From 7354bd6b0557bab336b3534009d4a2444a179ddb Mon Sep 17 00:00:00 2001 From: Draylar <17728338+Draylar@users.noreply.github.com> Date: Wed, 19 Oct 2022 02:17:20 -0500 Subject: [PATCH 1/6] Add initial documentation for ArmorMaterial class --- .../net/minecraft/item/ArmorMaterial.mapping | 72 +++++++++++++++++++ 1 file changed, 72 insertions(+) diff --git a/mappings/net/minecraft/item/ArmorMaterial.mapping b/mappings/net/minecraft/item/ArmorMaterial.mapping index cbc654cdfd..81c07d69ba 100644 --- a/mappings/net/minecraft/item/ArmorMaterial.mapping +++ b/mappings/net/minecraft/item/ArmorMaterial.mapping @@ -1,11 +1,83 @@ CLASS net/minecraft/class_1741 net/minecraft/item/ArmorMaterial + COMMENT Defines the material stats of an {@link net.minecraft.item.ArmorItem} item. + COMMENT + COMMENT

+ COMMENT To view available vanilla armor materials, visit {@link net.minecraft.item.ArmorMaterials}. METHOD method_24355 getKnockbackResistance ()F + COMMENT Returns the knockback resistance value of an {@link net.minecraft.item.ArmorItem} piece using this {@link ArmorMaterial}. + COMMENT + COMMENT

+ COMMENT {@link net.minecraft.item.ArmorItem} will cover the value returned here into the {@link net.minecraft.entity.attribute.EntityAttributes#GENERIC_KNOCKBACK_RESISTANCE} + COMMENT statistic with the {@link net.minecraft.entity.attribute.EntityAttributeModifier.Operation#ADDITION} modifier type. + COMMENT + COMMENT @return the knockback resistance value of any {@link net.minecraft.item.ArmorItem} using this {@link ArmorMaterial} METHOD method_7694 getName ()Ljava/lang/String; + COMMENT Returns the {@code name} of this {@link ArmorMaterial}, which is used for locating armor texture files. + COMMENT + COMMENT

+ COMMENT The return value of this method should be in {@code snake_case}. + COMMENT {@link net.minecraft.client.render.entity.feature.ArmorFeatureRenderer} will expect to find an armor + COMMENT texture file matching {@code minecraft:textures/models/armor/{material_name}_layer_[1/2].png} + COMMENT based off the return result of this method. + COMMENT + COMMENT

+ COMMENT Example: given a return value of {@code cool_material}, {@code ArmorFeatureRenderer} will require a file + COMMENT at {@code minecraft:textures/models/armor/cool_material_layer_1.png} and {@code minecraft:textures/models/armor/cool_material_layer_2.png}. + COMMENT + COMMENT @return the {@code name} of this armor material in snake_case, used for finding armor textures METHOD method_7695 getRepairIngredient ()Lnet/minecraft/class_1856; + COMMENT Returns the {@link Ingredient} used to repair items using this {@link ArmorMaterial}. + COMMENT + COMMENT

+ COMMENT By default, {@link net.minecraft.item.ArmorItem} will delegate {@link net.minecraft.item.Item#canRepair(ItemStack, ItemStack)} + COMMENT back to this method. + COMMENT + COMMENT @return the {@link Ingredient} required to repair items with this {@link ArmorMaterial} METHOD method_7696 getDurability (Lnet/minecraft/class_1304;)I + COMMENT Returns the total amount of durability points an {@link net.minecraft.item.ArmorItem} using this {@link ArmorMaterial} has. + COMMENT + COMMENT

+ COMMENT The value returned here will set the {@link net.minecraft.item.Item.Settings} max durability option when passed + COMMENT into {@link net.minecraft.item.ArmorItem#ArmorItem(net.minecraft.item.ArmorMaterial, EquipmentSlot, net.minecraft.item.Item.Settings)} + COMMENT if the value was not already specified. + COMMENT + COMMENT @return the total durability an {@link net.minecraft.item.ArmorItem} with this {@link ArmorMaterial} has ARG 1 slot + COMMENT the {@link EquipmentSlot} containing the {@link net.minecraft.item.Item} with this {@link ArmorMaterial} METHOD method_7697 getProtectionAmount (Lnet/minecraft/class_1304;)I + COMMENT Returns the amount of armor protection points offered by an {@link net.minecraft.item.ArmorItem} + COMMENT using this {@link ArmorMaterial} while it is worn by a player. + COMMENT + COMMENT

+ COMMENT The protection value returned here is applied as an {@link net.minecraft.entity.attribute.EntityAttributeModifier} + COMMENT to a player wearing the {@link net.minecraft.item.ArmorItem} piece via the {@link net.minecraft.entity.attribute.EntityAttributeModifier.Operation#ADDITION} modifier. + COMMENT + COMMENT

+ COMMENT For more information on the formula used to calculate dealt damage based off armor resistance, + COMMENT visit the Minecraft Wiki Armor page. + COMMENT + COMMENT @return the amount of armor protection points offered by an {@link net.minecraft.item.ArmorItem} with this {@link ArmorMaterial} ARG 1 slot + COMMENT the {@link EquipmentSlot} containing the {@link net.minecraft.item.Item} with this {@link ArmorMaterial} METHOD method_7698 getEquipSound ()Lnet/minecraft/class_3414; + COMMENT @return the {@link SoundEvent} played when a {@link net.minecraft.entity.LivingEntity} equips an {@link net.minecraft.item.ArmorItem} using this {@link ArmorMaterial} METHOD method_7699 getEnchantability ()I + COMMENT Returns the base enchantment value used by {@link net.minecraft.item.ArmorItem} with this material. + COMMENT + COMMENT

+ COMMENT By default, {@link net.minecraft.item.ArmorItem} will override {@link net.minecraft.item.Item#getEnchantability()} + COMMENT and delegate the call back to this method. + COMMENT + COMMENT

+ COMMENT A higher return value will result in better enchantment results when using an {@code Enchanting Table}. + COMMENT The highest enchantability value in vanilla is Netherite, at {@code 37}. + COMMENT + COMMENT @return the enchantment value sent back to {@link net.minecraft.item.Item#getEnchantability()} for armor using this material METHOD method_7700 getToughness ()F + COMMENT Returns the toughness value of an {@link net.minecraft.item.ArmorItem} piece using this {@link ArmorMaterial}. + COMMENT + COMMENT

+ COMMENT {@link net.minecraft.item.ArmorItem} will cover the value returned here into the {@link net.minecraft.entity.attribute.EntityAttributes#GENERIC_ARMOR_TOUGHNESS} + COMMENT statistic with the {@link net.minecraft.entity.attribute.EntityAttributeModifier.Operation#ADDITION} modifier type. + COMMENT + COMMENT @return the toughness value of any {@link net.minecraft.item.ArmorItem} using this {@link ArmorMaterial} From ce238d183fa1ae35b11b4b400a8fafa8add185c0 Mon Sep 17 00:00:00 2001 From: Draylar <17728338+Draylar@users.noreply.github.com> Date: Thu, 20 Oct 2022 02:49:50 -0500 Subject: [PATCH 2/6] Switch to inline return on getKnockbackResistance method descriptor --- mappings/net/minecraft/item/ArmorMaterial.mapping | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/mappings/net/minecraft/item/ArmorMaterial.mapping b/mappings/net/minecraft/item/ArmorMaterial.mapping index 81c07d69ba..e30bba48d8 100644 --- a/mappings/net/minecraft/item/ArmorMaterial.mapping +++ b/mappings/net/minecraft/item/ArmorMaterial.mapping @@ -4,13 +4,11 @@ CLASS net/minecraft/class_1741 net/minecraft/item/ArmorMaterial COMMENT

COMMENT To view available vanilla armor materials, visit {@link net.minecraft.item.ArmorMaterials}. METHOD method_24355 getKnockbackResistance ()F - COMMENT Returns the knockback resistance value of an {@link net.minecraft.item.ArmorItem} piece using this {@link ArmorMaterial}. + COMMENT {@return the knockback resistance value of an {@link net.minecraft.item.ArmorItem} piece using this {@link ArmorMaterial}} COMMENT COMMENT

COMMENT {@link net.minecraft.item.ArmorItem} will cover the value returned here into the {@link net.minecraft.entity.attribute.EntityAttributes#GENERIC_KNOCKBACK_RESISTANCE} COMMENT statistic with the {@link net.minecraft.entity.attribute.EntityAttributeModifier.Operation#ADDITION} modifier type. - COMMENT - COMMENT @return the knockback resistance value of any {@link net.minecraft.item.ArmorItem} using this {@link ArmorMaterial} METHOD method_7694 getName ()Ljava/lang/String; COMMENT Returns the {@code name} of this {@link ArmorMaterial}, which is used for locating armor texture files. COMMENT From 2611d6ef2357535bc715948b6bb01b86119f4646 Mon Sep 17 00:00:00 2001 From: Draylar <17728338+Draylar@users.noreply.github.com> Date: Fri, 21 Oct 2022 03:56:40 -0500 Subject: [PATCH 3/6] Remove armor documentation reference link to Minecraft Wiki --- mappings/net/minecraft/item/ArmorMaterial.mapping | 4 ---- 1 file changed, 4 deletions(-) diff --git a/mappings/net/minecraft/item/ArmorMaterial.mapping b/mappings/net/minecraft/item/ArmorMaterial.mapping index e30bba48d8..be7282e622 100644 --- a/mappings/net/minecraft/item/ArmorMaterial.mapping +++ b/mappings/net/minecraft/item/ArmorMaterial.mapping @@ -50,10 +50,6 @@ CLASS net/minecraft/class_1741 net/minecraft/item/ArmorMaterial COMMENT The protection value returned here is applied as an {@link net.minecraft.entity.attribute.EntityAttributeModifier} COMMENT to a player wearing the {@link net.minecraft.item.ArmorItem} piece via the {@link net.minecraft.entity.attribute.EntityAttributeModifier.Operation#ADDITION} modifier. COMMENT - COMMENT

- COMMENT For more information on the formula used to calculate dealt damage based off armor resistance, - COMMENT visit the Minecraft Wiki Armor page. - COMMENT COMMENT @return the amount of armor protection points offered by an {@link net.minecraft.item.ArmorItem} with this {@link ArmorMaterial} ARG 1 slot COMMENT the {@link EquipmentSlot} containing the {@link net.minecraft.item.Item} with this {@link ArmorMaterial} From 1e759aeceff37f475c4e2f6c9186ca7c2458995d Mon Sep 17 00:00:00 2001 From: Draylar <17728338+Draylar@users.noreply.github.com> Date: Mon, 24 Oct 2022 13:17:51 -0500 Subject: [PATCH 4/6] Replace qualified javadoc imports with class names for classes in same package --- .../net/minecraft/item/ArmorMaterial.mapping | 42 +++++++++---------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/mappings/net/minecraft/item/ArmorMaterial.mapping b/mappings/net/minecraft/item/ArmorMaterial.mapping index be7282e622..d1d02d0e44 100644 --- a/mappings/net/minecraft/item/ArmorMaterial.mapping +++ b/mappings/net/minecraft/item/ArmorMaterial.mapping @@ -1,13 +1,13 @@ CLASS net/minecraft/class_1741 net/minecraft/item/ArmorMaterial - COMMENT Defines the material stats of an {@link net.minecraft.item.ArmorItem} item. + COMMENT Defines the material stats of an {@link ArmorItem} item. COMMENT COMMENT

- COMMENT To view available vanilla armor materials, visit {@link net.minecraft.item.ArmorMaterials}. + COMMENT To view available vanilla armor materials, visit {@link ArmorMaterials}. METHOD method_24355 getKnockbackResistance ()F - COMMENT {@return the knockback resistance value of an {@link net.minecraft.item.ArmorItem} piece using this {@link ArmorMaterial}} + COMMENT {@return the knockback resistance value of an {@link ArmorItem} piece using this {@link ArmorMaterial}} COMMENT COMMENT

- COMMENT {@link net.minecraft.item.ArmorItem} will cover the value returned here into the {@link net.minecraft.entity.attribute.EntityAttributes#GENERIC_KNOCKBACK_RESISTANCE} + COMMENT {@link ArmorItem} will cover the value returned here into the {@link net.minecraft.entity.attribute.EntityAttributes#GENERIC_KNOCKBACK_RESISTANCE} COMMENT statistic with the {@link net.minecraft.entity.attribute.EntityAttributeModifier.Operation#ADDITION} modifier type. METHOD method_7694 getName ()Ljava/lang/String; COMMENT Returns the {@code name} of this {@link ArmorMaterial}, which is used for locating armor texture files. @@ -27,51 +27,51 @@ CLASS net/minecraft/class_1741 net/minecraft/item/ArmorMaterial COMMENT Returns the {@link Ingredient} used to repair items using this {@link ArmorMaterial}. COMMENT COMMENT

- COMMENT By default, {@link net.minecraft.item.ArmorItem} will delegate {@link net.minecraft.item.Item#canRepair(ItemStack, ItemStack)} + COMMENT By default, {@link ArmorItem} will delegate {@link Item#canRepair(ItemStack, ItemStack)} COMMENT back to this method. COMMENT COMMENT @return the {@link Ingredient} required to repair items with this {@link ArmorMaterial} METHOD method_7696 getDurability (Lnet/minecraft/class_1304;)I - COMMENT Returns the total amount of durability points an {@link net.minecraft.item.ArmorItem} using this {@link ArmorMaterial} has. + COMMENT Returns the total amount of durability points an {@link ArmorItem} using this {@link ArmorMaterial} has. COMMENT COMMENT

- COMMENT The value returned here will set the {@link net.minecraft.item.Item.Settings} max durability option when passed - COMMENT into {@link net.minecraft.item.ArmorItem#ArmorItem(net.minecraft.item.ArmorMaterial, EquipmentSlot, net.minecraft.item.Item.Settings)} + COMMENT The value returned here will set the {@link Item.Settings} max durability option when passed + COMMENT into {@link ArmorItem#ArmorItem(net.minecraft.item.ArmorMaterial, EquipmentSlot, Item.Settings)} COMMENT if the value was not already specified. COMMENT - COMMENT @return the total durability an {@link net.minecraft.item.ArmorItem} with this {@link ArmorMaterial} has + COMMENT @return the total durability an {@link ArmorItem} with this {@link ArmorMaterial} has ARG 1 slot - COMMENT the {@link EquipmentSlot} containing the {@link net.minecraft.item.Item} with this {@link ArmorMaterial} + COMMENT the {@link EquipmentSlot} containing the {@link Item} with this {@link ArmorMaterial} METHOD method_7697 getProtectionAmount (Lnet/minecraft/class_1304;)I - COMMENT Returns the amount of armor protection points offered by an {@link net.minecraft.item.ArmorItem} + COMMENT Returns the amount of armor protection points offered by an {@link ArmorItem} COMMENT using this {@link ArmorMaterial} while it is worn by a player. COMMENT COMMENT

COMMENT The protection value returned here is applied as an {@link net.minecraft.entity.attribute.EntityAttributeModifier} - COMMENT to a player wearing the {@link net.minecraft.item.ArmorItem} piece via the {@link net.minecraft.entity.attribute.EntityAttributeModifier.Operation#ADDITION} modifier. + COMMENT to a player wearing the {@link ArmorItem} piece via the {@link net.minecraft.entity.attribute.EntityAttributeModifier.Operation#ADDITION} modifier. COMMENT - COMMENT @return the amount of armor protection points offered by an {@link net.minecraft.item.ArmorItem} with this {@link ArmorMaterial} + COMMENT @return the amount of armor protection points offered by an {@link ArmorItem} with this {@link ArmorMaterial} ARG 1 slot - COMMENT the {@link EquipmentSlot} containing the {@link net.minecraft.item.Item} with this {@link ArmorMaterial} + COMMENT the {@link EquipmentSlot} containing the {@link Item} with this {@link ArmorMaterial} METHOD method_7698 getEquipSound ()Lnet/minecraft/class_3414; - COMMENT @return the {@link SoundEvent} played when a {@link net.minecraft.entity.LivingEntity} equips an {@link net.minecraft.item.ArmorItem} using this {@link ArmorMaterial} + COMMENT @return the {@link SoundEvent} played when a {@link net.minecraft.entity.LivingEntity} equips an {@link ArmorItem} using this {@link ArmorMaterial} METHOD method_7699 getEnchantability ()I - COMMENT Returns the base enchantment value used by {@link net.minecraft.item.ArmorItem} with this material. + COMMENT Returns the base enchantment value used by {@link ArmorItem} with this material. COMMENT COMMENT

- COMMENT By default, {@link net.minecraft.item.ArmorItem} will override {@link net.minecraft.item.Item#getEnchantability()} + COMMENT By default, {@link ArmorItem} will override {@link Item#getEnchantability()} COMMENT and delegate the call back to this method. COMMENT COMMENT

COMMENT A higher return value will result in better enchantment results when using an {@code Enchanting Table}. COMMENT The highest enchantability value in vanilla is Netherite, at {@code 37}. COMMENT - COMMENT @return the enchantment value sent back to {@link net.minecraft.item.Item#getEnchantability()} for armor using this material + COMMENT @return the enchantment value sent back to {@link Item#getEnchantability()} for armor using this material METHOD method_7700 getToughness ()F - COMMENT Returns the toughness value of an {@link net.minecraft.item.ArmorItem} piece using this {@link ArmorMaterial}. + COMMENT Returns the toughness value of an {@link ArmorItem} piece using this {@link ArmorMaterial}. COMMENT COMMENT

- COMMENT {@link net.minecraft.item.ArmorItem} will cover the value returned here into the {@link net.minecraft.entity.attribute.EntityAttributes#GENERIC_ARMOR_TOUGHNESS} + COMMENT {@link ArmorItem} will cover the value returned here into the {@link net.minecraft.entity.attribute.EntityAttributes#GENERIC_ARMOR_TOUGHNESS} COMMENT statistic with the {@link net.minecraft.entity.attribute.EntityAttributeModifier.Operation#ADDITION} modifier type. COMMENT - COMMENT @return the toughness value of any {@link net.minecraft.item.ArmorItem} using this {@link ArmorMaterial} + COMMENT @return the toughness value of any {@link ArmorItem} using this {@link ArmorMaterial} From a7ca18dfd61e24e3371a3662ed1a503cb98ae468 Mon Sep 17 00:00:00 2001 From: YanisBft Date: Fri, 1 Sep 2023 06:24:00 +0200 Subject: [PATCH 5/6] Merge branch '23w35a' into pr/3323 --- .github/CODEOWNERS | 5 + .github/workflows/build.yml | 15 +- .github/workflows/publish.yml | 10 +- .github/workflows/release-filament.yml | 15 + .github/workflows/update-base.yml | 2 +- .github/workflows/version-label.yml | 14 + build.gradle | 767 +++++------------- filament/build.gradle | 55 +- filament/gradle.properties | 1 + .../fabricmc/filament/FilamentExtension.java | 56 ++ .../filament/FilamentGradlePlugin.java | 79 +- .../fabricmc/filament/task/DownloadTask.java | 70 ++ .../filament/task/JavadocLintTask.java | 12 +- .../fabricmc/filament/task/MapJarTask.java | 48 +- .../task/RemapUnpickDefinitionsTask.java | 71 +- .../fabricmc/filament/task/UnpickJarTask.java | 80 ++ .../filament/task/base/FilamentTask.java | 20 + .../filament/task/base/FileOutputTask.java | 4 + .../filament/task/base/WithFileInput.java | 23 + .../filament/task/base/WithFileOutput.java | 23 + .../task/enigma/EnigmaCommandTask.java | 55 ++ .../enigma/MapSpecializedMethodsTask.java | 52 ++ .../task/mappingio/ConvertMappingsTask.java | 14 + .../task/mappingio/MappingOutputTask.java | 26 + .../task/mappingio/MergeMappingsTask.java | 76 ++ .../minecraft/ExtractBundledServerTask.java | 24 + .../task/minecraft/MergeMinecraftTask.java | 28 + .../util/MinecraftVersionMetaHelper.java | 66 ++ .../projects/javadocLint/build.gradle | 5 + .../resources/projects/unpickDef/build.gradle | 5 + gradle.properties | 18 +- gradle/wrapper/gradle-wrapper.jar | Bin 59821 -> 63721 bytes gradle/wrapper/gradle-wrapper.properties | 4 +- gradlew | 31 +- gradlew.bat | 15 +- .../blaze3d/platform/GlStateManager.mapping | 21 +- .../blaze3d/platform/TextureUtil.mapping | 30 +- .../blaze3d/systems/RenderSystem.mapping | 69 +- .../blaze3d/systems/VertexSorter.mapping | 23 + mappings/net/minecraft/Bootstrap.mapping | 4 +- mappings/net/minecraft/GameVersion.mapping | 7 + .../net/minecraft/MinecraftVersion.mapping | 3 - .../net/minecraft/SharedConstants.mapping | 3 +- .../minecraft/advancement/Advancement.mapping | 92 +-- .../advancement/AdvancementCriterion.mapping | 18 +- .../advancement/AdvancementDisplays.mapping | 21 + .../advancement/AdvancementFrame.mapping | 7 +- .../advancement/AdvancementManager.mapping | 16 +- .../advancement/AdvancementPositioner.mapping | 7 +- .../advancement/AdvancementProgress.mapping | 19 +- .../advancement/CriterionMerger.mapping | 9 - .../PlayerAdvancementTracker.mapping | 49 +- .../criterion/AbstractCriterion.mapping | 6 +- .../AbstractCriterionConditions.mapping | 7 +- .../BeeNestDestroyedCriterion.mapping | 11 +- .../criterion/BredAnimalsCriterion.mapping | 26 +- .../criterion/BrewedPotionCriterion.mapping | 7 +- .../ChangedDimensionCriterion.mapping | 13 +- .../ChanneledLightningCriterion.mapping | 9 +- .../ConstructBeaconCriterion.mapping | 9 +- .../criterion/ConsumeItemCriterion.mapping | 14 +- .../advancement/criterion/Criteria.mapping | 8 +- .../advancement/criterion/Criterion.mapping | 14 +- .../criterion/CriterionConditions.mapping | 4 +- .../criterion/CriterionProgress.mapping | 8 +- .../CuredZombieVillagerCriterion.mapping | 15 +- .../criterion/EffectsChangedCriterion.mapping | 14 +- .../criterion/EnchantedItemCriterion.mapping | 9 +- .../criterion/EnterBlockCriterion.mapping | 9 +- .../EntityHurtPlayerCriterion.mapping | 15 +- .../criterion/FilledBucketCriterion.mapping | 10 +- .../FishingRodHookedCriterion.mapping | 21 +- .../criterion/ImpossibleCriterion.mapping | 1 - .../InventoryChangedCriterion.mapping | 13 +- .../criterion/ItemCriterion.mapping | 35 +- .../ItemDurabilityChangedCriterion.mapping | 13 +- .../KilledByCrossbowCriterion.mapping | 11 +- .../criterion/LevitationCriterion.mapping | 11 +- .../LightningStrikeCriterion.mapping | 11 +- .../criterion/OnKilledCriterion.mapping | 65 +- .../criterion/PlacedBlockCriterion.mapping | 30 - ...yerGeneratesContainerLootCriterion.mapping | 7 +- .../PlayerHurtEntityCriterion.mapping | 37 +- ...layerInteractedWithEntityCriterion.mapping | 21 +- .../criterion/RecipeCraftedCriterion.mapping | 22 + .../criterion/RecipeUnlockedCriterion.mapping | 15 +- .../criterion/ShotCrossbowCriterion.mapping | 13 +- .../criterion/SlideDownBlockCriterion.mapping | 9 +- .../criterion/StartedRidingCriterion.mapping | 5 +- .../criterion/SummonedEntityCriterion.mapping | 11 +- .../criterion/TameAnimalCriterion.mapping | 14 +- .../criterion/TargetHitCriterion.mapping | 11 +- ...hrownItemPickedUpByEntityCriterion.mapping | 21 +- .../criterion/TickCriterion.mapping | 16 +- .../criterion/TravelCriterion.mapping | 22 +- .../criterion/UsedEnderEyeCriterion.mapping | 5 +- .../criterion/UsedTotemCriterion.mapping | 11 +- .../criterion/UsingItemCriterion.mapping | 9 +- .../criterion/VillagerTradeCriterion.mapping | 15 +- .../net/minecraft/block/AbstractBlock.mapping | 164 ++-- .../block/AbstractCauldronBlock.mapping | 26 + .../block/AbstractPressurePlateBlock.mapping | 16 +- .../block/AbstractRedstoneGateBlock.mapping | 9 +- .../minecraft/block/AbstractSignBlock.mapping | 23 +- .../net/minecraft/block/BarrierBlock.mapping | 1 + mappings/net/minecraft/block/BedBlock.mapping | 5 +- .../net/minecraft/block/BeehiveBlock.mapping | 2 +- mappings/net/minecraft/block/Block.mapping | 26 +- .../net/minecraft/block/BlockSetType.mapping | 22 + .../minecraft/block/BlockWithEntity.mapping | 2 +- mappings/net/minecraft/block/Blocks.mapping | 18 + .../minecraft/block/BrushableBlock.mapping | 13 + ...uttonBlock.mapping => ButtonBlock.mapping} | 15 +- .../block/CalibratedSculkSensorBlock.mapping | 7 + .../net/minecraft/block/CampfireBlock.mapping | 2 +- .../net/minecraft/block/CandleBlock.mapping | 2 +- .../minecraft/block/CandleCakeBlock.mapping | 2 +- .../block/CarvedPumpkinBlock.mapping | 15 + .../net/minecraft/block/CauldronBlock.mapping | 1 + .../net/minecraft/block/CaveVines.mapping | 9 +- .../minecraft/block/CherryLeavesBlock.mapping | 1 + .../net/minecraft/block/ChestBlock.mapping | 4 +- .../block/ChiseledBookshelfBlock.mapping | 26 + .../minecraft/block/ComposterBlock.mapping | 42 +- .../minecraft/block/ConnectingBlock.mapping | 2 +- .../net/minecraft/block/CropBlock.mapping | 4 +- .../minecraft/block/DecoratedPotBlock.mapping | 12 + .../block/DecoratedPotPatterns.mapping | 54 ++ .../net/minecraft/block/Degradable.mapping | 3 +- .../net/minecraft/block/DoorBlock.mapping | 20 +- .../block/EnchantingTableBlock.mapping | 6 +- .../minecraft/block/EnderChestBlock.mapping | 2 +- ...apping => ExperienceDroppingBlock.mapping} | 2 +- .../net/minecraft/block/FarmlandBlock.mapping | 9 +- .../minecraft/block/FenceGateBlock.mapping | 6 + .../net/minecraft/block/Fertilizable.mapping | 3 +- .../net/minecraft/block/FlowerBlock.mapping | 5 +- .../minecraft/block/FlowerbedBlock.mapping | 7 + .../minecraft/block/FluidDrainable.mapping | 9 +- .../net/minecraft/block/FluidFillable.mapping | 11 +- .../net/minecraft/block/FungusBlock.mapping | 12 +- .../minecraft/block/GlowLichenBlock.mapping | 2 +- .../minecraft/block/HangingSignBlock.mapping | 10 + .../net/minecraft/block/HopperBlock.mapping | 3 +- .../block/HorizontalConnectingBlock.mapping | 2 +- mappings/net/minecraft/block/IceBlock.mapping | 1 + .../net/minecraft/block/JukeboxBlock.mapping | 9 - .../net/minecraft/block/LandingBlock.mapping | 4 +- .../minecraft/block/LavaCauldronBlock.mapping | 1 + .../net/minecraft/block/LeavesBlock.mapping | 2 + .../net/minecraft/block/LecternBlock.mapping | 19 +- .../block/LeveledCauldronBlock.mapping | 18 + .../net/minecraft/block/LightBlock.mapping | 3 + mappings/net/minecraft/block/Material.mapping | 119 --- .../block/MushroomPlantBlock.mapping | 6 +- .../net/minecraft/block/NoteBlock.mapping | 16 +- .../net/minecraft/block/NyliumBlock.mapping | 9 + .../net/minecraft/block/PistonBlock.mapping | 2 +- .../minecraft/block/PitcherCropBlock.mapping | 35 + .../block/PointedDripstoneBlock.mapping | 18 +- .../block/PowderSnowCauldronBlock.mapping | 1 + .../block/PressurePlateBlock.mapping | 3 +- .../net/minecraft/block/PumpkinBlock.mapping | 2 +- .../block/RedstoneTorchBlock.mapping | 2 +- .../block/RespawnAnchorBlock.mapping | 9 +- .../block/SculkCatalystBlock.mapping | 6 - .../minecraft/block/SculkSensorBlock.mapping | 37 +- .../block/SculkShriekerBlock.mapping | 4 +- .../minecraft/block/ShulkerBoxBlock.mapping | 16 +- .../net/minecraft/block/SkullBlock.mapping | 3 + .../minecraft/block/SnifferEggBlock.mapping | 14 + .../net/minecraft/block/SpawnerBlock.mapping | 4 + .../net/minecraft/block/SpongeBlock.mapping | 5 + .../minecraft/block/StoneButtonBlock.mapping | 1 - .../block/SuspiciousStewIngredient.mapping | 9 + mappings/net/minecraft/block/TntBlock.mapping | 2 +- .../minecraft/block/TorchflowerBlock.mapping | 3 + .../net/minecraft/block/TrapdoorBlock.mapping | 4 + .../block/WallHangingSignBlock.mapping | 25 + .../block/WallPiglinHeadBlock.mapping | 2 + .../block/WearableCarvedPumpkinBlock.mapping | 1 + .../block/WeightedPressurePlateBlock.mapping | 3 +- .../minecraft/block/WitherSkullBlock.mapping | 4 + .../WoodType.mapping} | 11 +- .../minecraft/block/WoodenButtonBlock.mapping | 1 - .../block/cauldron/CauldronBehavior.mapping | 111 ++- .../entity/AbstractFurnaceBlockEntity.mapping | 20 +- .../block/entity/BannerPatterns.mapping | 2 +- .../block/entity/BeaconBlockEntity.mapping | 14 +- .../block/entity/BeehiveBlockEntity.mapping | 2 +- .../block/entity/BellBlockEntity.mapping | 2 +- .../block/entity/BlockEntityType.mapping | 4 +- .../block/entity/BrushableBlockEntity.mapping | 36 + .../CalibratedSculkSensorBlockEntity.mapping | 8 + .../block/entity/CampfireBlockEntity.mapping | 2 - .../block/entity/ChestBlockEntity.mapping | 3 +- .../ChiseledBookshelfBlockEntity.mapping | 12 + .../entity/DecoratedPotBlockEntity.mapping | 25 + .../entity/HangingSignBlockEntity.mapping | 3 + .../block/entity/HopperBlockEntity.mapping | 11 +- .../block/entity/JukeboxBlockEntity.mapping | 32 +- .../entity/MobSpawnerBlockEntity.mapping | 3 + .../block/entity/PistonBlockEntity.mapping | 9 +- .../entity/SculkCatalystBlockEntity.mapping | 23 +- .../entity/SculkSensorBlockEntity.mapping | 17 +- .../entity/SculkShriekerBlockEntity.mapping | 14 +- .../SculkShriekerWarningManager.mapping | 6 +- .../block/entity/SculkSpreadManager.mapping | 2 +- .../block/entity/SignBlockEntity.mapping | 117 ++- .../minecraft/block/entity/SignText.mapping | 60 ++ .../block/entity/SkullBlockEntity.mapping | 54 +- .../entity/StructureBlockBlockEntity.mapping | 3 + ...ountLocation.mapping => BlockFace.mapping} | 2 +- .../minecraft/block/enums/ChestType.mapping | 5 +- .../minecraft/block/enums/Instrument.mapping | 16 +- .../sapling/CherrySaplingGenerator.mapping | 1 + .../sapling/LargeTreeSaplingGenerator.mapping | 2 +- .../block/sapling/SaplingGenerator.mapping | 2 +- mappings/net/minecraft/class_4558.mapping | 3 + mappings/net/minecraft/class_5699.mapping | 4 + mappings/net/minecraft/class_8782.mapping | 4 + .../client/ClientGameSession.mapping | 10 - .../net/minecraft/client/Keyboard.mapping | 5 +- .../minecraft/client/MinecraftClient.mapping | 149 ++-- .../client/MinecraftClientGame.mapping | 20 - mappings/net/minecraft/client/Mouse.mapping | 3 +- .../net/minecraft/client/QuickPlay.mapping | 24 + .../minecraft/client/QuickPlayLogger.mapping | 33 + mappings/net/minecraft/client/RunArgs.mapping | 16 +- .../client/color/block/BlockColors.mapping | 5 + .../client/color/world/GrassColors.mapping | 1 + .../minecraft/client/font/BitmapFont.mapping | 27 +- .../minecraft/client/font/FontLoader.mapping | 11 +- .../minecraft/client/font/FontManager.mapping | 89 +- .../minecraft/client/font/FontStorage.mapping | 8 +- .../minecraft/client/font/FontType.mapping | 15 +- .../client/font/GlyphAtlasTexture.mapping | 12 +- .../client/font/GlyphContainer.mapping | 33 + .../client/font/GlyphRenderer.mapping | 30 +- .../client/font/MultilineText.mapping | 20 +- .../client/font/ReferenceFont.mapping | 8 + .../minecraft/client/font/SpaceFont.mapping | 17 +- .../minecraft/client/font/TextHandler.mapping | 17 +- .../client/font/TextRenderLayerSet.mapping | 7 + .../client/font/TextRenderer.mapping | 123 +-- .../client/font/TrueTypeFont.mapping | 3 + .../client/font/TrueTypeFontLoader.mapping | 35 +- .../client/font/UnicodeTextureFont.mapping | 41 - .../minecraft/client/font/UnihexFont.mapping | 99 +++ .../client/gl/EffectGlShader.mapping | 1 - .../client/gl/EffectShaderProgram.mapping | 1 + ...gram.mapping => EffectShaderStage.mapping} | 9 +- .../client/gl/GLImportProcessor.mapping | 2 +- .../client/gl/GlProgramManager.mapping | 4 +- .../net/minecraft/client/gl/GlShader.mapping | 6 - ...apping => JsonEffectShaderProgram.mapping} | 16 +- ...sShader.mapping => PostEffectPass.mapping} | 6 +- ...ct.mapping => PostEffectProcessor.mapping} | 4 +- .../client/gl/ShaderParseException.mapping | 19 - .../ShaderProgram.mapping} | 25 +- .../client/gl/ShaderProgramSetupView.mapping | 8 + .../{Program.mapping => ShaderStage.mapping} | 34 +- .../net/minecraft/client/gl/Uniform.mapping | 8 +- .../minecraft/client/gl/VertexBuffer.mapping | 36 +- .../minecraft/client/gui/DrawContext.mapping | 460 +++++++++++ .../net/minecraft/client/gui/Drawable.mapping | 4 +- .../client/gui/DrawableHelper.mapping | 243 ------ .../net/minecraft/client/gui/Element.mapping | 24 +- .../minecraft/client/gui/LogoDrawer.mapping | 27 + .../client/gui/ParentElement.mapping | 24 +- .../client/gui/PlayerSkinDrawer.mapping | 61 +- .../gui/RotatingCubeMapRenderer.mapping | 6 +- .../minecraft/client/gui/ScreenPos.mapping | 10 + .../minecraft/client/gui/ScreenRect.mapping | 53 ++ .../client/gui/hud/BossBarHud.mapping | 21 +- .../minecraft/client/gui/hud/ChatHud.mapping | 38 +- .../client/gui/hud/ClientBossBar.mapping | 1 + .../minecraft/client/gui/hud/DebugHud.mapping | 57 +- .../client/gui/hud/InGameHud.mapping | 168 ++-- .../client/gui/hud/MessageIndicator.mapping | 26 +- .../client/gui/hud/PlayerListHud.mapping | 85 +- .../client/gui/hud/SpectatorHud.mapping | 21 +- .../client/gui/hud/SubtitlesHud.mapping | 4 +- .../client/gui/hud/debug/DebugChart.mapping | 37 + .../gui/hud/debug/PacketSizeChart.mapping | 19 + .../client/gui/hud/debug/PingChart.mapping | 1 + .../gui/hud/debug/RenderingChart.mapping | 3 + .../client/gui/hud/debug/TickChart.mapping | 3 + .../gui/hud/spectator/SpectatorMenu.mapping | 4 + .../spectator/SpectatorMenuCommand.mapping | 4 +- .../TeamTeleportSpectatorMenu.mapping | 15 +- .../spectator/TeleportSpectatorMenu.mapping | 10 +- ...rtToSpecificPlayerSpectatorCommand.mapping | 2 +- .../gui/navigation/GuiNavigation.mapping | 6 + .../gui/navigation/GuiNavigationPath.mapping | 16 + .../gui/navigation/GuiNavigationType.mapping | 4 + .../client/gui/navigation/Navigable.mapping | 2 + .../gui/navigation/NavigationAxis.mapping | 6 + .../navigation/NavigationDirection.mapping | 30 + .../AccessibilityOnboardingButtons.mapping | 9 + .../AccessibilityOnboardingScreen.mapping | 27 + .../client/gui/screen/ButtonTextures.mapping | 11 + .../gui/screen/ChatInputSuggestor.mapping | 27 +- .../gui/screen/ChatPreviewBackground.mapping | 19 - .../client/gui/screen/ChatScreen.mapping | 58 -- .../gui/screen/ConfirmLinkScreen.mapping | 20 +- .../client/gui/screen/ConnectScreen.mapping | 12 +- .../client/gui/screen/CreditsScreen.mapping | 9 +- .../screen/CustomizeFlatLevelScreen.mapping | 11 +- .../client/gui/screen/DeathScreen.mapping | 14 +- .../gui/screen/DisconnectedScreen.mapping | 13 +- .../client/gui/screen/GameMenuScreen.mapping | 50 +- .../screen/GameModeSelectionScreen.mapping | 32 +- .../gui/screen/LevelLoadingScreen.mapping | 4 +- .../client/gui/screen/OpenToLanScreen.mapping | 18 +- .../client/gui/screen/PresetsScreen.mapping | 46 +- .../screen/Realms32BitWarningScreen.mapping | 3 + .../gui/screen/ReconfiguringScreen.mapping | 12 + .../client/gui/screen/Screen.mapping | 116 +-- .../gui/screen/SleepingChatScreen.mapping | 2 +- .../client/gui/screen/SplashOverlay.mapping | 3 +- .../gui/screen/SplashTextRenderer.mapping | 12 + .../client/gui/screen/StatsScreen.mapping | 26 +- .../client/gui/screen/TitleScreen.mapping | 23 +- .../client/gui/screen/WarningScreen.mapping | 4 +- .../AdvancementObtainedStatus.mapping | 16 +- .../screen/advancement/AdvancementTab.mapping | 34 +- .../advancement/AdvancementTabType.mapping | 36 +- .../advancement/AdvancementWidget.mapping | 46 +- .../advancement/AdvancementsScreen.mapping | 18 +- .../ingame/AbstractFurnaceScreen.mapping | 7 +- .../ingame/AbstractInventoryScreen.mapping | 18 +- .../ingame/AbstractSignEditScreen.mapping | 37 + .../gui/screen/ingame/AnvilScreen.mapping | 3 + .../gui/screen/ingame/BeaconScreen.mapping | 30 +- .../screen/ingame/BlastFurnaceScreen.mapping | 2 + .../gui/screen/ingame/BookEditScreen.mapping | 9 +- .../screen/ingame/BrewingStandScreen.mapping | 3 + .../ingame/CartographyTableScreen.mapping | 13 +- .../gui/screen/ingame/CraftingScreen.mapping | 1 - .../ingame/CreativeInventoryScreen.mapping | 48 +- .../gui/screen/ingame/CyclingSlotIcon.mapping | 24 + .../screen/ingame/EnchantmentScreen.mapping | 10 + .../gui/screen/ingame/ForgingScreen.mapping | 8 +- .../gui/screen/ingame/FurnaceScreen.mapping | 2 + .../screen/ingame/GrindstoneScreen.mapping | 1 + .../gui/screen/ingame/HandledScreen.mapping | 33 +- .../ingame/HangingSignEditScreen.mapping | 4 + .../gui/screen/ingame/HorseScreen.mapping | 4 + .../gui/screen/ingame/InventoryScreen.mapping | 25 +- .../gui/screen/ingame/LoomScreen.mapping | 17 +- .../gui/screen/ingame/MerchantScreen.mapping | 29 +- .../gui/screen/ingame/SignEditScreen.mapping | 20 +- .../gui/screen/ingame/SmithingScreen.mapping | 22 +- .../gui/screen/ingame/SmokerScreen.mapping | 2 + .../screen/ingame/StonecutterScreen.mapping | 18 +- .../ChatPreviewWarningScreen.mapping | 14 - .../multiplayer/MultiplayerScreen.mapping | 4 +- .../MultiplayerServerListWidget.mapping | 49 +- .../MultiplayerWarningScreen.mapping | 4 + .../SocialInteractionsPlayerListEntry.mapping | 29 +- ...SocialInteractionsPlayerListWidget.mapping | 2 + .../SocialInteractionsScreen.mapping | 8 +- .../option/AccessibilityOptionsScreen.mapping | 1 - .../screen/option/ControlsListWidget.mapping | 8 + .../CreditsAndAttributionScreen.mapping | 16 + .../screen/option/GameOptionsScreen.mapping | 10 +- .../option/LanguageOptionsScreen.mapping | 13 +- .../screen/option/OnlineOptionsScreen.mapping | 16 +- .../gui/screen/option/OptionsScreen.mapping | 58 +- .../screen/option/SoundOptionsScreen.mapping | 9 +- .../option/TelemetryEventWidget.mapping | 51 ++ .../screen/option/TelemetryInfoScreen.mapping | 36 + .../screen/option/VideoOptionsScreen.mapping | 1 + .../pack/ExperimentalWarningScreen.mapping | 34 + .../gui/screen/pack/PackListWidget.mapping | 34 +- .../client/gui/screen/pack/PackScreen.mapping | 31 +- .../screen/pack/ResourcePackOrganizer.mapping | 3 + .../AbstractFurnaceRecipeBookScreen.mapping | 3 + .../recipebook/AnimatedResultButton.mapping | 13 +- .../RecipeAlternativesWidget.mapping | 24 +- .../recipebook/RecipeBookGhostSlots.mapping | 15 +- .../recipebook/RecipeBookResults.mapping | 14 +- .../recipebook/RecipeBookWidget.mapping | 21 +- .../RecipeGroupButtonWidget.mapping | 6 +- .../recipebook/RecipeResultCollection.mapping | 15 +- .../report/AbuseReportReasonScreen.mapping | 1 - .../report/AbuseReportTypeScreen.mapping | 24 + .../screen/report/ChatReportScreen.mapping | 74 +- .../screen/report/ChatSelectionScreen.mapping | 30 +- .../gui/screen/report/ReportScreen.mapping | 52 ++ .../screen/report/SkinReportScreen.mapping | 37 + .../report/UsernameReportScreen.mapping | 32 + .../screen/world/CreateWorldScreen.mapping | 246 +++--- .../screen/world/EditGameRulesScreen.mapping | 9 +- .../gui/screen/world/EditWorldScreen.mapping | 7 - .../screen/world/ExperimentsScreen.mapping | 28 + .../screen/world/LevelScreenProvider.mapping | 8 +- .../screen/world/MoreOptionsDialog.mapping | 93 --- .../screen/world/OptimizeWorldScreen.mapping | 4 +- .../screen/world/SelectWorldScreen.mapping | 9 +- .../screen/world/SymlinkWarningScreen.mapping | 24 + .../gui/screen/world/WorldCreator.mapping | 105 +++ .../client/gui/screen/world/WorldIcon.mapping | 22 + .../gui/screen/world/WorldListWidget.mapping | 20 +- .../world/WorldScreenOptionGrid.mapping | 75 ++ .../client/gui/tab/GridScreenTab.mapping | 5 + .../net/minecraft/client/gui/tab/Tab.mapping | 6 + .../client/gui/tab/TabManager.mapping | 14 + .../tooltip/BundleTooltipComponent.mapping | 40 +- .../tooltip/FocusedTooltipPositioner.mapping | 4 + .../tooltip/HoveredTooltipPositioner.mapping | 8 + .../client/gui/tooltip/Tooltip.mapping | 18 + .../tooltip/TooltipBackgroundRenderer.mapping | 51 ++ .../gui/tooltip/TooltipComponent.mapping | 8 +- .../gui/tooltip/TooltipPositioner.mapping | 8 + .../tooltip/WidgetTooltipPositioner.mapping | 8 + .../gui/widget/AbstractTextWidget.mapping | 14 + .../AlwaysSelectedEntryListWidget.mapping | 1 - .../client/gui/widget/AxisGridWidget.mapping | 47 ++ .../client/gui/widget/ButtonWidget.mapping | 71 +- .../client/gui/widget/CheckboxWidget.mapping | 5 +- .../client/gui/widget/ClickableWidget.mapping | 78 +- .../gui/widget/CyclingButtonWidget.mapping | 3 +- .../widget/DirectionalLayoutWidget.mapping | 39 + .../client/gui/widget/EditBoxWidget.mapping | 8 +- .../gui/widget/ElementListWidget.mapping | 6 +- .../client/gui/widget/EmptyWidget.mapping | 17 + .../client/gui/widget/EntryListWidget.mapping | 77 +- .../client/gui/widget/GridWidget.mapping | 90 ++ .../client/gui/widget/IconWidget.mapping | 36 + .../client/gui/widget/LayoutWidget.mapping | 8 + .../client/gui/widget/LayoutWidgets.mapping | 13 + .../gui/widget/LockButtonWidget.mapping | 12 +- .../gui/widget/MultilineTextWidget.mapping | 23 + .../NarratedMultilineTextWidget.mapping | 13 + ...idget.mapping => OptionListWidget.mapping} | 18 +- .../client/gui/widget/PageTurnWidget.mapping | 4 + .../gui/widget/PlayerSkinWidget.mapping | 16 + .../client/gui/widget/Positioner.mapping | 48 ++ .../client/gui/widget/PressableWidget.mapping | 5 + .../gui/widget/ScrollableTextWidget.mapping | 13 + .../gui/widget/ScrollableWidget.mapping | 30 +- .../widget/SimplePositioningWidget.mapping | 59 ++ .../client/gui/widget/SliderWidget.mapping | 7 + .../gui/widget/SoundSliderWidget.mapping | 8 - .../client/gui/widget/TabButtonWidget.mapping | 19 + .../gui/widget/TabNavigationWidget.mapping | 41 + .../client/gui/widget/TextFieldWidget.mapping | 44 +- .../gui/widget/TextIconButtonWidget.mapping | 44 + .../client/gui/widget/TextWidget.mapping | 27 + .../gui/widget/TexturedButtonWidget.mapping | 73 +- .../gui/widget/ThreePartsLayoutWidget.mapping | 39 + .../gui/widget/ToggleButtonWidget.mapping | 17 +- .../client/gui/widget/Widget.mapping | 15 + .../client/gui/widget/WrapperWidget.mapping | 28 + .../net/minecraft/client/input/Input.mapping | 1 + .../minecraft/client/input/KeyCodes.mapping | 3 + ... => ClampedModelPredicateProvider.mapping} | 2 +- .../ModelPredicateProviderRegistry.mapping | 15 + .../client/item/TooltipContext.mapping | 7 +- .../net/minecraft/client/main/Main.mapping | 3 - .../client/model/ModelCuboidData.mapping | 8 +- .../minecraft/client/model/ModelPart.mapping | 14 +- .../client/model/ModelPartBuilder.mapping | 9 + .../AbstractClientPlayerEntity.mapping | 19 +- .../network/ChatPreviewRequester.mapping | 69 -- .../client/network/ChatPreviewer.mapping | 95 --- .../network/ChunkBatchSizeCalculator.mapping | 8 + .../network/ClientAdvancementManager.mapping | 14 +- .../ClientCommonNetworkHandler.mapping | 49 ++ .../ClientConfigurationNetworkHandler.mapping | 9 + .../network/ClientConnectionState.mapping | 5 + .../network/ClientDynamicRegistryType.mapping | 4 + .../network/ClientLoginNetworkHandler.mapping | 18 +- .../network/ClientPlayNetworkHandler.mapping | 117 ++- .../client/network/ClientPlayerEntity.mapping | 84 +- .../ClientPlayerInteractionManager.mapping | 4 +- .../network/LanServerQueryManager.mapping | 4 +- .../client/network/LegacyServerPinger.mapping | 22 + .../MultiplayerServerListPinger.mapping | 31 +- .../network/OtherClientPlayerEntity.mapping | 2 + .../client/network/PingMeasurer.mapping | 9 + .../client/network/PlayerListEntry.mapping | 60 +- .../client/network/ServerInfo.mapping | 59 +- .../network/message/MessageHandler.mapping | 117 +-- .../message/MessageTrustStatus.mapping | 19 +- .../minecraft/client/option/AoMode.mapping | 9 - .../client/option/AttackIndicator.mapping | 2 +- .../client/option/ChatPreviewMode.mapping | 9 - .../client/option/ChatVisibility.mapping | 2 +- .../client/option/CloudRenderMode.mapping | 7 +- .../client/option/GameOptions.mapping | 138 ++-- .../client/option/GraphicsMode.mapping | 2 +- .../client/option/KeyBinding.mapping | 1 + .../client/option/NarratorMode.mapping | 2 +- .../client/option/ParticlesMode.mapping | 2 +- .../client/option/SimpleOption.mapping | 94 ++- .../client/option/StickyKeyBinding.mapping | 1 + .../client/particle/BillboardParticle.mapping | 6 + .../client/particle/BlockLeakParticle.mapping | 222 +++-- .../particle/CherryLeavesParticle.mapping | 7 + .../particle/DragonBreathParticle.mapping | 8 + .../DustColorTransitionParticle.mapping | 6 +- .../client/particle/GlowParticle.mapping | 4 + .../client/particle/NoRenderParticle.mapping | 2 + .../client/particle/Particle.mapping | 66 ++ .../client/particle/ParticleFactory.mapping | 10 + .../client/particle/ParticleManager.mapping | 48 +- .../particle/ParticleTextureSheet.mapping | 11 + .../client/particle/ShriekParticle.mapping | 6 +- .../particle/SpriteBillboardParticle.mapping | 10 + .../client/particle/SpriteProvider.mapping | 2 + .../client/particle/SuspendParticle.mapping | 4 + .../client/particle/VibrationParticle.mapping | 13 +- .../client/particle/WhiteAshParticle.mapping | 1 + .../client/realms/CheckedGson.mapping | 2 + .../minecraft/client/realms/KeyCombo.mapping | 12 - .../client/realms/RealmsAvailability.mapping | 15 + .../client/realms/RealmsClient.mapping | 32 +- .../client/realms/RealmsError.mapping | 27 +- .../realms/RealmsObjectSelectionList.mapping | 6 - .../realms/RealmsPeriodicCheckers.mapping | 1 + .../client/realms/dto/Backup.mapping | 2 - .../client/realms/dto/PendingInvite.mapping | 2 +- .../client/realms/dto/PlayerInfo.mapping | 6 +- .../realms/dto/RealmsNotification.mapping | 41 + .../client/realms/dto/RealmsServer.mapping | 2 +- .../realms/dto/RealmsServerPlayerList.mapping | 1 - .../client/realms/dto/RealmsText.mapping | 12 + .../exception/RealmsServiceException.mapping | 13 +- .../realms/gui/RealmsLoadingWidget.mapping | 5 + .../realms/gui/RealmsWorldSlotButton.mapping | 9 +- .../realms/gui/screen/BuyRealmsScreen.mapping | 38 + .../screen/DisconnectedRealmsScreen.mapping | 2 - .../screen/RealmsAcceptRejectButton.mapping | 12 +- .../gui/screen/RealmsBackupInfoScreen.mapping | 17 + .../gui/screen/RealmsBackupScreen.mapping | 49 +- .../screen/RealmsBrokenWorldScreen.mapping | 9 +- ...=> RealmsClientIncompatibleScreen.mapping} | 2 +- .../screen/RealmsConfigureWorldScreen.mapping | 54 +- .../screen/RealmsCreateRealmScreen.mapping | 11 +- .../RealmsDownloadLatestWorldScreen.mapping | 16 +- .../screen/RealmsGenericErrorScreen.mapping | 9 +- .../gui/screen/RealmsInviteScreen.mapping | 8 + .../RealmsLongConfirmationScreen.mapping | 4 +- .../RealmsLongRunningMcoTaskScreen.mapping | 13 - .../gui/screen/RealmsMainScreen.mapping | 378 ++++----- .../screen/RealmsNotificationsScreen.mapping | 46 +- .../screen/RealmsPendingInvitesScreen.mapping | 38 +- .../gui/screen/RealmsPlayerScreen.mapping | 64 +- .../RealmsResetNormalWorldScreen.mapping | 4 + .../gui/screen/RealmsResetWorldScreen.mapping | 42 - .../realms/gui/screen/RealmsScreen.mapping | 3 - .../RealmsSelectFileToUploadScreen.mapping | 13 +- .../RealmsSelectWorldTemplateScreen.mapping | 68 +- .../RealmsSubscriptionInfoScreen.mapping | 6 +- .../gui/screen/RealmsTermsScreen.mapping | 1 - .../gui/screen/RealmsUploadScreen.mapping | 20 +- .../realms/task/CloseServerTask.mapping | 1 + .../client/realms/task/DownloadTask.mapping | 1 + .../realms/task/LongRunningTask.mapping | 6 +- .../client/realms/task/OpenServerTask.mapping | 1 + .../task/RealmsGetServerDetailsTask.mapping | 1 + .../realms/task/ResettingWorldTask.mapping | 1 + .../client/realms/task/RestoreTask.mapping | 1 + .../realms/task/SwitchMinigameTask.mapping | 1 + .../client/realms/task/SwitchSlotTask.mapping | 1 + .../realms/task/WorldCreationTask.mapping | 1 + .../client/realms/util/Errable.mapping | 5 - .../client/realms/util/JsonUtils.mapping | 11 + .../realms/util/RealmsPersistence.mapping | 2 +- .../realms/util/RealmsServerFilterer.mapping | 5 +- .../realms/util/RealmsTextureManager.mapping | 35 +- .../client/realms/util/RealmsUtil.mapping | 21 +- .../client/realms/util/SkinProcessor.mapping | 16 - .../recipebook/ClientRecipeBook.mapping | 13 +- .../client/render/BufferBuilder.mapping | 74 +- .../client/render/BufferRenderer.mapping | 22 +- .../render/BufferVertexConsumer.mapping | 2 +- .../client/render/BuiltChunkStorage.mapping | 3 + .../minecraft/client/render/Camera.mapping | 17 +- .../client/render/ChunkBuilderMode.mapping | 2 +- .../render/ChunkRenderingDataPreparer.mapping | 35 + .../client/render/DiffuseLighting.mapping | 4 +- .../minecraft/client/render/Frustum.mapping | 33 +- .../client/render/GameRenderer.mapping | 432 +++++----- .../render/LightmapTextureManager.mapping | 3 + .../OutlineVertexConsumerProvider.mapping | 4 +- .../render/OverlayVertexConsumer.mapping | 12 +- .../client/render/RenderLayer.mapping | 55 +- .../client/render/RenderPhase.mapping | 116 +-- .../SpriteTexturedVertexConsumer.mapping | 4 +- .../client/render/Tessellator.mapping | 4 +- .../render/TexturedRenderLayers.mapping | 29 +- .../client/render/VertexConsumer.mapping | 4 +- .../client/render/VertexConsumers.mapping | 16 +- .../client/render/WorldRenderer.mapping | 180 ++-- .../client/render/block/BlockModels.mapping | 5 +- .../render/block/BlockRenderManager.mapping | 2 +- .../entity/BeaconBlockEntityRenderer.mapping | 4 +- .../BrushableBlockEntityRenderer.mapping | 7 + .../DecoratedPotBlockEntityRenderer.mapping | 29 + .../EndPortalBlockEntityRenderer.mapping | 4 +- .../HangingSignBlockEntityRenderer.mapping | 25 + .../entity/SignBlockEntityRenderer.mapping | 61 +- .../client/render/chunk/ChunkBuilder.mapping | 15 +- .../render/debug/BeeDebugRenderer.mapping | 165 ++-- .../debug/ChunkBorderDebugRenderer.mapping | 2 + .../client/render/debug/DebugRenderer.mapping | 136 ++-- .../debug/GameEventDebugRenderer.mapping | 33 +- .../debug/GameTestDebugRenderer.mapping | 11 +- .../debug/GoalSelectorDebugRenderer.mapping | 17 +- .../debug/HeightmapDebugRenderer.mapping | 2 +- .../render/debug/LightDebugRenderer.mapping | 75 ++ .../debug/PathfindingDebugRenderer.mapping | 38 +- .../debug/RaidCenterDebugRenderer.mapping | 16 +- .../debug/StructureDebugRenderer.mapping | 10 +- .../SupportingBlockDebugRenderer.mapping | 32 + .../render/debug/VillageDebugRenderer.mapping | 153 ++-- .../VillageSectionsDebugRenderer.mapping | 14 +- .../render/entity/BipedEntityRenderer.mapping | 1 - .../render/entity/BoatEntityRenderer.mapping | 2 +- .../render/entity/CamelEntityRenderer.mapping | 5 + .../entity/DisplayEntityRenderer.mapping | 25 + .../DragonFireballEntityRenderer.mapping | 2 +- .../entity/EnderDragonEntityRenderer.mapping | 28 +- .../entity/EntityRenderDispatcher.mapping | 23 +- .../entity/EntityRendererFactory.mapping | 1 + .../render/entity/EntityRenderers.mapping | 7 +- .../ExperienceOrbEntityRenderer.mapping | 2 +- .../FishingBobberEntityRenderer.mapping | 2 +- .../entity/GuardianEntityRenderer.mapping | 2 +- .../entity/LightningEntityRenderer.mapping | 2 +- .../render/entity/LlamaEntityRenderer.mapping | 5 +- .../render/entity/MobEntityRenderer.mapping | 2 +- .../entity/PaintingEntityRenderer.mapping | 2 +- .../entity/ParrotEntityRenderer.mapping | 8 +- .../entity/ProjectileEntityRenderer.mapping | 2 +- .../entity/RabbitEntityRenderer.mapping | 2 +- .../entity/ShulkerEntityRenderer.mapping | 4 + .../entity/SnifferEntityRenderer.mapping | 2 + .../entity/TropicalFishEntityRenderer.mapping | 2 + .../entity/animation/AnimationHelper.mapping | 23 +- .../entity/animation/CamelAnimations.mapping | 7 + .../animation/SnifferAnimations.mapping | 9 + .../entity/animation/Transformation.mapping | 15 +- .../feature/ArmorFeatureRenderer.mapping | 34 +- .../feature/HeldItemFeatureRenderer.mapping | 2 +- .../ShoulderParrotFeatureRenderer.mapping | 2 +- .../StuckStingersFeatureRenderer.mapping | 2 +- .../TropicalFishColorFeatureRenderer.mapping | 12 + .../VillagerClothingFeatureRenderer.mapping | 8 +- .../entity/model/ArmorEntityModel.mapping | 3 + .../entity/model/AxolotlEntityModel.mapping | 4 +- .../entity/model/BipedEntityModel.mapping | 2 +- .../entity/model/BoatEntityModel.mapping | 17 +- .../entity/model/CamelEntityModel.mapping | 20 + .../entity/model/ChestBoatEntityModel.mapping | 5 + .../entity/model/ChestRaftEntityModel.mapping | 5 + .../entity/model/EntityModelLayers.mapping | 6 + .../entity/model/EntityModelPartNames.mapping | 4 + .../render/entity/model/EntityModels.mapping | 2 + .../entity/model/FrogEntityModel.mapping | 3 + .../entity/model/ModelWithWaterPatch.mapping | 2 + .../entity/model/PiglinEntityModel.mapping | 3 + .../model/PiglinHeadEntityModel.mapping | 7 + .../entity/model/RaftEntityModel.mapping | 19 + .../model/SinglePartEntityModel.mapping | 9 + ...ePartEntityModelWithChildTransform.mapping | 10 + .../entity/model/SnifferEntityModel.mapping | 8 + .../entity/model/VexEntityModel.mapping | 24 +- .../item/BuiltinModelItemRenderer.mapping | 7 +- .../render/item/HeldItemRenderer.mapping | 8 +- .../client/render/item/ItemRenderer.mapping | 112 +-- .../render/model/BakedModelManager.mapping | 46 +- .../render/model/BakedQuadFactory.mapping | 12 +- .../client/render/model/Baker.mapping | 6 + .../client/render/model/ModelLoader.mapping | 56 +- .../client/render/model/ModelRotation.mapping | 2 + .../model/MultipartUnbakedModel.mapping | 4 +- .../render/model/SpriteAtlasManager.mapping | 29 +- .../client/render/model/UnbakedModel.mapping | 9 +- .../model/json/ItemModelGenerator.mapping | 12 +- .../model/json/JsonUnbakedModel.mapping | 24 +- .../render/model/json/ModelElement.mapping | 12 +- .../model/json/ModelOverrideList.mapping | 14 +- .../render/model/json/ModelRotation.mapping | 15 +- .../model/json/ModelTransformation.mapping | 10 +- .../json/ModelTransformationMode.mapping | 10 + .../render/model/json/ModelVariantMap.mapping | 3 + .../render/model/json/Transformation.mapping | 16 +- .../model/json/WeightedUnbakedModel.mapping | 2 + .../client/report/AbuseReport.mapping | 41 + .../client/report/AbuseReportContext.mapping | 22 + .../client/report/AbuseReportReason.mapping | 11 +- .../client/report/AbuseReportSender.mapping | 5 +- .../client/report/AbuseReportType.mapping | 5 + .../client/report/ChatAbuseReport.mapping | 108 +-- .../report/ContextMessageCollector.mapping | 28 + .../report/GroupedMessagesCollector.mapping | 12 - .../client/report/MessagesListAdder.mapping | 33 +- .../client/report/SkinAbuseReport.mapping | 16 + .../client/report/UsernameAbuseReport.mapping | 16 + .../client/report/log/ChatLog.mapping | 132 +-- .../client/report/log/ChatLogEntry.mapping | 9 + .../client/report/log/ChatLogImpl.mapping | 22 - .../client/report/log/HeaderEntry.mapping | 7 - .../client/report/log/ReceivedMessage.mapping | 17 +- .../DefaultClientResourcePack.mapping | 5 - .../DefaultClientResourcePackProvider.mapping | 15 + .../resource/DirectResourceIndex.mapping | 10 - .../resource/Format3ResourcePack.mapping | 14 - .../resource/Format4ResourcePack.mapping | 46 -- .../client/resource/ResourceIndex.mapping | 22 +- ...ing => ServerResourcePackProvider.mapping} | 24 +- .../SplashTextResourceSupplier.mapping | 2 +- .../language/LanguageDefinition.mapping | 17 +- .../resource/language/LanguageManager.mapping | 9 +- .../language/TranslationStorage.mapping | 3 +- .../AnimationResourceMetadata.mapping | 12 +- .../metadata/GuiResourceMetadata.mapping | 6 + .../metadata/LanguageResourceMetadata.mapping | 10 +- .../LanguageResourceMetadataReader.mapping | 2 - .../sound/AbstractSoundInstance.mapping | 2 + .../client/sound/AmbientSoundLoops.mapping | 1 + .../client/sound/AmbientSoundPlayer.mapping | 4 + .../sound/BiomeEffectSoundPlayer.mapping | 5 +- .../sound/GuardianAttackSoundInstance.mapping | 4 + .../client/sound/MusicTracker.mapping | 3 + .../minecraft/client/sound/MusicType.mapping | 4 +- .../sound/PositionedSoundInstance.mapping | 9 +- .../sound/SnifferDigSoundInstance.mapping | 4 + .../net/minecraft/client/sound/Sound.mapping | 1 + .../client/sound/SoundListener.mapping | 2 +- .../client/sound/SoundLoader.mapping | 6 +- .../client/sound/SoundManager.mapping | 24 +- .../client/sound/SoundSystem.mapping | 9 +- .../client/sound/WeightedSoundSet.mapping | 3 - .../minecraft/client/texture/Animator.mapping | 4 + .../client/texture/DynamicTexture.mapping | 4 + .../client/texture/GuiAtlasManager.mapping | 8 + .../client/texture/MipmapHelper.mapping | 7 +- .../client/texture/MissingSprite.mapping | 24 +- .../client/texture/NativeImage.mapping | 51 +- .../client/texture/PlayerSkinProvider.mapping | 71 +- .../minecraft/client/texture/Scaling.mapping | 35 + .../minecraft/client/texture/Sprite.mapping | 133 +-- .../client/texture/SpriteAtlasHolder.mapping | 20 +- .../client/texture/SpriteAtlasTexture.mapping | 63 +- .../client/texture/SpriteContents.mapping | 102 +++ .../client/texture/SpriteDimensions.mapping | 1 + .../client/texture/SpriteLoader.mapping | 57 ++ .../client/texture/SpriteOpener.mapping | 10 + .../client/texture/TextureManager.mapping | 7 + .../client/texture/TextureStitcher.mapping | 36 +- .../TextureStitcherCannotFitException.mapping | 2 +- .../client/texture/atlas/AtlasLoader.mapping | 15 + .../client/texture/atlas/AtlasSource.mapping | 19 + .../texture/atlas/AtlasSourceManager.mapping | 12 + .../texture/atlas/AtlasSourceType.mapping | 1 + .../atlas/DirectoryAtlasSource.mapping | 9 + .../texture/atlas/FilterAtlasSource.mapping | 5 + .../PalettedPermutationsAtlasSource.mapping | 32 + .../texture/atlas/SingleAtlasSource.mapping | 8 + .../client/texture/atlas/Sprite.mapping | 11 + .../texture/atlas/UnstitchAtlasSource.mapping | 38 + .../client/toast/AdvancementToast.mapping | 6 +- .../client/toast/RecipeToast.mapping | 11 +- .../client/toast/SystemToast.mapping | 10 +- .../net/minecraft/client/toast/Toast.mapping | 5 +- .../client/toast/ToastManager.mapping | 11 +- .../client/toast/TutorialToast.mapping | 22 +- .../minecraft/client/util/BanReason.mapping | 7 + .../client/{network => util}/Bans.mapping | 15 +- .../client/util/CommandHistoryManager.mapping | 12 + .../client/util/DefaultSkinHelper.mapping | 16 +- .../net/minecraft/client/util/Icons.mapping | 11 + .../minecraft/client/util/InputUtil.mapping | 1 + .../client/util/MacWindowUtil.mapping | 4 +- .../client/util/ModelIdentifier.mapping | 12 +- .../client/util/NarratorManager.mapping | 15 +- .../client/util/NetworkUtils.mapping | 2 + .../client/util/OrderableTooltip.mapping | 2 - .../client/util/ParticleUtil.mapping | 5 + .../net/minecraft/client/util/PngFile.mapping | 39 - .../minecraft/client/util/ProfileKeys.mapping | 68 +- .../client/util/ProfileKeysImpl.mapping | 43 + .../client/util/ScreenshotRecorder.mapping | 3 + .../net/minecraft/client/util/Session.mapping | 6 +- .../client/util/SkinTextures.mapping | 8 + .../client/util/SpriteIdentifier.mapping | 1 + .../net/minecraft/client/util/Window.mapping | 11 +- .../client/util/math/MatrixStack.mapping | 23 +- .../client/util/math/Vector3d.mapping | 18 - .../util/telemetry/GameLoadTimeEvent.mapping | 37 + .../telemetry/PerformanceMetricsEvent.mapping | 11 + .../client/util/telemetry/PropertyMap.mapping | 43 + .../client/util/telemetry/SampleEvent.mapping | 16 + .../util/telemetry/SentTelemetryEvent.mapping | 6 + .../util/telemetry/TelemetryConstants.mapping | 24 - .../telemetry/TelemetryEventProperty.mapping | 74 ++ .../util/telemetry/TelemetryEventType.mapping | 56 ++ .../telemetry/TelemetryLogManager.mapping | 15 + .../util/telemetry/TelemetryLogger.mapping | 3 + .../util/telemetry/TelemetryManager.mapping | 36 + .../util/telemetry/TelemetrySender.mapping | 56 +- .../util/telemetry/ThreadedLogWriter.mapping | 10 + .../telemetry/WorldLoadTimesEvent.mapping | 10 + .../util/telemetry/WorldLoadedEvent.mapping | 19 + .../util/telemetry/WorldSession.mapping | 29 + .../util/telemetry/WorldUnloadedEvent.mapping | 16 + .../client/world/BiomeColorCache.mapping | 3 + .../client/world/ClientChunkManager.mapping | 9 +- .../client/world/ClientWorld.mapping | 16 +- .../world/GeneratorOptionsHolder.mapping | 25 +- .../command/CommandRegistryAccess.mapping | 34 +- .../command/CommandRegistryWrapper.mapping | 37 - .../minecraft/command/CommandSource.mapping | 3 +- .../command/DataCommandStorage.mapping | 8 +- .../minecraft/command/EntitySelector.mapping | 11 +- .../command/EntitySelectorOptions.mapping | 13 +- .../command/EntitySelectorReader.mapping | 4 - .../command/FloatRangeArgument.mapping | 4 - .../argument/BlockArgumentParser.mapping | 16 +- .../argument/BlockPosArgumentType.mapping | 9 +- .../argument/DecoratableArgumentList.mapping | 17 - .../argument/DecoratableArgumentType.mapping | 8 - .../argument/EnchantmentArgumentType.mapping | 14 - .../argument/EntitySummonArgumentType.mapping | 13 - .../command/argument/EnumArgumentType.mapping | 2 + .../argument/GameModeArgumentType.mapping | 15 + .../argument/HeightmapArgumentType.mapping | 9 + .../argument/IdentifierArgumentType.mapping | 4 +- .../argument/MessageArgumentType.mapping | 39 +- .../argument/NbtPathArgumentType.mapping | 21 +- .../ParticleEffectArgumentType.mapping | 12 +- .../RegistryEntryArgumentType.mapping | 57 ++ ...RegistryEntryPredicateArgumentType.mapping | 48 ++ .../argument/RegistryKeyArgumentType.mapping | 14 +- .../argument/ScoreHolderArgumentType.mapping | 2 +- .../ScoreboardSlotArgumentType.mapping | 2 +- .../argument/SignedArgumentList.mapping | 13 + .../argument/SignedArgumentType.mapping | 2 - .../argument/StatusEffectArgumentType.mapping | 14 - .../command/argument/TimeArgumentType.mapping | 17 +- mappings/net/minecraft/data/DataCache.mapping | 72 +- .../net/minecraft/data/DataGenerator.mapping | 61 +- .../net/minecraft/data/DataOutput.mapping | 26 + .../net/minecraft/data/DataProvider.mapping | 13 +- mappings/net/minecraft/data/Main.mapping | 15 + .../minecraft/data/MetadataProvider.mapping | 18 + .../net/minecraft/data/SnbtProvider.mapping | 14 +- .../client/BlockStateModelGenerator.mapping | 120 ++- .../data/client/ItemModelGenerator.mapping | 29 + .../net/minecraft/data/client/Model.mapping | 20 +- .../minecraft/data/client/ModelIds.mapping | 4 + .../data/client/ModelProvider.mapping | 16 +- .../net/minecraft/data/client/Models.mapping | 3 + .../data/client/PropertiesMap.mapping | 2 + .../minecraft/data/client/TextureMap.mapping | 21 + .../data/client/TexturedModel.mapping | 4 + .../minecraft/data/dev/NbtProvider.mapping | 18 +- .../data/family/BlockFamilies.mapping | 3 + .../minecraft/data/family/BlockFamily.mapping | 12 +- .../data/report/BlockListProvider.mapping | 6 +- .../data/report/CommandSyntaxProvider.mapping | 10 +- .../report/DynamicRegistriesProvider.mapping | 28 + .../data/report/RegistryDumpProvider.mapping | 6 +- .../data/report/WorldgenProvider.mapping | 20 - .../data/server/AbstractTagProvider.mapping | 40 - .../data/server/AdvancementProvider.mapping | 8 - .../AdventureTabAdvancementGenerator.mapping | 19 - .../server/BannerPatternTagProvider.mapping | 3 - .../server/BarterLootTableGenerator.mapping | 3 - .../server/BiomeParametersProvider.mapping | 17 +- .../data/server/BiomeTagProvider.mapping | 7 - .../server/BlockLootTableGenerator.mapping | 309 ------- .../data/server/BlockTagProvider.mapping | 3 - .../data/server/CatVariantTagProvider.mapping | 3 - .../server/ChestLootTableGenerator.mapping | 3 - .../server/EndTabAdvancementGenerator.mapping | 3 - .../server/EntityLootTableGenerator.mapping | 17 - .../data/server/EntityTypeTagProvider.mapping | 3 - ...latLevelGeneratorPresetTagProvider.mapping | 3 - .../data/server/FluidTagProvider.mapping | 3 - .../data/server/GameEventTagProvider.mapping | 4 - .../server/GiftLootTableGenerator.mapping | 3 - .../data/server/InstrumentTagProvider.mapping | 3 - .../data/server/ItemTagProvider.mapping | 8 - .../data/server/LootTableProvider.mapping | 22 - .../NetherTabAdvancementGenerator.mapping | 5 - .../server/PaintingVariantTagProvider.mapping | 3 - .../PointOfInterestTypeTagProvider.mapping | 3 - .../data/server/RecipeProvider.mapping | 340 -------- .../StoryTabAdvancementGenerator.mapping | 3 - .../data/server/StructureTagProvider.mapping | 3 - .../server/WorldPresetTagProvider.mapping | 3 - .../advancement/AdvancementProvider.mapping | 12 + .../AdvancementTabGenerator.mapping | 4 + .../VanillaAdvancementProviders.mapping | 4 + ...laAdventureTabAdvancementGenerator.mapping | 37 + .../VanillaEndTabAdvancementGenerator.mapping | 1 + ...aHusbandryTabAdvancementGenerator.mapping} | 33 +- ...nillaNetherTabAdvancementGenerator.mapping | 2 + ...anillaStoryTabAdvancementGenerator.mapping | 1 + .../loottable/BlockLootTableGenerator.mapping | 153 ++++ .../EntityLootTableGenerator.mapping | 33 + .../loottable/LootTableGenerator.mapping | 3 + .../loottable/LootTableProvider.mapping | 23 + ...nillaArchaeologyLootTableGenerator.mapping | 1 + .../VanillaBarterLootTableGenerator.mapping | 1 + .../VanillaBlockLootTableGenerator.mapping | 480 +++++++++++ .../VanillaChestLootTableGenerator.mapping | 17 + .../VanillaEntityLootTableGenerator.mapping | 2 + .../VanillaFishingLootTableGenerator.mapping} | 5 +- .../VanillaGiftLootTableGenerator.mapping | 1 + .../vanilla/VanillaLootTableProviders.mapping | 3 + .../recipe/BundleRecipeProvider.mapping | 1 + .../recipe/ComplexRecipeJsonBuilder.mapping | 10 +- .../recipe/CookingRecipeJsonBuilder.mapping | 119 +-- .../recipe/CraftingRecipeJsonBuilder.mapping | 12 +- .../server/recipe/RecipeJsonBuilder.mapping | 7 + .../server/recipe/RecipeJsonProvider.mapping | 7 +- .../data/server/recipe/RecipeProvider.mapping | 339 ++++++++ .../recipe/ShapedRecipeJsonBuilder.mapping | 40 +- .../recipe/ShapelessRecipeJsonBuilder.mapping | 35 +- .../SingleItemRecipeJsonBuilder.mapping | 48 +- .../recipe/SmithingRecipeJsonBuilder.mapping | 42 - ...SmithingTransformRecipeJsonBuilder.mapping | 30 + .../SmithingTrimRecipeJsonBuilder.mapping | 27 + .../recipe/VanillaRecipeProvider.mapping | 13 + .../data/server/tag/ItemTagProvider.mapping | 25 + .../data/server/tag/TagProvider.mapping | 68 ++ .../server/tag/ValueLookupTagProvider.mapping | 22 + .../VanillaBannerPatternTagProvider.mapping | 4 + .../vanilla/VanillaBiomeTagProvider.mapping | 4 + .../vanilla/VanillaBlockTagProvider.mapping | 8 + .../VanillaCatVariantTagProvider.mapping | 4 + .../VanillaDamageTypeTagProvider.mapping | 4 + .../VanillaEntityTypeTagProvider.mapping | 6 + ...latLevelGeneratorPresetTagProvider.mapping | 4 + .../vanilla/VanillaFluidTagProvider.mapping | 6 + .../VanillaGameEventTagProvider.mapping | 7 + .../VanillaInstrumentTagProvider.mapping | 4 + .../vanilla/VanillaItemTagProvider.mapping | 1 + .../VanillaPaintingVariantTagProvider.mapping | 4 + ...illaPointOfInterestTypeTagProvider.mapping | 4 + .../VanillaStructureTagProvider.mapping | 4 + .../VanillaWorldPresetTagProvider.mapping | 4 + .../StructureValidatorProvider.mapping | 5 - .../minecraft/datafixer/DataFixTypes.mapping | 29 +- .../datafixer/DataFixerPhase.mapping | 1 - .../net/minecraft/datafixer/Schemas.mapping | 4 +- .../datafixer/TypeReferences.mapping | 10 +- .../fix/AddFlagIfNotPresentFix.mapping | 2 +- .../datafixer/fix/AddTrappedChestFix.mapping | 3 + .../fix/AdvancementCriteriaRenameFix.mapping | 2 +- .../datafixer/fix/AdvancementsFix.mapping | 3 + .../datafixer/fix/BedBlockEntityFix.mapping | 3 + .../datafixer/fix/BedItemColorFix.mapping | 3 + .../datafixer/fix/BiomeFormatFix.mapping | 3 + .../datafixer/fix/BiomeRenameFix.mapping | 8 - .../minecraft/datafixer/fix/BiomesFix.mapping | 2 - .../datafixer/fix/BlendingDataFix.mapping | 2 +- ...BlendingDataRemoveFromNetherEndFix.mapping | 2 +- .../fix/BlockEntityBannerColorFix.mapping | 3 + .../fix/BlockEntityBlockStateFix.mapping | 3 + .../BlockEntityCustomNameToTextFix.mapping | 3 + .../datafixer/fix/BlockEntityIdFix.mapping | 3 + .../fix/BlockEntityJukeboxFix.mapping | 3 + ...pping => BlockEntityKeepPackedFix.mapping} | 5 +- .../fix/BlockEntityShulkerBoxColorFix.mapping | 3 + .../BlockEntitySignTextStrictJsonFix.mapping | 3 + .../datafixer/fix/BlockNameFix.mapping | 4 +- .../fix/BlockNameFlatteningFix.mapping | 3 + .../BlockStateStructureTemplateFix.mapping | 3 + .../datafixer/fix/CatTypeFix.mapping | 3 + .../datafixer/fix/CauldronRenameFix.mapping | 3 + .../ChunkDeleteIgnoredLightDataFix.mapping | 2 +- .../datafixer/fix/ChunkDeleteLightFix.mapping | 3 + .../fix/ChunkHeightAndBiomeFix.mapping | 2 +- .../fix/ChunkLevelTagRenameFix.mapping | 2 +- .../datafixer/fix/ChunkLightRemoveFix.mapping | 3 + .../fix/ChunkPalettedStorageFix.mapping | 28 + .../datafixer/fix/ChunkStatusFix.mapping | 3 + .../datafixer/fix/ChunkStatusFix2.mapping | 3 + .../ChunkStructuresTemplateRenameFix.mapping | 4 + .../fix/ChunkToProtoChunkFix.mapping | 7 + .../fix/ColorlessShulkerEntityFix.mapping | 3 + .../fix/DecoratedPotFieldRenameFix.mapping | 4 + .../fix/DropInvalidSignDatafixDataFix.mapping | 16 + .../fix/EntityArmorStandSilentFix.mapping | 3 + .../datafixer/fix/EntityBlockStateFix.mapping | 2 +- ...ntityBrushableBlockFieldsRenameFix.mapping | 9 + .../datafixer/fix/EntityCatSplitFix.mapping | 3 + .../datafixer/fix/EntityCodSalmonFix.mapping | 3 + .../fix/EntityCustomNameToTextFix.mapping | 3 + .../fix/EntityElderGuardianSplitFix.mapping | 3 + .../EntityEquipmentToArmorAndHandFix.mapping | 3 + .../datafixer/fix/EntityHealthFix.mapping | 3 + .../fix/EntityHorseSaddleFix.mapping | 3 + .../datafixer/fix/EntityHorseSplitFix.mapping | 3 + .../datafixer/fix/EntityIdFix.mapping | 3 + .../fix/EntityItemFrameDirectionFix.mapping | 4 + .../fix/EntityMinecartIdentifiersFix.mapping | 3 + .../fix/EntityPaintingFieldsRenameFix.mapping | 2 +- .../fix/EntityPaintingMotiveFix.mapping | 3 + .../fix/EntityPufferfishRenameFix.mapping | 3 + .../fix/EntityRavagerRenameFix.mapping | 3 + .../fix/EntityRedundantChanceTagsFix.mapping | 8 + .../fix/EntityRidingToPassengerFix.mapping | 3 + .../fix/EntityShulkerColorFix.mapping | 3 + .../fix/EntitySkeletonSplitFix.mapping | 3 + .../datafixer/fix/EntityStringUuidFix.mapping | 3 + ...ng => EntityTheRenameningBlockFix.mapping} | 6 +- .../fix/EntityTippedArrowFix.mapping | 3 + .../datafixer/fix/EntityUuidFix.mapping | 1 + .../fix/EntityVariantTypeFix.mapping | 3 +- .../datafixer/fix/EntityWolfColorFix.mapping | 3 + .../fix/EntityZombieSplitFix.mapping | 3 + .../fix/EntityZombieVillagerTypeFix.mapping | 3 + .../datafixer/fix/FurnaceRecipesFix.mapping | 3 + .../datafixer/fix/GameEventRenamesFix.mapping | 15 +- .../datafixer/fix/GoatHornIdFix.mapping | 2 +- .../datafixer/fix/GoatMissingStateFix.mapping | 2 +- .../datafixer/fix/HangingEntityFix.mapping | 3 + .../fix/HeightmapRenamingFix.mapping | 3 + .../fix/IglooMetadataRemovalFix.mapping | 3 + .../datafixer/fix/ItemBannerColorFix.mapping | 3 + .../fix/ItemCustomNameToComponentFix.mapping | 3 + .../minecraft/datafixer/fix/ItemIdFix.mapping | 3 + .../fix/ItemInstanceMapIdFix.mapping | 3 + .../fix/ItemInstanceSpawnEggFix.mapping | 7 + .../fix/ItemInstanceTheFlatteningFix.mapping | 3 + .../datafixer/fix/ItemLoreToTextFix.mapping | 3 + .../datafixer/fix/ItemNbtFix.mapping | 2 +- .../datafixer/fix/ItemPotionFix.mapping | 3 + .../fix/ItemRemoveBlockEntityTagFix.mapping | 2 +- .../fix/ItemShulkerBoxColorFix.mapping | 3 + .../datafixer/fix/ItemSpawnEggFix.mapping | 3 + .../fix/ItemStackEnchantmentFix.mapping | 3 + .../datafixer/fix/ItemWaterPotionFix.mapping | 3 + .../ItemWrittenBookPagesStrictJsonFix.mapping | 3 + .../datafixer/fix/JigsawPropertiesFix.mapping | 3 + .../datafixer/fix/JigsawRotationFix.mapping | 3 + .../minecraft/datafixer/fix/LeavesFix.mapping | 28 + .../fix/LegacyDragonFightFix.mapping | 7 + .../fix/LevelDataGeneratorOptionsFix.mapping | 3 + .../fix/LevelFlatGeneratorInfoFix.mapping | 3 + .../minecraft/datafixer/fix/MapIdFix.mapping | 3 + .../datafixer/fix/MissingDimensionFix.mapping | 3 + .../MobSpawnerEntityIdentifiersFix.mapping | 3 + .../datafixer/fix/NewVillageFix.mapping | 3 + .../fix/ObjectiveDisplayNameFix.mapping | 3 + .../fix/ObjectiveRenderTypeFix.mapping | 9 +- .../OminousBannerBlockEntityRenameFix.mapping | 3 + .../fix/OminousBannerItemRenameFix.mapping | 2 +- .../OptionsAccessibilityOnboardFix.mapping | 7 + .../fix/OptionsAddTextBackgroundFix.mapping | 3 + .../fix/OptionsAmbientOcclusionFix.mapping | 5 + .../datafixer/fix/OptionsForceVBOFix.mapping | 3 + .../datafixer/fix/OptionsKeyLwjgl3Fix.mapping | 4 + .../fix/OptionsKeyTranslationFix.mapping | 3 + .../fix/OptionsLowerCaseLanguageFix.mapping | 3 + .../fix/OptionsProgrammerArtFix.mapping | 11 + .../fix/PersistentStateUuidFix.mapping | 1 + .../datafixer/fix/PointOfInterestFix.mapping | 2 +- .../fix/PointOfInterestRemoveFix.mapping | 2 +- .../fix/PointOfInterestRenameFix.mapping | 2 +- .../PointOfInterestReorganizationFix.mapping | 3 + .../fix/ProtoChunkTickListFix.mapping | 2 +- .../fix/RandomSequenceSettingsFix.mapping | 9 + .../minecraft/datafixer/fix/RecipeFix.mapping | 2 - .../datafixer/fix/RecipeRenameFix.mapping | 8 - .../datafixer/fix/RecipeRenamingFix.mapping | 2 - .../fix/RemoveFeatureTogglesFix.mapping | 15 + .../fix/RemoveFilteredBookTextFix.mapping | 2 +- .../fix/RemoveFilteredSignTextFix.mapping | 2 +- .../fix/RemoveGolemGossipFix.mapping | 3 + .../fix/RemovePoiValidTagFix.mapping | 3 + .../fix/RenameBlockEntityFix.mapping | 15 + .../fix/RenameChunkStatusFix.mapping | 13 + .../RenameScoreboardDisplaySlotFix.mapping | 6 + .../datafixer/fix/RenameVariantsFix.mapping | 2 +- .../fix/SavedDataVillageCropFix.mapping | 9 - .../datafixer/fix/StatsCounterFix.mapping | 15 +- .../fix/StatusEffectDurationFix.mapping | 7 + .../datafixer/fix/StatusEffectFix.mapping | 39 + .../datafixer/fix/StriderGravityFix.mapping | 3 + .../fix/StructureReferenceFix.mapping | 3 + .../fix/StructureSettingsFlattenFix.mapping | 2 +- ...tructuresToConfiguredStructuresFix.mapping | 2 +- .../datafixer/fix/TeamDisplayNameFix.mapping | 3 + .../fix/TicksInWrongChunkFix.mapping | 10 +- .../datafixer/fix/UntaggedSpawnerFix.mapping | 5 +- .../fix/UpdateSignTextFormatFix.mapping | 24 + .../fix/VillagerFollowRangeFix.mapping | 2 + .../datafixer/fix/VillagerTradeFix.mapping | 3 + .../fix/VillagerXpRebuildFix.mapping | 5 + .../datafixer/fix/WallPropertyFix.mapping | 3 + .../fix/WeaponsmithChestLootTableFix.mapping | 3 + ...SettingsDisallowOldCustomWorldsFix.mapping | 2 +- .../WorldGenSettingsHeightAndBiomeFix.mapping | 2 +- .../datafixer/fix/WorldUuidFix.mapping | 1 + .../fix/ZombieVillagerXpRebuildFix.mapping | 3 + .../mapping/FlatteningBiomeMapping.mapping | 2 + .../mapping/FlatteningRecipeMapping.mapping | 2 + .../mapping/WoodRecipeMapping.mapping | 2 + .../IdentifierNormalizingSchema.mapping | 10 + .../datafixer/schema/Schema100.mapping | 12 + .../datafixer/schema/Schema102.mapping | 1 + .../datafixer/schema/Schema1022.mapping | 1 + .../datafixer/schema/Schema106.mapping | 1 + .../datafixer/schema/Schema107.mapping | 2 + .../datafixer/schema/Schema1125.mapping | 3 + .../datafixer/schema/Schema135.mapping | 1 + .../datafixer/schema/Schema143.mapping | 2 + .../datafixer/schema/Schema1451.mapping | 2 + .../datafixer/schema/Schema1451v1.mapping | 1 + .../datafixer/schema/Schema1451v2.mapping | 4 + .../datafixer/schema/Schema1451v3.mapping | 4 + .../datafixer/schema/Schema1451v4.mapping | 1 + .../datafixer/schema/Schema1451v5.mapping | 2 + .../datafixer/schema/Schema1451v6.mapping | 20 + .../datafixer/schema/Schema1451v7.mapping | 4 - .../datafixer/schema/Schema1460.mapping | 63 ++ .../datafixer/schema/Schema1466.mapping | 3 + .../datafixer/schema/Schema1470.mapping | 8 + .../datafixer/schema/Schema1481.mapping | 2 + .../datafixer/schema/Schema1483.mapping | 2 + .../datafixer/schema/Schema1486.mapping | 2 + .../datafixer/schema/Schema1510.mapping | 2 + .../datafixer/schema/Schema1800.mapping | 6 +- .../datafixer/schema/Schema1801.mapping | 2 + .../datafixer/schema/Schema1904.mapping | 2 + .../datafixer/schema/Schema1906.mapping | 8 + .../datafixer/schema/Schema1909.mapping | 2 + .../datafixer/schema/Schema1920.mapping | 6 + .../datafixer/schema/Schema1928.mapping | 5 + .../datafixer/schema/Schema1929.mapping | 6 + .../datafixer/schema/Schema1931.mapping | 2 + .../datafixer/schema/Schema2100.mapping | 2 + .../datafixer/schema/Schema2502.mapping | 4 - .../datafixer/schema/Schema2505.mapping | 4 - .../datafixer/schema/Schema2509.mapping | 4 - .../datafixer/schema/Schema2519.mapping | 4 - .../datafixer/schema/Schema2522.mapping | 4 - .../datafixer/schema/Schema2568.mapping | 4 - .../datafixer/schema/Schema2571.mapping | 4 - .../datafixer/schema/Schema2684.mapping | 4 + .../datafixer/schema/Schema2686.mapping | 4 - .../datafixer/schema/Schema2688.mapping | 4 - .../datafixer/schema/Schema2704.mapping | 4 - .../datafixer/schema/Schema2707.mapping | 4 - .../datafixer/schema/Schema2831.mapping | 4 + .../datafixer/schema/Schema2832.mapping | 4 + .../datafixer/schema/Schema2842.mapping | 4 + .../datafixer/schema/Schema3076.mapping | 2 + .../datafixer/schema/Schema3078.mapping | 8 + .../datafixer/schema/Schema3081.mapping | 4 - .../datafixer/schema/Schema3083.mapping | 6 + .../datafixer/schema/Schema3202.mapping | 3 + .../datafixer/schema/Schema3203.mapping | 3 + .../datafixer/schema/Schema3204.mapping | 3 + .../datafixer/schema/Schema3325.mapping | 3 + .../datafixer/schema/Schema3326.mapping | 3 + .../datafixer/schema/Schema3327.mapping | 3 + .../datafixer/schema/Schema3328.mapping | 3 + .../datafixer/schema/Schema3438.mapping | 3 + .../datafixer/schema/Schema3448.mapping | 3 + .../datafixer/schema/Schema501.mapping | 4 +- .../datafixer/schema/Schema700.mapping | 4 +- .../datafixer/schema/Schema701.mapping | 4 + .../datafixer/schema/Schema702.mapping | 4 + .../datafixer/schema/Schema703.mapping | 2 + .../datafixer/schema/Schema704.mapping | 18 + .../datafixer/schema/Schema705.mapping | 55 ++ .../datafixer/schema/Schema808.mapping | 4 + .../datafixer/schema/Schema99.mapping | 63 ++ .../minecraft/enchantment/Enchantment.mapping | 8 +- .../enchantment/EnchantmentHelper.mapping | 3 + .../minecraft/entity/AnimationState.mapping | 3 + .../entity/AreaEffectCloudEntity.mapping | 2 +- .../net/minecraft/entity/Attackable.mapping | 2 + .../net/minecraft/entity/CrossbowUser.mapping | 2 +- mappings/net/minecraft/entity/Entity.mapping | 257 ++++-- .../minecraft/entity/EntityStatuses.mapping | 7 +- .../net/minecraft/entity/EntityType.mapping | 64 +- .../minecraft/entity/EquipmentSlot.mapping | 43 + .../entity/ExperienceOrbEntity.mapping | 1 + .../minecraft/entity/EyeOfEnderEntity.mapping | 2 - .../entity/FallingBlockEntity.mapping | 2 + .../minecraft/entity/InventoryOwner.mapping | 5 + .../net/minecraft/entity/ItemEntity.mapping | 20 +- .../minecraft/entity/ItemSteerable.mapping | 7 - .../net/minecraft/entity/JumpingMount.mapping | 1 + .../net/minecraft/entity/LimbAnimator.mapping | 16 + .../net/minecraft/entity/LivingEntity.mapping | 70 +- mappings/net/minecraft/entity/Ownable.mapping | 2 + .../net/minecraft/entity/Saddleable.mapping | 1 + .../minecraft/entity/SaddledComponent.mapping | 4 +- .../net/minecraft/entity/Tameable.mapping | 2 +- .../net/minecraft/entity/Targeter.mapping | 2 + .../net/minecraft/entity/TntEntity.mapping | 1 - .../minecraft/entity/VariantHolder.mapping | 4 + .../entity/ai/RangedAttackMob.mapping | 2 +- .../ai/brain/BlockPosLookTarget.mapping | 2 + .../minecraft/entity/ai/brain/Brain.mapping | 53 +- .../minecraft/entity/ai/brain/Memory.mapping | 7 + .../entity/ai/brain/MemoryQuery.mapping | 24 + .../entity/ai/brain/MemoryQueryResult.mapping | 27 + .../entity/ai/brain/Schedule.mapping | 4 + .../entity/ai/brain/ScheduleBuilder.mapping | 2 + .../entity/ai/brain/ScheduleRule.mapping | 2 + .../sensor/WardenAttackablesSensor.mapping | 6 +- .../ai/brain/task/AdmireItemTask.mapping | 16 +- .../task/AdmireItemTimeLimitTask.mapping | 17 +- .../ai/brain/task/AquaticStrollTask.mapping | 2 - .../entity/ai/brain/task/AttackTask.mapping | 25 +- .../ai/brain/task/BiasedLongJumpTask.mapping | 5 +- .../ai/brain/task/CompositeTask.mapping | 36 +- .../ai/brain/task/ConditionalTask.mapping | 22 - .../ai/brain/task/DefeatTargetTask.mapping | 21 +- .../entity/ai/brain/task/EndRaidTask.mapping | 7 + .../ai/brain/task/FindEntityTask.mapping | 62 +- .../task/FindInteractionTargetTask.mapping | 33 +- .../task/FindPointOfInterestTask.mapping | 55 +- .../ai/brain/task/FindRoarTargetTask.mapping | 17 +- .../ai/brain/task/FindWalkTargetTask.mapping | 36 +- .../{WalkTask.mapping => FleeTask.mapping} | 13 +- .../ai/brain/task/FollowMobTask.mapping | 26 - .../task/ForgetAngryAtTargetTask.mapping | 17 +- .../brain/task/ForgetAttackTargetTask.mapping | 53 +- .../ai/brain/task/ForgetBellRingTask.mapping | 18 +- ...ForgetCompletedPointOfInterestTask.mapping | 25 +- .../entity/ai/brain/task/ForgetTask.mapping | 16 +- .../task/GatherItemsVillagerTask.mapping | 4 + .../ai/brain/task/GiveGiftsToHeroTask.mapping | 2 + .../GiveInventoryToLookTargetTask.mapping | 5 +- .../ai/brain/task/GoToCelebrateTask.mapping | 15 - .../ai/brain/task/GoToIfNearbyTask.mapping | 25 +- .../brain/task/GoToNearbyPositionTask.mapping | 26 +- .../task/GoToPointOfInterestTask.mapping | 18 +- .../task/GoToRememberedPositionTask.mapping | 41 +- .../task/GoToSecondaryPositionTask.mapping | 29 +- .../entity/ai/brain/task/GoToWorkTask.mapping | 22 +- .../ai/brain/task/GoTowardsLookTarget.mapping | 15 - .../task/GoTowardsLookTargetTask.mapping | 21 + .../task/HideInHomeDuringRaidTask.mapping | 4 - .../ai/brain/task/HideInHomeTask.mapping | 42 +- .../brain/task/HideWhenBellRingsTask.mapping | 9 + .../ai/brain/task/HuntFinishTask.mapping | 12 +- .../ai/brain/task/HuntHoglinTask.mapping | 18 + .../ai/brain/task/LayFrogSpawnTask.mapping | 17 +- .../entity/ai/brain/task/LongJumpTask.mapping | 18 +- .../brain/task/LookAtDisturbanceTask.mapping | 12 + .../ai/brain/task/LookAtMobTask.mapping | 29 + .../task/LookAtMobWithIntervalTask.mapping | 34 + .../ai/brain/task/LookTargetUtil.mapping | 5 - .../brain/task/LoseJobOnSiteLossTask.mapping | 9 + .../ai/brain/task/MeetVillagerTask.mapping | 19 + .../ai/brain/task/MeleeAttackTask.mapping | 20 +- .../ai/brain/task/MemoryTransferTask.mapping | 23 +- .../ai/brain/task/MultiTickTask.mapping | 52 ++ .../ai/brain/task/NoPenaltyStrollTask.mapping | 1 - .../ai/brain/task/OpenDoorsTask.mapping | 55 +- .../entity/ai/brain/task/PacifyTask.mapping | 17 +- .../ai/brain/task/PlayDeadTimerTask.mapping | 10 + .../task/PlayWithVillagerBabiesTask.mapping | 59 +- .../ai/brain/task/PrepareRamTask.mapping | 4 +- .../brain/task/RandomLookAroundTask.mapping | 10 + .../ai/brain/task/RangedApproachTask.mapping | 25 +- .../brain/task/RemoveOffHandItemTask.mapping | 9 + .../entity/ai/brain/task/RidingTask.mapping | 23 +- .../entity/ai/brain/task/RingBellTask.mapping | 9 + .../brain/task/RunAroundAfterRaidTask.mapping | 1 - .../brain/task/ScheduleActivityTask.mapping | 7 + .../task/SeekSkyAfterRaidWinTask.mapping | 1 - .../entity/ai/brain/task/SeekSkyTask.mapping | 21 +- .../ai/brain/task/SeekWaterTask.mapping | 19 +- .../ai/brain/task/SingleTickTask.mapping | 2 + .../ai/brain/task/StartRaidTask.mapping | 7 + .../ai/brain/task/StartRidingTask.mapping | 19 +- .../ai/brain/task/StartSniffingTask.mapping | 13 + .../ai/brain/task/StopPanickingTask.mapping | 15 +- .../entity/ai/brain/task/StrollTask.mapping | 72 +- .../ai/brain/task/TakeJobSiteTask.mapping | 43 +- .../entity/ai/brain/task/Task.mapping | 42 +- .../entity/ai/brain/task/TaskRunnable.mapping | 9 + .../ai/brain/task/TaskTriggerer.mapping | 161 ++++ .../entity/ai/brain/task/Tasks.mapping | 22 + .../entity/ai/brain/task/TemptTask.mapping | 8 + .../ai/brain/task/TimeLimitedTask.mapping | 15 - .../brain/task/UpdateAttackTargetTask.mapping | 32 +- .../task/VillagerTaskListProvider.mapping | 14 + .../task/VillagerWalkTowardsTask.mapping | 45 +- .../entity/ai/brain/task/WaitTask.mapping | 4 + .../entity/ai/brain/task/WakeUpTask.mapping | 7 + .../entity/ai/brain/task/WalkHomeTask.mapping | 27 +- ...WalkToNearestVisibleWantedItemTask.mapping | 34 +- .../task/WalkTowardClosestAdultTask.mapping | 28 +- .../brain/task/WalkTowardJobSiteTask.mapping | 2 + .../ai/brain/task/WalkTowardsLandTask.mapping | 19 +- .../task/WalkTowardsLookTargetTask.mapping | 18 +- .../ai/brain/task/WalkTowardsPosTask.mapping | 21 + .../brain/task/WalkTowardsWaterTask.mapping | 19 +- .../ai/brain/task/WanderAroundTask.mapping | 2 + .../ai/brain/task/WanderIndoorsTask.mapping | 21 +- .../ai/brain/task/WantNewItemTask.mapping | 14 +- .../task/WorkStationCompetitionTask.mapping | 33 +- .../entity/ai/control/LookControl.mapping | 2 + .../entity/ai/goal/AmbientStandGoal.mapping | 8 + .../entity/ai/goal/FollowOwnerGoal.mapping | 1 + .../entity/ai/goal/GoalSelector.mapping | 5 +- .../entity/ai/goal/MeleeAttackGoal.mapping | 5 +- .../ai/goal/StepAndDestroyBlockGoal.mapping | 1 - .../pathing/AmphibiousSwimNavigation.mapping | 3 + .../ai/pathing/BirdPathNodeMaker.mapping | 11 + .../ai/pathing/EntityNavigation.mapping | 6 +- .../ai/pathing/LandPathNodeMaker.mapping | 40 +- .../entity/ai/pathing/MobNavigation.mapping | 2 + .../minecraft/entity/ai/pathing/Path.mapping | 32 +- .../entity/ai/pathing/PathNode.mapping | 9 +- .../entity/ai/pathing/PathNodeMaker.mapping | 11 +- .../ai/pathing/WaterPathNodeMaker.mapping | 11 + .../attribute/AttributeContainer.mapping | 14 +- .../AttributeModifierCreator.mapping | 4 + .../DefaultAttributeContainer.mapping | 2 +- .../attribute/EntityAttributeInstance.mapping | 2 +- .../attribute/EntityAttributeModifier.mapping | 7 +- .../entity/attribute/EntityAttributes.mapping | 1 + .../boss/dragon/EnderDragonEntity.mapping | 8 +- .../boss/dragon/EnderDragonFight.mapping | 25 +- .../BadRespawnPointDamageSource.mapping | 3 - .../entity/damage/DamageEffects.mapping | 8 + .../entity/damage/DamageRecord.mapping | 29 +- .../entity/damage/DamageScaling.mapping | 5 + .../entity/damage/DamageSource.mapping | 138 +--- .../entity/damage/DamageSources.mapping | 108 +++ .../entity/damage/DamageTracker.mapping | 31 +- .../entity/damage/DamageType.mapping | 20 + .../entity/damage/DamageTypes.mapping | 47 ++ .../entity/damage/DeathMessageType.mapping | 5 + .../entity/damage/EntityDamageSource.mapping | 8 - .../entity/damage/FallLocation.mapping | 6 + .../damage/ProjectileDamageSource.mapping | 6 - .../minecraft/entity/data/DataTracker.mapping | 44 +- .../data/TrackedDataHandlerRegistry.mapping | 7 +- .../AbstractDecorationEntity.mapping | 1 + .../entity/decoration/Brightness.mapping | 9 + .../entity/decoration/DisplayEntity.mapping | 251 ++++++ .../decoration/InteractionEntity.mapping | 29 + .../painting/PaintingEntity.mapping | 9 +- .../entity/effect/BadOmenStatusEffect.mapping | 1 + .../effect/DamageModifierStatusEffect.mapping | 6 - .../effect/HealthBoostStatusEffect.mapping | 1 - .../entity/effect/HungerStatusEffect.mapping | 1 + .../InstantHealthOrDamageStatusEffect.mapping | 6 + .../entity/effect/PoisonStatusEffect.mapping | 1 + .../effect/RegenerationStatusEffect.mapping | 1 + .../effect/SaturationStatusEffect.mapping | 1 + .../entity/effect/StatusEffect.mapping | 35 +- .../effect/StatusEffectInstance.mapping | 34 +- .../entity/effect/StatusEffectUtil.mapping | 2 +- .../entity/effect/StatusEffects.mapping | 7 +- .../entity/effect/WitherStatusEffect.mapping | 1 + .../entity/mob/AbstractPiglinEntity.mapping | 1 + .../entity/mob/CreeperEntity.mapping | 2 +- .../entity/mob/EndermanEntity.mapping | 1 + .../entity/mob/EvokerFangsEntity.mapping | 1 - .../entity/mob/GuardianEntity.mapping | 1 + .../minecraft/entity/mob/HoglinBrain.mapping | 7 +- .../entity/mob/IllusionerEntity.mapping | 4 + .../minecraft/entity/mob/MobEntity.mapping | 27 +- .../entity/mob/PathAwareEntity.mapping | 3 + .../entity/mob/PhantomEntity.mapping | 2 + .../minecraft/entity/mob/PiglinBrain.mapping | 25 +- .../entity/mob/PiglinBruteBrain.mapping | 2 + .../entity/mob/PillagerEntity.mapping | 1 + .../entity/mob/RavagerEntity.mapping | 8 +- .../entity/mob/ShulkerEntity.mapping | 8 +- .../entity/mob/SkeletonEntity.mapping | 1 + .../mob/SpellcastingIllagerEntity.mapping | 3 + .../minecraft/entity/mob/VexEntity.mapping | 1 - .../entity/mob/VindicatorEntity.mapping | 3 - .../minecraft/entity/mob/WardenBrain.mapping | 13 +- .../minecraft/entity/mob/WardenEntity.mapping | 11 + .../minecraft/entity/mob/ZoglinEntity.mapping | 6 + .../entity/mob/ZombieVillagerEntity.mapping | 4 + .../entity/mob/ZombifiedPiglinEntity.mapping | 2 + .../passive/AbstractDonkeyEntity.mapping | 3 + .../passive/AbstractHorseEntity.mapping | 57 +- .../entity/passive/AllayBrain.mapping | 9 +- .../entity/passive/AllayEntity.mapping | 15 +- .../entity/passive/AnimalEntity.mapping | 6 + .../entity/passive/AxolotlBrain.mapping | 2 +- .../entity/passive/AxolotlEntity.mapping | 10 +- .../passive/AxolotlSwimNavigation.mapping | 3 - .../entity/passive/CamelBrain.mapping | 28 + .../entity/passive/CamelEntity.mapping | 38 + .../entity/passive/CatEntity.mapping | 3 - .../entity/passive/CatVariant.mapping | 9 +- .../entity/passive/FoxEntity.mapping | 9 +- .../entity/passive/FrogBrain.mapping | 7 +- .../entity/passive/FrogEntity.mapping | 5 - .../entity/passive/HorseColor.mapping | 17 +- .../entity/passive/HorseEntity.mapping | 7 +- .../entity/passive/HorseMarking.mapping | 8 +- .../entity/passive/LlamaEntity.mapping | 19 +- .../entity/passive/MooshroomEntity.mapping | 12 +- .../entity/passive/PandaEntity.mapping | 4 +- .../entity/passive/ParrotEntity.mapping | 15 +- .../entity/passive/PigEntity.mapping | 1 - .../entity/passive/RabbitEntity.mapping | 36 +- .../passive/SchoolingFishEntity.mapping | 4 +- .../entity/passive/SheepEntity.mapping | 8 +- .../entity/passive/SnifferBrain.mapping | 47 ++ .../entity/passive/SnifferEntity.mapping | 39 + .../entity/passive/SnowGolemEntity.mapping | 2 +- .../entity/passive/StriderEntity.mapping | 8 +- .../entity/passive/TadpoleBrain.mapping | 2 + .../entity/passive/TropicalFishEntity.mapping | 77 +- .../entity/passive/VillagerEntity.mapping | 8 +- .../passive/WanderingTraderEntity.mapping | 1 + .../entity/player/PlayerEntity.mapping | 27 +- .../projectile/AbstractFireballEntity.mapping | 2 - .../projectile/FishingBobberEntity.mapping | 1 + .../projectile/ProjectileEntity.mapping | 1 - .../entity/projectile/ProjectileUtil.mapping | 17 +- .../projectile/ShulkerBulletEntity.mapping | 1 + .../projectile/thrown/PotionEntity.mapping | 4 +- .../thrown/ThrownItemEntity.mapping | 2 - .../vehicle/AbstractMinecartEntity.mapping | 17 +- .../entity/vehicle/BoatEntity.mapping | 11 +- .../vehicle/HopperMinecartEntity.mapping | 6 - .../entity/vehicle/TntMinecartEntity.mapping | 7 +- .../entity/vehicle/VehicleInventory.mapping | 5 +- .../net/minecraft/fluid/FlowableFluid.mapping | 31 +- .../net/minecraft/fluid/FluidState.mapping | 2 +- .../net/minecraft/fluid/LavaFluid.mapping | 1 + .../inventory/CraftingInventory.mapping | 8 +- .../inventory/CraftingResultInventory.mapping | 3 +- .../inventory/DoubleInventory.mapping | 6 + .../inventory/EnderChestInventory.mapping | 6 + .../minecraft/inventory/Inventories.mapping | 48 ++ .../net/minecraft/inventory/Inventory.mapping | 143 +++- .../InventoryChangedListener.mapping | 4 + .../inventory/RecipeInputInventory.mapping | 9 + .../inventory/SidedInventory.mapping | 8 +- .../inventory/SimpleInventory.mapping | 41 +- .../inventory/SingleStackInventory.mapping | 11 + mappings/net/minecraft/item/ArmorItem.mapping | 22 +- .../net/minecraft/item/ArmorMaterial.mapping | 44 +- .../net/minecraft/item/ArmorMaterials.mapping | 23 +- .../net/minecraft/item/ArmorStandItem.mapping | 3 - .../net/minecraft/item/BannerItem.mapping | 4 + mappings/net/minecraft/item/BowItem.mapping | 1 + mappings/net/minecraft/item/BrushItem.mapping | 19 + .../net/minecraft/item/BundleItem.mapping | 1 + .../minecraft/item/CommandBlockItem.mapping | 1 - .../net/minecraft/item/CrossbowItem.mapping | 5 +- .../net/minecraft/item/DecorationItem.mapping | 5 + mappings/net/minecraft/item/DyeItem.mapping | 2 + mappings/net/minecraft/item/Equipment.mapping | 13 + .../net/minecraft/item/FilledMapItem.mapping | 4 +- .../minecraft/item/FireworkRocketItem.mapping | 9 +- .../net/minecraft/item/GlowInkSacItem.mapping | 3 + .../net/minecraft/item/GoatHornItem.mapping | 4 + .../minecraft/item/HangingSignItem.mapping | 5 + .../net/minecraft/item/InkSacItem.mapping | 3 + .../net/minecraft/item/Instrument.mapping | 2 + mappings/net/minecraft/item/Item.mapping | 38 +- mappings/net/minecraft/item/ItemGroup.mapping | 147 +++- .../net/minecraft/item/ItemGroups.mapping | 155 ++++ mappings/net/minecraft/item/ItemStack.mapping | 36 +- .../net/minecraft/item/ItemStackSet.mapping | 11 + .../minecraft/item/ItemUsageContext.mapping | 6 +- mappings/net/minecraft/item/Items.mapping | 57 +- .../item/OperatorOnlyBlockItem.mapping | 1 + .../net/minecraft/item/ShieldItem.mapping | 1 + .../minecraft/item/SignChangingItem.mapping | 9 + mappings/net/minecraft/item/SignItem.mapping | 5 + mappings/net/minecraft/item/SkullItem.mapping | 6 +- .../item/SmithingTemplateItem.mapping | 58 ++ .../minecraft/item/SuspiciousStewItem.mapping | 16 +- .../net/minecraft/item/TridentItem.mapping | 1 + .../VerticallyAttachableBlockItem.mapping | 17 + .../item/WallStandingBlockItem.mapping | 6 - mappings/net/minecraft/item/Wearable.mapping | 4 - .../minecraft/item/WrittenBookItem.mapping | 6 +- .../net/minecraft/item/map/MapIcon.mapping | 36 +- .../net/minecraft/item/map/MapState.mapping | 5 +- .../net/minecraft/item/trim/ArmorTrim.mapping | 49 ++ .../item/trim/ArmorTrimMaterial.mapping | 11 + .../item/trim/ArmorTrimMaterials.mapping | 23 + .../item/trim/ArmorTrimPattern.mapping | 7 + .../item/trim/ArmorTrimPatterns.mapping | 14 + .../net/minecraft/loot/AndFunction.mapping | 11 + .../net/minecraft/loot/LootDataKey.mapping | 3 + .../net/minecraft/loot/LootDataLookup.mapping | 13 + .../net/minecraft/loot/LootDataType.mapping | 33 + mappings/net/minecraft/loot/LootGsons.mapping | 4 - .../net/minecraft/loot/LootManager.mapping | 59 +- mappings/net/minecraft/loot/LootPool.mapping | 24 +- mappings/net/minecraft/loot/LootTable.mapping | 58 +- .../minecraft/loot/LootTableReporter.mapping | 39 +- .../loot/condition/AllOfLootCondition.mapping | 9 + .../AlternativeLootCondition.mapping | 22 +- .../loot/condition/AnyOfLootCondition.mapping | 7 + .../BlockStatePropertyLootCondition.mapping | 23 +- ...amageSourcePropertiesLootCondition.mapping | 7 +- .../EntityPropertiesLootCondition.mapping | 11 +- .../EntityScoresLootCondition.mapping | 10 +- .../condition/InvertedLootCondition.mapping | 5 +- .../KilledByPlayerLootCondition.mapping | 2 +- .../LocationCheckLootCondition.mapping | 12 +- .../loot/condition/LootCondition.mapping | 7 +- .../condition/LootConditionManager.mapping | 25 - .../loot/condition/LootConditionTypes.mapping | 24 +- .../condition/MatchToolLootCondition.mapping | 7 +- .../RandomChanceLootCondition.mapping | 5 +- ...ndomChanceWithLootingLootCondition.mapping | 8 +- .../condition/ReferenceLootCondition.mapping | 7 +- .../SurvivesExplosionLootCondition.mapping | 2 +- .../condition/TableBonusLootCondition.mapping | 11 +- .../condition/TimeCheckLootCondition.mapping | 13 +- .../condition/ValueCheckLootCondition.mapping | 8 +- .../WeatherCheckLootCondition.mapping | 19 +- .../loot/context/LootContext.mapping | 93 +-- .../context/LootContextParameterSet.mapping | 51 ++ .../loot/context/LootContextTypes.mapping | 13 +- .../loot/entry/AlternativeEntry.mapping | 5 +- .../loot/entry/CombinedEntry.mapping | 14 +- .../minecraft/loot/entry/DynamicEntry.mapping | 6 +- .../minecraft/loot/entry/EmptyEntry.mapping | 7 +- .../minecraft/loot/entry/GroupEntry.mapping | 5 +- .../minecraft/loot/entry/ItemEntry.mapping | 8 +- .../minecraft/loot/entry/LeafEntry.mapping | 18 +- .../loot/entry/LootPoolEntry.mapping | 17 +- .../loot/entry/LootPoolEntryTypes.mapping | 6 +- .../loot/entry/LootTableEntry.mapping | 8 +- .../loot/entry/SequenceEntry.mapping | 5 +- .../net/minecraft/loot/entry/TagEntry.mapping | 8 +- .../function/ApplyBonusLootFunction.mapping | 51 +- .../function/ConditionalLootFunction.mapping | 13 +- .../function/CopyNameLootFunction.mapping | 9 +- .../loot/function/CopyNbtLootFunction.mapping | 31 +- .../loot/function/CopyStateFunction.mapping | 20 +- .../EnchantRandomlyLootFunction.mapping | 14 +- .../EnchantWithLevelsLootFunction.mapping | 4 +- .../ExplorationMapLootFunction.mapping | 8 +- .../ExplosionDecayLootFunction.mapping | 4 +- .../FillPlayerHeadLootFunction.mapping | 6 +- .../function/FurnaceSmeltLootFunction.mapping | 4 +- .../function/LimitCountLootFunction.mapping | 6 +- .../loot/function/LootFunctionManager.mapping | 32 - .../loot/function/LootFunctionTypes.mapping | 13 +- .../LootingEnchantLootFunction.mapping | 4 +- .../function/ReferenceLootFunction.mapping | 13 + .../SetAttributesLootFunction.mapping | 46 +- .../function/SetBannerPatternFunction.mapping | 7 +- .../function/SetContentsLootFunction.mapping | 12 +- .../function/SetCountLootFunction.mapping | 8 +- .../function/SetDamageLootFunction.mapping | 8 +- .../SetEnchantmentsLootFunction.mapping | 11 +- .../SetGoatHornSoundLootFunction.mapping | 10 - .../SetInstrumentLootFunction.mapping | 10 + .../function/SetLootTableLootFunction.mapping | 12 +- .../loot/function/SetLoreLootFunction.mapping | 10 +- .../loot/function/SetNameLootFunction.mapping | 12 +- .../loot/function/SetNbtLootFunction.mapping | 6 +- .../function/SetPotionLootFunction.mapping | 8 +- .../SetStewEffectLootFunction.mapping | 19 +- .../operator/BoundedIntUnaryOperator.mapping | 13 +- .../nbt/ContextLootNbtProvider.mapping | 5 +- .../provider/nbt/LootNbtProviderTypes.mapping | 7 +- .../nbt/StorageLootNbtProvider.mapping | 5 +- .../number/BinomialLootNumberProvider.mapping | 8 +- .../number/ConstantLootNumberProvider.mapping | 6 +- .../number/LootNumberProviderTypes.mapping | 7 +- .../number/ScoreLootNumberProvider.mapping | 11 +- .../number/UniformLootNumberProvider.mapping | 8 +- .../score/ContextLootScoreProvider.mapping | 6 +- .../score/FixedLootScoreProvider.mapping | 6 +- .../score/LootScoreProviderTypes.mapping | 7 +- mappings/net/minecraft/nbt/NbtByte.mapping | 2 +- .../net/minecraft/nbt/NbtByteArray.mapping | 2 +- .../net/minecraft/nbt/NbtCompound.mapping | 2 +- mappings/net/minecraft/nbt/NbtDouble.mapping | 2 +- mappings/net/minecraft/nbt/NbtElement.mapping | 1 + mappings/net/minecraft/nbt/NbtEnd.mapping | 2 +- mappings/net/minecraft/nbt/NbtFloat.mapping | 2 +- mappings/net/minecraft/nbt/NbtHelper.mapping | 37 +- mappings/net/minecraft/nbt/NbtInt.mapping | 2 +- .../net/minecraft/nbt/NbtIntArray.mapping | 2 +- mappings/net/minecraft/nbt/NbtIo.mapping | 39 +- mappings/net/minecraft/nbt/NbtList.mapping | 2 +- mappings/net/minecraft/nbt/NbtLong.mapping | 2 +- .../net/minecraft/nbt/NbtLongArray.mapping | 2 +- mappings/net/minecraft/nbt/NbtOps.mapping | 102 ++- mappings/net/minecraft/nbt/NbtShort.mapping | 2 +- mappings/net/minecraft/nbt/NbtString.mapping | 2 +- .../minecraft/nbt/NbtTagSizeTracker.mapping | 5 +- .../net/minecraft/nbt/StringNbtReader.mapping | 3 + .../network/ClientConnection.mapping | 102 ++- .../minecraft/network/DecoderHandler.mapping | 9 - .../network/LegacyQueryHandler.mapping | 13 - .../minecraft/network/NetworkState.mapping | 72 +- mappings/net/minecraft/network/Packet.mapping | 8 - .../minecraft/network/PacketByteBuf.mapping | 284 +++++-- .../minecraft/network/PacketEncoder.mapping | 9 - .../network/PacketEncoderException.mapping | 3 - .../minecraft/network/QueryableServer.mapping | 5 + .../minecraft/network/SplitterHandler.mapping | 5 - .../network/encoding/StringEncoding.mapping | 8 + .../network/encoding/VarInts.mapping | 14 + .../network/encoding/VarLongs.mapping | 14 + .../encryption/ClientPlayerSession.mapping | 6 + .../encryption/NetworkEncryptionUtils.mapping | 1 + .../encryption/PlayerPublicKey.mapping | 6 +- .../encryption/PublicPlayerSession.mapping | 20 + .../encryption/SignatureVerifier.mapping | 10 +- .../network/handler/DecoderHandler.mapping | 9 + .../network/handler/LegacyQueries.mapping | 11 + .../handler/LegacyQueryHandler.mapping | 20 + .../NetworkStateTransitionHandler.mapping | 4 + .../handler/PacketBundleHandler.mapping | 20 + .../network/handler/PacketBundler.mapping | 10 + .../{ => handler}/PacketDeflater.mapping | 2 +- .../network/handler/PacketEncoder.mapping | 9 + .../handler/PacketEncoderException.mapping | 3 + .../{ => handler}/PacketInflater.mapping | 7 +- .../network/handler/PacketSizeLogger.mapping | 8 + .../network/handler/PacketUnbundler.mapping | 8 + .../network/handler/PacketValidator.mapping | 20 + .../{ => handler}/SizePrepender.mapping | 2 +- .../network/handler/SplitterHandler.mapping | 15 + .../ClientCommonPacketListener.mapping | 13 + .../ClientConfigurationPacketListener.mapping | 7 + .../listener/ClientPacketListener.mapping | 1 + .../ClientPingResultPacketListener.mapping | 6 + .../listener/ClientPlayPacketListener.mapping | 38 +- .../ClientQueryPacketListener.mapping | 2 - .../network/listener/PacketListener.mapping | 16 +- .../ServerCommonPacketListener.mapping | 9 + .../ServerConfigurationPacketListener.mapping | 3 + .../ServerCrashSafePacketListener.mapping | 5 + .../ServerLoginPacketListener.mapping | 2 + .../listener/ServerPacketListener.mapping | 6 +- .../listener/ServerPlayPacketListener.mapping | 16 +- .../ServerQueryPacketListener.mapping | 2 - .../ServerQueryPingPacketListener.mapping | 6 + .../listener/TickablePacketListener.mapping | 2 + .../message/AcknowledgedMessage.mapping | 5 + .../message/AcknowledgmentValidator.mapping | 44 +- .../message/ArgumentSignatureDataMap.mapping | 20 +- .../message/CachedDecoratorResult.mapping | 27 - .../network/message/DecoratedContents.mapping | 13 - .../network/message/FilterMask.mapping | 21 +- .../message/LastSeenMessageList.mapping | 36 +- .../message/LastSeenMessagesCollector.mapping | 27 +- .../network/message/MessageBody.mapping | 39 +- .../network/message/MessageChain.mapping | 98 ++- .../message/MessageChainTaskQueue.mapping | 6 +- .../network/message/MessageDecorator.mapping | 28 +- .../network/message/MessageHeader.mapping | 16 - .../network/message/MessageLink.mapping | 23 + .../network/message/MessageMetadata.mapping | 17 - .../message/MessageSignatureData.mapping | 47 +- .../message/MessageSignatureStorage.mapping | 18 + .../message/MessageSourceProfile.mapping | 11 - .../network/message/MessageType.mapping | 7 +- .../network/message/MessageVerifier.mapping | 59 +- .../network/message/SentMessage.mapping | 17 +- .../network/message/SignedMessage.mapping | 55 +- .../network/packet/BrandCustomPayload.mapping | 4 + .../network/packet/BundlePacket.mapping | 5 + .../packet/BundleSplitterPacket.mapping | 1 + .../network/packet/CustomPayload.mapping | 3 + .../minecraft/network/packet/Packet.mapping | 15 + .../packet/UnknownCustomPayload.mapping | 1 + .../CommonPongC2SPacket.mapping} | 6 +- .../c2s/common/CustomPayloadC2SPacket.mapping | 11 + .../KeepAliveC2SPacket.mapping | 2 +- .../ResourcePackStatusC2SPacket.mapping | 2 +- .../packet/c2s/config/ReadyC2SPacket.mapping | 3 + .../c2s/handshake/ConnectionIntent.mapping | 7 + .../c2s/handshake/HandshakeC2SPacket.mapping | 20 +- .../login/EnterConfigurationC2SPacket.mapping | 3 + .../c2s/login/LoginHelloC2SPacket.mapping | 3 - .../c2s/login/LoginKeyC2SPacket.mapping | 18 +- .../login/LoginQueryResponseC2SPacket.mapping | 29 +- .../login/LoginQueryResponsePayload.mapping | 3 + .../UnknownLoginQueryResponsePayload.mapping | 2 + .../play/AcknowledgeChunksC2SPacket.mapping | 3 + ...cknowledgeReconfigurationC2SPacket.mapping | 3 + .../c2s/play/AdvancementTabC2SPacket.mapping | 2 +- .../c2s/play/ChatMessageC2SPacket.mapping | 8 +- .../c2s/play/ClickSlotC2SPacket.mapping | 2 +- .../play/CommandExecutionC2SPacket.mapping | 7 +- .../c2s/play/CraftRequestC2SPacket.mapping | 3 +- .../CreativeInventoryActionC2SPacket.mapping | 2 +- .../c2s/play/CustomPayloadC2SPacket.mapping | 12 - .../MessageAcknowledgmentC2SPacket.mapping | 2 - .../PlayerInteractEntityC2SPacket.mapping | 2 + .../c2s/play/PlayerSessionC2SPacket.mapping | 3 + .../c2s/play/RecipeBookDataC2SPacket.mapping | 2 - .../play/RequestChatPreviewC2SPacket.mapping | 3 - .../c2s/play/UpdateBeaconC2SPacket.mapping | 13 + .../play/UpdateCommandBlockC2SPacket.mapping | 2 +- .../c2s/play/UpdateSignC2SPacket.mapping | 13 +- .../CommonPingS2CPacket.mapping} | 7 +- .../s2c/common/CustomPayloadS2CPacket.mapping | 11 + .../DisconnectS2CPacket.mapping | 2 +- .../KeepAliveS2CPacket.mapping | 2 +- .../ResourcePackSendS2CPacket.mapping | 6 +- .../SynchronizeTagsS2CPacket.mapping | 9 +- .../config/DynamicRegistriesS2CPacket.mapping | 6 + .../s2c/config/FeaturesS2CPacket.mapping | 3 + .../packet/s2c/config/ReadyS2CPacket.mapping | 3 + .../s2c/custom/DebugBeeCustomPayload.mapping | 26 + .../custom/DebugBrainCustomPayload.mapping | 32 + .../DebugGameEventCustomPayload.mapping | 4 + ...bugGameEventListenersCustomPayload.mapping | 4 + ...ebugGameTestAddMarkerCustomPayload.mapping | 4 + .../DebugGameTestClearCustomPayload.mapping | 4 + .../DebugGoalSelectorCustomPayload.mapping | 12 + .../s2c/custom/DebugHiveCustomPayload.mapping | 9 + .../DebugNeighborsUpdateCustomPayload.mapping | 4 + .../s2c/custom/DebugPathCustomPayload.mapping | 4 + .../custom/DebugPoiAddedCustomPayload.mapping | 4 + .../DebugPoiRemovedCustomPayload.mapping | 4 + .../DebugPoiTicketCountCustomPayload.mapping | 4 + .../custom/DebugRaidsCustomPayload.mapping | 4 + .../DebugStructuresCustomPayload.mapping | 17 + .../DebugVillageSectionsCustomPayload.mapping | 4 + .../DebugWorldgenAttemptCustomPayload.mapping | 4 + .../login/LoginQueryRequestPayload.mapping | 3 + .../login/LoginQueryRequestS2CPacket.mapping | 18 +- .../UnknownLoginQueryRequestPayload.mapping | 1 + .../play/AdvancementUpdateS2CPacket.mapping | 7 +- .../packet/s2c/play/BundleS2CPacket.mapping | 1 + .../s2c/play/ChatMessageS2CPacket.mapping | 5 +- .../s2c/play/ChatPreviewS2CPacket.mapping | 3 - .../ChatPreviewStateChangeS2CPacket.mapping | 3 - .../s2c/play/ChunkBiomeDataS2CPacket.mapping | 23 + .../s2c/play/ChunkDataS2CPacket.mapping | 7 +- .../play/ChunkDeltaUpdateS2CPacket.mapping | 6 +- .../s2c/play/ChunkSentS2CPacket.mapping | 3 + .../s2c/play/CommonPlayerSpawnInfo.mapping | 9 + .../play/CraftFailedResponseS2CPacket.mapping | 3 +- .../s2c/play/CustomPayloadS2CPacket.mapping | 29 - .../s2c/play/DamageTiltS2CPacket.mapping | 5 + .../s2c/play/DeathMessageS2CPacket.mapping | 8 +- .../s2c/play/EndCombatS2CPacket.mapping | 6 +- .../EnterReconfigurationS2CPacket.mapping | 3 + .../s2c/play/EntityAnimationS2CPacket.mapping | 1 - .../s2c/play/EntityAttachS2CPacket.mapping | 4 +- .../play/EntityAttributesS2CPacket.mapping | 2 +- .../s2c/play/EntityDamageS2CPacket.mapping | 18 + .../s2c/play/EntitySpawnS2CPacket.mapping | 13 +- .../play/EntityStatusEffectS2CPacket.mapping | 1 - .../play/EntityTrackerUpdateS2CPacket.mapping | 18 +- .../packet/s2c/play/GameJoinS2CPacket.mapping | 21 +- .../network/packet/s2c/play/LightData.mapping | 5 +- .../s2c/play/LightUpdateS2CPacket.mapping | 3 +- .../s2c/play/MapUpdateS2CPacket.mapping | 2 +- .../s2c/play/MessageHeaderS2CPacket.mapping | 5 - .../play/PlaySoundFromEntityS2CPacket.mapping | 6 +- .../s2c/play/PlaySoundIdS2CPacket.mapping | 27 - .../s2c/play/PlaySoundS2CPacket.mapping | 6 +- .../s2c/play/PlayerListS2CPacket.mapping | 117 ++- .../play/PlayerPositionLookS2CPacket.mapping | 16 +- .../s2c/play/PlayerRemoveS2CPacket.mapping | 3 + .../s2c/play/PlayerRespawnS2CPacket.mapping | 35 +- .../packet/s2c/play/PositionFlag.mapping | 13 + .../ProfilelessChatMessageS2CPacket.mapping | 3 + ...mapping => RemoveMessageS2CPacket.mapping} | 2 +- .../play/ScoreboardDisplayS2CPacket.mapping | 10 +- .../ScoreboardPlayerUpdateS2CPacket.mapping | 4 +- .../ScreenHandlerSlotUpdateS2CPacket.mapping | 2 +- .../s2c/play/ServerMetadataS2CPacket.mapping | 13 +- .../s2c/play/SetTradeOffersS2CPacket.mapping | 4 +- .../s2c/play/SignEditorOpenS2CPacket.mapping | 5 +- .../s2c/play/StartChunkSendS2CPacket.mapping | 3 + .../s2c/play/StatisticsS2CPacket.mapping | 4 +- .../play/SynchronizeRecipesS2CPacket.mapping | 5 +- .../s2c/play/UnloadChunkS2CPacket.mapping | 7 - .../play/UpdateSelectedSlotS2CPacket.mapping | 2 +- ...et.mapping => PingResultS2CPacket.mapping} | 2 +- .../s2c/query/QueryResponseS2CPacket.mapping | 5 +- .../minecraft/obfuscate/DontObfuscate.mapping | 3 - .../AbstractDustParticleEffect.mapping | 10 +- .../DustColorTransitionParticleEffect.mapping | 14 +- .../particle/DustParticleEffect.mapping | 4 +- mappings/net/minecraft/potion/Potion.mapping | 2 + .../net/minecraft/potion/PotionUtil.mapping | 8 +- mappings/net/minecraft/potion/Potions.mapping | 5 + .../predicate/BlockPredicate.mapping | 37 +- .../predicate/DamagePredicate.mapping | 29 +- .../predicate/FluidPredicate.mapping | 24 +- .../predicate/LightPredicate.mapping | 8 +- .../minecraft/predicate/NbtPredicate.mapping | 8 +- .../minecraft/predicate/NumberRange.mapping | 64 +- .../predicate/StatePredicate.mapping | 57 +- .../minecraft/predicate/TagPredicate.mapping | 16 + ...ncementEntityPredicateDeserializer.mapping | 11 +- ...vancementEntityPredicateSerializer.mapping | 5 - .../entity/DamageSourcePredicate.mapping | 75 +- .../entity/DistancePredicate.mapping | 19 +- .../entity/EntityEffectPredicate.mapping | 42 +- .../entity/EntityEquipmentPredicate.mapping | 60 +- .../entity/EntityFlagsPredicate.mapping | 43 +- .../predicate/entity/EntityPredicate.mapping | 171 ++-- .../predicate/entity/EntityPredicates.mapping | 2 +- .../entity/EntityTypePredicate.mapping | 14 +- .../entity/FishingHookPredicate.mapping | 9 +- .../entity/LightningBoltPredicate.mapping | 14 +- .../entity/LocationPredicate.mapping | 103 +-- .../entity/LootContextPredicate.mapping | 18 + .../predicate/entity/PlayerPredicate.mapping | 76 +- .../predicate/entity/SlimePredicate.mapping | 6 +- .../entity/TypeSpecificPredicate.mapping | 57 +- .../entity/VariantPredicates.mapping | 21 +- .../item/EnchantmentPredicate.mapping | 14 +- .../predicate/item/ItemPredicate.mapping | 57 +- .../recipe/AbstractCookingRecipe.mapping | 23 +- .../minecraft/recipe/BlastingRecipe.mapping | 12 +- .../recipe/CampfireCookingRecipe.mapping | 12 +- .../recipe/CookingRecipeSerializer.mapping | 14 +- .../recipe/CraftingDecoratedPotRecipe.mapping | 1 + .../minecraft/recipe/CraftingRecipe.mapping | 1 + .../minecraft/recipe/CuttingRecipe.mapping | 25 +- .../net/minecraft/recipe/Ingredient.mapping | 22 +- .../minecraft/recipe/InputSlotFiller.mapping | 8 +- .../recipe/MapExtendingRecipe.mapping | 6 +- mappings/net/minecraft/recipe/Recipe.mapping | 13 +- .../recipe/RecipeGridAligner.mapping | 3 +- .../minecraft/recipe/RecipeManager.mapping | 10 +- .../minecraft/recipe/RecipeMatcher.mapping | 8 +- .../minecraft/recipe/RecipeSerializer.mapping | 55 +- .../minecraft/recipe/RecipeUnlocker.mapping | 11 +- .../net/minecraft/recipe/ShapedRecipe.mapping | 48 +- .../minecraft/recipe/ShapelessRecipe.mapping | 19 +- .../minecraft/recipe/SmeltingRecipe.mapping | 12 +- .../minecraft/recipe/SmithingRecipe.mapping | 18 +- .../recipe/SmithingTransformRecipe.mapping | 12 + .../recipe/SmithingTrimRecipe.mapping | 10 + .../minecraft/recipe/SmokingRecipe.mapping | 12 +- .../recipe/SpecialCraftingRecipe.mapping | 6 +- .../recipe/SpecialRecipeSerializer.mapping | 8 +- .../recipe/StonecuttingRecipe.mapping | 10 +- .../recipe/book/CookingRecipeCategory.mapping | 5 + .../book/CraftingRecipeCategory.mapping | 5 + .../minecraft/recipe/book/RecipeBook.mapping | 18 +- .../recipe/book/RecipeCategory.mapping | 5 + .../registry/BuiltinRegistries.mapping | 18 + .../CombinedDynamicRegistries.mapping | 33 + .../registry/DefaultedRegistry.mapping | 2 + .../registry/DynamicRegistryManager.mapping | 47 ++ .../registry/MutableRegistry.mapping | 12 + .../minecraft/registry/Registerable.mapping | 10 + .../net/minecraft/registry/Registries.mapping | 224 +++++ .../net/minecraft/registry/Registry.mapping | 287 +++++++ .../registry/RegistryBuilder.mapping | 94 +++ .../registry/RegistryCodecs.mapping | 45 +- .../registry/RegistryEntryLookup.mapping | 14 + .../{util => }/registry/RegistryKey.mapping | 13 +- .../minecraft/registry/RegistryKeys.mapping | 47 ++ .../minecraft/registry/RegistryLoader.mapping | 57 ++ .../minecraft/registry/RegistryOps.mapping | 44 + .../registry/RegistryWrapper.mapping | 43 + .../registry/SerializableRegistries.mapping | 35 + .../ServerDynamicRegistryType.mapping | 4 + .../registry/SimpleDefaultedRegistry.mapping | 9 + .../registry/SimpleRegistry.mapping | 41 +- .../entry}/RegistryElementCodec.mapping | 8 +- .../registry/entry/RegistryEntry.mapping | 150 ++++ .../registry/entry/RegistryEntryList.mapping | 71 ++ .../entry}/RegistryEntryListCodec.mapping | 6 +- .../registry/entry/RegistryEntryOwner.mapping | 6 + .../entry}/RegistryFixedCodec.mapping | 4 +- .../tag/BannerPatternTags.mapping | 2 +- .../{ => registry}/tag/BiomeTags.mapping | 2 +- .../{ => registry}/tag/BlockTags.mapping | 2 +- .../{ => registry}/tag/CatVariantTags.mapping | 2 +- .../registry/tag/DamageTypeTags.mapping | 3 + .../{ => registry}/tag/EntityTypeTags.mapping | 2 +- .../tag/FlatLevelGeneratorPresetTags.mapping | 3 + .../{ => registry}/tag/FluidTags.mapping | 2 +- .../{ => registry}/tag/GameEventTags.mapping | 2 +- .../{ => registry}/tag/InstrumentTags.mapping | 2 +- .../{ => registry}/tag/ItemTags.mapping | 2 +- .../tag/PaintingVariantTags.mapping | 2 +- .../tag/PointOfInterestTypeTags.mapping | 2 +- .../{ => registry}/tag/StructureTags.mapping | 2 +- .../{ => registry}/tag/TagBuilder.mapping | 2 +- .../{ => registry}/tag/TagEntry.mapping | 2 +- .../{ => registry}/tag/TagFile.mapping | 2 +- .../registry/tag/TagGroupLoader.mapping | 42 + .../{ => registry}/tag/TagKey.mapping | 2 +- .../tag/TagManagerLoader.mapping | 2 +- .../tag/TagPacketSerializer.mapping | 6 +- .../tag/WorldPresetTags.mapping | 2 +- .../resource/AbstractFileResourcePack.mapping | 18 +- .../resource/DataConfiguration.mapping | 8 + .../resource/DefaultResourcePack.mapping | 57 +- .../DefaultResourcePackBuilder.mapping | 41 + .../resource/DependencyTracker.mapping | 41 + .../resource/DirectoryResourcePack.mapping | 48 +- .../resource/FileResourcePackProvider.mapping | 33 +- .../minecraft/resource/InputSupplier.mapping | 6 + .../minecraft/resource/JsonDataLoader.mapping | 9 +- .../LifecycledResourceManagerImpl.mapping | 5 + .../resource/NamespaceResourceManager.mapping | 66 +- .../resource/OverlayResourcePack.mapping | 6 + .../net/minecraft/resource/Resource.mapping | 17 +- .../resource/ResourceFactory.mapping | 4 + .../minecraft/resource/ResourceFinder.mapping | 22 + .../ResourceNotFoundException.mapping | 4 - .../minecraft/resource/ResourcePack.mapping | 17 +- .../ResourcePackCompatibility.mapping | 9 +- .../resource/ResourcePackManager.mapping | 22 +- .../resource/ResourcePackOpener.mapping | 11 + .../resource/ResourcePackProfile.mapping | 76 +- .../resource/ResourcePackProvider.mapping | 4 +- .../resource/ResourcePackSource.mapping | 22 +- .../minecraft/resource/ResourceType.mapping | 6 +- .../SinglePreparationResourceReloader.mapping | 2 + .../resource/VanillaDataPackProvider.mapping | 13 +- .../VanillaResourcePackProvider.mapping | 42 + .../resource/ZipResourcePack.mapping | 37 +- .../featuretoggle/FeatureFlag.mapping | 6 + .../featuretoggle/FeatureFlags.mapping | 19 + .../featuretoggle/FeatureManager.mapping | 42 + .../resource/featuretoggle/FeatureSet.mapping | 29 + .../featuretoggle/FeatureUniverse.mapping | 4 + .../featuretoggle/ToggleableFeature.mapping | 5 + .../resource/fs/ResourceFile.mapping | 5 + .../fs/ResourceFileAttributes.mapping | 2 + .../resource/fs/ResourceFileStore.mapping | 12 + .../resource/fs/ResourceFileSystem.mapping | 43 + .../fs/ResourceFileSystemProvider.mapping | 63 ++ .../resource/fs/ResourcePath.mapping | 62 ++ .../resource/metadata/BlockEntry.mapping | 25 + .../metadata/PackFeatureSetMetadata.mapping | 5 + .../metadata/PackOverlaysMetadata.mapping | 18 + .../metadata/PackResourceMetadata.mapping | 11 +- .../PackResourceMetadataReader.mapping | 1 - .../resource/metadata/ResourceFilter.mapping | 28 +- .../metadata/ResourceMetadata.mapping | 14 + .../metadata/ResourceMetadataMap.mapping | 16 + .../ResourceMetadataSerializer.mapping | 7 + .../minecraft/scoreboard/Scoreboard.mapping | 28 +- .../scoreboard/ScoreboardCriterion.mapping | 2 +- .../scoreboard/ScoreboardDisplaySlot.mapping | 11 + .../scoreboard/ScoreboardState.mapping | 3 +- .../scoreboard/ServerScoreboard.mapping | 1 + .../AbstractFurnaceScreenHandler.mapping | 4 +- .../AbstractRecipeScreenHandler.mapping | 6 +- .../screen/AnvilScreenHandler.mapping | 16 +- .../screen/BeaconScreenHandler.mapping | 11 + .../screen/BrewingStandScreenHandler.mapping | 8 + .../CartographyTableScreenHandler.mapping | 4 + .../screen/CraftingScreenHandler.mapping | 11 +- .../screen/EnchantmentScreenHandler.mapping | 1 + .../screen/ForgingScreenHandler.mapping | 25 +- .../Generic3x3ContainerScreenHandler.mapping | 5 + .../GenericContainerScreenHandler.mapping | 1 + .../screen/GrindstoneScreenHandler.mapping | 7 + .../screen/LoomScreenHandler.mapping | 5 + .../screen/MerchantScreenHandler.mapping | 11 + .../screen/PlayerScreenHandler.mapping | 19 +- .../minecraft/screen/ScreenHandler.mapping | 36 +- .../screen/ScreenHandlerFactory.mapping | 2 +- .../screen/ScreenHandlerType.mapping | 10 +- .../net/minecraft/screen/ScreenTexts.mapping | 13 +- .../screen/SmithingScreenHandler.mapping | 27 +- .../screen/StonecutterScreenHandler.mapping | 7 + .../screen/slot/CraftingResultSlot.mapping | 4 +- .../screen/slot/ForgingSlotsManager.mapping | 37 + .../net/minecraft/screen/slot/Slot.mapping | 14 +- .../minecraft/server/DataPackContents.mapping | 24 +- mappings/net/minecraft/server/Main.mapping | 18 +- .../minecraft/server/MinecraftServer.mapping | 48 +- .../minecraft/server/PlayerManager.mapping | 31 +- .../net/minecraft/server/SaveLoader.mapping | 9 +- .../net/minecraft/server/SaveLoading.mapping | 38 +- .../server/ServerAdvancementLoader.mapping | 10 +- .../server/ServerConfigHandler.mapping | 20 +- .../minecraft/server/ServerMetadata.mapping | 99 +-- .../minecraft/server/ServerNetworkIo.mapping | 4 +- .../server/command/AdvancementCommand.mapping | 12 +- .../server/command/AttributeCommand.mapping | 21 +- .../server/command/ChaseCommand.mapping | 1 + .../server/command/CloneCommand.mapping | 82 +- .../server/command/CommandManager.mapping | 4 +- .../server/command/DamageCommand.mapping | 22 + .../server/command/DataCommand.mapping | 108 ++- .../server/command/DatapackCommand.mapping | 12 +- .../server/command/DebugConfigCommand.mapping | 20 + .../command/DefaultGameModeCommand.mapping | 2 - .../server/command/EffectCommand.mapping | 17 +- .../server/command/EnchantCommand.mapping | 5 +- .../server/command/ExecuteCommand.mapping | 54 +- .../server/command/FillBiomeCommand.mapping | 36 + .../server/command/FillCommand.mapping | 1 - .../server/command/FunctionCommand.mapping | 24 +- .../server/command/GameModeCommand.mapping | 4 - .../server/command/LocateCommand.mapping | 59 +- .../server/command/LootCommand.mapping | 4 +- .../server/command/MeCommand.mapping | 4 +- .../server/command/MessageCommand.mapping | 8 +- .../server/command/ParticleCommand.mapping | 3 +- .../server/command/PlaceCommand.mapping | 10 +- .../server/command/PublishCommand.mapping | 6 +- .../server/command/RandomCommand.mapping | 59 ++ .../server/command/ReturnCommand.mapping | 16 + .../server/command/RideCommand.mapping | 32 + .../server/command/SayCommand.mapping | 4 +- .../server/command/ScheduleCommand.mapping | 4 +- .../server/command/ScoreboardCommand.mapping | 4 +- .../server/command/SeedCommand.mapping | 2 - .../command/ServerCommandSource.mapping | 12 +- .../command/SpawnArmorTrimsCommand.mapping | 25 + .../server/command/SummonCommand.mapping | 15 +- .../server/command/TeamMsgCommand.mapping | 13 +- .../server/command/TestCommand.mapping | 5 + .../command/WardenSpawnTrackerCommand.mapping | 2 + .../server/command/WeatherCommand.mapping | 4 + .../dedicated/DedicatedPlayerManager.mapping | 2 +- .../server/dedicated/DedicatedServer.mapping | 3 - .../dedicated/DedicatedServerWatchdog.mapping | 2 + .../server/dedicated/ServerMBean.mapping | 4 + .../dedicated/ServerPropertiesHandler.mapping | 23 +- .../dedicated/command/BanIpCommand.mapping | 1 - .../server/function/CommandFunction.mapping | 32 + .../function/CommandFunctionManager.mapping | 21 +- .../server/function/FunctionLoader.mapping | 6 +- .../server/function/MacroException.mapping | 5 + .../IntegratedPlayerManager.mapping | 2 +- .../integrated/IntegratedServer.mapping | 4 + .../integrated/IntegratedServerLoader.mapping | 46 +- .../server/network/ChunkDataSender.mapping | 30 + .../server/network/ChunkFilter.mapping | 44 + .../server/network/DebugInfoSender.mapping | 26 +- .../server/network/EntityTrackerEntry.mapping | 16 +- .../server/network/JoinWorldTask.mapping | 2 + .../PlayerAssociatedNetworkHandler.mapping | 4 + .../network/SendResourcePackTask.mapping | 5 + .../ServerCommonNetworkHandler.mapping | 29 + .../ServerConfigurationNetworkHandler.mapping | 18 + .../network/ServerLoginNetworkHandler.mapping | 38 +- .../network/ServerPlayNetworkHandler.mapping | 138 +--- .../ServerPlayerConfigurationTask.mapping | 5 + .../server/network/ServerPlayerEntity.mapping | 63 +- .../network/ServerQueryNetworkHandler.mapping | 6 +- .../server/rcon/QueryResponseHandler.mapping | 1 + .../server/world/ChunkHolder.mapping | 46 +- .../server/world/ChunkLevelType.mapping | 3 + .../server/world/ChunkLevels.mapping | 19 + .../server/world/ChunkTicketManager.mapping | 13 +- .../server/world/ChunkTicketType.mapping | 6 + .../world/EntityTrackingListener.mapping | 5 - .../world/PlayerChunkWatchingManager.mapping | 16 +- .../server/world/ServerChunkManager.mapping | 4 +- .../server/world/ServerEntityManager.mapping | 2 +- .../world/ServerLightingProvider.mapping | 10 +- .../server/world/ServerWorld.mapping | 59 +- .../world/ThreadedAnvilChunkStorage.mapping | 106 ++- .../sound/BiomeAdditionsSound.mapping | 10 +- .../minecraft/sound/BiomeMoodSound.mapping | 14 +- .../minecraft/sound/BlockSoundGroup.mapping | 18 + .../net/minecraft/sound/MusicSound.mapping | 14 +- .../net/minecraft/sound/SoundEvent.mapping | 24 +- .../net/minecraft/sound/SoundEvents.mapping | 19 +- mappings/net/minecraft/stat/StatType.mapping | 4 +- mappings/net/minecraft/state/State.mapping | 5 + .../state/property/IntProperty.mapping | 2 + .../state/property/Properties.mapping | 36 +- .../structure/AncientCityGenerator.mapping | 5 +- .../AncientCityOutskirtsGenerator.mapping | 3 +- .../structure/BastionBridgeData.mapping | 3 +- .../minecraft/structure/BastionData.mapping | 3 +- .../structure/BastionHoglinStableData.mapping | 3 + .../structure/BastionRemnantGenerator.mapping | 5 +- .../structure/BastionTreasureData.mapping | 3 +- .../structure/BastionUnitsData.mapping | 3 +- .../structure/DesertTempleGenerator.mapping | 40 + .../structure/DesertVillageData.mapping | 7 +- .../structure/EndCityGenerator.mapping | 2 + .../structure/HoglinStableData.mapping | 2 - .../structure/MineshaftGenerator.mapping | 2 +- .../structure/OceanMonumentGenerator.mapping | 13 +- .../structure/OceanRuinGenerator.mapping | 29 +- .../PillagerOutpostGenerator.mapping | 5 +- .../structure/PlainsVillageData.mapping | 6 +- .../RuinedPortalStructurePiece.mapping | 2 + .../structure/SavannaVillageData.mapping | 7 +- .../structure/ShiftableStructurePiece.mapping | 1 + .../structure/ShipwreckGenerator.mapping | 3 + .../structure/SimpleStructurePiece.mapping | 2 + .../structure/SnowyVillageData.mapping | 6 +- .../structure/StructurePlacementData.mapping | 1 + .../minecraft/structure/StructureSets.mapping | 28 +- .../structure/StructureTemplate.mapping | 17 +- .../StructureTemplateManager.mapping | 9 +- .../structure/TaigaVillageData.mapping | 6 +- .../structure/TrailRuinsGenerator.mapping | 4 + .../structure/VillageGenerator.mapping | 3 +- .../WoodlandMansionGenerator.mapping | 7 - .../structure/pool/SinglePoolElement.mapping | 2 - .../structure/pool/StructurePool.mapping | 24 +- .../pool/StructurePoolBasedGenerator.mapping | 23 +- .../pool/StructurePoolElement.mapping | 1 + .../structure/pool/StructurePools.mapping | 12 +- .../BlockRotStructureProcessor.mapping | 2 +- .../CappedStructureProcessor.mapping | 13 + .../processor/StructureProcessor.mapping | 7 + .../processor/StructureProcessorLists.mapping | 14 +- .../processor/StructureProcessorRule.mapping | 17 +- .../structure/rule/PosRuleTest.mapping | 3 + .../AppendLootRuleBlockEntityModifier.mapping | 12 + ...ppendStaticRuleBlockEntityModifier.mapping | 9 + .../ClearRuleBlockEntityModifier.mapping | 3 + ...PassthroughRuleBlockEntityModifier.mapping | 3 + .../RuleBlockEntityModifier.mapping | 6 + .../RuleBlockEntityModifierType.mapping | 4 + .../tag/FlatLevelGeneratorPresetTags.mapping | 3 - .../net/minecraft/tag/TagGroupLoader.mapping | 72 -- .../minecraft/test/StructureTestUtil.mapping | 3 +- .../net/minecraft/test/TestContext.mapping | 66 +- .../net/minecraft/test/TestRunner.mapping | 2 + .../net/minecraft/test/TestServer.mapping | 7 +- mappings/net/minecraft/test/TestUtil.mapping | 6 +- mappings/net/minecraft/text/Text.mapping | 9 +- .../TextReorderingProcessor.mapping | 4 +- .../font => text}/TextVisitFactory.mapping | 4 +- mappings/net/minecraft/text/Texts.mapping | 6 +- .../text/TranslatableTextContent.mapping | 9 +- .../packageinfo/PackageInfo6204.mapping | 1 - .../packageinfo/PackageInfo7676.mapping | 1 + .../packageinfo/PackageInfo7694.mapping | 1 + .../packageinfo/PackageInfo7702.mapping | 1 + .../packageinfo/PackageInfo7727.mapping | 1 + .../packageinfo/PackageInfo7728.mapping | 1 + .../packageinfo/PackageInfo7787.mapping | 1 + .../packageinfo/PackageInfo7795.mapping | 1 + .../packageinfo/PackageInfo7797.mapping | 1 + .../packageinfo/PackageInfo7804.mapping | 1 + .../packageinfo/PackageInfo7888.mapping | 1 + .../packageinfo/PackageInfo7912.mapping | 1 + .../packageinfo/PackageInfo7925.mapping | 1 + .../packageinfo/PackageInfo7937.mapping | 1 + .../packageinfo/PackageInfo7945.mapping | 1 + .../packageinfo/PackageInfo7953.mapping | 1 + .../packageinfo/PackageInfo7961.mapping | 1 + .../packageinfo/PackageInfo7983.mapping | 1 + .../packageinfo/PackageInfo7984.mapping | 1 + .../packageinfo/PackageInfo8008.mapping | 1 + .../packageinfo/PackageInfo8022.mapping | 1 + .../packageinfo/PackageInfo8031.mapping | 1 + .../packageinfo/PackageInfo8058.mapping | 1 + .../packageinfo/PackageInfo8091.mapping | 1 + .../packageinfo/PackageInfo8250.mapping | 1 + .../packageinfo/PackageInfo8501.mapping | 1 + .../packageinfo/PackageInfo8585.mapping | 1 + .../packageinfo/PackageInfo8598.mapping | 1 + .../packageinfo/PackageInfo8613.mapping | 1 + .../packageinfo/PackageInfo8696.mapping | 1 + .../packageinfo/PackageInfo8730.mapping | 1 + .../packageinfo/PackageInfo8731.mapping | 1 + .../packageinfo/PackageInfo8737.mapping | 1 + .../net/minecraft/util/ApiServices.mapping | 3 +- mappings/net/minecraft/util/Arm.mapping | 9 +- .../net/minecraft/util/CachedMapper.mapping | 13 + mappings/net/minecraft/util/Colors.mapping | 12 + .../net/minecraft/util/CubicSampler.mapping | 2 + mappings/net/minecraft/util/DyeColor.mapping | 7 +- .../net/minecraft/util/Identifier.mapping | 35 +- .../InvalidHierarchicalFileException.mapping | 23 + .../net/minecraft/util/JsonHelper.mapping | 32 +- .../util/JsonSerializableType.mapping | 5 - .../net/minecraft/util/JsonSerializer.mapping | 8 - .../minecraft/util/JsonSerializing.mapping | 72 -- mappings/net/minecraft/util/Language.mapping | 8 +- .../net/minecraft/util/MetricsData.mapping | 13 - mappings/net/minecraft/util/Nullables.mapping | 65 ++ ...{FileNameUtil.mapping => PathUtil.mapping} | 32 +- .../minecraft/util/PendingTaskRunner.mapping | 22 - .../minecraft/util/StringIdentifiable.mapping | 26 +- mappings/net/minecraft/util/Urls.mapping | 28 + mappings/net/minecraft/util/UserCache.mapping | 12 +- mappings/net/minecraft/util/Util.mapping | 49 +- ...SerializableUuid.mapping => Uuids.mapping} | 18 +- .../util/collection/ArrayListDeque.mapping | 55 ++ .../util/collection/PaletteStorage.mapping | 2 + .../util/collection/WeightedList.mapping | 2 + .../net/minecraft/util/dynamic/Codecs.mapping | 188 ++++- .../util/dynamic/EntryLoader.mapping | 67 -- .../net/minecraft/util/dynamic/Range.mapping | 2 + .../util/dynamic/RegistryLoader.mapping | 49 -- .../util/dynamic/RegistryOps.mapping | 29 - .../function/LazyIterationConsumer.mapping | 11 + .../util/function/MaterialPredicate.mapping | 9 - .../util/function/ValueLists.mapping | 24 + .../logging/DebugLoggerPrintStream.mapping | 1 + .../util/logging/LogFileCompressor.mapping | 47 ++ .../minecraft/util/logging/LogReader.mapping | 5 + .../minecraft/util/logging/LogWriter.mapping | 17 + .../util/math/AffineTransformation.mapping | 53 +- .../util/math/AffineTransformations.mapping | 10 + .../util/math/AxisTransformation.mapping | 5 +- .../net/minecraft/util/math/BlockBox.mapping | 37 +- .../net/minecraft/util/math/BlockPos.mapping | 38 +- mappings/net/minecraft/util/math/Box.mapping | 32 +- .../net/minecraft/util/math/ChunkPos.mapping | 24 + .../util/math/ChunkSectionPos.mapping | 3 + .../minecraft/util/math/ColorHelper.mapping | 41 + .../net/minecraft/util/math/Direction.mapping | 30 +- .../util/math/DirectionTransformation.mapping | 4 +- .../net/minecraft/util/math/Divider.mapping | 16 + .../minecraft/util/math/GivensPair.mapping | 16 + .../minecraft/util/math/MathHelper.mapping | 158 ++-- .../net/minecraft/util/math/Matrix3f.mapping | 107 --- .../net/minecraft/util/math/Matrix4f.mapping | 126 --- .../minecraft/util/math/MatrixUtil.mapping | 36 + .../minecraft/util/math/Quaternion.mapping | 60 -- .../minecraft/util/math/RotationAxis.mapping | 27 + .../util/math/RotationCalculator.mapping | 23 + .../util/math/RotationPropertyHelper.mapping | 16 + .../net/minecraft/util/math/Spline.mapping | 13 + .../net/minecraft/util/math/Vec3d.mapping | 25 +- .../net/minecraft/util/math/Vec3f.mapping | 77 -- .../net/minecraft/util/math/Vec3i.mapping | 31 +- .../net/minecraft/util/math/Vector4f.mapping | 45 - .../ConstantFloatProvider.mapping | 10 - .../intprovider/ConstantIntProvider.mapping | 10 - .../util/math/intprovider/IntProvider.mapping | 4 + .../noise/DoublePerlinNoiseSampler.mapping | 5 + .../noise/InterpolatedNoiseSampler.mapping | 3 + .../noise/OctavePerlinNoiseSampler.mapping | 10 + .../util/math/random/RandomSeed.mapping | 11 + .../util/math/random/RandomSequence.mapping | 21 + .../math/random/RandomSequencesState.mapping | 52 ++ .../random/Xoroshiro128PlusPlusRandom.mapping | 10 +- .../Xoroshiro128PlusPlusRandomImpl.mapping | 7 + .../path/AllowedSymlinkPathMatcher.mapping | 47 ++ .../minecraft/util/path/SymlinkEntry.mapping | 1 + .../minecraft/util/path/SymlinkFinder.mapping | 25 + .../path/SymlinkValidationException.mapping | 11 + .../util/profiler/PerformanceLog.mapping | 14 + .../minecraft/util/profiler/Profiler.mapping | 2 + .../util/profiler/ProfilerTiming.mapping | 2 + .../util/profiling/jfr/FlightProfiler.mapping | 8 +- .../util/profiling/jfr/JfrJsonReport.mapping | 2 +- .../profiling/jfr/event/PacketEvent.mapping | 2 +- .../profiling/jfr/sample/TimedSample.mapping | 2 - .../util/registry/BuiltinRegistries.mapping | 70 -- .../util/registry/DefaultedRegistry.mapping | 9 - .../registry/DynamicRegistryManager.mapping | 149 ---- .../util/registry/MutableRegistry.mapping | 23 - .../minecraft/util/registry/Registry.mapping | 427 ---------- .../util/registry/RegistryEntry.mapping | 46 -- .../util/registry/RegistryEntryList.mapping | 39 - .../util/shape/BitSetVoxelSet.mapping | 32 + .../util/shape/DisjointPairList.mapping | 5 + .../util/shape/SimplePairList.mapping | 1 + .../net/minecraft/util/shape/VoxelSet.mapping | 6 +- .../minecraft/util/shape/VoxelShape.mapping | 1 + .../minecraft/util/shape/VoxelShapes.mapping | 1 + .../minecraft/util/thread/FutureQueue.mapping | 11 +- .../minecraft/util/thread/LockHelper.mapping | 1 + .../net/minecraft/village/Merchant.mapping | 2 +- .../net/minecraft/village/TradeOffers.mapping | 51 +- .../village/VillageGossipType.mapping | 6 +- .../minecraft/village/VillagerGossips.mapping | 31 +- .../net/minecraft/village/raid/Raid.mapping | 3 +- .../village/raid/RaidManager.mapping | 4 + .../world/BlockCollisionSpliterator.mapping | 8 +- .../net/minecraft/world/BlockView.mapping | 8 +- .../minecraft/world/ChunkUpdateState.mapping | 1 + .../net/minecraft/world/CollisionView.mapping | 15 + .../world/CommandBlockExecutor.mapping | 1 + .../net/minecraft/world/Difficulty.mapping | 8 +- .../net/minecraft/world/EntityView.mapping | 2 + .../minecraft/world/FeatureUpdater.mapping | 6 + .../minecraft/world/ForcedChunkState.mapping | 1 + mappings/net/minecraft/world/GameMode.mapping | 5 +- .../net/minecraft/world/Heightmap.mapping | 5 +- .../net/minecraft/world/IdCountsState.mapping | 1 + .../net/minecraft/world/LightType.mapping | 3 - .../minecraft/world/MobSpawnerEntry.mapping | 8 +- .../minecraft/world/MobSpawnerLogic.mapping | 24 +- .../minecraft/world/ModifiableWorld.mapping | 1 - .../minecraft/world/PersistentState.mapping | 1 + .../world/PersistentStateManager.mapping | 21 +- .../net/minecraft/world/PortalForcer.mapping | 4 +- .../net/minecraft/world/RedstoneView.mapping | 21 + .../minecraft/world/RegistryWorldView.mapping | 1 - .../minecraft/world/SaveProperties.mapping | 14 +- .../net/minecraft/world/SpawnHelper.mapping | 2 +- .../minecraft/world/StructureLocator.mapping | 2 +- mappings/net/minecraft/world/World.mapping | 134 ++- .../net/minecraft/world/WorldAccess.mapping | 15 +- .../net/minecraft/world/WorldEvents.mapping | 78 +- .../net/minecraft/world/WorldView.mapping | 7 +- .../net/minecraft/world/biome/Biome.mapping | 22 +- .../world/biome/BiomeEffects.mapping | 28 +- .../world/biome/BiomeParticleConfig.mapping | 4 + .../world/biome/BuiltinBiomes.mapping | 3 +- .../{level => biome}/ColorResolver.mapping | 2 +- .../world/biome/GenerationSettings.mapping | 44 +- .../world/biome/OverworldBiomeCreator.mapping | 199 +++-- .../world/biome/SpawnSettings.mapping | 20 +- .../world/biome/TheEndBiomeCreator.mapping | 20 +- .../world/biome/TheNetherBiomeCreator.mapping | 20 +- .../world/biome/source/BiomeSource.mapping | 7 +- .../source/CheckerboardBiomeSource.mapping | 4 + .../biome/source/FixedBiomeSource.mapping | 2 + .../source/MultiNoiseBiomeSource.mapping | 81 +- ...MultiNoiseBiomeSourceParameterList.mapping | 32 + ...ultiNoiseBiomeSourceParameterLists.mapping | 5 + .../biome/source/TheEndBiomeSource.mapping | 8 +- .../biome/source/util/MultiNoiseUtil.mapping | 4 + .../util/VanillaBiomeParameters.mapping | 5 +- .../net/minecraft/world/chunk/Chunk.mapping | 23 +- .../world/chunk/ChunkNibbleArray.mapping | 10 +- .../world/chunk/ChunkProvider.mapping | 2 +- .../world/chunk/ChunkSection.mapping | 25 +- .../minecraft/world/chunk/ChunkStatus.mapping | 124 ++- .../chunk/ChunkStatusChangeListener.mapping | 2 +- .../world/chunk/ChunkToNibbleArrayMap.mapping | 2 +- .../minecraft/world/chunk/ProtoChunk.mapping | 7 - .../minecraft/world/chunk/WorldChunk.mapping | 16 +- ...hunk.mapping => WrapperProtoChunk.mapping} | 7 +- .../light/ChunkBlockLightProvider.mapping | 10 +- .../chunk/light/ChunkLightProvider.mapping | 113 ++- .../world/chunk/light/ChunkSkyLight.mapping | 53 ++ .../chunk/light/ChunkSkyLightProvider.mapping | 24 +- .../world/chunk/light/LevelPropagator.mapping | 24 +- .../world/chunk/light/LightSourceView.mapping | 4 + .../world/chunk/light/LightStorage.mapping | 60 +- .../chunk/light/LightingProvider.mapping | 8 +- .../world/chunk/light/LightingView.mapping | 9 +- .../chunk/light/PendingUpdateQueue.mapping | 21 + .../world/chunk/light/SkyLightStorage.mapping | 15 +- .../world/dimension/DimensionOptions.mapping | 19 +- .../DimensionOptionsRegistryHolder.mapping | 55 ++ .../dimension/DimensionTypeRegistrar.mapping | 4 +- ...reaHelper.mapping => NetherPortal.mapping} | 17 +- .../world/entity/EntityIndex.mapping | 4 +- .../world/entity/EntityLookup.mapping | 10 +- .../entity/EntityTrackingSection.mapping | 8 +- .../world/entity/EntityTrackingStatus.mapping | 2 +- .../world/entity/SectionedEntityCache.mapping | 17 +- .../world/event/EntityPositionSource.mapping | 2 +- .../minecraft/world/event/GameEvent.mapping | 7 +- .../world/event/PositionSource.mapping | 2 +- .../minecraft/world/event/Vibrations.mapping | 121 +++ .../listener/EntityGameEventHandler.mapping | 7 - .../listener/GameEventDispatchManager.mapping | 15 + .../listener/GameEventDispatcher.mapping | 8 +- .../event/listener/GameEventListener.mapping | 9 +- .../SimpleGameEventDispatcher.mapping | 9 +- .../world/event/listener/Vibration.mapping | 35 + .../event/listener/VibrationListener.mapping | 106 --- .../event/listener/VibrationSelector.mapping | 20 + .../world/explosion/Explosion.mapping | 9 +- .../gen/FlatLevelGeneratorPreset.mapping | 2 + .../gen/FlatLevelGeneratorPresets.mapping | 17 +- .../world/gen/GeneratorOptions.mapping | 53 +- .../world/gen/OreVeinSampler.mapping | 15 + .../world/gen/StructureAccessor.mapping | 2 + .../world/gen/StructureWeightSampler.mapping | 15 + .../minecraft/world/gen/WorldPreset.mapping | 10 +- .../minecraft/world/gen/WorldPresets.mapping | 45 +- .../gen/blockpredicate/BlockPredicate.mapping | 3 + .../HasSturdyFacePredicate.mapping | 2 + .../InsideWorldBoundsBlockPredicate.mapping | 2 + .../MatchingBlockTagPredicate.mapping | 2 + .../SolidBlockPredicate.mapping | 2 + .../minecraft/world/gen/carver/Carver.mapping | 8 + .../world/gen/carver/CaveCarver.mapping | 2 +- .../world/gen/carver/CaveCarverConfig.mapping | 2 + .../gen/carver/ConfiguredCarvers.mapping | 5 +- .../world/gen/carver/RavineCarver.mapping | 4 +- .../minecraft/world/gen/chunk/Blender.mapping | 2 +- .../world/gen/chunk/BlendingData.mapping | 14 +- .../world/gen/chunk/ChunkGenerator.mapping | 76 +- .../gen/chunk/ChunkGeneratorSettings.mapping | 27 +- .../world/gen/chunk/ChunkNoiseSampler.mapping | 129 ++- .../gen/chunk/DebugChunkGenerator.mapping | 9 +- .../gen/chunk/FlatChunkGenerator.mapping | 5 +- .../chunk/FlatChunkGeneratorConfig.mapping | 54 +- .../gen/chunk/FlatChunkGeneratorLayer.mapping | 2 + .../gen/chunk/GenerationShapeConfig.mapping | 4 +- .../gen/chunk/NoiseChunkGenerator.mapping | 32 +- .../ConcentricRingsStructurePlacement.mapping | 2 + .../RandomSpreadStructurePlacement.mapping | 4 +- .../placement/StructurePlacement.mapping | 34 +- .../StructurePlacementCalculator.mapping | 58 ++ .../placement/StructurePlacementType.mapping | 1 + .../densityfunction/DensityFunction.mapping | 45 +- .../densityfunction/DensityFunctions.mapping | 114 +-- .../gen/feature/BlockColumnFeature.mapping | 5 + .../gen/feature/ConfiguredFeatures.mapping | 19 +- .../gen/feature/DefaultBiomeFeatures.mapping | 2 + .../gen/feature/DesertWellFeature.mapping | 6 + .../gen/feature/EndConfiguredFeatures.mapping | 12 +- .../gen/feature/EndPlacedFeatures.mapping | 10 +- .../gen/feature/EndPortalFeature.mapping | 2 + .../world/gen/feature/EndSpikeFeature.mapping | 2 + .../gen/feature/HugeFungusFeature.mapping | 11 +- .../feature/HugeFungusFeatureConfig.mapping | 8 +- .../world/gen/feature/IcebergFeature.mapping | 6 + .../gen/feature/LargeDripstoneFeature.mapping | 1 + .../feature/MiscConfiguredFeatures.mapping | 38 +- .../gen/feature/MiscPlacedFeatures.mapping | 38 +- .../feature/NetherConfiguredFeatures.mapping | 48 +- .../gen/feature/NetherPlacedFeatures.mapping | 43 +- .../feature/OceanConfiguredFeatures.mapping | 18 +- .../gen/feature/OceanPlacedFeatures.mapping | 28 +- .../gen/feature/OreConfiguredFeatures.mapping | 76 +- .../world/gen/feature/OreFeature.mapping | 3 + .../gen/feature/OrePlacedFeatures.mapping | 81 +- .../feature/PileConfiguredFeatures.mapping | 12 +- .../world/gen/feature/PlacedFeature.mapping | 7 +- .../world/gen/feature/PlacedFeatures.mapping | 25 +- .../gen/feature/RandomFeatureEntry.mapping | 1 + .../gen/feature/RootSystemFeature.mapping | 4 + .../gen/feature/ScatteredOreFeature.mapping | 3 + .../feature/TreeConfiguredFeatures.mapping | 80 +- .../world/gen/feature/TreeFeature.mapping | 30 +- .../gen/feature/TreePlacedFeatures.mapping | 60 +- .../UndergroundConfiguredFeatures.mapping | 56 +- .../feature/UndergroundPlacedFeatures.mapping | 42 +- .../VegetationConfiguredFeatures.mapping | 89 +- .../feature/VegetationPatchFeature.mapping | 2 + .../feature/VegetationPlacedFeatures.mapping | 158 ++-- .../gen/feature/VillagePlacedFeatures.mapping | 28 +- .../feature/VoidStartPlatformFeature.mapping | 1 + .../gen/feature/size/FeatureSize.mapping | 4 + .../gen/foliage/CherryFoliagePlacer.mapping | 25 + .../world/gen/foliage/FoliagePlacer.mapping | 42 +- .../ConstantHeightProvider.mapping | 10 - .../gen/heightprovider/HeightProvider.mapping | 1 + .../gen/noise/BuiltinNoiseParameters.mapping | 19 +- .../world/gen/noise/NoiseConfig.mapping | 20 +- .../gen/noise/NoiseParametersKeys.mapping | 7 +- .../stateprovider/BlockStateProvider.mapping | 2 +- .../structure/DesertPyramidStructure.mapping | 6 + .../gen/structure/JigsawStructure.mapping | 5 +- .../gen/structure/MineshaftStructure.mapping | 8 +- .../structure/NetherFossilStructure.mapping | 1 + .../structure/RuinedPortalStructure.mapping | 10 + .../world/gen/structure/Structure.mapping | 10 +- .../world/gen/structure/Structures.mapping | 52 +- .../gen/surfacebuilder/MaterialRules.mapping | 9 + .../gen/surfacebuilder/SurfaceBuilder.mapping | 6 + .../gen/treedecorator/TreeDecorator.mapping | 2 +- .../world/gen/trunk/CherryTrunkPlacer.mapping | 42 + .../world/gen/trunk/GiantTrunkPlacer.mapping | 9 + .../gen/trunk/LargeOakTrunkPlacer.mapping | 4 + .../minecraft/world/level/LevelInfo.mapping | 16 +- .../world/level/LevelProperties.mapping | 39 +- .../world/level/WorldGenSettings.mapping | 16 + .../world/level/storage/LevelStorage.mapping | 57 +- .../world/level/storage/LevelSummary.mapping | 15 +- .../world/poi/PointOfInterestStorage.mapping | 6 +- .../world/poi/PointOfInterestTypes.mapping | 8 +- .../world/spawner/CatSpawner.mapping | 2 + .../storage/EntityChunkDataAccess.mapping | 2 - .../world/storage/RegionBasedStorage.mapping | 3 + .../world/storage/RegionFile.mapping | 1 + .../world/{ => tick}/TickPriority.mapping | 2 +- .../world/tick/WorldTickScheduler.mapping | 16 +- .../world/updater/WorldUpdater.mapping | 9 +- settings.gradle | 2 + .../block/cauldron/package-info.java | 11 + .../minecraft/util/registry/package-info.java | 10 + unpick-definitions/entity_status.unpick | 7 +- unpick-definitions/gl.unpick | 3 - unpick-definitions/key_bindings.unpick | 2 - unpick-definitions/network_packets.unpick | 1 - .../set_block_state_flags.unpick | 1 - unpick-definitions/world_events.unpick | 19 +- 2488 files changed, 30399 insertions(+), 17586 deletions(-) create mode 100644 .github/CODEOWNERS create mode 100644 .github/workflows/release-filament.yml create mode 100644 .github/workflows/version-label.yml create mode 100644 filament/gradle.properties create mode 100644 filament/src/main/java/net/fabricmc/filament/FilamentExtension.java create mode 100644 filament/src/main/java/net/fabricmc/filament/task/DownloadTask.java create mode 100644 filament/src/main/java/net/fabricmc/filament/task/UnpickJarTask.java create mode 100644 filament/src/main/java/net/fabricmc/filament/task/base/FilamentTask.java create mode 100644 filament/src/main/java/net/fabricmc/filament/task/base/FileOutputTask.java create mode 100644 filament/src/main/java/net/fabricmc/filament/task/base/WithFileInput.java create mode 100644 filament/src/main/java/net/fabricmc/filament/task/base/WithFileOutput.java create mode 100644 filament/src/main/java/net/fabricmc/filament/task/enigma/EnigmaCommandTask.java create mode 100644 filament/src/main/java/net/fabricmc/filament/task/enigma/MapSpecializedMethodsTask.java create mode 100644 filament/src/main/java/net/fabricmc/filament/task/mappingio/ConvertMappingsTask.java create mode 100644 filament/src/main/java/net/fabricmc/filament/task/mappingio/MappingOutputTask.java create mode 100644 filament/src/main/java/net/fabricmc/filament/task/mappingio/MergeMappingsTask.java create mode 100644 filament/src/main/java/net/fabricmc/filament/task/minecraft/ExtractBundledServerTask.java create mode 100644 filament/src/main/java/net/fabricmc/filament/task/minecraft/MergeMinecraftTask.java create mode 100644 filament/src/main/java/net/fabricmc/filament/util/MinecraftVersionMetaHelper.java create mode 100644 mappings/com/mojang/blaze3d/systems/VertexSorter.mapping create mode 100644 mappings/net/minecraft/advancement/AdvancementDisplays.mapping delete mode 100644 mappings/net/minecraft/advancement/CriterionMerger.mapping delete mode 100644 mappings/net/minecraft/advancement/criterion/PlacedBlockCriterion.mapping create mode 100644 mappings/net/minecraft/advancement/criterion/RecipeCraftedCriterion.mapping create mode 100644 mappings/net/minecraft/block/BlockSetType.mapping create mode 100644 mappings/net/minecraft/block/BrushableBlock.mapping rename mappings/net/minecraft/block/{AbstractButtonBlock.mapping => ButtonBlock.mapping} (84%) create mode 100644 mappings/net/minecraft/block/CalibratedSculkSensorBlock.mapping create mode 100644 mappings/net/minecraft/block/CherryLeavesBlock.mapping create mode 100644 mappings/net/minecraft/block/ChiseledBookshelfBlock.mapping create mode 100644 mappings/net/minecraft/block/DecoratedPotBlock.mapping create mode 100644 mappings/net/minecraft/block/DecoratedPotPatterns.mapping rename mappings/net/minecraft/block/{OreBlock.mapping => ExperienceDroppingBlock.mapping} (70%) create mode 100644 mappings/net/minecraft/block/FlowerbedBlock.mapping create mode 100644 mappings/net/minecraft/block/HangingSignBlock.mapping delete mode 100644 mappings/net/minecraft/block/Material.mapping create mode 100644 mappings/net/minecraft/block/PitcherCropBlock.mapping create mode 100644 mappings/net/minecraft/block/SnifferEggBlock.mapping delete mode 100644 mappings/net/minecraft/block/StoneButtonBlock.mapping create mode 100644 mappings/net/minecraft/block/SuspiciousStewIngredient.mapping create mode 100644 mappings/net/minecraft/block/TorchflowerBlock.mapping create mode 100644 mappings/net/minecraft/block/WallHangingSignBlock.mapping create mode 100644 mappings/net/minecraft/block/WallPiglinHeadBlock.mapping create mode 100644 mappings/net/minecraft/block/WearableCarvedPumpkinBlock.mapping rename mappings/net/minecraft/{util/SignType.mapping => block/WoodType.mapping} (67%) delete mode 100644 mappings/net/minecraft/block/WoodenButtonBlock.mapping create mode 100644 mappings/net/minecraft/block/entity/BrushableBlockEntity.mapping create mode 100644 mappings/net/minecraft/block/entity/CalibratedSculkSensorBlockEntity.mapping create mode 100644 mappings/net/minecraft/block/entity/ChiseledBookshelfBlockEntity.mapping create mode 100644 mappings/net/minecraft/block/entity/DecoratedPotBlockEntity.mapping create mode 100644 mappings/net/minecraft/block/entity/HangingSignBlockEntity.mapping create mode 100644 mappings/net/minecraft/block/entity/SignText.mapping rename mappings/net/minecraft/block/enums/{WallMountLocation.mapping => BlockFace.mapping} (59%) create mode 100644 mappings/net/minecraft/block/sapling/CherrySaplingGenerator.mapping create mode 100644 mappings/net/minecraft/class_4558.mapping create mode 100644 mappings/net/minecraft/class_5699.mapping create mode 100644 mappings/net/minecraft/class_8782.mapping delete mode 100644 mappings/net/minecraft/client/ClientGameSession.mapping delete mode 100644 mappings/net/minecraft/client/MinecraftClientGame.mapping create mode 100644 mappings/net/minecraft/client/QuickPlay.mapping create mode 100644 mappings/net/minecraft/client/QuickPlayLogger.mapping create mode 100644 mappings/net/minecraft/client/font/GlyphContainer.mapping create mode 100644 mappings/net/minecraft/client/font/ReferenceFont.mapping create mode 100644 mappings/net/minecraft/client/font/TextRenderLayerSet.mapping delete mode 100644 mappings/net/minecraft/client/font/UnicodeTextureFont.mapping create mode 100644 mappings/net/minecraft/client/font/UnihexFont.mapping delete mode 100644 mappings/net/minecraft/client/gl/EffectGlShader.mapping create mode 100644 mappings/net/minecraft/client/gl/EffectShaderProgram.mapping rename mappings/net/minecraft/client/gl/{EffectProgram.mapping => EffectShaderStage.mapping} (61%) delete mode 100644 mappings/net/minecraft/client/gl/GlShader.mapping rename mappings/net/minecraft/client/gl/{JsonEffectGlShader.mapping => JsonEffectShaderProgram.mapping} (83%) rename mappings/net/minecraft/client/gl/{PostProcessShader.mapping => PostEffectPass.mapping} (80%) rename mappings/net/minecraft/client/gl/{ShaderEffect.mapping => PostEffectProcessor.mapping} (93%) delete mode 100644 mappings/net/minecraft/client/gl/ShaderParseException.mapping rename mappings/net/minecraft/client/{render/Shader.mapping => gl/ShaderProgram.mapping} (76%) create mode 100644 mappings/net/minecraft/client/gl/ShaderProgramSetupView.mapping rename mappings/net/minecraft/client/gl/{Program.mapping => ShaderStage.mapping} (58%) create mode 100644 mappings/net/minecraft/client/gui/DrawContext.mapping delete mode 100644 mappings/net/minecraft/client/gui/DrawableHelper.mapping create mode 100644 mappings/net/minecraft/client/gui/LogoDrawer.mapping create mode 100644 mappings/net/minecraft/client/gui/ScreenPos.mapping create mode 100644 mappings/net/minecraft/client/gui/ScreenRect.mapping create mode 100644 mappings/net/minecraft/client/gui/hud/debug/DebugChart.mapping create mode 100644 mappings/net/minecraft/client/gui/hud/debug/PacketSizeChart.mapping create mode 100644 mappings/net/minecraft/client/gui/hud/debug/PingChart.mapping create mode 100644 mappings/net/minecraft/client/gui/hud/debug/RenderingChart.mapping create mode 100644 mappings/net/minecraft/client/gui/hud/debug/TickChart.mapping create mode 100644 mappings/net/minecraft/client/gui/navigation/GuiNavigation.mapping create mode 100644 mappings/net/minecraft/client/gui/navigation/GuiNavigationPath.mapping create mode 100644 mappings/net/minecraft/client/gui/navigation/GuiNavigationType.mapping create mode 100644 mappings/net/minecraft/client/gui/navigation/Navigable.mapping create mode 100644 mappings/net/minecraft/client/gui/navigation/NavigationAxis.mapping create mode 100644 mappings/net/minecraft/client/gui/navigation/NavigationDirection.mapping create mode 100644 mappings/net/minecraft/client/gui/screen/AccessibilityOnboardingButtons.mapping create mode 100644 mappings/net/minecraft/client/gui/screen/AccessibilityOnboardingScreen.mapping create mode 100644 mappings/net/minecraft/client/gui/screen/ButtonTextures.mapping delete mode 100644 mappings/net/minecraft/client/gui/screen/ChatPreviewBackground.mapping create mode 100644 mappings/net/minecraft/client/gui/screen/ReconfiguringScreen.mapping create mode 100644 mappings/net/minecraft/client/gui/screen/SplashTextRenderer.mapping create mode 100644 mappings/net/minecraft/client/gui/screen/ingame/AbstractSignEditScreen.mapping create mode 100644 mappings/net/minecraft/client/gui/screen/ingame/CyclingSlotIcon.mapping create mode 100644 mappings/net/minecraft/client/gui/screen/ingame/HangingSignEditScreen.mapping delete mode 100644 mappings/net/minecraft/client/gui/screen/multiplayer/ChatPreviewWarningScreen.mapping create mode 100644 mappings/net/minecraft/client/gui/screen/option/CreditsAndAttributionScreen.mapping create mode 100644 mappings/net/minecraft/client/gui/screen/option/TelemetryEventWidget.mapping create mode 100644 mappings/net/minecraft/client/gui/screen/option/TelemetryInfoScreen.mapping create mode 100644 mappings/net/minecraft/client/gui/screen/pack/ExperimentalWarningScreen.mapping create mode 100644 mappings/net/minecraft/client/gui/screen/report/AbuseReportTypeScreen.mapping create mode 100644 mappings/net/minecraft/client/gui/screen/report/ReportScreen.mapping create mode 100644 mappings/net/minecraft/client/gui/screen/report/SkinReportScreen.mapping create mode 100644 mappings/net/minecraft/client/gui/screen/report/UsernameReportScreen.mapping create mode 100644 mappings/net/minecraft/client/gui/screen/world/ExperimentsScreen.mapping delete mode 100644 mappings/net/minecraft/client/gui/screen/world/MoreOptionsDialog.mapping create mode 100644 mappings/net/minecraft/client/gui/screen/world/SymlinkWarningScreen.mapping create mode 100644 mappings/net/minecraft/client/gui/screen/world/WorldCreator.mapping create mode 100644 mappings/net/minecraft/client/gui/screen/world/WorldIcon.mapping create mode 100644 mappings/net/minecraft/client/gui/screen/world/WorldScreenOptionGrid.mapping create mode 100644 mappings/net/minecraft/client/gui/tab/GridScreenTab.mapping create mode 100644 mappings/net/minecraft/client/gui/tab/Tab.mapping create mode 100644 mappings/net/minecraft/client/gui/tab/TabManager.mapping create mode 100644 mappings/net/minecraft/client/gui/tooltip/FocusedTooltipPositioner.mapping create mode 100644 mappings/net/minecraft/client/gui/tooltip/HoveredTooltipPositioner.mapping create mode 100644 mappings/net/minecraft/client/gui/tooltip/Tooltip.mapping create mode 100644 mappings/net/minecraft/client/gui/tooltip/TooltipBackgroundRenderer.mapping create mode 100644 mappings/net/minecraft/client/gui/tooltip/TooltipPositioner.mapping create mode 100644 mappings/net/minecraft/client/gui/tooltip/WidgetTooltipPositioner.mapping create mode 100644 mappings/net/minecraft/client/gui/widget/AbstractTextWidget.mapping create mode 100644 mappings/net/minecraft/client/gui/widget/AxisGridWidget.mapping create mode 100644 mappings/net/minecraft/client/gui/widget/DirectionalLayoutWidget.mapping create mode 100644 mappings/net/minecraft/client/gui/widget/EmptyWidget.mapping create mode 100644 mappings/net/minecraft/client/gui/widget/GridWidget.mapping create mode 100644 mappings/net/minecraft/client/gui/widget/IconWidget.mapping create mode 100644 mappings/net/minecraft/client/gui/widget/LayoutWidget.mapping create mode 100644 mappings/net/minecraft/client/gui/widget/LayoutWidgets.mapping create mode 100644 mappings/net/minecraft/client/gui/widget/MultilineTextWidget.mapping create mode 100644 mappings/net/minecraft/client/gui/widget/NarratedMultilineTextWidget.mapping rename mappings/net/minecraft/client/gui/widget/{ButtonListWidget.mapping => OptionListWidget.mapping} (63%) create mode 100644 mappings/net/minecraft/client/gui/widget/PlayerSkinWidget.mapping create mode 100644 mappings/net/minecraft/client/gui/widget/Positioner.mapping create mode 100644 mappings/net/minecraft/client/gui/widget/ScrollableTextWidget.mapping create mode 100644 mappings/net/minecraft/client/gui/widget/SimplePositioningWidget.mapping delete mode 100644 mappings/net/minecraft/client/gui/widget/SoundSliderWidget.mapping create mode 100644 mappings/net/minecraft/client/gui/widget/TabButtonWidget.mapping create mode 100644 mappings/net/minecraft/client/gui/widget/TabNavigationWidget.mapping create mode 100644 mappings/net/minecraft/client/gui/widget/TextIconButtonWidget.mapping create mode 100644 mappings/net/minecraft/client/gui/widget/TextWidget.mapping create mode 100644 mappings/net/minecraft/client/gui/widget/ThreePartsLayoutWidget.mapping create mode 100644 mappings/net/minecraft/client/gui/widget/Widget.mapping create mode 100644 mappings/net/minecraft/client/gui/widget/WrapperWidget.mapping create mode 100644 mappings/net/minecraft/client/input/KeyCodes.mapping rename mappings/net/minecraft/client/item/{UnclampedModelPredicateProvider.mapping => ClampedModelPredicateProvider.mapping} (64%) delete mode 100644 mappings/net/minecraft/client/network/ChatPreviewRequester.mapping delete mode 100644 mappings/net/minecraft/client/network/ChatPreviewer.mapping create mode 100644 mappings/net/minecraft/client/network/ChunkBatchSizeCalculator.mapping create mode 100644 mappings/net/minecraft/client/network/ClientCommonNetworkHandler.mapping create mode 100644 mappings/net/minecraft/client/network/ClientConfigurationNetworkHandler.mapping create mode 100644 mappings/net/minecraft/client/network/ClientConnectionState.mapping create mode 100644 mappings/net/minecraft/client/network/ClientDynamicRegistryType.mapping create mode 100644 mappings/net/minecraft/client/network/LegacyServerPinger.mapping create mode 100644 mappings/net/minecraft/client/network/PingMeasurer.mapping delete mode 100644 mappings/net/minecraft/client/option/AoMode.mapping delete mode 100644 mappings/net/minecraft/client/option/ChatPreviewMode.mapping create mode 100644 mappings/net/minecraft/client/particle/CherryLeavesParticle.mapping delete mode 100644 mappings/net/minecraft/client/realms/KeyCombo.mapping create mode 100644 mappings/net/minecraft/client/realms/RealmsAvailability.mapping create mode 100644 mappings/net/minecraft/client/realms/dto/RealmsNotification.mapping create mode 100644 mappings/net/minecraft/client/realms/dto/RealmsText.mapping create mode 100644 mappings/net/minecraft/client/realms/gui/RealmsLoadingWidget.mapping create mode 100644 mappings/net/minecraft/client/realms/gui/screen/BuyRealmsScreen.mapping rename mappings/net/minecraft/client/realms/gui/screen/{RealmsClientOutdatedScreen.mapping => RealmsClientIncompatibleScreen.mapping} (93%) delete mode 100644 mappings/net/minecraft/client/realms/util/Errable.mapping delete mode 100644 mappings/net/minecraft/client/realms/util/SkinProcessor.mapping create mode 100644 mappings/net/minecraft/client/render/ChunkRenderingDataPreparer.mapping create mode 100644 mappings/net/minecraft/client/render/block/entity/BrushableBlockEntityRenderer.mapping create mode 100644 mappings/net/minecraft/client/render/block/entity/DecoratedPotBlockEntityRenderer.mapping create mode 100644 mappings/net/minecraft/client/render/block/entity/HangingSignBlockEntityRenderer.mapping create mode 100644 mappings/net/minecraft/client/render/debug/LightDebugRenderer.mapping create mode 100644 mappings/net/minecraft/client/render/debug/SupportingBlockDebugRenderer.mapping create mode 100644 mappings/net/minecraft/client/render/entity/CamelEntityRenderer.mapping create mode 100644 mappings/net/minecraft/client/render/entity/DisplayEntityRenderer.mapping create mode 100644 mappings/net/minecraft/client/render/entity/SnifferEntityRenderer.mapping create mode 100644 mappings/net/minecraft/client/render/entity/animation/CamelAnimations.mapping create mode 100644 mappings/net/minecraft/client/render/entity/animation/SnifferAnimations.mapping create mode 100644 mappings/net/minecraft/client/render/entity/model/ArmorEntityModel.mapping create mode 100644 mappings/net/minecraft/client/render/entity/model/CamelEntityModel.mapping create mode 100644 mappings/net/minecraft/client/render/entity/model/ChestBoatEntityModel.mapping create mode 100644 mappings/net/minecraft/client/render/entity/model/ChestRaftEntityModel.mapping create mode 100644 mappings/net/minecraft/client/render/entity/model/ModelWithWaterPatch.mapping create mode 100644 mappings/net/minecraft/client/render/entity/model/PiglinHeadEntityModel.mapping create mode 100644 mappings/net/minecraft/client/render/entity/model/RaftEntityModel.mapping create mode 100644 mappings/net/minecraft/client/render/entity/model/SinglePartEntityModelWithChildTransform.mapping create mode 100644 mappings/net/minecraft/client/render/entity/model/SnifferEntityModel.mapping create mode 100644 mappings/net/minecraft/client/render/model/Baker.mapping create mode 100644 mappings/net/minecraft/client/render/model/json/ModelTransformationMode.mapping create mode 100644 mappings/net/minecraft/client/report/AbuseReport.mapping create mode 100644 mappings/net/minecraft/client/report/AbuseReportType.mapping create mode 100644 mappings/net/minecraft/client/report/ContextMessageCollector.mapping delete mode 100644 mappings/net/minecraft/client/report/GroupedMessagesCollector.mapping create mode 100644 mappings/net/minecraft/client/report/SkinAbuseReport.mapping create mode 100644 mappings/net/minecraft/client/report/UsernameAbuseReport.mapping delete mode 100644 mappings/net/minecraft/client/report/log/ChatLogImpl.mapping delete mode 100644 mappings/net/minecraft/client/report/log/HeaderEntry.mapping delete mode 100644 mappings/net/minecraft/client/resource/DefaultClientResourcePack.mapping create mode 100644 mappings/net/minecraft/client/resource/DefaultClientResourcePackProvider.mapping delete mode 100644 mappings/net/minecraft/client/resource/DirectResourceIndex.mapping delete mode 100644 mappings/net/minecraft/client/resource/Format3ResourcePack.mapping delete mode 100644 mappings/net/minecraft/client/resource/Format4ResourcePack.mapping rename mappings/net/minecraft/client/resource/{ClientBuiltinResourcePackProvider.mapping => ServerResourcePackProvider.mapping} (60%) create mode 100644 mappings/net/minecraft/client/resource/metadata/GuiResourceMetadata.mapping delete mode 100644 mappings/net/minecraft/client/resource/metadata/LanguageResourceMetadataReader.mapping create mode 100644 mappings/net/minecraft/client/sound/SnifferDigSoundInstance.mapping create mode 100644 mappings/net/minecraft/client/texture/Animator.mapping create mode 100644 mappings/net/minecraft/client/texture/DynamicTexture.mapping create mode 100644 mappings/net/minecraft/client/texture/GuiAtlasManager.mapping create mode 100644 mappings/net/minecraft/client/texture/Scaling.mapping create mode 100644 mappings/net/minecraft/client/texture/SpriteContents.mapping create mode 100644 mappings/net/minecraft/client/texture/SpriteDimensions.mapping create mode 100644 mappings/net/minecraft/client/texture/SpriteLoader.mapping create mode 100644 mappings/net/minecraft/client/texture/SpriteOpener.mapping create mode 100644 mappings/net/minecraft/client/texture/atlas/AtlasLoader.mapping create mode 100644 mappings/net/minecraft/client/texture/atlas/AtlasSource.mapping create mode 100644 mappings/net/minecraft/client/texture/atlas/AtlasSourceManager.mapping create mode 100644 mappings/net/minecraft/client/texture/atlas/AtlasSourceType.mapping create mode 100644 mappings/net/minecraft/client/texture/atlas/DirectoryAtlasSource.mapping create mode 100644 mappings/net/minecraft/client/texture/atlas/FilterAtlasSource.mapping create mode 100644 mappings/net/minecraft/client/texture/atlas/PalettedPermutationsAtlasSource.mapping create mode 100644 mappings/net/minecraft/client/texture/atlas/SingleAtlasSource.mapping create mode 100644 mappings/net/minecraft/client/texture/atlas/Sprite.mapping create mode 100644 mappings/net/minecraft/client/texture/atlas/UnstitchAtlasSource.mapping create mode 100644 mappings/net/minecraft/client/util/BanReason.mapping rename mappings/net/minecraft/client/{network => util}/Bans.mapping (62%) create mode 100644 mappings/net/minecraft/client/util/CommandHistoryManager.mapping create mode 100644 mappings/net/minecraft/client/util/Icons.mapping delete mode 100644 mappings/net/minecraft/client/util/OrderableTooltip.mapping delete mode 100644 mappings/net/minecraft/client/util/PngFile.mapping create mode 100644 mappings/net/minecraft/client/util/ProfileKeysImpl.mapping create mode 100644 mappings/net/minecraft/client/util/SkinTextures.mapping delete mode 100644 mappings/net/minecraft/client/util/math/Vector3d.mapping create mode 100644 mappings/net/minecraft/client/util/telemetry/GameLoadTimeEvent.mapping create mode 100644 mappings/net/minecraft/client/util/telemetry/PerformanceMetricsEvent.mapping create mode 100644 mappings/net/minecraft/client/util/telemetry/PropertyMap.mapping create mode 100644 mappings/net/minecraft/client/util/telemetry/SampleEvent.mapping create mode 100644 mappings/net/minecraft/client/util/telemetry/SentTelemetryEvent.mapping delete mode 100644 mappings/net/minecraft/client/util/telemetry/TelemetryConstants.mapping create mode 100644 mappings/net/minecraft/client/util/telemetry/TelemetryEventProperty.mapping create mode 100644 mappings/net/minecraft/client/util/telemetry/TelemetryEventType.mapping create mode 100644 mappings/net/minecraft/client/util/telemetry/TelemetryLogManager.mapping create mode 100644 mappings/net/minecraft/client/util/telemetry/TelemetryLogger.mapping create mode 100644 mappings/net/minecraft/client/util/telemetry/TelemetryManager.mapping create mode 100644 mappings/net/minecraft/client/util/telemetry/ThreadedLogWriter.mapping create mode 100644 mappings/net/minecraft/client/util/telemetry/WorldLoadTimesEvent.mapping create mode 100644 mappings/net/minecraft/client/util/telemetry/WorldLoadedEvent.mapping create mode 100644 mappings/net/minecraft/client/util/telemetry/WorldSession.mapping create mode 100644 mappings/net/minecraft/client/util/telemetry/WorldUnloadedEvent.mapping delete mode 100644 mappings/net/minecraft/command/CommandRegistryWrapper.mapping delete mode 100644 mappings/net/minecraft/command/argument/DecoratableArgumentList.mapping delete mode 100644 mappings/net/minecraft/command/argument/DecoratableArgumentType.mapping delete mode 100644 mappings/net/minecraft/command/argument/EnchantmentArgumentType.mapping delete mode 100644 mappings/net/minecraft/command/argument/EntitySummonArgumentType.mapping create mode 100644 mappings/net/minecraft/command/argument/GameModeArgumentType.mapping create mode 100644 mappings/net/minecraft/command/argument/HeightmapArgumentType.mapping create mode 100644 mappings/net/minecraft/command/argument/RegistryEntryArgumentType.mapping create mode 100644 mappings/net/minecraft/command/argument/RegistryEntryPredicateArgumentType.mapping create mode 100644 mappings/net/minecraft/command/argument/SignedArgumentList.mapping delete mode 100644 mappings/net/minecraft/command/argument/StatusEffectArgumentType.mapping create mode 100644 mappings/net/minecraft/data/DataOutput.mapping create mode 100644 mappings/net/minecraft/data/MetadataProvider.mapping create mode 100644 mappings/net/minecraft/data/report/DynamicRegistriesProvider.mapping delete mode 100644 mappings/net/minecraft/data/report/WorldgenProvider.mapping delete mode 100644 mappings/net/minecraft/data/server/AbstractTagProvider.mapping delete mode 100644 mappings/net/minecraft/data/server/AdvancementProvider.mapping delete mode 100644 mappings/net/minecraft/data/server/AdventureTabAdvancementGenerator.mapping delete mode 100644 mappings/net/minecraft/data/server/BannerPatternTagProvider.mapping delete mode 100644 mappings/net/minecraft/data/server/BarterLootTableGenerator.mapping delete mode 100644 mappings/net/minecraft/data/server/BiomeTagProvider.mapping delete mode 100644 mappings/net/minecraft/data/server/BlockLootTableGenerator.mapping delete mode 100644 mappings/net/minecraft/data/server/BlockTagProvider.mapping delete mode 100644 mappings/net/minecraft/data/server/CatVariantTagProvider.mapping delete mode 100644 mappings/net/minecraft/data/server/ChestLootTableGenerator.mapping delete mode 100644 mappings/net/minecraft/data/server/EndTabAdvancementGenerator.mapping delete mode 100644 mappings/net/minecraft/data/server/EntityLootTableGenerator.mapping delete mode 100644 mappings/net/minecraft/data/server/EntityTypeTagProvider.mapping delete mode 100644 mappings/net/minecraft/data/server/FlatLevelGeneratorPresetTagProvider.mapping delete mode 100644 mappings/net/minecraft/data/server/FluidTagProvider.mapping delete mode 100644 mappings/net/minecraft/data/server/GameEventTagProvider.mapping delete mode 100644 mappings/net/minecraft/data/server/GiftLootTableGenerator.mapping delete mode 100644 mappings/net/minecraft/data/server/InstrumentTagProvider.mapping delete mode 100644 mappings/net/minecraft/data/server/ItemTagProvider.mapping delete mode 100644 mappings/net/minecraft/data/server/LootTableProvider.mapping delete mode 100644 mappings/net/minecraft/data/server/NetherTabAdvancementGenerator.mapping delete mode 100644 mappings/net/minecraft/data/server/PaintingVariantTagProvider.mapping delete mode 100644 mappings/net/minecraft/data/server/PointOfInterestTypeTagProvider.mapping delete mode 100644 mappings/net/minecraft/data/server/RecipeProvider.mapping delete mode 100644 mappings/net/minecraft/data/server/StoryTabAdvancementGenerator.mapping delete mode 100644 mappings/net/minecraft/data/server/StructureTagProvider.mapping delete mode 100644 mappings/net/minecraft/data/server/WorldPresetTagProvider.mapping create mode 100644 mappings/net/minecraft/data/server/advancement/AdvancementProvider.mapping create mode 100644 mappings/net/minecraft/data/server/advancement/AdvancementTabGenerator.mapping create mode 100644 mappings/net/minecraft/data/server/advancement/vanilla/VanillaAdvancementProviders.mapping create mode 100644 mappings/net/minecraft/data/server/advancement/vanilla/VanillaAdventureTabAdvancementGenerator.mapping create mode 100644 mappings/net/minecraft/data/server/advancement/vanilla/VanillaEndTabAdvancementGenerator.mapping rename mappings/net/minecraft/data/server/{HusbandryTabAdvancementGenerator.mapping => advancement/vanilla/VanillaHusbandryTabAdvancementGenerator.mapping} (52%) create mode 100644 mappings/net/minecraft/data/server/advancement/vanilla/VanillaNetherTabAdvancementGenerator.mapping create mode 100644 mappings/net/minecraft/data/server/advancement/vanilla/VanillaStoryTabAdvancementGenerator.mapping create mode 100644 mappings/net/minecraft/data/server/loottable/BlockLootTableGenerator.mapping create mode 100644 mappings/net/minecraft/data/server/loottable/EntityLootTableGenerator.mapping create mode 100644 mappings/net/minecraft/data/server/loottable/LootTableGenerator.mapping create mode 100644 mappings/net/minecraft/data/server/loottable/LootTableProvider.mapping create mode 100644 mappings/net/minecraft/data/server/loottable/vanilla/VanillaArchaeologyLootTableGenerator.mapping create mode 100644 mappings/net/minecraft/data/server/loottable/vanilla/VanillaBarterLootTableGenerator.mapping create mode 100644 mappings/net/minecraft/data/server/loottable/vanilla/VanillaBlockLootTableGenerator.mapping create mode 100644 mappings/net/minecraft/data/server/loottable/vanilla/VanillaChestLootTableGenerator.mapping create mode 100644 mappings/net/minecraft/data/server/loottable/vanilla/VanillaEntityLootTableGenerator.mapping rename mappings/net/minecraft/data/server/{FishingLootTableGenerator.mapping => loottable/vanilla/VanillaFishingLootTableGenerator.mapping} (55%) create mode 100644 mappings/net/minecraft/data/server/loottable/vanilla/VanillaGiftLootTableGenerator.mapping create mode 100644 mappings/net/minecraft/data/server/loottable/vanilla/VanillaLootTableProviders.mapping create mode 100644 mappings/net/minecraft/data/server/recipe/BundleRecipeProvider.mapping create mode 100644 mappings/net/minecraft/data/server/recipe/RecipeJsonBuilder.mapping create mode 100644 mappings/net/minecraft/data/server/recipe/RecipeProvider.mapping delete mode 100644 mappings/net/minecraft/data/server/recipe/SmithingRecipeJsonBuilder.mapping create mode 100644 mappings/net/minecraft/data/server/recipe/SmithingTransformRecipeJsonBuilder.mapping create mode 100644 mappings/net/minecraft/data/server/recipe/SmithingTrimRecipeJsonBuilder.mapping create mode 100644 mappings/net/minecraft/data/server/recipe/VanillaRecipeProvider.mapping create mode 100644 mappings/net/minecraft/data/server/tag/ItemTagProvider.mapping create mode 100644 mappings/net/minecraft/data/server/tag/TagProvider.mapping create mode 100644 mappings/net/minecraft/data/server/tag/ValueLookupTagProvider.mapping create mode 100644 mappings/net/minecraft/data/server/tag/vanilla/VanillaBannerPatternTagProvider.mapping create mode 100644 mappings/net/minecraft/data/server/tag/vanilla/VanillaBiomeTagProvider.mapping create mode 100644 mappings/net/minecraft/data/server/tag/vanilla/VanillaBlockTagProvider.mapping create mode 100644 mappings/net/minecraft/data/server/tag/vanilla/VanillaCatVariantTagProvider.mapping create mode 100644 mappings/net/minecraft/data/server/tag/vanilla/VanillaDamageTypeTagProvider.mapping create mode 100644 mappings/net/minecraft/data/server/tag/vanilla/VanillaEntityTypeTagProvider.mapping create mode 100644 mappings/net/minecraft/data/server/tag/vanilla/VanillaFlatLevelGeneratorPresetTagProvider.mapping create mode 100644 mappings/net/minecraft/data/server/tag/vanilla/VanillaFluidTagProvider.mapping create mode 100644 mappings/net/minecraft/data/server/tag/vanilla/VanillaGameEventTagProvider.mapping create mode 100644 mappings/net/minecraft/data/server/tag/vanilla/VanillaInstrumentTagProvider.mapping create mode 100644 mappings/net/minecraft/data/server/tag/vanilla/VanillaItemTagProvider.mapping create mode 100644 mappings/net/minecraft/data/server/tag/vanilla/VanillaPaintingVariantTagProvider.mapping create mode 100644 mappings/net/minecraft/data/server/tag/vanilla/VanillaPointOfInterestTypeTagProvider.mapping create mode 100644 mappings/net/minecraft/data/server/tag/vanilla/VanillaStructureTagProvider.mapping create mode 100644 mappings/net/minecraft/data/server/tag/vanilla/VanillaWorldPresetTagProvider.mapping delete mode 100644 mappings/net/minecraft/datafixer/DataFixerPhase.mapping delete mode 100644 mappings/net/minecraft/datafixer/fix/BiomeRenameFix.mapping delete mode 100644 mappings/net/minecraft/datafixer/fix/BiomesFix.mapping rename mappings/net/minecraft/datafixer/fix/{BlockEntityKeepPacked.mapping => BlockEntityKeepPackedFix.mapping} (58%) create mode 100644 mappings/net/minecraft/datafixer/fix/ChunkDeleteLightFix.mapping create mode 100644 mappings/net/minecraft/datafixer/fix/DecoratedPotFieldRenameFix.mapping create mode 100644 mappings/net/minecraft/datafixer/fix/DropInvalidSignDatafixDataFix.mapping create mode 100644 mappings/net/minecraft/datafixer/fix/EntityBrushableBlockFieldsRenameFix.mapping rename mappings/net/minecraft/datafixer/fix/{EntityTheRenameningBlock.mapping => EntityTheRenameningBlockFix.mapping} (52%) create mode 100644 mappings/net/minecraft/datafixer/fix/LegacyDragonFightFix.mapping create mode 100644 mappings/net/minecraft/datafixer/fix/OptionsAccessibilityOnboardFix.mapping create mode 100644 mappings/net/minecraft/datafixer/fix/OptionsAmbientOcclusionFix.mapping create mode 100644 mappings/net/minecraft/datafixer/fix/OptionsProgrammerArtFix.mapping create mode 100644 mappings/net/minecraft/datafixer/fix/RandomSequenceSettingsFix.mapping delete mode 100644 mappings/net/minecraft/datafixer/fix/RecipeFix.mapping delete mode 100644 mappings/net/minecraft/datafixer/fix/RecipeRenameFix.mapping delete mode 100644 mappings/net/minecraft/datafixer/fix/RecipeRenamingFix.mapping create mode 100644 mappings/net/minecraft/datafixer/fix/RemoveFeatureTogglesFix.mapping create mode 100644 mappings/net/minecraft/datafixer/fix/RenameBlockEntityFix.mapping create mode 100644 mappings/net/minecraft/datafixer/fix/RenameChunkStatusFix.mapping create mode 100644 mappings/net/minecraft/datafixer/fix/RenameScoreboardDisplaySlotFix.mapping delete mode 100644 mappings/net/minecraft/datafixer/fix/SavedDataVillageCropFix.mapping create mode 100644 mappings/net/minecraft/datafixer/fix/StatusEffectDurationFix.mapping create mode 100644 mappings/net/minecraft/datafixer/fix/StatusEffectFix.mapping create mode 100644 mappings/net/minecraft/datafixer/fix/UpdateSignTextFormatFix.mapping create mode 100644 mappings/net/minecraft/datafixer/mapping/FlatteningBiomeMapping.mapping create mode 100644 mappings/net/minecraft/datafixer/mapping/FlatteningRecipeMapping.mapping create mode 100644 mappings/net/minecraft/datafixer/mapping/WoodRecipeMapping.mapping delete mode 100644 mappings/net/minecraft/datafixer/schema/Schema1451v7.mapping create mode 100644 mappings/net/minecraft/datafixer/schema/Schema3202.mapping create mode 100644 mappings/net/minecraft/datafixer/schema/Schema3203.mapping create mode 100644 mappings/net/minecraft/datafixer/schema/Schema3204.mapping create mode 100644 mappings/net/minecraft/datafixer/schema/Schema3325.mapping create mode 100644 mappings/net/minecraft/datafixer/schema/Schema3326.mapping create mode 100644 mappings/net/minecraft/datafixer/schema/Schema3327.mapping create mode 100644 mappings/net/minecraft/datafixer/schema/Schema3328.mapping create mode 100644 mappings/net/minecraft/datafixer/schema/Schema3438.mapping create mode 100644 mappings/net/minecraft/datafixer/schema/Schema3448.mapping create mode 100644 mappings/net/minecraft/entity/Attackable.mapping create mode 100644 mappings/net/minecraft/entity/LimbAnimator.mapping create mode 100644 mappings/net/minecraft/entity/Ownable.mapping create mode 100644 mappings/net/minecraft/entity/Targeter.mapping create mode 100644 mappings/net/minecraft/entity/VariantHolder.mapping create mode 100644 mappings/net/minecraft/entity/ai/brain/MemoryQuery.mapping create mode 100644 mappings/net/minecraft/entity/ai/brain/MemoryQueryResult.mapping delete mode 100644 mappings/net/minecraft/entity/ai/brain/task/AquaticStrollTask.mapping delete mode 100644 mappings/net/minecraft/entity/ai/brain/task/ConditionalTask.mapping rename mappings/net/minecraft/entity/ai/brain/task/{WalkTask.mapping => FleeTask.mapping} (57%) delete mode 100644 mappings/net/minecraft/entity/ai/brain/task/FollowMobTask.mapping delete mode 100644 mappings/net/minecraft/entity/ai/brain/task/GoToCelebrateTask.mapping delete mode 100644 mappings/net/minecraft/entity/ai/brain/task/GoTowardsLookTarget.mapping create mode 100644 mappings/net/minecraft/entity/ai/brain/task/GoTowardsLookTargetTask.mapping delete mode 100644 mappings/net/minecraft/entity/ai/brain/task/HideInHomeDuringRaidTask.mapping create mode 100644 mappings/net/minecraft/entity/ai/brain/task/LookAtMobTask.mapping create mode 100644 mappings/net/minecraft/entity/ai/brain/task/LookAtMobWithIntervalTask.mapping create mode 100644 mappings/net/minecraft/entity/ai/brain/task/MultiTickTask.mapping delete mode 100644 mappings/net/minecraft/entity/ai/brain/task/NoPenaltyStrollTask.mapping create mode 100644 mappings/net/minecraft/entity/ai/brain/task/RandomLookAroundTask.mapping delete mode 100644 mappings/net/minecraft/entity/ai/brain/task/RunAroundAfterRaidTask.mapping delete mode 100644 mappings/net/minecraft/entity/ai/brain/task/SeekSkyAfterRaidWinTask.mapping create mode 100644 mappings/net/minecraft/entity/ai/brain/task/SingleTickTask.mapping create mode 100644 mappings/net/minecraft/entity/ai/brain/task/TaskRunnable.mapping create mode 100644 mappings/net/minecraft/entity/ai/brain/task/TaskTriggerer.mapping create mode 100644 mappings/net/minecraft/entity/ai/brain/task/Tasks.mapping delete mode 100644 mappings/net/minecraft/entity/ai/brain/task/TimeLimitedTask.mapping create mode 100644 mappings/net/minecraft/entity/ai/brain/task/WalkTowardsPosTask.mapping create mode 100644 mappings/net/minecraft/entity/ai/goal/AmbientStandGoal.mapping create mode 100644 mappings/net/minecraft/entity/ai/pathing/AmphibiousSwimNavigation.mapping create mode 100644 mappings/net/minecraft/entity/attribute/AttributeModifierCreator.mapping delete mode 100644 mappings/net/minecraft/entity/damage/BadRespawnPointDamageSource.mapping create mode 100644 mappings/net/minecraft/entity/damage/DamageEffects.mapping create mode 100644 mappings/net/minecraft/entity/damage/DamageScaling.mapping create mode 100644 mappings/net/minecraft/entity/damage/DamageSources.mapping create mode 100644 mappings/net/minecraft/entity/damage/DamageType.mapping create mode 100644 mappings/net/minecraft/entity/damage/DamageTypes.mapping create mode 100644 mappings/net/minecraft/entity/damage/DeathMessageType.mapping delete mode 100644 mappings/net/minecraft/entity/damage/EntityDamageSource.mapping create mode 100644 mappings/net/minecraft/entity/damage/FallLocation.mapping delete mode 100644 mappings/net/minecraft/entity/damage/ProjectileDamageSource.mapping create mode 100644 mappings/net/minecraft/entity/decoration/Brightness.mapping create mode 100644 mappings/net/minecraft/entity/decoration/DisplayEntity.mapping create mode 100644 mappings/net/minecraft/entity/decoration/InteractionEntity.mapping create mode 100644 mappings/net/minecraft/entity/effect/BadOmenStatusEffect.mapping delete mode 100644 mappings/net/minecraft/entity/effect/DamageModifierStatusEffect.mapping delete mode 100644 mappings/net/minecraft/entity/effect/HealthBoostStatusEffect.mapping create mode 100644 mappings/net/minecraft/entity/effect/HungerStatusEffect.mapping create mode 100644 mappings/net/minecraft/entity/effect/InstantHealthOrDamageStatusEffect.mapping create mode 100644 mappings/net/minecraft/entity/effect/PoisonStatusEffect.mapping create mode 100644 mappings/net/minecraft/entity/effect/RegenerationStatusEffect.mapping create mode 100644 mappings/net/minecraft/entity/effect/SaturationStatusEffect.mapping create mode 100644 mappings/net/minecraft/entity/effect/WitherStatusEffect.mapping delete mode 100644 mappings/net/minecraft/entity/passive/AxolotlSwimNavigation.mapping create mode 100644 mappings/net/minecraft/entity/passive/CamelBrain.mapping create mode 100644 mappings/net/minecraft/entity/passive/CamelEntity.mapping create mode 100644 mappings/net/minecraft/entity/passive/SnifferBrain.mapping create mode 100644 mappings/net/minecraft/entity/passive/SnifferEntity.mapping create mode 100644 mappings/net/minecraft/inventory/RecipeInputInventory.mapping create mode 100644 mappings/net/minecraft/inventory/SingleStackInventory.mapping create mode 100644 mappings/net/minecraft/item/BrushItem.mapping delete mode 100644 mappings/net/minecraft/item/CommandBlockItem.mapping create mode 100644 mappings/net/minecraft/item/Equipment.mapping create mode 100644 mappings/net/minecraft/item/GlowInkSacItem.mapping create mode 100644 mappings/net/minecraft/item/HangingSignItem.mapping create mode 100644 mappings/net/minecraft/item/InkSacItem.mapping create mode 100644 mappings/net/minecraft/item/ItemGroups.mapping create mode 100644 mappings/net/minecraft/item/ItemStackSet.mapping create mode 100644 mappings/net/minecraft/item/OperatorOnlyBlockItem.mapping create mode 100644 mappings/net/minecraft/item/SignChangingItem.mapping create mode 100644 mappings/net/minecraft/item/SmithingTemplateItem.mapping create mode 100644 mappings/net/minecraft/item/VerticallyAttachableBlockItem.mapping delete mode 100644 mappings/net/minecraft/item/WallStandingBlockItem.mapping delete mode 100644 mappings/net/minecraft/item/Wearable.mapping create mode 100644 mappings/net/minecraft/item/trim/ArmorTrim.mapping create mode 100644 mappings/net/minecraft/item/trim/ArmorTrimMaterial.mapping create mode 100644 mappings/net/minecraft/item/trim/ArmorTrimMaterials.mapping create mode 100644 mappings/net/minecraft/item/trim/ArmorTrimPattern.mapping create mode 100644 mappings/net/minecraft/item/trim/ArmorTrimPatterns.mapping create mode 100644 mappings/net/minecraft/loot/AndFunction.mapping create mode 100644 mappings/net/minecraft/loot/LootDataKey.mapping create mode 100644 mappings/net/minecraft/loot/LootDataLookup.mapping create mode 100644 mappings/net/minecraft/loot/LootDataType.mapping delete mode 100644 mappings/net/minecraft/loot/LootGsons.mapping create mode 100644 mappings/net/minecraft/loot/condition/AllOfLootCondition.mapping create mode 100644 mappings/net/minecraft/loot/condition/AnyOfLootCondition.mapping delete mode 100644 mappings/net/minecraft/loot/condition/LootConditionManager.mapping create mode 100644 mappings/net/minecraft/loot/context/LootContextParameterSet.mapping delete mode 100644 mappings/net/minecraft/loot/function/LootFunctionManager.mapping create mode 100644 mappings/net/minecraft/loot/function/ReferenceLootFunction.mapping delete mode 100644 mappings/net/minecraft/loot/function/SetGoatHornSoundLootFunction.mapping create mode 100644 mappings/net/minecraft/loot/function/SetInstrumentLootFunction.mapping delete mode 100644 mappings/net/minecraft/network/DecoderHandler.mapping delete mode 100644 mappings/net/minecraft/network/LegacyQueryHandler.mapping delete mode 100644 mappings/net/minecraft/network/Packet.mapping delete mode 100644 mappings/net/minecraft/network/PacketEncoder.mapping delete mode 100644 mappings/net/minecraft/network/PacketEncoderException.mapping create mode 100644 mappings/net/minecraft/network/QueryableServer.mapping delete mode 100644 mappings/net/minecraft/network/SplitterHandler.mapping create mode 100644 mappings/net/minecraft/network/encoding/StringEncoding.mapping create mode 100644 mappings/net/minecraft/network/encoding/VarInts.mapping create mode 100644 mappings/net/minecraft/network/encoding/VarLongs.mapping create mode 100644 mappings/net/minecraft/network/encryption/ClientPlayerSession.mapping create mode 100644 mappings/net/minecraft/network/encryption/PublicPlayerSession.mapping create mode 100644 mappings/net/minecraft/network/handler/DecoderHandler.mapping create mode 100644 mappings/net/minecraft/network/handler/LegacyQueries.mapping create mode 100644 mappings/net/minecraft/network/handler/LegacyQueryHandler.mapping create mode 100644 mappings/net/minecraft/network/handler/NetworkStateTransitionHandler.mapping create mode 100644 mappings/net/minecraft/network/handler/PacketBundleHandler.mapping create mode 100644 mappings/net/minecraft/network/handler/PacketBundler.mapping rename mappings/net/minecraft/network/{ => handler}/PacketDeflater.mapping (85%) create mode 100644 mappings/net/minecraft/network/handler/PacketEncoder.mapping create mode 100644 mappings/net/minecraft/network/handler/PacketEncoderException.mapping rename mappings/net/minecraft/network/{ => handler}/PacketInflater.mapping (66%) create mode 100644 mappings/net/minecraft/network/handler/PacketSizeLogger.mapping create mode 100644 mappings/net/minecraft/network/handler/PacketUnbundler.mapping create mode 100644 mappings/net/minecraft/network/handler/PacketValidator.mapping rename mappings/net/minecraft/network/{ => handler}/SizePrepender.mapping (80%) create mode 100644 mappings/net/minecraft/network/handler/SplitterHandler.mapping create mode 100644 mappings/net/minecraft/network/listener/ClientCommonPacketListener.mapping create mode 100644 mappings/net/minecraft/network/listener/ClientConfigurationPacketListener.mapping create mode 100644 mappings/net/minecraft/network/listener/ClientPacketListener.mapping create mode 100644 mappings/net/minecraft/network/listener/ClientPingResultPacketListener.mapping create mode 100644 mappings/net/minecraft/network/listener/ServerCommonPacketListener.mapping create mode 100644 mappings/net/minecraft/network/listener/ServerConfigurationPacketListener.mapping create mode 100644 mappings/net/minecraft/network/listener/ServerCrashSafePacketListener.mapping create mode 100644 mappings/net/minecraft/network/listener/ServerQueryPingPacketListener.mapping create mode 100644 mappings/net/minecraft/network/message/AcknowledgedMessage.mapping delete mode 100644 mappings/net/minecraft/network/message/CachedDecoratorResult.mapping delete mode 100644 mappings/net/minecraft/network/message/DecoratedContents.mapping delete mode 100644 mappings/net/minecraft/network/message/MessageHeader.mapping create mode 100644 mappings/net/minecraft/network/message/MessageLink.mapping delete mode 100644 mappings/net/minecraft/network/message/MessageMetadata.mapping create mode 100644 mappings/net/minecraft/network/message/MessageSignatureStorage.mapping delete mode 100644 mappings/net/minecraft/network/message/MessageSourceProfile.mapping create mode 100644 mappings/net/minecraft/network/packet/BrandCustomPayload.mapping create mode 100644 mappings/net/minecraft/network/packet/BundlePacket.mapping create mode 100644 mappings/net/minecraft/network/packet/BundleSplitterPacket.mapping create mode 100644 mappings/net/minecraft/network/packet/CustomPayload.mapping create mode 100644 mappings/net/minecraft/network/packet/Packet.mapping create mode 100644 mappings/net/minecraft/network/packet/UnknownCustomPayload.mapping rename mappings/net/minecraft/network/packet/c2s/{play/PlayPongC2SPacket.mapping => common/CommonPongC2SPacket.mapping} (73%) create mode 100644 mappings/net/minecraft/network/packet/c2s/common/CustomPayloadC2SPacket.mapping rename mappings/net/minecraft/network/packet/c2s/{play => common}/KeepAliveC2SPacket.mapping (88%) rename mappings/net/minecraft/network/packet/c2s/{play => common}/ResourcePackStatusC2SPacket.mapping (90%) create mode 100644 mappings/net/minecraft/network/packet/c2s/config/ReadyC2SPacket.mapping create mode 100644 mappings/net/minecraft/network/packet/c2s/handshake/ConnectionIntent.mapping create mode 100644 mappings/net/minecraft/network/packet/c2s/login/EnterConfigurationC2SPacket.mapping create mode 100644 mappings/net/minecraft/network/packet/c2s/login/LoginQueryResponsePayload.mapping create mode 100644 mappings/net/minecraft/network/packet/c2s/login/UnknownLoginQueryResponsePayload.mapping create mode 100644 mappings/net/minecraft/network/packet/c2s/play/AcknowledgeChunksC2SPacket.mapping create mode 100644 mappings/net/minecraft/network/packet/c2s/play/AcknowledgeReconfigurationC2SPacket.mapping delete mode 100644 mappings/net/minecraft/network/packet/c2s/play/CustomPayloadC2SPacket.mapping create mode 100644 mappings/net/minecraft/network/packet/c2s/play/PlayerSessionC2SPacket.mapping delete mode 100644 mappings/net/minecraft/network/packet/c2s/play/RequestChatPreviewC2SPacket.mapping rename mappings/net/minecraft/network/packet/s2c/{play/PlayPingS2CPacket.mapping => common/CommonPingS2CPacket.mapping} (76%) create mode 100644 mappings/net/minecraft/network/packet/s2c/common/CustomPayloadS2CPacket.mapping rename mappings/net/minecraft/network/packet/s2c/{play => common}/DisconnectS2CPacket.mapping (91%) rename mappings/net/minecraft/network/packet/s2c/{play => common}/KeepAliveS2CPacket.mapping (88%) rename mappings/net/minecraft/network/packet/s2c/{play => common}/ResourcePackSendS2CPacket.mapping (80%) rename mappings/net/minecraft/network/packet/s2c/{play => common}/SynchronizeTagsS2CPacket.mapping (60%) create mode 100644 mappings/net/minecraft/network/packet/s2c/config/DynamicRegistriesS2CPacket.mapping create mode 100644 mappings/net/minecraft/network/packet/s2c/config/FeaturesS2CPacket.mapping create mode 100644 mappings/net/minecraft/network/packet/s2c/config/ReadyS2CPacket.mapping create mode 100644 mappings/net/minecraft/network/packet/s2c/custom/DebugBeeCustomPayload.mapping create mode 100644 mappings/net/minecraft/network/packet/s2c/custom/DebugBrainCustomPayload.mapping create mode 100644 mappings/net/minecraft/network/packet/s2c/custom/DebugGameEventCustomPayload.mapping create mode 100644 mappings/net/minecraft/network/packet/s2c/custom/DebugGameEventListenersCustomPayload.mapping create mode 100644 mappings/net/minecraft/network/packet/s2c/custom/DebugGameTestAddMarkerCustomPayload.mapping create mode 100644 mappings/net/minecraft/network/packet/s2c/custom/DebugGameTestClearCustomPayload.mapping create mode 100644 mappings/net/minecraft/network/packet/s2c/custom/DebugGoalSelectorCustomPayload.mapping create mode 100644 mappings/net/minecraft/network/packet/s2c/custom/DebugHiveCustomPayload.mapping create mode 100644 mappings/net/minecraft/network/packet/s2c/custom/DebugNeighborsUpdateCustomPayload.mapping create mode 100644 mappings/net/minecraft/network/packet/s2c/custom/DebugPathCustomPayload.mapping create mode 100644 mappings/net/minecraft/network/packet/s2c/custom/DebugPoiAddedCustomPayload.mapping create mode 100644 mappings/net/minecraft/network/packet/s2c/custom/DebugPoiRemovedCustomPayload.mapping create mode 100644 mappings/net/minecraft/network/packet/s2c/custom/DebugPoiTicketCountCustomPayload.mapping create mode 100644 mappings/net/minecraft/network/packet/s2c/custom/DebugRaidsCustomPayload.mapping create mode 100644 mappings/net/minecraft/network/packet/s2c/custom/DebugStructuresCustomPayload.mapping create mode 100644 mappings/net/minecraft/network/packet/s2c/custom/DebugVillageSectionsCustomPayload.mapping create mode 100644 mappings/net/minecraft/network/packet/s2c/custom/DebugWorldgenAttemptCustomPayload.mapping create mode 100644 mappings/net/minecraft/network/packet/s2c/login/LoginQueryRequestPayload.mapping create mode 100644 mappings/net/minecraft/network/packet/s2c/login/UnknownLoginQueryRequestPayload.mapping create mode 100644 mappings/net/minecraft/network/packet/s2c/play/BundleS2CPacket.mapping delete mode 100644 mappings/net/minecraft/network/packet/s2c/play/ChatPreviewS2CPacket.mapping delete mode 100644 mappings/net/minecraft/network/packet/s2c/play/ChatPreviewStateChangeS2CPacket.mapping create mode 100644 mappings/net/minecraft/network/packet/s2c/play/ChunkBiomeDataS2CPacket.mapping create mode 100644 mappings/net/minecraft/network/packet/s2c/play/ChunkSentS2CPacket.mapping create mode 100644 mappings/net/minecraft/network/packet/s2c/play/CommonPlayerSpawnInfo.mapping delete mode 100644 mappings/net/minecraft/network/packet/s2c/play/CustomPayloadS2CPacket.mapping create mode 100644 mappings/net/minecraft/network/packet/s2c/play/DamageTiltS2CPacket.mapping create mode 100644 mappings/net/minecraft/network/packet/s2c/play/EnterReconfigurationS2CPacket.mapping create mode 100644 mappings/net/minecraft/network/packet/s2c/play/EntityDamageS2CPacket.mapping delete mode 100644 mappings/net/minecraft/network/packet/s2c/play/MessageHeaderS2CPacket.mapping delete mode 100644 mappings/net/minecraft/network/packet/s2c/play/PlaySoundIdS2CPacket.mapping create mode 100644 mappings/net/minecraft/network/packet/s2c/play/PlayerRemoveS2CPacket.mapping create mode 100644 mappings/net/minecraft/network/packet/s2c/play/PositionFlag.mapping create mode 100644 mappings/net/minecraft/network/packet/s2c/play/ProfilelessChatMessageS2CPacket.mapping rename mappings/net/minecraft/network/packet/s2c/play/{HideMessageS2CPacket.mapping => RemoveMessageS2CPacket.mapping} (81%) create mode 100644 mappings/net/minecraft/network/packet/s2c/play/StartChunkSendS2CPacket.mapping rename mappings/net/minecraft/network/packet/s2c/query/{QueryPongS2CPacket.mapping => PingResultS2CPacket.mapping} (89%) create mode 100644 mappings/net/minecraft/predicate/TagPredicate.mapping delete mode 100644 mappings/net/minecraft/predicate/entity/AdvancementEntityPredicateSerializer.mapping create mode 100644 mappings/net/minecraft/predicate/entity/LootContextPredicate.mapping create mode 100644 mappings/net/minecraft/recipe/CraftingDecoratedPotRecipe.mapping create mode 100644 mappings/net/minecraft/recipe/SmithingTransformRecipe.mapping create mode 100644 mappings/net/minecraft/recipe/SmithingTrimRecipe.mapping create mode 100644 mappings/net/minecraft/recipe/book/CookingRecipeCategory.mapping create mode 100644 mappings/net/minecraft/recipe/book/CraftingRecipeCategory.mapping create mode 100644 mappings/net/minecraft/recipe/book/RecipeCategory.mapping create mode 100644 mappings/net/minecraft/registry/BuiltinRegistries.mapping create mode 100644 mappings/net/minecraft/registry/CombinedDynamicRegistries.mapping create mode 100644 mappings/net/minecraft/registry/DefaultedRegistry.mapping create mode 100644 mappings/net/minecraft/registry/DynamicRegistryManager.mapping create mode 100644 mappings/net/minecraft/registry/MutableRegistry.mapping create mode 100644 mappings/net/minecraft/registry/Registerable.mapping create mode 100644 mappings/net/minecraft/registry/Registries.mapping create mode 100644 mappings/net/minecraft/registry/Registry.mapping create mode 100644 mappings/net/minecraft/registry/RegistryBuilder.mapping rename mappings/net/minecraft/{util => }/registry/RegistryCodecs.mapping (52%) create mode 100644 mappings/net/minecraft/registry/RegistryEntryLookup.mapping rename mappings/net/minecraft/{util => }/registry/RegistryKey.mapping (87%) create mode 100644 mappings/net/minecraft/registry/RegistryKeys.mapping create mode 100644 mappings/net/minecraft/registry/RegistryLoader.mapping create mode 100644 mappings/net/minecraft/registry/RegistryOps.mapping create mode 100644 mappings/net/minecraft/registry/RegistryWrapper.mapping create mode 100644 mappings/net/minecraft/registry/SerializableRegistries.mapping create mode 100644 mappings/net/minecraft/registry/ServerDynamicRegistryType.mapping create mode 100644 mappings/net/minecraft/registry/SimpleDefaultedRegistry.mapping rename mappings/net/minecraft/{util => }/registry/SimpleRegistry.mapping (64%) rename mappings/net/minecraft/{util/dynamic => registry/entry}/RegistryElementCodec.mapping (83%) create mode 100644 mappings/net/minecraft/registry/entry/RegistryEntry.mapping create mode 100644 mappings/net/minecraft/registry/entry/RegistryEntryList.mapping rename mappings/net/minecraft/{util/registry => registry/entry}/RegistryEntryListCodec.mapping (91%) create mode 100644 mappings/net/minecraft/registry/entry/RegistryEntryOwner.mapping rename mappings/net/minecraft/{util/registry => registry/entry}/RegistryFixedCodec.mapping (81%) rename mappings/net/minecraft/{ => registry}/tag/BannerPatternTags.mapping (51%) rename mappings/net/minecraft/{ => registry}/tag/BiomeTags.mapping (54%) rename mappings/net/minecraft/{ => registry}/tag/BlockTags.mapping (54%) rename mappings/net/minecraft/{ => registry}/tag/CatVariantTags.mapping (52%) create mode 100644 mappings/net/minecraft/registry/tag/DamageTypeTags.mapping rename mappings/net/minecraft/{ => registry}/tag/EntityTypeTags.mapping (52%) create mode 100644 mappings/net/minecraft/registry/tag/FlatLevelGeneratorPresetTags.mapping rename mappings/net/minecraft/{ => registry}/tag/FluidTags.mapping (54%) rename mappings/net/minecraft/{ => registry}/tag/GameEventTags.mapping (53%) rename mappings/net/minecraft/{ => registry}/tag/InstrumentTags.mapping (52%) rename mappings/net/minecraft/{ => registry}/tag/ItemTags.mapping (55%) rename mappings/net/minecraft/{ => registry}/tag/PaintingVariantTags.mapping (51%) rename mappings/net/minecraft/{ => registry}/tag/PointOfInterestTypeTags.mapping (50%) rename mappings/net/minecraft/{ => registry}/tag/StructureTags.mapping (53%) rename mappings/net/minecraft/{ => registry}/tag/TagBuilder.mapping (91%) rename mappings/net/minecraft/{ => registry}/tag/TagEntry.mapping (96%) rename mappings/net/minecraft/{ => registry}/tag/TagFile.mapping (74%) create mode 100644 mappings/net/minecraft/registry/tag/TagGroupLoader.mapping rename mappings/net/minecraft/{ => registry}/tag/TagKey.mapping (94%) rename mappings/net/minecraft/{ => registry}/tag/TagManagerLoader.mapping (93%) rename mappings/net/minecraft/{ => registry}/tag/TagPacketSerializer.mapping (87%) rename mappings/net/minecraft/{ => registry}/tag/WorldPresetTags.mapping (52%) create mode 100644 mappings/net/minecraft/resource/DataConfiguration.mapping create mode 100644 mappings/net/minecraft/resource/DefaultResourcePackBuilder.mapping create mode 100644 mappings/net/minecraft/resource/DependencyTracker.mapping create mode 100644 mappings/net/minecraft/resource/InputSupplier.mapping create mode 100644 mappings/net/minecraft/resource/OverlayResourcePack.mapping create mode 100644 mappings/net/minecraft/resource/ResourceFinder.mapping delete mode 100644 mappings/net/minecraft/resource/ResourceNotFoundException.mapping create mode 100644 mappings/net/minecraft/resource/ResourcePackOpener.mapping create mode 100644 mappings/net/minecraft/resource/VanillaResourcePackProvider.mapping create mode 100644 mappings/net/minecraft/resource/featuretoggle/FeatureFlag.mapping create mode 100644 mappings/net/minecraft/resource/featuretoggle/FeatureFlags.mapping create mode 100644 mappings/net/minecraft/resource/featuretoggle/FeatureManager.mapping create mode 100644 mappings/net/minecraft/resource/featuretoggle/FeatureSet.mapping create mode 100644 mappings/net/minecraft/resource/featuretoggle/FeatureUniverse.mapping create mode 100644 mappings/net/minecraft/resource/featuretoggle/ToggleableFeature.mapping create mode 100644 mappings/net/minecraft/resource/fs/ResourceFile.mapping create mode 100644 mappings/net/minecraft/resource/fs/ResourceFileAttributes.mapping create mode 100644 mappings/net/minecraft/resource/fs/ResourceFileStore.mapping create mode 100644 mappings/net/minecraft/resource/fs/ResourceFileSystem.mapping create mode 100644 mappings/net/minecraft/resource/fs/ResourceFileSystemProvider.mapping create mode 100644 mappings/net/minecraft/resource/fs/ResourcePath.mapping create mode 100644 mappings/net/minecraft/resource/metadata/BlockEntry.mapping create mode 100644 mappings/net/minecraft/resource/metadata/PackFeatureSetMetadata.mapping create mode 100644 mappings/net/minecraft/resource/metadata/PackOverlaysMetadata.mapping delete mode 100644 mappings/net/minecraft/resource/metadata/PackResourceMetadataReader.mapping create mode 100644 mappings/net/minecraft/resource/metadata/ResourceMetadataMap.mapping create mode 100644 mappings/net/minecraft/resource/metadata/ResourceMetadataSerializer.mapping create mode 100644 mappings/net/minecraft/scoreboard/ScoreboardDisplaySlot.mapping create mode 100644 mappings/net/minecraft/screen/slot/ForgingSlotsManager.mapping create mode 100644 mappings/net/minecraft/server/command/DamageCommand.mapping create mode 100644 mappings/net/minecraft/server/command/DebugConfigCommand.mapping create mode 100644 mappings/net/minecraft/server/command/FillBiomeCommand.mapping create mode 100644 mappings/net/minecraft/server/command/RandomCommand.mapping create mode 100644 mappings/net/minecraft/server/command/ReturnCommand.mapping create mode 100644 mappings/net/minecraft/server/command/RideCommand.mapping create mode 100644 mappings/net/minecraft/server/command/SpawnArmorTrimsCommand.mapping create mode 100644 mappings/net/minecraft/server/function/MacroException.mapping create mode 100644 mappings/net/minecraft/server/network/ChunkDataSender.mapping create mode 100644 mappings/net/minecraft/server/network/ChunkFilter.mapping create mode 100644 mappings/net/minecraft/server/network/JoinWorldTask.mapping create mode 100644 mappings/net/minecraft/server/network/PlayerAssociatedNetworkHandler.mapping create mode 100644 mappings/net/minecraft/server/network/SendResourcePackTask.mapping create mode 100644 mappings/net/minecraft/server/network/ServerCommonNetworkHandler.mapping create mode 100644 mappings/net/minecraft/server/network/ServerConfigurationNetworkHandler.mapping create mode 100644 mappings/net/minecraft/server/network/ServerPlayerConfigurationTask.mapping create mode 100644 mappings/net/minecraft/server/world/ChunkLevelType.mapping create mode 100644 mappings/net/minecraft/server/world/ChunkLevels.mapping delete mode 100644 mappings/net/minecraft/server/world/EntityTrackingListener.mapping create mode 100644 mappings/net/minecraft/structure/BastionHoglinStableData.mapping delete mode 100644 mappings/net/minecraft/structure/HoglinStableData.mapping create mode 100644 mappings/net/minecraft/structure/TrailRuinsGenerator.mapping create mode 100644 mappings/net/minecraft/structure/processor/CappedStructureProcessor.mapping create mode 100644 mappings/net/minecraft/structure/rule/blockentity/AppendLootRuleBlockEntityModifier.mapping create mode 100644 mappings/net/minecraft/structure/rule/blockentity/AppendStaticRuleBlockEntityModifier.mapping create mode 100644 mappings/net/minecraft/structure/rule/blockentity/ClearRuleBlockEntityModifier.mapping create mode 100644 mappings/net/minecraft/structure/rule/blockentity/PassthroughRuleBlockEntityModifier.mapping create mode 100644 mappings/net/minecraft/structure/rule/blockentity/RuleBlockEntityModifier.mapping create mode 100644 mappings/net/minecraft/structure/rule/blockentity/RuleBlockEntityModifierType.mapping delete mode 100644 mappings/net/minecraft/tag/FlatLevelGeneratorPresetTags.mapping delete mode 100644 mappings/net/minecraft/tag/TagGroupLoader.mapping rename mappings/net/minecraft/{client/resource/language => text}/TextReorderingProcessor.mapping (91%) rename mappings/net/minecraft/{client/font => text}/TextVisitFactory.mapping (98%) delete mode 100644 mappings/net/minecraft/unused/packageinfo/PackageInfo6204.mapping create mode 100644 mappings/net/minecraft/unused/packageinfo/PackageInfo7676.mapping create mode 100644 mappings/net/minecraft/unused/packageinfo/PackageInfo7694.mapping create mode 100644 mappings/net/minecraft/unused/packageinfo/PackageInfo7702.mapping create mode 100644 mappings/net/minecraft/unused/packageinfo/PackageInfo7727.mapping create mode 100644 mappings/net/minecraft/unused/packageinfo/PackageInfo7728.mapping create mode 100644 mappings/net/minecraft/unused/packageinfo/PackageInfo7787.mapping create mode 100644 mappings/net/minecraft/unused/packageinfo/PackageInfo7795.mapping create mode 100644 mappings/net/minecraft/unused/packageinfo/PackageInfo7797.mapping create mode 100644 mappings/net/minecraft/unused/packageinfo/PackageInfo7804.mapping create mode 100644 mappings/net/minecraft/unused/packageinfo/PackageInfo7888.mapping create mode 100644 mappings/net/minecraft/unused/packageinfo/PackageInfo7912.mapping create mode 100644 mappings/net/minecraft/unused/packageinfo/PackageInfo7925.mapping create mode 100644 mappings/net/minecraft/unused/packageinfo/PackageInfo7937.mapping create mode 100644 mappings/net/minecraft/unused/packageinfo/PackageInfo7945.mapping create mode 100644 mappings/net/minecraft/unused/packageinfo/PackageInfo7953.mapping create mode 100644 mappings/net/minecraft/unused/packageinfo/PackageInfo7961.mapping create mode 100644 mappings/net/minecraft/unused/packageinfo/PackageInfo7983.mapping create mode 100644 mappings/net/minecraft/unused/packageinfo/PackageInfo7984.mapping create mode 100644 mappings/net/minecraft/unused/packageinfo/PackageInfo8008.mapping create mode 100644 mappings/net/minecraft/unused/packageinfo/PackageInfo8022.mapping create mode 100644 mappings/net/minecraft/unused/packageinfo/PackageInfo8031.mapping create mode 100644 mappings/net/minecraft/unused/packageinfo/PackageInfo8058.mapping create mode 100644 mappings/net/minecraft/unused/packageinfo/PackageInfo8091.mapping create mode 100644 mappings/net/minecraft/unused/packageinfo/PackageInfo8250.mapping create mode 100644 mappings/net/minecraft/unused/packageinfo/PackageInfo8501.mapping create mode 100644 mappings/net/minecraft/unused/packageinfo/PackageInfo8585.mapping create mode 100644 mappings/net/minecraft/unused/packageinfo/PackageInfo8598.mapping create mode 100644 mappings/net/minecraft/unused/packageinfo/PackageInfo8613.mapping create mode 100644 mappings/net/minecraft/unused/packageinfo/PackageInfo8696.mapping create mode 100644 mappings/net/minecraft/unused/packageinfo/PackageInfo8730.mapping create mode 100644 mappings/net/minecraft/unused/packageinfo/PackageInfo8731.mapping create mode 100644 mappings/net/minecraft/unused/packageinfo/PackageInfo8737.mapping create mode 100644 mappings/net/minecraft/util/CachedMapper.mapping create mode 100644 mappings/net/minecraft/util/Colors.mapping create mode 100644 mappings/net/minecraft/util/InvalidHierarchicalFileException.mapping delete mode 100644 mappings/net/minecraft/util/JsonSerializableType.mapping delete mode 100644 mappings/net/minecraft/util/JsonSerializer.mapping delete mode 100644 mappings/net/minecraft/util/JsonSerializing.mapping delete mode 100644 mappings/net/minecraft/util/MetricsData.mapping create mode 100644 mappings/net/minecraft/util/Nullables.mapping rename mappings/net/minecraft/util/{FileNameUtil.mapping => PathUtil.mapping} (55%) delete mode 100644 mappings/net/minecraft/util/PendingTaskRunner.mapping create mode 100644 mappings/net/minecraft/util/Urls.mapping rename mappings/net/minecraft/util/{dynamic/DynamicSerializableUuid.mapping => Uuids.mapping} (53%) create mode 100644 mappings/net/minecraft/util/collection/ArrayListDeque.mapping delete mode 100644 mappings/net/minecraft/util/dynamic/EntryLoader.mapping delete mode 100644 mappings/net/minecraft/util/dynamic/RegistryLoader.mapping delete mode 100644 mappings/net/minecraft/util/dynamic/RegistryOps.mapping create mode 100644 mappings/net/minecraft/util/function/LazyIterationConsumer.mapping delete mode 100644 mappings/net/minecraft/util/function/MaterialPredicate.mapping create mode 100644 mappings/net/minecraft/util/function/ValueLists.mapping create mode 100644 mappings/net/minecraft/util/logging/LogFileCompressor.mapping create mode 100644 mappings/net/minecraft/util/logging/LogReader.mapping create mode 100644 mappings/net/minecraft/util/logging/LogWriter.mapping create mode 100644 mappings/net/minecraft/util/math/Divider.mapping create mode 100644 mappings/net/minecraft/util/math/GivensPair.mapping delete mode 100644 mappings/net/minecraft/util/math/Matrix3f.mapping delete mode 100644 mappings/net/minecraft/util/math/Matrix4f.mapping create mode 100644 mappings/net/minecraft/util/math/MatrixUtil.mapping delete mode 100644 mappings/net/minecraft/util/math/Quaternion.mapping create mode 100644 mappings/net/minecraft/util/math/RotationAxis.mapping create mode 100644 mappings/net/minecraft/util/math/RotationCalculator.mapping create mode 100644 mappings/net/minecraft/util/math/RotationPropertyHelper.mapping delete mode 100644 mappings/net/minecraft/util/math/Vec3f.mapping delete mode 100644 mappings/net/minecraft/util/math/Vector4f.mapping create mode 100644 mappings/net/minecraft/util/math/random/RandomSequence.mapping create mode 100644 mappings/net/minecraft/util/math/random/RandomSequencesState.mapping create mode 100644 mappings/net/minecraft/util/path/AllowedSymlinkPathMatcher.mapping create mode 100644 mappings/net/minecraft/util/path/SymlinkEntry.mapping create mode 100644 mappings/net/minecraft/util/path/SymlinkFinder.mapping create mode 100644 mappings/net/minecraft/util/path/SymlinkValidationException.mapping create mode 100644 mappings/net/minecraft/util/profiler/PerformanceLog.mapping delete mode 100644 mappings/net/minecraft/util/profiling/jfr/sample/TimedSample.mapping delete mode 100644 mappings/net/minecraft/util/registry/BuiltinRegistries.mapping delete mode 100644 mappings/net/minecraft/util/registry/DefaultedRegistry.mapping delete mode 100644 mappings/net/minecraft/util/registry/DynamicRegistryManager.mapping delete mode 100644 mappings/net/minecraft/util/registry/MutableRegistry.mapping delete mode 100644 mappings/net/minecraft/util/registry/Registry.mapping delete mode 100644 mappings/net/minecraft/util/registry/RegistryEntry.mapping delete mode 100644 mappings/net/minecraft/util/registry/RegistryEntryList.mapping create mode 100644 mappings/net/minecraft/world/RedstoneView.mapping rename mappings/net/minecraft/world/{level => biome}/ColorResolver.mapping (58%) create mode 100644 mappings/net/minecraft/world/biome/source/MultiNoiseBiomeSourceParameterList.mapping create mode 100644 mappings/net/minecraft/world/biome/source/MultiNoiseBiomeSourceParameterLists.mapping rename mappings/net/minecraft/world/chunk/{ReadOnlyChunk.mapping => WrapperProtoChunk.mapping} (57%) create mode 100644 mappings/net/minecraft/world/chunk/light/ChunkSkyLight.mapping create mode 100644 mappings/net/minecraft/world/chunk/light/LightSourceView.mapping create mode 100644 mappings/net/minecraft/world/chunk/light/PendingUpdateQueue.mapping create mode 100644 mappings/net/minecraft/world/dimension/DimensionOptionsRegistryHolder.mapping rename mappings/net/minecraft/world/dimension/{AreaHelper.mapping => NetherPortal.mapping} (81%) create mode 100644 mappings/net/minecraft/world/event/Vibrations.mapping create mode 100644 mappings/net/minecraft/world/event/listener/GameEventDispatchManager.mapping create mode 100644 mappings/net/minecraft/world/event/listener/Vibration.mapping delete mode 100644 mappings/net/minecraft/world/event/listener/VibrationListener.mapping create mode 100644 mappings/net/minecraft/world/event/listener/VibrationSelector.mapping create mode 100644 mappings/net/minecraft/world/gen/chunk/placement/StructurePlacementCalculator.mapping create mode 100644 mappings/net/minecraft/world/gen/foliage/CherryFoliagePlacer.mapping create mode 100644 mappings/net/minecraft/world/gen/trunk/CherryTrunkPlacer.mapping create mode 100644 mappings/net/minecraft/world/level/WorldGenSettings.mapping rename mappings/net/minecraft/world/{ => tick}/TickPriority.mapping (72%) create mode 100644 src/packageDocs/java/net/minecraft/block/cauldron/package-info.java create mode 100644 src/packageDocs/java/net/minecraft/util/registry/package-info.java diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS new file mode 100644 index 0000000000..61399cb9a8 --- /dev/null +++ b/.github/CODEOWNERS @@ -0,0 +1,5 @@ +* @FabricMC/developers + +mappings/ +unpick-definitions/ +src/ \ No newline at end of file diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 6d5bf099b1..e6774b1759 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -4,19 +4,18 @@ jobs: build: strategy: matrix: - java: [17-jdk, 18-jdk] + java: [17-jdk, 20-jdk] runs-on: ubuntu-22.04 container: - image: openjdk:${{ matrix.java }} + image: eclipse-temurin:${{ matrix.java }} options: --user root steps: - - uses: actions/checkout@v2 - - uses: gradle/wrapper-validation-action@v1 + - uses: actions/checkout@v3 - run: ./gradlew build javadocJar checkMappings --stacktrace --warning-mode fail - name: Build artifacts - if: ${{ matrix.java == '18-jdk' }} + if: ${{ matrix.java == '20-jdk' }} continue-on-error: true - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v3 with: name: Artifacts path: build/libs/ @@ -24,9 +23,9 @@ jobs: test-build-logic: runs-on: ubuntu-22.04 container: - image: openjdk:18-jdk + image: eclipse-temurin:20-jdk options: --user root steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - uses: gradle/wrapper-validation-action@v1 - run: ./gradlew :filament:build diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 6c81ffbc95..6c114d697f 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -6,19 +6,17 @@ jobs: if: ${{ github.repository_owner == 'FabricMC' }} runs-on: ubuntu-22.04 container: - image: openjdk:18-jdk + image: eclipse-temurin:20-jdk options: --user root steps: - - uses: actions/checkout@v2 - - uses: gradle/wrapper-validation-action@v1 - + - uses: actions/checkout@v3 # Generate the build number based on tags to allow per branch build numbers, not something github provides by default. - name: Generate build number id: buildnumber - uses: einaregilsson/build-number@v3 + uses: onyxmueller/build-tag-number@v1 with: token: ${{ secrets.github_token }} - prefix: ${{ github.ref }} + prefix: "build/${{ github.ref }}" - run: ./gradlew build javadocJar checkVersion publish --stacktrace env: diff --git a/.github/workflows/release-filament.yml b/.github/workflows/release-filament.yml new file mode 100644 index 0000000000..7396c3e780 --- /dev/null +++ b/.github/workflows/release-filament.yml @@ -0,0 +1,15 @@ +name: Release Filament +on: [workflow_dispatch] # Manual trigger +jobs: + build: + runs-on: ubuntu-22.04 + container: + image: eclipse-temurin:20-jdk + options: --user root + steps: + - uses: actions/checkout@v3 + - run: ./gradlew :filament:build :filament:publish --stacktrace --no-configuration-cache + env: + MAVEN_URL: ${{ secrets.MAVEN_URL }} + MAVEN_USERNAME: ${{ secrets.MAVEN_USERNAME }} + MAVEN_PASSWORD: ${{ secrets.MAVEN_PASSWORD }} diff --git a/.github/workflows/update-base.yml b/.github/workflows/update-base.yml index e271dbf3f5..f23ceeda2f 100644 --- a/.github/workflows/update-base.yml +++ b/.github/workflows/update-base.yml @@ -9,6 +9,6 @@ jobs: if: ${{ github.event.label.name == 'update-base' }} runs-on: ubuntu-22.04 steps: - - uses: FabricMC/fabric-action-scripts@v1 + - uses: FabricMC/fabric-action-scripts@v2 with: context: yarn-update-base \ No newline at end of file diff --git a/.github/workflows/version-label.yml b/.github/workflows/version-label.yml new file mode 100644 index 0000000000..a00e1442ea --- /dev/null +++ b/.github/workflows/version-label.yml @@ -0,0 +1,14 @@ +name: Update Base Branch + +on: + pull_request: + types: [ opened ] + +jobs: + update: + if: ${{ github.event.label.name == 'update-base' }} + runs-on: ubuntu-22.04 + steps: + - uses: FabricMC/fabric-action-scripts@v2 + with: + context: yarn-version-label \ No newline at end of file diff --git a/build.gradle b/build.gradle index 5fbf1e1535..98496ad96a 100644 --- a/build.gradle +++ b/build.gradle @@ -9,24 +9,22 @@ buildscript { } dependencies { classpath "cuchaz:enigma-cli:${project.enigma_version}" - classpath "net.fabricmc:stitch:${project.stitch_version}" - classpath "commons-io:commons-io:2.11.0" - classpath "de.undercouch:gradle-download-task:4.1.1" - classpath "net.fabricmc.unpick:unpick:${project.unpick_version}" - classpath "net.fabricmc.unpick:unpick-format-utils:${project.unpick_version}" classpath "net.fabricmc:name-proposal:${project.name_proposal_version}" } } plugins { id 'java' // for constants, packages, javadoc - id 'de.undercouch.download' version '4.1.2' id 'maven-publish' - id "com.diffplug.spotless" version "6.4.2" + id "com.diffplug.spotless" version "6.21.0" id 'net.fabricmc.filament' } -def minecraft_version = "1.19.2" +def minecraft_version = "23w35a" + +filament { + minecraftVersion = minecraft_version +} def ENV = System.getenv() // Fetch build number from Github Actions @@ -70,9 +68,6 @@ configurations { extendsFrom asm transitive = true } - unpick { - extendsFrom asm - } } def unpickMetaFile = file("unpick-definitions/unpick.json") @@ -80,383 +75,95 @@ def unpickMetaFile = file("unpick-definitions/unpick.json") dependencies { enigmaRuntime "cuchaz:enigma-swing:${project.enigma_version}" enigmaRuntime "net.fabricmc:name-proposal:${project.name_proposal_version}" + enigmaRuntime "net.fabricmc:cfr:${project.cfr_version}" javadocClasspath "net.fabricmc:fabric-loader:${project.fabric_loader_version}" javadocClasspath "org.jetbrains:annotations:${project.jetbrains_annotations_version}" javadocClasspath "com.google.code.findbugs:jsr305:3.0.2" // for some other jsr annotations decompileClasspath "net.fabricmc:cfr:${project.cfr_version}" mappingPoetJar "net.fabricmc:mappingpoet:${project.mappingpoet_version}" - unpick "net.fabricmc.unpick:unpick-cli:${project.unpick_version}" asm "org.ow2.asm:asm:${project.asm_version}" asm "org.ow2.asm:asm-tree:${project.asm_version}" asm "org.ow2.asm:asm-commons:${project.asm_version}" asm "org.ow2.asm:asm-util:${project.asm_version}" } -def setupGroup = "jar setup" def yarnGroup = "yarn" def buildMappingGroup = "mapping build" def mapJarGroup = "jar mapping" def mappingsDir = file("mappings") -def cacheFilesMinecraft = file(".gradle/minecraft") -def tempDir = file(".gradle/temp") -def mergedFile = file("${minecraft_version}-merged.jar") -def intermediaryJar = file("${minecraft_version}-intermediary.jar") -def unpickedJar = file("${minecraft_version}-intermediary-unpicked.jar") -def namedJar = file("${minecraft_version}-named.jar") -def versionFile = new File(cacheFilesMinecraft, "${minecraft_version}.json") -def clientJar = new File(cacheFilesMinecraft, "${minecraft_version}-client.jar") -// The vanilla server bootstrap jar (Contains the real server jar) -def serverBootstrapJar = new File(cacheFilesMinecraft, "${minecraft_version}-serverboostrap.jar") -// The real server jar, expected from the bootstrap -def serverJar = new File(cacheFilesMinecraft, "${minecraft_version}-server.jar") -def serverIntermediaryJar = file("${minecraft_version}-server-intermediary.jar") -def libraries = new File(cacheFilesMinecraft, "libraries") +def tempDir = file("build/temp/yarn") +def cacheFilesMinecraft = new File(tempDir, "minecraft") def libs = new File("build/libs/") -import com.google.common.hash.Hashing +def minecraftLibraries = configurations.minecraftLibraries + import cuchaz.enigma.command.CheckMappingsCommand -import cuchaz.enigma.command.ComposeMappingsCommand -import cuchaz.enigma.command.ConvertMappingsCommand -import cuchaz.enigma.command.MapSpecializedMethodsCommand -import groovy.json.JsonSlurper import net.fabricmc.filament.task.MapJarTask -import net.fabricmc.stitch.commands.CommandMergeTiny -import net.fabricmc.stitch.commands.CommandReorderTiny -import net.fabricmc.stitch.commands.CommandRewriteIntermediary -import net.fabricmc.stitch.commands.tinyv2.CommandMergeTinyV2 -import net.fabricmc.stitch.commands.tinyv2.CommandReorderTinyV2 -import net.fabricmc.stitch.merge.JarMerger +import net.fabricmc.filament.task.DownloadTask +import net.fabricmc.filament.task.UnpickJarTask +import net.fabricmc.filament.task.base.WithFileInput +import net.fabricmc.filament.task.base.WithFileOutput +import net.fabricmc.filament.task.enigma.MapSpecializedMethodsTask +import net.fabricmc.filament.task.mappingio.ConvertMappingsTask +import net.fabricmc.filament.task.mappingio.MergeMappingsTask +import net.fabricmc.mappingio.format.MappingFormat import net.fabricmc.nameproposal.MappingNameCompleter -import org.apache.commons.io.FileUtils +import org.gradle.work.DisableCachingByDefault -import java.nio.charset.StandardCharsets import java.util.zip.GZIPOutputStream -boolean validateChecksum(File file, String checksum) { - if (file != null) { - def hash = com.google.common.io.Files.asByteSource(file).hash(Hashing.sha1()) - def builder = new StringBuilder() - hash.asBytes().each { - builder.append(Integer.toString((it & 0xFF) + 0x100, 16).substring(1)) - } - return builder.toString().equals(checksum) - } - return false -} - -task downloadVersionsManifest { - group = setupGroup - //inputs.property "mc_ver", minecraft_version - inputs.property "currenttime", new Date() - def manifestFile = new File(cacheFilesMinecraft, "version_manifest_v2.json") - outputs.file(manifestFile) - doLast { - logger.lifecycle(":downloading minecraft versions manifest") - FileUtils.copyURLToFile(new URL("https://piston-meta.mojang.com/mc/game/version_manifest_v2.json"), manifestFile) - } -} - -def getManifestVersion(File manifestFile, String minecraft_version) { - def manifest = manifestFile.exists() ? new JsonSlurper().parseText(FileUtils.readFileToString(manifestFile)) : null - return manifest != null ? manifest.versions.stream().filter({ - it.id.equals(minecraft_version) - }).findFirst() : java.util.Optional.empty() -} - -task downloadWantedVersionManifest(dependsOn: downloadVersionsManifest) { - group = setupGroup - def manifestFile = downloadVersionsManifest.outputs.files.singleFile - def manifestVersion = getManifestVersion(manifestFile, minecraft_version) - - //have to grab the release time as there's a current timestamp on each element?! - inputs.property "releaseTime", manifestVersion.isPresent() ? manifestVersion.get().releaseTime : -1 - - outputs.file versionFile - - doLast { - manifestVersion = getManifestVersion(manifestFile, minecraft_version) - //nb need to re-read here in case it didn't exist before - if (manifestVersion.isPresent() || versionFile.exists()) { - - if (manifestVersion.isPresent()) { - FileUtils.copyURLToFile(new URL(manifestVersion.get().url), versionFile) - } - } else { - throw new RuntimeException("No version data for Minecraft version ${minecraft_version}") - } - } - -} - -task downloadMcJars(dependsOn: downloadWantedVersionManifest) { - group = setupGroup - inputs.files versionFile - - outputs.files(clientJar, serverBootstrapJar) - - outputs.upToDateWhen { - def version = new JsonSlurper().parseText(FileUtils.readFileToString(versionFile)) - return clientJar.exists() && serverBootstrapJar.exists() && validateChecksum(clientJar, version.downloads.client.sha1) && validateChecksum(serverBootstrapJar, version.downloads.server.sha1) - } - - doLast { - if (!versionFile.exists()) { - throw new RuntimeException("Can't download the jars without the ${versionFile.name} file!") - } - - //reload in case it changed - def version = new JsonSlurper().parseText(FileUtils.readFileToString(versionFile)) - - logger.lifecycle(":downloading minecraft jars") - - download { - src new URL(version.downloads.client.url) - dest clientJar - overwrite false - } - - download { - src new URL(version.downloads.server.url) - dest serverBootstrapJar - overwrite false - } - } -} - -task downloadIntermediary(type: Download) { - group = buildMappingGroup - def url = "https://github.com/FabricMC/intermediary/raw/master/mappings/${minecraft_version}.tiny" - src com.google.common.net.UrlEscapers.urlFragmentEscaper().escape(url) - dest new File(cacheFilesMinecraft, "${minecraft_version}-intermediary.tiny") -} - -task downloadIntermediaryV2(type: Download) { +tasks.register('downloadIntermediary', DownloadTask) { group = buildMappingGroup - def url = "https://maven.fabricmc.net/net/fabricmc/intermediary/${minecraft_version}/intermediary-${minecraft_version}-v2.jar" - src com.google.common.net.UrlEscapers.urlFragmentEscaper().escape(url) - dest new File(cacheFilesMinecraft, "${minecraft_version}-intermediary-v2.jar") - - def output = new File(cacheFilesMinecraft, "${minecraft_version}-intermediary-v2.tiny") - outputs.file output - - doLast { - copy { - from({ zipTree(downloadIntermediaryV2.dest) }) { - from 'mappings/mappings.tiny' - rename 'mappings.tiny', "../${output.name}" - } - - into output.parentFile - } - } -} - -import java.util.zip.ZipFile - -// Extracts the real server jar from the boostrap jar -task extractServerJar(dependsOn: downloadMcJars) { - group = setupGroup - inputs.file serverBootstrapJar - outputs.file serverJar - - doLast { - new ZipFile(serverBootstrapJar as File).withCloseable { zip -> - def serverVersionsEntry = zip.getEntry("META-INF/versions.list") - - if (!serverVersionsEntry) { - throw new RuntimeException("Could not find versions.list") - } - - def jarPath = null - - zip.getInputStream(serverVersionsEntry).withCloseable { is -> - def versions = is.text.split("\t") - assert versions.length == 3 - jarPath = versions[2] - } - - def serverJarEntry = zip.getEntry("META-INF/versions/${jarPath}") - - if (!serverJarEntry) { - throw new RuntimeException("Failed to find server jar entry ${jarPath}") - } - - zip.getInputStream(serverJarEntry).withCloseable { is -> - serverJar.bytes = is.readAllBytes() - } - } - } -} - -task mergeJars(dependsOn: extractServerJar) { - group = setupGroup - inputs.files (serverJar, clientJar) - outputs.file(mergedFile) - - doLast { - logger.lifecycle(":merging jars") - - if (mergedFile.exists()) { - return - } - - def jarMerger = new JarMerger(clientJar, serverJar, mergedFile) - jarMerger.merge() - jarMerger.close() - } - -} - -task downloadMcLibs(dependsOn: downloadWantedVersionManifest) { - group = setupGroup - inputs.files versionFile - - outputs.dir(libraries) - - outputs.upToDateWhen { false } - - doLast { - if (!versionFile.exists()) { - throw new RuntimeException("Can't download the jars without the ${versionFile.name} file!") - } - - def version = new JsonSlurper().parseText(FileUtils.readFileToString(versionFile, StandardCharsets.UTF_8)) - - logger.lifecycle(":downloading minecraft libraries") - - if (!libraries.exists()) { - libraries.mkdirs() - } - - version.libraries.each { - if (it.downloads.artifact == null) return // TODO: happens for downloads.classifiers - implement properly? - - def downloadUrl = it.downloads.artifact.url - - download { - src downloadUrl - dest new File(libraries, downloadUrl.substring(downloadUrl.lastIndexOf("/") + 1)) - overwrite false - } - - project.dependencies.add("decompileClasspath", it.name) - } - } -} - -task invertIntermediary(dependsOn: downloadIntermediary, type: FileOutput) { - group = buildMappingGroup - def v1Input = downloadIntermediary.dest - - output = new File(cacheFilesMinecraft, "${minecraft_version}-intermediary-inverted.tiny") - outputs.file(output) - - outputs.upToDateWhen { false } - - doLast { - logger.lifecycle(":building inverted intermediary") - - String[] v1Args = [ - v1Input.getAbsolutePath(), - output.getAbsolutePath(), - "intermediary", "official" - ] - - new CommandReorderTiny().run(v1Args) - } -} - -task invertIntermediaryv2(dependsOn: downloadIntermediaryV2, type: FileOutput) { - group = buildMappingGroup - def v2Input = new File(cacheFilesMinecraft, "${minecraft_version}-intermediary-v2.tiny") - - output = new File(cacheFilesMinecraft, "${minecraft_version}-intermediary-inverted-v2.tiny") - outputs.file(output) - - outputs.upToDateWhen { false } - - doLast { - logger.lifecycle(":building inverted intermediary v2") - - String[] v2Args = [ - v2Input.getAbsolutePath(), - output.getAbsolutePath(), - "intermediary", "official" - ] - - new CommandReorderTinyV2().run(v2Args) - } -} - -task patchIntermediary(dependsOn: [mergeJars, downloadIntermediary]) { - group = buildMappingGroup - def intermediaryTinyInput = downloadIntermediary.outputs.files.singleFile - - def outputFile = new File(cacheFilesMinecraft, "${minecraft_version}-intermediary-full.tiny") - outputs.file(outputFile) - - outputs.upToDateWhen { false } - - doLast { - logger.lifecycle(":patching intermediary") - String[] args = [ - mergedFile.getAbsolutePath(), - intermediaryTinyInput.getAbsolutePath(), - outputFile.getAbsolutePath(), - "--writeAll" - ] - - new CommandRewriteIntermediary().run(args) - } + url = "https://github.com/FabricMC/intermediary/raw/master/mappings/${minecraft_version}.tiny" + output = new File(cacheFilesMinecraft, "${minecraft_version}-intermediary.tiny") } -task mapIntermediaryJar(type: MapJarTask, dependsOn: [downloadMcLibs, downloadIntermediary, mergeJars]) { +tasks.register('mapIntermediaryJar', MapJarTask) { + dependsOn downloadIntermediary, mergeMinecraftJars group = mapJarGroup - output = intermediaryJar - input = mergedFile - mappings = downloadIntermediary.dest - classpath.from fileTree(libraries) + output = file("${minecraft_version}-intermediary.jar") + input = mergeMinecraftJars.output + mappings = downloadIntermediary.output + classpath.from minecraftLibraries from = 'official' to = 'intermediary' } -task mapServerIntermediaryJar(type: MapJarTask, dependsOn: [downloadMcLibs, downloadIntermediary, extractServerJar]) { +tasks.register('mapServerIntermediaryJar', MapJarTask) { + dependsOn downloadIntermediary, extractBundledServer group = mapJarGroup - output = serverIntermediaryJar - input = serverJar - mappings = downloadIntermediary.dest - classpath.from fileTree(libraries) + output = file("${minecraft_version}-server-intermediary.jar") + input = extractBundledServer.output + mappings = downloadIntermediary.output + classpath.from minecraftLibraries from = 'official' to = 'intermediary' } -task yarnUnpicked(dependsOn: "unpickIntermediaryJar", type: EnigmaTask) { - group = yarnGroup - jar = unpickedJar - mappings = mappingsDir -} - -task yarn(dependsOn: mapIntermediaryJar, type: EnigmaTask) { +tasks.register('yarn', EnigmaTask) { + dependsOn mapIntermediaryJar group = yarnGroup - jar = intermediaryJar + jar = mapIntermediaryJar.output mappings = mappingsDir } -task yarnCommon(dependsOn: mapServerIntermediaryJar, type: EnigmaTask) { +tasks.register('yarnCommon', EnigmaTask) { group = yarnGroup - jar = serverIntermediaryJar + jar = mapServerIntermediaryJar.output mappings = mappingsDir } -task checkMappings(dependsOn: mapIntermediaryJar) { +tasks.register('checkMappings') { group = buildMappingGroup inputs.dir mappingsDir - doLast { - logger.lifecycle(":checking mappings") + inputs.file mapIntermediaryJar.output + + def intermediaryJarPath = mapIntermediaryJar.outputFile.absolutePath + doLast { String[] args = [ - intermediaryJar.getAbsolutePath(), - mappingsDir.getAbsolutePath() + intermediaryJarPath, + mappingsDir.getAbsolutePath() ] try { @@ -467,77 +174,41 @@ task checkMappings(dependsOn: mapIntermediaryJar) { } } -task buildYarnTiny(dependsOn: mapIntermediaryJar, type: WithV2FileOutput) { - group = buildMappingGroup - inputs.dir mappingsDir - if (!libs.exists()) { - libs.mkdirs() - } - - v1Output = new File(tempDir, "yarn-mappings.tiny") - v2Output = new File(tempDir, "yarn-mappings-v2.tiny") - - outputs.upToDateWhen { false } +tasks.register('mapSpecializedMethods', MapSpecializedMethodsTask) { + intermediaryJarFile = mapIntermediaryJar.output + mappings = mappingsDir + output = new File(tempDir, "yarn-mappings-v2.tiny") - doLast { - logger.lifecycle(":generating tiny mappings") - - new MapSpecializedMethodsCommand().run( - intermediaryJar.getAbsolutePath(), - "enigma", - mappingsDir.getAbsolutePath(), - "tinyv2:intermediary:named", - v2Output.getAbsolutePath() - ) + inputMappingsFormat = "enigma" + outputMappingsFormat = "tinyv2:intermediary:named" +} - new ConvertMappingsCommand().run( - "tinyv2", - v2Output.getAbsolutePath(), - "tiny:intermediary:named", - v1Output.getAbsolutePath()) - } +tasks.register('convertToV1', ConvertMappingsTask) { + input = mapSpecializedMethods.output + output = new File(tempDir, "yarn-mappings.tiny") + outputFormat = MappingFormat.TINY } -task mergeTiny(dependsOn: ["buildYarnTiny", "invertIntermediary"], type: FileOutput) { +tasks.register('mergeTiny', MergeMappingsTask) { group = buildMappingGroup - def yarnTinyInput = buildYarnTiny.v1Output - def intermediaryTinyInput = invertIntermediary.output - - def unorderedResultMappings = new File(tempDir, "mappings-unordered.tiny") output = new File(tempDir, "mappings.tiny") - outputs.file(output) - - outputs.upToDateWhen { false } - - doLast { - logger.lifecycle(":merging yarn and intermediary") - String[] args = [ - intermediaryTinyInput.getAbsolutePath(), - yarnTinyInput.getAbsolutePath(), - unorderedResultMappings.getAbsolutePath(), - "intermediary", - "official" - ] - - new CommandMergeTiny().run(args) - - logger.lifecycle(":reordering merged intermediary") - String[] args2 = [ - unorderedResultMappings.getAbsolutePath(), - output.getAbsolutePath(), - "official", "intermediary", "named" - ] + mappingInputs.from downloadIntermediary.output + mappingInputs.from convertToV1.output + outputFormat = MappingFormat.TINY +} - new CommandReorderTiny().run(args2) - } +// Disable the default jar task +jar { + enabled = false } -task tinyJar(type: Jar, dependsOn: mergeTiny) { +tasks.register('tinyJar', Jar) { + dependsOn mergeTiny group = buildMappingGroup - outputs.upToDateWhen { false } archiveFileName = "yarn-${yarnVersion}.jar" destinationDirectory.set(file("build/libs")) - classifier = "" + archiveClassifier = "" + from(mergeTiny.output) { rename { "mappings/mappings.tiny" } } @@ -546,19 +217,14 @@ task tinyJar(type: Jar, dependsOn: mergeTiny) { } } -task compressTiny(dependsOn: [tinyJar, mergeTiny], type: FileOutput) { +tasks.register('compressTiny', FileInputOutput) { + dependsOn tinyJar, mergeTiny group = buildMappingGroup - def outputFile = new File(libs, "yarn-tiny-${yarnVersion}.gz") - outputs.file(outputFile) - output = outputFile - def inputFile = mergeTiny.output - - outputs.upToDateWhen { false } + input = mergeTiny.output + output = new File(libs, "yarn-tiny-${yarnVersion}.gz") doLast { - logger.lifecycle(":compressing tiny mappings") - def buffer = new byte[1024] def fileOutputStream = new FileOutputStream(outputFile) def outputStream = new GZIPOutputStream(fileOutputStream) @@ -579,103 +245,46 @@ clean.doFirst { delete tempDir, cacheFilesMinecraft } -tasks.build.dependsOn "compressTiny","tinyJar","v2UnmergedYarnJar", "v2MergedYarnJar", "javadocJar" - -task exportMappingsOfficial(dependsOn: downloadIntermediary) { - def composeInput = downloadIntermediary.dest - - doLast { - logger.lifecycle(":exporting mappings") - String[] args = [ - "tiny", - composeInput.getAbsolutePath(), - "enigma", - file("mappings/").getAbsolutePath(), - "enigma", - file("mappings_official/").getAbsolutePath(), - "right" - ] - - new ComposeMappingsCommand().run(args) - } +sourceSets { + constants + packageDocs // package info files } -task importMappingsOfficial(dependsOn: invertIntermediary) { - def composeInput = invertIntermediary.output - - doLast { - logger.lifecycle(":importing mappings") - String[] args = [ - "tiny", - composeInput.getAbsolutePath(), - "enigma", - file("mappings_official/").getAbsolutePath(), - "enigma", - file("mappings/").getAbsolutePath(), - "right" - ] - - new ComposeMappingsCommand().run(args) - } +tasks.register('constantsJar', Jar) { + from sourceSets.constants.output + archiveClassifier = "constants" } +tasks.build.dependsOn "compressTiny","tinyJar","v2UnmergedYarnJar", "v2MergedYarnJar", "javadocJar" + combineUnpickDefinitions { group = 'unpick' input = file('unpick-definitions') output = new File(tempDir, 'definitions.unpick') } -remapUnpickDefinitionsIntermediary { - dependsOn buildYarnTiny - group = 'unpick' - output = new File(tempDir, 'intermediary-definitions.unpick') - mappings = buildYarnTiny.v2Output -} - -task unpickIntermediaryJar(type: JavaExec, dependsOn: [mapIntermediaryJar, "constantsJar", remapUnpickDefinitionsIntermediary]) { - outputs.upToDateWhen { false } - group "unpick" - - mainClass = "daomephsta.unpick.cli.Main" - systemProperty "java.util.logging.config.file", file('unpick-logging.properties') - classpath configurations.unpick - - doFirst { - args intermediaryJar.absolutePath, unpickedJar.absolutePath, remapUnpickDefinitionsIntermediary.output.get().asFile.absolutePath, constantsJar.archiveFile.get().asFile.absolutePath - - configurations.decompileClasspath.files.each { - args it.absolutePath - } - } -} - // Setup the build for the unpicked constants -sourceCompatibility = JavaVersion.VERSION_17 -targetCompatibility = JavaVersion.VERSION_17 +java { + sourceCompatibility = JavaVersion.VERSION_17 + targetCompatibility = JavaVersion.VERSION_17 +} tasks.withType(JavaCompile).configureEach { it.options.encoding = "UTF-8" it.options.release = 17 } -sourceSets { - constants - packageDocs // package info files -} - spotless { + lineEndings = com.diffplug.spotless.LineEnding.UNIX + java { licenseHeaderFile(rootProject.file("HEADER")) } } -task constantsJar(type: Jar) { - from sourceSets.constants.output - archiveClassifier = "constants" -} - -task sourcesJar(type: Jar, dependsOn: classes) { +tasks.register('sourcesJar', Jar) { + dependsOn classes archiveClassifier = "sources" from sourceSets.constants.allSource } @@ -684,68 +293,71 @@ task sourcesJar(type: Jar, dependsOn: classes) { build.dependsOn constantsJar -task insertAutoGeneratedEnumMappings(dependsOn : [buildYarnTiny,mapIntermediaryJar], type : FileOutput){ +tasks.register('insertAutoGeneratedEnumMappings', FileInputOutput) { + dependsOn mapIntermediaryJar, downloadIntermediary group = buildMappingGroup - File noEnumV2 = buildYarnTiny.v2Output + input = mapSpecializedMethods.output output = new File(tempDir, "unmerged-named-v2-with-enum.tiny") - outputs.upToDateWhen { false } + inputs.file mapIntermediaryJar.output + inputs.file downloadIntermediary.output - doLast { - logger.lifecycle(":seeking auto-mappable fields for unmerged mappings") + def intermediaryJarPath = mapIntermediaryJar.outputPath + def intermediaryMappingsPath = downloadIntermediary.outputPath + doLast { MappingNameCompleter.completeNames( - intermediaryJar.toPath(), - noEnumV2.toPath(), - downloadIntermediary.dest.toPath(), - output.toPath() + intermediaryJarPath, + inputPath, + intermediaryMappingsPath, + outputPath ) } } -task mergeV2(dependsOn: ["v2UnmergedYarnJar", "invertIntermediaryv2"], type: FileOutput) { - def mergedV2 = new File(tempDir, "merged-v2.tiny"); - - output = new File(tempDir, "merged-reordered-v2.tiny") - outputs.upToDateWhen { false } +remapUnpickDefinitionsIntermediary { + group = 'unpick' + output = new File(tempDir, 'intermediary-definitions.unpick') + mappings = insertAutoGeneratedEnumMappings.output +} - doLast { - logger.lifecycle(":merging yarn and intermediary v2") - String[] args = [ - invertIntermediaryv2.output.getAbsolutePath(), - insertAutoGeneratedEnumMappings.output.getAbsolutePath(), - mergedV2.getAbsolutePath(), - "intermediary", - "official" - ] +tasks.register('unpickIntermediaryJar', UnpickJarTask) { + group = 'unpick' + input = mapIntermediaryJar.output + output = file("${minecraft_version}-intermediary-unpicked.jar") + unpickDefinition = remapUnpickDefinitionsIntermediary.output + constantsJarFile = constantsJar.archiveFile + classpath.from minecraftLibraries +} - new CommandMergeTinyV2().run(args) +tasks.register('yarnUnpicked', EnigmaTask) { + dependsOn "unpickIntermediaryJar" + group = yarnGroup + jar = unpickIntermediaryJar.output + mappings = mappingsDir +} - //Reorder the mappings to match the output of loom - args = [ - mergedV2.getAbsolutePath(), - output.getAbsolutePath(), - "official", - "intermediary", - "named" - ] - new CommandReorderTinyV2().run(args) - } +tasks.register('mergeV2', MergeMappingsTask) { + group = buildMappingGroup + output = new File(tempDir, "merged-v2.tiny") + mappingInputs.from downloadIntermediary.output + mappingInputs.from insertAutoGeneratedEnumMappings.output + outputFormat = MappingFormat.TINY_2 } -task v2UnmergedYarnJar(dependsOn: [insertAutoGeneratedEnumMappings, combineUnpickDefinitions], type: Jar) { +tasks.register('v2UnmergedYarnJar', Jar) { + dependsOn insertAutoGeneratedEnumMappings, combineUnpickDefinitions def mappings = insertAutoGeneratedEnumMappings.output group = "mapping build" - outputs.upToDateWhen { false } archiveFileName = "yarn-${yarnVersion}-v2.jar" from(file(mappings)) { - rename mappings.name, "mappings/mappings.tiny" + rename mappings.get().asFile.name, "mappings/mappings.tiny" } from(combineUnpickDefinitions.output) { rename combineUnpickDefinitions.output.get().asFile.name, "extras/definitions.unpick" } - from (file(unpickMetaFile)) { + from(file(unpickMetaFile)) { expand version: project.unpick_version rename unpickMetaFile.name, "extras/unpick.json" } @@ -755,10 +367,10 @@ task v2UnmergedYarnJar(dependsOn: [insertAutoGeneratedEnumMappings, combineUnpic } } -task v2MergedYarnJar(dependsOn: ["mergeV2"], type: Jar) { - def mappings = mergeV2.output +tasks.register('v2MergedYarnJar', Jar) { + dependsOn mergeV2 + def mappings = mergeV2.outputFile group = "mapping build" - outputs.upToDateWhen { false } archiveFileName = "yarn-${yarnVersion}-mergedv2.jar" from(file(mappings)) { @@ -767,7 +379,7 @@ task v2MergedYarnJar(dependsOn: ["mergeV2"], type: Jar) { from(combineUnpickDefinitions.output) { rename combineUnpickDefinitions.output.get().asFile.name, "extras/definitions.unpick" } - from (file(unpickMetaFile)) { + from(file(unpickMetaFile)) { expand version: project.unpick_version rename unpickMetaFile.name, "extras/unpick.json" } @@ -777,52 +389,64 @@ task v2MergedYarnJar(dependsOn: ["mergeV2"], type: Jar) { } } -task mapNamedJar(type: MapJarTask, dependsOn: ["mergeV2", "unpickIntermediaryJar"]) { +tasks.register('mapNamedJar', MapJarTask) { + dependsOn mergeV2, unpickIntermediaryJar group = mapJarGroup - output = namedJar - input = unpickedJar + output = file("${minecraft_version}-named.jar") + input = unpickIntermediaryJar.output mappings = mergeV2.output - classpath.from fileTree(libraries) + classpath.from minecraftLibraries from = 'intermediary' to = 'named' classMappings = [ - "javax/annotation/Nullable": "org/jetbrains/annotations/Nullable", - "javax/annotation/Nonnull": "org/jetbrains/annotations/NotNull", - "javax/annotation/concurrent/Immutable": "org/jetbrains/annotations/Unmodifiable" + "javax/annotation/Nullable" : "org/jetbrains/annotations/Nullable", + "javax/annotation/Nonnull" : "org/jetbrains/annotations/NotNull", + "javax/annotation/concurrent/Immutable": "org/jetbrains/annotations/Unmodifiable" ] } +def mcLibsDir = file('build/tmp/mclibs') + +// Task to copy all the mc libs into a single directory. +tasks.register('syncDependencies', Sync) { + from minecraftLibraries + into mcLibsDir +} + def fakeSourceDir = file(".gradle/temp/fakeSource") -task genFakeSource(type: JavaExec, dependsOn: ["mergeV2", "mapNamedJar"]) { +tasks.register('genFakeSource', JavaExec) { + dependsOn mergeV2, mapNamedJar, syncDependencies group = "javadoc generation" - outputs.upToDateWhen { false } + + inputs.file mergeV2.output + inputs.file mapNamedJar.output + inputs.dir mcLibsDir + + outputs.dir fakeSourceDir mainClass = "net.fabricmc.mappingpoet.Main" classpath configurations.mappingPoet // use merged v2 so we have all namespaces in jd - args mergeV2.output.getAbsolutePath(), namedJar.getAbsolutePath(), fakeSourceDir.getAbsolutePath(), libraries.getAbsolutePath() - - doLast { - logger.lifecycle ":Fake source generated" - } + args mergeV2.outputFile.getAbsolutePath(), mapNamedJar.outputFile.getAbsolutePath(), fakeSourceDir.getAbsolutePath(), mcLibsDir.getAbsolutePath() } -task decompileCFR(type: JavaExec, dependsOn: [mapNamedJar]) { - mainClass = "org.benf.cfr.reader.Main" +tasks.register('decompileCFR', JavaExec) { + def outputDir = file("namedSrc") - args namedJar.getAbsolutePath(), "--outputdir", file("namedSrc").absolutePath + dependsOn mapNamedJar + mainClass = "org.benf.cfr.reader.Main" + classpath.from configurations.decompileClasspath + classpath.from minecraftLibraries + args mapNamedJar.outputFile.getAbsolutePath(), "--outputdir", outputDir.absolutePath doFirst { - file("namedSrc").deleteDir() - classpath = configurations.decompileClasspath + outputDir.deleteDir() } } javadoc { dependsOn genFakeSource - dependsOn downloadMcLibs group = "javadoc generation" - outputs.upToDateWhen { false } def mappingPoetJar = project.provider { zipTree configurations.mappingPoetJar.singleFile } @@ -849,16 +473,17 @@ javadoc { addBooleanOption "-allow-script-in-comments", true addBooleanOption "-ignore-source-errors", true links( - 'https://guava.dev/releases/31.0-jre/api/docs/', - 'https://www.javadoc.io/doc/com.google.code.gson/gson/2.8.9/', + 'https://guava.dev/releases/31.1-jre/api/docs/', + 'https://www.javadoc.io/doc/com.google.code.gson/gson/2.10/', 'https://logging.apache.org/log4j/2.x/log4j-api/apidocs/', 'https://www.slf4j.org/apidocs/', "https://javadoc.io/doc/org.jetbrains/annotations/${project.jetbrains_annotations_version}/", 'https://javadoc.lwjgl.org/', 'https://fastutil.di.unimi.it/docs/', + 'https://javadoc.scijava.org/JOML/', 'https://netty.io/4.1/api/', 'https://www.oshi.ooo/oshi-core-java11/apidocs/', - 'https://java-native-access.github.io/jna/5.10.0/javadoc/', + 'https://java-native-access.github.io/jna/5.12.1/javadoc/', 'https://unicode-org.github.io/icu-docs/apidoc/released/icu4j/', 'https://jopt-simple.github.io/jopt-simple/apidocs/', 'https://solutions.weblite.ca/java-objective-c-bridge/docs/', @@ -878,27 +503,33 @@ javadoc { addBooleanOption 'Xdoclint:accessibility', true } source fileTree(fakeSourceDir) + sourceSets.constants.allJava + sourceSets.packageDocs.allJava - classpath = configurations.javadocClasspath.plus downloadMcLibs.outputs.files.asFileTree + classpath = configurations.javadocClasspath.plus minecraftLibraries + + def fs = services.get(FileSystemOperations.class) + def outputDir = javadoc.outputDirectory doLast { - project.copy { + fs.copy { from mappingPoetJar include "copy_on_click.js" - into javadoc.outputDirectory + into outputDir } } + def tagletClasspath = configurations.mappingPoet.files.toList() + doFirst { // lazy setting options { - tagletPath configurations.mappingPoet.files.toList() + tagletPath tagletClasspath header mappingPoetJar.get().filter { it.name == 'javadoc_header.txt' }.singleFile.text.trim() // cannot include line breaks addFileOption "-add-stylesheet", mappingPoetJar.get().filter { it.name == 'forms.css' }.singleFile } } } -task javadocJar(type: Jar, dependsOn: ["javadoc"]) { +tasks.register('javadocJar', Jar) { + dependsOn javadoc group = "javadoc generation" from javadoc.destinationDir @@ -908,8 +539,7 @@ task javadocJar(type: Jar, dependsOn: ["javadoc"]) { } generatePackageInfoMappings { - dependsOn mapIntermediaryJar - inputJar = intermediaryJar + inputJar = mapIntermediaryJar.output packageName = "net/minecraft/unused/packageinfo/" outputDir = file("mappings/net/minecraft/unused/packageinfo") } @@ -961,7 +591,7 @@ publishing { } // A task to ensure that the version being released has not already been released. -task checkVersion { +tasks.register('checkVersion') { doFirst { def xml = new URL("https://maven.fabricmc.net/net/fabricmc/yarn/maven-metadata.xml").text def metadata = new XmlSlurper().parseText(xml) @@ -974,29 +604,14 @@ task checkVersion { publish.mustRunAfter checkVersion -class FileOutput extends DefaultTask { - @OutputFile - File output -} -class FileOutputInput extends DefaultTask { - @InputFile - File input - - @OutputFile - File output -} - -class WithV2FileOutput extends DefaultTask { - @OutputFile - File v1Output - @OutputFile - File v2Output +abstract class FileInputOutput extends DefaultTask implements WithFileInput, WithFileOutput { } +@DisableCachingByDefault abstract class EnigmaTask extends JavaExec { - @Input - abstract Property getJar() + @InputFile + abstract RegularFileProperty getJar() @Input abstract Property getMappings() @@ -1004,17 +619,17 @@ abstract class EnigmaTask extends JavaExec { EnigmaTask() { classpath = project.configurations.enigmaRuntime mainClass.set('cuchaz.enigma.gui.Main') + jvmArgs "-Xmx2048m" } @TaskAction void exec() { args '-jar' - args jar.get().absolutePath + args jar.get().asFile.absolutePath args '-mappings' args mappings.get().absolutePath args '-profile' args 'enigma_profile.json' - jvmArgs "-Xmx2048m" super.exec() } } diff --git a/filament/build.gradle b/filament/build.gradle index 54f6af479b..0b1840a463 100644 --- a/filament/build.gradle +++ b/filament/build.gradle @@ -1,11 +1,18 @@ +import org.gradle.util.GradleVersion + plugins { id 'java-library' id 'java-gradle-plugin' id 'checkstyle' + id 'maven-publish' } group = 'net.fabricmc' +version = project.filament_version + +def ENV = System.getenv() +// Needed to read the main projects properties def properties = new Properties() file('../gradle.properties').newInputStream().withCloseable { properties.load(it) @@ -17,16 +24,26 @@ repositories { url 'https://maven.fabricmc.net' } mavenCentral() + mavenLocal() } dependencies { implementation "org.ow2.asm:asm:${properties.asm_version}" implementation "org.ow2.asm:asm-tree:${properties.asm_version}" implementation "cuchaz:enigma:$properties.enigma_version" + implementation "cuchaz:enigma-cli:$properties.enigma_version" implementation "net.fabricmc.unpick:unpick:$properties.unpick_version" implementation "net.fabricmc.unpick:unpick-format-utils:$properties.unpick_version" - implementation "net.fabricmc:tiny-mappings-parser:$properties.tiny_mappings_parser_version" + implementation "net.fabricmc.unpick:unpick-cli:$properties.unpick_version" implementation "net.fabricmc:tiny-remapper:$properties.tiny_remapper_version" + implementation "net.fabricmc:mappingpoet:$properties.mappingpoet_version" + implementation 'com.fasterxml.jackson.core:jackson-databind:2.13.4.2' + implementation 'net.fabricmc:mapping-io:0.4.0' + + // Contains a number of useful utilities we can re-use. + implementation ("net.fabricmc:fabric-loom:1.2.7") { + transitive = false + } testImplementation platform("org.junit:junit-bom:$properties.junit_version") testImplementation 'org.junit.jupiter:junit-jupiter' @@ -54,4 +71,40 @@ gradlePlugin { implementationClass = 'net.fabricmc.filament.FilamentGradlePlugin' } } +} + +publishing { + repositories { + if (ENV.MAVEN_URL) { + repositories.maven { + name "fabric" + url ENV.MAVEN_URL + credentials { + username ENV.MAVEN_USERNAME + password ENV.MAVEN_PASSWORD + } + } + } + } +} + +/** + * Run this task to download the gradle sources next to the api jar, you may need to manually attach the sources jar + */ +task downloadGradleSources() { + doLast { + // Awful hack to find the gradle api location + def gradleApiFile = project.configurations.detachedConfiguration(dependencies.gradleApi()).files.stream() + .filter { + it.name.startsWith("gradle-api") + }.findFirst().orElseThrow() + + def gradleApiSources = new File(gradleApiFile.absolutePath.replace(".jar", "-sources.jar")) + def url = "https://services.gradle.org/distributions/gradle-${GradleVersion.current().getVersion()}-src.zip" + + gradleApiSources.delete() + + println("Downloading (${url}) to (${gradleApiSources})") + gradleApiSources << new URL(url).newInputStream() + } } \ No newline at end of file diff --git a/filament/gradle.properties b/filament/gradle.properties new file mode 100644 index 0000000000..36fb6e54dc --- /dev/null +++ b/filament/gradle.properties @@ -0,0 +1 @@ +filament_version=0.6.2 \ No newline at end of file diff --git a/filament/src/main/java/net/fabricmc/filament/FilamentExtension.java b/filament/src/main/java/net/fabricmc/filament/FilamentExtension.java new file mode 100644 index 0000000000..8986c109fa --- /dev/null +++ b/filament/src/main/java/net/fabricmc/filament/FilamentExtension.java @@ -0,0 +1,56 @@ +package net.fabricmc.filament; + +import java.io.File; + +import javax.inject.Inject; + +import org.gradle.api.Project; +import org.gradle.api.file.Directory; +import org.gradle.api.file.DirectoryProperty; +import org.gradle.api.file.RegularFile; +import org.gradle.api.provider.Property; +import org.gradle.api.provider.Provider; + +import net.fabricmc.filament.util.MinecraftVersionMetaHelper; +import net.fabricmc.loom.configuration.providers.minecraft.MinecraftVersionMeta; + +public abstract class FilamentExtension { + public static FilamentExtension get(Project project) { + return project.getExtensions().getByType(FilamentExtension.class); + } + + @Inject + protected abstract Project getProject(); + + public abstract Property getMinecraftVersion(); + + public abstract Property getMinecraftVersionManifestUrl(); + + private final MinecraftVersionMetaHelper metaHelper; + private final Provider metaProvider; + + @Inject + public FilamentExtension() { + getMinecraftVersion().finalizeValueOnRead(); + getMinecraftVersionManifestUrl().convention("https://piston-meta.mojang.com/mc/game/version_manifest_v2.json").finalizeValueOnRead(); + + metaHelper = getProject().getObjects().newInstance(MinecraftVersionMetaHelper.class, this); + metaProvider = getProject().provider(metaHelper::setup); + } + + public DirectoryProperty getCacheDirectory() { + return getProject().getObjects().directoryProperty().fileValue(new File(getProject().getRootDir(), ".gradle/filament")); + } + + public Provider getMinecraftDirectory() { + return getCacheDirectory().dir(getMinecraftVersion()); + } + + public Provider getMinecraftFile(String filename) { + return getMinecraftDirectory().map(directory -> directory.file(filename)); + } + + public Provider getMinecraftVersionMetadata() { + return metaProvider; + } +} diff --git a/filament/src/main/java/net/fabricmc/filament/FilamentGradlePlugin.java b/filament/src/main/java/net/fabricmc/filament/FilamentGradlePlugin.java index e7450ee45c..64705e5c22 100644 --- a/filament/src/main/java/net/fabricmc/filament/FilamentGradlePlugin.java +++ b/filament/src/main/java/net/fabricmc/filament/FilamentGradlePlugin.java @@ -1,25 +1,96 @@ package net.fabricmc.filament; +import com.fasterxml.jackson.databind.DeserializationFeature; +import com.fasterxml.jackson.databind.ObjectMapper; import org.gradle.api.Plugin; import org.gradle.api.Project; +import org.gradle.api.artifacts.Dependency; +import org.gradle.api.artifacts.dsl.DependencyHandler; +import org.gradle.api.file.RegularFile; +import org.gradle.api.provider.Provider; +import org.gradle.api.tasks.Delete; +import org.gradle.api.tasks.TaskContainer; +import org.gradle.api.tasks.TaskProvider; import net.fabricmc.filament.task.CombineUnpickDefinitionsTask; +import net.fabricmc.filament.task.DownloadTask; import net.fabricmc.filament.task.GeneratePackageInfoMappingsTask; import net.fabricmc.filament.task.JavadocLintTask; import net.fabricmc.filament.task.RemapUnpickDefinitionsTask; +import net.fabricmc.filament.task.base.WithFileOutput; +import net.fabricmc.filament.task.minecraft.ExtractBundledServerTask; +import net.fabricmc.filament.task.minecraft.MergeMinecraftTask; +import net.fabricmc.loom.configuration.providers.minecraft.MinecraftVersionMeta; +import net.fabricmc.loom.util.gradle.GradleUtils; public final class FilamentGradlePlugin implements Plugin { + public static final ObjectMapper OBJECT_MAPPER = new ObjectMapper().configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false); + @Override public void apply(Project project) { - project.getTasks().register("generatePackageInfoMappings", GeneratePackageInfoMappingsTask.class); - project.getTasks().register("javadocLint", JavadocLintTask.class); + final FilamentExtension extension = project.getExtensions().create("filament", FilamentExtension.class); + final TaskContainer tasks = project.getTasks(); + + var metaProvider = extension.getMinecraftVersionMetadata(); + + var minecraftClient = tasks.register("downloadMinecraftClientJar", DownloadTask.class, task -> { + Provider downloadProvider = metaProvider.map(meta -> meta.download("client")); + task.getUrl().set(downloadProvider.map(MinecraftVersionMeta.Download::url)); + task.getSha1().set(downloadProvider.map(MinecraftVersionMeta.Download::sha1)); + + task.getOutput().set(extension.getMinecraftFile("client.jar")); + }); + var minecraftServer = tasks.register("downloadMinecraftServerJar", DownloadTask.class, task -> { + Provider downloadProvider = metaProvider.map(meta -> meta.download("server")); + task.getUrl().set(downloadProvider.map(MinecraftVersionMeta.Download::url)); + task.getSha1().set(downloadProvider.map(MinecraftVersionMeta.Download::sha1)); + + task.getOutput().set(extension.getMinecraftFile("server_bundle.jar")); + }); + var extractBundledServer = tasks.register("extractBundledServer", ExtractBundledServerTask.class, task -> { + task.dependsOn(minecraftServer); + task.getInput().set(getOutput(minecraftServer)); + task.getOutput().set(extension.getMinecraftFile("server.jar")); + }); + tasks.register("mergeMinecraftJars", MergeMinecraftTask.class, task -> { + task.getClientJar().set(getOutput(minecraftClient)); + task.getServerJar().set(getOutput(extractBundledServer)); + + task.getOutput().set(extension.getMinecraftFile("merged.jar")); + }); + tasks.register("generatePackageInfoMappings", GeneratePackageInfoMappingsTask.class); + tasks.register("javadocLint", JavadocLintTask.class); - var combineUnpickDefinitions = project.getTasks().register("combineUnpickDefinitions", CombineUnpickDefinitionsTask.class); - project.getTasks().register("remapUnpickDefinitionsIntermediary", RemapUnpickDefinitionsTask.class, task -> { + var combineUnpickDefinitions = tasks.register("combineUnpickDefinitions", CombineUnpickDefinitionsTask.class); + tasks.register("remapUnpickDefinitionsIntermediary", RemapUnpickDefinitionsTask.class, task -> { task.dependsOn(combineUnpickDefinitions); task.getInput().set(combineUnpickDefinitions.flatMap(CombineUnpickDefinitionsTask::getOutput)); task.getSourceNamespace().set("named"); task.getTargetNamespace().set("intermediary"); }); + + var cleanFilament = tasks.register("cleanFilament", Delete.class, task -> task.delete(extension.getCacheDirectory())); + tasks.named("clean", task -> task.dependsOn(cleanFilament)); + + var minecraftLibraries = project.getConfigurations().register("minecraftLibraries"); + + GradleUtils.afterSuccessfulEvaluation(project, () -> { + var name = minecraftLibraries.getName(); + + for (Dependency dependency : getDependencies(metaProvider.get(), project.getDependencies())) { + project.getDependencies().add(name, dependency); + } + }); + } + + private Provider getOutput(TaskProvider taskProvider) { + return taskProvider.flatMap(WithFileOutput::getOutput); + } + + private Dependency[] getDependencies(MinecraftVersionMeta meta, DependencyHandler dependencyHandler) { + return meta.libraries().stream() + .filter(library -> library.artifact() != null) + .map(library -> dependencyHandler.create(library.name())) + .toArray(Dependency[]::new); } } diff --git a/filament/src/main/java/net/fabricmc/filament/task/DownloadTask.java b/filament/src/main/java/net/fabricmc/filament/task/DownloadTask.java new file mode 100644 index 0000000000..fdee2b91d8 --- /dev/null +++ b/filament/src/main/java/net/fabricmc/filament/task/DownloadTask.java @@ -0,0 +1,70 @@ +package net.fabricmc.filament.task; + +import java.net.URISyntaxException; + +import javax.inject.Inject; + +import org.gradle.api.file.RegularFileProperty; +import org.gradle.api.provider.Property; +import org.gradle.api.tasks.Input; +import org.gradle.api.tasks.TaskAction; +import org.gradle.workers.WorkAction; +import org.gradle.workers.WorkParameters; +import org.gradle.workers.WorkQueue; +import org.gradle.workers.WorkerExecutor; + +import net.fabricmc.filament.task.base.FilamentTask; +import net.fabricmc.filament.task.base.WithFileOutput; +import net.fabricmc.loom.util.download.Download; +import net.fabricmc.loom.util.download.DownloadException; + +public abstract class DownloadTask extends FilamentTask implements WithFileOutput { + @Input + public abstract Property getUrl(); + @Input + public abstract Property getSha1(); + + @Inject + protected abstract WorkerExecutor getWorkerExecutor(); + + @Inject + public DownloadTask() { + getSha1().convention(""); + } + + @TaskAction + public void run() { + WorkQueue workQueue = getWorkerExecutor().noIsolation(); + workQueue.submit(DownloadAction.class, parameters -> { + parameters.getUrl().set(getUrl()); + parameters.getSha1().set(getSha1()); + parameters.getOutput().set(getOutput()); + }); + } + + public interface DownloadParameters extends WorkParameters { + Property getUrl(); + Property getSha1(); + RegularFileProperty getOutput(); + } + + public abstract static class DownloadAction implements WorkAction { + @Override + public void execute() { + try { + var sha1 = getParameters().getSha1().get(); + var download = Download.create(getParameters().getUrl().get()); + + if (!sha1.isEmpty()) { + download.sha1(sha1); + } else { + download.defaultCache(); + } + + download.downloadPath(getParameters().getOutput().get().getAsFile().toPath()); + } catch (DownloadException | URISyntaxException e) { + throw new RuntimeException("Failed to download", e); + } + } + } +} diff --git a/filament/src/main/java/net/fabricmc/filament/task/JavadocLintTask.java b/filament/src/main/java/net/fabricmc/filament/task/JavadocLintTask.java index dcfec32d7d..19c1552a79 100644 --- a/filament/src/main/java/net/fabricmc/filament/task/JavadocLintTask.java +++ b/filament/src/main/java/net/fabricmc/filament/task/JavadocLintTask.java @@ -56,10 +56,18 @@ public JavadocLintTask() { @TaskAction public void run(InputChanges changes) { + List fileChanges = new ArrayList<>(); + changes.getFileChanges(mappingDirectory).forEach(fileChanges::add); + + if (fileChanges.isEmpty()) { + // Nothing changed, nothing to do! + return; + } + WorkQueue workQueue = getWorkerExecutor().noIsolation(); workQueue.submit(LintAction.class, parameters -> { - for (FileChange change : changes.getFileChanges(mappingDirectory)) { + for (FileChange change : fileChanges) { if (change.getChangeType() != ChangeType.REMOVED && change.getFileType() == FileType.FILE) { parameters.getMappingFiles().from(change.getFile()); } @@ -104,7 +112,7 @@ public LintAction() { @Override public void execute() { try { - var files = FileUtil.toPaths(getParameters().getMappingFiles().getFiles()).toArray(new Path[0]); + Path[] files = FileUtil.toPaths(getParameters().getMappingFiles().getFiles()).toArray(new Path[0]); EntryTree mappings = EnigmaMappingsReader.readFiles(ProgressListener.none(), files); List errors = new ArrayList<>(); diff --git a/filament/src/main/java/net/fabricmc/filament/task/MapJarTask.java b/filament/src/main/java/net/fabricmc/filament/task/MapJarTask.java index 531078e25c..9f833ab05d 100644 --- a/filament/src/main/java/net/fabricmc/filament/task/MapJarTask.java +++ b/filament/src/main/java/net/fabricmc/filament/task/MapJarTask.java @@ -1,5 +1,6 @@ package net.fabricmc.filament.task; +import java.io.File; import java.io.IOException; import java.nio.file.Files; import java.nio.file.Path; @@ -11,8 +12,6 @@ import org.gradle.api.DefaultTask; import org.gradle.api.file.ConfigurableFileCollection; import org.gradle.api.file.FileSystemLocation; -import org.gradle.api.file.FileVisitDetails; -import org.gradle.api.file.FileVisitor; import org.gradle.api.file.RegularFileProperty; import org.gradle.api.provider.MapProperty; import org.gradle.api.provider.Property; @@ -20,21 +19,20 @@ import org.gradle.api.tasks.Classpath; import org.gradle.api.tasks.Input; import org.gradle.api.tasks.InputFile; -import org.gradle.api.tasks.OutputFile; import org.gradle.api.tasks.TaskAction; import org.gradle.workers.WorkAction; import org.gradle.workers.WorkParameters; import org.gradle.workers.WorkQueue; import org.gradle.workers.WorkerExecutor; +import net.fabricmc.filament.task.base.WithFileInput; +import net.fabricmc.filament.task.base.WithFileOutput; import net.fabricmc.tinyremapper.OutputConsumerPath; import net.fabricmc.tinyremapper.TinyRemapper; import net.fabricmc.tinyremapper.TinyUtils; -public abstract class MapJarTask extends DefaultTask { - @InputFile public abstract RegularFileProperty getInput(); +public abstract class MapJarTask extends DefaultTask implements WithFileOutput, WithFileInput { @InputFile public abstract RegularFileProperty getMappings(); - @OutputFile public abstract RegularFileProperty getOutput(); @Classpath public abstract ConfigurableFileCollection getClasspath(); @Input public abstract Property getFrom(); @Input public abstract Property getTo(); @@ -49,8 +47,6 @@ public MapJarTask() { @TaskAction public void remap() { - getProject().getLogger().lifecycle(":remapping {} from {} to {}", getInput().get().getAsFile(), getFrom().get(), getTo().get()); - WorkQueue workQueue = getWorkerExecutor().noIsolation(); workQueue.submit(RemapAction.class, parameters -> { parameters.getInput().set(getInput()); @@ -64,20 +60,16 @@ public void remap() { } public interface RemapParameters extends WorkParameters { - @InputFile RegularFileProperty getInput(); - @InputFile RegularFileProperty getMappings(); - @OutputFile RegularFileProperty getOutput(); - @Classpath ConfigurableFileCollection getClasspath(); - @Input Property getFrom(); - @Input Property getTo(); - @Input MapProperty getClassMappings(); + RegularFileProperty getInput(); + RegularFileProperty getMappings(); + RegularFileProperty getOutput(); + ConfigurableFileCollection getClasspath(); + Property getFrom(); + Property getTo(); + MapProperty getClassMappings(); } public abstract static class RemapAction implements WorkAction { - @Inject - public RemapAction() { - } - private static Path getPath(Provider provider) { return provider.get().getAsFile().toPath(); } @@ -108,19 +100,11 @@ private void doExecute() throws IOException { try (OutputConsumerPath outputConsumer = new OutputConsumerPath.Builder(output).build()) { Path input = getPath(params.getInput()); outputConsumer.addNonClassFiles(input); - remapper.readInputs(input); - - params.getClasspath().getAsFileTree().visit(new FileVisitor() { - @Override - public void visitDir(FileVisitDetails dirDetails) { - // ignore - } - - @Override - public void visitFile(FileVisitDetails fileDetails) { - remapper.readClassPath(fileDetails.getFile().toPath()); - } - }); + remapper.readInputsAsync(input); + + for (File file : params.getClasspath().getFiles()) { + remapper.readClassPathAsync(file.toPath()); + } remapper.apply(outputConsumer); } finally { diff --git a/filament/src/main/java/net/fabricmc/filament/task/RemapUnpickDefinitionsTask.java b/filament/src/main/java/net/fabricmc/filament/task/RemapUnpickDefinitionsTask.java index 97950fd579..afeb31a4ca 100644 --- a/filament/src/main/java/net/fabricmc/filament/task/RemapUnpickDefinitionsTask.java +++ b/filament/src/main/java/net/fabricmc/filament/task/RemapUnpickDefinitionsTask.java @@ -1,13 +1,12 @@ package net.fabricmc.filament.task; -import java.io.BufferedReader; import java.io.File; import java.io.FileInputStream; -import java.io.FileReader; import java.io.IOException; import java.io.UncheckedIOException; import java.util.HashMap; import java.util.Map; +import java.util.Objects; import javax.inject.Inject; @@ -30,11 +29,9 @@ import net.fabricmc.filament.util.FileUtil; import net.fabricmc.filament.util.UnpickUtil; -import net.fabricmc.mapping.tree.ClassDef; -import net.fabricmc.mapping.tree.FieldDef; -import net.fabricmc.mapping.tree.MethodDef; -import net.fabricmc.mapping.tree.TinyMappingFactory; -import net.fabricmc.mapping.tree.TinyTree; +import net.fabricmc.mappingio.MappingReader; +import net.fabricmc.mappingio.tree.MappingTree; +import net.fabricmc.mappingio.tree.MemoryMappingTree; public abstract class RemapUnpickDefinitionsTask extends DefaultTask { @InputFile @@ -98,28 +95,44 @@ public void execute() { Map classMappings = new HashMap<>(); Map methodMappings = new HashMap<>(); Map fieldMappings = new HashMap<>(); - String fromM = getParameters().getSourceNamespace().get(); - String toM = getParameters().getTargetNamespace().get(); - - try (BufferedReader reader = new BufferedReader(new FileReader(getParameters().getMappings().getAsFile().get()))) { - TinyTree tinyTree = TinyMappingFactory.loadWithDetection(reader); - - for (ClassDef classDef : tinyTree.getClasses()) { - classMappings.put(classDef.getName(fromM), classDef.getName(toM)); - - for (MethodDef methodDef : classDef.getMethods()) { - methodMappings.put( - new MethodKey(classDef.getName(fromM), methodDef.getName(fromM), methodDef.getDescriptor(fromM)), - methodDef.getName(toM) - ); - } - - for (FieldDef fieldDef : classDef.getFields()) { - fieldMappings.put( - new FieldKey(classDef.getName(fromM), fieldDef.getName(fromM)), - fieldDef.getName(toM) - ); - } + + final MemoryMappingTree mappingTree = new MemoryMappingTree(); + MappingReader.read(getParameters().getMappings().getAsFile().get().toPath(), mappingTree); + + final int fromM = mappingTree.getNamespaceId(getParameters().getSourceNamespace().get()); + final int toM = mappingTree.getNamespaceId(getParameters().getTargetNamespace().get()); + + for (MappingTree.ClassMapping classDef : mappingTree.getClasses()) { + final String classFromName = classDef.getName(fromM); + + if (classFromName == null) { + continue; + } + + classMappings.put( + classFromName, + Objects.requireNonNull(classDef.getName(toM), "Null to name: " + classFromName) + ); + + for (MappingTree.MethodMapping methodDef : classDef.getMethods()) { + methodMappings.put( + new MethodKey( + Objects.requireNonNull(classFromName, "Null dst name: " + classDef.getSrcName()), + Objects.requireNonNull(methodDef.getName(fromM), "Null dst name: " + methodDef.getSrcName()), + Objects.requireNonNull(methodDef.getDesc(fromM), "Null dst name: " + methodDef.getSrcName()) + ), + Objects.requireNonNull(methodDef.getName(toM), "Null to name: " + methodDef.getSrcName()) + ); + } + + for (MappingTree.FieldMapping fieldDef : classDef.getFields()) { + fieldMappings.put( + new FieldKey( + Objects.requireNonNull(classFromName, "Null dst name: " + classDef.getSrcName()), + Objects.requireNonNull(fieldDef.getName(fromM), "Null dst name: " + fieldDef.getSrcName()) + ), + Objects.requireNonNull(fieldDef.getName(toM), "Null to name: " + fieldDef.getSrcName()) + ); } } diff --git a/filament/src/main/java/net/fabricmc/filament/task/UnpickJarTask.java b/filament/src/main/java/net/fabricmc/filament/task/UnpickJarTask.java new file mode 100644 index 0000000000..6d4e84b542 --- /dev/null +++ b/filament/src/main/java/net/fabricmc/filament/task/UnpickJarTask.java @@ -0,0 +1,80 @@ +package net.fabricmc.filament.task; + +import java.io.File; +import java.io.IOException; +import java.util.ArrayList; +import java.util.List; + +import javax.inject.Inject; + +import daomephsta.unpick.cli.Main; +import org.gradle.api.file.ConfigurableFileCollection; +import org.gradle.api.file.RegularFileProperty; +import org.gradle.api.tasks.InputFile; +import org.gradle.api.tasks.InputFiles; +import org.gradle.api.tasks.TaskAction; +import org.gradle.workers.WorkAction; +import org.gradle.workers.WorkParameters; +import org.gradle.workers.WorkQueue; +import org.gradle.workers.WorkerExecutor; + +import net.fabricmc.filament.task.base.FilamentTask; +import net.fabricmc.filament.task.base.WithFileInput; +import net.fabricmc.filament.task.base.WithFileOutput; + +public abstract class UnpickJarTask extends FilamentTask implements WithFileInput, WithFileOutput { + @InputFile + public abstract RegularFileProperty getUnpickDefinition(); + @InputFile + public abstract RegularFileProperty getConstantsJarFile(); + @InputFiles + public abstract ConfigurableFileCollection getClasspath(); + + @Inject + protected abstract WorkerExecutor getWorkerExecutor(); + + @TaskAction + public void run() { + WorkQueue workQueue = getWorkerExecutor().noIsolation(); + workQueue.submit(UnpickAction.class, parameters -> { + parameters.getInput().set(getInput()); + parameters.getOutput().set(getOutput()); + parameters.getUnpickDefinition().set(getUnpickDefinition()); + parameters.getConstantJar().set(getConstantsJarFile()); + parameters.getClasspath().from(getClasspath()); + }); + } + + public interface UnpickParameters extends WorkParameters { + RegularFileProperty getInput(); + RegularFileProperty getOutput(); + RegularFileProperty getUnpickDefinition(); + RegularFileProperty getConstantJar(); + ConfigurableFileCollection getClasspath(); + } + + public abstract static class UnpickAction implements WorkAction { + @Override + public void execute() { + List args = new ArrayList<>(); + args.add(getPath(getParameters().getInput())); + args.add(getPath(getParameters().getOutput())); + args.add(getPath(getParameters().getUnpickDefinition())); + args.add(getPath(getParameters().getConstantJar())); + + for (File file : getParameters().getClasspath().getFiles()) { + args.add(file.getAbsolutePath()); + } + + try { + Main.main(args.toArray(String[]::new)); + } catch (IOException e) { + throw new RuntimeException(e); + } + } + + private String getPath(RegularFileProperty fileProperty) { + return fileProperty.get().getAsFile().getAbsolutePath(); + } + } +} diff --git a/filament/src/main/java/net/fabricmc/filament/task/base/FilamentTask.java b/filament/src/main/java/net/fabricmc/filament/task/base/FilamentTask.java new file mode 100644 index 0000000000..7333ed237e --- /dev/null +++ b/filament/src/main/java/net/fabricmc/filament/task/base/FilamentTask.java @@ -0,0 +1,20 @@ +package net.fabricmc.filament.task.base; + +import javax.inject.Inject; + +import org.gradle.api.DefaultTask; +import org.gradle.api.tasks.Internal; + +import net.fabricmc.filament.FilamentExtension; + +public abstract class FilamentTask extends DefaultTask { + @Inject + public FilamentTask() { + setGroup("filament"); + } + + @Internal + protected FilamentExtension getExtension() { + return FilamentExtension.get(getProject()); + } +} diff --git a/filament/src/main/java/net/fabricmc/filament/task/base/FileOutputTask.java b/filament/src/main/java/net/fabricmc/filament/task/base/FileOutputTask.java new file mode 100644 index 0000000000..84b26e1280 --- /dev/null +++ b/filament/src/main/java/net/fabricmc/filament/task/base/FileOutputTask.java @@ -0,0 +1,4 @@ +package net.fabricmc.filament.task.base; + +public abstract class FileOutputTask extends FilamentTask implements WithFileOutput { +} diff --git a/filament/src/main/java/net/fabricmc/filament/task/base/WithFileInput.java b/filament/src/main/java/net/fabricmc/filament/task/base/WithFileInput.java new file mode 100644 index 0000000000..d60853beab --- /dev/null +++ b/filament/src/main/java/net/fabricmc/filament/task/base/WithFileInput.java @@ -0,0 +1,23 @@ +package net.fabricmc.filament.task.base; + +import java.io.File; +import java.nio.file.Path; + +import org.gradle.api.file.RegularFileProperty; +import org.gradle.api.tasks.InputFile; +import org.gradle.api.tasks.Internal; + +public interface WithFileInput { + @InputFile + RegularFileProperty getInput(); + + @Internal + default File getInputFile() { + return getInput().get().getAsFile(); + } + + @Internal + default Path getInputPath() { + return getInputFile().toPath(); + } +} diff --git a/filament/src/main/java/net/fabricmc/filament/task/base/WithFileOutput.java b/filament/src/main/java/net/fabricmc/filament/task/base/WithFileOutput.java new file mode 100644 index 0000000000..9f3886c851 --- /dev/null +++ b/filament/src/main/java/net/fabricmc/filament/task/base/WithFileOutput.java @@ -0,0 +1,23 @@ +package net.fabricmc.filament.task.base; + +import java.io.File; +import java.nio.file.Path; + +import org.gradle.api.file.RegularFileProperty; +import org.gradle.api.tasks.Internal; +import org.gradle.api.tasks.OutputFile; + +public interface WithFileOutput { + @OutputFile + RegularFileProperty getOutput(); + + @Internal + default File getOutputFile() { + return getOutput().get().getAsFile(); + } + + @Internal + default Path getOutputPath() { + return getOutputFile().toPath(); + } +} diff --git a/filament/src/main/java/net/fabricmc/filament/task/enigma/EnigmaCommandTask.java b/filament/src/main/java/net/fabricmc/filament/task/enigma/EnigmaCommandTask.java new file mode 100644 index 0000000000..59685009c9 --- /dev/null +++ b/filament/src/main/java/net/fabricmc/filament/task/enigma/EnigmaCommandTask.java @@ -0,0 +1,55 @@ +package net.fabricmc.filament.task.enigma; + +import java.util.List; + +import javax.inject.Inject; + +import cuchaz.enigma.command.Command; +import org.gradle.api.provider.ListProperty; +import org.gradle.api.provider.Property; +import org.gradle.api.tasks.Internal; +import org.gradle.api.tasks.TaskAction; +import org.gradle.workers.WorkAction; +import org.gradle.workers.WorkParameters; +import org.gradle.workers.WorkQueue; +import org.gradle.workers.WorkerExecutor; + +import net.fabricmc.filament.task.base.FilamentTask; + +public abstract class EnigmaCommandTask extends FilamentTask { + @Internal + public abstract Class getCommandClass(); + + @Internal + protected abstract List getArguments(); + + @Inject + protected abstract WorkerExecutor getWorkerExecutor(); + + @TaskAction + public void run() { + WorkQueue workQueue = getWorkerExecutor().noIsolation(); + workQueue.submit(EnigmaAction.class, parameters -> { + parameters.getCommandClassName().set(getCommandClass().getName()); + parameters.getArguments().set(getArguments()); + }); + } + + public interface EnimgaParameters extends WorkParameters { + Property getCommandClassName(); + ListProperty getArguments(); + } + + public abstract static class EnigmaAction implements WorkAction { + @Override + public void execute() { + try { + Class commandClass = Class.forName(getParameters().getCommandClassName().get()); + Command command = (Command) commandClass.getConstructor().newInstance(); + command.run(getParameters().getArguments().get().toArray(String[]::new)); + } catch (Throwable e) { + throw new RuntimeException(e); + } + } + } +} diff --git a/filament/src/main/java/net/fabricmc/filament/task/enigma/MapSpecializedMethodsTask.java b/filament/src/main/java/net/fabricmc/filament/task/enigma/MapSpecializedMethodsTask.java new file mode 100644 index 0000000000..d6483a6a69 --- /dev/null +++ b/filament/src/main/java/net/fabricmc/filament/task/enigma/MapSpecializedMethodsTask.java @@ -0,0 +1,52 @@ +package net.fabricmc.filament.task.enigma; + +import java.util.List; + +import javax.inject.Inject; + +import cuchaz.enigma.command.Command; +import cuchaz.enigma.command.MapSpecializedMethodsCommand; +import org.gradle.api.file.DirectoryProperty; +import org.gradle.api.file.RegularFileProperty; +import org.gradle.api.provider.Property; +import org.gradle.api.tasks.Input; +import org.gradle.api.tasks.InputDirectory; +import org.gradle.api.tasks.InputFile; + +import net.fabricmc.filament.task.base.WithFileOutput; + +public abstract class MapSpecializedMethodsTask extends EnigmaCommandTask implements WithFileOutput { + @InputFile + public abstract RegularFileProperty getIntermediaryJarFile(); + + @Input + public abstract Property getInputMappingsFormat(); + + @InputDirectory + public abstract DirectoryProperty getMappings(); + + @Input + public abstract Property getOutputMappingsFormat(); + + @Inject + public MapSpecializedMethodsTask() { + getInputMappingsFormat().convention("engima"); + getOutputMappingsFormat().convention("tinyv2:intermediary:named"); + } + + @Override + public Class getCommandClass() { + return MapSpecializedMethodsCommand.class; + } + + @Override + protected List getArguments() { + return List.of( + getIntermediaryJarFile().get().getAsFile().getAbsolutePath(), + getInputMappingsFormat().get(), + getMappings().get().getAsFile().getAbsolutePath(), + getOutputMappingsFormat().get(), + getOutputFile().getAbsolutePath() + ); + } +} diff --git a/filament/src/main/java/net/fabricmc/filament/task/mappingio/ConvertMappingsTask.java b/filament/src/main/java/net/fabricmc/filament/task/mappingio/ConvertMappingsTask.java new file mode 100644 index 0000000000..145b9e3b18 --- /dev/null +++ b/filament/src/main/java/net/fabricmc/filament/task/mappingio/ConvertMappingsTask.java @@ -0,0 +1,14 @@ +package net.fabricmc.filament.task.mappingio; + +import java.io.IOException; + +import net.fabricmc.filament.task.base.WithFileInput; +import net.fabricmc.mappingio.MappingReader; +import net.fabricmc.mappingio.MappingWriter; + +public abstract class ConvertMappingsTask extends MappingOutputTask implements WithFileInput { + @Override + void run(MappingWriter writer) throws IOException { + MappingReader.read(getInputPath(), writer); + } +} diff --git a/filament/src/main/java/net/fabricmc/filament/task/mappingio/MappingOutputTask.java b/filament/src/main/java/net/fabricmc/filament/task/mappingio/MappingOutputTask.java new file mode 100644 index 0000000000..5cd26a4ebb --- /dev/null +++ b/filament/src/main/java/net/fabricmc/filament/task/mappingio/MappingOutputTask.java @@ -0,0 +1,26 @@ +package net.fabricmc.filament.task.mappingio; + +import java.io.IOException; + +import org.gradle.api.provider.Property; +import org.gradle.api.tasks.Input; +import org.gradle.api.tasks.TaskAction; + +import net.fabricmc.filament.task.base.FilamentTask; +import net.fabricmc.filament.task.base.WithFileOutput; +import net.fabricmc.mappingio.MappingWriter; +import net.fabricmc.mappingio.format.MappingFormat; + +public abstract class MappingOutputTask extends FilamentTask implements WithFileOutput { + @Input + public abstract Property getOutputFormat(); + + @TaskAction + public final void run() throws IOException { + try (MappingWriter mappingWriter = MappingWriter.create(getOutputPath(), getOutputFormat().get())) { + run(mappingWriter); + } + } + + abstract void run(MappingWriter writer) throws IOException; +} diff --git a/filament/src/main/java/net/fabricmc/filament/task/mappingio/MergeMappingsTask.java b/filament/src/main/java/net/fabricmc/filament/task/mappingio/MergeMappingsTask.java new file mode 100644 index 0000000000..a63f1936a6 --- /dev/null +++ b/filament/src/main/java/net/fabricmc/filament/task/mappingio/MergeMappingsTask.java @@ -0,0 +1,76 @@ +package net.fabricmc.filament.task.mappingio; + +import java.io.File; +import java.io.IOException; +import java.util.Arrays; +import java.util.List; +import java.util.Map; +import java.util.regex.Pattern; + +import org.gradle.api.file.ConfigurableFileCollection; +import org.gradle.api.tasks.InputFiles; + +import net.fabricmc.mappingio.MappingReader; +import net.fabricmc.mappingio.MappingWriter; +import net.fabricmc.mappingio.adapter.MappingDstNsReorder; +import net.fabricmc.mappingio.adapter.MappingNsCompleter; +import net.fabricmc.mappingio.adapter.MappingSourceNsSwitch; +import net.fabricmc.mappingio.tree.MappingTree; +import net.fabricmc.mappingio.tree.MemoryMappingTree; + +public abstract class MergeMappingsTask extends MappingOutputTask { + @InputFiles + public abstract ConfigurableFileCollection getMappingInputs(); + + @Override + void run(MappingWriter writer) throws IOException { + var mappingTree = new MemoryMappingTree(); + + for (File file : getMappingInputs().getFiles()) { + var nsSwitch = new MappingSourceNsSwitch(mappingTree, "intermediary"); + MappingReader.read(file.toPath(), nsSwitch); + } + + fixInnerClasses(mappingTree); + + var nsCompleter = new MappingNsCompleter(writer, Map.of("named", "intermediary"), true); + var dstReorder = new MappingDstNsReorder(nsCompleter, List.of("intermediary", "named")); + var sourceNsSwitch = new MappingSourceNsSwitch(dstReorder, "official"); + mappingTree.accept(sourceNsSwitch); + } + + private void fixInnerClasses(MemoryMappingTree mappingTree) { + int named = mappingTree.getNamespaceId("named"); + + for (MappingTree.ClassMapping entry : mappingTree.getClasses()) { + String name = entry.getName(named); + + if (name != null) { + continue; + } + + entry.setDstName(matchEnclosingClass(entry.getSrcName(), mappingTree), named); + } + } + + /* + * Takes something like net/minecraft/class_123$class_124 that doesn't have a mapping, tries to find net/minecraft/class_123 + * , say the mapping of net/minecraft/class_123 is path/to/someclass and then returns a class of the form + * path/to/someclass$class124 + */ + private String matchEnclosingClass(String sharedName, MemoryMappingTree mappingTree) { + final int named = mappingTree.getNamespaceId("named"); + final String[] path = sharedName.split(Pattern.quote("$")); + + for (int i = path.length - 2; i >= 0; i--) { + final String currentPath = String.join("$", Arrays.copyOfRange(path, 0, i + 1)); + final MappingTree.ClassMapping match = mappingTree.getClass(currentPath); + + if (match != null && match.getName(named) != null) { + return match.getName(named) + "$" + String.join("$", Arrays.copyOfRange(path, i + 1, path.length)); + } + } + + return sharedName; + } +} diff --git a/filament/src/main/java/net/fabricmc/filament/task/minecraft/ExtractBundledServerTask.java b/filament/src/main/java/net/fabricmc/filament/task/minecraft/ExtractBundledServerTask.java new file mode 100644 index 0000000000..56b35ff571 --- /dev/null +++ b/filament/src/main/java/net/fabricmc/filament/task/minecraft/ExtractBundledServerTask.java @@ -0,0 +1,24 @@ +package net.fabricmc.filament.task.minecraft; + +import java.io.IOException; +import java.nio.charset.StandardCharsets; +import java.nio.file.Files; +import java.nio.file.StandardCopyOption; + +import org.gradle.api.tasks.TaskAction; + +import net.fabricmc.filament.task.base.FilamentTask; +import net.fabricmc.filament.task.base.WithFileInput; +import net.fabricmc.filament.task.base.WithFileOutput; +import net.fabricmc.loom.util.FileSystemUtil; + +public abstract class ExtractBundledServerTask extends FilamentTask implements WithFileOutput, WithFileInput { + @TaskAction + public void run() throws IOException { + try (FileSystemUtil.Delegate fs = FileSystemUtil.getJarFileSystem(getInputPath(), false)) { + String versionsList = new String(fs.readAllBytes("META-INF/versions.list"), StandardCharsets.UTF_8); + String jarPath = "META-INF/versions/" + versionsList.split("\t")[2]; + Files.copy(fs.getPath(jarPath), getOutputPath(), StandardCopyOption.REPLACE_EXISTING); + } + } +} diff --git a/filament/src/main/java/net/fabricmc/filament/task/minecraft/MergeMinecraftTask.java b/filament/src/main/java/net/fabricmc/filament/task/minecraft/MergeMinecraftTask.java new file mode 100644 index 0000000000..986194fab8 --- /dev/null +++ b/filament/src/main/java/net/fabricmc/filament/task/minecraft/MergeMinecraftTask.java @@ -0,0 +1,28 @@ +package net.fabricmc.filament.task.minecraft; + +import java.io.IOException; + +import org.gradle.api.file.RegularFileProperty; +import org.gradle.api.tasks.InputFile; +import org.gradle.api.tasks.TaskAction; + +import net.fabricmc.filament.task.base.FileOutputTask; +import net.fabricmc.loom.configuration.providers.minecraft.MinecraftJarMerger; + +public abstract class MergeMinecraftTask extends FileOutputTask { + @InputFile + public abstract RegularFileProperty getClientJar(); + + @InputFile + public abstract RegularFileProperty getServerJar(); + + @TaskAction + public void run() throws IOException { + try (MinecraftJarMerger jarMerger = new MinecraftJarMerger( + getClientJar().getAsFile().get(), + getServerJar().getAsFile().get(), + getOutput().getAsFile().get())) { + jarMerger.merge(); + } + } +} diff --git a/filament/src/main/java/net/fabricmc/filament/util/MinecraftVersionMetaHelper.java b/filament/src/main/java/net/fabricmc/filament/util/MinecraftVersionMetaHelper.java new file mode 100644 index 0000000000..e1bffc8f7a --- /dev/null +++ b/filament/src/main/java/net/fabricmc/filament/util/MinecraftVersionMetaHelper.java @@ -0,0 +1,66 @@ +package net.fabricmc.filament.util; + +import java.io.IOException; +import java.io.UncheckedIOException; +import java.net.URISyntaxException; +import java.nio.file.Path; + +import javax.inject.Inject; + +import org.gradle.api.file.RegularFileProperty; +import org.gradle.api.provider.Property; + +import net.fabricmc.filament.FilamentExtension; +import net.fabricmc.filament.FilamentGradlePlugin; +import net.fabricmc.loom.configuration.providers.minecraft.ManifestVersion; +import net.fabricmc.loom.configuration.providers.minecraft.MinecraftVersionMeta; +import net.fabricmc.loom.util.download.Download; + +public abstract class MinecraftVersionMetaHelper { + public abstract Property getMinecraftVersion(); + + public abstract Property getMinecraftVersionManifestUrl(); + + public abstract RegularFileProperty getVersionManifestFile(); + public abstract RegularFileProperty getVersionMetadataFile(); + + @Inject + public MinecraftVersionMetaHelper(FilamentExtension extension) { + // Use the Minecraft version as an input to ensure the task re-runs on upgrade + getMinecraftVersion().set(extension.getMinecraftVersion()); + getMinecraftVersionManifestUrl().set(extension.getMinecraftVersionManifestUrl()); + + getVersionManifestFile().set(extension.getMinecraftFile("version_manifest.json")); + getVersionMetadataFile().set(extension.getMinecraftFile("version.json")); + } + + public MinecraftVersionMeta setup() throws IOException, URISyntaxException { + final Path versionManifestPath = getVersionManifestFile().getAsFile().get().toPath(); + final Path versionMetadataPath = getVersionMetadataFile().getAsFile().get().toPath(); + + final String versionManifest = Download.create(getMinecraftVersionManifestUrl().get()) + .defaultCache() + .downloadString(versionManifestPath); + + final ManifestVersion mcManifest = FilamentGradlePlugin.OBJECT_MAPPER.readValue(versionManifest, ManifestVersion.class); + + ManifestVersion.Versions version = mcManifest.versions().stream() + .filter(versions -> versions.id.equalsIgnoreCase(getMinecraftVersion().get())) + .findFirst() + .orElse(null); + + if (version == null) { + throw new RuntimeException("Failed to find minecraft version: " + getMinecraftVersion().get()); + } + + final String versionMetadata = Download.create(version.url) + .sha1(version.sha1) + .downloadString(versionMetadataPath); + + try { + return FilamentGradlePlugin.OBJECT_MAPPER.readValue(versionMetadata, MinecraftVersionMeta.class); + } catch (IOException e) { + throw new UncheckedIOException(e); + } + } +} diff --git a/filament/src/test/resources/projects/javadocLint/build.gradle b/filament/src/test/resources/projects/javadocLint/build.gradle index 132c35b1bc..062b4749df 100644 --- a/filament/src/test/resources/projects/javadocLint/build.gradle +++ b/filament/src/test/resources/projects/javadocLint/build.gradle @@ -1,7 +1,12 @@ plugins { + id 'java' id 'net.fabricmc.filament' } +filament { + minecraftVersion = "1.19.2" +} + javadocLint { mappingDirectory = file('mappings') } diff --git a/filament/src/test/resources/projects/unpickDef/build.gradle b/filament/src/test/resources/projects/unpickDef/build.gradle index 3985ba03d7..3b6a64fadc 100644 --- a/filament/src/test/resources/projects/unpickDef/build.gradle +++ b/filament/src/test/resources/projects/unpickDef/build.gradle @@ -1,7 +1,12 @@ plugins { + id 'java' id 'net.fabricmc.filament' } +filament { + minecraftVersion = "1.19.2" +} + combineUnpickDefinitions { input = file('unpick-definitions') output = file('combined_definitions.unpick') diff --git a/gradle.properties b/gradle.properties index abbe610813..ae6f9b2e7d 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,20 +1,20 @@ # Done to increase the memory available to gradle. org.gradle.jvmargs=-Xmx1G +org.gradle.parallel=true +org.gradle.configuration-cache=true -enigma_version=2.1.0 -stitch_version=0.6.1 +enigma_version=2.3.2 unpick_version=2.3.0 -cfr_version=0.1.1 -name_proposal_version=0.1.4 -tiny_remapper_version=0.8.2 -asm_version=9.3 +cfr_version=0.2.1 +name_proposal_version=0.1.5 +asm_version=9.5 # Javadoc generation/linking -fabric_loader_version=0.13.3 +fabric_loader_version=0.14.14 jetbrains_annotations_version=23.0.0 -mappingpoet_version=0.3.0 +mappingpoet_version=0.3.2 # Build logic -tiny_mappings_parser_version=0.3.0+build.17 +tiny_remapper_version=0.8.5 junit_version=5.7.1 assertj_version=3.19.0 diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 41d9927a4d4fb3f96a785543079b8df6723c946b..7f93135c49b765f8051ef9d0a6055ff8e46073d8 100644 GIT binary patch delta 44451 zcmZ6yV~}RivMpM+ZQC}wY}>Z&`nqh}wr$(C)n%LgdY=>bzPI0>IWtzQ6|sKg$Q*Nw zoHa|J=l7uCiZY;JXbJh~2{@?0XbB8X|CW5x|19VU8|eSDCxHRuqoDx-K|uil0SN(x zo~?OM!T4o?-OM51qG*g-4=}AB;P?MF(WmR3#n3^#P^(CouLeN9g|D${_kB zhbx{jgl%v4+Te96N|eZ#civua5a?}(9N=wLn#X~A<%e>fO{Sk19o=dS4k}KNy9{X_ zZ};+oyCsM6-8v!tK4{$<1D~qZ1D|Sa`=Bra<%LR(ouD4nT&H6@G@19r=!ByZ$7>QN zi3wBfgsA@8MSwz-*U9hV$hd><$WO<~C6UjA{*CO70 zc2L36@Kpwa1f0c*fAR?gi*=Yg=0N;jBHJ)m>$N+xuZ=v~ z6ynIOk^zhZ1_5FRq$L!*i*7dQUl;tb;LCKUw5~GwnF^gbp|L1imNsS_f+=EY>9 zzZzthZo-kA>#ocfFxaJaN@jz-*DT=>|Q>Y*@1miyI)G8dDi(bDIqW;Z(utWf3gm+HayA6f~mTSxfA)C^j*_)C3|FgY#Sqm60ncDuYYI-!scG*dxnV zM02313iVN8hlMHD;7&x_WGN*LcmP&oDB?GY4+g~%Bg(LQ&@^=sS*|T6X3gIBU@UiD)WNY0l>uuHef{2tu5V2sk2AH*`>uKHVOilVp^o9Hgc4PV_m1-5yB8owjb+V)oIzXU;R)MlP zEAB~iG~b%#du-AU8v*AS0)+yFRz{D?l9gP$6$5F*;519mvWw$fe1JZ6hIMo{_{prFVeP6X!WAD&nM%D4BCh+-l_m>2ue3ya zVviBjRfb5^?9rfmV^M`ABcQ%tCc68%_?lyb0OY_J<7wbx!$Q!`PzaBKAj+P!z1=i- z_MAmYhOq^6mvS}iZyIih#^-}@O3h^bEAC6WRnC=#3DZ)m%a|E`bC^ZCcL}x<%y|Mq zHxb`f&e10J$+Rc_0}s9Bc`VR~Bj1!G-o3P$0`krL9p57kXlyow0zf5-@pguQF6z{h zvx$d+vFbTm{`|Ujy{u&7CON~tL9E?NGh?d>sZ_f5ZYO_SbpAw5t0{V+oq>@}J@Rd9 z&;`1ca&ELEVUd=7NwMs2SLu>vR#8yIrctLu;fl&+8J04wd7d5h=ms;pd@jn6Tb%De z2PUV$k950yUgBP28Gy%xlcG%WrZ%e!x(k%NvB+Hg%@y zpNXkJ6QK11{LIKZRwZu4D3y zZ`F@voZM?O@JR{;G`ZiT!5XjEG@fzdvX7?T$r`nHD{^7=Fb|B9zY&G5BpAUE961ry zwhdC+*4l5Uw$>a8XSUV`=Ntsc+X+aDL;3>yPG*kMJ=%ht(``aP;SQ{H*)f4Z+cW!8 zxB_j$#f>n5mFQPp|B9SGANzLUzau)-EEU_V&y2oXLe=Zc*3=@ilN@4%Za zAs$)Fb0O9w9c#b{b4Br~L2FJ1oTYRKpV%$x^IMETV0BXRg)K+OFp$lhAY@peAiNrz zSLRUvjzZHVZJpGl;8N5Vs=-%cSKHQP24g{~Loh%E2LjZvt8vCI)alDP6bb|O^Eo2e zLCFZlHl3=oL`l8ESS>SOLRn2w8sOthv#kvnykZs zrtQPE9&A{S$gM|YHNdtRa@t$G-3$`&MfSvMHZ&Lv=Y~y&ZeydBi8{j$#ukeF0)( z>@UK#>UmNAk)T-M`6YPOo=4&i!7ydGW~WIK5U|tx*zTKO&CL_g>U7o7=LK^8nlG}i zO9rS~-F0%!ap77c`hDFVEwvCL?=5rD8fyePRTCP5VYsl;bezhnG$@-gm5!(Pq{WFU ze6c%yw-SGY?MdPBT-*&jSNO8id;viL28o%p!0(6fcWq#;%9`5~Zxt9x44O&EleB*8%i@_-YcQ7wiAhQ$;UqV6-M{uSk%8+p|wS z7%*BA@d0*I-)~>wf8pp>TCdGxA6HWOm ztt-9qj5^mgz8qj>y4B6o;22ojDWBOx3e=!5BD1O@8_4SZNG;|rHaYuiai}&hLhl4J z487l{l^V-dh!0GoX~@LG?P|%XL{D_X}vFU1_J_5A529vf4m%w?A5x#Gxd@nTv!yV&#&FtLMxH4sLff%W-~zN~nI*A% zEKO6W)r#Z#21^aLQ!uZ&0H+~{c6f0;>4R)z(U?u1gYze@>~N&9qPaG>nY}gmNr*Ws zs`|R4=t8!+C>sj{y6Bz&b}@q(Xmd)W6!mxYd2J+-OryIz>*~~W+qk2x#sa*UicAux zkHUg&kJ&=hq<)S+MN8}*RF=Q}7Z@H(e2Ns{L6$)RbAa`bH2xFfz zBhS?|4z?XkllFoaKxWb|y=%Md@f7H|#E0<#v_{!Znx}L-$jL_c7w021K+X#*9 z&G7e&7S?yW+d`E#R#rYqFoIqGGYQ9r$PpOb0^t$z4RjP zlhmL81?m3<_XY$6?eq6jNn^2Zy zp}EzZv-b|`mdHJ_FXrEPQSyah$h(5*rnRE%=Hvc!iZ0fsro4=eoUNaa?{CWATH9>- zCd-0|xwVi`!m{cE3XDX%i-2iq~hdiq$47l!Y zR&y2s#BNi_v4AWiQ@UNh?&)~lhf1(H>Y+(Pz1ofM%P9AH#QPLII%qDYNe= zbxLeT`?-YF8urKr4gk$yL(|bJ7D}KXio|1%{gLU+N<;slI;0Kh9Hx0M*4(i2?ql?W ztx)Z0+?F|QfKBIKNiU$!mKaM5Hx<@?b$)?s zl5l|k@I6vUF>1aRN9?Q<&L$ihlaKi!#G%*>`G~IIltIEeg_;OsOpoOJ?CF^?qhWp8c!FL2 zc`RQnXh3m&G{B#7o>2JIQe9vBP$epb1Xq)Ma9$fOhK>?+lxQ|MI;=UUkn|OF!b0p3 z7KLW0cJA{xE^z(4s~xZlv7(fP)S{$77%Z_jbM=Pe@*!vOG=F7*x+cCA1xW=Ced7Yz zsoDXi$gbXl(!Gkg6Qr$=L8wgvoC>`>jL1L(^*Kst(64Cmz?`)6QlO+8sj`N+ZutdY zo{FDu+3d28e4ux>Z{W=I-}jLJ-I#DX6TZGdfq>j#fq?ju0@BHnauWyu%3JD4Ke6;& zv2-X$5Gb3AJj-Br;Gj}LjMUI+!Npu$HK^K2yQT&02(8HpClqz_5@$Natk?0$=O+fd zeqjRAygQ`ahGP&J^5!3>x-VB7-!DtKD?jgZ3VlGD{UX>F2?Amw;-gTDc-+`1wUgtA zK}4yJF-M*2bS~9UE$r9;7JJ8SIK!Ny)ab1@#Ze>Z8NOqzFLk#7dTX} zrOINO)J~Np744c#ZT3sImGub?`0rY4c2`=7O^qt?6@6pPycczV+7R+>^ZAK+D^{_Z zi-ZLiDOlEww^rLt#R-nopqGk@jZUQ+`e&*liX*nT`cqhG$zC-;8@_9uuFaN(stsPG zP2I-2s31vu6Vp|w(+e2qTiK6KYCi|I|RilqFqQDSe_^(lhPM1=Q0)szsM#RN&dnvt|IY&!6R{YD-Vzq?x%zV{R33uY5-z)|)HZk&yvZaQGmV*62It?du3j zGs$TlTVi1VC>D?bQ$eU!?(jK7$gaH?;}iDe+?T)|#{byz`7*`3U({ z|F{7_2%`#H`yHt`PZbWjkvo>1j9Es`Y7%;36mjRQ^!8=lkmokcl%6i|iG_?rmz%5^HhD+{5F(Kkt8yRlS+mnkUZA~Tck1nk0i+OIg8bPf&f1@8`F zDFm?czU4+eEj(0$#B2^lPG`5dU$=eaE&9ISzQFq#+#ekkCrrc{IS4LJ5`x@vb{!R6 z6g}!E;f&&; zas(0TND)Md4Sc9MniGcea0+3%_gt!Q_OwvJ)*pP4VCdbJVb=TbXt$q(m+y)D_}oyQe2a&# zKWsBpslBgL4Lwo=pQ0(Z!K5pwj3ue+xt47uQM$)YGb0#$m|J&Pk$oy1>0^PQ56>Ha zf11+PRfOPRHK>g>vu-ekd|%`d07I)pP$~1@*cf%5tRErMu?uijOJ@`CVZBV1g$}cU z1%8D|GL&&7MV4y<18(l0* zcX`UHGni7?2AL9A>5k!XYY)h(Tbfx+R=UKJljO;_i*tln+uK97hMSV*&7bfYXa&lC zJQ{x#&Sr}>%UAjacZ>JHolgPCN|IaXLI`vgWD3+c8K76zkdxGgd{r?%ngu?nRnR{I ztBG$woQd!7ja|}usg4>$QLKW%|DAFcPhq zfuR+e&R9|WX%9R=BH6ESQa3I)L#1N*Ws+;S(LSzN0CGDwvevOhydd<NF_RNzGi=Ss z^hI^nl{^7j!&rM;HSmySSu+juwrvu7r-`&6fT>FhTbGyLH}4!!YVFAhHieM(|IbnFY4`L zu%P)1Zdz^G{n3|ZP!MQ6vFoVLM)hER0D(RLiVW}X!V(CzfnMO} zSC7mAnsILUv6V%kyyXBTu+TYdJx`eQ7_Cb__3Mo(e&l7(?U(N$C9 z%-&#UV_asI4*eX;>{?)DB6w>AL8BUUJqBZe3yM`8HkF*i1E zz8wjLD7HWrPpE_|*6R=qU_D%=NhV*Yo;_$c+_bnBjo=Eh8_AEp8|g=XuYP4$(Pj(~ zX$J6efbZf{(oV0S;)i{)VCV{q0a8#tAkClC#2JaUKN-vohT#c0qKjC1_$@9tYNl`~ z6x9N+i!E=s7d0<(3Pb0Ad%`Dr=I{YPWk$4`qc|7HcOT>xuXW}C+4+zj`|=NVtTiH3 zTFvpRdhN7#?q#R^iZU<7PTQVXj~fqQ0YO9QZqO^=(GQ5TC%nvAaf}T4+R;KKejL?r zksw1^{Q3nb3HpKoEgYE{)F_&~SrKyS=ZD{TVhO(z_S-@k8DCIZi3|M()(OOIVyjvR z;yF{y0)&HCVeoclB-4>4SX(2tLf5j769JO!gT*2i?2Q@I^=Zb|4u?k5@cpQQG z4u zPOF->(}f#DCAv&{z}_(NIEz?^9rRS!RDJv+lvO?{`>A*MP^vWcl)Zv1xS&|B-|J_AXCT*gpVSi7JjQ~m7yZ7s9#cIY=|RAY zv6ie}RF$ee41EM+cte-H6uVm%qkEC#pN*ZhIt}#G1ER+ohMD&EP?%-$%lhD&#vF)5T0MBNDB_s1^B16} zb_|Gi@?Ki)Dw$5U8`{KPbr#CA22IAFoW(57DgUi#g66BF#vgoB2(>HqS5e`=GMUL*r$D4j85{L4>DU;1k=ew!(SJjS(o_d@!Ma7h!>_(?Yum& z2+V^H1|B+Cf*LQDsWyULZJRUERrrolAiN+VZyV@&NBLYHrJyKMLzAp%H+Jn#e9VlL439468Y(WoN|BYy=$N3!J(Yg6?}T#z*m~ zuPM`%u8Pj(ii2)#c0Ep3PPsPEC#+Xx`KwhxN8eZtV8%ObbD~2$&`CN|AdSaQQUojc z5uPl``EUX?R9J)!D3sL{9U8fm-75Mv5c`T&cyyRyFz>4=zX{F4WL^^kI&}!?T^X&2 zwK*4ZleYqyWEK|dB?EIJwLF~p2YfP2q!(&rfP&YPB#aMPcbGhqRaboTbVJAhSB*)4 zR94jw(A?+{-YsH{cv0GH8q5;cD`AY-Ah)+H(7LB?ZJii^j%3z^-x(sZ6Ikby@fh85=Rar1!P$b*!r92wHYp|@>tC`$ByE-;1Jrh$m&DP2R#QpEs7AOVL>38&g0-cM zv%#b-vrD1>%+)wq%87{Rq{q}S7e*c@n3ndO;ogDx1@1a7;g+eG^XR??VDZr7&q~wC znIJD=`^?>J+Uq$A_cdhLGz_E z0qBh&11r}PhsqdhDLHD5)3Vf7jzc%$)lQYe)a8x8sfx>u!iN^9O*I6vhc?^WGE1Vj znX%y2XvJ#X-rS_`()XGqQE0eiZSNlDlCL%>!`$cyh`2YQYSyYadGKx@1za*)s*N%C zM9%o_kqvibUbe{C#kJWsEjQPo7>0!BeqoLUjsNj z2-0Wrx9gZISuTh@4dXDT4x^R#=$WRwp)-xzjau*tT*Xjr>ZVF@HQmqmX6q2_0n<1g z>bUl6HklgqO4hxMUs?y52gmtr?6L=T@LBB>^g^8d_L@>gbf79)+jx>kh z!nuw0(Fn}FFmdG;lWlg8ioKuN+iaH32 zDaUP__~E`m-l>y6eDkcuX#RxyC<2BnD7hMYAnA4Ep6=8UC0w*{yt!Ubi;ex1BNLXG zS(KlISd$iE#3mxBibkX=0AUSd$qGEx#Ei}+bIg-JzXHCc6h;i*0(ziqcnDAM*T~E* z?))`RNzp7*2dR3)5Q2Qs4UJRHQT|v0;1*$*&8VJq%K93FMBIZqSqR%)Gi(>hB+O59 zjeT=}_>Tz*7dI2AV(5muP=fc)sAxfd8Lms|>^-t}M$U@fz9La&f=}+XS;*>|k}Vn9a`U zxX$Yn1c0WGG_iRbS(25qnJS`~bB9>La~f5qFXR`JiHe19pxs2QbE6}w@|lJ^^$o=9 z?EV4db(}l48P$gLUUU4xPSmGu=1)ro-)b2W3!MnpI4zv%WKK~bqND-P|l$ZF>Vw0SrgX(d!t zM&+PJ+QnyQ66z8Npu&6$3t@E3jA?GuCILoobT^OqTNOIJv1OXePOwFA(Sda)sv`gt zk$2^8?8d+M8k}u4+MbhcXzcz!aOX9c!*4A_$NpHp^+WWb0}NU8{>7AYI`mUDs5|z+ z__gI0IOpqLqDjU3~V3mX=AB<8Z$r1r@#123i* z`La=%w?p9y?MRR7qS-CV!$_89btQ_@cgi zdpr{IX|{K4e8~A;ljF0()8!F{lQFWg;(p`Kh6F`x* z2~fk$RNA8^5X_g)wah1}&5uyDg@h(a#E<>aw4eQSL&SLt6gZv{{~HCdb*~SpNewm9 zfdAEZS-Y+W8$%`~)S7>57L<%D|AL|>j{hg{R;DkIY;v^+umne_DzTQ_^<}SxpRi9dTS4~u}~mUj+g9n4w-TWSG=hkj<(4w!Q9D^1&K{+TC9L|YHDntezzl6^l7Qg-{zs9) zhBQHt$)VcP6yK15nn|f~DMudpX6wgv0jSe4&)#~kB9o}Er8E^vO zZkeaK!)e?IDeRuj!W0Sz5c%-fg|qqV6;O*7HDZj_BTpatZ*Uk)4`s|b>pN)?=S|mGukSN4j??n1jV!u}@_1<`2*_c-OB&faIBJRwR|u5%h=c z?=q%w$b=J-^aHEocP43Huqj_Ul4canYox?ox$Q_v`y&po>~VS%Jdbj74DM}m1#(1J z9xL01IwsBTi*q|1i$c~}oCEa6ijG4{%f}~P34>3@%wl60D{KX~$m*mMe4&l!Ky%}M z^1om=Mwu_@+i`c?w0z-LaN^^!D!qi@a7moh2j>ErrN2o=`#}FYVLhi9VUzOee*yFy z77fw-<*CtNU4FCdd>M~(VBxOpU`JD+$jOeI2X2hq=;s^hO>UjoSv(1P9mP=Szkz-! zjXt*8HVOr@SnFHFjL>S`3 z0=m&Y&3E}^ZmHu{;@g}pjne8>45lBuYvMNFzM>UB3E2j2z%i}&dmo=F>SheJy)*gf zOrh1k-PYF~*y-6G*F_cv1&karHawdFTih3U9YNua^KGR z6frpS5I_ywli9#LEzkjm1OP$DIBWMC_z0I5!q(s1HF0vhAx{CwRs%RGB_9hlWu1b| zu9k((ttt5f;qeka^Eus|K7fp^!2{AmNLF+7JKYl>H=B~LU3o3qq}PFFD_dC{+Du4A zAQP?E&_;GNlbS){T*}~F>WDda*enIBFJjA*c!RGa3*vbH&dm<`}b3DUnT)wZgAGp##!~wQ|6jhUNQ-2ehCfzinyN z$w(*2LhFNnZBWY;$Z2L_C{s1l4M;gcGnr*5!#J3#Y!{_$AV9 zz;JvQc-(fqX1mPsPkGGwc^|DmLITOAeFMBKhsrMQGrYg*BE0cf?le&C@mTHwZ`;Rr zm=L{ej$DM0_bJe*60*k!L@p zdQPjtN~j<*&XNc8u?xjRE614FmG@H)mc_(9OXlMfC@7AQG*Xp9qdAmj3_ZJ5m-qyV;5BH6-iipgng%Q#jrsJlltS71>rC7?Q#;s^s<%uX_ zY%B4~sE=0Q)T~N1<}@YS@i3@SDgB71ff}U?G|ris88<0QD>N3KW}()!a@;EBmAiBz zl@ATN=00Yz#4c(cx!P{M8W>b7Re+vG#U4f$(}swZWO^CV^`xdV@Rp_(=SE@+pA)>6 z797;H@s3K5T#Zy3(3MPO$|+ebhEtyt5E_v*$sTIjW8u1L)ubx84oSm*{++w45*1R^ z2J^tU+4a34nJ!@*#1MTHN!BLl!Y@7)_F^F>eE{teM#wH(BXh0~>_PK8r zco8F9TL@{^(CqQUFE(?D%cFpHyK$Ua&t2$0t1zKv*!q-I)$pUnx|BN|@;%5m>feV`5y(XZ~n`ls+O8vrJ+$b$RF}RHaX1_0H0?Kn5ZpZ__q62_1 zW!q8>-x^P7ty5QO>Z)q>8Ug-Z&ynad4CSbAsrGQX80BZ-kRs?xT_d~74SYyt>IWOD zrcQEx&x0j0tCU=62KC3)INl}w2hiYy^ysm!D2Up_b|at%Z?$lHATovB#Z0I)69Dxyi-zm&9K1dR zW(css!U;1i1N81HgWIw$o!;#Pb9bB;p$f_i=qnCUK@I((@p6=&f53(Y-uQ&HG6@~px<^Z&9Nn+9cx{W0Z@}c@ghUQ8*YVhARXoTy|sp?!tS_9bM_Rh+A zdqj}nyUf{x3))=!uRtHx-T=9_M44p9W~N?(JT`5}zGu5qeuZLID&zQin=32@2y$PpYH3#Q&&MbaHFB@FYzBQpN#b`pFi^e8QMQ~P_mjbdVcm0_(3qeZw` z#mvbLk!I+vZMgvYz=)pfboNBb=goQOadV3;agOr2N&ce0q$IF;#51AISc}q@yI9aH z`+v|%ptaGUL$1W}fi{eJV6!`+?I6WtAv%p|O9= zPqG*MFtp1pmYruRF~<3-eZXd^l~ObE{3NWMe`kG+Qs+#{vd*ttju|JJ%Vtre>n;nz zpgpq9Zm`sZxs)FA`4MIN(S#R=Ye@%tAZ%m@ZB@s)isEXCQ;QO8NGNwCnjF|~n;md$ z+aJiUbO9h=Q3||MxhRorPFO<0=r^eBFmA>e0{R5kuStWfOr#_^oWP;0Bt#WAZk>`^ zkW{x-&y-~fQJTmY@KbduvLdK@ax5k=h#ilUQ?#5rbcv}hJw~2z)aaX2>UGpx{~UH) zmTEhfxN1A6=-N%NH_jy5nDG`AS^8IV2{E^I4+9b}kG;j7=w-NG^6z$E@ns0&Az53M@nax(&{^J-G=FBhr*#JSmqZ=|{3 z)hm+*$Z^=AKSCP+NOCQo$3Ys~U5UFzvdGqys0yJFzCEg!CP&d zZJoJDd-1DVOxtW*k0lc(pjbvw7&V6x_+}2}kuhn>dntL8F8wjce zW?vIBJj8jM07V}gqUmeVpqQUgb?#rJ{ zt-5jqrJEER<(|gpOX*1Z4cbr3Wq^NC>d1GXf5b=6(%gl{a769D5x(lHG{C@|+DqzL07gaUq zf`FOkGbWqW4wNeDqYvr@(7`WPr#`O%o2oXDJR@Ol%Xkj!#%}{Zd~rqZ^gR*$oI_h} zAdZG^L7Nz6594aD$a!nY=LJniH>vDjtDXnLaJ^r!97S{vjk5g2JipiL7gXkFQuSbx z%d>%ktfQ%#)M83d9LQq_3#e+cJ#grtu=qA*;c7@{Y5Z|zu>*R2(a)ocHf*2REo8W3 zu&)sBXrlOBm4z4Lfd_|e>iCmYo0G?tWPDm-Q%jl8ntYa^_5vL#5P3gJS~2CWq`m^# zw(hj5z<-e?e~sRVuI(l4-cG(-Ig|`B9v6H`a!?E!W<7b#kxKRL4A4Pq&d#KNX#{s? zn6rRTkYQU~=%p!NrIwuYel`;x*+~9L;z3U6`9iIL(YR*JyNU%*A=uhdr2xa)Wb5@?{H}Q;2PXmYRdy93nR%OL*V4W2r?bGSTi3tj z@!#ZfEh_%3MpSN;H=r}@6ZrUv5!a-V++KmMBTEFoVfA=mVak&a5)vyj!seseq1eWJ z+8kWadwqGtXgZ>}Sx0!Z?E}qL?3uh%Vx9!U_qmhDp_$e8xPFaCwy8<7R&EkEkwWep zQDoe*(PW@}C%Lnx0_=7_cwzi(dF{Gx;+*a;+df)z0l{xbNjd0{E>8H8H`AYbyrRBC#}- zVh`j!(kY?&9$@6<^J^zgPc>TDWiJr-9qs5sTwjE9Iy8}geB}=q0cd0l@2ghaQ%}xf2zv)PY8G=-l1? zj9bJX{t#JAZQky*cs(;qX;Pt%nrd7zG*w;2#gK|fPistRHQv(6%SZPDTSyq+ z-DCF(7=XR{(23j4WcMJSS!1ML`h?!S-1U@!nRz4|D#=Xp_(SLAgX!zNhP#P?TY{?_ z>SGskhhPs{LWLejjs0tbm6;w_%@Z{~F->l+5Ov-&Rt$Q2IIL1k3KwS8n>#XyrD0>W zIOXcTb+wswwMoB0v_w6Dk0Z1`#YkNPaGwaN06-K~AS~v{GF8YjLCG?u0VEAV!%K*c|l_L$u^rOhek3wrBVMVB$mF~~P0 z>ln*^LJ7Lk_%AeEkv_o}kl^tnL3EjVT;nTL=oxcRrq(Q-o6{LwEeG%utZamlfWK%g zAHcdrXwJLCUcXQyx^K*+n6*4;=<;M%VCV?%F<(1(EN;W4%2wK(&<9bOcJ=tdf-fSE ziIZ|t;*C1j_=i77)LP7vR2c2_b=|j74618n5%9%81q(G`W`%DlBe{ zD;zyVBm5Em&z8TLAu+~%G3p}~-rnvSXlQ|Pcro_AUhZrJO{v|M_9*C@Z;7hVJ%w~TSFw|j70k^H0m?{K3nYjJoh8NnV0vdvkl{Sy1o{cZ5@5in zO(f9vb*i0;>(xlr)LACwst zYK-C37U{{?6>!IG!T4u2rR2AlAmGme#!kAz7Ja#Mij|8h@)rt(m&!8=#yyvDWlDMo zS`l%wVgnVmDRT%NF&S2DGM|CI@TByLjA2*BeA(bL6UAHiM!%KdY+?Nl)*h?gy2r;` zk$}U%#-}5KMga`F^p(x{TBFAx6;~Q4gF)`xcHE;g`Zrr%Rerr;#pC3eBA`sJX0vZ` zxrju>hDZJxB@-va9^4uIQ&HpGyqYT2%uj1mg>EWE?B&RJrWT#Mqj?`>4Yu52Tn&{L z>{+ipJ}XNtb9+nLzAFCTF>Rm3BIpM00YXE#aLDsZebjVlslu~6vK)*=h(M`d0*}fZ zPR`~QUg+6(0FN46B z@aR6g)^CGJHWQ{3#!*_B=k^N|&y+>@ zS|84T^H9-$;+P{WJy=`5z)bF8<=V0{`DU~49PwpHO9#{#MsYn=P5@1KvVWj``UZ92 zuKC{CcPak->8E5oz^_e+I&Z}N`wL!o`3<~VrrGV1PWk=R@29!6N30p71 z9KSqihff1YHfB!$^f5r_-$kshFD7%UC-xP}Ytat(@S3pejvdXJdM%a9OwMOFPncOf z?M6bIrAsPV`DG=wn+DzljmdcJwo28U8O$pEo9>-4z!aADUXaxZ4Bef;x2s|ucX}1V zk(Ev)fTGt=)b~?^uD{QS_-FhZkUjYS@b!+torKZ0_sj$n+qP}%AKSKVtAmMc+s0&K zb7I@cOl(Y?ygBFGI(5#iw{BJUhpz7a*1hX__FBKSTa?wqdPWEru!nA6LCPTDL13<= zHtp_1ME)1zke|jgcFFO_Z*?tSHeCtkiC$~&Zy?-2@v4tRZ?3Ybk-?Xd>r3cP#5s>K zl<%cWsRZe1I>$7wF`FTiB_XxPYWDCq7oyyMPlw6jAp%98+fE;h2K3n)B~={fle1fV zrUiq|&1zB^nl5B#z4r8qwFJd@pe*ezD9zTv;d6x0>f< zCl~klDN?sFJjooE?)ezj=etae?1A9!v{t%{w*gxtE0E}BhTS_B-T5J}mw|DF z-K#OP6oP~ZxoqF+oHsNWB=>^kk1^?YDGxeMwD{GEXA|gn1+a}8%uM}rUh+pKkEc=p z>D-m9(LuG2wZ3Y*Z_CTSqA%{0wQ6s)KKjo&ErNE%{_hJ_vqocA`y=_lP!VQuC@#qWipKY)t;v?*&U%`k;bu-96fBv5T{)q{O&5(k9VuI60 z*gps7+y4U`1Qut$g8f%c1}@V76tm43-CV6~8NvP=O9Zh0e{NgZyP7%M8~yil|4l{_ zPLarVd}?VCpN1sX|JRF(My{5s&PMKL&Mro_AWJh78#Cws>bs?=>S*Aqp}mKKn?r#Z zRe%Nv8gcJH*>!AhVVQ!abmf{-Y7U_iF}*Oy%xrfS)amR1zNfuBBA_=-pd67}Chhqm z&be)xti&n?k-{cteCy@xa=qp0^wQwtizCFg=}g=>cJzK^L={GDM*8Fq$TwLSX8GP~ zsvo{a;JCgJhu!{ae=f6+5&tf~v4lp&>P)lU`AJj629RFZJ)V3KHE(i0)>$UQFh&%a4EG&USz4Qf3x(^vQ1gmVe!X++QVWLBXA5b8;F!;jIb&OY1?ov zr*NuZd$2-=#F6M0hdN{CJ*S7+0B1-F1C?$}@Xr1qaxJR`&+^nB+FS3eB2G7k+_6Y5 znJ-$Yi$)e1bQ(hl(}^V;J=@ZBV@-SOeZHF5m)%4&L!Sh@8DGe`5mnH@~y05}|%22F4k zgf6=Kmy5UjQdVR>szSDQwi(EN-ONiarL!U;Yu5@iO zR9u*~-F5Z+l zgU7nD``4V&x(9XmReU7OEWnWFh2bHm+#(mpb^X~ZH%yfOC`QosLo z{w;z|IbxZ#35?tOFG@(1-WH`J!l6~3v~A2hIOyk0;8U)oRgqQ;1W*+LTg$p4QW_z( zj4h2&^uvL3w{^-9R^lJCZ$Qxt)4U)_j<-{|fVk3E*55lU@-rSDa2nL9Hg|c)#w_bY zrUBZ#Zdp7+(;{ILh+(GLCg4k=z)8p{onG^VG=@z2#(UA}6Oh!iqY7Izg;ik9R#cVk z#nPFayi(NOQo`CR_`mz{O4>tx!k_(k>`#_N;Qv(UL*p9Sat^yO9TJ|Pq&|7J#AojA<#C=!yA{N@1uLB?Sm)S%3CG`8%8D<>bl zvAqV5Hhbvjsw-Hs#K*rYl6L4UtDNJDr9=if$KBFtgn z7}1(dj@w7yxr?u7!V^OpL&!r5fJ0@ew;*CInq_QdTwxWa=%r#5ot%Nt@U7cWgr%$-*wk*)6pVzu?pxwLBdWr*#v0O9B05FhgdXH_ z(ob9>#c1plXITVGUFH{<{~&%|Rq8%UsrF*61mu*>ag=qN4NXB#&N=5Gz`oWgpZJj# zO#D+~bzL|gTfCNKj&Dtv@wQRD$QS3R;TGe4WEvn~ ztHPG69Lsfa*rb}7?`_)+V2;*{zO~yI@?`7J7?*3!OFkHR8)cG3SSf6?Tuq&+ZDB;P z(nKw}$!C}Q2ij2dbXM@b^c01_l-5Y&Xcf}_zJTba+wLyM6i4?)bRZRwA)JUuF-|-w zS(Y}{+dX&%HCnL39i^1$&iTcpRf;EyZ!nZnshj>6|Nl!)?5UrtXisALDhUYbj1~Q8o*|3Zu7@`kRwIjt zjml?0%8KBZD|H^8_53C{6bdg%_xMEs#_3G-n+T@f#KuUri`zxl?d|dd;g?)v!Cn^o znmzXb-qur-^$~tTxxf^QHOmLx{3Yu=D9U-#dtXt6>1!DeV(;XY0g-#?9cV?<_TOT}X&m ziur!K!w@GxayNc<#She#$Bv3dV(mhRe~g-G^x4))!!Ch!93b5G^>4PTf1;V9pW;R<gPHg>VS%d#zTe_8T9oxo1BbQpS-S~ zxAUJ5qkwf`gcxL<^u*+((PG$uhNIdrdnais zIks@IneGUD1KoEg70E4l64Kq&AI#V}nhDngTMi?3zC^nNM5?=%YIIr+f5;rM{YbpA zY*23C#yX80X)CIlC+$L)tR`o&u^|oEnkRM?GP$Q5nM$x!h+H}sePJL|n>jiOQYOHgy*4!JJ#!xGJDMn1~ ziS0%9<ukxYnyfiW=E%A^(J@yXuf%qrX7cZ>Oz;#$uORO@}FMT%kog5&{MRhNa3B!x<6O zrJE`pT7>?Hx&rqTkosACND_K1>Pj-Oi)@i2!O-zHLbX8*V~SCXt%zpI3Qa|a9vU%W zm)OTMdv``ZzN*Rtss>!H4}Sw)(lxZUY#|AydXb8%H{OtjYL65;^&4(%P@*PeJ@IaC zken^`BUT<#himglR}q{35YI&*+7GHnw7gkv^uxe%JF1ExVA{!`9}}i~Py?k~{R$qk z%8}+(O1j_<+%56AX>p z>FUw@dzGD39o}M+#&(HB)){&YzT*V0%q z63i8cN1`00iozZC?wYH2oos1=`2t6VI?1n-dY*@DWp5wjX&kFfh56Zt*=YD%1_v(Y zl>O^$R2Age-kN3!Wlp<`m_8x(PF6TJxQ+vhsuYJg;I)2J=NtpnVZI#Q!ja=@{Ij+F zWE0z3IGW!{Z3w57OmCa=m;e(HU}Ao@#4oG^=f~y;BV9M_nUjIlFa5QM9?C3RwTDd< ziN%jC&LpkglyMI#1oF|gg~wAGdS<&|4JiIRd;|&&V=7$cyW!5|bwHU*E~H+^q!6dg z%EOcZ(Xn=T>35eqhARfc1@(fita$7fzovQNM0x|9FdNQ!5d??_DfU^iHlF z3)>4iGOM)zX`1YI_I84yKO;eLnj^MMe4OhVDfsTlFMMlO@6N1w)I+qbI}8B@N~rE{R0hce^B-rSj$c?kqm&CB?VX8Ukh5K2Kfuqh ztiCow9Bw`v5RC~X&zKS7Cf}GrTAWRPiIoa#1UBz5cv0DhvM3;V4+a?>I_;+wZ!B zl|%vlV<`W(z0sVHb zQoCTjL({9vtnfA;I>^AE-dNkyFQtmn3Uv%w@3el--W`+rZn23!;yyXXKV9S9sZOiS zp2s_PzmYo9Lf@iqle?>*!7Bhpi}cPu-tdYG=b>zYvFPD9FHnrlTj<$ZlD5I~^oPEW#Tm;&Ki!%9W1RB)k^ zhv8k0P&v-DYDpF$e*QP*(ZlT`*~|SdeK(bl9*6V=vMcdYOFjk1VZG_p_nKHuK#l9d z(=i|$g%W}^wqm1#OK+rt-U0Buh-HJank5|wqRtdqWy=dEpg|Kwq|U-fsX2_!Hj1|& z01szG8x$LvxyQtm1Gxy@!A}Y|J`~0c`#-nHzrajJ+!1Jc+hPXZJu)OWHAd~o9J33V zP^tz%Ae+)?YeFfN76gYtBi<#wWA)c}+M}YRjiv}8%w&51417QpxdR}~A$4-!0{-1G zD!zy25}d(Z2$x*1x`@%ganU6)?*odTNuR+Fi`x-%EJwuk3)lk|U6o7dx`o!GpLt1aHcto&f$roT zmGscrc&D#MiL)|N=OD(@5i;Cfv<^v>(0DUUrjgK+K@Yilsd%jnU1Hj(b%&1I3z0wl9nP2(R<9N)RI~ z&u*woy4Qqcc0dsrL}vZBq`Jut`t81oWFgNz|9dTl5vvxI``HNc|Ewl#|5;7=5O9GP z2UH29_kXs||IFl~aV1r7B%@%PlU5K)5K;8|sFRnx;x(jDsj_azxV^hvrVm43L2nuA zJ56Ghj}g*u8Z^YuLN%(;ZvXZ~n^C#hoZT(ldopsK%-t`S(*)n(cIc!bV~yCP2eiQa zJT)o~3q27pX^+9c2=_VznWIlz4T*rtFG{-6JBgW$9{Vs9uDUV#NPWezad3A#nStQ7 zv<`%)tp)q2p$x!gCB-cqnAkGy;aD!!Doe|5gtVAB~cH9oFs>mf-QpKe1kM& zms8EsB=rp;DpQj$xqp+P(TL+OGixW2;IE?8q^?H}{EYm$$!UaZc?8T_H!^x+v11|c ztRHTzvCO!Sn#ykg+bEvHs-f+@(xKCaL=r2V4gY`6dY_ z(0RwLLk-c>*w1UMJ=#Cd67RUw>!riYJX8)_Yv3*&eFHn-uH8YQ1FIbR!cTaL@CbqI z=ryBGFjApsAE)0#O*$x>?BHBY6N!_R7e*?w4*o2&Ympa)Oh%IYk^>ajIn~CAM={9I zDW7P#LP0-WSX)xD<$Ef(OQ|AGhT2Hz*(Jnif9y^2fLhwAI^;Gwf*tH`_wh9gpJC^d z7poCq6$rya(?MHWp;{)H+1kF!o#f2N?Ih( zlib`?Lg}onX()m4xGnJ=z7-Cn_q3_zkzK>ktii3 zZQ$cm9Y3*}Ld+h?(=7RNxd$Qp8UynVpE#=6 zTXi(VYl=>Cho4Oxkub@nOhzqY9iuvb2Y|21r1N+;10Mk+!gvVmSm|WJ@q4taO%Tn3 zK=68as0ukeuL`>+Q4A5TDlw+!!8Jzm1CpA3^cfpW+WQ_dOdaC9#`DMjwKJXrBbw#; zq#xMmk`PcRfk|y>U)9A$LCTB?pNvjhFj2^_5)g1&DKs)c$S6V3WM5gK+4AQkZW5zq z&F8c7>;yT~tjz2tIVJCNj@mzWDd} z3tepd-SBDt;6B`fR(L(_3yZMC{^&}lX3Rr=L@ zwW0A3+vXnGay3LC^DYX&r_;8APQv>%KL{TvWYr}`$N3_1V!{e_0DPb7bPmRujQ{#VKLMEz{%~ROq z=GbgH0quQQ{)OK^-Ru*lql&ePZnd9m7u)0n4t>f4m#sExZ@qIEQ6NnyF@_R}ye7G6Ku(j@0k3l6z=MXY**f{yZU!bah|*)D!)Y_OPL%Ei}N^8w4r@)lZh3u#-oh0EAY7#8Bgfs12fO=%YE zZ)nAibzlZT%Nz#FMlJoSGg#kVY$+=10vt|Dw_SM78mE~x%^5YERsWN9&;sKH4Gdl zBFXj?{oI)FqFb1LsZZy>RN(cv!X{PGvzSJl_0=yXVXa$3-V*6a!S662rYFfjM~^0P5oH!-0zY z&=>sF(Gk4D-Woy)yQN+`e9T1MvwVOh%)4fpq8jU4#oSkpL|qfWp)4oS5v_S*y4rPc zfB&sZubk272MhxEk5y?27pA$DwhF(?{7?P}ouW|KbZVnW3EudievuGfPV1yU@vBNq zk*`)F0=qvWi^#K(DY)Nnpn=Bv2rXisq#7}lj=aYl0Y2id(o|@^Dbv|XK3y6bJDHoc z1(&_pKq*vexYq11(o_}E1ZQ`O(6ACAbX$j^+1)|SI&$OWK~g8y1+x%|y&^42El>sZ z))$|$6I~rLV!HH$1FBq;8CF)Az~4Izv=^$`cmtI%swwKGDkK8AKsXq5DtGALAVaPZ z>fMRL;TCJ(tl<`$SAm#INnS92Z7y^$mA7Uh3zB+9JkAGm88wLDmdu8o9n}T;$!=`Hd zlhBnCjGYQz*ugVgeJ8S1{x%LCE}G@;KH(hznDsi$9bbs&Oe?*lpLaln z@M#!F4JRuMP93D9agA&jwuEobx|n@r2);b%mdp&pw>sbFnOLEUO%9QO z_ZI|&_7QP>8G+wBpjV?{!G1!s%#_0u!>f_UBFOC#+bg4Ezih!knM*ipELYr3`6rzA-Z7Tj^! zfh|_2-1iwI^SrsoufcK7bNL1{jPSWTCXj@O-;wzk4d4}7c-EF{Ss%d%{`Hi81kH;E zc|)*)wIMCNunF2;N%;@%NDO_?+np|*QoTAA3li-HWWo^kOlUZCQ2XK|vtf1*;?~$F z2;&~%-|+zb%#nDbw*iWLmW4kGDQG?5jXl~+gkf|tV$)&D7gIHQl3+5YuTH$z&s7PI zBgT>Mu#iAP9@C?Y5UgKRuBex+or4-gKhD_H5E5y}k}2b;l|kwOEhL~ean0^Ow^Mg( z0sjs_0xJ6s*spf)v3=Wr5m}#_89trxA zE|_4BWhpd2ICv6*vT|T38{RB}Kl;y- zt3x;Czp`d0sHBgb?`oQhM-Aefc^?ZiTCAy(pWO{L3=c5__j{T@pIg|fY_1HR9DYN1 zq1YX^-=(P$>cnyDs6@Xt-2oPkAC1>3oobXrsdatZ$5l?o`Y;o;oa7a zehqbnZ5}_0%O~8AX@V4I7k~i|nU-#pR9^o8bJ7BWW1O&4@GuqJN>b={etl{vpJ7zu_*n__MRz+ovkMgG7S-muh53V0j|W;cz!U?J7Ce z>BPp*bnA~8NANr479i$}wI#_CN951H$yzE~_P8A7L@TIb7vFq|+{(TsUYgy03qXq` zLPUoTC1Lim?}H5NQ<9-c3-y-}?Ve89GFMe8vxu}JbJ0tzFE&rh?+~z#jjs5<^GGc$ zINdVv@zbs_4|mrh)L6xs4dT?UxxO+ve6kV0m?FzA{m%lu14U}QQ(?RJ+eXDvmiLF;mqrdR%nJe6KU^Ob%I< z3#FXzO(I=j?3y=V`GYNS+eO`+IdeZVzp$cOT^XWAxf+;i;VjltEB()dr@EN(xy^CR z=$UJ&HyO5pWY1ne_#zN`uH8DZn6S*a^rC(Lk5Rf4HxIdNT>Pwx4v;OKk*FFf&pp5I z$xlEsKw$WfOAT#q36vDKOwgCXK<<)~=)`{PN=#phu_lSBgjl0=^U~+XOkbcd^CsOt zc_#%tqY1d3d73!l8fgq1jpC+X z(n@lNq9xXx!mRR zpq3!EFEI08>H|rr=#(>Y5Z*Rt>V6}i&P!JVVfYQXy`2;vi}~h3o$S9PtkmV+lrr`9 zUGPh|*}Dsi2H7dgt@E4hgXDRoU2G0o;}Q`EZ&?x<3yhmEgMGex=gb&_O@0Ev9!LTG}5Ar zd>(K3#3U)XCe#E@sBJ`}ODcCn()Cy(2#9&CRKL8U=>aNe?XNb1wXa@WF#*899mF$9 z>#5LR)H`ylSuh8GYyk#U$WUDULZ_JS{u-PbZ7Bmaaf@~oL4zVne7pyhf=}T4p`YxR zZ4L6EezKHXGbhN9HPoLghrt=)b}k%MgxabuP>S?$QUkoe(SAL`Ru@!QEI z=>@zd@OT*^!08nH*Zt#$qYscY?$pfHE`^%*(nMAx!`;chsKqGX(^^s9m`N~~<%;b_ z_kdPMMXj%NLVI&8b%LjLX0>0V>K&vG@7Y07{$i>&n!WdS5Sdu1e6OXg z#*^he9ErFk44KOJg19AqyO8~>5bf+>$+))i50{<0N|yp-wn}!f3<4mx60Q^Je_+{q~4P|y- zl53h2xhtTmH|mZ+(wTO7#%@Eh<@U+-dtEWF7yITUCNVa2&=zd5k@A)@4r ztjK8Eegb-2`>Qt4D|MsMH>J#VqA=6^RhO%oHB;u=1>2utWE$bM(>!Q`R4k+-93%YYQ?skt@Vl?QID15&5RM3@QscP zyeHiK0_pnZnX*G9yuO#QbrENSMzMS#moN|yoy+2+n5Nb?uNnAZJifcmr$kFHdV!KTN3rjBhu>b|%L%H!q{-y#GX@!={cDBXb)o+zdFDn<$ApR2Q?$MR1Cl4}Js=mB z)#W(uj?&W+jidRnR&4Zx^$ns+pDeSdkP@qn+3pkK;-6k&5Y)yrs=<8PO z!}@xM7!gQI8AzbvEu92YS}}H`;5{mQ+5!99Yc>-JL8Sd>vLZ$x~zBeT5dkLXo6|EI3nbY|L)qUqqi1!lv zSJ;GNfMR~7PwkN0x}mQ9x7gsBVd-3(d!E5}D| zQM^~o>`qDdPJso|9OHA1b-9NZxz8SP`0q((=s;pc`|?blH^0S{OM!;x{m$R zmi+v4^2JYWx`EFj8A-_8$Nz)q-YxR50)6^Gs$r85c&LCB_2d8WfPBD%Lk^b_*$<__ z)DVCBnx=j-M`HSMCZojNXP8QY;6WPqHr@;MMbU(6^|4;c zp{MXzu|aZT6U->w)Acn@Bf2P!#hCbnQ3*5R=77xF5;|#)i|c{PjDRWcvE|yVN@?^I zk2eQx&XH;TzqH0g-x^N4R=Z6YcXgCVt=h6Iid%eEx&hvTUg)}EO#&72>Z50{mlc5m zq6LRCDl>RcD7l1l#t+x2Q)qePd89*E5f8Xw*g>R`Vxd90sN{_HQ)v;8x;+ma#1JeJ zIUsp&*zsj-42sn7G%r=Evhw^?zjT9gUu?6ax>$DnXe!z@h(eR_;qK2weJ*`#ZBBb` zvR3T6T7p`A+fj6d&hgRepjyVAq=eswq)vO9i)8VoerSM*o{4w`dm{HpLMrAtCFROk z!_Ad^y@C_(A(`2Z3Uf1qc~Nm*V`Aw!4xsL>={@f*Jrwl~K{pV=6^1WJ0^%PtRFNK0 z(Azh?D@nNu^guiUje5J)MK1Q{6oCxZiDXysS|jxx9($_ti$)7@edA78M%d1vtZ#KJ zo-tN+`|yFB*Qveho)SYH-!6Ck0uiqYBICdXhAF@0u{?ZQgoiM{8SK%bw}5w>9|I0o zHN76K6^1X3v?ko+tSrvd_qORxe8U8nx;0kiTIvV-eYI*yb%xtu%`h7{ zLncZQWzt-U)Uw=9hOPr_b%J3W2A@7##H@48N!vCu36*62-o_LgEiHF5dYMc%|ABkc z&>M1mZ`uU}bMKz5ck`esi+;qpb(SIp*zo>?ey}jHGIt4Lk z-Tj&82Joy7aY*hjtsUMD| z!V^_F&!>uDel<0V{+k9xxK02?G;`c>Cz39f1O<{VlYG`Bu;p(Vo|QA8`c$&Oug^?i z%_uRZPDo*2fe{Y0=dw0w3sd2?Xq@eXO?o2a8^8 zjnU90DrJexd$ZD3T^53Is}O^b5oWlIMol$hJ;s)Cn#qS zQ^x!QYmX}!7EAmaspLLhmxa?tAsi6r^coKR`a|kf8ZWB#j|F28(&%|FGT!~IXG{DD zlYcLBWr4`tX2|@$=(bt(3E(6gQd#)mVEg#JsEJrX$QzAsbwxr8p!wZyU{I?fM-~_6 zph1@lg#{y?wt#eY`=n5~ZSdW3Oc1wN5plLQ!qNx%^&aIO+VcOFhZ;=F=Dk0yy_k^y z>A1VxzyVT{KOI7fSi^Zg-Dqj?cV34Xlc`OJ@Cl8>jibrLlL|0dWv(u&@x%+7ex5IU z{KjQqOR!|So`e0M+V_!%#WjIUHM`_?@X6hN>EthayL}j8`~s`V5ih0{nt>Ohg?%yZ zDlZ`xdkg8TIn(glkPWQ+I1=+c*AT1X;_6|;*%vr%+mDoRHHzZ3=S4atf%8gIN83YZ zc*sGPYWx6!d91|T%1=EwA5~ZJ_Ysa&?9R? zm#oMY@vLR`NQsG8#Zv13dcYy^9Kfx0{=2?WbK9HX<*c;L%T^O+w_f_gsKm8%K)BL^ zkQc~BUn1_6%8KM28SJcS_&QBC=FJ&@jXcIrAa2?{mM zadi-CDuXG3)5vgT&~0PpGjG&QT#%x6rxJie#2V(A(&u#lfzKTML0HsW9t-WA=X|$T zq8N{0sUGicIiVzfA#|A3NN&jn7M=IozW#>uC@YL+AhT7-g;hT!D$?jT#S8LS zHKNf27O{I$B0R+p_^~;*SmmdJn~ASYH)mhx3}TreXuci@n+P~phamrxC#E#U9(DrY z6tkoz#`A_h%Rtw#i!+u-MmjWrYa(fH+_c0O~%y>!n37Z(UPYkTAywfN{uF?Wd3P})=v|n zjAN;VZv`7tOz&QvQ34_T`7f3D%yx0EzfJoojH`>x)%jlgJZw5$WPETxL>_KE&6$Wc zsq&7?4CzwFd3&*WR^)I3N51XBkAEpU|Lnzh9oZ+3PF)zghWP;&5$mRgtq@^qIdbAaUs8hTv_*;Be&_ z*2(*K_OFr3)~0^u0Doii@&K_{9;NGanuI2SACH7fccx0BJMwQK}1h4 z#LN3D0Y=1|5Q6UCGUJcNtIsGojQ3Y&B7eFF{PWVRtKY|Ok1>741l|(sl1J1C{Civt z&UbB0FZ>Y=vZj}>?{A!f`RwnmzIWacc1s;1dRK@&dd4`U=IRuqr!9qb`qBa`GRWO> zgU{h-PQ3#yr@mo;tN(%w;omr^!yJNcnJo{WCxY(f0m8Hd1t_q*To}Opv+u8U&z`{!H%|U9?RZ^8ZK#Zdo<&H-SFWxF=sMb3fqG&UF0TTG3qipzfhbO zq65;Q#7Nnr=;ENns>CRbBc~>uO2tOxU{KtQUNp;1gt}XX`ejk+Z;)A)x@vwQtHAV= z82b(L6 zt9Z7Ilcn+W6X^~6OI&=0B7Lw<-Otg> zclTv%=b> zilF&L<{AIe($Onx4uEjoUeqA(60CV*xks+2h?P~G?QO%fWI{n_ry!s1_a=4N*bc*7 z;z9)X<2TdeYlHDYBPl7u2L70)EU6y@E!>6&K&$1SH%PQRliR(o*MB_&1S;*uv3#i5gG+9N2@%@dU>9l`mtIvk&byL3kN<>S@WP} z9VR}20T;v!*z;O=*T~RCR3y1uC@ii9!>@_(Cm0$NK{iHhhb(c`iBF77iVg@oiivzP zio!mH9ook@vfe|z@GPX|0pcaO!wP>9u5U4Krg5bcK7!F^m z$VyB9JG`VwN1abKpTv4~{k~90>2ghYtNizwJ+6IxhGb5r{2I5X2rK`M$OlilY z)9*~LptLZSS(5)y0HSC9(Wj1}c+ttZH0ZX5=P+S@go%LGTVx5w=R2#B^l20VFp2l= zRCY{WGWhGHOR;Td;^3ZP{1)>$kK}?0{%i-lL!)mu9<@OF#S$hUw>K%w##spc2%W3zl|IH z@T@fR=r(C)X)pI(TH`o#Waj2kt{1a8T!Qp#Pl1h?D}0Beu{V*fH?NzyVz@yk*S^;xJ06dM~TtX7N9> z%3Ab(uwNvgERr9QX3g1Qv|<@+s&?9QvCWArNMkdlHUglmg3o~|T5Gm?Stgb)>`Xig zS%|k*l-O(ERxdZ^Qy$E8yp5!M3wmg+hf~72Ldb&(!UeIgWtkBtYHv7KDh!G*#5r!V zUgAFnfZ%s>E8?pBnkFv}kL)me5bdlyM^lJ)MFIWX0c+P`x$KJ1NQ2nI_Ct@8p{1F2 zTdf+Fb_t|AM_0!nN_by7lHBOUbOTIs)vqDQw^V-%OPQvUiLUjM1sFG)g;P=%fJh^w3GzpBZiQl`Z15;qwu|fJR zTl35|VU)3v@eCp|q!}Zu4UJuOMdL_;3~f8|^k=3T6~fX*BKf-^T(#L_v8@H;gU3jr z-)E2x2NEW!rkPO+)WI}e;9EHw*n6U<6xs2HKX=CO_{AI+lQO+5$Yf!mVS_4|F(GD%TGmcfGtvBoKuf+lB6y;c3+6;yGaaV%l{%mqvvtsGth?-VagI+yzZiHzDsIbF*c8?)A?MfN6UNdQ`?U`MI^f`^D9voVFvV_tq{g zdC*N!PES`qo7_3dhD($exUM1>E%{udRjXo z&$ad=Rmye5LjOg+A9&TI7h^s^7qS4>vG1B%UJFLM$N9MfR%b{7ontky)~b~zA9PAO zh3%zYp`y&LHMb8BlTEdS7;rnOAGG3NDbVA(vsLu+Iqu)#KkPJSmg|wJ5BHzpl}18J={WzoH{KI zn7p1z)Z)H(OxiUdF?G34sI6+o`bl*CNduWSjX19!{PBwvHMRS$$`a2+5AP*HJ&~@R z>4lg$h{A1C^lr!e@RchY`F_kjHkr4r<|Vi&+jj0|lAeEQR?(}iZCXV4NFHT+iAqJl zQ=r%qfoJiu(dNR_V;ZFZCJka`1*b%W_s^5 zh3K=@HZdJ5MNk?O-GS(-q!egn9=XUIjY4a;eCFzlar8ApW_GR9fu8|YR65I%Pu)+9Pj_H9s zaEOtAtZZ-Ms{V|4N>O6>(0bAyAv<7(wq+b&rbYZsea(Vv>68LTjcq|KXAZJCxBwR& zD>mGMh_JCSr}M)9R2N{f$~|nPsbj@NbINyP9eB8kEWl?&hN~%zd9q*JdF*J`0dGRI z5p$7X<)6O$1^Z@f;kLZund8C?TZ%F-@KaC1M_mZp3ye3u>Bmragm(jXzU=LzQMVzD zrmksmiPhaRMiTGPK;JNY#>dHvx*DS+Mh$fCF%HOeg#F3h5$+GW;p)^CFuEgo>#4di zNYJaJ20&3;;;BARiOQ7d_hVP5IhR(ZT^>kWV4xPuS8Pf9L|;W;QF3KX^eEh0168am zNs6MN=<`6(Z0^4Pb(mS}#)oeAIk*P{S{yQAPoK>e;`nJ&;>_xcJS~pWLdIJTJ@6e` z)wc`9v12|)5JjOgY|7}7p)TM^!keSM5zxzq<`$8BDwRRV1L}!Qi^=OJqCaFGn5>`C zWgWifKAspDof133P(^GbVcz(d3KYu7_YD#m`Uq1ZjGjE-FsFGY2uMxSMVW7E95>A} zrbCXUyh{CIIKWd}Lz2tg@IbK$FEZ5eg^cO4J&zLRn&RXvXrg^Cpj1r11{kYGR48~( z&C?o?@fda;ZY|a#T75^FckTv~KgKbcUHTuhoQjYWD(-W!(3ZojH zHB{R`f&KX#6ra~-q@v0u(#ZOXHeX(r%IdHxugzhR3Tr9b?>wH_MH7e@OEctEa;_~%=iQ+ z!aX0vJ`13it&WLr;A#N~&SbwH>YUI{J6 zl!u6%@QfBkYmu$2maJ?Ds`Z_yj52gbSK7mkG*rUkl?a)0f5Ub1k|7YyELGk*i~tf% zf1#bpttMIDHVt7mArH~B0wJDaek=NLUUdDU($e}u+i3y@`qG8@hCL#}BzUwfI_ucB zW;5Z_vguS{OkH$KV7L>xj!-ec+Ik7g22%BO@%ea&T8*(Bd*zA%vBaf=FX0lA z%%G_9mO2MVa^ts1Qaj)rmiWx;myta&>=BJ0nC9df8tQ89{O1zWSeb`nw}``%axw?z znA7~jdYsHhuPNx(K5D7s2`E^#STH%p;WCs*Pc7}Lo3S0&*RlxLEOoa6pw0zBu!;7}L zA$WO{#5kZ5T5!AK3!Z`kvp8P^+tv80R|N?CI2?$D20@deq>`eJ2`_^W96^2j;J+(YZjG^tr7Q^6da>jb-tMrC`zJnYYJV z1ysX&QV$FWoj9(K^5x4xr1jX}rd9yfl2VzmPPvEu7RZT$#`4o+DtJya*`8-{A+V-J z219vIHqa0|7{i2f6Eyrfi;KPwJ-A)_^D`4!7=7gEj=4YAA#ap|*u>?1%#EU$_=TtE961d*)JYex*wN+I6hv!6K z`jav&4kiepkG9Gfn5Nh5GdbCLA#JuacQOIjRyV}TM+u!3NvRpH_D3}1b>LppIPX0{ zXL}(nHe-rpR!fk?4a3%m5pEoRYfB(xw76JWQY*ds);Z= z)A9&MZLe#!#$w60@x0HRMblAv#xcvJ;3|9~KPvL-rI*_f_tFT$CyF~?1E#@}gxVA! z)9V$ZvySw``<$VVrK4XSFv8Fh)lcTh%dUA=T}p}7Z$aZtQPsUUlMk;q0`G*PnG4P;Gy z3KHkG>tZ*8*L%LlQNk#v?v5&@yx9tQ1Tp{EzY{{ygSI0o5*+PKg?nwGKMaerEp^NX>}m1Dio9+^e%(%{JL|im?3tc0tNB`yh>zRt?&$A|pI-StaIrsYIg42I zdWOsJwkG8DEBY%Mz2@|n=INa~zzJYQD)MU(Hi916Sgo8<(Gz+J%y+5B)6pekqd0{>d`j9B? z{uSZeNuIA=$2RM9(2cz8l(sTsu0v9(ofwwU<#S@eT`y*bVmy)K{T&5{tl92M@9%EZ z?#NO{(&u8g92<}=?`X%Csaz*~`C=;MNh<=*iFDiBl&mBoXz`ojq)zETDXOPLJtA6d zYIi=Z1o*(OA95o?HxIl`)O4#_xdT%6H5n6@XKCta$?GFVmi9R2Bu>3ycrQ4267Ri0V61yy_FQ&&r4mr*=R) z>_QqE8OlCMSJ$VSN^gOA6K6DDqUp@y?~0k*podlWa+@2+>kw@ffd(AFx6_MG^Nd0p z2ye+CA=QNxp-YiyTZwL?b}6@THdXecHSZ20G=*6MQ37_$XkpcGTv-oh&eJ}pP77O` z$(9xqaJY~3&5HLC8bFD_&xKVmb^E}#`{3hVI%W-7!Q8$pg!KnH%IUK!DjGsw_aHrQ zPLt+NUOK889}A}PBdQOI(N88S>6Ufe$0Z39oVu|@zK=kW~?%P*6fJX z<;;6p);nRhs46MUq;CGs!#|5vu6LNMb-^mfPaN5Hz4Gh&=Rl%$J=Zng4$aJgU>HNr zniE;9=5KyDXpaO3U-5tLN&y*f5WaCRNQP`UX*AyZl@v&~a-;(r66h*{1_01Of?e@I z7%%XECdA9QqM>P+W_ncS!Y^K1o)J+Z;&i&K5saW>4US4~H6NOWc3QKBZ7_*- zsS8vtp%FLh^EYV+jkO5J9U|ghHcW3;UVmUBbZw|%$&BW#)zusDDE?46ve+oa=35mW zXvC-os*)^rT*t!@skg22knC+(aXjC615C1n`W9 z{+Z85)`wb;)MS#Z**J}H*|ZMJ(ZwpW61It@hbKwTC{;t9J<@UP__eDWbUdGSm{6Ii zvc3J(xpPd(Wqfy#-nU0H|jC;WggI7 zwiYQPrrXP0Tqch-TB<4Ts>!|%Btz0MSBa;tPvoV8GoPY7UZSs|qTE|hZNUV)_N;cT za(#NMgnV?XrOkP*t_&6-Wv`FaxSS73X>pIHDh&GQZ{n{e5JBpJ^ z8N=A_pS?QLFWtK6B<1otdW{)u3|R4TrTf|Sj?(XNIYG&nc6o7o{8)h#a~HtNtRQak zo~!pGKA3OQFNMBQ>?UA+8~o^+fxA7SnuiOvLIn1i&_1GOV{P_s!QKdAFz*Yb>L@>- z(ol-MAg|$w=Oys*IGDYPpx#ZR&{Z`jMq>k#|HjsipXY0u z^sKPOhKyMHQC+*8O<%RMNvy%%CA`SsJ{4bMs}lOzNuW*nrLQ?_bwE8=xr&c7LoLIL z8<^aH`oT8P^9N5ldVOO+CkbmOe3Wly%xrcWL44Epi{xXLQ!XfMRUcL0b1p3?c?0qf zbmVi>f}b#y^Yun8-mD2EJm%9K@Fmu`J;g)VKKXjG(mD~=rrj1dO-{U{gWpsw`<}`x zcx90Xgu&uF8`4nI>B^Dj&~60QA${B4*yecL+Quui?m06N)Qg`Q*Uszt9$FYY>$rM< z{>_&m&4D!C38tPW#mb=_X#Wv>q;qpOni{anvL_&#rZ$f~l^`Y(`v&8ZGpm_W@;c!n zBY~=aBViwbU*aM9CLs$YE@93-%-#RyJbsyS5Zh}O@9AdP1?tFMi1}eTm?3UtCZ3^# z;fCIZ_CwYVrwSl`(DaG?u7m?kc@nt4D+T}y_i+%L_wE#7e|Jm>81e=@D?_>~_#ID* z`LVh?{t{0}=R>0P(sOCulI(CXaa7)$1#oYBZ;PWv`p00Sj`$RNBG}fM&N=*JH2G(96ja=N!Pp#m+O-h*NLpmdqGr;6m8eE8;TtOAJ`i z^WKg%~|`M@EMfLeNXX zrum3gbgY>{zlKf2{$h6QWleA(iZa@RWpXIS71fZ<9`mYnKrT!BzAtuC!h-XM*|*CK*ox+`x(vzqx8lbo^f+(PyV~9* z(SA9j&ogVMaRN?NB8TFLv}cmsm{gmV5Prq5L>cFlxK~UuML)nPB+2Sr+>)3{C8YMD+#^YW`Da@)BV+kq_NZ?1 z*5^=}YssmpmbN4eNZ;N9dX)O|ingE5(m}h+@m%7 zp8 zhNdQ7e+6{07ub8{CQ43--g%v79HhnS|a?+-cYpT!g zd0gy_qac+Iy?V$Q(*)QI5iJMoxx`$W4JT z5-k8+Y)@?VB=e9YwKx@s(YfNXGBFah09U|g2v|Fkhp#9S1}QMfEHHWRF%mxlETj;y z4kUFT(jf|UG7D7RA&f+Kz||8vSPFh|H;QbjL`D)q^tl)lZgdT)DNh81uaXsDZf`b# zx_4r$R3g4W090guXqWWV7YvMtF!epcr`K2i;sZ=~Zd@kIAVg4gAp+Tq5?8?Sq?BiYtK z{_TTH?8q(Wm#-pUg2>7D!GYiWM-$Mm?=ZiS-0nR|Ah&#<06v2fSGy7zNMU*RQr3SR zm;nENT{F->BtU3tGUCone~=I{`%;lkoW&F?e^)d=?GizZdPhCS(&U}u9Shms`y(2E zGLy@_7--wp2&wDI0yCnk;xo%zycnc-7{{B{XS%CcO0Gq$W<>g~W-&om zYNDBZsU?CXG+b3d9U?*TpB2)PDf8cN0m(K_%-F`vYld-@^GzCZ$~FNf48Pt z<)6`xJl@6W|Kus_b&GmN6c_H-@c>uMrgQ$x&&%7-ugR`y#sErVd`7d%)YevCBJSK} zcmd1dtDumN5hs1Kv~uDaZc9m7D>#cr$=uh~FdJiLp_Uli0XrP)X@$dlcydvI1F-WP zLQOM95M6nqxT?ilM_gi6PsH772N&S6R}j=3cfXx3btY6W%+(av>!0hJ!(y;fOS`x^ zxsYKilgin`J5xK7GMH#)-Q^j1)>@oyChsW_^c6NfOV-=-3!a$ z)XhRWA}orT7F%6557Nj=MtW#5H=sswFTY`4%t3h7V5^#yJh;l+r zk?c&Hz_NIxXF@i*dQXYYrLcI>n<6Z`KV`(!=}=)Ff%617Z~2~M*X9)@EM)Q-dL%N# z`*-1ycTASmg=OvoXR~uQSlPgsWSm)UIhAH*cNfXRCa$g^%kP~fqh4O9$kr^0t?AV{ zmZygJDPVv9I4wV1(d(Y+eEiWnII?oP7t>q8Dsu~E3x=79)-Lu))4}i~V;S4y2Pdh0 zZE6!Gj&O@GTH&=?_HKFs=Igx{{@7b)4qIh;?wP#w)FBnIVmA}sXmCJ_3VS;g7s9PR zFIoSm!;qJcvDbG{HnE*V5)sKdmXC?F=(}`;;%3c0SYM+B8TUq5z}PQ!Ix~|L!`Rvt zUMdYgb%-^ve2g91m)2*Jk}p~%3Y=ay+2^$1HsRXSovbK8xxy|2@CLXc$?WbdZv;bq^zRZ<Ia6r%ZIUS6_=a+fuJpeGO{H(l6dh zoZZ6FoqlVy+Z#(&-9n5fOhSSr&gYrdF+gaWX3X}I-ku~ukD~sJuGaYC2 z&^BG~B&LyOmA9zW-a})x`?Vln+du<;>fp%~^GjyTLv{QdY~SK(=oM1h2?j{2G zrzZ64KVEzSP4#JbVlyJf8(PSW;F5*E3x53^TKCFhQ5|q{3JM~Ax8ik7r_98~&)zk98d>7So zMY0@#8uKDT4v&#edOrF*CEwJt(4TZDEgp#|So_s%v@fv6^TgI=-8+w#d0}1xoy4Hh z8QXZJ3L!YkDKiB-dJ)H14jO)u~MBNEG? zK1&OhgQ%jzpsRg9oP8P3YKXdhSd^U$e9MlpVZ>frp0f~QCF#*jFg?R_!6iy5p$MX6 zV4(-rQQ-@e*DpzceOWGMxXspM{Iawv1rw~I;X!Mz=X zHR8yOIC|+r;Tub@8!jKc<}xGHWz*i}0&~ry+`efi-pwk^)a*J^f$!Nx!&C>{o3j0~ z7&{D(fv21b-6D03MY?iCRc@6gT9Zy*!tkC@NL^436!# zDj5P2l-qj^6=v=AN@8%1xy&dvqJ4;g!TQksgtCYULuT zeZjJN!46RC44QE3JrLY>g$|5@@sFW*j(}Z%jvx|1*vsw_ToR*vr_Ihj|oaQxbk{LfGmYVLF2&SBo*L-Y?djZaFW;vK_$x!kdp#J z(BU${j}u%F&IvTYr||V z?2vfBAM_E_kiWlc zz~|f4(C#RpU>|PK%nl@A5Yz?{d`E)_2tl8>nIHnn9ct*;*r3@|643h~eE2_`2MU6S z<#2zBokGz61m}bjf-ZNEpv&-nUU(OZ^0z+oE;aNS2}Ddy%=t&2`aethI~HLuiqaeu zzl#UGO!`9&G`36eORL}WAqy2jB5CL#%g8@k{?}0w>__=iy*eI?<=;gTbtFB0h5Wnh zfeZkM{DpvgmIOP}`~>AC5rgXXe(l}E5(y<`NIe&jOs{gkL53J05QYELVRb`OhypRn z8xsH!{SDyG{IibI43htV?5|Hc%OSPgKxjaIH*AgTCuk<0_&=aNPt1fW2xt%j`n{%g zUQk0RBS__dY({{&IIA^Q*LABJOyfBgnhP=bJ{P=9k+2!RYW zG@%hFX_Nuvc>H6`ct8YnmJk6IsCVWcmwyKlD_MhXj-?qyYx zqMzDN*MIHbe730S#$k&W3`rls(;=5wXuJ$4gIk+^jo!0*8Wugu~LMA W0}GkPe@wIjfE;Yd41Mt9+y4Mm#rGos delta 40585 zcmY(qV|1XwvIQDzV%xTD+qP}{i!<@Wwryu(OzdQ0+n8vAH}9Ui&b#kl_v-prwQBFG zz5DDAymk>BQdtfh0xlU89wQMK4HPbs(FOE>Zb%RyARtbzR!ra^|6jx!#(y4@AwUVR z;6OlNVEzS(fTU6^mUV)HfZ%|GfG{PiWMC%G+@mK;yI}&45b1DxL>H4=px z=~X>~f6HHzWKQ5n9l*Y$<8cxzL0!Wg)-xDmO{EO$Q7%o^sALa?h>3-qITfe6>rBz3RujVGntj4oJ38{lrCHF zEBHDVdgrNZkMk+MF>bns_%U8|S(|y-R-P_T&zs56ZX*{O zLA*NGyX+CH2M>V#`yaQi3h6UA@V*2Q$sG9dZjk*`}u#RvOqk*8r5k+AZP!<#H zow+P6u9@jLA?5CBUW#llsN;0-pRpRd@EaOihs~)Ar0plI5~0*4%M*5^7}F~wesQN> zX&z09>I~f(jO)4s!0uUhTU*oM)g#ZO>jdJ@DeJCG5B80{CvLF<`Z{>Rm6(}%RPTa7UU zz19{mD$}J!=FVip3^hD$(N6IS1Jt2-s2xU`4$OC)YkECMAVNDdXgVD}&uf7&f!vFW z%F&@TuSdFiO>L-LrZ>hlwNIe9w!;+F-IcR3>x3@eG1CIJy@FS+OGmjiI@9R54bKQD zqVT94SB_$s+Smx@_jhFXoqhRifg&q~6 zi_NAb%f+V~LpsA@n0M!Ry5MtgSWCB6%65gNxuy>Pt) z#svDcxa=|N@Sul!kUM+9AvbqHWtSL{_PgIhh;GS-=ICgd9|h|HoBK9xgriHFTuEJW zxio_X>n0`2yxir{yFcfePV>i6+sl$#HNin<3{wh;JK{|)*5#ww7rYwD>iLQ4;df~h zOMGO2>Y<`%?d7fNgReBX9+kVDz>f)w>0`=~>>8)0uJRM>C~n+)&OUp$IMmJ5`rm`f z9|8-9E5&fP7T4zM^o`p4kk`EMU8`-sjk}lH*6c}JeD7v^N>cI^?lxc*y^^1C0d9iuHdk76iXH5uV?obA%=&-yPN+2@ui^(Ps#pDtb zmk{J{(ANoqgKcYKUj<%hz52gzzQBWXoY?=u3?N7Yj-)AMs!}sv6>y!=il)>W?hXZj z-_#e(M)4=DZ_(#%Jnf)aur+Z{atRrak+)V`^p@Fx^$#CRsndYj<%%z+$2zh2H$W^! zBUiF>J1(_oHr|A3+83M{?36?Mew+o-RXNI5L z0W&0SKW+Tnv{c*7JW`R_p#sGO9=9UUlYMxgkW&!$Q$sFwj8CSArAWNt3igd+IB!29 z>_^ylaZkn044mz!jFqnytU!aO{jeh z{0y8AJcHtdk3M1CKLi242)jx#Y`&vlD|6?nS5hzA{tzyQePRKl6^&2cB<^ydhq9vK zcRhiEOCl-*K|;d@<%f8J7=z&+H{a~#RyqSW-@oxv3;+6Gth~9$N%r?0|347v)1ueU z{tr@rL;nNJe-KHS?CZw@gj=AgN>iij3UA?}P;??}Fm`vW z34cWhzAUBpo+dA18S#>ddXxn$W`2@=`p)Cz&bvqoJfjA>!*LTNk9TrCZ@Tr~be~*q zQ31dQOh4VrFL5v@_9Bd-g;?oij`19aejc=wJ4>{r4q`3Ftd1~Xo-)>CQ+TFdkFv;{ z&((zR+>A5<)`k%;gWY+gA6;ztjuvB&%^j1!FRAjS=kohh)ogltcs>oaRa#*oJ-*6b zurYV*>L`oTvIoCm@3|j_k$N>`H!h4;IHBRwNc7cm)rMb~5vpT<|9u#+;(4{pKXkMN z3X%7%$tjJ5|2!3lvU3~o97$bY2)VU-2@#`XfUFDM(Pu320{S96T} zrralMNGzkn29VJq5bk)MM{ll&FQOxTUPMXos zRFelLEi!{ho?5a=bno?LanZx{U@_0ksj#PN4_VDpkY#~(%2!td7gbk}cG&^CqSGU8 z*d?`WZHLmVo8*(Vtnpn1?~TdB@=>SsVOL{6#zyP%WQJw@^CYW5bwgS&wOz=~wIZCI z!j4vR%%8X;hxX&FU8z>eV7jM+8s8ka?F$JAFyjjr2Wj9@t3|+Xv@;~<2VrwsPCI>; z`(wlHGB^NcDuJ7Y#%q!6z3;jnr>AU-99#|Q!)_$0+|LthCnyFAx~0aOMNy<>OAj2yRXmwO6~9-BI~Roxio~mpqmByC$>NH<@ep-TwKb^ruF8-EF3@=lj2`TTeg_q_9}c;UHdVXaSJtT zx%alqLVv@jA8qDpYrII@Y>#se86bDz5twT%?jNnc$_iP?|3-{5zjiyPT(Z2i3t!;I zMLqIrcL4~6kNvnUEo~9E;26saZ3w(;H#ASs?E6x~w`e3E^4oDnbL9dfBm$K?Lo%kAis$)z6^A)XT*jzZFHw=! za3+koOK0de#XjO+Q1h>d0R)X>Na!!fC@tr#hQi=$05X{rR`Ia~349|=gbub&nOP2w z>;w)e7TG-xY89E>P3xk!4hCgA15>#;3rBJhJ4F@f`WywgCfZpMUQwN0miqXqc#n9^ zpY5~W1ByBSi(~}+b>T^@jnaf)_EVeXOIGLBusvmS-#erI37D$5m<$A|e~3O9{r?$S zUP$dmVe&2@0&KadNuYmSDV!=ea zgmT8E0GDFHE!}Gg7VN2BVpHjfd`^7~4n}fW>Bk=R0CL!nHG-%Gqj!6 z3y=p&;wPbeokxVhi0GX1Pdlm(aK+O595s@CB7%!9Qr#?+QtUG~ZpBMUe{Pm^@BOZ$ zjzhc6Inw_0i5O6qGWU%l(RY?hDlE6=aqW6K%6h~c&QhR@Dzby~lkrYlz>6`#0K1y@ zz5Y2J1!VOx66~;s-}u76R~<;#8^_pcpi=IfogNxOqk925Z_Vbtd%mS*0+Sxtie(EU z-TQWlZYB8}MB;>|7)M@KdK4(Xe-F}}90$z0PC!H>|MF5;wfqkCGE!CYV)oF>+?Rox zN~}eY&#HeqWi$pa1@7DG=fe@pn!^n;Z9LV@0nDao(T}*>ThUds?s_AP@x&Jz$wEOF-k|B4_-Au(oj~!!J|kz{^JAq=y!I14r_}Gj+bW*Q;mM(_E^k$ucE9rZ)wm` z0ZQ7=Dv!%-dC1p7O7_W(pvIi7JsponS%)gq|7@UBsQl#CDk(j#unt%5(Xl$!#Ik6Q z^7Fc_bqMSMms1B!vYK=i;*TpunxT8pHm>b@Ely4YE3hO<@Lk!G*8Lv0t#ND1uk&uM z*)?iLXf)!INcXb{W@@%l%Xan~8pZKn07nx8Z?rrr&NCC)QZ2Zp$G>6Cs?tm*KeqP- zeXDi&>l{&JNUYCQRjB$D*Krouv*M=akmgwRU;^Z_B0zDwVZixE@!0Q$Ii10r=J7Ri zw{CBlY)rE3GI zNAf#D`;7OU)Nhr3$VY$~N-%9xRwEZW?GYqluf>u{B$1Y^NOLHBNfii0Ru)_ReJ1k8 zAKp_A4VGbrq3LB6(=-12z||3FEyAs_z^oApxd787g5er$LFgpvgQRja`b)9c`HYFM z@b-;4pz-TJqxOI2s|07IDH>D|kP1o=5R(6w5&(>5_9kv_BRa6&ddsPTW4hbTkN6w1 z`{FV%U`^bHGBB{ejlUB>)7>R$dxoHidN<}dP&AR3l+&kBq?Gw-!?n$eNDSD zp#t-?pDHxV^MLoM&{-e<=|{VDVCCGG_b&+|?^Bnz)bv1wzPkl8_TUH^lc%I~Iezm7 zvBw-k-U&wdGw@%g?bhh?6>#ak)`)(?{oe*^D)lKltSa^EoWmnAT}vYa_&3Dr@9^iR zFzhvoGEWK-^XeOn_8h)n8HV&(ZW@T*rwD>ddk-VeVDt1S)2j3I z4|CZ)n?uVzqU;=St5y0Zh0FRkq<8fp1pqjg@2N+x@=+?G;RsfgL^Y&E>mU|g�Kz z0yJ&?NIDbBbSW)YRK1wAt>z1B;n`7<4azh|QKu^Vh4>-DcfA6q3W9B~bWR zgVxKNdQc>ltExxlNKxbp)$;0T&SSIq-V*5}rM+Ua+FAO?oBFkuPqio&#`f`EwU6-8 zmFOs9c)f~u`NV2fkKECP`ijOjgF8NYccccVI-#nM_7O@d8SRaVPrWv_hPV12b~0w{ zNUXV@x>9K@`eNrr9Ekt{$LiSg7*OOQ(8Gg6q=;LoZbfc^YixcW?7q9()xu*sJoT%< zaa4r<=4N|otGU*1b>(SWxuG1-KG*Ltz}HMY0f8%G%AA~Yb4q;$Goe&oz|wKK*v1;u z>b~vC>G#}rHy!%s_RO#dv+|FD)j6D}CzRM#h7Qr-{t<@!=k}AwMGPx*XYt*hiA#KV?%kpDfwL--RNUx?j6foD zQe3VpY8EZF*F`Z@GW5?{Nmh)gAzh3po2LpU%9Eif=y8n7(9;A{s8~yJ?4O%W8tbv* zc-@Z>8M0!Ddl`;p$;!L?gTUHk8J;I^DJ1J=x`Zi8b9iN|Z$xokTnmO?W{$&M1BrUv zaP0NtsUz81`At0T;QXD4K$nJ+D@9zg)AYk2{b}R?P?K^)UVX_g@wLI=V6y zoiNDw(ePvoWyc&ixAC?EB@qr=KSJzwaD1#AZsemPs`d=dvbUL?G}1V71+gVq&DQsh8Fx zqm7T&^&}~eSuSb`p16%BZsbZyC^JdkWTHITlk597jgUo{Z9#?)56jo$6Y-!wmEmw% zIR%_tdC`eB?J@!qRmk!<-6le3gIyRWocr@yGNrSbdkPawy8v?3Nl04D(8hNeic%z; zkMUFVzaB-qW$2t3igZ0ndmnH_zgVO)FqK@UqAN#*%7c)3vDyBBL-Lk~XV7}rYbZ%T zm6MuCsEjFbB?SdpF>^tAhpmP*lA!ZBwCAy|)Ho&}Oqh4obV=7SXmZg-AS~*pT(V9j za_jdHCotK-O8|{}#T?Lq(?6zk3`cM&zg0KorW#v{bazm#)ln6r3~+EI(CvsOxi}CO z>lMM}`uNZt8WgE1_FMe=l`35ldRF0x`@tiZW3;IkK9-giGfrDWN$d{rM=id<4Uan; zXQ>&ehe*w};WjpOlz7($8%)qqmAkTg@mpYgEO^uAcL0n$+@y|Rp`kG86m(2IKPn5Y zeJ7XO&OE9PK{S0t@7!JIkniGke;hd?_uy_x7%9I%#R-ja**;qMN*DW`$>^!bsYd4E z2D7u=wTyDzO~dUJ-I4Ta93(tA-~u5?Y}1UY`Rt$ML@O_9k9ni{m_KK4tvKHB0}PAF z+@*^*&H!ZE4R~nXdz5F6ZaKGR*<9T56%p-*BpXK)btLWe6vpH+Xq%Kpg< zh#g41WWxzn-Khl1AB?@W)wGMFUXF+3IyUIA1b_I_BBPw~WGZGzc8Hulg$*j%zB2^M z9+bas$a`lIEWY3biXPm+Y~=q%fyKS!<mTV>Kw2HH=`Bt&?tW7oW{i*`><=@f!TA3u}XSoFV$m>!1^62 z%xn{Tz+~JBiz=1H2K`PBloT4HP~Mk2z;$OdO^g@$wU zBaY{@7ETzLp)o_|3hp<5!^}3Hv;v6%1GHqkpa=T{Sey75ym7&@i=j}vwbP>eql4WY zhm^th_3g2gBpn;*qBc}Ti@naqaQlXt?A`@F1!L(Dw}`>o3pG|?%Cl910>+U z)r6Ii*zvLBI4|Re2N5nj)VN&C9Ge}VQ8i&HIJUBFSf{^Y(Y)0wWS8w11mnFCIV z>cp5_;Fa#AC}W&^AlA@{#^8AEo&(o{bnJMSb1nA@8YC{w2AUAPI}0xkD5p(|?3c~e z5ta#;w#tqOQdBgu{L97|G)TUXfVsg+T)3QCoSa(ld1JwSpFN246oOdcgj_vvu(hA#EJivhdymAFCUHf zTfrh%QtVB;p_*IFHXd9f6;UKN@gT9$+3WJFMB6S#`2?5Aul|vOrl4;nz%iJb3?WAn zo3aL|--`3TCT~%BR~&emKdSwh0S_f~_;dVb>I8xT7fyeN?eU-@2Y6fseDL3^x>Tz{!sMZ zhG91_Q&14Lzr+v~p+9m{W~H?L#A~wDP{Zi(XhghG+vgEr?e7#t128cqA<5~OVLpxN zh>9wI`Ghf4n^L*M-jWnsMN!nI1@zY_tkRbx0oWvy0fUeMOGK!z0I$Ng9OC zd&~0IjF`h0UCf?GS?=UzmEU5)7FE7;u$hsh)0DQ#?zPYDekZYw3kj6sx6u7LT>*G1 zVO^tlTFR{>Ypldv0}&;H{IokVQO$$f?y|Q)yS()k)aM^-TR51ewlzl@y5zoF^WH}C z#{uYTGd}X!c>8w|;0$)SN#<9}&M*d9i zUN$IZml-&Goe=c!E536neZS~EMeimHB$gf6_7n?D?>VjsfoLiz54UJd3B<3$?~Y{; z74h(J9UX2D#Pk~ zzwVEbP_@82PpGf0q%XpSxxVz??@w|Cm&9B=cMSEFM_q4d>aHR9W{3WgtUHk_p-l4< z>@k{)AE(ROz~v)|0QHxyI%B)l8X8>6uRP^};8yR-(2%&_!HwFTJ~{f}W{1}`<3C)J z)XVC+lGP`Wd!Y!B7Ud4F>S~2#a1Zu$BWCE!*t|yxD5i0Pe3K>!TCPrqGuO?2oTX%G zCcgY#)>S=2)s;Tt?=z*{}c*q^yIf*tal6T}GL{G};u zgJJ6m0M#y3M_nnm3JhwS;-i*4+e!o6f{}HyleVs$jdOBES@WCk?%AiX(7YB(1!EM` z#cS_g1JsOv>30Ta)gD{oD8cO@W}~yLq5>Y2lKLR(s#A&~UEQ-L#%%V45%LCN6z6!7 zp))DCt_vhu600iJXdN6n1~uPQ&d!n~43+y7fHC`rKgnWs^!1Z-`|!ElwUXGh%&^9C z&PbOnI3El=+~^@MIB)R?`!@^C+CKV@qb<-M@}6vCgxV_ajSd)IZpqb85V`4v580as z?gRbY3^@Ixa%0vy?K`=J|Bxa}x6duMYOeu9A$kWkofZeI*40NM;{3`fbSJZLlv2wA z;1HDr8`&ELv^Og^`u4MCdanq?!GS~ zukn_}=AOCZk)_^8CzigNUzYa<--=%f#8XPxb1Q0*+ONLqvMo{0v~RD*8%A)xq_T9K ztE>6AkVGTzGYS2Hrx%RbE_)7E^Y27`3dpybtcMJOM)n@erD#Do?ZVaHuwl6p7rq8N zt}E6kA0L~tpiK0x(4q=qplI~bU-DHVhq1bOFGpqwA$Z_Tev=IH> zk-iBzm_4<8gGK&yGoODxBmN-U0#R^0lyFDOm*RS0DlKAHiLP0qC~Xu8urI5%kUl?P@9lD}S@J?|pZ-E>5GKvv5Q z-|$~eJ)q|htD4IpJe^+D357PDUDSsw;;g@c*sv0}kr1EzYgrXrfv~8l2}y3${ubfQ zmF?VX3PA|VHoT#}k!6mCZ!@pd z|N1sNGrs1=k+EG$r1x}4&54n^2Q$@1CbsIn{OW0Ws=LED_RZZO;_;ey$B~85-IRa# zHe8IDljj2GK{6sDOFyuDCtSv?U*!UCW)22B!m#KUOU)*orsOxRHy~F(wtJjri-VSx z@?C>;@ed|FS10|CC%P^$@wly!L*?pD@`d5Hk$i=e5%7gNCd9 zU=IU#V~xOqE6aJE^u7j3^oeo*-Slx7FQ^ZI`!=F}!gckf3; z$*n7$))y8xI5VWm8v}lkVJu*$<)lzg@*n~;_^=Q%BT4xrC)(1OscPKK3YudXHSrDN z>G-3~L)Tr4?u_@RqIe<|t_~OqII>H6FuYJb1^|5|$pzvgzv}Y0{>2#S%JQJt^oNGU zG(M&5VXjawj*qyWP6o-Ow+(zxWh+2|VdV%ixv${aeoEaG4FFy4F0C4`smgWDpymIb z$@d+ffU9gL299yf z%Pt#m3PHf1M)y~f{b$HxuH+Z|`yFl3DaW}enP;d8m?GG3G%C_8;$t@gq*MddA8> z^G4qzPP2IC71X~Y@gJOKxq>RN|D#eVyLM$(!-9Y?V1j_q{*RGE5fm5jMjylYgwAa# zUoLVjiXzRI;EN)aXVD%+CV?gQCl*E(-vxq9F`-U$KBYB{HeV7=Ul3K^2aGHKqS_ADj11@_1fOlqjhjMDaqGWM#D zR683ERBKGRjMuB&>Gmi_|I|Z#{-EkO1I$U~RujX+J3Csp$6$a@ zojw)pdV~*S^JJ`BJ?z#I<7VLF{^F;rcRv31%^381M?n!f(yvzlTEia(sp^GUl~$6a zY@d`+mAP)0jFxjRDVooDErHH;Nb18|dw}fz!OZpUfL1VADQ!>fr6pumdPb^LI!P#I zc6{%Fwl|2W>IJp8W|xlEbH5tQ&Fj+6=36__*_GptS4pv**5AZB0fAhDZb-1bgEyL= zELCHXxZMtPs6@5^X2zQBC|Vm~`}4(o2?;X&@9mZC#RVKkr^#QHip`f-SN1pK%2>zB z-#An4i&*X$$|Q8Q>VA~YQG7Lh$H+hfc-2pviVfN$sO#6wbc7Y; zwk!3(ju@qe?KcUdaP=988s!<+QOHPWz@ja(JoUnQD9E}}nO{`W9jpNMh2OTLroR5d zyxn7ag#`1S7d$`q)PN8 zt{-yiiPi@Ixxw4n#Cd5Wfn{u9n)q}fiOnTgJ#|>F#C5f_+WIW^$3Lax3zg{;yi*_b z>51(l;vznzo`w6ZUsw=coc7Sc*)hY_igmxWkY6`Yzj`6fg031Kqv5q!UdhIsl4Cz& z>vwm3vRw!@!vu+Ee%!`eW~|vEtfj@KV>3q;6{-U;y6ee?LuB1f5B)uJt8E)FO&8oJ z?+dB_R)e5Gunnfxu4uRT$F$NjTc&!)`N3atKtzuLgO!M1yd|^zKt+vct^sKaHxEot z3@k08*jN&xoR<){H`odF>wR(DJWCPMnEIFQSyQd7>TZ?EaYKaD-UeK6@m}`}p^qXQ zdcHg$39o0o_2u%(?oT8%cPsWTJ&?fh4w1kTLz&zxrUcLS9XBvKpXQ}A!e}=gm()8e z0wrh38DB~3mJXqB)CuC)uVb0!!j*kO?V2&CY}}5#pl@2jIRr>>L~18Tm5kLflj+?V z-+Km|6v$|Aw5G6EBsY}jUM&>bO#svNB%B8*yiU%?yQoG!Wd`y&-XVeITP~cX4RY-A;hFs+l5w~Tf zdZIY+B)2rjq%nHoP@%28MOg4ws3?**ma8UA$o6#ZFGyyIVE)ZCy9ILxhnS_w90$n! zfE41k&TKRm@>^sPFo8&CQlK}=O^!4ei^uzDqhx1MtD@5q52vJ+NF@c!s(@0fe0qb{ zM{9Q0KxyV+k(#oQjP{AHm>>3+(Idp)Q>XuZc_MZ7P^=3QmS($K_CZ9#tCl z!S1HS9Z6FDaPLx!%EauNZ;mvS5(l)(mJ~*Y&~aAK7*>>7Er+ivDu;wnyGP6bTKX@WWBufWN|7oK=)Lm*t&#lQz)jjk}-j_shiFI zHg&H`#zZXBEuk4JOl<_gQjy(-un0}~9sD(SjsfE0o9=1Ln{VBak3bnS_BMdkh9|1V z@iMfkaiC#H<(qP1tH|PkP91T87R-H^DxOEX33uIjtPw;Y5F=nP4P7!IW*)eBZY(Hq z6jz%SrR$wKG1kI7oddDTK&Z$CF3aXtwkzIrVwi`~bh&aApwb+hSi$Ioq#5#_ExH)p znm%>3xFM@fOIfLSEGH9{v=5dFigz8Y6P@&_n+#y*_7IB zP8#M@ib#gez&aTfyfdcd=YvIQJobWhQP!A(zuS8onvGlPkr*j#)CjrKIvN zHm4~hB;S0)%?ph3GuZGvq#1C=@PVc&1rtL!4i5dyox_u8 zU>O_p*V$m%LaLeeQprjM!a>DVH4Q=JE_MeAGX6;1LB$2x12txX={R?q>Pi!Onv!oX z8fg3^to!%gm12B4W-Pi!nCb??>iJ*}h(}7(#`v3D1ZHQp8Dq3-akT3}%N(`(CkSpm{}gB;F0=)kOp7!2c9m zV-LZFoFZ$Qqfib|d$nB(V{Fxll^-b2VH{+DozU%blLLM6yoifWjGD8umNfS}#la90Lu1YdA-t`Eq;cH~}%2aBmvD&HRHaBCr1yvXK3CV)k zUN+E_)wI(G-_SWroF5#XO)S0fv)?ph_tWUq=h3YdO&$a?sG@@P0@52w>njTV;Ps^L zO6bC>jsVg&SbdoCX2JZ;g#D{)fZADZolpQRJ?gOwR{AYe`v4k0r(I7^ZSF7j8r`Le~2Er za;BcfKl5(HKmC#Pe~4bg6Ld2C6AX~6<>Qa8Mex;o$uemk#GWz-xn733F)e~=T}X}$ zff_xJYz-Dx0weE9l`UgwwX&uI_NQQ7H^Fz6?vG$&v}~h}==|tkVY{DB^P06%0vAM2 zY7!qGmY&I5(@CfguZKTrt3``%&zBLnE1yY))?6 zq}(y~=#7HtB@X*}d)J3Ohu;F9$b!g&&|)t?Vk!MIkOT)8;^kf{Vm&&PD3OFH_YP1M zrC-8?mra(nO|)5-Pgm8rE+Qx!3f!~>Y9u}ACN2=bQsvQB7Ztl5ztKS}%NAWrA&$G7Gb!tdUSMU`=6o#e987XoHWATHG^iq&VQqHvWM}v&`O7pxdYbBr{q z=B}Ge6Z0oMXym!`auwx@%Z1oQi+Qo9A{jZrUXAWM+mmj;3d94rcx#1a`k1i!NzST+ zALdsnXEw0q5R9|Xi_@nw!6po&T_=A|VbwfXIV(3Ao z3F*wn*qNkXH`!Tmf-SRg*lPamNh6QpbzETcHE%&iG38;!0}wOR-pE!o^$IKBLuPM%`2?$XN#to?@R9OQ zelqRG!1abP(Y?U+((c*8^~Srw{bO~q|3-oK+wUPxW~zf;=>AwcXfW)h>KiJz0q;Sv z6W~Gat4)JMvM-4tL~N@{w`#CLYPW9hq60qfssr`66(PXbtsP{a$w!|=2=ihcPS((6 zm{4?w1rdcv!hsiRVEr!AOK}L*Efpj%YV^GWo*7ofL38x`YF3(BHjC4uTC2KnYrI6V zH7bmUo$WfSp7goV+Fsw@4P4%EN&mvxsfU%kl#;EQD39jhpd#Y^{aSQtOS-A#?u3pA znezulnl&JJ*100#(A|MwaVGEN&W+2#I5{IV-daH{E5}rqqKwzfvFu`}RnTc)&agpd z^+;tDmVNjhc6_P2W>=3$uIp7PQ`-Vp?gXCZpo*u1L$l~7)vsC-v&_^mtyy~ z^rKrouA*Fk4=X8G4{9MT(WS+piVYACRxx8?P{3NI?W#g`>kWzC$`G@f zsWkZ4ey!B>rpC7qeO8&BUiH&X7^W>ioBZO-2;%Bo^DQ^Rv4$D%r%1loIdqKwAk=hv z%w)xoG*-kSimFCyLGAgt@RTTrgt|CVr%YK`EGg}1q3&q-+2=YQNZ)}M);&6;cwLNI z!2{N>_+GkEVc%9rolh7u*7^y0E0`z3Oeo3}^d`$3a=L8@UW4pAr1P^8wW$UF_;|<+ zM+Xndz^GiQ{k&;Awa`&b3r9A1p0Z45p7rMsd#oJQLZjiI{U`h;Ml89fdxrUD@3@!u zfO0j0(w&$J1Fug8b$q@bCAR|Vwg zOWReOGK_u(MbKmBm3c8;y)|{%!(ZSvRS*u@t|RxH5zuG#AMxQ*HF(35WZ5d_4Wee% z|00!tl=BlPTz(e4CyLxzm9_hVNCP|=h=zXEP}1kK7LE`-orp)l>SvPG_C~{KTDowc zSg2eO7!K_ZeX@C{A(`}1U9E5TjG$@H@8=2X6;L1}<_vg%nOPszUqA{li7^bIQlO}! zA|_?$aqvj&?LwUUCVY9ZQt|wd2*5*Jr(&ia^?-Frv1y*#G zX7isQ9VZoa4|_SHc8Vd_paj%N<^PTjY()4w0*a3=Gc2=6Vj_m|Y$BW^CeI%$;*yuQ zoM0x+4{Pv_Hnb0x#8?JRl3Zp%9>7KN0rf*Og@}1xzP|-2AF*Hp-|9T4Vk8is45VP=M(X<#3|;es4GG8%4kNx*mHo8z2DVx@z+eAEOa5zws@dHg3jq7~ zeFzE!1eD>wY()PF4M$zuN4-q`5v`Xx9(7B%Rhq_w zZ@YIxVtYCy6pISQyt<8zViKdWiUvK7%d~@jlXP{i%MG1+$9ZHAw?&40EVX|bHp>2W z8^5k0ld3TyfX}1+HO!<6dZE0MHPhjmN8Kd@F5)0P{N$3?G?FB1`lp$+14m~-!#L7V z8GIe@_!Jf#eDhlHUJ}Nu_9+M^xv>R|@Xb6oD1+?W`dq;x6}8Vo+Ie*@P4cK_@zI)S z+7*5S4=jrdq?SVLeh4fY4H{GurQ?2DJVnGAC_!ci5OKlEZ;E~6?WeYe<(X`<|ApNu zVQdbMKgLt&=xJn&K0WB zQG*>}-$X<*`-YsCM+)Ic+BEQ^K|v>Fl!aC(DW4}IEnh(LQ4TM;4AuBzP8$XG3BUL< zTvQPXV3ps6DzHSIS(4|(D7l;=l-TS`>Bz#Tgn#L#If6gBe7#5&L)@Z5@V|!s|CXxeR9I9m1_%fi69@?L|5hpj zP^$y$ufDu2WYxyy!`~(hLl#qv`il^iQ-+!|jCcT<8gwD3wuhW){FMG|3Qwk`R&GSs z4(s3gZ$&p<7E5ig^;5?4RSs#zoyRLX)}K$mF-l(Qs!tfNb567x%WQ=KzMj~w@j@KMkvf!;hlFY^R&VBDu&ib>!u259&9h%Ry(4kYtb?z?E{%e;~$SLg;VBmGy z(-d+_&2%9B@FcNcto*Tae&TuNW!a=J>(KfWZQQ9e3v3YP}hy!!h62X*u%$gfGYZ6C>D|N(HwkWY#z6cc*l5et2cWX;kWWLie-a|E{9b zs%0%$)-2~gPd82Y*)f`b`yiNGcNk;Alo8nX*#7pK9N0TOn~(ao!SUGwjCwKSD9ndB zL<}MP)I6~`w_1wk3Y!)mlx2oo;jF9PS?T$c)T&Uc*UnzM*4ApHHc63v(OzdY;ncg- zvsnX|J)c*l$wwIdw8Wy|_#L*d;^!7T6@$>u_~ExPU*8(;#hhd9p7JUxN6+xusx6o1 z`q^kLj%t~jN3Ri2sUenTAjT$;aj>kl(r2x7w#Dy)#I%HrK4*5i)!2;_0W;U)k5@!; z)ZEcZm-6qbo68o|s5r|d^(Kv@{WwtY_^Ss zBEotOA>tL{AM%4Tf@p~gS^V-yQw>uz7YVB;ezkF%<`7AP--3ka(i1lhcg&0EkpW9h z)ol(oU@{_{GIsSk&GtTatb^@d*M3h1@N<$G2nt9aTIfQw4lA zt7D|hn>CG~Y;);|S-TzK)uYiryA%&*URqPrksn%NEzD{AT(($iWHA>qH z)=w?EtfJqnd6%K{%`%jH!nWTfNG;Lttb(X9l_YXU^Fw9CqS}AI3=%N2s^i~-+T`%XVN{f?hY>kwb{o}c zgYMB>0^*U(a|+;NOErF(#<3PF8k-|hmEt%{QW{8amb^Ml;HHz)=!=0h4bu0<&6^KT znESLR&5=zt?nb+>(C1J~)BapJv}~=qG%u3#4m3PqA_gU&a-uIFQ6hJ z#Fp|KGxt{+F&5s7t*up!6ER&ot491ADc{L4Cs2rn@7$s{utR`Zeo+QC6fzQn#rEfr zKWCBZ^~=iF;}26>nQm5=3QbxxdZ%1i3p$V2xVoo}vq*liMprs zJfH!WDKb0P4E2%wX)?F?=n?uU4X~c_JsN}xiW703fBPCeVaTfE+3gx;KpghqNJYuw-!{M5}LV0oby0>NnF5ZARe zFfs~Oo!&JGMDC>V~GAa%o1#08dj>+cSrga(vw z-_eB_rdJU@p?0ipxy~fY46tZ@Lf1wVoK;jzRT}6lDMIEm2*l$YvJ0)}ViAMr<3ork zb=p~fXH+4Ec+&rlYo@aPQ~U!438I?K9XwS!rg+fdyaRm*3W(`*xb=GJh5{1u0dwCC znQ-Z=+#(IvEEI_pl z!YlG}d!neKYj&7Sq_no;Y|6WQ$YLPZ`H#t&KQ4InnMRd_w z7;cKMc3I9|EEAtvszdEP+;4~r4If^U!QK43fQny|cdZmStzsy2YCJM?zz4p^l=V|> z!q_yZ%mCC^h#~t+`a4}Hz+luD41NX~1^bf>U16k=*_+T~a@@9;s1bVq?1VuKE2Jy__Ds&df6qd2#X>R<3)rQstyKd6W{mf6 z9;yW(lN?vegAl0m>$uMaSgX7ERcTpr)$6Sicj68kr=F*5ke#37XvgTalJ|@nO^skTJ6A zU%D2ePv~^uJXTFQbnrWuOkUiVGVmAbvgv1)2y*$sryKbTc=b^IKU{rdd!|9RW!$lC z+qT(J$F^p$|OtWD>65G+H%k z&Q;ZB{u(uZ;w-3=NJ}5&qWRt_znF3!P3MjOl)sjJ-5*eO8;tTSjFsm;VV0L){+uS; zRjdytxvaFw4(sf)6l3C6l*9N?FDl<|^EOmZ-Na z_x5lIJk}1T$FrO?Vx`$oJKj`0*6#<(WoO2j@-M8G1`R1^581;qlb@ZSvUFF<)%x=U zMnlL!Ne=ea-s!yF3$4XOzCN25WrE5!O)}R*nMR;`+#+PdZg|eoJYUqPXnH7mYq@#~ z-$f$xpEclE6y_LJz=@|UWxY4kF~a4ILrR|58NBK|gn~kycK=x0pobj25edX}TRh3T zx&^Cs5LBtS&YC?@A&KA?j$Hic*tZ@#Iw6Xmt$h8Q^KO25(5wqIS>A91MsO|VZe+jn zl5@4Zn*<4l!bW=UlQb3rnL)KD@%H{e$S(U{h68|yn3X3^SCE|AFrgTi`M&Z}xRQUV1p`tOL1G+&L$3V4T#@&QJ!AThfx}{nSX?0&kCze{S8KmStb2Z((P4`LP8I zK$p62m}{~7%ZocZLOprTVRyenrR=72S+jF+iT8aov^8A?EQ$}G6Kk9Hd@~%?FK+-) zO=j^3mxfhUMd`|LSeEAebouw@RG0lS<^73I^VOnf(#D35WQu+L0!kQs!!BP`zbpAHjG7ll0D$ZN;k*_7g$74Kh}Bv2VaT4^7ZSlo=%( zW0ZFD9UN=?VvYly=!~lixtbz=+&%!mryi$lvAERcOHW)S4~ml?EZRY}oz0yoF3yM6 z6x$=O{7s$mj)C83%chF|K5%)zp4_Wn_Kq>=!(F|^@PC*@y)rd&0G^Pbt$zqVYvUp2 za*7xJ#GLb+2e{zk8F8;kE>2#?D||K_giHI21hfg-3J^^1#37$7 z4SpbN#~6b0J0{|WReIWe=by1`3QUWxA-&a%LfO{YLPljc*zqgVZH_zii>W@y!j89kz=O@D4z? zT)2Uj#or&3IGI(>i}EW~J75U@)kTLUVSyx)pZ+?S6IxcZsk7x7^gH&?D$zs|3EXB( zdBm;KRiW}Jv7qvdcThzR(CnUrD6@i(UC0)J|4{26#1u-gmnDOH7=vut zx@mf_8UEth1V*DqTW}?Ss$Ohw3%&iSm|k&huPH{~U98cPh`j#RpOoak6igH?nZK`4 zP!~?h8|7v|)Da?cOKMB^9xSX$uPn;kv(BW)L(58*l!*NQ8Vjg^7D}(*rCR*1Zdh_f zfJkX=@uJaO_g7J9T;h?TSp(f7;{IOQg+0TSz4jAzn0e;2;a9-m_ZAUIRA|Se@ zEdhbQE9bo_O9DVOJ%qXfy2BZyxZ$uaaZa?TnZ{DV%B6jLw7~BJsa@^>y^QOd+xgce zthho9@f`+fs>Dl{WLS%rg(@ei&4TA-XnTF3sXRpLJ6(xW@i&zY!q>9zBa{f{5*E#o zS#j?kukNYv{@+M|v{y=0A3syjrbR?6GCr{M5G1)+Q*BMzd9)X{KlH`dv(NcJq~nzB zM2DsVsu4~)SgG73@`j?Q^d!%aim55^p{1;Ez+X%|_Q!;)pq154Dklz9#)7(rz zpl?YhvAcC``UD>E2ucQC8ef^AWxgb>u=5$N+ae1yS5tZbnA&5GzGM5(_9deBnbEED z_^x=5jHlUlgS8oc8I0!f>m#ByPEoq%k)urg^U1n=ySS}6-E%+|G^pkmI)yOE*OHK> zjfg5Lik%IYpc7up`fd3AE@YQW+?t7gs5@mCiZD(|_Kv&5*E+=MC5VV~pz|oXHAQ z_{HC#7QZhHL1{XjAeEi~J6o{J+EWh9b(ra|j2tz9K7cmRe^{BZ&`^x~vl_$;Sn=YT zS>KMd2LSf|HqSrQ0};Js{@@kOZZ1jU9B^bLt;ls2{U9#UDS(KOkZ@NFnaX9C{PZ=H>kh|!O?zrD7 zng6D_G5^&o^p5@-y4M9pN&QHsQUT=+*yjH63&AeY<@yw%;~Zx|JHRg=|VEr*?@#;4My`lza>LL4Z%jAxN%(ZwH6iD=eW|v%G?U9>H9sNz1VC z8%Vb1v9i|hd&NIK)@T@*isbHqB+gAHW(2DaWTN@N;33n>9mJ;X&%*(|RVEH@If6+?nnT zXQn5&luF4Ccq+0CE#w>Hq7me9xJL!A8Pw$fP?sCB+4n&0ik7vV#PlZXSMF4_31$Iy z>_N$^E79$0){vt)THxPSlGC(oPQ51$F!GI_TBZcij@7@v_!B2(CLXBx!uv%q=9R2n zAvuDJv@V%?yn`yUPE-WROfdX}_HO>fsI!{$Ek~i2JjTQ!dd;osNf|gmmC)irZ^0XT zbhkPN8`AGj_D?GO935FFCroKw8wxMDtlc?ot1A~h`ACmVQtf)U<#o9%Hel`pV1?xL zK1w+WK;VChKjIR^e>R6LV@{g}T?c0kjI4VX=5#=!8(JwtUDQx~8PPfNW$9DIuTqlO zv#IkBGMRP8T-sKIpq;eQyZW14lB8A^@YoJY!a($LL^AtCfZytY_1czD;)KRtEA+QH z2>oWRs-T#1f0sD#I1ITA64O%*fJP@5e-Z)(<6rKjl*2aSA{^0SL{a7^k=~_2R$8p88Nxg$;K_DVPWL+rQYaMc##wX*Nb#33wtQ+k6z#o-c!UX>XZrmZaAIb@ z(VyCW#7Hwop_sw$c`e>Z7^O%nC9LIA%bAVJY_Rk3lRYPA;M`T*k-=dnzzytc)}WJO z*a~c*wELTZwsy}(sFR~3ec%@?g#ag)OFF@l%NetPAcKTT31&b4y}PevZoQoI;nq=f zHs!i8$$>Te5i`V(`XAYdkar5nlOLnBhj25RW)xrB+c}x-u&2ZSVfxS3H}HSjFWmHS zKiU1vEq;KA43Hl}Ez&bqBgN<#@c+lN$lGn<0sFChp@9biBL8o^7=Iic0Ki#9<1?Zo z8Q%vVl&Y&o8HB2*9YvRdO5!XMZ3#!C<#`m(2AYz@9#52HF-#dam4mW^p?g>S{hV@D zLZ%o2<9)ro@IzE(F&bre^k=ZU@^aedJI--Co_c>SCGdsa;pB(j$5hosl86soWK`CM zPjm?mMMf||!e%(uv=Rocw`~F)>B(}Y|FK2waWkr|{b5|X3BH|?&0`kS|i(PpI$Jad&6fixf zAl8N6HDT9-+FeA{h1qp^0*DM`g4kxx-8))nv(br6uBKF2ffPjnN~ng^rPyT$QR}`h zF4Awy!w-Z1hOZuure6%)ZG2dpzE$~+ESS7jWKoZ5GO@AJu&I9&}lTHA0|{o zo^T5AIN2IncXwA7nvVo0H0V#(v-Xv9& zFIfQpGFtCyoen_2o zMBli;CQ_q}O5&p1qB!LJre>y4-y+?NYt?dX@GK=}`M2Oz`(W_8BNLrq z9`3VkICp)D8g&l8(7Zok5SR3n-sl)wEhRTxah0A5`4X)d3*PEyMq!HJ86?)+OeL6F zKQIG|Y`r23pfO#CRNn(5O0jE;ql?Ntcua6W3#1Q~LpJmXcjVs{2wOLrKrWL_*1Qc# z?F}*7TT27>E*`S@ZA(z?9zPU?LvC2^Z^?Z;D2&^%pim|{17w8R)*iObpxj*@C}zh6 za92gCb<6TROl03F{+@pfQt3%Sdbif7Jt;RhExwU%0C3#zyX0vmx$u|lpzVD=BtTr; zU=xs@>qk(S!0#87FWOy(m&%|X10BKE{u&u3C5z^?S=!=}g)OsCg^z5DPmzB)p*slo#xuIMK@c+m`(3)*f~7WvoCM@du&A#>0mAw4r@*D4qsOw!vE2ln$@J#;e# z?{Eq@PF$WSsr`7ete6yB((N(>qDs07=&&mP0RBhYP9g{v=UIDSxxNQa5mEQj6Davc z9i=^1A}|hW_FfqR>;pP<=4#LlV!I&qkrr~?>Nhh1^-&!S94Qu_ytk&4UG>a8mM6=^MySiFfy7 z$)aO)&qgr!VdsRIH};vH0}91omYgdtMG+^SuArdO@%_%K68sLt1O@ANL=nqz*TC4* zGdldy^uK-l;t){S?>jO{Aqx;#0G#qKHl(x5OwwKmiF~0R6q)hd??|+q7Z{`P!Xx29 z^L+rL*hiDKQL^RiunmpD+4uJ?A;S8cn@1I<5$xBNq;oFrwophD=*y-ag_=#5CR^`* zA(T-gC=AHa{!fIp)0P1>V1#F=wNWN7sZw?JQ32oh z2srX~99`C-A%EB$LcEa+XGx``pjVtHZ#p=${0J{uV_9zk#55-6uNVS%xk409o7CPvfXgtzQHs^C zrKcr`C6>)cwySm61_k-Z4%x~WwpOa=uH#;!Kw-BE-w~R7n8zt5(923EWZ44BvuFmM z8k8!=6NY3r%mLjdgu0v>uA0vpr;WNUgw9#$XWQ%hCHQAt%}8TfPG@h3L(O$7P1#t2 zChPOaVR9y#O$d>m}fQ2is9Bo*p?ON|!aiZC8lh+FiJzH#gohzcHELLi6%`fYX zL#wgZiX-7u%UVlkXSKU1N*>}zSDlxz?Z%?Qv;9@46W?dz3ekQsG1{}sm{z+U=aVZ5 z6%1bKQl>n}Wy~lV{NSUiw{D-P>EqqSo;6LKT9xOP^Tq0}oU_>krf>M!6t|J1i{{rX9ZlEfZ(?)KP^2N#-6{^tqmr|9@@oKp{>&! z>H`ca--KM=ksN0}rb{>!>TK7{5Xy=J8Yy|847JczA0L{e3BxuLt|;%n;VFNJD;c*05lZG({_EdrKnC)?q}|T+(Lmf=g7T zC_AVbvvbZxG&UJ=SI#r(Y3SD29Qi0~&evV|+2LK1GYslSf=B?r#*sbb3ba~3OP$%ZC zLVcpCMdV{I4|f8D>*Gj*on5ICU&bJW+Yi)S?=&^}&>Pt4V-I)spxB!a1#&=?8UeyC z3NIibR6h6ycRKfImxY-hr|($ZA7I@Za0)+RTpo1UeXlS^-BZT1K zfyLxuzde#-vo4V!(uJIYcPbY}`s@8yJAfLAFA18H%q*R2vjL8e!Jxd*vzMLuGJKD# zyeDtK<=;r$7Ywdkzx6Sn!$Q%-MH&;mfk>=HbZe}ZCU;?LZbK99rj@|OM0P-_zD0|H z>8avonnirpzUSDMojPmAQc_U$tmDl(k!$vn5_r3~zP}ucYzEy0Q-i0TfunLO1fW@A ziEYEEq-la^lG*(lzhSdR`;O{#7lfP|HaoYec_Cbv?s%(m)yNpmt2XEnP4lh8wx0+J zS*P-uRBZV)DaVNqv5o@P(R(~Qy^YoElxuSC8OP&y)htLLtVT$X*eqO(UzKeu0-Upx z;GJpj?_^<>0!lIPJLaPiQR(G55WpO61G6)ck>zO+1)Z>X3bMvBd8BLH?B=R=uWO9k z_)ADss&S{x6~VGit!EKVb`rR*Fz?&9ad;IBLL8Mup@bbhy+DyIeT&Rc>XJbQ`)TQ+ zCtHhjqxB}T1GM=Pr-s%sNnjEqt|XLfD+;B-Xc@v6-B_O*8gyL0>r57DCg3>!eMA3` zO;zMp)dqxsk4mdy=^Lx~>aNqZT>RWyn(D~Li8jwQ^J<$Q)xy zEH$cH%6i%HE4DiiL%P*UQZaO%=C+~&V)h0|sLAgR*AZyD`rl!yH$3a?ZXNXtSIV$^ znWSsA?deZ+_#w*PINSL{I)Da`ytw9QsV;R(WKErHVzQeNOez$O9`+vo1a^x|w#zWz zj0!W7WLc<6KoU=K#PyyR?Iku_E>9IcT5bQi3hqBE64|;$IIBuMiVjgWpKPGt z5IrilJi4Fw66FfT;~C~5XygRB!9FA!8!=L~r5tX&KCxmSLW2ai6lj1W8O&h?EP%qT z+K24Ww#oEs;ZWX!!a|K4VqA~&sG`z6g!8^EqOiN*3~=W=k&KvC$Z^kII!@yr z*(_M}K_>;h$!&Om>+pN4!+{dMP1=FIe!X?uuqYVA5{f)MW9Ah+ZTcG0hsW5a6ck+m z>-V<(qu5hXVkT9)paJY!Nm<}vGJ)xbxg%LZvcfh3=n-TIGx_?0`?*=7wG2`Z9ly2c z+Q#W}uPpnE3qZWbEahQry{{d8J2nDZq(0+|Xrd4x+-&|&cSE9Md8P(B)4XT8QBV9G ze%crOl85hIrD^+mm1DkpyiqTbvDHd5^siB5x+mx4y_740XLw_*Yj#;a+6?0_3wL;x z{(AdIS`a5l_~`;u^t&d%^U_%Z?NG4j3MVK##F=JHN&rZV2zt}f3as$7;VZ6XX#ejW zvI(4;7_wTy?7@#pT3S{5Ld_9%K^8=kD9((Tqxi+MjCj;eMHJZweQx36_fug%xe}vB zb-{lyQ0}uPv@y-P;+*I`QSF=-PWbXeTDAI87sv{x3Ic(}hFH2o^ROw?1qKk&Q>)O& zRZ>~i&VVUZE;G0IP+}JKOI&uIP%AK_NT-%1E-i|wB|Sl-T>E~AVK@g@k#$-_HHL&Q zB;H^%L>Igne=$~DVymT@@4-oR;qP>u69f~mb;^?Ua7TnepI=wQax#V(_=C3XJ*kLK zJG@teFsR=__6B}W(hiWJ!P2FtLyUx~7m`v{oB)xEAnDYCGXXF~+1^A2viTm>j6&zJ zTHffNmWZ*^+?MEg&}*cydYQ|P(u_Xe7Q)84A>Ppp;&T30QL>+yIXkG0-~(z_<_;xB zbja}$dXJvhk0U|1N)~di(mZAKier{uu#{xLr>blebPtvoZ1<)F%eot$41J3=k}mYv z9`IbJZks*WGB$BWhW7SH0y>G=s<|>CQ^N&69U5@b#+*w|tkvKMzaBaY`us4YWmXsH z%fldey8l-etSQBK5#z9?VBtWyy7&(*p_D;_io6rar0jwA5(%-h)~P9HEhl4C6Ih|7 zhluht(ca65q*K^KMnSvLLm|VjR`}ML3BXctmhy&*#_%vNKIC8gI7Z<9uI;NWguBnN z@%^0f-o3+p&fPa^5eRUur|Ou8%?=QoTZpkJK8#37IYGI&SQd4ezY}3v*;<3za40s4 zl29ZtO2#snT)dKQXo~B^q2LklVaVD1-P)i}ZL8Q3gT+8-*2QpK^5`KE$Rdorz;}4Af>(ESca&54AiZdpI^Y|I;Na$QHR; z-qa)3n zGvZykfbZRJkpINu7EB^x2!6r{@P0lLpv0XcvcyRk6r=-c>Pec>3EAdDkpCNFAo&B; z{lpz4>cL|D?DCGW8WUh0{tLhR{@LOoq=ErMH#Var1OF`2XnH?OBK|2>B8Lt_B0LvN zqTVTN;~6@{e+lSsanIoYUkCyznyFXfDV_p=ua54|AH?f0w0ycIaHKjv;p9kEXd$Va z?G~ML;Z?GAF>mnPKDB?MfxituN^jGn9Hwmj4YgV@k-xLXC$j9ixp-K-e80Z#(Ebss zlCqM_Ns1^7!w@4IVm=r`K68d}UBOJ2fyFSz{KDNw?o3M}+$9<&iJ^jsef>=bRsg#R zklGv(a}3Fvq=}c&jV67lrqdWFSCQ37i4HIv81>X%RCY=*XjxwUu!E7#qN|U5u4ZaO z@l-W1M+zv;u5L2qO`P{gXd-)z%F;`OQ@Mx~Zp|CFclhyx!epsXU{rIP6O)A4?ku4a zCuYEahSrGYbc9vz%jfJ$HyVdlQ^JP=h$PljXEYd;w8*L~b0Wi5Kdrfn{Z6dYeIVyJ zSau|3u=+bvVNs?@uS?j(B1m_PS)}4KJVMD*A(``N5`BtM!M8I8H?%ft)6|h1~)=(H2Onrm5i2BJ! zo|Y}BtXZrjWF-Yl6|xJcsMj=X;FG%?3vpyFv5e?##DF{Oc0$k20Bb=yOwSsn3>MaB z{jI^REMoAmYSM00@d~MuTvmqy0HHq4GGu;8a*a~<6d6qmHIo*@9bagb3wml%tmO)I zq_yF0M!y!8^{G{DBA9yiA_mBV(zCaHyD;rG<`qQxp3pswN;@;m$j7@n zHPsfbV!-+Y(O^Pf7hdsQ>X?_-Yn-gmo~`0`TI1u9o)hA&?jzR#Ek(Qm;72iQ5;<@l z@wx~%SmnV4{yjon-Iy(O+`#1&e_fmN0O=vbmk^CS&9=D#S$qO*J^o2+>HZQCo6iwb zoiRtzw??YAhPtE;2GXi81GAx!P$svB*%TG3vYj6j0}e&{hu3#XWC6Ou0LIDd>%Xc+ znn_&!Z&&rC=@kU^Emk>aX#yASi9Nk-|Y4GUi*x0GYx zQKl`F8+cHUzuW*L$ZdB75&Z2+1d_`wbELuAWgp0-RO`d9|NOs;u|x|Kqltt7|NGJZ z?M2t+NY_+G$gc+GPh;;FK|CaSLqv)u8z=5=(9mSY)peDAng4?HLEjxGN;W%yuoKEW zr9167mjG&%aWOS9^<`@6X8V4>+)4ms>agw?qX23V<&wx+Q)o^YE(NMo=PYxcW-y}M z>6smAIf}&I|7SFjt&-eh5zt&6ajq`^*Lr2K*e4e}WC2ft^GhcrzTW-$mRZDcv=W)O z6qaWFQC5q8Ka*ZVE~yjRZCv}uj3ZhKFmAzUeBJe6^Lh|{?JitCF1+G6dKeudTj9d! zNNO4vgd1~JT6OR8j^-;xiyni`YB4pYj4sNK5kT5jRerFBj^)XV zBy^Hya$+?$S=Mx-1c!q+f@e60F*~Gsd>#C1##_G^F0g3)HKt#$WOI945bvyQq|V=m zH*91Uz(350gK0hd1Q2Iwby*J z6%Mb);l7d(!Bo0$3P5jVoM!Z>f-p|woLXg>!0%x@xsMi537Kud;k)RDcJPHI;AVRR zn5UT&d|9>IIGo-eE}jMA>D@8AwO)$o`Y}U4XqTMA6-x*{qDtw^{6s7ihc-zRS+JVP zwEUW+^%XKqRfg+geIgd($t{em?$^f|iMPo+jp3C8@h_^20{E8B5C|WetLkd*8AT=& zXx`IA85ng23G$Njur53CQ@9{h;F({ut$XB-sid7@VEYr+M z1q(i0QbdCZ&&iAp<*Hkp2_n-@kv+tJ$1QTdTJ-kJ;t+on0CF(@@XOo~WaxhcsYFG} zqI@L!ll}%ct}7#c#Z(`(HOz6BNZ}CfK$J>(hdWtiu2@JX=!WB9Y(Qi=CZa8t)fdOm z&Ub^v{?kgrN<(Fy`3l^{b4SH|lC(8kmOEg~-ktt?vD)~4S;|-Wd7rE23(6Q8$}DGe z3kE0698xzDpGah&A&#Ef-xg4bOAs*$JzVjpgIokKDy!7GTw&Q&lekvEFygKzf@-18^XF1n&WsioG)2Q%d7X;a6?XjK zCCFe#%d7ijhDb{*@m1oi)v}}_BUxs)9znv z^9XaVYr`lmQni1H(o9qs-t9yN<_axqFf70zYqxDUjvu{r@6HE2^CfAY1)R*9Y2f2U z`35MLh4$66-R>%F38himG>7j(vX?6gN?DJI6v3^|Pz{@H)44`q@xc^7%PJ#^&50DC zL)Mj+>Q^6r`!>KTazLm7b12b%Wba)qD5l}QfJy%v(&Q^C*uRMoq(hC4@vY@>0v>nl zco=SZe(49#lg9I9RVs0mTO&apQ#w$$r6hLts4!Yla{B1`(`Vr?dm~(XjNLEVM_GnM z_*25#fcy+XHVrtpq36ew)ZDbhenA3KzyfY{5v?5%b9dQYd(MZ(a47kz!8_FCNNP#) z9p%b3l)_Vr={X5-Cl`EA@y{I9Uf%n2o1S|70Dr%G%B1mzsSOu+;1tFOiIEgKEzm>- z7aSQoWjnN*5ay~#69kCjBuiY8KK!46J4N=T9EOf&htUyDF>dHbLr$X}n0^CVc5BK~ z5~6lNv+OiKVQ_s|E4|`=kD{)NZHw@^< z4|qs6^TMPQlmFebr%aVb&o5z&5y6HN0}gen?2qO2i`wy^xoVjJh*6TctFDO^fI z2x69*k1nZJklwLT4|??$Y`}iZE$2@C9>dlA&rEw5_nzL%u-OmhYWeTUT3gVwg|1jw zw|+_=458e88|m8tZNdWlG^A2IqG)a>#4Na(!>@wesXZeqKL+zJ#e{F%|KR}ML|v&V z`-5#?{{(}GCmNvPCHnn_NCce`f0|7lem4~-xWQ!y7pcV{XIDwCDTScokOdd|l? z+i^{uunh+ce*cSPNPE%uej>oS-JiOG2o$s06FHvR;CkNhk~0$keBU7bBWH)HQ=rnH zpyk?N8|TB3ChxK?G&LF=q9*Do_C~WoVIE)95pF?pCNn4~_I~xA*-rG709<%vQMCrd z+_(m-9%Yd?&eEVEAK?%u$qFR-mJz#6Y=+D84$V293*tg8qxeqC#y#%JG>@|N8We#5 z`cJSxvUKbk8fw@xnWa(0`I*j|!i+lA=+rA!y$ zL%o@x+m^FeVrhlCYEKZX#_5+{b(!1t=tML1#Kf>;D(WZ@>UOv$w|h56Hmp!9q$fYGNnlZnCj16EcY zQ*7FH&PTtrq5GaV|rS-HR1!B2e+7icW*uclNDXLjK-ubHj6_kbIsk<9u}^4 zzspg&EIIe#-ki~u0f6N4+wYngH?lcdex&;D8tiqyCybK(^0)r4BgKSJ-0B73_7(qh zFne|@_@9FOj72-}vaTMrkEb1e+`4i_?Up_$3(64v3HF~|l=p?=)Xa~{k{l^u2=(v~?JM;D#MBee^{1%Q z=}VM(OA0C_<0Z*c7pXBw@2as$lY*K?GQI?Z^l{B7v2`nA9iGMWPoW=|Yaz9vi=P8% z?NJpL_haKOOo*l$oN-vR6s|{7%;`}fK9NDva>JF&i>#pC;?@C$QxG%x$4QRisyVqp zO`|l|3NwI$WkjBH1LvyXEh$>GG&EQ>vR5@1>5weWnQ+o?CO>0KDLKuvGwJdkdKQ0Y z&rKLh>$~AJYFVU(tdra4`G)AyT$Ka%V$#!Z;e0^y;c0}HvIi;oPJ5%t_MPP=+dU zdzDW}bB$?_ZVxhjEytv zYIsQ{}XK>-6YKJFxUZAFBR$jTTFSR&?-!Do-(+`?J z7nrNg1QbK3KZncAA5=1v{Gd7W^r9cT0)|O za{h2=v|tMapO`|`Qmq6kfa{zn*I`(pcE+$FZy~l7m9=)j4d-j$-3J3?;5Bq*5(BR%gZK}Us41pzhG z&HtH)DYd6N|KioiUbv^|frYFhLslwdF*HY4o((gXFRqHeNXm<+#+st8*`6;+wk!Sj zX7T*WV$p@B$y>uSwP!+;qKI&nb}B=4GFmQvXadRCGGdX=`?mw&w;wrO(P`jQ5if;+ zHQW|!qDc7`@T{leBk~1PM~+h| zag>!k-A=Z;(r&i;GV=AnT8byd5{KwBUK{<)6W!W~WNhLw>%)pWb#O>QCBS9C{EBE#{Y*naWXsPTBY{&eqbF9=0nuhp z#5p3C7pB7JR0GDd4thD!w(=BLcoZDw)Ekr=)P}=-4OCh(hc%>8f+?3QHqnVOLSy*P z=Cm&V@r*Hm%(U@!&q+B_PirnT!3Q~ zF)&Fl0(h>j`N2A3uUws-gaU_<%69xQx-)4c4B${hT+yoCy8-+m2fN>6%RuBra0vX^ zETEyz{?E|p`H3wqMTgV{FSj=34IldBK*o^$Y%c)teYZ-BUz#jGWbSE4>>vEaA5)&1M)5~juLHGmP>KVGL5#^hpje)yP@vyU=}~Y(j&S4bK~^?z zh1dnGiONu|5=t0F%ifDf5W&kstloPnc zMIl!`zifq*Ps14u?BvB?sm=I0gnd`o&&X|eO>{F0OI;DdeQ^x*HWIxG{Acwe9q2A7 z{%N-!ekvgE|4BDZ{AA|-!4&3yl!)JMIGamoSkz&$GNP-X4RG;9Wl&S0m=qcMjJ;|Y zOA{Ga=yp5>x6yVF^Dn~4!2=k+Kmtj(8!Z#S(h%bbS6S;$zQ^^Kxjj9;plO2%F<_3| z2_qCz)RZoo63`rrt5FFN4oUlICNo)d(~hFJt(YNtFL%=PI!ZMF&kYu=s8Zpy21}=9 zHl2{a86-G^AqOt&w6<%i^=GV^+6z`GjG#TEBynUBj?2g?Zn^mhm%rk)jKWm1xer;2 zVAV7y;gq`faM-i6YPd2tbob{JJ>40~#v71Sn`d|;YjTu-w~q?g zrWHvsv`Hv5G`o2NGBIrEu?JP;6V?@Nvx&w`L=N2!$oun1;0c#H2-^kU&wa;`Xku0n zlDQeTe{DKm;~nYyHIZ=3;D>WB=1f)(G7aC9)P_GlQN3#+z5Y>5W$r(4(8hdFDJA2W z98OtFm?dFnslb8=iBnBohj7kfW{hP5MWe-R3zLSp(&voM$Q1Jr=JiHhX8+aN&*}dXHyPg0jp|bD96?fBh=xz@(J97Jm1Id>$P( z0qJMAWgMWAqM#DKGl>e_@iGXI0x!Yc56#czag=GvA9anv(uPw&(?d{5+CTrkoKNO? z4*+{V+mHIk_^((d4h zRA^#o`GnwN)OI+-iTdnxfPpSfWYE&5-%CaycRUw65 zmyn=c*36BXWZHG(krZ47h6V6iwuyk*I%xU7_LFO81QW<23tkp~|EA-gz-zzf#hsXp zw{-HrBHZ`h=)c}Vix@AKD>O)*u9&k`mbed9!rj3p;RbS0Ypc&a0kV3)dlISPhoJr8c6 zpzY{p{mLSm5Yr*wKr2e&dBMMInnNORa0mLd{+Zw9(c7|xF|EVi8fEtH&@=veoypgFlg<7U*t?*4Vs7uwV z*fdS!#y|G$D)ZMYrQ$MwI+9;e3K<2IR|j;!8udEmWZFzSOgJL6XF*|mpJCT7;&#azU0pj^0UEc8T^(zz8R--9r;Ei2 z<`5wcy+O;9vfS^2kn)MJf%>r;eg{F$XUtK!_BubI5&1Y`?8<*>%xFY3(kinDkd7OK zd0RxxVrfo;US=;qA{~RnzE4CNODikqz66YfigZ&B_TJ&~&Whwv((fS;V$qZA-(Td_ zMpK{VB9T|{12k7TM7N2$ewip~G7F~AzpM1YDQ^<^R5LeXo{g6}WM0p}YNHH=zTW1rZ}4 z>1Sy*{uzf1#G0@+7FkKHBLPALf*5>(Ny2v#(2+mRn^1vZMYhVJ%^ z5Zzwu;+YfyNe48%R8(}EL%PMlD6I7v)xa2))JPrUvj7U_ire zqVXIRaf#Jp_I6Z1o9;ynL1YBWfJwezG32lhTl|gx*#nR68e`C=b#5N9KOCUB%=p0w z)~E}=NVm=vJIVkYTLO6E`G`D{<|9%3+ei0Fs3K{V6JE2#AXwp{+?uV0(eg?%;5v7}Rno2?9Iu(M-&HGvfIR}9e;sK*n_NINdGgvMW2 zjOT#tsvUj{UgpqWX?ZKWc-9H5L>;mnUYM7*$*N%(>FKL54``O)yafq{t?TafN|gLToFUC`fY3ABA*Hs-t_C)fIeU>>kPs11U&2Iltd^ zk%OxiqIIHh;?&i|l=uDQ#MS59{U?PV7w@TG=lO^6pP6#f!s!}vPjgQS)BYPqVJ)A@4^L_~fjZ1Z2~WWjmI?awLg-mKkJ zR5$xWBeZCMsqX4yW>VUH8f5oUavUb(KiTDi-!5#2wdg(`jTxnqUI!&|2D9zf7cpEo zlCNaN1!<*9cc3y|Z#~^iEz~vjSs{6w5gLzjBsZi4e42qG;8YkgEKm!$;XeGE#^6ld z1fV;53RUYQIyG;bj*AF9st@@E%P_6%=H_d%igP$$g=j)_gz0D&ZgjHWaw)1%!z&=Y zoBYAmFsT!yu&?&iOHqcn-&5XhAnowH68ir*W281y?9AF9kD9#LO88C7JGlBJTk!Ta@wa0 z$%jv*>nx?2#(^8IMc$Nyw<%GbT$sDH6=js0W{{Ov%Xd{|ut-ItD`BIu3CxT9y#`?c zrTJ?@gmmK6r_9uWz*;^8ev}bS|G_gYKsQA&qa2g`-JJ!Nqzx7@k}cVPAV;cbEuA6EUW>bS zaSw#aU9~s?Ir)`Xq@P%&y-db0M%UO%D`G5)xCGgvsIm`n8u#S83Xs(-dVJwk9=w=s z<_+t1Tn^EG(MlpAY}>JrFdg_rNn^#f;Bt0Tp(Q`T>`XVMcCGxb6R4a zXutoiI8m}_-(&Z!qIJ{lbC!qva{U*#$^~yTT^-te$xgF1TYn>V@(L@y=t9@C7e-hI z*{XW~QL_3l*lm;!H_Q&@MY`d$dXatuIzFwVS3Z%)RuGmkbzl{`Cz=*xpK1C_<7x`E z!g(mNBAN7^{@>vfaX0`G*WFi=^XX1Pa8;QPHCj!6z=8KNd5Fg=RF#C*%?w%vE)uEj zxURS%DXT|Uf8-M;BfrO%LkFp)2>u*kI1g~;H(=7g%7b|zsO&~7!xqpb8o8tISu1ntS&(t z5`Vs6n0EFlKSSm~+lqxRIvrxWW?ajnp66B?XyB(?4ox3iY#v9PNK2BL)&&HRfFDMz zmP$W>o;$$71G3c*qD{OT2o(^?=dDxW4K3*QFX;}hu%7tDt}a_uIw?HELhj7wOT3~& zwtNR&!1!NfU3FX(TN{QI1d)(trKB6grBgscI;2~qq`O(V(*z5CD1zUO(~bLPyPGr!-wwG9ZT24_QTm~);*!!|0BGe132qVDIGKN4A~ zkHMq-gr_7K^j1*8M0~U{cm}tZZI&t)zn(5?k$rrCI@D{WaK&GdAzI;-@a|Tzr)Ok0 zFczjw*Cfuvt$T@L6XUzKZuLtN@*-4RryJrB&kYqKO3>%9$h%XwlJ&_)exxM;4Ob*I zlqo)=TLEg4uqTb&v7#X3-VmF|^e(Jo@Al(rq~NO#8F=;-{LOAunczy1iQvAI-^>_4 zAucZo>3B0RiXKlvzQ-(Jx?`UGb2&SFV%Ama7lWbqNGIAaq+g87^=xT#kHk`|)}&jH zGWODEuC9)bi2d$V*}PJzjF(`Gh4E~^=TDqbInIxq`GVCoeogl~cnw?j+F=lKVt8J;j?KZ3Z1Y=WB^G$){veiV+;d z7oWe+@d%jRtpmr5DaY#}NDHRVPCwUl&Kj_MlE1U$U2Fc!*gCpZjULB zsfUywS}r$b$-3$>F(Pf_?JHaG3n$g+EYOMD`J3m(7_Zr58({@pqC=FA2h7&HwYo$) zlH1wV##!aH1J*)cTX)E?hGvbQ@oD+)1btmvEaj4m2{2C%vv4nJo!_LsTiMsDfqelr zS|{|g52OKyvQ-T3UilqFli%SHbrN_^M=-@fk5u!~uUA$%CY;$C{|&Y#FttIw*E{t4 z$-_Y%`O5gGc&Ss3!Q2n8FY_S0;NlX*0)mw9GL*swU@|8^X*AJoEvJdzH&mq==O zpVxMFoujfuItxJX&pZ3Udto#pM4n`8CJ3iKA;Jj=_fMhL3~fszy{`Bx+0+zXPtO|D zX{fM~_2Qkax12TQa5WJmpd8QJig=s>EzdVn6vJUDxHWv@b?vw@4`Ph)0scmzC;|1a z?)y(G)V1UF?BY!gLXD>bh5fLotdU?a-=FhoBLnNe@JnSkB{y{!b(itUaiubHuhR#9 z+Tg<%6aohoudg(@TPG`svMkO6u{lIW4w$YAoGw6Ezw#HAzMo@>OlB|NC-*p4?Jy>% zIau>1Ya8+2hH;LQO$HHYMxN72!$^9^JKvi$x&K^JYvmq4CzQ;L(a-roXE;bw1k5&* zx-cbhi3hYsP2?)WoW0vKOrz*cToM-WTfqbsNe)H8GCukO`gbVlxht8)so}Cpk$VZ= zLL88(g#vnr%a}|Beg0-LiyBu-Q7;$yk!eGW4!?rR(C6G|u$P`Go|>R+2D0C7H)%6Ag>T*+J?~4eXUGnB1u)z3JY?Zy&a%7xwCLr{~ucpY(fwI0FM( zSzojgTSB#@L8$$BWN?{Hca*+jGhkV-YAdUnE8Ap+x<wlBY~#~PXbrs)UvwLa!n zE@k}8P_9j=&cr!fsJc!ALhr9a8J=8Wx@aV1+l{)c;YKGuBBMr46j8+yxx0?h9T09I z4{-_T?GJFM6v5-AIZ&o{4o^{_1v8e{fB8N{EYBwj6~>zbRuE63m^gqY642@86(*cu zPDWWh1F7O1m%hp7R z)(j(h@g}ALUh%GCQ2RJ%<=m`#Gkx+qjri{YDk{3uAB3L+-;WlM2I%MZT47X62ZZmE zu<6CuH+;GRVoQDfXoGyDDQU7ZzEfdjHC1eTFSLk!MkAOyuVnjDGJ#)!1Y6pTC&)FW zB&HFi?}Br}yW7LTbbyPHoD;k?d8jN@$7Vem-h!Gf!&o5`r>olMbj%uAlPU||9h+)4 zNdxNUqoW3Y%wcQWzc6CW^%aCT>5-$#1P8}2*oyJKik`jQ|5|%(TB~dmM z^1^|SQlq%w%ETvhw4beWzVwp1oDN|z-!qw$Hzsg4W!ZD2w!OPa^d91(E|HdGIaN2{ zx4t2JH#iNZFRq8WkB(tAJw#Bh#a*vl{(5S=L!h(w4wHD8J%G`G7$}o$Nf(GxA6#a8 zPiOGbiqsafF&sGeCZiW@m?5HAlb;iSL5z)uJB*S}4-yLjJuxT3L{sJ39(naK0#he} zPn5!X&ExKU}O<13X*kZ$PM)eI*!Oi7oXr zgA_TPbZz#$yeFyg&*Xm^7@tX|#PJWNYUqvZ21Q6}Vx`zOJ#y6o^JOqC6|W%PB4&&V z@FwGnAfMfs1@^WvYtaU&!z$K5#iu;q1~GXr-Qby^47r78Ae^rAK z{zfxw`yusobIedDW$kzZPNndDjz?)eX;Y5b;O*F(8ZkfBgL96 zmipGV^Q^$1ZRlRNU|lplTS!%e<$_n8lCluNHujsgD$ZO5@Yni4=Yo)0y}`K2Xe*ce zIzjGfTNy1^61?~VDt$*zT)H3onBn(29_K?x}1OKVWyY7d??^q0(f|v3uy4sHfmwH8Bp=>9VN{R*wQ{ z)_*99a>%-?2kzapmSiQ020BKodR{J6p$F@#ccbq#Xq19hbRCK1_ zY4Fz)wrx8hv&^-?LvlLiAG3G6pj5T}ZrWP)pK>FjiJuI)=nrstlm>hW)h5CcVo0#s zQy$C+nWb}Mh;}XqLFcSp0I}Nq@{7~4BoZwQXRne~!Nie>>XJ`Dw9FA$O@ZLYuWI!; z{HVNE3?y1O&MX|W{CVMMA+uRsnE)#Z3gyMs6pAd0-Y@}DWUTMmde%LGhY!wDY{^Gr zNhA-JUUnJvbTD^y*PCR}dlCK=(Lk}Jdr(mY+C0-)p>>E5lzVDvk&4sP$ODA1p+i(-N^TrO=5>qZ$NB33PQM1 zbP;YLc;sCmX7d-obE4A8mHZGP=2*)^P$ITUTb{8jYm8L8a2MN%3^hrF@YU76wD$?|JK^T`}=BX|7LrFS6ALxf#cR& zsH#L}9K*&Kl}R|=*&C|x5O0xTQq|6IgVBy~w==gIqlrmy1}0jN(!Nv{NQjmE_!XtC zh`H!2Dxu+;#}l&hVejLltmJvR6AU!JHqRWbH4*Cfimy1gH6Uhj+7Ec2RN5n42aqf{ zoxnbAbGnJp1u0e52TyTv&AOyP|m26eiiT#(O6a zCe|ecl8$>_E$tfdWlF{g-NPHhar|s(+XC*Msr?|4VPeqar8^rwp7X|Y63;aVV~q=+ zry+SiNk~_})hf!FM@_M&#cqJCTToyNKLGJkOKltr{3-$29Cw&#Ov}?gjqBpb>({t7n?^4*fj|m^#(-@@-v_2y{-qJQJvFSZkGCUTEJ(%!BYw z2*+lT-|)M%$mM+aoWjUoGKI?|c$A}7U##EKwqlKFs=g@&D6~^y;Wil(_ci~q@YZ+| zfY2NiqWGGDy7DQF$CkF0h^+=OHW(H9SlIbtoTp{%kc{Dv#^A$AN6ju9?0)A85%5@_tpxJ0*XlPs>XSkCuhxT}_MiSa2_ACr_t(3WEz#_ErNX z+SjWxTMgsCuxA}PFbh-=`4KY|7A3tWJCO=mptriTxjLw~jv@ioJMx;wU>2kk_ zpPa>MuHUv?Ii@nSN9sn7vRH@ptU@vP{ZyjiK8y?Z+wu30jjN1mn@XjE16tdYb?i(( z%|uo-!Yll0%L|B?UEjZ>Tuvk03hMT8q|Cq5%xB4~NNxH_ZVBSWSup`7-alC)z|&I< zcupjy{z}>T&jCwzM^?YjEY|Vth7ZZOqF+9L99Hig#>MI*Wp&4heCjh~NJN13lwT?r>Q zQ>a~}b2IU@$K7o*w*{}3L|F6K-;|bCw%~jT9hJk~n1~;=o^`V}Gv!b$o3fJ(i^ykC zX*(5?H^P&b#NRB(W^oXiIYEDUr)C*&{0^x3lIDvMzKIQpqMHaT6n+0-aw@`bnYu}? z@2ngv>pd!Lgqg;u&%LUb$s*~cvka2}T;4i~KFAc`RfZvFG?={}K-{ko)@#rSSGn@N zD+uR5?&+_4G2h9%BB93w{=|I|sve<-o;Mj}KG(H9*+?UCO zqf{o+r3Nv*5*xr%&JW$v0?-Z~IER~X`aX*hdR;xJbK>+($oxfwCesF$qxbs$h2?bq zR6jrE=8E?Aa?eL7Q;HASPIqjI1O5t)P(apW-u%8F=S5bj2N>D3|L%(@$y&6LSj3rSZn<^@5N+w zs$r82E=GxClnfkUI`*HMXMZkvaaF@bFiHjrVkxD56&EJRxTHvotI5feSs@vgRAZGs zQ@p>5WX7Gqt3gq8urlEu*(8~XmeMCVuU*{|@k%i>K2T&}s4c{*IqJtZ^<(3hcNL>| zsiMl99~Vebfz>2AhGyL^1EKy}neA$TpNkBu3QL89uM9it_+rJuL!e54gE+J}*{6osemg{5t=^<;=7;^`x zdE_dUKX6Q_Q?M6NXXxsO?FHM*FN-Lh()w|XC>(0vg58B$Q}*i@kcfCR^8D&?BG)5* zS@ZVZj(IY(xsBmnl7%AHRgAQEO|k%;8B>?m1K9$tw*=61ag7IfT)MIbkA~x+2GL~J zlY|#9yeK{;_7Pmon=u1nofzia5+9ge& zL%E3>tH1XW2CsQ!!oIHRRez?n*z6K`$W=ydIsBdLLzqQds2zR$j*^Glg_Y9nsw9IbG+pGuvTZsF#w9eDFKat9n$zkU*As+T{!lpgg+Gyv!N zOo~?|Mtuxr9ng_&Ib#)k8+Y{fSg}X zw@9$lzHn!yS|;C%d1VI+72D|i9;d#*DQ%UN6!op@r*m5gO8&mqHtbD3&xP&2h@s#Z zks=boa#*ex^+eWEU?rVKSU0C$jmw=*D64-p7*rV zWCLC(^K#frgFC^>qcucQc%Q0!iDsUjvQqh%u<+SEt9MExA)-r;rTWpLoc$u^F<`Nk z?{7T3_*^hdMvUi}4N7Cm4`t?c96^eVyWe(SZNS651xN%x%;PdnN(zPIYT zy*1t*==qT~hHn{O4M4#V^s2}p_BW>#s#h|8ZG8U7RS4B-U$@Xt`mm0U9i~N{e)*aD zJG#n!D`{LM<3cT%xgK$rJ#l5MWJT7n$dE`|OWG28NRMpH&zR4c5qHT@^y zcB@z~&9q_fRoZsh;mUrMpaa%MnJJijLj#}5-~j&fFTa#Z3Vlp;L>O7q9-<_xDaIW{ zyqS{4m*4SbzWcyRq1Uy@sK@|QkQg{40`WV3Z2(U8=j;kj^XH6r zmE}h6j6}LGdG!d>6cAyW;(&Op(n5v~3AkuE*-fmCot%{AuGRm)wt*!w>qkmdBqUnI zr!O{y?e_0qu0PEkh|wq^g8T^4&E6pmAR7Hz5bODX_1{`Ns&qebA^e%A5cxX9{#JoF z=K9;;`$M`1@$#bk4>2>KWF{LiP+tU*>lX12_Wy}!ekA`P#@Z_lFd@Fr70@FgQQab* z;{G9`W8J!Bh|w_(z<~DeMu=T95yH3PugPvjG%3Xz>$Sk(-NXO% zeye2et=@qg*Ca(`;{Pl6Lg>QehrBysrvK;r;;mY2w=|scL-ub$Z&pgVeTyQ+Ax}@a zZ)m+$sp6JaHA#e4vVYA;=P3<9N%wldSEqQ0%f>yU0sPRv7EttKLA1^&ZYaN%*6fz@ zZ-##;`2WA?euO3lbIAS~-wh47(z@Kzz-tY$pXB(@Jm1Qdaf|T84)SP*`9Fl)5uyJu za{Z&-5%Hlc*DD5y`FBIE|BgF^bB*&_ObBsb!+yx)frMn|XwGr%z+lQ@Vr|Ls_fzt2 zjRs)q0g1x|K^`Cejs^XN5bS#)1VD)JIx|9Gu}%ZX_Jb@kl0gdB$q@oMLLg*e9Rt7{ za4qyD#Q8&|*q{L<1zrmcH-1n30T~byxq$(g3r7fPAPpN>Hzw|Pn5i6MnY1GEh6w&W zc*HT+zbE1v{$TUbji}V?xH*wcB7k+wpH@V@Ybq?le=pm=VwB!(5&{h4uYo1Br2m=H zTk#6F`mRodP;DvR80J5o=154wx1eUp*ZS+WsBggk?V9&DBiBDZ>l*$LL<$kvzI%i6 z+x@8s;cC)}a5cHzLtG97d6x+S*(SRI|F>t#KRqOVxQ1VC6WxH{vg-ehMI3YeKNMWU ziG*<>?{;qv=-RfA7*Gvj4+Y(#H0BU+E5uGJdJDb?y@v1Y(%yjoW8Xjo2Hb*^)*#^2 z5ZygY#8XM3e{-?8^gtH(s3B$7O-*|=fPl{k0T%+NWC4V5>|+4(zCZ-`#SsGEeHwu0 dI7HyJAd#{hD&lVa-ru>9WD#4o!sPFN{{wjn*1P}! diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index ae04661ee7..ac72c34e8a 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,7 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-bin.zip +networkTimeout=10000 +validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew index 1b6c787337..0adc8e1a53 100755 --- a/gradlew +++ b/gradlew @@ -55,7 +55,7 @@ # Darwin, MinGW, and NonStop. # # (3) This script is generated from the Groovy template -# https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt # within the Gradle project. # # You can find Gradle at https://github.com/gradle/gradle/. @@ -80,13 +80,11 @@ do esac done -APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit - -APP_NAME="Gradle" +# This is normally unused +# shellcheck disable=SC2034 APP_BASE_NAME=${0##*/} - -# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' +# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) +APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit # Use the maximum available, or set MAX_FD != -1 to use that value. MAX_FD=maximum @@ -133,22 +131,29 @@ location of your Java installation." fi else JAVACMD=java - which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + if ! command -v java >/dev/null 2>&1 + then + die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. Please set the JAVA_HOME variable in your environment to match the location of your Java installation." + fi fi # Increase the maximum file descriptors if we can. if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then case $MAX_FD in #( max*) + # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC3045 MAX_FD=$( ulimit -H -n ) || warn "Could not query maximum file descriptor limit" esac case $MAX_FD in #( '' | soft) :;; #( *) + # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC3045 ulimit -n "$MAX_FD" || warn "Could not set maximum file descriptor limit to $MAX_FD" esac @@ -193,6 +198,10 @@ if "$cygwin" || "$msys" ; then done fi + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + # Collect all arguments for the java command; # * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of # shell script including quotes and variable substitutions, so put them in @@ -205,6 +214,12 @@ set -- \ org.gradle.wrapper.GradleWrapperMain \ "$@" +# Stop when "xargs" is not available. +if ! command -v xargs >/dev/null 2>&1 +then + die "xargs is not available" +fi + # Use "xargs" to parse quoted args. # # With -n1 it outputs one arg per line, with the quotes and backslashes removed. diff --git a/gradlew.bat b/gradlew.bat index 107acd32c4..93e3f59f13 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -14,7 +14,7 @@ @rem limitations under the License. @rem -@if "%DEBUG%" == "" @echo off +@if "%DEBUG%"=="" @echo off @rem ########################################################################## @rem @rem Gradle startup script for Windows @@ -25,7 +25,8 @@ if "%OS%"=="Windows_NT" setlocal set DIRNAME=%~dp0 -if "%DIRNAME%" == "" set DIRNAME=. +if "%DIRNAME%"=="" set DIRNAME=. +@rem This is normally unused set APP_BASE_NAME=%~n0 set APP_HOME=%DIRNAME% @@ -40,7 +41,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome set JAVA_EXE=java.exe %JAVA_EXE% -version >NUL 2>&1 -if "%ERRORLEVEL%" == "0" goto execute +if %ERRORLEVEL% equ 0 goto execute echo. echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. @@ -75,13 +76,15 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar :end @rem End local scope for the variables with windows NT shell -if "%ERRORLEVEL%"=="0" goto mainEnd +if %ERRORLEVEL% equ 0 goto mainEnd :fail rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of rem the _cmd.exe /c_ return code! -if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 -exit /b 1 +set EXIT_CODE=%ERRORLEVEL% +if %EXIT_CODE% equ 0 set EXIT_CODE=1 +if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% +exit /b %EXIT_CODE% :mainEnd if "%OS%"=="Windows_NT" endlocal diff --git a/mappings/com/mojang/blaze3d/platform/GlStateManager.mapping b/mappings/com/mojang/blaze3d/platform/GlStateManager.mapping index 627e4289ef..c5674026ad 100644 --- a/mappings/com/mojang/blaze3d/platform/GlStateManager.mapping +++ b/mappings/com/mojang/blaze3d/platform/GlStateManager.mapping @@ -63,8 +63,6 @@ CLASS com/mojang/blaze3d/platform/GlStateManager ARG 0 target ARG 1 level ARG 2 pname - METHOD _getTextureId (I)I - ARG 0 texture METHOD _glBindAttribLocation (IILjava/lang/CharSequence;)V ARG 0 program ARG 1 index @@ -260,6 +258,15 @@ CLASS com/mojang/blaze3d/platform/GlStateManager ARG 6 format ARG 7 type ARG 8 pixels + METHOD _upload (IIIIILnet/minecraft/class_1011$class_1012;Ljava/nio/IntBuffer;Ljava/util/function/Consumer;)V + ARG 0 level + ARG 1 offsetX + ARG 2 offsetY + ARG 3 width + ARG 4 height + ARG 5 format + ARG 6 pixels + ARG 7 closer METHOD _vertexAttribIPointer (IIIIJ)V ARG 0 index ARG 1 size @@ -315,6 +322,15 @@ CLASS com/mojang/blaze3d/platform/GlStateManager METHOD glShaderSource (ILjava/util/List;)V ARG 0 shader ARG 1 strings + METHOD upload (IIIIILnet/minecraft/class_1011$class_1012;Ljava/nio/IntBuffer;Ljava/util/function/Consumer;)V + ARG 0 level + ARG 1 offsetX + ARG 2 offsetY + ARG 3 width + ARG 4 height + ARG 5 format + ARG 6 pixels + ARG 7 closer CLASS class_1017 BlendFuncState FIELD field_5045 capState Lcom/mojang/blaze3d/platform/GlStateManager$class_1018; FIELD field_5046 dstFactorAlpha I @@ -365,7 +381,6 @@ CLASS com/mojang/blaze3d/platform/GlStateManager FIELD field_5152 sfail I FIELD field_5153 mask I CLASS class_1039 Texture2DState - FIELD field_5166 capState Z FIELD field_5167 boundTexture I CLASS class_1040 Viewport FIELD field_5168 height I diff --git a/mappings/com/mojang/blaze3d/platform/TextureUtil.mapping b/mappings/com/mojang/blaze3d/platform/TextureUtil.mapping index 6fde36880e..58252e7125 100644 --- a/mappings/com/mojang/blaze3d/platform/TextureUtil.mapping +++ b/mappings/com/mojang/blaze3d/platform/TextureUtil.mapping @@ -1,10 +1,8 @@ CLASS com/mojang/blaze3d/platform/TextureUtil METHOD bind (I)V ARG 0 id - METHOD initTexture (Ljava/nio/IntBuffer;II)V - ARG 0 imageData - ARG 1 width - ARG 2 height + METHOD getDebugTexturePath (Ljava/nio/file/Path;)Ljava/nio/file/Path; + ARG 0 path METHOD prepareImage (III)V ARG 0 id ARG 1 width @@ -27,11 +25,23 @@ CLASS com/mojang/blaze3d/platform/TextureUtil ARG 4 height METHOD readResource (Ljava/io/InputStream;)Ljava/nio/ByteBuffer; ARG 0 inputStream + METHOD readResource (Ljava/nio/channels/ReadableByteChannel;I)Ljava/nio/ByteBuffer; + ARG 0 channel + ARG 1 bufSize METHOD releaseTextureId (I)V ARG 0 id - METHOD writeAsPNG (Ljava/lang/String;IIII)V - ARG 0 filename - ARG 1 id - ARG 2 scales - ARG 3 width - ARG 4 height + METHOD writeAsPNG (Ljava/nio/file/Path;Ljava/lang/String;IIII)V + ARG 0 directory + ARG 1 prefix + ARG 2 textureId + ARG 3 scales + ARG 4 width + ARG 5 height + METHOD writeAsPNG (Ljava/nio/file/Path;Ljava/lang/String;IIIILjava/util/function/IntUnaryOperator;)V + ARG 0 directory + ARG 1 prefix + ARG 2 textureId + ARG 3 scales + ARG 4 width + ARG 5 height + ARG 6 operator diff --git a/mappings/com/mojang/blaze3d/systems/RenderSystem.mapping b/mappings/com/mojang/blaze3d/systems/RenderSystem.mapping index c5922f2bc2..f918bdf8e5 100644 --- a/mappings/com/mojang/blaze3d/systems/RenderSystem.mapping +++ b/mappings/com/mojang/blaze3d/systems/RenderSystem.mapping @@ -86,8 +86,6 @@ CLASS com/mojang/blaze3d/systems/RenderSystem METHOD getString (ILjava/util/function/Consumer;)V ARG 0 name ARG 1 consumer - METHOD getTextureId (I)I - ARG 0 texture METHOD glBindBuffer (ILjava/util/function/IntSupplier;)V ARG 0 target ARG 1 bufferSupplier @@ -151,10 +149,10 @@ CLASS com/mojang/blaze3d/systems/RenderSystem ARG 1 debugSync METHOD lambda$static$0 (Lit/unimi/dsi/fastutil/ints/IntConsumer;I)V ARG 0 indexConsumer - ARG 1 vertexCount + ARG 1 firstVertexIndex METHOD lambda$static$1 (Lit/unimi/dsi/fastutil/ints/IntConsumer;I)V ARG 0 indexConsumer - ARG 1 vertexCount + ARG 1 firstVertexIndex METHOD limitDisplayFPS (I)V ARG 0 fps METHOD lineWidth (F)V @@ -186,12 +184,18 @@ CLASS com/mojang/blaze3d/systems/RenderSystem ARG 0 runnable METHOD setErrorCallback (Lorg/lwjgl/glfw/GLFWErrorCallbackI;)V ARG 0 callback - METHOD setInverseViewRotationMatrix (Lnet/minecraft/class_4581;)V + METHOD setInverseViewRotationMatrix (Lorg/joml/Matrix3f;)V ARG 0 inverseViewRotationMatrix - METHOD setProjectionMatrix (Lnet/minecraft/class_1159;)V + METHOD setProjectionMatrix (Lorg/joml/Matrix4f;Lnet/minecraft/class_8251;)V ARG 0 projectionMatrix + ARG 1 vertexSorting METHOD setShader (Ljava/util/function/Supplier;)V - ARG 0 shaderSupplier + COMMENT Sets the {@code RenderSystem}'s global shader program. + COMMENT + COMMENT

Note that this sets both the vertex shader and the fragment shader + COMMENT indirectly through the given shader program. The name of this method is + COMMENT not obfuscated and is kept as is. + ARG 0 program METHOD setShaderColor (FFFF)V ARG 0 red ARG 1 green @@ -221,7 +225,7 @@ CLASS com/mojang/blaze3d/systems/RenderSystem METHOD setShaderTexture (ILnet/minecraft/class_2960;)V ARG 0 texture ARG 1 id - METHOD setTextureMatrix (Lnet/minecraft/class_1159;)V + METHOD setTextureMatrix (Lorg/joml/Matrix4f;)V ARG 0 textureMatrix METHOD setupDefaultState (IIII)V ARG 0 x @@ -252,31 +256,48 @@ CLASS com/mojang/blaze3d/systems/RenderSystem ARG 1 y ARG 2 width ARG 3 height - CLASS class_5590 IndexBuffer - FIELD field_27332 sizeMultiplier I - FIELD field_27333 increment I - FIELD field_27334 indexMapper Lcom/mojang/blaze3d/systems/RenderSystem$class_5590$class_5591; + CLASS class_5590 ShapeIndexBuffer + COMMENT An index buffer that holds a pre-made indices for a specific shape. If + COMMENT this buffer is not large enough for the required number of indices when + COMMENT this buffer is bound, it automatically grows and fills indices using a + COMMENT given {@code triangulator}. + FIELD field_27332 vertexCountInShape I + FIELD field_27333 vertexCountInTriangulated I + FIELD field_27334 triangulator Lcom/mojang/blaze3d/systems/RenderSystem$class_5590$class_5591; FIELD field_27335 id I FIELD field_27336 indexType Lnet/minecraft/class_293$class_5595; FIELD field_27337 size I METHOD (IILcom/mojang/blaze3d/systems/RenderSystem$class_5590$class_5591;)V - ARG 1 sizeMultiplier - ARG 2 increment - ARG 3 indexMapper + ARG 1 vertexCountInShape + COMMENT the number of vertices in a shape + ARG 2 vertexCountInTriangulated + COMMENT the number of vertices in the triangles decomposed from the shape + ARG 3 triangulator + COMMENT a function that decomposes a shape into triangles METHOD method_31920 grow (I)V - ARG 1 newSize + ARG 1 requiredSize METHOD method_31922 getIndexConsumer (Ljava/nio/ByteBuffer;)Lit/unimi/dsi/fastutil/ints/IntConsumer; - ARG 1 indicesBuffer + ARG 1 indexBuffer METHOD method_31923 (Ljava/nio/ByteBuffer;I)V ARG 1 index METHOD method_31924 getIndexType ()Lnet/minecraft/class_293$class_5595; - METHOD method_31925 (Ljava/nio/ByteBuffer;I)V - ARG 1 index - METHOD method_43409 isSizeLessThanOrEqual (I)Z - ARG 1 size + METHOD method_43409 isLargeEnough (I)Z + ARG 1 requiredSize METHOD method_43410 bindAndGrow (I)V - ARG 1 newSize - CLASS class_5591 IndexMapper + COMMENT Binds this buffer as a current index buffer. If necessary, it grows this + COMMENT buffer in size and uploads indices to the corresponding buffer in GPU. + ARG 1 requiredSize + CLASS class_5591 Triangulator + COMMENT A functional interface that decomposes a shape into triangles. + COMMENT + COMMENT

The input shape is represented by the index of the first vertex in + COMMENT the shape. An output triangle is represented by the indices of the + COMMENT vertices in the triangle. + COMMENT + COMMENT @see Polygon triangulation - Wikipedia METHOD accept (Lit/unimi/dsi/fastutil/ints/IntConsumer;I)V + COMMENT Decomposes a shape into triangles. ARG 1 indexConsumer - ARG 2 vertexCount + COMMENT the consumer that accepts triangles + ARG 2 firstVertexIndex + COMMENT the index of the first vertex in the input shape diff --git a/mappings/com/mojang/blaze3d/systems/VertexSorter.mapping b/mappings/com/mojang/blaze3d/systems/VertexSorter.mapping new file mode 100644 index 0000000000..22eb803e69 --- /dev/null +++ b/mappings/com/mojang/blaze3d/systems/VertexSorter.mapping @@ -0,0 +1,23 @@ +CLASS net/minecraft/class_8251 com/mojang/blaze3d/systems/VertexSorter + FIELD field_43360 BY_DISTANCE Lnet/minecraft/class_8251; + FIELD field_43361 BY_Z Lnet/minecraft/class_8251; + METHOD method_49906 byDistance (FFF)Lnet/minecraft/class_8251; + ARG 0 originX + ARG 1 originY + ARG 2 originZ + METHOD method_49907 of (Lnet/minecraft/class_8251$class_8252;)Lnet/minecraft/class_8251; + ARG 0 mapper + METHOD method_49908 (Lnet/minecraft/class_8251$class_8252;[Lorg/joml/Vector3f;)[I + ARG 1 vec + METHOD method_49909 byDistance (Lorg/joml/Vector3f;)Lnet/minecraft/class_8251; + ARG 0 origin + METHOD method_49910 ([FII)I + ARG 1 a + ARG 2 b + METHOD method_49911 (Lorg/joml/Vector3f;)F + ARG 0 vec + METHOD sort ([Lorg/joml/Vector3f;)[I + ARG 1 vec + CLASS class_8252 SortKeyMapper + METHOD apply (Lorg/joml/Vector3f;)F + ARG 1 vec diff --git a/mappings/net/minecraft/Bootstrap.mapping b/mappings/net/minecraft/Bootstrap.mapping index 1e038d0f3c..ea253436b9 100644 --- a/mappings/net/minecraft/Bootstrap.mapping +++ b/mappings/net/minecraft/Bootstrap.mapping @@ -2,6 +2,7 @@ CLASS net/minecraft/class_2966 net/minecraft/Bootstrap FIELD field_13357 initialized Z FIELD field_13358 SYSOUT Ljava/io/PrintStream; FIELD field_13359 LOGGER Lorg/slf4j/Logger; + FIELD field_44781 LOAD_TIME Ljava/util/concurrent/atomic/AtomicLong; 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 @@ -24,6 +25,3 @@ CLASS net/minecraft/class_2966 net/minecraft/Bootstrap ARG 0 key METHOD method_36237 createNotBootstrappedException (Ljava/util/function/Supplier;)Ljava/lang/RuntimeException; ARG 0 callerGetter - METHOD method_39889 (Lnet/minecraft/class_1959;)V - ARG 0 biome - METHOD method_39891 logMissingBiomePlacementModifier ()V diff --git a/mappings/net/minecraft/GameVersion.mapping b/mappings/net/minecraft/GameVersion.mapping index 14150e6f7a..9ef14a8d63 100644 --- a/mappings/net/minecraft/GameVersion.mapping +++ b/mappings/net/minecraft/GameVersion.mapping @@ -3,3 +3,10 @@ CLASS net/minecraft/class_6489 net/minecraft/GameVersion COMMENT one's occurrences in Minecraft code. METHOD method_37912 getSaveVersion ()Lnet/minecraft/class_6595; COMMENT {@return the save version information for this game version} + METHOD method_48017 getResourceVersion (Lnet/minecraft/class_3264;)I + ARG 1 type + METHOD method_48018 getId ()Ljava/lang/String; + METHOD method_48019 getName ()Ljava/lang/String; + METHOD method_48020 getProtocolVersion ()I + METHOD method_48021 getBuildTime ()Ljava/util/Date; + METHOD method_48022 isStable ()Z diff --git a/mappings/net/minecraft/MinecraftVersion.mapping b/mappings/net/minecraft/MinecraftVersion.mapping index 9207695d9e..f7492e7e23 100644 --- a/mappings/net/minecraft/MinecraftVersion.mapping +++ b/mappings/net/minecraft/MinecraftVersion.mapping @@ -6,12 +6,9 @@ CLASS net/minecraft/class_3797 net/minecraft/MinecraftVersion FIELD field_16737 stable Z FIELD field_16738 id Ljava/lang/String; FIELD field_16739 buildTime Ljava/util/Date; - FIELD field_16740 releaseTarget Ljava/lang/String; FIELD field_16741 LOGGER Lorg/slf4j/Logger; FIELD field_25319 CURRENT Lnet/minecraft/class_6489; FIELD field_27843 resourcePackVersion I METHOD (Lcom/google/gson/JsonObject;)V ARG 1 json - METHOD getPackVersion (Lcom/mojang/bridge/game/PackType;)I - ARG 1 packType METHOD method_16672 create ()Lnet/minecraft/class_6489; diff --git a/mappings/net/minecraft/SharedConstants.mapping b/mappings/net/minecraft/SharedConstants.mapping index 481e6b2527..d047cfc2d1 100644 --- a/mappings/net/minecraft/SharedConstants.mapping +++ b/mappings/net/minecraft/SharedConstants.mapping @@ -15,7 +15,6 @@ CLASS net/minecraft/class_155 net/minecraft/SharedConstants FIELD field_29731 COMMAND_MAX_LENGTH I FIELD field_29732 WORLD_VERSION I FIELD field_29733 VERSION_NAME Ljava/lang/String; - FIELD field_29734 RELEASE_TARGET Ljava/lang/String; FIELD field_29735 RELEASE_TARGET_PROTOCOL_VERSION I FIELD field_29737 SNBT_TOO_OLD_THRESHOLD I FIELD field_29738 RESOURCE_PACK_VERSION I @@ -25,7 +24,7 @@ CLASS net/minecraft/class_155 net/minecraft/SharedConstants FIELD field_34372 DEBUG_NOISE Z FIELD field_34373 CURRENT_SERIES Ljava/lang/String; FIELD field_36325 CRASH_ON_UNCAUGHT_THREAD_EXCEPTION Z - FIELD field_38828 dataFixerPhase Lnet/minecraft/class_7395; + FIELD field_43095 requiredDataFixTypes Ljava/util/Set; METHOD method_16673 getGameVersion ()Lnet/minecraft/class_6489; METHOD method_31372 getProtocolVersion ()I METHOD method_34872 setGameVersion (Lnet/minecraft/class_6489;)V diff --git a/mappings/net/minecraft/advancement/Advancement.mapping b/mappings/net/minecraft/advancement/Advancement.mapping index 96e615738d..ca8a7e495d 100644 --- a/mappings/net/minecraft/advancement/Advancement.mapping +++ b/mappings/net/minecraft/advancement/Advancement.mapping @@ -1,49 +1,26 @@ CLASS net/minecraft/class_161 net/minecraft/advancement/Advancement - FIELD field_1139 criteria Ljava/util/Map; - FIELD field_1140 children Ljava/util/Set; - FIELD field_1141 text Lnet/minecraft/class_2561; - FIELD field_1142 requirements [[Ljava/lang/String; - FIELD field_1143 parent Lnet/minecraft/class_161; - FIELD field_1144 id Lnet/minecraft/class_2960; - FIELD field_1145 rewards Lnet/minecraft/class_170; - FIELD field_1146 display Lnet/minecraft/class_185; - METHOD (Lnet/minecraft/class_2960;Lnet/minecraft/class_161;Lnet/minecraft/class_185;Lnet/minecraft/class_170;Ljava/util/Map;[[Ljava/lang/String;)V - ARG 1 id - ARG 2 parent - ARG 3 display - ARG 4 rewards - ARG 5 criteria - ARG 6 requirements + FIELD comp_1912 parent Ljava/util/Optional; + FIELD comp_1913 display Ljava/util/Optional; + FIELD comp_1914 rewards Lnet/minecraft/class_170; + FIELD comp_1915 criteria Ljava/util/Map; + FIELD comp_1916 requirements Lnet/minecraft/class_8782; + FIELD comp_1917 sendsTelemetryEvent Z + METHOD comp_1912 parent ()Ljava/util/Optional; + METHOD comp_1913 display ()Ljava/util/Optional; + METHOD comp_1914 rewards ()Lnet/minecraft/class_170; + METHOD comp_1915 criteria ()Ljava/util/Map; + METHOD comp_1916 requirements ()Lnet/minecraft/class_8782; + METHOD comp_1917 sendsTelemetryEvent ()Z METHOD equals (Ljava/lang/Object;)Z ARG 1 o - METHOD method_680 getRequirements ()[[Ljava/lang/String; - METHOD method_681 getChildren ()Ljava/lang/Iterable; - METHOD method_682 getCriteria ()Ljava/util/Map; - METHOD method_683 getRequirementCount ()I - METHOD method_684 toHoverableText ()Lnet/minecraft/class_2561; - METHOD method_685 (Lnet/minecraft/class_2561;Lnet/minecraft/class_2583;)Lnet/minecraft/class_2583; - ARG 1 style - METHOD method_686 getDisplay ()Lnet/minecraft/class_185; - METHOD method_687 getParent ()Lnet/minecraft/class_161; - METHOD method_688 getId ()Lnet/minecraft/class_2960; - METHOD method_689 createTask ()Lnet/minecraft/class_161$class_162; - METHOD method_690 addChild (Lnet/minecraft/class_161;)V - ARG 1 child - METHOD method_691 getRewards ()Lnet/minecraft/class_170; CLASS class_162 Builder - FIELD field_1147 display Lnet/minecraft/class_185; - FIELD field_1148 criteria Ljava/util/Map; - FIELD field_1149 parentObj Lnet/minecraft/class_161; - FIELD field_1150 requirements [[Ljava/lang/String; - FIELD field_1151 merger Lnet/minecraft/class_193; - FIELD field_1152 parentId Lnet/minecraft/class_2960; + FIELD field_1147 display Ljava/util/Optional; + FIELD field_1148 criteria Lcom/google/common/collect/ImmutableMap$Builder; + FIELD field_1149 parentObj Ljava/util/Optional; + FIELD field_1150 requirements Ljava/util/Optional; + FIELD field_1151 merger Lnet/minecraft/class_8782$net/minecraft/class_necraft/class_193; FIELD field_1153 rewards Lnet/minecraft/class_170; - METHOD (Lnet/minecraft/class_2960;Lnet/minecraft/class_185;Lnet/minecraft/class_170;Ljava/util/Map;[[Ljava/lang/String;)V - ARG 1 parentId - ARG 2 display - ARG 3 rewards - ARG 4 criteria - ARG 5 requirements + FIELD field_44783 sendsTelemetryEvent Z METHOD method_20416 display (Lnet/minecraft/class_1799;Lnet/minecraft/class_2561;Lnet/minecraft/class_2561;Lnet/minecraft/class_2960;Lnet/minecraft/class_189;ZZZ)Lnet/minecraft/class_161$class_162; ARG 1 icon ARG 2 title @@ -53,23 +30,14 @@ CLASS net/minecraft/class_161 net/minecraft/advancement/Advancement ARG 6 showToast ARG 7 announceToChat ARG 8 hidden - METHOD method_34884 requirements ([[Ljava/lang/String;)Lnet/minecraft/class_161$class_162; - ARG 1 requirements - METHOD method_43662 (Lnet/minecraft/class_2540;Lnet/minecraft/class_185;)V - ARG 0 buf2 - ARG 1 display - METHOD method_692 fromJson (Lcom/google/gson/JsonObject;Lnet/minecraft/class_5257;)Lnet/minecraft/class_161$class_162; - ARG 0 obj - ARG 1 predicateDeserializer + METHOD method_34884 requirements (Lnet/minecraft/class_8782;)Lnet/minecraft/class_161$class_162; + METHOD method_51698 createUntelemetered ()Lnet/minecraft/class_161$class_162; METHOD method_693 display (Lnet/minecraft/class_185;)Lnet/minecraft/class_161$class_162; ARG 1 display - METHOD method_694 build (Ljava/util/function/Consumer;Ljava/lang/String;)Lnet/minecraft/class_161; + METHOD method_694 build (Ljava/util/function/Consumer;Ljava/lang/String;)Lnet/minecraft/class_8779; ARG 1 exporter ARG 2 id - METHOD method_695 build (Lnet/minecraft/class_2960;)Lnet/minecraft/class_161; - ARG 1 id - METHOD method_696 fromPacket (Lnet/minecraft/class_2540;)Lnet/minecraft/class_161$class_162; - ARG 0 buf + METHOD method_695 build (Lnet/minecraft/class_2960;)Lnet/minecraft/class_8779; METHOD method_697 display (Lnet/minecraft/class_1935;Lnet/minecraft/class_2561;Lnet/minecraft/class_2561;Lnet/minecraft/class_2960;Lnet/minecraft/class_189;ZZZ)Lnet/minecraft/class_161$class_162; ARG 1 icon ARG 2 title @@ -79,18 +47,10 @@ CLASS net/minecraft/class_161 net/minecraft/advancement/Advancement ARG 6 showToast ARG 7 announceToChat ARG 8 hidden - METHOD method_698 toJson ()Lcom/google/gson/JsonObject; - METHOD method_699 toPacket (Lnet/minecraft/class_2540;)V - ARG 1 buf - METHOD method_700 findParent (Ljava/util/function/Function;)Z - ARG 1 parentProvider - METHOD method_701 parent (Lnet/minecraft/class_161;)Lnet/minecraft/class_161$class_162; - ARG 1 parent - METHOD method_702 (Lnet/minecraft/class_2960;)Lnet/minecraft/class_161; - ARG 0 id + METHOD method_701 parent (Lnet/minecraft/class_8779;)Lnet/minecraft/class_161$class_162; METHOD method_703 rewards (Lnet/minecraft/class_170$class_171;)Lnet/minecraft/class_161$class_162; ARG 1 builder - METHOD method_704 criteriaMerger (Lnet/minecraft/class_193;)Lnet/minecraft/class_161$class_162; + METHOD method_704 criteriaMerger (Lnet/minecraft/class_8782$net/minecraft/class_necraft/class_193;)Lnet/minecraft/class_161$class_162; ARG 1 merger METHOD method_705 criterion (Ljava/lang/String;Lnet/minecraft/class_175;)Lnet/minecraft/class_161$class_162; ARG 1 name @@ -100,7 +60,3 @@ CLASS net/minecraft/class_161 net/minecraft/advancement/Advancement METHOD method_707 create ()Lnet/minecraft/class_161$class_162; METHOD method_708 parent (Lnet/minecraft/class_2960;)Lnet/minecraft/class_161$class_162; ARG 1 parentId - METHOD method_709 criterion (Ljava/lang/String;Lnet/minecraft/class_184;)Lnet/minecraft/class_161$class_162; - ARG 1 name - ARG 2 conditions - METHOD method_710 getCriteria ()Ljava/util/Map; diff --git a/mappings/net/minecraft/advancement/AdvancementCriterion.mapping b/mappings/net/minecraft/advancement/AdvancementCriterion.mapping index 6fb03f8563..e497d8ff38 100644 --- a/mappings/net/minecraft/advancement/AdvancementCriterion.mapping +++ b/mappings/net/minecraft/advancement/AdvancementCriterion.mapping @@ -1,24 +1,10 @@ CLASS net/minecraft/class_175 net/minecraft/advancement/AdvancementCriterion - FIELD field_1214 conditions Lnet/minecraft/class_184; - METHOD (Lnet/minecraft/class_184;)V - ARG 1 conditions - METHOD method_33899 (Lnet/minecraft/class_2540;Lnet/minecraft/class_175;)V - ARG 0 buf - ARG 1 criterion - METHOD method_768 criteriaFromPacket (Lnet/minecraft/class_2540;)Ljava/util/Map; - ARG 0 buf - METHOD method_769 fromPacket (Lnet/minecraft/class_2540;)Lnet/minecraft/class_175; - ARG 0 buf + FIELD comp_1924 conditions Lnet/minecraft/class_184; + METHOD comp_1924 conditions ()Lnet/minecraft/class_184; METHOD method_770 fromJson (Lcom/google/gson/JsonObject;Lnet/minecraft/class_5257;)Lnet/minecraft/class_175; ARG 0 obj ARG 1 predicateDeserializer - METHOD method_771 toPacket (Lnet/minecraft/class_2540;)V - ARG 1 buf METHOD method_772 criteriaFromJson (Lcom/google/gson/JsonObject;Lnet/minecraft/class_5257;)Ljava/util/Map; ARG 0 obj ARG 1 predicateDeserializer METHOD method_773 toJson ()Lcom/google/gson/JsonElement; - METHOD method_774 getConditions ()Lnet/minecraft/class_184; - METHOD method_775 criteriaToPacket (Ljava/util/Map;Lnet/minecraft/class_2540;)V - ARG 0 criteria - ARG 1 buf diff --git a/mappings/net/minecraft/advancement/AdvancementDisplays.mapping b/mappings/net/minecraft/advancement/AdvancementDisplays.mapping new file mode 100644 index 0000000000..347df20801 --- /dev/null +++ b/mappings/net/minecraft/advancement/AdvancementDisplays.mapping @@ -0,0 +1,21 @@ +CLASS net/minecraft/class_8005 net/minecraft/advancement/AdvancementDisplays + FIELD field_41737 DISPLAY_DEPTH I + METHOD method_48030 shouldDisplay (Lnet/minecraft/class_8781;Lit/unimi/dsi/fastutil/Stack;Ljava/util/function/Predicate;Lnet/minecraft/class_8005$class_8006;)Z + ARG 0 advancement + ARG 1 statuses + ARG 2 donePredicate + ARG 3 consumer + METHOD method_48031 calculateDisplay (Lnet/minecraft/class_8781;Ljava/util/function/Predicate;Lnet/minecraft/class_8005$class_8006;)V + ARG 0 advancement + ARG 1 donePredicate + ARG 2 consumer + METHOD method_48032 getStatus (Lnet/minecraft/class_161;Z)Lnet/minecraft/class_8005$class_8007; + ARG 0 advancement + ARG 1 force + METHOD method_48033 shouldDisplay (Lit/unimi/dsi/fastutil/Stack;)Z + ARG 0 statuses + CLASS class_8006 ResultConsumer + METHOD accept (Lnet/minecraft/class_8781;Z)V + ARG 1 advancement + ARG 2 shouldDisplay + CLASS class_8007 Status diff --git a/mappings/net/minecraft/advancement/AdvancementFrame.mapping b/mappings/net/minecraft/advancement/AdvancementFrame.mapping index 516925ad1e..745946d9ac 100644 --- a/mappings/net/minecraft/advancement/AdvancementFrame.mapping +++ b/mappings/net/minecraft/advancement/AdvancementFrame.mapping @@ -1,15 +1,12 @@ CLASS net/minecraft/class_189 net/minecraft/advancement/AdvancementFrame FIELD field_1251 id Ljava/lang/String; - FIELD field_1252 textureV I FIELD field_1255 titleFormat Lnet/minecraft/class_124; FIELD field_26386 toastText Lnet/minecraft/class_2561; - METHOD (Ljava/lang/String;ILjava/lang/String;ILnet/minecraft/class_124;)V + METHOD (Ljava/lang/String;ILjava/lang/String;Lnet/minecraft/class_124;)V ARG 3 id - ARG 4 texV - ARG 5 titleFormat + ARG 4 titleFormat METHOD method_30756 getToastText ()Lnet/minecraft/class_2561; METHOD method_830 getTitleFormat ()Lnet/minecraft/class_124; METHOD method_831 getId ()Ljava/lang/String; - METHOD method_832 getTextureV ()I METHOD method_833 forName (Ljava/lang/String;)Lnet/minecraft/class_189; ARG 0 name diff --git a/mappings/net/minecraft/advancement/AdvancementManager.mapping b/mappings/net/minecraft/advancement/AdvancementManager.mapping index 17636a8541..e4a6bad38d 100644 --- a/mappings/net/minecraft/advancement/AdvancementManager.mapping +++ b/mappings/net/minecraft/advancement/AdvancementManager.mapping @@ -4,26 +4,22 @@ CLASS net/minecraft/class_163 net/minecraft/advancement/AdvancementManager FIELD field_1156 dependents Ljava/util/Set; FIELD field_1157 advancements Ljava/util/Map; FIELD field_1158 LOGGER Lorg/slf4j/Logger; - METHOD method_711 load (Ljava/util/Map;)V - ARG 1 advancements - METHOD method_712 getAdvancements ()Ljava/util/Collection; METHOD method_713 removeAll (Ljava/util/Set;)V ARG 1 advancements METHOD method_714 clear ()V METHOD method_715 getRoots ()Ljava/lang/Iterable; - METHOD method_716 get (Lnet/minecraft/class_2960;)Lnet/minecraft/class_161; + METHOD method_716 get (Lnet/minecraft/class_2960;)Lnet/minecraft/class_8781; ARG 1 id METHOD method_717 setListener (Lnet/minecraft/class_163$class_164;)V ARG 1 listener - METHOD method_718 remove (Lnet/minecraft/class_161;)V - ARG 1 advancement + METHOD method_718 remove (Lnet/minecraft/class_8781;)V CLASS class_164 Listener - METHOD method_719 onDependentRemoved (Lnet/minecraft/class_161;)V + METHOD method_719 onDependentRemoved (Lnet/minecraft/class_8781;)V ARG 1 dependent - METHOD method_720 onRootRemoved (Lnet/minecraft/class_161;)V + METHOD method_720 onRootRemoved (Lnet/minecraft/class_8781;)V ARG 1 root - METHOD method_721 onDependentAdded (Lnet/minecraft/class_161;)V + METHOD method_721 onDependentAdded (Lnet/minecraft/class_8781;)V ARG 1 dependent METHOD method_722 onClear ()V - METHOD method_723 onRootAdded (Lnet/minecraft/class_161;)V + METHOD method_723 onRootAdded (Lnet/minecraft/class_8781;)V ARG 1 root diff --git a/mappings/net/minecraft/advancement/AdvancementPositioner.mapping b/mappings/net/minecraft/advancement/AdvancementPositioner.mapping index 46bbaa5575..d734199237 100644 --- a/mappings/net/minecraft/advancement/AdvancementPositioner.mapping +++ b/mappings/net/minecraft/advancement/AdvancementPositioner.mapping @@ -4,12 +4,11 @@ CLASS net/minecraft/class_194 net/minecraft/advancement/AdvancementPositioner FIELD field_1260 previousSibling Lnet/minecraft/class_194; FIELD field_1261 childrenSize I FIELD field_1262 optionalLast Lnet/minecraft/class_194; - FIELD field_1263 advancement Lnet/minecraft/class_161; FIELD field_1264 substituteChild Lnet/minecraft/class_194; FIELD field_1267 children Ljava/util/List; FIELD field_1268 relativeRowInSiblings F FIELD field_1269 row F - METHOD (Lnet/minecraft/class_161;Lnet/minecraft/class_194;Lnet/minecraft/class_194;II)V + METHOD (Lnet/minecraft/class_8781;Lnet/minecraft/class_194;Lnet/minecraft/class_194;II)V ARG 1 advancement ARG 2 parent ARG 3 previousSibling @@ -25,7 +24,7 @@ CLASS net/minecraft/class_194 net/minecraft/advancement/AdvancementPositioner ARG 1 deltaRow 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; + METHOD method_846 findChildrenRecursively (Lnet/minecraft/class_8781;Lnet/minecraft/class_194;)Lnet/minecraft/class_194; ARG 1 advancement ARG 2 lastChild METHOD method_847 calculateRecursively ()V @@ -35,5 +34,5 @@ CLASS net/minecraft/class_194 net/minecraft/advancement/AdvancementPositioner METHOD method_849 getFirstChild ()Lnet/minecraft/class_194; METHOD method_850 onFinishChildrenCalculation ()V METHOD method_851 apply ()V - METHOD method_852 arrangeForTree (Lnet/minecraft/class_161;)V + METHOD method_852 arrangeForTree (Lnet/minecraft/class_8781;)V ARG 0 root diff --git a/mappings/net/minecraft/advancement/AdvancementProgress.mapping b/mappings/net/minecraft/advancement/AdvancementProgress.mapping index 8e20bc6d76..f467c326d6 100644 --- a/mappings/net/minecraft/advancement/AdvancementProgress.mapping +++ b/mappings/net/minecraft/advancement/AdvancementProgress.mapping @@ -1,16 +1,14 @@ CLASS net/minecraft/class_167 net/minecraft/advancement/AdvancementProgress FIELD field_1160 criteriaProgresses Ljava/util/Map; - FIELD field_1161 requirements [[Ljava/lang/String; + FIELD field_1161 requirements Lnet/minecraft/class_8782; METHOD (Ljava/util/Map;)V ARG 1 criteriaProgresses METHOD compareTo (Ljava/lang/Object;)I ARG 1 other METHOD method_33895 (Lnet/minecraft/class_2540;Lnet/minecraft/class_178;)V - ARG 0 buf + ARG 0 bufx ARG 1 progresses - METHOD method_727 init (Ljava/util/Map;[[Ljava/lang/String;)V - ARG 1 criteria - ARG 2 requirements + METHOD method_727 init (Lnet/minecraft/class_8782;)V METHOD method_728 getProgressBarFraction ()Ljava/lang/String; METHOD method_729 reset (Ljava/lang/String;)Z ARG 1 name @@ -27,16 +25,7 @@ CLASS net/minecraft/class_167 net/minecraft/advancement/AdvancementProgress METHOD method_737 getCriterionProgress (Ljava/lang/String;)Lnet/minecraft/class_178; ARG 1 name METHOD method_740 isDone ()Z - METHOD method_741 getEarliestProgressObtainDate ()Ljava/util/Date; + METHOD method_741 getEarliestProgressObtainDate ()Ljava/time/Instant; METHOD method_742 isAnyObtained ()Z METHOD method_743 obtain (Ljava/lang/String;)Z ARG 1 name - CLASS class_168 Serializer - METHOD deserialize (Lcom/google/gson/JsonElement;Ljava/lang/reflect/Type;Lcom/google/gson/JsonDeserializationContext;)Ljava/lang/Object; - ARG 1 functionJson - ARG 2 unused - ARG 3 context - METHOD serialize (Ljava/lang/Object;Ljava/lang/reflect/Type;Lcom/google/gson/JsonSerializationContext;)Lcom/google/gson/JsonElement; - ARG 1 entry - ARG 2 unused - ARG 3 context diff --git a/mappings/net/minecraft/advancement/CriterionMerger.mapping b/mappings/net/minecraft/advancement/CriterionMerger.mapping deleted file mode 100644 index 8bd183eab4..0000000000 --- a/mappings/net/minecraft/advancement/CriterionMerger.mapping +++ /dev/null @@ -1,9 +0,0 @@ -CLASS net/minecraft/class_193 net/minecraft/advancement/CriterionMerger - FIELD field_1257 OR Lnet/minecraft/class_193; - FIELD field_16882 AND Lnet/minecraft/class_193; - METHOD createRequirements (Ljava/util/Collection;)[[Ljava/lang/String; - ARG 1 criteriaNames - METHOD method_16773 (Ljava/util/Collection;)[[Ljava/lang/String; - ARG 0 criteriaNames - METHOD method_16774 (Ljava/util/Collection;)[[Ljava/lang/String; - ARG 0 criteriaNames diff --git a/mappings/net/minecraft/advancement/PlayerAdvancementTracker.mapping b/mappings/net/minecraft/advancement/PlayerAdvancementTracker.mapping index 62efde9664..0fa78ece30 100644 --- a/mappings/net/minecraft/advancement/PlayerAdvancementTracker.mapping +++ b/mappings/net/minecraft/advancement/PlayerAdvancementTracker.mapping @@ -1,59 +1,54 @@ CLASS net/minecraft/class_2985 net/minecraft/advancement/PlayerAdvancementTracker - FIELD field_13386 visibilityUpdates Ljava/util/Set; - FIELD field_13387 currentDisplayTab Lnet/minecraft/class_161; + FIELD field_13387 currentDisplayTab Lnet/minecraft/class_8779; FIELD field_13388 progressUpdates Ljava/util/Set; - FIELD field_13389 advancementToProgress Ljava/util/Map; FIELD field_13390 visibleAdvancements Ljava/util/Set; FIELD field_13391 owner Lnet/minecraft/class_3222; - FIELD field_13392 JSON_TYPE Lcom/google/gson/reflect/TypeToken; - FIELD field_13393 advancementFile Ljava/io/File; FIELD field_13394 LOGGER Lorg/slf4j/Logger; FIELD field_13395 GSON Lcom/google/gson/Gson; FIELD field_13396 dirty Z - FIELD field_25324 dataFixer Lcom/mojang/datafixers/DataFixer; FIELD field_25325 playerManager Lnet/minecraft/class_3324; - FIELD field_33383 MAX_VISIBLE_CHILDREN I - METHOD (Lcom/mojang/datafixers/DataFixer;Lnet/minecraft/class_3324;Lnet/minecraft/class_2989;Ljava/io/File;Lnet/minecraft/class_3222;)V - ARG 1 dataFixer - ARG 2 playerManager - ARG 3 advancementLoader - ARG 4 advancementFile - ARG 5 owner + FIELD field_41734 filePath Ljava/nio/file/Path; + FIELD field_41735 progress Ljava/util/Map; + FIELD field_41736 updatedRoots Ljava/util/Set; METHOD method_12872 rewardEmptyAdvancements (Lnet/minecraft/class_2989;)V ARG 1 advancementLoader METHOD method_12873 load (Lnet/minecraft/class_2989;)V ARG 1 advancementLoader - METHOD method_12874 beginTracking (Lnet/minecraft/class_161;)V + METHOD method_12874 beginTracking (Lnet/minecraft/class_8779;)V ARG 1 advancement METHOD method_12875 setOwner (Lnet/minecraft/class_3222;)V ARG 1 owner METHOD method_12876 sendUpdate (Lnet/minecraft/class_3222;)V ARG 1 player - METHOD method_12877 hasChildrenDone (Lnet/minecraft/class_161;)Z - ARG 1 advancement - METHOD method_12878 grantCriterion (Lnet/minecraft/class_161;Ljava/lang/String;)Z + METHOD method_12878 grantCriterion (Lnet/minecraft/class_8779;Ljava/lang/String;)Z ARG 1 advancement ARG 2 criterionName - METHOD method_12879 canSee (Lnet/minecraft/class_161;)Z - ARG 1 advancement - METHOD method_12880 endTrackingCompleted (Lnet/minecraft/class_161;)V + METHOD method_12880 endTrackingCompleted (Lnet/minecraft/class_8779;)V ARG 1 advancement METHOD method_12881 clearCriteria ()V - METHOD method_12882 getProgress (Lnet/minecraft/class_161;)Lnet/minecraft/class_167; + METHOD method_12882 getProgress (Lnet/minecraft/class_8779;)Lnet/minecraft/class_167; ARG 1 advancement - METHOD method_12883 revokeCriterion (Lnet/minecraft/class_161;Ljava/lang/String;)Z + METHOD method_12883 revokeCriterion (Lnet/minecraft/class_8779;Ljava/lang/String;)Z ARG 1 advancement ARG 2 criterionName - METHOD method_12884 initProgress (Lnet/minecraft/class_161;Lnet/minecraft/class_167;)V + METHOD method_12884 initProgress (Lnet/minecraft/class_8779;Lnet/minecraft/class_167;)V ARG 1 advancement ARG 2 progress - METHOD method_12885 updateDisplay (Lnet/minecraft/class_161;)V - ARG 1 advancement METHOD method_12886 reload (Lnet/minecraft/class_2989;)V ARG 1 advancementLoader - METHOD method_12887 updateCompleted ()V - METHOD method_12888 setDisplayTab (Lnet/minecraft/class_161;)V + METHOD method_12888 setDisplayTab (Lnet/minecraft/class_8779;)V ARG 1 advancement METHOD method_12889 beginTrackingAllAdvancements (Lnet/minecraft/class_2989;)V ARG 1 advancementLoader METHOD method_12890 save ()V + METHOD method_48025 calculateDisplay (Lnet/minecraft/class_8781;Ljava/util/Set;Ljava/util/Set;)V + ARG 1 root + ARG 2 added + ARG 3 removed + METHOD method_48027 (Ljava/util/Set;Ljava/util/Set;Lnet/minecraft/class_8781;Z)V + ARG 3 advancement + ARG 4 displayed + METHOD method_48028 onStatusUpdate (Lnet/minecraft/class_8779;)V + ARG 1 advancement + METHOD method_48029 (Lnet/minecraft/class_8781;)Z + ARG 1 advancement diff --git a/mappings/net/minecraft/advancement/criterion/AbstractCriterion.mapping b/mappings/net/minecraft/advancement/criterion/AbstractCriterion.mapping index d88d4e87ed..998a6fa8e5 100644 --- a/mappings/net/minecraft/advancement/criterion/AbstractCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/AbstractCriterion.mapping @@ -4,8 +4,8 @@ CLASS net/minecraft/class_4558 net/minecraft/advancement/criterion/AbstractCrite ARG 1 player ARG 2 predicate METHOD method_22512 (Lnet/minecraft/class_2985;)Ljava/util/Set; - ARG 0 manager - METHOD method_27854 conditionsFromJson (Lcom/google/gson/JsonObject;Lnet/minecraft/class_2048$class_5258;Lnet/minecraft/class_5257;)Lnet/minecraft/class_195; + ARG 0 managerx + METHOD method_27854 conditionsFromJson (Lcom/google/gson/JsonObject;Ljava/util/Optional;Lnet/minecraft/class_5257;)Lnet/minecraft/class_4558$class_8788; ARG 1 obj - ARG 2 playerPredicate + ARG 2 predicate ARG 3 predicateDeserializer diff --git a/mappings/net/minecraft/advancement/criterion/AbstractCriterionConditions.mapping b/mappings/net/minecraft/advancement/criterion/AbstractCriterionConditions.mapping index 2daf63b552..1f9f06edd7 100644 --- a/mappings/net/minecraft/advancement/criterion/AbstractCriterionConditions.mapping +++ b/mappings/net/minecraft/advancement/criterion/AbstractCriterionConditions.mapping @@ -1,7 +1,2 @@ CLASS net/minecraft/class_195 net/minecraft/advancement/criterion/AbstractCriterionConditions - FIELD field_1270 id Lnet/minecraft/class_2960; - FIELD field_24381 playerPredicate Lnet/minecraft/class_2048$class_5258; - METHOD (Lnet/minecraft/class_2960;Lnet/minecraft/class_2048$class_5258;)V - ARG 1 id - ARG 2 entity - METHOD method_27790 getPlayerPredicate ()Lnet/minecraft/class_2048$class_5258; + FIELD field_24381 playerPredicate Ljava/util/Optional; diff --git a/mappings/net/minecraft/advancement/criterion/BeeNestDestroyedCriterion.mapping b/mappings/net/minecraft/advancement/criterion/BeeNestDestroyedCriterion.mapping index f19c53816a..27eba3bcd1 100644 --- a/mappings/net/minecraft/advancement/criterion/BeeNestDestroyedCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/BeeNestDestroyedCriterion.mapping @@ -1,5 +1,4 @@ CLASS net/minecraft/class_4708 net/minecraft/advancement/criterion/BeeNestDestroyedCriterion - FIELD field_21568 ID Lnet/minecraft/class_2960; METHOD method_23872 (Lnet/minecraft/class_2680;Lnet/minecraft/class_1799;ILnet/minecraft/class_4708$class_4709;)Z ARG 3 conditions METHOD method_23873 getBlock (Lcom/google/gson/JsonObject;)Lnet/minecraft/class_2248; @@ -11,10 +10,10 @@ CLASS net/minecraft/class_4708 net/minecraft/advancement/criterion/BeeNestDestro ARG 4 beeCount CLASS class_4709 Conditions FIELD field_21569 block Lnet/minecraft/class_2248; - FIELD field_21570 item Lnet/minecraft/class_2073; + FIELD field_21570 item Ljava/util/Optional; FIELD field_21571 beeCount Lnet/minecraft/class_2096$class_2100; - METHOD (Lnet/minecraft/class_2048$class_5258;Lnet/minecraft/class_2248;Lnet/minecraft/class_2073;Lnet/minecraft/class_2096$class_2100;)V - ARG 1 player + METHOD (Ljava/util/Optional;Lnet/minecraft/class_2248;Ljava/util/Optional;Lnet/minecraft/class_2096$class_2100;)V + ARG 1 playerPredicate ARG 2 block ARG 3 item ARG 4 beeCount @@ -22,7 +21,9 @@ CLASS net/minecraft/class_4708 net/minecraft/advancement/criterion/BeeNestDestro ARG 1 state ARG 2 stack ARG 3 count - METHOD method_23879 create (Lnet/minecraft/class_2248;Lnet/minecraft/class_2073$class_2074;Lnet/minecraft/class_2096$class_2100;)Lnet/minecraft/class_4708$class_4709; + METHOD method_23879 create (Lnet/minecraft/class_2248;Lnet/minecraft/class_2073$class_2074;Lnet/minecraft/class_2096$class_2100;)Lnet/minecraft/class_175; ARG 0 block ARG 1 itemPredicateBuilder ARG 2 beeCountRange + METHOD method_53070 (Lcom/google/gson/JsonObject;Lnet/minecraft/class_2073;)V + ARG 1 item diff --git a/mappings/net/minecraft/advancement/criterion/BredAnimalsCriterion.mapping b/mappings/net/minecraft/advancement/criterion/BredAnimalsCriterion.mapping index 05d7ae120d..1b347a2c4e 100644 --- a/mappings/net/minecraft/advancement/criterion/BredAnimalsCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/BredAnimalsCriterion.mapping @@ -1,5 +1,4 @@ CLASS net/minecraft/class_196 net/minecraft/advancement/criterion/BredAnimalsCriterion - FIELD field_1271 ID Lnet/minecraft/class_2960; METHOD method_22455 (Lnet/minecraft/class_47;Lnet/minecraft/class_47;Lnet/minecraft/class_47;Lnet/minecraft/class_196$class_198;)Z ARG 3 conditions METHOD method_855 trigger (Lnet/minecraft/class_3222;Lnet/minecraft/class_1429;Lnet/minecraft/class_1429;Lnet/minecraft/class_1296;)V @@ -8,20 +7,23 @@ CLASS net/minecraft/class_196 net/minecraft/advancement/criterion/BredAnimalsCri 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; - FIELD field_1277 partner Lnet/minecraft/class_2048$class_5258; - METHOD (Lnet/minecraft/class_2048$class_5258;Lnet/minecraft/class_2048$class_5258;Lnet/minecraft/class_2048$class_5258;Lnet/minecraft/class_2048$class_5258;)V - ARG 1 player - ARG 2 parent - ARG 3 partner - ARG 4 child - METHOD method_29918 create (Lnet/minecraft/class_2048;Lnet/minecraft/class_2048;Lnet/minecraft/class_2048;)Lnet/minecraft/class_196$class_198; + FIELD field_1275 child Ljava/util/Optional; + FIELD field_1276 parent Ljava/util/Optional; + FIELD field_1277 partner Ljava/util/Optional; + METHOD (Ljava/util/Optional;Ljava/util/Optional;Ljava/util/Optional;Ljava/util/Optional;)V + ARG 1 playerPredicate + ARG 2 parentPredicate + ARG 3 partnerPredicate + ARG 4 childPredicate + METHOD method_29918 create (Ljava/util/Optional;Ljava/util/Optional;Ljava/util/Optional;)Lnet/minecraft/class_175; ARG 0 parent ARG 1 partner ARG 2 child - METHOD method_860 any ()Lnet/minecraft/class_196$class_198; - METHOD method_861 create (Lnet/minecraft/class_2048$class_2049;)Lnet/minecraft/class_196$class_198; + METHOD method_53075 parentMatches (Ljava/util/Optional;Lnet/minecraft/class_47;)Z + ARG 0 parent + ARG 1 parentContext + METHOD method_860 any ()Lnet/minecraft/class_175; + METHOD method_861 create (Lnet/minecraft/class_2048$class_2049;)Lnet/minecraft/class_175; ARG 0 child METHOD method_862 matches (Lnet/minecraft/class_47;Lnet/minecraft/class_47;Lnet/minecraft/class_47;)Z ARG 1 parentContext diff --git a/mappings/net/minecraft/advancement/criterion/BrewedPotionCriterion.mapping b/mappings/net/minecraft/advancement/criterion/BrewedPotionCriterion.mapping index b33feef19a..2ef25117c1 100644 --- a/mappings/net/minecraft/advancement/criterion/BrewedPotionCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/BrewedPotionCriterion.mapping @@ -1,5 +1,4 @@ CLASS net/minecraft/class_1996 net/minecraft/advancement/criterion/BrewedPotionCriterion - FIELD field_9488 ID Lnet/minecraft/class_2960; METHOD method_22456 (Lnet/minecraft/class_1842;Lnet/minecraft/class_1996$class_1998;)Z ARG 1 conditions METHOD method_8784 trigger (Lnet/minecraft/class_3222;Lnet/minecraft/class_1842;)V @@ -7,9 +6,9 @@ CLASS net/minecraft/class_1996 net/minecraft/advancement/criterion/BrewedPotionC ARG 2 potion CLASS class_1998 Conditions FIELD field_9492 potion Lnet/minecraft/class_1842; - METHOD (Lnet/minecraft/class_2048$class_5258;Lnet/minecraft/class_1842;)V - ARG 1 player + METHOD (Ljava/util/Optional;Lnet/minecraft/class_1842;)V + ARG 1 playerPredicate ARG 2 potion METHOD method_8790 matches (Lnet/minecraft/class_1842;)Z ARG 1 potion - METHOD method_8791 any ()Lnet/minecraft/class_1996$class_1998; + METHOD method_8791 any ()Lnet/minecraft/class_175; diff --git a/mappings/net/minecraft/advancement/criterion/ChangedDimensionCriterion.mapping b/mappings/net/minecraft/advancement/criterion/ChangedDimensionCriterion.mapping index 592618dd8f..bfd127d61a 100644 --- a/mappings/net/minecraft/advancement/criterion/ChangedDimensionCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/ChangedDimensionCriterion.mapping @@ -1,5 +1,4 @@ CLASS net/minecraft/class_1999 net/minecraft/advancement/criterion/ChangedDimensionCriterion - FIELD field_9493 ID Lnet/minecraft/class_2960; METHOD method_22457 (Lnet/minecraft/class_5321;Lnet/minecraft/class_5321;Lnet/minecraft/class_1999$class_2001;)Z ARG 2 conditions METHOD method_8794 trigger (Lnet/minecraft/class_3222;Lnet/minecraft/class_5321;Lnet/minecraft/class_5321;)V @@ -9,17 +8,17 @@ CLASS net/minecraft/class_1999 net/minecraft/advancement/criterion/ChangedDimens CLASS class_2001 Conditions FIELD field_9497 from Lnet/minecraft/class_5321; FIELD field_9498 to Lnet/minecraft/class_5321; - METHOD (Lnet/minecraft/class_2048$class_5258;Lnet/minecraft/class_5321;Lnet/minecraft/class_5321;)V - ARG 1 player + METHOD (Ljava/util/Optional;Lnet/minecraft/class_5321;Lnet/minecraft/class_5321;)V + ARG 1 playerPredicate ARG 2 from ARG 3 to - METHOD method_35068 create (Lnet/minecraft/class_5321;Lnet/minecraft/class_5321;)Lnet/minecraft/class_1999$class_2001; + METHOD method_35068 create (Lnet/minecraft/class_5321;Lnet/minecraft/class_5321;)Lnet/minecraft/class_175; ARG 0 from ARG 1 to - METHOD method_35069 from (Lnet/minecraft/class_5321;)Lnet/minecraft/class_1999$class_2001; + METHOD method_35069 from (Lnet/minecraft/class_5321;)Lnet/minecraft/class_175; ARG 0 from - METHOD method_35070 create ()Lnet/minecraft/class_1999$class_2001; - METHOD method_8799 to (Lnet/minecraft/class_5321;)Lnet/minecraft/class_1999$class_2001; + METHOD method_35070 create ()Lnet/minecraft/class_175; + METHOD method_8799 to (Lnet/minecraft/class_5321;)Lnet/minecraft/class_175; ARG 0 to METHOD method_8800 matches (Lnet/minecraft/class_5321;Lnet/minecraft/class_5321;)Z ARG 1 from diff --git a/mappings/net/minecraft/advancement/criterion/ChanneledLightningCriterion.mapping b/mappings/net/minecraft/advancement/criterion/ChanneledLightningCriterion.mapping index 62f0796f32..8f8c593baa 100644 --- a/mappings/net/minecraft/advancement/criterion/ChanneledLightningCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/ChanneledLightningCriterion.mapping @@ -1,5 +1,4 @@ CLASS net/minecraft/class_2002 net/minecraft/advancement/criterion/ChanneledLightningCriterion - FIELD field_9499 ID Lnet/minecraft/class_2960; METHOD method_22458 (Ljava/util/List;Lnet/minecraft/class_2002$class_2004;)Z ARG 1 conditions METHOD method_27791 (Lnet/minecraft/class_3222;Lnet/minecraft/class_1297;)Lnet/minecraft/class_47; @@ -8,11 +7,11 @@ CLASS net/minecraft/class_2002 net/minecraft/advancement/criterion/ChanneledLigh ARG 1 player ARG 2 victims CLASS class_2004 Conditions - FIELD field_9503 victims [Lnet/minecraft/class_2048$class_5258; - METHOD (Lnet/minecraft/class_2048$class_5258;[Lnet/minecraft/class_2048$class_5258;)V - ARG 1 player + FIELD field_9503 victims Ljava/util/List; + METHOD (Ljava/util/Optional;Ljava/util/List;)V + ARG 1 playerPredicate ARG 2 victims METHOD method_8808 matches (Ljava/util/Collection;)Z ARG 1 victims - METHOD method_8809 create ([Lnet/minecraft/class_2048;)Lnet/minecraft/class_2002$class_2004; + METHOD method_8809 create ([Lnet/minecraft/class_2048$class_2049;)Lnet/minecraft/class_175; ARG 0 victims diff --git a/mappings/net/minecraft/advancement/criterion/ConstructBeaconCriterion.mapping b/mappings/net/minecraft/advancement/criterion/ConstructBeaconCriterion.mapping index c01d0e4ea6..1a40c76733 100644 --- a/mappings/net/minecraft/advancement/criterion/ConstructBeaconCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/ConstructBeaconCriterion.mapping @@ -1,5 +1,4 @@ CLASS net/minecraft/class_2006 net/minecraft/advancement/criterion/ConstructBeaconCriterion - FIELD field_9504 ID Lnet/minecraft/class_2960; METHOD method_22459 (ILnet/minecraft/class_2006$class_2008;)Z ARG 1 conditions METHOD method_8812 trigger (Lnet/minecraft/class_3222;I)V @@ -7,11 +6,11 @@ CLASS net/minecraft/class_2006 net/minecraft/advancement/criterion/ConstructBeac ARG 2 level CLASS class_2008 Conditions FIELD field_9508 level Lnet/minecraft/class_2096$class_2100; - METHOD (Lnet/minecraft/class_2048$class_5258;Lnet/minecraft/class_2096$class_2100;)V - ARG 1 player + METHOD (Ljava/util/Optional;Lnet/minecraft/class_2096$class_2100;)V + ARG 1 playerPredicate ARG 2 level - METHOD method_35110 create ()Lnet/minecraft/class_2006$class_2008; + METHOD method_35110 create ()Lnet/minecraft/class_175; METHOD method_8817 matches (I)Z ARG 1 level - METHOD method_8818 level (Lnet/minecraft/class_2096$class_2100;)Lnet/minecraft/class_2006$class_2008; + METHOD method_8818 level (Lnet/minecraft/class_2096$class_2100;)Lnet/minecraft/class_175; ARG 0 level diff --git a/mappings/net/minecraft/advancement/criterion/ConsumeItemCriterion.mapping b/mappings/net/minecraft/advancement/criterion/ConsumeItemCriterion.mapping index b7aad6ae5e..2b1d24042e 100644 --- a/mappings/net/minecraft/advancement/criterion/ConsumeItemCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/ConsumeItemCriterion.mapping @@ -1,19 +1,17 @@ CLASS net/minecraft/class_2010 net/minecraft/advancement/criterion/ConsumeItemCriterion - FIELD field_9509 ID Lnet/minecraft/class_2960; METHOD method_22460 (Lnet/minecraft/class_1799;Lnet/minecraft/class_2010$class_2012;)Z ARG 1 conditions METHOD method_8821 trigger (Lnet/minecraft/class_3222;Lnet/minecraft/class_1799;)V ARG 1 player ARG 2 stack CLASS class_2012 Conditions - FIELD field_9513 item Lnet/minecraft/class_2073; - METHOD (Lnet/minecraft/class_2048$class_5258;Lnet/minecraft/class_2073;)V - ARG 1 player + FIELD field_9513 item Ljava/util/Optional; + METHOD (Ljava/util/Optional;Ljava/util/Optional;)V + ARG 1 playerPredicate ARG 2 item - METHOD method_35112 predicate (Lnet/minecraft/class_2073;)Lnet/minecraft/class_2010$class_2012; - ARG 0 predicate + METHOD method_35112 predicate (Lnet/minecraft/class_2073$class_2074;)Lnet/minecraft/class_175; METHOD method_8826 matches (Lnet/minecraft/class_1799;)Z ARG 1 stack - METHOD method_8827 any ()Lnet/minecraft/class_2010$class_2012; - METHOD method_8828 item (Lnet/minecraft/class_1935;)Lnet/minecraft/class_2010$class_2012; + METHOD method_8827 any ()Lnet/minecraft/class_175; + METHOD method_8828 item (Lnet/minecraft/class_1935;)Lnet/minecraft/class_175; ARG 0 item diff --git a/mappings/net/minecraft/advancement/criterion/Criteria.mapping b/mappings/net/minecraft/advancement/criterion/Criteria.mapping index 6222463095..3c40b84408 100644 --- a/mappings/net/minecraft/advancement/criterion/Criteria.mapping +++ b/mappings/net/minecraft/advancement/criterion/Criteria.mapping @@ -10,7 +10,7 @@ CLASS net/minecraft/class_174 net/minecraft/advancement/criterion/Criteria FIELD field_1188 ENTITY_KILLED_PLAYER Lnet/minecraft/class_2080; FIELD field_1189 CONSTRUCT_BEACON Lnet/minecraft/class_2006; FIELD field_1190 BRED_ANIMALS Lnet/minecraft/class_196; - FIELD field_1191 PLACED_BLOCK Lnet/minecraft/class_2111; + FIELD field_1191 PLACED_BLOCK Lnet/minecraft/class_4711; FIELD field_1192 PLAYER_KILLED_ENTITY Lnet/minecraft/class_2080; FIELD field_1193 EFFECTS_CHANGED Lnet/minecraft/class_2027; FIELD field_1194 LOCATION Lnet/minecraft/class_2135; @@ -24,7 +24,7 @@ CLASS net/minecraft/class_174 net/minecraft/advancement/criterion/Criteria FIELD field_1202 CHANNELED_LIGHTNING Lnet/minecraft/class_2002; FIELD field_1203 FISHING_ROD_HOOKED Lnet/minecraft/class_2058; FIELD field_1204 USED_TOTEM Lnet/minecraft/class_2148; - FIELD field_1205 VALUES Ljava/util/Map; + FIELD field_1205 VALUES Lcom/google/common/collect/BiMap; FIELD field_1206 VILLAGER_TRADE Lnet/minecraft/class_2140; FIELD field_1207 RECIPE_UNLOCKED Lnet/minecraft/class_2119; FIELD field_1208 FILLED_BUCKET Lnet/minecraft/class_2054; @@ -51,8 +51,8 @@ CLASS net/minecraft/class_174 net/minecraft/advancement/criterion/Criteria FIELD field_38700 THROWN_ITEM_PICKED_UP_BY_PLAYER Lnet/minecraft/class_5279; FIELD field_38701 ALLAY_DROP_ITEM_ON_BLOCK Lnet/minecraft/class_4711; FIELD field_38838 AVOID_VIBRATION Lnet/minecraft/class_2135; + FIELD field_44587 RECIPE_CRAFTED Lnet/minecraft/class_8508; METHOD method_765 getById (Lnet/minecraft/class_2960;)Lnet/minecraft/class_179; ARG 0 id METHOD method_766 getCriteria ()Ljava/lang/Iterable; - METHOD method_767 register (Lnet/minecraft/class_179;)Lnet/minecraft/class_179; - ARG 0 object + METHOD method_767 register (Ljava/lang/String;Lnet/minecraft/class_179;)Lnet/minecraft/class_179; diff --git a/mappings/net/minecraft/advancement/criterion/Criterion.mapping b/mappings/net/minecraft/advancement/criterion/Criterion.mapping index f9655a027b..8c890f1806 100644 --- a/mappings/net/minecraft/advancement/criterion/Criterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/Criterion.mapping @@ -7,20 +7,20 @@ CLASS net/minecraft/class_179 net/minecraft/advancement/criterion/Criterion 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 ARG 2 predicateDeserializer CLASS class_180 ConditionsContainer - FIELD field_1221 id Ljava/lang/String; - FIELD field_1222 advancement Lnet/minecraft/class_161; - FIELD field_1223 conditions Lnet/minecraft/class_184; - METHOD (Lnet/minecraft/class_184;Lnet/minecraft/class_161;Ljava/lang/String;)V + FIELD comp_1925 conditions Lnet/minecraft/class_184; + FIELD comp_1926 advancement Lnet/minecraft/class_8779; + FIELD comp_1927 id Ljava/lang/String; + METHOD (Lnet/minecraft/class_184;Lnet/minecraft/class_8779;Ljava/lang/String;)V ARG 1 conditions - ARG 2 advancement ARG 3 id + METHOD comp_1925 conditions ()Lnet/minecraft/class_184; + METHOD comp_1926 advancement ()Lnet/minecraft/class_8779; + METHOD comp_1927 id ()Ljava/lang/String; METHOD equals (Ljava/lang/Object;)Z ARG 1 o METHOD method_796 grant (Lnet/minecraft/class_2985;)V ARG 1 tracker - METHOD method_797 getConditions ()Lnet/minecraft/class_184; diff --git a/mappings/net/minecraft/advancement/criterion/CriterionConditions.mapping b/mappings/net/minecraft/advancement/criterion/CriterionConditions.mapping index f40987c768..10b654019f 100644 --- a/mappings/net/minecraft/advancement/criterion/CriterionConditions.mapping +++ b/mappings/net/minecraft/advancement/criterion/CriterionConditions.mapping @@ -1,4 +1,2 @@ CLASS net/minecraft/class_184 net/minecraft/advancement/criterion/CriterionConditions - METHOD method_806 getId ()Lnet/minecraft/class_2960; - METHOD method_807 toJson (Lnet/minecraft/class_5267;)Lcom/google/gson/JsonObject; - ARG 1 predicateSerializer + METHOD method_807 toJson ()Lcom/google/gson/JsonObject; diff --git a/mappings/net/minecraft/advancement/criterion/CriterionProgress.mapping b/mappings/net/minecraft/advancement/criterion/CriterionProgress.mapping index a338e4a620..3219d539df 100644 --- a/mappings/net/minecraft/advancement/criterion/CriterionProgress.mapping +++ b/mappings/net/minecraft/advancement/criterion/CriterionProgress.mapping @@ -1,14 +1,10 @@ CLASS net/minecraft/class_178 net/minecraft/advancement/criterion/CriterionProgress - FIELD field_1219 obtainedDate Ljava/util/Date; - FIELD field_1220 FORMAT Ljava/text/SimpleDateFormat; - METHOD method_783 toJson ()Lcom/google/gson/JsonElement; + FIELD field_1219 obtainedDate Ljava/time/Instant; METHOD method_784 isObtained ()Z METHOD method_785 fromPacket (Lnet/minecraft/class_2540;)Lnet/minecraft/class_178; ARG 0 buf - METHOD method_786 getObtainedDate ()Ljava/util/Date; + METHOD method_786 getObtainedDate ()Ljava/time/Instant; METHOD method_787 toPacket (Lnet/minecraft/class_2540;)V ARG 1 buf - METHOD method_788 obtainedAt (Ljava/lang/String;)Lnet/minecraft/class_178; - ARG 0 datetime METHOD method_789 obtain ()V METHOD method_790 reset ()V diff --git a/mappings/net/minecraft/advancement/criterion/CuredZombieVillagerCriterion.mapping b/mappings/net/minecraft/advancement/criterion/CuredZombieVillagerCriterion.mapping index 41d401644b..fe37006ba7 100644 --- a/mappings/net/minecraft/advancement/criterion/CuredZombieVillagerCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/CuredZombieVillagerCriterion.mapping @@ -1,5 +1,4 @@ CLASS net/minecraft/class_2014 net/minecraft/advancement/criterion/CuredZombieVillagerCriterion - FIELD field_9514 ID Lnet/minecraft/class_2960; METHOD method_22461 (Lnet/minecraft/class_47;Lnet/minecraft/class_47;Lnet/minecraft/class_2014$class_2016;)Z ARG 2 conditions METHOD method_8831 trigger (Lnet/minecraft/class_3222;Lnet/minecraft/class_1642;Lnet/minecraft/class_1646;)V @@ -7,13 +6,13 @@ CLASS net/minecraft/class_2014 net/minecraft/advancement/criterion/CuredZombieVi ARG 2 zombie ARG 3 villager CLASS class_2016 Conditions - FIELD field_9518 zombie Lnet/minecraft/class_2048$class_5258; - FIELD field_9519 villager Lnet/minecraft/class_2048$class_5258; - METHOD (Lnet/minecraft/class_2048$class_5258;Lnet/minecraft/class_2048$class_5258;Lnet/minecraft/class_2048$class_5258;)V - ARG 1 player + FIELD field_9518 zombie Ljava/util/Optional; + FIELD field_9519 villager Ljava/util/Optional; + METHOD (Ljava/util/Optional;Ljava/util/Optional;Ljava/util/Optional;)V + ARG 1 playerPredicate ARG 2 zombie ARG 3 villager - METHOD method_8836 any ()Lnet/minecraft/class_2014$class_2016; + METHOD method_8836 any ()Lnet/minecraft/class_175; METHOD method_8837 matches (Lnet/minecraft/class_47;Lnet/minecraft/class_47;)Z - ARG 1 zombieContext - ARG 2 villagerContext + ARG 1 zombie + ARG 2 villager diff --git a/mappings/net/minecraft/advancement/criterion/EffectsChangedCriterion.mapping b/mappings/net/minecraft/advancement/criterion/EffectsChangedCriterion.mapping index 5283d58358..07d3c38bd8 100644 --- a/mappings/net/minecraft/advancement/criterion/EffectsChangedCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/EffectsChangedCriterion.mapping @@ -1,21 +1,19 @@ CLASS net/minecraft/class_2027 net/minecraft/advancement/criterion/EffectsChangedCriterion - FIELD field_9558 ID Lnet/minecraft/class_2960; METHOD method_22462 (Lnet/minecraft/class_3222;Lnet/minecraft/class_47;Lnet/minecraft/class_2027$class_2029;)Z ARG 2 conditions METHOD method_8863 trigger (Lnet/minecraft/class_3222;Lnet/minecraft/class_1297;)V ARG 1 player ARG 2 source CLASS class_2029 Conditions - FIELD field_33909 source Lnet/minecraft/class_2048$class_5258; - FIELD field_9562 effects Lnet/minecraft/class_2102; - METHOD (Lnet/minecraft/class_2048$class_5258;Lnet/minecraft/class_2102;Lnet/minecraft/class_2048$class_5258;)V - ARG 1 player + FIELD field_33909 source Ljava/util/Optional; + FIELD field_9562 effects Ljava/util/Optional; + METHOD (Ljava/util/Optional;Ljava/util/Optional;Ljava/util/Optional;)V + ARG 1 playerPredicate ARG 2 effects ARG 3 source - METHOD method_37224 create (Lnet/minecraft/class_2048;)Lnet/minecraft/class_2027$class_2029; - ARG 0 source + METHOD method_37224 create (Lnet/minecraft/class_2048$class_2049;)Lnet/minecraft/class_175; METHOD method_8868 matches (Lnet/minecraft/class_3222;Lnet/minecraft/class_47;)Z ARG 1 player ARG 2 context - METHOD method_8869 create (Lnet/minecraft/class_2102;)Lnet/minecraft/class_2027$class_2029; + METHOD method_8869 create (Lnet/minecraft/class_2102$class_8748;)Lnet/minecraft/class_175; ARG 0 effects diff --git a/mappings/net/minecraft/advancement/criterion/EnchantedItemCriterion.mapping b/mappings/net/minecraft/advancement/criterion/EnchantedItemCriterion.mapping index 2e5a35c808..b92216f381 100644 --- a/mappings/net/minecraft/advancement/criterion/EnchantedItemCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/EnchantedItemCriterion.mapping @@ -1,5 +1,4 @@ CLASS net/minecraft/class_2030 net/minecraft/advancement/criterion/EnchantedItemCriterion - FIELD field_9563 ID Lnet/minecraft/class_2960; METHOD method_22463 (Lnet/minecraft/class_1799;ILnet/minecraft/class_2030$class_2032;)Z ARG 2 conditions METHOD method_8870 trigger (Lnet/minecraft/class_3222;Lnet/minecraft/class_1799;I)V @@ -7,13 +6,13 @@ CLASS net/minecraft/class_2030 net/minecraft/advancement/criterion/EnchantedItem ARG 2 stack ARG 3 levels CLASS class_2032 Conditions - FIELD field_9567 item Lnet/minecraft/class_2073; + FIELD field_9567 item Ljava/util/Optional; FIELD field_9568 levels Lnet/minecraft/class_2096$class_2100; - METHOD (Lnet/minecraft/class_2048$class_5258;Lnet/minecraft/class_2073;Lnet/minecraft/class_2096$class_2100;)V - ARG 1 player + METHOD (Ljava/util/Optional;Ljava/util/Optional;Lnet/minecraft/class_2096$class_2100;)V + ARG 1 playerPredicate ARG 2 item ARG 3 levels - METHOD method_8877 any ()Lnet/minecraft/class_2030$class_2032; + METHOD method_8877 any ()Lnet/minecraft/class_175; METHOD method_8878 matches (Lnet/minecraft/class_1799;I)Z ARG 1 stack ARG 2 levels diff --git a/mappings/net/minecraft/advancement/criterion/EnterBlockCriterion.mapping b/mappings/net/minecraft/advancement/criterion/EnterBlockCriterion.mapping index 16dad4f52d..33fb675e79 100644 --- a/mappings/net/minecraft/advancement/criterion/EnterBlockCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/EnterBlockCriterion.mapping @@ -1,5 +1,4 @@ CLASS net/minecraft/class_2037 net/minecraft/advancement/criterion/EnterBlockCriterion - FIELD field_9572 ID Lnet/minecraft/class_2960; METHOD method_22464 (Lnet/minecraft/class_2248;Ljava/lang/String;)V ARG 1 name METHOD method_22465 (Lnet/minecraft/class_2680;Lnet/minecraft/class_2037$class_2039;)Z @@ -11,12 +10,12 @@ CLASS net/minecraft/class_2037 net/minecraft/advancement/criterion/EnterBlockCri ARG 2 state CLASS class_2039 Conditions FIELD field_9576 block Lnet/minecraft/class_2248; - FIELD field_9577 state Lnet/minecraft/class_4559; - METHOD (Lnet/minecraft/class_2048$class_5258;Lnet/minecraft/class_2248;Lnet/minecraft/class_4559;)V - ARG 1 player + FIELD field_9577 state Ljava/util/Optional; + METHOD (Ljava/util/Optional;Lnet/minecraft/class_2248;Ljava/util/Optional;)V + ARG 1 playerPredicate ARG 2 block ARG 3 state - METHOD method_8890 block (Lnet/minecraft/class_2248;)Lnet/minecraft/class_2037$class_2039; + METHOD method_8890 block (Lnet/minecraft/class_2248;)Lnet/minecraft/class_175; ARG 0 block METHOD method_8891 matches (Lnet/minecraft/class_2680;)Z ARG 1 state diff --git a/mappings/net/minecraft/advancement/criterion/EntityHurtPlayerCriterion.mapping b/mappings/net/minecraft/advancement/criterion/EntityHurtPlayerCriterion.mapping index 882770d2b4..a938a624a0 100644 --- a/mappings/net/minecraft/advancement/criterion/EntityHurtPlayerCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/EntityHurtPlayerCriterion.mapping @@ -1,5 +1,4 @@ CLASS net/minecraft/class_2044 net/minecraft/advancement/criterion/EntityHurtPlayerCriterion - FIELD field_9589 ID Lnet/minecraft/class_2960; METHOD method_22467 trigger (Lnet/minecraft/class_3222;Lnet/minecraft/class_1282;FFZ)V ARG 1 player ARG 2 source @@ -9,18 +8,18 @@ CLASS net/minecraft/class_2044 net/minecraft/advancement/criterion/EntityHurtPla METHOD method_22468 (Lnet/minecraft/class_3222;Lnet/minecraft/class_1282;FFZLnet/minecraft/class_2044$class_2046;)Z ARG 5 conditions CLASS class_2046 Conditions - FIELD field_9593 damage Lnet/minecraft/class_2019; - METHOD (Lnet/minecraft/class_2048$class_5258;Lnet/minecraft/class_2019;)V - ARG 1 player + FIELD field_9593 damage Ljava/util/Optional; + METHOD (Ljava/util/Optional;Ljava/util/Optional;)V + ARG 1 playerPredicate ARG 2 damage - METHOD method_35209 create (Lnet/minecraft/class_2019;)Lnet/minecraft/class_2044$class_2046; + METHOD method_35209 create (Lnet/minecraft/class_2019;)Lnet/minecraft/class_175; ARG 0 predicate - METHOD method_35210 create ()Lnet/minecraft/class_2044$class_2046; + METHOD method_35210 create ()Lnet/minecraft/class_175; METHOD method_8907 matches (Lnet/minecraft/class_3222;Lnet/minecraft/class_1282;FFZ)Z ARG 1 player - ARG 2 source + ARG 2 damageSource ARG 3 dealt ARG 4 taken ARG 5 blocked - METHOD method_8908 create (Lnet/minecraft/class_2019$class_2020;)Lnet/minecraft/class_2044$class_2046; + METHOD method_8908 create (Lnet/minecraft/class_2019$class_2020;)Lnet/minecraft/class_175; ARG 0 damageBuilder diff --git a/mappings/net/minecraft/advancement/criterion/FilledBucketCriterion.mapping b/mappings/net/minecraft/advancement/criterion/FilledBucketCriterion.mapping index c99e913ae0..e115c969b2 100644 --- a/mappings/net/minecraft/advancement/criterion/FilledBucketCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/FilledBucketCriterion.mapping @@ -1,16 +1,14 @@ CLASS net/minecraft/class_2054 net/minecraft/advancement/criterion/FilledBucketCriterion - FIELD field_9612 ID Lnet/minecraft/class_2960; METHOD method_22471 (Lnet/minecraft/class_1799;Lnet/minecraft/class_2054$class_2056;)Z ARG 1 conditions METHOD method_8932 trigger (Lnet/minecraft/class_3222;Lnet/minecraft/class_1799;)V ARG 1 player ARG 2 stack CLASS class_2056 Conditions - FIELD field_9616 item Lnet/minecraft/class_2073; - METHOD (Lnet/minecraft/class_2048$class_5258;Lnet/minecraft/class_2073;)V - ARG 1 player + FIELD field_9616 item Ljava/util/Optional; + METHOD (Ljava/util/Optional;Ljava/util/Optional;)V + ARG 1 playerPredicate ARG 2 item - METHOD method_8937 create (Lnet/minecraft/class_2073;)Lnet/minecraft/class_2054$class_2056; - ARG 0 item + METHOD method_8937 create (Lnet/minecraft/class_2073$class_2074;)Lnet/minecraft/class_175; METHOD method_8938 matches (Lnet/minecraft/class_1799;)Z ARG 1 stack diff --git a/mappings/net/minecraft/advancement/criterion/FishingRodHookedCriterion.mapping b/mappings/net/minecraft/advancement/criterion/FishingRodHookedCriterion.mapping index bf3dc896c1..7cbb8a093c 100644 --- a/mappings/net/minecraft/advancement/criterion/FishingRodHookedCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/FishingRodHookedCriterion.mapping @@ -1,5 +1,4 @@ CLASS net/minecraft/class_2058 net/minecraft/advancement/criterion/FishingRodHookedCriterion - FIELD field_9617 ID Lnet/minecraft/class_2960; METHOD method_22472 (Lnet/minecraft/class_1799;Lnet/minecraft/class_47;Ljava/util/Collection;Lnet/minecraft/class_2058$class_2060;)Z ARG 3 conditions METHOD method_8939 trigger (Lnet/minecraft/class_3222;Lnet/minecraft/class_1799;Lnet/minecraft/class_1536;Ljava/util/Collection;)V @@ -8,19 +7,19 @@ CLASS net/minecraft/class_2058 net/minecraft/advancement/criterion/FishingRodHoo ARG 3 bobber ARG 4 fishingLoots CLASS class_2060 Conditions - FIELD field_24391 hookedEntity Lnet/minecraft/class_2048$class_5258; - FIELD field_9621 rod Lnet/minecraft/class_2073; - FIELD field_9623 caughtItem Lnet/minecraft/class_2073; - METHOD (Lnet/minecraft/class_2048$class_5258;Lnet/minecraft/class_2073;Lnet/minecraft/class_2048$class_5258;Lnet/minecraft/class_2073;)V - ARG 1 player + FIELD field_24391 hookedEntity Ljava/util/Optional; + FIELD field_9621 rod Ljava/util/Optional; + FIELD field_9623 caughtItem Ljava/util/Optional; + METHOD (Ljava/util/Optional;Ljava/util/Optional;Ljava/util/Optional;Ljava/util/Optional;)V + ARG 1 playerPredicate ARG 2 rod ARG 3 hookedEntity ARG 4 caughtItem METHOD method_27810 matches (Lnet/minecraft/class_1799;Lnet/minecraft/class_47;Ljava/util/Collection;)Z - ARG 1 rod - ARG 2 hookedEntityContext + ARG 1 rodStack + ARG 2 hookedEntity ARG 3 fishingLoots - METHOD method_8947 create (Lnet/minecraft/class_2073;Lnet/minecraft/class_2048;Lnet/minecraft/class_2073;)Lnet/minecraft/class_2058$class_2060; + METHOD method_8947 create (Ljava/util/Optional;Ljava/util/Optional;Ljava/util/Optional;)Lnet/minecraft/class_175; ARG 0 rod - ARG 1 bobber - ARG 2 item + ARG 1 hookedEntity + ARG 2 caughtItem diff --git a/mappings/net/minecraft/advancement/criterion/ImpossibleCriterion.mapping b/mappings/net/minecraft/advancement/criterion/ImpossibleCriterion.mapping index 0ee7207460..c27ba4762a 100644 --- a/mappings/net/minecraft/advancement/criterion/ImpossibleCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/ImpossibleCriterion.mapping @@ -1,3 +1,2 @@ CLASS net/minecraft/class_2062 net/minecraft/advancement/criterion/ImpossibleCriterion - FIELD field_9624 ID Lnet/minecraft/class_2960; CLASS class_2063 Conditions diff --git a/mappings/net/minecraft/advancement/criterion/InventoryChangedCriterion.mapping b/mappings/net/minecraft/advancement/criterion/InventoryChangedCriterion.mapping index 964ca61d6e..d23f60df0f 100644 --- a/mappings/net/minecraft/advancement/criterion/InventoryChangedCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/InventoryChangedCriterion.mapping @@ -1,5 +1,4 @@ CLASS net/minecraft/class_2066 net/minecraft/advancement/criterion/InventoryChangedCriterion - FIELD field_9625 ID Lnet/minecraft/class_2960; METHOD method_22476 (Lnet/minecraft/class_1661;Lnet/minecraft/class_1799;IIILnet/minecraft/class_2066$class_2068;)Z ARG 5 conditions METHOD method_24362 trigger (Lnet/minecraft/class_3222;Lnet/minecraft/class_1661;Lnet/minecraft/class_1799;III)V @@ -17,16 +16,18 @@ CLASS net/minecraft/class_2066 net/minecraft/advancement/criterion/InventoryChan FIELD field_9629 occupied Lnet/minecraft/class_2096$class_2100; FIELD field_9630 full Lnet/minecraft/class_2096$class_2100; FIELD field_9631 empty Lnet/minecraft/class_2096$class_2100; - FIELD field_9632 items [Lnet/minecraft/class_2073; - METHOD (Lnet/minecraft/class_2048$class_5258;Lnet/minecraft/class_2096$class_2100;Lnet/minecraft/class_2096$class_2100;Lnet/minecraft/class_2096$class_2100;[Lnet/minecraft/class_2073;)V - ARG 1 player + FIELD field_9632 items Ljava/util/List; + METHOD (Ljava/util/Optional;Lnet/minecraft/class_2096$class_2100;Lnet/minecraft/class_2096$class_2100;Lnet/minecraft/class_2096$class_2100;Ljava/util/List;)V + ARG 1 playerPredicate ARG 2 occupied ARG 3 full ARG 4 empty ARG 5 items METHOD method_24363 (Lnet/minecraft/class_1799;Lnet/minecraft/class_2073;)Z ARG 1 item - METHOD method_8957 items ([Lnet/minecraft/class_2073;)Lnet/minecraft/class_2066$class_2068; + METHOD method_53160 items ([Lnet/minecraft/class_2073$class_2074;)Lnet/minecraft/class_175; + ARG 0 items + METHOD method_8957 items ([Lnet/minecraft/class_2073;)Lnet/minecraft/class_175; ARG 0 items METHOD method_8958 matches (Lnet/minecraft/class_1661;Lnet/minecraft/class_1799;III)Z ARG 1 inventory @@ -34,5 +35,5 @@ CLASS net/minecraft/class_2066 net/minecraft/advancement/criterion/InventoryChan ARG 3 full ARG 4 empty ARG 5 occupied - METHOD method_8959 items ([Lnet/minecraft/class_1935;)Lnet/minecraft/class_2066$class_2068; + METHOD method_8959 items ([Lnet/minecraft/class_1935;)Lnet/minecraft/class_175; ARG 0 items diff --git a/mappings/net/minecraft/advancement/criterion/ItemCriterion.mapping b/mappings/net/minecraft/advancement/criterion/ItemCriterion.mapping index 329748620a..66ff9201a0 100644 --- a/mappings/net/minecraft/advancement/criterion/ItemCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/ItemCriterion.mapping @@ -1,29 +1,26 @@ CLASS net/minecraft/class_4711 net/minecraft/advancement/criterion/ItemCriterion - FIELD field_21576 id Lnet/minecraft/class_2960; - METHOD (Lnet/minecraft/class_2960;)V - ARG 1 id - METHOD method_23888 (Lnet/minecraft/class_2680;Lnet/minecraft/class_3222;Lnet/minecraft/class_2338;Lnet/minecraft/class_1799;Lnet/minecraft/class_4711$class_4712;)Z - ARG 4 conditions + METHOD method_23888 (Lnet/minecraft/class_47;Lnet/minecraft/class_4711$class_4712;)Z + ARG 1 conditions METHOD method_23889 trigger (Lnet/minecraft/class_3222;Lnet/minecraft/class_2338;Lnet/minecraft/class_1799;)V ARG 1 player ARG 2 pos ARG 3 stack CLASS class_4712 Conditions - FIELD field_21579 item Lnet/minecraft/class_2073; - FIELD field_24495 location Lnet/minecraft/class_2090; - METHOD (Lnet/minecraft/class_2960;Lnet/minecraft/class_2048$class_5258;Lnet/minecraft/class_2090;Lnet/minecraft/class_2073;)V - ARG 1 id - ARG 2 entity - ARG 3 location - ARG 4 item - METHOD method_23892 test (Lnet/minecraft/class_2680;Lnet/minecraft/class_3218;Lnet/minecraft/class_2338;Lnet/minecraft/class_1799;)Z - ARG 1 state - ARG 2 world - ARG 3 pos - ARG 4 stack - METHOD method_27981 create (Lnet/minecraft/class_2090$class_2091;Lnet/minecraft/class_2073$class_2074;)Lnet/minecraft/class_4711$class_4712; + FIELD field_24495 location Ljava/util/Optional; + METHOD (Ljava/util/Optional;Ljava/util/Optional;)V + ARG 2 playerPredicate + METHOD method_27981 createItemUsedOnBlock (Lnet/minecraft/class_2090$class_2091;Lnet/minecraft/class_2073$class_2074;)Lnet/minecraft/class_175; ARG 0 location ARG 1 item - METHOD method_43125 createAllayDropItemOnBlock (Lnet/minecraft/class_2090$class_2091;Lnet/minecraft/class_2073$class_2074;)Lnet/minecraft/class_4711$class_4712; + METHOD method_43125 createAllayDropItemOnBlock (Lnet/minecraft/class_2090$class_2091;Lnet/minecraft/class_2073$class_2074;)Lnet/minecraft/class_175; ARG 0 location ARG 1 item + METHOD method_51709 create (Lnet/minecraft/class_2090$class_2091;Lnet/minecraft/class_2073$class_2074;)Lnet/minecraft/class_4711$class_4712; + ARG 0 location + ARG 1 item + METHOD method_51710 createPlacedBlock (Lnet/minecraft/class_2248;)Lnet/minecraft/class_175; + ARG 0 block + METHOD method_51711 test (Lnet/minecraft/class_47;)Z + ARG 1 location + METHOD method_51712 createPlacedBlock ([Lnet/minecraft/class_5341$class_210;)Lnet/minecraft/class_175; + ARG 0 locationConditions diff --git a/mappings/net/minecraft/advancement/criterion/ItemDurabilityChangedCriterion.mapping b/mappings/net/minecraft/advancement/criterion/ItemDurabilityChangedCriterion.mapping index 777cfa3ab2..c658790079 100644 --- a/mappings/net/minecraft/advancement/criterion/ItemDurabilityChangedCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/ItemDurabilityChangedCriterion.mapping @@ -1,5 +1,4 @@ CLASS net/minecraft/class_2069 net/minecraft/advancement/criterion/ItemDurabilityChangedCriterion - FIELD field_9633 ID Lnet/minecraft/class_2960; METHOD method_22477 (Lnet/minecraft/class_1799;ILnet/minecraft/class_2069$class_2071;)Z ARG 2 conditions METHOD method_8960 trigger (Lnet/minecraft/class_3222;Lnet/minecraft/class_1799;I)V @@ -7,19 +6,19 @@ CLASS net/minecraft/class_2069 net/minecraft/advancement/criterion/ItemDurabilit ARG 2 stack ARG 3 durability CLASS class_2071 Conditions - FIELD field_9637 item Lnet/minecraft/class_2073; + FIELD field_9637 item Ljava/util/Optional; FIELD field_9638 durability Lnet/minecraft/class_2096$class_2100; FIELD field_9639 delta Lnet/minecraft/class_2096$class_2100; - METHOD (Lnet/minecraft/class_2048$class_5258;Lnet/minecraft/class_2073;Lnet/minecraft/class_2096$class_2100;Lnet/minecraft/class_2096$class_2100;)V - ARG 1 player + METHOD (Ljava/util/Optional;Ljava/util/Optional;Lnet/minecraft/class_2096$class_2100;Lnet/minecraft/class_2096$class_2100;)V + ARG 1 playerPredicate ARG 2 item ARG 3 durability ARG 4 delta - METHOD method_35229 create (Lnet/minecraft/class_2073;Lnet/minecraft/class_2096$class_2100;)Lnet/minecraft/class_2069$class_2071; + METHOD method_35229 create (Ljava/util/Optional;Lnet/minecraft/class_2096$class_2100;)Lnet/minecraft/class_175; ARG 0 item ARG 1 durability - METHOD method_8967 create (Lnet/minecraft/class_2048$class_5258;Lnet/minecraft/class_2073;Lnet/minecraft/class_2096$class_2100;)Lnet/minecraft/class_2069$class_2071; - ARG 0 player + METHOD method_8967 create (Ljava/util/Optional;Ljava/util/Optional;Lnet/minecraft/class_2096$class_2100;)Lnet/minecraft/class_175; + ARG 0 playerPredicate ARG 1 item ARG 2 durability METHOD method_8968 matches (Lnet/minecraft/class_1799;I)Z diff --git a/mappings/net/minecraft/advancement/criterion/KilledByCrossbowCriterion.mapping b/mappings/net/minecraft/advancement/criterion/KilledByCrossbowCriterion.mapping index 0fbaf7372a..a83da8b5ce 100644 --- a/mappings/net/minecraft/advancement/criterion/KilledByCrossbowCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/KilledByCrossbowCriterion.mapping @@ -1,5 +1,4 @@ CLASS net/minecraft/class_2076 net/minecraft/advancement/criterion/KilledByCrossbowCriterion - FIELD field_9655 ID Lnet/minecraft/class_2960; METHOD method_22478 (Ljava/util/List;Ljava/util/Set;Lnet/minecraft/class_2076$class_2078;)Z ARG 2 conditions METHOD method_8980 trigger (Lnet/minecraft/class_3222;Ljava/util/Collection;)V @@ -7,14 +6,14 @@ CLASS net/minecraft/class_2076 net/minecraft/advancement/criterion/KilledByCross ARG 2 piercingKilledEntities CLASS class_2078 Conditions FIELD field_9659 uniqueEntityTypes Lnet/minecraft/class_2096$class_2100; - FIELD field_9660 victims [Lnet/minecraft/class_2048$class_5258; - METHOD (Lnet/minecraft/class_2048$class_5258;[Lnet/minecraft/class_2048$class_5258;Lnet/minecraft/class_2096$class_2100;)V - ARG 1 player + FIELD field_9660 victims Ljava/util/List; + METHOD (Ljava/util/Optional;Ljava/util/List;Lnet/minecraft/class_2096$class_2100;)V + ARG 1 playerPredicate ARG 2 victims ARG 3 uniqueEntityTypes - METHOD method_8986 create ([Lnet/minecraft/class_2048$class_2049;)Lnet/minecraft/class_2076$class_2078; + METHOD method_8986 create ([Lnet/minecraft/class_2048$class_2049;)Lnet/minecraft/class_175; ARG 0 victimPredicates - METHOD method_8987 create (Lnet/minecraft/class_2096$class_2100;)Lnet/minecraft/class_2076$class_2078; + METHOD method_8987 create (Lnet/minecraft/class_2096$class_2100;)Lnet/minecraft/class_175; ARG 0 uniqueEntityTypes METHOD method_8988 matches (Ljava/util/Collection;I)Z ARG 1 victimContexts diff --git a/mappings/net/minecraft/advancement/criterion/LevitationCriterion.mapping b/mappings/net/minecraft/advancement/criterion/LevitationCriterion.mapping index 1bb610ed0b..d7bc5a32bc 100644 --- a/mappings/net/minecraft/advancement/criterion/LevitationCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/LevitationCriterion.mapping @@ -1,5 +1,4 @@ CLASS net/minecraft/class_2085 net/minecraft/advancement/criterion/LevitationCriterion - FIELD field_9671 ID Lnet/minecraft/class_2960; METHOD method_22480 (Lnet/minecraft/class_3222;Lnet/minecraft/class_243;ILnet/minecraft/class_2085$class_2087;)Z ARG 3 conditions METHOD method_9008 trigger (Lnet/minecraft/class_3222;Lnet/minecraft/class_243;I)V @@ -7,15 +6,15 @@ CLASS net/minecraft/class_2085 net/minecraft/advancement/criterion/LevitationCri ARG 2 startPos ARG 3 duration CLASS class_2087 Conditions - FIELD field_9675 distance Lnet/minecraft/class_2025; + FIELD field_9675 distance Ljava/util/Optional; FIELD field_9676 duration Lnet/minecraft/class_2096$class_2100; - METHOD (Lnet/minecraft/class_2048$class_5258;Lnet/minecraft/class_2025;Lnet/minecraft/class_2096$class_2100;)V - ARG 1 player + METHOD (Ljava/util/Optional;Ljava/util/Optional;Lnet/minecraft/class_2096$class_2100;)V + ARG 1 playerPredicate ARG 2 distance ARG 3 duration - METHOD method_9013 create (Lnet/minecraft/class_2025;)Lnet/minecraft/class_2085$class_2087; + METHOD method_9013 create (Lnet/minecraft/class_2025;)Lnet/minecraft/class_175; ARG 0 distance METHOD method_9014 matches (Lnet/minecraft/class_3222;Lnet/minecraft/class_243;I)Z ARG 1 player - ARG 2 startPos + ARG 2 distance ARG 3 duration diff --git a/mappings/net/minecraft/advancement/criterion/LightningStrikeCriterion.mapping b/mappings/net/minecraft/advancement/criterion/LightningStrikeCriterion.mapping index 961bee1c1b..3fe5c024fd 100644 --- a/mappings/net/minecraft/advancement/criterion/LightningStrikeCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/LightningStrikeCriterion.mapping @@ -1,5 +1,4 @@ CLASS net/minecraft/class_6405 net/minecraft/advancement/criterion/LightningStrikeCriterion - FIELD field_33925 ID Lnet/minecraft/class_2960; METHOD method_37239 (Lnet/minecraft/class_3222;Lnet/minecraft/class_1297;)Lnet/minecraft/class_47; ARG 1 bystander METHOD method_37240 trigger (Lnet/minecraft/class_3222;Lnet/minecraft/class_1538;Ljava/util/List;)V @@ -9,13 +8,13 @@ CLASS net/minecraft/class_6405 net/minecraft/advancement/criterion/LightningStri METHOD method_37242 (Lnet/minecraft/class_47;Ljava/util/List;Lnet/minecraft/class_6405$class_6406;)Z ARG 2 conditions CLASS class_6406 Conditions - FIELD field_33926 lightning Lnet/minecraft/class_2048$class_5258; - FIELD field_33927 bystander Lnet/minecraft/class_2048$class_5258; - METHOD (Lnet/minecraft/class_2048$class_5258;Lnet/minecraft/class_2048$class_5258;Lnet/minecraft/class_2048$class_5258;)V - ARG 1 player + FIELD field_33926 lightning Ljava/util/Optional; + FIELD field_33927 bystander Ljava/util/Optional; + METHOD (Ljava/util/Optional;Ljava/util/Optional;Ljava/util/Optional;)V + ARG 1 playerPredicate ARG 2 lightning ARG 3 bystander - METHOD method_37243 create (Lnet/minecraft/class_2048;Lnet/minecraft/class_2048;)Lnet/minecraft/class_6405$class_6406; + METHOD method_37243 create (Ljava/util/Optional;Ljava/util/Optional;)Lnet/minecraft/class_175; ARG 0 lightning ARG 1 bystander METHOD method_37244 test (Lnet/minecraft/class_47;Ljava/util/List;)Z diff --git a/mappings/net/minecraft/advancement/criterion/OnKilledCriterion.mapping b/mappings/net/minecraft/advancement/criterion/OnKilledCriterion.mapping index 974a33932b..e86d02d93f 100644 --- a/mappings/net/minecraft/advancement/criterion/OnKilledCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/OnKilledCriterion.mapping @@ -1,7 +1,4 @@ CLASS net/minecraft/class_2080 net/minecraft/advancement/criterion/OnKilledCriterion - FIELD field_9661 id Lnet/minecraft/class_2960; - METHOD (Lnet/minecraft/class_2960;)V - ARG 1 id METHOD method_22479 (Lnet/minecraft/class_3222;Lnet/minecraft/class_47;Lnet/minecraft/class_1282;Lnet/minecraft/class_2080$class_2083;)Z ARG 3 conditions METHOD method_8990 trigger (Lnet/minecraft/class_3222;Lnet/minecraft/class_1297;Lnet/minecraft/class_1282;)V @@ -9,49 +6,47 @@ CLASS net/minecraft/class_2080 net/minecraft/advancement/criterion/OnKilledCrite ARG 2 entity ARG 3 killingDamage CLASS class_2083 Conditions - FIELD field_9667 killingBlow Lnet/minecraft/class_2022; - FIELD field_9668 entity Lnet/minecraft/class_2048$class_5258; - METHOD (Lnet/minecraft/class_2960;Lnet/minecraft/class_2048$class_5258;Lnet/minecraft/class_2048$class_5258;Lnet/minecraft/class_2022;)V - ARG 1 id - ARG 2 player + FIELD field_9667 killingBlow Ljava/util/Optional; + FIELD field_9668 entity Ljava/util/Optional; + METHOD (Ljava/util/Optional;Ljava/util/Optional;Ljava/util/Optional;)V + ARG 2 playerPredicate ARG 3 entity - ARG 4 killingBlow - METHOD method_35247 createPlayerKilledEntity (Lnet/minecraft/class_2048$class_2049;Lnet/minecraft/class_2022;)Lnet/minecraft/class_2080$class_2083; + METHOD method_35247 createPlayerKilledEntity (Lnet/minecraft/class_2048$class_2049;Ljava/util/Optional;)Lnet/minecraft/class_175; ARG 0 killedEntityPredicateBuilder - ARG 1 damageSourcePredicate - METHOD method_35248 createPlayerKilledEntity (Lnet/minecraft/class_2048;)Lnet/minecraft/class_2080$class_2083; - ARG 0 killedEntityPredicate - METHOD method_35249 createPlayerKilledEntity (Lnet/minecraft/class_2048;Lnet/minecraft/class_2022$class_2023;)Lnet/minecraft/class_2080$class_2083; - ARG 0 killedEntityPredicate + ARG 1 killingBlow + METHOD method_35248 createPlayerKilledEntity (Ljava/util/Optional;)Lnet/minecraft/class_175; + ARG 0 entity + METHOD method_35249 createPlayerKilledEntity (Ljava/util/Optional;Lnet/minecraft/class_2022$class_2023;)Lnet/minecraft/class_175; + ARG 0 entity ARG 1 damageSourcePredicateBuilder - METHOD method_35250 createPlayerKilledEntity (Lnet/minecraft/class_2048;Lnet/minecraft/class_2022;)Lnet/minecraft/class_2080$class_2083; - ARG 0 killedEntityPredicate - ARG 1 damageSourcePredicate - METHOD method_35251 createEntityKilledPlayer (Lnet/minecraft/class_2048$class_2049;)Lnet/minecraft/class_2080$class_2083; + METHOD method_35250 createPlayerKilledEntity (Ljava/util/Optional;Ljava/util/Optional;)Lnet/minecraft/class_175; + ARG 0 entity + ARG 1 killingBlow + METHOD method_35251 createEntityKilledPlayer (Lnet/minecraft/class_2048$class_2049;)Lnet/minecraft/class_175; ARG 0 killerEntityPredicateBuilder - METHOD method_35252 createEntityKilledPlayer (Lnet/minecraft/class_2048$class_2049;Lnet/minecraft/class_2022$class_2023;)Lnet/minecraft/class_2080$class_2083; + METHOD method_35252 createEntityKilledPlayer (Lnet/minecraft/class_2048$class_2049;Lnet/minecraft/class_2022$class_2023;)Lnet/minecraft/class_175; ARG 0 killerEntityPredicateBuilder ARG 1 damageSourcePredicateBuilder - METHOD method_35253 createEntityKilledPlayer (Lnet/minecraft/class_2048$class_2049;Lnet/minecraft/class_2022;)Lnet/minecraft/class_2080$class_2083; + METHOD method_35253 createEntityKilledPlayer (Lnet/minecraft/class_2048$class_2049;Ljava/util/Optional;)Lnet/minecraft/class_175; ARG 0 killerEntityPredicateBuilder - ARG 1 damageSourcePredicate - METHOD method_35254 createEntityKilledPlayer (Lnet/minecraft/class_2048;)Lnet/minecraft/class_2080$class_2083; - ARG 0 killerEntityPredicate - METHOD method_35255 createEntityKilledPlayer (Lnet/minecraft/class_2048;Lnet/minecraft/class_2022$class_2023;)Lnet/minecraft/class_2080$class_2083; - ARG 0 killerEntityPredicate + ARG 1 killingBlow + METHOD method_35254 createEntityKilledPlayer (Ljava/util/Optional;)Lnet/minecraft/class_175; + ARG 0 entity + METHOD method_35255 createEntityKilledPlayer (Ljava/util/Optional;Lnet/minecraft/class_2022$class_2023;)Lnet/minecraft/class_175; + ARG 0 entity ARG 1 damageSourcePredicateBuilder - METHOD method_35256 createEntityKilledPlayer (Lnet/minecraft/class_2048;Lnet/minecraft/class_2022;)Lnet/minecraft/class_2080$class_2083; - ARG 0 killerEntityPredicate - ARG 1 damageSourcePredicate - METHOD method_42671 createKillMobNearSculkCatalyst ()Lnet/minecraft/class_2080$class_2083; - METHOD method_8997 createPlayerKilledEntity (Lnet/minecraft/class_2048$class_2049;)Lnet/minecraft/class_2080$class_2083; + METHOD method_35256 createEntityKilledPlayer (Ljava/util/Optional;Ljava/util/Optional;)Lnet/minecraft/class_175; + ARG 0 entity + ARG 1 killingBlow + METHOD method_42671 createKillMobNearSculkCatalyst ()Lnet/minecraft/class_175; + METHOD method_8997 createPlayerKilledEntity (Lnet/minecraft/class_2048$class_2049;)Lnet/minecraft/class_175; ARG 0 killedEntityPredicateBuilder - METHOD method_8998 createEntityKilledPlayer ()Lnet/minecraft/class_2080$class_2083; - METHOD method_8999 createPlayerKilledEntity ()Lnet/minecraft/class_2080$class_2083; + METHOD method_8998 createEntityKilledPlayer ()Lnet/minecraft/class_175; + METHOD method_8999 createPlayerKilledEntity ()Lnet/minecraft/class_175; METHOD method_9000 test (Lnet/minecraft/class_3222;Lnet/minecraft/class_47;Lnet/minecraft/class_1282;)Z ARG 1 player - ARG 2 killedEntityContext + ARG 2 entity ARG 3 killingBlow - METHOD method_9001 createPlayerKilledEntity (Lnet/minecraft/class_2048$class_2049;Lnet/minecraft/class_2022$class_2023;)Lnet/minecraft/class_2080$class_2083; + METHOD method_9001 createPlayerKilledEntity (Lnet/minecraft/class_2048$class_2049;Lnet/minecraft/class_2022$class_2023;)Lnet/minecraft/class_175; ARG 0 killedEntityPredicateBuilder ARG 1 killingBlowBuilder diff --git a/mappings/net/minecraft/advancement/criterion/PlacedBlockCriterion.mapping b/mappings/net/minecraft/advancement/criterion/PlacedBlockCriterion.mapping deleted file mode 100644 index 32f77f5fa7..0000000000 --- a/mappings/net/minecraft/advancement/criterion/PlacedBlockCriterion.mapping +++ /dev/null @@ -1,30 +0,0 @@ -CLASS net/minecraft/class_2111 net/minecraft/advancement/criterion/PlacedBlockCriterion - FIELD field_9724 ID Lnet/minecraft/class_2960; - METHOD method_22490 (Lnet/minecraft/class_2248;Ljava/lang/String;)V - ARG 1 name - METHOD method_22491 (Lnet/minecraft/class_2680;Lnet/minecraft/class_2338;Lnet/minecraft/class_3222;Lnet/minecraft/class_1799;Lnet/minecraft/class_2111$class_2113;)Z - ARG 4 conditions - METHOD method_22492 getBlock (Lcom/google/gson/JsonObject;)Lnet/minecraft/class_2248; - ARG 0 obj - METHOD method_9087 trigger (Lnet/minecraft/class_3222;Lnet/minecraft/class_2338;Lnet/minecraft/class_1799;)V - ARG 1 player - ARG 2 blockPos - ARG 3 stack - CLASS class_2113 Conditions - FIELD field_9728 block Lnet/minecraft/class_2248; - FIELD field_9729 location Lnet/minecraft/class_2090; - FIELD field_9730 state Lnet/minecraft/class_4559; - FIELD field_9731 item Lnet/minecraft/class_2073; - METHOD (Lnet/minecraft/class_2048$class_5258;Lnet/minecraft/class_2248;Lnet/minecraft/class_4559;Lnet/minecraft/class_2090;Lnet/minecraft/class_2073;)V - ARG 1 player - ARG 2 block - ARG 3 state - ARG 4 location - ARG 5 item - METHOD method_9094 matches (Lnet/minecraft/class_2680;Lnet/minecraft/class_2338;Lnet/minecraft/class_3218;Lnet/minecraft/class_1799;)Z - ARG 1 state - ARG 2 pos - ARG 3 world - ARG 4 stack - METHOD method_9095 block (Lnet/minecraft/class_2248;)Lnet/minecraft/class_2111$class_2113; - ARG 0 block diff --git a/mappings/net/minecraft/advancement/criterion/PlayerGeneratesContainerLootCriterion.mapping b/mappings/net/minecraft/advancement/criterion/PlayerGeneratesContainerLootCriterion.mapping index 76080c1786..6b4b812a1c 100644 --- a/mappings/net/minecraft/advancement/criterion/PlayerGeneratesContainerLootCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/PlayerGeneratesContainerLootCriterion.mapping @@ -1,5 +1,4 @@ CLASS net/minecraft/class_5282 net/minecraft/advancement/criterion/PlayerGeneratesContainerLootCriterion - FIELD field_24502 ID Lnet/minecraft/class_2960; METHOD method_27992 (Lnet/minecraft/class_2960;Lnet/minecraft/class_5282$class_5283;)Z ARG 1 conditions METHOD method_27993 trigger (Lnet/minecraft/class_3222;Lnet/minecraft/class_2960;)V @@ -7,10 +6,10 @@ CLASS net/minecraft/class_5282 net/minecraft/advancement/criterion/PlayerGenerat ARG 2 id CLASS class_5283 Conditions FIELD field_24503 lootTable Lnet/minecraft/class_2960; - METHOD (Lnet/minecraft/class_2048$class_5258;Lnet/minecraft/class_2960;)V - ARG 1 entity + METHOD (Ljava/util/Optional;Lnet/minecraft/class_2960;)V + ARG 1 playerPredicate ARG 2 lootTable - METHOD method_27995 create (Lnet/minecraft/class_2960;)Lnet/minecraft/class_5282$class_5283; + METHOD method_27995 create (Lnet/minecraft/class_2960;)Lnet/minecraft/class_175; ARG 0 lootTable METHOD method_27996 test (Lnet/minecraft/class_2960;)Z ARG 1 lootTable diff --git a/mappings/net/minecraft/advancement/criterion/PlayerHurtEntityCriterion.mapping b/mappings/net/minecraft/advancement/criterion/PlayerHurtEntityCriterion.mapping index fa9daf991f..d7442bed7c 100644 --- a/mappings/net/minecraft/advancement/criterion/PlayerHurtEntityCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/PlayerHurtEntityCriterion.mapping @@ -1,5 +1,4 @@ CLASS net/minecraft/class_2115 net/minecraft/advancement/criterion/PlayerHurtEntityCriterion - FIELD field_9732 ID Lnet/minecraft/class_2960; METHOD method_22493 (Lnet/minecraft/class_3222;Lnet/minecraft/class_47;Lnet/minecraft/class_1282;FFZLnet/minecraft/class_2115$class_2117;)Z ARG 6 conditions METHOD method_9097 trigger (Lnet/minecraft/class_3222;Lnet/minecraft/class_1297;Lnet/minecraft/class_1282;FFZ)V @@ -10,29 +9,27 @@ CLASS net/minecraft/class_2115 net/minecraft/advancement/criterion/PlayerHurtEnt ARG 5 taken ARG 6 blocked CLASS class_2117 Conditions - FIELD field_9736 damage Lnet/minecraft/class_2019; - FIELD field_9737 entity Lnet/minecraft/class_2048$class_5258; - METHOD (Lnet/minecraft/class_2048$class_5258;Lnet/minecraft/class_2019;Lnet/minecraft/class_2048$class_5258;)V - ARG 1 player + FIELD field_9736 damage Ljava/util/Optional; + FIELD field_9737 entity Ljava/util/Optional; + METHOD (Ljava/util/Optional;Ljava/util/Optional;Ljava/util/Optional;)V + ARG 1 playerPredicate ARG 2 damage ARG 3 entity - METHOD method_35294 create (Lnet/minecraft/class_2019$class_2020;Lnet/minecraft/class_2048;)Lnet/minecraft/class_2115$class_2117; - ARG 0 damagePredicateBuilder - ARG 1 hurtEntityPredicate - METHOD method_35295 create (Lnet/minecraft/class_2019;)Lnet/minecraft/class_2115$class_2117; - ARG 0 damagePredicate - METHOD method_35296 create (Lnet/minecraft/class_2019;Lnet/minecraft/class_2048;)Lnet/minecraft/class_2115$class_2117; - ARG 0 damagePredicate - ARG 1 hurtEntityPredicate - METHOD method_35297 create (Lnet/minecraft/class_2048;)Lnet/minecraft/class_2115$class_2117; - ARG 0 hurtEntityPredicate - METHOD method_35298 create ()Lnet/minecraft/class_2115$class_2117; - METHOD method_9103 create (Lnet/minecraft/class_2019$class_2020;)Lnet/minecraft/class_2115$class_2117; - ARG 0 damagePredicateBuilder + METHOD method_35294 create (Ljava/util/Optional;Ljava/util/Optional;)Lnet/minecraft/class_175; + ARG 0 damage + ARG 1 entity + METHOD method_35295 create (Ljava/util/Optional;)Lnet/minecraft/class_175; + ARG 0 entity + METHOD method_35297 create (Lnet/minecraft/class_2019$class_2020;)Lnet/minecraft/class_175; + ARG 0 damage + METHOD method_35298 create ()Lnet/minecraft/class_175; + METHOD method_9103 create (Lnet/minecraft/class_2019$class_2020;Ljava/util/Optional;)Lnet/minecraft/class_175; + ARG 0 damage + ARG 1 entity METHOD method_9104 matches (Lnet/minecraft/class_3222;Lnet/minecraft/class_47;Lnet/minecraft/class_1282;FFZ)Z ARG 1 player - ARG 2 entityContext - ARG 3 source + ARG 2 entity + ARG 3 damageSource ARG 4 dealt ARG 5 taken ARG 6 blocked diff --git a/mappings/net/minecraft/advancement/criterion/PlayerInteractedWithEntityCriterion.mapping b/mappings/net/minecraft/advancement/criterion/PlayerInteractedWithEntityCriterion.mapping index 5c8c2d4395..8d3b7673af 100644 --- a/mappings/net/minecraft/advancement/criterion/PlayerInteractedWithEntityCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/PlayerInteractedWithEntityCriterion.mapping @@ -1,5 +1,4 @@ CLASS net/minecraft/class_5409 net/minecraft/advancement/criterion/PlayerInteractedWithEntityCriterion - FIELD field_25699 ID Lnet/minecraft/class_2960; METHOD method_30095 (Lnet/minecraft/class_1799;Lnet/minecraft/class_47;Lnet/minecraft/class_5409$class_5410;)Z ARG 2 conditions METHOD method_30097 trigger (Lnet/minecraft/class_3222;Lnet/minecraft/class_1799;Lnet/minecraft/class_1297;)V @@ -7,19 +6,19 @@ CLASS net/minecraft/class_5409 net/minecraft/advancement/criterion/PlayerInterac ARG 2 stack ARG 3 entity CLASS class_5410 Conditions - FIELD field_25700 item Lnet/minecraft/class_2073; - FIELD field_25701 entity Lnet/minecraft/class_2048$class_5258; - METHOD (Lnet/minecraft/class_2048$class_5258;Lnet/minecraft/class_2073;Lnet/minecraft/class_2048$class_5258;)V - ARG 1 player + FIELD field_25700 item Ljava/util/Optional; + FIELD field_25701 entity Ljava/util/Optional; + METHOD (Ljava/util/Optional;Ljava/util/Optional;Ljava/util/Optional;)V + ARG 1 playerPredicate ARG 2 item ARG 3 entity - METHOD method_30099 create (Lnet/minecraft/class_2048$class_5258;Lnet/minecraft/class_2073$class_2074;Lnet/minecraft/class_2048$class_5258;)Lnet/minecraft/class_5409$class_5410; - ARG 0 player - ARG 1 itemBuilder + METHOD method_30099 create (Ljava/util/Optional;Lnet/minecraft/class_2073$class_2074;Ljava/util/Optional;)Lnet/minecraft/class_175; + ARG 0 playerPredicate + ARG 1 item ARG 2 entity METHOD method_30100 test (Lnet/minecraft/class_1799;Lnet/minecraft/class_47;)Z ARG 1 stack - ARG 2 context - METHOD method_43278 create (Lnet/minecraft/class_2073$class_2074;Lnet/minecraft/class_2048$class_5258;)Lnet/minecraft/class_5409$class_5410; - ARG 0 itemBuilder + ARG 2 entity + METHOD method_43278 create (Lnet/minecraft/class_2073$class_2074;Ljava/util/Optional;)Lnet/minecraft/class_175; + ARG 0 item ARG 1 entity diff --git a/mappings/net/minecraft/advancement/criterion/RecipeCraftedCriterion.mapping b/mappings/net/minecraft/advancement/criterion/RecipeCraftedCriterion.mapping new file mode 100644 index 0000000000..14c0ade19d --- /dev/null +++ b/mappings/net/minecraft/advancement/criterion/RecipeCraftedCriterion.mapping @@ -0,0 +1,22 @@ +CLASS net/minecraft/class_8508 net/minecraft/advancement/criterion/RecipeCraftedCriterion + METHOD method_51349 (Lnet/minecraft/class_2960;Ljava/util/List;Lnet/minecraft/class_8508$class_8509;)Z + ARG 2 conditions + METHOD method_51350 trigger (Lnet/minecraft/class_3222;Lnet/minecraft/class_2960;Ljava/util/List;)V + ARG 1 player + ARG 2 recipeId + ARG 3 ingredients + CLASS class_8509 Conditions + FIELD field_44605 recipeId Lnet/minecraft/class_2960; + FIELD field_44606 ingredients Ljava/util/List; + METHOD (Ljava/util/Optional;Lnet/minecraft/class_2960;Ljava/util/List;)V + ARG 1 playerPredicate + ARG 2 recipeId + ARG 3 ingredients + METHOD method_51352 create (Lnet/minecraft/class_2960;)Lnet/minecraft/class_175; + ARG 0 recipeId + METHOD method_51353 create (Lnet/minecraft/class_2960;Ljava/util/List;)Lnet/minecraft/class_175; + ARG 0 recipeId + ARG 1 ingredients + METHOD method_51354 matches (Lnet/minecraft/class_2960;Ljava/util/List;)Z + ARG 1 recipeId + ARG 2 ingredients diff --git a/mappings/net/minecraft/advancement/criterion/RecipeUnlockedCriterion.mapping b/mappings/net/minecraft/advancement/criterion/RecipeUnlockedCriterion.mapping index 73a63cbabd..d0b94fb510 100644 --- a/mappings/net/minecraft/advancement/criterion/RecipeUnlockedCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/RecipeUnlockedCriterion.mapping @@ -1,16 +1,13 @@ CLASS net/minecraft/class_2119 net/minecraft/advancement/criterion/RecipeUnlockedCriterion - FIELD field_9738 ID Lnet/minecraft/class_2960; - METHOD method_22508 (Lnet/minecraft/class_1860;Lnet/minecraft/class_2119$class_2121;)Z + METHOD method_22508 (Lnet/minecraft/class_8786;Lnet/minecraft/class_2119$class_2121;)Z ARG 1 conditions - METHOD method_27847 create (Lnet/minecraft/class_2960;)Lnet/minecraft/class_2119$class_2121; + METHOD method_27847 create (Lnet/minecraft/class_2960;)Lnet/minecraft/class_175; ARG 0 id - METHOD method_9107 trigger (Lnet/minecraft/class_3222;Lnet/minecraft/class_1860;)V + METHOD method_9107 trigger (Lnet/minecraft/class_3222;Lnet/minecraft/class_8786;)V ARG 1 player - ARG 2 recipe CLASS class_2121 Conditions FIELD field_9742 recipe Lnet/minecraft/class_2960; - METHOD (Lnet/minecraft/class_2048$class_5258;Lnet/minecraft/class_2960;)V - ARG 1 player + METHOD (Ljava/util/Optional;Lnet/minecraft/class_2960;)V + ARG 1 playerPredicate ARG 2 recipe - METHOD method_9112 matches (Lnet/minecraft/class_1860;)Z - ARG 1 recipe + METHOD method_9112 matches (Lnet/minecraft/class_8786;)Z diff --git a/mappings/net/minecraft/advancement/criterion/ShotCrossbowCriterion.mapping b/mappings/net/minecraft/advancement/criterion/ShotCrossbowCriterion.mapping index ecaf775b96..4bbd5eb257 100644 --- a/mappings/net/minecraft/advancement/criterion/ShotCrossbowCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/ShotCrossbowCriterion.mapping @@ -1,18 +1,17 @@ CLASS net/minecraft/class_2123 net/minecraft/advancement/criterion/ShotCrossbowCriterion - FIELD field_9743 ID Lnet/minecraft/class_2960; METHOD method_22509 (Lnet/minecraft/class_1799;Lnet/minecraft/class_2123$class_2125;)Z ARG 1 conditions METHOD method_9115 trigger (Lnet/minecraft/class_3222;Lnet/minecraft/class_1799;)V ARG 1 player ARG 2 stack CLASS class_2125 Conditions - FIELD field_9747 item Lnet/minecraft/class_2073; - METHOD (Lnet/minecraft/class_2048$class_5258;Lnet/minecraft/class_2073;)V - ARG 1 player + FIELD field_9747 item Ljava/util/Optional; + METHOD (Ljava/util/Optional;Ljava/util/Optional;)V + ARG 1 playerPredicate ARG 2 item - METHOD method_35323 create (Lnet/minecraft/class_2073;)Lnet/minecraft/class_2123$class_2125; - ARG 0 itemPredicate - METHOD method_9120 create (Lnet/minecraft/class_1935;)Lnet/minecraft/class_2123$class_2125; + METHOD method_35323 create (Ljava/util/Optional;)Lnet/minecraft/class_175; + ARG 0 item + METHOD method_9120 create (Lnet/minecraft/class_1935;)Lnet/minecraft/class_175; ARG 0 item METHOD method_9121 matches (Lnet/minecraft/class_1799;)Z ARG 1 stack diff --git a/mappings/net/minecraft/advancement/criterion/SlideDownBlockCriterion.mapping b/mappings/net/minecraft/advancement/criterion/SlideDownBlockCriterion.mapping index 5b4f83397e..b6d8318f8e 100644 --- a/mappings/net/minecraft/advancement/criterion/SlideDownBlockCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/SlideDownBlockCriterion.mapping @@ -1,5 +1,4 @@ CLASS net/minecraft/class_4713 net/minecraft/advancement/criterion/SlideDownBlockCriterion - FIELD field_21586 ID Lnet/minecraft/class_2960; METHOD method_23905 (Lnet/minecraft/class_2248;Ljava/lang/String;)V ARG 1 key METHOD method_23906 (Lnet/minecraft/class_2680;Lnet/minecraft/class_4713$class_4714;)Z @@ -11,12 +10,12 @@ CLASS net/minecraft/class_4713 net/minecraft/advancement/criterion/SlideDownBloc ARG 2 state CLASS class_4714 Conditions FIELD field_21587 block Lnet/minecraft/class_2248; - FIELD field_21588 state Lnet/minecraft/class_4559; - METHOD (Lnet/minecraft/class_2048$class_5258;Lnet/minecraft/class_2248;Lnet/minecraft/class_4559;)V - ARG 1 player + FIELD field_21588 state Ljava/util/Optional; + METHOD (Ljava/util/Optional;Lnet/minecraft/class_2248;Ljava/util/Optional;)V + ARG 1 playerPredicate ARG 2 block ARG 3 state - METHOD method_23912 create (Lnet/minecraft/class_2248;)Lnet/minecraft/class_4713$class_4714; + METHOD method_23912 create (Lnet/minecraft/class_2248;)Lnet/minecraft/class_175; ARG 0 block METHOD method_23913 test (Lnet/minecraft/class_2680;)Z ARG 1 state diff --git a/mappings/net/minecraft/advancement/criterion/StartedRidingCriterion.mapping b/mappings/net/minecraft/advancement/criterion/StartedRidingCriterion.mapping index 851ee1e794..76b7bbacc1 100644 --- a/mappings/net/minecraft/advancement/criterion/StartedRidingCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/StartedRidingCriterion.mapping @@ -1,11 +1,8 @@ CLASS net/minecraft/class_6407 net/minecraft/advancement/criterion/StartedRidingCriterion - FIELD field_33932 ID Lnet/minecraft/class_2960; METHOD method_37257 trigger (Lnet/minecraft/class_3222;)V ARG 1 player METHOD method_37259 (Lnet/minecraft/class_6407$class_6408;)Z ARG 0 conditions CLASS class_6408 Conditions - METHOD (Lnet/minecraft/class_2048$class_5258;)V - ARG 1 player - METHOD method_37260 create (Lnet/minecraft/class_2048$class_2049;)Lnet/minecraft/class_6407$class_6408; + METHOD method_37260 create (Lnet/minecraft/class_2048$class_2049;)Lnet/minecraft/class_175; ARG 0 player diff --git a/mappings/net/minecraft/advancement/criterion/SummonedEntityCriterion.mapping b/mappings/net/minecraft/advancement/criterion/SummonedEntityCriterion.mapping index 19bea0f8a2..686cb285a6 100644 --- a/mappings/net/minecraft/advancement/criterion/SummonedEntityCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/SummonedEntityCriterion.mapping @@ -1,16 +1,15 @@ CLASS net/minecraft/class_2128 net/minecraft/advancement/criterion/SummonedEntityCriterion - FIELD field_9748 ID Lnet/minecraft/class_2960; METHOD method_22537 (Lnet/minecraft/class_47;Lnet/minecraft/class_2128$class_2130;)Z ARG 1 conditions METHOD method_9124 trigger (Lnet/minecraft/class_3222;Lnet/minecraft/class_1297;)V ARG 1 player ARG 2 entity CLASS class_2130 Conditions - FIELD field_9752 entity Lnet/minecraft/class_2048$class_5258; - METHOD (Lnet/minecraft/class_2048$class_5258;Lnet/minecraft/class_2048$class_5258;)V - ARG 1 player + FIELD field_9752 entity Ljava/util/Optional; + METHOD (Ljava/util/Optional;Ljava/util/Optional;)V + ARG 1 playerPredicate ARG 2 entity - METHOD method_9129 create (Lnet/minecraft/class_2048$class_2049;)Lnet/minecraft/class_2128$class_2130; + METHOD method_9129 create (Lnet/minecraft/class_2048$class_2049;)Lnet/minecraft/class_175; ARG 0 summonedEntityPredicateBuilder METHOD method_9130 matches (Lnet/minecraft/class_47;)Z - ARG 1 summonedEntityContext + ARG 1 entity diff --git a/mappings/net/minecraft/advancement/criterion/TameAnimalCriterion.mapping b/mappings/net/minecraft/advancement/criterion/TameAnimalCriterion.mapping index 1249bdd03e..7e3a849f31 100644 --- a/mappings/net/minecraft/advancement/criterion/TameAnimalCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/TameAnimalCriterion.mapping @@ -1,17 +1,15 @@ CLASS net/minecraft/class_2131 net/minecraft/advancement/criterion/TameAnimalCriterion - FIELD field_9753 ID Lnet/minecraft/class_2960; METHOD method_22538 (Lnet/minecraft/class_47;Lnet/minecraft/class_2131$class_2133;)Z ARG 1 conditions METHOD method_9132 trigger (Lnet/minecraft/class_3222;Lnet/minecraft/class_1429;)V ARG 1 player ARG 2 entity CLASS class_2133 Conditions - FIELD field_9757 entity Lnet/minecraft/class_2048$class_5258; - METHOD (Lnet/minecraft/class_2048$class_5258;Lnet/minecraft/class_2048$class_5258;)V - ARG 1 player + FIELD field_9757 entity Ljava/util/Optional; + METHOD (Ljava/util/Optional;Ljava/util/Optional;)V + ARG 1 playerPredicate ARG 2 entity - METHOD method_16114 create (Lnet/minecraft/class_2048;)Lnet/minecraft/class_2131$class_2133; - ARG 0 entity - METHOD method_9138 any ()Lnet/minecraft/class_2131$class_2133; + METHOD method_16114 create (Lnet/minecraft/class_2048$class_2049;)Lnet/minecraft/class_175; + METHOD method_9138 any ()Lnet/minecraft/class_175; METHOD method_9139 matches (Lnet/minecraft/class_47;)Z - ARG 1 tamedEntityContext + ARG 1 entity diff --git a/mappings/net/minecraft/advancement/criterion/TargetHitCriterion.mapping b/mappings/net/minecraft/advancement/criterion/TargetHitCriterion.mapping index 7a33c11260..6297a3f33e 100644 --- a/mappings/net/minecraft/advancement/criterion/TargetHitCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/TargetHitCriterion.mapping @@ -1,5 +1,4 @@ CLASS net/minecraft/class_4851 net/minecraft/advancement/criterion/TargetHitCriterion - FIELD field_22429 ID Lnet/minecraft/class_2960; METHOD method_24861 trigger (Lnet/minecraft/class_3222;Lnet/minecraft/class_1297;Lnet/minecraft/class_243;I)V ARG 1 player ARG 2 projectile @@ -9,15 +8,15 @@ CLASS net/minecraft/class_4851 net/minecraft/advancement/criterion/TargetHitCrit ARG 3 conditions CLASS class_4852 Conditions FIELD field_22430 signalStrength Lnet/minecraft/class_2096$class_2100; - FIELD field_22512 projectile Lnet/minecraft/class_2048$class_5258; - METHOD (Lnet/minecraft/class_2048$class_5258;Lnet/minecraft/class_2096$class_2100;Lnet/minecraft/class_2048$class_5258;)V - ARG 1 player + FIELD field_22512 projectile Ljava/util/Optional; + METHOD (Ljava/util/Optional;Lnet/minecraft/class_2096$class_2100;Ljava/util/Optional;)V + ARG 1 playerPredicate ARG 2 signalStrength ARG 3 projectile - METHOD method_24865 create (Lnet/minecraft/class_2096$class_2100;Lnet/minecraft/class_2048$class_5258;)Lnet/minecraft/class_4851$class_4852; + METHOD method_24865 create (Lnet/minecraft/class_2096$class_2100;Ljava/util/Optional;)Lnet/minecraft/class_175; ARG 0 signalStrength ARG 1 projectile METHOD method_24952 test (Lnet/minecraft/class_47;Lnet/minecraft/class_243;I)Z - ARG 1 projectileContext + ARG 1 projectile ARG 2 hitPos ARG 3 signalStrength diff --git a/mappings/net/minecraft/advancement/criterion/ThrownItemPickedUpByEntityCriterion.mapping b/mappings/net/minecraft/advancement/criterion/ThrownItemPickedUpByEntityCriterion.mapping index 64dc5e0607..cb0bd8fb3f 100644 --- a/mappings/net/minecraft/advancement/criterion/ThrownItemPickedUpByEntityCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/ThrownItemPickedUpByEntityCriterion.mapping @@ -1,7 +1,4 @@ CLASS net/minecraft/class_5279 net/minecraft/advancement/criterion/ThrownItemPickedUpByEntityCriterion - FIELD field_24492 id Lnet/minecraft/class_2960; - METHOD (Lnet/minecraft/class_2960;)V - ARG 1 id METHOD method_27975 trigger (Lnet/minecraft/class_3222;Lnet/minecraft/class_1799;Lnet/minecraft/class_1297;)V ARG 1 player ARG 2 stack @@ -9,22 +6,20 @@ CLASS net/minecraft/class_5279 net/minecraft/advancement/criterion/ThrownItemPic METHOD method_27976 (Lnet/minecraft/class_3222;Lnet/minecraft/class_1799;Lnet/minecraft/class_47;Lnet/minecraft/class_5279$class_5280;)Z ARG 3 conditions CLASS class_5280 Conditions - FIELD field_24493 item Lnet/minecraft/class_2073; - FIELD field_24494 entity Lnet/minecraft/class_2048$class_5258; - METHOD (Lnet/minecraft/class_2960;Lnet/minecraft/class_2048$class_5258;Lnet/minecraft/class_2073;Lnet/minecraft/class_2048$class_5258;)V - ARG 1 id - ARG 2 player + FIELD field_24493 item Ljava/util/Optional; + FIELD field_24494 entity Ljava/util/Optional; + METHOD (Ljava/util/Optional;Ljava/util/Optional;Ljava/util/Optional;)V + ARG 2 playerPredicate ARG 3 item - ARG 4 entity - METHOD method_27978 createThrownItemPickedUpByEntity (Lnet/minecraft/class_2048$class_5258;Lnet/minecraft/class_2073;Lnet/minecraft/class_2048$class_5258;)Lnet/minecraft/class_5279$class_5280; + METHOD method_27978 createThrownItemPickedUpByEntity (Lnet/minecraft/class_5258;Ljava/util/Optional;Ljava/util/Optional;)Lnet/minecraft/class_175; ARG 0 player ARG 1 item ARG 2 entity METHOD method_27979 test (Lnet/minecraft/class_3222;Lnet/minecraft/class_1799;Lnet/minecraft/class_47;)Z ARG 1 player ARG 2 stack - ARG 3 entityContext - METHOD method_43277 createThrownItemPickedUpByPlayer (Lnet/minecraft/class_2048$class_5258;Lnet/minecraft/class_2073;Lnet/minecraft/class_2048$class_5258;)Lnet/minecraft/class_5279$class_5280; - ARG 0 player + ARG 3 entity + METHOD method_43277 createThrownItemPickedUpByPlayer (Ljava/util/Optional;Ljava/util/Optional;Ljava/util/Optional;)Lnet/minecraft/class_175; + ARG 0 playerPredicate ARG 1 item ARG 2 entity diff --git a/mappings/net/minecraft/advancement/criterion/TickCriterion.mapping b/mappings/net/minecraft/advancement/criterion/TickCriterion.mapping index 9522fa03d4..aac466e805 100644 --- a/mappings/net/minecraft/advancement/criterion/TickCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/TickCriterion.mapping @@ -1,19 +1,17 @@ CLASS net/minecraft/class_2135 net/minecraft/advancement/criterion/TickCriterion - FIELD field_9758 id Lnet/minecraft/class_2960; - METHOD (Lnet/minecraft/class_2960;)V - ARG 1 id METHOD method_29964 (Lnet/minecraft/class_2135$class_2137;)Z ARG 0 conditions METHOD method_9141 trigger (Lnet/minecraft/class_3222;)V ARG 1 player CLASS class_2137 Conditions - METHOD method_43135 createLocation (Lnet/minecraft/class_2048;)Lnet/minecraft/class_2135$class_2137; + METHOD method_43135 createLocation (Ljava/util/Optional;)Lnet/minecraft/class_175; ARG 0 entity - METHOD method_43136 createLocation (Lnet/minecraft/class_2248;Lnet/minecraft/class_1792;)Lnet/minecraft/class_2135$class_2137; + METHOD method_43136 createLocation (Lnet/minecraft/class_2248;Lnet/minecraft/class_1792;)Lnet/minecraft/class_175; ARG 0 block ARG 1 item - METHOD method_43137 createLocation (Lnet/minecraft/class_2090;)Lnet/minecraft/class_2135$class_2137; + METHOD method_43137 createLocation (Lnet/minecraft/class_2090$class_2091;)Lnet/minecraft/class_175; ARG 0 location - METHOD method_43138 createSleptInBed ()Lnet/minecraft/class_2135$class_2137; - METHOD method_43139 createHeroOfTheVillage ()Lnet/minecraft/class_2135$class_2137; - METHOD method_43279 createAvoidVibration ()Lnet/minecraft/class_2135$class_2137; + METHOD method_43138 createSleptInBed ()Lnet/minecraft/class_175; + METHOD method_43139 createHeroOfTheVillage ()Lnet/minecraft/class_175; + METHOD method_43279 createAvoidVibration ()Lnet/minecraft/class_175; + METHOD method_49195 createTick ()Lnet/minecraft/class_175; diff --git a/mappings/net/minecraft/advancement/criterion/TravelCriterion.mapping b/mappings/net/minecraft/advancement/criterion/TravelCriterion.mapping index d80163bd32..e0bb472673 100644 --- a/mappings/net/minecraft/advancement/criterion/TravelCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/TravelCriterion.mapping @@ -1,30 +1,24 @@ CLASS net/minecraft/class_2108 net/minecraft/advancement/criterion/TravelCriterion - FIELD field_9717 id Lnet/minecraft/class_2960; - METHOD (Lnet/minecraft/class_2960;)V - ARG 1 id METHOD method_22486 (Lnet/minecraft/class_3222;Lnet/minecraft/class_243;Lnet/minecraft/class_243;Lnet/minecraft/class_2108$class_2110;)Z ARG 3 conditions METHOD method_9080 trigger (Lnet/minecraft/class_3222;Lnet/minecraft/class_243;)V ARG 1 player ARG 2 startPos CLASS class_2110 Conditions - FIELD field_35040 startPos Lnet/minecraft/class_2090; - FIELD field_9723 distance Lnet/minecraft/class_2025; - METHOD (Lnet/minecraft/class_2960;Lnet/minecraft/class_2048$class_5258;Lnet/minecraft/class_2090;Lnet/minecraft/class_2025;)V - ARG 1 id - ARG 2 entity + FIELD field_35040 startPos Ljava/util/Optional; + FIELD field_9723 distance Ljava/util/Optional; + METHOD (Ljava/util/Optional;Ljava/util/Optional;Ljava/util/Optional;)V + ARG 2 playerPredicate ARG 3 startPos - ARG 4 distance - METHOD method_38850 rideEntityInLava (Lnet/minecraft/class_2048$class_2049;Lnet/minecraft/class_2025;)Lnet/minecraft/class_2108$class_2110; + METHOD method_38850 rideEntityInLava (Lnet/minecraft/class_2048$class_2049;Lnet/minecraft/class_2025;)Lnet/minecraft/class_175; ARG 0 entity ARG 1 distance - METHOD method_38851 fallFromHeight (Lnet/minecraft/class_2048$class_2049;Lnet/minecraft/class_2025;Lnet/minecraft/class_2090;)Lnet/minecraft/class_2108$class_2110; + METHOD method_38851 fallFromHeight (Lnet/minecraft/class_2048$class_2049;Lnet/minecraft/class_2025;Lnet/minecraft/class_2090$class_2091;)Lnet/minecraft/class_175; ARG 0 entity ARG 1 distance - ARG 2 startPos - METHOD method_9085 netherTravel (Lnet/minecraft/class_2025;)Lnet/minecraft/class_2108$class_2110; + METHOD method_9085 netherTravel (Lnet/minecraft/class_2025;)Lnet/minecraft/class_175; ARG 0 distance METHOD method_9086 matches (Lnet/minecraft/class_3218;Lnet/minecraft/class_243;Lnet/minecraft/class_243;)Z ARG 1 world - ARG 2 startPos + ARG 2 pos ARG 3 endPos diff --git a/mappings/net/minecraft/advancement/criterion/UsedEnderEyeCriterion.mapping b/mappings/net/minecraft/advancement/criterion/UsedEnderEyeCriterion.mapping index e862e4eb40..af185c7acb 100644 --- a/mappings/net/minecraft/advancement/criterion/UsedEnderEyeCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/UsedEnderEyeCriterion.mapping @@ -1,5 +1,4 @@ CLASS net/minecraft/class_2143 net/minecraft/advancement/criterion/UsedEnderEyeCriterion - FIELD field_9768 ID Lnet/minecraft/class_2960; METHOD method_22540 (DLnet/minecraft/class_2143$class_2145;)Z ARG 2 conditions METHOD method_9157 trigger (Lnet/minecraft/class_3222;Lnet/minecraft/class_2338;)V @@ -7,8 +6,8 @@ CLASS net/minecraft/class_2143 net/minecraft/advancement/criterion/UsedEnderEyeC ARG 2 strongholdPos CLASS class_2145 Conditions FIELD field_9772 distance Lnet/minecraft/class_2096$class_2099; - METHOD (Lnet/minecraft/class_2048$class_5258;Lnet/minecraft/class_2096$class_2099;)V - ARG 1 player + METHOD (Ljava/util/Optional;Lnet/minecraft/class_2096$class_2099;)V + ARG 1 playerPredicate ARG 2 distance METHOD method_9162 matches (D)Z ARG 1 distance diff --git a/mappings/net/minecraft/advancement/criterion/UsedTotemCriterion.mapping b/mappings/net/minecraft/advancement/criterion/UsedTotemCriterion.mapping index 83724788c8..43c86ec072 100644 --- a/mappings/net/minecraft/advancement/criterion/UsedTotemCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/UsedTotemCriterion.mapping @@ -1,18 +1,17 @@ CLASS net/minecraft/class_2148 net/minecraft/advancement/criterion/UsedTotemCriterion - FIELD field_9773 ID Lnet/minecraft/class_2960; METHOD method_22541 (Lnet/minecraft/class_1799;Lnet/minecraft/class_2148$class_2150;)Z ARG 1 conditions METHOD method_9165 trigger (Lnet/minecraft/class_3222;Lnet/minecraft/class_1799;)V ARG 1 player ARG 2 stack CLASS class_2150 Conditions - FIELD field_9777 item Lnet/minecraft/class_2073; - METHOD (Lnet/minecraft/class_2048$class_5258;Lnet/minecraft/class_2073;)V - ARG 1 player + FIELD field_9777 item Ljava/util/Optional; + METHOD (Ljava/util/Optional;Ljava/util/Optional;)V + ARG 1 playerPredicate ARG 2 item - METHOD method_35399 create (Lnet/minecraft/class_2073;)Lnet/minecraft/class_2148$class_2150; + METHOD method_35399 create (Lnet/minecraft/class_2073;)Lnet/minecraft/class_175; ARG 0 itemPredicate - METHOD method_9170 create (Lnet/minecraft/class_1935;)Lnet/minecraft/class_2148$class_2150; + METHOD method_9170 create (Lnet/minecraft/class_1935;)Lnet/minecraft/class_175; ARG 0 item METHOD method_9171 matches (Lnet/minecraft/class_1799;)Z ARG 1 stack diff --git a/mappings/net/minecraft/advancement/criterion/UsingItemCriterion.mapping b/mappings/net/minecraft/advancement/criterion/UsingItemCriterion.mapping index 9397cf201f..c4255ddd05 100644 --- a/mappings/net/minecraft/advancement/criterion/UsingItemCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/UsingItemCriterion.mapping @@ -1,16 +1,15 @@ CLASS net/minecraft/class_6409 net/minecraft/advancement/criterion/UsingItemCriterion - FIELD field_33937 ID Lnet/minecraft/class_2960; METHOD method_37262 trigger (Lnet/minecraft/class_3222;Lnet/minecraft/class_1799;)V ARG 1 player ARG 2 stack METHOD method_37263 (Lnet/minecraft/class_1799;Lnet/minecraft/class_6409$class_6410;)Z ARG 1 conditions CLASS class_6410 Conditions - FIELD field_33938 item Lnet/minecraft/class_2073; - METHOD (Lnet/minecraft/class_2048$class_5258;Lnet/minecraft/class_2073;)V - ARG 1 player + FIELD field_33938 item Ljava/util/Optional; + METHOD (Ljava/util/Optional;Ljava/util/Optional;)V + ARG 1 playerPredicate ARG 2 item - METHOD method_37265 create (Lnet/minecraft/class_2048$class_2049;Lnet/minecraft/class_2073$class_2074;)Lnet/minecraft/class_6409$class_6410; + METHOD method_37265 create (Lnet/minecraft/class_2048$class_2049;Lnet/minecraft/class_2073$class_2074;)Lnet/minecraft/class_175; ARG 0 player ARG 1 item METHOD method_37266 test (Lnet/minecraft/class_1799;)Z diff --git a/mappings/net/minecraft/advancement/criterion/VillagerTradeCriterion.mapping b/mappings/net/minecraft/advancement/criterion/VillagerTradeCriterion.mapping index c0f6f6a82a..794ef84329 100644 --- a/mappings/net/minecraft/advancement/criterion/VillagerTradeCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/VillagerTradeCriterion.mapping @@ -1,5 +1,4 @@ CLASS net/minecraft/class_2140 net/minecraft/advancement/criterion/VillagerTradeCriterion - FIELD field_9762 ID Lnet/minecraft/class_2960; METHOD method_22539 (Lnet/minecraft/class_47;Lnet/minecraft/class_1799;Lnet/minecraft/class_2140$class_2142;)Z ARG 2 conditions METHOD method_9146 trigger (Lnet/minecraft/class_3222;Lnet/minecraft/class_3988;Lnet/minecraft/class_1799;)V @@ -7,15 +6,15 @@ CLASS net/minecraft/class_2140 net/minecraft/advancement/criterion/VillagerTrade ARG 2 merchant ARG 3 stack CLASS class_2142 Conditions - FIELD field_9766 item Lnet/minecraft/class_2073; - FIELD field_9767 villager Lnet/minecraft/class_2048$class_5258; - METHOD (Lnet/minecraft/class_2048$class_5258;Lnet/minecraft/class_2048$class_5258;Lnet/minecraft/class_2073;)V - ARG 1 player + FIELD field_9766 item Ljava/util/Optional; + FIELD field_9767 villager Ljava/util/Optional; + METHOD (Ljava/util/Optional;Ljava/util/Optional;Ljava/util/Optional;)V + ARG 1 playerPredicate ARG 2 villager ARG 3 item - METHOD method_38914 create (Lnet/minecraft/class_2048$class_2049;)Lnet/minecraft/class_2140$class_2142; + METHOD method_38914 create (Lnet/minecraft/class_2048$class_2049;)Lnet/minecraft/class_175; ARG 0 playerPredicate - METHOD method_9153 any ()Lnet/minecraft/class_2140$class_2142; + METHOD method_9153 any ()Lnet/minecraft/class_175; METHOD method_9154 matches (Lnet/minecraft/class_47;Lnet/minecraft/class_1799;)Z - ARG 1 merchantContext + ARG 1 villager ARG 2 stack diff --git a/mappings/net/minecraft/block/AbstractBlock.mapping b/mappings/net/minecraft/block/AbstractBlock.mapping index 5260e6b776..bd33073156 100644 --- a/mappings/net/minecraft/block/AbstractBlock.mapping +++ b/mappings/net/minecraft/block/AbstractBlock.mapping @@ -228,7 +228,6 @@ CLASS net/minecraft/class_4970 net/minecraft/block/AbstractBlock FIELD field_23155 settings Lnet/minecraft/class_4970$class_2251; FIELD field_23156 lootTableId Lnet/minecraft/class_2960; 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 FIELD field_23161 randomTicks Z @@ -236,6 +235,7 @@ CLASS net/minecraft/class_4970 net/minecraft/block/AbstractBlock FIELD field_23163 slipperiness F FIELD field_23164 velocityMultiplier F FIELD field_23165 jumpVelocityMultiplier F + FIELD field_40337 requiredFeatures Lnet/minecraft/class_7699; METHOD (Lnet/minecraft/class_4970$class_2251;)V ARG 1 settings METHOD method_17454 createScreenHandlerFactory (Lnet/minecraft/class_2680;Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;)Lnet/minecraft/class_3908; @@ -287,7 +287,7 @@ CLASS net/minecraft/class_4970 net/minecraft/block/AbstractBlock METHOD method_22358 canBucketPlace (Lnet/minecraft/class_2680;Lnet/minecraft/class_3611;)Z COMMENT {@return whether a bucket can replace the block with the fluid} COMMENT - COMMENT

By default, this checks if the block's material allows replacing or is not solid. + COMMENT

By default, this checks if the block allows replacing or is not solid. COMMENT Blocks intended to be unbreakable should override this to implement additional checks. COMMENT COMMENT

This method is called on both the logical client and logical server, so take caution @@ -297,7 +297,7 @@ CLASS net/minecraft/class_4970 net/minecraft/block/AbstractBlock COMMENT @deprecated Consider calling {@link AbstractBlockState#canBucketPlace} instead. See why these methods are deprecated. COMMENT COMMENT @see #canReplace - COMMENT @see Material#isReplaceable + COMMENT @see AbstractBlockState#isReplaceable ARG 1 state ARG 2 fluid METHOD method_25959 getSidesShape (Lnet/minecraft/class_2680;Lnet/minecraft/class_1922;Lnet/minecraft/class_2338;)Lnet/minecraft/class_265; @@ -434,14 +434,14 @@ CLASS net/minecraft/class_4970 net/minecraft/block/AbstractBlock COMMENT COMMENT

Weak redstone power is a power that cannot power a redstone wire when a solid block COMMENT is in between. For example, {@link RedstoneBlock} and {@link TargetBlock} emits weak - COMMENT redstone power only. {@link LeverBlock} and {@link AbstractButtonBlock} emits both + COMMENT redstone power only. {@link LeverBlock} and {@link ButtonBlock} emits both COMMENT weak and strong redstone power depending on the direction. COMMENT COMMENT @deprecated Consider calling {@link AbstractBlockState#getWeakRedstonePower} instead. See why these methods are deprecated. COMMENT COMMENT @see #emitsRedstonePower COMMENT @see #getStrongRedstonePower - COMMENT @see World#isReceivingRedstonePower + COMMENT @see net.minecraft.world.RedstoneView#isReceivingRedstonePower ARG 1 state ARG 2 world ARG 3 pos @@ -451,24 +451,6 @@ CLASS net/minecraft/class_4970 net/minecraft/block/AbstractBlock COMMENT COMMENT @deprecated Consider calling {@link AbstractBlockState#hasSidedTransparency} instead. See why these methods are deprecated. ARG 1 state - METHOD method_9527 getPistonBehavior (Lnet/minecraft/class_2680;)Lnet/minecraft/class_3619; - COMMENT {@return how the piston should handle the block} - COMMENT - COMMENT

Notes on piston behavior: - COMMENT

- COMMENT - COMMENT @deprecated Consider calling {@link AbstractBlockState#getPistonBehavior} instead. See why these methods are deprecated. - COMMENT - COMMENT @see PistonBlock#isMovable - ARG 1 state METHOD method_9530 getOutlineShape (Lnet/minecraft/class_2680;Lnet/minecraft/class_1922;Lnet/minecraft/class_2338;Lnet/minecraft/class_3726;)Lnet/minecraft/class_265; COMMENT @deprecated Consider calling {@link AbstractBlockState#getOutlineShape(BlockView, BlockPos, ShapeContext)} instead. See why these methods are deprecated. ARG 1 state @@ -629,7 +611,7 @@ CLASS net/minecraft/class_4970 net/minecraft/block/AbstractBlock 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; + METHOD method_9560 getDroppedStacks (Lnet/minecraft/class_2680;Lnet/minecraft/class_8567$class_8568;)Ljava/util/List; COMMENT {@return the block's dropped item stacks} COMMENT COMMENT

The default implementation uses loot tables. Blocks with custom drops should @@ -659,18 +641,18 @@ CLASS net/minecraft/class_4970 net/minecraft/block/AbstractBlock COMMENT COMMENT

Experience orbs should only be dropped if {@code dropExperience} is {@code true}. COMMENT {@link Block#dropExperienceWhenMined} can be used to drop experience orbs. - COMMENT {@link OreBlock} provides the implementation for experience-dropping blocks. + COMMENT {@link ExperienceDroppingBlock} provides the implementation for experience-dropping blocks. COMMENT COMMENT @deprecated Consider calling {@link AbstractBlockState#onStacksDropped} instead. See why these methods are deprecated. COMMENT - COMMENT @see OreBlock + COMMENT @see ExperienceDroppingBlock COMMENT @see Block#dropExperienceWhenMined COMMENT @see #getDroppedStacks COMMENT @see #onStateReplaced ARG 1 state ARG 2 world ARG 3 pos - ARG 4 stack + ARG 4 tool ARG 5 dropExperience METHOD method_9569 mirror (Lnet/minecraft/class_2680;Lnet/minecraft/class_2415;)Lnet/minecraft/class_2680; COMMENT {@return {@code state} mirrored by {@code mirror}} @@ -709,7 +691,7 @@ CLASS net/minecraft/class_4970 net/minecraft/block/AbstractBlock METHOD method_9588 scheduledTick (Lnet/minecraft/class_2680;Lnet/minecraft/class_3218;Lnet/minecraft/class_2338;Lnet/minecraft/class_5819;)V COMMENT Called server-side when a block receives a scheduled tick. This can be used like a timer. COMMENT Scheduled ticks are added using {@link - COMMENT WorldAccess#createAndScheduleBlockTick(BlockPos, Block, int)}. Additionally, {@link + COMMENT WorldAccess#scheduleBlockTick(BlockPos, Block, int)}. Additionally, {@link COMMENT #randomTick} by default calls this method; override {@link #randomTick} to disable this COMMENT behavior. COMMENT @@ -727,7 +709,7 @@ CLASS net/minecraft/class_4970 net/minecraft/block/AbstractBlock COMMENT COMMENT @deprecated Consider calling {@link AbstractBlockState#scheduledTick} instead. See why these methods are deprecated. COMMENT - COMMENT @see WorldAccess#createAndScheduleBlockTick(BlockPos, Block, int) + COMMENT @see WorldAccess#scheduleBlockTick(BlockPos, Block, int) COMMENT @see #getStateForNeighborUpdate COMMENT @see #randomTick ARG 1 state @@ -769,14 +751,14 @@ CLASS net/minecraft/class_4970 net/minecraft/block/AbstractBlock COMMENT COMMENT

Strong redstone power is a power that can power a redstone wire when a solid block COMMENT is in between. For example, {@link RedstoneBlock} and {@link TargetBlock} emits weak - COMMENT redstone power only. {@link LeverBlock} and {@link AbstractButtonBlock} emits both + COMMENT redstone power only. {@link LeverBlock} and {@link ButtonBlock} emits both COMMENT weak and strong redstone power. COMMENT COMMENT @deprecated Consider calling {@link AbstractBlockState#getStrongRedstonePower} instead. See why these methods are deprecated. COMMENT COMMENT @see #emitsRedstonePower COMMENT @see #getWeakRedstonePower - COMMENT @see World#isReceivingRedstonePower + COMMENT @see net.minecraft.world.RedstoneView#isReceivingRedstonePower ARG 1 state ARG 2 world ARG 3 pos @@ -817,7 +799,7 @@ CLASS net/minecraft/class_4970 net/minecraft/block/AbstractBlock COMMENT @deprecated Consider calling {@link AbstractBlockState#neighborUpdate} instead. See why these methods are deprecated. COMMENT COMMENT @see #getStateForNeighborUpdate - COMMENT @see World#isReceivingRedstonePower + COMMENT @see net.minecraft.world.RedstoneView#isReceivingRedstonePower ARG 1 state ARG 2 world ARG 3 pos @@ -848,7 +830,7 @@ CLASS net/minecraft/class_4970 net/minecraft/block/AbstractBlock METHOD method_9616 canReplace (Lnet/minecraft/class_2680;Lnet/minecraft/class_1750;)Z COMMENT {@return whether the item can replace the block} COMMENT - COMMENT

By default, this checks if the block's material allows replacing and whether the + COMMENT

By default, this checks if the block allows replacing and whether the COMMENT item differs from the block's item. Items composed of multiple blocks, such as candles, COMMENT vines, or snow layers, should override this to implement additional checks. COMMENT @@ -859,7 +841,7 @@ CLASS net/minecraft/class_4970 net/minecraft/block/AbstractBlock COMMENT @deprecated Consider calling {@link AbstractBlockState#canReplace} instead. See why these methods are deprecated. COMMENT COMMENT @see #canBucketPlace - COMMENT @see Material#isReplaceable + COMMENT @see AbstractBlockState#isReplaceable ARG 1 state ARG 2 context CLASS class_2250 OffsetType @@ -872,7 +854,6 @@ CLASS net/minecraft/class_4970 net/minecraft/block/AbstractBlock FIELD field_10665 soundGroup Lnet/minecraft/class_2498; FIELD field_10666 lootTableId Lnet/minecraft/class_2960; FIELD field_10667 slipperiness F - FIELD field_10668 material Lnet/minecraft/class_3614; FIELD field_10669 hardness F FIELD field_10670 dynamicBounds Z FIELD field_20721 opaque Z @@ -886,13 +867,16 @@ CLASS net/minecraft/class_4970 net/minecraft/block/AbstractBlock FIELD field_23185 postProcessPredicate Lnet/minecraft/class_4970$class_4973; FIELD field_23186 emissiveLightingPredicate Lnet/minecraft/class_4970$class_4973; FIELD field_25185 toolRequired Z - FIELD field_38863 offsetType Ljava/util/function/Function; - METHOD (Lnet/minecraft/class_3614;Ljava/util/function/Function;)V - ARG 1 material - ARG 2 mapColorProvider - METHOD (Lnet/minecraft/class_3614;Lnet/minecraft/class_3620;)V - ARG 1 material - ARG 2 mapColorProvider + FIELD field_40341 blockBreakParticles Z + FIELD field_40342 requiredFeatures Lnet/minecraft/class_7699; + FIELD field_42818 offsetter Ljava/util/Optional; + FIELD field_43394 burnable Z + FIELD field_43395 pistonBehavior Lnet/minecraft/class_3619; + FIELD field_44481 liquid Z + FIELD field_44627 forceNotSolid Z + FIELD field_44628 forceSolid Z + FIELD field_44629 instrument Lnet/minecraft/class_2766; + FIELD field_44630 replaceable Z METHOD method_16228 dropsLike (Lnet/minecraft/class_2248;)Lnet/minecraft/class_4970$class_2251; COMMENT Specifies that a block should drop the same items as a provided block. ARG 1 source @@ -920,11 +904,6 @@ CLASS net/minecraft/class_4970 net/minecraft/block/AbstractBlock ARG 1 world ARG 2 pos ARG 3 type - METHOD method_26240 of (Lnet/minecraft/class_3614;Ljava/util/function/Function;)Lnet/minecraft/class_4970$class_2251; - ARG 0 material - ARG 1 mapColor - METHOD method_26241 (Lnet/minecraft/class_3620;Lnet/minecraft/class_2680;)Lnet/minecraft/class_3620; - ARG 1 state METHOD method_26243 suffocates (Lnet/minecraft/class_4970$class_4973;)Lnet/minecraft/class_4970$class_2251; COMMENT Specifies logic that calculates whether an entity should suffocate if inside of a block. ARG 1 predicate @@ -935,9 +914,9 @@ CLASS net/minecraft/class_4970 net/minecraft/block/AbstractBlock METHOD method_26245 blockVision (Lnet/minecraft/class_4970$class_4973;)Lnet/minecraft/class_4970$class_2251; ARG 1 predicate METHOD method_26246 (Lnet/minecraft/class_2680;Lnet/minecraft/class_1922;Lnet/minecraft/class_2338;)Z - ARG 1 state - ARG 2 world - ARG 3 pos + ARG 0 state + ARG 1 world + ARG 2 pos METHOD method_26247 postProcess (Lnet/minecraft/class_4970$class_4973;)Lnet/minecraft/class_4970$class_2251; ARG 1 predicate METHOD method_26248 (Lnet/minecraft/class_2680;Lnet/minecraft/class_1922;Lnet/minecraft/class_2338;)Z @@ -950,24 +929,43 @@ CLASS net/minecraft/class_4970 net/minecraft/block/AbstractBlock METHOD method_29292 requiresTool ()Lnet/minecraft/class_4970$class_2251; METHOD method_31710 mapColor (Lnet/minecraft/class_3620;)Lnet/minecraft/class_4970$class_2251; ARG 1 color - METHOD method_31711 (Lnet/minecraft/class_3620;Lnet/minecraft/class_2680;)Lnet/minecraft/class_3620; - ARG 1 state METHOD method_36557 hardness (F)Lnet/minecraft/class_4970$class_2251; ARG 1 hardness METHOD method_36558 resistance (F)Lnet/minecraft/class_4970$class_2251; ARG 1 resistance METHOD method_42327 dropsNothing ()Lnet/minecraft/class_4970$class_2251; - METHOD method_43281 offsetType (Lnet/minecraft/class_4970$class_2250;)Lnet/minecraft/class_4970$class_2251; + METHOD method_45476 requires ([Lnet/minecraft/class_7696;)Lnet/minecraft/class_4970$class_2251; + ARG 1 features + METHOD method_45477 noBlockBreakParticles ()Lnet/minecraft/class_4970$class_2251; + METHOD method_49229 offset (Lnet/minecraft/class_4970$class_2250;)Lnet/minecraft/class_4970$class_2251; ARG 1 offsetType - METHOD method_43282 (Lnet/minecraft/class_4970$class_2250;Lnet/minecraft/class_2680;)Lnet/minecraft/class_4970$class_2250; - ARG 1 state - METHOD method_43283 (Lnet/minecraft/class_2680;)Lnet/minecraft/class_4970$class_2250; + METHOD method_49230 (Lnet/minecraft/class_2680;Lnet/minecraft/class_1922;Lnet/minecraft/class_2338;)Lnet/minecraft/class_243; ARG 0 state - METHOD method_43284 offsetType (Ljava/util/function/Function;)Lnet/minecraft/class_4970$class_2251; - ARG 1 offsetType - METHOD method_9617 of (Lnet/minecraft/class_3614;Lnet/minecraft/class_1767;)Lnet/minecraft/class_4970$class_2251; - ARG 0 material + ARG 1 world + ARG 2 pos + METHOD method_49231 (Lnet/minecraft/class_2680;Lnet/minecraft/class_1922;Lnet/minecraft/class_2338;)Lnet/minecraft/class_243; + ARG 0 state + ARG 1 world + ARG 2 pos + METHOD method_50012 pistonBehavior (Lnet/minecraft/class_3619;)Lnet/minecraft/class_4970$class_2251; + ARG 1 pistonBehavior + METHOD method_50013 burnable ()Lnet/minecraft/class_4970$class_2251; + METHOD method_51177 liquid ()Lnet/minecraft/class_4970$class_2251; + METHOD method_51368 instrument (Lnet/minecraft/class_2766;)Lnet/minecraft/class_4970$class_2251; + ARG 1 instrument + METHOD method_51369 solid ()Lnet/minecraft/class_4970$class_2251; + METHOD method_51370 notSolid ()Lnet/minecraft/class_4970$class_2251; + METHOD method_51371 replaceable ()Lnet/minecraft/class_4970$class_2251; + METHOD method_51517 mapColor (Lnet/minecraft/class_1767;)Lnet/minecraft/class_4970$class_2251; ARG 1 color + METHOD method_51518 (Lnet/minecraft/class_1767;Lnet/minecraft/class_2680;)Lnet/minecraft/class_3620; + ARG 1 state + METHOD method_51519 (Lnet/minecraft/class_3620;Lnet/minecraft/class_2680;)Lnet/minecraft/class_3620; + ARG 1 state + METHOD method_51520 mapColor (Ljava/util/function/Function;)Lnet/minecraft/class_4970$class_2251; + ARG 1 mapColorProvider + METHOD method_51521 (Lnet/minecraft/class_2680;)Lnet/minecraft/class_3620; + ARG 0 state METHOD method_9618 breakInstantly ()Lnet/minecraft/class_4970$class_2251; COMMENT Specifies that a block is broken instantly. METHOD method_9624 dynamicBounds ()Lnet/minecraft/class_4970$class_2251; @@ -993,18 +991,13 @@ CLASS net/minecraft/class_4970 net/minecraft/block/AbstractBlock COMMENT Specifies that a block should have no collision bounds. COMMENT COMMENT

This also marks a block as non-opaque. - METHOD method_9637 of (Lnet/minecraft/class_3614;)Lnet/minecraft/class_4970$class_2251; - ARG 0 material - METHOD method_9639 of (Lnet/minecraft/class_3614;Lnet/minecraft/class_3620;)Lnet/minecraft/class_4970$class_2251; - ARG 0 material - ARG 1 color + METHOD method_9637 create ()Lnet/minecraft/class_4970$class_2251; METHOD method_9640 ticksRandomly ()Lnet/minecraft/class_4970$class_2251; CLASS class_4971 AbstractBlockState FIELD field_23166 shapeCache Lnet/minecraft/class_4970$class_4971$class_3752; FIELD field_23167 luminance I FIELD field_23168 hasSidedTransparency Z FIELD field_23169 isAir Z - FIELD field_23170 material Lnet/minecraft/class_3614; FIELD field_23171 mapColor Lnet/minecraft/class_3620; FIELD field_23172 hardness F FIELD field_23173 opaque Z @@ -1014,7 +1007,16 @@ CLASS net/minecraft/class_4970 net/minecraft/block/AbstractBlock FIELD field_23177 postProcessPredicate Lnet/minecraft/class_4970$class_4973; FIELD field_23178 emissiveLightingPredicate Lnet/minecraft/class_4970$class_4973; FIELD field_25184 toolRequired Z - FIELD field_38862 offsetType Lnet/minecraft/class_4970$class_2250; + FIELD field_40338 blockBreakParticles Z + FIELD field_40339 fluidState Lnet/minecraft/class_3610; + FIELD field_40340 ticksRandomly Z + FIELD field_42817 offsetter Ljava/util/Optional; + FIELD field_43392 burnable Z + FIELD field_43393 pistonBehavior Lnet/minecraft/class_3619; + FIELD field_44480 liquid Z + FIELD field_44624 solid Z + FIELD field_44625 instrument Lnet/minecraft/class_2766; + FIELD field_44626 replaceable Z METHOD (Lnet/minecraft/class_2248;Lcom/google/common/collect/ImmutableMap;Lcom/mojang/serialization/MapCodec;)V ARG 1 block ARG 2 propertyMap @@ -1027,7 +1029,7 @@ CLASS net/minecraft/class_4970 net/minecraft/block/AbstractBlock ARG 3 pos METHOD method_26166 canReplace (Lnet/minecraft/class_1750;)Z ARG 1 context - METHOD method_26167 isTranslucent (Lnet/minecraft/class_1922;Lnet/minecraft/class_2338;)Z + METHOD method_26167 isTransparent (Lnet/minecraft/class_1922;Lnet/minecraft/class_2338;)Z ARG 1 world ARG 2 pos METHOD method_26168 hasSolidTopSurface (Lnet/minecraft/class_1922;Lnet/minecraft/class_2338;Lnet/minecraft/class_1297;)Z @@ -1084,7 +1086,7 @@ CLASS net/minecraft/class_4970 net/minecraft/block/AbstractBlock METHOD method_26180 onStacksDropped (Lnet/minecraft/class_3218;Lnet/minecraft/class_2338;Lnet/minecraft/class_1799;Z)V ARG 1 world ARG 2 pos - ARG 3 stack + ARG 3 tool ARG 4 dropExperience METHOD method_26181 neighborUpdate (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_2248;Lnet/minecraft/class_2338;Z)V ARG 1 world @@ -1114,7 +1116,7 @@ CLASS net/minecraft/class_4970 net/minecraft/block/AbstractBlock ARG 2 direction METHOD method_26188 canBucketPlace (Lnet/minecraft/class_3611;)Z ARG 1 fluid - METHOD method_26189 getDroppedStacks (Lnet/minecraft/class_47$class_48;)Ljava/util/List; + METHOD method_26189 getDroppedStacks (Lnet/minecraft/class_8567$class_8568;)Ljava/util/List; ARG 1 builder METHOD method_26190 getRenderingSeed (Lnet/minecraft/class_2338;)J ARG 1 pos @@ -1184,7 +1186,6 @@ CLASS net/minecraft/class_4970 net/minecraft/block/AbstractBlock ARG 1 world ARG 2 pos ARG 3 direction - METHOD method_26207 getMaterial ()Lnet/minecraft/class_3614; METHOD method_26208 hasEmissiveLighting (Lnet/minecraft/class_1922;Lnet/minecraft/class_2338;)Z ARG 1 world ARG 2 pos @@ -1268,10 +1269,22 @@ CLASS net/minecraft/class_4970 net/minecraft/block/AbstractBlock ARG 1 blocks METHOD method_40144 streamTags ()Ljava/util/stream/Stream; METHOD method_41520 getRegistryEntry ()Lnet/minecraft/class_6880; - METHOD method_43280 getOffsetType ()Lnet/minecraft/class_4970$class_2250; + METHOD method_45474 isReplaceable ()Z + METHOD method_45475 hasBlockBreakParticles ()Z + METHOD method_49227 (Lnet/minecraft/class_1922;Lnet/minecraft/class_2338;Lnet/minecraft/class_4970$class_8176;)Lnet/minecraft/class_243; + ARG 3 offsetter + METHOD method_49228 hasModelOffset ()Z + METHOD method_50011 isBurnable ()Z + METHOD method_51176 isLiquid ()Z + METHOD method_51364 getInstrument ()Lnet/minecraft/class_2766; + METHOD method_51365 shouldBeSolid ()Z + METHOD method_51366 blocksMovement ()Z + METHOD method_51367 isSolid ()Z + METHOD method_53257 isOf (Lnet/minecraft/class_6880;)Z + ARG 1 blockEntry CLASS class_3752 ShapeCache FIELD field_16555 lightSubtracted I - FIELD field_16556 translucent Z + FIELD field_16556 transparent Z FIELD field_16557 fullOpaque Z FIELD field_16559 DIRECTIONS [Lnet/minecraft/class_2350; FIELD field_16560 extrudedFaces [Lnet/minecraft/class_265; @@ -1301,3 +1314,8 @@ CLASS net/minecraft/class_4970 net/minecraft/block/AbstractBlock ARG 1 state ARG 2 world ARG 3 pos + CLASS class_8176 Offsetter + METHOD evaluate (Lnet/minecraft/class_2680;Lnet/minecraft/class_1922;Lnet/minecraft/class_2338;)Lnet/minecraft/class_243; + ARG 1 state + ARG 2 world + ARG 3 pos diff --git a/mappings/net/minecraft/block/AbstractCauldronBlock.mapping b/mappings/net/minecraft/block/AbstractCauldronBlock.mapping index 8b25da13d2..5ee74a5395 100644 --- a/mappings/net/minecraft/block/AbstractCauldronBlock.mapping +++ b/mappings/net/minecraft/block/AbstractCauldronBlock.mapping @@ -1,10 +1,24 @@ CLASS net/minecraft/class_2275 net/minecraft/block/AbstractCauldronBlock + COMMENT The base class for all cauldrons. + COMMENT + COMMENT

Interaction with cauldrons is controlled by {@linkplain CauldronBehavior + COMMENT cauldron behaviors}. + COMMENT + COMMENT @see CauldronBlock empty cauldrons + COMMENT @see LavaCauldronBlock cauldrons filled with lava + COMMENT @see LeveledCauldronBlock cauldrons with varying levels of contents + COMMENT @see PowderSnowCauldronBlock cauldrons filled with powder snow FIELD field_10746 OUTLINE_SHAPE Lnet/minecraft/class_265; FIELD field_10747 RAYCAST_SHAPE Lnet/minecraft/class_265; FIELD field_27084 behaviorMap Ljava/util/Map; METHOD (Lnet/minecraft/class_4970$class_2251;Ljava/util/Map;)V + COMMENT Constructs a cauldron block. + COMMENT + COMMENT

The behavior map must match {@link CauldronBehavior#createMap} by providing + COMMENT a nonnull value for all items. ARG 1 settings ARG 2 behaviorMap + COMMENT the map containing cauldron behaviors for each item METHOD method_31615 getFluidHeight (Lnet/minecraft/class_2680;)D ARG 1 state METHOD method_31616 isEntityTouchingFluid (Lnet/minecraft/class_2680;Lnet/minecraft/class_2338;Lnet/minecraft/class_1297;)Z @@ -12,11 +26,23 @@ CLASS net/minecraft/class_2275 net/minecraft/block/AbstractCauldronBlock ARG 2 pos ARG 3 entity METHOD method_32764 fillFromDripstone (Lnet/minecraft/class_2680;Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_3611;)V + COMMENT Fills a cauldron with one level of the specified fluid if possible. ARG 1 state + COMMENT the current cauldron state ARG 2 world + COMMENT the world where the cauldron is located ARG 3 pos + COMMENT the cauldron's position ARG 4 fluid + COMMENT the fluid to fill the cauldron with METHOD method_32765 canBeFilledByDripstone (Lnet/minecraft/class_3611;)Z + COMMENT Checks if this cauldron block can be filled with the specified fluid by dripstone. + COMMENT + COMMENT @return {@code true} if this block can be filled, {@code false} otherwise ARG 1 fluid + COMMENT the fluid to check METHOD method_32766 isFull (Lnet/minecraft/class_2680;)Z + COMMENT {@return {@code true} if the specified cauldron state is completely full, + COMMENT {@code false} otherwise} ARG 1 state + COMMENT the cauldron state to check diff --git a/mappings/net/minecraft/block/AbstractPressurePlateBlock.mapping b/mappings/net/minecraft/block/AbstractPressurePlateBlock.mapping index 92a0cc43f9..1bd27731fa 100644 --- a/mappings/net/minecraft/block/AbstractPressurePlateBlock.mapping +++ b/mappings/net/minecraft/block/AbstractPressurePlateBlock.mapping @@ -1,7 +1,17 @@ CLASS net/minecraft/class_2231 net/minecraft/block/AbstractPressurePlateBlock + FIELD field_42726 blockSetType Lnet/minecraft/class_8177; FIELD field_9941 BOX Lnet/minecraft/class_238; FIELD field_9942 PRESSED_SHAPE Lnet/minecraft/class_265; FIELD field_9943 DEFAULT_SHAPE Lnet/minecraft/class_265; + METHOD (Lnet/minecraft/class_4970$class_2251;Lnet/minecraft/class_8177;)V + ARG 1 settings + ARG 2 blockSetType + METHOD method_52209 (Lnet/minecraft/class_1297;)Z + ARG 0 entity + METHOD method_52210 getEntityCount (Lnet/minecraft/class_1937;Lnet/minecraft/class_238;Ljava/lang/Class;)I + ARG 0 world + ARG 1 box + ARG 2 entityClass METHOD method_9432 setRedstoneOutput (Lnet/minecraft/class_2680;I)Lnet/minecraft/class_2680; ARG 1 state ARG 2 rsOut @@ -16,13 +26,7 @@ CLASS net/minecraft/class_2231 net/minecraft/block/AbstractPressurePlateBlock ARG 2 pos METHOD method_9435 getRedstoneOutput (Lnet/minecraft/class_2680;)I ARG 1 state - METHOD method_9436 playPressSound (Lnet/minecraft/class_1936;Lnet/minecraft/class_2338;)V - ARG 1 world - ARG 2 pos METHOD method_9437 updateNeighbors (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;)V ARG 1 world ARG 2 pos - METHOD method_9438 playDepressSound (Lnet/minecraft/class_1936;Lnet/minecraft/class_2338;)V - ARG 1 world - ARG 2 pos METHOD method_9563 getTickRate ()I diff --git a/mappings/net/minecraft/block/AbstractRedstoneGateBlock.mapping b/mappings/net/minecraft/block/AbstractRedstoneGateBlock.mapping index 5b16c61a2c..f2c3b36de1 100644 --- a/mappings/net/minecraft/block/AbstractRedstoneGateBlock.mapping +++ b/mappings/net/minecraft/block/AbstractRedstoneGateBlock.mapping @@ -1,16 +1,15 @@ CLASS net/minecraft/class_2312 net/minecraft/block/AbstractRedstoneGateBlock FIELD field_10911 POWERED Lnet/minecraft/class_2746; FIELD field_10912 SHAPE Lnet/minecraft/class_265; - METHOD method_10000 getMaxInputLevelSides (Lnet/minecraft/class_4538;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;)I + METHOD method_10000 getMaxInputLevelSides (Lnet/minecraft/class_8235;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;)I ARG 1 world ARG 2 pos ARG 3 state + METHOD method_49816 getSideInputFromGatesOnly ()Z METHOD method_9988 isTargetNotAligned (Lnet/minecraft/class_1922;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;)Z ARG 1 world ARG 2 pos ARG 3 state - METHOD method_9989 isValidInput (Lnet/minecraft/class_2680;)Z - ARG 1 state METHOD method_9990 hasPower (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;)Z ARG 1 world ARG 2 pos @@ -25,10 +24,6 @@ CLASS net/minecraft/class_2312 net/minecraft/block/AbstractRedstoneGateBlock ARG 1 world ARG 2 pos ARG 3 state - METHOD method_9995 getInputLevel (Lnet/minecraft/class_4538;Lnet/minecraft/class_2338;Lnet/minecraft/class_2350;)I - ARG 1 world - 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 diff --git a/mappings/net/minecraft/block/AbstractSignBlock.mapping b/mappings/net/minecraft/block/AbstractSignBlock.mapping index e61e2b9adf..dfc15fb039 100644 --- a/mappings/net/minecraft/block/AbstractSignBlock.mapping +++ b/mappings/net/minecraft/block/AbstractSignBlock.mapping @@ -5,4 +5,25 @@ CLASS net/minecraft/class_2478 net/minecraft/block/AbstractSignBlock METHOD (Lnet/minecraft/class_4970$class_2251;Lnet/minecraft/class_4719;)V ARG 1 settings ARG 2 type - METHOD method_24025 getSignType ()Lnet/minecraft/class_4719; + METHOD method_24025 getWoodType ()Lnet/minecraft/class_4719; + METHOD method_45459 getWoodType (Lnet/minecraft/class_2248;)Lnet/minecraft/class_4719; + ARG 0 block + METHOD method_49814 getRotationDegrees (Lnet/minecraft/class_2680;)F + ARG 1 state + METHOD method_49824 isOtherPlayerEditing (Lnet/minecraft/class_1657;Lnet/minecraft/class_2625;)Z + ARG 1 player + ARG 2 blockEntity + METHOD method_49825 openEditScreen (Lnet/minecraft/class_1657;Lnet/minecraft/class_2625;Z)V + ARG 1 player + ARG 2 blockEntity + ARG 3 front + METHOD method_50003 getCenter (Lnet/minecraft/class_2680;)Lnet/minecraft/class_243; + ARG 1 state + METHOD method_51172 (Lnet/minecraft/class_2561;)Z + ARG 0 message + METHOD method_51173 isTextLiteralOrEmpty (Lnet/minecraft/class_1657;Lnet/minecraft/class_2625;Z)Z + ARG 1 player + ARG 2 blockEntity + ARG 3 front + METHOD method_52576 getActionResult (Z)Lnet/minecraft/class_1269; + ARG 1 usedSignChanger diff --git a/mappings/net/minecraft/block/BarrierBlock.mapping b/mappings/net/minecraft/block/BarrierBlock.mapping index 387319da50..46d5163873 100644 --- a/mappings/net/minecraft/block/BarrierBlock.mapping +++ b/mappings/net/minecraft/block/BarrierBlock.mapping @@ -1 +1,2 @@ CLASS net/minecraft/class_2213 net/minecraft/block/BarrierBlock + FIELD field_45144 WATERLOGGED Lnet/minecraft/class_2746; diff --git a/mappings/net/minecraft/block/BedBlock.mapping b/mappings/net/minecraft/block/BedBlock.mapping index f41f9f7f30..090e51848b 100644 --- a/mappings/net/minecraft/block/BedBlock.mapping +++ b/mappings/net/minecraft/block/BedBlock.mapping @@ -60,11 +60,12 @@ CLASS net/minecraft/class_2244 net/minecraft/block/BedBlock METHOD method_30840 getAroundBedOffsets (Lnet/minecraft/class_2350;Lnet/minecraft/class_2350;)[[I ARG 0 bedDirection ARG 1 respawnDirection - METHOD method_9484 findWakeUpPosition (Lnet/minecraft/class_1299;Lnet/minecraft/class_1941;Lnet/minecraft/class_2338;F)Ljava/util/Optional; + METHOD method_9484 findWakeUpPosition (Lnet/minecraft/class_1299;Lnet/minecraft/class_1941;Lnet/minecraft/class_2338;Lnet/minecraft/class_2350;F)Ljava/util/Optional; ARG 0 type ARG 1 world ARG 2 pos - ARG 3 spawnAngle + ARG 3 bedDirection + ARG 4 spawnAngle METHOD method_9487 getColor ()Lnet/minecraft/class_1767; METHOD method_9488 getDirectionTowardsOtherPart (Lnet/minecraft/class_2742;Lnet/minecraft/class_2350;)Lnet/minecraft/class_2350; ARG 0 part diff --git a/mappings/net/minecraft/block/BeehiveBlock.mapping b/mappings/net/minecraft/block/BeehiveBlock.mapping index 162ff59eff..8c4c25be98 100644 --- a/mappings/net/minecraft/block/BeehiveBlock.mapping +++ b/mappings/net/minecraft/block/BeehiveBlock.mapping @@ -4,7 +4,7 @@ CLASS net/minecraft/class_4481 net/minecraft/block/BeehiveBlock FIELD field_31011 FULL_HONEY_LEVEL I FIELD field_31012 DROPPED_HONEYCOMB_COUNT I METHOD method_21839 (Lnet/minecraft/class_1268;Lnet/minecraft/class_1657;)V - ARG 1 player + ARG 1 playerx METHOD method_21840 addHoneyParticle (Lnet/minecraft/class_1937;DDDDD)V ARG 1 world ARG 2 minX diff --git a/mappings/net/minecraft/block/Block.mapping b/mappings/net/minecraft/block/Block.mapping index a886a22a54..2cd64756fc 100644 --- a/mappings/net/minecraft/block/Block.mapping +++ b/mappings/net/minecraft/block/Block.mapping @@ -6,12 +6,12 @@ CLASS net/minecraft/class_2248 net/minecraft/block/Block COMMENT COMMENT

There is exactly one instance for every type of block. Every stone COMMENT block for example in a world shares the same block instance. Each block - COMMENT instance is registered under {@link net.minecraft.util.registry.Registry#BLOCK}. + COMMENT instance is registered under {@link net.minecraft.registry.Registries#BLOCK}. COMMENT See {@link Blocks} for examples of block instances. COMMENT COMMENT

An item corresponding to a block is not automatically created. You COMMENT may create your own {@link net.minecraft.item.BlockItem} and register it - COMMENT under {@link net.minecraft.util.registry.Registry#ITEM}. + COMMENT under {@link net.minecraft.registry.Registries#ITEM}. COMMENT COMMENT

The translation key for the block name is determined by {@link COMMENT #getTranslationKey}. @@ -44,8 +44,6 @@ CLASS net/minecraft/class_2248 net/minecraft/block/Block COMMENT Prevents the previous block (container) from dropping items when destroyed. FIELD field_31033 MOVED I COMMENT Signals that the current block is being moved to a different location, usually because of a piston. - FIELD field_31034 SKIP_LIGHTING_UPDATES I - COMMENT Signals that lighting updates should be skipped. FIELD field_31036 NOTIFY_ALL I COMMENT The default setBlockState behavior. Same as {@code NOTIFY_NEIGHBORS | NOTIFY_LISTENERS}. FIELD field_36404 registryEntry Lnet/minecraft/class_6880$class_6883; @@ -89,11 +87,6 @@ CLASS net/minecraft/class_2248 net/minecraft/block/Block METHOD method_34725 getStateWithProperties (Lnet/minecraft/class_2680;)Lnet/minecraft/class_2680; COMMENT Gets a block state with all properties that both this block and the source block state have. ARG 1 state - METHOD method_35257 (Lnet/minecraft/class_3218;Lnet/minecraft/class_2338;Lnet/minecraft/class_1799;)V - ARG 2 stack - METHOD method_35258 dropStacks (Lnet/minecraft/class_2680;Lnet/minecraft/class_47$class_48;)V - ARG 0 state - ARG 1 lootContext METHOD method_36992 dropStack (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_2350;Lnet/minecraft/class_1799;)V ARG 0 world ARG 1 pos @@ -172,7 +165,7 @@ CLASS net/minecraft/class_2248 net/minecraft/block/Block ARG 2 pos ARG 3 blockEntity ARG 4 entity - ARG 5 stack + ARG 5 tool METHOD method_9515 appendProperties (Lnet/minecraft/class_2689$class_2690;)V COMMENT Appends block state properties to this block. To use this, override and call {@link COMMENT StateManager.Builder#add} inside the method. See {@link @@ -191,7 +184,8 @@ CLASS net/minecraft/class_2248 net/minecraft/block/Block COMMENT COMMENT @see net.minecraft.loot.condition.SurvivesExplosionLootCondition ARG 1 explosion - METHOD method_9538 canMobSpawnInside ()Z + METHOD method_9538 canMobSpawnInside (Lnet/minecraft/class_2680;)Z + ARG 1 state METHOD method_9539 getTranslationKey ()Ljava/lang/String; COMMENT {@return the translation key for the name of this block} COMMENT @@ -246,7 +240,7 @@ CLASS net/minecraft/class_2248 net/minecraft/block/Block ARG 3 pos ARG 4 state ARG 5 blockEntity - ARG 6 stack + ARG 6 tool METHOD method_9562 getDroppedStacks (Lnet/minecraft/class_2680;Lnet/minecraft/class_3218;Lnet/minecraft/class_2338;Lnet/minecraft/class_2586;)Ljava/util/List; ARG 0 state ARG 1 world @@ -317,13 +311,7 @@ CLASS net/minecraft/class_2248 net/minecraft/block/Block ARG 0 world ARG 1 pos ARG 2 stack - METHOD method_9578 appendStacks (Lnet/minecraft/class_1761;Lnet/minecraft/class_2371;)V - COMMENT Appends the stacks of this block shown in the item group to the list. - COMMENT - COMMENT @see net.minecraft.item.BlockItem#appendStacks(ItemGroup, DefaultedList) - ARG 1 group - ARG 2 stacks - METHOD method_9579 isTranslucent (Lnet/minecraft/class_2680;Lnet/minecraft/class_1922;Lnet/minecraft/class_2338;)Z + METHOD method_9579 isTransparent (Lnet/minecraft/class_2680;Lnet/minecraft/class_1922;Lnet/minecraft/class_2338;)Z ARG 1 state ARG 2 world ARG 3 pos diff --git a/mappings/net/minecraft/block/BlockSetType.mapping b/mappings/net/minecraft/block/BlockSetType.mapping new file mode 100644 index 0000000000..375e37be82 --- /dev/null +++ b/mappings/net/minecraft/block/BlockSetType.mapping @@ -0,0 +1,22 @@ +CLASS net/minecraft/class_8177 net/minecraft/block/BlockSetType + FIELD field_42819 IRON Lnet/minecraft/class_8177; + FIELD field_42820 GOLD Lnet/minecraft/class_8177; + FIELD field_42821 STONE Lnet/minecraft/class_8177; + FIELD field_42822 POLISHED_BLACKSTONE Lnet/minecraft/class_8177; + FIELD field_42823 OAK Lnet/minecraft/class_8177; + FIELD field_42824 SPRUCE Lnet/minecraft/class_8177; + FIELD field_42825 BIRCH Lnet/minecraft/class_8177; + FIELD field_42826 ACACIA Lnet/minecraft/class_8177; + FIELD field_42827 CHERRY Lnet/minecraft/class_8177; + FIELD field_42828 JUNGLE Lnet/minecraft/class_8177; + FIELD field_42829 DARK_OAK Lnet/minecraft/class_8177; + FIELD field_42830 CRIMSON Lnet/minecraft/class_8177; + FIELD field_42831 WARPED Lnet/minecraft/class_8177; + FIELD field_42832 MANGROVE Lnet/minecraft/class_8177; + FIELD field_42833 BAMBOO Lnet/minecraft/class_8177; + FIELD field_42834 VALUES Ljava/util/Set; + METHOD (Ljava/lang/String;)V + ARG 1 name + METHOD method_49232 stream ()Ljava/util/stream/Stream; + METHOD method_49233 register (Lnet/minecraft/class_8177;)Lnet/minecraft/class_8177; + ARG 0 blockSetType diff --git a/mappings/net/minecraft/block/BlockWithEntity.mapping b/mappings/net/minecraft/block/BlockWithEntity.mapping index bb8dc5d0a9..cd3b2b618e 100644 --- a/mappings/net/minecraft/block/BlockWithEntity.mapping +++ b/mappings/net/minecraft/block/BlockWithEntity.mapping @@ -11,7 +11,7 @@ CLASS net/minecraft/class_2237 net/minecraft/block/BlockWithEntity COMMENT COMMENT @see net.minecraft.block.entity.BlockEntity COMMENT @see BlockEntityProvider - METHOD method_31618 checkType (Lnet/minecraft/class_2591;Lnet/minecraft/class_2591;Lnet/minecraft/class_5558;)Lnet/minecraft/class_5558; + METHOD method_31618 validateTicker (Lnet/minecraft/class_2591;Lnet/minecraft/class_2591;Lnet/minecraft/class_5558;)Lnet/minecraft/class_5558; COMMENT {@return the ticker if the given type and expected type are the same, or {@code null} if they are different} ARG 0 givenType ARG 1 expectedType diff --git a/mappings/net/minecraft/block/Blocks.mapping b/mappings/net/minecraft/block/Blocks.mapping index f86723e12e..5666bfca3c 100644 --- a/mappings/net/minecraft/block/Blocks.mapping +++ b/mappings/net/minecraft/block/Blocks.mapping @@ -167,6 +167,24 @@ CLASS net/minecraft/class_2246 net/minecraft/block/Blocks ARG 0 state METHOD method_41424 (Lnet/minecraft/class_2680;)I ARG 0 state + METHOD method_45451 createWoodenButtonBlock (Lnet/minecraft/class_8177;[Lnet/minecraft/class_7696;)Lnet/minecraft/class_2269; + ARG 0 blockSetType + ARG 1 requiredFeatures + METHOD method_45453 createStoneButtonBlock ()Lnet/minecraft/class_2269; + METHOD method_47375 createBambooBlock (Lnet/minecraft/class_3620;Lnet/minecraft/class_3620;Lnet/minecraft/class_2498;)Lnet/minecraft/class_2465; + ARG 0 topMapColor + ARG 1 sideMapColor + ARG 2 soundGroup + METHOD method_47376 (Lnet/minecraft/class_3620;Lnet/minecraft/class_3620;Lnet/minecraft/class_2680;)Lnet/minecraft/class_3620; + ARG 2 state + METHOD method_50000 createFlowerPotBlock (Lnet/minecraft/class_2248;[Lnet/minecraft/class_7696;)Lnet/minecraft/class_2362; + ARG 0 flower + ARG 1 requiredFeatures + METHOD method_50001 createCandleBlock (Lnet/minecraft/class_3620;)Lnet/minecraft/class_5544; + ARG 0 color + METHOD method_52571 register (Lnet/minecraft/class_2960;Lnet/minecraft/class_2248;)Lnet/minecraft/class_2248; + ARG 0 id + ARG 1 block METHOD method_9492 register (Ljava/lang/String;Lnet/minecraft/class_2248;)Lnet/minecraft/class_2248; ARG 0 id ARG 1 block diff --git a/mappings/net/minecraft/block/BrushableBlock.mapping b/mappings/net/minecraft/block/BrushableBlock.mapping new file mode 100644 index 0000000000..8c7aef7475 --- /dev/null +++ b/mappings/net/minecraft/block/BrushableBlock.mapping @@ -0,0 +1,13 @@ +CLASS net/minecraft/class_8170 net/minecraft/block/BrushableBlock + FIELD field_42774 DUSTED Lnet/minecraft/class_2758; + FIELD field_43232 baseBlock Lnet/minecraft/class_2248; + FIELD field_43233 brushingSound Lnet/minecraft/class_3414; + FIELD field_43234 brushingCompleteSound Lnet/minecraft/class_3414; + METHOD (Lnet/minecraft/class_2248;Lnet/minecraft/class_4970$class_2251;Lnet/minecraft/class_3414;Lnet/minecraft/class_3414;)V + ARG 1 baseBlock + ARG 2 settings + ARG 3 brushingSound + ARG 4 brushingCompleteSound + METHOD method_49810 getBaseBlock ()Lnet/minecraft/class_2248; + METHOD method_49811 getBrushingSound ()Lnet/minecraft/class_3414; + METHOD method_49812 getBrushingCompleteSound ()Lnet/minecraft/class_3414; diff --git a/mappings/net/minecraft/block/AbstractButtonBlock.mapping b/mappings/net/minecraft/block/ButtonBlock.mapping similarity index 84% rename from mappings/net/minecraft/block/AbstractButtonBlock.mapping rename to mappings/net/minecraft/block/ButtonBlock.mapping index 3c1f818bfa..ab5cf3cff2 100644 --- a/mappings/net/minecraft/block/AbstractButtonBlock.mapping +++ b/mappings/net/minecraft/block/ButtonBlock.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_2269 net/minecraft/block/AbstractButtonBlock +CLASS net/minecraft/class_2269 net/minecraft/block/ButtonBlock FIELD field_10715 SOUTH_SHAPE Lnet/minecraft/class_265; FIELD field_10716 FLOOR_Z_SHAPE Lnet/minecraft/class_265; FIELD field_10717 CEILING_X_PRESSED_SHAPE Lnet/minecraft/class_265; @@ -9,7 +9,6 @@ CLASS net/minecraft/class_2269 net/minecraft/block/AbstractButtonBlock FIELD field_10722 FLOOR_X_PRESSED_SHAPE Lnet/minecraft/class_265; FIELD field_10723 FLOOR_X_SHAPE Lnet/minecraft/class_265; FIELD field_10724 SOUTH_PRESSED_SHAPE Lnet/minecraft/class_265; - FIELD field_10725 wooden Z FIELD field_10726 CEILING_Z_PRESSED_SHAPE Lnet/minecraft/class_265; FIELD field_10727 CEILING_Z_SHAPE Lnet/minecraft/class_265; FIELD field_10728 NORTH_SHAPE Lnet/minecraft/class_265; @@ -17,14 +16,18 @@ CLASS net/minecraft/class_2269 net/minecraft/block/AbstractButtonBlock FIELD field_10730 FLOOR_Z_PRESSED_SHAPE Lnet/minecraft/class_265; FIELD field_10731 WEST_SHAPE Lnet/minecraft/class_265; FIELD field_10732 WEST_PRESSED_SHAPE Lnet/minecraft/class_265; - METHOD (ZLnet/minecraft/class_4970$class_2251;)V - ARG 1 wooden - ARG 2 settings + FIELD field_40298 pressTicks I + FIELD field_40299 wooden Z + FIELD field_42753 blockSetType Lnet/minecraft/class_8177; + METHOD (Lnet/minecraft/class_4970$class_2251;Lnet/minecraft/class_8177;IZ)V + ARG 1 settings + ARG 2 blockSetType + ARG 3 pressTicks + ARG 4 wooden METHOD method_21845 powerOn (Lnet/minecraft/class_2680;Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;)V ARG 1 state ARG 2 world ARG 3 pos - METHOD method_26153 getPressTicks ()I METHOD method_9712 getClickSound (Z)Lnet/minecraft/class_3414; ARG 1 powered METHOD method_9713 updateNeighbors (Lnet/minecraft/class_2680;Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;)V diff --git a/mappings/net/minecraft/block/CalibratedSculkSensorBlock.mapping b/mappings/net/minecraft/block/CalibratedSculkSensorBlock.mapping new file mode 100644 index 0000000000..45f9d860f5 --- /dev/null +++ b/mappings/net/minecraft/block/CalibratedSculkSensorBlock.mapping @@ -0,0 +1,7 @@ +CLASS net/minecraft/class_8236 net/minecraft/block/CalibratedSculkSensorBlock + FIELD field_43235 FACING Lnet/minecraft/class_2753; + METHOD method_49813 (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;Lnet/minecraft/class_8239;)V + ARG 0 worldx + ARG 1 pos + ARG 2 statex + ARG 3 blockEntity diff --git a/mappings/net/minecraft/block/CampfireBlock.mapping b/mappings/net/minecraft/block/CampfireBlock.mapping index 20b9cfcefe..7a169742bc 100644 --- a/mappings/net/minecraft/block/CampfireBlock.mapping +++ b/mappings/net/minecraft/block/CampfireBlock.mapping @@ -30,6 +30,6 @@ CLASS net/minecraft/class_3922 net/minecraft/block/CampfireBlock ARG 2 pos ARG 3 state METHOD method_30034 (Lnet/minecraft/class_4970$class_4971;)Z - ARG 0 state + ARG 0 statex METHOD method_30035 canBeLit (Lnet/minecraft/class_2680;)Z ARG 0 state diff --git a/mappings/net/minecraft/block/CandleBlock.mapping b/mappings/net/minecraft/block/CandleBlock.mapping index 66f2d10491..e6d56aeba1 100644 --- a/mappings/net/minecraft/block/CandleBlock.mapping +++ b/mappings/net/minecraft/block/CandleBlock.mapping @@ -10,7 +10,7 @@ CLASS net/minecraft/class_5544 net/minecraft/block/CandleBlock FIELD field_27182 FOUR_CANDLES_SHAPE Lnet/minecraft/class_265; FIELD field_31051 MAX_CANDLE_AMOUNT I METHOD method_31628 (Lnet/minecraft/class_4970$class_4971;)Z - ARG 0 state + ARG 0 statex METHOD method_31630 canBeLit (Lnet/minecraft/class_2680;)Z ARG 0 state METHOD method_31631 (Lnet/minecraft/class_2680;)I diff --git a/mappings/net/minecraft/block/CandleCakeBlock.mapping b/mappings/net/minecraft/block/CandleCakeBlock.mapping index 5e4b7f2647..b558125c46 100644 --- a/mappings/net/minecraft/block/CandleCakeBlock.mapping +++ b/mappings/net/minecraft/block/CandleCakeBlock.mapping @@ -11,7 +11,7 @@ CLASS net/minecraft/class_5545 net/minecraft/block/CandleCakeBlock METHOD method_31632 getCandleCakeFromCandle (Lnet/minecraft/class_2248;)Lnet/minecraft/class_2680; ARG 0 candle METHOD method_31633 (Lnet/minecraft/class_2680;Lnet/minecraft/class_4970$class_4971;)Z - ARG 1 state + ARG 1 statex METHOD method_31634 isHittingCandle (Lnet/minecraft/class_3965;)Z ARG 0 hitResult METHOD method_31635 canBeLit (Lnet/minecraft/class_2680;)Z diff --git a/mappings/net/minecraft/block/CarvedPumpkinBlock.mapping b/mappings/net/minecraft/block/CarvedPumpkinBlock.mapping index ad43b98d14..bfe1dc6921 100644 --- a/mappings/net/minecraft/block/CarvedPumpkinBlock.mapping +++ b/mappings/net/minecraft/block/CarvedPumpkinBlock.mapping @@ -5,6 +5,21 @@ CLASS net/minecraft/class_2276 net/minecraft/block/CarvedPumpkinBlock FIELD field_10751 IS_GOLEM_HEAD_PREDICATE Ljava/util/function/Predicate; FIELD field_10752 ironGolemDispenserPattern Lnet/minecraft/class_2700; FIELD field_10753 ironGolemPattern Lnet/minecraft/class_2700; + METHOD method_45454 breakPatternBlocks (Lnet/minecraft/class_1937;Lnet/minecraft/class_2700$class_2702;)V + ARG 0 world + ARG 1 patternResult + METHOD method_45455 spawnEntity (Lnet/minecraft/class_1937;Lnet/minecraft/class_2700$class_2702;Lnet/minecraft/class_1297;Lnet/minecraft/class_2338;)V + ARG 0 world + ARG 1 patternResult + ARG 2 entity + ARG 3 pos + METHOD method_45456 updatePatternBlocks (Lnet/minecraft/class_1937;Lnet/minecraft/class_2700$class_2702;)V + ARG 0 world + ARG 1 patternResult + METHOD method_51167 (Lnet/minecraft/class_2694;)Z + ARG 0 pos + METHOD method_51168 (Lnet/minecraft/class_2694;)Z + ARG 0 pos METHOD method_9727 getIronGolemDispenserPattern ()Lnet/minecraft/class_2700; METHOD method_9728 (Lnet/minecraft/class_2680;)Z ARG 0 state diff --git a/mappings/net/minecraft/block/CauldronBlock.mapping b/mappings/net/minecraft/block/CauldronBlock.mapping index e84a999a4f..54175ecc8a 100644 --- a/mappings/net/minecraft/block/CauldronBlock.mapping +++ b/mappings/net/minecraft/block/CauldronBlock.mapping @@ -1,4 +1,5 @@ CLASS net/minecraft/class_5546 net/minecraft/block/CauldronBlock + COMMENT An empty cauldron block. FIELD field_34027 FILL_WITH_RAIN_CHANCE F FIELD field_34028 FILL_WITH_SNOW_CHANCE F METHOD method_31636 canFillWithPrecipitation (Lnet/minecraft/class_1937;Lnet/minecraft/class_1959$class_1963;)Z diff --git a/mappings/net/minecraft/block/CaveVines.mapping b/mappings/net/minecraft/block/CaveVines.mapping index d890338c76..cab3ca85d4 100644 --- a/mappings/net/minecraft/block/CaveVines.mapping +++ b/mappings/net/minecraft/block/CaveVines.mapping @@ -3,10 +3,11 @@ CLASS net/minecraft/class_5803 net/minecraft/block/CaveVines FIELD field_28688 BERRIES Lnet/minecraft/class_2746; METHOD method_33618 hasBerries (Lnet/minecraft/class_2680;)Z ARG 0 state - METHOD method_33619 pickBerries (Lnet/minecraft/class_2680;Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;)Lnet/minecraft/class_1269; - ARG 0 state - ARG 1 world - ARG 2 pos + METHOD method_33619 pickBerries (Lnet/minecraft/class_1297;Lnet/minecraft/class_2680;Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;)Lnet/minecraft/class_1269; + ARG 0 picker + ARG 1 state + ARG 2 world + ARG 3 pos METHOD method_37361 (ILnet/minecraft/class_2680;)I ARG 1 state METHOD method_37362 getLuminanceSupplier (I)Ljava/util/function/ToIntFunction; diff --git a/mappings/net/minecraft/block/CherryLeavesBlock.mapping b/mappings/net/minecraft/block/CherryLeavesBlock.mapping new file mode 100644 index 0000000000..46538ae96c --- /dev/null +++ b/mappings/net/minecraft/block/CherryLeavesBlock.mapping @@ -0,0 +1 @@ +CLASS net/minecraft/class_8167 net/minecraft/block/CherryLeavesBlock diff --git a/mappings/net/minecraft/block/ChestBlock.mapping b/mappings/net/minecraft/block/ChestBlock.mapping index 031b2ab8ea..02586c1640 100644 --- a/mappings/net/minecraft/block/ChestBlock.mapping +++ b/mappings/net/minecraft/block/ChestBlock.mapping @@ -18,8 +18,8 @@ CLASS net/minecraft/class_2281 net/minecraft/block/ChestBlock METHOD method_24166 getAnimationProgressRetriever (Lnet/minecraft/class_2618;)Lnet/minecraft/class_4732$class_3923; ARG 0 progress METHOD method_24168 (Lnet/minecraft/class_1936;Lnet/minecraft/class_2338;)Z - ARG 0 world - ARG 1 pos + ARG 0 worldx + ARG 1 posx METHOD method_24169 getDoubleBlockType (Lnet/minecraft/class_2680;)Lnet/minecraft/class_4732$class_4733; ARG 0 state METHOD method_31641 getExpectedEntityType ()Lnet/minecraft/class_2591; diff --git a/mappings/net/minecraft/block/ChiseledBookshelfBlock.mapping b/mappings/net/minecraft/block/ChiseledBookshelfBlock.mapping new file mode 100644 index 0000000000..d97ff47be2 --- /dev/null +++ b/mappings/net/minecraft/block/ChiseledBookshelfBlock.mapping @@ -0,0 +1,26 @@ +CLASS net/minecraft/class_7714 net/minecraft/block/ChiseledBookshelfBlock + FIELD field_41307 BOOK_HEIGHT I + FIELD field_41308 SLOT_OCCUPIED_PROPERTIES Ljava/util/List; + FIELD field_41309 MAX_BOOK_COUNT I + METHOD method_45457 tryRemoveBook (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_1657;Lnet/minecraft/class_7716;I)V + ARG 0 world + ARG 1 pos + ARG 2 player + ARG 3 blockEntity + ARG 4 slot + METHOD method_45458 tryAddBook (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_1657;Lnet/minecraft/class_7716;Lnet/minecraft/class_1799;I)V + ARG 0 world + ARG 1 pos + ARG 2 player + ARG 3 blockEntity + ARG 4 stack + ARG 5 slot + METHOD method_47577 getColumn (F)I + ARG 0 x + METHOD method_47578 (Lnet/minecraft/class_2689$class_2690;Lnet/minecraft/class_2769;)V + ARG 1 property + METHOD method_47579 getHitPos (Lnet/minecraft/class_3965;Lnet/minecraft/class_2350;)Ljava/util/Optional; + ARG 0 hit + ARG 1 facing + METHOD method_47580 getSlotForHitPos (Lnet/minecraft/class_241;)I + ARG 0 hitPos diff --git a/mappings/net/minecraft/block/ComposterBlock.mapping b/mappings/net/minecraft/block/ComposterBlock.mapping index ccfb809aa8..91d454245e 100644 --- a/mappings/net/minecraft/block/ComposterBlock.mapping +++ b/mappings/net/minecraft/block/ComposterBlock.mapping @@ -3,35 +3,41 @@ CLASS net/minecraft/class_3962 net/minecraft/block/ComposterBlock FIELD field_17566 ITEM_TO_LEVEL_INCREASE_CHANCE Lit/unimi/dsi/fastutil/objects/Object2FloatMap; FIELD field_17567 RAYCAST_SHAPE Lnet/minecraft/class_265; FIELD field_17568 LEVEL_TO_COLLISION_SHAPE [Lnet/minecraft/class_265; - FIELD field_31071 MAX_LEVEL I + FIELD field_31071 NUM_LEVELS I + FIELD field_31072 MIN_LEVEL I + FIELD field_31073 MAX_LEVEL I METHOD method_17753 registerCompostableItem (FLnet/minecraft/class_1935;)V ARG 0 levelIncreaseChance ARG 1 item METHOD method_17755 ([Lnet/minecraft/class_265;)V ARG 0 shapes - METHOD method_17756 addToComposter (Lnet/minecraft/class_2680;Lnet/minecraft/class_1936;Lnet/minecraft/class_2338;Lnet/minecraft/class_1799;)Lnet/minecraft/class_2680; - ARG 0 state - ARG 1 world - ARG 2 pos - ARG 3 item + METHOD method_17756 addToComposter (Lnet/minecraft/class_1297;Lnet/minecraft/class_2680;Lnet/minecraft/class_1936;Lnet/minecraft/class_2338;Lnet/minecraft/class_1799;)Lnet/minecraft/class_2680; + ARG 0 user + ARG 1 state + ARG 2 world + ARG 3 pos + ARG 4 stack METHOD method_17758 registerDefaultCompostableItems ()V - METHOD method_17759 emptyComposter (Lnet/minecraft/class_2680;Lnet/minecraft/class_1936;Lnet/minecraft/class_2338;)Lnet/minecraft/class_2680; - ARG 0 state - ARG 1 world - ARG 2 pos + METHOD method_17759 emptyComposter (Lnet/minecraft/class_1297;Lnet/minecraft/class_2680;Lnet/minecraft/class_1936;Lnet/minecraft/class_2338;)Lnet/minecraft/class_2680; + ARG 0 user + ARG 1 state + ARG 2 world + ARG 3 pos METHOD method_18027 playEffects (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Z)V ARG 0 world ARG 1 pos ARG 2 fill - METHOD method_26373 compost (Lnet/minecraft/class_2680;Lnet/minecraft/class_3218;Lnet/minecraft/class_1799;Lnet/minecraft/class_2338;)Lnet/minecraft/class_2680; - ARG 0 state - ARG 1 world - ARG 2 stack + METHOD method_26373 compost (Lnet/minecraft/class_1297;Lnet/minecraft/class_2680;Lnet/minecraft/class_3218;Lnet/minecraft/class_1799;Lnet/minecraft/class_2338;)Lnet/minecraft/class_2680; + ARG 0 user + ARG 1 state + ARG 2 world + ARG 3 stack + ARG 4 pos + METHOD method_26374 emptyFullComposter (Lnet/minecraft/class_1297;Lnet/minecraft/class_2680;Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;)Lnet/minecraft/class_2680; + ARG 0 user + ARG 1 state + ARG 2 world ARG 3 pos - METHOD method_26374 emptyFullComposter (Lnet/minecraft/class_2680;Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;)Lnet/minecraft/class_2680; - ARG 0 state - ARG 1 world - ARG 2 pos CLASS class_3925 DummyInventory CLASS class_3963 ComposterInventory FIELD field_17569 state Lnet/minecraft/class_2680; diff --git a/mappings/net/minecraft/block/ConnectingBlock.mapping b/mappings/net/minecraft/block/ConnectingBlock.mapping index 531ae3f945..bfa735b50d 100644 --- a/mappings/net/minecraft/block/ConnectingBlock.mapping +++ b/mappings/net/minecraft/block/ConnectingBlock.mapping @@ -5,7 +5,7 @@ CLASS net/minecraft/class_2429 net/minecraft/block/ConnectingBlock FIELD field_11330 DOWN Lnet/minecraft/class_2746; FIELD field_11331 SOUTH Lnet/minecraft/class_2746; FIELD field_11332 NORTH Lnet/minecraft/class_2746; - FIELD field_11333 connectionsToShape [Lnet/minecraft/class_265; + FIELD field_11333 facingsToShape [Lnet/minecraft/class_265; FIELD field_11334 FACINGS [Lnet/minecraft/class_2350; FIELD field_11335 EAST Lnet/minecraft/class_2746; METHOD (FLnet/minecraft/class_4970$class_2251;)V diff --git a/mappings/net/minecraft/block/CropBlock.mapping b/mappings/net/minecraft/block/CropBlock.mapping index 698311e100..d2c158ece9 100644 --- a/mappings/net/minecraft/block/CropBlock.mapping +++ b/mappings/net/minecraft/block/CropBlock.mapping @@ -2,9 +2,11 @@ CLASS net/minecraft/class_2302 net/minecraft/block/CropBlock FIELD field_10835 AGE Lnet/minecraft/class_2758; FIELD field_10836 AGE_TO_SHAPE [Lnet/minecraft/class_265; FIELD field_31079 MAX_AGE I + METHOD method_52572 hasEnoughLightAt (Lnet/minecraft/class_4538;Lnet/minecraft/class_2338;)Z + ARG 0 world + ARG 1 pos METHOD method_9824 getAgeProperty ()Lnet/minecraft/class_2758; METHOD method_9825 isMature (Lnet/minecraft/class_2680;)Z - ARG 1 state METHOD method_9826 applyGrowth (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/DecoratedPotBlock.mapping b/mappings/net/minecraft/block/DecoratedPotBlock.mapping new file mode 100644 index 0000000000..791d088358 --- /dev/null +++ b/mappings/net/minecraft/block/DecoratedPotBlock.mapping @@ -0,0 +1,12 @@ +CLASS net/minecraft/class_8168 net/minecraft/block/DecoratedPotBlock + FIELD field_42754 SHAPE Lnet/minecraft/class_265; + FIELD field_42755 FACING Lnet/minecraft/class_2753; + FIELD field_42756 WATERLOGGED Lnet/minecraft/class_2746; + FIELD field_43236 SHERDS_DYNAMIC_DROP_ID Lnet/minecraft/class_2960; + FIELD field_43237 CRACKED Lnet/minecraft/class_2746; + METHOD method_49815 (Lnet/minecraft/class_8172;Ljava/util/function/Consumer;)V + ARG 1 lootConsumer + METHOD method_51510 (Ljava/util/List;Lnet/minecraft/class_1792;)V + ARG 1 sherd + METHOD method_52573 (Lnet/minecraft/class_1799;Lnet/minecraft/class_8172;)V + ARG 1 blockEntity diff --git a/mappings/net/minecraft/block/DecoratedPotPatterns.mapping b/mappings/net/minecraft/block/DecoratedPotPatterns.mapping new file mode 100644 index 0000000000..a0a027eee5 --- /dev/null +++ b/mappings/net/minecraft/block/DecoratedPotPatterns.mapping @@ -0,0 +1,54 @@ +CLASS net/minecraft/class_8173 net/minecraft/block/DecoratedPotPatterns + FIELD field_42786 DECORATED_POT_BASE Ljava/lang/String; + FIELD field_42787 DECORATED_POT_BASE_KEY Lnet/minecraft/class_5321; + FIELD field_42788 DECORATED_POT_SIDE Ljava/lang/String; + FIELD field_42789 ARCHER_POTTERY_PATTERN Ljava/lang/String; + FIELD field_42790 PRIZE_POTTERY_PATTERN Ljava/lang/String; + FIELD field_42791 ARMS_UP_POTTERY_PATTERN Ljava/lang/String; + FIELD field_42792 SKULL_POTTERY_PATTERN Ljava/lang/String; + FIELD field_42793 DECORATED_POT_SIDE_KEY Lnet/minecraft/class_5321; + FIELD field_42794 ARCHER_POTTERY_PATTERN_KEY Lnet/minecraft/class_5321; + FIELD field_42795 POTTERY_PATTERN_PRIZE_KEY Lnet/minecraft/class_5321; + FIELD field_42796 ARMS_UP_POTTERY_PATTERN_KEY Lnet/minecraft/class_5321; + FIELD field_42797 SKULL_POTTERY_PATTERN_KEY Lnet/minecraft/class_5321; + FIELD field_42798 SHERD_TO_PATTERN Ljava/util/Map; + FIELD field_43259 BLADE_POTTERY_PATTERN_KEY Lnet/minecraft/class_5321; + FIELD field_43260 BREWER_POTTERY_PATTERN_KEY Lnet/minecraft/class_5321; + FIELD field_43261 BURN_POTTERY_PATTERN_KEY Lnet/minecraft/class_5321; + FIELD field_43262 DANGER_POTTERY_PATTERN_KEY Lnet/minecraft/class_5321; + FIELD field_43263 EXPLORER_POTTERY_PATTERN_KEY Lnet/minecraft/class_5321; + FIELD field_43264 FRIEND_POTTERY_PATTERN_KEY Lnet/minecraft/class_5321; + FIELD field_43265 HEART_POTTERY_PATTERN_KEY Lnet/minecraft/class_5321; + FIELD field_43266 HEARTBREAK_POTTERY_PATTERN_KEY Lnet/minecraft/class_5321; + FIELD field_43267 HOWL_POTTERY_PATTERN_KEY Lnet/minecraft/class_5321; + FIELD field_43268 MINER_POTTERY_PATTERN_KEY Lnet/minecraft/class_5321; + FIELD field_43269 MOURNER_POTTERY_PATTERN_KEY Lnet/minecraft/class_5321; + FIELD field_43270 PLENTY_POTTERY_PATTERN_KEY Lnet/minecraft/class_5321; + FIELD field_43271 SHEAF_POTTERY_PATTERN_KEY Lnet/minecraft/class_5321; + FIELD field_43272 SHELTER_POTTERY_PATTERN_KEY Lnet/minecraft/class_5321; + FIELD field_43273 SNORT_POTTERY_PATTERN_KEY Lnet/minecraft/class_5321; + FIELD field_43274 ANGLER_POTTERY_PATTERN Ljava/lang/String; + FIELD field_43275 BLADE_POTTERY_PATTERN Ljava/lang/String; + FIELD field_43276 BREWER_POTTERY_PATTERN Ljava/lang/String; + FIELD field_43277 BURN_POTTERY_PATTERN Ljava/lang/String; + FIELD field_43278 DANGER_POTTERY_PATTERN Ljava/lang/String; + FIELD field_43279 EXPLORER_POTTERY_PATTERN Ljava/lang/String; + FIELD field_43280 FRIEND_POTTERY_PATTERN Ljava/lang/String; + FIELD field_43281 HEART_POTTERY_PATTERN Ljava/lang/String; + FIELD field_43282 HEARTBREAK_POTTERY_PATTERN Ljava/lang/String; + FIELD field_43283 HOWL_POTTERY_PATTERN Ljava/lang/String; + FIELD field_43284 MINER_POTTERY_PATTERN Ljava/lang/String; + FIELD field_43285 MOURNER_POTTERY_PATTERN Ljava/lang/String; + FIELD field_43286 PLENTY_POTTERY_PATTERN Ljava/lang/String; + FIELD field_43287 SHEAF_POTTERY_PATTERN Ljava/lang/String; + FIELD field_43288 SHELTER_POTTERY_PATTERN Ljava/lang/String; + FIELD field_43289 SNORT_POTTERY_PATTERN Ljava/lang/String; + FIELD field_43290 ANGLER_POTTERY_PATTERN_KEY Lnet/minecraft/class_5321; + METHOD method_49205 getTextureId (Lnet/minecraft/class_5321;)Lnet/minecraft/class_2960; + ARG 0 key + METHOD method_49206 fromSherd (Lnet/minecraft/class_1792;)Lnet/minecraft/class_5321; + ARG 0 sherd + METHOD method_49207 registerAndGetDefault (Lnet/minecraft/class_2378;)Ljava/lang/String; + ARG 0 registry + METHOD method_49208 of (Ljava/lang/String;)Lnet/minecraft/class_5321; + ARG 0 path diff --git a/mappings/net/minecraft/block/Degradable.mapping b/mappings/net/minecraft/block/Degradable.mapping index 95ddbcaa91..7c66608830 100644 --- a/mappings/net/minecraft/block/Degradable.mapping +++ b/mappings/net/minecraft/block/Degradable.mapping @@ -1,4 +1,5 @@ CLASS net/minecraft/class_5547 net/minecraft/block/Degradable + FIELD field_31056 DEGRADING_RANGE I METHOD method_31639 getDegradationResult (Lnet/minecraft/class_2680;)Ljava/util/Optional; ARG 1 state METHOD method_33620 getDegradationChanceMultiplier ()F @@ -14,4 +15,4 @@ CLASS net/minecraft/class_5547 net/minecraft/block/Degradable ARG 3 pos ARG 4 random METHOD method_34726 (Lnet/minecraft/class_3218;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;)V - ARG 2 state + ARG 2 statex diff --git a/mappings/net/minecraft/block/DoorBlock.mapping b/mappings/net/minecraft/block/DoorBlock.mapping index aea2ac582e..f36ec06ec2 100644 --- a/mappings/net/minecraft/block/DoorBlock.mapping +++ b/mappings/net/minecraft/block/DoorBlock.mapping @@ -8,24 +8,28 @@ CLASS net/minecraft/class_2323 net/minecraft/block/DoorBlock FIELD field_10944 EAST_SHAPE Lnet/minecraft/class_265; FIELD field_10945 OPEN Lnet/minecraft/class_2746; FIELD field_10946 HALF Lnet/minecraft/class_2754; - METHOD method_10032 getOpenSoundEventId ()I + FIELD field_42757 blockSetType Lnet/minecraft/class_8177; + METHOD (Lnet/minecraft/class_4970$class_2251;Lnet/minecraft/class_8177;)V + ARG 1 settings + ARG 2 blockSetType METHOD method_10033 setOpen (Lnet/minecraft/class_1297;Lnet/minecraft/class_1937;Lnet/minecraft/class_2680;Lnet/minecraft/class_2338;Z)V ARG 1 entity ARG 2 world ARG 3 state ARG 4 pos ARG 5 open - METHOD method_10034 getCloseSoundEventId ()I METHOD method_10035 getHinge (Lnet/minecraft/class_1750;)Lnet/minecraft/class_2750; ARG 1 ctx - METHOD method_10036 playOpenCloseSound (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Z)V - ARG 1 world - ARG 2 pos - ARG 3 open - METHOD method_24795 isWoodenDoor (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;)Z + METHOD method_10036 playOpenCloseSound (Lnet/minecraft/class_1297;Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Z)V + ARG 1 entity + ARG 2 world + ARG 3 pos + ARG 4 open + METHOD method_24795 canOpenByHand (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;)Z ARG 0 world ARG 1 pos - METHOD method_24796 isWoodenDoor (Lnet/minecraft/class_2680;)Z + METHOD method_24796 canOpenByHand (Lnet/minecraft/class_2680;)Z ARG 0 state METHOD method_30841 isOpen (Lnet/minecraft/class_2680;)Z ARG 1 state + METHOD method_51169 getBlockSetType ()Lnet/minecraft/class_8177; diff --git a/mappings/net/minecraft/block/EnchantingTableBlock.mapping b/mappings/net/minecraft/block/EnchantingTableBlock.mapping index 5c730dd806..e88c892e80 100644 --- a/mappings/net/minecraft/block/EnchantingTableBlock.mapping +++ b/mappings/net/minecraft/block/EnchantingTableBlock.mapping @@ -1,13 +1,13 @@ CLASS net/minecraft/class_2331 net/minecraft/block/EnchantingTableBlock FIELD field_10951 SHAPE Lnet/minecraft/class_265; - FIELD field_36535 BOOKSHELF_OFFSETS Ljava/util/List; + FIELD field_36535 POWER_PROVIDER_OFFSETS Ljava/util/List; METHOD method_17467 (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;ILnet/minecraft/class_1661;Lnet/minecraft/class_1657;)Lnet/minecraft/class_1703; ARG 2 syncId ARG 3 inventory ARG 4 player - METHOD method_40445 canAccessBookshelf (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_2338;)Z + METHOD method_40445 canAccessPowerProvider (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_2338;)Z ARG 0 world ARG 1 tablePos - ARG 2 bookshelfOffset + ARG 2 providerOffset METHOD method_40446 (Lnet/minecraft/class_2338;)Z ARG 0 pos diff --git a/mappings/net/minecraft/block/EnderChestBlock.mapping b/mappings/net/minecraft/block/EnderChestBlock.mapping index 9e0c4e53c2..add9f28733 100644 --- a/mappings/net/minecraft/block/EnderChestBlock.mapping +++ b/mappings/net/minecraft/block/EnderChestBlock.mapping @@ -6,4 +6,4 @@ CLASS net/minecraft/class_2336 net/minecraft/block/EnderChestBlock METHOD method_17468 (Lnet/minecraft/class_1730;ILnet/minecraft/class_1661;Lnet/minecraft/class_1657;)Lnet/minecraft/class_1703; ARG 1 syncId ARG 2 inventory - ARG 3 player + ARG 3 playerx diff --git a/mappings/net/minecraft/block/OreBlock.mapping b/mappings/net/minecraft/block/ExperienceDroppingBlock.mapping similarity index 70% rename from mappings/net/minecraft/block/OreBlock.mapping rename to mappings/net/minecraft/block/ExperienceDroppingBlock.mapping index 42d6e68633..70899bfe59 100644 --- a/mappings/net/minecraft/block/OreBlock.mapping +++ b/mappings/net/minecraft/block/ExperienceDroppingBlock.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_2431 net/minecraft/block/OreBlock +CLASS net/minecraft/class_2431 net/minecraft/block/ExperienceDroppingBlock FIELD field_27195 experienceDropped Lnet/minecraft/class_6017; METHOD (Lnet/minecraft/class_4970$class_2251;Lnet/minecraft/class_6017;)V ARG 1 settings diff --git a/mappings/net/minecraft/block/FarmlandBlock.mapping b/mappings/net/minecraft/block/FarmlandBlock.mapping index 9d5f61476d..2b509187d6 100644 --- a/mappings/net/minecraft/block/FarmlandBlock.mapping +++ b/mappings/net/minecraft/block/FarmlandBlock.mapping @@ -5,10 +5,11 @@ CLASS net/minecraft/class_2344 net/minecraft/block/FarmlandBlock METHOD method_10124 hasCrop (Lnet/minecraft/class_1922;Lnet/minecraft/class_2338;)Z ARG 0 world ARG 1 pos - METHOD method_10125 setToDirt (Lnet/minecraft/class_2680;Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;)V - ARG 0 state - ARG 1 world - ARG 2 pos + METHOD method_10125 setToDirt (Lnet/minecraft/class_1297;Lnet/minecraft/class_2680;Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;)V + ARG 0 entity + ARG 1 state + ARG 2 world + ARG 3 pos METHOD method_10126 isWaterNearby (Lnet/minecraft/class_4538;Lnet/minecraft/class_2338;)Z ARG 0 world ARG 1 pos diff --git a/mappings/net/minecraft/block/FenceGateBlock.mapping b/mappings/net/minecraft/block/FenceGateBlock.mapping index 20b8102217..35ba6eb53c 100644 --- a/mappings/net/minecraft/block/FenceGateBlock.mapping +++ b/mappings/net/minecraft/block/FenceGateBlock.mapping @@ -12,6 +12,12 @@ CLASS net/minecraft/class_2349 net/minecraft/block/FenceGateBlock FIELD field_11026 OPEN Lnet/minecraft/class_2746; FIELD field_11027 IN_WALL_X_AXIS_CULL_SHAPE Lnet/minecraft/class_265; FIELD field_11028 Z_AXIS_COLLISION_SHAPE Lnet/minecraft/class_265; + FIELD field_40744 Z_AXIS_SIDES_SHAPE Lnet/minecraft/class_265; + FIELD field_40745 X_AXIS_SIDES_SHAPE Lnet/minecraft/class_265; + FIELD field_42758 type Lnet/minecraft/class_4719; + METHOD (Lnet/minecraft/class_4970$class_2251;Lnet/minecraft/class_4719;)V + ARG 1 settings + ARG 2 type METHOD method_10138 isWall (Lnet/minecraft/class_2680;)Z ARG 1 state METHOD method_16703 canWallConnect (Lnet/minecraft/class_2680;Lnet/minecraft/class_2350;)Z diff --git a/mappings/net/minecraft/block/Fertilizable.mapping b/mappings/net/minecraft/block/Fertilizable.mapping index 1dc4458cae..ba980fe9d4 100644 --- a/mappings/net/minecraft/block/Fertilizable.mapping +++ b/mappings/net/minecraft/block/Fertilizable.mapping @@ -4,11 +4,10 @@ CLASS net/minecraft/class_2256 net/minecraft/block/Fertilizable ARG 2 random ARG 3 pos ARG 4 state - METHOD method_9651 isFertilizable (Lnet/minecraft/class_1922;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;Z)Z + METHOD method_9651 isFertilizable (Lnet/minecraft/class_4538;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;)Z ARG 1 world ARG 2 pos ARG 3 state - ARG 4 isClient METHOD method_9652 grow (Lnet/minecraft/class_3218;Lnet/minecraft/class_5819;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;)V ARG 1 world ARG 2 random diff --git a/mappings/net/minecraft/block/FlowerBlock.mapping b/mappings/net/minecraft/block/FlowerBlock.mapping index d949881f1c..d74c550aa5 100644 --- a/mappings/net/minecraft/block/FlowerBlock.mapping +++ b/mappings/net/minecraft/block/FlowerBlock.mapping @@ -1,10 +1,7 @@ CLASS net/minecraft/class_2356 net/minecraft/block/FlowerBlock FIELD field_11085 SHAPE Lnet/minecraft/class_265; - FIELD field_11086 effectInStewDuration I - FIELD field_11087 effectInStew Lnet/minecraft/class_1291; + FIELD field_45775 stewEffects Ljava/util/List; METHOD (Lnet/minecraft/class_1291;ILnet/minecraft/class_4970$class_2251;)V ARG 1 suspiciousStewEffect ARG 2 effectDuration ARG 3 settings - METHOD method_10187 getEffectInStewDuration ()I - METHOD method_10188 getEffectInStew ()Lnet/minecraft/class_1291; diff --git a/mappings/net/minecraft/block/FlowerbedBlock.mapping b/mappings/net/minecraft/block/FlowerbedBlock.mapping new file mode 100644 index 0000000000..8189e95b89 --- /dev/null +++ b/mappings/net/minecraft/block/FlowerbedBlock.mapping @@ -0,0 +1,7 @@ +CLASS net/minecraft/class_8169 net/minecraft/block/FlowerbedBlock + FIELD field_42764 FACING Lnet/minecraft/class_2753; + FIELD field_42765 FLOWER_AMOUNT Lnet/minecraft/class_2758; + FIELD field_45146 FACING_AND_AMOUNT_TO_SHAPE Ljava/util/function/BiFunction; + METHOD method_52574 (Lnet/minecraft/class_2350;Ljava/lang/Integer;)Lnet/minecraft/class_265; + ARG 0 facing + ARG 1 flowerAmount diff --git a/mappings/net/minecraft/block/FluidDrainable.mapping b/mappings/net/minecraft/block/FluidDrainable.mapping index 945f8b3981..529725902c 100644 --- a/mappings/net/minecraft/block/FluidDrainable.mapping +++ b/mappings/net/minecraft/block/FluidDrainable.mapping @@ -3,7 +3,8 @@ CLASS net/minecraft/class_2263 net/minecraft/block/FluidDrainable COMMENT {@return the sound played when filling a bucket with the fluid contained in this block} COMMENT COMMENT @see net.minecraft.fluid.Fluid#getBucketFillSound() - METHOD method_9700 tryDrainFluid (Lnet/minecraft/class_1936;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;)Lnet/minecraft/class_1799; - ARG 1 world - ARG 2 pos - ARG 3 state + METHOD method_9700 tryDrainFluid (Lnet/minecraft/class_1657;Lnet/minecraft/class_1936;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;)Lnet/minecraft/class_1799; + ARG 1 player + ARG 2 world + ARG 3 pos + ARG 4 state diff --git a/mappings/net/minecraft/block/FluidFillable.mapping b/mappings/net/minecraft/block/FluidFillable.mapping index 0ac72c638e..2bf034aa9d 100644 --- a/mappings/net/minecraft/block/FluidFillable.mapping +++ b/mappings/net/minecraft/block/FluidFillable.mapping @@ -1,9 +1,10 @@ CLASS net/minecraft/class_2402 net/minecraft/block/FluidFillable - METHOD method_10310 canFillWithFluid (Lnet/minecraft/class_1922;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;Lnet/minecraft/class_3611;)Z - ARG 1 world - ARG 2 pos - ARG 3 state - ARG 4 fluid + METHOD method_10310 canFillWithFluid (Lnet/minecraft/class_1657;Lnet/minecraft/class_1922;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;Lnet/minecraft/class_3611;)Z + ARG 1 player + ARG 2 world + ARG 3 pos + ARG 4 state + ARG 5 fluid METHOD method_10311 tryFillWithFluid (Lnet/minecraft/class_1936;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;Lnet/minecraft/class_3610;)Z ARG 1 world ARG 2 pos diff --git a/mappings/net/minecraft/block/FungusBlock.mapping b/mappings/net/minecraft/block/FungusBlock.mapping index 940ffd8d89..5c2eb20e2b 100644 --- a/mappings/net/minecraft/block/FungusBlock.mapping +++ b/mappings/net/minecraft/block/FungusBlock.mapping @@ -1,7 +1,13 @@ CLASS net/minecraft/class_4771 net/minecraft/block/FungusBlock FIELD field_22134 SHAPE Lnet/minecraft/class_265; - FIELD field_22135 feature Ljava/util/function/Supplier; + FIELD field_22135 featureKey Lnet/minecraft/class_5321; FIELD field_31099 GROW_CHANCE D - METHOD (Lnet/minecraft/class_4970$class_2251;Ljava/util/function/Supplier;)V + FIELD field_41074 nylium Lnet/minecraft/class_2248; + METHOD (Lnet/minecraft/class_4970$class_2251;Lnet/minecraft/class_5321;Lnet/minecraft/class_2248;)V ARG 1 settings - ARG 2 feature + ARG 2 featureKey + ARG 3 nylium + METHOD method_46682 (Lnet/minecraft/class_3218;Lnet/minecraft/class_5819;Lnet/minecraft/class_2338;Lnet/minecraft/class_6880;)V + ARG 3 featureEntry + METHOD method_46683 getFeatureEntry (Lnet/minecraft/class_4538;)Ljava/util/Optional; + ARG 1 world diff --git a/mappings/net/minecraft/block/GlowLichenBlock.mapping b/mappings/net/minecraft/block/GlowLichenBlock.mapping index a0d68f444c..244d254dac 100644 --- a/mappings/net/minecraft/block/GlowLichenBlock.mapping +++ b/mappings/net/minecraft/block/GlowLichenBlock.mapping @@ -1,7 +1,7 @@ CLASS net/minecraft/class_5777 net/minecraft/block/GlowLichenBlock FIELD field_28412 WATERLOGGED Lnet/minecraft/class_2746; FIELD field_37585 grower Lnet/minecraft/class_7118; - METHOD method_34727 (Lnet/minecraft/class_2680;Lnet/minecraft/class_1922;Lnet/minecraft/class_2338;Lnet/minecraft/class_2350;)Z + METHOD method_34727 (Lnet/minecraft/class_2680;Lnet/minecraft/class_4538;Lnet/minecraft/class_2338;Lnet/minecraft/class_2350;)Z ARG 4 direction METHOD method_37363 (ILnet/minecraft/class_2680;)I ARG 1 state diff --git a/mappings/net/minecraft/block/HangingSignBlock.mapping b/mappings/net/minecraft/block/HangingSignBlock.mapping new file mode 100644 index 0000000000..6170ba253f --- /dev/null +++ b/mappings/net/minecraft/block/HangingSignBlock.mapping @@ -0,0 +1,10 @@ +CLASS net/minecraft/class_7713 net/minecraft/block/HangingSignBlock + FIELD field_40300 ROTATION Lnet/minecraft/class_2758; + FIELD field_40301 ATTACHED Lnet/minecraft/class_2746; + FIELD field_40303 DEFAULT_SHAPE Lnet/minecraft/class_265; + FIELD field_40304 SHAPES_FOR_ROTATION Ljava/util/Map; + METHOD method_50002 shouldTryAttaching (Lnet/minecraft/class_1657;Lnet/minecraft/class_3965;Lnet/minecraft/class_2625;Lnet/minecraft/class_1799;)Z + ARG 1 player + ARG 2 hitResult + ARG 3 sign + ARG 4 stack diff --git a/mappings/net/minecraft/block/HopperBlock.mapping b/mappings/net/minecraft/block/HopperBlock.mapping index fd0f57c0ec..938fabdec9 100644 --- a/mappings/net/minecraft/block/HopperBlock.mapping +++ b/mappings/net/minecraft/block/HopperBlock.mapping @@ -15,7 +15,8 @@ CLASS net/minecraft/class_2377 net/minecraft/block/HopperBlock FIELD field_11133 EAST_RAYCAST_SHAPE Lnet/minecraft/class_265; FIELD field_11134 EAST_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 + METHOD method_10217 updateEnabled (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;I)V ARG 1 world ARG 2 pos ARG 3 state + ARG 4 flags diff --git a/mappings/net/minecraft/block/HorizontalConnectingBlock.mapping b/mappings/net/minecraft/block/HorizontalConnectingBlock.mapping index d73d8c3eb0..840a4e9b80 100644 --- a/mappings/net/minecraft/block/HorizontalConnectingBlock.mapping +++ b/mappings/net/minecraft/block/HorizontalConnectingBlock.mapping @@ -16,7 +16,7 @@ CLASS net/minecraft/class_2310 net/minecraft/block/HorizontalConnectingBlock ARG 5 collisionHeight ARG 6 settings METHOD method_20517 (Lnet/minecraft/class_2680;)I - ARG 0 state + ARG 0 statex METHOD method_9984 createShapes (FFFFF)[Lnet/minecraft/class_265; ARG 1 radius1 ARG 2 radius2 diff --git a/mappings/net/minecraft/block/IceBlock.mapping b/mappings/net/minecraft/block/IceBlock.mapping index a7554073e8..1081273a38 100644 --- a/mappings/net/minecraft/block/IceBlock.mapping +++ b/mappings/net/minecraft/block/IceBlock.mapping @@ -3,3 +3,4 @@ CLASS net/minecraft/class_2386 net/minecraft/block/IceBlock ARG 1 state ARG 2 world ARG 3 pos + METHOD method_51170 getMeltedState ()Lnet/minecraft/class_2680; diff --git a/mappings/net/minecraft/block/JukeboxBlock.mapping b/mappings/net/minecraft/block/JukeboxBlock.mapping index 8584842a6a..b5d30bf434 100644 --- a/mappings/net/minecraft/block/JukeboxBlock.mapping +++ b/mappings/net/minecraft/block/JukeboxBlock.mapping @@ -1,11 +1,2 @@ CLASS net/minecraft/class_2387 net/minecraft/block/JukeboxBlock FIELD field_11180 HAS_RECORD Lnet/minecraft/class_2746; - METHOD method_10276 setRecord (Lnet/minecraft/class_1297;Lnet/minecraft/class_1936;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;Lnet/minecraft/class_1799;)V - ARG 1 user - ARG 2 world - ARG 3 pos - ARG 4 state - ARG 5 stack - METHOD method_10277 removeRecord (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;)V - ARG 1 world - ARG 2 pos diff --git a/mappings/net/minecraft/block/LandingBlock.mapping b/mappings/net/minecraft/block/LandingBlock.mapping index 7837747c8a..db3549443d 100644 --- a/mappings/net/minecraft/block/LandingBlock.mapping +++ b/mappings/net/minecraft/block/LandingBlock.mapping @@ -9,5 +9,5 @@ CLASS net/minecraft/class_5688 net/minecraft/block/LandingBlock ARG 1 world ARG 2 pos ARG 3 fallingBlockEntity - METHOD method_32897 getEntityPredicate ()Ljava/util/function/Predicate; - METHOD method_32898 getDamageSource ()Lnet/minecraft/class_1282; + METHOD method_32898 getDamageSource (Lnet/minecraft/class_1297;)Lnet/minecraft/class_1282; + ARG 1 attacker diff --git a/mappings/net/minecraft/block/LavaCauldronBlock.mapping b/mappings/net/minecraft/block/LavaCauldronBlock.mapping index a7b29d1787..7cad99c23f 100644 --- a/mappings/net/minecraft/block/LavaCauldronBlock.mapping +++ b/mappings/net/minecraft/block/LavaCauldronBlock.mapping @@ -1 +1,2 @@ CLASS net/minecraft/class_5553 net/minecraft/block/LavaCauldronBlock + COMMENT A cauldron filled with lava. diff --git a/mappings/net/minecraft/block/LeavesBlock.mapping b/mappings/net/minecraft/block/LeavesBlock.mapping index ef3f5110e4..0a04bab8bf 100644 --- a/mappings/net/minecraft/block/LeavesBlock.mapping +++ b/mappings/net/minecraft/block/LeavesBlock.mapping @@ -11,3 +11,5 @@ CLASS net/minecraft/class_2397 net/minecraft/block/LeavesBlock ARG 0 state METHOD method_42311 shouldDecay (Lnet/minecraft/class_2680;)Z ARG 1 state + METHOD method_49817 getOptionalDistanceFromLog (Lnet/minecraft/class_2680;)Ljava/util/OptionalInt; + ARG 0 state diff --git a/mappings/net/minecraft/block/LecternBlock.mapping b/mappings/net/minecraft/block/LecternBlock.mapping index 1ba8825ab1..100a49e8b7 100644 --- a/mappings/net/minecraft/block/LecternBlock.mapping +++ b/mappings/net/minecraft/block/LecternBlock.mapping @@ -20,23 +20,24 @@ CLASS net/minecraft/class_3715 net/minecraft/block/LecternBlock ARG 0 world ARG 1 pos ARG 2 state - METHOD method_17472 putBookIfAbsent (Lnet/minecraft/class_1657;Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;Lnet/minecraft/class_1799;)Z - ARG 0 player + METHOD method_17472 putBookIfAbsent (Lnet/minecraft/class_1297;Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;Lnet/minecraft/class_1799;)Z + ARG 0 user ARG 1 world ARG 2 pos ARG 3 state ARG 4 stack - METHOD method_17473 setHasBook (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;Z)V - ARG 0 world - ARG 1 pos - ARG 2 state - ARG 3 hasBook + METHOD method_17473 setHasBook (Lnet/minecraft/class_1297;Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;Z)V + ARG 0 user + ARG 1 world + ARG 2 pos + ARG 3 state + ARG 4 hasBook METHOD method_17474 updateNeighborAlways (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;)V ARG 0 world ARG 1 pos ARG 2 state - METHOD method_17475 putBook (Lnet/minecraft/class_1657;Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;Lnet/minecraft/class_1799;)V - ARG 0 player + METHOD method_17475 putBook (Lnet/minecraft/class_1297;Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;Lnet/minecraft/class_1799;)V + ARG 0 user ARG 1 world ARG 2 pos ARG 3 state diff --git a/mappings/net/minecraft/block/LeveledCauldronBlock.mapping b/mappings/net/minecraft/block/LeveledCauldronBlock.mapping index d78c4f8888..94fe650de9 100644 --- a/mappings/net/minecraft/block/LeveledCauldronBlock.mapping +++ b/mappings/net/minecraft/block/LeveledCauldronBlock.mapping @@ -1,12 +1,30 @@ CLASS net/minecraft/class_5556 net/minecraft/block/LeveledCauldronBlock + COMMENT A cauldron with a varying level of contents. + COMMENT This includes water and powder snow cauldrons. + COMMENT + COMMENT

The amount of stored substance is controlled with the {@link #LEVEL} + COMMENT block state property which can take values between {@value #MIN_LEVEL} and + COMMENT {@value #MAX_LEVEL} (inclusive). FIELD field_27206 LEVEL Lnet/minecraft/class_2758; FIELD field_27880 RAIN_PREDICATE Ljava/util/function/Predicate; + COMMENT A precipitation predicate that allows {@link Biome.Precipitation#RAIN}. FIELD field_27881 SNOW_PREDICATE Ljava/util/function/Predicate; + COMMENT A precipitation predicate that allows {@link Biome.Precipitation#SNOW}. FIELD field_27882 precipitationPredicate Ljava/util/function/Predicate; + FIELD field_31107 MIN_LEVEL I + FIELD field_31108 MAX_LEVEL I + FIELD field_31109 BASE_FLUID_HEIGHT I + FIELD field_31110 FLUID_HEIGHT_PER_LEVEL D METHOD (Lnet/minecraft/class_4970$class_2251;Ljava/util/function/Predicate;Ljava/util/Map;)V + COMMENT Constructs a leveled cauldron block. + COMMENT + COMMENT @apiNote The precipitation predicates are compared using identity comparisons in some cases, + COMMENT so callers should typically use {@link #RAIN_PREDICATE} and {@link #SNOW_PREDICATE} if applicable. ARG 1 settings ARG 2 precipitationPredicate + COMMENT a predicate that checks what type of precipitation can fill this cauldron ARG 3 behaviorMap + COMMENT the map containing cauldron behaviors for each item METHOD method_31650 decrementFluidLevel (Lnet/minecraft/class_2680;Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;)V ARG 0 state ARG 1 world diff --git a/mappings/net/minecraft/block/LightBlock.mapping b/mappings/net/minecraft/block/LightBlock.mapping index 7101d872c9..53d532d6cf 100644 --- a/mappings/net/minecraft/block/LightBlock.mapping +++ b/mappings/net/minecraft/block/LightBlock.mapping @@ -4,3 +4,6 @@ CLASS net/minecraft/class_6089 net/minecraft/block/LightBlock FIELD field_31189 STATE_TO_LUMINANCE Ljava/util/function/ToIntFunction; METHOD method_35281 (Lnet/minecraft/class_2680;)I ARG 0 state + METHOD method_47377 addNbtForLevel (Lnet/minecraft/class_1799;I)Lnet/minecraft/class_1799; + ARG 0 stack + ARG 1 level diff --git a/mappings/net/minecraft/block/Material.mapping b/mappings/net/minecraft/block/Material.mapping deleted file mode 100644 index fd8ab44dfb..0000000000 --- a/mappings/net/minecraft/block/Material.mapping +++ /dev/null @@ -1,119 +0,0 @@ -CLASS net/minecraft/class_3614 net/minecraft/block/Material - FIELD field_15911 solid Z - FIELD field_15913 COBWEB Lnet/minecraft/class_3614; - FIELD field_15914 STONE Lnet/minecraft/class_3614; - COMMENT Material for blocks that are stone or made from it, and generally prefer to be broken by a pickaxe. - FIELD field_15915 BUBBLE_COLUMN Lnet/minecraft/class_3614; - FIELD field_15916 AGGREGATE Lnet/minecraft/class_3614; - COMMENT A material or structure formed from a loosely compacted mass of fragments or particles. - FIELD field_15917 SPONGE Lnet/minecraft/class_3614; - FIELD field_15918 REDSTONE_LAMP Lnet/minecraft/class_3614; - 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 MOSS_BLOCK Lnet/minecraft/class_3614; - COMMENT Material for full sized moss blocks. - FIELD field_15922 LAVA Lnet/minecraft/class_3614; - FIELD field_15923 LEAVES Lnet/minecraft/class_3614; - 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; - COMMENT Material for structure void block. - FIELD field_15928 DENSE_ICE Lnet/minecraft/class_3614; - COMMENT Material for ice blocks that do not melt. See {@link #ICE} for meltable ice. - FIELD field_15929 liquid Z - FIELD field_15930 EGG Lnet/minecraft/class_3614; - COMMENT Material for egg blocks, such as dragon and turtle eggs. - FIELD field_15931 WOOL Lnet/minecraft/class_3614; - COMMENT Material for wool and bed blocks. - FIELD field_15932 WOOD Lnet/minecraft/class_3614; - COMMENT Material for wood logs, and things crafted from them. - FIELD field_15933 PISTON Lnet/minecraft/class_3614; - FIELD field_15934 SNOW_BLOCK Lnet/minecraft/class_3614; - COMMENT Material for full sized snow blocks. - FIELD field_15935 PLANT Lnet/minecraft/class_3614; - COMMENT Material for plants such as flowers and crops - FIELD field_15936 ORGANIC_PRODUCT Lnet/minecraft/class_3614; - COMMENT Material for blocks that come from mobs such as honey, slime, or infested blocks. Includes clay but not bone blocks. - FIELD field_15937 CAKE Lnet/minecraft/class_3614; - FIELD field_15938 BAMBOO_SAPLING Lnet/minecraft/class_3614; - FIELD field_15939 blocksLight Z - FIELD field_15940 blocksMovement Z - FIELD field_15941 SOIL Lnet/minecraft/class_3614; - COMMENT Material for the top layer of soil. Path, dirt, podzol, soul soil, farmland and similar. - FIELD field_15942 GLASS Lnet/minecraft/class_3614; - COMMENT Material for glass and glass-like blocks (includes sea lanterns and conduits). - FIELD field_15943 FIRE Lnet/minecraft/class_3614; - FIELD field_15944 color Lnet/minecraft/class_3620; - FIELD field_15945 SOLID_ORGANIC Lnet/minecraft/class_3614; - COMMENT Organic blocks that are solid, including hay, target, and grass blocks. - FIELD field_15946 BAMBOO Lnet/minecraft/class_3614; - FIELD field_15947 UNDERWATER_PLANT Lnet/minecraft/class_3614; - COMMENT Material for underwater plants without the replaceable property. - FIELD field_15948 SNOW_LAYER Lnet/minecraft/class_3614; - COMMENT Material for non-full blocks of snow. Has the replaceable property. - FIELD field_15949 REPAIR_STATION Lnet/minecraft/class_3614; - COMMENT Material for blocks that can repair tools, including grindstone and anvils. - FIELD field_15950 replaceable Z - FIELD field_15951 burnable Z - FIELD field_15952 BARRIER Lnet/minecraft/class_3614; - FIELD field_15953 METAL Lnet/minecraft/class_3614; - COMMENT Material for blocks metallic in nature, such as cauldrons, bells, iron doors, and iron trapdoors. It also includes non-obvious blocks such as brewing stands and compressed ore blocks, including diamond, redstone, and lapis blocks. - FIELD field_15954 GOURD Lnet/minecraft/class_3614; - COMMENT Material for gourds. Includes the carved pumpkin and jack o' lantern. - FIELD field_15955 TNT Lnet/minecraft/class_3614; - FIELD field_15956 REPLACEABLE_PLANT Lnet/minecraft/class_3614; - FIELD field_15957 CARPET Lnet/minecraft/class_3614; - FIELD field_15958 ICE Lnet/minecraft/class_3614; - COMMENT Material for ice that can melt. See {@link #DENSE_ICE} for unmeltable ice. - FIELD field_15959 AIR Lnet/minecraft/class_3614; - FIELD field_15960 pistonBehavior Lnet/minecraft/class_3619; - FIELD field_17008 SHULKER_BOX Lnet/minecraft/class_3614; - FIELD field_22223 NETHER_WOOD Lnet/minecraft/class_3614; - COMMENT Material for blocks crafted from Nether stems and hyphae. - FIELD field_26708 NETHER_SHOOTS Lnet/minecraft/class_3614; - COMMENT Material for crimson and warped roots, as well as Nether sprouts. - FIELD field_27340 AMETHYST Lnet/minecraft/class_3614; - FIELD field_27890 POWDER_SNOW Lnet/minecraft/class_3614; - FIELD field_28242 SCULK Lnet/minecraft/class_3614; - FIELD field_37828 FROGSPAWN Lnet/minecraft/class_3614; - FIELD field_38977 FROGLIGHT Lnet/minecraft/class_3614; - METHOD (Lnet/minecraft/class_3620;ZZZZZZLnet/minecraft/class_3619;)V - ARG 1 color - ARG 2 liquid - ARG 3 solid - ARG 4 blocksMovement - ARG 5 blocksLight - ARG 6 burnable - ARG 7 replaceable - ARG 8 pistonBehavior - METHOD method_15797 isLiquid ()Z - METHOD method_15798 getPistonBehavior ()Lnet/minecraft/class_3619; - METHOD method_15799 isSolid ()Z - METHOD method_15800 isReplaceable ()Z - METHOD method_15801 blocksMovement ()Z - METHOD method_15802 isBurnable ()Z - METHOD method_15803 getColor ()Lnet/minecraft/class_3620; - METHOD method_15804 blocksLight ()Z - CLASS class_3615 Builder - FIELD field_15961 color Lnet/minecraft/class_3620; - FIELD field_15962 blocksLight Z - FIELD field_15963 solid Z - FIELD field_15964 replaceable Z - FIELD field_15965 liquid Z - FIELD field_15967 burnable Z - FIELD field_15968 pistonBehavior Lnet/minecraft/class_3619; - FIELD field_15969 blocksMovement Z - METHOD (Lnet/minecraft/class_3620;)V - ARG 1 color - METHOD method_15806 notSolid ()Lnet/minecraft/class_3614$class_3615; - METHOD method_15807 burnable ()Lnet/minecraft/class_3614$class_3615; - METHOD method_15809 destroyedByPiston ()Lnet/minecraft/class_3614$class_3615; - METHOD method_15810 liquid ()Lnet/minecraft/class_3614$class_3615; - METHOD method_15811 allowsMovement ()Lnet/minecraft/class_3614$class_3615; - METHOD method_15812 lightPassesThrough ()Lnet/minecraft/class_3614$class_3615; - METHOD method_15813 build ()Lnet/minecraft/class_3614; - METHOD method_15815 replaceable ()Lnet/minecraft/class_3614$class_3615; - METHOD method_15816 blocksPistons ()Lnet/minecraft/class_3614$class_3615; diff --git a/mappings/net/minecraft/block/MushroomPlantBlock.mapping b/mappings/net/minecraft/block/MushroomPlantBlock.mapping index 0e2d1dd6be..c1db7afee6 100644 --- a/mappings/net/minecraft/block/MushroomPlantBlock.mapping +++ b/mappings/net/minecraft/block/MushroomPlantBlock.mapping @@ -1,9 +1,9 @@ CLASS net/minecraft/class_2420 net/minecraft/block/MushroomPlantBlock FIELD field_11304 SHAPE Lnet/minecraft/class_265; - FIELD field_27194 feature Ljava/util/function/Supplier; - METHOD (Lnet/minecraft/class_4970$class_2251;Ljava/util/function/Supplier;)V + FIELD field_27194 featureKey Lnet/minecraft/class_5321; + METHOD (Lnet/minecraft/class_4970$class_2251;Lnet/minecraft/class_5321;)V ARG 1 settings - ARG 2 feature + ARG 2 featureKey METHOD method_10349 trySpawningBigMushroom (Lnet/minecraft/class_3218;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;Lnet/minecraft/class_5819;)Z ARG 1 world ARG 2 pos diff --git a/mappings/net/minecraft/block/NoteBlock.mapping b/mappings/net/minecraft/block/NoteBlock.mapping index 8553a1c6ec..d5e4cf0b2e 100644 --- a/mappings/net/minecraft/block/NoteBlock.mapping +++ b/mappings/net/minecraft/block/NoteBlock.mapping @@ -2,7 +2,17 @@ CLASS net/minecraft/class_2428 net/minecraft/block/NoteBlock FIELD field_11324 NOTE Lnet/minecraft/class_2758; FIELD field_11325 INSTRUMENT Lnet/minecraft/class_2754; FIELD field_11326 POWERED Lnet/minecraft/class_2746; - METHOD method_10367 playNote (Lnet/minecraft/class_1297;Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;)V + METHOD method_10367 playNote (Lnet/minecraft/class_1297;Lnet/minecraft/class_2680;Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;)V ARG 1 entity - ARG 2 world - ARG 3 pos + ARG 2 state + ARG 3 world + ARG 4 pos + METHOD method_47583 getStateWithInstrument (Lnet/minecraft/class_1936;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;)Lnet/minecraft/class_2680; + ARG 1 world + ARG 2 pos + ARG 3 state + METHOD method_47886 getCustomSound (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;)Lnet/minecraft/class_2960; + ARG 1 world + ARG 2 pos + METHOD method_49818 getNotePitch (I)F + ARG 0 note diff --git a/mappings/net/minecraft/block/NyliumBlock.mapping b/mappings/net/minecraft/block/NyliumBlock.mapping index 52a1997db2..25be92d834 100644 --- a/mappings/net/minecraft/block/NyliumBlock.mapping +++ b/mappings/net/minecraft/block/NyliumBlock.mapping @@ -3,3 +3,12 @@ CLASS net/minecraft/class_4849 net/minecraft/block/NyliumBlock ARG 0 state ARG 1 world ARG 2 pos + METHOD method_46686 (Lnet/minecraft/class_3218;Lnet/minecraft/class_2794;Lnet/minecraft/class_5819;Lnet/minecraft/class_2338;Lnet/minecraft/class_6880$class_6883;)V + ARG 4 entry + METHOD method_46687 generate (Lnet/minecraft/class_2378;Lnet/minecraft/class_5321;Lnet/minecraft/class_3218;Lnet/minecraft/class_2794;Lnet/minecraft/class_5819;Lnet/minecraft/class_2338;)V + ARG 1 registry + ARG 2 key + ARG 3 world + ARG 4 chunkGenerator + ARG 5 random + ARG 6 pos diff --git a/mappings/net/minecraft/block/PistonBlock.mapping b/mappings/net/minecraft/block/PistonBlock.mapping index 355c205ad9..37ae1ac9ce 100644 --- a/mappings/net/minecraft/block/PistonBlock.mapping +++ b/mappings/net/minecraft/block/PistonBlock.mapping @@ -15,7 +15,7 @@ CLASS net/minecraft/class_2665 net/minecraft/block/PistonBlock ARG 2 pos ARG 3 dir ARG 4 retract - METHOD method_11482 shouldExtend (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_2350;)Z + METHOD method_11482 shouldExtend (Lnet/minecraft/class_8235;Lnet/minecraft/class_2338;Lnet/minecraft/class_2350;)Z ARG 1 world ARG 2 pos ARG 3 pistonFace diff --git a/mappings/net/minecraft/block/PitcherCropBlock.mapping b/mappings/net/minecraft/block/PitcherCropBlock.mapping new file mode 100644 index 0000000000..33ecd5d906 --- /dev/null +++ b/mappings/net/minecraft/block/PitcherCropBlock.mapping @@ -0,0 +1,35 @@ +CLASS net/minecraft/class_8237 net/minecraft/block/PitcherCropBlock + FIELD field_43239 AGE Lnet/minecraft/class_2758; + FIELD field_43244 GROWN_UPPER_OUTLINE_SHAPE Lnet/minecraft/class_265; + FIELD field_43245 GROWN_LOWER_OUTLINE_SHAPE Lnet/minecraft/class_265; + FIELD field_43246 AGE_0_SHAPE Lnet/minecraft/class_265; + FIELD field_43247 LOWER_COLLISION_SHAPE Lnet/minecraft/class_265; + FIELD field_44477 UPPER_OUTLINE_SHAPES [Lnet/minecraft/class_265; + FIELD field_44478 LOWER_OUTLINE_SHAPES [Lnet/minecraft/class_265; + METHOD method_49819 tryGrow (Lnet/minecraft/class_3218;Lnet/minecraft/class_2680;Lnet/minecraft/class_2338;I)V + ARG 1 world + ARG 2 state + ARG 3 pos + ARG 4 amount + METHOD method_49820 canGrowAt (Lnet/minecraft/class_4538;Lnet/minecraft/class_2338;)Z + ARG 0 world + ARG 1 pos + METHOD method_49821 isFullyGrown (Lnet/minecraft/class_2680;)Z + ARG 1 state + METHOD method_51171 isLowerHalf (Lnet/minecraft/class_2680;)Z + ARG 0 state + METHOD method_52266 canGrow (Lnet/minecraft/class_4538;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;I)Z + ARG 1 world + ARG 2 pos + ARG 3 state + ARG 4 age + METHOD method_52267 canPlaceAt (Lnet/minecraft/class_4538;Lnet/minecraft/class_2338;)Z + ARG 0 world + ARG 1 pos + METHOD method_52268 getLowerHalfContext (Lnet/minecraft/class_4538;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;)Lnet/minecraft/class_8237$class_8587; + ARG 1 world + ARG 2 pos + ARG 3 state + METHOD method_52575 isDoubleTallAtAge (I)Z + ARG 0 age + CLASS class_8587 LowerHalfContext diff --git a/mappings/net/minecraft/block/PointedDripstoneBlock.mapping b/mappings/net/minecraft/block/PointedDripstoneBlock.mapping index 9b7c3f7c39..2816b014f8 100644 --- a/mappings/net/minecraft/block/PointedDripstoneBlock.mapping +++ b/mappings/net/minecraft/block/PointedDripstoneBlock.mapping @@ -97,8 +97,8 @@ CLASS net/minecraft/class_5689 net/minecraft/block/PointedDripstoneBlock METHOD method_33274 (Lnet/minecraft/class_3611;Lnet/minecraft/class_2680;)Z ARG 1 state METHOD method_33275 (Lnet/minecraft/class_2350;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;)Z - ARG 1 pos - ARG 2 state + ARG 1 posx + ARG 2 statex METHOD method_33276 getFluid (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;)Ljava/util/Optional; ARG 0 world ARG 1 pos @@ -106,14 +106,14 @@ CLASS net/minecraft/class_5689 net/minecraft/block/PointedDripstoneBlock METHOD method_33277 (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;Lnet/minecraft/class_5689$class_7381;)V ARG 3 fluid METHOD method_33278 (Lnet/minecraft/class_2350;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;)Z - ARG 1 pos - ARG 2 state + ARG 1 posx + ARG 2 statex METHOD method_33279 (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;)Lnet/minecraft/class_5689$class_7381; - ARG 1 pos + ARG 1 posx METHOD method_33280 (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;Lnet/minecraft/class_5689$class_7381;)V ARG 3 fluid METHOD method_33281 (Lnet/minecraft/class_2680;)Z - ARG 0 state + ARG 0 statex METHOD method_35283 isPointingUp (Lnet/minecraft/class_2680;)Z ARG 0 state METHOD method_36368 tryGrowStalagmite (Lnet/minecraft/class_3218;Lnet/minecraft/class_2338;)V @@ -135,7 +135,7 @@ CLASS net/minecraft/class_5689 net/minecraft/block/PointedDripstoneBlock ARG 0 state ARG 1 direction METHOD method_36373 (ZLnet/minecraft/class_2680;)Z - ARG 1 state + ARG 1 statex METHOD method_36374 canGrow (Lnet/minecraft/class_2680;Lnet/minecraft/class_3218;Lnet/minecraft/class_2338;)Z ARG 0 state ARG 1 world @@ -158,10 +158,10 @@ CLASS net/minecraft/class_5689 net/minecraft/block/PointedDripstoneBlock ARG 1 pos ARG 2 state METHOD method_40017 (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;)Z - ARG 1 pos + ARG 1 posx ARG 2 state METHOD method_40018 (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;)Z - ARG 1 pos + ARG 1 posx ARG 2 state METHOD method_43131 (Lnet/minecraft/class_5689$class_7381;)Lnet/minecraft/class_3611; ARG 0 fluid diff --git a/mappings/net/minecraft/block/PowderSnowCauldronBlock.mapping b/mappings/net/minecraft/block/PowderSnowCauldronBlock.mapping index 0ef7377848..61972d96c3 100644 --- a/mappings/net/minecraft/block/PowderSnowCauldronBlock.mapping +++ b/mappings/net/minecraft/block/PowderSnowCauldronBlock.mapping @@ -1 +1,2 @@ CLASS net/minecraft/class_6377 net/minecraft/block/PowderSnowCauldronBlock + COMMENT A cauldron filled with powder snow. diff --git a/mappings/net/minecraft/block/PressurePlateBlock.mapping b/mappings/net/minecraft/block/PressurePlateBlock.mapping index 7e0d0bff76..06d67a3178 100644 --- a/mappings/net/minecraft/block/PressurePlateBlock.mapping +++ b/mappings/net/minecraft/block/PressurePlateBlock.mapping @@ -1,7 +1,8 @@ CLASS net/minecraft/class_2440 net/minecraft/block/PressurePlateBlock FIELD field_11358 POWERED Lnet/minecraft/class_2746; FIELD field_11359 type Lnet/minecraft/class_2440$class_2441; - METHOD (Lnet/minecraft/class_2440$class_2441;Lnet/minecraft/class_4970$class_2251;)V + METHOD (Lnet/minecraft/class_2440$class_2441;Lnet/minecraft/class_4970$class_2251;Lnet/minecraft/class_8177;)V ARG 1 type ARG 2 settings + ARG 3 blockSetType CLASS class_2441 ActivationRule diff --git a/mappings/net/minecraft/block/PumpkinBlock.mapping b/mappings/net/minecraft/block/PumpkinBlock.mapping index 6065dc3706..404872ed0d 100644 --- a/mappings/net/minecraft/block/PumpkinBlock.mapping +++ b/mappings/net/minecraft/block/PumpkinBlock.mapping @@ -1,3 +1,3 @@ CLASS net/minecraft/class_2445 net/minecraft/block/PumpkinBlock METHOD method_20291 (Lnet/minecraft/class_1268;Lnet/minecraft/class_1657;)V - ARG 1 player + ARG 1 playerx diff --git a/mappings/net/minecraft/block/RedstoneTorchBlock.mapping b/mappings/net/minecraft/block/RedstoneTorchBlock.mapping index 522cb06744..614d08faab 100644 --- a/mappings/net/minecraft/block/RedstoneTorchBlock.mapping +++ b/mappings/net/minecraft/block/RedstoneTorchBlock.mapping @@ -11,7 +11,7 @@ CLASS net/minecraft/class_2459 net/minecraft/block/RedstoneTorchBlock ARG 1 pos ARG 2 addNew METHOD method_20453 (Lnet/minecraft/class_1922;)Ljava/util/List; - ARG 0 world + ARG 0 worldx CLASS class_2460 BurnoutEntry FIELD field_11447 time J FIELD field_11448 pos Lnet/minecraft/class_2338; diff --git a/mappings/net/minecraft/block/RespawnAnchorBlock.mapping b/mappings/net/minecraft/block/RespawnAnchorBlock.mapping index ed3de6ea86..467e4e1ab5 100644 --- a/mappings/net/minecraft/block/RespawnAnchorBlock.mapping +++ b/mappings/net/minecraft/block/RespawnAnchorBlock.mapping @@ -11,10 +11,11 @@ CLASS net/minecraft/class_4969 net/minecraft/block/RespawnAnchorBlock METHOD method_26157 getLightLevel (Lnet/minecraft/class_2680;I)I ARG 0 state ARG 1 maxLevel - METHOD method_26382 charge (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;)V - ARG 0 world - ARG 1 pos - ARG 2 state + METHOD method_26382 charge (Lnet/minecraft/class_1297;Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;)V + ARG 0 charger + ARG 1 world + ARG 2 pos + ARG 3 state METHOD method_27353 isNether (Lnet/minecraft/class_1937;)Z ARG 0 world METHOD method_29289 isChargeItem (Lnet/minecraft/class_1799;)Z diff --git a/mappings/net/minecraft/block/SculkCatalystBlock.mapping b/mappings/net/minecraft/block/SculkCatalystBlock.mapping index d550ebc6c5..8b2351ef0a 100644 --- a/mappings/net/minecraft/block/SculkCatalystBlock.mapping +++ b/mappings/net/minecraft/block/SculkCatalystBlock.mapping @@ -1,9 +1,3 @@ CLASS net/minecraft/class_7126 net/minecraft/block/SculkCatalystBlock - FIELD field_37603 BLOOM_DURATION I FIELD field_37604 BLOOM Lnet/minecraft/class_2746; FIELD field_37605 experience Lnet/minecraft/class_6017; - METHOD method_41477 bloom (Lnet/minecraft/class_3218;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;Lnet/minecraft/class_5819;)V - ARG 0 world - ARG 1 pos - ARG 2 state - ARG 3 random diff --git a/mappings/net/minecraft/block/SculkSensorBlock.mapping b/mappings/net/minecraft/block/SculkSensorBlock.mapping index 931c350ca4..916b700ec5 100644 --- a/mappings/net/minecraft/block/SculkSensorBlock.mapping +++ b/mappings/net/minecraft/block/SculkSensorBlock.mapping @@ -1,35 +1,40 @@ CLASS net/minecraft/class_5703 net/minecraft/block/SculkSensorBlock - FIELD field_28110 FREQUENCIES Lit/unimi/dsi/fastutil/objects/Object2IntMap; FIELD field_28111 SCULK_SENSOR_PHASE Lnet/minecraft/class_2754; FIELD field_28112 POWER Lnet/minecraft/class_2758; FIELD field_28113 WATERLOGGED Lnet/minecraft/class_2746; FIELD field_28114 OUTLINE_SHAPE Lnet/minecraft/class_265; - FIELD field_28115 range I - METHOD (Lnet/minecraft/class_4970$class_2251;I)V + FIELD field_43248 RESONATION_NOTE_PITCHES [F + METHOD (Lnet/minecraft/class_4970$class_2251;)V ARG 1 settings - ARG 2 range - METHOD method_32902 updateNeighbors (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;)V + METHOD method_32902 updateNeighbors (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;)V ARG 0 world ARG 1 pos + ARG 2 state METHOD method_32903 setCooldown (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;)V ARG 0 world ARG 1 pos ARG 2 state - METHOD method_32904 setActive (Lnet/minecraft/class_1297;Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;I)V - ARG 0 entity - ARG 1 world - ARG 2 pos - ARG 3 state - ARG 4 power + METHOD method_32904 setActive (Lnet/minecraft/class_1297;Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;II)V + ARG 1 sourceEntity + ARG 2 world + ARG 3 pos + ARG 4 state + ARG 5 power + ARG 6 frequency METHOD method_32905 (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;Lnet/minecraft/class_5704;)V - ARG 0 world + ARG 0 worldx ARG 1 pos - ARG 2 state + ARG 2 statex ARG 3 blockEntity - METHOD method_32906 (Lit/unimi/dsi/fastutil/objects/Object2IntOpenHashMap;)V - ARG 0 map - METHOD method_32907 getRange ()I METHOD method_32908 getPhase (Lnet/minecraft/class_2680;)Lnet/minecraft/class_5705; ARG 0 state METHOD method_32909 isInactive (Lnet/minecraft/class_2680;)Z ARG 0 state + METHOD method_49822 tryResonate (Lnet/minecraft/class_1297;Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;I)V + ARG 0 sourceEntity + ARG 1 world + ARG 2 pos + ARG 3 frequency + METHOD method_49823 ([F)V + ARG 0 frequency + METHOD method_51166 getCooldownTime ()I diff --git a/mappings/net/minecraft/block/SculkShriekerBlock.mapping b/mappings/net/minecraft/block/SculkShriekerBlock.mapping index 86f32e8876..153c61db8c 100644 --- a/mappings/net/minecraft/block/SculkShriekerBlock.mapping +++ b/mappings/net/minecraft/block/SculkShriekerBlock.mapping @@ -5,10 +5,8 @@ CLASS net/minecraft/class_7268 net/minecraft/block/SculkShriekerBlock FIELD field_38232 TOP D FIELD field_38422 CAN_SUMMON Lnet/minecraft/class_2746; METHOD method_42317 (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;Lnet/minecraft/class_7133;)V - ARG 0 world ARG 1 pos - ARG 2 state - ARG 3 blockEntity + ARG 2 statex METHOD method_43132 (Lnet/minecraft/class_3218;Lnet/minecraft/class_7133;)V ARG 1 blockEntity METHOD method_43133 (Lnet/minecraft/class_3218;Lnet/minecraft/class_7133;)V diff --git a/mappings/net/minecraft/block/ShulkerBoxBlock.mapping b/mappings/net/minecraft/block/ShulkerBoxBlock.mapping index ca832d7efa..166db9c116 100644 --- a/mappings/net/minecraft/block/ShulkerBoxBlock.mapping +++ b/mappings/net/minecraft/block/ShulkerBoxBlock.mapping @@ -1,13 +1,19 @@ CLASS net/minecraft/class_2480 net/minecraft/block/ShulkerBoxBlock FIELD field_11494 color Lnet/minecraft/class_1767; - FIELD field_11495 CONTENTS Lnet/minecraft/class_2960; + FIELD field_11495 CONTENTS_DYNAMIC_DROP_ID Lnet/minecraft/class_2960; FIELD field_11496 FACING Lnet/minecraft/class_2754; + FIELD field_41076 UP_SHAPE Lnet/minecraft/class_265; + FIELD field_41077 DOWN_SHAPE Lnet/minecraft/class_265; + FIELD field_41078 WEST_SHAPE Lnet/minecraft/class_265; + FIELD field_41079 EAST_SHAPE Lnet/minecraft/class_265; + FIELD field_41080 NORTH_SHAPE Lnet/minecraft/class_265; + FIELD field_41081 SOUTH_SHAPE Lnet/minecraft/class_265; + FIELD field_41082 SIDES_SHAPES Ljava/util/Map; METHOD (Lnet/minecraft/class_1767;Lnet/minecraft/class_4970$class_2251;)V ARG 1 color ARG 2 settings - METHOD method_10524 (Lnet/minecraft/class_2627;Lnet/minecraft/class_47;Ljava/util/function/Consumer;)V - ARG 1 context - ARG 2 consumer + METHOD method_10524 (Lnet/minecraft/class_2627;Ljava/util/function/Consumer;)V + ARG 1 lootConsumer METHOD method_10525 get (Lnet/minecraft/class_1767;)Lnet/minecraft/class_2248; ARG 0 dyeColor METHOD method_10526 getColor (Lnet/minecraft/class_2248;)Lnet/minecraft/class_1767; @@ -24,3 +30,5 @@ CLASS net/minecraft/class_2480 net/minecraft/block/ShulkerBoxBlock ARG 3 entity METHOD method_38234 (Lnet/minecraft/class_1799;Lnet/minecraft/class_2627;)V ARG 1 blockEntity + METHOD method_47378 (Ljava/util/EnumMap;)V + ARG 0 map diff --git a/mappings/net/minecraft/block/SkullBlock.mapping b/mappings/net/minecraft/block/SkullBlock.mapping index d851ffb1fd..60eddf8c59 100644 --- a/mappings/net/minecraft/block/SkullBlock.mapping +++ b/mappings/net/minecraft/block/SkullBlock.mapping @@ -1,5 +1,8 @@ CLASS net/minecraft/class_2484 net/minecraft/block/SkullBlock FIELD field_11505 ROTATION Lnet/minecraft/class_2758; FIELD field_11506 SHAPE Lnet/minecraft/class_265; + FIELD field_31244 MAX_ROTATION_INDEX I + FIELD field_31245 MAX_ROTATIONS I + FIELD field_41312 PIGLIN_SHAPE Lnet/minecraft/class_265; CLASS class_2485 SkullType CLASS class_2486 Type diff --git a/mappings/net/minecraft/block/SnifferEggBlock.mapping b/mappings/net/minecraft/block/SnifferEggBlock.mapping new file mode 100644 index 0000000000..ff02d4a259 --- /dev/null +++ b/mappings/net/minecraft/block/SnifferEggBlock.mapping @@ -0,0 +1,14 @@ +CLASS net/minecraft/class_8238 net/minecraft/block/SnifferEggBlock + FIELD field_43249 FINAL_HATCH_STAGE I + FIELD field_43250 HATCH Lnet/minecraft/class_2758; + FIELD field_43251 HATCHING_TIME I + FIELD field_43252 BOOSTED_HATCHING_TIME I + FIELD field_43253 MAX_RANDOM_CRACK_TIME_OFFSET I + FIELD field_43254 SHAPE Lnet/minecraft/class_265; + METHOD method_49826 isAboveHatchBooster (Lnet/minecraft/class_1922;Lnet/minecraft/class_2338;)Z + ARG 0 world + ARG 1 pos + METHOD method_49827 getHatchStage (Lnet/minecraft/class_2680;)I + ARG 1 state + METHOD method_49828 isReadyToHatch (Lnet/minecraft/class_2680;)Z + ARG 1 state diff --git a/mappings/net/minecraft/block/SpawnerBlock.mapping b/mappings/net/minecraft/block/SpawnerBlock.mapping index ab4fc44d29..c9ee95235d 100644 --- a/mappings/net/minecraft/block/SpawnerBlock.mapping +++ b/mappings/net/minecraft/block/SpawnerBlock.mapping @@ -1 +1,5 @@ CLASS net/minecraft/class_2496 net/minecraft/block/SpawnerBlock + METHOD method_46688 (Lnet/minecraft/class_1299;)Lnet/minecraft/class_2561; + ARG 0 entityType + METHOD method_46689 getEntityNameForTooltip (Lnet/minecraft/class_1799;)Ljava/util/Optional; + ARG 1 stack diff --git a/mappings/net/minecraft/block/SpongeBlock.mapping b/mappings/net/minecraft/block/SpongeBlock.mapping index 27b9d04eab..37759ec799 100644 --- a/mappings/net/minecraft/block/SpongeBlock.mapping +++ b/mappings/net/minecraft/block/SpongeBlock.mapping @@ -5,3 +5,8 @@ CLASS net/minecraft/class_2502 net/minecraft/block/SpongeBlock METHOD method_10620 update (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;)V ARG 1 world ARG 2 pos + METHOD method_49829 (Lnet/minecraft/class_2338;Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;)Z + ARG 2 currentPos + METHOD method_49830 (Lnet/minecraft/class_2338;Ljava/util/function/Consumer;)V + ARG 0 currentPos + ARG 1 queuer diff --git a/mappings/net/minecraft/block/StoneButtonBlock.mapping b/mappings/net/minecraft/block/StoneButtonBlock.mapping deleted file mode 100644 index 255c3b02f8..0000000000 --- a/mappings/net/minecraft/block/StoneButtonBlock.mapping +++ /dev/null @@ -1 +0,0 @@ -CLASS net/minecraft/class_2517 net/minecraft/block/StoneButtonBlock diff --git a/mappings/net/minecraft/block/SuspiciousStewIngredient.mapping b/mappings/net/minecraft/block/SuspiciousStewIngredient.mapping new file mode 100644 index 0000000000..3d428464af --- /dev/null +++ b/mappings/net/minecraft/block/SuspiciousStewIngredient.mapping @@ -0,0 +1,9 @@ +CLASS net/minecraft/class_7917 net/minecraft/block/SuspiciousStewIngredient + METHOD method_47379 getAll ()Ljava/util/List; + METHOD method_47380 of (Lnet/minecraft/class_1935;)Lnet/minecraft/class_7917; + ARG 0 item + METHOD method_53233 getStewEffects ()Ljava/util/List; + CLASS class_8751 StewEffect + FIELD field_45782 CODEC Lcom/mojang/serialization/Codec; + FIELD field_45783 LIST_CODEC Lcom/mojang/serialization/Codec; + METHOD method_53247 createStatusEffectInstance ()Lnet/minecraft/class_1293; diff --git a/mappings/net/minecraft/block/TntBlock.mapping b/mappings/net/minecraft/block/TntBlock.mapping index d5a4562bb0..e4f960b17a 100644 --- a/mappings/net/minecraft/block/TntBlock.mapping +++ b/mappings/net/minecraft/block/TntBlock.mapping @@ -8,4 +8,4 @@ CLASS net/minecraft/class_2530 net/minecraft/block/TntBlock ARG 0 world ARG 1 pos METHOD method_20292 (Lnet/minecraft/class_1268;Lnet/minecraft/class_1657;)V - ARG 1 player + ARG 1 playerx diff --git a/mappings/net/minecraft/block/TorchflowerBlock.mapping b/mappings/net/minecraft/block/TorchflowerBlock.mapping new file mode 100644 index 0000000000..6e300a8dbd --- /dev/null +++ b/mappings/net/minecraft/block/TorchflowerBlock.mapping @@ -0,0 +1,3 @@ +CLASS net/minecraft/class_8171 net/minecraft/block/TorchflowerBlock + FIELD field_42776 AGE Lnet/minecraft/class_2758; + FIELD field_42778 SHAPES [Lnet/minecraft/class_265; diff --git a/mappings/net/minecraft/block/TrapdoorBlock.mapping b/mappings/net/minecraft/block/TrapdoorBlock.mapping index f86f8817f3..33e6b290df 100644 --- a/mappings/net/minecraft/block/TrapdoorBlock.mapping +++ b/mappings/net/minecraft/block/TrapdoorBlock.mapping @@ -9,6 +9,10 @@ CLASS net/minecraft/class_2533 net/minecraft/block/TrapdoorBlock FIELD field_11631 OPEN Lnet/minecraft/class_2746; FIELD field_11632 OPEN_BOTTOM_SHAPE Lnet/minecraft/class_265; FIELD field_11633 NORTH_SHAPE Lnet/minecraft/class_265; + FIELD field_42779 blockSetType Lnet/minecraft/class_8177; + METHOD (Lnet/minecraft/class_4970$class_2251;Lnet/minecraft/class_8177;)V + ARG 1 settings + ARG 2 blockSetType METHOD method_10740 playToggleSound (Lnet/minecraft/class_1657;Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Z)V ARG 1 player ARG 2 world diff --git a/mappings/net/minecraft/block/WallHangingSignBlock.mapping b/mappings/net/minecraft/block/WallHangingSignBlock.mapping new file mode 100644 index 0000000000..da207a4424 --- /dev/null +++ b/mappings/net/minecraft/block/WallHangingSignBlock.mapping @@ -0,0 +1,25 @@ +CLASS net/minecraft/class_7715 net/minecraft/block/WallHangingSignBlock + FIELD field_40319 FACING Lnet/minecraft/class_2753; + FIELD field_40320 NORTH_SOUTH_COLLISION_SHAPE Lnet/minecraft/class_265; + FIELD field_40321 EAST_WEST_COLLISION_SHAPE Lnet/minecraft/class_265; + FIELD field_40322 NORTH_SOUTH_SHAPE Lnet/minecraft/class_265; + FIELD field_40323 EAST_WEST_SHAPE Lnet/minecraft/class_265; + FIELD field_40324 OUTLINE_SHAPES Ljava/util/Map; + METHOD method_45460 canAttachTo (Lnet/minecraft/class_4538;Lnet/minecraft/class_2680;Lnet/minecraft/class_2338;Lnet/minecraft/class_2350;)Z + ARG 1 world + ARG 2 state + ARG 3 toPos + ARG 4 direction + METHOD method_45461 canAttachAt (Lnet/minecraft/class_2680;Lnet/minecraft/class_4538;Lnet/minecraft/class_2338;)Z + ARG 1 state + ARG 2 world + ARG 3 pos + METHOD method_50004 shouldTryAttaching (Lnet/minecraft/class_2680;Lnet/minecraft/class_1657;Lnet/minecraft/class_3965;Lnet/minecraft/class_2625;Lnet/minecraft/class_1799;)Z + ARG 1 state + ARG 2 player + ARG 3 hitResult + ARG 4 sign + ARG 5 stack + METHOD method_50005 isHitOnFacingAxis (Lnet/minecraft/class_3965;Lnet/minecraft/class_2680;)Z + ARG 1 hitResult + ARG 2 state diff --git a/mappings/net/minecraft/block/WallPiglinHeadBlock.mapping b/mappings/net/minecraft/block/WallPiglinHeadBlock.mapping new file mode 100644 index 0000000000..03c8ba3e52 --- /dev/null +++ b/mappings/net/minecraft/block/WallPiglinHeadBlock.mapping @@ -0,0 +1,2 @@ +CLASS net/minecraft/class_7938 net/minecraft/block/WallPiglinHeadBlock + FIELD field_41311 SHAPES Ljava/util/Map; diff --git a/mappings/net/minecraft/block/WearableCarvedPumpkinBlock.mapping b/mappings/net/minecraft/block/WearableCarvedPumpkinBlock.mapping new file mode 100644 index 0000000000..1bfb363558 --- /dev/null +++ b/mappings/net/minecraft/block/WearableCarvedPumpkinBlock.mapping @@ -0,0 +1 @@ +CLASS net/minecraft/class_8574 net/minecraft/block/WearableCarvedPumpkinBlock diff --git a/mappings/net/minecraft/block/WeightedPressurePlateBlock.mapping b/mappings/net/minecraft/block/WeightedPressurePlateBlock.mapping index c5ca7709f2..4c1ac8c4e7 100644 --- a/mappings/net/minecraft/block/WeightedPressurePlateBlock.mapping +++ b/mappings/net/minecraft/block/WeightedPressurePlateBlock.mapping @@ -1,6 +1,7 @@ CLASS net/minecraft/class_2557 net/minecraft/block/WeightedPressurePlateBlock FIELD field_11738 weight I FIELD field_11739 POWER Lnet/minecraft/class_2758; - METHOD (ILnet/minecraft/class_4970$class_2251;)V + METHOD (ILnet/minecraft/class_4970$class_2251;Lnet/minecraft/class_8177;)V ARG 1 weight ARG 2 settings + ARG 3 blockSetType diff --git a/mappings/net/minecraft/block/WitherSkullBlock.mapping b/mappings/net/minecraft/block/WitherSkullBlock.mapping index 3c0c7e7c8a..23e9df9aab 100644 --- a/mappings/net/minecraft/block/WitherSkullBlock.mapping +++ b/mappings/net/minecraft/block/WitherSkullBlock.mapping @@ -15,3 +15,7 @@ CLASS net/minecraft/class_2570 net/minecraft/block/WitherSkullBlock ARG 0 pos METHOD method_24799 (Lnet/minecraft/class_2694;)Z ARG 0 pos + METHOD method_51174 (Lnet/minecraft/class_2694;)Z + ARG 0 pos + METHOD method_51175 (Lnet/minecraft/class_2694;)Z + ARG 0 pos diff --git a/mappings/net/minecraft/util/SignType.mapping b/mappings/net/minecraft/block/WoodType.mapping similarity index 67% rename from mappings/net/minecraft/util/SignType.mapping rename to mappings/net/minecraft/block/WoodType.mapping index 8b0ece95ff..b77ec3431c 100644 --- a/mappings/net/minecraft/util/SignType.mapping +++ b/mappings/net/minecraft/block/WoodType.mapping @@ -1,4 +1,5 @@ -CLASS net/minecraft/class_4719 net/minecraft/util/SignType +CLASS net/minecraft/class_4719 net/minecraft/block/WoodType + FIELD comp_1299 name Ljava/lang/String; FIELD field_21676 OAK Lnet/minecraft/class_4719; FIELD field_21677 SPRUCE Lnet/minecraft/class_4719; FIELD field_21678 BIRCH Lnet/minecraft/class_4719; @@ -6,13 +7,15 @@ CLASS net/minecraft/class_4719 net/minecraft/util/SignType FIELD field_21680 JUNGLE Lnet/minecraft/class_4719; FIELD field_21681 DARK_OAK Lnet/minecraft/class_4719; FIELD field_21682 VALUES Ljava/util/Set; - FIELD field_21683 name Ljava/lang/String; FIELD field_22183 CRIMSON Lnet/minecraft/class_4719; FIELD field_22184 WARPED Lnet/minecraft/class_4719; FIELD field_37657 MANGROVE Lnet/minecraft/class_4719; - METHOD (Ljava/lang/String;)V + FIELD field_40350 BAMBOO Lnet/minecraft/class_4719; + FIELD field_42837 CHERRY Lnet/minecraft/class_4719; + METHOD (Ljava/lang/String;Lnet/minecraft/class_8177;)V ARG 1 name + ARG 2 setType + METHOD comp_1299 name ()Ljava/lang/String; METHOD method_24026 stream ()Ljava/util/stream/Stream; METHOD method_24027 register (Lnet/minecraft/class_4719;)Lnet/minecraft/class_4719; ARG 0 type - METHOD method_24028 getName ()Ljava/lang/String; diff --git a/mappings/net/minecraft/block/WoodenButtonBlock.mapping b/mappings/net/minecraft/block/WoodenButtonBlock.mapping deleted file mode 100644 index 13e98f9933..0000000000 --- a/mappings/net/minecraft/block/WoodenButtonBlock.mapping +++ /dev/null @@ -1 +0,0 @@ -CLASS net/minecraft/class_2571 net/minecraft/block/WoodenButtonBlock diff --git a/mappings/net/minecraft/block/cauldron/CauldronBehavior.mapping b/mappings/net/minecraft/block/cauldron/CauldronBehavior.mapping index a92801a7b1..46da25f5f9 100644 --- a/mappings/net/minecraft/block/cauldron/CauldronBehavior.mapping +++ b/mappings/net/minecraft/block/cauldron/CauldronBehavior.mapping @@ -1,32 +1,121 @@ CLASS net/minecraft/class_5620 net/minecraft/block/cauldron/CauldronBehavior + COMMENT Cauldron behaviors control what happens when a player interacts with + COMMENT cauldrons using a specific item. + COMMENT + COMMENT

To register new cauldron behaviors, you can add them to the corresponding + COMMENT maps based on the cauldron type. + 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
Behavior maps by cauldron type
TypeBlockBehavior map
Empty{@link net.minecraft.block.Blocks#CAULDRON minecraft:cauldron}{@link #EMPTY_CAULDRON_BEHAVIOR}
Water{@link net.minecraft.block.Blocks#WATER_CAULDRON minecraft:water_cauldron}{@link #WATER_CAULDRON_BEHAVIOR}
Lava{@link net.minecraft.block.Blocks#LAVA_CAULDRON minecraft:lava_cauldron}{@link #LAVA_CAULDRON_BEHAVIOR}
Powder snow{@link net.minecraft.block.Blocks#POWDER_SNOW_CAULDRON minecraft:powder_snow_cauldron}{@link #POWDER_SNOW_CAULDRON_BEHAVIOR}
FIELD field_27775 EMPTY_CAULDRON_BEHAVIOR Ljava/util/Map; + COMMENT The cauldron behaviors for empty cauldrons. + COMMENT + COMMENT @see #createMap FIELD field_27776 WATER_CAULDRON_BEHAVIOR Ljava/util/Map; + COMMENT The cauldron behaviors for water cauldrons. + COMMENT + COMMENT @see #createMap FIELD field_27777 LAVA_CAULDRON_BEHAVIOR Ljava/util/Map; + COMMENT The cauldron behaviors for lava cauldrons. + COMMENT + COMMENT @see #createMap FIELD field_27778 FILL_WITH_WATER Lnet/minecraft/class_5620; + COMMENT A behavior that fills cauldrons with water. + COMMENT + COMMENT @see #fillCauldron FIELD field_27779 FILL_WITH_LAVA Lnet/minecraft/class_5620; + COMMENT A behavior that fills cauldrons with lava. + COMMENT + COMMENT @see #fillCauldron FIELD field_27780 CLEAN_SHULKER_BOX Lnet/minecraft/class_5620; + COMMENT A behavior that cleans dyed shulker boxes. FIELD field_27781 CLEAN_BANNER Lnet/minecraft/class_5620; + COMMENT A behavior that cleans banners with patterns. FIELD field_27782 CLEAN_DYEABLE_ITEM Lnet/minecraft/class_5620; + COMMENT A behavior that cleans {@linkplain net.minecraft.item.DyeableItem dyeable items}. FIELD field_28011 POWDER_SNOW_CAULDRON_BEHAVIOR Ljava/util/Map; + COMMENT The cauldron behaviors for powder snow cauldrons. + COMMENT + COMMENT @see #createMap FIELD field_28012 FILL_WITH_POWDER_SNOW Lnet/minecraft/class_5620; + COMMENT A behavior that fills cauldrons with powder snow. + COMMENT + COMMENT @see #fillCauldron METHOD interact (Lnet/minecraft/class_2680;Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_1657;Lnet/minecraft/class_1268;Lnet/minecraft/class_1799;)Lnet/minecraft/class_1269; + COMMENT Called when a player interacts with a cauldron. + COMMENT + COMMENT @return a {@linkplain ActionResult#isAccepted successful} action result if this behavior succeeds, + COMMENT {@link ActionResult#PASS} otherwise ARG 1 state + COMMENT the current cauldron block state ARG 2 world + COMMENT the world where the cauldron is located ARG 3 pos + COMMENT the cauldron's position ARG 4 player + COMMENT the interacting player ARG 5 hand + COMMENT the hand interacting with the cauldron ARG 6 stack + COMMENT the stack in the player's hand METHOD method_32206 createMap ()Lit/unimi/dsi/fastutil/objects/Object2ObjectOpenHashMap; + COMMENT Creates a mutable map from {@linkplain Item items} to their + COMMENT corresponding cauldron behaviors. + COMMENT + COMMENT

The default return value in the map is a cauldron behavior + COMMENT that returns {@link ActionResult#PASS} for all items. + COMMENT + COMMENT @return the created map METHOD method_32207 fillCauldron (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_1657;Lnet/minecraft/class_1268;Lnet/minecraft/class_1799;Lnet/minecraft/class_2680;Lnet/minecraft/class_3414;)Lnet/minecraft/class_1269; + COMMENT Fills a cauldron from a bucket stack. + COMMENT + COMMENT

The filled bucket stack will be replaced by an empty bucket in the player's + COMMENT inventory. + COMMENT + COMMENT @return a {@linkplain ActionResult#isAccepted successful} action result ARG 0 world + COMMENT the world where the cauldron is located ARG 1 pos + COMMENT the cauldron's position ARG 2 player + COMMENT the interacting player ARG 3 hand + COMMENT the hand interacting with the cauldron ARG 4 stack + COMMENT the filled bucket stack in the player's hand ARG 5 state + COMMENT the filled cauldron state ARG 6 soundEvent + COMMENT the sound produced by filling METHOD method_32208 (Lnet/minecraft/class_2680;)Z - ARG 0 state + ARG 0 statex METHOD method_32209 (Lnet/minecraft/class_2680;Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_1657;Lnet/minecraft/class_1268;Lnet/minecraft/class_1799;)Lnet/minecraft/class_1269; ARG 0 state ARG 1 world @@ -35,20 +124,33 @@ CLASS net/minecraft/class_5620 net/minecraft/block/cauldron/CauldronBehavior ARG 4 hand ARG 5 stack METHOD method_32210 emptyCauldron (Lnet/minecraft/class_2680;Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_1657;Lnet/minecraft/class_1268;Lnet/minecraft/class_1799;Lnet/minecraft/class_1799;Ljava/util/function/Predicate;Lnet/minecraft/class_3414;)Lnet/minecraft/class_1269; + COMMENT Empties a cauldron if it's full. + COMMENT + COMMENT @return a {@linkplain ActionResult#isAccepted successful} action result if emptied, {@link ActionResult#PASS} otherwise ARG 0 state + COMMENT the cauldron block state ARG 1 world + COMMENT the world where the cauldron is located ARG 2 pos + COMMENT the cauldron's position ARG 3 player + COMMENT the interacting player ARG 4 hand + COMMENT the hand interacting with the cauldron ARG 5 stack + COMMENT the stack in the player's hand ARG 6 output - ARG 7 predicate + COMMENT the item stack that replaces the interaction stack when the cauldron is emptied + ARG 7 fullPredicate + COMMENT a predicate used to check if the cauldron can be emptied into the output stack ARG 8 soundEvent + COMMENT the sound produced by emptying METHOD method_32211 (Lit/unimi/dsi/fastutil/objects/Object2ObjectOpenHashMap;)V ARG 0 map METHOD method_32212 registerBehavior ()V + COMMENT Registers the vanilla cauldron behaviors. METHOD method_32213 (Lnet/minecraft/class_2680;)Z - ARG 0 state + ARG 0 statex METHOD method_32214 (Lnet/minecraft/class_2680;Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_1657;Lnet/minecraft/class_1268;Lnet/minecraft/class_1799;)Lnet/minecraft/class_1269; ARG 0 state ARG 1 world @@ -120,7 +222,7 @@ CLASS net/minecraft/class_5620 net/minecraft/block/cauldron/CauldronBehavior ARG 4 hand ARG 5 stack METHOD method_32696 (Lnet/minecraft/class_2680;)Z - ARG 0 state + ARG 0 statex METHOD method_32697 (Lnet/minecraft/class_2680;Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_1657;Lnet/minecraft/class_1268;Lnet/minecraft/class_1799;)Lnet/minecraft/class_1269; ARG 0 state ARG 1 world @@ -136,4 +238,5 @@ CLASS net/minecraft/class_5620 net/minecraft/block/cauldron/CauldronBehavior ARG 4 hand ARG 5 stack METHOD method_34850 registerBucketBehavior (Ljava/util/Map;)V + COMMENT Registers the behavior for filled buckets in the specified behavior map. ARG 0 behavior diff --git a/mappings/net/minecraft/block/entity/AbstractFurnaceBlockEntity.mapping b/mappings/net/minecraft/block/entity/AbstractFurnaceBlockEntity.mapping index be3c856101..53f3832c92 100644 --- a/mappings/net/minecraft/block/entity/AbstractFurnaceBlockEntity.mapping +++ b/mappings/net/minecraft/block/entity/AbstractFurnaceBlockEntity.mapping @@ -24,10 +24,10 @@ CLASS net/minecraft/class_2609 net/minecraft/block/entity/AbstractFurnaceBlockEn ARG 2 pos ARG 3 state ARG 4 recipeType - METHOD method_11192 canAcceptRecipeOutput (Lnet/minecraft/class_1860;Lnet/minecraft/class_2371;I)Z - ARG 0 recipe - ARG 1 slots - ARG 2 count + METHOD method_11192 canAcceptRecipeOutput (Lnet/minecraft/class_5455;Lnet/minecraft/class_8786;Lnet/minecraft/class_2371;I)Z + ARG 0 registryManager + ARG 2 slots + ARG 3 count METHOD method_11194 addFuel (Ljava/util/Map;Lnet/minecraft/class_6862;I)V ARG 0 fuelTimes ARG 1 tag @@ -42,10 +42,10 @@ CLASS net/minecraft/class_2609 net/minecraft/block/entity/AbstractFurnaceBlockEn ARG 0 fuelTimes ARG 1 item ARG 2 fuelTime - METHOD method_11203 craftRecipe (Lnet/minecraft/class_1860;Lnet/minecraft/class_2371;I)Z - ARG 0 recipe - ARG 1 slots - ARG 2 count + METHOD method_11203 craftRecipe (Lnet/minecraft/class_5455;Lnet/minecraft/class_8786;Lnet/minecraft/class_2371;I)Z + ARG 0 registryManager + ARG 2 slots + ARG 3 count METHOD method_17029 getCookTime (Lnet/minecraft/class_1937;Lnet/minecraft/class_2609;)I ARG 0 world ARG 1 furnace @@ -54,8 +54,6 @@ CLASS net/minecraft/class_2609 net/minecraft/block/entity/AbstractFurnaceBlockEn ARG 1 pos ARG 2 multiplier ARG 3 experience - METHOD method_17761 (Ljava/util/List;Lnet/minecraft/class_3218;Lnet/minecraft/class_243;Lit/unimi/dsi/fastutil/objects/Object2IntMap$Entry;Lnet/minecraft/class_1860;)V - ARG 4 recipe METHOD method_17763 dropExperienceForRecipesUsed (Lnet/minecraft/class_3222;)V ARG 1 player METHOD method_24431 (Lnet/minecraft/class_2487;Lnet/minecraft/class_2960;Ljava/lang/Integer;)V @@ -63,7 +61,7 @@ CLASS net/minecraft/class_2609 net/minecraft/block/entity/AbstractFurnaceBlockEn ARG 2 count METHOD method_26395 isNonFlammableWood (Lnet/minecraft/class_1792;)Z COMMENT {@return whether the provided {@code item} is in the {@link - COMMENT net.minecraft.tag.ItemTags#NON_FLAMMABLE_WOOD non_flammable_wood} tag} + COMMENT net.minecraft.registry.tag.ItemTags#NON_FLAMMABLE_WOOD non_flammable_wood} tag} ARG 0 item METHOD method_27354 getRecipesUsedAndDropExperience (Lnet/minecraft/class_3218;Lnet/minecraft/class_243;)Ljava/util/List; ARG 1 world diff --git a/mappings/net/minecraft/block/entity/BannerPatterns.mapping b/mappings/net/minecraft/block/entity/BannerPatterns.mapping index 52d593c473..5465d927a6 100644 --- a/mappings/net/minecraft/block/entity/BannerPatterns.mapping +++ b/mappings/net/minecraft/block/entity/BannerPatterns.mapping @@ -1,5 +1,5 @@ CLASS net/minecraft/class_7446 net/minecraft/block/entity/BannerPatterns - METHOD method_43721 initAndGetDefault (Lnet/minecraft/class_2378;)Lnet/minecraft/class_2582; + METHOD method_43721 registerAndGetDefault (Lnet/minecraft/class_2378;)Lnet/minecraft/class_2582; ARG 0 registry METHOD method_43722 of (Ljava/lang/String;)Lnet/minecraft/class_5321; ARG 0 id diff --git a/mappings/net/minecraft/block/entity/BeaconBlockEntity.mapping b/mappings/net/minecraft/block/entity/BeaconBlockEntity.mapping index 1efbc83da7..ef641bf10f 100644 --- a/mappings/net/minecraft/block/entity/BeaconBlockEntity.mapping +++ b/mappings/net/minecraft/block/entity/BeaconBlockEntity.mapping @@ -13,11 +13,12 @@ CLASS net/minecraft/class_2580 net/minecraft/block/entity/BeaconBlockEntity FIELD field_31301 PRIMARY_PROPERTY_INDEX I FIELD field_31302 SECONDARY_PROPERTY_INDEX I FIELD field_31303 PROPERTY_COUNT I + FIELD field_40328 CONTAINER_NAME_TEXT Lnet/minecraft/class_2561; + FIELD field_45784 PRIMARY_EFFECT_NBT_KEY Ljava/lang/String; + FIELD field_45785 SECONDARY_EFFECT_NBT_KEY Ljava/lang/String; METHOD (Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;)V ARG 1 pos ARG 2 state - 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; @@ -41,6 +42,15 @@ CLASS net/minecraft/class_2580 net/minecraft/block/entity/BeaconBlockEntity ARG 1 x ARG 2 y ARG 3 z + METHOD method_53251 getEffectOrNull (Lnet/minecraft/class_1291;)Lnet/minecraft/class_1291; + ARG 0 effect + METHOD method_53252 readStatusEffect (Lnet/minecraft/class_2487;Ljava/lang/String;)Lnet/minecraft/class_1291; + ARG 0 nbt + ARG 1 key + METHOD method_53253 writeStatusEffect (Lnet/minecraft/class_2487;Ljava/lang/String;Lnet/minecraft/class_1291;)V + ARG 0 nbt + ARG 1 key + ARG 2 effect CLASS class_2581 BeamSegment FIELD field_11804 height I FIELD field_11805 color [F diff --git a/mappings/net/minecraft/block/entity/BeehiveBlockEntity.mapping b/mappings/net/minecraft/block/entity/BeehiveBlockEntity.mapping index 96f9c49eee..1d57bf54fc 100644 --- a/mappings/net/minecraft/block/entity/BeehiveBlockEntity.mapping +++ b/mappings/net/minecraft/block/entity/BeehiveBlockEntity.mapping @@ -69,7 +69,7 @@ CLASS net/minecraft/class_4482 net/minecraft/block/entity/BeehiveBlockEntity METHOD method_36379 removeIrrelevantNbtKeys (Lnet/minecraft/class_2487;)V ARG 0 compound METHOD method_40019 (Lnet/minecraft/class_4970$class_4971;)Z - ARG 0 state + ARG 0 statex CLASS class_4483 Bee FIELD field_20425 entityData Lnet/minecraft/class_2487; FIELD field_20426 ticksInHive I diff --git a/mappings/net/minecraft/block/entity/BellBlockEntity.mapping b/mappings/net/minecraft/block/entity/BellBlockEntity.mapping index cc8409c6d0..c4f6e191fd 100644 --- a/mappings/net/minecraft/block/entity/BellBlockEntity.mapping +++ b/mappings/net/minecraft/block/entity/BellBlockEntity.mapping @@ -25,7 +25,7 @@ CLASS net/minecraft/class_3721 net/minecraft/block/entity/BellBlockEntity 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_2338;Lnet/minecraft/class_1309;)Z - COMMENT Determines whether the given entity is in the {@link net.minecraft.tag.EntityTypeTags#RAIDERS} entity type tag and within 48 blocks of the given position. + COMMENT Determines whether the given entity is in the {@link net.minecraft.registry.tag.EntityTypeTags#RAIDERS} entity type tag and within 48 blocks of the given position. ARG 0 pos ARG 1 entity METHOD method_20519 (Lnet/minecraft/class_2338;ILorg/apache/commons/lang3/mutable/MutableInt;Lnet/minecraft/class_1937;Lnet/minecraft/class_1309;)V diff --git a/mappings/net/minecraft/block/entity/BlockEntityType.mapping b/mappings/net/minecraft/block/entity/BlockEntityType.mapping index f235ddbe29..e0e00d49ef 100644 --- a/mappings/net/minecraft/block/entity/BlockEntityType.mapping +++ b/mappings/net/minecraft/block/entity/BlockEntityType.mapping @@ -4,7 +4,7 @@ CLASS net/minecraft/class_2591 net/minecraft/block/entity/BlockEntityType COMMENT represents the type of the placed block entities, like chests or furnaces. COMMENT COMMENT

Block entity types are pre-defined and registered in {@link - COMMENT net.minecraft.util.registry.Registry#BLOCK_ENTITY_TYPE}. To create a block + COMMENT net.minecraft.registry.Registries#BLOCK_ENTITY_TYPE}. To create a block COMMENT entity type, the {@linkplain BlockEntityType.Builder#create builder} should be used. COMMENT COMMENT

Blocks that have corresponding block entities must implement {@link @@ -18,6 +18,7 @@ CLASS net/minecraft/class_2591 net/minecraft/block/entity/BlockEntityType FIELD field_11893 LOGGER Lorg/slf4j/Logger; FIELD field_11909 type Lcom/mojang/datafixers/types/Type; FIELD field_19315 blocks Ljava/util/Set; + FIELD field_45786 registryEntry Lnet/minecraft/class_6880$class_6883; METHOD (Lnet/minecraft/class_2591$class_5559;Ljava/util/Set;Lcom/mojang/datafixers/types/Type;)V ARG 1 factory ARG 2 blocks @@ -49,6 +50,7 @@ CLASS net/minecraft/class_2591 net/minecraft/block/entity/BlockEntityType COMMENT @see BlockView#getBlockEntity ARG 1 world ARG 2 pos + METHOD method_53254 getRegistryEntry ()Lnet/minecraft/class_6880$class_6883; CLASS class_2592 Builder COMMENT Builder for {@link BlockEntityType}. FIELD field_11915 factory Lnet/minecraft/class_2591$class_5559; diff --git a/mappings/net/minecraft/block/entity/BrushableBlockEntity.mapping b/mappings/net/minecraft/block/entity/BrushableBlockEntity.mapping new file mode 100644 index 0000000000..83ae445135 --- /dev/null +++ b/mappings/net/minecraft/block/entity/BrushableBlockEntity.mapping @@ -0,0 +1,36 @@ +CLASS net/minecraft/class_8174 net/minecraft/block/entity/BrushableBlockEntity + FIELD field_42802 LOOT_TABLE_NBT_KEY Ljava/lang/String; + FIELD field_42803 LOOT_TABLE_SEED_NBT_KEY Ljava/lang/String; + FIELD field_42804 HIT_DIRECTION_NBT_KEY Ljava/lang/String; + FIELD field_42805 ITEM_NBT_KEY Ljava/lang/String; + FIELD field_42809 brushesCount I + FIELD field_42810 nextDustTime J + FIELD field_42811 nextBrushTime J + FIELD field_42812 item Lnet/minecraft/class_1799; + FIELD field_42813 hitDirection Lnet/minecraft/class_2350; + FIELD field_42814 lootTable Lnet/minecraft/class_2960; + FIELD field_42815 lootTableSeed J + METHOD (Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;)V + ARG 1 pos + ARG 2 state + METHOD method_49215 brush (JLnet/minecraft/class_1657;Lnet/minecraft/class_2350;)Z + ARG 1 worldTime + ARG 3 player + ARG 4 hitDirection + METHOD method_49216 setLootTable (Lnet/minecraft/class_2960;J)V + ARG 1 lootTable + ARG 2 seed + METHOD method_49217 generateItem (Lnet/minecraft/class_1657;)V + ARG 1 player + METHOD method_49218 finishBrushing (Lnet/minecraft/class_1657;)V + ARG 1 player + METHOD method_49219 scheduledTick ()V + METHOD method_49220 spawnItem (Lnet/minecraft/class_1657;)V + ARG 1 player + METHOD method_49222 readLootTableFromNbt (Lnet/minecraft/class_2487;)Z + ARG 1 nbt + METHOD method_49223 writeLootTableToNbt (Lnet/minecraft/class_2487;)Z + ARG 1 nbt + METHOD method_49224 getHitDirection ()Lnet/minecraft/class_2350; + METHOD method_49225 getItem ()Lnet/minecraft/class_1799; + METHOD method_49226 getDustedLevel ()I diff --git a/mappings/net/minecraft/block/entity/CalibratedSculkSensorBlockEntity.mapping b/mappings/net/minecraft/block/entity/CalibratedSculkSensorBlockEntity.mapping new file mode 100644 index 0000000000..e19646590d --- /dev/null +++ b/mappings/net/minecraft/block/entity/CalibratedSculkSensorBlockEntity.mapping @@ -0,0 +1,8 @@ +CLASS net/minecraft/class_8239 net/minecraft/block/entity/CalibratedSculkSensorBlockEntity + CLASS class_8240 Callback + METHOD (Lnet/minecraft/class_8239;Lnet/minecraft/class_2338;)V + ARG 2 pos + METHOD method_49832 getCalibrationFrequency (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;)I + ARG 1 world + ARG 2 pos + ARG 3 state diff --git a/mappings/net/minecraft/block/entity/CampfireBlockEntity.mapping b/mappings/net/minecraft/block/entity/CampfireBlockEntity.mapping index ad49573b01..6379fae865 100644 --- a/mappings/net/minecraft/block/entity/CampfireBlockEntity.mapping +++ b/mappings/net/minecraft/block/entity/CampfireBlockEntity.mapping @@ -12,8 +12,6 @@ CLASS net/minecraft/class_3924 net/minecraft/block/entity/CampfireBlockEntity ARG 1 user ARG 2 stack ARG 3 cookTime - METHOD method_17504 (Lnet/minecraft/class_1263;Lnet/minecraft/class_3920;)Lnet/minecraft/class_1799; - ARG 1 recipe METHOD method_17505 getItemsBeingCooked ()Lnet/minecraft/class_2371; METHOD method_17506 spawnItemsBeingCooked ()V METHOD method_17510 updateListeners ()V diff --git a/mappings/net/minecraft/block/entity/ChestBlockEntity.mapping b/mappings/net/minecraft/block/entity/ChestBlockEntity.mapping index ae3a149645..54d4c22745 100644 --- a/mappings/net/minecraft/block/entity/ChestBlockEntity.mapping +++ b/mappings/net/minecraft/block/entity/ChestBlockEntity.mapping @@ -2,6 +2,7 @@ CLASS net/minecraft/class_2595 net/minecraft/block/entity/ChestBlockEntity FIELD field_11927 inventory Lnet/minecraft/class_2371; FIELD field_27209 stateManager Lnet/minecraft/class_5561; FIELD field_27210 lidAnimator Lnet/minecraft/class_5560; + FIELD field_31332 VIEWER_COUNT_UPDATE_EVENT_TYPE I METHOD (Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;)V ARG 1 pos ARG 2 state @@ -11,7 +12,7 @@ CLASS net/minecraft/class_2595 net/minecraft/block/entity/ChestBlockEntity METHOD method_11048 getPlayersLookingInChestCount (Lnet/minecraft/class_1922;Lnet/minecraft/class_2338;)I ARG 0 world ARG 1 pos - METHOD method_11049 onInvOpenOrClose (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;II)V + METHOD method_11049 onViewerCountUpdate (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;II)V ARG 1 world ARG 2 pos ARG 3 state diff --git a/mappings/net/minecraft/block/entity/ChiseledBookshelfBlockEntity.mapping b/mappings/net/minecraft/block/entity/ChiseledBookshelfBlockEntity.mapping new file mode 100644 index 0000000000..3493f88240 --- /dev/null +++ b/mappings/net/minecraft/block/entity/ChiseledBookshelfBlockEntity.mapping @@ -0,0 +1,12 @@ +CLASS net/minecraft/class_7716 net/minecraft/block/entity/ChiseledBookshelfBlockEntity + FIELD field_40331 MAX_BOOKS I + FIELD field_40898 LOGGER Lorg/slf4j/Logger; + FIELD field_41314 inventory Lnet/minecraft/class_2371; + FIELD field_41601 lastInteractedSlot I + METHOD (Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;)V + ARG 1 pos + ARG 2 state + METHOD method_47585 updateState (I)V + ARG 1 interactedSlot + METHOD method_47587 getOpenSlotCount ()I + METHOD method_47887 getLastInteractedSlot ()I diff --git a/mappings/net/minecraft/block/entity/DecoratedPotBlockEntity.mapping b/mappings/net/minecraft/block/entity/DecoratedPotBlockEntity.mapping new file mode 100644 index 0000000000..d900998207 --- /dev/null +++ b/mappings/net/minecraft/block/entity/DecoratedPotBlockEntity.mapping @@ -0,0 +1,25 @@ +CLASS net/minecraft/class_8172 net/minecraft/block/entity/DecoratedPotBlockEntity + FIELD field_42782 SHERDS_NBT_KEY Ljava/lang/String; + FIELD field_44706 sherds Lnet/minecraft/class_8172$class_8526; + METHOD (Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;)V + ARG 1 pos + ARG 2 state + METHOD method_49196 readNbtFromStack (Lnet/minecraft/class_1799;)V + ARG 1 stack + METHOD method_49204 getHorizontalFacing ()Lnet/minecraft/class_2350; + METHOD method_51511 getSherds ()Lnet/minecraft/class_8172$class_8526; + METHOD method_52577 getStackWith (Lnet/minecraft/class_8172$class_8526;)Lnet/minecraft/class_1799; + ARG 0 sherds + METHOD method_52578 asStack ()Lnet/minecraft/class_1799; + CLASS class_8526 Sherds + FIELD field_44707 DEFAULT Lnet/minecraft/class_8172$class_8526; + METHOD method_51512 stream ()Ljava/util/stream/Stream; + METHOD method_51513 toNbt (Lnet/minecraft/class_2487;)Lnet/minecraft/class_2487; + ARG 1 nbt + METHOD method_51514 getSherd (Lnet/minecraft/class_2499;I)Lnet/minecraft/class_1792; + ARG 0 list + ARG 1 index + METHOD method_51515 (Lnet/minecraft/class_2499;Lnet/minecraft/class_1792;)V + ARG 1 sherd + METHOD method_51516 fromNbt (Lnet/minecraft/class_2487;)Lnet/minecraft/class_8172$class_8526; + ARG 0 nbt diff --git a/mappings/net/minecraft/block/entity/HangingSignBlockEntity.mapping b/mappings/net/minecraft/block/entity/HangingSignBlockEntity.mapping new file mode 100644 index 0000000000..91307cf9d3 --- /dev/null +++ b/mappings/net/minecraft/block/entity/HangingSignBlockEntity.mapping @@ -0,0 +1,3 @@ +CLASS net/minecraft/class_7717 net/minecraft/block/entity/HangingSignBlockEntity + FIELD field_40333 MAX_TEXT_WIDTH I + FIELD field_40334 TEXT_LINE_HEIGHT I diff --git a/mappings/net/minecraft/block/entity/HopperBlockEntity.mapping b/mappings/net/minecraft/block/entity/HopperBlockEntity.mapping index 71d3835d52..565a7036b8 100644 --- a/mappings/net/minecraft/block/entity/HopperBlockEntity.mapping +++ b/mappings/net/minecraft/block/entity/HopperBlockEntity.mapping @@ -54,11 +54,12 @@ CLASS net/minecraft/class_2614 net/minecraft/block/entity/HopperBlockEntity ARG 1 x ARG 3 y ARG 5 z - METHOD method_11252 canExtract (Lnet/minecraft/class_1263;Lnet/minecraft/class_1799;ILnet/minecraft/class_2350;)Z - ARG 0 inv - ARG 1 stack - ARG 2 slot - ARG 3 facing + METHOD method_11252 canExtract (Lnet/minecraft/class_1263;Lnet/minecraft/class_1263;Lnet/minecraft/class_1799;ILnet/minecraft/class_2350;)Z + ARG 0 hopperInventory + ARG 1 fromInventory + ARG 2 stack + ARG 3 slot + ARG 4 facing METHOD method_11253 transfer (Lnet/minecraft/class_1263;Lnet/minecraft/class_1263;Lnet/minecraft/class_1799;ILnet/minecraft/class_2350;)Lnet/minecraft/class_1799; ARG 0 from ARG 1 to diff --git a/mappings/net/minecraft/block/entity/JukeboxBlockEntity.mapping b/mappings/net/minecraft/block/entity/JukeboxBlockEntity.mapping index 451fe1f26c..96f5a8996e 100644 --- a/mappings/net/minecraft/block/entity/JukeboxBlockEntity.mapping +++ b/mappings/net/minecraft/block/entity/JukeboxBlockEntity.mapping @@ -1,26 +1,34 @@ CLASS net/minecraft/class_2619 net/minecraft/block/entity/JukeboxBlockEntity - FIELD field_12031 record Lnet/minecraft/class_1799; FIELD field_39481 ticksThisSecond I FIELD field_39482 tickCount J FIELD field_39483 recordStartTick J FIELD field_39484 isPlaying Z + FIELD field_42799 SECOND_PER_TICK I + FIELD field_42800 inventory Lnet/minecraft/class_2371; METHOD (Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;)V ARG 1 pos ARG 2 state - METHOD method_11275 getRecord ()Lnet/minecraft/class_1799; - METHOD method_11276 setRecord (Lnet/minecraft/class_1799;)V - ARG 1 stack METHOD method_44370 tick (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;Lnet/minecraft/class_2619;)V ARG 0 world ARG 1 pos ARG 2 state ARG 3 blockEntity - METHOD method_44371 hasSecondPassed (Lnet/minecraft/class_2619;)Z - ARG 0 blockEntity - METHOD method_44372 isSongFinished (Lnet/minecraft/class_2619;Lnet/minecraft/class_1813;)Z - ARG 0 blockEntity + METHOD method_44371 hasSecondPassed ()Z + METHOD method_44372 isSongFinished (Lnet/minecraft/class_1813;)Z ARG 1 musicDisc - METHOD method_44373 isPlayingRecord (Lnet/minecraft/class_2680;Lnet/minecraft/class_2619;)Z - ARG 0 state - ARG 1 blockEntity - METHOD method_44374 startPlaying ()V + METHOD method_44373 isPlayingRecord ()Z + METHOD method_48969 spawnNoteParticle (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;)V + ARG 1 world + ARG 2 pos + METHOD method_49209 updateState (Lnet/minecraft/class_1297;Z)V + ARG 1 entity + ARG 2 hasRecord + METHOD method_49210 setDisc (Lnet/minecraft/class_1799;)V + ARG 1 stack + METHOD method_49211 tick (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;)V + ARG 1 world + ARG 2 pos + ARG 3 state + METHOD method_49212 startPlaying ()V + METHOD method_49213 dropRecord ()V + METHOD method_49214 stopPlaying ()V diff --git a/mappings/net/minecraft/block/entity/MobSpawnerBlockEntity.mapping b/mappings/net/minecraft/block/entity/MobSpawnerBlockEntity.mapping index 76db48dbcf..8ed2430309 100644 --- a/mappings/net/minecraft/block/entity/MobSpawnerBlockEntity.mapping +++ b/mappings/net/minecraft/block/entity/MobSpawnerBlockEntity.mapping @@ -14,3 +14,6 @@ CLASS net/minecraft/class_2636 net/minecraft/block/entity/MobSpawnerBlockEntity ARG 1 pos ARG 2 state ARG 3 blockEntity + METHOD method_46408 setEntityType (Lnet/minecraft/class_1299;Lnet/minecraft/class_5819;)V + ARG 1 entityType + ARG 2 random diff --git a/mappings/net/minecraft/block/entity/PistonBlockEntity.mapping b/mappings/net/minecraft/block/entity/PistonBlockEntity.mapping index af1cdd90ae..355bca50e1 100644 --- a/mappings/net/minecraft/block/entity/PistonBlockEntity.mapping +++ b/mappings/net/minecraft/block/entity/PistonBlockEntity.mapping @@ -4,6 +4,7 @@ CLASS net/minecraft/class_2669 net/minecraft/block/entity/PistonBlockEntity FIELD field_12202 source Z FIELD field_12203 extending Z FIELD field_12204 pushedBlock Lnet/minecraft/class_2680; + FIELD field_12205 entityMovementDirection Ljava/lang/ThreadLocal; FIELD field_12206 lastProgress F FIELD field_12207 progress F FIELD field_12208 savedWorldTime J @@ -53,15 +54,17 @@ CLASS net/minecraft/class_2669 net/minecraft/block/entity/PistonBlockEntity ARG 3 amount METHOD method_11515 isSource ()Z METHOD method_23364 isPushingHoneyBlock ()Z - METHOD method_23671 canMoveEntity (Lnet/minecraft/class_238;Lnet/minecraft/class_1297;)Z + METHOD method_23671 canMoveEntity (Lnet/minecraft/class_238;Lnet/minecraft/class_1297;Lnet/minecraft/class_2338;)Z ARG 0 box ARG 1 entity + ARG 2 pos METHOD method_23672 moveEntity (Lnet/minecraft/class_2350;Lnet/minecraft/class_1297;DLnet/minecraft/class_2350;)V ARG 0 direction ARG 1 entity + ARG 2 distance ARG 4 movementDirection - METHOD method_23673 (Lnet/minecraft/class_238;Lnet/minecraft/class_1297;)Z - ARG 1 entity + METHOD method_23673 (Lnet/minecraft/class_238;Lnet/minecraft/class_2338;Lnet/minecraft/class_1297;)Z + ARG 2 entity METHOD method_23674 moveEntitiesInHoneyBlock (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;FLnet/minecraft/class_2669;)V ARG 0 world ARG 1 pos diff --git a/mappings/net/minecraft/block/entity/SculkCatalystBlockEntity.mapping b/mappings/net/minecraft/block/entity/SculkCatalystBlockEntity.mapping index 5a7d17e455..2322a0d9bd 100644 --- a/mappings/net/minecraft/block/entity/SculkCatalystBlockEntity.mapping +++ b/mappings/net/minecraft/block/entity/SculkCatalystBlockEntity.mapping @@ -1,6 +1,5 @@ CLASS net/minecraft/class_7132 net/minecraft/block/entity/SculkCatalystBlockEntity - FIELD field_37649 positionSource Lnet/minecraft/class_5707; - FIELD field_37650 spreadManager Lnet/minecraft/class_7128; + FIELD field_44610 eventListener Lnet/minecraft/class_7132$class_8510; METHOD (Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;)V ARG 1 pos ARG 2 state @@ -9,4 +8,22 @@ CLASS net/minecraft/class_7132 net/minecraft/block/entity/SculkCatalystBlockEnti ARG 1 pos ARG 2 state ARG 3 blockEntity - METHOD method_41519 getSpreadManager ()Lnet/minecraft/class_7128; + CLASS class_8510 Listener + FIELD field_44611 RANGE I + FIELD field_44612 spreadManager Lnet/minecraft/class_7128; + FIELD field_44613 state Lnet/minecraft/class_2680; + FIELD field_44614 positionSource Lnet/minecraft/class_5716; + METHOD (Lnet/minecraft/class_2680;Lnet/minecraft/class_5716;)V + ARG 1 state + ARG 2 positionSource + METHOD method_51359 (Lnet/minecraft/class_3218;Lnet/minecraft/class_243;)V + ARG 2 pos + METHOD method_51360 bloom (Lnet/minecraft/class_3218;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;Lnet/minecraft/class_5819;)V + ARG 1 world + ARG 2 pos + ARG 3 state + ARG 4 random + METHOD method_51361 triggerCriteria (Lnet/minecraft/class_1937;Lnet/minecraft/class_1309;)V + ARG 1 world + ARG 2 deadEntity + METHOD method_51362 getSpreadManager ()Lnet/minecraft/class_7128; diff --git a/mappings/net/minecraft/block/entity/SculkSensorBlockEntity.mapping b/mappings/net/minecraft/block/entity/SculkSensorBlockEntity.mapping index ed9183f5ef..3b55651278 100644 --- a/mappings/net/minecraft/block/entity/SculkSensorBlockEntity.mapping +++ b/mappings/net/minecraft/block/entity/SculkSensorBlockEntity.mapping @@ -1,18 +1,23 @@ CLASS net/minecraft/class_5704 net/minecraft/block/entity/SculkSensorBlockEntity - FIELD field_28118 listener Lnet/minecraft/class_5718; + FIELD field_28118 listener Lnet/minecraft/class_8514$class_8516; FIELD field_28119 lastVibrationFrequency I FIELD field_38236 LOGGER Lorg/slf4j/Logger; + FIELD field_43291 callback Lnet/minecraft/class_8514$class_5719; + FIELD field_44615 listenerData Lnet/minecraft/class_8514$class_8515; METHOD (Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;)V ARG 1 pos ARG 2 state - METHOD method_32910 getPower (FI)I - ARG 0 distance - ARG 1 range - METHOD method_32911 getEventListener ()Lnet/minecraft/class_5718; METHOD method_32912 getLastVibrationFrequency ()I - METHOD method_42320 (Lnet/minecraft/class_5718;)V + METHOD method_42320 (Lnet/minecraft/class_8514$class_8515;)V ARG 1 listener METHOD method_42321 (Lnet/minecraft/class_2487;Lnet/minecraft/class_2520;)V ARG 1 listenerNbt METHOD method_44213 setLastVibrationFrequency (I)V ARG 1 lastVibrationFrequency + METHOD method_49831 createCallback ()Lnet/minecraft/class_8514$class_5719; + CLASS class_8241 VibrationCallback + FIELD field_43292 RANGE I + FIELD field_44616 positionSource Lnet/minecraft/class_5716; + FIELD field_44617 pos Lnet/minecraft/class_2338; + METHOD (Lnet/minecraft/class_5704;Lnet/minecraft/class_2338;)V + ARG 2 pos diff --git a/mappings/net/minecraft/block/entity/SculkShriekerBlockEntity.mapping b/mappings/net/minecraft/block/entity/SculkShriekerBlockEntity.mapping index 41477b3781..33184e4302 100644 --- a/mappings/net/minecraft/block/entity/SculkShriekerBlockEntity.mapping +++ b/mappings/net/minecraft/block/entity/SculkShriekerBlockEntity.mapping @@ -1,7 +1,6 @@ CLASS net/minecraft/class_7133 net/minecraft/block/entity/SculkShriekerBlockEntity FIELD field_38237 LOGGER Lorg/slf4j/Logger; - FIELD field_38238 RANGE I - FIELD field_38239 vibrationListener Lnet/minecraft/class_5718; + FIELD field_38239 vibrationListener Lnet/minecraft/class_8514$class_8516; FIELD field_38751 WARDEN_SPAWN_TRIES I FIELD field_38752 WARDEN_SPAWN_HORIZONTAL_RANGE I FIELD field_38753 WARDEN_SPAWN_VERTICAL_RANGE I @@ -9,12 +8,13 @@ CLASS net/minecraft/class_7133 net/minecraft/block/entity/SculkShriekerBlockEnti FIELD field_38755 WARNING_SOUNDS Lit/unimi/dsi/fastutil/ints/Int2ObjectMap; FIELD field_38756 SHRIEK_DELAY I FIELD field_38757 warningLevel I + FIELD field_44619 vibrationCallback Lnet/minecraft/class_8514$class_5719; + FIELD field_44620 vibrationListenerData Lnet/minecraft/class_8514$class_8515; METHOD (Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;)V ARG 1 pos ARG 2 state - METHOD method_42322 (Lnet/minecraft/class_5718;)V + METHOD method_42322 (Lnet/minecraft/class_8514$class_8515;)V ARG 1 vibrationListener - METHOD method_42325 getVibrationListener ()Lnet/minecraft/class_5718; METHOD method_43141 shriek (Lnet/minecraft/class_3218;Lnet/minecraft/class_3222;)V ARG 1 world ARG 2 player @@ -29,7 +29,8 @@ CLASS net/minecraft/class_7133 net/minecraft/block/entity/SculkShriekerBlockEnti ARG 1 world METHOD method_43150 canWarn (Lnet/minecraft/class_3218;)Z ARG 1 world - METHOD method_43151 playWarningSound ()V + METHOD method_43151 playWarningSound (Lnet/minecraft/class_1937;)V + ARG 1 world METHOD method_44016 (I)V ARG 1 warningLevel METHOD method_44017 shriek (Lnet/minecraft/class_3218;Lnet/minecraft/class_1297;)V @@ -37,3 +38,6 @@ CLASS net/minecraft/class_7133 net/minecraft/block/entity/SculkShriekerBlockEnti ARG 2 entity METHOD method_44018 findResponsiblePlayerFromEntity (Lnet/minecraft/class_1297;)Lnet/minecraft/class_3222; ARG 0 entity + CLASS class_8511 VibrationCallback + FIELD field_44622 RANGE I + FIELD field_44623 positionSource Lnet/minecraft/class_5716; diff --git a/mappings/net/minecraft/block/entity/SculkShriekerWarningManager.mapping b/mappings/net/minecraft/block/entity/SculkShriekerWarningManager.mapping index 0254bde91f..a018305159 100644 --- a/mappings/net/minecraft/block/entity/SculkShriekerWarningManager.mapping +++ b/mappings/net/minecraft/block/entity/SculkShriekerWarningManager.mapping @@ -29,8 +29,6 @@ CLASS net/minecraft/class_7262 net/minecraft/block/entity/SculkShriekerWarningMa METHOD method_42259 canIncreaseWarningLevel (Lnet/minecraft/class_3218;Lnet/minecraft/class_2338;)Z ARG 0 world ARG 1 pos - METHOD method_42260 (Lnet/minecraft/class_7262;)I - ARG 0 manager METHOD method_42261 increaseWarningLevel ()V METHOD method_42263 (Lnet/minecraft/class_7262;)Ljava/lang/Integer; ARG 0 manager @@ -48,3 +46,7 @@ CLASS net/minecraft/class_7262 net/minecraft/block/entity/SculkShriekerWarningMa METHOD method_44002 (Lnet/minecraft/class_7262;Lnet/minecraft/class_3222;)V ARG 1 nearbyPlayer METHOD method_44003 isInCooldown ()Z + METHOD method_45380 (Lnet/minecraft/class_3222;)Ljava/util/stream/Stream; + ARG 0 playerx + METHOD method_45381 (Lnet/minecraft/class_7262;Lnet/minecraft/class_7262;)V + ARG 1 warningManager diff --git a/mappings/net/minecraft/block/entity/SculkSpreadManager.mapping b/mappings/net/minecraft/block/entity/SculkSpreadManager.mapping index 40c467446e..f09a743dba 100644 --- a/mappings/net/minecraft/block/entity/SculkSpreadManager.mapping +++ b/mappings/net/minecraft/block/entity/SculkSpreadManager.mapping @@ -25,7 +25,7 @@ CLASS net/minecraft/class_7128 net/minecraft/block/entity/SculkSpreadManager METHOD method_41480 addCursor (Lnet/minecraft/class_7128$class_7129;)V ARG 1 cursor METHOD method_41481 (Lnet/minecraft/class_7128$class_7129;Lnet/minecraft/class_2338;Ljava/lang/Integer;)Ljava/lang/Integer; - ARG 1 pos + ARG 1 posx ARG 2 charge METHOD method_41482 spread (Lnet/minecraft/class_2338;I)V ARG 1 pos diff --git a/mappings/net/minecraft/block/entity/SignBlockEntity.mapping b/mappings/net/minecraft/block/entity/SignBlockEntity.mapping index 35790fb0af..b6582bf683 100644 --- a/mappings/net/minecraft/block/entity/SignBlockEntity.mapping +++ b/mappings/net/minecraft/block/entity/SignBlockEntity.mapping @@ -1,51 +1,84 @@ CLASS net/minecraft/class_2625 net/minecraft/block/entity/SignBlockEntity FIELD field_12046 editor Ljava/util/UUID; - FIELD field_12048 editable Z - FIELD field_12049 textsBeingEdited [Lnet/minecraft/class_5481; - FIELD field_12050 texts [Lnet/minecraft/class_2561; - FIELD field_16419 textColor Lnet/minecraft/class_1767; - FIELD field_28905 TEXT_KEYS [Ljava/lang/String; - FIELD field_28906 FILTERED_TEXT_KEYS [Ljava/lang/String; - FIELD field_28907 filteredTexts [Lnet/minecraft/class_2561; - FIELD field_28908 filterText Z - FIELD field_29225 glowingText Z - FIELD field_31362 TEXT_COUNT I + FIELD field_40335 MAX_TEXT_WIDTH I + FIELD field_40336 TEXT_LINE_HEIGHT I + FIELD field_43294 LOGGER Lorg/slf4j/Logger; + FIELD field_43295 frontText Lnet/minecraft/class_8242; + FIELD field_43296 backText Lnet/minecraft/class_8242; + FIELD field_43297 waxed Z METHOD (Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;)V ARG 1 pos ARG 2 state - METHOD method_11299 setTextOnRow (ILnet/minecraft/class_2561;)V - ARG 1 row - ARG 2 text - METHOD method_11301 onActivate (Lnet/minecraft/class_3222;)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 ()Ljava/util/UUID; METHOD method_11306 setEditor (Ljava/util/UUID;)V ARG 1 editor - METHOD method_11307 isEditable ()Z - METHOD method_16126 getTextColor ()Lnet/minecraft/class_1767; - METHOD method_16127 setTextColor (Lnet/minecraft/class_1767;)Z - ARG 1 value - METHOD method_30843 getTextOnRow (IZ)Lnet/minecraft/class_2561; - ARG 1 row - ARG 2 filtered - METHOD method_33384 unparsedTextFromJson (Ljava/lang/String;)Lnet/minecraft/class_2561; - ARG 1 json - METHOD method_33827 setTextOnRow (ILnet/minecraft/class_2561;Lnet/minecraft/class_2561;)V - ARG 1 row - ARG 2 text - ARG 3 filteredText - METHOD method_33828 parseTextFromJson (Ljava/lang/String;)Lnet/minecraft/class_2561; - ARG 1 json - METHOD method_33829 updateSign (ZLjava/util/function/Function;)[Lnet/minecraft/class_5481; - ARG 1 filterText - ARG 2 textOrderingFunction - METHOD method_33830 getTexts (Z)[Lnet/minecraft/class_2561; - ARG 1 filtered - METHOD method_34270 setGlowingText (Z)Z - ARG 1 glowingText - METHOD method_34271 isGlowingText ()Z METHOD method_34272 updateListeners ()V + METHOD method_45469 getTextLineHeight ()I + METHOD method_45470 getMaxTextWidth ()I + METHOD method_49834 isPlayerFacingFront (Lnet/minecraft/class_1657;)Z + ARG 1 player + METHOD method_49835 getTextWithMessages (Lnet/minecraft/class_1657;Ljava/util/List;Lnet/minecraft/class_8242;)Lnet/minecraft/class_8242; + ARG 1 player + ARG 2 messages + ARG 3 text + METHOD method_49836 tryChangeText (Lnet/minecraft/class_1657;ZLjava/util/List;)V + ARG 1 player + ARG 2 front + ARG 3 messages + METHOD method_49837 tick (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;Lnet/minecraft/class_2625;)V + ARG 0 world + ARG 1 pos + ARG 2 state + ARG 3 blockEntity + METHOD method_49838 tryClearInvalidEditor (Lnet/minecraft/class_2625;Lnet/minecraft/class_1937;Ljava/util/UUID;)V + ARG 1 blockEntity + ARG 2 world + ARG 3 uuid + METHOD method_49839 setBackText (Lnet/minecraft/class_8242;)Z + ARG 1 backText + METHOD method_49840 setText (Lnet/minecraft/class_8242;Z)Z + ARG 1 text + ARG 2 front + METHOD method_49841 changeText (Ljava/util/function/UnaryOperator;Z)Z + ARG 1 textChanger + ARG 2 front + METHOD method_49842 (Lnet/minecraft/class_2487;Lnet/minecraft/class_2520;)V + ARG 1 backText + METHOD method_49843 getText (Z)Lnet/minecraft/class_8242; + ARG 1 front + METHOD method_49844 getTextFacing (Lnet/minecraft/class_1657;)Lnet/minecraft/class_8242; + ARG 1 player + METHOD method_49845 (Lnet/minecraft/class_1657;Ljava/util/List;Lnet/minecraft/class_8242;)Lnet/minecraft/class_8242; + ARG 3 text + METHOD method_49846 setFrontText (Lnet/minecraft/class_8242;)Z + ARG 1 frontText + METHOD method_49847 isPlayerTooFarToEdit (Ljava/util/UUID;)Z + ARG 1 uuid + METHOD method_49848 (Lnet/minecraft/class_2487;Lnet/minecraft/class_2520;)V + ARG 1 frontText + METHOD method_49849 setWaxed (Z)Z + ARG 1 waxed + METHOD method_49850 (Lnet/minecraft/class_8242;)V + ARG 1 signText + METHOD method_49851 (Lnet/minecraft/class_8242;)V + ARG 1 signText + METHOD method_49852 createText ()Lnet/minecraft/class_8242; + METHOD method_49853 getFrontText ()Lnet/minecraft/class_8242; + METHOD method_49854 getBackText ()Lnet/minecraft/class_8242; + METHOD method_49855 isWaxed ()Z + METHOD method_50006 createCommandSource (Lnet/minecraft/class_1657;Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;)Lnet/minecraft/class_2168; + ARG 0 player + ARG 1 world + ARG 2 pos + METHOD method_50007 runCommandClickEvent (Lnet/minecraft/class_1657;Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Z)Z + ARG 1 player + ARG 2 world + ARG 3 pos + ARG 4 front + METHOD method_50008 parseLines (Lnet/minecraft/class_8242;)Lnet/minecraft/class_8242; + ARG 1 signText + METHOD method_50009 parseLine (Lnet/minecraft/class_2561;)Lnet/minecraft/class_2561; + ARG 1 text + METHOD method_50010 canRunCommandClickEvent (ZLnet/minecraft/class_1657;)Z + ARG 1 front + ARG 2 player diff --git a/mappings/net/minecraft/block/entity/SignText.mapping b/mappings/net/minecraft/block/entity/SignText.mapping new file mode 100644 index 0000000000..d0a1917a73 --- /dev/null +++ b/mappings/net/minecraft/block/entity/SignText.mapping @@ -0,0 +1,60 @@ +CLASS net/minecraft/class_8242 net/minecraft/block/entity/SignText + FIELD field_43298 CODEC Lcom/mojang/serialization/Codec; + FIELD field_43300 MESSAGES_CODEC Lcom/mojang/serialization/Codec; + FIELD field_43301 messages [Lnet/minecraft/class_2561; + FIELD field_43302 filteredMessages [Lnet/minecraft/class_2561; + FIELD field_43303 color Lnet/minecraft/class_1767; + FIELD field_43304 glowing Z + FIELD field_43305 orderedMessages [Lnet/minecraft/class_5481; + FIELD field_43306 filtered Z + METHOD ([Lnet/minecraft/class_2561;[Lnet/minecraft/class_2561;Lnet/minecraft/class_1767;Z)V + ARG 1 messages + ARG 2 filteredMessages + ARG 3 color + ARG 4 glowing + METHOD method_49856 isGlowing ()Z + METHOD method_49857 withMessage (ILnet/minecraft/class_2561;)Lnet/minecraft/class_8242; + ARG 1 line + ARG 2 message + METHOD method_49858 withMessage (ILnet/minecraft/class_2561;Lnet/minecraft/class_2561;)Lnet/minecraft/class_8242; + ARG 1 line + ARG 2 message + ARG 3 filteredMessage + METHOD method_49859 getMessage (IZ)Lnet/minecraft/class_2561; + ARG 1 line + ARG 2 filtered + METHOD method_49861 hasText (Lnet/minecraft/class_1657;)Z + ARG 1 player + METHOD method_49862 withColor (Lnet/minecraft/class_1767;)Lnet/minecraft/class_8242; + ARG 1 color + METHOD method_49863 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 0 instance + METHOD method_49864 (Lnet/minecraft/class_8242;)Ljava/lang/Boolean; + ARG 0 signText + METHOD method_49865 (Ljava/util/List;)Lcom/mojang/serialization/DataResult; + ARG 0 messages + METHOD method_49866 (Lnet/minecraft/class_2561;)Z + ARG 0 text + METHOD method_49867 withGlowing (Z)Lnet/minecraft/class_8242; + ARG 1 glowing + METHOD method_49868 getOrderedMessages (ZLjava/util/function/Function;)[Lnet/minecraft/class_5481; + ARG 1 filtered + ARG 2 messageOrderer + METHOD method_49869 ([Lnet/minecraft/class_2561;)Ljava/util/List; + ARG 0 messages + METHOD method_49870 create ([Lnet/minecraft/class_2561;Ljava/util/Optional;Lnet/minecraft/class_1767;Z)Lnet/minecraft/class_8242; + ARG 0 messages + ARG 1 filteredMessages + ARG 2 color + ARG 3 glowing + METHOD method_49872 getColor ()Lnet/minecraft/class_1767; + METHOD method_49874 hasRunCommandClickEvent (Lnet/minecraft/class_1657;)Z + ARG 1 player + METHOD method_49875 (Lnet/minecraft/class_8242;)Lnet/minecraft/class_1767; + ARG 0 signText + METHOD method_49877 getMessages (Z)[Lnet/minecraft/class_2561; + ARG 1 filtered + METHOD method_49878 getDefaultText ()[Lnet/minecraft/class_2561; + METHOD method_49879 (Lnet/minecraft/class_8242;)[Lnet/minecraft/class_2561; + ARG 0 signText + METHOD method_49880 getFilteredMessages ()Ljava/util/Optional; diff --git a/mappings/net/minecraft/block/entity/SkullBlockEntity.mapping b/mappings/net/minecraft/block/entity/SkullBlockEntity.mapping index caadafb941..1958caa23a 100644 --- a/mappings/net/minecraft/block/entity/SkullBlockEntity.mapping +++ b/mappings/net/minecraft/block/entity/SkullBlockEntity.mapping @@ -1,37 +1,53 @@ CLASS net/minecraft/class_2631 net/minecraft/block/entity/SkullBlockEntity - FIELD field_12085 ticksPowered I - FIELD field_12086 powered Z 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; FIELD field_31363 SKULL_OWNER_KEY Ljava/lang/String; - FIELD field_34029 executor Ljava/util/concurrent/Executor; + FIELD field_34029 currentExecutor Ljava/util/concurrent/Executor; + FIELD field_41315 poweredTicks I + FIELD field_41316 powered Z + FIELD field_41602 NOTE_BLOCK_SOUND_KEY Ljava/lang/String; + FIELD field_41603 noteBlockSound Lnet/minecraft/class_2960; + FIELD field_45147 EXECUTOR Ljava/util/concurrent/Executor; METHOD (Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;)V ARG 1 pos ARG 2 state 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;Ljava/util/function/Consumer;)V - ARG 0 owner - ARG 1 callback - METHOD method_11338 getTicksPowered (F)F - ARG 1 tickDelta METHOD method_11339 loadOwnerProperties ()V - METHOD method_31695 tick (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;Lnet/minecraft/class_2631;)V + METHOD method_39765 setServices (Lnet/minecraft/class_7497;Ljava/util/concurrent/Executor;)V + ARG 0 apiServices + ARG 1 executor + METHOD method_39766 clearServices ()V + METHOD method_47588 getPoweredTicks (F)F + ARG 1 tickDelta + METHOD method_47589 tick (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;Lnet/minecraft/class_2631;)V ARG 0 world ARG 1 pos ARG 2 state ARG 3 blockEntity - METHOD method_37248 (Ljava/util/function/Consumer;Lcom/mojang/authlib/GameProfile;)V - ARG 1 profile - METHOD method_37249 (Lcom/mojang/authlib/GameProfile;)V - ARG 1 owner - METHOD method_37468 (Ljava/util/function/Consumer;Lcom/mojang/authlib/GameProfile;Ljava/util/Optional;)V + METHOD method_47888 getNoteBlockSound ()Lnet/minecraft/class_2960; + METHOD method_52579 (Ljava/lang/Runnable;)V + ARG 0 runnable + METHOD method_52580 fetchProfile (Ljava/lang/String;)Ljava/util/concurrent/CompletableFuture; + ARG 0 name + METHOD method_52581 (Ljava/util/Optional;)Ljava/util/Optional; + ARG 0 profile + METHOD method_52582 fillSkullOwner (Lnet/minecraft/class_2487;Ljava/lang/String;)V + ARG 0 nbt + ARG 1 name + METHOD method_52583 (Lnet/minecraft/class_2487;Ljava/lang/String;Ljava/util/Optional;)V ARG 2 profile - METHOD method_37469 (Ljava/util/function/Consumer;Lcom/mojang/authlib/GameProfile;)V + METHOD method_52584 fetchProfileWithTextures (Lcom/mojang/authlib/GameProfile;)Ljava/util/concurrent/CompletableFuture; + ARG 0 profile + METHOD method_52585 (Ljava/util/Optional;)Ljava/util/concurrent/CompletionStage; + ARG 0 profile + METHOD method_52586 hasTextures (Lcom/mojang/authlib/GameProfile;)Z + ARG 0 profile + METHOD method_52587 (Ljava/util/Optional;)V ARG 1 profile - METHOD method_39765 setServices (Lnet/minecraft/class_7497;Ljava/util/concurrent/Executor;)V - ARG 0 apiServices - ARG 1 executor - METHOD method_39766 clearServices ()V + METHOD method_52589 getProfile (Lnet/minecraft/class_2487;)Lcom/mojang/authlib/GameProfile; + ARG 0 nbt + METHOD method_52590 fillSkullOwner (Lnet/minecraft/class_2487;)V + ARG 0 nbt diff --git a/mappings/net/minecraft/block/entity/StructureBlockBlockEntity.mapping b/mappings/net/minecraft/block/entity/StructureBlockBlockEntity.mapping index 91600ab25d..36ca72d907 100644 --- a/mappings/net/minecraft/block/entity/StructureBlockBlockEntity.mapping +++ b/mappings/net/minecraft/block/entity/StructureBlockBlockEntity.mapping @@ -46,9 +46,11 @@ CLASS net/minecraft/class_2633 net/minecraft/block/entity/StructureBlockBlockEnt ARG 1 metadata METHOD method_11365 saveStructure ()Z METHOD method_11366 saveStructure (Z)Z + ARG 1 interactive METHOD method_11367 shouldIgnoreEntities ()Z METHOD method_11368 loadStructure (Lnet/minecraft/class_3218;Z)Z ARG 1 world + ARG 2 interactive METHOD method_11370 setIntegrity (F)V ARG 1 integrity METHOD method_11371 getSeed ()J @@ -77,6 +79,7 @@ CLASS net/minecraft/class_2633 net/minecraft/block/entity/StructureBlockBlockEnt ARG 0 seed METHOD method_21864 place (Lnet/minecraft/class_3218;ZLnet/minecraft/class_3499;)Z ARG 1 world + ARG 2 interactive ARG 3 template METHOD method_21865 getStructurePath ()Ljava/lang/String; METHOD method_34273 (Lnet/minecraft/class_2586;)Lnet/minecraft/class_2633; diff --git a/mappings/net/minecraft/block/enums/WallMountLocation.mapping b/mappings/net/minecraft/block/enums/BlockFace.mapping similarity index 59% rename from mappings/net/minecraft/block/enums/WallMountLocation.mapping rename to mappings/net/minecraft/block/enums/BlockFace.mapping index 2c97c7c727..877391ff18 100644 --- a/mappings/net/minecraft/block/enums/WallMountLocation.mapping +++ b/mappings/net/minecraft/block/enums/BlockFace.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_2738 net/minecraft/block/enums/WallMountLocation +CLASS net/minecraft/class_2738 net/minecraft/block/enums/BlockFace FIELD field_12472 name Ljava/lang/String; METHOD (Ljava/lang/String;ILjava/lang/String;)V ARG 3 name diff --git a/mappings/net/minecraft/block/enums/ChestType.mapping b/mappings/net/minecraft/block/enums/ChestType.mapping index f78ace13d6..d529abc9e0 100644 --- a/mappings/net/minecraft/block/enums/ChestType.mapping +++ b/mappings/net/minecraft/block/enums/ChestType.mapping @@ -1,8 +1,5 @@ CLASS net/minecraft/class_2745 net/minecraft/block/enums/ChestType - FIELD field_12568 opposite I - FIELD field_12570 VALUES [Lnet/minecraft/class_2745; FIELD field_12572 name Ljava/lang/String; - METHOD (Ljava/lang/String;ILjava/lang/String;I)V + METHOD (Ljava/lang/String;ILjava/lang/String;)V ARG 3 name - ARG 4 opposite METHOD method_11824 getOpposite ()Lnet/minecraft/class_2745; diff --git a/mappings/net/minecraft/block/enums/Instrument.mapping b/mappings/net/minecraft/block/enums/Instrument.mapping index dafc47ccbe..be56250ce4 100644 --- a/mappings/net/minecraft/block/enums/Instrument.mapping +++ b/mappings/net/minecraft/block/enums/Instrument.mapping @@ -1,9 +1,15 @@ CLASS net/minecraft/class_2766 net/minecraft/block/enums/Instrument FIELD field_12646 name Ljava/lang/String; - FIELD field_12649 sound Lnet/minecraft/class_3414; - METHOD (Ljava/lang/String;ILjava/lang/String;Lnet/minecraft/class_3414;)V + FIELD field_12649 sound Lnet/minecraft/class_6880; + FIELD field_41605 type Lnet/minecraft/class_2766$class_7994; + METHOD (Ljava/lang/String;ILjava/lang/String;Lnet/minecraft/class_6880;Lnet/minecraft/class_2766$class_7994;)V ARG 3 name ARG 4 sound - METHOD method_11886 getSound ()Lnet/minecraft/class_3414; - METHOD method_11887 fromBlockState (Lnet/minecraft/class_2680;)Lnet/minecraft/class_2766; - ARG 0 state + ARG 5 type + METHOD method_11886 getSound ()Lnet/minecraft/class_6880; + METHOD method_47889 shouldSpawnNoteParticles ()Z + COMMENT {@return whether note blocks playing this instrument should produce note particles} + METHOD method_47890 hasCustomSound ()Z + COMMENT {@return whether note blocks playing this instrument should determine the sound from skulls above them} + METHOD method_51372 isNotBaseBlock ()Z + CLASS class_7994 Type diff --git a/mappings/net/minecraft/block/sapling/CherrySaplingGenerator.mapping b/mappings/net/minecraft/block/sapling/CherrySaplingGenerator.mapping new file mode 100644 index 0000000000..165a0427ba --- /dev/null +++ b/mappings/net/minecraft/block/sapling/CherrySaplingGenerator.mapping @@ -0,0 +1 @@ +CLASS net/minecraft/class_8175 net/minecraft/block/sapling/CherrySaplingGenerator diff --git a/mappings/net/minecraft/block/sapling/LargeTreeSaplingGenerator.mapping b/mappings/net/minecraft/block/sapling/LargeTreeSaplingGenerator.mapping index 433731c7c7..87ea9093be 100644 --- a/mappings/net/minecraft/block/sapling/LargeTreeSaplingGenerator.mapping +++ b/mappings/net/minecraft/block/sapling/LargeTreeSaplingGenerator.mapping @@ -5,7 +5,7 @@ CLASS net/minecraft/class_2650 net/minecraft/block/sapling/LargeTreeSaplingGener ARG 2 pos ARG 3 x ARG 4 z - METHOD method_11443 getLargeTreeFeature (Lnet/minecraft/class_5819;)Lnet/minecraft/class_6880; + METHOD method_11443 getLargeTreeFeature (Lnet/minecraft/class_5819;)Lnet/minecraft/class_5321; ARG 1 random METHOD method_11444 generateLargeTree (Lnet/minecraft/class_3218;Lnet/minecraft/class_2794;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;Lnet/minecraft/class_5819;II)Z ARG 1 world diff --git a/mappings/net/minecraft/block/sapling/SaplingGenerator.mapping b/mappings/net/minecraft/block/sapling/SaplingGenerator.mapping index 86e26b6a1b..24133e374e 100644 --- a/mappings/net/minecraft/block/sapling/SaplingGenerator.mapping +++ b/mappings/net/minecraft/block/sapling/SaplingGenerator.mapping @@ -1,5 +1,5 @@ CLASS net/minecraft/class_2647 net/minecraft/block/sapling/SaplingGenerator - METHOD method_11430 getTreeFeature (Lnet/minecraft/class_5819;Z)Lnet/minecraft/class_6880; + METHOD method_11430 getTreeFeature (Lnet/minecraft/class_5819;Z)Lnet/minecraft/class_5321; 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;Lnet/minecraft/class_5819;)Z diff --git a/mappings/net/minecraft/class_4558.mapping b/mappings/net/minecraft/class_4558.mapping new file mode 100644 index 0000000000..6d9bbae3ec --- /dev/null +++ b/mappings/net/minecraft/class_4558.mapping @@ -0,0 +1,3 @@ +CLASS net/minecraft/class_4558 + CLASS class_8788 + METHOD method_27790 getPlayerPredicate ()Ljava/util/Optional; diff --git a/mappings/net/minecraft/class_5699.mapping b/mappings/net/minecraft/class_5699.mapping new file mode 100644 index 0000000000..7dfeeb7bc2 --- /dev/null +++ b/mappings/net/minecraft/class_5699.mapping @@ -0,0 +1,4 @@ +CLASS net/minecraft/class_5699 + CLASS class_8783 + FIELD a keyCodec Lcom/mojang/serialization/Codec; + FIELD b elementCodec Lcom/mojang/serialization/Codec; diff --git a/mappings/net/minecraft/class_8782.mapping b/mappings/net/minecraft/class_8782.mapping new file mode 100644 index 0000000000..b6d66f1bc2 --- /dev/null +++ b/mappings/net/minecraft/class_8782.mapping @@ -0,0 +1,4 @@ +CLASS net/minecraft/class_8782 + CLASS net/minecraft/class_necraft/class_193 CriterionMerger + FIELD field_1257 OR Lnet/minecraft/class_8782$net/minecraft/class_necraft/class_193; + FIELD field_16882 AND Lnet/minecraft/class_8782$net/minecraft/class_necraft/class_193; diff --git a/mappings/net/minecraft/client/ClientGameSession.mapping b/mappings/net/minecraft/client/ClientGameSession.mapping deleted file mode 100644 index 16742319fb..0000000000 --- a/mappings/net/minecraft/client/ClientGameSession.mapping +++ /dev/null @@ -1,10 +0,0 @@ -CLASS net/minecraft/class_3801 net/minecraft/client/ClientGameSession - FIELD field_16763 difficulty Ljava/lang/String; - FIELD field_16764 gameMode Ljava/lang/String; - FIELD field_16765 playerCount I - FIELD field_16766 remoteServer Z - FIELD field_16767 sessionId Ljava/util/UUID; - METHOD (Lnet/minecraft/class_638;Lnet/minecraft/class_746;Lnet/minecraft/class_634;)V - ARG 1 world - ARG 2 player - ARG 3 networkHandler diff --git a/mappings/net/minecraft/client/Keyboard.mapping b/mappings/net/minecraft/client/Keyboard.mapping index 4b4bb148ef..f72100889c 100644 --- a/mappings/net/minecraft/client/Keyboard.mapping +++ b/mappings/net/minecraft/client/Keyboard.mapping @@ -5,7 +5,6 @@ CLASS net/minecraft/class_309 net/minecraft/client/Keyboard FIELD field_1680 debugCrashElapsedTime J FIELD field_1681 debugCrashLastLogTime J FIELD field_1682 debugCrashStartTime J - FIELD field_1683 repeatEvents Z FIELD field_32143 DEBUG_CRASH_TIME I METHOD (Lnet/minecraft/class_310;)V ARG 1 client @@ -25,8 +24,6 @@ CLASS net/minecraft/class_309 net/minecraft/client/Keyboard METHOD method_1461 (IJ)V ARG 1 error ARG 2 description - METHOD method_1462 setRepeatEvents (Z)V - ARG 1 repeatEvents METHOD method_1463 (Lnet/minecraft/class_2561;)V ARG 1 message METHOD method_1465 copyLookAt (ZZ)V @@ -75,3 +72,5 @@ CLASS net/minecraft/class_309 net/minecraft/client/Keyboard METHOD method_37273 addDebugMessage (Lnet/minecraft/class_124;Lnet/minecraft/class_2561;)V ARG 1 formatting ARG 2 text + METHOD method_49711 (Ljava/nio/file/Path;Lnet/minecraft/class_2583;)Lnet/minecraft/class_2583; + ARG 1 style diff --git a/mappings/net/minecraft/client/MinecraftClient.mapping b/mappings/net/minecraft/client/MinecraftClient.mapping index 5849e5765d..659894c4aa 100644 --- a/mappings/net/minecraft/client/MinecraftClient.mapping +++ b/mappings/net/minecraft/client/MinecraftClient.mapping @@ -40,23 +40,19 @@ CLASS net/minecraft/class_310 net/minecraft/client/MinecraftClient 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; FIELD field_1687 world Lnet/minecraft/class_638; COMMENT Represents the world the client is currently viewing. COMMENT This field is not null when in game. - FIELD field_1688 metricsData Lnet/minecraft/class_3517; FIELD field_1689 framebuffer Lnet/minecraft/class_276; FIELD field_1690 options Lnet/minecraft/class_315; FIELD field_1692 targetedEntity Lnet/minecraft/class_1297; FIELD field_1693 is64Bit Z - FIELD field_1694 sessionPropertyMap Lcom/mojang/authlib/properties/PropertyMap; 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; FIELD field_1701 openProfilerSection Ljava/lang/String; FIELD field_1702 toastManager Lnet/minecraft/class_374; @@ -75,7 +71,6 @@ CLASS net/minecraft/class_310 net/minecraft/client/MinecraftClient FIELD field_1719 cameraEntity Lnet/minecraft/class_1297; FIELD field_1720 versionType Ljava/lang/String; FIELD field_1721 isDemo Z - FIELD field_1722 builtinPackProvider Lnet/minecraft/class_1066; FIELD field_1723 sessionService Lcom/mojang/authlib/minecraft/MinecraftSessionService; FIELD field_1724 player Lnet/minecraft/class_746; COMMENT Represents the client's own player. @@ -98,7 +93,6 @@ CLASS net/minecraft/class_310 net/minecraft/client/MinecraftClient FIELD field_1741 pausedTickDelta F FIELD field_1742 itemRenderer Lnet/minecraft/class_918; FIELD field_1743 skipGameRender Z - FIELD field_1744 connectedToRealms Z FIELD field_1745 resourceManager Lnet/minecraft/class_3304; FIELD field_1746 integratedServerConnection Lnet/minecraft/class_2535; COMMENT The client connection to the integrated server. @@ -119,7 +113,7 @@ CLASS net/minecraft/class_310 net/minecraft/client/MinecraftClient COMMENT COMMENT @see MinecraftClient#setScreen(Screen) FIELD field_1756 blockRenderManager Lnet/minecraft/class_776; - FIELD field_1757 resourcePackDir Ljava/io/File; + FIELD field_1757 resourcePackDir Ljava/nio/file/Path; FIELD field_1758 tutorialManager Lnet/minecraft/class_1156; FIELD field_1759 integratedServerRunning Z FIELD field_1760 itemColors Lnet/minecraft/class_325; @@ -165,26 +159,35 @@ CLASS net/minecraft/class_310 net/minecraft/client/MinecraftClient COMMENT A message, in English, displayed in a dialog when a GLFW error is encountered. COMMENT COMMENT @see net.minecraft.client.util.Window#throwGlError(int, long) - FIELD field_34956 deviceSessionId Ljava/util/UUID; FIELD field_36433 REGIONAL_COMPLIANCIES_ID Lnet/minecraft/class_2960; FIELD field_36434 regionalComplianciesManager Lnet/minecraft/class_6877; FIELD field_37855 metricsSampleDuration J FIELD field_37856 gpuUtilizationPercentage D FIELD field_37857 currentGlTimerQuery Lnet/minecraft/class_7168$class_7169; - FIELD field_39068 profileKeys Lnet/minecraft/class_7434; + FIELD field_39068 profileKeys Lnet/minecraft/class_7853; FIELD field_39317 realms32BitWarningChecker Lnet/minecraft/class_7478; FIELD field_39420 authenticationService Lcom/mojang/authlib/yggdrasil/YggdrasilAuthenticationService; - FIELD field_39421 servicesSignatureVerifier Lnet/minecraft/class_7500; FIELD field_39492 abuseReportContext Lnet/minecraft/class_7574; FIELD field_39718 realmsPeriodicCheckers Lnet/minecraft/class_7578; FIELD field_39769 narratorManager Lnet/minecraft/class_333; FIELD field_39770 messageHandler Lnet/minecraft/class_7594; FIELD field_39924 advanceValidatingTextRenderer Lnet/minecraft/class_327; + FIELD field_40380 defaultResourcePack Lnet/minecraft/class_3268; + FIELD field_40381 serverResourcePackProvider Lnet/minecraft/class_1066; + FIELD field_41331 telemetryManager Lnet/minecraft/class_6628; + FIELD field_41332 renderTime J + FIELD field_41782 navigationType Lnet/minecraft/class_8015; + FIELD field_44539 quickPlayLogger Lnet/minecraft/class_8497; + FIELD field_45293 guiAtlasManager Lnet/minecraft/class_8658; + FIELD field_45294 commandHistoryManager Lnet/minecraft/class_8657; + FIELD field_45295 symlinkFinder Lnet/minecraft/class_8580; + FIELD field_45899 gameProfileFuture Ljava/util/concurrent/CompletableFuture; + FIELD field_45900 finishedLoading Z METHOD (Lnet/minecraft/class_542;)V ARG 1 args METHOD method_1476 checkIs64Bit ()Z METHOD method_1478 getResourceManager ()Lnet/minecraft/class_3300; - METHOD method_1479 getResourcePackDir ()Ljava/io/File; + METHOD method_1479 getResourcePackDir ()Ljava/nio/file/Path; METHOD method_1480 getItemRenderer ()Lnet/minecraft/class_918; METHOD method_1481 joinWorld (Lnet/minecraft/class_638;)V ARG 1 world @@ -196,8 +199,8 @@ CLASS net/minecraft/class_310 net/minecraft/client/MinecraftClient METHOD method_1487 getNetworkProxy ()Ljava/net/Proxy; METHOD method_1488 getTickDelta ()F METHOD method_1490 stop ()V - METHOD method_1492 drawProfilerResults (Lnet/minecraft/class_4587;Lnet/minecraft/class_3696;)V - ARG 1 matrices + METHOD method_1492 drawProfilerResults (Lnet/minecraft/class_332;Lnet/minecraft/class_3696;)V + ARG 1 context ARG 2 profileResult METHOD method_1493 isPaused ()Z METHOD method_1494 setCrashReportSupplierAndAddDetails (Lnet/minecraft/class_128;)V @@ -205,7 +208,7 @@ CLASS net/minecraft/class_310 net/minecraft/client/MinecraftClient METHOD method_1495 getSessionService ()Lcom/mojang/authlib/minecraft/MinecraftSessionService; METHOD method_1496 isIntegratedServerRunning ()Z METHOD method_1498 isHudEnabled ()Z - METHOD method_1499 addBlockEntityNbt (Lnet/minecraft/class_1799;Lnet/minecraft/class_2586;)Lnet/minecraft/class_1799; + METHOD method_1499 addBlockEntityNbt (Lnet/minecraft/class_1799;Lnet/minecraft/class_2586;)V ARG 1 stack ARG 2 blockEntity METHOD method_1502 (Lnet/minecraft/class_1799;)Ljava/util/stream/Stream; @@ -236,7 +239,7 @@ CLASS net/minecraft/class_310 net/minecraft/client/MinecraftClient METHOD method_1513 reloadResourcesConcurrently ()Ljava/util/concurrent/CompletableFuture; METHOD method_1514 run ()V METHOD method_1515 getGameVersion ()Ljava/lang/String; - METHOD method_1516 getResourcePackProvider ()Lnet/minecraft/class_1066; + METHOD method_1516 getServerResourcePackProvider ()Lnet/minecraft/class_1066; METHOD method_1517 isFancyGraphicsOrBetter ()Z METHOD method_1519 cleanUpAfterCrash ()V METHOD method_1520 getResourcePackManager ()Lnet/minecraft/class_3283; @@ -253,10 +256,7 @@ CLASS net/minecraft/class_310 net/minecraft/client/MinecraftClient METHOD method_1531 getTextureManager ()Lnet/minecraft/class_1060; METHOD method_1534 getLastFrameDuration ()F METHOD method_1536 doAttack ()Z - METHOD method_1537 setConnectedToRealms (Z)V - ARG 1 connectedToRealms METHOD method_1538 getMusicTracker ()Lnet/minecraft/class_1142; - METHOD method_1539 getSessionProperties ()Lcom/mojang/authlib/properties/PropertyMap; METHOD method_1540 is64Bit ()Z METHOD method_1541 getBlockRenderManager ()Lnet/minecraft/class_776; METHOD method_1542 isInSingleplayer ()Z @@ -270,8 +270,6 @@ CLASS net/minecraft/class_310 net/minecraft/client/MinecraftClient METHOD method_1551 getInstance ()Lnet/minecraft/class_310; METHOD method_1554 getBakedModelManager ()Lnet/minecraft/class_1092; METHOD method_1555 hasReducedDebugInfo ()Z - METHOD method_1556 (Lnet/minecraft/class_1860;)Lnet/minecraft/class_2960; - ARG 0 recipe METHOD method_1558 getCurrentServerEntry ()Lnet/minecraft/class_642; METHOD method_1560 getCameraEntity ()Lnet/minecraft/class_1297; METHOD method_1561 getEntityRenderDispatcher ()Lnet/minecraft/class_898; @@ -280,7 +278,6 @@ CLASS net/minecraft/class_310 net/minecraft/client/MinecraftClient ARG 0 report METHOD method_1566 getToastManager ()Lnet/minecraft/class_374; METHOD method_1569 isWindowFocused ()Z - METHOD method_1570 getMetricsData ()Lnet/minecraft/class_3517; METHOD method_1571 getCreativeHotbarStorage ()Lnet/minecraft/class_302; METHOD method_1573 forcesUnicodeFont ()Z METHOD method_1574 tick ()V @@ -295,21 +292,15 @@ CLASS net/minecraft/class_310 net/minecraft/client/MinecraftClient ARG 0 tooltip 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 METHOD method_1588 isAmbientOcclusionEnabled ()Z - METHOD method_1589 isConnectedToRealms ()Z METHOD method_1590 handleBlockBreaking (Z)V ARG 1 breaking - METHOD method_1591 (Lnet/minecraft/class_1860;)Ljava/util/stream/Stream; - ARG 0 recipe METHOD method_1592 scheduleStop ()V METHOD method_16009 getFramerateLimit ()I METHOD method_16011 getProfiler ()Lnet/minecraft/class_3695; - METHOD method_16689 getGame ()Lnet/minecraft/class_3799; METHOD method_17044 checkGameData ()V METHOD method_17533 (I)Lnet/minecraft/class_3949; ARG 1 spawnChunkRadius @@ -328,8 +319,16 @@ CLASS net/minecraft/class_310 net/minecraft/client/MinecraftClient METHOD method_18506 getOverlay ()Lnet/minecraft/class_4071; METHOD method_18507 (Ljava/util/concurrent/CompletableFuture;)Ljava/util/concurrent/CompletionStage; ARG 0 future - METHOD method_20539 openPauseMenu (Z)V - ARG 1 pause + METHOD method_20539 openGameMenu (Z)V + COMMENT Opens the "game menu", also called "pause menu". + COMMENT + COMMENT

This is also used for menu-less pausing, which can be triggered by + COMMENT pressing Esc and F3 keys at the same time. + COMMENT + COMMENT @implNote Calling this does not immediately pause the game. Instead, + COMMENT the game is paused during {@linkplain #render the next rendering}. + ARG 1 pauseOnly + COMMENT whether to trigger menu-less pausing instead of opening the game menu METHOD method_22107 shouldRenderAsync ()Z METHOD method_22108 isRunning ()Z METHOD method_22681 addSystemDetailsToCrashReport (Lnet/minecraft/class_310;Lnet/minecraft/class_1076;Ljava/lang/String;Lnet/minecraft/class_315;Lnet/minecraft/class_128;)V @@ -340,33 +339,19 @@ CLASS net/minecraft/class_310 net/minecraft/client/MinecraftClient ARG 4 report METHOD method_22683 getWindow ()Lnet/minecraft/class_1041; METHOD method_22940 getBufferBuilders ()Lnet/minecraft/class_4599; - METHOD method_24038 createResourcePackProfile (Ljava/lang/String;Lnet/minecraft/class_2561;ZLjava/util/function/Supplier;Lnet/minecraft/class_3272;Lnet/minecraft/class_3288$class_3289;Lnet/minecraft/class_5352;)Lnet/minecraft/class_3288; - ARG 0 name - ARG 1 displayName - ARG 2 alwaysEnabled - ARG 3 packFactory - ARG 4 metadata - ARG 5 insertionPosition - ARG 6 source - METHOD method_24040 (Ljava/util/Optional;)V - ARG 1 throwable 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 + METHOD method_24226 handleResourceReloadException (Ljava/lang/Throwable;Lnet/minecraft/class_310$class_8764;)V ARG 1 throwable - METHOD method_24228 (Ljava/util/concurrent/CompletableFuture;Ljava/util/Optional;)V - ARG 2 throwable + ARG 2 loadingContext + METHOD method_24228 (ZLnet/minecraft/class_310$class_8764;Ljava/util/concurrent/CompletableFuture;Ljava/util/Optional;)V + ARG 4 error METHOD method_24287 getWindowTitle ()Ljava/lang/String; METHOD method_24288 updateWindowTitle ()V METHOD method_24289 getModStatus ()Lnet/minecraft/class_6683; METHOD method_24458 startMonitor (ZLnet/minecraft/class_4758;)Lnet/minecraft/class_3695; ARG 1 active ARG 2 monitor - METHOD method_24459 shouldMonitorTickDuration ()Z METHOD method_24460 endMonitor (ZLnet/minecraft/class_4758;)V ARG 1 active ARG 2 monitor @@ -386,18 +371,20 @@ CLASS net/minecraft/class_310 net/minecraft/client/MinecraftClient METHOD method_29043 isMultiplayerEnabled ()Z METHOD method_29603 (Lnet/minecraft/class_32$class_5143;Lnet/minecraft/class_3283;Lnet/minecraft/class_6904;Lnet/minecraft/class_7497;Ljava/lang/Thread;)Lnet/minecraft/class_1132; ARG 5 thread - METHOD method_29610 startIntegratedServer (Ljava/lang/String;Lnet/minecraft/class_32$class_5143;Lnet/minecraft/class_3283;Lnet/minecraft/class_6904;)V + METHOD method_29610 startIntegratedServer (Ljava/lang/String;Lnet/minecraft/class_32$class_5143;Lnet/minecraft/class_3283;Lnet/minecraft/class_6904;Z)V ARG 1 levelName ARG 2 session ARG 3 dataPackManager ARG 4 saveLoader + ARG 5 newWorld METHOD method_29611 isFabulousGraphicsOrBetter ()Z METHOD method_29970 setScreenAndRender (Lnet/minecraft/class_437;)V ARG 1 screen METHOD method_30049 getVideoWarningManager ()Lnet/minecraft/class_5407; - METHOD method_31186 onResourceReloadFailure (Ljava/lang/Throwable;Lnet/minecraft/class_2561;)V + METHOD method_31186 onResourceReloadFailure (Ljava/lang/Throwable;Lnet/minecraft/class_2561;Lnet/minecraft/class_310$class_8764;)V ARG 1 exception ARG 2 resourceName + ARG 3 loadingContext METHOD method_31320 getSocialInteractionsManager ()Lnet/minecraft/class_5520; METHOD method_31321 isConnectedToServer ()Z METHOD method_31382 createUserApiService (Lcom/mojang/authlib/yggdrasil/YggdrasilAuthenticationService;Lnet/minecraft/class_542;)Lcom/mojang/authlib/minecraft/UserApiService; @@ -440,8 +427,9 @@ CLASS net/minecraft/class_310 net/minecraft/client/MinecraftClient METHOD method_35704 (Ljava/io/File;Lnet/minecraft/class_2583;)Lnet/minecraft/class_2583; ARG 1 style METHOD method_35706 isRealmsEnabled ()Z - METHOD method_36561 reloadResources (Z)Ljava/util/concurrent/CompletableFuture; + METHOD method_36561 reloadResources (ZLnet/minecraft/class_310$class_8764;)Ljava/util/concurrent/CompletableFuture; ARG 1 force + ARG 2 loadingContext METHOD method_37274 addSystemDetailsToCrashReport (Lnet/minecraft/class_6396;Lnet/minecraft/class_310;Lnet/minecraft/class_1076;Ljava/lang/String;Lnet/minecraft/class_315;)Lnet/minecraft/class_6396; ARG 0 systemDetails ARG 1 client @@ -464,7 +452,6 @@ CLASS net/minecraft/class_310 net/minecraft/client/MinecraftClient ARG 2 result METHOD method_37291 (Ljava/util/function/Consumer;Ljava/nio/file/Path;)V ARG 2 path - METHOD method_38736 createTelemetrySender ()Lnet/minecraft/class_6628; METHOD method_38932 loadBlockList ()V METHOD method_40189 isCountrySetTo (Ljava/lang/Object;)Z ARG 0 country @@ -475,7 +462,7 @@ CLASS net/minecraft/class_310 net/minecraft/client/MinecraftClient METHOD method_41735 createIntegratedServerLoader ()Lnet/minecraft/class_7196; METHOD method_43587 setCrashReportSupplier (Lnet/minecraft/class_128;)V ARG 1 crashReport - METHOD method_43590 getProfileKeys ()Lnet/minecraft/class_7434; + METHOD method_43590 getProfileKeys ()Lnet/minecraft/class_7853; METHOD method_43758 (Lnet/minecraft/class_516;)Ljava/util/stream/Stream; ARG 0 resultCollection METHOD method_43759 reloadSearchProvider (Lnet/minecraft/class_1124$class_1125;Ljava/util/List;)V @@ -497,9 +484,6 @@ CLASS net/minecraft/class_310 net/minecraft/client/MinecraftClient METHOD method_44256 getServicesSignatureVerifier ()Lnet/minecraft/class_7500; METHOD method_44352 (Z)V ARG 1 confirmed - METHOD method_44375 setCurrentServerEntry (Lnet/minecraft/class_4877;Ljava/lang/String;)V - ARG 1 server - ARG 2 address METHOD method_44376 ensureAbuseReportContext (Lnet/minecraft/class_7569;)V COMMENT Recreates and resets {@link #abuseReportContext} if {@code environment} has COMMENT changed. @@ -507,20 +491,67 @@ CLASS net/minecraft/class_310 net/minecraft/client/MinecraftClient METHOD method_44377 getAbuseReportContext ()Lnet/minecraft/class_7574; METHOD method_44646 getRealmsPeriodicCheckers ()Lnet/minecraft/class_7578; METHOD method_44647 getMultiplayerBanDetails ()Lcom/mojang/authlib/minecraft/BanDetails; - METHOD method_44648 (Z)V - ARG 1 confirmed - METHOD method_44649 isMultiplayerBanned ()Z METHOD method_44713 getNarratorManager ()Lnet/minecraft/class_333; METHOD method_44714 getMessageHandler ()Lnet/minecraft/class_7594; + METHOD method_45573 getDefaultResourcePack ()Lnet/minecraft/class_3268; + METHOD method_46740 (Ljava/util/List;)V + ARG 1 stacks + METHOD method_47392 isConnectedToLocalServer ()Z + METHOD method_47595 isOptionalTelemetryEnabledByApi ()Z + METHOD method_47596 isTelemetryEnabledByApi ()Z + METHOD method_47599 getCurrentFps ()I + METHOD method_47600 getRenderTime ()J + METHOD method_47601 getTelemetryManager ()Lnet/minecraft/class_6628; + METHOD method_47602 isOptionalTelemetryEnabled ()Z + METHOD method_48185 setNavigationType (Lnet/minecraft/class_8015;)V + ARG 1 navigationType + METHOD method_48186 getNavigationType ()Lnet/minecraft/class_8015; + METHOD method_49292 showResourceReloadFailureToast (Lnet/minecraft/class_2561;)V + ARG 1 description + METHOD method_49293 (ZLnet/minecraft/class_310$class_8764;Ljava/lang/Throwable;)V + ARG 3 throwable + METHOD method_49294 onForcedResourceReloadFailure ()V + METHOD method_51253 getQuickPlayLogger ()Lnet/minecraft/class_8497; + METHOD method_51736 collectLoadTimes (Lnet/minecraft/class_310$class_8764;)V + ARG 1 loadingContext + METHOD method_52699 getGuiAtlasManager ()Lnet/minecraft/class_8658; + METHOD method_52700 getCommandHistoryManager ()Lnet/minecraft/class_8657; + METHOD method_52701 uuidEquals (Ljava/util/UUID;)Z + ARG 1 uuid + METHOD method_52702 getSymlinkFinder ()Lnet/minecraft/class_8580; + METHOD method_52703 enterReconfiguration (Lnet/minecraft/class_437;)V + ARG 1 screen + METHOD method_53462 getGameProfile ()Lcom/mojang/authlib/GameProfile; + METHOD method_53465 onFinishedLoading (Lnet/minecraft/class_310$class_8764;)V + ARG 1 loadingContext + METHOD method_53466 isFinishedLoading ()Z + METHOD method_53518 isUsernameBanned ()Z + METHOD method_53519 (Lcom/mojang/authlib/GameProfile;Ljava/lang/Runnable;)Lnet/minecraft/class_437; + ARG 1 onClose + METHOD method_53520 (Lcom/mojang/authlib/minecraft/BanDetails;Ljava/lang/Runnable;)Lnet/minecraft/class_437; + ARG 1 onClose + METHOD method_53521 (Lnet/minecraft/class_310$class_8764;Ljava/lang/Throwable;)V + ARG 2 throwable + METHOD method_53522 (Lnet/minecraft/class_310$class_8764;Ljava/util/Optional;)V + ARG 2 error + METHOD method_53523 (Ljava/lang/Runnable;)Lnet/minecraft/class_437; + ARG 1 onClose + METHOD method_53524 (Ljava/lang/Runnable;Z)V + ARG 1 confirmed + METHOD method_53525 createInitScreens (Ljava/util/List;)V + ARG 1 list + METHOD method_53526 getDebugHud ()Lnet/minecraft/class_340; + METHOD method_53527 onInitFinished (Lnet/minecraft/class_310$class_8764;)Ljava/lang/Runnable; + ARG 1 loadingContext CLASS class_5859 ChatRestriction COMMENT Represents the restrictions on chat on a Minecraft client. COMMENT COMMENT @see MinecraftClient#getChatRestriction() FIELD field_28944 description Lnet/minecraft/class_2561; FIELD field_39456 MORE_INFO_TEXT Lnet/minecraft/class_2561; - FIELD field_39457 JAVA_ACCOUNT_SETTINGS_URL Ljava/lang/String; METHOD (Ljava/lang/String;ILnet/minecraft/class_2561;)V ARG 3 description METHOD method_33885 getDescription ()Lnet/minecraft/class_2561; METHOD method_33886 allowsChat (Z)Z ARG 1 singlePlayer + CLASS class_8764 LoadingContext diff --git a/mappings/net/minecraft/client/MinecraftClientGame.mapping b/mappings/net/minecraft/client/MinecraftClientGame.mapping deleted file mode 100644 index 1670a43735..0000000000 --- a/mappings/net/minecraft/client/MinecraftClientGame.mapping +++ /dev/null @@ -1,20 +0,0 @@ -CLASS net/minecraft/class_3799 net/minecraft/client/MinecraftClientGame - FIELD field_16755 launcher Lcom/mojang/bridge/launcher/Launcher; - FIELD field_16756 listener Lcom/mojang/bridge/launcher/SessionEventListener; - FIELD field_16757 client Lnet/minecraft/class_310; - METHOD (Lnet/minecraft/class_310;)V - ARG 1 client - METHOD method_16687 onStartGameSession ()V - METHOD method_16688 onLeaveGameSession ()V - METHOD setSessionEventListener (Lcom/mojang/bridge/launcher/SessionEventListener;)V - ARG 1 listener - CLASS class_3800 PerformanceMetricsImpl - FIELD field_16758 sampleCount I - FIELD field_16759 averageTime I - FIELD field_16760 maxTime I - FIELD field_16761 minTime I - METHOD (IIII)V - ARG 1 minTime - ARG 2 maxTime - ARG 3 averageTime - ARG 4 sampleCount diff --git a/mappings/net/minecraft/client/Mouse.mapping b/mappings/net/minecraft/client/Mouse.mapping index f073a2cd5f..e35e09c88f 100644 --- a/mappings/net/minecraft/client/Mouse.mapping +++ b/mappings/net/minecraft/client/Mouse.mapping @@ -6,7 +6,6 @@ CLASS net/minecraft/class_312 net/minecraft/client/Mouse FIELD field_1783 cursorLocked Z FIELD field_1784 hasResolutionChanged Z FIELD field_1785 lastMouseUpdateTime D - FIELD field_1786 eventDeltaWheel D FIELD field_1787 cursorDeltaY D FIELD field_1788 rightButtonClicked Z FIELD field_1789 cursorDeltaX D @@ -16,6 +15,8 @@ CLASS net/minecraft/class_312 net/minecraft/client/Mouse FIELD field_1793 cursorXSmoother Lnet/minecraft/class_3540; FIELD field_1794 y D FIELD field_1795 x D + FIELD field_45296 eventDeltaHorizontalWheel D + FIELD field_45297 eventDeltaVerticalWheel D METHOD (Lnet/minecraft/class_310;)V ARG 1 client METHOD method_1598 onMouseScroll (JDD)V diff --git a/mappings/net/minecraft/client/QuickPlay.mapping b/mappings/net/minecraft/client/QuickPlay.mapping new file mode 100644 index 0000000000..44a826b637 --- /dev/null +++ b/mappings/net/minecraft/client/QuickPlay.mapping @@ -0,0 +1,24 @@ +CLASS net/minecraft/class_8496 net/minecraft/client/QuickPlay + FIELD field_44554 ERROR_TITLE Lnet/minecraft/class_2561; + FIELD field_44555 ERROR_INVALID_IDENTIFIER Lnet/minecraft/class_2561; + FIELD field_44556 ERROR_REALM_CONNECT Lnet/minecraft/class_2561; + FIELD field_44557 ERROR_REALM_PERMISSION Lnet/minecraft/class_2561; + FIELD field_44558 TO_TITLE Lnet/minecraft/class_2561; + FIELD field_44559 TO_WORLD Lnet/minecraft/class_2561; + FIELD field_44560 TO_REALMS Lnet/minecraft/class_2561; + METHOD method_51258 (JLnet/minecraft/class_4877;)Z + ARG 2 server + METHOD method_51259 startRealms (Lnet/minecraft/class_310;Lnet/minecraft/class_4341;Ljava/lang/String;)V + ARG 0 client + ARG 1 realmsClient + ARG 2 realmId + METHOD method_51260 startQuickPlay (Lnet/minecraft/class_310;Lnet/minecraft/class_542$class_8495;Lnet/minecraft/class_4341;)V + ARG 0 client + ARG 1 quickPlay + ARG 2 realmsClient + METHOD method_51261 startSingleplayer (Lnet/minecraft/class_310;Ljava/lang/String;)V + ARG 0 client + ARG 1 levelName + METHOD method_51263 startMultiplayer (Lnet/minecraft/class_310;Ljava/lang/String;)V + ARG 0 client + ARG 1 serverAddress diff --git a/mappings/net/minecraft/client/QuickPlayLogger.mapping b/mappings/net/minecraft/client/QuickPlayLogger.mapping new file mode 100644 index 0000000000..fc6de99164 --- /dev/null +++ b/mappings/net/minecraft/client/QuickPlayLogger.mapping @@ -0,0 +1,33 @@ +CLASS net/minecraft/class_8497 net/minecraft/client/QuickPlayLogger + FIELD field_44561 NOOP Lnet/minecraft/class_8497; + FIELD field_44562 LOGGER Lorg/slf4j/Logger; + FIELD field_44563 GSON Lcom/google/gson/Gson; + FIELD field_44564 path Ljava/nio/file/Path; + FIELD field_44565 world Lnet/minecraft/class_8497$class_8499; + METHOD (Ljava/lang/String;)V + ARG 1 relativePath + METHOD method_51264 (Lcom/google/gson/JsonElement;)V + ARG 1 json + METHOD method_51265 save (Lnet/minecraft/class_310;)V + ARG 1 client + METHOD method_51266 setWorld (Lnet/minecraft/class_8497$class_8500;Ljava/lang/String;Ljava/lang/String;)V + ARG 1 worldType + ARG 2 id + ARG 3 name + METHOD method_51267 create (Ljava/lang/String;)Lnet/minecraft/class_8497; + ARG 0 relativePath + CLASS class_8498 Log + FIELD comp_1482 gameMode Lnet/minecraft/class_1934; + FIELD field_44566 CODEC Lcom/mojang/serialization/Codec; + METHOD comp_1482 gameMode ()Lnet/minecraft/class_1934; + METHOD method_51269 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 0 instance + CLASS class_8499 QuickPlayWorld + FIELD field_44567 CODEC Lcom/mojang/serialization/MapCodec; + METHOD method_51270 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 0 instance + CLASS class_8500 WorldType + FIELD field_44571 CODEC Lcom/mojang/serialization/Codec; + FIELD field_44572 id Ljava/lang/String; + METHOD (Ljava/lang/String;ILjava/lang/String;)V + ARG 3 id diff --git a/mappings/net/minecraft/client/RunArgs.mapping b/mappings/net/minecraft/client/RunArgs.mapping index 87d5a95406..bc756f001c 100644 --- a/mappings/net/minecraft/client/RunArgs.mapping +++ b/mappings/net/minecraft/client/RunArgs.mapping @@ -3,13 +3,13 @@ CLASS net/minecraft/class_542 net/minecraft/client/RunArgs FIELD field_3278 network Lnet/minecraft/class_542$class_547; FIELD field_3279 windowSettings Lnet/minecraft/class_543; FIELD field_3280 game Lnet/minecraft/class_542$class_545; - FIELD field_3281 autoConnect Lnet/minecraft/class_542$class_546; - METHOD (Lnet/minecraft/class_542$class_547;Lnet/minecraft/class_543;Lnet/minecraft/class_542$class_544;Lnet/minecraft/class_542$class_545;Lnet/minecraft/class_542$class_546;)V + FIELD field_44553 quickPlay Lnet/minecraft/class_542$class_8495; + METHOD (Lnet/minecraft/class_542$class_547;Lnet/minecraft/class_543;Lnet/minecraft/class_542$class_544;Lnet/minecraft/class_542$class_545;Lnet/minecraft/class_542$class_8495;)V ARG 1 network ARG 2 windowSettings ARG 3 dirs ARG 4 game - ARG 5 autoConnect + ARG 5 quickPlay CLASS class_544 Directories FIELD field_3287 runDir Ljava/io/File; FIELD field_3288 assetIndex Ljava/lang/String; @@ -20,7 +20,7 @@ CLASS net/minecraft/class_542 net/minecraft/client/RunArgs ARG 2 resPackDir ARG 3 assetDir ARG 4 assetIndex - METHOD method_2788 getResourceIndex ()Lnet/minecraft/class_1064; + METHOD method_45701 getAssetDir ()Ljava/nio/file/Path; CLASS class_545 Game FIELD field_25061 multiplayerDisabled Z FIELD field_25062 onlineChatDisabled Z @@ -33,12 +33,6 @@ CLASS net/minecraft/class_542 net/minecraft/client/RunArgs ARG 3 versionType ARG 4 multiplayerDisabled ARG 5 onlineChatDisabled - CLASS class_546 AutoConnect - FIELD field_3294 serverAddress Ljava/lang/String; - FIELD field_3295 serverPort I - METHOD (Ljava/lang/String;I)V - ARG 1 serverAddress - ARG 2 serverPort CLASS class_547 Network FIELD field_3296 netProxy Ljava/net/Proxy; FIELD field_3297 profileProperties Lcom/mojang/authlib/properties/PropertyMap; @@ -49,3 +43,5 @@ CLASS net/minecraft/class_542 net/minecraft/client/RunArgs ARG 2 userProperties ARG 3 profileProperties ARG 4 proxy + CLASS class_8495 QuickPlay + METHOD method_51257 isEnabled ()Z diff --git a/mappings/net/minecraft/client/color/block/BlockColors.mapping b/mappings/net/minecraft/client/color/block/BlockColors.mapping index e233446a30..25b5cfefb5 100644 --- a/mappings/net/minecraft/client/color/block/BlockColors.mapping +++ b/mappings/net/minecraft/client/color/block/BlockColors.mapping @@ -82,3 +82,8 @@ CLASS net/minecraft/class_324 net/minecraft/client/color/block/BlockColors METHOD method_21594 registerColorProperties (Ljava/util/Set;[Lnet/minecraft/class_2248;)V ARG 1 properties ARG 2 blocks + METHOD method_49295 (Lnet/minecraft/class_2680;Lnet/minecraft/class_1920;Lnet/minecraft/class_2338;I)I + ARG 0 state + ARG 1 world + ARG 2 pos + ARG 3 tintIndex diff --git a/mappings/net/minecraft/client/color/world/GrassColors.mapping b/mappings/net/minecraft/client/color/world/GrassColors.mapping index 5ccc15cf4e..1061859a3e 100644 --- a/mappings/net/minecraft/client/color/world/GrassColors.mapping +++ b/mappings/net/minecraft/client/color/world/GrassColors.mapping @@ -1,5 +1,6 @@ CLASS net/minecraft/class_1933 net/minecraft/client/color/world/GrassColors FIELD field_9214 colorMap [I + METHOD method_49724 getDefaultColor ()I METHOD method_8376 setColorMap ([I)V ARG 0 map METHOD method_8377 getColor (DD)I diff --git a/mappings/net/minecraft/client/font/BitmapFont.mapping b/mappings/net/minecraft/client/font/BitmapFont.mapping index 35e19a6253..2d0e3035c4 100644 --- a/mappings/net/minecraft/client/font/BitmapFont.mapping +++ b/mappings/net/minecraft/client/font/BitmapFont.mapping @@ -1,28 +1,35 @@ CLASS net/minecraft/class_386 net/minecraft/client/font/BitmapFont - FIELD field_2284 glyphs Lit/unimi/dsi/fastutil/ints/Int2ObjectMap; + FIELD field_2284 glyphs Lnet/minecraft/class_8532; FIELD field_2285 image Lnet/minecraft/class_1011; FIELD field_2286 LOGGER Lorg/slf4j/Logger; - METHOD (Lnet/minecraft/class_1011;Lit/unimi/dsi/fastutil/ints/Int2ObjectMap;)V + METHOD (Lnet/minecraft/class_1011;Lnet/minecraft/class_8532;)V ARG 1 image ARG 2 glyphs CLASS class_387 Loader - FIELD field_2287 ascent I - FIELD field_2288 height I - FIELD field_2289 filename Lnet/minecraft/class_2960; - FIELD field_2290 chars Ljava/util/List; - METHOD (Lnet/minecraft/class_2960;IILjava/util/List;)V + FIELD field_44799 CODEC Lcom/mojang/serialization/MapCodec; + FIELD field_44800 CODE_POINT_GRID_CODEC Lcom/mojang/serialization/Codec; + METHOD (Lnet/minecraft/class_2960;II[[I)V ARG 1 id ARG 2 height ARG 3 ascent - ARG 4 chars - METHOD method_2037 fromJson (Lcom/google/gson/JsonObject;)Lnet/minecraft/class_386$class_387; - ARG 0 json METHOD method_2038 findCharacterStartX (Lnet/minecraft/class_1011;IIII)I ARG 1 image ARG 2 characterWidth ARG 3 characterHeight ARG 4 charPosX ARG 5 charPosY + METHOD method_2039 load (Lnet/minecraft/class_3300;)Lnet/minecraft/class_390; + ARG 1 resourceManager + METHOD method_51748 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 0 instance + METHOD method_51749 validate (Lnet/minecraft/class_386$class_387;)Lcom/mojang/serialization/DataResult; + ARG 0 fontLoader + METHOD method_51750 (Ljava/util/List;)[[I + ARG 0 strings + METHOD method_51752 validateCodePointGrid ([[I)Lcom/mojang/serialization/DataResult; + ARG 0 codePointGrid + METHOD method_51754 ([[I)Ljava/util/List; + ARG 0 codePointGrid CLASS class_388 BitmapFontGlyph FIELD comp_603 scaleFactor F FIELD comp_604 image Lnet/minecraft/class_1011; diff --git a/mappings/net/minecraft/client/font/FontLoader.mapping b/mappings/net/minecraft/client/font/FontLoader.mapping index 25a13d7363..4970c9f5ec 100644 --- a/mappings/net/minecraft/client/font/FontLoader.mapping +++ b/mappings/net/minecraft/client/font/FontLoader.mapping @@ -1,3 +1,10 @@ CLASS net/minecraft/class_389 net/minecraft/client/font/FontLoader - METHOD method_2039 load (Lnet/minecraft/class_3300;)Lnet/minecraft/class_390; - ARG 1 manager + FIELD field_44801 CODEC Lcom/mojang/serialization/Codec; + METHOD method_51731 getType ()Lnet/minecraft/class_394; + METHOD method_51734 build ()Lcom/mojang/datafixers/util/Either; + METHOD method_51757 (Lnet/minecraft/class_394;)Lcom/mojang/serialization/Codec; + ARG 0 fontType + CLASS class_8539 Loadable + METHOD load (Lnet/minecraft/class_3300;)Lnet/minecraft/class_390; + ARG 1 resourceManager + CLASS class_8540 Reference diff --git a/mappings/net/minecraft/client/font/FontManager.mapping b/mappings/net/minecraft/client/font/FontManager.mapping index ab8492813d..1b26125c39 100644 --- a/mappings/net/minecraft/client/font/FontManager.mapping +++ b/mappings/net/minecraft/client/font/FontManager.mapping @@ -1,5 +1,4 @@ CLASS net/minecraft/class_378 net/minecraft/client/font/FontManager - FIELD field_18215 resourceReloadListener Lnet/minecraft/class_3302; FIELD field_2259 fontStorages Ljava/util/Map; FIELD field_2260 textureManager Lnet/minecraft/class_1060; FIELD field_2261 LOGGER Lorg/slf4j/Logger; @@ -7,9 +6,11 @@ CLASS net/minecraft/class_378 net/minecraft/client/font/FontManager FIELD field_24255 missingStorage Lnet/minecraft/class_377; FIELD field_24256 idOverrides Ljava/util/Map; FIELD field_32226 FONTS_JSON Ljava/lang/String; + FIELD field_40409 FINDER Lnet/minecraft/class_7654; + FIELD field_44757 GSON Lcom/google/gson/Gson; + FIELD field_44758 fonts Ljava/util/List; METHOD (Lnet/minecraft/class_1060;)V ARG 1 manager - METHOD method_18627 getResourceReloadListener ()Lnet/minecraft/class_3302; METHOD method_27539 createTextRenderer ()Lnet/minecraft/class_327; METHOD method_27540 (Lnet/minecraft/class_377;)V ARG 0 fontStorage @@ -20,13 +21,77 @@ CLASS net/minecraft/class_378 net/minecraft/client/font/FontManager METHOD method_45077 (Lnet/minecraft/class_2960;)Lnet/minecraft/class_377; ARG 1 id METHOD method_45078 createAdvanceValidatingTextRenderer ()Lnet/minecraft/class_327; - CLASS 1 - METHOD method_18633 (Lnet/minecraft/class_2960;)Z - ARG 0 id - METHOD method_18637 (Lnet/minecraft/class_2960;)Ljava/util/List; - ARG 0 id - METHOD method_27543 (Ljava/util/List;I)V - ARG 1 codePoint - METHOD method_27544 (Lnet/minecraft/class_2960;Ljava/util/List;)V - ARG 1 id - ARG 2 fonts + METHOD method_51606 getEffectiveId (Lnet/minecraft/class_2960;)Lnet/minecraft/class_2960; + ARG 1 id + METHOD method_51607 (Lnet/minecraft/class_2960;Ljava/util/List;)V + ARG 1 fontId + ARG 2 providers + METHOD method_51608 loadIndex (Lnet/minecraft/class_3300;Ljava/util/concurrent/Executor;)Ljava/util/concurrent/CompletableFuture; + ARG 1 resourceManager + ARG 2 executor + METHOD method_51609 (Lnet/minecraft/class_8523;Lnet/minecraft/class_378$class_8537;)V + ARG 1 entry + METHOD method_51610 (Lnet/minecraft/class_3695;Lnet/minecraft/class_378$class_8536;)V + ARG 2 index + METHOD method_51611 (Lnet/minecraft/class_390;Ljava/util/concurrent/Executor;Ljava/util/List;)Ljava/util/concurrent/CompletableFuture; + ARG 3 dest + METHOD method_51612 (Lnet/minecraft/class_378$class_8534;Lnet/minecraft/class_3300;Ljava/util/concurrent/Executor;Lnet/minecraft/class_378$class_8537;Lnet/minecraft/class_389$class_8539;)V + ARG 5 loadable + METHOD method_51613 load (Lnet/minecraft/class_378$class_8534;Lnet/minecraft/class_389$class_8539;Lnet/minecraft/class_3300;Ljava/util/concurrent/Executor;)Ljava/util/concurrent/CompletableFuture; + ARG 1 key + ARG 2 loadable + ARG 3 resourceManager + ARG 4 executor + METHOD method_51614 reload (Lnet/minecraft/class_378$class_8536;Lnet/minecraft/class_3695;)V + ARG 1 index + ARG 2 profiler + METHOD method_51615 (Lnet/minecraft/class_378$class_8537;Lnet/minecraft/class_378$class_8534;Lnet/minecraft/class_389$class_8540;)V + ARG 2 reference + METHOD method_51617 getRequiredFontProviders (Ljava/util/List;)Ljava/util/Map; + ARG 1 entries + METHOD method_51618 (Ljava/util/List;I)V + ARG 1 codePoint + METHOD method_51619 loadFontProviders (Ljava/util/List;Lnet/minecraft/class_2960;)Ljava/util/List; + ARG 0 fontResources + ARG 1 id + METHOD method_51620 insertFont (Ljava/util/List;Lnet/minecraft/class_390;)V + ARG 1 fonts + ARG 2 font + METHOD method_51621 (Ljava/util/List;Lnet/minecraft/class_390;Ljava/util/concurrent/Executor;Ljava/util/List;)Ljava/util/concurrent/CompletionStage; + ARG 4 providers + METHOD method_51622 (Ljava/util/List;Ljava/util/Map;Ljava/lang/Void;)Lnet/minecraft/class_378$class_8536; + ARG 2 ignored + METHOD method_51624 (Ljava/util/Map;Lnet/minecraft/class_2960;Lnet/minecraft/class_378$class_8537;)V + ARG 1 dependent + ARG 2 fontEntry + METHOD method_51625 (Ljava/util/Map;Lnet/minecraft/class_2960;Ljava/util/List;)V + ARG 2 fonts + METHOD method_51626 (Ljava/util/concurrent/Executor;Ljava/util/List;)Ljava/util/concurrent/CompletionStage; + ARG 2 entries + CLASS class_8534 FontKey + CLASS class_8535 Builder + METHOD method_51628 (Ljava/util/concurrent/CompletableFuture;)Ljava/util/Optional; + ARG 0 future + METHOD method_51629 build (Ljava/util/function/Function;)Ljava/util/Optional; + ARG 1 fontRetriever + METHOD method_51630 (Ljava/util/function/Function;Lnet/minecraft/class_2960;)Ljava/util/Optional; + ARG 2 referee + CLASS class_8536 ProviderIndex + CLASS class_8537 FontEntry + METHOD (Lnet/minecraft/class_2960;)V + ARG 1 fontId + METHOD method_51631 addReferenceBuilder (Lnet/minecraft/class_378$class_8534;Lnet/minecraft/class_389$class_8540;)V + ARG 1 key + ARG 2 reference + METHOD method_51632 addBuilder (Lnet/minecraft/class_378$class_8534;Ljava/util/concurrent/CompletableFuture;)V + ARG 1 key + ARG 2 provider + METHOD method_51633 (Lnet/minecraft/class_378$class_8535;)Ljava/util/stream/Stream; + ARG 0 builder + METHOD method_51634 getRequiredFontProviders (Ljava/util/function/Function;)Ljava/util/Optional; + ARG 1 fontRetriever + METHOD method_51635 getImmediateProviders ()Ljava/util/stream/Stream; + CLASS class_8556 Providers + FIELD field_44798 CODEC Lcom/mojang/serialization/Codec; + METHOD method_51747 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 0 instance diff --git a/mappings/net/minecraft/client/font/FontStorage.mapping b/mappings/net/minecraft/client/font/FontStorage.mapping index 7f3fd99ca4..f4f520ad12 100644 --- a/mappings/net/minecraft/client/font/FontStorage.mapping +++ b/mappings/net/minecraft/client/font/FontStorage.mapping @@ -5,10 +5,10 @@ CLASS net/minecraft/class_377 net/minecraft/client/font/FontStorage FIELD field_2248 textureManager Lnet/minecraft/class_1060; FIELD field_2249 charactersByWidth Lit/unimi/dsi/fastutil/ints/Int2ObjectMap; FIELD field_2252 RANDOM Lnet/minecraft/class_5819; - FIELD field_2253 glyphRendererCache Lit/unimi/dsi/fastutil/ints/Int2ObjectMap; + FIELD field_2253 glyphRendererCache Lnet/minecraft/class_8532; FIELD field_2254 glyphAtlases Ljava/util/List; FIELD field_2256 blankGlyphRenderer Lnet/minecraft/class_382; - FIELD field_2257 glyphCache Lit/unimi/dsi/fastutil/ints/Int2ObjectMap; + FIELD field_2257 glyphCache Lnet/minecraft/class_8532; FIELD field_39934 MAX_ADVANCE F METHOD (Lnet/minecraft/class_1060;Lnet/minecraft/class_2960;)V ARG 1 textureManager @@ -43,6 +43,10 @@ CLASS net/minecraft/class_377 net/minecraft/client/font/FontStorage ARG 1 codePoint METHOD method_45079 isAdvanceInvalid (Lnet/minecraft/class_379;)Z ARG 0 glyph + METHOD method_51636 (I)[[Lnet/minecraft/class_377$class_7647; + ARG 0 rowCount + METHOD method_51638 (I)[[Lnet/minecraft/class_382; + ARG 0 rowCount CLASS class_7647 GlyphPair FIELD comp_979 glyph Lnet/minecraft/class_379; FIELD comp_980 advanceValidatedGlyph Lnet/minecraft/class_379; diff --git a/mappings/net/minecraft/client/font/FontType.mapping b/mappings/net/minecraft/client/font/FontType.mapping index 5ccf8c2858..5de3b450ff 100644 --- a/mappings/net/minecraft/client/font/FontType.mapping +++ b/mappings/net/minecraft/client/font/FontType.mapping @@ -1,13 +1,8 @@ CLASS net/minecraft/class_394 net/minecraft/client/font/FontType - FIELD field_2311 REGISTRY Ljava/util/Map; FIELD field_2314 id Ljava/lang/String; - FIELD field_2315 loaderFactory Ljava/util/function/Function; - METHOD (Ljava/lang/String;ILjava/lang/String;Ljava/util/function/Function;)V + FIELD field_44802 CODEC Lcom/mojang/serialization/Codec; + FIELD field_44803 loaderCodec Lcom/mojang/serialization/MapCodec; + METHOD (Ljava/lang/String;ILjava/lang/String;Lcom/mojang/serialization/MapCodec;)V ARG 3 id - ARG 4 factory - METHOD method_2047 createLoader (Lcom/google/gson/JsonObject;)Lnet/minecraft/class_389; - ARG 1 json - METHOD method_2048 byId (Ljava/lang/String;)Lnet/minecraft/class_394; - ARG 0 id - METHOD method_2049 (Ljava/util/HashMap;)V - ARG 0 map + ARG 4 loaderCodec + METHOD method_51758 getLoaderCodec ()Lcom/mojang/serialization/MapCodec; diff --git a/mappings/net/minecraft/client/font/GlyphAtlasTexture.mapping b/mappings/net/minecraft/client/font/GlyphAtlasTexture.mapping index 240d8e2d0e..cac392ab3e 100644 --- a/mappings/net/minecraft/client/font/GlyphAtlasTexture.mapping +++ b/mappings/net/minecraft/client/font/GlyphAtlasTexture.mapping @@ -1,17 +1,15 @@ CLASS net/minecraft/class_380 net/minecraft/client/font/GlyphAtlasTexture - FIELD field_21690 textLayer Lnet/minecraft/class_1921; - FIELD field_21691 seeThroughTextLayer Lnet/minecraft/class_1921; - FIELD field_2262 id Lnet/minecraft/class_2960; FIELD field_2263 hasColor Z FIELD field_2264 rootSlot Lnet/minecraft/class_380$class_381; FIELD field_32227 SLOT_LENGTH I - FIELD field_33998 polygonOffsetTextLayer Lnet/minecraft/class_1921; - METHOD (Lnet/minecraft/class_2960;Z)V - ARG 1 id + FIELD field_44759 textRenderLayers Lnet/minecraft/class_8538; + METHOD (Lnet/minecraft/class_8538;Z)V + ARG 1 textRenderLayers ARG 2 hasColor METHOD method_2022 getGlyphRenderer (Lnet/minecraft/class_383;)Lnet/minecraft/class_382; ARG 1 glyph - METHOD method_2023 getId ()Lnet/minecraft/class_2960; + METHOD method_51640 (I)I + ARG 0 color CLASS class_381 Slot FIELD field_2265 occupied Z FIELD field_2266 height I diff --git a/mappings/net/minecraft/client/font/GlyphContainer.mapping b/mappings/net/minecraft/client/font/GlyphContainer.mapping new file mode 100644 index 0000000000..f0218debce --- /dev/null +++ b/mappings/net/minecraft/client/font/GlyphContainer.mapping @@ -0,0 +1,33 @@ +CLASS net/minecraft/class_8532 net/minecraft/client/font/GlyphContainer + FIELD field_44749 ROW_SHIFT I + FIELD field_44750 ENTRIES_PER_ROW I + FIELD field_44751 LAST_ENTRY_NUM_IN_ROW I + FIELD field_44752 LAST_ROW_NUM I + FIELD field_44753 NUM_ROWS I + FIELD field_44754 defaultRow [Ljava/lang/Object; + FIELD field_44755 rows [[Ljava/lang/Object; + FIELD field_44756 makeRow Ljava/util/function/IntFunction; + METHOD (Ljava/util/function/IntFunction;Ljava/util/function/IntFunction;)V + ARG 1 makeRow + ARG 2 makeScroll + METHOD method_51597 clear ()V + METHOD method_51598 get (I)Ljava/lang/Object; + ARG 1 codePoint + METHOD method_51599 put (ILjava/lang/Object;)Ljava/lang/Object; + ARG 1 codePoint + ARG 2 glyph + METHOD method_51600 computeIfAbsent (ILjava/util/function/IntFunction;)Ljava/lang/Object; + ARG 1 codePoint + ARG 2 ifAbsent + METHOD method_51601 forEachGlyph (Lnet/minecraft/class_8532$class_8533;)V + ARG 1 glyphConsumer + METHOD method_51602 (Lit/unimi/dsi/fastutil/ints/IntOpenHashSet;ILjava/lang/Object;)V + ARG 1 codePoint + ARG 2 glyph + METHOD method_51603 getProvidedGlyphs ()Lit/unimi/dsi/fastutil/ints/IntSet; + METHOD method_51604 remove (I)Ljava/lang/Object; + ARG 1 codePoint + CLASS class_8533 GlyphConsumer + METHOD accept (ILjava/lang/Object;)V + ARG 1 codePoint + ARG 2 glyph diff --git a/mappings/net/minecraft/client/font/GlyphRenderer.mapping b/mappings/net/minecraft/client/font/GlyphRenderer.mapping index 61707aa475..3c0379bbb8 100644 --- a/mappings/net/minecraft/client/font/GlyphRenderer.mapping +++ b/mappings/net/minecraft/client/font/GlyphRenderer.mapping @@ -1,6 +1,4 @@ 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 minX F FIELD field_2273 maxV F FIELD field_2274 minV F @@ -9,20 +7,18 @@ CLASS net/minecraft/class_382 net/minecraft/client/font/GlyphRenderer FIELD field_2278 maxY F FIELD field_2279 minY F FIELD field_2280 maxX F - FIELD field_33999 polygonOffsetTextLayer Lnet/minecraft/class_1921; - METHOD (Lnet/minecraft/class_1921;Lnet/minecraft/class_1921;Lnet/minecraft/class_1921;FFFFFFFF)V - ARG 1 textLayer - ARG 2 seeThroughTextLayer - ARG 3 polygonOffsetTextLayer - ARG 4 minU - ARG 5 maxU - ARG 6 minV - ARG 7 maxV - ARG 8 minX - ARG 9 maxX - ARG 10 minY - ARG 11 maxY - METHOD method_2025 draw (ZFFLnet/minecraft/class_1159;Lnet/minecraft/class_4588;FFFFI)V + FIELD field_44760 textRenderLayers Lnet/minecraft/class_8538; + METHOD (Lnet/minecraft/class_8538;FFFFFFFF)V + ARG 1 textRenderLayers + ARG 2 minU + ARG 3 maxU + ARG 4 minV + ARG 5 maxV + ARG 6 minX + ARG 7 maxX + ARG 8 minY + ARG 9 maxY + METHOD method_2025 draw (ZFFLorg/joml/Matrix4f;Lnet/minecraft/class_4588;FFFFI)V ARG 1 italic ARG 2 x ARG 3 y @@ -33,7 +29,7 @@ CLASS net/minecraft/class_382 net/minecraft/client/font/GlyphRenderer ARG 8 blue ARG 9 alpha ARG 10 light - METHOD method_22944 drawRectangle (Lnet/minecraft/class_382$class_328;Lnet/minecraft/class_1159;Lnet/minecraft/class_4588;I)V + METHOD method_22944 drawRectangle (Lnet/minecraft/class_382$class_328;Lorg/joml/Matrix4f;Lnet/minecraft/class_4588;I)V ARG 1 rectangle ARG 2 matrix ARG 3 vertexConsumer diff --git a/mappings/net/minecraft/client/font/MultilineText.mapping b/mappings/net/minecraft/client/font/MultilineText.mapping index 7fe6179d7c..b6e6d42015 100644 --- a/mappings/net/minecraft/client/font/MultilineText.mapping +++ b/mappings/net/minecraft/client/font/MultilineText.mapping @@ -1,12 +1,12 @@ CLASS net/minecraft/class_5489 net/minecraft/client/font/MultilineText FIELD field_26528 EMPTY Lnet/minecraft/class_5489; METHOD method_30887 count ()I - METHOD method_30888 drawCenterWithShadow (Lnet/minecraft/class_4587;II)I - ARG 1 matrices + METHOD method_30888 drawCenterWithShadow (Lnet/minecraft/class_332;II)I + ARG 1 context ARG 2 x ARG 3 y - METHOD method_30889 drawCenterWithShadow (Lnet/minecraft/class_4587;IIII)I - ARG 1 matrices + METHOD method_30889 drawCenterWithShadow (Lnet/minecraft/class_332;IIII)I + ARG 1 context ARG 2 x ARG 3 y ARG 4 lineHeight @@ -23,8 +23,8 @@ CLASS net/minecraft/class_5489 net/minecraft/client/font/MultilineText METHOD method_30892 create (Lnet/minecraft/class_327;[Lnet/minecraft/class_2561;)Lnet/minecraft/class_5489; ARG 0 renderer ARG 1 texts - METHOD method_30893 drawWithShadow (Lnet/minecraft/class_4587;IIII)I - ARG 1 matrices + METHOD method_30893 drawWithShadow (Lnet/minecraft/class_332;IIII)I + ARG 1 context ARG 2 x ARG 3 y ARG 4 lineHeight @@ -34,8 +34,8 @@ CLASS net/minecraft/class_5489 net/minecraft/client/font/MultilineText METHOD method_30895 create (Lnet/minecraft/class_327;Ljava/util/List;)Lnet/minecraft/class_5489; ARG 0 textRenderer ARG 1 lines - METHOD method_30896 draw (Lnet/minecraft/class_4587;IIII)I - ARG 1 matrices + METHOD method_30896 draw (Lnet/minecraft/class_332;IIII)I + ARG 1 context ARG 2 x ARG 3 y ARG 4 lineHeight @@ -49,8 +49,8 @@ CLASS net/minecraft/class_5489 net/minecraft/client/font/MultilineText METHOD method_35726 createFromTexts (Lnet/minecraft/class_327;Ljava/util/List;)Lnet/minecraft/class_5489; ARG 0 renderer ARG 1 texts - METHOD method_41154 fillBackground (Lnet/minecraft/class_4587;IIIII)V - ARG 1 matrices + METHOD method_41154 fillBackground (Lnet/minecraft/class_332;IIIII)V + ARG 1 context ARG 2 centerX ARG 3 centerY ARG 4 lineHeight diff --git a/mappings/net/minecraft/client/font/ReferenceFont.mapping b/mappings/net/minecraft/client/font/ReferenceFont.mapping new file mode 100644 index 0000000000..f551dca747 --- /dev/null +++ b/mappings/net/minecraft/client/font/ReferenceFont.mapping @@ -0,0 +1,8 @@ +CLASS net/minecraft/class_8541 net/minecraft/client/font/ReferenceFont + FIELD comp_1523 id Lnet/minecraft/class_2960; + FIELD field_44762 CODEC Lcom/mojang/serialization/MapCodec; + METHOD (Lnet/minecraft/class_2960;)V + ARG 1 id + METHOD comp_1523 id ()Lnet/minecraft/class_2960; + METHOD method_51647 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 0 instance diff --git a/mappings/net/minecraft/client/font/SpaceFont.mapping b/mappings/net/minecraft/client/font/SpaceFont.mapping index 23c18902e1..0ba5aa7733 100644 --- a/mappings/net/minecraft/client/font/SpaceFont.mapping +++ b/mappings/net/minecraft/client/font/SpaceFont.mapping @@ -1,10 +1,13 @@ CLASS net/minecraft/class_7166 net/minecraft/client/font/SpaceFont FIELD field_37842 codePointsToGlyphs Lit/unimi/dsi/fastutil/ints/Int2ObjectMap; - METHOD (Lit/unimi/dsi/fastutil/ints/Int2FloatMap;)V + METHOD (Ljava/util/Map;)V ARG 1 codePointsToAdvances - METHOD method_41715 fromJson (Lcom/google/gson/JsonObject;)Lnet/minecraft/class_389; - ARG 0 json - METHOD method_41716 (Lit/unimi/dsi/fastutil/ints/Int2FloatMap$Entry;)V - ARG 1 entry - METHOD method_41717 (Lit/unimi/dsi/fastutil/ints/Int2FloatMap;Lnet/minecraft/class_3300;)Lnet/minecraft/class_390; - ARG 0 manager + METHOD method_41716 (Ljava/lang/Integer;Ljava/lang/Float;)V + ARG 1 codePoint + ARG 2 glyph + CLASS class_8554 Loader + FIELD field_44791 CODEC Lcom/mojang/serialization/MapCodec; + METHOD method_51732 (Lnet/minecraft/class_3300;)Lnet/minecraft/class_390; + ARG 1 resourceManager + METHOD method_51733 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 0 instance diff --git a/mappings/net/minecraft/client/font/TextHandler.mapping b/mappings/net/minecraft/client/font/TextHandler.mapping index e53f12a491..25793485e2 100644 --- a/mappings/net/minecraft/client/font/TextHandler.mapping +++ b/mappings/net/minecraft/client/font/TextHandler.mapping @@ -132,9 +132,6 @@ CLASS net/minecraft/class_5225 net/minecraft/client/font/TextHandler ARG 1 text ARG 2 maxWidth ARG 3 style - METHOD method_44918 getStyleMatchResults (Lnet/minecraft/class_5481;Ljava/util/function/Predicate;)Ljava/util/List; - ARG 1 text - ARG 2 stylePredicate CLASS 1 FIELD field_24219 collector Lnet/minecraft/class_5222; CLASS class_5226 LineWrappingCollector @@ -142,7 +139,7 @@ CLASS net/minecraft/class_5225 net/minecraft/client/font/TextHandler FIELD field_24221 joined Ljava/lang/String; METHOD (Ljava/util/List;)V ARG 1 parts - METHOD method_27499 collectRemainers ()Lnet/minecraft/class_5348; + METHOD method_27499 collectRemainders ()Lnet/minecraft/class_5348; METHOD method_27500 charAt (I)C ARG 1 index METHOD method_27501 collectLine (IILnet/minecraft/class_2583;)Lnet/minecraft/class_5348; @@ -202,15 +199,3 @@ CLASS net/minecraft/class_5225 net/minecraft/client/font/TextHandler METHOD (Ljava/lang/String;Lnet/minecraft/class_2583;)V ARG 1 literal ARG 2 style - CLASS class_7623 MatchResult - CLASS class_7624 StylePredicateVisitor - FIELD field_39840 stylePredicate Ljava/util/function/Predicate; - FIELD field_39841 totalWidth F - FIELD field_39842 results Lcom/google/common/collect/ImmutableList$Builder; - FIELD field_39843 styleStartWidth F - FIELD field_39844 lastTestResult Z - METHOD (Lnet/minecraft/class_5225;Ljava/util/function/Predicate;)V - ARG 2 stylePredicate - METHOD method_44919 getResults ()Ljava/util/List; - METHOD method_44920 onStyleMatchStart ()V - METHOD method_44921 onStyleMatchEnd ()V diff --git a/mappings/net/minecraft/client/font/TextRenderLayerSet.mapping b/mappings/net/minecraft/client/font/TextRenderLayerSet.mapping new file mode 100644 index 0000000000..69d6747ff0 --- /dev/null +++ b/mappings/net/minecraft/client/font/TextRenderLayerSet.mapping @@ -0,0 +1,7 @@ +CLASS net/minecraft/class_8538 net/minecraft/client/font/TextRenderLayerSet + METHOD method_51641 ofIntensity (Lnet/minecraft/class_2960;)Lnet/minecraft/class_8538; + ARG 0 textureId + METHOD method_51642 getRenderLayer (Lnet/minecraft/class_327$class_6415;)Lnet/minecraft/class_1921; + ARG 1 layerType + METHOD method_51643 of (Lnet/minecraft/class_2960;)Lnet/minecraft/class_8538; + ARG 0 textureId diff --git a/mappings/net/minecraft/client/font/TextRenderer.mapping b/mappings/net/minecraft/client/font/TextRenderer.mapping index a63a65ad4b..cdab5a8402 100644 --- a/mappings/net/minecraft/client/font/TextRenderer.mapping +++ b/mappings/net/minecraft/client/font/TextRenderer.mapping @@ -9,7 +9,7 @@ CLASS net/minecraft/class_327 net/minecraft/client/font/TextRenderer FIELD field_2000 fontHeight I COMMENT The font height of the text that is rendered by the text renderer. FIELD field_2001 random Lnet/minecraft/class_5819; - FIELD field_24237 FORWARD_SHIFT Lnet/minecraft/class_1160; + FIELD field_24237 FORWARD_SHIFT Lorg/joml/Vector3f; FIELD field_24238 handler Lnet/minecraft/class_5225; FIELD field_32166 Z_INDEX F FIELD field_35427 ARABIC_SHAPING_LETTERS_SHAPE I @@ -17,7 +17,7 @@ CLASS net/minecraft/class_327 net/minecraft/client/font/TextRenderer METHOD (Ljava/util/function/Function;Z)V ARG 1 fontStorageAccessor ARG 2 validateAdvance - METHOD method_1710 drawGlyph (Lnet/minecraft/class_382;ZZFFFLnet/minecraft/class_1159;Lnet/minecraft/class_4588;FFFFI)V + METHOD method_1710 drawGlyph (Lnet/minecraft/class_382;ZZFFFLorg/joml/Matrix4f;Lnet/minecraft/class_4588;FFFFI)V ARG 1 glyphRenderer ARG 2 bold ARG 3 italic @@ -31,13 +31,6 @@ CLASS net/minecraft/class_327 net/minecraft/client/font/TextRenderer ARG 11 blue ARG 12 alpha ARG 13 light - METHOD method_1712 drawTrimmed (Lnet/minecraft/class_5348;IIII)V - ARG 1 text - ARG 2 x - ARG 3 y - ARG 4 maxWidth - ARG 5 color - COMMENT the text color in the 0xAARRGGBB format METHOD method_1713 getWrappedLinesHeight (Ljava/lang/String;I)I COMMENT Gets the height of the text when it has been wrapped. COMMENT @@ -53,16 +46,9 @@ CLASS net/minecraft/class_327 net/minecraft/client/font/TextRenderer 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 - ARG 1 matrices - ARG 2 text - ARG 3 x - ARG 4 y - ARG 5 color - COMMENT the text color in the 0xAARRGGBB format METHOD method_1721 mirror (Ljava/lang/String;)Ljava/lang/String; ARG 1 text - METHOD method_1723 drawInternal (Lnet/minecraft/class_5481;FFIZLnet/minecraft/class_1159;Lnet/minecraft/class_4597;ZII)I + METHOD method_1723 drawInternal (Lnet/minecraft/class_5481;FFIZLorg/joml/Matrix4f;Lnet/minecraft/class_4597;Lnet/minecraft/class_327$class_6415;II)I ARG 1 text ARG 2 x ARG 3 y @@ -70,10 +56,10 @@ CLASS net/minecraft/class_327 net/minecraft/client/font/TextRenderer ARG 5 shadow ARG 6 matrix ARG 7 vertexConsumerProvider - ARG 8 seeThrough + ARG 8 layerType ARG 9 backgroundColor ARG 10 light - METHOD method_1724 drawLayer (Ljava/lang/String;FFIZLnet/minecraft/class_1159;Lnet/minecraft/class_4597;ZII)F + METHOD method_1724 drawLayer (Ljava/lang/String;FFIZLorg/joml/Matrix4f;Lnet/minecraft/class_4597;Lnet/minecraft/class_327$class_6415;II)F ARG 1 text ARG 2 x ARG 3 y @@ -81,7 +67,7 @@ CLASS net/minecraft/class_327 net/minecraft/client/font/TextRenderer ARG 5 shadow ARG 6 matrix ARG 7 vertexConsumerProvider - ARG 8 seeThrough + ARG 8 layerType ARG 9 underlineColor ARG 10 light METHOD method_1726 isRightToLeft ()Z @@ -96,21 +82,7 @@ CLASS net/minecraft/class_327 net/minecraft/client/font/TextRenderer 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 - ARG 1 matrices - ARG 2 text - ARG 3 x - ARG 4 y - ARG 5 color - COMMENT the text color in the 0xAARRGGBB format - METHOD method_22941 draw (Lnet/minecraft/class_5481;FFILnet/minecraft/class_1159;Z)I - ARG 1 text - ARG 2 x - ARG 3 y - ARG 4 color - ARG 5 matrix - ARG 6 shadow - METHOD method_22942 draw (Lnet/minecraft/class_5481;FFIZLnet/minecraft/class_1159;Lnet/minecraft/class_4597;ZII)I + METHOD method_22942 draw (Lnet/minecraft/class_5481;FFIZLorg/joml/Matrix4f;Lnet/minecraft/class_4597;Lnet/minecraft/class_327$class_6415;II)I ARG 1 text ARG 2 x ARG 3 y @@ -119,7 +91,7 @@ CLASS net/minecraft/class_327 net/minecraft/client/font/TextRenderer ARG 5 shadow ARG 6 matrix ARG 7 vertexConsumers - ARG 8 seeThrough + ARG 8 layerType ARG 9 backgroundColor ARG 10 light METHOD method_27515 tweakTransparency (I)I @@ -127,22 +99,7 @@ CLASS net/minecraft/class_327 net/minecraft/client/font/TextRenderer METHOD method_27516 (ILnet/minecraft/class_2583;)F ARG 1 codePoint ARG 2 style - METHOD method_27517 drawWithShadow (Lnet/minecraft/class_4587;Lnet/minecraft/class_5481;FFI)I - ARG 1 matrices - ARG 2 text - ARG 3 x - ARG 4 y - ARG 5 color - COMMENT the text color in the 0xAARRGGBB format - METHOD method_27520 draw (Ljava/lang/String;FFILnet/minecraft/class_1159;ZZ)I - ARG 1 text - ARG 2 x - ARG 3 y - ARG 4 color - ARG 5 matrix - ARG 6 shadow - ARG 7 mirror - METHOD method_27521 draw (Ljava/lang/String;FFIZLnet/minecraft/class_1159;Lnet/minecraft/class_4597;ZII)I + METHOD method_27521 draw (Ljava/lang/String;FFIZLorg/joml/Matrix4f;Lnet/minecraft/class_4597;Lnet/minecraft/class_327$class_6415;II)I ARG 1 text ARG 2 x ARG 3 y @@ -151,10 +108,10 @@ CLASS net/minecraft/class_327 net/minecraft/client/font/TextRenderer ARG 5 shadow ARG 6 matrix ARG 7 vertexConsumers - ARG 8 seeThrough + ARG 8 layerType ARG 9 backgroundColor ARG 10 light - METHOD method_27522 draw (Ljava/lang/String;FFIZLnet/minecraft/class_1159;Lnet/minecraft/class_4597;ZIIZ)I + METHOD method_27522 draw (Ljava/lang/String;FFIZLorg/joml/Matrix4f;Lnet/minecraft/class_4597;Lnet/minecraft/class_327$class_6415;IIZ)I ARG 1 text ARG 2 x ARG 3 y @@ -163,7 +120,7 @@ CLASS net/minecraft/class_327 net/minecraft/client/font/TextRenderer ARG 5 shadow ARG 6 matrix ARG 7 vertexConsumers - ARG 8 seeThrough + ARG 8 layerType ARG 9 backgroundColor ARG 10 light ARG 11 rightToLeft @@ -188,14 +145,7 @@ CLASS net/minecraft/class_327 net/minecraft/client/font/TextRenderer METHOD method_27526 getFontStorage (Lnet/minecraft/class_2960;)Lnet/minecraft/class_377; ARG 1 id METHOD method_27527 getTextHandler ()Lnet/minecraft/class_5225; - METHOD method_27528 draw (Lnet/minecraft/class_4587;Lnet/minecraft/class_5481;FFI)I - ARG 1 matrices - ARG 2 text - ARG 3 x - ARG 4 y - ARG 5 color - COMMENT the text color in the 0xAARRGGBB format - METHOD method_27529 drawInternal (Ljava/lang/String;FFIZLnet/minecraft/class_1159;Lnet/minecraft/class_4597;ZIIZ)I + METHOD method_27529 drawInternal (Ljava/lang/String;FFIZLorg/joml/Matrix4f;Lnet/minecraft/class_4597;Lnet/minecraft/class_327$class_6415;IIZ)I ARG 1 text ARG 2 x ARG 3 y @@ -203,11 +153,11 @@ CLASS net/minecraft/class_327 net/minecraft/client/font/TextRenderer ARG 5 shadow ARG 6 matrix ARG 7 vertexConsumers - ARG 8 seeThrough + ARG 8 layerType ARG 9 backgroundColor ARG 10 light ARG 11 mirror - METHOD method_27530 drawLayer (Lnet/minecraft/class_5481;FFIZLnet/minecraft/class_1159;Lnet/minecraft/class_4597;ZII)F + METHOD method_27530 drawLayer (Lnet/minecraft/class_5481;FFIZLorg/joml/Matrix4f;Lnet/minecraft/class_4597;Lnet/minecraft/class_327$class_6415;II)F ARG 1 text ARG 2 x ARG 3 y @@ -215,28 +165,13 @@ CLASS net/minecraft/class_327 net/minecraft/client/font/TextRenderer ARG 5 shadow ARG 6 matrix ARG 7 vertexConsumerProvider - ARG 8 seeThrough + ARG 8 layerType ARG 9 underlineColor ARG 10 light - METHOD method_29342 drawWithShadow (Lnet/minecraft/class_4587;Ljava/lang/String;FFIZ)I - ARG 1 matrices - ARG 2 text - ARG 3 x - ARG 4 y - ARG 5 color - 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 - ARG 2 text - ARG 3 x - ARG 4 y - ARG 5 color - COMMENT the text color in the 0xAARRGGBB format - METHOD method_30882 draw (Lnet/minecraft/class_2561;FFIZLnet/minecraft/class_1159;Lnet/minecraft/class_4597;ZII)I + METHOD method_30882 draw (Lnet/minecraft/class_2561;FFIZLorg/joml/Matrix4f;Lnet/minecraft/class_4597;Lnet/minecraft/class_327$class_6415;II)I ARG 1 text ARG 2 x ARG 3 y @@ -245,17 +180,10 @@ CLASS net/minecraft/class_327 net/minecraft/client/font/TextRenderer ARG 5 shadow ARG 6 matrix ARG 7 vertexConsumers - ARG 8 seeThrough + ARG 8 layerType ARG 9 backgroundColor ARG 10 light - METHOD method_30883 draw (Lnet/minecraft/class_4587;Lnet/minecraft/class_2561;FFI)I - ARG 1 matrices - ARG 2 text - ARG 3 x - ARG 4 y - ARG 5 color - COMMENT the text color in the 0xAARRGGBB format - METHOD method_37296 drawWithOutline (Lnet/minecraft/class_5481;FFIILnet/minecraft/class_1159;Lnet/minecraft/class_4597;I)V + METHOD method_37296 drawWithOutline (Lnet/minecraft/class_5481;FFIILorg/joml/Matrix4f;Lnet/minecraft/class_4597;I)V ARG 1 text ARG 2 x ARG 3 y @@ -284,13 +212,13 @@ CLASS net/minecraft/class_327 net/minecraft/client/font/TextRenderer FIELD field_24244 green F FIELD field_24245 blue F FIELD field_24246 alpha F - FIELD field_24247 matrix Lnet/minecraft/class_1159; + FIELD field_24247 matrix Lorg/joml/Matrix4f; FIELD field_24249 light I FIELD field_24250 x F FIELD field_24251 y F FIELD field_24252 rectangles Ljava/util/List; FIELD field_33997 layerType Lnet/minecraft/class_327$class_6415; - METHOD (Lnet/minecraft/class_327;Lnet/minecraft/class_4597;FFIZLnet/minecraft/class_1159;Lnet/minecraft/class_327$class_6415;I)V + METHOD (Lnet/minecraft/class_327;Lnet/minecraft/class_4597;FFIZLorg/joml/Matrix4f;Lnet/minecraft/class_327$class_6415;I)V ARG 2 vertexConsumers ARG 3 x ARG 4 y @@ -299,15 +227,6 @@ CLASS net/minecraft/class_327 net/minecraft/client/font/TextRenderer ARG 7 matrix ARG 8 layerType ARG 9 light - METHOD (Lnet/minecraft/class_327;Lnet/minecraft/class_4597;FFIZLnet/minecraft/class_1159;ZI)V - ARG 2 vertexConsumers - ARG 3 x - ARG 4 y - ARG 5 color - ARG 6 shadow - ARG 7 matrix - ARG 8 seeThrough - ARG 9 light METHOD method_27531 drawLayer (IF)F ARG 1 underlineColor ARG 2 x diff --git a/mappings/net/minecraft/client/font/TrueTypeFont.mapping b/mappings/net/minecraft/client/font/TrueTypeFont.mapping index bd6fa034d7..788754b017 100644 --- a/mappings/net/minecraft/client/font/TrueTypeFont.mapping +++ b/mappings/net/minecraft/client/font/TrueTypeFont.mapping @@ -17,6 +17,7 @@ CLASS net/minecraft/class_395 net/minecraft/client/font/TrueTypeFont ARG 7 excludedCharacters METHOD method_27443 (I)Z ARG 1 codePoint + METHOD method_51884 getInfo ()Lorg/lwjgl/stb/STBTTFontinfo; CLASS class_397 TtfGlyph FIELD field_2332 advance F FIELD field_2333 ascent F @@ -29,4 +30,6 @@ CLASS net/minecraft/class_395 net/minecraft/client/font/TrueTypeFont ARG 3 x2 ARG 4 y2 ARG 5 y1 + ARG 6 advance + ARG 7 bearingX ARG 8 glyphIndex diff --git a/mappings/net/minecraft/client/font/TrueTypeFontLoader.mapping b/mappings/net/minecraft/client/font/TrueTypeFontLoader.mapping index 893a8e5d95..0897407cce 100644 --- a/mappings/net/minecraft/client/font/TrueTypeFontLoader.mapping +++ b/mappings/net/minecraft/client/font/TrueTypeFontLoader.mapping @@ -1,17 +1,18 @@ -CLASS net/minecraft/class_396 net/minecraft/client/font/TrueTypeFontLoader - FIELD field_16242 LOGGER Lorg/slf4j/Logger; - FIELD field_2326 shiftY F - FIELD field_2327 shiftX F - FIELD field_2328 oversample F - FIELD field_2329 size F - FIELD field_2330 filename Lnet/minecraft/class_2960; - FIELD field_2331 excludedCharacters Ljava/lang/String; - METHOD (Lnet/minecraft/class_2960;FFFFLjava/lang/String;)V - ARG 1 filename - ARG 2 size - ARG 3 oversample - ARG 4 shiftX - ARG 5 shiftY - ARG 6 excludedCharacters - METHOD method_2059 fromJson (Lcom/google/gson/JsonObject;)Lnet/minecraft/class_389; - ARG 0 json +CLASS net/minecraft/class_8557 net/minecraft/client/font/TrueTypeFontLoader + FIELD field_44804 CODEC Lcom/mojang/serialization/MapCodec; + FIELD field_44805 SKIP_CODEC Lcom/mojang/serialization/Codec; + METHOD method_51759 load (Lnet/minecraft/class_3300;)Lnet/minecraft/class_390; + ARG 1 resourceManager + METHOD method_51761 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 0 instance + METHOD method_52730 (Ljava/util/List;)Ljava/lang/String; + ARG 0 chars + CLASS class_8558 Shift + FIELD field_44806 NONE Lnet/minecraft/class_8557$class_8558; + FIELD field_44807 CODEC Lcom/mojang/serialization/Codec; + METHOD method_51764 (Lnet/minecraft/class_8557$class_8558;)Ljava/util/List; + ARG 0 shift + METHOD method_51765 (Ljava/util/List;)Lcom/mojang/serialization/DataResult; + ARG 0 floatList + METHOD method_51766 (Ljava/util/List;)Lnet/minecraft/class_8557$class_8558; + ARG 0 floatList diff --git a/mappings/net/minecraft/client/font/UnicodeTextureFont.mapping b/mappings/net/minecraft/client/font/UnicodeTextureFont.mapping deleted file mode 100644 index 883fdbdcdf..0000000000 --- a/mappings/net/minecraft/client/font/UnicodeTextureFont.mapping +++ /dev/null @@ -1,41 +0,0 @@ -CLASS net/minecraft/class_391 net/minecraft/client/font/UnicodeTextureFont - FIELD field_2299 images Ljava/util/Map; - FIELD field_2300 template Ljava/lang/String; - FIELD field_2301 sizes [B - FIELD field_2302 resourceManager Lnet/minecraft/class_3300; - FIELD field_2303 LOGGER Lorg/slf4j/Logger; - METHOD (Lnet/minecraft/class_3300;[BLjava/lang/String;)V - ARG 1 resourceManager - ARG 2 sizes - ARG 3 template - METHOD method_2041 getImageId (I)Lnet/minecraft/class_2960; - ARG 1 codePoint - METHOD method_2042 getGlyphImage (Lnet/minecraft/class_2960;)Lnet/minecraft/class_1011; - ARG 1 glyphId - METHOD method_2043 getStart (B)I - ARG 0 size - METHOD method_2044 getEnd (B)I - ARG 0 size - CLASS class_392 Loader - FIELD field_2304 sizes Lnet/minecraft/class_2960; - FIELD field_2305 template Ljava/lang/String; - METHOD (Lnet/minecraft/class_2960;Ljava/lang/String;)V - ARG 1 sizes - ARG 2 template - METHOD method_2046 fromJson (Lcom/google/gson/JsonObject;)Lnet/minecraft/class_389; - ARG 0 json - METHOD method_37431 getLegacyUnicodeTemplate (Lcom/google/gson/JsonObject;)Ljava/lang/String; - ARG 0 json - CLASS class_393 UnicodeTextureGlyph - FIELD comp_611 unpackSkipPixels I - FIELD comp_612 unpackSkipRows I - FIELD comp_613 width I - FIELD comp_614 height I - FIELD comp_615 image Lnet/minecraft/class_1011; - METHOD (IIIILnet/minecraft/class_1011;)V - ARG 5 image - METHOD comp_611 unpackSkipPixels ()I - METHOD comp_612 unpackSkipRows ()I - METHOD comp_613 width ()I - METHOD comp_614 height ()I - METHOD comp_615 image ()Lnet/minecraft/class_1011; diff --git a/mappings/net/minecraft/client/font/UnihexFont.mapping b/mappings/net/minecraft/client/font/UnihexFont.mapping new file mode 100644 index 0000000000..a31362e162 --- /dev/null +++ b/mappings/net/minecraft/client/font/UnihexFont.mapping @@ -0,0 +1,99 @@ +CLASS net/minecraft/class_391 net/minecraft/client/font/UnihexFont + FIELD field_2303 LOGGER Lorg/slf4j/Logger; + FIELD field_44770 glyphs Lnet/minecraft/class_8532; + METHOD (Lnet/minecraft/class_8532;)V + ARG 1 glyphs + METHOD method_51651 getHexDigitValue (IB)I + ARG 0 lineNum + ARG 1 digit + METHOD method_51652 getHexDigitValue (ILit/unimi/dsi/fastutil/bytes/ByteList;I)I + ARG 0 lineNum + ARG 1 bytes + ARG 2 index + METHOD method_51653 readLines (Ljava/io/InputStream;Lnet/minecraft/class_391$class_8546;)V + ARG 0 stream + ARG 1 callback + METHOD method_51654 readUntilDelimiter (Ljava/io/InputStream;Lit/unimi/dsi/fastutil/bytes/ByteList;I)Z + ARG 0 stream + ARG 1 data + ARG 2 delimiter + METHOD method_51655 addRowPixels (Ljava/nio/IntBuffer;III)V + ARG 0 pixelsOut + ARG 1 row + ARG 2 left + ARG 3 right + METHOD method_51656 addGlyphPixels (Ljava/nio/IntBuffer;Lnet/minecraft/class_391$class_8544;II)V + ARG 0 pixelsOut + ARG 1 glyph + ARG 2 left + ARG 3 right + CLASS class_392 Loader + FIELD field_2304 sizes Lnet/minecraft/class_2960; + FIELD field_44771 CODEC Lcom/mojang/serialization/MapCodec; + FIELD field_44772 overrides Ljava/util/List; + METHOD (Lnet/minecraft/class_2960;Ljava/util/List;)V + ARG 1 sizes + ARG 2 overrides + METHOD method_51658 load (Lnet/minecraft/class_3300;)Lnet/minecraft/class_390; + ARG 1 resourceManager + METHOD method_51659 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 0 instance + METHOD method_51660 (Lnet/minecraft/class_8532;ILnet/minecraft/class_391$class_8544;)V + ARG 1 codePoint + ARG 2 glyph + METHOD method_51661 (Lnet/minecraft/class_391$class_392;)Ljava/util/List; + ARG 0 loader + METHOD method_51662 loadHexFile (Ljava/io/InputStream;)Lnet/minecraft/class_391; + ARG 1 stream + METHOD method_51665 (Lnet/minecraft/class_391$class_392;)Lnet/minecraft/class_2960; + ARG 0 loader + METHOD method_51666 (I)[[Lnet/minecraft/class_391$class_8544; + ARG 0 rows + CLASS class_393 UnicodeTextureGlyph + METHOD method_51675 width ()I + CLASS class_7736 FontImage8x16 + METHOD ([B)V + ARG 1 sizes + METHOD method_51669 read (ILit/unimi/dsi/fastutil/bytes/ByteList;)Lnet/minecraft/class_391$class_8544; + ARG 0 lineNum + ARG 1 data + CLASS class_8542 Dimensions + FIELD field_44773 MAP_CODEC Lcom/mojang/serialization/MapCodec; + FIELD field_44774 CODEC Lcom/mojang/serialization/Codec; + METHOD method_51670 packedValue ()I + METHOD method_51671 getLeft (I)I + ARG 0 packed + METHOD method_51672 pack (II)I + ARG 0 left + ARG 1 right + METHOD method_51673 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 0 instance + METHOD method_51674 getRight (I)I + ARG 0 packed + CLASS class_8543 FontImage32x16 + METHOD method_51676 read32x16 (ILit/unimi/dsi/fastutil/bytes/ByteList;)Lnet/minecraft/class_391$class_8544; + ARG 0 lineNum + ARG 1 data + METHOD method_51677 read24x16 (ILit/unimi/dsi/fastutil/bytes/ByteList;)Lnet/minecraft/class_391$class_8544; + ARG 0 lineNum + ARG 1 data + CLASS class_8544 BitmapGlyph + METHOD method_51668 getPixels (I)I + ARG 1 y + METHOD method_51678 getNonemptyColumnBitmask ()I + METHOD method_51679 getPackedDimensions ()I + CLASS class_8545 DimensionOverride + FIELD field_44776 CODEC Lcom/mojang/serialization/Codec; + FIELD field_44777 NON_VALIDATED_CODEC Lcom/mojang/serialization/Codec; + METHOD method_51680 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 0 instance + METHOD method_51681 (Lnet/minecraft/class_391$class_8545;)Lcom/mojang/serialization/DataResult; + ARG 0 override + CLASS class_8546 BitmapGlyphConsumer + METHOD accept (ILnet/minecraft/class_391$class_8544;)V + ARG 1 codePoint + ARG 2 glyph + CLASS class_8547 FontImage16x16 + METHOD method_51683 read (ILit/unimi/dsi/fastutil/bytes/ByteList;)Lnet/minecraft/class_391$class_8544; + ARG 0 lineNum + ARG 1 data diff --git a/mappings/net/minecraft/client/gl/EffectGlShader.mapping b/mappings/net/minecraft/client/gl/EffectGlShader.mapping deleted file mode 100644 index 42ed7dd49f..0000000000 --- a/mappings/net/minecraft/client/gl/EffectGlShader.mapping +++ /dev/null @@ -1 +0,0 @@ -CLASS net/minecraft/class_5936 net/minecraft/client/gl/EffectGlShader diff --git a/mappings/net/minecraft/client/gl/EffectShaderProgram.mapping b/mappings/net/minecraft/client/gl/EffectShaderProgram.mapping new file mode 100644 index 0000000000..08412a1e58 --- /dev/null +++ b/mappings/net/minecraft/client/gl/EffectShaderProgram.mapping @@ -0,0 +1 @@ +CLASS net/minecraft/class_5936 net/minecraft/client/gl/EffectShaderProgram diff --git a/mappings/net/minecraft/client/gl/EffectProgram.mapping b/mappings/net/minecraft/client/gl/EffectShaderStage.mapping similarity index 61% rename from mappings/net/minecraft/client/gl/EffectProgram.mapping rename to mappings/net/minecraft/client/gl/EffectShaderStage.mapping index e8dd8ebd28..08d5a0df8f 100644 --- a/mappings/net/minecraft/client/gl/EffectProgram.mapping +++ b/mappings/net/minecraft/client/gl/EffectShaderStage.mapping @@ -1,11 +1,12 @@ -CLASS net/minecraft/class_5937 net/minecraft/client/gl/EffectProgram - COMMENT A program that can be applied to multiple GLShaders. - COMMENT This program will only be released once an equal number of programs referencing it have been released. +CLASS net/minecraft/class_5937 net/minecraft/client/gl/EffectShaderStage + COMMENT A shader stage that can be attached to multiple shader programs. This + COMMENT shader stage will only be released once an equal number of shader + COMMENT programs referencing it have been released. FIELD field_29329 LOADER Lnet/minecraft/class_5913; FIELD field_29330 refCount I METHOD (Lnet/minecraft/class_281$class_282;ILjava/lang/String;)V ARG 1 type - ARG 2 shaderRef + ARG 2 glRef ARG 3 name METHOD method_34414 attachTo (Lnet/minecraft/class_5936;)V ARG 1 program diff --git a/mappings/net/minecraft/client/gl/GLImportProcessor.mapping b/mappings/net/minecraft/client/gl/GLImportProcessor.mapping index 11c56e673c..a6e7766fd0 100644 --- a/mappings/net/minecraft/client/gl/GLImportProcessor.mapping +++ b/mappings/net/minecraft/client/gl/GLImportProcessor.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_5913 net/minecraft/client/gl/GLImportProcessor +CLASS net/minecraft/class_5913 net/minecraft/client/gl/GlImportProcessor COMMENT Handles the flattening of "moj_" import strings in the loaded GLSL shader file. COMMENT Instances of an import are replaced by the contents of the referenced file COMMENT prefixed by a comment describing the line position and original file location diff --git a/mappings/net/minecraft/client/gl/GlProgramManager.mapping b/mappings/net/minecraft/client/gl/GlProgramManager.mapping index 8553e9bfa3..b55af05809 100644 --- a/mappings/net/minecraft/client/gl/GlProgramManager.mapping +++ b/mappings/net/minecraft/client/gl/GlProgramManager.mapping @@ -1,9 +1,9 @@ CLASS net/minecraft/class_285 net/minecraft/client/gl/GlProgramManager FIELD field_1551 LOGGER Lorg/slf4j/Logger; METHOD method_1304 deleteProgram (Lnet/minecraft/class_3679;)V - ARG 0 shader + ARG 0 program METHOD method_1306 createProgram ()I METHOD method_1307 linkProgram (Lnet/minecraft/class_3679;)V - ARG 0 shader + ARG 0 program METHOD method_22094 useProgram (I)V ARG 0 program diff --git a/mappings/net/minecraft/client/gl/GlShader.mapping b/mappings/net/minecraft/client/gl/GlShader.mapping deleted file mode 100644 index feff60743e..0000000000 --- a/mappings/net/minecraft/client/gl/GlShader.mapping +++ /dev/null @@ -1,6 +0,0 @@ -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 - METHOD method_34418 attachReferencedShaders ()V diff --git a/mappings/net/minecraft/client/gl/JsonEffectGlShader.mapping b/mappings/net/minecraft/client/gl/JsonEffectShaderProgram.mapping similarity index 83% rename from mappings/net/minecraft/client/gl/JsonEffectGlShader.mapping rename to mappings/net/minecraft/client/gl/JsonEffectShaderProgram.mapping index 7c641f8ecd..53d12e6288 100644 --- a/mappings/net/minecraft/client/gl/JsonEffectGlShader.mapping +++ b/mappings/net/minecraft/client/gl/JsonEffectShaderProgram.mapping @@ -1,22 +1,22 @@ -CLASS net/minecraft/class_280 net/minecraft/client/gl/JsonEffectGlShader +CLASS net/minecraft/class_280 net/minecraft/client/gl/JsonEffectShaderProgram FIELD field_1503 samplerNames Ljava/util/List; - FIELD field_1504 attribNames Ljava/util/List; - FIELD field_1505 activeProgramRef I - FIELD field_1506 samplerShaderLocs Ljava/util/List; - FIELD field_1507 uniformLocs Ljava/util/List; + FIELD field_1504 attributeNames Ljava/util/List; + FIELD field_1505 activeProgramGlRef I + FIELD field_1506 samplerLocations Ljava/util/List; + FIELD field_1507 uniformLocations Ljava/util/List; FIELD field_1508 vertexShader Lnet/minecraft/class_5937; FIELD field_1509 name Ljava/lang/String; FIELD field_1510 uniformByName Ljava/util/Map; FIELD field_1511 uniformStateDirty Z - FIELD field_1512 activeShader Lnet/minecraft/class_280; + FIELD field_1512 activeProgram Lnet/minecraft/class_280; FIELD field_1514 LOGGER Lorg/slf4j/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_1518 attributeLocations Ljava/util/List; FIELD field_1519 fragmentShader Lnet/minecraft/class_5937; FIELD field_1520 DEFAULT_UNIFORM Lnet/minecraft/class_278; - FIELD field_1521 programRef I + FIELD field_1521 glRef I FIELD field_32682 PROGRAM_DIRECTORY Ljava/lang/String; METHOD (Lnet/minecraft/class_3300;Ljava/lang/String;)V ARG 1 resource diff --git a/mappings/net/minecraft/client/gl/PostProcessShader.mapping b/mappings/net/minecraft/client/gl/PostEffectPass.mapping similarity index 80% rename from mappings/net/minecraft/client/gl/PostProcessShader.mapping rename to mappings/net/minecraft/client/gl/PostEffectPass.mapping index 9096849543..2931d0a1d0 100644 --- a/mappings/net/minecraft/client/gl/PostProcessShader.mapping +++ b/mappings/net/minecraft/client/gl/PostEffectPass.mapping @@ -1,7 +1,7 @@ -CLASS net/minecraft/class_283 net/minecraft/client/gl/PostProcessShader +CLASS net/minecraft/class_283 net/minecraft/client/gl/PostEffectPass FIELD field_1533 samplerWidths Ljava/util/List; FIELD field_1534 samplerValues Ljava/util/List; - FIELD field_1535 projectionMatrix Lnet/minecraft/class_1159; + FIELD field_1535 projectionMatrix Lorg/joml/Matrix4f; FIELD field_1536 input Lnet/minecraft/class_276; FIELD field_1537 samplerHeights Ljava/util/List; FIELD field_1538 output Lnet/minecraft/class_276; @@ -12,7 +12,7 @@ CLASS net/minecraft/class_283 net/minecraft/client/gl/PostProcessShader ARG 2 programName ARG 3 input ARG 4 output - METHOD method_1291 setProjectionMatrix (Lnet/minecraft/class_1159;)V + METHOD method_1291 setProjectionMatrix (Lorg/joml/Matrix4f;)V ARG 1 projectionMatrix METHOD method_1292 addAuxTarget (Ljava/lang/String;Ljava/util/function/IntSupplier;II)V ARG 1 name diff --git a/mappings/net/minecraft/client/gl/ShaderEffect.mapping b/mappings/net/minecraft/client/gl/PostEffectProcessor.mapping similarity index 93% rename from mappings/net/minecraft/client/gl/ShaderEffect.mapping rename to mappings/net/minecraft/client/gl/PostEffectProcessor.mapping index e51a19796a..8264878d4b 100644 --- a/mappings/net/minecraft/client/gl/ShaderEffect.mapping +++ b/mappings/net/minecraft/client/gl/PostEffectProcessor.mapping @@ -1,11 +1,11 @@ -CLASS net/minecraft/class_279 net/minecraft/client/gl/ShaderEffect +CLASS net/minecraft/class_279 net/minecraft/client/gl/PostEffectProcessor FIELD field_1492 height I FIELD field_1493 width I FIELD field_1494 name Ljava/lang/String; FIELD field_1495 targetsByName Ljava/util/Map; FIELD field_1496 defaultSizedTargets Ljava/util/List; FIELD field_1497 passes Ljava/util/List; - FIELD field_1498 projectionMatrix Lnet/minecraft/class_1159; + FIELD field_1498 projectionMatrix Lorg/joml/Matrix4f; FIELD field_1499 mainTarget Lnet/minecraft/class_276; FIELD field_1500 lastTickDelta F FIELD field_1501 time F diff --git a/mappings/net/minecraft/client/gl/ShaderParseException.mapping b/mappings/net/minecraft/client/gl/ShaderParseException.mapping deleted file mode 100644 index f3627ae025..0000000000 --- a/mappings/net/minecraft/client/gl/ShaderParseException.mapping +++ /dev/null @@ -1,19 +0,0 @@ -CLASS net/minecraft/class_2973 net/minecraft/client/gl/ShaderParseException - FIELD field_13371 traces Ljava/util/List; - FIELD field_13372 message Ljava/lang/String; - METHOD (Ljava/lang/String;Ljava/lang/Throwable;)V - ARG 1 message - ARG 2 cause - METHOD method_12854 addFaultyElement (Ljava/lang/String;)V - ARG 1 jsonKey - METHOD method_12855 addFaultyFile (Ljava/lang/String;)V - ARG 1 path - METHOD method_12856 wrap (Ljava/lang/Exception;)Lnet/minecraft/class_2973; - ARG 0 cause - CLASS class_2974 JsonStackTrace - FIELD field_13373 fileName Ljava/lang/String; - FIELD field_13374 faultyElements Ljava/util/List; - METHOD method_12857 joinStackTrace ()Ljava/lang/String; - METHOD method_12858 add (Ljava/lang/String;)V - ARG 1 element - METHOD method_36182 getFileName ()Ljava/lang/String; diff --git a/mappings/net/minecraft/client/render/Shader.mapping b/mappings/net/minecraft/client/gl/ShaderProgram.mapping similarity index 76% rename from mappings/net/minecraft/client/render/Shader.mapping rename to mappings/net/minecraft/client/gl/ShaderProgram.mapping index 428f103d44..735f6c8f5a 100644 --- a/mappings/net/minecraft/client/render/Shader.mapping +++ b/mappings/net/minecraft/client/gl/ShaderProgram.mapping @@ -1,10 +1,11 @@ -CLASS net/minecraft/class_5944 net/minecraft/client/render/Shader - COMMENT Represents a program object. +CLASS net/minecraft/class_5944 net/minecraft/client/gl/ShaderProgram + COMMENT Represents a shader program. Also known as a program object that can be + COMMENT created with {@code glCreateProgram}. COMMENT - COMMENT

Warning: This does NOT represent a shader object - COMMENT that can be created with {@code glCreateShader}. However, this class is - COMMENT referred to as a shader in strings, hence the class name. {@link - COMMENT net.minecraft.client.gl.Program} represents a shader object instead. + COMMENT

Warning: This class is referred to as a shader in + COMMENT strings. However, this does NOT represent a shader object that can be + COMMENT created with {@code glCreateShader}. {@link ShaderStage} is what + COMMENT represents a shader object. COMMENT COMMENT @see COMMENT GLSL Object - OpenGL Wiki (Program objects) @@ -29,26 +30,28 @@ CLASS net/minecraft/class_5944 net/minecraft/client/render/Shader FIELD field_29482 chunkOffset Lnet/minecraft/class_284; FIELD field_29483 LOGGER Lorg/slf4j/Logger; FIELD field_29484 DEFAULT_UNIFORM Lnet/minecraft/class_278; - FIELD field_29485 activeShader Lnet/minecraft/class_5944; - FIELD field_29486 activeShaderId I + FIELD field_29485 activeProgram Lnet/minecraft/class_5944; + FIELD field_29486 activeProgramGlRef I FIELD field_29487 samplers Ljava/util/Map; FIELD field_29488 samplerNames Ljava/util/List; FIELD field_29489 loadedSamplerIds Ljava/util/List; FIELD field_29490 uniforms Ljava/util/List; FIELD field_29491 loadedUniformIds Ljava/util/List; FIELD field_29492 loadedUniforms Ljava/util/Map; - FIELD field_29493 programId I + FIELD field_29493 glRef I FIELD field_29494 name Ljava/lang/String; FIELD field_29495 dirty Z - FIELD field_32778 CORE_DIRECTORY Ljava/lang/String; + FIELD field_32778 SHADERS_DIRECTORY Ljava/lang/String; FIELD field_32779 INCLUDE_DIRECTORY Ljava/lang/String; FIELD field_36323 viewRotationMat Lnet/minecraft/class_284; FIELD field_36373 fogShape Lnet/minecraft/class_284; + FIELD field_40512 CORE_DIRECTORY Ljava/lang/String; + FIELD field_42231 glintAlpha Lnet/minecraft/class_284; METHOD (Lnet/minecraft/class_5912;Ljava/lang/String;Lnet/minecraft/class_293;)V ARG 1 factory ARG 2 name ARG 3 format - METHOD method_34579 loadProgram (Lnet/minecraft/class_5912;Lnet/minecraft/class_281$class_282;Ljava/lang/String;)Lnet/minecraft/class_281; + METHOD method_34579 loadShader (Lnet/minecraft/class_5912;Lnet/minecraft/class_281$class_282;Ljava/lang/String;)Lnet/minecraft/class_281; ARG 0 factory ARG 1 type ARG 2 name diff --git a/mappings/net/minecraft/client/gl/ShaderProgramSetupView.mapping b/mappings/net/minecraft/client/gl/ShaderProgramSetupView.mapping new file mode 100644 index 0000000000..844c195c9f --- /dev/null +++ b/mappings/net/minecraft/client/gl/ShaderProgramSetupView.mapping @@ -0,0 +1,8 @@ +CLASS net/minecraft/class_3679 net/minecraft/client/gl/ShaderProgramSetupView + COMMENT A superinterface of {@link ShaderProgram} that exposes methods necessary + COMMENT for linking or deleting this shader program. + METHOD method_1270 getGlRef ()I + METHOD method_1274 getVertexShader ()Lnet/minecraft/class_281; + METHOD method_1278 getFragmentShader ()Lnet/minecraft/class_281; + METHOD method_1279 markUniformsDirty ()V + METHOD method_34418 attachReferencedShaders ()V diff --git a/mappings/net/minecraft/client/gl/Program.mapping b/mappings/net/minecraft/client/gl/ShaderStage.mapping similarity index 58% rename from mappings/net/minecraft/client/gl/Program.mapping rename to mappings/net/minecraft/client/gl/ShaderStage.mapping index 9432348e53..4c0dc5b417 100644 --- a/mappings/net/minecraft/client/gl/Program.mapping +++ b/mappings/net/minecraft/client/gl/ShaderStage.mapping @@ -1,22 +1,24 @@ -CLASS net/minecraft/class_281 net/minecraft/client/gl/Program - COMMENT Represents a (vertex or fragment) shader object. +CLASS net/minecraft/class_281 net/minecraft/client/gl/ShaderStage + COMMENT Represents a programmable shader stage (a vertex or a fragment shader) + COMMENT in the graphics pipeline. Also known as a shader object that can be + COMMENT created with {@code glCreateShader}. COMMENT - COMMENT

Warning: This does NOT represent a program object - COMMENT that can be created with {@code glCreateProgram}. However, this class is - COMMENT referred to as a program in strings, hence the class name. {@link - COMMENT net.minecraft.client.render.Shader} represents a program object instead. + COMMENT

Warning: This class is referred to as a program in + COMMENT strings. However, this does NOT represent a program object that can be + COMMENT created with {@code glCreateProgram}. {@link ShaderProgram} is what + COMMENT represents a program object. COMMENT COMMENT @see COMMENT Shader - OpenGL Wiki COMMENT @see COMMENT GLSL Object - OpenGL Wiki (Shader objects) - FIELD field_1523 shaderRef I - FIELD field_1524 shaderType Lnet/minecraft/class_281$class_282; + FIELD field_1523 glRef I + FIELD field_1524 type Lnet/minecraft/class_281$class_282; FIELD field_1525 name Ljava/lang/String; - FIELD field_32037 MAX_SHADER_INFO_LOG_LENGTH I + FIELD field_32037 MAX_INFO_LOG_LENGTH I METHOD (Lnet/minecraft/class_281$class_282;ILjava/lang/String;)V - ARG 1 shaderType - ARG 2 shaderRef + ARG 1 type + ARG 2 glRef ARG 3 name METHOD method_1280 getName ()Ljava/lang/String; METHOD method_1281 attachTo (Lnet/minecraft/class_3679;)V @@ -28,17 +30,17 @@ CLASS net/minecraft/class_281 net/minecraft/client/gl/Program ARG 2 stream ARG 3 domain ARG 4 loader - METHOD method_34416 loadProgram (Lnet/minecraft/class_281$class_282;Ljava/lang/String;Ljava/io/InputStream;Ljava/lang/String;Lnet/minecraft/class_5913;)I + METHOD method_34416 load (Lnet/minecraft/class_281$class_282;Ljava/lang/String;Ljava/io/InputStream;Ljava/lang/String;Lnet/minecraft/class_5913;)I ARG 0 type ARG 1 name ARG 2 stream ARG 3 domain ARG 4 loader - METHOD method_34417 getShaderRef ()I + METHOD method_34417 getGlRef ()I CLASS class_282 Type COMMENT Whether a vertex shader or a fragment shader. FIELD field_1526 name Ljava/lang/String; - FIELD field_1527 programCache Ljava/util/Map; + 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; @@ -50,5 +52,5 @@ CLASS net/minecraft/class_281 net/minecraft/client/gl/Program METHOD method_1284 getFileExtension ()Ljava/lang/String; METHOD method_1286 getName ()Ljava/lang/String; METHOD method_1287 getGlType ()I - METHOD method_1289 getProgramCache ()Ljava/util/Map; - COMMENT Gets a map of loaded shaders. + METHOD method_1289 getLoadedShaders ()Ljava/util/Map; + COMMENT {@return all loaded shaders of this type, keyed by their names} diff --git a/mappings/net/minecraft/client/gl/Uniform.mapping b/mappings/net/minecraft/client/gl/Uniform.mapping index 6b61efe96b..3f44befad2 100644 --- a/mappings/net/minecraft/client/gl/Uniform.mapping +++ b/mappings/net/minecraft/client/gl/Uniform.mapping @@ -10,7 +10,7 @@ CLASS net/minecraft/class_278 net/minecraft/client/gl/Uniform ARG 1 value1 ARG 2 value2 ARG 3 value3 - METHOD method_1250 set (Lnet/minecraft/class_1159;)V + METHOD method_1250 set (Lorg/joml/Matrix4f;)V ARG 1 values METHOD method_1251 set (F)V ARG 1 value1 @@ -29,7 +29,7 @@ CLASS net/minecraft/class_278 net/minecraft/client/gl/Uniform METHOD method_1255 set (FF)V ARG 1 value1 ARG 2 value2 - METHOD method_34413 set (Lnet/minecraft/class_1160;)V + METHOD method_34413 set (Lorg/joml/Vector3f;)V ARG 1 vector METHOD method_35644 set (FFFFFF)V ARG 1 value1 @@ -96,7 +96,7 @@ CLASS net/minecraft/class_278 net/minecraft/client/gl/Uniform ARG 1 value1 ARG 2 value2 ARG 3 value3 - METHOD method_35652 set (Lnet/minecraft/class_1162;)V + METHOD method_35652 set (Lorg/joml/Vector4f;)V ARG 1 vec METHOD method_35653 (FFFFFF)V ARG 1 value1 @@ -137,5 +137,5 @@ CLASS net/minecraft/class_278 net/minecraft/client/gl/Uniform ARG 2 value2 ARG 3 value3 ARG 4 value4 - METHOD method_39978 set (Lnet/minecraft/class_4581;)V + METHOD method_39978 set (Lorg/joml/Matrix3f;)V ARG 1 values diff --git a/mappings/net/minecraft/client/gl/VertexBuffer.mapping b/mappings/net/minecraft/client/gl/VertexBuffer.mapping index 193b2de7cf..4535d43c17 100644 --- a/mappings/net/minecraft/client/gl/VertexBuffer.mapping +++ b/mappings/net/minecraft/client/gl/VertexBuffer.mapping @@ -8,14 +8,17 @@ CLASS net/minecraft/class_291 net/minecraft/client/gl/VertexBuffer COMMENT COMMENT @implNote This is mostly a wrapper around vertex buffer object (VBO), COMMENT element buffer object (EBO), and vertex array object (VAO). - FIELD field_1593 vertexCount I + FIELD field_1593 indexCount I FIELD field_1594 vertexBufferId I FIELD field_27366 indexBufferId I FIELD field_27367 indexType Lnet/minecraft/class_293$class_5595; FIELD field_27368 drawMode Lnet/minecraft/class_293$class_5596; FIELD field_29338 vertexArrayId I FIELD field_29339 vertexFormat Lnet/minecraft/class_293; - FIELD field_38983 indexBuffer Lcom/mojang/blaze3d/systems/RenderSystem$class_5590; + FIELD field_38983 sharedSequentialIndexBuffer Lcom/mojang/blaze3d/systems/RenderSystem$class_5590; + FIELD field_44792 usage Lnet/minecraft/class_291$class_8555; + METHOD (Lnet/minecraft/class_291$class_8555;)V + ARG 1 usage METHOD method_1352 upload (Lnet/minecraft/class_287$class_7433;)V COMMENT Uploads the contents of {@code buffer} to GPU, discarding previously COMMENT uploaded data. @@ -28,32 +31,37 @@ CLASS net/minecraft/class_291 net/minecraft/client/gl/VertexBuffer COMMENT COMMENT

This method must be called before uploading or drawing data. METHOD method_1354 unbind ()V - METHOD method_34427 draw (Lnet/minecraft/class_1159;Lnet/minecraft/class_1159;Lnet/minecraft/class_5944;)V - COMMENT Draws the contents in this vertex buffer with {@code shader}. + METHOD method_34427 draw (Lorg/joml/Matrix4f;Lorg/joml/Matrix4f;Lnet/minecraft/class_5944;)V + COMMENT Draws the contents in this vertex buffer with {@code program}. COMMENT COMMENT

The caller of this method must {@linkplain #bind bind} this vertex COMMENT buffer before calling this method. ARG 1 viewMatrix ARG 2 projectionMatrix - ARG 3 shader - METHOD method_34431 drawInternal (Lnet/minecraft/class_1159;Lnet/minecraft/class_1159;Lnet/minecraft/class_5944;)V + ARG 3 program + METHOD method_34431 drawInternal (Lorg/joml/Matrix4f;Lorg/joml/Matrix4f;Lnet/minecraft/class_5944;)V ARG 1 viewMatrix ARG 2 projectionMatrix - ARG 3 shader + ARG 3 program METHOD method_34435 getVertexFormat ()Lnet/minecraft/class_293; - METHOD method_35665 drawElements ()V + METHOD method_35665 draw ()V COMMENT Draws the contents in this vertex buffer. COMMENT COMMENT

The caller of this method must {@linkplain #bind bind} this vertex COMMENT buffer before calling this method. COMMENT - COMMENT

Unlike {@link #draw(Matrix4f, Matrix4f, Shader)}, the caller of this - COMMENT method must manually bind a shader before calling this method. - METHOD method_43442 configureVertexFormat (Lnet/minecraft/class_287$class_4574;Ljava/nio/ByteBuffer;)Lnet/minecraft/class_293; + COMMENT

Unlike {@link #draw(Matrix4f, Matrix4f, ShaderProgram)}, the caller + COMMENT of this method must manually bind a shader program before calling this + COMMENT method. + METHOD method_43442 uploadVertexBuffer (Lnet/minecraft/class_287$class_4574;Ljava/nio/ByteBuffer;)Lnet/minecraft/class_293; ARG 1 parameters - ARG 2 data - METHOD method_43443 configureIndexBuffer (Lnet/minecraft/class_287$class_4574;Ljava/nio/ByteBuffer;)Lcom/mojang/blaze3d/systems/RenderSystem$class_5590; + ARG 2 vertexBuffer + METHOD method_43443 uploadIndexBuffer (Lnet/minecraft/class_287$class_4574;Ljava/nio/ByteBuffer;)Lcom/mojang/blaze3d/systems/RenderSystem$class_5590; ARG 1 parameters - ARG 2 data + ARG 2 indexBuffer METHOD method_43444 isClosed ()Z METHOD method_43445 getIndexType ()Lnet/minecraft/class_293$class_5595; + CLASS class_8555 Usage + FIELD field_44795 id I + METHOD (Ljava/lang/String;II)V + ARG 3 id diff --git a/mappings/net/minecraft/client/gui/DrawContext.mapping b/mappings/net/minecraft/client/gui/DrawContext.mapping new file mode 100644 index 0000000000..ad282fbb76 --- /dev/null +++ b/mappings/net/minecraft/client/gui/DrawContext.mapping @@ -0,0 +1,460 @@ +CLASS net/minecraft/class_332 net/minecraft/client/gui/DrawContext + FIELD field_44656 client Lnet/minecraft/class_310; + FIELD field_44657 matrices Lnet/minecraft/class_4587; + FIELD field_44658 vertexConsumers Lnet/minecraft/class_4597$class_4598; + FIELD field_44659 scissorStack Lnet/minecraft/class_332$class_8214; + FIELD field_44797 runningDrawCallback Z + FIELD field_45337 guiAtlasManager Lnet/minecraft/class_8658; + METHOD (Lnet/minecraft/class_310;Lnet/minecraft/class_4587;Lnet/minecraft/class_4597$class_4598;)V + ARG 1 client + ARG 2 matrices + ARG 3 vertexConsumers + METHOD (Lnet/minecraft/class_310;Lnet/minecraft/class_4597$class_4598;)V + ARG 1 client + ARG 2 vertexConsumers + METHOD method_25290 drawTexture (Lnet/minecraft/class_2960;IIFFIIII)V + COMMENT Draws a textured rectangle from a region in a texture. + COMMENT + COMMENT

The width and height of the region are the same as + COMMENT the dimensions of the rectangle. + ARG 1 texture + ARG 2 x + ARG 3 y + ARG 4 u + ARG 5 v + ARG 6 width + ARG 7 height + ARG 8 textureWidth + ARG 9 textureHeight + METHOD method_25291 drawTexture (Lnet/minecraft/class_2960;IIIFFIIII)V + COMMENT Draws a textured rectangle from a region in a texture. + COMMENT + COMMENT

The width and height of the region are the same as + COMMENT the dimensions of the rectangle. + ARG 1 texture + ARG 2 x + ARG 3 y + ARG 4 z + ARG 5 u + ARG 6 v + ARG 7 width + ARG 8 height + ARG 9 textureWidth + ARG 10 textureHeight + METHOD method_25292 drawHorizontalLine (IIII)V + ARG 1 x1 + ARG 2 x2 + ARG 3 y + ARG 4 color + METHOD method_25293 drawTexture (Lnet/minecraft/class_2960;IIIIFFIIII)V + COMMENT Draws a textured rectangle from a region in a texture. + ARG 1 texture + ARG 2 x + ARG 3 y + ARG 4 width + ARG 5 height + ARG 6 u + ARG 7 v + ARG 8 regionWidth + ARG 9 regionHeight + ARG 10 textureWidth + ARG 11 textureHeight + METHOD method_25294 fill (IIIII)V + ARG 1 x1 + ARG 2 y1 + ARG 3 x2 + ARG 4 y2 + ARG 5 color + METHOD method_25295 drawTexturedQuad (Lnet/minecraft/class_2960;IIIIIFFFF)V + ARG 1 texture + ARG 2 x1 + ARG 3 x2 + ARG 4 y1 + ARG 5 y2 + ARG 6 z + ARG 7 u1 + ARG 8 u2 + ARG 9 v1 + ARG 10 v2 + METHOD method_25296 fillGradient (IIIIII)V + ARG 1 startX + ARG 2 startY + ARG 3 endX + ARG 4 endY + ARG 5 colorStart + ARG 6 colorEnd + METHOD method_25297 drawTexture (Lnet/minecraft/class_2960;IIIIIIIFFII)V + ARG 1 texture + ARG 2 x1 + ARG 3 x2 + ARG 4 y1 + ARG 5 y2 + ARG 6 z + ARG 7 regionWidth + ARG 8 regionHeight + ARG 9 u + ARG 10 v + ARG 11 textureWidth + ARG 12 textureHeight + METHOD method_25298 drawSprite (IIIIILnet/minecraft/class_1058;)V + ARG 1 x + ARG 2 y + ARG 3 z + ARG 4 width + ARG 5 height + ARG 6 sprite + METHOD method_25300 drawCenteredTextWithShadow (Lnet/minecraft/class_327;Ljava/lang/String;III)V + ARG 1 textRenderer + ARG 2 text + ARG 3 centerX + ARG 4 y + ARG 5 color + METHOD method_25301 drawVerticalLine (IIII)V + ARG 1 x + ARG 2 y1 + ARG 3 y2 + ARG 4 color + METHOD method_25302 drawTexture (Lnet/minecraft/class_2960;IIIIII)V + COMMENT Draws a textured rectangle from a region in a 256x256 texture. + COMMENT + COMMENT

The Z coordinate of the rectangle is {@code 0}. + COMMENT + COMMENT

The width and height of the region are the same as + COMMENT the dimensions of the rectangle. + ARG 1 texture + ARG 2 x + ARG 3 y + ARG 4 u + ARG 5 v + ARG 6 width + ARG 7 height + METHOD method_25303 drawTextWithShadow (Lnet/minecraft/class_327;Ljava/lang/String;III)I + ARG 1 textRenderer + ARG 2 text + ARG 3 x + ARG 4 y + ARG 5 color + METHOD method_27533 fillGradient (Lnet/minecraft/class_4588;IIIIIII)V + ARG 1 vertexConsumer + ARG 2 startX + ARG 3 startY + ARG 4 endX + ARG 5 endY + ARG 6 z + ARG 7 colorStart + ARG 8 colorEnd + METHOD method_27534 drawCenteredTextWithShadow (Lnet/minecraft/class_327;Lnet/minecraft/class_2561;III)V + ARG 1 textRenderer + ARG 2 text + ARG 3 centerX + ARG 4 y + ARG 5 color + METHOD method_27535 drawTextWithShadow (Lnet/minecraft/class_327;Lnet/minecraft/class_2561;III)I + ARG 1 textRenderer + ARG 2 text + ARG 3 x + ARG 4 y + ARG 5 color + METHOD method_33284 fillGradient (IIIIIII)V + ARG 1 startX + ARG 2 startY + ARG 3 endX + ARG 4 endY + ARG 5 z + ARG 6 colorStart + ARG 7 colorEnd + METHOD method_35719 drawCenteredTextWithShadow (Lnet/minecraft/class_327;Lnet/minecraft/class_5481;III)V + ARG 1 textRenderer + ARG 2 text + ARG 3 centerX + ARG 4 y + ARG 5 color + METHOD method_35720 drawTextWithShadow (Lnet/minecraft/class_327;Lnet/minecraft/class_5481;III)I + ARG 1 textRenderer + ARG 2 text + ARG 3 x + ARG 4 y + ARG 5 color + METHOD method_44379 enableScissor (IIII)V + ARG 1 x1 + ARG 2 y1 + ARG 3 x2 + ARG 4 y2 + METHOD method_44380 disableScissor ()V + METHOD method_48196 fill (Lnet/minecraft/class_1921;IIIIII)V + ARG 1 layer + ARG 2 x1 + ARG 3 y1 + ARG 4 x2 + ARG 5 y2 + ARG 6 z + ARG 7 color + METHOD method_48465 drawSprite (IIIIILnet/minecraft/class_1058;FFFF)V + ARG 1 x + ARG 2 y + ARG 3 z + ARG 4 width + ARG 5 height + ARG 6 sprite + ARG 7 red + ARG 8 green + ARG 9 blue + ARG 10 alpha + METHOD method_48466 drawTexturedQuad (Lnet/minecraft/class_2960;IIIIIFFFFFFFF)V + ARG 1 texture + ARG 2 x1 + ARG 3 x2 + ARG 4 y1 + ARG 5 y2 + ARG 6 z + ARG 7 u1 + ARG 8 u2 + ARG 9 v1 + ARG 10 v2 + ARG 11 red + ARG 12 green + ARG 13 blue + ARG 14 alpha + METHOD method_49601 drawBorder (IIIII)V + ARG 1 x + ARG 2 y + ARG 3 width + ARG 4 height + ARG 5 color + METHOD method_49698 setScissor (Lnet/minecraft/class_8030;)V + ARG 1 rect + METHOD method_51421 getScaledWindowWidth ()I + METHOD method_51422 setShaderColor (FFFF)V + ARG 1 red + ARG 2 green + ARG 3 blue + ARG 4 alpha + METHOD method_51423 drawItem (Lnet/minecraft/class_1309;Lnet/minecraft/class_1799;III)V + ARG 1 entity + ARG 2 stack + ARG 3 x + ARG 4 y + ARG 5 seed + METHOD method_51424 drawItem (Lnet/minecraft/class_1309;Lnet/minecraft/class_1937;Lnet/minecraft/class_1799;III)V + ARG 1 entity + ARG 2 world + ARG 3 stack + ARG 4 x + ARG 5 y + ARG 6 seed + METHOD method_51425 drawItem (Lnet/minecraft/class_1309;Lnet/minecraft/class_1937;Lnet/minecraft/class_1799;IIII)V + ARG 1 entity + ARG 2 world + ARG 3 stack + ARG 4 x + ARG 5 y + ARG 6 seed + ARG 7 z + METHOD method_51427 drawItem (Lnet/minecraft/class_1799;II)V + ARG 1 item + ARG 2 x + ARG 3 y + METHOD method_51428 drawItem (Lnet/minecraft/class_1799;III)V + ARG 1 stack + ARG 2 x + ARG 3 y + ARG 4 seed + METHOD method_51429 drawItem (Lnet/minecraft/class_1799;IIII)V + ARG 1 stack + ARG 2 x + ARG 3 y + ARG 4 seed + ARG 5 z + METHOD method_51430 drawText (Lnet/minecraft/class_327;Lnet/minecraft/class_5481;IIIZ)I + ARG 1 textRenderer + ARG 2 text + ARG 3 x + ARG 4 y + ARG 5 color + ARG 6 shadow + METHOD method_51431 drawItemInSlot (Lnet/minecraft/class_327;Lnet/minecraft/class_1799;II)V + ARG 1 textRenderer + ARG 2 stack + ARG 3 x + ARG 4 y + METHOD method_51432 drawItemInSlot (Lnet/minecraft/class_327;Lnet/minecraft/class_1799;IILjava/lang/String;)V + ARG 1 textRenderer + ARG 2 stack + ARG 3 x + ARG 4 y + ARG 5 countOverride + METHOD method_51433 drawText (Lnet/minecraft/class_327;Ljava/lang/String;IIIZ)I + ARG 1 textRenderer + ARG 2 text + ARG 3 x + ARG 4 y + ARG 5 color + ARG 6 shadow + METHOD method_51434 drawTooltip (Lnet/minecraft/class_327;Ljava/util/List;II)V + ARG 1 textRenderer + ARG 2 text + ARG 3 x + ARG 4 y + METHOD method_51435 drawTooltip (Lnet/minecraft/class_327;Ljava/util/List;IILnet/minecraft/class_8000;)V + ARG 1 textRenderer + ARG 2 components + ARG 3 x + ARG 4 y + ARG 5 positioner + METHOD method_51436 drawTooltip (Lnet/minecraft/class_327;Ljava/util/List;Lnet/minecraft/class_8000;II)V + ARG 1 textRenderer + ARG 2 text + ARG 3 positioner + ARG 4 x + ARG 5 y + METHOD method_51437 drawTooltip (Lnet/minecraft/class_327;Ljava/util/List;Ljava/util/Optional;II)V + ARG 1 textRenderer + ARG 2 text + ARG 3 data + ARG 4 x + ARG 5 y + METHOD method_51438 drawTooltip (Lnet/minecraft/class_327;Lnet/minecraft/class_2561;II)V + ARG 1 textRenderer + ARG 2 text + ARG 3 x + ARG 4 y + METHOD method_51439 drawText (Lnet/minecraft/class_327;Lnet/minecraft/class_2561;IIIZ)I + ARG 1 textRenderer + ARG 2 text + ARG 3 x + ARG 4 y + ARG 5 color + ARG 6 shadow + METHOD method_51440 drawTextWrapped (Lnet/minecraft/class_327;Lnet/minecraft/class_5348;IIII)V + ARG 1 textRenderer + ARG 2 text + ARG 3 x + ARG 4 y + ARG 5 width + ARG 6 color + METHOD method_51441 drawHoverEvent (Lnet/minecraft/class_327;Lnet/minecraft/class_2583;II)V + ARG 1 textRenderer + ARG 2 style + ARG 3 x + ARG 4 y + METHOD method_51442 (Ljava/util/List;Lnet/minecraft/class_5632;)V + ARG 1 data + METHOD method_51443 getScaledWindowHeight ()I + METHOD method_51445 drawItemWithoutEntity (Lnet/minecraft/class_1799;II)V + ARG 1 stack + ARG 2 x + ARG 3 y + METHOD method_51446 drawItemTooltip (Lnet/minecraft/class_327;Lnet/minecraft/class_1799;II)V + ARG 1 textRenderer + ARG 2 stack + ARG 3 x + ARG 4 y + METHOD method_51447 drawOrderedTooltip (Lnet/minecraft/class_327;Ljava/util/List;II)V + ARG 1 textRenderer + ARG 2 text + ARG 3 x + ARG 4 y + METHOD method_51448 getMatrices ()Lnet/minecraft/class_4587; + METHOD method_51450 getVertexConsumers ()Lnet/minecraft/class_4597$class_4598; + METHOD method_51452 draw ()V + METHOD method_51737 fill (IIIIII)V + ARG 1 x1 + ARG 2 y1 + ARG 3 x2 + ARG 4 y2 + ARG 5 z + ARG 6 color + METHOD method_51738 drawHorizontalLine (Lnet/minecraft/class_1921;IIII)V + ARG 1 layer + ARG 2 x1 + ARG 3 x2 + ARG 4 y + ARG 5 color + METHOD method_51739 fill (Lnet/minecraft/class_1921;IIIII)V + ARG 1 layer + ARG 2 x1 + ARG 3 y1 + ARG 4 x2 + ARG 5 y2 + ARG 6 color + METHOD method_51740 fillGradient (Lnet/minecraft/class_1921;IIIIIII)V + ARG 1 layer + ARG 2 startX + ARG 3 startY + ARG 4 endX + ARG 5 endY + ARG 6 colorStart + ARG 7 colorEnd + ARG 8 z + METHOD method_51741 draw (Ljava/lang/Runnable;)V + ARG 1 drawCallback + METHOD method_51742 drawVerticalLine (Lnet/minecraft/class_1921;IIII)V + ARG 1 layer + ARG 2 x + ARG 3 y1 + ARG 4 y2 + ARG 5 color + METHOD method_51744 tryDraw ()V + METHOD method_51887 drawIfRunning ()V + METHOD method_52706 drawGuiTexture (Lnet/minecraft/class_2960;IIII)V + ARG 1 texture + ARG 2 x + ARG 3 y + ARG 4 width + ARG 5 height + METHOD method_52707 drawGuiTexture (Lnet/minecraft/class_2960;IIIII)V + ARG 1 texture + ARG 2 x + ARG 3 y + ARG 4 z + ARG 5 width + ARG 6 height + METHOD method_52708 drawGuiTexture (Lnet/minecraft/class_2960;IIIIIIII)V + ARG 1 texture + ARG 6 x + ARG 7 y + ARG 8 width + ARG 9 height + METHOD method_52709 drawGuiTexture (Lnet/minecraft/class_2960;IIIIIIIII)V + ARG 1 texture + ARG 6 x + ARG 7 y + ARG 8 z + ARG 9 width + ARG 10 height + METHOD method_52710 drawSprite (Lnet/minecraft/class_1058;IIIII)V + ARG 1 sprite + ARG 2 x + ARG 3 y + ARG 4 z + ARG 5 width + ARG 6 height + METHOD method_52711 drawSprite (Lnet/minecraft/class_1058;IIIIIIIII)V + ARG 1 sprite + ARG 6 x + ARG 7 y + ARG 8 z + ARG 9 width + ARG 10 height + METHOD method_52712 drawSpriteTiled (Lnet/minecraft/class_1058;IIIIIIIIIII)V + ARG 1 sprite + ARG 2 x + ARG 3 y + ARG 4 z + ARG 5 width + ARG 6 height + ARG 9 tileWidth + ARG 10 tileHeight + METHOD method_52713 drawSprite (Lnet/minecraft/class_1058;Lnet/minecraft/class_8690$class_8691;IIIII)V + ARG 1 sprite + ARG 2 nineSlice + ARG 3 x + ARG 4 y + ARG 5 z + ARG 6 width + ARG 7 height + CLASS class_8214 ScissorStack + FIELD field_43099 stack Ljava/util/Deque; + METHOD method_49699 pop ()Lnet/minecraft/class_8030; + METHOD method_49700 push (Lnet/minecraft/class_8030;)Lnet/minecraft/class_8030; + ARG 1 rect diff --git a/mappings/net/minecraft/client/gui/Drawable.mapping b/mappings/net/minecraft/client/gui/Drawable.mapping index fa3c5273a2..f6b68e1815 100644 --- a/mappings/net/minecraft/client/gui/Drawable.mapping +++ b/mappings/net/minecraft/client/gui/Drawable.mapping @@ -1,6 +1,6 @@ CLASS net/minecraft/class_4068 net/minecraft/client/gui/Drawable - METHOD method_25394 render (Lnet/minecraft/class_4587;IIF)V - ARG 1 matrices + METHOD method_25394 render (Lnet/minecraft/class_332;IIF)V + ARG 1 context ARG 2 mouseX ARG 3 mouseY ARG 4 delta diff --git a/mappings/net/minecraft/client/gui/DrawableHelper.mapping b/mappings/net/minecraft/client/gui/DrawableHelper.mapping deleted file mode 100644 index a0145e0c8f..0000000000 --- a/mappings/net/minecraft/client/gui/DrawableHelper.mapping +++ /dev/null @@ -1,243 +0,0 @@ -CLASS net/minecraft/class_332 net/minecraft/client/gui/DrawableHelper - FIELD field_22734 zOffset I - COMMENT The z offset used by {@link DrawableHelper}. - FIELD field_22735 OPTIONS_BACKGROUND_TEXTURE Lnet/minecraft/class_2960; - COMMENT The texture used by options for background. - FIELD field_22736 STATS_ICON_TEXTURE Lnet/minecraft/class_2960; - COMMENT The texture of icons used in the stats screen. - FIELD field_22737 GUI_ICONS_TEXTURE Lnet/minecraft/class_2960; - COMMENT The texture of various icons and widgets used for rendering ingame indicators. - METHOD method_25290 drawTexture (Lnet/minecraft/class_4587;IIFFIIII)V - COMMENT Draws a textured rectangle from a region in a texture. - COMMENT - COMMENT

The width and height of the region are the same as - COMMENT the dimensions of the rectangle. - ARG 0 matrices - COMMENT the matrix stack used for rendering - ARG 1 x - COMMENT the X coordinate of the rectangle - ARG 2 y - COMMENT the Y coordinate of the rectangle - ARG 3 u - COMMENT the left-most coordinate of the texture region - ARG 4 v - COMMENT the top-most coordinate of the texture region - ARG 5 width - COMMENT the width of the rectangle - ARG 6 height - COMMENT the height of the rectangle - ARG 7 textureWidth - COMMENT the width of the entire texture - ARG 8 textureHeight - COMMENT the height of the entire texture - METHOD method_25291 drawTexture (Lnet/minecraft/class_4587;IIIFFIIII)V - COMMENT Draws a textured rectangle from a region in a texture. - COMMENT - COMMENT

The width and height of the region are the same as - COMMENT the dimensions of the rectangle. - ARG 0 matrices - COMMENT the matrix stack used for rendering - ARG 1 x - COMMENT the X coordinate of the rectangle - ARG 2 y - COMMENT the Y coordinate of the rectangle - ARG 3 z - COMMENT the Z coordinate of the rectangle - ARG 4 u - COMMENT the left-most coordinate of the texture region - ARG 5 v - COMMENT the top-most coordinate of the texture region - ARG 6 width - COMMENT the width of the rectangle - ARG 7 height - COMMENT the height of the rectangle - ARG 8 textureWidth - COMMENT the width of the entire texture - ARG 9 textureHeight - COMMENT the height of the entire texture - METHOD method_25292 drawHorizontalLine (Lnet/minecraft/class_4587;IIII)V - ARG 1 matrices - ARG 2 x1 - ARG 3 x2 - ARG 4 y - ARG 5 color - METHOD method_25293 drawTexture (Lnet/minecraft/class_4587;IIIIFFIIII)V - COMMENT Draws a textured rectangle from a region in a texture. - ARG 0 matrices - COMMENT the matrix stack used for rendering - ARG 1 x - COMMENT the X coordinate of the rectangle - ARG 2 y - COMMENT the Y coordinate of the rectangle - ARG 3 width - COMMENT the width of the rectangle - ARG 4 height - COMMENT the height of the rectangle - ARG 5 u - COMMENT the left-most coordinate of the texture region - ARG 6 v - COMMENT the top-most coordinate of the texture region - ARG 7 regionWidth - COMMENT the width of the texture region - ARG 8 regionHeight - COMMENT the height of the texture region - ARG 9 textureWidth - COMMENT the width of the entire texture - ARG 10 textureHeight - COMMENT the height of the entire texture - METHOD method_25294 fill (Lnet/minecraft/class_4587;IIIII)V - ARG 0 matrices - ARG 1 x1 - ARG 2 y1 - ARG 3 x2 - ARG 4 y2 - ARG 5 color - METHOD method_25295 drawTexturedQuad (Lnet/minecraft/class_1159;IIIIIFFFF)V - ARG 0 matrix - ARG 1 x0 - ARG 2 x1 - ARG 3 y0 - ARG 4 y1 - ARG 5 z - ARG 6 u0 - ARG 7 u1 - ARG 8 v0 - ARG 9 v1 - METHOD method_25296 fillGradient (Lnet/minecraft/class_4587;IIIIII)V - ARG 1 matrices - 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 - ARG 0 matrices - ARG 1 x0 - ARG 2 x1 - ARG 3 y0 - ARG 4 y1 - ARG 5 z - ARG 6 regionWidth - ARG 7 regionHeight - ARG 8 u - ARG 9 v - ARG 10 textureWidth - ARG 11 textureHeight - METHOD method_25298 drawSprite (Lnet/minecraft/class_4587;IIIIILnet/minecraft/class_1058;)V - ARG 0 matrices - ARG 1 x - ARG 2 y - ARG 3 z - ARG 4 width - ARG 5 height - ARG 6 sprite - METHOD method_25299 fill (Lnet/minecraft/class_1159;IIIII)V - ARG 0 matrix - ARG 1 x1 - ARG 2 y1 - ARG 3 x2 - ARG 4 y2 - ARG 5 color - 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 - ARG 3 centerX - ARG 4 y - ARG 5 color - METHOD method_25301 drawVerticalLine (Lnet/minecraft/class_4587;IIII)V - ARG 1 matrices - ARG 2 x - ARG 3 y1 - ARG 4 y2 - ARG 5 color - METHOD method_25302 drawTexture (Lnet/minecraft/class_4587;IIIIII)V - COMMENT Draws a textured rectangle from a region in a 256x256 texture. - COMMENT - COMMENT

The Z coordinate of the rectangle is {@link #zOffset}. - COMMENT - COMMENT

The width and height of the region are the same as - COMMENT the dimensions of the rectangle. - ARG 1 matrices - COMMENT the matrix stack used for rendering - ARG 2 x - COMMENT the X coordinate of the rectangle - ARG 3 y - COMMENT the Y coordinate of the rectangle - ARG 4 u - COMMENT the left-most coordinate of the texture region - ARG 5 v - COMMENT the top-most coordinate of the texture region - ARG 6 width - COMMENT the width - ARG 7 height - COMMENT the height - METHOD method_25303 drawStringWithShadow (Lnet/minecraft/class_4587;Lnet/minecraft/class_327;Ljava/lang/String;III)V - ARG 0 matrices - ARG 1 textRenderer - ARG 2 text - ARG 3 x - ARG 4 y - ARG 5 color - METHOD method_25304 setZOffset (I)V - ARG 1 zOffset - METHOD method_25305 getZOffset ()I - METHOD method_27533 fillGradient (Lnet/minecraft/class_1159;Lnet/minecraft/class_287;IIIIIII)V - ARG 0 matrix - ARG 1 builder - ARG 2 startX - ARG 3 startY - ARG 4 endX - ARG 5 endY - ARG 6 z - ARG 7 colorStart - ARG 8 colorEnd - METHOD method_27534 drawCenteredText (Lnet/minecraft/class_4587;Lnet/minecraft/class_327;Lnet/minecraft/class_2561;III)V - ARG 0 matrices - ARG 1 textRenderer - ARG 2 text - ARG 3 centerX - ARG 4 y - ARG 5 color - METHOD method_27535 drawTextWithShadow (Lnet/minecraft/class_4587;Lnet/minecraft/class_327;Lnet/minecraft/class_2561;III)V - ARG 0 matrices - ARG 1 textRenderer - ARG 2 text - ARG 3 x - ARG 4 y - ARG 5 color - METHOD method_29343 drawWithOutline (IILjava/util/function/BiConsumer;)V - ARG 1 x - ARG 2 y - ARG 3 renderAction - COMMENT the action to render both the content and the outline, taking x and y positions as input - METHOD method_33284 fillGradient (Lnet/minecraft/class_4587;IIIIIII)V - ARG 0 matrices - ARG 1 startX - ARG 2 startY - ARG 3 endX - ARG 4 endY - ARG 5 colorStart - ARG 6 colorEnd - ARG 7 z - METHOD method_35719 drawCenteredTextWithShadow (Lnet/minecraft/class_4587;Lnet/minecraft/class_327;Lnet/minecraft/class_5481;III)V - ARG 0 matrices - ARG 1 textRenderer - ARG 2 text - ARG 3 centerX - ARG 4 y - ARG 5 color - METHOD method_35720 drawWithShadow (Lnet/minecraft/class_4587;Lnet/minecraft/class_327;Lnet/minecraft/class_5481;III)V - ARG 0 matrices - ARG 1 textRenderer - ARG 2 text - ARG 3 x - ARG 4 y - ARG 5 color - METHOD method_44379 enableScissor (IIII)V - ARG 0 x1 - ARG 1 y1 - ARG 2 x2 - ARG 3 y2 - METHOD method_44380 disableScissor ()V diff --git a/mappings/net/minecraft/client/gui/Element.mapping b/mappings/net/minecraft/client/gui/Element.mapping index 84835ee49f..11224391fd 100644 --- a/mappings/net/minecraft/client/gui/Element.mapping +++ b/mappings/net/minecraft/client/gui/Element.mapping @@ -29,6 +29,9 @@ CLASS net/minecraft/class_364 net/minecraft/client/gui/Element 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 GLFW Modifier key flags) + METHOD method_25365 setFocused (Z)V + ARG 1 focused + METHOD method_25370 isFocused ()Z METHOD method_25400 charTyped (CI)Z COMMENT Callback for when a character input has been captured. COMMENT @@ -43,7 +46,7 @@ CLASS net/minecraft/class_364 net/minecraft/client/gui/Element COMMENT the captured character ARG 2 modifiers COMMENT a GLFW bitfield describing the modifier keys that are held down (see GLFW Modifier key flags) - METHOD method_25401 mouseScrolled (DDD)Z + METHOD method_25401 mouseScrolled (DDDD)Z COMMENT Callback for when a mouse button scroll event COMMENT has been captured. COMMENT @@ -53,8 +56,10 @@ CLASS net/minecraft/class_364 net/minecraft/client/gui/Element COMMENT the X coordinate of the mouse ARG 3 mouseY COMMENT the Y coordinate of the mouse - ARG 5 amount - COMMENT value is {@code < 0} if scrolled down, {@code > 0} if scrolled up + ARG 5 horizontalAmount + COMMENT the horizontal scroll amount + ARG 7 verticalAmount + COMMENT the vertical scroll amount METHOD method_25402 mouseClicked (DDI)Z COMMENT Callback for when a mouse button down event COMMENT has been captured. @@ -132,12 +137,7 @@ CLASS net/minecraft/class_364 net/minecraft/client/gui/Element COMMENT the Y coordinate of the mouse ARG 5 button COMMENT the mouse button number - METHOD method_25407 changeFocus (Z)Z - COMMENT Changes the focusing element by cycling to the next/previous element. - COMMENT - COMMENT This action is done typically when the user has pressed the 'Tab' or 'Ctrl+Tab' - COMMENT key. - COMMENT - COMMENT @return {@code true} to indicate that the event handling is successful/valid - ARG 1 lookForwards - COMMENT {@code true} to cycle forwards, otherwise cycle backwards + METHOD method_48202 getNavigationFocus ()Lnet/minecraft/class_8030; + METHOD method_48205 getNavigationPath (Lnet/minecraft/class_8023;)Lnet/minecraft/class_8016; + ARG 1 navigation + METHOD method_48218 getFocusedPath ()Lnet/minecraft/class_8016; diff --git a/mappings/net/minecraft/client/gui/LogoDrawer.mapping b/mappings/net/minecraft/client/gui/LogoDrawer.mapping new file mode 100644 index 0000000000..e6886f1bd9 --- /dev/null +++ b/mappings/net/minecraft/client/gui/LogoDrawer.mapping @@ -0,0 +1,27 @@ +CLASS net/minecraft/class_8020 net/minecraft/client/gui/LogoDrawer + FIELD field_41805 LOGO_TEXTURE Lnet/minecraft/class_2960; + FIELD field_41806 EDITION_TEXTURE Lnet/minecraft/class_2960; + FIELD field_41807 LOGO_REGION_WIDTH I + FIELD field_41808 LOGO_REGION_HEIGHT I + FIELD field_41809 LOGO_BASE_Y I + FIELD field_41810 minceraft Z + FIELD field_41811 ignoreAlpha Z + FIELD field_44540 MINCERAFT_TEXTURE Lnet/minecraft/class_2960; + FIELD field_44541 LOGO_TEXTURE_WIDTH I + FIELD field_44542 LOGO_TEXTURE_HEIGHT I + FIELD field_44543 EDITION_REGION_WIDTH I + FIELD field_44544 EDITION_REGION_HEIGHT I + FIELD field_44545 EDITION_TEXTURE_WIDTH I + FIELD field_44546 EDITION_TEXTURE_HEIGHT I + FIELD field_44547 LOGO_AND_EDITION_OVERLAP I + METHOD (Z)V + ARG 1 ignoreAlpha + METHOD method_48209 draw (Lnet/minecraft/class_332;IF)V + ARG 1 context + ARG 2 screenWidth + ARG 3 alpha + METHOD method_48210 draw (Lnet/minecraft/class_332;IFI)V + ARG 1 context + ARG 2 screenWidth + ARG 3 alpha + ARG 4 y diff --git a/mappings/net/minecraft/client/gui/ParentElement.mapping b/mappings/net/minecraft/client/gui/ParentElement.mapping index d34ba9e9f0..95ff0d49a9 100644 --- a/mappings/net/minecraft/client/gui/ParentElement.mapping +++ b/mappings/net/minecraft/client/gui/ParentElement.mapping @@ -4,12 +4,10 @@ CLASS net/minecraft/class_4069 net/minecraft/client/gui/ParentElement METHOD method_19355 hoveredElement (DD)Ljava/util/Optional; ARG 1 mouseX ARG 3 mouseY - METHOD method_20082 (DDDLnet/minecraft/class_364;)Z - ARG 6 element + METHOD method_20082 (DDDDLnet/minecraft/class_364;)Z + ARG 8 element METHOD method_20083 (DDILnet/minecraft/class_364;)Z ARG 5 element - METHOD method_20085 setInitialFocus (Lnet/minecraft/class_364;)V - ARG 1 element METHOD method_20086 focusOn (Lnet/minecraft/class_364;)V ARG 1 element METHOD method_25395 setFocused (Lnet/minecraft/class_364;)V @@ -20,3 +18,21 @@ CLASS net/minecraft/class_4069 net/minecraft/client/gui/ParentElement METHOD method_25398 setDragging (Z)V ARG 1 dragging METHOD method_25399 getFocused ()Lnet/minecraft/class_364; + METHOD method_48214 computeNavigationPath (Lnet/minecraft/class_8023$class_8024;)Lnet/minecraft/class_8016; + ARG 1 navigation + METHOD method_48215 computeNavigationPath (Lnet/minecraft/class_8023$class_8026;)Lnet/minecraft/class_8016; + ARG 1 navigation + METHOD method_48216 (Lnet/minecraft/class_8028;Lnet/minecraft/class_364;)Ljava/lang/Integer; + ARG 1 element + METHOD method_48217 computeChildPath (Lnet/minecraft/class_8030;Lnet/minecraft/class_8028;Lnet/minecraft/class_364;Lnet/minecraft/class_8023;)Lnet/minecraft/class_8016; + ARG 1 focus + ARG 2 direction + ARG 3 focused + ARG 4 navigation + METHOD method_48219 (Lnet/minecraft/class_8028;Lnet/minecraft/class_364;)Ljava/lang/Integer; + ARG 1 element + METHOD method_48220 computeInitialChildPath (Lnet/minecraft/class_8030;Lnet/minecraft/class_8028;Lnet/minecraft/class_364;Lnet/minecraft/class_8023;)Lnet/minecraft/class_8016; + ARG 1 focus + ARG 2 direction + ARG 3 focused + ARG 4 navigation diff --git a/mappings/net/minecraft/client/gui/PlayerSkinDrawer.mapping b/mappings/net/minecraft/client/gui/PlayerSkinDrawer.mapping index 8c5e444b33..5b0a084683 100644 --- a/mappings/net/minecraft/client/gui/PlayerSkinDrawer.mapping +++ b/mappings/net/minecraft/client/gui/PlayerSkinDrawer.mapping @@ -1,28 +1,39 @@ CLASS net/minecraft/class_7532 net/minecraft/client/gui/PlayerSkinDrawer COMMENT Helper class for drawing a player's head on GUI. - METHOD method_44443 draw (Lnet/minecraft/class_4587;III)V - COMMENT Draws the player's head (including the hat) on GUI. The skin texture must be - COMMENT specified prior to calling by using {@link - COMMENT com.mojang.blaze3d.systems.RenderSystem#setShaderTexture(int, net.minecraft.util.Identifier)}. - ARG 0 matrices - ARG 1 x - ARG 2 y - ARG 3 size - METHOD method_44444 drawHat (Lnet/minecraft/class_4587;IIIZ)V - ARG 0 matrices - ARG 1 x - ARG 2 y - ARG 3 size - ARG 4 upsideDown - METHOD method_44445 draw (Lnet/minecraft/class_4587;IIIZZ)V - COMMENT Draws the player's head on GUI. The skin texture must be specified prior to - COMMENT calling by using {@link - COMMENT com.mojang.blaze3d.systems.RenderSystem#setShaderTexture(int, net.minecraft.util.Identifier)}. - ARG 0 matrices - ARG 1 x - ARG 2 y - ARG 3 size - ARG 4 hatVisible - COMMENT whether the hat should be drawn + FIELD field_39525 FACE_WIDTH I + FIELD field_39526 FACE_HEIGHT I + FIELD field_39527 FACE_X I + FIELD field_39528 FACE_Y I + FIELD field_39529 FACE_OVERLAY_X I + FIELD field_39530 FACE_OVERLAY_Y I + FIELD field_39533 SKIN_TEXTURE_WIDTH I + FIELD field_39534 SKIN_TEXTURE_HEIGHT I + METHOD method_44443 draw (Lnet/minecraft/class_332;Lnet/minecraft/class_2960;III)V + COMMENT Draws the player's head (including the hat) on GUI. + ARG 0 context + ARG 1 texture + ARG 2 x + ARG 3 y + ARG 4 size + METHOD method_44444 drawHat (Lnet/minecraft/class_332;Lnet/minecraft/class_2960;IIIZ)V + ARG 0 context + ARG 1 texture + ARG 2 x + ARG 3 y + ARG 4 size ARG 5 upsideDown - COMMENT whether the head should be upside down, also known as "Dinnerbone" + METHOD method_44445 draw (Lnet/minecraft/class_332;Lnet/minecraft/class_2960;IIIZZ)V + COMMENT Draws the player's head on GUI. + ARG 0 context + ARG 1 texture + ARG 2 x + ARG 3 y + ARG 4 size + ARG 5 hatVisible + ARG 6 upsideDown + METHOD method_52722 draw (Lnet/minecraft/class_332;Lnet/minecraft/class_8685;III)V + ARG 0 context + ARG 1 textures + ARG 2 x + ARG 3 y + ARG 4 size diff --git a/mappings/net/minecraft/client/gui/RotatingCubeMapRenderer.mapping b/mappings/net/minecraft/client/gui/RotatingCubeMapRenderer.mapping index 6d077df658..82151a3f11 100644 --- a/mappings/net/minecraft/client/gui/RotatingCubeMapRenderer.mapping +++ b/mappings/net/minecraft/client/gui/RotatingCubeMapRenderer.mapping @@ -1,9 +1,13 @@ CLASS net/minecraft/class_766 net/minecraft/client/gui/RotatingCubeMapRenderer + FIELD field_40510 pitch F + FIELD field_40511 yaw F FIELD field_4139 client Lnet/minecraft/class_310; - FIELD field_4140 time F FIELD field_4141 cubeMap Lnet/minecraft/class_751; METHOD (Lnet/minecraft/class_751;)V ARG 1 cubeMap METHOD method_3317 render (FF)V ARG 1 delta ARG 2 alpha + METHOD method_45780 wrapOnce (FF)F + ARG 0 a + ARG 1 b diff --git a/mappings/net/minecraft/client/gui/ScreenPos.mapping b/mappings/net/minecraft/client/gui/ScreenPos.mapping new file mode 100644 index 0000000000..dae2eeecb7 --- /dev/null +++ b/mappings/net/minecraft/client/gui/ScreenPos.mapping @@ -0,0 +1,10 @@ +CLASS net/minecraft/class_8029 net/minecraft/client/gui/ScreenPos + COMMENT Represents the position of a {@link ScreenRect}. + METHOD method_48245 getComponent (Lnet/minecraft/class_8027;)I + ARG 1 axis + METHOD method_48246 of (Lnet/minecraft/class_8027;II)Lnet/minecraft/class_8029; + ARG 0 axis + ARG 1 sameAxis + ARG 2 otherAxis + METHOD method_48247 add (Lnet/minecraft/class_8028;)Lnet/minecraft/class_8029; + ARG 1 direction diff --git a/mappings/net/minecraft/client/gui/ScreenRect.mapping b/mappings/net/minecraft/client/gui/ScreenRect.mapping new file mode 100644 index 0000000000..c3cfa10fc6 --- /dev/null +++ b/mappings/net/minecraft/client/gui/ScreenRect.mapping @@ -0,0 +1,53 @@ +CLASS net/minecraft/class_8030 net/minecraft/client/gui/ScreenRect + COMMENT A rectangle on the screen. + FIELD field_41835 EMPTY Lnet/minecraft/class_8030; + METHOD (IIII)V + ARG 1 sameAxis + ARG 2 otherAxis + ARG 3 width + ARG 4 height + METHOD method_48248 empty ()Lnet/minecraft/class_8030; + COMMENT {@return an empty rect} + METHOD method_48249 getLength (Lnet/minecraft/class_8027;)I + COMMENT {@return the length of the rect in the given {@code axis}} + ARG 1 axis + METHOD method_48250 of (Lnet/minecraft/class_8027;IIII)Lnet/minecraft/class_8030; + COMMENT {@return a new rect} + ARG 0 axis + ARG 1 sameAxisCoord + COMMENT the coordinate of the {@code axis} axis + ARG 2 otherAxisCoord + COMMENT the coordinate of the {@code axis}'s other axis + ARG 3 sameAxisLength + COMMENT the length of the edge whose axis is the same as {@code axis} + ARG 4 otherAxisLength + COMMENT the length of the edge whose axis is different from {@code axis} + METHOD method_48251 add (Lnet/minecraft/class_8028;)Lnet/minecraft/class_8030; + COMMENT {@return a new rect of the same dimensions with the position incremented} + ARG 1 direction + METHOD method_48252 overlaps (Lnet/minecraft/class_8030;)Z + COMMENT {@return whether this rect overlaps with {@code rect} in both axes} + ARG 1 other + METHOD method_48253 overlaps (Lnet/minecraft/class_8030;Lnet/minecraft/class_8027;)Z + COMMENT {@return whether this rect overlaps with {@code rect} in {@code axis}} + ARG 1 other + ARG 2 axis + METHOD method_48254 getCenter (Lnet/minecraft/class_8027;)I + COMMENT {@return the center of this rect in the given {@code axis}} + ARG 1 axis + METHOD method_48255 getBoundingCoordinate (Lnet/minecraft/class_8028;)I + COMMENT {@return the coordinate of the bounding box in the given {@code direction}} + ARG 1 direction + METHOD method_48256 getBorder (Lnet/minecraft/class_8028;)Lnet/minecraft/class_8030; + COMMENT {@return a rect representing the border of this rect in the given {@code direction}} + COMMENT + COMMENT

Borders are one pixel thick. + ARG 1 direction + METHOD method_49618 getTop ()I + METHOD method_49619 getBottom ()I + METHOD method_49620 getLeft ()I + METHOD method_49621 getRight ()I + METHOD method_49701 intersection (Lnet/minecraft/class_8030;)Lnet/minecraft/class_8030; + COMMENT {@return the rect that intersects with {@code other}, or {@code null} if they do not + COMMENT intersect} + ARG 1 other diff --git a/mappings/net/minecraft/client/gui/hud/BossBarHud.mapping b/mappings/net/minecraft/client/gui/hud/BossBarHud.mapping index 5f8cf95578..12932a6c68 100644 --- a/mappings/net/minecraft/client/gui/hud/BossBarHud.mapping +++ b/mappings/net/minecraft/client/gui/hud/BossBarHud.mapping @@ -1,29 +1,32 @@ CLASS net/minecraft/class_337 net/minecraft/client/gui/hud/BossBarHud FIELD field_2058 client Lnet/minecraft/class_310; - FIELD field_2059 BARS_TEXTURE Lnet/minecraft/class_2960; FIELD field_2060 bossBars Ljava/util/Map; FIELD field_32177 WIDTH I FIELD field_32178 HEIGHT I - FIELD field_32179 NOTCHED_BAR_OVERLAY_V I + FIELD field_45344 BACKGROUND_TEXTURES [Lnet/minecraft/class_2960; + FIELD field_45345 PROGRESS_TEXTURES [Lnet/minecraft/class_2960; + FIELD field_45346 NOTCHED_BACKGROUND_TEXTURES [Lnet/minecraft/class_2960; + FIELD field_45347 NOTCHED_PROGRESS_TEXTURES [Lnet/minecraft/class_2960; METHOD (Lnet/minecraft/class_310;)V ARG 1 client METHOD method_1795 handlePacket (Lnet/minecraft/class_2629;)V ARG 1 packet - METHOD method_1796 render (Lnet/minecraft/class_4587;)V - ARG 1 matrices + METHOD method_1796 render (Lnet/minecraft/class_332;)V + ARG 1 context METHOD method_1797 shouldDarkenSky ()Z METHOD method_1798 shouldPlayDragonMusic ()Z - METHOD method_1799 renderBossBar (Lnet/minecraft/class_4587;IILnet/minecraft/class_1259;)V - ARG 1 matrices + METHOD method_1799 renderBossBar (Lnet/minecraft/class_332;IILnet/minecraft/class_1259;)V + ARG 1 context ARG 2 x ARG 3 y ARG 4 bossBar METHOD method_1800 shouldThickenFog ()Z METHOD method_1801 clear ()V - METHOD method_41830 renderBossBar (Lnet/minecraft/class_4587;IILnet/minecraft/class_1259;II)V - ARG 1 matrices + METHOD method_41830 renderBossBar (Lnet/minecraft/class_332;IILnet/minecraft/class_1259;I[Lnet/minecraft/class_2960;[Lnet/minecraft/class_2960;)V + ARG 1 context ARG 2 x ARG 3 y ARG 4 bossBar ARG 5 width - ARG 6 height + ARG 6 textures + ARG 7 notchedTextures diff --git a/mappings/net/minecraft/client/gui/hud/ChatHud.mapping b/mappings/net/minecraft/client/gui/hud/ChatHud.mapping index 626cc1fbdd..b3f50636c0 100644 --- a/mappings/net/minecraft/client/gui/hud/ChatHud.mapping +++ b/mappings/net/minecraft/client/gui/hud/ChatHud.mapping @@ -5,27 +5,33 @@ CLASS net/minecraft/class_338 net/minecraft/client/gui/hud/ChatHud COMMENT @see net.minecraft.client.gui.screen.ChatScreen FIELD field_2061 messages Ljava/util/List; FIELD field_2062 client Lnet/minecraft/class_310; - FIELD field_2063 messageHistory Ljava/util/List; + FIELD field_2063 messageHistory Lnet/minecraft/class_8623; FIELD field_2064 visibleMessages Ljava/util/List; FIELD field_2065 LOGGER Lorg/slf4j/Logger; FIELD field_2066 scrolledLines I FIELD field_2067 hasUnreadNewMessages Z FIELD field_32180 MAX_MESSAGES I FIELD field_39771 MISSING_MESSAGE_INDEX I + FIELD field_40389 OFFSET_FROM_BOTTOM I + FIELD field_40390 REMOVAL_QUEUE_TICKS I + FIELD field_40391 DELETED_MARKER_TEXT Lnet/minecraft/class_2561; + FIELD field_40392 removalQueue Ljava/util/List; METHOD (Lnet/minecraft/class_310;)V ARG 1 client METHOD method_1802 scroll (I)V ARG 1 scroll METHOD method_1803 addToMessageHistory (Ljava/lang/String;)V ARG 1 message - METHOD method_1805 render (Lnet/minecraft/class_4587;I)V - ARG 1 matrices + METHOD method_1805 render (Lnet/minecraft/class_332;III)V + ARG 1 context ARG 2 currentTick + ARG 3 mouseX + ARG 4 mouseY METHOD method_1806 getWidth (D)I ARG 0 widthOption METHOD method_1808 clear (Z)V ARG 1 clearHistory - METHOD method_1809 getMessageHistory ()Ljava/util/List; + METHOD method_1809 getMessageHistory ()Lnet/minecraft/class_8623; METHOD method_1810 getHeight ()I METHOD method_1811 getWidth ()I METHOD method_1812 addMessage (Lnet/minecraft/class_2561;)V @@ -53,13 +59,12 @@ CLASS net/minecraft/class_338 net/minecraft/client/gui/hud/ChatHud ARG 1 mouseX ARG 3 mouseY METHOD method_41831 getDefaultUnfocusedHeight ()D - METHOD method_44047 getChatScreen ()Lnet/minecraft/class_408; METHOD method_44718 isXInsideIndicatorIcon (DLnet/minecraft/class_303$class_7590;Lnet/minecraft/class_7591;)Z ARG 1 x ARG 3 line ARG 4 indicator - METHOD method_44719 drawIndicatorIcon (Lnet/minecraft/class_4587;IILnet/minecraft/class_7591$class_7592;)V - ARG 1 matrices + METHOD method_44719 drawIndicatorIcon (Lnet/minecraft/class_332;IILnet/minecraft/class_7591$class_7592;)V + ARG 1 context ARG 2 x ARG 3 y ARG 4 icon @@ -72,16 +77,29 @@ CLASS net/minecraft/class_338 net/minecraft/client/gui/hud/ChatHud ARG 3 mouseY METHOD method_44724 toChatLineY (D)D ARG 1 y - METHOD method_44725 getMessageIndex (D)I - ARG 1 y + METHOD method_44725 getMessageLineIndex (DD)I + ARG 1 chatLineX + ARG 3 chatLineY METHOD method_44752 getLineHeight ()I METHOD method_44811 addMessage (Lnet/minecraft/class_2561;Lnet/minecraft/class_7469;Lnet/minecraft/class_7591;)V ARG 1 message ARG 2 signature ARG 3 indicator - METHOD method_44812 hideMessage (Lnet/minecraft/class_7469;)V + METHOD method_44812 removeMessage (Lnet/minecraft/class_7469;)V ARG 1 signature METHOD method_44813 refresh ()V METHOD method_45027 logChatMessage (Lnet/minecraft/class_2561;Lnet/minecraft/class_7591;)V ARG 1 message ARG 2 indicator + METHOD method_45584 tickRemovalQueueIfExists ()V + METHOD method_45585 (ILnet/minecraft/class_338$class_7731;)Z + ARG 2 message + METHOD method_45586 createRemovalMarker (Lnet/minecraft/class_303;)Lnet/minecraft/class_303; + ARG 1 original + METHOD method_45587 queueForRemoval (Lnet/minecraft/class_7469;)Lnet/minecraft/class_338$class_7731; + ARG 1 signature + METHOD method_45588 getMessageIndex (DD)I + ARG 1 chatLineX + ARG 3 chatLineY + METHOD method_45589 tickRemovalQueue ()V + CLASS class_7731 RemovalQueuedMessage diff --git a/mappings/net/minecraft/client/gui/hud/ClientBossBar.mapping b/mappings/net/minecraft/client/gui/hud/ClientBossBar.mapping index 379840fcfe..a09ea8068a 100644 --- a/mappings/net/minecraft/client/gui/hud/ClientBossBar.mapping +++ b/mappings/net/minecraft/client/gui/hud/ClientBossBar.mapping @@ -1,6 +1,7 @@ CLASS net/minecraft/class_345 net/minecraft/client/gui/hud/ClientBossBar FIELD field_2128 timeHealthSet J FIELD field_2129 healthLatest F + FIELD field_32204 HEALTH_CHANGE_ANIMATION_MS J METHOD (Ljava/util/UUID;Lnet/minecraft/class_2561;FLnet/minecraft/class_1259$class_1260;Lnet/minecraft/class_1259$class_1261;ZZZ)V ARG 1 uuid ARG 2 name diff --git a/mappings/net/minecraft/client/gui/hud/DebugHud.mapping b/mappings/net/minecraft/client/gui/hud/DebugHud.mapping index 0030f8f033..21753b1606 100644 --- a/mappings/net/minecraft/client/gui/hud/DebugHud.mapping +++ b/mappings/net/minecraft/client/gui/hud/DebugHud.mapping @@ -9,19 +9,20 @@ CLASS net/minecraft/class_340 net/minecraft/client/gui/hud/DebugHud FIELD field_2085 pos Lnet/minecraft/class_1923; FIELD field_32187 TEXT_COLOR I FIELD field_38985 allocationRateCalculator Lnet/minecraft/class_340$class_7412; + FIELD field_45910 renderingChart Lnet/minecraft/class_8757; + FIELD field_45911 pingChart Lnet/minecraft/class_8758; + FIELD field_45912 packetSizeChart Lnet/minecraft/class_8756; + FIELD field_45913 tickChart Lnet/minecraft/class_8759; + FIELD field_45988 showDebugHud Z + FIELD field_45989 renderingChartVisible Z + FIELD field_45990 renderingAndTickChartsVisible Z + FIELD field_45991 packetSizeAndPingChartsVisible Z + FIELD field_45992 frameNanosLog Lnet/minecraft/class_8743; + FIELD field_45993 tickNanosLog Lnet/minecraft/class_8743; + FIELD field_45994 pingLog Lnet/minecraft/class_8743; + FIELD field_45995 packetSizeLog Lnet/minecraft/class_8743; METHOD (Lnet/minecraft/class_310;)V ARG 1 client - METHOD method_15870 drawMetricsData (Lnet/minecraft/class_4587;Lnet/minecraft/class_3517;IIZ)V - ARG 1 matrices - ARG 2 metricsData - ARG 3 x - ARG 4 width - ARG 5 showFps - METHOD method_1833 getMetricsLineColor (IIII)I - ARG 1 value - ARG 2 greenValue - ARG 3 yellowValue - ARG 4 redValue METHOD method_1834 getChunk ()Lnet/minecraft/class_2818; METHOD method_1835 getLeftText ()Ljava/util/List; METHOD method_1836 getClientChunk ()Lnet/minecraft/class_2818; @@ -32,18 +33,14 @@ CLASS net/minecraft/class_340 net/minecraft/client/gui/hud/DebugHud METHOD method_1841 (Lnet/minecraft/class_1132;)Ljava/util/Optional; ARG 1 server METHOD method_1842 resetChunk ()V - METHOD method_1843 interpolateColor (IIF)I - ARG 1 color1 - ARG 2 color2 - ARG 3 dt METHOD method_1845 propertyToString (Ljava/util/Map$Entry;)Ljava/lang/String; ARG 1 propEntry - METHOD method_1846 render (Lnet/minecraft/class_4587;)V - ARG 1 matrices - METHOD method_1847 renderLeftText (Lnet/minecraft/class_4587;)V - ARG 1 matrices - METHOD method_1848 renderRightText (Lnet/minecraft/class_4587;)V - ARG 1 matrices + METHOD method_1846 render (Lnet/minecraft/class_332;)V + ARG 1 context + METHOD method_1847 drawLeftText (Lnet/minecraft/class_332;)V + ARG 1 context + METHOD method_1848 drawRightText (Lnet/minecraft/class_332;)V + ARG 1 context METHOD method_20455 (Ljava/util/EnumMap;)V ARG 0 types METHOD method_20540 (Lnet/minecraft/class_2791;)Lnet/minecraft/class_2818; @@ -66,6 +63,24 @@ CLASS net/minecraft/class_340 net/minecraft/client/gui/hud/DebugHud ARG 0 biomeKey METHOD method_40207 (Lnet/minecraft/class_6862;)Ljava/lang/String; ARG 0 tag + METHOD method_51745 drawText (Lnet/minecraft/class_332;Ljava/util/List;Z)V + ARG 1 context + ARG 2 text + ARG 3 left + METHOD method_53534 pushToFrameLog (J)V + ARG 1 value + METHOD method_53535 pushToTickLog (J)V + ARG 1 value + METHOD method_53536 shouldShowDebugHud ()Z + METHOD method_53537 shouldShowRenderingChart ()Z + METHOD method_53538 showShowPacketSizeAndPingCharts ()Z + METHOD method_53539 toggleDebugHud ()V + METHOD method_53540 togglePacketSizeAndPingCharts ()V + METHOD method_53541 toggleRenderingAndTickCharts ()V + METHOD method_53542 toggleRenderingChart ()V + METHOD method_53543 getPingLog ()Lnet/minecraft/class_8743; + METHOD method_53544 getPacketSizeLog ()Lnet/minecraft/class_8743; + METHOD method_53545 clear ()V CLASS class_7412 AllocationRateCalculator FIELD field_38986 INTERVAL I FIELD field_38987 GARBAGE_COLLECTORS Ljava/util/List; diff --git a/mappings/net/minecraft/client/gui/hud/InGameHud.mapping b/mappings/net/minecraft/client/gui/hud/InGameHud.mapping index b0ef7ff6fb..06b802ed83 100644 --- a/mappings/net/minecraft/client/gui/hud/InGameHud.mapping +++ b/mappings/net/minecraft/client/gui/hud/InGameHud.mapping @@ -19,7 +19,6 @@ CLASS net/minecraft/class_329 net/minecraft/client/gui/hud/InGameHud FIELD field_2025 spectatorHud Lnet/minecraft/class_365; FIELD field_2026 debugHud Lnet/minecraft/class_340; FIELD field_2027 subtitlesHud Lnet/minecraft/class_359; - FIELD field_2028 WIDGETS_TEXTURE Lnet/minecraft/class_2960; FIELD field_2029 scaledHeight I FIELD field_2030 bossBarHud Lnet/minecraft/class_337; FIELD field_2031 currentStack Lnet/minecraft/class_1799; @@ -44,6 +43,37 @@ CLASS net/minecraft/class_329 net/minecraft/client/gui/hud/InGameHud FIELD field_35429 lastAutosaveIndicatorAlpha F FIELD field_35430 SAVING_LEVEL_TEXT Lnet/minecraft/class_2561; FIELD field_39458 canShowChatDisabledScreen Z + FIELD field_45298 FOOD_FULL_TEXTURE Lnet/minecraft/class_2960; + FIELD field_45299 AIR_TEXTURE Lnet/minecraft/class_2960; + FIELD field_45300 AIR_BURSTING_TEXTURE Lnet/minecraft/class_2960; + FIELD field_45301 VEHICLE_CONTAINER_HEART_TEXTURE Lnet/minecraft/class_2960; + FIELD field_45302 VEHICLE_FULL_HEART_TEXTURE Lnet/minecraft/class_2960; + FIELD field_45303 VEHICLE_HALF_HEART_TEXTURE Lnet/minecraft/class_2960; + FIELD field_45304 CROSSHAIR_TEXTURE Lnet/minecraft/class_2960; + FIELD field_45305 CROSSHAIR_ATTACK_INDICATOR_FULL_TEXTURE Lnet/minecraft/class_2960; + FIELD field_45306 CROSSHAIR_ATTACK_INDICATOR_BACKGROUND_TEXTURE Lnet/minecraft/class_2960; + FIELD field_45307 CROSSHAIR_ATTACK_INDICATOR_PROGRESS_TEXTURE Lnet/minecraft/class_2960; + FIELD field_45308 EFFECT_BACKGROUND_AMBIENT_TEXTURE Lnet/minecraft/class_2960; + FIELD field_45309 EFFECT_BACKGROUND_TEXTURE Lnet/minecraft/class_2960; + FIELD field_45310 HOTBAR_TEXTURE Lnet/minecraft/class_2960; + FIELD field_45311 HOTBAR_SELECTION_TEXTURE Lnet/minecraft/class_2960; + FIELD field_45312 HOTBAR_OFFHAND_LEFT_TEXTURE Lnet/minecraft/class_2960; + FIELD field_45313 HOTBAR_OFFHAND_RIGHT_TEXTURE Lnet/minecraft/class_2960; + FIELD field_45314 HOTBAR_ATTACK_INDICATOR_BACKGROUND_TEXTURE Lnet/minecraft/class_2960; + FIELD field_45315 HOTBAR_ATTACK_INDICATOR_PROGRESS_TEXTURE Lnet/minecraft/class_2960; + FIELD field_45316 JUMP_BAR_BACKGROUND_TEXTURE Lnet/minecraft/class_2960; + FIELD field_45317 JUMP_BAR_COOLDOWN_TEXTURE Lnet/minecraft/class_2960; + FIELD field_45318 JUMP_BAR_PROGRESS_TEXTURE Lnet/minecraft/class_2960; + FIELD field_45319 EXPERIENCE_BAR_BACKGROUND_TEXTURE Lnet/minecraft/class_2960; + FIELD field_45320 EXPERIENCE_BAR_PROGRESS_TEXTURE Lnet/minecraft/class_2960; + FIELD field_45321 ARMOR_EMPTY_TEXTURE Lnet/minecraft/class_2960; + FIELD field_45322 ARMOR_HALF_TEXTURE Lnet/minecraft/class_2960; + FIELD field_45323 ARMOR_FULL_TEXTURE Lnet/minecraft/class_2960; + FIELD field_45324 FOOD_EMPTY_HUNGER_TEXTURE Lnet/minecraft/class_2960; + FIELD field_45325 FOOD_HALF_HUNGER_TEXTURE Lnet/minecraft/class_2960; + FIELD field_45326 FOOD_FULL_HUNGER_TEXTURE Lnet/minecraft/class_2960; + FIELD field_45327 FOOD_EMPTY_TEXTURE Lnet/minecraft/class_2960; + FIELD field_45328 FOOD_HALF_TEXTURE Lnet/minecraft/class_2960; METHOD (Lnet/minecraft/class_310;Lnet/minecraft/class_918;)V ARG 1 client ARG 2 itemRenderer @@ -54,76 +84,82 @@ CLASS net/minecraft/class_329 net/minecraft/client/gui/hud/InGameHud METHOD method_1733 getHeartRows (I)I ARG 1 heartCount METHOD method_1734 getRiddenEntity ()Lnet/minecraft/class_1309; - METHOD method_1735 renderVignetteOverlay (Lnet/minecraft/class_1297;)V - ARG 1 entity - METHOD method_1736 renderCrosshair (Lnet/minecraft/class_4587;)V - ARG 1 matrices + METHOD method_1735 renderVignetteOverlay (Lnet/minecraft/class_332;Lnet/minecraft/class_1297;)V + ARG 1 context + ARG 2 entity + METHOD method_1736 renderCrosshair (Lnet/minecraft/class_332;)V + ARG 1 context METHOD method_1737 getCameraPlayer ()Lnet/minecraft/class_1657; METHOD method_1738 getTicks ()I METHOD method_1739 getSpectatorHud ()Lnet/minecraft/class_365; METHOD method_1740 getBossBarHud ()Lnet/minecraft/class_337; - METHOD method_1741 renderMountHealth (Lnet/minecraft/class_4587;)V - ARG 1 matrices + METHOD method_1741 renderMountHealth (Lnet/minecraft/class_332;)V + ARG 1 context METHOD method_1742 setDefaultTitleFade ()V METHOD method_1743 getChatHud ()Lnet/minecraft/class_338; METHOD method_1744 getHeartCount (Lnet/minecraft/class_1309;)I ARG 1 entity METHOD method_1745 resetDebugHudChunk ()V - METHOD method_1746 renderPortalOverlay (F)V - ARG 1 nauseaStrength + METHOD method_1746 renderPortalOverlay (Lnet/minecraft/class_332;F)V + ARG 1 context + ARG 2 nauseaStrength METHOD method_1747 clear ()V METHOD method_1748 tick ()V - METHOD method_1749 renderHeldItemTooltip (Lnet/minecraft/class_4587;)V - ARG 1 matrices + METHOD method_1749 renderHeldItemTooltip (Lnet/minecraft/class_332;)V + ARG 1 context METHOD method_1750 getPlayerListHud ()Lnet/minecraft/class_355; METHOD method_1751 (Lnet/minecraft/class_267;)Z ARG 0 score - METHOD method_1752 renderMountJumpBar (Lnet/minecraft/class_4587;I)V - ARG 1 matrices - ARG 2 x - METHOD method_1753 render (Lnet/minecraft/class_4587;F)V - ARG 1 matrices + METHOD method_1752 renderMountJumpBar (Lnet/minecraft/class_1316;Lnet/minecraft/class_332;I)V + ARG 1 mount + ARG 2 context + ARG 3 x + METHOD method_1753 render (Lnet/minecraft/class_332;F)V + ARG 1 context ARG 2 tickDelta METHOD method_17534 shouldRenderSpectatorCrosshair (Lnet/minecraft/class_239;)Z ARG 1 hitResult - METHOD method_1754 renderExperienceBar (Lnet/minecraft/class_4587;I)V - ARG 1 matrices + METHOD method_1754 renderExperienceBar (Lnet/minecraft/class_332;I)V + ARG 1 context ARG 2 x METHOD method_1756 getTextRenderer ()Lnet/minecraft/class_327; - METHOD method_1757 renderScoreboardSidebar (Lnet/minecraft/class_4587;Lnet/minecraft/class_266;)V - ARG 1 matrices + METHOD method_1757 renderScoreboardSidebar (Lnet/minecraft/class_332;Lnet/minecraft/class_266;)V + ARG 1 context ARG 2 objective METHOD method_1758 setOverlayMessage (Lnet/minecraft/class_2561;Z)V ARG 1 message ARG 2 tinted - METHOD method_1759 renderHotbar (FLnet/minecraft/class_4587;)V + METHOD method_1759 renderHotbar (FLnet/minecraft/class_332;)V ARG 1 tickDelta - ARG 2 matrices - METHOD method_1760 renderStatusBars (Lnet/minecraft/class_4587;)V + ARG 2 context + METHOD method_1760 renderStatusBars (Lnet/minecraft/class_332;)V COMMENT Renders the armor, health, air, and hunger bars. - ARG 1 matrices - METHOD method_1762 renderHotbarItem (IIFLnet/minecraft/class_1657;Lnet/minecraft/class_1799;I)V - ARG 1 x - ARG 2 y - ARG 3 tickDelta - ARG 4 player - ARG 5 stack - ARG 6 seed - METHOD method_1765 renderStatusEffectOverlay (Lnet/minecraft/class_4587;)V - ARG 1 matrices - METHOD method_1766 renderDemoTimer (Lnet/minecraft/class_4587;)V - ARG 1 matrices - METHOD method_19346 drawTextBackground (Lnet/minecraft/class_4587;Lnet/minecraft/class_327;III)V - ARG 1 matrices + ARG 1 context + METHOD method_1762 renderHotbarItem (Lnet/minecraft/class_332;IIFLnet/minecraft/class_1657;Lnet/minecraft/class_1799;I)V + ARG 1 context + ARG 2 x + ARG 3 y + ARG 4 tickDelta + ARG 5 player + ARG 6 stack + ARG 7 seed + METHOD method_1765 renderStatusEffectOverlay (Lnet/minecraft/class_332;)V + ARG 1 context + METHOD method_1766 renderDemoTimer (Lnet/minecraft/class_332;)V + ARG 1 context + METHOD method_19346 drawTextBackground (Lnet/minecraft/class_332;Lnet/minecraft/class_327;III)V + ARG 1 context ARG 2 textRenderer ARG 3 yOffset ARG 4 width ARG 5 color - METHOD method_31977 renderOverlay (Lnet/minecraft/class_2960;F)V - ARG 1 texture - ARG 2 opacity - METHOD method_32598 renderSpyglassOverlay (F)V - ARG 1 scale + METHOD method_31977 renderOverlay (Lnet/minecraft/class_332;Lnet/minecraft/class_2960;F)V + ARG 1 context + ARG 2 texture + ARG 3 opacity + METHOD method_32598 renderSpyglassOverlay (Lnet/minecraft/class_332;F)V + ARG 1 context + ARG 2 scale METHOD method_34001 setTitleTicks (III)V ARG 1 fadeInTicks ARG 2 stayTicks @@ -133,8 +169,8 @@ CLASS net/minecraft/class_329 net/minecraft/client/gui/hud/InGameHud METHOD method_34003 clearTitle ()V METHOD method_34004 setTitle (Lnet/minecraft/class_2561;)V ARG 1 title - METHOD method_37298 renderHealthBar (Lnet/minecraft/class_4587;Lnet/minecraft/class_1657;IIIIFIIIZ)V - ARG 1 matrices + METHOD method_37298 renderHealthBar (Lnet/minecraft/class_332;Lnet/minecraft/class_1657;IIIIFIIIZ)V + ARG 1 context ARG 2 player ARG 3 x ARG 4 y @@ -145,31 +181,45 @@ CLASS net/minecraft/class_329 net/minecraft/client/gui/hud/InGameHud ARG 9 health ARG 10 absorption ARG 11 blinking - METHOD method_37299 drawHeart (Lnet/minecraft/class_4587;Lnet/minecraft/class_329$class_6411;IIIZZ)V - ARG 1 matrices + METHOD method_37299 drawHeart (Lnet/minecraft/class_332;Lnet/minecraft/class_329$class_6411;IIZZZ)V + ARG 1 context ARG 2 type ARG 3 x ARG 4 y - ARG 5 v + ARG 5 hardcore ARG 6 blinking - ARG 7 halfHeart + ARG 7 half METHOD method_39191 tick (Z)V ARG 1 paused - METHOD method_39192 renderAutosaveIndicator (Lnet/minecraft/class_4587;)V - ARG 1 matrices + METHOD method_39192 renderAutosaveIndicator (Lnet/minecraft/class_332;)V + ARG 1 context METHOD method_39193 tickAutosaveIndicator ()V METHOD method_44353 shouldShowChatDisabledScreen ()Z METHOD method_44354 setCanShowChatDisabledScreen (Z)V ARG 1 canShowChatDisabledScreen + METHOD method_53531 getDebugHud ()Lnet/minecraft/class_340; CLASS class_6411 HeartType - FIELD field_33950 textureIndex I - FIELD field_33951 hasBlinkingTexture Z - METHOD (Ljava/lang/String;IIZ)V - ARG 3 textureIndex - ARG 4 hasBlinkingTexture + FIELD field_33946 POISONED Lnet/minecraft/class_329$class_6411; + FIELD field_45329 fullTexture Lnet/minecraft/class_2960; + FIELD field_45330 fullBlinkingTexture Lnet/minecraft/class_2960; + FIELD field_45331 halfTexture Lnet/minecraft/class_2960; + FIELD field_45332 halfBlinkingTexture Lnet/minecraft/class_2960; + FIELD field_45333 hardcoreFullTexture Lnet/minecraft/class_2960; + FIELD field_45334 hardcoreFullBlinkingTexture Lnet/minecraft/class_2960; + FIELD field_45335 hardcoreHalfTexture Lnet/minecraft/class_2960; + FIELD field_45336 hardcoreHalfBlinkingTexture Lnet/minecraft/class_2960; + METHOD (Ljava/lang/String;ILnet/minecraft/class_2960;Lnet/minecraft/class_2960;Lnet/minecraft/class_2960;Lnet/minecraft/class_2960;Lnet/minecraft/class_2960;Lnet/minecraft/class_2960;Lnet/minecraft/class_2960;Lnet/minecraft/class_2960;)V + ARG 3 fullTexture + ARG 4 fullBlinkingTexture + ARG 5 halfTexture + ARG 6 halfBlinkingTexture + ARG 7 hardcoreFullTexture + ARG 8 hardcoreFullBlinkingTexture + ARG 9 hardcoreHalfTexture + ARG 10 hardcoreHalfBlinkingTexture METHOD method_37301 fromPlayerState (Lnet/minecraft/class_1657;)Lnet/minecraft/class_329$class_6411; ARG 0 player - METHOD method_37302 getU (ZZ)I - COMMENT {@return the left-most coordinate of the heart texture} - ARG 1 halfHeart - ARG 2 blinking + METHOD method_52705 getTexture (ZZZ)Lnet/minecraft/class_2960; + ARG 1 hardcore + ARG 2 half + ARG 3 blinking diff --git a/mappings/net/minecraft/client/gui/hud/MessageIndicator.mapping b/mappings/net/minecraft/client/gui/hud/MessageIndicator.mapping index f17e570763..8727105c34 100644 --- a/mappings/net/minecraft/client/gui/hud/MessageIndicator.mapping +++ b/mappings/net/minecraft/client/gui/hud/MessageIndicator.mapping @@ -4,26 +4,26 @@ CLASS net/minecraft/class_7591 net/minecraft/client/gui/hud/MessageIndicator FIELD field_39757 MODIFIED_TEXT Lnet/minecraft/class_2561; FIELD field_39758 NOT_SECURE_COLOR I FIELD field_39759 MODIFIED_COLOR I - FIELD field_39761 CHAT_TAGS_TEXTURE Lnet/minecraft/class_2960; - FIELD field_39788 SYSTEM_COLOR I - FIELD field_39922 FILTERED_TEXT Lnet/minecraft/class_2561; + FIELD field_40379 SYSTEM_TEXT Lnet/minecraft/class_2561; + FIELD field_41092 SINGLE_PLAYER_TEXT Lnet/minecraft/class_2561; + FIELD field_41093 SINGLE_PLAYER Lnet/minecraft/class_7591; + FIELD field_45897 ERROR_TEXT Lnet/minecraft/class_2561; METHOD comp_902 loggedName ()Ljava/lang/String; METHOD method_44709 notSecure ()Lnet/minecraft/class_7591; METHOD method_44710 modified (Ljava/lang/String;)Lnet/minecraft/class_7591; ARG 0 originalText METHOD method_44751 system ()Lnet/minecraft/class_7591; - METHOD method_45071 filtered ()Lnet/minecraft/class_7591; + METHOD method_47391 singlePlayer ()Lnet/minecraft/class_7591; + METHOD method_53461 chatError ()Lnet/minecraft/class_7591; CLASS class_7592 Icon - FIELD field_39764 u I - FIELD field_39765 v I FIELD field_39766 width I FIELD field_39767 height I - METHOD (Ljava/lang/String;IIIII)V - ARG 3 u - ARG 4 v - ARG 5 width - ARG 6 height - METHOD method_44712 draw (Lnet/minecraft/class_4587;II)V - ARG 1 matrices + FIELD field_45292 texture Lnet/minecraft/class_2960; + METHOD (Ljava/lang/String;ILnet/minecraft/class_2960;II)V + ARG 3 texture + ARG 4 width + ARG 5 height + METHOD method_44712 draw (Lnet/minecraft/class_332;II)V + ARG 1 context ARG 2 x ARG 3 y diff --git a/mappings/net/minecraft/client/gui/hud/PlayerListHud.mapping b/mappings/net/minecraft/client/gui/hud/PlayerListHud.mapping index c54933c6df..6898c7fbb3 100644 --- a/mappings/net/minecraft/client/gui/hud/PlayerListHud.mapping +++ b/mappings/net/minecraft/client/gui/hud/PlayerListHud.mapping @@ -5,47 +5,52 @@ CLASS net/minecraft/class_355 net/minecraft/client/gui/hud/PlayerListHud COMMENT COMMENT

The current instance used by the client can be obtained by {@code COMMENT MinecraftClient.getInstance().inGameHud.getPlayerListHud()}. - FIELD field_2152 showTime J - COMMENT The time, in milliseconds, when this HUD was last set to visible. FIELD field_2153 header Lnet/minecraft/class_2561; FIELD field_2154 footer Lnet/minecraft/class_2561; FIELD field_2155 client Lnet/minecraft/class_310; - FIELD field_2156 ENTRY_ORDERING Lcom/google/common/collect/Ordering; + FIELD field_2156 ENTRY_ORDERING Ljava/util/Comparator; FIELD field_2157 inGameHud Lnet/minecraft/class_329; FIELD field_2158 visible Z FIELD field_32205 MAX_ROWS I - FIELD field_32206 HEART_OUTLINE_U I - FIELD field_32207 BLINKING_HEART_OUTLINE_U I - FIELD field_32208 HEART_U I - FIELD field_32209 HALF_HEART_U I - FIELD field_32210 GOLDEN_HEART_U I - FIELD field_32211 HALF_GOLDEN_HEART_U I - FIELD field_32212 BLINKING_HEART_U I - FIELD field_32213 BLINKING_HALF_HEART_U I + FIELD field_40393 hearts Ljava/util/Map; + FIELD field_45365 PING_UNKNOWN_ICON_TEXTURE Lnet/minecraft/class_2960; + FIELD field_45366 PING_1_ICON_TEXTURE Lnet/minecraft/class_2960; + FIELD field_45367 PING_2_ICON_TEXTURE Lnet/minecraft/class_2960; + FIELD field_45368 PING_3_ICON_TEXTURE Lnet/minecraft/class_2960; + FIELD field_45369 PING_4_ICON_TEXTURE Lnet/minecraft/class_2960; + FIELD field_45370 PING_5_ICON_TEXTURE Lnet/minecraft/class_2960; + FIELD field_45371 CONTAINER_HEART_BLINKING_TEXTURE Lnet/minecraft/class_2960; + FIELD field_45372 CONTAINER_HEART_TEXTURE Lnet/minecraft/class_2960; + FIELD field_45373 FULL_HEART_BLINKING_TEXTURE Lnet/minecraft/class_2960; + FIELD field_45374 HALF_HEART_BLINKING_TEXTURE Lnet/minecraft/class_2960; + FIELD field_45375 ABSORBING_FULL_HEART_BLINKING_TEXTURE Lnet/minecraft/class_2960; + FIELD field_45376 FULL_HEART_TEXTURE Lnet/minecraft/class_2960; + FIELD field_45377 ABSORBING_HALF_HEART_BLINKING_TEXTURE Lnet/minecraft/class_2960; + FIELD field_45378 HALF_HEART_TEXTURE Lnet/minecraft/class_2960; METHOD (Lnet/minecraft/class_310;Lnet/minecraft/class_329;)V ARG 1 client ARG 2 inGameHud METHOD method_1918 getPlayerName (Lnet/minecraft/class_640;)Lnet/minecraft/class_2561; COMMENT {@return the player name rendered by this HUD} ARG 1 entry - METHOD method_1919 render (Lnet/minecraft/class_4587;ILnet/minecraft/class_269;Lnet/minecraft/class_266;)V - ARG 1 matrices + METHOD method_1919 render (Lnet/minecraft/class_332;ILnet/minecraft/class_269;Lnet/minecraft/class_266;)V + ARG 1 context ARG 2 scaledWindowWidth ARG 3 scoreboard ARG 4 objective METHOD method_1920 clear ()V METHOD method_1921 setVisible (Z)V ARG 1 visible - METHOD method_1922 renderScoreboardObjective (Lnet/minecraft/class_266;ILjava/lang/String;IILnet/minecraft/class_640;Lnet/minecraft/class_4587;)V + METHOD method_1922 renderScoreboardObjective (Lnet/minecraft/class_266;ILjava/lang/String;IILjava/util/UUID;Lnet/minecraft/class_332;)V ARG 1 objective ARG 2 y ARG 3 player - ARG 4 startX - ARG 5 endX - ARG 6 entry - ARG 7 matrices - METHOD method_1923 renderLatencyIcon (Lnet/minecraft/class_4587;IIILnet/minecraft/class_640;)V - ARG 1 matrices + ARG 4 left + ARG 5 right + ARG 6 uuid + ARG 7 context + METHOD method_1923 renderLatencyIcon (Lnet/minecraft/class_332;IIILnet/minecraft/class_640;)V + ARG 1 context ARG 2 width ARG 3 x ARG 4 y @@ -59,7 +64,39 @@ CLASS net/minecraft/class_355 net/minecraft/client/gui/hud/PlayerListHud COMMENT the given player is in {@linkplain net.minecraft.world.GameMode#SPECTATOR spectator mode}. ARG 1 entry ARG 2 name - CLASS class_356 EntryOrderComparator - METHOD compare (Ljava/lang/Object;Ljava/lang/Object;)I - ARG 1 a - ARG 2 b + METHOD method_45590 renderHearts (IIILjava/util/UUID;Lnet/minecraft/class_332;I)V + ARG 1 y + ARG 2 left + ARG 3 right + ARG 4 uuid + ARG 5 context + ARG 6 score + METHOD method_45591 (ILjava/util/UUID;)Lnet/minecraft/class_355$class_7732; + ARG 1 uuid2 + METHOD method_45592 (Lnet/minecraft/class_640;)I + ARG 0 entry + METHOD method_45593 (Ljava/util/Set;Ljava/util/UUID;)Z + ARG 1 uuid + METHOD method_45594 (Lnet/minecraft/class_640;)Ljava/util/UUID; + ARG 0 playerEntry + METHOD method_45595 (Lnet/minecraft/class_640;)Ljava/lang/String; + ARG 0 entry + METHOD method_46511 (Lnet/minecraft/class_640;)Ljava/lang/String; + ARG 0 entry + METHOD method_48213 collectPlayerEntries ()Ljava/util/List; + CLASS class_7732 Heart + FIELD field_40394 COOLDOWN_TICKS J + FIELD field_40395 SCORE_DECREASE_HIGHLIGHT_TICKS J + FIELD field_40396 SCORE_INCREASE_HIGHLIGHT_TICKS J + FIELD field_40397 score I + FIELD field_40398 prevScore I + FIELD field_40399 lastScoreChangeTick J + FIELD field_40400 highlightEndTick J + METHOD (I)V + ARG 1 score + METHOD method_45596 getPrevScore ()I + METHOD method_45597 tick (IJ)V + ARG 1 score + ARG 2 currentTick + METHOD method_45598 useHighlighted (J)Z + ARG 1 currentTick diff --git a/mappings/net/minecraft/client/gui/hud/SpectatorHud.mapping b/mappings/net/minecraft/client/gui/hud/SpectatorHud.mapping index 92b8e1505e..b6ec9a37d3 100644 --- a/mappings/net/minecraft/client/gui/hud/SpectatorHud.mapping +++ b/mappings/net/minecraft/client/gui/hud/SpectatorHud.mapping @@ -1,30 +1,31 @@ CLASS net/minecraft/class_365 net/minecraft/client/gui/hud/SpectatorHud - FIELD field_2197 WIDGETS_TEXTURE Lnet/minecraft/class_2960; FIELD field_2198 lastInteractionTime J - FIELD field_2199 SPECTATOR_TEXTURE Lnet/minecraft/class_2960; FIELD field_2200 spectatorMenu Lnet/minecraft/class_531; FIELD field_2201 client Lnet/minecraft/class_310; FIELD field_32215 FADE_OUT_DELAY J FIELD field_32216 FADE_OUT_DURATION J + FIELD field_45392 HOTBAR_TEXTURE Lnet/minecraft/class_2960; + FIELD field_45393 HOTBAR_SELECTION_TEXTURE Lnet/minecraft/class_2960; 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_1975 renderSpectatorMenu (Lnet/minecraft/class_332;FIILnet/minecraft/class_539;)V + ARG 1 context ARG 2 height ARG 3 x ARG 4 y ARG 5 state METHOD method_1976 cycleSlot (I)V + ARG 1 offset METHOD method_1977 selectSlot (I)V ARG 1 slot - METHOD method_1978 renderSpectatorMenu (Lnet/minecraft/class_4587;)V - ARG 1 matrices - METHOD method_1979 render (Lnet/minecraft/class_4587;)V - ARG 1 matrices + METHOD method_1978 renderSpectatorMenu (Lnet/minecraft/class_332;)V + ARG 1 context + METHOD method_1979 render (Lnet/minecraft/class_332;)V + ARG 1 context 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_1982 renderSpectatorCommand (Lnet/minecraft/class_332;IIFFLnet/minecraft/class_537;)V + ARG 1 context ARG 2 slot ARG 3 x ARG 4 y diff --git a/mappings/net/minecraft/client/gui/hud/SubtitlesHud.mapping b/mappings/net/minecraft/client/gui/hud/SubtitlesHud.mapping index da96162005..4418290988 100644 --- a/mappings/net/minecraft/client/gui/hud/SubtitlesHud.mapping +++ b/mappings/net/minecraft/client/gui/hud/SubtitlesHud.mapping @@ -5,8 +5,8 @@ CLASS net/minecraft/class_359 net/minecraft/client/gui/hud/SubtitlesHud FIELD field_32214 REMOVE_DELAY J METHOD (Lnet/minecraft/class_310;)V ARG 1 client - METHOD method_1957 render (Lnet/minecraft/class_4587;)V - ARG 1 matrices + METHOD method_1957 render (Lnet/minecraft/class_332;)V + ARG 1 context CLASS class_360 SubtitleEntry FIELD field_2185 time J FIELD field_2186 pos Lnet/minecraft/class_243; diff --git a/mappings/net/minecraft/client/gui/hud/debug/DebugChart.mapping b/mappings/net/minecraft/client/gui/hud/debug/DebugChart.mapping new file mode 100644 index 0000000000..c7a95b22aa --- /dev/null +++ b/mappings/net/minecraft/client/gui/hud/debug/DebugChart.mapping @@ -0,0 +1,37 @@ +CLASS net/minecraft/class_8755 net/minecraft/client/gui/hud/debug/DebugChart + FIELD field_45915 TEXT_COLOR I + FIELD field_45918 textRenderer Lnet/minecraft/class_327; + FIELD field_45919 log Lnet/minecraft/class_8743; + METHOD (Lnet/minecraft/class_327;Lnet/minecraft/class_8743;)V + ARG 1 textRenderer + ARG 2 log + METHOD method_53468 format (D)Ljava/lang/String; + ARG 1 value + METHOD method_53469 getColor (DDIDIDI)I + ARG 1 value + ARG 3 min + ARG 5 minColor + ARG 6 median + ARG 8 medianColor + ARG 9 max + ARG 11 maxColor + METHOD method_53470 getWidth (I)I + ARG 1 centerX + METHOD method_53471 getColor (J)I + ARG 1 value + METHOD method_53472 render (Lnet/minecraft/class_332;II)V + ARG 1 context + ARG 2 x + ARG 3 width + METHOD method_53473 renderThresholds (Lnet/minecraft/class_332;III)V + ARG 1 context + ARG 2 x + ARG 3 width + ARG 4 height + METHOD method_53474 drawBorderedText (Lnet/minecraft/class_332;Ljava/lang/String;II)V + ARG 1 context + ARG 2 string + ARG 3 x + ARG 4 y + METHOD method_53475 getHeight (D)I + ARG 1 value diff --git a/mappings/net/minecraft/client/gui/hud/debug/PacketSizeChart.mapping b/mappings/net/minecraft/client/gui/hud/debug/PacketSizeChart.mapping new file mode 100644 index 0000000000..7e8e58aa4a --- /dev/null +++ b/mappings/net/minecraft/client/gui/hud/debug/PacketSizeChart.mapping @@ -0,0 +1,19 @@ +CLASS net/minecraft/class_8756 net/minecraft/client/gui/hud/debug/PacketSizeChart + METHOD method_53476 drawSizeBar (Lnet/minecraft/class_332;IIII)V + ARG 1 context + ARG 2 x + ARG 3 width + ARG 4 height + ARG 5 bytes + METHOD method_53477 drawSizeBar (Lnet/minecraft/class_332;IIILjava/lang/String;)V + ARG 1 context + ARG 2 x + ARG 3 width + ARG 4 y + ARG 5 label + METHOD method_53478 formatBytesPerSecond (D)Ljava/lang/String; + ARG 0 value + METHOD method_53479 calculateHeight (D)I + ARG 0 value + METHOD method_53480 toBytesPerSecond (D)D + ARG 0 bytesPerTick diff --git a/mappings/net/minecraft/client/gui/hud/debug/PingChart.mapping b/mappings/net/minecraft/client/gui/hud/debug/PingChart.mapping new file mode 100644 index 0000000000..b27d4fe255 --- /dev/null +++ b/mappings/net/minecraft/client/gui/hud/debug/PingChart.mapping @@ -0,0 +1 @@ +CLASS net/minecraft/class_8758 net/minecraft/client/gui/hud/debug/PingChart diff --git a/mappings/net/minecraft/client/gui/hud/debug/RenderingChart.mapping b/mappings/net/minecraft/client/gui/hud/debug/RenderingChart.mapping new file mode 100644 index 0000000000..febec69c77 --- /dev/null +++ b/mappings/net/minecraft/client/gui/hud/debug/RenderingChart.mapping @@ -0,0 +1,3 @@ +CLASS net/minecraft/class_8757 net/minecraft/client/gui/hud/debug/RenderingChart + METHOD method_53481 toMillisecondsPerFrame (D)D + ARG 0 nanosecondsPerFrame diff --git a/mappings/net/minecraft/client/gui/hud/debug/TickChart.mapping b/mappings/net/minecraft/client/gui/hud/debug/TickChart.mapping new file mode 100644 index 0000000000..478145d7fa --- /dev/null +++ b/mappings/net/minecraft/client/gui/hud/debug/TickChart.mapping @@ -0,0 +1,3 @@ +CLASS net/minecraft/class_8759 net/minecraft/client/gui/hud/debug/TickChart + METHOD method_53482 toMillisecondsPerTick (D)D + ARG 0 nanosecondsPerTick diff --git a/mappings/net/minecraft/client/gui/hud/spectator/SpectatorMenu.mapping b/mappings/net/minecraft/client/gui/hud/spectator/SpectatorMenu.mapping index 0811ef00ed..819775c478 100644 --- a/mappings/net/minecraft/client/gui/hud/spectator/SpectatorMenu.mapping +++ b/mappings/net/minecraft/client/gui/hud/spectator/SpectatorMenu.mapping @@ -2,6 +2,7 @@ CLASS net/minecraft/class_531 net/minecraft/client/gui/hud/spectator/SpectatorMe FIELD field_26613 CLOSE_TEXT Lnet/minecraft/class_2561; FIELD field_26614 PREVIOUS_PAGE_TEXT Lnet/minecraft/class_2561; FIELD field_26615 NEXT_PAGE_TEXT Lnet/minecraft/class_2561; + FIELD field_32443 CLOSE_SLOT I FIELD field_3254 selectedSlot I FIELD field_3255 closeCallback Lnet/minecraft/class_536; FIELD field_3256 NEXT_PAGE_COMMAND Lnet/minecraft/class_537; @@ -11,6 +12,9 @@ CLASS net/minecraft/class_531 net/minecraft/client/gui/hud/spectator/SpectatorMe FIELD field_3261 CLOSE_COMMAND Lnet/minecraft/class_537; FIELD field_3262 PREVIOUS_PAGE_COMMAND Lnet/minecraft/class_537; FIELD field_3263 page I + FIELD field_45579 CLOSE_TEXTURE Lnet/minecraft/class_2960; + FIELD field_45580 SCROLL_LEFT_TEXTURE Lnet/minecraft/class_2960; + FIELD field_45581 SCROLL_RIGHT_TEXTURE Lnet/minecraft/class_2960; METHOD (Lnet/minecraft/class_536;)V ARG 1 closeCallback METHOD method_2770 getCommands ()Ljava/util/List; diff --git a/mappings/net/minecraft/client/gui/hud/spectator/SpectatorMenuCommand.mapping b/mappings/net/minecraft/client/gui/hud/spectator/SpectatorMenuCommand.mapping index 2496672b1d..08ff2e492c 100644 --- a/mappings/net/minecraft/client/gui/hud/spectator/SpectatorMenuCommand.mapping +++ b/mappings/net/minecraft/client/gui/hud/spectator/SpectatorMenuCommand.mapping @@ -3,7 +3,7 @@ CLASS net/minecraft/class_537 net/minecraft/client/gui/hud/spectator/SpectatorMe METHOD method_16893 isEnabled ()Z METHOD method_2783 use (Lnet/minecraft/class_531;)V ARG 1 menu - METHOD method_2784 renderIcon (Lnet/minecraft/class_4587;FI)V - ARG 1 matrices + METHOD method_2784 renderIcon (Lnet/minecraft/class_332;FI)V + ARG 1 context ARG 2 brightness ARG 3 alpha diff --git a/mappings/net/minecraft/client/gui/hud/spectator/TeamTeleportSpectatorMenu.mapping b/mappings/net/minecraft/client/gui/hud/spectator/TeamTeleportSpectatorMenu.mapping index 1c139250a8..5a80a51d1b 100644 --- a/mappings/net/minecraft/client/gui/hud/spectator/TeamTeleportSpectatorMenu.mapping +++ b/mappings/net/minecraft/client/gui/hud/spectator/TeamTeleportSpectatorMenu.mapping @@ -2,9 +2,20 @@ CLASS net/minecraft/class_540 net/minecraft/client/gui/hud/spectator/TeamTelepor FIELD field_26618 TEAM_TELEPORT_TEXT Lnet/minecraft/class_2561; FIELD field_26619 PROMPT_TEXT Lnet/minecraft/class_2561; FIELD field_3272 commands Ljava/util/List; + FIELD field_45583 TEXTURE Lnet/minecraft/class_2960; + METHOD method_47431 (Lnet/minecraft/class_310;Lnet/minecraft/class_268;)Ljava/util/stream/Stream; + ARG 1 team + METHOD method_47432 getCommands (Lnet/minecraft/class_310;Lnet/minecraft/class_269;)Ljava/util/List; + ARG 0 client + ARG 1 scoreboard CLASS class_541 TeleportToSpecificTeamCommand FIELD field_3274 scoreboardEntries Ljava/util/List; FIELD field_3275 team Lnet/minecraft/class_268; - FIELD field_3276 skinId Lnet/minecraft/class_2960; - METHOD (Lnet/minecraft/class_268;)V + FIELD field_41115 skinTexturesSupplier Ljava/util/function/Supplier; + METHOD (Lnet/minecraft/class_268;Ljava/util/List;Ljava/util/function/Supplier;)V + ARG 1 team + ARG 2 scoreboardEntries + ARG 3 skinTexturesSupplier + METHOD method_47433 create (Lnet/minecraft/class_310;Lnet/minecraft/class_268;)Ljava/util/Optional; + ARG 0 client ARG 1 team diff --git a/mappings/net/minecraft/client/gui/hud/spectator/TeleportSpectatorMenu.mapping b/mappings/net/minecraft/client/gui/hud/spectator/TeleportSpectatorMenu.mapping index c713318903..f755e83c4b 100644 --- a/mappings/net/minecraft/client/gui/hud/spectator/TeleportSpectatorMenu.mapping +++ b/mappings/net/minecraft/client/gui/hud/spectator/TeleportSpectatorMenu.mapping @@ -1,10 +1,14 @@ CLASS net/minecraft/class_538 net/minecraft/client/gui/hud/spectator/TeleportSpectatorMenu FIELD field_26616 TELEPORT_TEXT Lnet/minecraft/class_2561; FIELD field_26617 PROMPT_TEXT Lnet/minecraft/class_2561; - FIELD field_3267 ORDERING Lcom/google/common/collect/Ordering; + FIELD field_3267 ORDERING Ljava/util/Comparator; FIELD field_3268 elements Ljava/util/List; + FIELD field_45582 TELEPORT_TO_PLAYER_TEXTURE Lnet/minecraft/class_2960; METHOD (Ljava/util/Collection;)V ARG 1 entries - METHOD method_2785 (Lnet/minecraft/class_640;Lnet/minecraft/class_640;)I + METHOD method_2785 (Lnet/minecraft/class_640;)Ljava/util/UUID; ARG 0 a - ARG 1 b + METHOD method_46520 (Lnet/minecraft/class_640;)Lnet/minecraft/class_537; + ARG 0 entry + METHOD method_46521 (Lnet/minecraft/class_640;)Z + ARG 0 entry diff --git a/mappings/net/minecraft/client/gui/hud/spectator/TeleportToSpecificPlayerSpectatorCommand.mapping b/mappings/net/minecraft/client/gui/hud/spectator/TeleportToSpecificPlayerSpectatorCommand.mapping index 58ee5e75be..7bf3da6089 100644 --- a/mappings/net/minecraft/client/gui/hud/spectator/TeleportToSpecificPlayerSpectatorCommand.mapping +++ b/mappings/net/minecraft/client/gui/hud/spectator/TeleportToSpecificPlayerSpectatorCommand.mapping @@ -1,6 +1,6 @@ CLASS net/minecraft/class_530 net/minecraft/client/gui/hud/spectator/TeleportToSpecificPlayerSpectatorCommand FIELD field_26611 name Lnet/minecraft/class_2561; - FIELD field_3252 skinId Lnet/minecraft/class_2960; FIELD field_3253 gameProfile Lcom/mojang/authlib/GameProfile; + FIELD field_45578 skinTexturesSupplier Ljava/util/function/Supplier; METHOD (Lcom/mojang/authlib/GameProfile;)V ARG 1 gameProfile diff --git a/mappings/net/minecraft/client/gui/navigation/GuiNavigation.mapping b/mappings/net/minecraft/client/gui/navigation/GuiNavigation.mapping new file mode 100644 index 0000000000..3deaa86423 --- /dev/null +++ b/mappings/net/minecraft/client/gui/navigation/GuiNavigation.mapping @@ -0,0 +1,6 @@ +CLASS net/minecraft/class_8023 net/minecraft/client/gui/navigation/GuiNavigation + COMMENT Represents a directional navigation initiated by keyboard. + METHOD method_48231 getDirection ()Lnet/minecraft/class_8028; + CLASS class_8024 Arrow + CLASS class_8025 Down + CLASS class_8026 Tab diff --git a/mappings/net/minecraft/client/gui/navigation/GuiNavigationPath.mapping b/mappings/net/minecraft/client/gui/navigation/GuiNavigationPath.mapping new file mode 100644 index 0000000000..54e4ff33f7 --- /dev/null +++ b/mappings/net/minecraft/client/gui/navigation/GuiNavigationPath.mapping @@ -0,0 +1,16 @@ +CLASS net/minecraft/class_8016 net/minecraft/client/gui/navigation/GuiNavigationPath + COMMENT Represents a path of currently navigating elements from the root element + COMMENT to the leaf. + METHOD method_48192 of (Lnet/minecraft/class_4069;Lnet/minecraft/class_8016;)Lnet/minecraft/class_8016; + ARG 0 element + ARG 1 childPath + METHOD method_48193 of (Lnet/minecraft/class_364;)Lnet/minecraft/class_8016; + ARG 0 leaf + METHOD method_48194 of (Lnet/minecraft/class_364;[Lnet/minecraft/class_4069;)Lnet/minecraft/class_8016; + ARG 0 leaf + ARG 1 elements + METHOD method_48195 setFocused (Z)V + COMMENT Sets whether the path is focused. This propagates to children. + ARG 1 focused + CLASS class_8017 Leaf + CLASS class_8018 IntermediaryNode diff --git a/mappings/net/minecraft/client/gui/navigation/GuiNavigationType.mapping b/mappings/net/minecraft/client/gui/navigation/GuiNavigationType.mapping new file mode 100644 index 0000000000..a2332f90d5 --- /dev/null +++ b/mappings/net/minecraft/client/gui/navigation/GuiNavigationType.mapping @@ -0,0 +1,4 @@ +CLASS net/minecraft/class_8015 net/minecraft/client/gui/navigation/GuiNavigationType + COMMENT An enum representing the type of navigation input method. + METHOD method_48182 isMouse ()Z + METHOD method_48183 isKeyboard ()Z diff --git a/mappings/net/minecraft/client/gui/navigation/Navigable.mapping b/mappings/net/minecraft/client/gui/navigation/Navigable.mapping new file mode 100644 index 0000000000..22dec853ad --- /dev/null +++ b/mappings/net/minecraft/client/gui/navigation/Navigable.mapping @@ -0,0 +1,2 @@ +CLASS net/minecraft/class_8083 net/minecraft/client/gui/navigation/Navigable + METHOD method_48590 getNavigationOrder ()I diff --git a/mappings/net/minecraft/client/gui/navigation/NavigationAxis.mapping b/mappings/net/minecraft/client/gui/navigation/NavigationAxis.mapping new file mode 100644 index 0000000000..ad67efee47 --- /dev/null +++ b/mappings/net/minecraft/client/gui/navigation/NavigationAxis.mapping @@ -0,0 +1,6 @@ +CLASS net/minecraft/class_8027 net/minecraft/client/gui/navigation/NavigationAxis + METHOD method_48232 getOther ()Lnet/minecraft/class_8027; + METHOD method_48233 getDirection (Z)Lnet/minecraft/class_8028; + ARG 1 positive + METHOD method_48234 getPositiveDirection ()Lnet/minecraft/class_8028; + METHOD method_48235 getNegativeDirection ()Lnet/minecraft/class_8028; diff --git a/mappings/net/minecraft/client/gui/navigation/NavigationDirection.mapping b/mappings/net/minecraft/client/gui/navigation/NavigationDirection.mapping new file mode 100644 index 0000000000..7da24f1d74 --- /dev/null +++ b/mappings/net/minecraft/client/gui/navigation/NavigationDirection.mapping @@ -0,0 +1,30 @@ +CLASS net/minecraft/class_8028 net/minecraft/client/gui/navigation/NavigationDirection + FIELD field_41830 comparator Lit/unimi/dsi/fastutil/ints/IntComparator; + METHOD method_48237 getAxis ()Lnet/minecraft/class_8027; + METHOD method_48238 isAfter (II)Z + COMMENT {@return whether the coordinate {@code a} comes after {@code b}} + COMMENT + COMMENT

For example, if navigating downwards, {@code 2} comes after {@code 1}, + COMMENT while the opposite is true if navigating upwards. This always returns + COMMENT {@code false} if two arguments are equal. + COMMENT + COMMENT @see #isBefore + ARG 1 a + ARG 2 b + METHOD method_48239 getOpposite ()Lnet/minecraft/class_8028; + METHOD method_48240 isBefore (II)Z + COMMENT {@return whether the coordinate {@code a} comes before {@code b}} + COMMENT + COMMENT

For example, if navigating downwards, {@code 1} comes before {@code 2}, + COMMENT while the opposite is true if navigating upwards. This always returns + COMMENT {@code false} if two arguments are equal. + COMMENT + COMMENT @see #isAfter + ARG 1 a + ARG 2 b + METHOD method_48241 isPositive ()Z + METHOD method_48242 (II)I + ARG 1 a + ARG 2 b + METHOD method_48243 getComparator ()Lit/unimi/dsi/fastutil/ints/IntComparator; + COMMENT {@return the comparator that sorts the coordinates in ascending order} diff --git a/mappings/net/minecraft/client/gui/screen/AccessibilityOnboardingButtons.mapping b/mappings/net/minecraft/client/gui/screen/AccessibilityOnboardingButtons.mapping new file mode 100644 index 0000000000..bd9935bade --- /dev/null +++ b/mappings/net/minecraft/client/gui/screen/AccessibilityOnboardingButtons.mapping @@ -0,0 +1,9 @@ +CLASS net/minecraft/class_8082 net/minecraft/client/gui/screen/AccessibilityOnboardingButtons + METHOD method_48592 createLanguageButton (ILnet/minecraft/class_4185$class_4241;Z)Lnet/minecraft/class_8662; + ARG 0 width + ARG 1 onPress + ARG 2 hideText + METHOD method_48594 createAccessibilityButton (ILnet/minecraft/class_4185$class_4241;Z)Lnet/minecraft/class_8662; + ARG 0 width + ARG 1 onPress + ARG 2 hideText diff --git a/mappings/net/minecraft/client/gui/screen/AccessibilityOnboardingScreen.mapping b/mappings/net/minecraft/client/gui/screen/AccessibilityOnboardingScreen.mapping new file mode 100644 index 0000000000..d14b1572aa --- /dev/null +++ b/mappings/net/minecraft/client/gui/screen/AccessibilityOnboardingScreen.mapping @@ -0,0 +1,27 @@ +CLASS net/minecraft/class_8032 net/minecraft/client/gui/screen/AccessibilityOnboardingScreen + FIELD field_41837 NARRATOR_PROMPT Lnet/minecraft/class_2561; + FIELD field_41840 backgroundRenderer Lnet/minecraft/class_766; + FIELD field_41841 logoDrawer Lnet/minecraft/class_8020; + FIELD field_41842 gameOptions Lnet/minecraft/class_315; + FIELD field_41843 narratorPrompted Z + FIELD field_41844 narratorPromptTimer F + FIELD field_41845 textWidget Lnet/minecraft/class_8019; + FIELD field_42038 isNarratorUsable Z + FIELD field_46008 onClose Ljava/lang/Runnable; + METHOD (Lnet/minecraft/class_315;Ljava/lang/Runnable;)V + ARG 1 gameOptions + ARG 2 onClose + METHOD method_48259 yMargin ()I + METHOD method_48260 tickNarratorPrompt ()V + METHOD method_48639 (Lnet/minecraft/class_4185;)V + ARG 1 button + METHOD method_49296 setScreen (Lnet/minecraft/class_437;)V + ARG 1 screen + METHOD method_49297 (Lnet/minecraft/class_4185;)V + ARG 1 button + METHOD method_49298 (Lnet/minecraft/class_4185;)V + ARG 1 button + METHOD method_52746 (Lnet/minecraft/class_7847;)V + ARG 0 positioner + METHOD method_53552 saveAndRun (Ljava/lang/Runnable;)V + ARG 1 callback diff --git a/mappings/net/minecraft/client/gui/screen/ButtonTextures.mapping b/mappings/net/minecraft/client/gui/screen/ButtonTextures.mapping new file mode 100644 index 0000000000..b25b9c407a --- /dev/null +++ b/mappings/net/minecraft/client/gui/screen/ButtonTextures.mapping @@ -0,0 +1,11 @@ +CLASS net/minecraft/class_8666 net/minecraft/client/gui/screen/ButtonTextures + METHOD (Lnet/minecraft/class_2960;Lnet/minecraft/class_2960;)V + ARG 1 unfocused + ARG 2 focused + METHOD (Lnet/minecraft/class_2960;Lnet/minecraft/class_2960;Lnet/minecraft/class_2960;)V + ARG 1 enabled + ARG 2 focused + ARG 3 disabled + METHOD method_52729 get (ZZ)Lnet/minecraft/class_2960; + ARG 1 enabled + ARG 2 focused diff --git a/mappings/net/minecraft/client/gui/screen/ChatInputSuggestor.mapping b/mappings/net/minecraft/client/gui/screen/ChatInputSuggestor.mapping index 1a26ef6805..182465a947 100644 --- a/mappings/net/minecraft/client/gui/screen/ChatInputSuggestor.mapping +++ b/mappings/net/minecraft/client/gui/screen/ChatInputSuggestor.mapping @@ -40,8 +40,8 @@ CLASS net/minecraft/class_4717 net/minecraft/client/gui/screen/ChatInputSuggesto ARG 1 mouseX ARG 3 mouseY ARG 5 button - METHOD method_23923 render (Lnet/minecraft/class_4587;II)V - ARG 1 matrices + METHOD method_23923 render (Lnet/minecraft/class_332;II)V + ARG 1 context ARG 2 mouseX ARG 3 mouseY METHOD method_23924 keyPressed (III)Z @@ -52,7 +52,7 @@ CLASS net/minecraft/class_4717 net/minecraft/client/gui/screen/ChatInputSuggesto ARG 0 parse ARG 1 original ARG 2 firstCharacterIndex - METHOD method_23929 showUsages (Lnet/minecraft/class_124;)V + METHOD method_23929 showUsages (Lnet/minecraft/class_124;)Z ARG 1 formatting METHOD method_23930 getStartOfCurrentWord (Ljava/lang/String;)I ARG 0 input @@ -66,25 +66,18 @@ CLASS net/minecraft/class_4717 net/minecraft/client/gui/screen/ChatInputSuggesto ARG 0 original ARG 1 suggestion METHOD method_23937 showCommandSuggestions ()V - METHOD method_23958 getNarration ()Ljava/lang/String; + METHOD method_23958 getNarration ()Lnet/minecraft/class_2561; METHOD method_30104 sortSuggestions (Lcom/mojang/brigadier/suggestion/Suggestions;)Ljava/util/List; ARG 1 suggestions METHOD method_30505 formatException (Lcom/mojang/brigadier/exceptions/CommandSyntaxException;)Lnet/minecraft/class_5481; ARG 0 exception - METHOD method_44277 getNodeAt (I)Lcom/mojang/brigadier/tree/CommandNode; - COMMENT {@return the command node at {@code cursor}} - ARG 1 cursor - METHOD method_44278 getNodeAt (ILcom/mojang/brigadier/context/CommandContextBuilder;)Lcom/mojang/brigadier/tree/CommandNode; - ARG 0 cursor - ARG 1 builder METHOD method_44931 clearWindow ()V - METHOD method_44932 renderMessages (Lnet/minecraft/class_4587;)V - ARG 1 matrices - METHOD method_44933 tryRenderWindow (Lnet/minecraft/class_4587;II)Z - ARG 1 matrices + METHOD method_44932 renderMessages (Lnet/minecraft/class_332;)V + ARG 1 context + METHOD method_44933 tryRenderWindow (Lnet/minecraft/class_332;II)Z + ARG 1 context ARG 2 mouseX ARG 3 mouseY - METHOD method_45028 getParse ()Lcom/mojang/brigadier/ParseResults; CLASS class_464 SuggestionWindow FIELD field_21630 lastNarrationIndex I FIELD field_25709 suggestions Ljava/util/List; @@ -108,8 +101,8 @@ CLASS net/minecraft/class_4717 net/minecraft/client/gui/screen/ChatInputSuggesto ARG 1 x ARG 2 y ARG 3 button - METHOD method_2373 render (Lnet/minecraft/class_4587;II)V - ARG 1 matrices + METHOD method_2373 render (Lnet/minecraft/class_332;II)V + ARG 1 context ARG 2 mouseX ARG 3 mouseY METHOD method_2374 select (I)V diff --git a/mappings/net/minecraft/client/gui/screen/ChatPreviewBackground.mapping b/mappings/net/minecraft/client/gui/screen/ChatPreviewBackground.mapping deleted file mode 100644 index 1373dec307..0000000000 --- a/mappings/net/minecraft/client/gui/screen/ChatPreviewBackground.mapping +++ /dev/null @@ -1,19 +0,0 @@ -CLASS net/minecraft/class_7625 net/minecraft/client/gui/screen/ChatPreviewBackground - FIELD field_39845 MAX_FADE_TIME J - FIELD field_39846 previewText Lnet/minecraft/class_2561; - FIELD field_39847 currentFadeTime J - FIELD field_39848 lastRenderTime J - METHOD method_44922 init (J)V - ARG 1 currentTime - METHOD method_44923 computeRenderData (JLnet/minecraft/class_2561;)Lnet/minecraft/class_7625$class_7626; - ARG 1 currentTime - ARG 3 previewText - METHOD method_44924 computeRenderDataWithoutText (J)Lnet/minecraft/class_7625$class_7626; - ARG 1 timeDelta - METHOD method_44925 computeRenderDataWithText (JLnet/minecraft/class_2561;)Lnet/minecraft/class_7625$class_7626; - ARG 1 timeDelta - ARG 3 previewText - METHOD method_44926 toAlpha (J)F - ARG 0 timeDelta - CLASS class_7626 RenderData - FIELD field_39849 EMPTY Lnet/minecraft/class_7625$class_7626; diff --git a/mappings/net/minecraft/client/gui/screen/ChatScreen.mapping b/mappings/net/minecraft/client/gui/screen/ChatScreen.mapping index 2479c458be..cae9e2f83d 100644 --- a/mappings/net/minecraft/client/gui/screen/ChatScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/ChatScreen.mapping @@ -12,20 +12,7 @@ CLASS net/minecraft/class_408 net/minecraft/client/gui/screen/ChatScreen FIELD field_2389 chatLastMessage Ljava/lang/String; FIELD field_32237 SHIFT_SCROLL_AMOUNT D FIELD field_33953 USAGE_TEXT Lnet/minecraft/class_2561; - FIELD field_39341 PREVIEW_LEFT_MARGIN I - FIELD field_39342 PREVIEW_RIGHT_MARGIN I - FIELD field_39343 PREVIEW_BOTTOM_MARGIN I - FIELD field_39344 CHAT_PREVIEW_WARNING_TOAST_TITLE Lnet/minecraft/class_2561; - FIELD field_39345 CHAT_PREVIEW_WARNING_TOAST_TEXT Lnet/minecraft/class_2561; - FIELD field_39347 chatPreviewer Lnet/minecraft/class_7479; FIELD field_39774 MAX_INDICATOR_TOOLTIP_WIDTH I - FIELD field_39850 chatPreviewMode Lnet/minecraft/class_7628; - FIELD field_39851 missingPreview Z - FIELD field_39852 chatPreviewBackground Lnet/minecraft/class_7625; - FIELD field_39853 PREVIEW_PENDING_COLOR I - FIELD field_39854 PREVIEW_CONSUMABLE_COLOR I - FIELD field_39855 CHAT_PREVIEW_INPUT_TEXT Lnet/minecraft/class_2561; - FIELD field_39856 EVENT_HIGHLIGHT_COLOR I METHOD (Ljava/lang/String;)V ARG 1 originalChatText METHOD method_2108 setText (Ljava/lang/String;)V @@ -34,57 +21,12 @@ CLASS net/minecraft/class_408 net/minecraft/client/gui/screen/ChatScreen ARG 1 offset METHOD method_23945 onChatFieldUpdate (Ljava/lang/String;)V ARG 1 chatText - METHOD method_44050 getPreviewLeft ()I - METHOD method_44051 getPreviewRight ()I METHOD method_44052 getTextStyleAt (DD)Lnet/minecraft/class_2583; ARG 1 x ARG 3 y - METHOD method_44053 renderChatPreview (Lnet/minecraft/class_4587;Lnet/minecraft/class_2561;FZ)V - ARG 1 matrices - ARG 2 previewText - ARG 3 alpha - ARG 4 signable METHOD method_44054 normalize (Ljava/lang/String;)Ljava/lang/String; COMMENT {@return the {@code message} normalized by trimming it and then normalizing spaces} ARG 1 chatText - METHOD method_44055 getPreviewTop (I)I - ARG 1 previewHeight METHOD method_44056 sendMessage (Ljava/lang/String;Z)Z ARG 1 chatText ARG 2 addToHistory - METHOD method_44057 getPreviewHeight (Ljava/util/List;)I - ARG 1 lines - METHOD method_44058 getPreviewTextStyleAt (DD)Lnet/minecraft/class_2583; - ARG 1 x - ARG 3 y - METHOD method_44059 updatePreviewer (Ljava/lang/String;)V - ARG 1 chatText - METHOD method_44060 getChatPreviewer ()Lnet/minecraft/class_7479; - METHOD method_44061 shouldPreviewChat ()Z - COMMENT {@return whether the client and the server both allow chat previews} - COMMENT - COMMENT

To check if the client allows chat previews, check {@linkplain - COMMENT net.minecraft.client.option.GameOptions#getChatPreview the chat preview option}. - COMMENT To check if the server allows chat previews, check {@link - COMMENT net.minecraft.client.network.ServerInfo#shouldPreviewChat}. - METHOD method_44063 getPreviewWidth ()I - METHOD method_44064 getPreviewBottom ()I - METHOD method_44279 tryRequestPreview (Ljava/lang/String;)V - ARG 1 chatText - METHOD method_44280 tryRequestChatPreview (Ljava/lang/String;)V - ARG 1 chatText - METHOD method_44281 tryRequestCommandPreview (Ljava/lang/String;)V - ARG 1 chatText - METHOD method_44934 drawEventHighlight (Lnet/minecraft/class_4587;Lnet/minecraft/class_5481;II)V - ARG 1 matrices - ARG 2 text - ARG 3 y - ARG 4 alpha - METHOD method_44935 wrapPreviewText (Lnet/minecraft/class_2561;)Ljava/util/List; - ARG 1 preview - METHOD method_44936 (Lnet/minecraft/class_2583;)Z - ARG 0 style - METHOD method_44937 getPreviewText ()Lnet/minecraft/class_2561; - METHOD method_45029 getPreviewScreenText ()Lnet/minecraft/class_2561; - COMMENT {@return the text to show in the preview screen, or {@code null} if there is - COMMENT nothing to show} diff --git a/mappings/net/minecraft/client/gui/screen/ConfirmLinkScreen.mapping b/mappings/net/minecraft/client/gui/screen/ConfirmLinkScreen.mapping index 6a009bccb0..9318f32b44 100644 --- a/mappings/net/minecraft/client/gui/screen/ConfirmLinkScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/ConfirmLinkScreen.mapping @@ -6,7 +6,7 @@ CLASS net/minecraft/class_407 net/minecraft/client/gui/screen/ConfirmLinkScreen METHOD (Lit/unimi/dsi/fastutil/booleans/BooleanConsumer;Ljava/lang/String;Z)V ARG 1 callback ARG 2 link - ARG 3 trusted + ARG 3 linkTrusted METHOD (Lit/unimi/dsi/fastutil/booleans/BooleanConsumer;Lnet/minecraft/class_2561;Ljava/lang/String;Lnet/minecraft/class_2561;Z)V ARG 1 callback ARG 2 title @@ -37,3 +37,21 @@ CLASS net/minecraft/class_407 net/minecraft/client/gui/screen/ConfirmLinkScreen ARG 1 link METHOD method_44659 getConfirmText (Z)Lnet/minecraft/class_5250; ARG 0 linkTrusted + METHOD method_49622 (Ljava/lang/String;Lnet/minecraft/class_310;Lnet/minecraft/class_437;Z)V + ARG 3 confirmed + METHOD method_49623 open (Ljava/lang/String;Lnet/minecraft/class_437;Z)V + COMMENT Opens the confirmation screen to open {@code url}. + COMMENT + COMMENT @see #opening + ARG 0 url + ARG 1 parent + ARG 2 linkTrusted + METHOD method_49624 (Ljava/lang/String;Lnet/minecraft/class_437;ZLnet/minecraft/class_4185;)V + ARG 3 button + METHOD method_49625 opening (Ljava/lang/String;Lnet/minecraft/class_437;Z)Lnet/minecraft/class_4185$class_4241; + COMMENT {@return the button press action that opens the confirmation screen to open {@code url}} + COMMENT + COMMENT @see #open + ARG 0 url + ARG 1 parent + ARG 2 linkTrusted diff --git a/mappings/net/minecraft/client/gui/screen/ConnectScreen.mapping b/mappings/net/minecraft/client/gui/screen/ConnectScreen.mapping index 79fa80d89e..319369c8cf 100644 --- a/mappings/net/minecraft/client/gui/screen/ConnectScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/ConnectScreen.mapping @@ -14,17 +14,23 @@ CLASS net/minecraft/class_412 net/minecraft/client/gui/screen/ConnectScreen FIELD field_2413 status Lnet/minecraft/class_2561; FIELD field_32238 NARRATOR_INTERVAL J FIELD field_33736 BLOCKED_HOST_TEXT Lnet/minecraft/class_2561; - METHOD (Lnet/minecraft/class_437;)V + FIELD field_44548 failureErrorMessage Lnet/minecraft/class_2561; + FIELD field_44970 ABORTED_TEXT Lnet/minecraft/class_2561; + FIELD field_44971 future Lio/netty/channel/ChannelFuture; + METHOD (Lnet/minecraft/class_437;Lnet/minecraft/class_2561;)V ARG 1 parent + ARG 2 failureErrorMessage METHOD method_19800 (Lnet/minecraft/class_4185;)V ARG 1 button - METHOD method_2130 connect (Lnet/minecraft/class_310;Lnet/minecraft/class_639;)V + METHOD method_2130 connect (Lnet/minecraft/class_310;Lnet/minecraft/class_639;Lnet/minecraft/class_642;)V ARG 1 client ARG 2 address + ARG 3 info METHOD method_2131 setStatus (Lnet/minecraft/class_2561;)V ARG 1 status - METHOD method_36877 connect (Lnet/minecraft/class_437;Lnet/minecraft/class_310;Lnet/minecraft/class_639;Lnet/minecraft/class_642;)V + METHOD method_36877 connect (Lnet/minecraft/class_437;Lnet/minecraft/class_310;Lnet/minecraft/class_639;Lnet/minecraft/class_642;Z)V ARG 0 screen ARG 1 client ARG 2 address ARG 3 info + ARG 4 quickPlay diff --git a/mappings/net/minecraft/client/gui/screen/CreditsScreen.mapping b/mappings/net/minecraft/client/gui/screen/CreditsScreen.mapping index d2fe462368..d066200fb7 100644 --- a/mappings/net/minecraft/client/gui/screen/CreditsScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/CreditsScreen.mapping @@ -1,12 +1,10 @@ CLASS net/minecraft/class_445 net/minecraft/client/gui/screen/CreditsScreen FIELD field_24260 OBFUSCATION_PLACEHOLDER Ljava/lang/String; FIELD field_24261 centeredLines Lit/unimi/dsi/fastutil/ints/IntSet; - FIELD field_2626 MINECRAFT_TITLE_TEXTURE Lnet/minecraft/class_2960; FIELD field_2627 endCredits Z FIELD field_2628 time F FIELD field_2629 creditsHeight I FIELD field_2630 finishAction Ljava/lang/Runnable; - FIELD field_2631 EDITION_TITLE_TEXTURE Lnet/minecraft/class_2960; FIELD field_2632 LOGGER Lorg/slf4j/Logger; FIELD field_2633 VIGNETTE_TEXTURE Lnet/minecraft/class_2960; FIELD field_2634 credits Ljava/util/List; @@ -14,19 +12,16 @@ CLASS net/minecraft/class_445 net/minecraft/client/gui/screen/CreditsScreen FIELD field_32273 CENTERED_LINE_PREFIX Ljava/lang/String; FIELD field_33954 baseSpeed F FIELD field_33955 SEPARATOR_LINE Lnet/minecraft/class_2561; - FIELD field_33956 MAX_WIDTH I FIELD field_33957 SPACE_BAR_SPEED_MULTIPLIER F FIELD field_34010 spaceKeyPressed Z FIELD field_34011 pressedCtrlKeys Lit/unimi/dsi/fastutil/ints/IntSet; FIELD field_34012 CTRL_KEY_SPEED_MULTIPLIER F + FIELD field_41848 logoDrawer Lnet/minecraft/class_8020; + FIELD field_44778 speedMultiplier I METHOD (ZLjava/lang/Runnable;)V ARG 1 endCredits ARG 2 finishAction METHOD method_2257 closeScreen ()V - METHOD method_2258 renderBackground ()V - METHOD method_29347 (Lnet/minecraft/class_4587;Ljava/lang/Integer;Ljava/lang/Integer;)V - ARG 2 x - ARG 3 y METHOD method_37304 addText (Lnet/minecraft/class_2561;Z)V ARG 1 text ARG 2 centered diff --git a/mappings/net/minecraft/client/gui/screen/CustomizeFlatLevelScreen.mapping b/mappings/net/minecraft/client/gui/screen/CustomizeFlatLevelScreen.mapping index f3a5be36ce..0636b6a0ea 100644 --- a/mappings/net/minecraft/client/gui/screen/CustomizeFlatLevelScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/CustomizeFlatLevelScreen.mapping @@ -6,13 +6,13 @@ CLASS net/minecraft/class_413 net/minecraft/client/gui/screen/CustomizeFlatLevel FIELD field_2424 layers Lnet/minecraft/class_413$class_4192; FIELD field_2425 heightText Lnet/minecraft/class_2561; FIELD field_24565 configConsumer Ljava/util/function/Consumer; - FIELD field_32239 ICON_TEXTURE_SIZE I FIELD field_32240 ICON_SIZE I FIELD field_32241 BUTTON_HEIGHT I FIELD field_32242 ICON_BACKGROUND_OFFSET_X I FIELD field_32243 ICON_BACKGROUND_OFFSET_Y I FIELD field_32244 ICON_OFFSET_X I FIELD field_32245 ICON_OFFSET_Y I + FIELD field_45406 SLOT_TEXTURE Lnet/minecraft/class_2960; METHOD (Lnet/minecraft/class_525;Ljava/util/function/Consumer;Lnet/minecraft/class_3232;)V ARG 1 parent ARG 2 configConsumer @@ -31,14 +31,15 @@ CLASS net/minecraft/class_413 net/minecraft/client/gui/screen/CustomizeFlatLevel ARG 1 config METHOD method_29055 getConfig ()Lnet/minecraft/class_3232; CLASS class_4192 SuperflatLayersListWidget + FIELD field_44667 STATS_ICONS_TEXTURE Lnet/minecraft/class_2960; METHOD method_19372 updateLayers ()V CLASS class_4193 SuperflatLayerEntry - METHOD method_19373 renderIconBackgroundTexture (Lnet/minecraft/class_4587;II)V - ARG 1 matrices + METHOD method_19373 renderIconBackgroundTexture (Lnet/minecraft/class_332;II)V + ARG 1 context ARG 2 x ARG 3 y - METHOD method_19375 renderIcon (Lnet/minecraft/class_4587;IILnet/minecraft/class_1799;)V - ARG 1 matrices + METHOD method_19375 renderIcon (Lnet/minecraft/class_332;IILnet/minecraft/class_1799;)V + ARG 1 context ARG 2 x ARG 3 y ARG 4 iconItem diff --git a/mappings/net/minecraft/client/gui/screen/DeathScreen.mapping b/mappings/net/minecraft/client/gui/screen/DeathScreen.mapping index bba5bddcfc..3073f66f64 100644 --- a/mappings/net/minecraft/client/gui/screen/DeathScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/DeathScreen.mapping @@ -4,15 +4,21 @@ CLASS net/minecraft/class_418 net/minecraft/client/gui/screen/DeathScreen FIELD field_2451 ticksSinceDeath I FIELD field_26537 scoreText Lnet/minecraft/class_2561; FIELD field_33809 buttons Ljava/util/List; + FIELD field_41684 titleScreenButton Lnet/minecraft/class_4185; + FIELD field_45407 DRAFT_REPORT_ICON_TEXTURE Lnet/minecraft/class_2960; METHOD (Lnet/minecraft/class_2561;Z)V ARG 1 message ARG 2 isHardcore - METHOD method_19808 (Lnet/minecraft/class_4185;)V - ARG 1 button METHOD method_19809 (Lnet/minecraft/class_4185;)V ARG 1 button - METHOD method_20373 onConfirmQuit (Z)V - ARG 1 quit METHOD method_2164 getTextComponentUnderMouse (I)Lnet/minecraft/class_2583; ARG 1 mouseX METHOD method_22364 quitLevel ()V + METHOD method_47938 (Lnet/minecraft/class_4185;)V + ARG 1 button + METHOD method_47939 (Z)V + ARG 1 confirmed + METHOD method_47940 onTitleScreenButtonClicked ()V + METHOD method_49299 setButtonsActive (Z)V + ARG 1 active + CLASS class_8183 TitleScreenConfirmScreen diff --git a/mappings/net/minecraft/client/gui/screen/DisconnectedScreen.mapping b/mappings/net/minecraft/client/gui/screen/DisconnectedScreen.mapping index e974400890..91cf41851d 100644 --- a/mappings/net/minecraft/client/gui/screen/DisconnectedScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/DisconnectedScreen.mapping @@ -1,11 +1,20 @@ CLASS net/minecraft/class_419 net/minecraft/client/gui/screen/DisconnectedScreen - FIELD field_2454 reasonHeight I FIELD field_2456 parent Lnet/minecraft/class_437; FIELD field_2457 reason Lnet/minecraft/class_2561; - FIELD field_2458 reasonFormatted Lnet/minecraft/class_5489; + FIELD field_44549 TO_MENU_TEXT Lnet/minecraft/class_2561; + FIELD field_44550 TO_TITLE_TEXT Lnet/minecraft/class_2561; + FIELD field_44551 buttonLabel Lnet/minecraft/class_2561; + FIELD field_44552 grid Lnet/minecraft/class_8667; METHOD (Lnet/minecraft/class_437;Lnet/minecraft/class_2561;Lnet/minecraft/class_2561;)V ARG 1 parent ARG 2 title ARG 3 reason + METHOD (Lnet/minecraft/class_437;Lnet/minecraft/class_2561;Lnet/minecraft/class_2561;Lnet/minecraft/class_2561;)V + ARG 1 parent + ARG 2 title + ARG 3 reason + ARG 4 buttonLabel METHOD method_19814 (Lnet/minecraft/class_4185;)V ARG 1 button + METHOD method_51256 (Lnet/minecraft/class_4185;)V + ARG 1 button diff --git a/mappings/net/minecraft/client/gui/screen/GameMenuScreen.mapping b/mappings/net/minecraft/client/gui/screen/GameMenuScreen.mapping index 9e3ee8925b..db86960746 100644 --- a/mappings/net/minecraft/client/gui/screen/GameMenuScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/GameMenuScreen.mapping @@ -1,28 +1,40 @@ CLASS net/minecraft/class_433 net/minecraft/client/gui/screen/GameMenuScreen FIELD field_19319 showMenu Z - FIELD field_32257 SNAPSHOT_FEEDBACK_URL Ljava/lang/String; - FIELD field_32258 JAVA_FEEDBACK_URL Ljava/lang/String; - FIELD field_32259 SNAPSHOT_BUGS_URL Ljava/lang/String; + FIELD field_40792 exitButton Lnet/minecraft/class_4185; + FIELD field_41611 RETURN_TO_MENU_TEXT Lnet/minecraft/class_2561; + FIELD field_41613 SAVING_LEVEL_TEXT Lnet/minecraft/class_2561; + FIELD field_41614 GAME_TEXT Lnet/minecraft/class_2561; + FIELD field_41615 PAUSED_TEXT Lnet/minecraft/class_2561; + FIELD field_41616 GRID_COLUMNS I + FIELD field_41617 BUTTONS_TOP_MARGIN I + FIELD field_41618 GRID_MARGIN I + FIELD field_41619 WIDE_BUTTON_WIDTH I + FIELD field_41620 NORMAL_BUTTON_WIDTH I + FIELD field_41621 RETURN_TO_GAME_TEXT Lnet/minecraft/class_2561; + FIELD field_41622 ADVANCEMENTS_TEXT Lnet/minecraft/class_2561; + FIELD field_41623 STATS_TEXT Lnet/minecraft/class_2561; + FIELD field_41624 SEND_FEEDBACK_TEXT Lnet/minecraft/class_2561; + FIELD field_41625 REPORT_BUGS_TEXT Lnet/minecraft/class_2561; + FIELD field_41626 OPTIONS_TEXT Lnet/minecraft/class_2561; + FIELD field_41627 SHARE_TO_LAN_TEXT Lnet/minecraft/class_2561; + FIELD field_41628 PLAYER_REPORTING_TEXT Lnet/minecraft/class_2561; + FIELD field_45416 DRAFT_REPORT_ICON_TEXTURE Lnet/minecraft/class_2960; METHOD (Z)V ARG 1 showMenu METHOD method_19836 (Lnet/minecraft/class_4185;)V ARG 1 button - METHOD method_19837 (Z)V - ARG 1 confirmed - METHOD method_19838 (Lnet/minecraft/class_4185;)V - ARG 1 button - METHOD method_19839 (Ljava/lang/String;Z)V - ARG 2 confirmed - METHOD method_19840 (Lnet/minecraft/class_4185;)V - ARG 1 button - METHOD method_19841 (Lnet/minecraft/class_4185;)V - ARG 1 button - METHOD method_19842 (Ljava/lang/String;Lnet/minecraft/class_4185;)V - ARG 2 button - METHOD method_19843 (Lnet/minecraft/class_4185;)V - ARG 1 button - METHOD method_19844 (Lnet/minecraft/class_4185;)V - ARG 1 button METHOD method_19845 (Lnet/minecraft/class_4185;)V ARG 1 button METHOD method_20543 initWidgets ()V + METHOD method_47632 disconnect ()V + METHOD method_47898 (Ljava/util/function/Supplier;Lnet/minecraft/class_4185;)V + ARG 2 button + METHOD method_47899 createUrlButton (Lnet/minecraft/class_2561;Ljava/lang/String;)Lnet/minecraft/class_4185; + ARG 1 text + ARG 2 url + METHOD method_47900 createButton (Lnet/minecraft/class_2561;Ljava/util/function/Supplier;)Lnet/minecraft/class_4185; + ARG 1 text + ARG 2 screenSupplier + METHOD method_47901 (Ljava/lang/String;Z)V + ARG 2 confirmed + METHOD method_53558 shouldShowMenu ()Z diff --git a/mappings/net/minecraft/client/gui/screen/GameModeSelectionScreen.mapping b/mappings/net/minecraft/client/gui/screen/GameModeSelectionScreen.mapping index 22004f0794..841556cc2f 100644 --- a/mappings/net/minecraft/client/gui/screen/GameModeSelectionScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/GameModeSelectionScreen.mapping @@ -1,8 +1,8 @@ CLASS net/minecraft/class_5289 net/minecraft/client/gui/screen/GameModeSelectionScreen FIELD field_24566 TEXTURE Lnet/minecraft/class_2960; FIELD field_24567 UI_WIDTH I - FIELD field_24568 currentGameMode Ljava/util/Optional; - FIELD field_24569 gameMode Ljava/util/Optional; + FIELD field_24568 currentGameMode Lnet/minecraft/class_5289$class_5290; + FIELD field_24569 gameMode Lnet/minecraft/class_5289$class_5290; FIELD field_24570 lastMouseX I FIELD field_24571 lastMouseY I FIELD field_24572 mouseUsedForSelection Z @@ -12,13 +12,11 @@ CLASS net/minecraft/class_5289 net/minecraft/client/gui/screen/GameModeSelection FIELD field_32311 TEXTURE_HEIGHT I FIELD field_32312 BUTTON_SIZE I FIELD field_32313 ICON_OFFSET I - METHOD method_28062 (Lnet/minecraft/class_4587;Lnet/minecraft/class_5289$class_5290;)V - ARG 2 gameMode - METHOD method_28064 apply (Lnet/minecraft/class_310;Ljava/util/Optional;)V + FIELD field_45432 SLOT_TEXTURE Lnet/minecraft/class_2960; + FIELD field_45433 SELECTION_TEXTURE Lnet/minecraft/class_2960; + METHOD method_28064 apply (Lnet/minecraft/class_310;Lnet/minecraft/class_5289$class_5290;)V ARG 0 client - ARG 1 gameMode - METHOD method_28065 (Lnet/minecraft/class_5289$class_5291;Lnet/minecraft/class_5289$class_5290;)V - ARG 1 gameMode + ARG 1 gameModeSelection METHOD method_28068 apply ()V METHOD method_28069 checkForClose ()Z METHOD method_30106 getPreviousGameMode ()Lnet/minecraft/class_1934; @@ -32,14 +30,14 @@ CLASS net/minecraft/class_5289 net/minecraft/client/gui/screen/GameModeSelection ARG 4 command ARG 5 icon METHOD method_28070 getText ()Lnet/minecraft/class_2561; - METHOD method_28074 renderIcon (Lnet/minecraft/class_918;II)V - ARG 1 itemRenderer + METHOD method_28074 renderIcon (Lnet/minecraft/class_332;II)V + ARG 1 context ARG 2 x ARG 3 y METHOD method_28075 getCommand ()Ljava/lang/String; - METHOD method_28076 of (Lnet/minecraft/class_1934;)Ljava/util/Optional; + METHOD method_28076 of (Lnet/minecraft/class_1934;)Lnet/minecraft/class_5289$class_5290; ARG 0 gameMode - METHOD method_28078 next ()Ljava/util/Optional; + METHOD method_28078 next ()Lnet/minecraft/class_5289$class_5290; CLASS class_5291 ButtonWidget FIELD field_24586 gameMode Lnet/minecraft/class_5289$class_5290; FIELD field_24587 selected Z @@ -47,11 +45,9 @@ CLASS net/minecraft/class_5289 net/minecraft/client/gui/screen/GameModeSelection ARG 2 gameMode ARG 3 x ARG 4 y - METHOD method_28080 drawBackground (Lnet/minecraft/class_4587;Lnet/minecraft/class_1060;)V - ARG 1 matrices - ARG 2 textureManager - METHOD method_28082 drawSelectionBox (Lnet/minecraft/class_4587;Lnet/minecraft/class_1060;)V - ARG 1 matrices - ARG 2 textureManager + METHOD method_28080 drawBackground (Lnet/minecraft/class_332;)V + ARG 1 context + METHOD method_28082 drawSelectionBox (Lnet/minecraft/class_332;)V + ARG 1 context METHOD method_28083 setSelected (Z)V ARG 1 selected diff --git a/mappings/net/minecraft/client/gui/screen/LevelLoadingScreen.mapping b/mappings/net/minecraft/client/gui/screen/LevelLoadingScreen.mapping index e2f3f694e4..6f3c628d9e 100644 --- a/mappings/net/minecraft/client/gui/screen/LevelLoadingScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/LevelLoadingScreen.mapping @@ -8,8 +8,8 @@ CLASS net/minecraft/class_3928 net/minecraft/client/gui/screen/LevelLoadingScree ARG 1 progressProvider 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 + METHOD method_17538 drawChunkMap (Lnet/minecraft/class_332;Lnet/minecraft/class_3953;IIII)V + ARG 0 context ARG 1 progressProvider ARG 2 centerX ARG 3 centerY diff --git a/mappings/net/minecraft/client/gui/screen/OpenToLanScreen.mapping b/mappings/net/minecraft/client/gui/screen/OpenToLanScreen.mapping index 842a7d4e13..21a8a4f6c7 100644 --- a/mappings/net/minecraft/client/gui/screen/OpenToLanScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/OpenToLanScreen.mapping @@ -5,15 +5,27 @@ CLASS net/minecraft/class_436 net/minecraft/client/gui/screen/OpenToLanScreen FIELD field_25889 ALLOW_COMMANDS_TEXT Lnet/minecraft/class_2561; FIELD field_25890 GAME_MODE_TEXT Lnet/minecraft/class_2561; FIELD field_26545 OTHER_PLAYERS_TEXT Lnet/minecraft/class_2561; + FIELD field_41106 UNAVAILABLE_PORT_TEXT Lnet/minecraft/class_2561; + FIELD field_41107 ERROR_TEXT_COLOR I + FIELD field_41108 PORT_TEXT Lnet/minecraft/class_2561; + FIELD field_41109 INVALID_PORT_TEXT Lnet/minecraft/class_2561; + FIELD field_41110 port I + FIELD field_41111 portField Lnet/minecraft/class_342; + FIELD field_41629 MIN_PORT I + FIELD field_41630 MAX_PORT I METHOD (Lnet/minecraft/class_437;)V - ARG 1 parent + ARG 1 screen METHOD method_19850 (Lnet/minecraft/class_4185;)V ARG 1 button - METHOD method_19851 (Lnet/minecraft/class_4185;)V - ARG 1 button + METHOD method_19851 (Lnet/minecraft/class_1132;Lnet/minecraft/class_4185;)V + ARG 2 button METHOD method_32638 (Lnet/minecraft/class_5676;Lnet/minecraft/class_1934;)V ARG 1 button ARG 2 gameMode METHOD method_32639 (Lnet/minecraft/class_5676;Ljava/lang/Boolean;)V ARG 1 button ARG 2 allowCommands + METHOD method_47416 (Lnet/minecraft/class_4185;Ljava/lang/String;)V + ARG 2 portText + METHOD method_47417 updatePort (Ljava/lang/String;)Lnet/minecraft/class_2561; + ARG 1 portText diff --git a/mappings/net/minecraft/client/gui/screen/PresetsScreen.mapping b/mappings/net/minecraft/client/gui/screen/PresetsScreen.mapping index f79e1dfe99..43af2c7b6b 100644 --- a/mappings/net/minecraft/client/gui/screen/PresetsScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/PresetsScreen.mapping @@ -8,7 +8,6 @@ CLASS net/minecraft/class_430 net/minecraft/client/gui/screen/PresetsScreen FIELD field_2524 listText Lnet/minecraft/class_2561; FIELD field_2525 selectPresetButton Lnet/minecraft/class_4185; FIELD field_27985 BIOME_KEY Lnet/minecraft/class_5321; - FIELD field_32263 ICON_TEXTURE_SIZE I FIELD field_32264 ICON_SIZE I FIELD field_32265 BUTTON_HEIGHT I FIELD field_32266 ICON_BACKGROUND_OFFSET_X I @@ -16,42 +15,57 @@ CLASS net/minecraft/class_430 net/minecraft/client/gui/screen/PresetsScreen FIELD field_32268 ICON_OFFSET_X I FIELD field_32269 ICON_OFFSET_Y I FIELD field_37908 UNKNOWN_PRESET_TEXT Lnet/minecraft/class_2561; + FIELD field_45417 SLOT_TEXTURE Lnet/minecraft/class_2960; METHOD (Lnet/minecraft/class_413;)V ARG 1 parent METHOD method_19846 (Lnet/minecraft/class_4185;)V ARG 1 button METHOD method_20102 updateSelectButton (Z)V ARG 1 hasSelected - METHOD method_29058 parsePresetLayersString (Ljava/lang/String;)Ljava/util/List; + METHOD method_29058 parsePresetLayersString (Lnet/minecraft/class_7871;Ljava/lang/String;)Ljava/util/List; COMMENT Parse a string like {@code "minecraft:bedrock,3*minecraft:dirt,minecraft:grass_block"} COMMENT to a list of {@link FlatChunkGeneratorLayer}. - ARG 0 layers - METHOD method_29059 parseLayerString (Ljava/lang/String;I)Lnet/minecraft/class_3229; + ARG 0 blockLookup + ARG 1 layers + METHOD method_29059 parseLayerString (Lnet/minecraft/class_7871;Ljava/lang/String;I)Lnet/minecraft/class_3229; COMMENT Parse a string like {@code "60*minecraft:stone"} to a {@link FlatChunkGeneratorLayer}. - ARG 0 layer - ARG 1 layerStartHeight - METHOD method_29060 parsePresetString (Lnet/minecraft/class_2378;Lnet/minecraft/class_2378;Ljava/lang/String;Lnet/minecraft/class_3232;)Lnet/minecraft/class_3232; - ARG 0 biomeRegistry - ARG 1 structureSetRegistry - ARG 2 preset - ARG 3 generatorConfig + ARG 0 blockLookup + ARG 1 layer + ARG 2 layerStartHeight + METHOD method_29060 parsePresetString (Lnet/minecraft/class_7871;Lnet/minecraft/class_7871;Lnet/minecraft/class_7871;Lnet/minecraft/class_7871;Ljava/lang/String;Lnet/minecraft/class_3232;)Lnet/minecraft/class_3232; + ARG 0 blockLookup + ARG 1 biomeLookup + ARG 2 structureSetLookup + ARG 3 placedFeatureLookup + ARG 4 preset + ARG 5 config + METHOD method_29061 (Lnet/minecraft/class_2960;)Lnet/minecraft/class_5321; + ARG 0 biomeId METHOD method_29062 getGeneratorConfigString (Lnet/minecraft/class_3232;)Ljava/lang/String; ARG 0 config CLASS class_4196 SuperflatPresetsListWidget - METHOD (Lnet/minecraft/class_430;Lnet/minecraft/class_5455;)V + METHOD (Lnet/minecraft/class_430;Lnet/minecraft/class_5455;Lnet/minecraft/class_7699;)V ARG 2 dynamicRegistryManager + ARG 3 featureSet + METHOD method_47409 (Lnet/minecraft/class_5321;)Ljava/lang/String; + ARG 0 key + METHOD method_47410 (Lnet/minecraft/class_7699;Lnet/minecraft/class_2248;)Z + ARG 1 block + METHOD method_47411 (Lnet/minecraft/class_3229;)Lnet/minecraft/class_2248; + ARG 0 layer CLASS class_432 SuperflatPresetEntry FIELD field_33812 preset Lnet/minecraft/class_7142; FIELD field_37909 text Lnet/minecraft/class_2561; + FIELD field_44668 STATS_ICONS_TEXTURE Lnet/minecraft/class_2960; METHOD (Lnet/minecraft/class_430$class_4196;Lnet/minecraft/class_6880;)V ARG 2 preset METHOD method_19389 setPreset ()V - METHOD method_2198 drawIconBackground (Lnet/minecraft/class_4587;II)V - ARG 1 matrices + METHOD method_2198 drawIconBackground (Lnet/minecraft/class_332;II)V + ARG 1 context ARG 2 x ARG 3 y - METHOD method_2200 renderIcon (Lnet/minecraft/class_4587;IILnet/minecraft/class_1792;)V - ARG 1 matrices + METHOD method_2200 renderIcon (Lnet/minecraft/class_332;IILnet/minecraft/class_1792;)V + ARG 1 context ARG 2 x ARG 3 y ARG 4 iconItem diff --git a/mappings/net/minecraft/client/gui/screen/Realms32BitWarningScreen.mapping b/mappings/net/minecraft/client/gui/screen/Realms32BitWarningScreen.mapping index 1ebf20b7dd..a4c8078a66 100644 --- a/mappings/net/minecraft/client/gui/screen/Realms32BitWarningScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/Realms32BitWarningScreen.mapping @@ -3,5 +3,8 @@ CLASS net/minecraft/class_7064 net/minecraft/client/gui/screen/Realms32BitWarnin FIELD field_37213 MESSAGE Lnet/minecraft/class_2561; FIELD field_37214 CHECK_MESSAGE Lnet/minecraft/class_2561; FIELD field_37215 NARRATED_TEXT Lnet/minecraft/class_2561; + FIELD field_39353 parent Lnet/minecraft/class_437; + METHOD (Lnet/minecraft/class_437;)V + ARG 1 parent METHOD method_41161 (Lnet/minecraft/class_4185;)V ARG 1 button diff --git a/mappings/net/minecraft/client/gui/screen/ReconfiguringScreen.mapping b/mappings/net/minecraft/client/gui/screen/ReconfiguringScreen.mapping new file mode 100644 index 0000000000..731bd4e35b --- /dev/null +++ b/mappings/net/minecraft/client/gui/screen/ReconfiguringScreen.mapping @@ -0,0 +1,12 @@ +CLASS net/minecraft/class_8671 net/minecraft/client/gui/screen/ReconfiguringScreen + FIELD field_45509 connection Lnet/minecraft/class_2535; + FIELD field_45510 disconnectButton Lnet/minecraft/class_4185; + FIELD field_45511 tick I + FIELD field_45512 layout Lnet/minecraft/class_8667; + METHOD (Lnet/minecraft/class_2561;Lnet/minecraft/class_2535;)V + ARG 1 title + ARG 2 connection + METHOD method_52757 (Lnet/minecraft/class_4185;)V + ARG 1 button + METHOD method_52758 (Lnet/minecraft/class_8671;Lnet/minecraft/class_364;)V + ARG 1 child diff --git a/mappings/net/minecraft/client/gui/screen/Screen.mapping b/mappings/net/minecraft/client/gui/screen/Screen.mapping index f0f5bc3699..6409442069 100644 --- a/mappings/net/minecraft/client/gui/screen/Screen.mapping +++ b/mappings/net/minecraft/client/gui/screen/Screen.mapping @@ -5,10 +5,8 @@ CLASS net/minecraft/class_437 net/minecraft/client/gui/screen/Screen FIELD field_22785 title Lnet/minecraft/class_2561; FIELD field_22786 children Ljava/util/List; FIELD field_22787 client Lnet/minecraft/class_310; - FIELD field_22788 itemRenderer Lnet/minecraft/class_918; FIELD field_22789 width I FIELD field_22790 height I - FIELD field_22792 passEvents Z FIELD field_22793 textRenderer Lnet/minecraft/class_327; FIELD field_33813 selected Lnet/minecraft/class_6379; FIELD field_33814 SCREEN_USAGE_TEXT Lnet/minecraft/class_2561; @@ -22,16 +20,16 @@ CLASS net/minecraft/class_437 net/minecraft/client/gui/screen/Screen FIELD field_33822 narrator Lnet/minecraft/class_6385; FIELD field_33823 elementNarrationStartTime J FIELD field_33824 screenNarrationStartTime J + FIELD field_41685 tooltip Lnet/minecraft/class_437$class_7998; + FIELD field_42156 screenInitialized Z + FIELD field_44669 OPTIONS_BACKGROUND_TEXTURE Lnet/minecraft/class_2960; + FIELD field_44944 executor Ljava/util/concurrent/Executor; METHOD (Lnet/minecraft/class_2561;)V ARG 1 title METHOD method_25393 tick ()V - METHOD method_25408 getTooltipFromItem (Lnet/minecraft/class_1799;)Ljava/util/List; + METHOD method_25408 getTooltipFromItem (Lnet/minecraft/class_310;Lnet/minecraft/class_1799;)Ljava/util/List; + ARG 0 client ARG 1 stack - METHOD method_25409 renderTooltip (Lnet/minecraft/class_4587;Lnet/minecraft/class_1799;II)V - ARG 1 matrices - ARG 2 stack - ARG 3 x - ARG 4 y METHOD method_25410 resize (Lnet/minecraft/class_310;II)V ARG 1 client ARG 2 width @@ -49,23 +47,17 @@ CLASS net/minecraft/class_437 net/minecraft/client/gui/screen/Screen ARG 2 override METHOD method_25416 openLink (Ljava/net/URI;)V ARG 1 link - METHOD method_25417 renderOrderedTooltip (Lnet/minecraft/class_4587;Ljava/util/List;II)V - ARG 1 matrices - ARG 2 lines - ARG 3 x - ARG 4 y - METHOD method_25418 renderTextHoverEffect (Lnet/minecraft/class_4587;Lnet/minecraft/class_2583;II)V - ARG 1 matrices - ARG 2 style - ARG 3 x - ARG 4 y METHOD method_25419 close ()V - METHOD method_25420 renderBackground (Lnet/minecraft/class_4587;)V + METHOD method_25420 renderBackground (Lnet/minecraft/class_332;IIF)V COMMENT Renders the background of this screen. COMMENT - COMMENT

If the client is in a world, renders the translucent background gradient. - COMMENT Otherwise {@linkplain #renderBackgroundTexture(int) renders the background texture}. - ARG 1 matrices + COMMENT

If the client is in a world, {@linkplain #renderInGameBackground + COMMENT renders the translucent background gradient}. + COMMENT Otherwise {@linkplain #renderBackgroundTexture renders the background texture}. + ARG 1 context + ARG 2 mouseX + ARG 3 mouseY + ARG 4 delta METHOD method_25421 shouldPause ()Z METHOD method_25422 shouldCloseOnEsc ()Z COMMENT Checks whether this screen should be closed when the escape key is pressed. @@ -73,15 +65,12 @@ CLASS net/minecraft/class_437 net/minecraft/client/gui/screen/Screen ARG 1 client ARG 2 width ARG 3 height - METHOD method_25424 renderTooltip (Lnet/minecraft/class_4587;Lnet/minecraft/class_2561;II)V - ARG 1 matrices - ARG 2 text - ARG 3 x - ARG 4 y METHOD method_25426 init ()V COMMENT Called when a screen should be initialized. COMMENT COMMENT

This method is called when this screen is {@linkplain net.minecraft.client.MinecraftClient#setScreen(Screen) opened} or resized. + COMMENT + COMMENT

This should call {@link #setInitialFocus} to set the element that is initially focused. METHOD method_25428 confirmLink (Z)V ARG 1 open METHOD method_25429 addSelectableChild (Lnet/minecraft/class_364;)Lnet/minecraft/class_364; @@ -89,18 +78,9 @@ CLASS net/minecraft/class_437 net/minecraft/client/gui/screen/Screen METHOD method_25430 handleTextClick (Lnet/minecraft/class_2583;)Z ARG 1 style METHOD method_25432 removed ()V - METHOD method_25433 renderBackground (Lnet/minecraft/class_4587;I)V - COMMENT Renders the background of this screen. - COMMENT - COMMENT

If the client is in a world, renders the translucent background gradient. - COMMENT Otherwise {@linkplain #renderBackgroundTexture(int) renders the background texture}. - ARG 1 matrices - 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 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_25434 renderBackgroundTexture (Lnet/minecraft/class_332;)V + COMMENT Renders the fullscreen {@linkplain #OPTIONS_BACKGROUND_TEXTURE background texture} of this screen. + ARG 1 context METHOD method_25435 getNarratedTitle ()Lnet/minecraft/class_2561; METHOD method_25436 isCut (I)Z ARG 0 code @@ -116,24 +96,6 @@ CLASS net/minecraft/class_437 net/minecraft/client/gui/screen/Screen METHOD method_25443 hasAltDown ()Z METHOD method_29638 filesDragged (Ljava/util/List;)V ARG 1 paths - METHOD method_30901 renderTooltip (Lnet/minecraft/class_4587;Ljava/util/List;II)V - ARG 1 matrices - ARG 2 lines - ARG 3 x - ARG 4 y - METHOD method_32633 renderTooltipFromComponents (Lnet/minecraft/class_4587;Ljava/util/List;II)V - ARG 1 matrices - ARG 2 components - ARG 3 x - ARG 4 y - METHOD method_32634 renderTooltip (Lnet/minecraft/class_4587;Ljava/util/List;Ljava/util/Optional;II)V - ARG 1 matrices - ARG 2 lines - ARG 3 data - ARG 4 x - ARG 5 y - METHOD method_32635 (Ljava/util/List;Lnet/minecraft/class_5632;)V - ARG 1 data METHOD method_37056 addElementNarrations (Lnet/minecraft/class_6382;)V ARG 1 builder METHOD method_37058 setElementNarrationDelay (J)V @@ -147,7 +109,7 @@ CLASS net/minecraft/class_437 net/minecraft/client/gui/screen/Screen ARG 0 selectables ARG 1 selectable METHOD method_37062 addScreenNarrations (Lnet/minecraft/class_6382;)V - ARG 1 builder + ARG 1 messageBuilder METHOD method_37063 addDrawableChild (Lnet/minecraft/class_364;)Lnet/minecraft/class_364; ARG 1 drawableElement METHOD method_37064 narrateScreenIfNarrationEnabled (Z)V @@ -169,6 +131,43 @@ CLASS net/minecraft/class_437 net/minecraft/client/gui/screen/Screen METHOD method_40041 hide ([Lnet/minecraft/class_339;)V ARG 0 widgets METHOD method_41843 clearAndInit ()V + METHOD method_47412 setTooltip (Lnet/minecraft/class_7919;Lnet/minecraft/class_8000;Z)V + ARG 1 tooltip + ARG 2 positioner + ARG 3 focused + METHOD method_47413 renderWithTooltip (Lnet/minecraft/class_332;IIF)V + ARG 1 context + ARG 2 mouseX + ARG 3 mouseY + ARG 4 delta + METHOD method_47414 setTooltip (Ljava/util/List;)V + ARG 1 tooltip + METHOD method_47415 setTooltip (Lnet/minecraft/class_2561;)V + ARG 1 tooltip + METHOD method_47942 setTooltip (Ljava/util/List;Lnet/minecraft/class_8000;Z)V + ARG 1 tooltip + ARG 2 positioner + ARG 3 focused + METHOD method_48262 hasUsageText ()Z + METHOD method_48263 switchFocus (Lnet/minecraft/class_8016;)V + COMMENT Switches focus from the currently focused element, if any, to {@code path}. + ARG 1 path + METHOD method_48264 getArrowNavigation (Lnet/minecraft/class_8028;)Lnet/minecraft/class_8023$class_8024; + ARG 1 direction + METHOD method_48265 setInitialFocus (Lnet/minecraft/class_364;)V + COMMENT Sets the initial focus of this screen. This should be called inside the overridden + COMMENT {@link #init()} method by screen implementations. + ARG 1 element + METHOD method_48266 getTabNavigation ()Lnet/minecraft/class_8023$class_8026; + METHOD method_48267 blur ()V + METHOD method_48640 initTabNavigation ()V + METHOD method_49589 onDisplayed ()V + COMMENT Called when the screen is displayed using {@link MinecraftClient#setScreen} + COMMENT before {@link #init()} or {@link #initTabNavigation()} is called. + METHOD method_50024 getMusic ()Lnet/minecraft/class_5195; + METHOD method_52752 renderInGameBackground (Lnet/minecraft/class_332;)V + COMMENT Renders the translucent background gradient used as the in-game screen background. + ARG 1 context CLASS class_6390 SelectedElementNarrationData FIELD field_33825 selectable Lnet/minecraft/class_6379; FIELD field_33826 index I @@ -177,3 +176,4 @@ CLASS net/minecraft/class_437 net/minecraft/client/gui/screen/Screen ARG 1 selectable ARG 2 index ARG 3 selectType + CLASS class_7998 PositionedTooltip diff --git a/mappings/net/minecraft/client/gui/screen/SleepingChatScreen.mapping b/mappings/net/minecraft/client/gui/screen/SleepingChatScreen.mapping index 693a2dda49..fcc1296a69 100644 --- a/mappings/net/minecraft/client/gui/screen/SleepingChatScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/SleepingChatScreen.mapping @@ -1,5 +1,5 @@ CLASS net/minecraft/class_423 net/minecraft/client/gui/screen/SleepingChatScreen - FIELD field_39902 stopSleepingButton Lnet/minecraft/class_4185; + FIELD field_41710 stopSleepingButton Lnet/minecraft/class_4185; METHOD method_19819 (Lnet/minecraft/class_4185;)V ARG 1 button METHOD method_2180 stopSleeping ()V diff --git a/mappings/net/minecraft/client/gui/screen/SplashOverlay.mapping b/mappings/net/minecraft/client/gui/screen/SplashOverlay.mapping index a80a7c0333..570f521a91 100644 --- a/mappings/net/minecraft/client/gui/screen/SplashOverlay.mapping +++ b/mappings/net/minecraft/client/gui/screen/SplashOverlay.mapping @@ -20,8 +20,7 @@ CLASS net/minecraft/class_425 net/minecraft/client/gui/screen/SplashOverlay ARG 2 monitor ARG 3 exceptionHandler ARG 4 reloading - METHOD method_18103 renderProgressBar (Lnet/minecraft/class_4587;IIIIF)V - ARG 1 matrices + METHOD method_18103 renderProgressBar (Lnet/minecraft/class_332;IIIIF)V ARG 2 minX ARG 3 minY ARG 4 maxX diff --git a/mappings/net/minecraft/client/gui/screen/SplashTextRenderer.mapping b/mappings/net/minecraft/client/gui/screen/SplashTextRenderer.mapping new file mode 100644 index 0000000000..8c3be40ccd --- /dev/null +++ b/mappings/net/minecraft/client/gui/screen/SplashTextRenderer.mapping @@ -0,0 +1,12 @@ +CLASS net/minecraft/class_8519 net/minecraft/client/gui/screen/SplashTextRenderer + FIELD field_44664 TEXT_X I + FIELD field_44665 TEXT_Y I + FIELD field_44666 text Ljava/lang/String; + METHOD (Ljava/lang/String;)V + ARG 1 text + METHOD method_51453 render (Lnet/minecraft/class_332;ILnet/minecraft/class_327;I)V + ARG 1 context + ARG 2 screenWidth + ARG 3 textRenderer + ARG 4 alpha + COMMENT a color with the appropriate alpha component bits set diff --git a/mappings/net/minecraft/client/gui/screen/StatsScreen.mapping b/mappings/net/minecraft/client/gui/screen/StatsScreen.mapping index d84185f733..d4ebdff890 100644 --- a/mappings/net/minecraft/client/gui/screen/StatsScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/StatsScreen.mapping @@ -7,6 +7,10 @@ CLASS net/minecraft/class_447 net/minecraft/client/gui/screen/StatsScreen FIELD field_2647 statHandler Lnet/minecraft/class_3469; FIELD field_2648 parent Lnet/minecraft/class_437; FIELD field_26546 DOWNLOADING_STATS_TEXT Lnet/minecraft/class_2561; + FIELD field_45418 SLOT_TEXTURE Lnet/minecraft/class_2960; + FIELD field_45419 HEADER_TEXTURE Lnet/minecraft/class_2960; + FIELD field_45420 SORT_UP_TEXTURE Lnet/minecraft/class_2960; + FIELD field_45421 SORT_DOWN_TEXTURE Lnet/minecraft/class_2960; METHOD (Lnet/minecraft/class_437;Lnet/minecraft/class_3469;)V ARG 1 parent ARG 2 statHandler @@ -23,16 +27,15 @@ CLASS net/minecraft/class_447 net/minecraft/client/gui/screen/StatsScreen ARG 1 button METHOD method_2267 createButtons ()V METHOD method_2270 createLists ()V - METHOD method_2282 renderIcon (Lnet/minecraft/class_4587;IIII)V - ARG 1 matrices + METHOD method_2282 renderIcon (Lnet/minecraft/class_332;IILnet/minecraft/class_2960;)V + ARG 1 context ARG 2 x ARG 3 y - ARG 4 u - ARG 5 v + ARG 4 texture METHOD method_2285 getColumnX (I)I ARG 1 index - METHOD method_2289 renderStatItem (Lnet/minecraft/class_4587;IILnet/minecraft/class_1792;)V - ARG 1 matrices + METHOD method_2289 renderStatItem (Lnet/minecraft/class_332;IILnet/minecraft/class_1792;)V + ARG 1 context ARG 2 x ARG 3 y ARG 4 item @@ -50,22 +53,17 @@ CLASS net/minecraft/class_447 net/minecraft/client/gui/screen/StatsScreen ARG 2 stat METHOD method_37074 getFormatted ()Ljava/lang/String; CLASS class_4200 ItemStatsListWidget - FIELD field_18753 HEADER_ICON_SPRITE_INDICES [I FIELD field_18754 blockStatTypes Ljava/util/List; FIELD field_18755 itemStatTypes Ljava/util/List; FIELD field_18756 selectedHeaderColumn I FIELD field_18758 comparator Ljava/util/Comparator; FIELD field_18759 selectedStatType Lnet/minecraft/class_3448; FIELD field_18760 listOrder I + FIELD field_45422 headerIconTextures [Lnet/minecraft/class_2960; METHOD (Lnet/minecraft/class_447;Lnet/minecraft/class_310;)V ARG 2 client METHOD method_19406 getText (Lnet/minecraft/class_1792;)Lnet/minecraft/class_2561; ARG 1 item - METHOD method_19407 render (Lnet/minecraft/class_4587;Lnet/minecraft/class_2561;II)V - ARG 1 matrices - ARG 2 text - ARG 3 mouseX - ARG 4 mouseY METHOD method_19408 selectStatType (Lnet/minecraft/class_3448;)V ARG 1 statType METHOD method_19409 getHeaderIndex (Lnet/minecraft/class_3448;)I @@ -80,8 +78,8 @@ CLASS net/minecraft/class_447 net/minecraft/client/gui/screen/StatsScreen FIELD field_33830 item Lnet/minecraft/class_1792; METHOD (Lnet/minecraft/class_447$class_4200;Lnet/minecraft/class_1792;)V ARG 2 item - METHOD method_19405 render (Lnet/minecraft/class_4587;Lnet/minecraft/class_3445;IIZ)V - ARG 1 matrices + METHOD method_19405 render (Lnet/minecraft/class_332;Lnet/minecraft/class_3445;IIZ)V + ARG 1 context ARG 2 stat ARG 3 x ARG 4 y diff --git a/mappings/net/minecraft/client/gui/screen/TitleScreen.mapping b/mappings/net/minecraft/client/gui/screen/TitleScreen.mapping index a75970dd3f..a97e573c88 100644 --- a/mappings/net/minecraft/client/gui/screen/TitleScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/TitleScreen.mapping @@ -2,21 +2,21 @@ CLASS net/minecraft/class_442 net/minecraft/client/gui/screen/TitleScreen FIELD field_17772 backgroundFadeStart J FIELD field_17774 PANORAMA_CUBE_MAP Lnet/minecraft/class_751; FIELD field_17775 PANORAMA_OVERLAY Lnet/minecraft/class_2960; - FIELD field_17776 isMinceraft Z FIELD field_18222 doBackgroundFade Z - FIELD field_19102 ACCESSIBILITY_ICON_TEXTURE Lnet/minecraft/class_2960; FIELD field_23775 LOGGER Lorg/slf4j/Logger; - FIELD field_2583 MINECRAFT_TITLE_TEXTURE Lnet/minecraft/class_2960; FIELD field_2585 backgroundRenderer Lnet/minecraft/class_766; - FIELD field_2586 splashText Ljava/lang/String; + FIELD field_2586 splashText Lnet/minecraft/class_8519; FIELD field_2590 buttonResetDemo Lnet/minecraft/class_4185; FIELD field_2592 realmsNotificationGui Lnet/minecraft/class_4399; - FIELD field_2594 EDITION_TITLE_TEXTURE Lnet/minecraft/class_2960; FIELD field_32271 COPYRIGHT Lnet/minecraft/class_2561; FIELD field_32272 DEMO_WORLD_NAME Ljava/lang/String; FIELD field_37209 deprecationNotice Lnet/minecraft/class_442$class_7063; + FIELD field_41847 logoDrawer Lnet/minecraft/class_8020; METHOD (Z)V ARG 1 doBackgroundFade + METHOD (ZLnet/minecraft/class_8020;)V + ARG 1 doBackgroundFade + ARG 2 logoDrawer METHOD method_18105 loadTexturesAsync (Lnet/minecraft/class_1060;Ljava/util/concurrent/Executor;)Ljava/util/concurrent/CompletableFuture; ARG 0 textureManager ARG 1 executor @@ -47,21 +47,14 @@ CLASS net/minecraft/class_442 net/minecraft/client/gui/screen/TitleScreen ARG 1 y ARG 2 spacingY METHOD method_2252 switchToRealms ()V - METHOD method_2253 areRealmsNotificationsEnabled ()Z - METHOD method_29064 (Lnet/minecraft/class_4587;Ljava/lang/Integer;Ljava/lang/Integer;)V - ARG 2 x - ARG 3 y - METHOD method_29066 (Lnet/minecraft/class_4587;Ljava/lang/Integer;Ljava/lang/Integer;)V - ARG 2 x - ARG 3 y + METHOD method_2253 isRealmsNotificationsGuiDisplayed ()Z METHOD method_31129 canReadDemoWorldData ()Z METHOD method_41198 (Lnet/minecraft/class_4185;)V ARG 1 button METHOD method_44692 getMultiplayerDisabledText ()Lnet/minecraft/class_2561; - CLASS 1 CLASS class_7063 DeprecationNotice FIELD comp_829 textRenderer Lnet/minecraft/class_327; METHOD comp_829 textRenderer ()Lnet/minecraft/class_327; - METHOD method_44065 render (Lnet/minecraft/class_4587;I)V - ARG 1 matrices + METHOD method_44065 render (Lnet/minecraft/class_332;I)V + ARG 1 context ARG 2 color diff --git a/mappings/net/minecraft/client/gui/screen/WarningScreen.mapping b/mappings/net/minecraft/client/gui/screen/WarningScreen.mapping index 71de58875e..4c28c70212 100644 --- a/mappings/net/minecraft/client/gui/screen/WarningScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/WarningScreen.mapping @@ -16,5 +16,5 @@ CLASS net/minecraft/class_7065 net/minecraft/client/gui/screen/WarningScreen METHOD method_41160 initButtons (I)V ARG 1 yOffset METHOD method_44068 getLineHeight ()I - METHOD method_44663 drawTitle (Lnet/minecraft/class_4587;)V - ARG 1 matrices + METHOD method_44663 drawTitle (Lnet/minecraft/class_332;)V + ARG 1 context diff --git a/mappings/net/minecraft/client/gui/screen/advancement/AdvancementObtainedStatus.mapping b/mappings/net/minecraft/client/gui/screen/advancement/AdvancementObtainedStatus.mapping index 0bf0a3c2c4..f453f219bb 100644 --- a/mappings/net/minecraft/client/gui/screen/advancement/AdvancementObtainedStatus.mapping +++ b/mappings/net/minecraft/client/gui/screen/advancement/AdvancementObtainedStatus.mapping @@ -1,5 +1,13 @@ CLASS net/minecraft/class_455 net/minecraft/client/gui/screen/advancement/AdvancementObtainedStatus - FIELD field_2700 spriteIndex I - METHOD (Ljava/lang/String;II)V - ARG 3 spriteIndex - METHOD method_2320 getSpriteIndex ()I + FIELD field_45426 boxTexture Lnet/minecraft/class_2960; + FIELD field_45427 taskFrameTexture Lnet/minecraft/class_2960; + FIELD field_45428 challengeFrameTexture Lnet/minecraft/class_2960; + FIELD field_45429 goalFrameTexture Lnet/minecraft/class_2960; + METHOD (Ljava/lang/String;ILnet/minecraft/class_2960;Lnet/minecraft/class_2960;Lnet/minecraft/class_2960;Lnet/minecraft/class_2960;)V + ARG 3 boxTexture + ARG 4 taskFrameTexture + ARG 5 challengeFrameTexture + ARG 6 goalFrameTexture + METHOD method_52753 getBoxTexture ()Lnet/minecraft/class_2960; + METHOD method_52754 getFrameTexture (Lnet/minecraft/class_189;)Lnet/minecraft/class_2960; + ARG 1 frame diff --git a/mappings/net/minecraft/client/gui/screen/advancement/AdvancementTab.mapping b/mappings/net/minecraft/client/gui/screen/advancement/AdvancementTab.mapping index d555931621..918b59f5dc 100644 --- a/mappings/net/minecraft/client/gui/screen/advancement/AdvancementTab.mapping +++ b/mappings/net/minecraft/client/gui/screen/advancement/AdvancementTab.mapping @@ -1,7 +1,6 @@ CLASS net/minecraft/class_454 net/minecraft/client/gui/screen/advancement/AdvancementTab FIELD field_2680 client Lnet/minecraft/class_310; FIELD field_2681 index I - FIELD field_2682 root Lnet/minecraft/class_161; FIELD field_2683 initialized Z FIELD field_2684 type Lnet/minecraft/class_453; FIELD field_2685 widgets Ljava/util/Map; @@ -17,21 +16,22 @@ CLASS net/minecraft/class_454 net/minecraft/client/gui/screen/advancement/Advanc FIELD field_2695 display Lnet/minecraft/class_185; FIELD field_2696 rootWidget Lnet/minecraft/class_456; FIELD field_2697 icon Lnet/minecraft/class_1799; - METHOD (Lnet/minecraft/class_310;Lnet/minecraft/class_457;Lnet/minecraft/class_453;ILnet/minecraft/class_161;Lnet/minecraft/class_185;)V + METHOD (Lnet/minecraft/class_310;Lnet/minecraft/class_457;Lnet/minecraft/class_453;ILnet/minecraft/class_8781;Lnet/minecraft/class_185;)V ARG 1 client ARG 2 screen ARG 3 type ARG 4 index ARG 5 root ARG 6 display - METHOD method_2307 getRoot ()Lnet/minecraft/class_161; - METHOD method_2308 getWidget (Lnet/minecraft/class_161;)Lnet/minecraft/class_456; + METHOD method_2308 getWidget (Lnet/minecraft/class_8779;)Lnet/minecraft/class_456; 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_2310 render (Lnet/minecraft/class_332;II)V + ARG 1 context + ARG 2 x + ARG 3 y + METHOD method_2311 drawBackground (Lnet/minecraft/class_332;IIZ)V + ARG 1 context ARG 2 x ARG 3 y ARG 4 selected @@ -39,29 +39,29 @@ CLASS net/minecraft/class_454 net/minecraft/client/gui/screen/advancement/Advanc 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_2314 drawWidgetTooltip (Lnet/minecraft/class_332;IIII)V + ARG 1 context ARG 2 mouseX ARG 3 mouseY ARG 4 x ARG 5 y - METHOD method_2315 drawIcon (IILnet/minecraft/class_918;)V - ARG 1 x - ARG 2 y - ARG 3 itemRenderer + METHOD method_2315 drawIcon (Lnet/minecraft/class_332;II)V + ARG 1 context + ARG 2 x + ARG 3 y METHOD method_2316 isClickOnTab (IIDD)Z ARG 1 screenX ARG 2 screenY ARG 3 mouseX ARG 5 mouseY - METHOD method_2317 create (Lnet/minecraft/class_310;Lnet/minecraft/class_457;ILnet/minecraft/class_161;)Lnet/minecraft/class_454; + METHOD method_2317 create (Lnet/minecraft/class_310;Lnet/minecraft/class_457;ILnet/minecraft/class_8781;)Lnet/minecraft/class_454; ARG 0 client ARG 1 screen ARG 2 index ARG 3 root - METHOD method_2318 addAdvancement (Lnet/minecraft/class_161;)V + METHOD method_2318 addAdvancement (Lnet/minecraft/class_8781;)V ARG 1 advancement - METHOD method_2319 addWidget (Lnet/minecraft/class_456;Lnet/minecraft/class_161;)V + METHOD method_2319 addWidget (Lnet/minecraft/class_456;Lnet/minecraft/class_8779;)V ARG 1 widget ARG 2 advancement METHOD method_35734 getType ()Lnet/minecraft/class_453; diff --git a/mappings/net/minecraft/client/gui/screen/advancement/AdvancementTabType.mapping b/mappings/net/minecraft/client/gui/screen/advancement/AdvancementTabType.mapping index 747c95789c..c12d1c09e8 100644 --- a/mappings/net/minecraft/client/gui/screen/advancement/AdvancementTabType.mapping +++ b/mappings/net/minecraft/client/gui/screen/advancement/AdvancementTabType.mapping @@ -2,21 +2,20 @@ CLASS net/minecraft/class_453 net/minecraft/client/gui/screen/advancement/Advanc FIELD field_2669 tabCount I FIELD field_2670 height I FIELD field_2671 width I - FIELD field_2672 v I - FIELD field_2674 u I - METHOD (Ljava/lang/String;IIIIII)V - ARG 3 u - ARG 4 v + FIELD field_45423 selectedTextures Lnet/minecraft/class_453$class_8670; + FIELD field_45424 unselectedTextures Lnet/minecraft/class_453$class_8670; + METHOD (Ljava/lang/String;ILnet/minecraft/class_453$class_8670;Lnet/minecraft/class_453$class_8670;III)V + ARG 3 selectedTextures + ARG 4 unselectedTextures ARG 5 width ARG 6 height ARG 7 tabCount - METHOD method_2301 drawBackground (Lnet/minecraft/class_4587;Lnet/minecraft/class_332;IIZI)V - ARG 1 matrices - ARG 2 tab - ARG 3 x - ARG 4 y - ARG 5 selected - ARG 6 index + METHOD method_2301 drawBackground (Lnet/minecraft/class_332;IIZI)V + ARG 1 context + ARG 2 x + ARG 3 y + ARG 4 selected + ARG 5 index METHOD method_2302 getTabX (I)I ARG 1 index METHOD method_2303 isClickOnTab (IIIDD)Z @@ -28,9 +27,10 @@ CLASS net/minecraft/class_453 net/minecraft/client/gui/screen/advancement/Advanc METHOD method_2304 getTabCount ()I METHOD method_2305 getTabY (I)I ARG 1 index - METHOD method_2306 drawIcon (IIILnet/minecraft/class_918;Lnet/minecraft/class_1799;)V - ARG 1 x - ARG 2 y - ARG 3 index - ARG 4 itemRenderer - ARG 5 icon + METHOD method_2306 drawIcon (Lnet/minecraft/class_332;IIILnet/minecraft/class_1799;)V + ARG 1 context + ARG 2 x + ARG 3 y + ARG 4 index + ARG 5 stack + CLASS class_8670 Textures diff --git a/mappings/net/minecraft/client/gui/screen/advancement/AdvancementWidget.mapping b/mappings/net/minecraft/client/gui/screen/advancement/AdvancementWidget.mapping index ad6da8e77f..b954be7eec 100644 --- a/mappings/net/minecraft/client/gui/screen/advancement/AdvancementWidget.mapping +++ b/mappings/net/minecraft/client/gui/screen/advancement/AdvancementWidget.mapping @@ -1,12 +1,10 @@ CLASS net/minecraft/class_456 net/minecraft/client/gui/screen/advancement/AdvancementWidget FIELD field_24262 SPLIT_OFFSET_CANDIDATES [I - FIELD field_2702 advancement Lnet/minecraft/class_161; FIELD field_2703 tab Lnet/minecraft/class_454; FIELD field_2704 client Lnet/minecraft/class_310; FIELD field_2705 description Ljava/util/List; 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 y I FIELD field_2711 x I FIELD field_2712 display Lnet/minecraft/class_185; @@ -19,52 +17,26 @@ CLASS net/minecraft/class_456 net/minecraft/client/gui/screen/advancement/Advanc FIELD field_32295 TITLE_OFFSET_X I FIELD field_32296 TITLE_OFFSET_Y I FIELD field_32297 TITLE_MAX_WIDTH I - METHOD (Lnet/minecraft/class_454;Lnet/minecraft/class_310;Lnet/minecraft/class_161;Lnet/minecraft/class_185;)V + FIELD field_45425 TITLE_BOX_TEXTURE Lnet/minecraft/class_2960; + METHOD (Lnet/minecraft/class_454;Lnet/minecraft/class_310;Lnet/minecraft/class_8781;Lnet/minecraft/class_185;)V ARG 1 tab ARG 2 client ARG 3 advancement ARG 4 display - METHOD method_2321 drawTextureRepeatedly (Lnet/minecraft/class_4587;IIIIIIII)V - COMMENT Draws a textured rectangle repeatedly to cover the area of {@code - COMMENT width} and {@code height}. The last texture is clipped to fit the area. - ARG 1 matrices - ARG 2 x - ARG 3 y - ARG 4 width - ARG 5 height - ARG 6 u - ARG 7 v - ARG 8 textureWidth - ARG 9 textureHeight METHOD method_2322 addChild (Lnet/minecraft/class_456;)V ARG 1 widget - METHOD method_2323 renderLines (Lnet/minecraft/class_4587;IIZ)V - ARG 1 matrices + METHOD method_2323 renderLines (Lnet/minecraft/class_332;IIZ)V + ARG 1 context ARG 2 x ARG 3 y ARG 4 border - METHOD method_2324 renderDescriptionBackground (Lnet/minecraft/class_4587;IIIIIIIII)V - COMMENT Renders the description background. - COMMENT - COMMENT @implNote This splits the area into 9 parts (4 corners, 4 edges and 1 - COMMENT central box) and draws each of them. - ARG 1 matrices - ARG 2 x - ARG 3 y - ARG 4 width - ARG 5 height - ARG 6 cornerSize - ARG 7 textureWidth - ARG 8 textureHeight - ARG 9 u - ARG 10 v - METHOD method_2325 renderWidgets (Lnet/minecraft/class_4587;II)V - ARG 1 matrices + METHOD method_2325 renderWidgets (Lnet/minecraft/class_332;II)V + ARG 1 context ARG 2 x ARG 3 y METHOD method_2326 getY ()I METHOD method_2327 getX ()I - METHOD method_2328 getParent (Lnet/minecraft/class_161;)Lnet/minecraft/class_456; + METHOD method_2328 getParent (Lnet/minecraft/class_8781;)Lnet/minecraft/class_456; ARG 1 advancement METHOD method_2329 shouldRender (IIII)Z ARG 1 originX @@ -74,8 +46,8 @@ CLASS net/minecraft/class_456 net/minecraft/client/gui/screen/advancement/Advanc 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 + METHOD method_2331 drawTooltip (Lnet/minecraft/class_332;IIFII)V + ARG 1 context ARG 2 originX ARG 3 originY ARG 4 alpha diff --git a/mappings/net/minecraft/client/gui/screen/advancement/AdvancementsScreen.mapping b/mappings/net/minecraft/client/gui/screen/advancement/AdvancementsScreen.mapping index f40260425b..be36e12852 100644 --- a/mappings/net/minecraft/client/gui/screen/advancement/AdvancementsScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/advancement/AdvancementsScreen.mapping @@ -2,7 +2,6 @@ CLASS net/minecraft/class_457 net/minecraft/client/gui/screen/advancement/Advanc FIELD field_26553 SAD_LABEL_TEXT Lnet/minecraft/class_2561; FIELD field_26554 EMPTY_TEXT Lnet/minecraft/class_2561; FIELD field_26555 ADVANCEMENTS_TEXT Lnet/minecraft/class_2561; - FIELD field_2716 TABS_TEXTURE Lnet/minecraft/class_2960; FIELD field_2717 WINDOW_TEXTURE Lnet/minecraft/class_2960; FIELD field_2718 movingTab Z FIELD field_2719 tabs Ljava/util/Map; @@ -18,22 +17,21 @@ CLASS net/minecraft/class_457 net/minecraft/client/gui/screen/advancement/Advanc FIELD field_32309 TITLE_OFFSET_Y I METHOD (Lnet/minecraft/class_632;)V ARG 1 advancementHandler - METHOD method_2334 drawWindow (Lnet/minecraft/class_4587;II)V - ARG 1 matrices + METHOD method_2334 drawWindow (Lnet/minecraft/class_332;II)V + ARG 1 context ARG 2 x ARG 3 y - METHOD method_2335 getAdvancementWidget (Lnet/minecraft/class_161;)Lnet/minecraft/class_456; + METHOD method_2335 getAdvancementWidget (Lnet/minecraft/class_8781;)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 + METHOD method_2336 getTab (Lnet/minecraft/class_8781;)Lnet/minecraft/class_454; + METHOD method_2337 drawAdvancementTree (Lnet/minecraft/class_332;IIII)V + ARG 1 context ARG 2 mouseX ARG 3 mouseY ARG 4 x ARG 5 y - METHOD method_2338 drawWidgetTooltip (Lnet/minecraft/class_4587;IIII)V - ARG 1 matrices + METHOD method_2338 drawWidgetTooltip (Lnet/minecraft/class_332;IIII)V + ARG 1 context ARG 2 mouseX ARG 3 mouseY ARG 4 x diff --git a/mappings/net/minecraft/client/gui/screen/ingame/AbstractFurnaceScreen.mapping b/mappings/net/minecraft/client/gui/screen/ingame/AbstractFurnaceScreen.mapping index e774b4be70..3e7feb5efa 100644 --- a/mappings/net/minecraft/client/gui/screen/ingame/AbstractFurnaceScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/ingame/AbstractFurnaceScreen.mapping @@ -2,12 +2,15 @@ CLASS net/minecraft/class_489 net/minecraft/client/gui/screen/ingame/AbstractFur FIELD field_18975 background Lnet/minecraft/class_2960; FIELD field_2924 recipeBook Lnet/minecraft/class_517; FIELD field_2925 narrow Z - FIELD field_2926 RECIPE_BUTTON_TEXTURE Lnet/minecraft/class_2960; - METHOD (Lnet/minecraft/class_1720;Lnet/minecraft/class_517;Lnet/minecraft/class_1661;Lnet/minecraft/class_2561;Lnet/minecraft/class_2960;)V + FIELD field_45434 litProgressTexture Lnet/minecraft/class_2960; + FIELD field_45435 burnProgressTexture Lnet/minecraft/class_2960; + METHOD (Lnet/minecraft/class_1720;Lnet/minecraft/class_517;Lnet/minecraft/class_1661;Lnet/minecraft/class_2561;Lnet/minecraft/class_2960;Lnet/minecraft/class_2960;Lnet/minecraft/class_2960;)V ARG 1 handler ARG 2 recipeBook ARG 3 inventory ARG 4 title ARG 5 background + ARG 6 litProgressTexture + ARG 7 burnProgressTexture METHOD method_19877 (Lnet/minecraft/class_4185;)V 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 c363aad250..0adec7ddbb 100644 --- a/mappings/net/minecraft/client/gui/screen/ingame/AbstractInventoryScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/ingame/AbstractInventoryScreen.mapping @@ -1,23 +1,25 @@ CLASS net/minecraft/class_485 net/minecraft/client/gui/screen/ingame/AbstractInventoryScreen - METHOD method_18642 drawStatusEffectBackgrounds (Lnet/minecraft/class_4587;IILjava/lang/Iterable;Z)V - ARG 1 matrices + FIELD field_45462 EFFECT_BACKGROUND_LARGE_TEXTURE Lnet/minecraft/class_2960; + FIELD field_45463 EFFECT_BACKGROUND_SMALL_TEXTURE Lnet/minecraft/class_2960; + METHOD method_18642 drawStatusEffectBackgrounds (Lnet/minecraft/class_332;IILjava/lang/Iterable;Z)V + ARG 1 context ARG 2 x ARG 3 height ARG 4 statusEffects ARG 5 wide - METHOD method_18643 drawStatusEffectSprites (Lnet/minecraft/class_4587;IILjava/lang/Iterable;Z)V - ARG 1 matrices + METHOD method_18643 drawStatusEffectSprites (Lnet/minecraft/class_332;IILjava/lang/Iterable;Z)V + ARG 1 context ARG 2 x ARG 3 height ARG 4 statusEffects ARG 5 wide - METHOD method_18644 drawStatusEffectDescriptions (Lnet/minecraft/class_4587;IILjava/lang/Iterable;)V - ARG 1 matrices + METHOD method_18644 drawStatusEffectDescriptions (Lnet/minecraft/class_332;IILjava/lang/Iterable;)V + ARG 1 context ARG 2 x ARG 3 height ARG 4 statusEffects - METHOD method_2477 drawStatusEffects (Lnet/minecraft/class_4587;II)V - ARG 1 matrices + METHOD method_2477 drawStatusEffects (Lnet/minecraft/class_332;II)V + ARG 1 context ARG 2 mouseX ARG 3 mouseY METHOD method_38933 getStatusEffectDescription (Lnet/minecraft/class_1293;)Lnet/minecraft/class_2561; diff --git a/mappings/net/minecraft/client/gui/screen/ingame/AbstractSignEditScreen.mapping b/mappings/net/minecraft/client/gui/screen/ingame/AbstractSignEditScreen.mapping new file mode 100644 index 0000000000..3b0ddba23d --- /dev/null +++ b/mappings/net/minecraft/client/gui/screen/ingame/AbstractSignEditScreen.mapping @@ -0,0 +1,37 @@ +CLASS net/minecraft/class_7743 net/minecraft/client/gui/screen/ingame/AbstractSignEditScreen + FIELD field_40424 blockEntity Lnet/minecraft/class_2625; + FIELD field_40425 messages [Ljava/lang/String; + FIELD field_40426 signType Lnet/minecraft/class_4719; + FIELD field_40427 ticksSinceOpened I + FIELD field_40428 currentRow I + FIELD field_40429 selectionManager Lnet/minecraft/class_3728; + FIELD field_43362 text Lnet/minecraft/class_8242; + FIELD field_43363 front Z + METHOD (Lnet/minecraft/class_2625;ZZ)V + ARG 1 blockEntity + ARG 2 front + ARG 3 filtered + METHOD (Lnet/minecraft/class_2625;ZZLnet/minecraft/class_2561;)V + ARG 1 blockEntity + ARG 2 front + ARG 3 filtered + ARG 4 title + METHOD method_45654 translateForRender (Lnet/minecraft/class_332;Lnet/minecraft/class_2680;)V + ARG 1 context + ARG 2 state + METHOD method_45655 renderSignText (Lnet/minecraft/class_332;)V + ARG 1 context + METHOD method_45656 renderSignBackground (Lnet/minecraft/class_332;Lnet/minecraft/class_2680;)V + ARG 1 context + ARG 2 state + METHOD method_45657 (Lnet/minecraft/class_4185;)V + ARG 1 button + METHOD method_45659 renderSign (Lnet/minecraft/class_332;)V + ARG 1 context + METHOD method_45661 getTextScale ()Lorg/joml/Vector3f; + METHOD method_45662 finishEditing ()V + METHOD method_49912 canEdit ()Z + METHOD method_49913 setCurrentRowMessage (Ljava/lang/String;)V + ARG 1 message + METHOD method_49914 (ZI)Lnet/minecraft/class_2561; + ARG 2 line diff --git a/mappings/net/minecraft/client/gui/screen/ingame/AnvilScreen.mapping b/mappings/net/minecraft/client/gui/screen/ingame/AnvilScreen.mapping index 4dd7ade8a5..471608d06f 100644 --- a/mappings/net/minecraft/client/gui/screen/ingame/AnvilScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/ingame/AnvilScreen.mapping @@ -3,6 +3,9 @@ CLASS net/minecraft/class_471 net/minecraft/client/gui/screen/ingame/AnvilScreen FIELD field_2819 TEXTURE Lnet/minecraft/class_2960; FIELD field_2821 nameField Lnet/minecraft/class_342; FIELD field_29348 player Lnet/minecraft/class_1657; + FIELD field_45436 TEXT_FIELD_TEXTURE Lnet/minecraft/class_2960; + FIELD field_45437 TEXT_FIELD_DISABLED_TEXTURE Lnet/minecraft/class_2960; + FIELD field_45438 ERROR_TEXTURE Lnet/minecraft/class_2960; METHOD (Lnet/minecraft/class_1706;Lnet/minecraft/class_1661;Lnet/minecraft/class_2561;)V ARG 1 handler ARG 2 inventory diff --git a/mappings/net/minecraft/client/gui/screen/ingame/BeaconScreen.mapping b/mappings/net/minecraft/client/gui/screen/ingame/BeaconScreen.mapping index 38c37cbbae..1c8404c1ce 100644 --- a/mappings/net/minecraft/client/gui/screen/ingame/BeaconScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/ingame/BeaconScreen.mapping @@ -5,6 +5,12 @@ CLASS net/minecraft/class_466 net/minecraft/client/gui/screen/ingame/BeaconScree FIELD field_26561 SECONDARY_POWER_TEXT Lnet/minecraft/class_2561; FIELD field_2808 TEXTURE Lnet/minecraft/class_2960; FIELD field_33832 buttons Ljava/util/List; + FIELD field_45439 BUTTON_HIGHLIGHTED_TEXTURE Lnet/minecraft/class_2960; + FIELD field_45440 BUTTON_TEXTURE Lnet/minecraft/class_2960; + FIELD field_45441 CONFIRM_TEXTURE Lnet/minecraft/class_2960; + FIELD field_45442 CANCEL_TEXTURE Lnet/minecraft/class_2960; + FIELD field_45443 BUTTON_DISABLED_TEXTURE Lnet/minecraft/class_2960; + FIELD field_45444 BUTTON_SELECTED_TEXTURE Lnet/minecraft/class_2960; METHOD (Lnet/minecraft/class_1704;Lnet/minecraft/class_1661;Lnet/minecraft/class_2561;)V ARG 1 handler ARG 2 inventory @@ -25,7 +31,6 @@ CLASS net/minecraft/class_466 net/minecraft/client/gui/screen/ingame/BeaconScree CLASS class_469 EffectButtonWidget FIELD field_17416 primary Z FIELD field_18223 sprite Lnet/minecraft/class_1058; - FIELD field_26562 tooltip Lnet/minecraft/class_2561; FIELD field_2813 effect Lnet/minecraft/class_1291; FIELD field_33833 level I METHOD (Lnet/minecraft/class_466;IILnet/minecraft/class_1291;ZI)V @@ -47,26 +52,19 @@ CLASS net/minecraft/class_466 net/minecraft/client/gui/screen/ingame/BeaconScree ARG 1 x ARG 2 y ARG 3 message - METHOD method_18641 renderExtra (Lnet/minecraft/class_4587;)V - ARG 1 matrices + METHOD method_18641 renderExtra (Lnet/minecraft/class_332;)V + ARG 1 context METHOD method_2401 setDisabled (Z)V ARG 1 disabled METHOD method_2402 isDisabled ()Z CLASS class_4072 IconButtonWidget - FIELD field_18224 u I - FIELD field_18225 v I - METHOD (Lnet/minecraft/class_466;IIIILnet/minecraft/class_2561;)V - ARG 2 x - ARG 3 y - ARG 4 u - ARG 5 v - ARG 6 message + FIELD field_45445 texture Lnet/minecraft/class_2960; + METHOD (IILnet/minecraft/class_2960;Lnet/minecraft/class_2561;)V + ARG 1 x + ARG 2 y + ARG 3 texture + ARG 4 message CLASS class_6392 BeaconButtonWidget - METHOD method_25352 renderTooltip (Lnet/minecraft/class_4587;II)V - ARG 1 matrices - ARG 2 mouseX - ARG 3 mouseY - METHOD method_37079 shouldRenderTooltip ()Z METHOD method_37080 tick (I)V ARG 1 level CLASS class_6393 LevelTwoEffectButtonWidget diff --git a/mappings/net/minecraft/client/gui/screen/ingame/BlastFurnaceScreen.mapping b/mappings/net/minecraft/client/gui/screen/ingame/BlastFurnaceScreen.mapping index ec8a3772e9..6703b4f470 100644 --- a/mappings/net/minecraft/client/gui/screen/ingame/BlastFurnaceScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/ingame/BlastFurnaceScreen.mapping @@ -1,5 +1,7 @@ CLASS net/minecraft/class_3871 net/minecraft/client/gui/screen/ingame/BlastFurnaceScreen FIELD field_17115 TEXTURE Lnet/minecraft/class_2960; + FIELD field_45446 LIT_PROGRESS_TEXTURE Lnet/minecraft/class_2960; + FIELD field_45447 BURN_PROGRESS_TEXTURE Lnet/minecraft/class_2960; METHOD (Lnet/minecraft/class_3705;Lnet/minecraft/class_1661;Lnet/minecraft/class_2561;)V ARG 1 container ARG 2 inventory diff --git a/mappings/net/minecraft/client/gui/screen/ingame/BookEditScreen.mapping b/mappings/net/minecraft/client/gui/screen/ingame/BookEditScreen.mapping index 438d1a3f2b..ba154eb108 100644 --- a/mappings/net/minecraft/client/gui/screen/ingame/BookEditScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/ingame/BookEditScreen.mapping @@ -67,8 +67,8 @@ CLASS net/minecraft/class_473 net/minecraft/client/gui/screen/ingame/BookEditScr METHOD method_27578 createPageContent ()Lnet/minecraft/class_473$class_5233; METHOD method_27580 moveVertically (I)V ARG 1 lines - METHOD method_27581 drawCursor (Lnet/minecraft/class_4587;Lnet/minecraft/class_473$class_5234;Z)V - ARG 1 matrices + METHOD method_27581 drawCursor (Lnet/minecraft/class_332;Lnet/minecraft/class_473$class_5234;Z)V + ARG 1 context ARG 2 position ARG 3 atEnd METHOD method_27582 screenPositionToAbsolutePosition (Lnet/minecraft/class_473$class_5234;)Lnet/minecraft/class_473$class_5234; @@ -94,8 +94,9 @@ CLASS net/minecraft/class_473 net/minecraft/client/gui/screen/ingame/BookEditScr ARG 6 style ARG 7 start ARG 8 end - METHOD method_27588 drawSelection ([Lnet/minecraft/class_768;)V - ARG 1 selectionRectangles + METHOD method_27588 drawSelection (Lnet/minecraft/class_332;[Lnet/minecraft/class_768;)V + ARG 1 context + ARG 2 selectionRectangles METHOD method_27589 selectCurrentWord (I)V ARG 1 cursor METHOD method_27590 absolutePositionToScreenPosition (Lnet/minecraft/class_473$class_5234;)Lnet/minecraft/class_473$class_5234; diff --git a/mappings/net/minecraft/client/gui/screen/ingame/BrewingStandScreen.mapping b/mappings/net/minecraft/client/gui/screen/ingame/BrewingStandScreen.mapping index dfef096b57..174f971bfb 100644 --- a/mappings/net/minecraft/client/gui/screen/ingame/BrewingStandScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/ingame/BrewingStandScreen.mapping @@ -1,6 +1,9 @@ CLASS net/minecraft/class_472 net/minecraft/client/gui/screen/ingame/BrewingStandScreen FIELD field_2823 TEXTURE Lnet/minecraft/class_2960; FIELD field_2824 BUBBLE_PROGRESS [I + FIELD field_45448 FUEL_LENGTH_TEXTURE Lnet/minecraft/class_2960; + FIELD field_45449 BREW_PROGRESS_TEXTURE Lnet/minecraft/class_2960; + FIELD field_45450 BUBBLES_TEXTURE Lnet/minecraft/class_2960; METHOD (Lnet/minecraft/class_1708;Lnet/minecraft/class_1661;Lnet/minecraft/class_2561;)V ARG 1 handler ARG 2 inventory diff --git a/mappings/net/minecraft/client/gui/screen/ingame/CartographyTableScreen.mapping b/mappings/net/minecraft/client/gui/screen/ingame/CartographyTableScreen.mapping index f3fe14887d..0268931ce7 100644 --- a/mappings/net/minecraft/client/gui/screen/ingame/CartographyTableScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/ingame/CartographyTableScreen.mapping @@ -1,18 +1,23 @@ CLASS net/minecraft/class_3934 net/minecraft/client/gui/screen/ingame/CartographyTableScreen FIELD field_17421 TEXTURE Lnet/minecraft/class_2960; + FIELD field_45451 MAP_TEXTURE Lnet/minecraft/class_2960; + FIELD field_45452 LOCKED_TEXTURE Lnet/minecraft/class_2960; + FIELD field_45453 ERROR_TEXTURE Lnet/minecraft/class_2960; + FIELD field_45454 SCALED_MAP_TEXTURE Lnet/minecraft/class_2960; + FIELD field_45455 DUPLICATED_MAP_TEXTURE Lnet/minecraft/class_2960; METHOD (Lnet/minecraft/class_3910;Lnet/minecraft/class_1661;Lnet/minecraft/class_2561;)V ARG 1 handler ARG 2 inventory ARG 3 title - METHOD method_17566 drawMap (Lnet/minecraft/class_4587;Ljava/lang/Integer;Lnet/minecraft/class_22;IIF)V - ARG 1 matrices + METHOD method_17566 drawMap (Lnet/minecraft/class_332;Ljava/lang/Integer;Lnet/minecraft/class_22;IIF)V + ARG 1 context ARG 2 mapId ARG 3 mapState ARG 4 x ARG 5 y ARG 6 scale - METHOD method_17567 drawMap (Lnet/minecraft/class_4587;Ljava/lang/Integer;Lnet/minecraft/class_22;ZZZZ)V - ARG 1 matrices + METHOD method_17567 drawMap (Lnet/minecraft/class_332;Ljava/lang/Integer;Lnet/minecraft/class_22;ZZZZ)V + ARG 1 context ARG 2 mapId ARG 3 mapState ARG 4 cloneMode diff --git a/mappings/net/minecraft/client/gui/screen/ingame/CraftingScreen.mapping b/mappings/net/minecraft/client/gui/screen/ingame/CraftingScreen.mapping index 7f030121a0..616638e868 100644 --- a/mappings/net/minecraft/client/gui/screen/ingame/CraftingScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/ingame/CraftingScreen.mapping @@ -2,7 +2,6 @@ CLASS net/minecraft/class_479 net/minecraft/client/gui/screen/ingame/CraftingScr FIELD field_2877 narrow Z FIELD field_2878 TEXTURE Lnet/minecraft/class_2960; FIELD field_2880 recipeBook Lnet/minecraft/class_507; - FIELD field_2881 RECIPE_BUTTON_TEXTURE Lnet/minecraft/class_2960; METHOD (Lnet/minecraft/class_1714;Lnet/minecraft/class_1661;Lnet/minecraft/class_2561;)V ARG 1 handler ARG 2 inventory diff --git a/mappings/net/minecraft/client/gui/screen/ingame/CreativeInventoryScreen.mapping b/mappings/net/minecraft/client/gui/screen/ingame/CreativeInventoryScreen.mapping index 273bb8d275..9cb3d069a8 100644 --- a/mappings/net/minecraft/client/gui/screen/ingame/CreativeInventoryScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/ingame/CreativeInventoryScreen.mapping @@ -8,10 +8,9 @@ CLASS net/minecraft/class_481 net/minecraft/client/gui/screen/ingame/CreativeInv FIELD field_2890 scrollPosition F FIELD field_2891 listener Lnet/minecraft/class_478; FIELD field_2892 scrolling Z - FIELD field_2893 TEXTURE Lnet/minecraft/class_2960; FIELD field_2894 searchBox Lnet/minecraft/class_342; FIELD field_2895 INVENTORY Lnet/minecraft/class_1277; - FIELD field_2896 selectedTab I + FIELD field_2896 selectedTab Lnet/minecraft/class_1761; FIELD field_32335 TAB_TEXTURE_PREFIX Ljava/lang/String; FIELD field_32336 CUSTOM_CREATIVE_LOCK_KEY Ljava/lang/String; FIELD field_32337 ROWS_COUNT I @@ -21,10 +20,21 @@ CLASS net/minecraft/class_481 net/minecraft/client/gui/screen/ingame/CreativeInv FIELD field_32341 SCROLLBAR_WIDTH I FIELD field_32342 SCROLLBAR_HEIGHT I FIELD field_32343 WHITE I - METHOD (Lnet/minecraft/class_1657;)V + FIELD field_41112 operatorTabEnabled Z + FIELD field_45456 TAB_TOP_SELECTED_TEXTURES [Lnet/minecraft/class_2960; + FIELD field_45457 TAB_BOTTOM_UNSELECTED_TEXTURES [Lnet/minecraft/class_2960; + FIELD field_45458 TAB_BOTTOM_SELECTED_TEXTURES [Lnet/minecraft/class_2960; + FIELD field_45459 SCROLLER_TEXTURE Lnet/minecraft/class_2960; + FIELD field_45460 SCROLLER_DISABLED_TEXTURE Lnet/minecraft/class_2960; + FIELD field_45461 TAB_TOP_UNSELECTED_TEXTURES [Lnet/minecraft/class_2960; + METHOD (Lnet/minecraft/class_1657;Lnet/minecraft/class_7699;Z)V ARG 1 player + ARG 2 enabledFeatures + ARG 3 operatorTabEnabled METHOD method_15871 searchForTags (Ljava/lang/String;)V ARG 1 id + METHOD method_15873 (Ljava/util/function/Predicate;Lnet/minecraft/class_6862;)Z + ARG 1 tag METHOD method_15874 (Ljava/lang/String;Ljava/lang/String;Lnet/minecraft/class_2960;)Z ARG 2 id METHOD method_15875 (Ljava/lang/String;Lnet/minecraft/class_2960;)Z @@ -45,17 +55,31 @@ CLASS net/minecraft/class_481 net/minecraft/client/gui/screen/ingame/CreativeInv METHOD method_2467 isClickInScrollbar (DD)Z ARG 1 mouseX ARG 3 mouseY - METHOD method_2468 renderTabIcon (Lnet/minecraft/class_4587;Lnet/minecraft/class_1761;)V - ARG 1 matrices + METHOD method_2468 renderTabIcon (Lnet/minecraft/class_332;Lnet/minecraft/class_1761;)V + ARG 1 context 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 + METHOD method_2471 renderTabTooltipIfHovered (Lnet/minecraft/class_332;Lnet/minecraft/class_1761;II)Z + ARG 1 context ARG 2 group ARG 3 mouseX ARG 4 mouseY + METHOD method_47419 shouldShowOperatorTab (Lnet/minecraft/class_1657;)Z + ARG 1 player + METHOD method_47420 updateDisplayParameters (Lnet/minecraft/class_7699;ZLnet/minecraft/class_7225$class_7874;)V + ARG 1 enabledFeatures + ARG 2 showOperatorTab + ARG 3 lookup + METHOD method_47421 refreshSelectedTab (Ljava/util/Collection;)V + ARG 1 displayStacks + METHOD method_47422 getTabX (Lnet/minecraft/class_1761;)I + ARG 1 group + METHOD method_47423 getTabY (Lnet/minecraft/class_1761;)I + ARG 1 group + METHOD method_47424 isInventoryTabSelected ()Z + METHOD method_51455 (Lnet/minecraft/class_1799;Ljava/util/List;Lnet/minecraft/class_6862;)V + ARG 2 tagKey CLASS class_482 LockableSlot CLASS class_483 CreativeScreenHandler FIELD field_2897 itemList Lnet/minecraft/class_2371; @@ -65,6 +89,14 @@ CLASS net/minecraft/class_481 net/minecraft/client/gui/screen/ingame/CreativeInv METHOD method_2473 scrollItems (F)V ARG 1 position METHOD method_2474 shouldShowScrollbar ()Z + METHOD method_47425 getRow (F)I + ARG 1 scroll + METHOD method_47426 getScrollPosition (FD)F + ARG 1 current + ARG 2 amount + METHOD method_47427 getScrollPosition (I)F + ARG 1 row + METHOD method_47428 getOverflowRows ()I CLASS class_484 CreativeSlot FIELD field_2898 slot Lnet/minecraft/class_1735; METHOD (Lnet/minecraft/class_1735;III)V diff --git a/mappings/net/minecraft/client/gui/screen/ingame/CyclingSlotIcon.mapping b/mappings/net/minecraft/client/gui/screen/ingame/CyclingSlotIcon.mapping new file mode 100644 index 0000000000..e612fa4796 --- /dev/null +++ b/mappings/net/minecraft/client/gui/screen/ingame/CyclingSlotIcon.mapping @@ -0,0 +1,24 @@ +CLASS net/minecraft/class_8064 net/minecraft/client/gui/screen/ingame/CyclingSlotIcon + FIELD field_42042 slotId I + FIELD field_42043 textures Ljava/util/List; + FIELD field_42044 timer I + FIELD field_42045 currentIndex I + METHOD (I)V + ARG 1 slotId + METHOD method_48468 computeAlpha (F)F + ARG 1 delta + METHOD method_48469 render (Lnet/minecraft/class_1703;Lnet/minecraft/class_332;FII)V + ARG 1 screenHandler + ARG 2 context + ARG 3 delta + ARG 4 x + ARG 5 y + METHOD method_48470 drawIcon (Lnet/minecraft/class_1735;Lnet/minecraft/class_2960;FLnet/minecraft/class_332;II)V + ARG 1 slot + ARG 2 texture + ARG 3 alpha + ARG 4 context + ARG 5 x + ARG 6 y + METHOD method_48471 updateTexture (Ljava/util/List;)V + ARG 1 textures diff --git a/mappings/net/minecraft/client/gui/screen/ingame/EnchantmentScreen.mapping b/mappings/net/minecraft/client/gui/screen/ingame/EnchantmentScreen.mapping index 9d25ec8654..fb560c08e7 100644 --- a/mappings/net/minecraft/client/gui/screen/ingame/EnchantmentScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/ingame/EnchantmentScreen.mapping @@ -11,8 +11,18 @@ CLASS net/minecraft/class_486 net/minecraft/client/gui/screen/ingame/Enchantment FIELD field_2913 stack Lnet/minecraft/class_1799; FIELD field_2914 pageAngle F FIELD field_2915 ticks I + FIELD field_45464 LEVEL_TEXTURES [Lnet/minecraft/class_2960; + FIELD field_45465 LEVEL_DISABLED_TEXTURES [Lnet/minecraft/class_2960; + FIELD field_45466 ENCHANTMENT_SLOT_DISABLED_TEXTURE Lnet/minecraft/class_2960; + FIELD field_45467 ENCHANTMENT_SLOT_HIGHLIGHTED_TEXTURE Lnet/minecraft/class_2960; + FIELD field_45468 ENCHANTMENT_SLOT_TEXTURE Lnet/minecraft/class_2960; METHOD (Lnet/minecraft/class_1718;Lnet/minecraft/class_1661;Lnet/minecraft/class_2561;)V ARG 1 handler ARG 2 inventory ARG 3 title METHOD method_2478 doTick ()V + METHOD method_52223 drawBook (Lnet/minecraft/class_332;IIF)V + ARG 1 context + ARG 2 x + ARG 3 y + ARG 4 delta diff --git a/mappings/net/minecraft/client/gui/screen/ingame/ForgingScreen.mapping b/mappings/net/minecraft/client/gui/screen/ingame/ForgingScreen.mapping index 3b8c01bbff..28e695125f 100644 --- a/mappings/net/minecraft/client/gui/screen/ingame/ForgingScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/ingame/ForgingScreen.mapping @@ -5,9 +5,13 @@ CLASS net/minecraft/class_4894 net/minecraft/client/gui/screen/ingame/ForgingScr ARG 2 playerInventory ARG 3 title ARG 4 texture - METHOD method_25444 renderForeground (Lnet/minecraft/class_4587;IIF)V - ARG 1 matrices + METHOD method_25444 renderForeground (Lnet/minecraft/class_332;IIF)V + ARG 1 context ARG 2 mouseX ARG 3 mouseY ARG 4 delta METHOD method_25445 setup ()V + METHOD method_48467 drawInvalidRecipeArrow (Lnet/minecraft/class_332;II)V + ARG 1 context + ARG 2 x + ARG 3 y diff --git a/mappings/net/minecraft/client/gui/screen/ingame/FurnaceScreen.mapping b/mappings/net/minecraft/client/gui/screen/ingame/FurnaceScreen.mapping index 864f4b9a29..e8d6324a97 100644 --- a/mappings/net/minecraft/client/gui/screen/ingame/FurnaceScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/ingame/FurnaceScreen.mapping @@ -1,5 +1,7 @@ CLASS net/minecraft/class_3873 net/minecraft/client/gui/screen/ingame/FurnaceScreen FIELD field_17127 TEXTURE Lnet/minecraft/class_2960; + FIELD field_45469 LIT_PROGRESS_TEXTURE Lnet/minecraft/class_2960; + FIELD field_45470 BURN_PROGRESS_TEXTURE Lnet/minecraft/class_2960; METHOD (Lnet/minecraft/class_3858;Lnet/minecraft/class_1661;Lnet/minecraft/class_2561;)V ARG 1 handler ARG 2 inventory diff --git a/mappings/net/minecraft/client/gui/screen/ingame/GrindstoneScreen.mapping b/mappings/net/minecraft/client/gui/screen/ingame/GrindstoneScreen.mapping index 2112d7b602..b046771140 100644 --- a/mappings/net/minecraft/client/gui/screen/ingame/GrindstoneScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/ingame/GrindstoneScreen.mapping @@ -1,5 +1,6 @@ CLASS net/minecraft/class_3802 net/minecraft/client/gui/screen/ingame/GrindstoneScreen FIELD field_16769 TEXTURE Lnet/minecraft/class_2960; + FIELD field_45471 ERROR_TEXTURE Lnet/minecraft/class_2960; METHOD (Lnet/minecraft/class_3803;Lnet/minecraft/class_1661;Lnet/minecraft/class_2561;)V ARG 1 handler ARG 2 inventory diff --git a/mappings/net/minecraft/client/gui/screen/ingame/HandledScreen.mapping b/mappings/net/minecraft/client/gui/screen/ingame/HandledScreen.mapping index 7477040be0..efbc72f5b0 100644 --- a/mappings/net/minecraft/client/gui/screen/ingame/HandledScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/ingame/HandledScreen.mapping @@ -44,8 +44,8 @@ CLASS net/minecraft/class_465 net/minecraft/client/gui/screen/ingame/HandledScre ARG 5 pointX ARG 7 pointY METHOD method_2379 calculateOffset ()V - METHOD method_2380 drawMouseoverTooltip (Lnet/minecraft/class_4587;II)V - ARG 1 matrices + METHOD method_2380 drawMouseoverTooltip (Lnet/minecraft/class_332;II)V + ARG 1 context ARG 2 x ARG 3 y METHOD method_2381 isClickOutsideBounds (DDIII)Z @@ -54,11 +54,12 @@ CLASS net/minecraft/class_465 net/minecraft/client/gui/screen/ingame/HandledScre ARG 5 left ARG 6 top ARG 7 button - METHOD method_2382 drawItem (Lnet/minecraft/class_1799;IILjava/lang/String;)V - ARG 1 stack - ARG 2 x - ARG 3 y - ARG 4 amountText + METHOD method_2382 drawItem (Lnet/minecraft/class_332;Lnet/minecraft/class_1799;IILjava/lang/String;)V + ARG 1 context + ARG 2 stack + ARG 3 x + ARG 4 y + ARG 5 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 @@ -68,8 +69,8 @@ CLASS net/minecraft/class_465 net/minecraft/client/gui/screen/ingame/HandledScre METHOD method_2384 handleHotbarKeyPressed (II)Z ARG 1 keyCode ARG 2 scanCode - METHOD method_2385 drawSlot (Lnet/minecraft/class_4587;Lnet/minecraft/class_1735;)V - ARG 1 matrices + METHOD method_2385 drawSlot (Lnet/minecraft/class_332;Lnet/minecraft/class_1735;)V + ARG 1 context ARG 2 slot METHOD method_2386 getSlotAt (DD)Lnet/minecraft/class_1735; ARG 1 x @@ -78,21 +79,23 @@ CLASS net/minecraft/class_465 net/minecraft/client/gui/screen/ingame/HandledScre ARG 1 slot ARG 2 pointX ARG 4 pointY - METHOD method_2388 drawForeground (Lnet/minecraft/class_4587;II)V - ARG 1 matrices + METHOD method_2388 drawForeground (Lnet/minecraft/class_332;II)V + ARG 1 context ARG 2 mouseX ARG 3 mouseY - METHOD method_2389 drawBackground (Lnet/minecraft/class_4587;FII)V - ARG 1 matrices + METHOD method_2389 drawBackground (Lnet/minecraft/class_332;FII)V + ARG 1 context ARG 2 delta ARG 3 mouseX ARG 4 mouseY METHOD method_30107 onMouseClick (I)V ARG 1 button - METHOD method_33285 drawSlotHighlight (Lnet/minecraft/class_4587;III)V - ARG 0 matrices + METHOD method_33285 drawSlotHighlight (Lnet/minecraft/class_332;III)V + ARG 0 context ARG 1 x ARG 2 y ARG 3 z METHOD method_37432 handledScreenTick ()V METHOD method_44339 endTouchDrag ()V + METHOD method_51454 getTooltipFromItem (Lnet/minecraft/class_1799;)Ljava/util/List; + ARG 1 stack diff --git a/mappings/net/minecraft/client/gui/screen/ingame/HangingSignEditScreen.mapping b/mappings/net/minecraft/client/gui/screen/ingame/HangingSignEditScreen.mapping new file mode 100644 index 0000000000..44d5311d4e --- /dev/null +++ b/mappings/net/minecraft/client/gui/screen/ingame/HangingSignEditScreen.mapping @@ -0,0 +1,4 @@ +CLASS net/minecraft/class_7744 net/minecraft/client/gui/screen/ingame/HangingSignEditScreen + FIELD field_40431 BACKGROUND_SCALE F + FIELD field_40432 TEXT_SCALE Lorg/joml/Vector3f; + FIELD field_40435 texture Lnet/minecraft/class_2960; diff --git a/mappings/net/minecraft/client/gui/screen/ingame/HorseScreen.mapping b/mappings/net/minecraft/client/gui/screen/ingame/HorseScreen.mapping index 3619f9c050..111628562d 100644 --- a/mappings/net/minecraft/client/gui/screen/ingame/HorseScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/ingame/HorseScreen.mapping @@ -3,6 +3,10 @@ CLASS net/minecraft/class_491 net/minecraft/client/gui/screen/ingame/HorseScreen FIELD field_2938 mouseY F FIELD field_2939 mouseX F FIELD field_2941 entity Lnet/minecraft/class_1496; + FIELD field_45472 ARMOR_SLOT_TEXTURE Lnet/minecraft/class_2960; + FIELD field_45473 CHEST_SLOTS_TEXTURE Lnet/minecraft/class_2960; + FIELD field_45474 SADDLE_SLOT_TEXTURE Lnet/minecraft/class_2960; + FIELD field_45475 LLAMA_ARMOR_SLOT_TEXTURE Lnet/minecraft/class_2960; METHOD (Lnet/minecraft/class_1724;Lnet/minecraft/class_1661;Lnet/minecraft/class_1496;)V ARG 1 handler ARG 2 inventory diff --git a/mappings/net/minecraft/client/gui/screen/ingame/InventoryScreen.mapping b/mappings/net/minecraft/client/gui/screen/ingame/InventoryScreen.mapping index f88ee20689..f34c0647e3 100644 --- a/mappings/net/minecraft/client/gui/screen/ingame/InventoryScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/ingame/InventoryScreen.mapping @@ -2,18 +2,25 @@ CLASS net/minecraft/class_490 net/minecraft/client/gui/screen/ingame/InventorySc FIELD field_2929 recipeBook Lnet/minecraft/class_507; FIELD field_2930 mouseDown Z FIELD field_2931 narrow Z - FIELD field_2932 open Z - FIELD field_2933 RECIPE_BUTTON_TEXTURE Lnet/minecraft/class_2960; FIELD field_2934 mouseY F FIELD field_2935 mouseX F METHOD (Lnet/minecraft/class_1657;)V ARG 1 player METHOD method_19891 (Lnet/minecraft/class_4185;)V ARG 1 button - METHOD method_2486 drawEntity (IIIFFLnet/minecraft/class_1309;)V - ARG 0 x - ARG 1 y - ARG 2 size - ARG 3 mouseX - ARG 4 mouseY - ARG 5 entity + METHOD method_2486 drawEntity (Lnet/minecraft/class_332;IIIIIFFFLnet/minecraft/class_1309;)V + ARG 0 context + ARG 1 x1 + ARG 2 y1 + ARG 3 x2 + ARG 4 y2 + ARG 5 size + ARG 7 mouseX + ARG 8 mouseY + ARG 9 entity + METHOD method_48472 drawEntity (Lnet/minecraft/class_332;FFILorg/joml/Vector3f;Lorg/joml/Quaternionf;Lorg/joml/Quaternionf;Lnet/minecraft/class_1309;)V + ARG 0 context + ARG 1 x + ARG 2 y + ARG 3 size + ARG 7 entity diff --git a/mappings/net/minecraft/client/gui/screen/ingame/LoomScreen.mapping b/mappings/net/minecraft/client/gui/screen/ingame/LoomScreen.mapping index c5e134d533..4f6f0c0c14 100644 --- a/mappings/net/minecraft/client/gui/screen/ingame/LoomScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/ingame/LoomScreen.mapping @@ -18,13 +18,22 @@ CLASS net/minecraft/class_494 net/minecraft/client/gui/screen/ingame/LoomScreen FIELD field_32352 PATTERN_LIST_OFFSET_X I FIELD field_32353 PATTERN_LIST_OFFSET_Y I FIELD field_39190 visibleTopRow I + FIELD field_45476 SCROLLER_TEXTURE Lnet/minecraft/class_2960; + FIELD field_45477 SCROLLER_DISABLED_TEXTURE Lnet/minecraft/class_2960; + FIELD field_45478 PATTERN_SELECTED_TEXTURE Lnet/minecraft/class_2960; + FIELD field_45479 PATTERN_HIGHLIGHTED_TEXTURE Lnet/minecraft/class_2960; + FIELD field_45480 PATTERN_TEXTURE Lnet/minecraft/class_2960; + FIELD field_45481 BANNER_SLOT_TEXTURE Lnet/minecraft/class_2960; + FIELD field_45482 DYE_SLOT_TEXTURE Lnet/minecraft/class_2960; + FIELD field_45483 PATTERN_SLOT_TEXTURE Lnet/minecraft/class_2960; METHOD (Lnet/minecraft/class_1726;Lnet/minecraft/class_1661;Lnet/minecraft/class_2561;)V ARG 1 screenHandler ARG 2 inventory ARG 3 title METHOD method_17576 onInventoryChanged ()V - METHOD method_22692 drawBanner (Lnet/minecraft/class_6880;II)V - ARG 1 bannerPattern - ARG 2 x - ARG 3 y + METHOD method_22692 drawBanner (Lnet/minecraft/class_332;Lnet/minecraft/class_6880;II)V + ARG 1 context + ARG 2 pattern + ARG 3 x + ARG 4 y METHOD method_43774 getRows ()I diff --git a/mappings/net/minecraft/client/gui/screen/ingame/MerchantScreen.mapping b/mappings/net/minecraft/client/gui/screen/ingame/MerchantScreen.mapping index a454225eeb..8bb760171b 100644 --- a/mappings/net/minecraft/client/gui/screen/ingame/MerchantScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/ingame/MerchantScreen.mapping @@ -22,12 +22,21 @@ CLASS net/minecraft/class_492 net/minecraft/client/gui/screen/ingame/MerchantScr FIELD field_32369 SCROLLBAR_AREA_HEIGHT I FIELD field_32370 SCROLLBAR_OFFSET_Y I FIELD field_32371 SCROLLBAR_OFFSET_X I + FIELD field_45484 EXPERIENCE_BAR_RESULT_TEXTURE Lnet/minecraft/class_2960; + FIELD field_45485 SCROLLER_TEXTURE Lnet/minecraft/class_2960; + FIELD field_45486 SCROLLER_DISABLED_TEXTURE Lnet/minecraft/class_2960; + FIELD field_45487 TRADE_ARROW_OUT_OF_STOCK_TEXTURE Lnet/minecraft/class_2960; + FIELD field_45488 TRADE_ARROW_TEXTURE Lnet/minecraft/class_2960; + FIELD field_45489 DISCOUNT_STRIKETHROUGH_TEXTURE Lnet/minecraft/class_2960; + FIELD field_45490 OUT_OF_STOCK_TEXTURE Lnet/minecraft/class_2960; + FIELD field_45491 EXPERIENCE_BAR_BACKGROUND_TEXTURE Lnet/minecraft/class_2960; + FIELD field_45492 EXPERIENCE_BAR_CURRENT_TEXTURE Lnet/minecraft/class_2960; METHOD (Lnet/minecraft/class_1728;Lnet/minecraft/class_1661;Lnet/minecraft/class_2561;)V ARG 1 handler ARG 2 inventory ARG 3 title - METHOD method_19413 drawLevelInfo (Lnet/minecraft/class_4587;IILnet/minecraft/class_1914;)V - ARG 1 matrices + METHOD method_19413 drawLevelInfo (Lnet/minecraft/class_332;IILnet/minecraft/class_1914;)V + ARG 1 context ARG 2 x ARG 3 y ARG 4 tradeOffer @@ -35,19 +44,19 @@ CLASS net/minecraft/class_492 net/minecraft/client/gui/screen/ingame/MerchantScr ARG 1 button METHOD method_20220 canScroll (I)Z ARG 1 listSize - METHOD method_20221 renderScrollbar (Lnet/minecraft/class_4587;IILnet/minecraft/class_1916;)V - ARG 1 matrices + METHOD method_20221 renderScrollbar (Lnet/minecraft/class_332;IILnet/minecraft/class_1916;)V + ARG 1 context ARG 2 x ARG 3 y ARG 4 tradeOffers - METHOD method_20222 renderFirstBuyItem (Lnet/minecraft/class_4587;Lnet/minecraft/class_1799;Lnet/minecraft/class_1799;II)V - ARG 1 matrices + METHOD method_20222 renderFirstBuyItem (Lnet/minecraft/class_332;Lnet/minecraft/class_1799;Lnet/minecraft/class_1799;II)V + ARG 1 context ARG 2 adjustedFirstBuyItem ARG 3 originalFirstBuyItem ARG 4 x ARG 5 y - METHOD method_20223 renderArrow (Lnet/minecraft/class_4587;Lnet/minecraft/class_1914;II)V - ARG 1 matrices + METHOD method_20223 renderArrow (Lnet/minecraft/class_332;Lnet/minecraft/class_1914;II)V + ARG 1 context ARG 2 tradeOffer ARG 3 x ARG 4 y @@ -60,3 +69,7 @@ CLASS net/minecraft/class_492 net/minecraft/client/gui/screen/ingame/MerchantScr ARG 4 index ARG 5 onPress METHOD method_20228 getIndex ()I + METHOD method_25352 renderTooltip (Lnet/minecraft/class_332;II)V + ARG 1 context + ARG 2 x + ARG 3 y diff --git a/mappings/net/minecraft/client/gui/screen/ingame/SignEditScreen.mapping b/mappings/net/minecraft/client/gui/screen/ingame/SignEditScreen.mapping index 9b131e615d..18a1f31ac3 100644 --- a/mappings/net/minecraft/client/gui/screen/ingame/SignEditScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/ingame/SignEditScreen.mapping @@ -1,20 +1,8 @@ CLASS net/minecraft/class_498 net/minecraft/client/gui/screen/ingame/SignEditScreen FIELD field_21525 model Lnet/minecraft/class_837$class_4702; - FIELD field_24285 text [Ljava/lang/String; - FIELD field_27390 signType Lnet/minecraft/class_4719; - FIELD field_3029 currentRow I - FIELD field_3030 ticksSinceOpened I - FIELD field_3031 sign Lnet/minecraft/class_2625; - FIELD field_3032 selectionManager Lnet/minecraft/class_3728; - METHOD (Lnet/minecraft/class_2625;Z)V + FIELD field_40436 BACKGROUND_SCALE F + FIELD field_40437 TEXT_SCALE_MULTIPLIER F + FIELD field_40438 TEXT_SCALE Lorg/joml/Vector3f; + METHOD (Lnet/minecraft/class_2625;ZZ)V ARG 1 sign ARG 2 filtered - METHOD method_16205 (Ljava/lang/String;)V - ARG 1 text - METHOD method_2526 finishEditing ()V - METHOD method_2527 (Lnet/minecraft/class_4185;)V - ARG 1 button - METHOD method_27611 (Ljava/lang/String;)Z - ARG 1 text - METHOD method_33890 (Lnet/minecraft/class_2625;ZI)Lnet/minecraft/class_2561; - ARG 2 row diff --git a/mappings/net/minecraft/client/gui/screen/ingame/SmithingScreen.mapping b/mappings/net/minecraft/client/gui/screen/ingame/SmithingScreen.mapping index d9c7462422..c88c900a66 100644 --- a/mappings/net/minecraft/client/gui/screen/ingame/SmithingScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/ingame/SmithingScreen.mapping @@ -1,6 +1,26 @@ CLASS net/minecraft/class_4895 net/minecraft/client/gui/screen/ingame/SmithingScreen - FIELD field_22795 TEXTURE Lnet/minecraft/class_2960; + FIELD field_42048 ARMOR_STAND_ROTATION Lorg/joml/Quaternionf; + FIELD field_42052 EMPTY_SLOT_SMITHING_TEMPLATE_ARMOR_TRIM_TEXTURE Lnet/minecraft/class_2960; + FIELD field_42053 EMPTY_SLOT_SMITHING_TEMPLATE_NETHERITE_UPGRADE_TEXTURE Lnet/minecraft/class_2960; + FIELD field_42054 MISSING_TEMPLATE_TOOLTIP Lnet/minecraft/class_2561; + FIELD field_42055 ERROR_TOOLTIP Lnet/minecraft/class_2561; + FIELD field_42056 EMPTY_SLOT_TEXTURES Ljava/util/List; + FIELD field_42064 templateSlotIcon Lnet/minecraft/class_8064; + FIELD field_42065 baseSlotIcon Lnet/minecraft/class_8064; + FIELD field_42066 additionsSlotIcon Lnet/minecraft/class_8064; + FIELD field_42067 armorStand Lnet/minecraft/class_1531; + FIELD field_45498 ERROR_TEXTURE Lnet/minecraft/class_2960; METHOD (Lnet/minecraft/class_4862;Lnet/minecraft/class_1661;Lnet/minecraft/class_2561;)V ARG 1 handler ARG 2 playerInventory ARG 3 title + METHOD method_48473 getSmithingTemplate ()Ljava/util/Optional; + METHOD method_48474 hasInvalidRecipe ()Z + METHOD method_48475 (Lnet/minecraft/class_332;IILnet/minecraft/class_2561;)V + ARG 4 text + METHOD method_48476 renderSlotTooltip (Lnet/minecraft/class_332;II)V + ARG 1 context + ARG 2 mouseX + ARG 3 mouseY + METHOD method_48641 equipArmorStand (Lnet/minecraft/class_1799;)V + ARG 1 stack diff --git a/mappings/net/minecraft/client/gui/screen/ingame/SmokerScreen.mapping b/mappings/net/minecraft/client/gui/screen/ingame/SmokerScreen.mapping index 15efd474d4..f11c6715c4 100644 --- a/mappings/net/minecraft/client/gui/screen/ingame/SmokerScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/ingame/SmokerScreen.mapping @@ -1,5 +1,7 @@ CLASS net/minecraft/class_3874 net/minecraft/client/gui/screen/ingame/SmokerScreen FIELD field_17128 TEXTURE Lnet/minecraft/class_2960; + FIELD field_45499 LIT_PROGRESS_TEXTURE Lnet/minecraft/class_2960; + FIELD field_45500 BURN_PROGRESS_TEXTURE Lnet/minecraft/class_2960; METHOD (Lnet/minecraft/class_3706;Lnet/minecraft/class_1661;Lnet/minecraft/class_2561;)V ARG 1 handler ARG 2 inventory diff --git a/mappings/net/minecraft/client/gui/screen/ingame/StonecutterScreen.mapping b/mappings/net/minecraft/client/gui/screen/ingame/StonecutterScreen.mapping index ea8eb448fc..90e551a591 100644 --- a/mappings/net/minecraft/client/gui/screen/ingame/StonecutterScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/ingame/StonecutterScreen.mapping @@ -13,16 +13,22 @@ CLASS net/minecraft/class_3979 net/minecraft/client/gui/screen/ingame/Stonecutte FIELD field_32378 SCROLLBAR_AREA_HEIGHT I FIELD field_32379 RECIPE_LIST_OFFSET_X I FIELD field_32380 RECIPE_LIST_OFFSET_Y I + FIELD field_45501 RECIPE_HIGHLIGHTED_TEXTURE Lnet/minecraft/class_2960; + FIELD field_45502 RECIPE_TEXTURE Lnet/minecraft/class_2960; + FIELD field_45503 SCROLLER_TEXTURE Lnet/minecraft/class_2960; + FIELD field_45504 SCROLLER_DISABLED_TEXTURE Lnet/minecraft/class_2960; + FIELD field_45505 RECIPE_SELECTED_TEXTURE Lnet/minecraft/class_2960; METHOD (Lnet/minecraft/class_3971;Lnet/minecraft/class_1661;Lnet/minecraft/class_2561;)V ARG 1 handler ARG 2 inventory ARG 3 title - METHOD method_17951 renderRecipeIcons (III)V - ARG 1 x - ARG 2 y - ARG 3 scrollOffset - METHOD method_17952 renderRecipeBackground (Lnet/minecraft/class_4587;IIIII)V - ARG 1 matrices + METHOD method_17951 renderRecipeIcons (Lnet/minecraft/class_332;III)V + ARG 1 context + ARG 2 x + ARG 3 y + ARG 4 scrollOffset + METHOD method_17952 renderRecipeBackground (Lnet/minecraft/class_332;IIIII)V + ARG 1 context ARG 2 mouseX ARG 3 mouseY ARG 4 x diff --git a/mappings/net/minecraft/client/gui/screen/multiplayer/ChatPreviewWarningScreen.mapping b/mappings/net/minecraft/client/gui/screen/multiplayer/ChatPreviewWarningScreen.mapping deleted file mode 100644 index 75d2c784be..0000000000 --- a/mappings/net/minecraft/client/gui/screen/multiplayer/ChatPreviewWarningScreen.mapping +++ /dev/null @@ -1,14 +0,0 @@ -CLASS net/minecraft/class_7483 net/minecraft/client/gui/screen/multiplayer/ChatPreviewWarningScreen - FIELD field_39348 TITLE Lnet/minecraft/class_2561; - FIELD field_39350 CHECK_MESSAGE Lnet/minecraft/class_2561; - FIELD field_39352 serverInfo Lnet/minecraft/class_642; - FIELD field_39433 parent Lnet/minecraft/class_437; - METHOD (Lnet/minecraft/class_437;Lnet/minecraft/class_642;)V - ARG 1 parent - ARG 2 serverInfo - METHOD method_44066 (Lnet/minecraft/class_4185;)V - ARG 1 button - METHOD method_44067 (Lnet/minecraft/class_4185;)V - ARG 1 button - METHOD method_44069 acknowledge ()V - METHOD method_44938 getWarningContent ()Lnet/minecraft/class_2561; diff --git a/mappings/net/minecraft/client/gui/screen/multiplayer/MultiplayerScreen.mapping b/mappings/net/minecraft/client/gui/screen/multiplayer/MultiplayerScreen.mapping index 5d1302d3d9..45dcff9223 100644 --- a/mappings/net/minecraft/client/gui/screen/multiplayer/MultiplayerScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/multiplayer/MultiplayerScreen.mapping @@ -2,7 +2,7 @@ CLASS net/minecraft/class_500 net/minecraft/client/gui/screen/multiplayer/Multip FIELD field_3037 serverListPinger Lnet/minecraft/class_644; FIELD field_3040 serverList Lnet/minecraft/class_641; FIELD field_3041 buttonEdit Lnet/minecraft/class_4185; - FIELD field_3042 tooltip Ljava/util/List; + FIELD field_3042 multiplayerScreenTooltip Ljava/util/List; FIELD field_3043 serverListWidget Lnet/minecraft/class_4267; FIELD field_3044 LOGGER Lorg/slf4j/Logger; FIELD field_3045 lanServerDetector Lnet/minecraft/class_1134$class_1135; @@ -37,7 +37,7 @@ CLASS net/minecraft/class_500 net/minecraft/client/gui/screen/multiplayer/Multip ARG 1 confirmedAction METHOD method_20380 directConnect (Z)V ARG 1 confirmedAction - METHOD method_2528 setTooltip (Ljava/util/List;)V + METHOD method_2528 setMultiplayerScreenTooltip (Ljava/util/List;)V ARG 1 tooltip METHOD method_2529 getServerList ()Lnet/minecraft/class_641; METHOD method_2531 select (Lnet/minecraft/class_4267$class_504;)V diff --git a/mappings/net/minecraft/client/gui/screen/multiplayer/MultiplayerServerListWidget.mapping b/mappings/net/minecraft/client/gui/screen/multiplayer/MultiplayerServerListWidget.mapping index 3f7772a6fb..54f1ca511b 100644 --- a/mappings/net/minecraft/client/gui/screen/multiplayer/MultiplayerServerListWidget.mapping +++ b/mappings/net/minecraft/client/gui/screen/multiplayer/MultiplayerServerListWidget.mapping @@ -2,7 +2,6 @@ CLASS net/minecraft/class_4267 net/minecraft/client/gui/screen/multiplayer/Multi FIELD field_19104 LOGGER Lorg/slf4j/Logger; FIELD field_19105 SERVER_PINGER_THREAD_POOL Ljava/util/concurrent/ThreadPoolExecutor; FIELD field_19106 UNKNOWN_SERVER_TEXTURE Lnet/minecraft/class_2960; - FIELD field_19107 SERVER_SELECTION_TEXTURE Lnet/minecraft/class_2960; FIELD field_19108 screen Lnet/minecraft/class_500; FIELD field_19109 servers Ljava/util/List; FIELD field_19110 scanningEntry Lnet/minecraft/class_4267$class_504; @@ -10,9 +9,28 @@ CLASS net/minecraft/class_4267 net/minecraft/client/gui/screen/multiplayer/Multi FIELD field_26581 LAN_SCANNING_TEXT Lnet/minecraft/class_2561; FIELD field_26582 CANNOT_RESOLVE_TEXT Lnet/minecraft/class_2561; FIELD field_26583 CANNOT_CONNECT_TEXT Lnet/minecraft/class_2561; - FIELD field_26586 NO_CONNECTION_TEXT Lnet/minecraft/class_2561; - FIELD field_26587 PINGING_TEXT Lnet/minecraft/class_2561; - FIELD field_26849 INCOMPATIBLE_TEXT Lnet/minecraft/class_2561; + FIELD field_41853 INCOMPATIBLE_TEXT Lnet/minecraft/class_2561; + FIELD field_41854 NO_CONNECTION_TEXT Lnet/minecraft/class_2561; + FIELD field_41855 PINGING_TEXT Lnet/minecraft/class_2561; + FIELD field_41856 ONLINE_TEXT Lnet/minecraft/class_2561; + FIELD field_45513 MOVE_UP_TEXTURE Lnet/minecraft/class_2960; + FIELD field_45514 MOVE_DOWN_HIGHLIGHTED_TEXTURE Lnet/minecraft/class_2960; + FIELD field_45515 MOVE_DOWN_TEXTURE Lnet/minecraft/class_2960; + FIELD field_45516 INCOMPATIBLE_TEXTURE Lnet/minecraft/class_2960; + FIELD field_45517 UNREACHABLE_TEXTURE Lnet/minecraft/class_2960; + FIELD field_45518 PING_1_TEXTURE Lnet/minecraft/class_2960; + FIELD field_45519 PING_2_TEXTURE Lnet/minecraft/class_2960; + FIELD field_45520 PING_3_TEXTURE Lnet/minecraft/class_2960; + FIELD field_45521 PING_4_TEXTURE Lnet/minecraft/class_2960; + FIELD field_45522 PING_5_TEXTURE Lnet/minecraft/class_2960; + FIELD field_45523 PINGING_1_TEXTURE Lnet/minecraft/class_2960; + FIELD field_45524 PINGING_2_TEXTURE Lnet/minecraft/class_2960; + FIELD field_45525 PINGING_3_TEXTURE Lnet/minecraft/class_2960; + FIELD field_45526 PINGING_4_TEXTURE Lnet/minecraft/class_2960; + FIELD field_45527 PINGING_5_TEXTURE Lnet/minecraft/class_2960; + FIELD field_45528 JOIN_HIGHLIGHTED_TEXTURE Lnet/minecraft/class_2960; + FIELD field_45529 JOIN_TEXTURE Lnet/minecraft/class_2960; + FIELD field_45530 MOVE_UP_HIGHLIGHTED_TEXTURE Lnet/minecraft/class_2960; METHOD (Lnet/minecraft/class_500;Lnet/minecraft/class_310;IIIII)V ARG 1 screen ARG 2 client @@ -26,12 +44,15 @@ CLASS net/minecraft/class_4267 net/minecraft/client/gui/screen/multiplayer/Multi METHOD method_20126 setLanServers (Ljava/util/List;)V ARG 1 lanServers METHOD method_20131 updateEntries ()V - METHOD method_30016 (Lnet/minecraft/class_4267$class_504;)Z - ARG 0 entry METHOD method_36888 (Lnet/minecraft/class_4267;Lnet/minecraft/class_350$class_351;)V ARG 1 lanServer METHOD method_36889 (Lnet/minecraft/class_4267;Lnet/minecraft/class_350$class_351;)V ARG 1 server + METHOD method_48271 (Lnet/minecraft/class_2583;)Lnet/minecraft/class_2583; + ARG 0 style + METHOD method_48272 (Lnet/minecraft/class_2583;)Lnet/minecraft/class_2583; + ARG 0 style + METHOD method_52204 onRemoved ()V CLASS class_504 Entry CLASS class_4268 ScanningEntry FIELD field_19112 client Lnet/minecraft/class_310; @@ -46,20 +67,20 @@ CLASS net/minecraft/class_4267 net/minecraft/client/gui/screen/multiplayer/Multi ARG 1 screen ARG 2 server METHOD method_20132 getLanServerEntry ()Lnet/minecraft/class_1131; + METHOD method_48273 getMotdNarration ()Lnet/minecraft/class_2561; CLASS class_4270 ServerEntry FIELD field_19118 screen Lnet/minecraft/class_500; FIELD field_19119 client Lnet/minecraft/class_310; FIELD field_19120 server Lnet/minecraft/class_642; - FIELD field_19121 iconTextureId Lnet/minecraft/class_2960; - FIELD field_19122 iconUri Ljava/lang/String; - FIELD field_19123 icon Lnet/minecraft/class_1043; + FIELD field_19123 icon Lnet/minecraft/class_8573; FIELD field_19124 time J + FIELD field_42874 favicon [B METHOD (Lnet/minecraft/class_4267;Lnet/minecraft/class_500;Lnet/minecraft/class_642;)V ARG 2 screen ARG 3 server METHOD method_20133 getServer ()Lnet/minecraft/class_642; - METHOD method_20134 draw (Lnet/minecraft/class_4587;IILnet/minecraft/class_2960;)V - ARG 1 matrices + METHOD method_20134 draw (Lnet/minecraft/class_332;IILnet/minecraft/class_2960;)V + ARG 1 context ARG 2 x ARG 3 y ARG 4 textureId @@ -68,5 +89,7 @@ CLASS net/minecraft/class_4267 net/minecraft/client/gui/screen/multiplayer/Multi ARG 1 i ARG 2 j METHOD method_29978 saveFile ()V - METHOD method_29979 isNewIconValid (Ljava/lang/String;)Z - ARG 1 newIconUri + METHOD method_48274 pinged ()Z + METHOD method_48275 protocolVersionMatches ()Z + METHOD method_49300 uploadFavicon ([B)Z + ARG 1 bytes diff --git a/mappings/net/minecraft/client/gui/screen/multiplayer/MultiplayerWarningScreen.mapping b/mappings/net/minecraft/client/gui/screen/multiplayer/MultiplayerWarningScreen.mapping index 4532953c32..95d219000b 100644 --- a/mappings/net/minecraft/client/gui/screen/multiplayer/MultiplayerWarningScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/multiplayer/MultiplayerWarningScreen.mapping @@ -6,3 +6,7 @@ CLASS net/minecraft/class_4749 net/minecraft/client/gui/screen/multiplayer/Multi FIELD field_39354 parent Lnet/minecraft/class_437; METHOD (Lnet/minecraft/class_437;)V ARG 1 parent + METHOD method_41162 (Lnet/minecraft/class_4185;)V + ARG 1 button + METHOD method_41163 (Lnet/minecraft/class_4185;)V + ARG 1 button diff --git a/mappings/net/minecraft/client/gui/screen/multiplayer/SocialInteractionsPlayerListEntry.mapping b/mappings/net/minecraft/client/gui/screen/multiplayer/SocialInteractionsPlayerListEntry.mapping index 7cb705ccb4..b29e63b779 100644 --- a/mappings/net/minecraft/client/gui/screen/multiplayer/SocialInteractionsPlayerListEntry.mapping +++ b/mappings/net/minecraft/client/gui/screen/multiplayer/SocialInteractionsPlayerListEntry.mapping @@ -10,11 +10,9 @@ CLASS net/minecraft/class_5519 net/minecraft/client/gui/screen/multiplayer/Socia FIELD field_26859 offline Z FIELD field_26860 hideButton Lnet/minecraft/class_4185; FIELD field_26861 showButton Lnet/minecraft/class_4185; - FIELD field_26862 hideTooltip Ljava/util/List; - FIELD field_26863 showTooltip Ljava/util/List; FIELD field_26864 timeCounter F FIELD field_26903 LIGHT_GRAY_COLOR I - FIELD field_26904 skinTexture Ljava/util/function/Supplier; + FIELD field_26904 skinSupplier Ljava/util/function/Supplier; FIELD field_26905 HIDDEN_TEXT Lnet/minecraft/class_2561; FIELD field_26906 BLOCKED_TEXT Lnet/minecraft/class_2561; FIELD field_26907 OFFLINE_TEXT Lnet/minecraft/class_2561; @@ -24,13 +22,15 @@ CLASS net/minecraft/class_5519 net/minecraft/client/gui/screen/multiplayer/Socia FIELD field_33838 showText Lnet/minecraft/class_2561; FIELD field_39622 reportButton Lnet/minecraft/class_4185; FIELD field_39623 reportText Lnet/minecraft/class_2561; - FIELD field_39624 reportTooltip Ljava/util/List; FIELD field_39736 REPORT_DISABLED_TEXT Lnet/minecraft/class_2561; - FIELD field_39737 REPORT_BUTTON_TEXTURE Lnet/minecraft/class_2960; FIELD field_39790 sentMessage Z FIELD field_39791 canSendReports Z - FIELD field_39936 NOT_REPORTABLE_TEXT Lnet/minecraft/class_2561; FIELD field_39937 reportable Z + FIELD field_40796 hasDraftReport Z + FIELD field_45560 DRAFT_REPORT_ICON_TEXTURE Lnet/minecraft/class_2960; + FIELD field_45561 REPORT_BUTTON_TEXTURES Lnet/minecraft/class_8666; + FIELD field_45562 MUTE_BUTTON_TEXTURES Lnet/minecraft/class_8666; + FIELD field_45563 UNMUTE_BUTTON_TEXTURES Lnet/minecraft/class_8666; METHOD (Lnet/minecraft/class_310;Lnet/minecraft/class_5522;Ljava/util/UUID;Ljava/lang/String;Ljava/util/function/Supplier;Z)V ARG 1 client ARG 2 parent @@ -40,12 +40,6 @@ CLASS net/minecraft/class_5519 net/minecraft/client/gui/screen/multiplayer/Socia ARG 6 reportable METHOD method_31326 (Lnet/minecraft/class_5520;Ljava/util/UUID;Ljava/lang/String;Lnet/minecraft/class_4185;)V ARG 4 button - METHOD method_31328 renderTooltip (Lnet/minecraft/class_5522;Lnet/minecraft/class_4587;Ljava/util/List;II)V - ARG 0 screen - ARG 1 matrices - ARG 2 tooltip - ARG 3 mouseX - ARG 4 mouseY METHOD method_31329 onButtonClick (ZLnet/minecraft/class_2561;)V ARG 1 showButtonVisible ARG 2 chatMessage @@ -58,11 +52,14 @@ CLASS net/minecraft/class_5519 net/minecraft/client/gui/screen/multiplayer/Socia METHOD method_31389 getNarrationMessage (Lnet/minecraft/class_5250;)Lnet/minecraft/class_5250; ARG 1 text METHOD method_31390 getStatusText ()Lnet/minecraft/class_2561; - METHOD method_44525 (Lnet/minecraft/class_310;Lnet/minecraft/class_7574;Ljava/util/UUID;Lnet/minecraft/class_4185;)V - ARG 3 button + METHOD method_44525 (Lnet/minecraft/class_7574;Lnet/minecraft/class_310;Lnet/minecraft/class_5522;Lnet/minecraft/class_4185;)V + ARG 4 button METHOD method_44753 setSentMessage (Z)V ARG 1 sentMessage METHOD method_44754 isOffline ()Z - METHOD method_44755 getReportText (Z)Lnet/minecraft/class_2561; - ARG 1 narrated METHOD method_44756 hasSentMessage ()Z + METHOD method_47634 getReportButtonTooltip ()Lnet/minecraft/class_7919; + METHOD method_47905 setShowButtonVisible (Z)V + ARG 1 showButtonVisible + METHOD method_53594 getSkinSupplier ()Ljava/util/function/Supplier; + METHOD method_53595 isReportable ()Z diff --git a/mappings/net/minecraft/client/gui/screen/multiplayer/SocialInteractionsPlayerListWidget.mapping b/mappings/net/minecraft/client/gui/screen/multiplayer/SocialInteractionsPlayerListWidget.mapping index ceabfd35db..2a14c5ddae 100644 --- a/mappings/net/minecraft/client/gui/screen/multiplayer/SocialInteractionsPlayerListWidget.mapping +++ b/mappings/net/minecraft/client/gui/screen/multiplayer/SocialInteractionsPlayerListWidget.mapping @@ -41,3 +41,5 @@ CLASS net/minecraft/class_5521 net/minecraft/client/gui/screen/multiplayer/Socia METHOD method_44761 (Lnet/minecraft/class_5519;)Ljava/lang/Integer; ARG 1 player METHOD method_44762 sortPlayers ()V + METHOD method_45665 collectReportableProfiles (Lnet/minecraft/class_7555;)Ljava/util/Collection; + ARG 0 log diff --git a/mappings/net/minecraft/client/gui/screen/multiplayer/SocialInteractionsScreen.mapping b/mappings/net/minecraft/client/gui/screen/multiplayer/SocialInteractionsScreen.mapping index 7d3f2f461b..719d9b2a7b 100644 --- a/mappings/net/minecraft/client/gui/screen/multiplayer/SocialInteractionsScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/multiplayer/SocialInteractionsScreen.mapping @@ -1,8 +1,6 @@ CLASS net/minecraft/class_5522 net/minecraft/client/gui/screen/multiplayer/SocialInteractionsScreen FIELD field_26871 playerCount I FIELD field_26873 initialized Z - FIELD field_26874 onRendered Ljava/lang/Runnable; - FIELD field_26875 SOCIAL_INTERACTIONS_TEXTURE Lnet/minecraft/class_2960; FIELD field_26876 ALL_TAB_TITLE Lnet/minecraft/class_2561; FIELD field_26877 HIDDEN_TAB_TITLE Lnet/minecraft/class_2561; FIELD field_26878 SELECTED_ALL_TAB_TITLE Lnet/minecraft/class_2561; @@ -23,7 +21,8 @@ CLASS net/minecraft/class_5522 net/minecraft/client/gui/screen/multiplayer/Socia FIELD field_26917 EMPTY_SEARCH_TEXT Lnet/minecraft/class_2561; FIELD field_26918 EMPTY_BLOCKED_TEXT Lnet/minecraft/class_2561; FIELD field_26919 BLOCKING_TEXT Lnet/minecraft/class_2561; - FIELD field_32423 BLOCKING_URL Ljava/lang/String; + FIELD field_45564 BACKGROUND_TEXTURE Lnet/minecraft/class_2960; + FIELD field_45565 SEARCH_ICON_TEXTURE Lnet/minecraft/class_2960; METHOD method_31350 updateServerLabel (Lnet/minecraft/class_310;)V ARG 1 client METHOD method_31351 (Lnet/minecraft/class_4185;)V @@ -32,8 +31,6 @@ CLASS net/minecraft/class_5522 net/minecraft/client/gui/screen/multiplayer/Socia ARG 1 currentTab METHOD method_31353 setPlayerOnline (Lnet/minecraft/class_640;)V ARG 1 player - METHOD method_31354 setOnRendered (Ljava/lang/Runnable;)V - ARG 1 onRendered METHOD method_31355 setPlayerOffline (Ljava/util/UUID;)V ARG 1 uuid METHOD method_31356 (Lnet/minecraft/class_4185;)V @@ -41,7 +38,6 @@ CLASS net/minecraft/class_5522 net/minecraft/client/gui/screen/multiplayer/Socia METHOD method_31357 onSearchChange (Ljava/lang/String;)V ARG 1 currentSearch METHOD method_31359 getScreenHeight ()I - METHOD method_31360 getRowCount ()I METHOD method_31361 getPlayerListBottom ()I METHOD method_31362 getSearchBoxX ()I METHOD method_31394 (Lnet/minecraft/class_4185;)V diff --git a/mappings/net/minecraft/client/gui/screen/option/AccessibilityOptionsScreen.mapping b/mappings/net/minecraft/client/gui/screen/option/AccessibilityOptionsScreen.mapping index aa947671d3..26e39c9878 100644 --- a/mappings/net/minecraft/client/gui/screen/option/AccessibilityOptionsScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/option/AccessibilityOptionsScreen.mapping @@ -1,5 +1,4 @@ CLASS net/minecraft/class_4189 net/minecraft/client/gui/screen/option/AccessibilityOptionsScreen - FIELD field_32235 GUIDE_URL Ljava/lang/String; 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/option/ControlsListWidget.mapping b/mappings/net/minecraft/client/gui/screen/option/ControlsListWidget.mapping index 9cdc31f412..24ce063232 100644 --- a/mappings/net/minecraft/client/gui/screen/option/ControlsListWidget.mapping +++ b/mappings/net/minecraft/client/gui/screen/option/ControlsListWidget.mapping @@ -4,17 +4,21 @@ CLASS net/minecraft/class_459 net/minecraft/client/gui/screen/option/ControlsLis METHOD (Lnet/minecraft/class_6599;Lnet/minecraft/class_310;)V ARG 1 parent ARG 2 client + METHOD method_49006 update ()V + METHOD method_49007 updateChildren ()V CLASS class_460 CategoryEntry FIELD field_2736 text Lnet/minecraft/class_2561; FIELD field_2737 textWidth I METHOD (Lnet/minecraft/class_459;Lnet/minecraft/class_2561;)V ARG 2 text CLASS class_461 Entry + METHOD method_48269 update ()V CLASS class_462 KeyBindingEntry FIELD field_2739 editButton Lnet/minecraft/class_4185; FIELD field_2740 binding Lnet/minecraft/class_304; FIELD field_2741 bindingName Lnet/minecraft/class_2561; FIELD field_2743 resetButton Lnet/minecraft/class_4185; + FIELD field_42497 duplicate Z METHOD (Lnet/minecraft/class_459;Lnet/minecraft/class_304;Lnet/minecraft/class_2561;)V ARG 2 binding ARG 3 bindingName @@ -22,3 +26,7 @@ CLASS net/minecraft/class_459 net/minecraft/client/gui/screen/option/ControlsLis ARG 2 button METHOD method_19871 (Lnet/minecraft/class_304;Lnet/minecraft/class_4185;)V ARG 2 button + METHOD method_46514 (Lnet/minecraft/class_304;Lnet/minecraft/class_2561;Ljava/util/function/Supplier;)Lnet/minecraft/class_5250; + ARG 2 textSupplier + METHOD method_46515 (Lnet/minecraft/class_2561;Ljava/util/function/Supplier;)Lnet/minecraft/class_5250; + ARG 1 textSupplier diff --git a/mappings/net/minecraft/client/gui/screen/option/CreditsAndAttributionScreen.mapping b/mappings/net/minecraft/client/gui/screen/option/CreditsAndAttributionScreen.mapping new file mode 100644 index 0000000000..3efa6f2dbf --- /dev/null +++ b/mappings/net/minecraft/client/gui/screen/option/CreditsAndAttributionScreen.mapping @@ -0,0 +1,16 @@ +CLASS net/minecraft/class_8219 net/minecraft/client/gui/screen/option/CreditsAndAttributionScreen + FIELD field_43137 SPACING I + FIELD field_43138 BUTTON_WIDTH I + FIELD field_43139 TITLE Lnet/minecraft/class_2561; + FIELD field_43140 CREDITS_TEXT Lnet/minecraft/class_2561; + FIELD field_43141 ATTRIBUTION_TEXT Lnet/minecraft/class_2561; + FIELD field_43142 LICENSE_TEXT Lnet/minecraft/class_2561; + FIELD field_43143 parent Lnet/minecraft/class_437; + FIELD field_43144 layout Lnet/minecraft/class_8132; + METHOD (Lnet/minecraft/class_437;)V + ARG 1 parent + METHOD method_49737 (Lnet/minecraft/class_4185;)V + ARG 1 button + METHOD method_49738 (Lnet/minecraft/class_4185;)V + ARG 1 button + METHOD method_49739 openCredits ()V diff --git a/mappings/net/minecraft/client/gui/screen/option/GameOptionsScreen.mapping b/mappings/net/minecraft/client/gui/screen/option/GameOptionsScreen.mapping index bced23512d..a0d6082290 100644 --- a/mappings/net/minecraft/client/gui/screen/option/GameOptionsScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/option/GameOptionsScreen.mapping @@ -5,7 +5,9 @@ CLASS net/minecraft/class_4667 net/minecraft/client/gui/screen/option/GameOption ARG 1 parent ARG 2 gameOptions ARG 3 title - METHOD method_31048 getHoveredButtonTooltip (Lnet/minecraft/class_353;II)Ljava/util/List; - ARG 0 buttonList - ARG 1 mouseX - ARG 2 mouseY + METHOD method_45626 render (Lnet/minecraft/class_332;Lnet/minecraft/class_353;IIF)V + ARG 1 context + ARG 2 optionButtons + ARG 3 mouseX + ARG 4 mouseY + ARG 5 tickDelta diff --git a/mappings/net/minecraft/client/gui/screen/option/LanguageOptionsScreen.mapping b/mappings/net/minecraft/client/gui/screen/option/LanguageOptionsScreen.mapping index cfbcf51b79..e48eb0a2fb 100644 --- a/mappings/net/minecraft/client/gui/screen/option/LanguageOptionsScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/option/LanguageOptionsScreen.mapping @@ -8,11 +8,18 @@ CLASS net/minecraft/class_426 net/minecraft/client/gui/screen/option/LanguageOpt ARG 3 languageManager METHOD method_19820 (Lnet/minecraft/class_4185;)V ARG 1 button + METHOD method_52184 onDone ()V CLASS class_4195 LanguageSelectionListWidget METHOD (Lnet/minecraft/class_426;Lnet/minecraft/class_310;)V ARG 2 client + METHOD method_48261 (Ljava/lang/String;Ljava/lang/String;Lnet/minecraft/class_1077;)V + ARG 2 languageCode + ARG 3 languageDefinition CLASS class_4194 LanguageEntry - FIELD field_18743 languageDefinition Lnet/minecraft/class_1077; - METHOD (Lnet/minecraft/class_426$class_4195;Lnet/minecraft/class_1077;)V - ARG 2 languageDefinition + FIELD field_18743 languageDefinition Lnet/minecraft/class_2561; + FIELD field_41846 languageCode Ljava/lang/String; + FIELD field_44921 clickTime J + METHOD (Lnet/minecraft/class_426$class_4195;Ljava/lang/String;Lnet/minecraft/class_1077;)V + ARG 2 languageCode + ARG 3 languageDefinition METHOD method_19381 onPressed ()V diff --git a/mappings/net/minecraft/client/gui/screen/option/OnlineOptionsScreen.mapping b/mappings/net/minecraft/client/gui/screen/option/OnlineOptionsScreen.mapping index 41a395c1b7..759967d5f4 100644 --- a/mappings/net/minecraft/client/gui/screen/option/OnlineOptionsScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/option/OnlineOptionsScreen.mapping @@ -1,4 +1,18 @@ CLASS net/minecraft/class_6777 net/minecraft/client/gui/screen/option/OnlineOptionsScreen - METHOD (Lnet/minecraft/class_437;Lnet/minecraft/class_315;)V + FIELD field_41344 difficulty Lnet/minecraft/class_7172; + METHOD (Lnet/minecraft/class_437;Lnet/minecraft/class_315;[Lnet/minecraft/class_7172;Lnet/minecraft/class_7172;)V ARG 1 parent ARG 2 gameOptions + ARG 3 options + ARG 4 difficulty + METHOD method_47619 (Lnet/minecraft/class_1267;Lnet/minecraft/class_2561;Lcom/mojang/datafixers/util/Unit;)Lnet/minecraft/class_2561; + ARG 1 optionText + ARG 2 unit + METHOD method_47620 (Lcom/mojang/datafixers/util/Unit;)V + ARG 0 unit + METHOD method_47621 create (Lnet/minecraft/class_310;Lnet/minecraft/class_437;Lnet/minecraft/class_315;)Lnet/minecraft/class_6777; + ARG 0 client + ARG 1 parent + ARG 2 gameOptions + METHOD method_47622 (Lnet/minecraft/class_638;)Lnet/minecraft/class_7172; + ARG 0 world diff --git a/mappings/net/minecraft/client/gui/screen/option/OptionsScreen.mapping b/mappings/net/minecraft/client/gui/screen/option/OptionsScreen.mapping index 78513741c5..c68c1878b5 100644 --- a/mappings/net/minecraft/client/gui/screen/option/OptionsScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/option/OptionsScreen.mapping @@ -3,41 +3,41 @@ CLASS net/minecraft/class_429 net/minecraft/client/gui/screen/option/OptionsScre FIELD field_2501 parent Lnet/minecraft/class_437; FIELD field_2502 settings Lnet/minecraft/class_315; FIELD field_2503 lockDifficultyButton Lnet/minecraft/class_347; + FIELD field_41345 SKIN_CUSTOMIZATION_TEXT Lnet/minecraft/class_2561; + FIELD field_41346 SOUNDS_TEXT Lnet/minecraft/class_2561; + FIELD field_41347 VIDEO_TEXT Lnet/minecraft/class_2561; + FIELD field_41348 CONTROL_TEXT Lnet/minecraft/class_2561; + FIELD field_41349 LANGUAGE_TEXT Lnet/minecraft/class_2561; + FIELD field_41350 CHAT_TEXT Lnet/minecraft/class_2561; + FIELD field_41351 RESOURCE_PACK_TEXT Lnet/minecraft/class_2561; + FIELD field_41352 ACCESSIBILITY_TEXT Lnet/minecraft/class_2561; + FIELD field_41353 TELEMETRY_TEXT Lnet/minecraft/class_2561; + FIELD field_41354 COLUMNS I + FIELD field_43145 CREDITS_AND_ATTRIBUTION_TEXT Lnet/minecraft/class_2561; METHOD (Lnet/minecraft/class_437;Lnet/minecraft/class_315;)V ARG 1 parent ARG 2 gameOptions - METHOD method_19822 (Lnet/minecraft/class_4185;)V - ARG 1 button - METHOD method_19823 (Lnet/minecraft/class_4185;)V - ARG 1 button - METHOD method_19824 (Lnet/minecraft/class_4185;)V - ARG 1 button - METHOD method_19825 (Lnet/minecraft/class_4185;)V - ARG 1 button - METHOD method_19826 (Lnet/minecraft/class_4185;)V - ARG 1 button - METHOD method_19827 (Lnet/minecraft/class_4185;)V - ARG 1 button - METHOD method_19828 (Lnet/minecraft/class_4185;)V - ARG 1 button - METHOD method_19829 (Lnet/minecraft/class_4185;)V - ARG 1 button - METHOD method_19830 (Lnet/minecraft/class_4185;)V - ARG 1 button - METHOD method_19832 (Lnet/minecraft/class_4185;)V - ARG 1 button METHOD method_20374 lockDifficulty (Z)V ARG 1 difficultyLocked - METHOD method_29975 refreshResourcePacks (Lnet/minecraft/class_3283;)V - ARG 1 resourcePackManager - METHOD method_39486 createDifficultyButtonWidget (IIILjava/lang/String;Lnet/minecraft/class_310;)Lnet/minecraft/class_5676; - ARG 0 buttonIndex - ARG 1 width - ARG 2 height - ARG 3 translationKey - ARG 4 client + METHOD method_39486 createDifficultyButtonWidget (IILjava/lang/String;Lnet/minecraft/class_310;)Lnet/minecraft/class_5676; + ARG 0 x + ARG 1 y + ARG 2 translationKey + ARG 3 client METHOD method_39487 (Lnet/minecraft/class_310;Lnet/minecraft/class_5676;Lnet/minecraft/class_1267;)V ARG 1 button ARG 2 difficulty - METHOD method_39488 (Lnet/minecraft/class_4185;)V + METHOD method_47623 (Lnet/minecraft/class_4185;)V ARG 1 button + METHOD method_47624 (Ljava/util/function/Supplier;Lnet/minecraft/class_4185;)V + ARG 2 button + METHOD method_47625 createButton (Lnet/minecraft/class_2561;Ljava/util/function/Supplier;)Lnet/minecraft/class_4185; + ARG 1 message + ARG 2 screenSupplier + METHOD method_47626 (Lnet/minecraft/class_4185;)V + ARG 1 button + METHOD method_47627 (Lnet/minecraft/class_4185;)V + ARG 1 button + METHOD method_47628 createTopRightButton ()Lnet/minecraft/class_8021; + METHOD method_49626 refreshResourcePacks (Lnet/minecraft/class_3283;)V + ARG 1 resourcePackManager diff --git a/mappings/net/minecraft/client/gui/screen/option/SoundOptionsScreen.mapping b/mappings/net/minecraft/client/gui/screen/option/SoundOptionsScreen.mapping index a742c2fe81..8ac6fe7c52 100644 --- a/mappings/net/minecraft/client/gui/screen/option/SoundOptionsScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/option/SoundOptionsScreen.mapping @@ -1,7 +1,14 @@ CLASS net/minecraft/class_443 net/minecraft/client/gui/screen/option/SoundOptionsScreen - FIELD field_37910 directionalAudioButton Lnet/minecraft/class_339; + FIELD field_40416 optionButtons Lnet/minecraft/class_353; METHOD (Lnet/minecraft/class_437;Lnet/minecraft/class_315;)V ARG 1 parent ARG 2 options METHOD method_19855 (Lnet/minecraft/class_4185;)V ARG 1 button + METHOD method_45628 (Lnet/minecraft/class_3419;)Lnet/minecraft/class_7172; + ARG 1 category + METHOD method_45629 getOptions (Lnet/minecraft/class_315;)[Lnet/minecraft/class_7172; + ARG 0 gameOptions + METHOD method_45630 (Lnet/minecraft/class_3419;)Z + ARG 0 category + METHOD method_45631 getVolumeOptions ()[Lnet/minecraft/class_7172; diff --git a/mappings/net/minecraft/client/gui/screen/option/TelemetryEventWidget.mapping b/mappings/net/minecraft/client/gui/screen/option/TelemetryEventWidget.mapping new file mode 100644 index 0000000000..4551691b6b --- /dev/null +++ b/mappings/net/minecraft/client/gui/screen/option/TelemetryEventWidget.mapping @@ -0,0 +1,51 @@ +CLASS net/minecraft/class_7941 net/minecraft/client/gui/screen/option/TelemetryEventWidget + FIELD field_41355 MARGIN_X I + FIELD field_41356 REQUIRED_TRANSLATION_KEY Ljava/lang/String; + FIELD field_41357 OPTIONAL_TRANSLATION_KEY Ljava/lang/String; + FIELD field_41358 PROPERTY_TITLE_TEXT Lnet/minecraft/class_2561; + FIELD field_41359 textRenderer Lnet/minecraft/class_327; + FIELD field_41360 contents Lnet/minecraft/class_7941$class_7942; + FIELD field_41361 scrollConsumer Ljava/util/function/DoubleConsumer; + METHOD (IIIILnet/minecraft/class_327;)V + ARG 1 x + ARG 2 y + ARG 3 width + ARG 4 height + ARG 5 textRenderer + METHOD method_47635 appendEventInfo (Lnet/minecraft/class_7941$class_7943;Lnet/minecraft/class_7966;)V + ARG 1 builder + ARG 2 eventType + METHOD method_47636 appendProperties (Lnet/minecraft/class_7966;Lnet/minecraft/class_7941$class_7943;)V + ARG 1 eventType + ARG 2 builder + METHOD method_47637 setScrollConsumer (Ljava/util/function/DoubleConsumer;)V + ARG 1 scrollConsumer + METHOD method_47638 refresh (Z)V + ARG 1 optionalTelemetryEnabled + METHOD method_47639 collectContents (Z)Lnet/minecraft/class_7941$class_7942; + ARG 1 optionalTelemetryEnabled + METHOD method_47640 getGridWidth ()I + METHOD method_48285 (Lnet/minecraft/class_332;IIFLnet/minecraft/class_339;)V + ARG 4 widget + CLASS class_7942 Contents + FIELD comp_1160 grid Lnet/minecraft/class_8133; + METHOD comp_1160 grid ()Lnet/minecraft/class_8133; + CLASS class_7943 ContentsBuilder + FIELD field_41362 gridWidth I + FIELD field_41366 narration Lnet/minecraft/class_5250; + FIELD field_45566 layout Lnet/minecraft/class_8667; + METHOD (I)V + ARG 1 gridWidth + METHOD method_47641 build ()Lnet/minecraft/class_7941$class_7942; + METHOD method_47642 appendSpace (I)V + ARG 1 height + METHOD method_47643 appendTitle (Lnet/minecraft/class_327;Lnet/minecraft/class_2561;)V + ARG 1 textRenderer + ARG 2 title + METHOD method_47644 appendTitle (Lnet/minecraft/class_327;Lnet/minecraft/class_2561;I)V + ARG 1 textRenderer + ARG 2 title + ARG 3 marginBottom + METHOD method_47645 appendText (Lnet/minecraft/class_327;Lnet/minecraft/class_2561;)V + ARG 1 textRenderer + ARG 2 text diff --git a/mappings/net/minecraft/client/gui/screen/option/TelemetryInfoScreen.mapping b/mappings/net/minecraft/client/gui/screen/option/TelemetryInfoScreen.mapping new file mode 100644 index 0000000000..dc753c222d --- /dev/null +++ b/mappings/net/minecraft/client/gui/screen/option/TelemetryInfoScreen.mapping @@ -0,0 +1,36 @@ +CLASS net/minecraft/class_7944 net/minecraft/client/gui/screen/option/TelemetryInfoScreen + FIELD field_41367 MARGIN I + FIELD field_41369 TITLE_TEXT Lnet/minecraft/class_2561; + FIELD field_41370 DESCRIPTION_TEXT Lnet/minecraft/class_2561; + FIELD field_41371 GIVE_FEEDBACK_TEXT Lnet/minecraft/class_2561; + FIELD field_41372 SHOW_DATA_TEXT Lnet/minecraft/class_2561; + FIELD field_41373 parent Lnet/minecraft/class_437; + FIELD field_41374 options Lnet/minecraft/class_315; + FIELD field_41375 telemetryEventWidget Lnet/minecraft/class_7941; + FIELD field_41376 scroll D + FIELD field_45567 PRIVACY_STATEMENT_TEXT Lnet/minecraft/class_2561; + METHOD (Lnet/minecraft/class_437;Lnet/minecraft/class_315;)V + ARG 1 parent + ARG 2 options + METHOD method_47646 (D)V + ARG 1 scroll + METHOD method_47647 createButtonRow (Lnet/minecraft/class_339;Lnet/minecraft/class_339;)Lnet/minecraft/class_7845; + ARG 1 left + ARG 2 right + METHOD method_47648 goBack (Lnet/minecraft/class_4185;)V + ARG 1 button + METHOD method_47649 (Ljava/lang/Boolean;)V + ARG 1 value + METHOD method_47650 openFeedbackPage (Lnet/minecraft/class_4185;)V + ARG 1 button + METHOD method_47651 openLogDirectory (Lnet/minecraft/class_4185;)V + ARG 1 button + METHOD method_47652 (Z)V + ARG 1 confirmed + METHOD method_47653 createOptInButton ()Lnet/minecraft/class_339; + METHOD method_48286 (Lnet/minecraft/class_7944;Lnet/minecraft/class_364;)V + ARG 1 child + METHOD method_52765 openPrivacyStatementPage (Lnet/minecraft/class_4185;)V + ARG 1 button + METHOD method_52766 (Z)V + ARG 1 confirmed diff --git a/mappings/net/minecraft/client/gui/screen/option/VideoOptionsScreen.mapping b/mappings/net/minecraft/client/gui/screen/option/VideoOptionsScreen.mapping index 464d9a5b6e..0ecabfd5fe 100644 --- a/mappings/net/minecraft/client/gui/screen/option/VideoOptionsScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/option/VideoOptionsScreen.mapping @@ -19,6 +19,7 @@ CLASS net/minecraft/class_446 net/minecraft/client/gui/screen/option/VideoOption METHOD method_41844 (Lnet/minecraft/class_313;Lnet/minecraft/class_1041;Ljava/lang/Integer;)V ARG 2 value METHOD method_41845 (Lnet/minecraft/class_313;Lnet/minecraft/class_2561;Ljava/lang/Integer;)Lnet/minecraft/class_2561; + ARG 1 prefix ARG 2 value METHOD method_41846 getOptions (Lnet/minecraft/class_315;)[Lnet/minecraft/class_7172; ARG 0 gameOptions diff --git a/mappings/net/minecraft/client/gui/screen/pack/ExperimentalWarningScreen.mapping b/mappings/net/minecraft/client/gui/screen/pack/ExperimentalWarningScreen.mapping new file mode 100644 index 0000000000..246502c0e1 --- /dev/null +++ b/mappings/net/minecraft/client/gui/screen/pack/ExperimentalWarningScreen.mapping @@ -0,0 +1,34 @@ +CLASS net/minecraft/class_7745 net/minecraft/client/gui/screen/pack/ExperimentalWarningScreen + FIELD field_40443 TITLE Lnet/minecraft/class_2561; + FIELD field_40444 MESSAGE Lnet/minecraft/class_2561; + FIELD field_40445 DETAILS Lnet/minecraft/class_2561; + FIELD field_40447 callback Lit/unimi/dsi/fastutil/booleans/BooleanConsumer; + FIELD field_40448 enabledProfiles Ljava/util/Collection; + FIELD field_42500 grid Lnet/minecraft/class_7845; + METHOD (Ljava/util/Collection;Lit/unimi/dsi/fastutil/booleans/BooleanConsumer;)V + ARG 1 enabledProfiles + ARG 2 callback + METHOD method_45666 (Lnet/minecraft/class_4185;)V + ARG 1 button + METHOD method_45667 (Lnet/minecraft/class_4185;)V + ARG 1 button + METHOD method_45668 (Lnet/minecraft/class_4185;)V + ARG 1 button + METHOD method_49008 (Lnet/minecraft/class_7745;Lnet/minecraft/class_364;)V + ARG 1 child + CLASS class_7746 DetailsScreen + FIELD field_40451 packList Lnet/minecraft/class_7745$class_7746$class_7747; + METHOD method_45671 (Lnet/minecraft/class_4185;)V + ARG 1 button + CLASS class_7747 PackListWidget + METHOD (Lnet/minecraft/class_7745$class_7746;Lnet/minecraft/class_310;Ljava/util/Collection;)V + ARG 2 client + ARG 3 enabledProfiles + CLASS class_7748 PackListWidgetEntry + FIELD field_40454 displayName Lnet/minecraft/class_2561; + FIELD field_40455 details Lnet/minecraft/class_2561; + FIELD field_40456 multilineDetails Lnet/minecraft/class_5489; + METHOD (Lnet/minecraft/class_7745$class_7746;Lnet/minecraft/class_2561;Lnet/minecraft/class_2561;Lnet/minecraft/class_5489;)V + ARG 2 displayName + ARG 3 details + ARG 4 multilineDetails diff --git a/mappings/net/minecraft/client/gui/screen/pack/PackListWidget.mapping b/mappings/net/minecraft/client/gui/screen/pack/PackListWidget.mapping index 3468d56119..d7df7984a3 100644 --- a/mappings/net/minecraft/client/gui/screen/pack/PackListWidget.mapping +++ b/mappings/net/minecraft/client/gui/screen/pack/PackListWidget.mapping @@ -1,30 +1,35 @@ CLASS net/minecraft/class_521 net/minecraft/client/gui/screen/pack/PackListWidget FIELD field_18978 title Lnet/minecraft/class_2561; - FIELD field_19125 RESOURCE_PACKS_TEXTURE Lnet/minecraft/class_2960; FIELD field_19126 INCOMPATIBLE Lnet/minecraft/class_2561; FIELD field_19127 INCOMPATIBLE_CONFIRM Lnet/minecraft/class_2561; - METHOD (Lnet/minecraft/class_310;IILnet/minecraft/class_2561;)V + FIELD field_41715 screen Lnet/minecraft/class_5375; + FIELD field_45532 SELECT_HIGHLIGHTED_TEXTURE Lnet/minecraft/class_2960; + FIELD field_45533 SELECT_TEXTURE Lnet/minecraft/class_2960; + FIELD field_45534 UNSELECT_HIGHLIGHTED_TEXTURE Lnet/minecraft/class_2960; + FIELD field_45535 UNSELECT_TEXTURE Lnet/minecraft/class_2960; + FIELD field_45536 MOVE_UP_HIGHLIGHTED_TEXTURE Lnet/minecraft/class_2960; + FIELD field_45537 MOVE_UP_TEXTURE Lnet/minecraft/class_2960; + FIELD field_45538 MOVE_DOWN_HIGHLIGHTED_TEXTURE Lnet/minecraft/class_2960; + FIELD field_45539 MOVE_DOWN_TEXTURE Lnet/minecraft/class_2960; + METHOD (Lnet/minecraft/class_310;Lnet/minecraft/class_5375;IILnet/minecraft/class_2561;)V ARG 1 client - ARG 2 width - ARG 3 height - ARG 4 title + ARG 2 screen + ARG 3 width + ARG 4 height + ARG 5 title CLASS class_4271 ResourcePackEntry FIELD field_19128 client Lnet/minecraft/class_310; FIELD field_19129 pack Lnet/minecraft/class_5369$class_5371; FIELD field_19130 widget Lnet/minecraft/class_521; - FIELD field_25476 screen Lnet/minecraft/class_437; FIELD field_26590 displayName Lnet/minecraft/class_5481; FIELD field_26591 description Lnet/minecraft/class_5489; FIELD field_26784 incompatibleText Lnet/minecraft/class_5481; FIELD field_26785 compatibilityNotificationText Lnet/minecraft/class_5489; FIELD field_32405 ELLIPSIS Ljava/lang/String; - METHOD (Lnet/minecraft/class_310;Lnet/minecraft/class_521;Lnet/minecraft/class_437;Lnet/minecraft/class_5369$class_5371;)V + METHOD (Lnet/minecraft/class_310;Lnet/minecraft/class_521;Lnet/minecraft/class_5369$class_5371;)V ARG 1 client ARG 2 widget - ARG 3 screen - ARG 4 pack - METHOD method_20146 (Z)V - ARG 1 confirmed + ARG 3 pack METHOD method_20152 isSelectable ()Z METHOD method_31229 trimTextToWidth (Lnet/minecraft/class_310;Lnet/minecraft/class_2561;)Lnet/minecraft/class_5481; ARG 0 client @@ -32,3 +37,10 @@ CLASS net/minecraft/class_521 net/minecraft/client/gui/screen/pack/PackListWidge METHOD method_31230 createMultilineText (Lnet/minecraft/class_310;Lnet/minecraft/class_2561;)Lnet/minecraft/class_5489; ARG 0 client ARG 1 text + METHOD method_48279 getName ()Ljava/lang/String; + METHOD method_48280 toggle ()V + METHOD method_48281 moveTowardStart ()V + METHOD method_48282 moveTowardEnd ()V + METHOD method_48477 (Z)V + ARG 1 confirmed + METHOD method_48478 enable ()Z diff --git a/mappings/net/minecraft/client/gui/screen/pack/PackScreen.mapping b/mappings/net/minecraft/client/gui/screen/pack/PackScreen.mapping index ad6f59579c..20b6d53821 100644 --- a/mappings/net/minecraft/client/gui/screen/pack/PackScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/pack/PackScreen.mapping @@ -3,29 +3,27 @@ CLASS net/minecraft/class_5375 net/minecraft/client/gui/screen/pack/PackScreen FIELD field_25465 DROP_INFO Lnet/minecraft/class_2561; FIELD field_25466 FOLDER_INFO Lnet/minecraft/class_2561; FIELD field_25468 organizer Lnet/minecraft/class_5369; - FIELD field_25469 parent Lnet/minecraft/class_437; FIELD field_25472 availablePackList Lnet/minecraft/class_521; FIELD field_25473 selectedPackList Lnet/minecraft/class_521; - FIELD field_25474 file Ljava/io/File; + FIELD field_25474 file Ljava/nio/file/Path; FIELD field_25475 doneButton Lnet/minecraft/class_4185; FIELD field_25786 UNKNOWN_PACK Lnet/minecraft/class_2960; FIELD field_25787 directoryWatcher Lnet/minecraft/class_5375$class_5426; FIELD field_25788 refreshTimeout J FIELD field_25789 iconTextures Ljava/util/Map; - METHOD (Lnet/minecraft/class_437;Lnet/minecraft/class_3283;Ljava/util/function/Consumer;Ljava/io/File;Lnet/minecraft/class_2561;)V - ARG 1 parent - ARG 2 packManager - ARG 3 applier - ARG 4 file - ARG 5 title + METHOD (Lnet/minecraft/class_3283;Ljava/util/function/Consumer;Ljava/nio/file/Path;Lnet/minecraft/class_2561;)V + ARG 1 resourcePackManager + ARG 2 applier + ARG 3 file + ARG 4 title METHOD method_29669 copyPacks (Lnet/minecraft/class_310;Ljava/util/List;Ljava/nio/file/Path;)V ARG 0 client ARG 1 srcPaths ARG 2 destPath METHOD method_29670 (Lnet/minecraft/class_4185;)V ARG 1 button - METHOD method_29672 (Lnet/minecraft/class_521;Lnet/minecraft/class_5369$class_5371;)V - ARG 2 pack + METHOD method_29672 (Lnet/minecraft/class_521;Ljava/lang/String;Lnet/minecraft/class_5369$class_5371;)V + ARG 3 pack METHOD method_29673 updatePackList (Lnet/minecraft/class_521;Ljava/util/stream/Stream;)V ARG 1 widget ARG 2 packs @@ -47,13 +45,18 @@ CLASS net/minecraft/class_5375 net/minecraft/client/gui/screen/pack/PackScreen ARG 1 textureManager ARG 2 resourcePackProfile METHOD method_30291 closeDirectoryWatcher ()V + METHOD method_48277 switchFocusedList (Lnet/minecraft/class_521;)V + ARG 1 listWidget + METHOD method_48278 clearSelection ()V + METHOD method_52760 streamFileNames (Ljava/util/Collection;)Ljava/util/stream/Stream; + ARG 0 paths CLASS class_5426 DirectoryWatcher FIELD field_25790 watchService Ljava/nio/file/WatchService; FIELD field_25791 path Ljava/nio/file/Path; - METHOD (Ljava/io/File;)V - ARG 1 file + METHOD (Ljava/nio/file/Path;)V + ARG 1 path METHOD method_30292 pollForChange ()Z - METHOD method_30293 create (Ljava/io/File;)Lnet/minecraft/class_5375$class_5426; - ARG 0 file + METHOD method_30293 create (Ljava/nio/file/Path;)Lnet/minecraft/class_5375$class_5426; + ARG 0 path METHOD method_30294 watchDirectory (Ljava/nio/file/Path;)V ARG 1 path diff --git a/mappings/net/minecraft/client/gui/screen/pack/ResourcePackOrganizer.mapping b/mappings/net/minecraft/client/gui/screen/pack/ResourcePackOrganizer.mapping index b9e0316040..16e06a6cc0 100644 --- a/mappings/net/minecraft/client/gui/screen/pack/ResourcePackOrganizer.mapping +++ b/mappings/net/minecraft/client/gui/screen/pack/ResourcePackOrganizer.mapping @@ -18,6 +18,7 @@ CLASS net/minecraft/class_5369 net/minecraft/client/gui/screen/pack/ResourcePack METHOD method_29644 (Lnet/minecraft/class_3288;)Lnet/minecraft/class_5369$class_5371; ARG 1 pack METHOD method_29981 refresh ()V + METHOD method_49627 refreshEnabledProfiles ()V CLASS class_5371 Pack METHOD method_29648 getCompatibility ()Lnet/minecraft/class_3281; METHOD method_29650 getDisplayName ()Lnet/minecraft/class_2561; @@ -36,6 +37,7 @@ CLASS net/minecraft/class_5369 net/minecraft/client/gui/screen/pack/ResourcePack METHOD method_29663 canMoveTowardStart ()Z METHOD method_29664 canMoveTowardEnd ()Z METHOD method_30286 getIconId ()Lnet/minecraft/class_2960; + METHOD method_48276 getName ()Ljava/lang/String; CLASS class_5372 AbstractPack FIELD field_25461 profile Lnet/minecraft/class_3288; METHOD (Lnet/minecraft/class_5369;Lnet/minecraft/class_3288;)V @@ -45,5 +47,6 @@ CLASS net/minecraft/class_5369 net/minecraft/client/gui/screen/pack/ResourcePack METHOD method_29666 getCurrentList ()Ljava/util/List; METHOD method_29667 getOppositeList ()Ljava/util/List; METHOD method_29668 toggle ()V + METHOD method_49628 toggleHighContrastOption ()V CLASS class_5373 EnabledPack CLASS class_5374 DisabledPack diff --git a/mappings/net/minecraft/client/gui/screen/recipebook/AbstractFurnaceRecipeBookScreen.mapping b/mappings/net/minecraft/client/gui/screen/recipebook/AbstractFurnaceRecipeBookScreen.mapping index 3374822dcc..fb6e4ef519 100644 --- a/mappings/net/minecraft/client/gui/screen/recipebook/AbstractFurnaceRecipeBookScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/recipebook/AbstractFurnaceRecipeBookScreen.mapping @@ -1,3 +1,6 @@ CLASS net/minecraft/class_517 net/minecraft/client/gui/screen/recipebook/AbstractFurnaceRecipeBookScreen FIELD field_3149 fuels Lnet/minecraft/class_1856; + FIELD field_45540 TEXTURES Lnet/minecraft/class_8666; METHOD method_17065 getAllowedFuels ()Ljava/util/Set; + METHOD method_49301 (Lnet/minecraft/class_1792;)Z + ARG 1 item diff --git a/mappings/net/minecraft/client/gui/screen/recipebook/AnimatedResultButton.mapping b/mappings/net/minecraft/client/gui/screen/recipebook/AnimatedResultButton.mapping index b93611216c..976429b0be 100644 --- a/mappings/net/minecraft/client/gui/screen/recipebook/AnimatedResultButton.mapping +++ b/mappings/net/minecraft/client/gui/screen/recipebook/AnimatedResultButton.mapping @@ -6,16 +6,15 @@ CLASS net/minecraft/class_514 net/minecraft/client/gui/screen/recipebook/Animate FIELD field_3140 time F FIELD field_3141 currentResultIndex I FIELD field_3142 resultCollection Lnet/minecraft/class_516; - FIELD field_3143 BACKGROUND_TEXTURE Lnet/minecraft/class_2960; + FIELD field_45555 SLOT_MANY_CRAFTABLE_TEXTURE Lnet/minecraft/class_2960; + FIELD field_45556 SLOT_CRAFTABLE_TEXTURE Lnet/minecraft/class_2960; + FIELD field_45557 SLOT_MANY_UNCRAFTABLE_TEXTURE Lnet/minecraft/class_2960; + FIELD field_45558 SLOT_UNCRAFTABLE_TEXTURE Lnet/minecraft/class_2960; METHOD method_2639 getResults ()Ljava/util/List; METHOD method_2640 showResultCollection (Lnet/minecraft/class_516;Lnet/minecraft/class_513;)V ARG 1 resultCollection ARG 2 results - METHOD method_2641 setPos (II)V - ARG 1 x - ARG 2 y METHOD method_2642 hasResults ()Z - METHOD method_2643 currentRecipe ()Lnet/minecraft/class_1860; - METHOD method_2644 getTooltip (Lnet/minecraft/class_437;)Ljava/util/List; - ARG 1 screen + METHOD method_2643 currentRecipe ()Lnet/minecraft/class_8786; + METHOD method_2644 getTooltip ()Ljava/util/List; METHOD method_2645 getResultCollection ()Lnet/minecraft/class_516; diff --git a/mappings/net/minecraft/client/gui/screen/recipebook/RecipeAlternativesWidget.mapping b/mappings/net/minecraft/client/gui/screen/recipebook/RecipeAlternativesWidget.mapping index a2d9de104d..e31d8c84b7 100644 --- a/mappings/net/minecraft/client/gui/screen/recipebook/RecipeAlternativesWidget.mapping +++ b/mappings/net/minecraft/client/gui/screen/recipebook/RecipeAlternativesWidget.mapping @@ -1,18 +1,26 @@ CLASS net/minecraft/class_508 net/minecraft/client/gui/screen/recipebook/RecipeAlternativesWidget FIELD field_3103 buttonY I - FIELD field_3104 lastClickedRecipe Lnet/minecraft/class_1860; + FIELD field_3104 lastClickedRecipe Lnet/minecraft/class_8786; FIELD field_3105 buttonX I FIELD field_3106 alternativeButtons Ljava/util/List; FIELD field_3107 visible Z FIELD field_3108 client Lnet/minecraft/class_310; - FIELD field_3109 BACKGROUND_TEXTURE Lnet/minecraft/class_2960; FIELD field_3110 time F FIELD field_3111 resultCollection Lnet/minecraft/class_516; FIELD field_3112 furnace Z + FIELD field_45541 OVERLAY_RECIPE_TEXTURE Lnet/minecraft/class_2960; + FIELD field_45542 FURNACE_OVERLAY_HIGHLIGHTED_TEXTURE Lnet/minecraft/class_2960; + FIELD field_45543 FURNACE_OVERLAY_TEXTURE Lnet/minecraft/class_2960; + FIELD field_45544 CRAFTING_OVERLAY_HIGHLIGHTED_TEXTURE Lnet/minecraft/class_2960; + FIELD field_45545 CRAFTING_OVERLAY_TEXTURE Lnet/minecraft/class_2960; + FIELD field_45546 FURNACE_OVERLAY_DISABLED_HIGHLIGHTED_TEXTURE Lnet/minecraft/class_2960; + FIELD field_45547 FURNACE_OVERLAY_DISABLED_TEXTURE Lnet/minecraft/class_2960; + FIELD field_45548 CRAFTING_OVERLAY_DISABLED_HIGHLIGHTED_TEXTURE Lnet/minecraft/class_2960; + FIELD field_45549 CRAFTING_OVERLAY_DISABLED_TEXTURE Lnet/minecraft/class_2960; METHOD method_2613 setVisible (Z)V ARG 1 visible METHOD method_2614 getResults ()Lnet/minecraft/class_516; - METHOD method_2615 getLastClickedRecipe ()Lnet/minecraft/class_1860; + METHOD method_2615 getLastClickedRecipe ()Lnet/minecraft/class_8786; METHOD method_2616 isVisible ()Z METHOD method_2617 showAlternativesForResult (Lnet/minecraft/class_310;Lnet/minecraft/class_516;IIIIF)V ARG 1 client @@ -22,19 +30,15 @@ CLASS net/minecraft/class_508 net/minecraft/client/gui/screen/recipebook/RecipeA ARG 5 areaCenterX 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_3114 recipe Lnet/minecraft/class_8786; FIELD field_3115 craftable Z FIELD field_3116 slots Ljava/util/List; - METHOD (Lnet/minecraft/class_508;IILnet/minecraft/class_1860;Z)V + METHOD (Lnet/minecraft/class_508;IILnet/minecraft/class_8786;Z)V ARG 2 x ARG 3 y - ARG 4 recipe ARG 5 craftable - METHOD method_2619 alignRecipe (Lnet/minecraft/class_1860;)V - ARG 1 recipe + METHOD method_2619 alignRecipe (Lnet/minecraft/class_8786;)V CLASS class_510 InputSlot FIELD field_3118 x I FIELD field_3119 y I diff --git a/mappings/net/minecraft/client/gui/screen/recipebook/RecipeBookGhostSlots.mapping b/mappings/net/minecraft/client/gui/screen/recipebook/RecipeBookGhostSlots.mapping index 902db1abc7..98ace6d8c8 100644 --- a/mappings/net/minecraft/client/gui/screen/recipebook/RecipeBookGhostSlots.mapping +++ b/mappings/net/minecraft/client/gui/screen/recipebook/RecipeBookGhostSlots.mapping @@ -1,13 +1,16 @@ CLASS net/minecraft/class_505 net/minecraft/client/gui/screen/recipebook/RecipeBookGhostSlots - FIELD field_3079 recipe Lnet/minecraft/class_1860; + FIELD field_3079 recipe Lnet/minecraft/class_8786; FIELD field_3080 time F FIELD field_3081 slots Ljava/util/List; - METHOD method_2565 setRecipe (Lnet/minecraft/class_1860;)V - 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 + METHOD method_2565 setRecipe (Lnet/minecraft/class_8786;)V + METHOD method_2566 getRecipe ()Lnet/minecraft/class_8786; + METHOD method_2567 draw (Lnet/minecraft/class_332;Lnet/minecraft/class_310;IIZF)V + ARG 1 context ARG 2 client + ARG 3 x + ARG 4 y + ARG 5 notInventory + ARG 6 tickDelta 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 fe840e8573..49429e2a70 100644 --- a/mappings/net/minecraft/client/gui/screen/recipebook/RecipeBookResults.mapping +++ b/mappings/net/minecraft/client/gui/screen/recipebook/RecipeBookResults.mapping @@ -1,6 +1,6 @@ CLASS net/minecraft/class_513 net/minecraft/client/gui/screen/recipebook/RecipeBookResults FIELD field_3124 pageCount I - FIELD field_3125 lastClickedRecipe Lnet/minecraft/class_1860; + FIELD field_3125 lastClickedRecipe Lnet/minecraft/class_8786; FIELD field_3126 client Lnet/minecraft/class_310; FIELD field_3127 resultCollections Ljava/util/List; FIELD field_3128 nextPageButton Lnet/minecraft/class_361; @@ -12,20 +12,22 @@ CLASS net/minecraft/class_513 net/minecraft/client/gui/screen/recipebook/RecipeB FIELD field_3134 recipeDisplayListeners Ljava/util/List; FIELD field_3135 currentPage I FIELD field_3136 recipeBook Lnet/minecraft/class_3439; + FIELD field_45552 PAGE_FORWARD_TEXTURES Lnet/minecraft/class_8666; + FIELD field_45553 PAGE_BACKWARD_TEXTURES Lnet/minecraft/class_8666; METHOD method_2625 refreshResultButtons ()V METHOD method_2626 hideShowPageButtons ()V METHOD method_2627 setResults (Ljava/util/List;Z)V ARG 1 resultCollections ARG 2 resetCurrentPage - METHOD method_2628 drawTooltip (Lnet/minecraft/class_4587;II)V - ARG 1 matrices + METHOD method_2628 drawTooltip (Lnet/minecraft/class_332;II)V + ARG 1 context ARG 2 x ARG 3 y METHOD method_2629 onRecipesDisplayed (Ljava/util/List;)V ARG 1 recipes METHOD method_2630 setGui (Lnet/minecraft/class_507;)V ARG 1 widget - METHOD method_2631 getLastClickedRecipe ()Lnet/minecraft/class_1860; + METHOD method_2631 getLastClickedRecipe ()Lnet/minecraft/class_8786; METHOD method_2632 mouseClicked (DDIIIII)Z ARG 1 mouseX ARG 3 mouseY @@ -35,8 +37,8 @@ CLASS net/minecraft/class_513 net/minecraft/client/gui/screen/recipebook/RecipeB ARG 8 areaWidth 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_2634 draw (Lnet/minecraft/class_332;IIIIF)V + ARG 1 context ARG 2 x ARG 3 y ARG 4 mouseX diff --git a/mappings/net/minecraft/client/gui/screen/recipebook/RecipeBookWidget.mapping b/mappings/net/minecraft/client/gui/screen/recipebook/RecipeBookWidget.mapping index abd3ae25b1..b181ae53c6 100644 --- a/mappings/net/minecraft/client/gui/screen/recipebook/RecipeBookWidget.mapping +++ b/mappings/net/minecraft/client/gui/screen/recipebook/RecipeBookWidget.mapping @@ -21,6 +21,8 @@ CLASS net/minecraft/class_507 net/minecraft/client/gui/screen/recipebook/RecipeB FIELD field_3102 leftOffset I FIELD field_33679 open Z FIELD field_34001 narrow Z + FIELD field_45550 BUTTON_TEXTURES Lnet/minecraft/class_8666; + FIELD field_45551 FILTER_BUTTON_TEXTURES Lnet/minecraft/class_8666; METHOD method_17064 getToggleCraftableButtonText ()Lnet/minecraft/class_2561; METHOD method_2576 triggerPirateSpeakEasterEgg (Ljava/lang/String;)V ARG 1 search @@ -29,10 +31,11 @@ CLASS net/minecraft/class_507 net/minecraft/client/gui/screen/recipebook/RecipeB METHOD method_2579 reset ()V METHOD method_2580 (Lnet/minecraft/class_516;)Z ARG 0 resultCollection - METHOD method_2581 drawGhostSlots (Lnet/minecraft/class_4587;IIZF)V - ARG 1 matrices + METHOD method_2581 drawGhostSlots (Lnet/minecraft/class_332;IIZF)V + ARG 1 context ARG 2 x ARG 3 y + ARG 4 notInventory ARG 5 delta METHOD method_2582 (Lnet/minecraft/class_512;)Z ARG 1 button @@ -55,8 +58,7 @@ CLASS net/minecraft/class_507 net/minecraft/client/gui/screen/recipebook/RecipeB METHOD method_2595 findLeftEdge (II)I ARG 1 width ARG 2 backgroundWidth - METHOD method_2596 showGhostRecipe (Lnet/minecraft/class_1860;Ljava/util/List;)V - ARG 1 recipe + METHOD method_2596 showGhostRecipe (Lnet/minecraft/class_8786;Ljava/util/List;)V ARG 2 slots METHOD method_2597 initialize (IILnet/minecraft/class_310;ZLnet/minecraft/class_1729;)V ARG 1 parentWidth @@ -72,17 +74,16 @@ CLASS net/minecraft/class_507 net/minecraft/client/gui/screen/recipebook/RecipeB ARG 7 backgroundWidth ARG 8 backgroundHeight ARG 9 button - METHOD method_2599 getCraftableButtonText ()Lnet/minecraft/class_2561; METHOD method_2600 slotClicked (Lnet/minecraft/class_1735;)V ARG 1 slot - METHOD method_2601 drawTooltip (Lnet/minecraft/class_4587;IIII)V - ARG 1 matrices + METHOD method_2601 drawTooltip (Lnet/minecraft/class_332;IIII)V + ARG 1 context ARG 2 x ARG 3 y ARG 4 mouseX ARG 5 mouseY - METHOD method_2602 drawGhostSlotTooltip (Lnet/minecraft/class_4587;IIII)V - ARG 1 matrices + METHOD method_2602 drawGhostSlotTooltip (Lnet/minecraft/class_332;IIII)V + ARG 1 context ARG 2 x ARG 3 y ARG 4 mouseX @@ -92,7 +93,7 @@ CLASS net/minecraft/class_507 net/minecraft/client/gui/screen/recipebook/RecipeB METHOD method_2604 isWide ()Z METHOD method_2605 isOpen ()Z METHOD method_2606 refreshTabButtons ()V - METHOD method_2607 close ()V METHOD method_36485 isGuiOpen ()Z METHOD method_37308 (Ljava/util/List;Lnet/minecraft/class_339;)V ARG 1 button + METHOD method_47429 updateTooltip ()V diff --git a/mappings/net/minecraft/client/gui/screen/recipebook/RecipeGroupButtonWidget.mapping b/mappings/net/minecraft/client/gui/screen/recipebook/RecipeGroupButtonWidget.mapping index 33d7d9ded3..c009e51f69 100644 --- a/mappings/net/minecraft/client/gui/screen/recipebook/RecipeGroupButtonWidget.mapping +++ b/mappings/net/minecraft/client/gui/screen/recipebook/RecipeGroupButtonWidget.mapping @@ -1,10 +1,12 @@ CLASS net/minecraft/class_512 net/minecraft/client/gui/screen/recipebook/RecipeGroupButtonWidget FIELD field_3122 bounce F FIELD field_3123 category Lnet/minecraft/class_314; + FIELD field_45554 TEXTURES Lnet/minecraft/class_8666; METHOD (Lnet/minecraft/class_314;)V ARG 1 category - METHOD method_2621 renderIcons (Lnet/minecraft/class_918;)V - ARG 1 itemRenderer + METHOD method_2621 renderIcons (Lnet/minecraft/class_332;Lnet/minecraft/class_918;)V + ARG 1 context + ARG 2 itemRenderer METHOD method_2622 checkForNewRecipes (Lnet/minecraft/class_310;)V ARG 1 client METHOD method_2623 getCategory ()Lnet/minecraft/class_314; diff --git a/mappings/net/minecraft/client/gui/screen/recipebook/RecipeResultCollection.mapping b/mappings/net/minecraft/client/gui/screen/recipebook/RecipeResultCollection.mapping index 29c3c6049e..d81050799c 100644 --- a/mappings/net/minecraft/client/gui/screen/recipebook/RecipeResultCollection.mapping +++ b/mappings/net/minecraft/client/gui/screen/recipebook/RecipeResultCollection.mapping @@ -4,8 +4,10 @@ CLASS net/minecraft/class_516 net/minecraft/client/gui/screen/recipebook/RecipeR FIELD field_3146 craftableRecipes Ljava/util/Set; FIELD field_3147 unlockedRecipes Ljava/util/Set; FIELD field_3148 singleOutput Z - METHOD (Ljava/util/List;)V - ARG 1 recipes + FIELD field_42069 registryManager Lnet/minecraft/class_5455; + METHOD (Lnet/minecraft/class_5455;Ljava/util/List;)V + ARG 1 registryManager + ARG 2 recipes METHOD method_2647 initialize (Lnet/minecraft/class_3439;)V ARG 1 recipeBook METHOD method_2648 getRecipes (Z)Ljava/util/List; @@ -19,10 +21,11 @@ CLASS net/minecraft/class_516 net/minecraft/client/gui/screen/recipebook/RecipeR METHOD method_2651 getResults (Z)Ljava/util/List; ARG 1 craftableOnly METHOD method_2652 isInitialized ()Z - METHOD method_2653 isCraftable (Lnet/minecraft/class_1860;)Z - ARG 1 recipe + METHOD method_2653 isCraftable (Lnet/minecraft/class_8786;)Z METHOD method_2655 hasCraftableRecipes ()Z METHOD method_2656 hasSingleOutput ()Z METHOD method_2657 hasFittingRecipes ()Z - METHOD method_30295 shouldHaveSingleOutput (Ljava/util/List;)Z - ARG 0 recipes + METHOD method_30295 shouldHaveSingleOutput (Lnet/minecraft/class_5455;Ljava/util/List;)Z + ARG 0 registryManager + ARG 1 recipes + METHOD method_48479 getRegistryManager ()Lnet/minecraft/class_5455; diff --git a/mappings/net/minecraft/client/gui/screen/report/AbuseReportReasonScreen.mapping b/mappings/net/minecraft/client/gui/screen/report/AbuseReportReasonScreen.mapping index 1ef927c00a..68e2f963af 100644 --- a/mappings/net/minecraft/client/gui/screen/report/AbuseReportReasonScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/report/AbuseReportReasonScreen.mapping @@ -9,7 +9,6 @@ CLASS net/minecraft/class_7551 net/minecraft/client/gui/screen/report/AbuseRepor FIELD field_39733 DONE_BUTTON_HEIGHT I FIELD field_39734 SCREEN_WIDTH I FIELD field_39735 TOP_MARGIN I - FIELD field_39753 ABOUT_JAVA_REPORTING_URL Ljava/lang/String; FIELD field_39754 READ_INFO_TEXT Lnet/minecraft/class_2561; FIELD field_39778 reason Lnet/minecraft/class_7573; METHOD (Lnet/minecraft/class_437;Lnet/minecraft/class_7573;Ljava/util/function/Consumer;)V diff --git a/mappings/net/minecraft/client/gui/screen/report/AbuseReportTypeScreen.mapping b/mappings/net/minecraft/client/gui/screen/report/AbuseReportTypeScreen.mapping new file mode 100644 index 0000000000..93661b8756 --- /dev/null +++ b/mappings/net/minecraft/client/gui/screen/report/AbuseReportTypeScreen.mapping @@ -0,0 +1,24 @@ +CLASS net/minecraft/class_8770 net/minecraft/client/gui/screen/report/AbuseReportTypeScreen + FIELD field_46041 TITLE_TEXT Lnet/minecraft/class_2561; + FIELD field_46042 MESSAGE_TEXT Lnet/minecraft/class_2561; + FIELD field_46043 CHAT_TYPE_TEXT Lnet/minecraft/class_2561; + FIELD field_46044 SKIN_TYPE_TEXT Lnet/minecraft/class_2561; + FIELD field_46045 NAME_TYPE_TEXT Lnet/minecraft/class_2561; + FIELD field_46047 parent Lnet/minecraft/class_437; + FIELD field_46048 context Lnet/minecraft/class_7574; + FIELD field_46049 selectedPlayer Lnet/minecraft/class_5519; + FIELD field_46050 layout Lnet/minecraft/class_8667; + METHOD (Lnet/minecraft/class_437;Lnet/minecraft/class_7574;Lnet/minecraft/class_5519;)V + ARG 1 parent + ARG 2 context + ARG 3 selectedPlayer + METHOD method_53581 (Lnet/minecraft/class_4185;)V + ARG 1 button + METHOD method_53582 (Lnet/minecraft/class_8770;Lnet/minecraft/class_364;)V + ARG 1 child + METHOD method_53583 (Lnet/minecraft/class_4185;)V + ARG 1 button + METHOD method_53584 (Lnet/minecraft/class_4185;)V + ARG 1 button + METHOD method_53585 (Lnet/minecraft/class_4185;)V + ARG 1 button diff --git a/mappings/net/minecraft/client/gui/screen/report/ChatReportScreen.mapping b/mappings/net/minecraft/client/gui/screen/report/ChatReportScreen.mapping index 8cfbcfebc3..10a7723796 100644 --- a/mappings/net/minecraft/client/gui/screen/report/ChatReportScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/report/ChatReportScreen.mapping @@ -1,51 +1,28 @@ CLASS net/minecraft/class_7538 net/minecraft/client/gui/screen/report/ChatReportScreen - FIELD field_39555 parent Lnet/minecraft/class_437; - FIELD field_39556 reporter Lnet/minecraft/class_7574; - FIELD field_39557 reasonDescription Lnet/minecraft/class_5489; - FIELD field_39558 editBox Lnet/minecraft/class_7529; FIELD field_39559 sendButton Lnet/minecraft/class_4185; - FIELD field_39560 report Lnet/minecraft/class_7566; - FIELD field_39561 validationError Lnet/minecraft/class_7566$class_7567; FIELD field_39562 BOTTOM_BUTTON_WIDTH I - FIELD field_39563 BUTTON_HEIGHT I - FIELD field_39564 BUTTON_TOP_MARGIN I - FIELD field_39565 BUTTON_BOTTOM_MARGIN I - FIELD field_39566 REASON_DESCRIPTION_TOP_MARGIN I - FIELD field_39567 REASON_DESCRIPTION_TEXT_WIDTH I - FIELD field_39568 SCREEN_HEIGHT I - FIELD field_39569 OBSERVED_WHAT_TEXT Lnet/minecraft/class_2561; - FIELD field_39570 SELECT_REASON_TEXT Lnet/minecraft/class_2561; - FIELD field_39571 MORE_COMMENTS_TEXT Lnet/minecraft/class_2561; - FIELD field_39572 DESCRIBE_TEXT Lnet/minecraft/class_2561; - FIELD field_39573 REPORT_SENT_MESSAGE_TEXT Lnet/minecraft/class_2561; FIELD field_39574 SELECT_CHAT_TEXT Lnet/minecraft/class_2561; - FIELD field_39575 SENDING_TEXT Lnet/minecraft/class_2561; - FIELD field_39576 GENERIC_ERROR_TEXT Lnet/minecraft/class_2561; - FIELD field_39748 REPORT_SENT_TITLE Lnet/minecraft/class_2561; - FIELD field_39749 REPORT_ERROR_TITLE Lnet/minecraft/class_2561; + FIELD field_46031 TITLE_TEXT Lnet/minecraft/class_2561; + FIELD field_46032 layout Lnet/minecraft/class_8667; + FIELD field_46033 commentsBox Lnet/minecraft/class_7529; + FIELD field_46034 selectChatButton Lnet/minecraft/class_4185; + FIELD field_46035 selectReasonButton Lnet/minecraft/class_4185; METHOD (Lnet/minecraft/class_437;Lnet/minecraft/class_7574;Ljava/util/UUID;)V ARG 1 parent ARG 2 reporter ARG 3 reportedPlayerUuid - METHOD method_44456 getTop ()I - METHOD method_44457 getBottom ()I - METHOD method_44458 getSelectionButtonY ()I - METHOD method_44459 getReasonButtonY ()I - METHOD method_44460 getEditBoxTop ()I - METHOD method_44461 getEditBoxBottom ()I - METHOD method_44462 getBottomButtonsY ()I + METHOD (Lnet/minecraft/class_437;Lnet/minecraft/class_7574;Lnet/minecraft/class_7566$class_8772;)V + ARG 1 parent + ARG 2 context + ARG 3 reportBuilder + METHOD (Lnet/minecraft/class_437;Lnet/minecraft/class_7574;Lnet/minecraft/class_7566;)V + ARG 1 parent + ARG 2 context + ARG 3 report METHOD method_44465 (Lnet/minecraft/class_4185;)V ARG 1 button - METHOD method_44466 onSubmissionFinished ()V - METHOD method_44467 (Ljava/lang/Object;Ljava/lang/Throwable;)Ljava/lang/Object; - ARG 1 unit - ARG 2 throwable - METHOD method_44468 onSubmissionError (Ljava/lang/Throwable;)V - ARG 1 throwable - METHOD method_44470 (Lnet/minecraft/class_7566$class_7568;)V - ARG 1 report - METHOD method_44471 (Lnet/minecraft/class_7566;)V - ARG 1 report + METHOD method_44471 (Lnet/minecraft/class_7566$class_8772;)V + ARG 1 updatedReportBuilder METHOD method_44472 (Lnet/minecraft/class_7573;)V ARG 1 reason METHOD method_44473 (Ljava/lang/String;)V @@ -57,20 +34,7 @@ CLASS net/minecraft/class_7538 net/minecraft/client/gui/screen/report/ChatReport METHOD method_44477 (Lnet/minecraft/class_4185;)V ARG 1 button METHOD method_44478 onChange ()V - METHOD method_44479 send ()V - METHOD method_44480 getWidgetsLeft ()I - METHOD method_44481 getWidgetsRight ()I - METHOD method_45053 (Lnet/minecraft/class_7566$class_7567;)V - ARG 1 validationError - METHOD method_45054 showErrorScreen (Lnet/minecraft/class_2561;)V - ARG 1 message - CLASS class_7539 DiscardWarningScreen - FIELD field_39723 TITLE Lnet/minecraft/class_2561; - FIELD field_39724 MESSAGE Lnet/minecraft/class_2561; - FIELD field_39725 RETURN_BUTTON_TEXT Lnet/minecraft/class_2561; - FIELD field_39726 DISCARD_BUTTON_TEXT Lnet/minecraft/class_2561; - METHOD method_44482 (Lnet/minecraft/class_4185;)V - ARG 1 button - METHOD method_44483 (Lnet/minecraft/class_4185;)V - ARG 1 button - CLASS class_7540 ValidationErrorTooltipSupplier + METHOD method_53572 (Lnet/minecraft/class_7847;)V + ARG 0 positioner + METHOD method_53573 (Lnet/minecraft/class_7538;Lnet/minecraft/class_364;)V + ARG 1 child diff --git a/mappings/net/minecraft/client/gui/screen/report/ChatSelectionScreen.mapping b/mappings/net/minecraft/client/gui/screen/report/ChatSelectionScreen.mapping index da688e606e..7718bd9eb3 100644 --- a/mappings/net/minecraft/client/gui/screen/report/ChatSelectionScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/report/ChatSelectionScreen.mapping @@ -3,14 +3,14 @@ CLASS net/minecraft/class_7543 net/minecraft/client/gui/screen/report/ChatSelect FIELD field_39585 reporter Lnet/minecraft/class_7574; FIELD field_39586 doneButton Lnet/minecraft/class_4185; FIELD field_39587 selectionList Lnet/minecraft/class_7543$class_7544; - FIELD field_39588 report Lnet/minecraft/class_7566; + FIELD field_39588 report Lnet/minecraft/class_7566$class_8772; FIELD field_39589 newReportConsumer Ljava/util/function/Consumer; FIELD field_39590 listAdder Lnet/minecraft/class_7541; - FIELD field_39591 tooltip Ljava/util/List; - FIELD field_39727 TITLE Lnet/minecraft/class_2561; - FIELD field_39728 CONTEXT_MESSAGE Lnet/minecraft/class_2561; + FIELD field_39727 TITLE_TEXT Lnet/minecraft/class_2561; + FIELD field_39728 CONTEXT_TEXT Lnet/minecraft/class_2561; FIELD field_39729 contextMessage Lnet/minecraft/class_5489; - METHOD (Lnet/minecraft/class_437;Lnet/minecraft/class_7574;Lnet/minecraft/class_7566;Ljava/util/function/Consumer;)V + FIELD field_45559 CHECKMARK_ICON_TEXTURE Lnet/minecraft/class_2960; + METHOD (Lnet/minecraft/class_437;Lnet/minecraft/class_7574;Lnet/minecraft/class_7566$class_8772;Ljava/util/function/Consumer;)V ARG 1 parent ARG 2 reporter ARG 3 report @@ -21,8 +21,6 @@ CLASS net/minecraft/class_7543 net/minecraft/client/gui/screen/report/ChatSelect ARG 1 message METHOD method_44496 (Lnet/minecraft/class_4185;)V ARG 1 button - METHOD method_44498 setTooltip (Ljava/util/List;)V - ARG 1 tooltip METHOD method_44504 addMessages ()V METHOD method_44507 addMoreMessages ()V METHOD method_44509 setDoneButtonActivation ()V @@ -34,8 +32,6 @@ CLASS net/minecraft/class_7543 net/minecraft/client/gui/screen/report/ChatSelect METHOD method_44511 addSenderEntry (Lnet/minecraft/class_7557$class_7558;Z)V ARG 1 message ARG 2 fromReportedPlayer - METHOD method_44512 tryMoveSelection (Lnet/minecraft/class_350$class_5403;)Z - ARG 1 direction METHOD method_44513 getDisplayedItemCount ()I METHOD method_44665 getContextMessageY ()I METHOD method_44693 shouldHighlight (Lnet/minecraft/class_7543$class_7544$class_7546;)Z @@ -60,7 +56,6 @@ CLASS net/minecraft/class_7543 net/minecraft/client/gui/screen/report/ChatSelect FIELD field_39603 fullContent Ljava/util/List; FIELD field_39604 fromReportedPlayer Z FIELD field_39605 isChatMessage Z - FIELD field_39750 CHECKMARK Lnet/minecraft/class_2960; FIELD field_39751 CHECKMARK_WIDTH I FIELD field_39752 CHECKMARK_HEIGHT I FIELD field_39775 INDICATOR_LEFT_MARGIN I @@ -76,13 +71,13 @@ CLASS net/minecraft/class_7543 net/minecraft/client/gui/screen/report/ChatSelect METHOD method_44517 toggle ()Z METHOD method_44666 getTextWidth ()I METHOD method_44667 getIndent ()I - METHOD method_44695 drawCheckmark (Lnet/minecraft/class_4587;III)V - ARG 1 matrices + METHOD method_44695 drawCheckmark (Lnet/minecraft/class_332;III)V + ARG 1 context ARG 2 y ARG 3 x ARG 4 entryHeight - METHOD method_44729 renderIndicator (Lnet/minecraft/class_4587;IIIII)V - ARG 1 matrices + METHOD method_44729 renderIndicator (Lnet/minecraft/class_332;IIIII)V + ARG 1 context ARG 2 x ARG 3 y ARG 4 entryHeight @@ -91,15 +86,10 @@ CLASS net/minecraft/class_7543 net/minecraft/client/gui/screen/report/ChatSelect CLASS class_7549 SenderEntry FIELD field_39607 PLAYER_SKIN_SIZE I FIELD field_39608 headingText Lnet/minecraft/class_2561; - FIELD field_39609 skinTextureId Lnet/minecraft/class_2960; + FIELD field_39609 skinTexturesSupplier Ljava/util/function/Supplier; FIELD field_39610 fromReportedPlayer Z METHOD (Lnet/minecraft/class_7543$class_7544;Lcom/mojang/authlib/GameProfile;Lnet/minecraft/class_2561;Z)V ARG 2 gameProfile ARG 3 headingText ARG 4 fromReportedPlayer - METHOD method_44519 drawSkin (Lnet/minecraft/class_4587;IILnet/minecraft/class_2960;)V - ARG 1 matrices - ARG 2 x - ARG 3 y - ARG 4 skinTextureId CLASS class_7550 SeparatorEntry diff --git a/mappings/net/minecraft/client/gui/screen/report/ReportScreen.mapping b/mappings/net/minecraft/client/gui/screen/report/ReportScreen.mapping new file mode 100644 index 0000000000..43674a4945 --- /dev/null +++ b/mappings/net/minecraft/client/gui/screen/report/ReportScreen.mapping @@ -0,0 +1,52 @@ +CLASS net/minecraft/class_8768 net/minecraft/client/gui/screen/report/ReportScreen + FIELD field_46012 SEND_TEXT Lnet/minecraft/class_2561; + FIELD field_46013 OBSERVED_WHAT_TEXT Lnet/minecraft/class_2561; + FIELD field_46014 SELECT_REASON_TEXT Lnet/minecraft/class_2561; + FIELD field_46015 MORE_COMMENTS_TEXT Lnet/minecraft/class_2561; + FIELD field_46019 parent Lnet/minecraft/class_437; + FIELD field_46020 context Lnet/minecraft/class_7574; + FIELD field_46021 reportBuilder Lnet/minecraft/class_7855$class_8775; + FIELD field_46022 REPORT_SENT_MESSAGE_TEXT Lnet/minecraft/class_2561; + FIELD field_46023 SENDING_TITLE_TEXT Lnet/minecraft/class_2561; + FIELD field_46024 SENT_TITLE_TEXT Lnet/minecraft/class_2561; + FIELD field_46025 ERROR_TITLE_TEXT Lnet/minecraft/class_2561; + FIELD field_46026 GENERIC_ERROR_TEXT Lnet/minecraft/class_2561; + FIELD field_46027 DESCRIBE_TEXT Lnet/minecraft/class_2561; + FIELD field_46028 COMMENTS_TEXT Lnet/minecraft/class_2561; + FIELD field_46029 LOGGER Lorg/slf4j/Logger; + METHOD (Lnet/minecraft/class_2561;Lnet/minecraft/class_437;Lnet/minecraft/class_7574;Lnet/minecraft/class_7855$class_8775;)V + ARG 1 title + ARG 2 parent + ARG 3 context + ARG 4 reportBuilder + METHOD method_53559 onSent ()V + METHOD method_53560 saveDraft ()V + METHOD method_53561 resetDraft ()V + METHOD method_53564 createCommentsBox (IILjava/util/function/Consumer;)Lnet/minecraft/class_7529; + ARG 1 width + ARG 2 height + ARG 3 changeListener + METHOD method_53565 (Lnet/minecraft/class_7855$class_7567;)V + ARG 1 validationError + METHOD method_53566 (Lnet/minecraft/class_7855$class_7568;)V + ARG 1 reportWithId + METHOD method_53567 (Ljava/lang/Object;Ljava/lang/Throwable;)Ljava/lang/Object; + ARG 1 v + ARG 2 throwable + METHOD method_53568 onSendError (Ljava/lang/Throwable;)V + ARG 1 error + METHOD method_53570 showError (Lnet/minecraft/class_2561;)V + ARG 1 errorMessage + METHOD method_53571 trySend ()V + CLASS class_7539 DiscardWarningScreen + FIELD field_39723 TITLE Lnet/minecraft/class_2561; + FIELD field_39724 MESSAGE Lnet/minecraft/class_2561; + FIELD field_39725 RETURN_BUTTON_TEXT Lnet/minecraft/class_2561; + FIELD field_39726 DISCARD_BUTTON_TEXT Lnet/minecraft/class_2561; + FIELD field_40794 DRAFT_BUTTON_TEXT Lnet/minecraft/class_2561; + METHOD method_44483 (Lnet/minecraft/class_4185;)V + ARG 1 button + METHOD method_46518 (Lnet/minecraft/class_4185;)V + ARG 1 button + METHOD method_46519 (Lnet/minecraft/class_4185;)V + ARG 1 button diff --git a/mappings/net/minecraft/client/gui/screen/report/SkinReportScreen.mapping b/mappings/net/minecraft/client/gui/screen/report/SkinReportScreen.mapping new file mode 100644 index 0000000000..cab4ae8f2c --- /dev/null +++ b/mappings/net/minecraft/client/gui/screen/report/SkinReportScreen.mapping @@ -0,0 +1,37 @@ +CLASS net/minecraft/class_8771 net/minecraft/client/gui/screen/report/SkinReportScreen + FIELD field_46051 BOTTOM_BUTTON_WIDTH I + FIELD field_46052 SKIN_WIDGET_WIDTH I + FIELD field_46053 REASON_BUTTON_AND_COMMENTS_BOX_WIDTH I + FIELD field_46054 TITLE_TEXT Lnet/minecraft/class_2561; + FIELD field_46055 layout Lnet/minecraft/class_8667; + FIELD field_46056 commentsBox Lnet/minecraft/class_7529; + FIELD field_46057 sendButton Lnet/minecraft/class_4185; + FIELD field_46058 selectReasonButton Lnet/minecraft/class_4185; + METHOD (Lnet/minecraft/class_437;Lnet/minecraft/class_7574;Ljava/util/UUID;Ljava/util/function/Supplier;)V + ARG 1 parent + ARG 2 context + ARG 3 reportedPlayerUuid + ARG 4 skinSupplier + METHOD (Lnet/minecraft/class_437;Lnet/minecraft/class_7574;Lnet/minecraft/class_8777$class_8778;)V + ARG 1 parent + ARG 2 context + ARG 3 reportBuilder + METHOD (Lnet/minecraft/class_437;Lnet/minecraft/class_7574;Lnet/minecraft/class_8777;)V + ARG 1 parent + ARG 2 context + ARG 3 report + METHOD method_53586 onChange ()V + METHOD method_53587 (Lnet/minecraft/class_4185;)V + ARG 1 button + METHOD method_53588 (Lnet/minecraft/class_7847;)V + ARG 0 positioner + METHOD method_53589 (Lnet/minecraft/class_8771;Lnet/minecraft/class_364;)V + ARG 1 child + METHOD method_53590 (Lnet/minecraft/class_7573;)V + ARG 1 reason + METHOD method_53591 (Ljava/lang/String;)V + ARG 1 opinionComments + METHOD method_53592 (Lnet/minecraft/class_4185;)V + ARG 1 button + METHOD method_53593 (Lnet/minecraft/class_4185;)V + ARG 1 button diff --git a/mappings/net/minecraft/client/gui/screen/report/UsernameReportScreen.mapping b/mappings/net/minecraft/client/gui/screen/report/UsernameReportScreen.mapping new file mode 100644 index 0000000000..023ac9282c --- /dev/null +++ b/mappings/net/minecraft/client/gui/screen/report/UsernameReportScreen.mapping @@ -0,0 +1,32 @@ +CLASS net/minecraft/class_8769 net/minecraft/client/gui/screen/report/UsernameReportScreen + FIELD field_46036 BOTTOM_BUTTON_WIDTH I + FIELD field_46037 TITLE_TEXT Lnet/minecraft/class_2561; + FIELD field_46038 layout Lnet/minecraft/class_8667; + FIELD field_46039 commentsBox Lnet/minecraft/class_7529; + FIELD field_46040 sendButton Lnet/minecraft/class_4185; + METHOD (Lnet/minecraft/class_437;Lnet/minecraft/class_7574;Ljava/util/UUID;Ljava/lang/String;)V + ARG 1 parent + ARG 2 context + ARG 3 reportedPlayerUuid + ARG 4 username + METHOD (Lnet/minecraft/class_437;Lnet/minecraft/class_7574;Lnet/minecraft/class_8773$class_8774;)V + ARG 1 parent + ARG 2 context + ARG 3 reportBuilder + METHOD (Lnet/minecraft/class_437;Lnet/minecraft/class_7574;Lnet/minecraft/class_8773;)V + ARG 1 parent + ARG 2 context + ARG 3 report + METHOD method_53574 onChange ()V + METHOD method_53575 (Lnet/minecraft/class_4185;)V + ARG 1 button + METHOD method_53576 (Lnet/minecraft/class_7847;)V + ARG 0 positioner + METHOD method_53577 (Lnet/minecraft/class_8769;Lnet/minecraft/class_364;)V + ARG 1 child + METHOD method_53578 (Ljava/lang/String;)V + ARG 1 opinionComments + METHOD method_53579 (Lnet/minecraft/class_4185;)V + ARG 1 button + METHOD method_53580 (Lnet/minecraft/class_7847;)V + ARG 0 positioner diff --git a/mappings/net/minecraft/client/gui/screen/world/CreateWorldScreen.mapping b/mappings/net/minecraft/client/gui/screen/world/CreateWorldScreen.mapping index a72f06ade2..9102dba6b1 100644 --- a/mappings/net/minecraft/client/gui/screen/world/CreateWorldScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/world/CreateWorldScreen.mapping @@ -1,67 +1,38 @@ CLASS net/minecraft/class_525 net/minecraft/client/gui/screen/world/CreateWorldScreen - FIELD field_24286 difficultyButton Lnet/minecraft/class_5676; - FIELD field_24287 gameRulesButton Lnet/minecraft/class_4185; - FIELD field_24288 gameRules Lnet/minecraft/class_1928; - FIELD field_24588 moreOptionsDialog Lnet/minecraft/class_5292; FIELD field_25477 dataPackTempDir Ljava/nio/file/Path; - FIELD field_25478 dataPacksButton Lnet/minecraft/class_4185; - FIELD field_25479 dataPackSettings Lnet/minecraft/class_5359; FIELD field_25480 LOGGER Lorg/slf4j/Logger; FIELD field_25792 packManager Lnet/minecraft/class_3283; FIELD field_25898 GAME_MODE_TEXT Lnet/minecraft/class_2561; - FIELD field_26598 ENTER_SEED_TEXT Lnet/minecraft/class_2561; - FIELD field_26599 SEED_INFO_TEXT Lnet/minecraft/class_2561; FIELD field_26600 ENTER_NAME_TEXT Lnet/minecraft/class_2561; - FIELD field_26601 RESULT_FOLDER_TEXT Lnet/minecraft/class_2561; - FIELD field_26602 ALLOW_COMMANDS_INFO_TEXT Lnet/minecraft/class_2561; - FIELD field_27998 currentDifficulty Lnet/minecraft/class_1267; - FIELD field_3178 hardcore Z - FIELD field_3179 tweakedCheats Z - FIELD field_3182 enableCheatsButton Lnet/minecraft/class_5676; - FIELD field_3185 lastMode Lnet/minecraft/class_525$class_4539; - FIELD field_3186 gameModeSwitchButton Lnet/minecraft/class_5676; FIELD field_3187 parent Lnet/minecraft/class_437; - FIELD field_3188 levelNameField Lnet/minecraft/class_342; - FIELD field_3192 cheatsEnabled Z - FIELD field_3193 moreOptionsButton Lnet/minecraft/class_4185; - FIELD field_3194 firstGameModeDescriptionLine Lnet/minecraft/class_2561; - FIELD field_3195 levelName Ljava/lang/String; - FIELD field_3196 saveDirectoryName Ljava/lang/String; - FIELD field_3199 secondGameModeDescriptionLine Lnet/minecraft/class_2561; - FIELD field_3201 currentMode Lnet/minecraft/class_525$class_4539; - FIELD field_3202 moreOptionsOpen Z - FIELD field_3205 createLevelButton Lnet/minecraft/class_4185; FIELD field_32434 TEMP_DIR_PREFIX Ljava/lang/String; FIELD field_37911 PREPARING_TEXT Lnet/minecraft/class_2561; - METHOD (Lnet/minecraft/class_437;Lnet/minecraft/class_5359;Lnet/minecraft/class_5292;)V - ARG 1 parent - ARG 2 dataPackSettings - ARG 3 moreOptionsDialog - METHOD method_19416 (Ljava/lang/String;)V - ARG 1 levelName + FIELD field_42163 grid Lnet/minecraft/class_7845; + FIELD field_42164 tabNavigation Lnet/minecraft/class_8089; + FIELD field_42169 ALLOW_COMMANDS_INFO_TEXT Lnet/minecraft/class_2561; + FIELD field_42172 worldCreator Lnet/minecraft/class_8100; + FIELD field_42173 tabManager Lnet/minecraft/class_8088; + FIELD field_42501 EXPERIMENTS_TEXT Lnet/minecraft/class_2561; + FIELD field_42502 recreated Z + FIELD field_43081 HEADER_SEPARATOR_TEXTURE Lnet/minecraft/class_2960; + FIELD field_43082 FOOTER_SEPARATOR_TEXTURE Lnet/minecraft/class_2960; + FIELD field_44672 LIGHT_DIRT_BACKGROUND_TEXTURE Lnet/minecraft/class_2960; + FIELD field_45568 symlinkFinder Lnet/minecraft/class_8580; + METHOD (Lnet/minecraft/class_310;Lnet/minecraft/class_437;Lnet/minecraft/class_7193;Ljava/util/Optional;Ljava/util/OptionalLong;)V + ARG 1 client + ARG 2 parent + ARG 3 generatorOptionsHolder + ARG 4 defaultWorldType + ARG 5 seed METHOD method_19921 (Lnet/minecraft/class_4185;)V ARG 1 button METHOD method_19922 (Lnet/minecraft/class_4185;)V ARG 1 button - METHOD method_19923 (Lnet/minecraft/class_4185;)V - ARG 1 button - METHOD method_22365 tweakDefaultsTo (Lnet/minecraft/class_525$class_4539;)V - ARG 1 mode - METHOD method_2710 setMoreOptionsOpen (Z)V - ARG 1 moreOptionsOpen - METHOD method_2721 toggleMoreOptions ()V - METHOD method_2722 updateSettingsLabels ()V - METHOD method_2727 updateSaveFolderName ()V METHOD method_2736 createLevel ()V - METHOD method_27614 (Lnet/minecraft/class_1928;)V - ARG 1 gameRules - METHOD method_27615 (Lnet/minecraft/class_4185;)V - ARG 1 button - METHOD method_27616 (Ljava/util/Optional;)V - ARG 1 optionalGameRules - METHOD method_28084 setMoreOptionsOpen ()V - METHOD method_29682 applyDataPacks (Lnet/minecraft/class_3283;)V + METHOD method_29682 applyDataPacks (Lnet/minecraft/class_3283;ZLjava/util/function/Consumer;)V ARG 1 dataPackManager + ARG 2 fromPackScreen + ARG 3 configurationSetter METHOD method_29685 copyDataPack (Ljava/nio/file/Path;Lnet/minecraft/class_310;)Ljava/nio/file/Path; ARG 0 srcFolder ARG 1 client @@ -75,80 +46,145 @@ CLASS net/minecraft/class_525 net/minecraft/client/gui/screen/world/CreateWorldS ARG 2 dataPackFile METHOD method_29689 (Ljava/nio/file/Path;)V ARG 0 path - METHOD method_29691 (Z)V - ARG 1 confirmed - METHOD method_29692 (Lnet/minecraft/class_4185;)V - ARG 1 button METHOD method_29693 getDataPackTempDir ()Ljava/nio/file/Path; - METHOD method_29694 openPackScreen ()V + METHOD method_29694 openPackScreen (Lnet/minecraft/class_7712;)V + ARG 1 dataConfiguration METHOD method_29695 clearDataPackTempDir ()V METHOD method_29983 (Ljava/util/List;Ljava/lang/String;)Z ARG 1 name - METHOD method_30296 getScannedPack ()Lcom/mojang/datafixers/util/Pair; + METHOD method_30296 getScannedPack (Lnet/minecraft/class_7712;)Lcom/mojang/datafixers/util/Pair; + ARG 1 dataConfiguration METHOD method_30297 onCloseScreen ()V METHOD method_31130 create (Lnet/minecraft/class_310;Lnet/minecraft/class_437;)V ARG 0 client ARG 1 parent - METHOD method_32667 (Lnet/minecraft/class_5676;)Lnet/minecraft/class_5250; - ARG 0 button - METHOD method_32668 (Lnet/minecraft/class_5676;Lnet/minecraft/class_1267;)V - ARG 1 button - ARG 2 difficulty - METHOD method_32669 (Lnet/minecraft/class_5676;Lnet/minecraft/class_525$class_4539;)V - ARG 1 button - ARG 2 mode - METHOD method_32670 (Lnet/minecraft/class_5676;Ljava/lang/Boolean;)V - ARG 1 button - ARG 2 cheatsEnabled - METHOD method_32671 (Lnet/minecraft/class_5676;)Lnet/minecraft/class_5250; - ARG 1 button - METHOD method_32672 getDifficulty ()Lnet/minecraft/class_1267; - METHOD method_37088 (Lnet/minecraft/class_5359;Lnet/minecraft/class_7193;)V - ARG 2 generatorOptionsHolder - METHOD method_37089 (Ljava/lang/Void;Ljava/lang/Throwable;)Ljava/lang/Object; - ARG 1 v - ARG 2 throwable - METHOD method_40209 (Lnet/minecraft/class_3300;Lnet/minecraft/class_5359;)Lcom/mojang/datafixers/util/Pair; - ARG 1 resourceManager - ARG 2 dataPackSettings - METHOD method_40211 (Lcom/mojang/serialization/DynamicOps;Lcom/google/gson/JsonElement;)Lcom/mojang/serialization/DataResult; - ARG 1 json - METHOD method_40212 create (Lnet/minecraft/class_437;Lnet/minecraft/class_6904;Ljava/nio/file/Path;)Lnet/minecraft/class_525; - ARG 0 parent - ARG 1 source - ARG 2 path + METHOD method_40212 create (Lnet/minecraft/class_310;Lnet/minecraft/class_437;Lnet/minecraft/class_1940;Lnet/minecraft/class_7193;Ljava/nio/file/Path;)Lnet/minecraft/class_525; + ARG 0 client + ARG 1 parent + ARG 2 levelInfo + ARG 3 generatorOptionsHolder + ARG 4 dataPackTempDir METHOD method_40213 createLevelInfo (Z)Lnet/minecraft/class_1940; ARG 1 debugWorld - METHOD method_41847 startServer ()V + METHOD method_41847 startServer (Lnet/minecraft/class_31$class_7729;Lnet/minecraft/class_7780;Lcom/mojang/serialization/Lifecycle;)V + ARG 1 specialProperty + ARG 2 combinedDynamicRegistries + ARG 3 lifecycle METHOD method_41848 createSession ()Ljava/util/Optional; - METHOD method_41849 createServerConfig (Lnet/minecraft/class_3283;Lnet/minecraft/class_5359;)Lnet/minecraft/class_7237$class_6906; - ARG 0 resourcePackManager - ARG 1 dataPackSettings - METHOD method_41850 (Lnet/minecraft/class_6860;Lnet/minecraft/class_5350;Lnet/minecraft/class_5455$class_6890;Lcom/mojang/datafixers/util/Pair;)Lnet/minecraft/class_7193; - ARG 0 resourceManager - ARG 1 dataPackContents - ARG 2 dynamicRegistryManager - ARG 3 pair - METHOD method_41851 (Lnet/minecraft/class_6860;Lnet/minecraft/class_5350;Lnet/minecraft/class_5455$class_6890;Lnet/minecraft/class_5285;)Lnet/minecraft/class_7193; + METHOD method_41849 createServerConfig (Lnet/minecraft/class_3283;Lnet/minecraft/class_7712;)Lnet/minecraft/class_7237$class_6906; + ARG 0 dataPackManager + ARG 1 dataConfiguration + METHOD method_41851 (Lnet/minecraft/class_6860;Lnet/minecraft/class_5350;Lnet/minecraft/class_7780;Lnet/minecraft/class_525$class_7749;)Lnet/minecraft/class_7193; ARG 0 resourceManager ARG 1 dataPackContents - ARG 2 dynamicRegistryManager + ARG 2 combinedDynamicRegistries ARG 3 generatorOptions METHOD method_41852 showMessage (Lnet/minecraft/class_310;Lnet/minecraft/class_2561;)V ARG 0 client ARG 1 text METHOD method_41853 (Ljava/nio/file/Path;)Z ARG 1 path - METHOD method_41854 (Lnet/minecraft/class_3300;Lnet/minecraft/class_5359;)Lcom/mojang/datafixers/util/Pair; - ARG 0 resourceManager - ARG 1 dataPackSettings METHOD method_41855 (Ljava/nio/file/Path;Ljava/nio/file/Path;)V ARG 2 path - CLASS class_4539 Mode - FIELD field_20628 translationSuffix Ljava/lang/String; - FIELD field_20629 defaultGameMode Lnet/minecraft/class_1934; - FIELD field_27999 text Lnet/minecraft/class_2561; - METHOD (Ljava/lang/String;ILjava/lang/String;Lnet/minecraft/class_1934;)V - ARG 3 translationSuffix - ARG 4 defaultGameMode - METHOD method_32673 asText ()Lnet/minecraft/class_2561; + METHOD method_45678 (Lnet/minecraft/class_7237$class_7660;)Lnet/minecraft/class_7237$class_7661; + ARG 1 context + METHOD method_45679 validateDataPacks (Lnet/minecraft/class_3283;Lnet/minecraft/class_7712;Ljava/util/function/Consumer;)V + ARG 1 dataPackManager + ARG 2 dataConfiguration + ARG 3 configurationSetter + METHOD method_45681 (Lnet/minecraft/class_6860;Lnet/minecraft/class_5350;Lnet/minecraft/class_7780;Lnet/minecraft/class_525$class_7749;)Lnet/minecraft/class_7193; + ARG 0 resourceManager + ARG 1 dataPackContents + ARG 2 combinedDynamicRegistries + ARG 3 context + METHOD method_45682 (Lcom/mojang/serialization/DynamicOps;Lcom/google/gson/JsonElement;)Lcom/mojang/serialization/DataResult; + ARG 1 json + METHOD method_45686 (Lnet/minecraft/class_7237$class_7660;)Lnet/minecraft/class_7237$class_7661; + ARG 0 context + METHOD method_48643 (Lnet/minecraft/class_3283;Lnet/minecraft/class_7712;Ljava/util/function/Consumer;Z)V + ARG 4 confirmed + METHOD method_48644 (Lnet/minecraft/class_339;)V + ARG 1 child + METHOD method_48650 (Lnet/minecraft/class_525;Lnet/minecraft/class_364;)V + ARG 1 child + METHOD method_48654 (Ljava/util/function/Consumer;Z)V + ARG 2 confirmed + METHOD method_48657 getWorldCreator ()Lnet/minecraft/class_8100; + METHOD method_49009 (Lnet/minecraft/class_3283;)V + ARG 1 resourcePackManager + METHOD method_49010 openExperimentsScreen (Lnet/minecraft/class_7712;)V + ARG 1 dataConfiguration + METHOD method_49011 (Lnet/minecraft/class_3283;)V + ARG 1 resourcePackManager + METHOD method_49629 (Ljava/util/function/Consumer;Ljava/lang/Void;Ljava/lang/Throwable;)Ljava/lang/Object; + ARG 3 throwable + CLASS class_7749 WorldCreationSettings + CLASS class_8093 GameTab + FIELD field_42175 GAME_TAB_TITLE_TEXT Lnet/minecraft/class_2561; + FIELD field_42176 ALLOW_COMMANDS_TEXT Lnet/minecraft/class_2561; + FIELD field_42177 worldNameField Lnet/minecraft/class_342; + METHOD method_48658 (Lnet/minecraft/class_5676;Lnet/minecraft/class_1267;)V + ARG 1 button + ARG 2 value + METHOD method_48659 (Lnet/minecraft/class_5676;Lnet/minecraft/class_8100$class_4539;)V + ARG 1 button + ARG 2 value + METHOD method_48660 (Lnet/minecraft/class_5676;Lnet/minecraft/class_8100;)V + ARG 2 creator + METHOD method_48661 (Lnet/minecraft/class_5676;Ljava/lang/Boolean;)V + ARG 1 button + ARG 2 value + METHOD method_48662 (Lnet/minecraft/class_8100$class_4539;)Lnet/minecraft/class_2561; + ARG 0 value + METHOD method_48663 (Ljava/lang/Boolean;)Lnet/minecraft/class_7919; + ARG 0 value + METHOD method_48664 (Lnet/minecraft/class_5676;Lnet/minecraft/class_8100;)V + ARG 2 creator + METHOD method_48665 (Lnet/minecraft/class_5676;Lnet/minecraft/class_8100;)V + ARG 1 creator + METHOD method_49012 (Lnet/minecraft/class_4185;)V + ARG 1 button + METHOD method_49702 (Lnet/minecraft/class_8100;)V + ARG 1 creator + CLASS class_8094 MoreTab + FIELD field_42179 MORE_TAB_TITLE_TEXT Lnet/minecraft/class_2561; + FIELD field_42180 GAME_RULES_TEXT Lnet/minecraft/class_2561; + FIELD field_42181 DATA_PACKS_TEXT Lnet/minecraft/class_2561; + METHOD method_48667 (Ljava/util/Optional;)V + ARG 1 gameRules + METHOD method_48668 (Lnet/minecraft/class_4185;)V + ARG 1 button + METHOD method_48669 openGameRulesScreen ()V + METHOD method_49013 (Lnet/minecraft/class_4185;)V + ARG 1 button + METHOD method_49014 (Lnet/minecraft/class_4185;)V + ARG 1 button + CLASS class_8095 WorldTab + FIELD field_42183 WORLD_TAB_TITLE_TEXT Lnet/minecraft/class_2561; + FIELD field_42184 AMPLIFIED_GENERATOR_INFO_TEXT Lnet/minecraft/class_2561; + FIELD field_42185 MAP_FEATURES_TEXT Lnet/minecraft/class_2561; + FIELD field_42186 MAP_FEATURES_INFO_TEXT Lnet/minecraft/class_2561; + FIELD field_42187 BONUS_ITEMS_TEXT Lnet/minecraft/class_2561; + FIELD field_42188 ENTER_SEED_TEXT Lnet/minecraft/class_2561; + FIELD field_42189 SEED_INFO_TEXT Lnet/minecraft/class_2561; + FIELD field_42191 seedField Lnet/minecraft/class_342; + FIELD field_42192 customizeButton Lnet/minecraft/class_4185; + METHOD method_48670 (Lnet/minecraft/class_4185;)V + ARG 1 button + METHOD method_48671 getWorldTypeNarrationMessage (Lnet/minecraft/class_5676;)Lnet/minecraft/class_5250; + ARG 0 worldTypeButton + METHOD method_48672 (Lnet/minecraft/class_5676;Lnet/minecraft/class_8100$class_8101;)V + ARG 1 button + ARG 2 worldType + METHOD method_48673 (Lnet/minecraft/class_5676;Lnet/minecraft/class_8100;)V + ARG 2 creator + METHOD method_48674 (Lnet/minecraft/class_7845$class_7939;Lnet/minecraft/class_8021;)V + ARG 1 widget + METHOD method_48675 (Lnet/minecraft/class_8096;Lnet/minecraft/class_8100;)V + ARG 1 creator + METHOD method_48676 (Lnet/minecraft/class_8100;)V + ARG 1 creator + METHOD method_48677 (Ljava/lang/String;)V + ARG 1 seed + METHOD method_48678 openCustomizeScreen ()V + METHOD method_48679 getWorldTypes ()Lnet/minecraft/class_5676$class_5680; diff --git a/mappings/net/minecraft/client/gui/screen/world/EditGameRulesScreen.mapping b/mappings/net/minecraft/client/gui/screen/world/EditGameRulesScreen.mapping index f28d66593b..acf0eb8508 100644 --- a/mappings/net/minecraft/client/gui/screen/world/EditGameRulesScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/world/EditGameRulesScreen.mapping @@ -3,7 +3,6 @@ CLASS net/minecraft/class_5235 net/minecraft/client/gui/screen/world/EditGameRul FIELD field_24294 ruleListWidget Lnet/minecraft/class_5235$class_5241; FIELD field_24295 invalidRuleWidgets Ljava/util/Set; FIELD field_24296 doneButton Lnet/minecraft/class_4185; - FIELD field_24297 tooltip Ljava/util/List; FIELD field_24298 gameRules Lnet/minecraft/class_1928; METHOD (Lnet/minecraft/class_1928;Ljava/util/function/Consumer;)V ARG 1 gameRules @@ -12,13 +11,13 @@ CLASS net/minecraft/class_5235 net/minecraft/client/gui/screen/world/EditGameRul ARG 1 button METHOD method_27620 markInvalid (Lnet/minecraft/class_5235$class_5240;)V ARG 1 ruleWidget - METHOD method_27624 setTooltip (Ljava/util/List;)V - ARG 1 tooltip METHOD method_27625 (Lnet/minecraft/class_4185;)V ARG 1 button METHOD method_27626 markValid (Lnet/minecraft/class_5235$class_5240;)V ARG 1 ruleWidget METHOD method_27632 updateDoneButton ()V + METHOD method_48682 (Lnet/minecraft/class_5235;Lnet/minecraft/class_364;)V + ARG 1 child CLASS class_5236 BooleanRuleWidget FIELD field_24300 toggleButton Lnet/minecraft/class_5676; METHOD (Lnet/minecraft/class_5235;Lnet/minecraft/class_2561;Ljava/util/List;Ljava/lang/String;Lnet/minecraft/class_1928$class_4310;)V @@ -83,7 +82,7 @@ CLASS net/minecraft/class_5235 net/minecraft/client/gui/screen/world/EditGameRul METHOD (Lnet/minecraft/class_5235;Ljava/util/List;Lnet/minecraft/class_2561;)V ARG 2 description ARG 3 name - METHOD method_29989 drawName (Lnet/minecraft/class_4587;II)V - ARG 1 matrices + METHOD method_29989 drawName (Lnet/minecraft/class_332;II)V + ARG 1 context ARG 2 x ARG 3 y diff --git a/mappings/net/minecraft/client/gui/screen/world/EditWorldScreen.mapping b/mappings/net/minecraft/client/gui/screen/world/EditWorldScreen.mapping index 5a71254960..d3e5cbe926 100644 --- a/mappings/net/minecraft/client/gui/screen/world/EditWorldScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/world/EditWorldScreen.mapping @@ -1,7 +1,6 @@ CLASS net/minecraft/class_524 net/minecraft/client/gui/screen/world/EditWorldScreen FIELD field_23776 LOGGER Lorg/slf4j/Logger; FIELD field_23777 storageSession Lnet/minecraft/class_32$class_5143; - FIELD field_25481 GSON Lcom/google/gson/Gson; FIELD field_26603 ENTER_NAME_TEXT Lnet/minecraft/class_2561; FIELD field_3168 saveButton Lnet/minecraft/class_4185; FIELD field_3169 callback Lit/unimi/dsi/fastutil/booleans/BooleanConsumer; @@ -31,12 +30,6 @@ CLASS net/minecraft/class_524 net/minecraft/client/gui/screen/world/EditWorldScr ARG 1 button METHOD method_27030 (Lnet/minecraft/class_4185;)V ARG 1 button - METHOD method_29067 (Lcom/mojang/serialization/DataResult$PartialResult;)V - ARG 0 result - METHOD method_29068 (Lnet/minecraft/class_4185;)V - ARG 1 button - METHOD method_29699 (Lcom/google/gson/JsonElement;)Lcom/mojang/serialization/DataResult; - ARG 1 json METHOD method_29784 onBackupConfirm (Lnet/minecraft/class_32;Ljava/lang/String;)V ARG 0 storage ARG 1 levelName diff --git a/mappings/net/minecraft/client/gui/screen/world/ExperimentsScreen.mapping b/mappings/net/minecraft/client/gui/screen/world/ExperimentsScreen.mapping new file mode 100644 index 0000000000..e8fe348bd1 --- /dev/null +++ b/mappings/net/minecraft/client/gui/screen/world/ExperimentsScreen.mapping @@ -0,0 +1,28 @@ +CLASS net/minecraft/class_8134 net/minecraft/client/gui/screen/world/ExperimentsScreen + FIELD field_42503 INFO_WIDTH I + FIELD field_42504 experimentToggleList Lnet/minecraft/class_8132; + FIELD field_42505 parent Lnet/minecraft/class_437; + FIELD field_42506 resourcePackManager Lnet/minecraft/class_3283; + FIELD field_42507 applier Ljava/util/function/Consumer; + FIELD field_42508 experiments Lit/unimi/dsi/fastutil/objects/Object2BooleanMap; + METHOD (Lnet/minecraft/class_437;Lnet/minecraft/class_3283;Ljava/util/function/Consumer;)V + ARG 1 parent + ARG 2 resourcePackManager + ARG 3 applier + METHOD method_49016 getDataPackName (Lnet/minecraft/class_3288;)Lnet/minecraft/class_2561; + ARG 0 packProfile + METHOD method_49017 (Lnet/minecraft/class_3288;Ljava/lang/Boolean;)V + ARG 2 enabled + METHOD method_49018 (Lnet/minecraft/class_4185;)V + ARG 1 button + METHOD method_49019 (Lnet/minecraft/class_8134;Lnet/minecraft/class_364;)V + ARG 1 widget + METHOD method_49020 (Lnet/minecraft/class_8096$class_8097;Lnet/minecraft/class_3288;Ljava/lang/Boolean;)V + ARG 2 pack + ARG 3 enabled + METHOD method_49021 (Ljava/util/List;Ljava/util/List;Lnet/minecraft/class_3288;Ljava/lang/Boolean;)V + ARG 2 pack + ARG 3 enabled + METHOD method_49023 (Lnet/minecraft/class_4185;)V + ARG 1 button + METHOD method_49024 applyAndClose ()V diff --git a/mappings/net/minecraft/client/gui/screen/world/LevelScreenProvider.mapping b/mappings/net/minecraft/client/gui/screen/world/LevelScreenProvider.mapping index 2bfb037eea..02caa832da 100644 --- a/mappings/net/minecraft/client/gui/screen/world/LevelScreenProvider.mapping +++ b/mappings/net/minecraft/client/gui/screen/world/LevelScreenProvider.mapping @@ -5,9 +5,9 @@ CLASS net/minecraft/class_5293 net/minecraft/client/gui/screen/world/LevelScreen ARG 2 generatorOptionsHolder METHOD method_41856 createModifier (Lnet/minecraft/class_3232;)Lnet/minecraft/class_7193$class_7195; ARG 0 config - METHOD method_41857 (Lnet/minecraft/class_3232;Lnet/minecraft/class_5455$class_6890;Lnet/minecraft/class_5285;)Lnet/minecraft/class_5285; + METHOD method_41857 (Lnet/minecraft/class_3232;Lnet/minecraft/class_5455$class_6890;Lnet/minecraft/class_7723;)Lnet/minecraft/class_7723; ARG 1 dynamicRegistryManager - ARG 2 generatorOptions + ARG 2 dimensionsRegistryHolder METHOD method_41858 (Lnet/minecraft/class_525;Lnet/minecraft/class_3232;)V ARG 1 config METHOD method_41859 (Lnet/minecraft/class_525;Lnet/minecraft/class_7193;)Lnet/minecraft/class_437; @@ -17,9 +17,9 @@ CLASS net/minecraft/class_5293 net/minecraft/client/gui/screen/world/LevelScreen ARG 1 biomeEntry METHOD method_41861 createModifier (Lnet/minecraft/class_6880;)Lnet/minecraft/class_7193$class_7195; ARG 0 biomeEntry - METHOD method_41862 (Lnet/minecraft/class_6880;Lnet/minecraft/class_5455$class_6890;Lnet/minecraft/class_5285;)Lnet/minecraft/class_5285; + METHOD method_41862 (Lnet/minecraft/class_6880;Lnet/minecraft/class_5455$class_6890;Lnet/minecraft/class_7723;)Lnet/minecraft/class_7723; ARG 1 dynamicRegistryManager - ARG 2 generatorOptions + ARG 2 dimensionsRegistryHolder METHOD method_41863 (Lnet/minecraft/class_525;Lnet/minecraft/class_7193;)Lnet/minecraft/class_437; ARG 0 parent ARG 1 generatorOptionsHolder diff --git a/mappings/net/minecraft/client/gui/screen/world/MoreOptionsDialog.mapping b/mappings/net/minecraft/client/gui/screen/world/MoreOptionsDialog.mapping deleted file mode 100644 index e8f400bac6..0000000000 --- a/mappings/net/minecraft/client/gui/screen/world/MoreOptionsDialog.mapping +++ /dev/null @@ -1,93 +0,0 @@ -CLASS net/minecraft/class_5292 net/minecraft/client/gui/screen/world/MoreOptionsDialog - FIELD field_24589 bonusItemsButton Lnet/minecraft/class_5676; - FIELD field_24592 textRenderer Lnet/minecraft/class_327; - FIELD field_24593 parentWidth I - FIELD field_24594 seedTextField Lnet/minecraft/class_342; - FIELD field_24595 mapFeaturesButton Lnet/minecraft/class_5676; - FIELD field_24596 mapTypeButton Lnet/minecraft/class_5676; - FIELD field_24597 customizeTypeButton Lnet/minecraft/class_4185; - FIELD field_24598 generatorOptionsHolder Lnet/minecraft/class_7193; - FIELD field_24600 seed Ljava/util/OptionalLong; - FIELD field_25046 LOGGER Lorg/slf4j/Logger; - FIELD field_25047 CUSTOM_TEXT Lnet/minecraft/class_2561; - FIELD field_25048 importSettingsButton Lnet/minecraft/class_4185; - FIELD field_25049 presetEntry Ljava/util/Optional; - FIELD field_26604 MAP_FEATURES_INFO_TEXT Lnet/minecraft/class_2561; - FIELD field_28000 SELECT_SETTINGS_FILE_TEXT Lnet/minecraft/class_2561; - FIELD field_28001 unchangeableMapTypeButton Lnet/minecraft/class_4185; - FIELD field_35754 AMPLIFIED_INFO_TEXT Lnet/minecraft/class_2561; - FIELD field_35755 amplifiedInfoText Lnet/minecraft/class_5489; - METHOD (Lnet/minecraft/class_7193;Ljava/util/Optional;Ljava/util/OptionalLong;)V - ARG 1 generatorOptionsHolder - ARG 2 presetKey - ARG 3 seed - METHOD method_28085 isDebugWorld ()Z - METHOD method_28086 setGeneratorOptionsHolder (Lnet/minecraft/class_7193;)V - ARG 1 generatorOptionsHolder - METHOD method_28087 (Lnet/minecraft/class_310;Lnet/minecraft/class_525;Lnet/minecraft/class_4185;)V - ARG 3 button - METHOD method_28092 init (Lnet/minecraft/class_525;Lnet/minecraft/class_310;Lnet/minecraft/class_327;)V - ARG 1 parent - ARG 2 client - ARG 3 textRenderer - METHOD method_28096 getGeneratorOptionsHolder (Z)Lnet/minecraft/class_7193; - ARG 1 hardcore - METHOD method_28100 (Ljava/lang/String;)V - ARG 1 seedText - METHOD method_28101 setVisible (Z)V - ARG 1 visible - METHOD method_29071 (Lnet/minecraft/class_310;Lnet/minecraft/class_525;Lnet/minecraft/class_4185;)V - ARG 3 button - METHOD method_29073 importOptions (Lnet/minecraft/class_5285;)V - ARG 1 generatorOptions - METHOD method_29700 getRegistryManager ()Lnet/minecraft/class_5455; - METHOD method_30510 seedToString (Ljava/util/OptionalLong;)Ljava/lang/String; - ARG 0 seed - METHOD method_32676 (Lnet/minecraft/class_4185;)V - ARG 0 button - METHOD method_32678 (Lnet/minecraft/class_5676;Ljava/lang/Boolean;)V - ARG 1 button - ARG 2 bonusChest - METHOD method_32679 (Lnet/minecraft/class_525;Lnet/minecraft/class_5676;Lnet/minecraft/class_6880;)V - ARG 2 button - ARG 3 presetEntry - METHOD method_32680 (Lnet/minecraft/class_5676;)Lnet/minecraft/class_5250; - ARG 0 button - METHOD method_32682 disableBonusItems ()V - METHOD method_32683 setMapTypeButtonVisible (Z)V - ARG 1 visible - METHOD method_32684 enableBonusItems ()V - METHOD method_37090 tickSeedTextField ()V - METHOD method_39664 (Lnet/minecraft/class_5676;)Lnet/minecraft/class_5250; - ARG 0 button - METHOD method_41867 (Lnet/minecraft/class_310;Lnet/minecraft/class_525;Lcom/mojang/serialization/Lifecycle;Lnet/minecraft/class_5285;)V - ARG 1 result - METHOD method_41868 apply (Lnet/minecraft/class_7193$class_7194;)V - ARG 1 modifier - METHOD method_41869 apply (Lnet/minecraft/class_7193$class_7195;)V - ARG 1 modifier - METHOD method_41870 createPresetEntry (Lnet/minecraft/class_7193;Ljava/util/Optional;)Ljava/util/Optional; - ARG 0 generatorOptionsHolder - ARG 1 presetKey - METHOD method_41871 (Lnet/minecraft/class_7193;Lnet/minecraft/class_5321;)Ljava/util/Optional; - ARG 1 key - METHOD method_41872 isAmplified (Lnet/minecraft/class_6880;)Z - ARG 0 presetEntry - METHOD method_41873 (Lnet/minecraft/class_6880;Lnet/minecraft/class_5285;)Lnet/minecraft/class_5285; - ARG 1 generatorOptions - METHOD method_41874 (Lnet/minecraft/class_6885$class_6888;)Ljava/util/List; - ARG 0 entryList - METHOD method_41876 collectPresets (Lnet/minecraft/class_2378;Lnet/minecraft/class_6862;)Ljava/util/Optional; - ARG 0 presetRegistry - ARG 1 tag - METHOD method_41877 (Ljava/util/List;)Z - ARG 0 entries - METHOD method_41878 (Lnet/minecraft/class_5321;)Lnet/minecraft/class_2561; - ARG 0 key - METHOD method_41879 (ZLjava/util/OptionalLong;Lnet/minecraft/class_5285;)Lnet/minecraft/class_5285; - ARG 2 generatorOptions - METHOD method_41882 getText (Lnet/minecraft/class_6880;)Lnet/minecraft/class_2561; - ARG 0 presetEntry - METHOD method_41883 (Lnet/minecraft/class_5321;)Z - ARG 0 key - METHOD method_41884 getGeneratorOptionsHolder ()Lnet/minecraft/class_7193; diff --git a/mappings/net/minecraft/client/gui/screen/world/OptimizeWorldScreen.mapping b/mappings/net/minecraft/client/gui/screen/world/OptimizeWorldScreen.mapping index befbc7ff11..b0ec95e094 100644 --- a/mappings/net/minecraft/client/gui/screen/world/OptimizeWorldScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/world/OptimizeWorldScreen.mapping @@ -3,13 +3,13 @@ CLASS net/minecraft/class_527 net/minecraft/client/gui/screen/world/OptimizeWorl FIELD field_3232 DIMENSION_COLORS Lit/unimi/dsi/fastutil/objects/Object2IntMap; FIELD field_3233 callback Lit/unimi/dsi/fastutil/booleans/BooleanConsumer; FIELD field_3234 updater Lnet/minecraft/class_1257; - METHOD (Lit/unimi/dsi/fastutil/booleans/BooleanConsumer;Lcom/mojang/datafixers/DataFixer;Lnet/minecraft/class_32$class_5143;Lnet/minecraft/class_1940;ZLnet/minecraft/class_5285;)V + METHOD (Lit/unimi/dsi/fastutil/booleans/BooleanConsumer;Lcom/mojang/datafixers/DataFixer;Lnet/minecraft/class_32$class_5143;Lnet/minecraft/class_1940;ZLnet/minecraft/class_2378;)V ARG 1 callback ARG 2 dataFixer ARG 3 storageSession ARG 4 levelInfo ARG 5 eraseCache - ARG 6 generatorOptions + ARG 6 dimensionOptionsRegistry METHOD method_19938 (Lnet/minecraft/class_4185;)V ARG 1 button METHOD method_27031 create (Lnet/minecraft/class_310;Lit/unimi/dsi/fastutil/booleans/BooleanConsumer;Lcom/mojang/datafixers/DataFixer;Lnet/minecraft/class_32$class_5143;Z)Lnet/minecraft/class_527; diff --git a/mappings/net/minecraft/client/gui/screen/world/SelectWorldScreen.mapping b/mappings/net/minecraft/client/gui/screen/world/SelectWorldScreen.mapping index f3b687d5d3..2127976377 100644 --- a/mappings/net/minecraft/client/gui/screen/world/SelectWorldScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/world/SelectWorldScreen.mapping @@ -6,14 +6,15 @@ CLASS net/minecraft/class_526 net/minecraft/client/gui/screen/world/SelectWorldS FIELD field_3219 deleteButton Lnet/minecraft/class_4185; FIELD field_3220 searchBox Lnet/minecraft/class_342; FIELD field_3221 parent Lnet/minecraft/class_437; - FIELD field_3222 tooltip Ljava/util/List; FIELD field_3224 selectButton Lnet/minecraft/class_4185; + FIELD field_40457 DEBUG_GENERATOR_OPTIONS Lnet/minecraft/class_5285; METHOD (Lnet/minecraft/class_437;)V ARG 1 parent METHOD method_19939 (Lnet/minecraft/class_4185;)V ARG 1 button - METHOD method_19940 worldSelected (Z)V - ARG 1 active + METHOD method_19940 worldSelected (ZZ)V + ARG 1 buttonsActive + ARG 2 deleteButtonActive METHOD method_19941 (Lnet/minecraft/class_4185;)V ARG 1 button METHOD method_19942 (Lnet/minecraft/class_4185;)V @@ -24,8 +25,6 @@ CLASS net/minecraft/class_526 net/minecraft/client/gui/screen/world/SelectWorldS ARG 1 button METHOD method_19945 (Lnet/minecraft/class_4185;)V ARG 1 button - METHOD method_2739 setTooltip (Ljava/util/List;)V - ARG 1 tooltip METHOD method_2744 (Ljava/lang/String;)V ARG 1 search METHOD method_35739 (Lnet/minecraft/class_4185;)V diff --git a/mappings/net/minecraft/client/gui/screen/world/SymlinkWarningScreen.mapping b/mappings/net/minecraft/client/gui/screen/world/SymlinkWarningScreen.mapping new file mode 100644 index 0000000000..1c947ceb2e --- /dev/null +++ b/mappings/net/minecraft/client/gui/screen/world/SymlinkWarningScreen.mapping @@ -0,0 +1,24 @@ +CLASS net/minecraft/class_8669 net/minecraft/client/gui/screen/world/SymlinkWarningScreen + FIELD field_45408 WORLD_TITLE Lnet/minecraft/class_2561; + FIELD field_45409 WORLD_MESSAGE Lnet/minecraft/class_2561; + FIELD field_45410 PACK_TITLE Lnet/minecraft/class_2561; + FIELD field_45411 PACK_MESSAGE Lnet/minecraft/class_2561; + FIELD field_45412 message Lnet/minecraft/class_2561; + FIELD field_45413 link Ljava/lang/String; + FIELD field_45414 parent Lnet/minecraft/class_437; + FIELD field_45415 grid Lnet/minecraft/class_7845; + METHOD (Lnet/minecraft/class_2561;Lnet/minecraft/class_2561;Ljava/lang/String;Lnet/minecraft/class_437;)V + ARG 1 title + ARG 2 message + ARG 3 link + ARG 4 parent + METHOD method_52747 (Lnet/minecraft/class_4185;)V + ARG 1 button + METHOD method_52748 world (Lnet/minecraft/class_437;)Lnet/minecraft/class_437; + ARG 0 parent + METHOD method_52749 (Lnet/minecraft/class_4185;)V + ARG 1 button + METHOD method_52750 pack (Lnet/minecraft/class_437;)Lnet/minecraft/class_437; + ARG 0 parent + METHOD method_52751 (Lnet/minecraft/class_4185;)V + ARG 1 button diff --git a/mappings/net/minecraft/client/gui/screen/world/WorldCreator.mapping b/mappings/net/minecraft/client/gui/screen/world/WorldCreator.mapping new file mode 100644 index 0000000000..8b71a8e815 --- /dev/null +++ b/mappings/net/minecraft/client/gui/screen/world/WorldCreator.mapping @@ -0,0 +1,105 @@ +CLASS net/minecraft/class_8100 net/minecraft/client/gui/screen/world/WorldCreator + FIELD field_42210 listeners Ljava/util/List; + FIELD field_42211 worldName Ljava/lang/String; + FIELD field_42213 gameMode Lnet/minecraft/class_8100$class_4539; + FIELD field_42214 difficulty Lnet/minecraft/class_1267; + FIELD field_42215 cheatsEnabled Ljava/lang/Boolean; + FIELD field_42216 seed Ljava/lang/String; + FIELD field_42217 generateStructures Z + FIELD field_42218 bonusChestEnabled Z + FIELD field_42219 generatorOptionsHolder Lnet/minecraft/class_7193; + FIELD field_42220 worldType Lnet/minecraft/class_8100$class_8101; + FIELD field_42221 normalWorldTypes Ljava/util/List; + FIELD field_42222 extendedWorldTypes Ljava/util/List; + FIELD field_42223 gameRules Lnet/minecraft/class_1928; + FIELD field_43104 NEW_WORLD_NAME Lnet/minecraft/class_2561; + FIELD field_43105 savesDirectory Ljava/nio/file/Path; + FIELD field_43106 worldDirectoryName Ljava/lang/String; + METHOD (Ljava/nio/file/Path;Lnet/minecraft/class_7193;Ljava/util/Optional;Ljava/util/OptionalLong;)V + ARG 1 savesDirectory + ARG 2 generatorOptionsHolder + ARG 3 defaultWorldType + ARG 4 seed + METHOD method_48695 update ()V + METHOD method_48696 setDifficulty (Lnet/minecraft/class_1267;)V + ARG 1 difficulty + METHOD method_48697 setGameRules (Lnet/minecraft/class_1928;)V + ARG 1 gameRules + METHOD method_48698 updateDataConfiguration (Lnet/minecraft/class_7712;)Z + ARG 1 dataConfiguration + METHOD method_48699 (Lnet/minecraft/class_5285;)Lnet/minecraft/class_5285; + ARG 1 options + METHOD method_48700 applyModifier (Lnet/minecraft/class_7193$class_7195;)V + ARG 1 modifier + METHOD method_48701 setGeneratorOptionsHolder (Lnet/minecraft/class_7193;)V + ARG 1 generatorOptionsHolder + METHOD method_48702 (Lnet/minecraft/class_7193;Lnet/minecraft/class_5321;)Ljava/util/Optional; + ARG 1 key2 + METHOD method_48703 getWorldPreset (Lnet/minecraft/class_7193;Ljava/util/Optional;)Ljava/util/Optional; + ARG 0 generatorOptionsHolder + ARG 1 key + METHOD method_48704 setGameMode (Lnet/minecraft/class_8100$class_4539;)V + ARG 1 gameMode + METHOD method_48705 setWorldType (Lnet/minecraft/class_8100$class_8101;)V + ARG 1 worldType + METHOD method_48706 (Lnet/minecraft/class_6880;Lnet/minecraft/class_5455$class_6890;Lnet/minecraft/class_7723;)Lnet/minecraft/class_7723; + ARG 1 registryManager + ARG 2 registryHolder + METHOD method_48707 (Lnet/minecraft/class_6885$class_6888;)Ljava/util/List; + ARG 0 entryList + METHOD method_48709 getWorldPresetList (Lnet/minecraft/class_2378;Lnet/minecraft/class_6862;)Ljava/util/Optional; + ARG 0 registry + ARG 1 tag + METHOD method_48710 setWorldName (Ljava/lang/String;)V + ARG 1 worldName + METHOD method_48711 (Ljava/util/List;)Z + ARG 0 worldTypeList + METHOD method_48712 addListener (Ljava/util/function/Consumer;)V + ARG 1 listener + METHOD method_48713 setCheatsEnabled (Z)V + ARG 1 cheatsEnabled + METHOD method_48714 (ZLnet/minecraft/class_5285;)Lnet/minecraft/class_5285; + ARG 1 options + METHOD method_48715 getWorldName ()Ljava/lang/String; + METHOD method_48716 setSeed (Ljava/lang/String;)V + ARG 1 seed + METHOD method_48717 setGenerateStructures (Z)V + ARG 1 generateStructures + METHOD method_48718 (ZLnet/minecraft/class_5285;)Lnet/minecraft/class_5285; + ARG 1 options + METHOD method_48720 setBonusChestEnabled (Z)V + ARG 1 bonusChestEnabled + METHOD method_48721 getGameMode ()Lnet/minecraft/class_8100$class_4539; + METHOD method_48722 getDifficulty ()Lnet/minecraft/class_1267; + METHOD method_48723 isHardcore ()Z + METHOD method_48724 areCheatsEnabled ()Z + METHOD method_48725 getSeed ()Ljava/lang/String; + METHOD method_48726 shouldGenerateStructures ()Z + METHOD method_48727 isBonusChestEnabled ()Z + METHOD method_48728 getGeneratorOptionsHolder ()Lnet/minecraft/class_7193; + METHOD method_48729 isDebug ()Z + METHOD method_48730 getWorldType ()Lnet/minecraft/class_8100$class_8101; + METHOD method_48731 getLevelScreenProvider ()Lnet/minecraft/class_5293; + METHOD method_48732 getNormalWorldTypes ()Ljava/util/List; + METHOD method_48733 getExtendedWorldTypes ()Ljava/util/List; + METHOD method_48734 getGameRules ()Lnet/minecraft/class_1928; + METHOD method_48735 updateWorldTypeLists ()V + METHOD method_49703 getWorldDirectoryName ()Ljava/lang/String; + METHOD method_49704 toDirectoryName (Ljava/lang/String;)Ljava/lang/String; + ARG 1 worldName + CLASS class_4539 Mode + FIELD field_20629 defaultGameMode Lnet/minecraft/class_1934; + FIELD field_42224 name Lnet/minecraft/class_2561; + FIELD field_42225 info Lnet/minecraft/class_2561; + METHOD (Ljava/lang/String;ILjava/lang/String;Lnet/minecraft/class_1934;)V + ARG 3 name + ARG 4 defaultGameMode + METHOD method_48736 getInfo ()Lnet/minecraft/class_2561; + CLASS class_8101 WorldType + FIELD field_42226 CUSTOM_GENERATOR_TEXT Lnet/minecraft/class_2561; + METHOD method_48737 getName ()Lnet/minecraft/class_2561; + METHOD method_48738 (Lnet/minecraft/class_5321;)Z + ARG 0 key + METHOD method_48739 isAmplified ()Z + METHOD method_48740 (Lnet/minecraft/class_5321;)Lnet/minecraft/class_2561; + ARG 0 key diff --git a/mappings/net/minecraft/client/gui/screen/world/WorldIcon.mapping b/mappings/net/minecraft/client/gui/screen/world/WorldIcon.mapping new file mode 100644 index 0000000000..b57aed6d95 --- /dev/null +++ b/mappings/net/minecraft/client/gui/screen/world/WorldIcon.mapping @@ -0,0 +1,22 @@ +CLASS net/minecraft/class_8573 net/minecraft/client/gui/screen/world/WorldIcon + FIELD field_44933 UNKNOWN_SERVER_ID Lnet/minecraft/class_2960; + FIELD field_44934 ICON_WIDTH I + FIELD field_44935 ICON_HEIGHT I + FIELD field_44936 textureManager Lnet/minecraft/class_1060; + FIELD field_44937 id Lnet/minecraft/class_2960; + FIELD field_44938 texture Lnet/minecraft/class_1043; + FIELD field_44939 closed Z + METHOD (Lnet/minecraft/class_1060;Lnet/minecraft/class_2960;)V + ARG 1 textureManager + ARG 2 id + METHOD method_52198 destroy ()V + METHOD method_52199 load (Lnet/minecraft/class_1011;)V + ARG 1 image + METHOD method_52200 forWorld (Lnet/minecraft/class_1060;Ljava/lang/String;)Lnet/minecraft/class_8573; + ARG 0 textureManager + ARG 1 worldName + METHOD method_52201 getTextureId ()Lnet/minecraft/class_2960; + METHOD method_52202 forServer (Lnet/minecraft/class_1060;Ljava/lang/String;)Lnet/minecraft/class_8573; + ARG 0 textureManager + ARG 1 serverAddress + METHOD method_52203 assertOpen ()V diff --git a/mappings/net/minecraft/client/gui/screen/world/WorldListWidget.mapping b/mappings/net/minecraft/client/gui/screen/world/WorldListWidget.mapping index 8c3ea1b182..548e68d1db 100644 --- a/mappings/net/minecraft/client/gui/screen/world/WorldListWidget.mapping +++ b/mappings/net/minecraft/client/gui/screen/world/WorldListWidget.mapping @@ -1,7 +1,6 @@ CLASS net/minecraft/class_528 net/minecraft/client/gui/screen/world/WorldListWidget FIELD field_19132 DATE_FORMAT Ljava/text/DateFormat; FIELD field_19133 UNKNOWN_SERVER_LOCATION Lnet/minecraft/class_2960; - FIELD field_19134 WORLD_SELECTION_LOCATION Lnet/minecraft/class_2960; FIELD field_26606 FROM_NEWER_VERSION_FIRST_LINE Lnet/minecraft/class_2561; FIELD field_26607 FROM_NEWER_VERSION_SECOND_LINE Lnet/minecraft/class_2561; FIELD field_26608 SNAPSHOT_FIRST_LINE Lnet/minecraft/class_2561; @@ -14,6 +13,15 @@ CLASS net/minecraft/class_528 net/minecraft/client/gui/screen/world/WorldListWid FIELD field_39738 search Ljava/lang/String; FIELD field_39739 levelsFuture Ljava/util/concurrent/CompletableFuture; FIELD field_39740 levels Ljava/util/List; + FIELD field_45569 EXPERIMENTAL_TEXT Lnet/minecraft/class_2561; + FIELD field_45570 ERROR_HIGHLIGHTED_TEXTURE Lnet/minecraft/class_2960; + FIELD field_45571 ERROR_TEXTURE Lnet/minecraft/class_2960; + FIELD field_45572 MARKED_JOIN_HIGHLIGHTED_TEXTURE Lnet/minecraft/class_2960; + FIELD field_45573 MARKED_JOIN_TEXTURE Lnet/minecraft/class_2960; + FIELD field_45574 WARNING_HIGHLIGHTED_TEXTURE Lnet/minecraft/class_2960; + FIELD field_45575 WARNING_TEXTURE Lnet/minecraft/class_2960; + FIELD field_45576 JOIN_HIGHLIGHTED_TEXTURE Lnet/minecraft/class_2960; + FIELD field_45577 JOIN_TEXTURE Lnet/minecraft/class_2960; METHOD (Lnet/minecraft/class_526;Lnet/minecraft/class_310;IIIIILjava/lang/String;Lnet/minecraft/class_528;)V ARG 1 parent ARG 2 client @@ -49,16 +57,15 @@ CLASS net/minecraft/class_528 net/minecraft/client/gui/screen/world/WorldListWid FIELD field_19136 client Lnet/minecraft/class_310; FIELD field_19137 screen Lnet/minecraft/class_526; FIELD field_19138 level Lnet/minecraft/class_34; - FIELD field_19139 iconLocation Lnet/minecraft/class_2960; FIELD field_19140 iconPath Ljava/nio/file/Path; - FIELD field_19141 icon Lnet/minecraft/class_1043; + FIELD field_19141 icon Lnet/minecraft/class_8573; FIELD field_19142 time J METHOD (Lnet/minecraft/class_528;Lnet/minecraft/class_528;Lnet/minecraft/class_34;)V ARG 2 levelList ARG 3 level METHOD method_20164 play ()V - METHOD method_20165 (Lnet/minecraft/class_6904;Ljava/nio/file/Path;Z)V - ARG 3 confirmed + METHOD method_20165 (Lnet/minecraft/class_1940;Lnet/minecraft/class_7193;Ljava/nio/file/Path;Z)V + ARG 4 confirmed METHOD method_20167 (ZZ)V ARG 1 backup ARG 2 eraseCache @@ -70,12 +77,13 @@ CLASS net/minecraft/class_528 net/minecraft/client/gui/screen/world/WorldListWid ARG 1 confirmed METHOD method_20173 recreate ()V METHOD method_20174 start ()V - METHOD method_20175 getIconTexture ()Lnet/minecraft/class_1043; METHOD method_27032 (Lnet/minecraft/class_32$class_5143;Ljava/lang/String;Z)V ARG 3 edited METHOD method_29990 openReadingWorldScreen ()V METHOD method_33685 delete ()V METHOD method_35740 getLevelDisplayName ()Ljava/lang/String; + METHOD method_52205 loadIcon ()V + METHOD method_52265 validateIconPath ()V CLASS class_7414 Entry METHOD method_43465 isAvailable ()Z CLASS class_7415 LoadingEntry diff --git a/mappings/net/minecraft/client/gui/screen/world/WorldScreenOptionGrid.mapping b/mappings/net/minecraft/client/gui/screen/world/WorldScreenOptionGrid.mapping new file mode 100644 index 0000000000..e9dcb06b0a --- /dev/null +++ b/mappings/net/minecraft/client/gui/screen/world/WorldScreenOptionGrid.mapping @@ -0,0 +1,75 @@ +CLASS net/minecraft/class_8096 net/minecraft/client/gui/screen/world/WorldScreenOptionGrid + FIELD field_42196 BUTTON_WIDTH I + FIELD field_42197 options Ljava/util/List; + METHOD (Ljava/util/List;)V + ARG 1 options + METHOD method_48683 refresh ()V + METHOD method_48684 builder (I)Lnet/minecraft/class_8096$class_8097; + ARG 0 width + CLASS class_8097 Builder + FIELD field_42198 width I + FIELD field_42199 options Ljava/util/List; + FIELD field_42200 marginLeft I + FIELD field_42509 rowSpacing I + FIELD field_42510 rows I + FIELD field_42511 tooltipBoxDisplay Ljava/util/Optional; + METHOD (I)V + ARG 1 width + METHOD method_48685 marginLeft (I)Lnet/minecraft/class_8096$class_8097; + ARG 1 marginLeft + METHOD method_48686 build (Ljava/util/function/Consumer;)Lnet/minecraft/class_8096; + ARG 1 widgetConsumer + METHOD method_48687 add (Lnet/minecraft/class_2561;Ljava/util/function/BooleanSupplier;Ljava/util/function/Consumer;)Lnet/minecraft/class_8096$class_8099; + ARG 1 text + ARG 2 getter + ARG 3 setter + METHOD method_49025 incrementRows ()V + METHOD method_49026 withTooltipBox (IZ)Lnet/minecraft/class_8096$class_8097; + ARG 1 maxInfoRows + ARG 2 alwaysMaxHeight + METHOD method_49027 setRowSpacing (I)Lnet/minecraft/class_8096$class_8097; + ARG 1 rowSpacing + CLASS class_8098 Option + FIELD comp_1261 button Lnet/minecraft/class_5676; + FIELD comp_1262 getter Ljava/util/function/BooleanSupplier; + FIELD comp_1263 toggleable Ljava/util/function/BooleanSupplier; + METHOD (Lnet/minecraft/class_5676;Ljava/util/function/BooleanSupplier;Ljava/util/function/BooleanSupplier;)V + ARG 1 button + ARG 2 getter + ARG 3 toggleable + METHOD comp_1261 button ()Lnet/minecraft/class_5676; + METHOD comp_1262 getter ()Ljava/util/function/BooleanSupplier; + METHOD comp_1263 toggleable ()Ljava/util/function/BooleanSupplier; + METHOD method_48688 refresh ()V + CLASS class_8099 OptionBuilder + FIELD field_42204 text Lnet/minecraft/class_2561; + FIELD field_42205 getter Ljava/util/function/BooleanSupplier; + FIELD field_42206 setter Ljava/util/function/Consumer; + FIELD field_42207 tooltip Lnet/minecraft/class_2561; + FIELD field_42208 toggleable Ljava/util/function/BooleanSupplier; + FIELD field_42209 buttonWidth I + METHOD (Lnet/minecraft/class_2561;Ljava/util/function/BooleanSupplier;Ljava/util/function/Consumer;I)V + ARG 1 text + ARG 2 getter + ARG 3 setter + ARG 4 buttonWidth + METHOD method_48690 (Lnet/minecraft/class_5676;Ljava/lang/Boolean;)V + ARG 1 button + ARG 2 value + METHOD method_48691 build (Lnet/minecraft/class_8096$class_8097;Lnet/minecraft/class_7845;I)Lnet/minecraft/class_8096$class_8098; + ARG 1 gridBuilder + ARG 2 gridWidget + ARG 3 row + METHOD method_48693 toggleable (Ljava/util/function/BooleanSupplier;)Lnet/minecraft/class_8096$class_8099; + ARG 1 toggleable + METHOD method_48694 tooltip (Lnet/minecraft/class_2561;)Lnet/minecraft/class_8096$class_8099; + ARG 1 tooltip + METHOD method_49028 (Lnet/minecraft/class_5676;)Lnet/minecraft/class_5250; + ARG 1 button + METHOD method_49029 (Lnet/minecraft/class_7919;Ljava/lang/Boolean;)Lnet/minecraft/class_7919; + ARG 1 value + METHOD method_49030 (Lnet/minecraft/class_8096$class_8097;Lnet/minecraft/class_7845;ILnet/minecraft/class_8096$class_8135;)V + ARG 4 tooltipBoxDisplay + METHOD method_49031 (Lnet/minecraft/class_5676;)Lnet/minecraft/class_5250; + ARG 1 button + CLASS class_8135 TooltipBoxDisplay diff --git a/mappings/net/minecraft/client/gui/tab/GridScreenTab.mapping b/mappings/net/minecraft/client/gui/tab/GridScreenTab.mapping new file mode 100644 index 0000000000..194b613c5a --- /dev/null +++ b/mappings/net/minecraft/client/gui/tab/GridScreenTab.mapping @@ -0,0 +1,5 @@ +CLASS net/minecraft/class_8086 net/minecraft/client/gui/tab/GridScreenTab + FIELD field_42139 grid Lnet/minecraft/class_7845; + FIELD field_42140 title Lnet/minecraft/class_2561; + METHOD (Lnet/minecraft/class_2561;)V + ARG 1 title diff --git a/mappings/net/minecraft/client/gui/tab/Tab.mapping b/mappings/net/minecraft/client/gui/tab/Tab.mapping new file mode 100644 index 0000000000..6f99ceb3f0 --- /dev/null +++ b/mappings/net/minecraft/client/gui/tab/Tab.mapping @@ -0,0 +1,6 @@ +CLASS net/minecraft/class_8087 net/minecraft/client/gui/tab/Tab + METHOD method_48610 getTitle ()Lnet/minecraft/class_2561; + METHOD method_48611 refreshGrid (Lnet/minecraft/class_8030;)V + ARG 1 tabArea + METHOD method_48612 forEachChild (Ljava/util/function/Consumer;)V + ARG 1 consumer diff --git a/mappings/net/minecraft/client/gui/tab/TabManager.mapping b/mappings/net/minecraft/client/gui/tab/TabManager.mapping new file mode 100644 index 0000000000..d4726b2dbd --- /dev/null +++ b/mappings/net/minecraft/client/gui/tab/TabManager.mapping @@ -0,0 +1,14 @@ +CLASS net/minecraft/class_8088 net/minecraft/client/gui/tab/TabManager + FIELD field_42141 tabLoadConsumer Ljava/util/function/Consumer; + FIELD field_42142 tabUnloadConsumer Ljava/util/function/Consumer; + FIELD field_42143 currentTab Lnet/minecraft/class_8087; + FIELD field_42144 tabArea Lnet/minecraft/class_8030; + METHOD (Ljava/util/function/Consumer;Ljava/util/function/Consumer;)V + ARG 1 tabLoadConsumer + ARG 2 tabUnloadConsumer + METHOD method_48614 getCurrentTab ()Lnet/minecraft/class_8087; + METHOD method_48615 setCurrentTab (Lnet/minecraft/class_8087;Z)V + ARG 1 tab + ARG 2 clickSound + METHOD method_48616 setTabArea (Lnet/minecraft/class_8030;)V + ARG 1 tabArea diff --git a/mappings/net/minecraft/client/gui/tooltip/BundleTooltipComponent.mapping b/mappings/net/minecraft/client/gui/tooltip/BundleTooltipComponent.mapping index 0c5c7bcbaa..48a6e60488 100644 --- a/mappings/net/minecraft/client/gui/tooltip/BundleTooltipComponent.mapping +++ b/mappings/net/minecraft/client/gui/tooltip/BundleTooltipComponent.mapping @@ -1,40 +1,32 @@ CLASS net/minecraft/class_5682 net/minecraft/client/gui/tooltip/BundleTooltipComponent FIELD field_27995 inventory Lnet/minecraft/class_2371; - FIELD field_28359 TEXTURE Lnet/minecraft/class_2960; FIELD field_28360 occupancy I + FIELD field_32384 WIDTH_PER_COLUMN I + FIELD field_32385 HEIGHT_PER_ROW I + FIELD field_45506 BACKGROUND_TEXTURE Lnet/minecraft/class_2960; METHOD (Lnet/minecraft/class_5631;)V ARG 1 data - METHOD method_33286 drawOutline (IIIILnet/minecraft/class_4587;I)V - ARG 1 x - ARG 2 y - ARG 3 columns - ARG 4 rows - ARG 5 matrices - ARG 6 z - METHOD method_33287 drawSlot (IIIZLnet/minecraft/class_327;Lnet/minecraft/class_4587;Lnet/minecraft/class_918;I)V + METHOD method_33287 drawSlot (IIIZLnet/minecraft/class_332;Lnet/minecraft/class_327;)V ARG 1 x ARG 2 y ARG 3 index ARG 4 shouldBlock - ARG 5 textRenderer - ARG 6 matrices - ARG 7 itemRenderer - ARG 8 z - METHOD method_33288 draw (Lnet/minecraft/class_4587;IIILnet/minecraft/class_5682$class_5771;)V - ARG 1 matrices + ARG 5 context + ARG 6 textRenderer + METHOD method_33288 draw (Lnet/minecraft/class_332;IILnet/minecraft/class_5682$class_5771;)V + ARG 1 context ARG 2 x ARG 3 y - ARG 4 z - ARG 5 sprite + ARG 4 sprite METHOD method_33289 getColumns ()I METHOD method_33290 getRows ()I + METHOD method_52755 getColumnsWidth ()I + METHOD method_52756 getRowsHeight ()I CLASS class_5771 Sprite - FIELD field_28368 u I - FIELD field_28369 v I FIELD field_28370 width I FIELD field_28371 height I - METHOD (Ljava/lang/String;IIIII)V - ARG 3 u - ARG 4 v - ARG 5 width - ARG 6 height + FIELD field_45507 texture Lnet/minecraft/class_2960; + METHOD (Ljava/lang/String;ILnet/minecraft/class_2960;II)V + ARG 3 texture + ARG 4 width + ARG 5 height diff --git a/mappings/net/minecraft/client/gui/tooltip/FocusedTooltipPositioner.mapping b/mappings/net/minecraft/client/gui/tooltip/FocusedTooltipPositioner.mapping new file mode 100644 index 0000000000..aea128a0b6 --- /dev/null +++ b/mappings/net/minecraft/client/gui/tooltip/FocusedTooltipPositioner.mapping @@ -0,0 +1,4 @@ +CLASS net/minecraft/class_7999 net/minecraft/client/gui/tooltip/FocusedTooltipPositioner + FIELD field_41686 widget Lnet/minecraft/class_339; + METHOD (Lnet/minecraft/class_339;)V + ARG 1 widget diff --git a/mappings/net/minecraft/client/gui/tooltip/HoveredTooltipPositioner.mapping b/mappings/net/minecraft/client/gui/tooltip/HoveredTooltipPositioner.mapping new file mode 100644 index 0000000000..9b82cb5d5b --- /dev/null +++ b/mappings/net/minecraft/client/gui/tooltip/HoveredTooltipPositioner.mapping @@ -0,0 +1,8 @@ +CLASS net/minecraft/class_8001 net/minecraft/client/gui/tooltip/HoveredTooltipPositioner + FIELD field_41687 INSTANCE Lnet/minecraft/class_8000; + METHOD method_47945 preventOverflow (IILorg/joml/Vector2i;II)V + ARG 1 screenWidth + ARG 2 screenHeight + ARG 3 pos + ARG 4 width + ARG 5 height diff --git a/mappings/net/minecraft/client/gui/tooltip/Tooltip.mapping b/mappings/net/minecraft/client/gui/tooltip/Tooltip.mapping new file mode 100644 index 0000000000..c88af69894 --- /dev/null +++ b/mappings/net/minecraft/client/gui/tooltip/Tooltip.mapping @@ -0,0 +1,18 @@ +CLASS net/minecraft/class_7919 net/minecraft/client/gui/tooltip/Tooltip + FIELD field_41101 ROW_LENGTH I + FIELD field_41102 content Lnet/minecraft/class_2561; + FIELD field_41103 lines Ljava/util/List; + FIELD field_41104 narration Lnet/minecraft/class_2561; + METHOD (Lnet/minecraft/class_2561;Lnet/minecraft/class_2561;)V + ARG 1 content + ARG 2 narration + METHOD method_47405 getLines (Lnet/minecraft/class_310;)Ljava/util/List; + ARG 1 client + METHOD method_47406 wrapLines (Lnet/minecraft/class_310;Lnet/minecraft/class_2561;)Ljava/util/List; + ARG 0 client + ARG 1 text + METHOD method_47407 of (Lnet/minecraft/class_2561;)Lnet/minecraft/class_7919; + ARG 0 content + METHOD method_47408 of (Lnet/minecraft/class_2561;Lnet/minecraft/class_2561;)Lnet/minecraft/class_7919; + ARG 0 content + ARG 1 narration diff --git a/mappings/net/minecraft/client/gui/tooltip/TooltipBackgroundRenderer.mapping b/mappings/net/minecraft/client/gui/tooltip/TooltipBackgroundRenderer.mapping new file mode 100644 index 0000000000..2133fb6bb7 --- /dev/null +++ b/mappings/net/minecraft/client/gui/tooltip/TooltipBackgroundRenderer.mapping @@ -0,0 +1,51 @@ +CLASS net/minecraft/class_8002 net/minecraft/client/gui/tooltip/TooltipBackgroundRenderer + COMMENT A class for rendering a background box for a tooltip. + FIELD field_41694 BACKGROUND_COLOR I + FIELD field_41695 START_Y_BORDER_COLOR I + FIELD field_41696 END_Y_BORDER_COLOR I + METHOD method_47946 render (Lnet/minecraft/class_332;IIIII)V + ARG 0 context + ARG 1 x + ARG 2 y + ARG 3 width + ARG 4 height + ARG 5 z + METHOD method_47947 renderVerticalLine (Lnet/minecraft/class_332;IIIIII)V + ARG 0 context + ARG 1 x + ARG 2 y + ARG 3 height + ARG 4 z + ARG 5 startColor + ARG 6 endColor + METHOD method_47948 renderBorder (Lnet/minecraft/class_332;IIIIIII)V + ARG 0 context + ARG 1 x + ARG 2 y + ARG 3 width + ARG 4 height + ARG 5 z + ARG 6 startColor + ARG 7 endColor + METHOD method_47949 renderVerticalLine (Lnet/minecraft/class_332;IIIII)V + ARG 0 context + ARG 1 x + ARG 2 y + ARG 3 height + ARG 4 z + ARG 5 color + METHOD method_47950 renderRectangle (Lnet/minecraft/class_332;IIIIII)V + ARG 0 context + ARG 1 x + ARG 2 y + ARG 3 width + ARG 4 height + ARG 5 z + ARG 6 color + METHOD method_47951 renderHorizontalLine (Lnet/minecraft/class_332;IIIII)V + ARG 0 context + ARG 1 x + ARG 2 y + ARG 3 width + ARG 4 z + ARG 5 color diff --git a/mappings/net/minecraft/client/gui/tooltip/TooltipComponent.mapping b/mappings/net/minecraft/client/gui/tooltip/TooltipComponent.mapping index 30c04ae7df..af3e9e4c9c 100644 --- a/mappings/net/minecraft/client/gui/tooltip/TooltipComponent.mapping +++ b/mappings/net/minecraft/client/gui/tooltip/TooltipComponent.mapping @@ -6,16 +6,14 @@ CLASS net/minecraft/class_5684 net/minecraft/client/gui/tooltip/TooltipComponent ARG 0 data METHOD method_32664 getWidth (Lnet/minecraft/class_327;)I ARG 1 textRenderer - METHOD method_32665 drawText (Lnet/minecraft/class_327;IILnet/minecraft/class_1159;Lnet/minecraft/class_4597$class_4598;)V + METHOD method_32665 drawText (Lnet/minecraft/class_327;IILorg/joml/Matrix4f;Lnet/minecraft/class_4597$class_4598;)V ARG 1 textRenderer ARG 2 x ARG 3 y ARG 4 matrix ARG 5 vertexConsumers - METHOD method_32666 drawItems (Lnet/minecraft/class_327;IILnet/minecraft/class_4587;Lnet/minecraft/class_918;I)V + METHOD method_32666 drawItems (Lnet/minecraft/class_327;IILnet/minecraft/class_332;)V ARG 1 textRenderer ARG 2 x ARG 3 y - ARG 4 matrices - ARG 5 itemRenderer - ARG 6 z + ARG 4 context diff --git a/mappings/net/minecraft/client/gui/tooltip/TooltipPositioner.mapping b/mappings/net/minecraft/client/gui/tooltip/TooltipPositioner.mapping new file mode 100644 index 0000000000..6216f72488 --- /dev/null +++ b/mappings/net/minecraft/client/gui/tooltip/TooltipPositioner.mapping @@ -0,0 +1,8 @@ +CLASS net/minecraft/class_8000 net/minecraft/client/gui/tooltip/TooltipPositioner + METHOD method_47944 getPosition (IIIIII)Lorg/joml/Vector2ic; + ARG 1 screenWidth + ARG 2 screenHeight + ARG 3 x + ARG 4 y + ARG 5 width + ARG 6 height diff --git a/mappings/net/minecraft/client/gui/tooltip/WidgetTooltipPositioner.mapping b/mappings/net/minecraft/client/gui/tooltip/WidgetTooltipPositioner.mapping new file mode 100644 index 0000000000..7fff138f47 --- /dev/null +++ b/mappings/net/minecraft/client/gui/tooltip/WidgetTooltipPositioner.mapping @@ -0,0 +1,8 @@ +CLASS net/minecraft/class_8092 net/minecraft/client/gui/tooltip/WidgetTooltipPositioner + FIELD field_42161 widget Lnet/minecraft/class_339; + METHOD (Lnet/minecraft/class_339;)V + ARG 1 widget + METHOD method_48642 getOffsetY (III)I + ARG 0 tooltipY + ARG 1 widgetY + ARG 2 widgetHeight diff --git a/mappings/net/minecraft/client/gui/widget/AbstractTextWidget.mapping b/mappings/net/minecraft/client/gui/widget/AbstractTextWidget.mapping new file mode 100644 index 0000000000..e1c3b49fcd --- /dev/null +++ b/mappings/net/minecraft/client/gui/widget/AbstractTextWidget.mapping @@ -0,0 +1,14 @@ +CLASS net/minecraft/class_8130 net/minecraft/client/gui/widget/AbstractTextWidget + FIELD field_42483 textRenderer Lnet/minecraft/class_327; + FIELD field_42484 textColor I + METHOD (IIIILnet/minecraft/class_2561;Lnet/minecraft/class_327;)V + ARG 1 x + ARG 2 y + ARG 3 width + ARG 4 height + ARG 5 message + ARG 6 textRenderer + METHOD method_48977 getTextRenderer ()Lnet/minecraft/class_327; + METHOD method_48978 setTextColor (I)Lnet/minecraft/class_8130; + ARG 1 textColor + METHOD method_48979 getTextColor ()I diff --git a/mappings/net/minecraft/client/gui/widget/AlwaysSelectedEntryListWidget.mapping b/mappings/net/minecraft/client/gui/widget/AlwaysSelectedEntryListWidget.mapping index 4beb2cc071..5d039f2027 100644 --- a/mappings/net/minecraft/client/gui/widget/AlwaysSelectedEntryListWidget.mapping +++ b/mappings/net/minecraft/client/gui/widget/AlwaysSelectedEntryListWidget.mapping @@ -1,5 +1,4 @@ CLASS net/minecraft/class_4280 net/minecraft/client/gui/widget/AlwaysSelectedEntryListWidget - FIELD field_22768 inFocus Z FIELD field_33783 SELECTION_USAGE_TEXT Lnet/minecraft/class_2561; CLASS class_4281 Entry METHOD method_37006 getNarration ()Lnet/minecraft/class_2561; diff --git a/mappings/net/minecraft/client/gui/widget/AxisGridWidget.mapping b/mappings/net/minecraft/client/gui/widget/AxisGridWidget.mapping new file mode 100644 index 0000000000..5b5b658fd0 --- /dev/null +++ b/mappings/net/minecraft/client/gui/widget/AxisGridWidget.mapping @@ -0,0 +1,47 @@ +CLASS net/minecraft/class_7849 net/minecraft/client/gui/widget/AxisGridWidget + FIELD field_40784 axis Lnet/minecraft/class_7849$class_7851; + FIELD field_40785 elements Ljava/util/List; + FIELD field_40787 mainPositioner Lnet/minecraft/class_7847; + METHOD (IIIILnet/minecraft/class_7849$class_7851;)V + ARG 1 x + ARG 2 y + ARG 3 width + ARG 4 height + ARG 5 axis + METHOD (IILnet/minecraft/class_7849$class_7851;)V + ARG 1 width + ARG 2 height + ARG 3 axis + METHOD method_46495 add (Lnet/minecraft/class_8021;)Lnet/minecraft/class_8021; + ARG 1 widget + METHOD method_46496 add (Lnet/minecraft/class_8021;Lnet/minecraft/class_7847;)Lnet/minecraft/class_8021; + ARG 1 widget + ARG 2 positioner + METHOD method_46499 copyPositioner ()Lnet/minecraft/class_7847; + METHOD method_46500 getMainPositioner ()Lnet/minecraft/class_7847; + METHOD method_48230 (Ljava/util/function/Consumer;Lnet/minecraft/class_7849$class_7850;)V + ARG 1 element + METHOD method_52731 add (Lnet/minecraft/class_8021;Ljava/util/function/Consumer;)Lnet/minecraft/class_8021; + ARG 1 widget + ARG 2 callback + CLASS class_7850 Element + CLASS class_7851 DisplayAxis + METHOD method_46502 getSameAxisLength (Lnet/minecraft/class_8021;)I + ARG 1 widget + METHOD method_46504 getSameAxisLength (Lnet/minecraft/class_7849$class_7850;)I + ARG 1 element + METHOD method_46505 setSameAxisCoordinate (Lnet/minecraft/class_7849$class_7850;I)V + ARG 1 element + ARG 2 low + METHOD method_46506 setOtherAxisCoordinate (Lnet/minecraft/class_7849$class_7850;II)V + ARG 1 element + ARG 2 low + ARG 3 high + METHOD method_46507 getOtherAxisLength (Lnet/minecraft/class_8021;)I + ARG 1 widget + METHOD method_46508 getOtherAxisLength (Lnet/minecraft/class_7849$class_7850;)I + ARG 1 element + METHOD method_46509 getSameAxisCoordinate (Lnet/minecraft/class_8021;)I + ARG 1 widget + METHOD method_46510 getOtherAxisCoordinate (Lnet/minecraft/class_8021;)I + ARG 1 widget diff --git a/mappings/net/minecraft/client/gui/widget/ButtonWidget.mapping b/mappings/net/minecraft/client/gui/widget/ButtonWidget.mapping index 01057309b1..edc706a19d 100644 --- a/mappings/net/minecraft/client/gui/widget/ButtonWidget.mapping +++ b/mappings/net/minecraft/client/gui/widget/ButtonWidget.mapping @@ -1,37 +1,56 @@ CLASS net/minecraft/class_4185 net/minecraft/client/gui/widget/ButtonWidget FIELD field_22767 onPress Lnet/minecraft/class_4185$class_4241; - FIELD field_25035 EMPTY Lnet/minecraft/class_4185$class_5316; - FIELD field_25036 tooltipSupplier Lnet/minecraft/class_4185$class_5316; - METHOD (IIIILnet/minecraft/class_2561;Lnet/minecraft/class_4185$class_4241;)V + FIELD field_39499 DEFAULT_WIDTH_SMALL I + FIELD field_39500 DEFAULT_WIDTH I + FIELD field_39501 DEFAULT_HEIGHT I + FIELD field_40754 DEFAULT_NARRATION_SUPPLIER Lnet/minecraft/class_4185$class_7841; + FIELD field_40755 narrationSupplier Lnet/minecraft/class_4185$class_7841; + METHOD (IIIILnet/minecraft/class_2561;Lnet/minecraft/class_4185$class_4241;Lnet/minecraft/class_4185$class_7841;)V ARG 1 x ARG 2 y ARG 3 width ARG 4 height ARG 5 message ARG 6 onPress - METHOD (IIIILnet/minecraft/class_2561;Lnet/minecraft/class_4185$class_4241;Lnet/minecraft/class_4185$class_5316;)V - ARG 1 x - ARG 2 y - ARG 3 width - ARG 4 height - ARG 5 message - ARG 6 onPress - ARG 7 tooltipSupplier - METHOD method_29045 (Lnet/minecraft/class_4185;Lnet/minecraft/class_4587;II)V - ARG 0 button - ARG 1 matrices - ARG 2 mouseX - ARG 3 mouseY - METHOD method_37022 (Lnet/minecraft/class_6382;Lnet/minecraft/class_2561;)V - ARG 1 text + ARG 7 narrationSupplier + METHOD method_46429 (Ljava/util/function/Supplier;)Lnet/minecraft/class_5250; + ARG 0 textSupplier + METHOD method_46430 builder (Lnet/minecraft/class_2561;Lnet/minecraft/class_4185$class_4241;)Lnet/minecraft/class_4185$class_7840; + ARG 0 message + ARG 1 onPress CLASS class_4241 PressAction METHOD onPress (Lnet/minecraft/class_4185;)V ARG 1 button - CLASS class_5316 TooltipSupplier - METHOD method_37023 supply (Ljava/util/function/Consumer;)V - ARG 1 consumer - METHOD onTooltip (Lnet/minecraft/class_4185;Lnet/minecraft/class_4587;II)V - ARG 1 button - ARG 2 matrices - ARG 3 mouseX - ARG 4 mouseY + CLASS class_7840 Builder + FIELD field_40756 message Lnet/minecraft/class_2561; + FIELD field_40757 onPress Lnet/minecraft/class_4185$class_4241; + FIELD field_40759 x I + FIELD field_40760 y I + FIELD field_40761 width I + FIELD field_40762 height I + FIELD field_40763 narrationSupplier Lnet/minecraft/class_4185$class_7841; + FIELD field_41099 tooltip Lnet/minecraft/class_7919; + METHOD (Lnet/minecraft/class_2561;Lnet/minecraft/class_4185$class_4241;)V + ARG 1 message + ARG 2 onPress + METHOD method_46431 build ()Lnet/minecraft/class_4185; + METHOD method_46432 width (I)Lnet/minecraft/class_4185$class_7840; + ARG 1 width + METHOD method_46433 position (II)Lnet/minecraft/class_4185$class_7840; + ARG 1 x + ARG 2 y + METHOD method_46434 dimensions (IIII)Lnet/minecraft/class_4185$class_7840; + ARG 1 x + ARG 2 y + ARG 3 width + ARG 4 height + METHOD method_46435 narrationSupplier (Lnet/minecraft/class_4185$class_7841;)Lnet/minecraft/class_4185$class_7840; + ARG 1 narrationSupplier + METHOD method_46436 tooltip (Lnet/minecraft/class_7919;)Lnet/minecraft/class_4185$class_7840; + ARG 1 tooltip + METHOD method_46437 size (II)Lnet/minecraft/class_4185$class_7840; + ARG 1 width + ARG 2 height + CLASS class_7841 NarrationSupplier + METHOD createNarrationMessage (Ljava/util/function/Supplier;)Lnet/minecraft/class_5250; + ARG 1 textSupplier diff --git a/mappings/net/minecraft/client/gui/widget/CheckboxWidget.mapping b/mappings/net/minecraft/client/gui/widget/CheckboxWidget.mapping index 1e7e8b644c..0880fd1fb1 100644 --- a/mappings/net/minecraft/client/gui/widget/CheckboxWidget.mapping +++ b/mappings/net/minecraft/client/gui/widget/CheckboxWidget.mapping @@ -1,8 +1,11 @@ CLASS net/minecraft/class_4286 net/minecraft/client/gui/widget/CheckboxWidget FIELD field_19230 checked Z - FIELD field_19231 TEXTURE Lnet/minecraft/class_2960; FIELD field_24253 showMessage Z FIELD field_32181 TEXT_COLOR I + FIELD field_45348 SELECTED_HIGHLIGHTED_TEXTURE Lnet/minecraft/class_2960; + FIELD field_45349 SELECTED_TEXTURE Lnet/minecraft/class_2960; + FIELD field_45350 HIGHLIGHTED_TEXTURE Lnet/minecraft/class_2960; + FIELD field_45351 TEXTURE Lnet/minecraft/class_2960; METHOD (IIIILnet/minecraft/class_2561;Z)V ARG 1 x ARG 2 y diff --git a/mappings/net/minecraft/client/gui/widget/ClickableWidget.mapping b/mappings/net/minecraft/client/gui/widget/ClickableWidget.mapping index c3cc3cdd0f..1c305adf2d 100644 --- a/mappings/net/minecraft/client/gui/widget/ClickableWidget.mapping +++ b/mappings/net/minecraft/client/gui/widget/ClickableWidget.mapping @@ -4,7 +4,6 @@ CLASS net/minecraft/class_339 net/minecraft/client/gui/widget/ClickableWidget COMMENT and narrated when the widget is selected. FIELD field_22754 message Lnet/minecraft/class_2561; FIELD field_22756 focused Z - FIELD field_22757 WIDGETS_TEXTURE Lnet/minecraft/class_2960; FIELD field_22758 width I FIELD field_22759 height I FIELD field_22760 x I @@ -13,6 +12,11 @@ CLASS net/minecraft/class_339 net/minecraft/client/gui/widget/ClickableWidget FIELD field_22763 active Z FIELD field_22764 visible Z FIELD field_22765 alpha F + FIELD field_41095 tooltip Lnet/minecraft/class_7919; + FIELD field_41096 tooltipDelay I + FIELD field_41097 lastHoveredTime J + FIELD field_41098 wasHovered Z + FIELD field_42116 navigationOrder I METHOD (IIIILnet/minecraft/class_2561;)V ARG 1 x ARG 2 y @@ -31,45 +35,71 @@ CLASS net/minecraft/class_339 net/minecraft/client/gui/widget/ClickableWidget ARG 1 alpha METHOD method_25351 isValidClickButton (I)Z ARG 1 button - METHOD method_25352 renderTooltip (Lnet/minecraft/class_4587;II)V - ARG 1 matrices - ARG 2 mouseX - ARG 3 mouseY - METHOD method_25353 renderBackground (Lnet/minecraft/class_4587;Lnet/minecraft/class_310;II)V - ARG 1 matrices - ARG 2 client - ARG 3 mouseX - ARG 4 mouseY METHOD method_25354 playDownSound (Lnet/minecraft/class_1144;)V ARG 1 soundManager METHOD method_25355 setMessage (Lnet/minecraft/class_2561;)V ARG 1 message - METHOD method_25356 getYImage (Z)I - ARG 1 hovered METHOD method_25357 onRelease (DD)V ARG 1 mouseX ARG 3 mouseY METHOD method_25358 setWidth (I)V ARG 1 width - METHOD method_25359 renderButton (Lnet/minecraft/class_4587;IIF)V - ARG 1 matrices - ARG 2 mouseX - ARG 3 mouseY - ARG 4 delta METHOD method_25360 getNarrationMessage ()Lnet/minecraft/class_5250; METHOD method_25361 clicked (DD)Z ARG 1 mouseX ARG 3 mouseY - METHOD method_25363 onFocusedChanged (Z)V - ARG 1 newFocused - METHOD method_25364 getHeight ()I - METHOD method_25365 setFocused (Z)V + METHOD method_25365 (Z)V ARG 1 focused - METHOD method_25367 isHovered ()Z - METHOD method_25368 getWidth ()I + METHOD method_25367 isSelected ()Z METHOD method_25369 getMessage ()Lnet/minecraft/class_2561; - METHOD method_25370 isFocused ()Z METHOD method_32602 getNarrationMessage (Lnet/minecraft/class_2561;)Lnet/minecraft/class_5250; ARG 0 message METHOD method_37021 appendDefaultNarrations (Lnet/minecraft/class_6382;)V ARG 1 builder + METHOD method_46419 (I)V + ARG 1 y + METHOD method_46421 (I)V + ARG 1 x + METHOD method_47399 appendClickableNarrations (Lnet/minecraft/class_6382;)V + ARG 1 builder + METHOD method_47400 setTooltip (Lnet/minecraft/class_7919;)V + ARG 1 tooltip + METHOD method_47401 applyTooltip ()V + METHOD method_47402 setTooltipDelay (I)V + ARG 1 delay + METHOD method_47937 getTooltipPositioner ()Lnet/minecraft/class_8000; + METHOD method_48579 renderButton (Lnet/minecraft/class_332;IIF)V + ARG 1 context + ARG 2 mouseX + ARG 3 mouseY + ARG 4 delta + METHOD method_48591 setNavigationOrder (I)V + ARG 1 navigationOrder + METHOD method_49604 drawScrollableText (Lnet/minecraft/class_332;Lnet/minecraft/class_327;II)V + ARG 1 context + ARG 2 textRenderer + ARG 3 xMargin + ARG 4 color + METHOD method_49605 drawScrollableText (Lnet/minecraft/class_332;Lnet/minecraft/class_327;Lnet/minecraft/class_2561;IIIIII)V + ARG 0 context + ARG 1 textRenderer + ARG 2 text + ARG 3 centerX + ARG 4 startX + ARG 5 startY + ARG 6 endX + ARG 7 endY + ARG 8 color + METHOD method_49606 isHovered ()Z + METHOD method_51254 getTooltip ()Lnet/minecraft/class_7919; + METHOD method_52718 drawScrollableText (Lnet/minecraft/class_332;Lnet/minecraft/class_327;Lnet/minecraft/class_2561;IIIII)V + ARG 0 context + ARG 1 textRenderer + ARG 2 text + ARG 3 startX + ARG 4 startY + ARG 5 endX + ARG 6 endY + ARG 7 color + METHOD method_53533 setHeight (I)V + ARG 1 height diff --git a/mappings/net/minecraft/client/gui/widget/CyclingButtonWidget.mapping b/mappings/net/minecraft/client/gui/widget/CyclingButtonWidget.mapping index 166fd4e4f8..10e39c32c5 100644 --- a/mappings/net/minecraft/client/gui/widget/CyclingButtonWidget.mapping +++ b/mappings/net/minecraft/client/gui/widget/CyclingButtonWidget.mapping @@ -71,6 +71,7 @@ CLASS net/minecraft/class_5676 net/minecraft/client/gui/widget/CyclingButtonWidg ARG 1 value METHOD method_37027 getValue (I)Ljava/lang/Object; ARG 1 offset + METHOD method_47403 refreshTooltip ()V CLASS class_5677 Builder COMMENT A builder to easily create cycling button widgets. COMMENT @@ -150,7 +151,7 @@ CLASS net/minecraft/class_5676 net/minecraft/client/gui/widget/CyclingButtonWidg METHOD method_32624 values ([Ljava/lang/Object;)Lnet/minecraft/class_5676$class_5677; COMMENT Sets the option values for this button. ARG 1 values - METHOD method_32625 (Ljava/lang/Object;)Ljava/util/List; + METHOD method_32625 (Ljava/lang/Object;)Lnet/minecraft/class_7919; ARG 0 value METHOD method_35723 build (IIIILnet/minecraft/class_2561;)Lnet/minecraft/class_5676; ARG 1 x diff --git a/mappings/net/minecraft/client/gui/widget/DirectionalLayoutWidget.mapping b/mappings/net/minecraft/client/gui/widget/DirectionalLayoutWidget.mapping new file mode 100644 index 0000000000..3e98a23910 --- /dev/null +++ b/mappings/net/minecraft/client/gui/widget/DirectionalLayoutWidget.mapping @@ -0,0 +1,39 @@ +CLASS net/minecraft/class_8667 net/minecraft/client/gui/widget/DirectionalLayoutWidget + COMMENT A widget implementing one-directional layout. The elements can be + COMMENT positioned either horizontally or vertically. + COMMENT + COMMENT

Use {@link AxisGridWidget} to allow multiple elements per row or column. + COMMENT + COMMENT @see AxisGridWidget + FIELD field_45400 grid Lnet/minecraft/class_7845; + FIELD field_45401 axis Lnet/minecraft/class_8667$class_8668; + FIELD field_45402 currentIndex I + METHOD (IILnet/minecraft/class_8667$class_8668;)V + ARG 1 x + ARG 2 y + ARG 3 axis + METHOD (Lnet/minecraft/class_8667$class_8668;)V + ARG 1 axis + METHOD method_52735 spacing (I)Lnet/minecraft/class_8667; + ARG 1 spacing + METHOD method_52736 add (Lnet/minecraft/class_8021;)Lnet/minecraft/class_8021; + ARG 1 widget + METHOD method_52737 add (Lnet/minecraft/class_8021;Lnet/minecraft/class_7847;)Lnet/minecraft/class_8021; + ARG 1 widget + ARG 2 positioner + METHOD method_52738 add (Lnet/minecraft/class_8021;Ljava/util/function/Consumer;)Lnet/minecraft/class_8021; + ARG 1 widget + ARG 2 callback + METHOD method_52739 copyPositioner ()Lnet/minecraft/class_7847; + METHOD method_52740 getMainPositioner ()Lnet/minecraft/class_7847; + METHOD method_52741 vertical ()Lnet/minecraft/class_8667; + METHOD method_52742 horizontal ()Lnet/minecraft/class_8667; + CLASS class_8668 DisplayAxis + METHOD method_52744 setSpacing (Lnet/minecraft/class_7845;I)V + ARG 1 grid + ARG 2 spacing + METHOD method_52745 add (Lnet/minecraft/class_7845;Lnet/minecraft/class_8021;ILnet/minecraft/class_7847;)Lnet/minecraft/class_8021; + ARG 1 grid + ARG 2 widget + ARG 3 index + ARG 4 positioner diff --git a/mappings/net/minecraft/client/gui/widget/EditBoxWidget.mapping b/mappings/net/minecraft/client/gui/widget/EditBoxWidget.mapping index b274694ab1..9169098bc9 100644 --- a/mappings/net/minecraft/client/gui/widget/EditBoxWidget.mapping +++ b/mappings/net/minecraft/client/gui/widget/EditBoxWidget.mapping @@ -12,7 +12,8 @@ CLASS net/minecraft/class_7529 net/minecraft/client/gui/widget/EditBoxWidget COMMENT The placeholder text that gets rendered when the edit box is empty. This does not COMMENT get returned from {@link #getText}; an empty string will be returned in such cases. FIELD field_39509 editBox Lnet/minecraft/class_7530; - FIELD field_39510 tick I + FIELD field_45363 CURSOR_BLINK_INTERVAL I + FIELD field_45364 lastSwitchFocusTime J METHOD (Lnet/minecraft/class_327;IIIILnet/minecraft/class_2561;Lnet/minecraft/class_2561;)V ARG 1 textRenderer ARG 2 x @@ -37,8 +38,8 @@ CLASS net/minecraft/class_7529 net/minecraft/client/gui/widget/EditBoxWidget COMMENT @throws IllegalArgumentException if {@code maxLength} is negative COMMENT @see EditBox#setMaxLength ARG 1 maxLength - METHOD method_44403 drawSelection (Lnet/minecraft/class_4587;IIII)V - ARG 1 matrices + METHOD method_44403 drawSelection (Lnet/minecraft/class_332;IIII)V + ARG 1 context ARG 2 left ARG 3 top ARG 4 right @@ -48,7 +49,6 @@ CLASS net/minecraft/class_7529 net/minecraft/client/gui/widget/EditBoxWidget ARG 3 mouseY METHOD method_44405 getText ()Ljava/lang/String; COMMENT {@return the current text of the edit box} - METHOD method_44406 tick ()V METHOD method_44407 onCursorChange ()V METHOD method_44408 getMaxLinesWithoutOverflow ()D COMMENT {@return the maximum amount of lines the widget can hold without overflowing} diff --git a/mappings/net/minecraft/client/gui/widget/ElementListWidget.mapping b/mappings/net/minecraft/client/gui/widget/ElementListWidget.mapping index f21db7a4b9..cbe9e99db6 100644 --- a/mappings/net/minecraft/client/gui/widget/ElementListWidget.mapping +++ b/mappings/net/minecraft/client/gui/widget/ElementListWidget.mapping @@ -1,5 +1,6 @@ CLASS net/minecraft/class_4265 net/minecraft/client/gui/widget/ElementListWidget - FIELD field_33781 widgetFocused Z + METHOD method_48207 (Lnet/minecraft/class_4265$class_4266;)Z + ARG 0 element CLASS class_4266 Entry FIELD field_19077 focused Lnet/minecraft/class_364; FIELD field_19078 dragging Z @@ -7,3 +8,6 @@ CLASS net/minecraft/class_4265 net/minecraft/client/gui/widget/ElementListWidget METHOD method_37024 appendNarrations (Lnet/minecraft/class_6382;)V ARG 1 builder METHOD method_37025 selectableChildren ()Ljava/util/List; + METHOD method_48208 getNavigationPath (Lnet/minecraft/class_8023;I)Lnet/minecraft/class_8016; + ARG 1 navigation + ARG 2 index diff --git a/mappings/net/minecraft/client/gui/widget/EmptyWidget.mapping b/mappings/net/minecraft/client/gui/widget/EmptyWidget.mapping new file mode 100644 index 0000000000..ef1aedb756 --- /dev/null +++ b/mappings/net/minecraft/client/gui/widget/EmptyWidget.mapping @@ -0,0 +1,17 @@ +CLASS net/minecraft/class_7852 net/minecraft/client/gui/widget/EmptyWidget + FIELD field_41818 x I + FIELD field_41819 y I + FIELD field_41820 width I + FIELD field_41821 height I + METHOD (II)V + ARG 1 width + ARG 2 height + METHOD (IIII)V + ARG 1 x + ARG 2 y + ARG 3 width + ARG 4 height + METHOD method_46512 ofWidth (I)Lnet/minecraft/class_7852; + ARG 0 width + METHOD method_46513 ofHeight (I)Lnet/minecraft/class_7852; + ARG 0 height diff --git a/mappings/net/minecraft/client/gui/widget/EntryListWidget.mapping b/mappings/net/minecraft/client/gui/widget/EntryListWidget.mapping index dc2d48c51e..ecdb47f137 100644 --- a/mappings/net/minecraft/client/gui/widget/EntryListWidget.mapping +++ b/mappings/net/minecraft/client/gui/widget/EntryListWidget.mapping @@ -9,15 +9,14 @@ CLASS net/minecraft/class_350 net/minecraft/client/gui/widget/EntryListWidget FIELD field_22742 width I FIELD field_22743 height I FIELD field_22744 centerListVertically Z - FIELD field_22746 renderSelection Z FIELD field_22747 renderHeader Z FIELD field_22748 headerHeight I FIELD field_22749 scrollAmount D FIELD field_22750 scrolling Z FIELD field_22751 selected Lnet/minecraft/class_350$class_351; FIELD field_26846 renderBackground Z - FIELD field_26847 renderHorizontalShadows Z FIELD field_33780 hoveredEntry Lnet/minecraft/class_350$class_351; + FIELD field_45908 SCROLLER_TEXTURE Lnet/minecraft/class_2960; METHOD (Lnet/minecraft/class_310;IIIII)V ARG 1 client ARG 2 width @@ -35,16 +34,15 @@ CLASS net/minecraft/class_350 net/minecraft/client/gui/widget/EntryListWidget METHOD method_25310 clickedHeader (II)V ARG 1 x ARG 2 y - METHOD method_25311 renderList (Lnet/minecraft/class_4587;IIF)V - ARG 1 matrices + METHOD method_25311 renderList (Lnet/minecraft/class_332;IIF)V + ARG 1 context ARG 2 mouseX ARG 3 mouseY ARG 4 delta - METHOD method_25312 renderHeader (Lnet/minecraft/class_4587;IILnet/minecraft/class_289;)V - ARG 1 matrices + METHOD method_25312 renderHeader (Lnet/minecraft/class_332;II)V + ARG 1 context ARG 2 x ARG 3 y - ARG 4 tessellator METHOD method_25313 setSelected (Lnet/minecraft/class_350$class_351;)V ARG 1 entry METHOD method_25314 replaceEntries (Ljava/util/Collection;)V @@ -52,7 +50,6 @@ CLASS net/minecraft/class_350 net/minecraft/client/gui/widget/EntryListWidget METHOD method_25315 setRenderHeader (ZI)V ARG 1 renderHeader ARG 2 headerHeight - METHOD method_25316 isFocused ()Z METHOD method_25317 getMaxPosition ()I METHOD method_25318 updateScrollingState (DDI)V ARG 1 mouseX @@ -60,8 +57,8 @@ CLASS net/minecraft/class_350 net/minecraft/client/gui/widget/EntryListWidget ARG 5 button METHOD method_25319 getRowBottom (I)I ARG 1 index - METHOD method_25320 renderDecorations (Lnet/minecraft/class_4587;II)V - ARG 1 matrices + METHOD method_25320 renderDecorations (Lnet/minecraft/class_332;II)V + ARG 1 context ARG 2 mouseX ARG 3 mouseY METHOD method_25321 addEntry (Lnet/minecraft/class_350$class_351;)I @@ -74,8 +71,6 @@ CLASS net/minecraft/class_350 net/minecraft/client/gui/widget/EntryListWidget ARG 4 bottom METHOD method_25324 centerScrollOn (Lnet/minecraft/class_350$class_351;)V ARG 1 entry - METHOD method_25325 renderBackground (Lnet/minecraft/class_4587;)V - ARG 1 matrices METHOD method_25326 getEntry (I)Lnet/minecraft/class_350$class_351; ARG 1 index METHOD method_25328 ensureVisible (Lnet/minecraft/class_350$class_351;)V @@ -90,8 +85,6 @@ CLASS net/minecraft/class_350 net/minecraft/client/gui/widget/EntryListWidget ARG 1 left METHOD method_25334 getSelectedOrNull ()Lnet/minecraft/class_350$class_351; COMMENT {@return the selected entry of this entry list, or {@code null} if there is none} - METHOD method_25335 moveSelection (Lnet/minecraft/class_350$class_5403;)V - ARG 1 direction METHOD method_25337 getRowTop (I)I ARG 1 index METHOD method_25338 remove (I)Lnet/minecraft/class_350$class_351; @@ -100,31 +93,17 @@ CLASS net/minecraft/class_350 net/minecraft/client/gui/widget/EntryListWidget METHOD method_25340 getEntryCount ()I METHOD method_25341 getScrollAmount ()D METHOD method_25342 getRowLeft ()I - METHOD method_29344 setRenderSelection (Z)V - ARG 1 renderSelection METHOD method_29621 setEntryParentList (Lnet/minecraft/class_350$class_351;)V ARG 1 entry - METHOD method_30013 moveSelectionIf (Lnet/minecraft/class_350$class_5403;Ljava/util/function/Predicate;)Z - COMMENT Moves the selection in the specified direction until the predicate returns true. - COMMENT - COMMENT @return whether the selection matching the predicate was found - ARG 1 direction - COMMENT the direction to move the selection - ARG 2 predicate - METHOD method_30014 (Lnet/minecraft/class_350$class_351;)Z - ARG 0 entry - METHOD method_30015 ensureSelectedEntryVisible ()V METHOD method_31322 setRenderBackground (Z)V ARG 1 renderBackground - METHOD method_31323 setRenderHorizontalShadows (Z)V - ARG 1 renderHorizontalShadows METHOD method_31383 getRowRight ()I METHOD method_37017 appendNarrations (Lnet/minecraft/class_6382;Lnet/minecraft/class_350$class_351;)V ARG 1 builder ARG 2 entry METHOD method_37019 getHoveredEntry ()Lnet/minecraft/class_350$class_351; - METHOD method_44397 renderEntry (Lnet/minecraft/class_4587;IIFIIIII)V - ARG 1 matrices + METHOD method_44397 renderEntry (Lnet/minecraft/class_332;IIFIIIII)V + ARG 1 context ARG 2 mouseX ARG 3 mouseY ARG 4 delta @@ -133,8 +112,8 @@ CLASS net/minecraft/class_350 net/minecraft/client/gui/widget/EntryListWidget ARG 7 y ARG 8 entryWidth ARG 9 entryHeight - METHOD method_44398 drawSelectionHighlight (Lnet/minecraft/class_4587;IIIII)V - ARG 1 matrices + METHOD method_44398 drawSelectionHighlight (Lnet/minecraft/class_332;IIIII)V + ARG 1 context ARG 2 y ARG 3 entryWidth ARG 4 entryHeight @@ -144,12 +123,25 @@ CLASS net/minecraft/class_350 net/minecraft/client/gui/widget/EntryListWidget ARG 1 entry METHOD method_44650 removeEntryWithoutScrolling (Lnet/minecraft/class_350$class_351;)Z ARG 1 entry + METHOD method_48197 getNeighboringEntry (Lnet/minecraft/class_8028;)Lnet/minecraft/class_350$class_351; + ARG 1 direction + METHOD method_48198 getNeighboringEntry (Lnet/minecraft/class_8028;Ljava/util/function/Predicate;)Lnet/minecraft/class_350$class_351; + ARG 1 direction + ARG 2 predicate + METHOD method_48199 getNeighboringEntry (Lnet/minecraft/class_8028;Ljava/util/function/Predicate;Lnet/minecraft/class_350$class_351;)Lnet/minecraft/class_350$class_351; + ARG 1 direction + ARG 2 predicate + ARG 3 selected + METHOD method_48200 getFirst ()Lnet/minecraft/class_350$class_351; + METHOD method_48201 (Lnet/minecraft/class_350$class_351;)Z + ARG 0 entry + METHOD method_49603 enableScissor (Lnet/minecraft/class_332;)V + ARG 1 context CLASS class_351 Entry FIELD field_22752 parentList Lnet/minecraft/class_350; - METHOD method_25343 render (Lnet/minecraft/class_4587;IIIIIIIZF)V + METHOD method_25343 render (Lnet/minecraft/class_332;IIIIIIIZF)V COMMENT Renders an entry in a list. - ARG 1 matrices - COMMENT the matrix stack used for rendering + ARG 1 context ARG 2 index COMMENT the index of the entry ARG 3 y @@ -167,6 +159,17 @@ CLASS net/minecraft/class_350 net/minecraft/client/gui/widget/EntryListWidget ARG 9 hovered COMMENT whether the mouse is hovering over the entry ARG 10 tickDelta + METHOD method_49568 drawBorder (Lnet/minecraft/class_332;IIIIIIIZF)V + ARG 1 context + ARG 2 index + ARG 3 y + ARG 4 x + ARG 5 entryWidth + ARG 6 entryHeight + ARG 7 mouseX + ARG 8 mouseY + ARG 9 hovered + ARG 10 tickDelta CLASS class_352 Entries FIELD field_2146 entries Ljava/util/List; METHOD add (ILjava/lang/Object;)V @@ -179,7 +182,3 @@ CLASS net/minecraft/class_350 net/minecraft/client/gui/widget/EntryListWidget METHOD set (ILjava/lang/Object;)Ljava/lang/Object; ARG 1 index ARG 2 entry - CLASS class_5403 MoveDirection - COMMENT Represents the direction in which the selection is moved. - FIELD field_25661 UP Lnet/minecraft/class_350$class_5403; - FIELD field_25662 DOWN Lnet/minecraft/class_350$class_5403; diff --git a/mappings/net/minecraft/client/gui/widget/GridWidget.mapping b/mappings/net/minecraft/client/gui/widget/GridWidget.mapping new file mode 100644 index 0000000000..9e173add05 --- /dev/null +++ b/mappings/net/minecraft/client/gui/widget/GridWidget.mapping @@ -0,0 +1,90 @@ +CLASS net/minecraft/class_7845 net/minecraft/client/gui/widget/GridWidget + COMMENT A widget that positions its children in a 2D grid. + COMMENT + COMMENT @see net.minecraft.util.math.Divider + FIELD field_40771 children Ljava/util/List; + FIELD field_40772 grids Ljava/util/List; + FIELD field_40773 mainPositioner Lnet/minecraft/class_7847; + FIELD field_42154 rowSpacing I + FIELD field_42155 columnSpacing I + METHOD (II)V + ARG 1 x + ARG 2 y + METHOD method_46452 add (Lnet/minecraft/class_8021;II)Lnet/minecraft/class_8021; + ARG 1 widget + ARG 2 row + ARG 3 column + METHOD method_46453 add (Lnet/minecraft/class_8021;IIII)Lnet/minecraft/class_8021; + ARG 1 widget + ARG 2 row + ARG 3 column + ARG 4 occupiedRows + ARG 5 occupiedColumns + METHOD method_46454 add (Lnet/minecraft/class_8021;IIIILnet/minecraft/class_7847;)Lnet/minecraft/class_8021; + ARG 1 widget + ARG 2 row + ARG 3 column + ARG 4 occupiedRows + ARG 5 occupiedColumns + ARG 6 positioner + METHOD method_46455 add (Lnet/minecraft/class_8021;IILnet/minecraft/class_7847;)Lnet/minecraft/class_8021; + ARG 1 widget + ARG 2 row + ARG 3 column + ARG 4 positioner + METHOD method_46457 copyPositioner ()Lnet/minecraft/class_7847; + METHOD method_46458 getMainPositioner ()Lnet/minecraft/class_7847; + METHOD method_47610 createAdder (I)Lnet/minecraft/class_7845$class_7939; + ARG 1 columns + METHOD method_48635 setColumnSpacing (I)Lnet/minecraft/class_7845; + ARG 1 columnSpacing + METHOD method_48636 setRowSpacing (I)Lnet/minecraft/class_7845; + ARG 1 rowSpacing + METHOD method_48637 setSpacing (I)Lnet/minecraft/class_7845; + ARG 1 spacing + METHOD method_52733 add (Lnet/minecraft/class_8021;IIIILjava/util/function/Consumer;)Lnet/minecraft/class_8021; + ARG 1 widget + ARG 2 row + ARG 3 column + ARG 4 occupiedBelow + ARG 5 occupiedAbove + ARG 6 callback + METHOD method_52734 add (Lnet/minecraft/class_8021;IILjava/util/function/Consumer;)Lnet/minecraft/class_8021; + ARG 1 widget + ARG 2 row + ARG 3 column + ARG 4 callback + CLASS class_7846 Element + FIELD field_40774 row I + FIELD field_40775 column I + FIELD field_40776 occupiedRows I + FIELD field_40777 occupiedColumns I + METHOD (Lnet/minecraft/class_8021;IIIILnet/minecraft/class_7847;)V + ARG 1 widget + ARG 2 row + ARG 3 column + ARG 4 occupiedRows + ARG 5 occupiedColumns + ARG 6 positioner + METHOD method_46459 getRowEnd ()I + METHOD method_46460 getColumnEnd ()I + CLASS class_7939 Adder + FIELD field_41339 columns I + FIELD field_41340 totalOccupiedColumns I + METHOD (Lnet/minecraft/class_7845;I)V + ARG 2 columns + METHOD method_47611 copyPositioner ()Lnet/minecraft/class_7847; + METHOD method_47612 add (Lnet/minecraft/class_8021;)Lnet/minecraft/class_8021; + ARG 1 widget + METHOD method_47613 add (Lnet/minecraft/class_8021;I)Lnet/minecraft/class_8021; + ARG 1 widget + ARG 2 occupiedColumns + METHOD method_47614 add (Lnet/minecraft/class_8021;ILnet/minecraft/class_7847;)Lnet/minecraft/class_8021; + ARG 1 widget + ARG 2 occupiedColumns + ARG 3 positioner + METHOD method_47615 add (Lnet/minecraft/class_8021;Lnet/minecraft/class_7847;)Lnet/minecraft/class_8021; + ARG 1 widget + ARG 2 positioner + METHOD method_47616 getMainPositioner ()Lnet/minecraft/class_7847; + METHOD method_48638 getGridWidget ()Lnet/minecraft/class_7845; diff --git a/mappings/net/minecraft/client/gui/widget/IconWidget.mapping b/mappings/net/minecraft/client/gui/widget/IconWidget.mapping new file mode 100644 index 0000000000..83a3e1f9ed --- /dev/null +++ b/mappings/net/minecraft/client/gui/widget/IconWidget.mapping @@ -0,0 +1,36 @@ +CLASS net/minecraft/class_8208 net/minecraft/client/gui/widget/IconWidget + METHOD (IIII)V + ARG 1 x + ARG 2 y + ARG 3 width + ARG 4 height + METHOD method_52720 create (IILnet/minecraft/class_2960;)Lnet/minecraft/class_8208; + ARG 0 width + ARG 1 height + ARG 2 texture + METHOD method_52721 create (IILnet/minecraft/class_2960;II)Lnet/minecraft/class_8208; + ARG 0 width + ARG 1 height + ARG 2 texture + ARG 3 textureWidth + ARG 4 textureHeight + CLASS class_8659 Simple + FIELD field_45357 texture Lnet/minecraft/class_2960; + METHOD (IIIILnet/minecraft/class_2960;)V + ARG 1 x + ARG 2 y + ARG 3 width + ARG 4 height + ARG 5 texture + CLASS class_8660 Texture + FIELD field_45358 texture Lnet/minecraft/class_2960; + FIELD field_45359 textureWidth I + FIELD field_45360 textureHeight I + METHOD (IIIILnet/minecraft/class_2960;II)V + ARG 1 x + ARG 2 y + ARG 3 width + ARG 4 height + ARG 5 texture + ARG 6 textureWidth + ARG 7 textureHeight diff --git a/mappings/net/minecraft/client/gui/widget/LayoutWidget.mapping b/mappings/net/minecraft/client/gui/widget/LayoutWidget.mapping new file mode 100644 index 0000000000..cab7c8e616 --- /dev/null +++ b/mappings/net/minecraft/client/gui/widget/LayoutWidget.mapping @@ -0,0 +1,8 @@ +CLASS net/minecraft/class_8133 net/minecraft/client/gui/widget/LayoutWidget + METHOD method_48222 refreshPositions ()V + METHOD method_48227 forEachElement (Ljava/util/function/Consumer;)V + ARG 1 consumer + METHOD method_49004 (Lnet/minecraft/class_8021;)V + ARG 0 element + METHOD method_49005 (Ljava/util/function/Consumer;Lnet/minecraft/class_8021;)V + ARG 1 element diff --git a/mappings/net/minecraft/client/gui/widget/LayoutWidgets.mapping b/mappings/net/minecraft/client/gui/widget/LayoutWidgets.mapping new file mode 100644 index 0000000000..2a0f889590 --- /dev/null +++ b/mappings/net/minecraft/client/gui/widget/LayoutWidgets.mapping @@ -0,0 +1,13 @@ +CLASS net/minecraft/class_8767 net/minecraft/client/gui/widget/LayoutWidgets + FIELD field_46007 SPACING I + METHOD method_53549 createLabeledWidget (Lnet/minecraft/class_327;Lnet/minecraft/class_8021;Lnet/minecraft/class_2561;)Lnet/minecraft/class_8133; + ARG 0 textRenderer + ARG 1 widget + ARG 2 label + METHOD method_53550 createLabeledWidget (Lnet/minecraft/class_327;Lnet/minecraft/class_8021;Lnet/minecraft/class_2561;Ljava/util/function/Consumer;)Lnet/minecraft/class_8133; + ARG 0 textRenderer + ARG 1 widget + ARG 2 label + ARG 3 callback + METHOD method_53551 (Lnet/minecraft/class_7847;)V + ARG 0 positioner diff --git a/mappings/net/minecraft/client/gui/widget/LockButtonWidget.mapping b/mappings/net/minecraft/client/gui/widget/LockButtonWidget.mapping index 91613fe437..4801f06589 100644 --- a/mappings/net/minecraft/client/gui/widget/LockButtonWidget.mapping +++ b/mappings/net/minecraft/client/gui/widget/LockButtonWidget.mapping @@ -7,11 +7,7 @@ CLASS net/minecraft/class_347 net/minecraft/client/gui/widget/LockButtonWidget METHOD method_1895 setLocked (Z)V ARG 1 locked METHOD method_1896 isLocked ()Z - CLASS class_348 IconLocation - FIELD field_2134 v I - FIELD field_2135 u I - METHOD (Ljava/lang/String;III)V - ARG 3 u - ARG 4 v - METHOD method_1897 getU ()I - METHOD method_1898 getV ()I + CLASS class_348 Icon + FIELD field_45362 texture Lnet/minecraft/class_2960; + METHOD (Ljava/lang/String;ILnet/minecraft/class_2960;)V + ARG 3 texture diff --git a/mappings/net/minecraft/client/gui/widget/MultilineTextWidget.mapping b/mappings/net/minecraft/client/gui/widget/MultilineTextWidget.mapping new file mode 100644 index 0000000000..f99c4852c2 --- /dev/null +++ b/mappings/net/minecraft/client/gui/widget/MultilineTextWidget.mapping @@ -0,0 +1,23 @@ +CLASS net/minecraft/class_7940 net/minecraft/client/gui/widget/MultilineTextWidget + FIELD field_41343 centered Z + FIELD field_42486 maxWidth Ljava/util/OptionalInt; + FIELD field_42487 maxRows Ljava/util/OptionalInt; + FIELD field_42488 cacheKeyToText Lnet/minecraft/class_8105; + METHOD (IILnet/minecraft/class_2561;Lnet/minecraft/class_327;)V + ARG 1 x + ARG 2 y + ARG 3 message + ARG 4 textRenderer + METHOD (Lnet/minecraft/class_2561;Lnet/minecraft/class_327;)V + ARG 1 message + ARG 2 textRenderer + METHOD method_48980 (Lnet/minecraft/class_327;Lnet/minecraft/class_7940$class_8131;)Lnet/minecraft/class_5489; + ARG 1 cacheKey + METHOD method_48981 setCentered (Z)Lnet/minecraft/class_7940; + ARG 1 centered + METHOD method_48982 getCacheKey ()Lnet/minecraft/class_7940$class_8131; + METHOD method_48984 setMaxWidth (I)Lnet/minecraft/class_7940; + ARG 1 maxWidth + METHOD method_48985 setMaxRows (I)Lnet/minecraft/class_7940; + ARG 1 maxRows + CLASS class_8131 CacheKey diff --git a/mappings/net/minecraft/client/gui/widget/NarratedMultilineTextWidget.mapping b/mappings/net/minecraft/client/gui/widget/NarratedMultilineTextWidget.mapping new file mode 100644 index 0000000000..13dfe30416 --- /dev/null +++ b/mappings/net/minecraft/client/gui/widget/NarratedMultilineTextWidget.mapping @@ -0,0 +1,13 @@ +CLASS net/minecraft/class_8019 net/minecraft/client/gui/widget/NarratedMultilineTextWidget + FIELD field_41801 BACKGROUND_COLOR I + FIELD field_41802 EXPANSION I + FIELD field_45355 alwaysShowBorders Z + METHOD (ILnet/minecraft/class_2561;Lnet/minecraft/class_327;)V + ARG 1 maxWidth + ARG 2 message + ARG 3 textRenderer + METHOD (ILnet/minecraft/class_2561;Lnet/minecraft/class_327;Z)V + ARG 1 maxWidth + ARG 2 message + ARG 3 textRenderer + ARG 4 alwaysShowBorders diff --git a/mappings/net/minecraft/client/gui/widget/ButtonListWidget.mapping b/mappings/net/minecraft/client/gui/widget/OptionListWidget.mapping similarity index 63% rename from mappings/net/minecraft/client/gui/widget/ButtonListWidget.mapping rename to mappings/net/minecraft/client/gui/widget/OptionListWidget.mapping index 61a05f30f7..ab69ee0557 100644 --- a/mappings/net/minecraft/client/gui/widget/ButtonListWidget.mapping +++ b/mappings/net/minecraft/client/gui/widget/OptionListWidget.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_353 net/minecraft/client/gui/widget/ButtonListWidget +CLASS net/minecraft/class_353 net/minecraft/client/gui/widget/OptionListWidget METHOD method_20406 addSingleOptionEntry (Lnet/minecraft/class_7172;)I ARG 1 option METHOD method_20407 addOptionEntry (Lnet/minecraft/class_7172;Lnet/minecraft/class_7172;)V @@ -6,18 +6,18 @@ CLASS net/minecraft/class_353 net/minecraft/client/gui/widget/ButtonListWidget ARG 2 secondOption METHOD method_20408 addAll ([Lnet/minecraft/class_7172;)V ARG 1 options - METHOD method_29624 getHoveredButton (DD)Ljava/util/Optional; + METHOD method_29624 getHoveredWidget (DD)Ljava/util/Optional; ARG 1 mouseX ARG 3 mouseY - METHOD method_31046 getButtonFor (Lnet/minecraft/class_7172;)Lnet/minecraft/class_339; + METHOD method_31046 getWidgetFor (Lnet/minecraft/class_7172;)Lnet/minecraft/class_339; ARG 1 option - CLASS class_354 ButtonEntry - FIELD field_18214 buttons Ljava/util/List; - FIELD field_27983 optionsToButtons Ljava/util/Map; + CLASS class_354 WidgetEntry + FIELD field_18214 widgets Ljava/util/List; + FIELD field_27983 optionsToWidgets Ljava/util/Map; METHOD (Ljava/util/Map;)V - ARG 1 optionsToButtons - METHOD method_18622 (ILnet/minecraft/class_4587;IIFLnet/minecraft/class_339;)V - ARG 5 button + ARG 1 optionsToWidgets + METHOD method_18622 (ILnet/minecraft/class_332;IIFLnet/minecraft/class_339;)V + ARG 5 widget METHOD method_20409 create (Lnet/minecraft/class_315;ILnet/minecraft/class_7172;)Lnet/minecraft/class_353$class_354; ARG 0 options ARG 1 width diff --git a/mappings/net/minecraft/client/gui/widget/PageTurnWidget.mapping b/mappings/net/minecraft/client/gui/widget/PageTurnWidget.mapping index 4b77fe946e..350c087be4 100644 --- a/mappings/net/minecraft/client/gui/widget/PageTurnWidget.mapping +++ b/mappings/net/minecraft/client/gui/widget/PageTurnWidget.mapping @@ -1,6 +1,10 @@ CLASS net/minecraft/class_474 net/minecraft/client/gui/widget/PageTurnWidget FIELD field_18977 playPageTurnSound Z FIELD field_2851 isNextPageButton Z + FIELD field_45493 PAGE_FORWARD_HIGHLIGHTED_TEXTURE Lnet/minecraft/class_2960; + FIELD field_45494 PAGE_FORWARD_TEXTURE Lnet/minecraft/class_2960; + FIELD field_45495 PAGE_BACKWARD_HIGHLIGHTED_TEXTURE Lnet/minecraft/class_2960; + FIELD field_45496 PAGE_BACKWARD_TEXTURE Lnet/minecraft/class_2960; METHOD (IIZLnet/minecraft/class_4185$class_4241;Z)V ARG 1 x ARG 2 y diff --git a/mappings/net/minecraft/client/gui/widget/PlayerSkinWidget.mapping b/mappings/net/minecraft/client/gui/widget/PlayerSkinWidget.mapping new file mode 100644 index 0000000000..61fb9fa4d1 --- /dev/null +++ b/mappings/net/minecraft/client/gui/widget/PlayerSkinWidget.mapping @@ -0,0 +1,16 @@ +CLASS net/minecraft/class_8765 net/minecraft/client/gui/widget/PlayerSkinWidget + FIELD field_46003 models Lnet/minecraft/class_8765$class_8766; + FIELD field_46004 skinSupplier Ljava/util/function/Supplier; + FIELD field_46005 xRotation F + FIELD field_46006 yRotation F + METHOD (IILnet/minecraft/class_5599;Ljava/util/function/Supplier;)V + ARG 1 width + ARG 2 height + ARG 3 entityModelLoader + ARG 4 skinSupplier + CLASS class_8766 Models + METHOD method_53547 draw (Lnet/minecraft/class_332;Lnet/minecraft/class_8685;)V + ARG 1 context + ARG 2 skinTextures + METHOD method_53548 create (Lnet/minecraft/class_5599;)Lnet/minecraft/class_8765$class_8766; + ARG 0 entityModelLoader diff --git a/mappings/net/minecraft/client/gui/widget/Positioner.mapping b/mappings/net/minecraft/client/gui/widget/Positioner.mapping new file mode 100644 index 0000000000..cb10621654 --- /dev/null +++ b/mappings/net/minecraft/client/gui/widget/Positioner.mapping @@ -0,0 +1,48 @@ +CLASS net/minecraft/class_7847 net/minecraft/client/gui/widget/Positioner + METHOD method_46461 alignLeft ()Lnet/minecraft/class_7847; + METHOD method_46462 relativeX (F)Lnet/minecraft/class_7847; + ARG 1 relativeX + METHOD method_46463 relative (FF)Lnet/minecraft/class_7847; + ARG 1 x + ARG 2 y + METHOD method_46464 margin (I)Lnet/minecraft/class_7847; + ARG 1 value + METHOD method_46465 margin (II)Lnet/minecraft/class_7847; + ARG 1 x + ARG 2 y + METHOD method_46466 margin (IIII)Lnet/minecraft/class_7847; + ARG 1 left + ARG 2 top + ARG 3 right + ARG 4 bottom + METHOD method_46467 alignHorizontalCenter ()Lnet/minecraft/class_7847; + METHOD method_46468 relativeY (F)Lnet/minecraft/class_7847; + ARG 1 relativeY + METHOD method_46469 marginLeft (I)Lnet/minecraft/class_7847; + ARG 1 marginLeft + METHOD method_46470 alignRight ()Lnet/minecraft/class_7847; + METHOD method_46471 marginTop (I)Lnet/minecraft/class_7847; + ARG 1 marginTop + METHOD method_46472 alignTop ()Lnet/minecraft/class_7847; + METHOD method_46473 marginRight (I)Lnet/minecraft/class_7847; + ARG 1 marginRight + METHOD method_46474 alignVerticalCenter ()Lnet/minecraft/class_7847; + METHOD method_46475 marginBottom (I)Lnet/minecraft/class_7847; + ARG 1 marginBottom + METHOD method_46476 alignBottom ()Lnet/minecraft/class_7847; + METHOD method_46477 marginX (I)Lnet/minecraft/class_7847; + ARG 1 marginX + METHOD method_46478 copy ()Lnet/minecraft/class_7847; + METHOD method_46479 marginY (I)Lnet/minecraft/class_7847; + ARG 1 marginY + METHOD method_46480 toImpl ()Lnet/minecraft/class_7847$class_7848; + METHOD method_46481 create ()Lnet/minecraft/class_7847; + CLASS class_7848 Impl + FIELD field_40778 marginLeft I + FIELD field_40779 marginTop I + FIELD field_40780 marginRight I + FIELD field_40781 marginBottom I + FIELD field_40782 relativeX F + FIELD field_40783 relativeY F + METHOD (Lnet/minecraft/class_7847$class_7848;)V + ARG 1 original diff --git a/mappings/net/minecraft/client/gui/widget/PressableWidget.mapping b/mappings/net/minecraft/client/gui/widget/PressableWidget.mapping index 77524be225..86f5b415e7 100644 --- a/mappings/net/minecraft/client/gui/widget/PressableWidget.mapping +++ b/mappings/net/minecraft/client/gui/widget/PressableWidget.mapping @@ -1,4 +1,9 @@ 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. + FIELD field_45339 TEXTURES Lnet/minecraft/class_8666; METHOD method_25306 onPress ()V + METHOD method_48589 drawMessage (Lnet/minecraft/class_332;Lnet/minecraft/class_327;I)V + ARG 1 context + ARG 2 textRenderer + ARG 3 color diff --git a/mappings/net/minecraft/client/gui/widget/ScrollableTextWidget.mapping b/mappings/net/minecraft/client/gui/widget/ScrollableTextWidget.mapping new file mode 100644 index 0000000000..8c5dbe24d1 --- /dev/null +++ b/mappings/net/minecraft/client/gui/widget/ScrollableTextWidget.mapping @@ -0,0 +1,13 @@ +CLASS net/minecraft/class_8577 net/minecraft/client/gui/widget/ScrollableTextWidget + FIELD field_44947 textRenderer Lnet/minecraft/class_327; + FIELD field_44948 wrapped Lnet/minecraft/class_7940; + METHOD (IIIILnet/minecraft/class_2561;Lnet/minecraft/class_327;)V + ARG 1 x + ARG 2 y + ARG 3 width + ARG 4 height + ARG 5 message + ARG 6 textRenderer + METHOD method_52234 textColor (I)Lnet/minecraft/class_8577; + ARG 1 textColor + METHOD method_53546 textOverflows ()Z diff --git a/mappings/net/minecraft/client/gui/widget/ScrollableWidget.mapping b/mappings/net/minecraft/client/gui/widget/ScrollableWidget.mapping index 39a3256daa..185b534e3d 100644 --- a/mappings/net/minecraft/client/gui/widget/ScrollableWidget.mapping +++ b/mappings/net/minecraft/client/gui/widget/ScrollableWidget.mapping @@ -1,37 +1,37 @@ CLASS net/minecraft/class_7528 net/minecraft/client/gui/widget/ScrollableWidget COMMENT A widget that can be focused and vertically scrolled. - FIELD field_39493 FOCUSED_BORDER_COLOR I - FIELD field_39494 UNFOCUSED_BORDER_COLOR I - FIELD field_39495 BOX_COLOR I FIELD field_39496 PADDING I FIELD field_39497 scrollY D FIELD field_39498 scrollbarDragged Z + FIELD field_45905 TEXT_FIELD_TEXTURES Lnet/minecraft/class_8666; + FIELD field_45906 SCROLLER_TEXTURE Lnet/minecraft/class_2960; + FIELD field_45907 SCROLLER_WIDTH I METHOD method_44381 getPadding ()I METHOD method_44382 setScrollY (D)V ARG 1 scrollY METHOD method_44383 isVisible (II)Z ARG 1 top ARG 2 bottom - METHOD method_44384 renderOverlay (Lnet/minecraft/class_4587;)V + METHOD method_44384 renderOverlay (Lnet/minecraft/class_332;)V COMMENT Renders overlays that are not scrolled but part of the widget. COMMENT COMMENT

This renders the scrollbar by default. Subclasses can override this to COMMENT render other overlays, but {@code super} call is necessary to make sure the scrollbar COMMENT renders when it should. - ARG 1 matrices + ARG 1 context METHOD method_44385 getPaddingDoubled ()I - METHOD method_44386 drawBox (Lnet/minecraft/class_4587;)V + METHOD method_44386 drawBox (Lnet/minecraft/class_332;)V COMMENT Draws the box that the contents are rendered over, including its borders. - ARG 1 matrices + ARG 1 context METHOD method_44387 getScrollY ()D METHOD method_44388 isWithinBounds (DD)Z ARG 1 mouseX ARG 3 mouseY - METHOD method_44389 renderContents (Lnet/minecraft/class_4587;IIF)V + METHOD method_44389 renderContents (Lnet/minecraft/class_332;IIF)V COMMENT Renders the scrolled contents. Subclasses must override this. The rendered contents COMMENT may overflow; the caller should trim those using {@link - COMMENT net.minecraft.client.gui.DrawableHelper#enableScissor}. - ARG 1 matrices + COMMENT net.minecraft.client.gui.DrawContext#enableScissor}. + ARG 1 context ARG 2 mouseX ARG 3 mouseY ARG 4 delta @@ -43,4 +43,12 @@ CLASS net/minecraft/class_7528 net/minecraft/client/gui/widget/ScrollableWidget METHOD method_44393 getDeltaYPerScroll ()D METHOD method_44394 getScrollbarThumbHeight ()I METHOD method_44395 getContentsHeightWithPadding ()I - METHOD method_44396 drawScrollbar ()V + METHOD method_44396 drawScrollbar (Lnet/minecraft/class_332;)V + ARG 1 context + METHOD method_52233 drawBox (Lnet/minecraft/class_332;IIII)V + ARG 1 context + ARG 2 x + ARG 3 y + ARG 4 width + ARG 5 height + METHOD method_53532 getScrollerWidth ()I diff --git a/mappings/net/minecraft/client/gui/widget/SimplePositioningWidget.mapping b/mappings/net/minecraft/client/gui/widget/SimplePositioningWidget.mapping new file mode 100644 index 0000000000..4f34ab8b22 --- /dev/null +++ b/mappings/net/minecraft/client/gui/widget/SimplePositioningWidget.mapping @@ -0,0 +1,59 @@ +CLASS net/minecraft/class_7843 net/minecraft/client/gui/widget/SimplePositioningWidget + COMMENT A widget that positions its children relative to the widget's position. + COMMENT This does not attempt to prevent widgets overlapping with each other; + COMMENT if this is necessary, consider {@link GridWidget}. + FIELD field_40766 elements Ljava/util/List; + FIELD field_40768 minHeight I + FIELD field_40769 minWidth I + FIELD field_40770 mainPositioner Lnet/minecraft/class_7847; + METHOD (II)V + ARG 1 width + ARG 2 height + METHOD method_46440 setPos (IIILjava/util/function/Consumer;F)V + ARG 0 low + ARG 1 high + ARG 2 length + ARG 3 setter + ARG 4 relative + METHOD method_46441 add (Lnet/minecraft/class_8021;)Lnet/minecraft/class_8021; + ARG 1 widget + METHOD method_46442 setPos (Lnet/minecraft/class_8021;IIII)V + ARG 0 widget + ARG 1 left + ARG 2 top + ARG 3 right + ARG 4 bottom + METHOD method_46443 setPos (Lnet/minecraft/class_8021;IIIIFF)V + ARG 0 widget + ARG 1 left + ARG 2 top + ARG 3 right + ARG 4 bottom + ARG 5 relativeX + ARG 6 relativeY + METHOD method_46444 add (Lnet/minecraft/class_8021;Lnet/minecraft/class_7847;)Lnet/minecraft/class_8021; + ARG 1 widget + ARG 2 positioner + METHOD method_46446 setDimensions (II)Lnet/minecraft/class_7843; + ARG 1 minWidth + ARG 2 minHeight + METHOD method_46447 setMinHeight (I)Lnet/minecraft/class_7843; + ARG 1 minWidth + METHOD method_46448 copyPositioner ()Lnet/minecraft/class_7847; + METHOD method_46449 setMinWidth (I)Lnet/minecraft/class_7843; + ARG 1 minHeight + METHOD method_46450 getMainPositioner ()Lnet/minecraft/class_7847; + METHOD method_48228 (Ljava/util/function/Consumer;Lnet/minecraft/class_7843$class_7844;)V + ARG 1 element + METHOD method_48634 setPos (Lnet/minecraft/class_8021;Lnet/minecraft/class_8030;)V + ARG 0 widget + ARG 1 rect + METHOD method_49617 setPos (Lnet/minecraft/class_8021;Lnet/minecraft/class_8030;FF)V + ARG 0 widget + ARG 1 rect + ARG 2 relativeX + ARG 3 relativeY + METHOD method_52732 add (Lnet/minecraft/class_8021;Ljava/util/function/Consumer;)Lnet/minecraft/class_8021; + ARG 1 widget + ARG 2 callback + CLASS class_7844 Element diff --git a/mappings/net/minecraft/client/gui/widget/SliderWidget.mapping b/mappings/net/minecraft/client/gui/widget/SliderWidget.mapping index 189090073a..2b698df31a 100644 --- a/mappings/net/minecraft/client/gui/widget/SliderWidget.mapping +++ b/mappings/net/minecraft/client/gui/widget/SliderWidget.mapping @@ -1,5 +1,10 @@ CLASS net/minecraft/class_357 net/minecraft/client/gui/widget/SliderWidget FIELD field_22753 value D + FIELD field_41796 sliderFocused Z + FIELD field_45340 TEXTURE Lnet/minecraft/class_2960; + FIELD field_45341 HIGHLIGHTED_TEXTURE Lnet/minecraft/class_2960; + FIELD field_45342 HANDLE_TEXTURE Lnet/minecraft/class_2960; + FIELD field_45343 HANDLE_HIGHLIGHTED_TEXTURE Lnet/minecraft/class_2960; METHOD (IIIILnet/minecraft/class_2561;D)V ARG 1 x ARG 2 y @@ -20,3 +25,5 @@ CLASS net/minecraft/class_357 net/minecraft/client/gui/widget/SliderWidget METHOD method_25347 setValue (D)V ARG 1 value COMMENT the new value; will be clamped to {@code [0, 1]} + METHOD method_52716 getTexture ()Lnet/minecraft/class_2960; + METHOD method_52717 getHandleTexture ()Lnet/minecraft/class_2960; diff --git a/mappings/net/minecraft/client/gui/widget/SoundSliderWidget.mapping b/mappings/net/minecraft/client/gui/widget/SoundSliderWidget.mapping deleted file mode 100644 index 731018ee19..0000000000 --- a/mappings/net/minecraft/client/gui/widget/SoundSliderWidget.mapping +++ /dev/null @@ -1,8 +0,0 @@ -CLASS net/minecraft/class_444 net/minecraft/client/gui/widget/SoundSliderWidget - FIELD field_2622 category Lnet/minecraft/class_3419; - METHOD (Lnet/minecraft/class_310;IILnet/minecraft/class_3419;I)V - ARG 1 client - ARG 2 x - ARG 3 y - ARG 4 category - ARG 5 width diff --git a/mappings/net/minecraft/client/gui/widget/TabButtonWidget.mapping b/mappings/net/minecraft/client/gui/widget/TabButtonWidget.mapping new file mode 100644 index 0000000000..85a562d1ae --- /dev/null +++ b/mappings/net/minecraft/client/gui/widget/TabButtonWidget.mapping @@ -0,0 +1,19 @@ +CLASS net/minecraft/class_8209 net/minecraft/client/gui/widget/TabButtonWidget + FIELD field_43068 tabManager Lnet/minecraft/class_8088; + FIELD field_43069 tab Lnet/minecraft/class_8087; + FIELD field_45391 TAB_BUTTON_TEXTURES Lnet/minecraft/class_8666; + METHOD (Lnet/minecraft/class_8088;Lnet/minecraft/class_8087;II)V + ARG 1 tabManager + ARG 2 tab + ARG 3 width + ARG 4 height + METHOD method_49608 drawMessage (Lnet/minecraft/class_332;Lnet/minecraft/class_327;I)V + ARG 1 context + ARG 2 textRenderer + ARG 3 color + METHOD method_49609 getTab ()Lnet/minecraft/class_8087; + METHOD method_49610 drawCurrentTabLine (Lnet/minecraft/class_332;Lnet/minecraft/class_327;I)V + ARG 1 context + ARG 2 textRenderer + ARG 3 color + METHOD method_49611 isCurrentTab ()Z diff --git a/mappings/net/minecraft/client/gui/widget/TabNavigationWidget.mapping b/mappings/net/minecraft/client/gui/widget/TabNavigationWidget.mapping new file mode 100644 index 0000000000..690c5aa6f1 --- /dev/null +++ b/mappings/net/minecraft/client/gui/widget/TabNavigationWidget.mapping @@ -0,0 +1,41 @@ +CLASS net/minecraft/class_8089 net/minecraft/client/gui/widget/TabNavigationWidget + FIELD field_42145 tabNavWidth I + FIELD field_42146 tabManager Lnet/minecraft/class_8088; + FIELD field_42147 tabs Lcom/google/common/collect/ImmutableList; + FIELD field_42148 tabButtons Lcom/google/common/collect/ImmutableList; + FIELD field_43079 USAGE_NARRATION_TEXT Lnet/minecraft/class_2561; + FIELD field_43080 grid Lnet/minecraft/class_7845; + METHOD (ILnet/minecraft/class_8088;Ljava/lang/Iterable;)V + ARG 1 x + ARG 2 tabManager + ARG 3 tabs + METHOD method_48618 setWidth (I)V + ARG 1 width + METHOD method_48623 builder (Lnet/minecraft/class_8088;I)Lnet/minecraft/class_8089$class_8090; + ARG 0 tabManager + ARG 1 width + METHOD method_48987 selectTab (IZ)V + ARG 1 index + ARG 2 clickSound + METHOD method_48988 trySwitchTabsWithKey (I)Z + ARG 1 keyCode + METHOD method_48989 getCurrentTabIndex ()I + METHOD method_48990 getTabForKey (I)I + ARG 1 keyCode + METHOD method_49612 appendNarrations (Lnet/minecraft/class_6382;Lnet/minecraft/class_8209;)V + ARG 1 builder + ARG 2 button + METHOD method_49613 init ()V + METHOD method_49614 (Lnet/minecraft/class_6382;Lnet/minecraft/class_8209;)V + ARG 2 button + METHOD method_49615 getCurrentTabButton ()Lnet/minecraft/class_8209; + CLASS class_8090 Builder + FIELD field_42151 width I + FIELD field_42152 tabManager Lnet/minecraft/class_8088; + FIELD field_42153 tabs Ljava/util/List; + METHOD (Lnet/minecraft/class_8088;I)V + ARG 1 tabManager + ARG 2 width + METHOD method_48627 build ()Lnet/minecraft/class_8089; + METHOD method_48631 tabs ([Lnet/minecraft/class_8087;)Lnet/minecraft/class_8089$class_8090; + ARG 1 tabs diff --git a/mappings/net/minecraft/client/gui/widget/TextFieldWidget.mapping b/mappings/net/minecraft/client/gui/widget/TextFieldWidget.mapping index e92b9cef7d..c185ba664c 100644 --- a/mappings/net/minecraft/client/gui/widget/TextFieldWidget.mapping +++ b/mappings/net/minecraft/client/gui/widget/TextFieldWidget.mapping @@ -1,5 +1,4 @@ CLASS net/minecraft/class_342 net/minecraft/client/gui/widget/TextFieldWidget - FIELD field_17037 selecting Z FIELD field_2088 changedListener Ljava/util/function/Consumer; FIELD field_2092 text Ljava/lang/String; FIELD field_2094 editable Z @@ -15,13 +14,13 @@ CLASS net/minecraft/class_342 net/minecraft/client/gui/widget/TextFieldWidget FIELD field_2104 textPredicate Ljava/util/function/Predicate; FIELD field_2105 textRenderer Lnet/minecraft/class_327; FIELD field_2106 suggestion Ljava/lang/String; - FIELD field_2107 focusedTicks I FIELD field_2108 maxLength I FIELD field_32196 DEFAULT_EDITABLE_COLOR I FIELD field_32198 VERTICAL_CURSOR_COLOR I FIELD field_32199 HORIZONTAL_CURSOR Ljava/lang/String; - FIELD field_32202 BORDER_COLOR I - FIELD field_32203 BACKGROUND_COLOR I + FIELD field_41100 placeholder Lnet/minecraft/class_2561; + FIELD field_45352 lastSwitchFocusTime J + FIELD field_45914 TEXTURES Lnet/minecraft/class_8666; METHOD (Lnet/minecraft/class_327;IIIILnet/minecraft/class_2561;)V ARG 1 textRenderer ARG 2 x @@ -37,8 +36,11 @@ CLASS net/minecraft/class_342 net/minecraft/client/gui/widget/TextFieldWidget ARG 5 height ARG 6 copyFrom ARG 7 text - METHOD method_16872 setX (I)V - ARG 1 x + METHOD (Lnet/minecraft/class_327;IILnet/minecraft/class_2561;)V + ARG 1 textRenderer + ARG 2 width + ARG 3 height + ARG 4 text METHOD method_16873 erase (I)V ARG 1 offset METHOD method_1851 drawsBackground ()Z @@ -48,8 +50,9 @@ CLASS net/minecraft/class_342 net/minecraft/client/gui/widget/TextFieldWidget ARG 1 wordOffset METHOD method_1854 setRenderTextProvider (Ljava/util/function/BiFunction;)V ARG 1 renderTextProvider - METHOD method_1855 moveCursor (I)V + METHOD method_1855 moveCursor (IZ)V ARG 1 offset + ARG 2 shiftKeyPressed METHOD method_1856 setFocusUnlocked (Z)V ARG 1 focusUnlocked METHOD method_1858 setDrawsBackground (Z)V @@ -66,7 +69,6 @@ CLASS net/minecraft/class_342 net/minecraft/client/gui/widget/TextFieldWidget ARG 1 wordOffset ARG 2 cursorPosition ARG 3 skipOverSpaces - METHOD method_1865 tick ()V METHOD method_1866 getSelectedText ()Ljava/lang/String; METHOD method_1867 write (Ljava/lang/String;)V ARG 1 text @@ -75,8 +77,10 @@ CLASS net/minecraft/class_342 net/minecraft/client/gui/widget/TextFieldWidget METHOD method_1869 getWordSkipPosition (II)I ARG 1 wordOffset ARG 2 cursorPosition - METHOD method_1870 setCursorToStart ()V - METHOD method_1872 setCursorToEnd ()V + METHOD method_1870 setCursorToStart (Z)V + ARG 1 shiftKeyPressed + METHOD method_1872 setCursorToEnd (Z)V + ARG 1 shiftKeyPressed METHOD method_1873 (Ljava/lang/String;Ljava/lang/Integer;)Lnet/minecraft/class_5481; ARG 0 string ARG 1 firstCharacterIndex @@ -84,8 +88,6 @@ CLASS net/minecraft/class_342 net/minecraft/client/gui/widget/TextFieldWidget ARG 1 newText METHOD method_1875 setSelectionStart (I)V ARG 1 cursor - METHOD method_1876 setTextFieldFocused (Z)V - ARG 1 focused METHOD method_1877 eraseWords (I)V ARG 1 wordOffset METHOD method_1878 eraseCharacters (I)V @@ -94,16 +96,18 @@ CLASS net/minecraft/class_342 net/minecraft/client/gui/widget/TextFieldWidget ARG 1 maxLength METHOD method_1881 getCursor ()I METHOD method_1882 getText ()Ljava/lang/String; - METHOD method_1883 setCursor (I)V + METHOD method_1883 setCursor (IZ)V ARG 1 cursor + ARG 2 shiftKeyPressed METHOD method_1884 setSelectionEnd (I)V ARG 1 index METHOD method_1885 isVisible ()Z - METHOD method_1886 drawSelectionHighlight (IIII)V - ARG 1 x1 - ARG 2 y1 - ARG 3 x2 - ARG 4 y2 + METHOD method_1886 drawSelectionHighlight (Lnet/minecraft/class_332;IIII)V + ARG 1 context + ARG 2 x1 + ARG 3 y1 + ARG 4 x2 + ARG 5 y2 METHOD method_1887 setSuggestion (Ljava/lang/String;)V ARG 1 suggestion METHOD method_1888 setEditable (Z)V @@ -116,3 +120,7 @@ CLASS net/minecraft/class_342 net/minecraft/client/gui/widget/TextFieldWidget METHOD method_20316 isEditable ()Z METHOD method_27537 getCursorPosWithOffset (I)I ARG 1 offset + METHOD method_47404 setPlaceholder (Lnet/minecraft/class_2561;)V + ARG 1 placeholder + METHOD method_52719 updateFirstCharacterIndex (I)V + ARG 1 cursor diff --git a/mappings/net/minecraft/client/gui/widget/TextIconButtonWidget.mapping b/mappings/net/minecraft/client/gui/widget/TextIconButtonWidget.mapping new file mode 100644 index 0000000000..bcd4e240e1 --- /dev/null +++ b/mappings/net/minecraft/client/gui/widget/TextIconButtonWidget.mapping @@ -0,0 +1,44 @@ +CLASS net/minecraft/class_8662 net/minecraft/client/gui/widget/TextIconButtonWidget + COMMENT A button with an icon and an optional text. + COMMENT + COMMENT @see ButtonWidget + FIELD field_45379 texture Lnet/minecraft/class_2960; + FIELD field_45380 textureWidth I + FIELD field_45381 textureHeight I + METHOD (IILnet/minecraft/class_2561;IILnet/minecraft/class_2960;Lnet/minecraft/class_4185$class_4241;)V + ARG 1 width + ARG 2 height + ARG 3 message + ARG 4 textureWidth + ARG 5 textureHeight + ARG 6 texture + ARG 7 onPress + METHOD method_52723 builder (Lnet/minecraft/class_2561;Lnet/minecraft/class_4185$class_4241;Z)Lnet/minecraft/class_8662$class_8663; + ARG 0 text + ARG 1 onPress + ARG 2 hideLabel + CLASS class_8663 Builder + FIELD field_45382 text Lnet/minecraft/class_2561; + FIELD field_45383 onPress Lnet/minecraft/class_4185$class_4241; + FIELD field_45384 hideText Z + FIELD field_45385 width I + FIELD field_45386 height I + FIELD field_45387 texture Lnet/minecraft/class_2960; + FIELD field_45388 textureWidth I + FIELD field_45389 textureHeight I + METHOD (Lnet/minecraft/class_2561;Lnet/minecraft/class_4185$class_4241;Z)V + ARG 1 text + ARG 2 onPress + ARG 3 hideText + METHOD method_52724 build ()Lnet/minecraft/class_8662; + METHOD method_52725 width (I)Lnet/minecraft/class_8662$class_8663; + ARG 1 width + METHOD method_52726 dimension (II)Lnet/minecraft/class_8662$class_8663; + ARG 1 width + ARG 2 height + METHOD method_52727 texture (Lnet/minecraft/class_2960;II)Lnet/minecraft/class_8662$class_8663; + ARG 1 texture + ARG 2 width + ARG 3 height + CLASS class_8664 IconOnly + CLASS class_8665 WithText diff --git a/mappings/net/minecraft/client/gui/widget/TextWidget.mapping b/mappings/net/minecraft/client/gui/widget/TextWidget.mapping new file mode 100644 index 0000000000..d5c6199ffe --- /dev/null +++ b/mappings/net/minecraft/client/gui/widget/TextWidget.mapping @@ -0,0 +1,27 @@ +CLASS net/minecraft/class_7842 net/minecraft/client/gui/widget/TextWidget + FIELD field_42121 horizontalAlignment F + METHOD (IIIILnet/minecraft/class_2561;Lnet/minecraft/class_327;)V + ARG 1 x + ARG 2 y + ARG 3 width + ARG 4 height + ARG 5 message + ARG 6 textRenderer + METHOD (IILnet/minecraft/class_2561;Lnet/minecraft/class_327;)V + ARG 1 width + ARG 2 height + ARG 3 message + ARG 4 textRenderer + METHOD (Lnet/minecraft/class_2561;Lnet/minecraft/class_327;)V + ARG 1 message + ARG 2 textRenderer + METHOD method_46438 setTextColor (I)Lnet/minecraft/class_7842; + ARG 1 textColor + METHOD method_48596 alignLeft ()Lnet/minecraft/class_7842; + METHOD method_48597 alignCenter ()Lnet/minecraft/class_7842; + METHOD method_48598 align (F)Lnet/minecraft/class_7842; + ARG 1 horizontalAlignment + METHOD method_48599 alignRight ()Lnet/minecraft/class_7842; + METHOD method_52728 trim (Lnet/minecraft/class_2561;I)Lnet/minecraft/class_5481; + ARG 1 text + ARG 2 width diff --git a/mappings/net/minecraft/client/gui/widget/TexturedButtonWidget.mapping b/mappings/net/minecraft/client/gui/widget/TexturedButtonWidget.mapping index 59f176f9f6..4d0e23f74b 100644 --- a/mappings/net/minecraft/client/gui/widget/TexturedButtonWidget.mapping +++ b/mappings/net/minecraft/client/gui/widget/TexturedButtonWidget.mapping @@ -1,68 +1,23 @@ CLASS net/minecraft/class_344 net/minecraft/client/gui/widget/TexturedButtonWidget - FIELD field_19079 hoveredVOffset I - FIELD field_19080 textureHeight I - FIELD field_2124 textureWidth I - FIELD field_2125 v I - FIELD field_2126 u I - FIELD field_2127 texture Lnet/minecraft/class_2960; - METHOD (IIIIIIILnet/minecraft/class_2960;IILnet/minecraft/class_4185$class_4241;)V + FIELD field_45356 textures Lnet/minecraft/class_8666; + METHOD (IIIILnet/minecraft/class_8666;Lnet/minecraft/class_4185$class_4241;)V ARG 1 x ARG 2 y ARG 3 width ARG 4 height - ARG 5 u - ARG 6 v - ARG 7 hoveredVOffset - ARG 8 texture - ARG 9 textureWidth - ARG 10 textureHeight - ARG 11 pressAction - METHOD (IIIIIIILnet/minecraft/class_2960;IILnet/minecraft/class_4185$class_4241;Lnet/minecraft/class_2561;)V + ARG 5 textures + ARG 6 pressAction + METHOD (IIIILnet/minecraft/class_8666;Lnet/minecraft/class_4185$class_4241;Lnet/minecraft/class_2561;)V ARG 1 x ARG 2 y ARG 3 width ARG 4 height - ARG 5 u - ARG 6 v - ARG 7 hoveredVOffset - ARG 8 texture - ARG 9 textureWidth - ARG 10 textureHeight - ARG 11 pressAction - ARG 12 text - METHOD (IIIIIIILnet/minecraft/class_2960;IILnet/minecraft/class_4185$class_4241;Lnet/minecraft/class_4185$class_5316;Lnet/minecraft/class_2561;)V - ARG 1 x - ARG 2 y - ARG 3 width - ARG 4 height - ARG 5 u - ARG 6 v - ARG 7 hoveredVOffset - ARG 8 texture - ARG 9 textureWidth - ARG 10 textureHeight - ARG 11 pressAction - ARG 12 tooltipSupplier - ARG 13 text - METHOD (IIIIIIILnet/minecraft/class_2960;Lnet/minecraft/class_4185$class_4241;)V - ARG 1 x - ARG 2 y - ARG 3 width - ARG 4 height - ARG 5 u - ARG 6 v - ARG 7 hoveredVOffset - ARG 8 texture - ARG 9 pressAction - METHOD (IIIIIILnet/minecraft/class_2960;Lnet/minecraft/class_4185$class_4241;)V - ARG 1 x - ARG 2 y - ARG 3 width - ARG 4 height - ARG 5 u - ARG 6 v - ARG 7 texture - ARG 8 pressAction - METHOD method_1893 setPos (II)V - ARG 1 x - ARG 2 y + ARG 5 textures + ARG 6 pressAction + ARG 7 text + METHOD (IILnet/minecraft/class_8666;Lnet/minecraft/class_4185$class_4241;Lnet/minecraft/class_2561;)V + ARG 1 width + ARG 2 height + ARG 3 textures + ARG 4 pressAction + ARG 5 text diff --git a/mappings/net/minecraft/client/gui/widget/ThreePartsLayoutWidget.mapping b/mappings/net/minecraft/client/gui/widget/ThreePartsLayoutWidget.mapping new file mode 100644 index 0000000000..4b12b14516 --- /dev/null +++ b/mappings/net/minecraft/client/gui/widget/ThreePartsLayoutWidget.mapping @@ -0,0 +1,39 @@ +CLASS net/minecraft/class_8132 net/minecraft/client/gui/widget/ThreePartsLayoutWidget + FIELD field_42490 DEFAULT_HEADER_FOOTER_HEIGHT I + FIELD field_42491 header Lnet/minecraft/class_7843; + FIELD field_42492 footer Lnet/minecraft/class_7843; + FIELD field_42493 body Lnet/minecraft/class_7843; + FIELD field_42494 screen Lnet/minecraft/class_437; + FIELD field_42495 headerHeight I + FIELD field_42496 footerHeight I + FIELD field_43136 FOOTER_MARGIN_TOP I + METHOD (Lnet/minecraft/class_437;)V + ARG 1 screen + METHOD (Lnet/minecraft/class_437;I)V + ARG 1 screen + ARG 2 headerFooterHeight + METHOD (Lnet/minecraft/class_437;II)V + ARG 1 screen + ARG 2 headerHeight + ARG 3 footerHeight + METHOD method_48991 setFooterHeight (I)V + ARG 1 footerHeight + METHOD method_48992 addHeader (Lnet/minecraft/class_8021;)Lnet/minecraft/class_8021; + ARG 1 widget + METHOD method_48993 addHeader (Lnet/minecraft/class_8021;Ljava/util/function/Consumer;)Lnet/minecraft/class_8021; + ARG 1 widget + ARG 2 callback + METHOD method_48994 getFooterHeight ()I + METHOD method_48995 setHeaderHeight (I)V + ARG 1 headerHeight + METHOD method_48996 addFooter (Lnet/minecraft/class_8021;)Lnet/minecraft/class_8021; + ARG 1 widget + METHOD method_48997 addFooter (Lnet/minecraft/class_8021;Ljava/util/function/Consumer;)Lnet/minecraft/class_8021; + ARG 1 widget + ARG 2 callback + METHOD method_48998 getHeaderHeight ()I + METHOD method_48999 addBody (Lnet/minecraft/class_8021;)Lnet/minecraft/class_8021; + ARG 1 widget + METHOD method_49000 addBody (Lnet/minecraft/class_8021;Ljava/util/function/Consumer;)Lnet/minecraft/class_8021; + ARG 1 widget + ARG 2 callback diff --git a/mappings/net/minecraft/client/gui/widget/ToggleButtonWidget.mapping b/mappings/net/minecraft/client/gui/widget/ToggleButtonWidget.mapping index 705f6c319b..21e399a187 100644 --- a/mappings/net/minecraft/client/gui/widget/ToggleButtonWidget.mapping +++ b/mappings/net/minecraft/client/gui/widget/ToggleButtonWidget.mapping @@ -1,25 +1,14 @@ CLASS net/minecraft/class_361 net/minecraft/client/gui/widget/ToggleButtonWidget - FIELD field_2189 hoverVOffset I - FIELD field_2190 pressedUOffset I - FIELD field_2191 v I - FIELD field_2192 u I - FIELD field_2193 texture Lnet/minecraft/class_2960; FIELD field_2194 toggled Z + FIELD field_45390 textures Lnet/minecraft/class_8666; METHOD (IIIIZ)V ARG 1 x ARG 2 y ARG 3 width ARG 4 height ARG 5 toggled - METHOD method_1962 setTextureUV (IIIILnet/minecraft/class_2960;)V - ARG 1 u - ARG 2 v - ARG 3 pressedUOffset - ARG 4 hoverVOffset - ARG 5 texture - METHOD method_1963 setPos (II)V - ARG 1 x - ARG 2 y + METHOD method_1962 setTextures (Lnet/minecraft/class_8666;)V + ARG 1 textures METHOD method_1964 setToggled (Z)V ARG 1 toggled METHOD method_1965 isToggled ()Z diff --git a/mappings/net/minecraft/client/gui/widget/Widget.mapping b/mappings/net/minecraft/client/gui/widget/Widget.mapping new file mode 100644 index 0000000000..73d746f42a --- /dev/null +++ b/mappings/net/minecraft/client/gui/widget/Widget.mapping @@ -0,0 +1,15 @@ +CLASS net/minecraft/class_8021 net/minecraft/client/gui/widget/Widget + METHOD method_25364 getHeight ()I + METHOD method_25368 getWidth ()I + METHOD method_46419 setY (I)V + ARG 1 y + METHOD method_46421 setX (I)V + ARG 1 x + METHOD method_46426 getX ()I + METHOD method_46427 getY ()I + METHOD method_48202 getNavigationFocus ()Lnet/minecraft/class_8030; + METHOD method_48206 forEachChild (Ljava/util/function/Consumer;)V + ARG 1 consumer + METHOD method_48229 setPosition (II)V + ARG 1 x + ARG 2 y diff --git a/mappings/net/minecraft/client/gui/widget/WrapperWidget.mapping b/mappings/net/minecraft/client/gui/widget/WrapperWidget.mapping new file mode 100644 index 0000000000..c503807098 --- /dev/null +++ b/mappings/net/minecraft/client/gui/widget/WrapperWidget.mapping @@ -0,0 +1,28 @@ +CLASS net/minecraft/class_7838 net/minecraft/client/gui/widget/WrapperWidget + FIELD field_41813 width I + FIELD field_41814 height I + FIELD field_41815 x I + FIELD field_41816 y I + METHOD (IIII)V + ARG 1 x + ARG 2 y + ARG 3 width + ARG 4 height + METHOD method_48223 (ILnet/minecraft/class_8021;)V + ARG 2 element + METHOD method_48226 (ILnet/minecraft/class_8021;)V + ARG 2 element + CLASS class_7839 WrappedElement + FIELD field_40752 widget Lnet/minecraft/class_8021; + FIELD field_40753 positioner Lnet/minecraft/class_7847$class_7848; + METHOD (Lnet/minecraft/class_8021;Lnet/minecraft/class_7847;)V + ARG 1 widget + ARG 2 positioner + METHOD method_46422 getHeight ()I + METHOD method_46423 setX (II)V + ARG 1 left + ARG 2 right + METHOD method_46424 getWidth ()I + METHOD method_46425 setY (II)V + ARG 1 top + ARG 2 bottom diff --git a/mappings/net/minecraft/client/input/Input.mapping b/mappings/net/minecraft/client/input/Input.mapping index c91ba1772f..9d53affcc1 100644 --- a/mappings/net/minecraft/client/input/Input.mapping +++ b/mappings/net/minecraft/client/input/Input.mapping @@ -11,3 +11,4 @@ CLASS net/minecraft/class_744 net/minecraft/client/input/Input METHOD method_3128 getMovementInput ()Lnet/minecraft/class_241; METHOD method_3129 tick (ZF)V ARG 1 slowDown + ARG 2 slowDownFactor diff --git a/mappings/net/minecraft/client/input/KeyCodes.mapping b/mappings/net/minecraft/client/input/KeyCodes.mapping new file mode 100644 index 0000000000..440f1a4368 --- /dev/null +++ b/mappings/net/minecraft/client/input/KeyCodes.mapping @@ -0,0 +1,3 @@ +CLASS net/minecraft/class_8494 net/minecraft/client/input/KeyCodes + METHOD method_51255 isToggle (I)Z + ARG 0 keyCode diff --git a/mappings/net/minecraft/client/item/UnclampedModelPredicateProvider.mapping b/mappings/net/minecraft/client/item/ClampedModelPredicateProvider.mapping similarity index 64% rename from mappings/net/minecraft/client/item/UnclampedModelPredicateProvider.mapping rename to mappings/net/minecraft/client/item/ClampedModelPredicateProvider.mapping index 362b2fcd66..ae516d1de8 100644 --- a/mappings/net/minecraft/client/item/UnclampedModelPredicateProvider.mapping +++ b/mappings/net/minecraft/client/item/ClampedModelPredicateProvider.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_6395 net/minecraft/client/item/UnclampedModelPredicateProvider +CLASS net/minecraft/class_6395 net/minecraft/client/item/ClampedModelPredicateProvider METHOD unclampedCall (Lnet/minecraft/class_1799;Lnet/minecraft/class_638;Lnet/minecraft/class_1309;I)F ARG 1 stack ARG 2 world diff --git a/mappings/net/minecraft/client/item/ModelPredicateProviderRegistry.mapping b/mappings/net/minecraft/client/item/ModelPredicateProviderRegistry.mapping index 3377d1ba1b..69a133919f 100644 --- a/mappings/net/minecraft/client/item/ModelPredicateProviderRegistry.mapping +++ b/mappings/net/minecraft/client/item/ModelPredicateProviderRegistry.mapping @@ -113,6 +113,21 @@ CLASS net/minecraft/class_5272 net/minecraft/client/item/ModelPredicateProviderR ARG 0 world ARG 1 stack ARG 2 entity + METHOD method_43611 (Lnet/minecraft/class_1799;Lnet/minecraft/class_638;Lnet/minecraft/class_1309;I)F + ARG 0 stack + ARG 1 world + ARG 2 entity + ARG 3 seed + METHOD method_48484 (Lnet/minecraft/class_1799;Lnet/minecraft/class_638;Lnet/minecraft/class_1309;I)F + ARG 0 stack + ARG 1 world + ARG 2 entity + ARG 3 seed + METHOD method_49351 (Lnet/minecraft/class_1799;Lnet/minecraft/class_638;Lnet/minecraft/class_1309;I)F + ARG 0 stack + ARG 1 world + ARG 2 entity + ARG 3 seed CLASS 1 FIELD field_7910 step D FIELD field_7911 time D diff --git a/mappings/net/minecraft/client/item/TooltipContext.mapping b/mappings/net/minecraft/client/item/TooltipContext.mapping index a796a35b1c..2e4951e2ae 100644 --- a/mappings/net/minecraft/client/item/TooltipContext.mapping +++ b/mappings/net/minecraft/client/item/TooltipContext.mapping @@ -1,6 +1,7 @@ CLASS net/minecraft/class_1836 net/minecraft/client/item/TooltipContext + FIELD field_41070 BASIC Lnet/minecraft/class_1836$class_1837; + FIELD field_41071 ADVANCED Lnet/minecraft/class_1836$class_1837; + METHOD method_47370 isCreative ()Z METHOD method_8035 isAdvanced ()Z CLASS class_1837 Default - FIELD field_8936 advanced Z - METHOD (Ljava/lang/String;IZ)V - ARG 3 advanced + METHOD method_47371 withCreative ()Lnet/minecraft/class_1836$class_1837; diff --git a/mappings/net/minecraft/client/main/Main.mapping b/mappings/net/minecraft/client/main/Main.mapping index 6a8752528f..5693cf95b6 100644 --- a/mappings/net/minecraft/client/main/Main.mapping +++ b/mappings/net/minecraft/client/main/Main.mapping @@ -11,6 +11,3 @@ CLASS net/minecraft/client/main/Main ARG 0 i METHOD method_38752 toOptional (Ljava/lang/String;)Ljava/util/Optional; ARG 0 string - METHOD method_44604 main ([Ljava/lang/String;Z)V - ARG 0 args - ARG 1 optimizeDataFixer diff --git a/mappings/net/minecraft/client/model/ModelCuboidData.mapping b/mappings/net/minecraft/client/model/ModelCuboidData.mapping index 4930a3dfc8..08051e2f34 100644 --- a/mappings/net/minecraft/client/model/ModelCuboidData.mapping +++ b/mappings/net/minecraft/client/model/ModelCuboidData.mapping @@ -1,12 +1,13 @@ CLASS net/minecraft/class_5604 net/minecraft/client/model/ModelCuboidData FIELD field_27708 name Ljava/lang/String; - FIELD field_27709 offset Lnet/minecraft/class_1160; - FIELD field_27710 dimensions Lnet/minecraft/class_1160; + FIELD field_27709 offset Lorg/joml/Vector3f; + FIELD field_27710 dimensions Lorg/joml/Vector3f; FIELD field_27711 extraSize Lnet/minecraft/class_5605; FIELD field_27712 mirror Z FIELD field_27713 textureUV Lnet/minecraft/class_5611; FIELD field_27714 textureScale Lnet/minecraft/class_5611; - METHOD (Ljava/lang/String;FFFFFFFFLnet/minecraft/class_5605;ZFF)V + FIELD field_42887 directions Ljava/util/Set; + METHOD (Ljava/lang/String;FFFFFFFFLnet/minecraft/class_5605;ZFFLjava/util/Set;)V ARG 1 name ARG 2 textureX ARG 3 textureY @@ -20,6 +21,7 @@ CLASS net/minecraft/class_5604 net/minecraft/client/model/ModelCuboidData ARG 11 mirror ARG 12 textureScaleX ARG 13 textureScaleY + ARG 14 directions METHOD method_32093 createCuboid (II)Lnet/minecraft/class_630$class_628; ARG 1 textureWidth ARG 2 textureHeight diff --git a/mappings/net/minecraft/client/model/ModelPart.mapping b/mappings/net/minecraft/client/model/ModelPart.mapping index 9fe1424c94..7c43cef311 100644 --- a/mappings/net/minecraft/client/model/ModelPart.mapping +++ b/mappings/net/minecraft/client/model/ModelPart.mapping @@ -74,16 +74,16 @@ CLASS net/minecraft/class_630 net/minecraft/client/model/ModelPart ARG 1 transform METHOD method_41919 hasChild (Ljava/lang/String;)Z ARG 1 child - METHOD method_41920 translate (Lnet/minecraft/class_1160;)V + METHOD method_41920 translate (Lorg/joml/Vector3f;)V ARG 1 vec3f METHOD method_41921 getDefaultTransform ()Lnet/minecraft/class_5603; - METHOD method_41922 rotate (Lnet/minecraft/class_1160;)V + METHOD method_41922 rotate (Lorg/joml/Vector3f;)V ARG 1 vec3f METHOD method_41923 resetTransform ()V - METHOD method_41924 scale (Lnet/minecraft/class_1160;)V + METHOD method_41924 scale (Lorg/joml/Vector3f;)V ARG 1 vec3f CLASS class_593 Quad - FIELD field_21618 direction Lnet/minecraft/class_1160; + FIELD field_21618 direction Lorg/joml/Vector3f; FIELD field_3502 vertices [Lnet/minecraft/class_630$class_618; METHOD ([Lnet/minecraft/class_630$class_618;FFFFFFZLnet/minecraft/class_2350;)V ARG 1 vertices @@ -98,14 +98,14 @@ CLASS net/minecraft/class_630 net/minecraft/client/model/ModelPart CLASS class_618 Vertex FIELD field_3603 v F FIELD field_3604 u F - FIELD field_3605 pos Lnet/minecraft/class_1160; + FIELD field_3605 pos Lorg/joml/Vector3f; METHOD (FFFFF)V ARG 1 x ARG 2 y ARG 3 z ARG 4 u ARG 5 v - METHOD (Lnet/minecraft/class_1160;FF)V + METHOD (Lorg/joml/Vector3f;FF)V ARG 1 pos ARG 2 u ARG 3 v @@ -120,7 +120,7 @@ CLASS net/minecraft/class_630 net/minecraft/client/model/ModelPart FIELD field_3647 maxY F FIELD field_3648 maxX F FIELD field_3649 sides [Lnet/minecraft/class_630$class_593; - METHOD (IIFFFFFFFFFZFF)V + METHOD (IIFFFFFFFFFZFFLjava/util/Set;)V ARG 1 u ARG 2 v ARG 3 x diff --git a/mappings/net/minecraft/client/model/ModelPartBuilder.mapping b/mappings/net/minecraft/client/model/ModelPartBuilder.mapping index a4f83191ad..879bc350ac 100644 --- a/mappings/net/minecraft/client/model/ModelPartBuilder.mapping +++ b/mappings/net/minecraft/client/model/ModelPartBuilder.mapping @@ -3,6 +3,7 @@ CLASS net/minecraft/class_5606 net/minecraft/client/model/ModelPartBuilder FIELD field_27720 textureX I FIELD field_27721 textureY I FIELD field_27722 mirror Z + FIELD field_42888 ALL_DIRECTIONS Ljava/util/Set; METHOD method_32096 mirrored ()Lnet/minecraft/class_5606; METHOD method_32097 cuboid (FFFFFF)Lnet/minecraft/class_5606; ARG 1 offsetX @@ -82,3 +83,11 @@ CLASS net/minecraft/class_5606 net/minecraft/client/model/ModelPartBuilder ARG 1 mirror METHOD method_32107 build ()Ljava/util/List; METHOD method_32108 create ()Lnet/minecraft/class_5606; + METHOD method_49304 cuboid (FFFFFFLjava/util/Set;)Lnet/minecraft/class_5606; + ARG 1 offsetX + ARG 2 offsetY + ARG 3 offsetZ + ARG 4 sizeX + ARG 5 sizeY + ARG 6 sizeZ + ARG 7 directions diff --git a/mappings/net/minecraft/client/network/AbstractClientPlayerEntity.mapping b/mappings/net/minecraft/client/network/AbstractClientPlayerEntity.mapping index 601dc9ac7b..a4628a3a3c 100644 --- a/mappings/net/minecraft/client/network/AbstractClientPlayerEntity.mapping +++ b/mappings/net/minecraft/client/network/AbstractClientPlayerEntity.mapping @@ -1,25 +1,14 @@ CLASS net/minecraft/class_742 net/minecraft/client/network/AbstractClientPlayerEntity FIELD field_17892 clientWorld Lnet/minecraft/class_638; - FIELD field_32666 SKIN_URL Ljava/lang/String; FIELD field_3898 elytraRoll F FIELD field_3899 elytraYaw F FIELD field_3900 elytraPitch F FIELD field_3901 playerListEntry Lnet/minecraft/class_640; - METHOD (Lnet/minecraft/class_638;Lcom/mojang/authlib/GameProfile;Lnet/minecraft/class_7428;)V + FIELD field_42906 lastVelocity Lnet/minecraft/class_243; + METHOD (Lnet/minecraft/class_638;Lcom/mojang/authlib/GameProfile;)V ARG 1 world ARG 2 profile - ARG 3 publicKey - METHOD method_3117 getSkinTexture ()Lnet/minecraft/class_2960; METHOD method_3118 getFovMultiplier ()F - METHOD method_3119 getCapeTexture ()Lnet/minecraft/class_2960; - METHOD method_3120 loadSkin (Lnet/minecraft/class_2960;Ljava/lang/String;)V - ARG 0 id - ARG 1 playerName - METHOD method_3121 getModel ()Ljava/lang/String; - METHOD method_3122 getElytraTexture ()Lnet/minecraft/class_2960; METHOD method_3123 getPlayerListEntry ()Lnet/minecraft/class_640; - METHOD method_3124 getSkinId (Ljava/lang/String;)Lnet/minecraft/class_2960; - ARG 0 playerName - METHOD method_3125 canRenderCapeTexture ()Z - METHOD method_3126 canRenderElytraTexture ()Z - METHOD method_3127 hasSkinTexture ()Z + METHOD method_49339 lerpVelocity (F)Lnet/minecraft/class_243; + ARG 1 tickDelta diff --git a/mappings/net/minecraft/client/network/ChatPreviewRequester.mapping b/mappings/net/minecraft/client/network/ChatPreviewRequester.mapping deleted file mode 100644 index e84e50e0ee..0000000000 --- a/mappings/net/minecraft/client/network/ChatPreviewRequester.mapping +++ /dev/null @@ -1,69 +0,0 @@ -CLASS net/minecraft/class_7516 net/minecraft/client/network/ChatPreviewRequester - COMMENT Chat preview requester requests the server to preview a message. - COMMENT - COMMENT

A query is a request to the server to send the chat message preview. - COMMENT The previewer only sends the query if there is no query that is waiting for the response, - COMMENT or if the last query took more than {@value #LATEST_NEXT_QUERY_DELAY} milliseconds to - COMMENT respond. A query can be sent at most every {@value #EARLIEST_NEXT_QUERY_DELAY} milliseconds. - COMMENT - COMMENT @see ChatPreviewer - FIELD field_39423 EARLIEST_NEXT_QUERY_DELAY J - COMMENT How long the previewer should wait at a minimum before sending the next - COMMENT query in milliseconds. Is {@value}. - FIELD field_39424 LATEST_NEXT_QUERY_DELAY J - COMMENT How long the previewer can wait for the response at most before sending the next - COMMENT query in milliseconds. Is {@value}. - FIELD field_39425 client Lnet/minecraft/class_310; - FIELD field_39426 idIncrementor Lnet/minecraft/class_7516$class_7482; - FIELD field_39427 pendingResponseQuery Lnet/minecraft/class_7516$class_7480; - COMMENT The query that is waiting for the server to respond (i.e. the last query). - COMMENT Can be {@code null} if there is no such query. - FIELD field_39428 queryTime J - COMMENT The last time a query was sent. - COMMENT - COMMENT

The next query will be sent after {@value #EARLIEST_NEXT_QUERY_DELAY} to - COMMENT {@value #LATEST_NEXT_QUERY_DELAY} milliseconds; the actual delay depends on - COMMENT when the server responds to the query. - METHOD (Lnet/minecraft/class_310;)V - ARG 1 client - METHOD method_44269 clear ()V - METHOD method_44270 handleResponse (I)Ljava/lang/String; - COMMENT {@return the response's original queried message, or {@code null} if the response - COMMENT is not for {@linkplain #pendingResponseQuery the current pending request}} - COMMENT - COMMENT

If the response is valid, this will also clear {@link #pendingResponseQuery}. - ARG 1 id - METHOD method_44271 shouldRequest (J)Z - COMMENT {@return whether the delay for querying has passed} - COMMENT - COMMENT

The previewer only sends the query if there is no query that is waiting for the response, - COMMENT or if the last query took more than {@value #LATEST_NEXT_QUERY_DELAY} milliseconds to - COMMENT respond. A query can be sent at most every {@value #EARLIEST_NEXT_QUERY_DELAY} milliseconds. - ARG 1 currentTime - METHOD method_44272 tryRequest (Ljava/lang/String;J)Z - COMMENT Sends the request to preview {@code message}, if there isn't already one and - COMMENT if the delay has passed. - COMMENT - COMMENT @return {@code false} if the request could not be sent due to the delay, otherwise - COMMENT {@code true} - ARG 1 message - ARG 2 currentTime - METHOD method_44273 hasPendingResponseQuery ()Z - COMMENT {@return whether the requester has a query that is waiting for the server to respond} - CLASS class_7480 Query - COMMENT A query, or a request, to the server to send the chat message preview. - FIELD comp_825 message Ljava/lang/String; - COMMENT the queried message to preview - METHOD comp_825 message ()Ljava/lang/String; - METHOD method_44043 idEquals (I)Z - ARG 1 id - METHOD method_44044 messageEquals (Ljava/lang/String;)Z - COMMENT {@return whether the query's queried message equals {@code message}} - ARG 1 message - CLASS class_7482 IdIncrementor - COMMENT A utility class that increments the ID by a random number from 0 to 99. - FIELD field_39335 MAX_INCREMENT I - FIELD field_39336 random Lnet/minecraft/class_5819; - FIELD field_39337 current I - METHOD method_44046 next ()I - COMMENT {@return the next ID} diff --git a/mappings/net/minecraft/client/network/ChatPreviewer.mapping b/mappings/net/minecraft/client/network/ChatPreviewer.mapping deleted file mode 100644 index 232dbbb38f..0000000000 --- a/mappings/net/minecraft/client/network/ChatPreviewer.mapping +++ /dev/null @@ -1,95 +0,0 @@ -CLASS net/minecraft/class_7479 net/minecraft/client/network/ChatPreviewer - COMMENT Chat previewer manages the chat preview. Chat previewer is created per - COMMENT {@link net.minecraft.client.gui.screen.ChatScreen}, so closing the chat screen and - COMMENT reopening it would create a new chat previewer. {@link ChatPreviewRequester} - COMMENT handles the actual requesting. - COMMENT - COMMENT

The response to the query can be "consumed" by calling {@link #tryConsumeResponse}. - COMMENT If the response is still valid (i.e. the input has not changed since the query was sent), - COMMENT consuming the response will return the response and clear it. Note that to prevent race - COMMENT condition between the player sending the chat message and the response's arrival, responses - COMMENT can only be consumed after the cooldown (by default, {@value #CONSUME_COOLDOWN} milliseconds) - COMMENT has passed. It is also possible to get the response text without consuming by calling - COMMENT {@link #getPreviewText}. - FIELD field_39328 CONSUME_COOLDOWN J - COMMENT How long the previewer should wait before consuming the response since the response - COMMENT arrived at the client in milliseconds. Is {@value}. - COMMENT - COMMENT @see #tryConsumeResponse - FIELD field_39334 lastResponse Lnet/minecraft/class_7479$class_7481; - FIELD field_39430 lastPreviewedMessage Ljava/lang/String; - FIELD field_39431 pendingRequestMessage Ljava/lang/String; - COMMENT The message that is waiting for the previewer to request (i.e. the next query to be sent). - COMMENT Can be {@code null} if there is no such query. - COMMENT - COMMENT @implNote If the message is sent instantly, this field is not set. - FIELD field_39432 requester Lnet/minecraft/class_7516; - METHOD (Lnet/minecraft/class_310;)V - ARG 1 client - METHOD method_44031 tryRequestPending ()V - COMMENT Sends the message that was waiting for its request delay to pass, if it is able to. - METHOD method_44032 onResponse (ILnet/minecraft/class_2561;)V - COMMENT Called when the preview response was received. - COMMENT - COMMENT @implNote This sets the last response if the requester {@linkplain - COMMENT ChatPreviewRequester#handleResponse successfully handled} the response. - ARG 1 id - ARG 2 previewText - METHOD method_44036 clear ()V - COMMENT Clears the last response and the requester's state. - METHOD method_44037 tryConsumeResponse (Ljava/lang/String;)Lnet/minecraft/class_7479$class_7481; - COMMENT {@return the consumed response text, or {@code null} if the server responded as such, or - COMMENT if the response could not be consumed} - COMMENT - COMMENT

If the response is still valid (i.e. the input has not changed since the query was sent), - COMMENT consuming the response will return the response and clear it. Note that to prevent race - COMMENT condition between the player sending the chat message and the response's arrival, responses - COMMENT can only be consumed after the cooldown (by default, {@value #CONSUME_COOLDOWN} milliseconds) - COMMENT has passed. It is also possible to get the response text without consuming by calling - COMMENT {@link #getPreviewText}. - ARG 1 message - METHOD method_44038 getPreviewText ()Lnet/minecraft/class_7479$class_7481; - COMMENT {@return the preview text (also known as the last response text), or {@code null} - COMMENT if the server responded as such} - COMMENT - COMMENT

This does not consume the response. - METHOD method_44039 normalize (Ljava/lang/String;)Ljava/lang/String; - COMMENT {@return the {@code message} normalized by trimming it and then normalizing spaces} - ARG 0 message - METHOD method_44274 tryRequest (Ljava/lang/String;)V - COMMENT Tries to send the request to preview {@code message}. If the delay has passed, - COMMENT it will send instantly; otherwise, it will set {@link #pendingRequestMessage} which - COMMENT can be requested by calling {@link #tryRequestPending()}. - ARG 1 message - METHOD method_44275 disablePreview ()V - COMMENT Clears this previewer. - METHOD method_44276 tryRequestInternal (Ljava/lang/String;)V - ARG 1 message - METHOD method_44927 equalsLastPreviewed (Ljava/lang/String;)Z - COMMENT {@return whether normalized {@code text} equals the last previewed text} - ARG 1 text - METHOD method_44928 cannotConsumePreview ()Z - COMMENT {@return whether the previewer cannot consume the preview (because the preview - COMMENT response hasn't arrived or because of the cooldown)} - CLASS class_7481 Response - COMMENT A response to the preview query. - FIELD comp_826 receptionTimestamp J - FIELD comp_827 Ljava/lang/String; - COMMENT the message that was queried to preview - FIELD comp_828 previewText Lnet/minecraft/class_2561; - METHOD comp_826 receptionTimestamp ()J - METHOD comp_828 previewText ()Lnet/minecraft/class_2561; - METHOD method_44045 canConsume (Ljava/lang/String;)Z - COMMENT {@return whether the response can be consumed for the {@code message}} - COMMENT - COMMENT

This returns {@code true} if the {@code message} equals the queried message and - COMMENT the cooldown has passed. - ARG 1 message - METHOD method_44929 queryEquals (Ljava/lang/String;)Z - COMMENT {@return whether normalized {@code query} equals the response query} - ARG 1 query - METHOD method_44930 hasCooldownPassed ()Z - COMMENT {@return the cooldown for consuming the preview has passed} - COMMENT - COMMENT @see #canConsume - COMMENT @see ChatPreviewer#tryConsumeResponse diff --git a/mappings/net/minecraft/client/network/ChunkBatchSizeCalculator.mapping b/mappings/net/minecraft/client/network/ChunkBatchSizeCalculator.mapping new file mode 100644 index 0000000000..e4fab7392d --- /dev/null +++ b/mappings/net/minecraft/client/network/ChunkBatchSizeCalculator.mapping @@ -0,0 +1,8 @@ +CLASS net/minecraft/class_8760 net/minecraft/client/network/ChunkBatchSizeCalculator + FIELD field_45941 averageNanosPerChunk D + FIELD field_45942 sampleSize I + FIELD field_45943 startTime J + METHOD method_53483 onStartChunkSend ()V + METHOD method_53484 onChunkSent (I)V + ARG 1 batchSize + METHOD method_53485 getDesiredChunksPerTick ()F diff --git a/mappings/net/minecraft/client/network/ClientAdvancementManager.mapping b/mappings/net/minecraft/client/network/ClientAdvancementManager.mapping index 95c3af8d91..52fabbd381 100644 --- a/mappings/net/minecraft/client/network/ClientAdvancementManager.mapping +++ b/mappings/net/minecraft/client/network/ClientAdvancementManager.mapping @@ -1,23 +1,23 @@ CLASS net/minecraft/class_632 net/minecraft/client/network/ClientAdvancementManager FIELD field_3681 advancementProgresses Ljava/util/Map; FIELD field_3682 listener Lnet/minecraft/class_632$class_633; - FIELD field_3683 manager Lnet/minecraft/class_163; FIELD field_3684 client Lnet/minecraft/class_310; - FIELD field_3685 selectedTab Lnet/minecraft/class_161; + FIELD field_3685 selectedTab Lnet/minecraft/class_8779; FIELD field_3686 LOGGER Lorg/slf4j/Logger; - METHOD (Lnet/minecraft/class_310;)V + FIELD field_44808 worldSession Lnet/minecraft/class_7975; + METHOD (Lnet/minecraft/class_310;Lnet/minecraft/class_7975;)V ARG 1 client + ARG 2 worldSession METHOD method_2861 onAdvancements (Lnet/minecraft/class_2779;)V ARG 1 packet METHOD method_2862 setListener (Lnet/minecraft/class_632$class_633;)V ARG 1 listener - METHOD method_2863 getManager ()Lnet/minecraft/class_163; - METHOD method_2864 selectTab (Lnet/minecraft/class_161;Z)V + METHOD method_2864 selectTab (Lnet/minecraft/class_8779;Z)V ARG 1 tab ARG 2 local CLASS class_633 Listener - METHOD method_2865 setProgress (Lnet/minecraft/class_161;Lnet/minecraft/class_167;)V + METHOD method_2865 setProgress (Lnet/minecraft/class_8781;Lnet/minecraft/class_167;)V ARG 1 advancement ARG 2 progress - METHOD method_2866 selectTab (Lnet/minecraft/class_161;)V + METHOD method_2866 selectTab (Lnet/minecraft/class_8779;)V ARG 1 advancement diff --git a/mappings/net/minecraft/client/network/ClientCommonNetworkHandler.mapping b/mappings/net/minecraft/client/network/ClientCommonNetworkHandler.mapping new file mode 100644 index 0000000000..02068a881b --- /dev/null +++ b/mappings/net/minecraft/client/network/ClientCommonNetworkHandler.mapping @@ -0,0 +1,49 @@ +CLASS net/minecraft/class_8673 net/minecraft/client/network/ClientCommonNetworkHandler + FIELD field_45588 client Lnet/minecraft/class_310; + FIELD field_45589 connection Lnet/minecraft/class_2535; + FIELD field_45590 serverInfo Lnet/minecraft/class_642; + FIELD field_45591 brand Ljava/lang/String; + FIELD field_45592 worldSession Lnet/minecraft/class_7975; + FIELD field_45593 postDisconnectScreen Lnet/minecraft/class_437; + FIELD field_45594 LOST_CONNECTION_TEXT Lnet/minecraft/class_2561; + FIELD field_45595 queuedPackets Ljava/util/List; + FIELD field_45944 LOGGER Lorg/slf4j/Logger; + METHOD (Lnet/minecraft/class_310;Lnet/minecraft/class_2535;Lnet/minecraft/class_8675;)V + ARG 1 client + ARG 2 connection + ARG 3 connectionState + METHOD method_11152 onCustomPayload (Lnet/minecraft/class_8710;)V + ARG 1 payload + METHOD method_29091 getRegistryManager ()Lnet/minecraft/class_5455$class_6890; + METHOD method_52771 handleSynchronizedTagGroup (Lnet/minecraft/class_5321;Lnet/minecraft/class_6864$class_5748;)V + ARG 1 registryRef + ARG 2 tags + METHOD method_52772 (Lnet/minecraft/class_437;Ljava/net/URL;Ljava/lang/String;ZZ)V + ARG 5 confirmed + METHOD method_52773 getParsedResourcePackUrl (Ljava/lang/String;)Ljava/net/URL; + ARG 0 url + METHOD method_52774 (Ljava/lang/Throwable;)Ljava/lang/Void; + ARG 1 throwable + METHOD method_52775 showPackConfirmationScreen (Ljava/net/URL;Ljava/lang/String;ZLnet/minecraft/class_2561;)V + ARG 1 packUrl + ARG 2 sha1 + ARG 3 required + ARG 4 prompt + METHOD method_52777 sendResourcePackStatusAfter (Ljava/util/concurrent/CompletableFuture;)V + ARG 1 future + METHOD method_52778 getPrompt (Lnet/minecraft/class_2561;Lnet/minecraft/class_2561;)Lnet/minecraft/class_2561; + ARG 0 requirementPrompt + ARG 1 customPrompt + METHOD method_52779 send (Lnet/minecraft/class_2596;Ljava/util/function/BooleanSupplier;Ljava/time/Duration;)V + ARG 1 packet + ARG 2 sendCondition + ARG 3 expiry + METHOD method_52785 sendResourcePackStatus (Lnet/minecraft/class_2856$class_2857;)V + ARG 1 status + METHOD method_52786 createDisconnectedScreen (Lnet/minecraft/class_2561;)Lnet/minecraft/class_437; + ARG 1 reason + METHOD method_52787 sendPacket (Lnet/minecraft/class_2596;)V + ARG 1 packet + METHOD method_52789 sendQueuedPackets ()V + METHOD method_52790 getBrand ()Ljava/lang/String; + CLASS class_8137 QueuedPacket diff --git a/mappings/net/minecraft/client/network/ClientConfigurationNetworkHandler.mapping b/mappings/net/minecraft/client/network/ClientConfigurationNetworkHandler.mapping new file mode 100644 index 0000000000..9d4428fa32 --- /dev/null +++ b/mappings/net/minecraft/client/network/ClientConfigurationNetworkHandler.mapping @@ -0,0 +1,9 @@ +CLASS net/minecraft/class_8674 net/minecraft/client/network/ClientConfigurationNetworkHandler + FIELD field_45596 LOGGER Lorg/slf4j/Logger; + FIELD field_45597 profile Lcom/mojang/authlib/GameProfile; + FIELD field_45598 registryManager Lnet/minecraft/class_5455$class_6890; + FIELD field_45599 enabledFeatures Lnet/minecraft/class_7699; + METHOD method_52793 (Lnet/minecraft/class_5455$class_6892;)V + ARG 0 entry + METHOD method_52797 handleCustomPayload (Lnet/minecraft/class_8710;)V + ARG 1 payload diff --git a/mappings/net/minecraft/client/network/ClientConnectionState.mapping b/mappings/net/minecraft/client/network/ClientConnectionState.mapping new file mode 100644 index 0000000000..53a7681fde --- /dev/null +++ b/mappings/net/minecraft/client/network/ClientConnectionState.mapping @@ -0,0 +1,5 @@ +CLASS net/minecraft/class_8675 net/minecraft/client/network/ClientConnectionState + FIELD comp_1612 worldSession Lnet/minecraft/class_7975; + FIELD comp_1616 serverInfo Lnet/minecraft/class_642; + METHOD comp_1612 worldSession ()Lnet/minecraft/class_7975; + METHOD comp_1616 serverInfo ()Lnet/minecraft/class_642; diff --git a/mappings/net/minecraft/client/network/ClientDynamicRegistryType.mapping b/mappings/net/minecraft/client/network/ClientDynamicRegistryType.mapping new file mode 100644 index 0000000000..64f1ac8fb4 --- /dev/null +++ b/mappings/net/minecraft/client/network/ClientDynamicRegistryType.mapping @@ -0,0 +1,4 @@ +CLASS net/minecraft/class_7756 net/minecraft/client/network/ClientDynamicRegistryType + FIELD field_40492 VALUES Ljava/util/List; + FIELD field_40493 STATIC_REGISTRY_MANAGER Lnet/minecraft/class_5455$class_6890; + METHOD method_45738 createCombinedDynamicRegistries ()Lnet/minecraft/class_7780; diff --git a/mappings/net/minecraft/client/network/ClientLoginNetworkHandler.mapping b/mappings/net/minecraft/client/network/ClientLoginNetworkHandler.mapping index d077888390..34c5ca824c 100644 --- a/mappings/net/minecraft/client/network/ClientLoginNetworkHandler.mapping +++ b/mappings/net/minecraft/client/network/ClientLoginNetworkHandler.mapping @@ -2,14 +2,20 @@ CLASS net/minecraft/class_635 net/minecraft/client/network/ClientLoginNetworkHan 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; FIELD field_3710 LOGGER Lorg/slf4j/Logger; FIELD field_3711 statusConsumer Ljava/util/function/Consumer; - METHOD (Lnet/minecraft/class_2535;Lnet/minecraft/class_310;Lnet/minecraft/class_437;Ljava/util/function/Consumer;)V + FIELD field_40481 serverInfo Lnet/minecraft/class_642; + FIELD field_41383 newWorld Z + FIELD field_41384 worldLoadTime Ljava/time/Duration; + FIELD field_44809 minigameName Ljava/lang/String; + METHOD (Lnet/minecraft/class_2535;Lnet/minecraft/class_310;Lnet/minecraft/class_642;Lnet/minecraft/class_437;ZLjava/time/Duration;Ljava/util/function/Consumer;)V ARG 1 connection ARG 2 client - ARG 3 parentGui - ARG 4 statusConsumer + ARG 3 serverInfo + ARG 4 parentScreen + ARG 5 newWorld + ARG 6 worldLoadTime + ARG 7 statusConsumer METHOD method_2891 getSessionService ()Lcom/mojang/authlib/minecraft/MinecraftSessionService; METHOD method_2892 joinServerSession (Ljava/lang/String;)Lnet/minecraft/class_2561; ARG 1 serverId @@ -18,5 +24,5 @@ CLASS net/minecraft/class_635 net/minecraft/client/network/ClientLoginNetworkHan ARG 2 packet ARG 3 decryptionCipher ARG 4 encryptionCipher - METHOD method_44285 ([BJLnet/minecraft/class_7498$class_7499;)V - ARG 3 updater + METHOD method_51768 setMinigameName (Ljava/lang/String;)V + ARG 1 minigameName diff --git a/mappings/net/minecraft/client/network/ClientPlayNetworkHandler.mapping b/mappings/net/minecraft/client/network/ClientPlayNetworkHandler.mapping index 6023d77bc1..5e1b399b71 100644 --- a/mappings/net/minecraft/client/network/ClientPlayNetworkHandler.mapping +++ b/mappings/net/minecraft/client/network/ClientPlayNetworkHandler.mapping @@ -2,15 +2,11 @@ CLASS net/minecraft/class_634 net/minecraft/client/network/ClientPlayNetworkHand FIELD field_16771 sessionId Ljava/util/UUID; FIELD field_19144 chunkLoadDistance I FIELD field_24321 worldProperties Lnet/minecraft/class_638$class_5271; - FIELD field_25063 registryManager Lnet/minecraft/class_5455$class_6890; + FIELD field_25063 combinedDynamicRegistries Lnet/minecraft/class_5455$class_6890; FIELD field_25273 worldKeys Ljava/util/Set; - FIELD field_26620 DISCONNECT_LOST_TEXT Lnet/minecraft/class_2561; - FIELD field_34963 telemetrySender Lnet/minecraft/class_6628; FIELD field_35164 simulationDistance I FIELD field_3687 random Lnet/minecraft/class_5819; FIELD field_3688 recipeManager Lnet/minecraft/class_1863; - FIELD field_3689 connection Lnet/minecraft/class_2535; - FIELD field_3690 client Lnet/minecraft/class_310; FIELD field_3691 commandSource Lnet/minecraft/class_637; FIELD field_3692 dataQueryHandler Lnet/minecraft/class_300; FIELD field_3693 playerListEntries Ljava/util/Map; @@ -19,29 +15,28 @@ CLASS net/minecraft/class_634 net/minecraft/client/network/ClientPlayNetworkHand FIELD field_3697 profile Lcom/mojang/authlib/GameProfile; FIELD field_3699 world Lnet/minecraft/class_638; FIELD field_3700 advancementHandler Lnet/minecraft/class_632; - FIELD field_3701 loginScreen Lnet/minecraft/class_437; FIELD field_39808 messagePacker Lnet/minecraft/class_7610$class_7612; - FIELD field_39857 MAX_PENDING_ACKNOWLEDGMENTS I FIELD field_39858 lastSeenMessagesCollector Lnet/minecraft/class_7637; - FIELD field_39859 lastReceivedMessage Ljava/util/Optional; - FIELD field_39860 pendingAcknowledgments I - COMMENT The number of messages whose acknowledgments aren't sent to the server yet. - COMMENT They are sent when the count reaches {@value #MAX_PENDING_ACKNOWLEDGMENTS} - COMMENT or when the client sends a message, and this count is reset to zero in those cases. FIELD field_39916 UNSECURE_SERVER_TOAST_TITLE Lnet/minecraft/class_2561; FIELD field_39917 UNSECURE_SERVER_TOAST_TEXT Lnet/minecraft/class_2561; - METHOD (Lnet/minecraft/class_310;Lnet/minecraft/class_437;Lnet/minecraft/class_2535;Lcom/mojang/authlib/GameProfile;Lnet/minecraft/class_6628;)V + FIELD field_40483 signatureStorage Lnet/minecraft/class_7561; + FIELD field_40485 INVALID_PACKET_TEXT Lnet/minecraft/class_2561; + FIELD field_40486 CHAT_VALIDATION_FAILED_TEXT Lnet/minecraft/class_2561; + FIELD field_40487 ACKNOWLEDGMENT_BATCH_SIZE I + FIELD field_40489 listedPlayerListEntries Ljava/util/Set; + FIELD field_40799 session Lnet/minecraft/class_7818; + FIELD field_45600 enabledFeatures Lnet/minecraft/class_7699; + FIELD field_45603 RECONFIGURING_TEXT Lnet/minecraft/class_2561; + FIELD field_45945 chunkBatchSizeCalculator Lnet/minecraft/class_8760; + FIELD field_45946 pingMeasurer Lnet/minecraft/class_8761; + FIELD field_45947 displayedUnsecureChatWarning Z + METHOD (Lnet/minecraft/class_310;Lnet/minecraft/class_2535;Lnet/minecraft/class_8675;)V ARG 1 client - ARG 2 screen - ARG 3 connection - ARG 4 profile - ARG 5 telemetrySender METHOD method_16690 getSessionId ()Ljava/util/UUID; METHOD method_19691 getActiveTotemOfUndying (Lnet/minecraft/class_1657;)Lnet/minecraft/class_1799; ARG 0 player - METHOD method_2868 clearWorld ()V METHOD method_2869 getAdvancementHandler ()Lnet/minecraft/class_632; - METHOD method_2870 updateLighting (IILnet/minecraft/class_3568;Lnet/minecraft/class_1944;Ljava/util/BitSet;Ljava/util/BitSet;Ljava/util/Iterator;Z)V + METHOD method_2870 updateLighting (IILnet/minecraft/class_3568;Lnet/minecraft/class_1944;Ljava/util/BitSet;Ljava/util/BitSet;Ljava/util/Iterator;)V ARG 1 chunkX ARG 2 chunkZ ARG 3 provider @@ -49,11 +44,8 @@ CLASS net/minecraft/class_634 net/minecraft/client/network/ClientPlayNetworkHand ARG 5 inited ARG 6 uninited ARG 7 nibbles - ARG 8 nonEdge METHOD method_2871 getPlayerListEntry (Ljava/util/UUID;)Lnet/minecraft/class_640; ARG 1 uuid - METHOD method_2873 sendResourcePackStatus (Lnet/minecraft/class_2856$class_2857;)V - ARG 1 packStatus METHOD method_2874 getPlayerListEntry (Ljava/lang/String;)Lnet/minecraft/class_640; ARG 1 profileName METHOD method_2875 getCommandSource ()Lnet/minecraft/class_637; @@ -61,45 +53,25 @@ CLASS net/minecraft/class_634 net/minecraft/client/network/ClientPlayNetworkHand METHOD method_2877 getRecipeManager ()Lnet/minecraft/class_1863; METHOD method_2879 getProfile ()Lcom/mojang/authlib/GameProfile; METHOD method_2880 getPlayerList ()Ljava/util/Collection; - METHOD method_2883 sendPacket (Lnet/minecraft/class_2596;)V - COMMENT Sends a packet to the server. - ARG 1 packet - COMMENT the packet to send - METHOD method_2885 feedbackAfterDownload (Ljava/util/concurrent/CompletableFuture;)V - ARG 1 downloadFuture METHOD method_2886 getCommandDispatcher ()Lcom/mojang/brigadier/CommandDispatcher; METHOD method_2890 getWorld ()Lnet/minecraft/class_638; - METHOD method_29091 getRegistryManager ()Lnet/minecraft/class_5455; METHOD method_29356 getWorldKeys ()Ljava/util/Set; METHOD method_31363 getPlayerUuids ()Ljava/util/Collection; - METHOD method_34007 (ILnet/minecraft/class_2338;Lnet/minecraft/class_2680;)V - ARG 2 pos - ARG 3 state + METHOD method_34007 (Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;)V + ARG 1 pos + ARG 2 state METHOD method_34008 (Lnet/minecraft/class_1297;Lcom/mojang/datafixers/util/Pair;)V ARG 1 pair - METHOD method_34009 (Lnet/minecraft/class_1703;Lnet/minecraft/class_1860;)V - ARG 2 recipe METHOD method_34010 (Lnet/minecraft/class_268;Lnet/minecraft/class_5900$class_5902;)V ARG 1 team - METHOD method_34011 (Lnet/minecraft/class_299;Lnet/minecraft/class_1860;)V - ARG 2 recipe METHOD method_34012 (Lnet/minecraft/class_299;Lnet/minecraft/class_516;)V ARG 1 recipeResultCollection - METHOD method_34014 (Ljava/net/URL;Ljava/lang/String;ZZ)V - ARG 4 enabled - METHOD method_36322 getServerResourcePackPrompt (Lnet/minecraft/class_2561;Lnet/minecraft/class_2561;)Lnet/minecraft/class_2561; - ARG 0 defaultPrompt - ARG 1 customPrompt METHOD method_37472 (I)V ARG 1 entityId METHOD method_38539 loadChunk (IILnet/minecraft/class_6603;)V ARG 1 x ARG 2 z ARG 3 chunkData - METHOD method_38540 updateChunk (IILnet/minecraft/class_6606;)V - ARG 1 x - ARG 2 z - ARG 3 lightData METHOD method_38541 scheduleRenderChunk (Lnet/minecraft/class_2818;II)V ARG 1 chunk ARG 2 x @@ -110,28 +82,43 @@ CLASS net/minecraft/class_634 net/minecraft/client/network/ClientPlayNetworkHand ARG 1 x ARG 2 z ARG 3 data - METHOD method_38544 unloadChunk (Lnet/minecraft/class_2666;)V - ARG 1 packet - METHOD method_40215 (Lnet/minecraft/class_5455$class_6892;)V - ARG 0 entry - METHOD method_40217 loadTags (Lnet/minecraft/class_5321;Lnet/minecraft/class_6864$class_5748;)V - ARG 1 registryKey - ARG 2 serialized METHOD method_43209 playSpawnSound (Lnet/minecraft/class_1297;)V ARG 1 entity - METHOD method_43331 resolveUrl (Ljava/lang/String;)Ljava/net/URL; - ARG 0 url - METHOD method_44071 (Lnet/minecraft/class_642;Ljava/lang/String;)V - ARG 1 favicon - METHOD method_44072 (Lnet/minecraft/class_642;Lnet/minecraft/class_2561;)V - ARG 1 description - METHOD method_44816 getMessagePacker ()Lnet/minecraft/class_7610$class_7612; METHOD method_44940 acknowledge (Lnet/minecraft/class_7471;Z)V ARG 1 message ARG 2 displayed - METHOD method_44941 consumeAcknowledgment ()Lnet/minecraft/class_7635$class_7636; - COMMENT {@return the consumed acknowledgment} - COMMENT - COMMENT

This resets {@link #pendingAcknowledgments} to {@code 0}. - COMMENT - COMMENT @see #pendingAcknowledgments + METHOD method_45720 hasFeature (Lnet/minecraft/class_7699;)Z + ARG 1 feature + METHOD method_45722 (Ljava/time/Instant;JLnet/minecraft/class_7637$class_7816;Ljava/lang/String;)Lnet/minecraft/class_7469; + ARG 5 value + METHOD method_45726 handlePlayerListAction (Lnet/minecraft/class_2703$class_5893;Lnet/minecraft/class_2703$class_2705;Lnet/minecraft/class_640;)V + ARG 1 action + ARG 2 receivedEntry + ARG 3 currentEntry + METHOD method_45727 setPublicSession (Lnet/minecraft/class_2703$class_2705;Lnet/minecraft/class_640;)V + ARG 1 receivedEntry + ARG 2 currentEntry + METHOD method_45729 sendChatMessage (Ljava/lang/String;)V + ARG 1 content + METHOD method_45730 sendChatCommand (Ljava/lang/String;)V + ARG 1 command + METHOD method_45731 sendCommand (Ljava/lang/String;)Z + ARG 1 command + METHOD method_45732 getListedPlayerListEntries ()Ljava/util/Collection; + METHOD method_45733 parse (Ljava/lang/String;)Lcom/mojang/brigadier/ParseResults; + ARG 1 command + METHOD method_45734 getServerInfo ()Lnet/minecraft/class_642; + METHOD method_45735 getEnabledFeatures ()Lnet/minecraft/class_7699; + METHOD method_45737 sendAcknowledgment ()V + METHOD method_46525 (Ljava/util/Optional;)V + ARG 1 keyPair + METHOD method_46528 (Ljava/util/Optional;)V + ARG 1 keyPair + METHOD method_46529 isSecureChatEnforced ()Z + METHOD method_47657 updateKeyPair (Lnet/minecraft/class_7427;)V + ARG 1 keyPair + METHOD method_47658 clearWorld ()V + METHOD method_48296 getConnection ()Lnet/minecraft/class_2535; + METHOD method_51684 unloadChunk (Lnet/minecraft/class_2666;)V + ARG 1 packet + METHOD method_52802 refreshTagBasedData ()V diff --git a/mappings/net/minecraft/client/network/ClientPlayerEntity.mapping b/mappings/net/minecraft/client/network/ClientPlayerEntity.mapping index efcd29c903..639bdf9550 100644 --- a/mappings/net/minecraft/client/network/ClientPlayerEntity.mapping +++ b/mappings/net/minecraft/client/network/ClientPlayerEntity.mapping @@ -3,7 +3,7 @@ CLASS net/minecraft/class_746 net/minecraft/client/network/ClientPlayerEntity FIELD field_20663 showsDeathScreen Z FIELD field_23093 inSneakingPose Z FIELD field_36194 MAX_SOFT_COLLISION_RADIANS D - FIELD field_3911 lastNauseaStrength F + FIELD field_39078 LOGGER Lorg/slf4j/Logger; FIELD field_3912 clientPermissionLevel I FIELD field_3913 input Lnet/minecraft/class_744; FIELD field_3914 lastRenderPitch F @@ -13,7 +13,6 @@ CLASS net/minecraft/class_746 net/minecraft/client/network/ClientPlayerEntity FIELD field_3918 healthInitialized Z FIELD field_3919 lastSprinting Z FIELD field_3920 lastOnGround Z - FIELD field_3921 ticksSinceSprintingChanged I FIELD field_3922 mountJumpStrength F FIELD field_3923 ticksSinceLastPositionPacketSent I FIELD field_3924 lastZ D @@ -21,7 +20,6 @@ CLASS net/minecraft/class_746 net/minecraft/client/network/ClientPlayerEntity FIELD field_3926 lastX D FIELD field_3927 autoJumpEnabled Z FIELD field_3928 statHandler Lnet/minecraft/class_3469; - FIELD field_3929 nextNauseaStrength F FIELD field_3930 recipeBook Lnet/minecraft/class_299; FIELD field_3931 lastRenderYaw F FIELD field_3932 renderYaw F @@ -34,9 +32,10 @@ CLASS net/minecraft/class_746 net/minecraft/client/network/ClientPlayerEntity FIELD field_3940 lastBaseY D FIELD field_3941 lastYaw F FIELD field_3942 riding Z - FIELD field_3943 serverBrand Ljava/lang/String; FIELD field_3944 networkHandler Lnet/minecraft/class_634; FIELD field_3945 activeHand Lnet/minecraft/class_1268; + FIELD field_44911 nauseaIntensity F + FIELD field_44912 prevNauseaIntensity F METHOD (Lnet/minecraft/class_310;Lnet/minecraft/class_638;Lnet/minecraft/class_634;Lnet/minecraft/class_3469;Lnet/minecraft/class_299;ZZ)V ARG 1 client ARG 2 world @@ -63,11 +62,9 @@ CLASS net/minecraft/class_746 net/minecraft/client/network/ClientPlayerEntity 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 METHOD method_3133 startRidingJump ()V METHOD method_3134 isCamera ()Z - METHOD method_3135 getServerBrand ()Ljava/lang/String; METHOD method_3136 sendMovementPackets ()V METHOD method_3137 closeScreen ()V METHOD method_3138 updateHealth (F)V @@ -77,16 +74,13 @@ CLASS net/minecraft/class_746 net/minecraft/client/network/ClientPlayerEntity METHOD method_3140 getUnderwaterVisibility ()F COMMENT {@return the color multiplier of vision in water} Visibility in COMMENT water is reduced when the player just entered water. - METHOD method_3141 onRecipeDisplayed (Lnet/minecraft/class_1860;)V - ARG 1 recipe + METHOD method_3141 onRecipeDisplayed (Lnet/minecraft/class_8786;)V METHOD method_3143 getStatHandler ()Lnet/minecraft/class_3469; METHOD method_3144 isRiding ()Z METHOD method_3145 setExperience (FII)V ARG 1 progress ARG 2 total ARG 3 level - METHOD method_3146 setServerBrand (Ljava/lang/String;)V - ARG 1 serverBrand METHOD method_3147 setClientPermissionLevel (I)V ARG 1 clientPermissionLevel METHOD method_3148 autoJump (FF)V @@ -95,67 +89,13 @@ CLASS net/minecraft/class_746 net/minecraft/client/network/ClientPlayerEntity METHOD method_3149 isAutoJumpEnabled ()Z METHOD method_3151 getMountJumpStrength ()F METHOD method_33689 init ()V - METHOD method_43609 signChatMessage (Lnet/minecraft/class_7470;Lnet/minecraft/class_7634;Lnet/minecraft/class_7635;)Lnet/minecraft/class_7469; - COMMENT Signs the chat message. If the chat message cannot be signed, this will return - COMMENT {@link MessageSignatureData#EMPTY}. - ARG 1 metadata - ARG 2 content - ARG 3 lastSeenMessages - METHOD method_43786 signArguments (Lnet/minecraft/class_7470;Lcom/mojang/brigadier/ParseResults;Lnet/minecraft/class_2561;Lnet/minecraft/class_7635;)Lnet/minecraft/class_7450; - COMMENT Signs the command arguments. If the arguments cannot be signed or if there is no - COMMENT arguments to sign, this will return {@link ArgumentSignatureDataMap#EMPTY}. - ARG 1 signer - ARG 2 parseResults - ARG 3 preview - COMMENT the previewed argument value; if supplied, will be used for all signed arguments - ARG 4 lastSeenMessages - METHOD method_43787 sendCommandInternal (Ljava/lang/String;Lnet/minecraft/class_2561;)V - COMMENT Signs and sends {@code command} to the server. - ARG 1 command - ARG 2 preview - METHOD method_44096 sendChatMessage (Ljava/lang/String;Lnet/minecraft/class_2561;)V - COMMENT Sends a chat message with the preview to the server. If the server could not - COMMENT reproduce the preview based on {@code message}, the server rejects the message. - COMMENT - COMMENT

The message will be truncated to at most 256 characters before - COMMENT sending to the server. - COMMENT - COMMENT

If the message contains an invalid character (see {@link - COMMENT net.minecraft.SharedConstants#isValidChar}), the server will - COMMENT reject the message and disconnect the client. - COMMENT - COMMENT @apiNote This method is used to send a message typed in {@linkplain - COMMENT net.minecraft.client.gui.screen the chat screen} that has a preview. - ARG 1 message - ARG 2 preview - METHOD method_44097 sendChatMessageInternal (Ljava/lang/String;Lnet/minecraft/class_2561;)V - ARG 1 message - ARG 2 preview - METHOD method_44098 sendCommand (Ljava/lang/String;Lnet/minecraft/class_2561;)V - COMMENT Signs and sends {@code command} to the server. - ARG 1 command - COMMENT the command (without the leading slash) - ARG 2 preview - METHOD method_44099 sendCommand (Ljava/lang/String;)Z - COMMENT Sends an unsigned command to the server. This fails for commands that - COMMENT {@linkplain #hasSignedArgument have signed arguments}. - COMMENT - COMMENT @see #sendCommand(String, Text) - COMMENT @return whether the command was sent successfully - ARG 1 command - COMMENT the command (without the leading slash) - METHOD method_44297 (Lnet/minecraft/class_2561;Lnet/minecraft/class_7501;Lnet/minecraft/class_7470;Lnet/minecraft/class_7635;Ljava/lang/String;Ljava/lang/String;)Lnet/minecraft/class_7469; - ARG 5 argumentName - ARG 6 value - METHOD method_44826 createMessageMetadata ()Lnet/minecraft/class_7470; - METHOD method_44970 hasSignedArgument (Ljava/lang/String;)Z - COMMENT {@return whether {@code command} contains a signed argument} - COMMENT - COMMENT @see ArgumentSignatureDataMap#hasSignedArgument - ARG 1 command - COMMENT the command (without the leading slash) - METHOD method_45081 toDecoratedContents (Ljava/lang/String;Lnet/minecraft/class_2561;)Lnet/minecraft/class_7634; - ARG 1 message - ARG 2 preview + METHOD method_45773 getJumpingMount ()Lnet/minecraft/class_1316; + METHOD method_46742 sendSprintingPacket ()V + METHOD method_46743 canSprint ()Z + METHOD method_48300 canStartSprinting ()Z + METHOD method_48301 canVehicleSprint (Lnet/minecraft/class_1297;)Z + ARG 1 vehicle + METHOD method_51889 onGameModeChanged (Lnet/minecraft/class_1934;)V + ARG 1 gameMode METHOD method_7290 dropSelectedItem (Z)Z ARG 1 entireStack diff --git a/mappings/net/minecraft/client/network/ClientPlayerInteractionManager.mapping b/mappings/net/minecraft/client/network/ClientPlayerInteractionManager.mapping index 6c6d3940e7..a9e79421e2 100644 --- a/mappings/net/minecraft/client/network/ClientPlayerInteractionManager.mapping +++ b/mappings/net/minecraft/client/network/ClientPlayerInteractionManager.mapping @@ -60,9 +60,8 @@ CLASS net/minecraft/class_636 net/minecraft/client/network/ClientPlayerInteracti ARG 1 pos ARG 2 direction METHOD method_2911 syncSelectedSlot ()V - METHOD method_2912 clickRecipe (ILnet/minecraft/class_1860;Z)V + METHOD method_2912 clickRecipe (ILnet/minecraft/class_8786;Z)V ARG 1 syncId - ARG 2 recipe ARG 3 craftAll METHOD method_2913 hasExperienceBar ()Z METHOD method_2914 hasCreativeInventory ()Z @@ -116,3 +115,4 @@ CLASS net/minecraft/class_636 net/minecraft/client/network/ClientPlayerInteracti ARG 3 sequence METHOD method_41936 (Lnet/minecraft/class_2338;Lnet/minecraft/class_2350;I)Lnet/minecraft/class_2596; ARG 3 sequence + METHOD method_51888 getBlockBreakingProgress ()I diff --git a/mappings/net/minecraft/client/network/LanServerQueryManager.mapping b/mappings/net/minecraft/client/network/LanServerQueryManager.mapping index 9f4ecf3a61..57f89433ea 100644 --- a/mappings/net/minecraft/client/network/LanServerQueryManager.mapping +++ b/mappings/net/minecraft/client/network/LanServerQueryManager.mapping @@ -10,9 +10,7 @@ CLASS net/minecraft/class_1134 net/minecraft/client/network/LanServerQueryManage CLASS class_1136 LanServerEntryList FIELD field_5536 serverEntries Ljava/util/List; FIELD field_5537 dirty Z - METHOD method_4823 needsUpdate ()Z + METHOD method_45912 getEntriesIfUpdated ()Ljava/util/List; METHOD method_4824 addServer (Ljava/lang/String;Ljava/net/InetAddress;)V ARG 1 announcement ARG 2 address - METHOD method_4825 markClean ()V - METHOD method_4826 getServers ()Ljava/util/List; diff --git a/mappings/net/minecraft/client/network/LegacyServerPinger.mapping b/mappings/net/minecraft/client/network/LegacyServerPinger.mapping new file mode 100644 index 0000000000..4a8cd30781 --- /dev/null +++ b/mappings/net/minecraft/client/network/LegacyServerPinger.mapping @@ -0,0 +1,22 @@ +CLASS net/minecraft/class_8676 net/minecraft/client/network/LegacyServerPinger + FIELD field_45604 SPLITTER Lcom/google/common/base/Splitter; + FIELD field_45605 serverAddress Lnet/minecraft/class_639; + FIELD field_45606 handler Lnet/minecraft/class_8676$class_8677; + METHOD (Lnet/minecraft/class_639;Lnet/minecraft/class_8676$class_8677;)V + ARG 1 serverAddress + ARG 2 handler + METHOD channelActive (Lio/netty/channel/ChannelHandlerContext;)V + ARG 1 context + METHOD channelRead0 (Lio/netty/channel/ChannelHandlerContext;Ljava/lang/Object;)V + ARG 1 context + ARG 2 buf + METHOD exceptionCaught (Lio/netty/channel/ChannelHandlerContext;Ljava/lang/Throwable;)V + ARG 1 context + ARG 2 throwable + CLASS class_8677 ResponseHandler + METHOD handleResponse (ILjava/lang/String;Ljava/lang/String;II)V + ARG 1 protocolVersion + ARG 2 version + ARG 3 label + ARG 4 currentPlayers + ARG 5 maxPlayers diff --git a/mappings/net/minecraft/client/network/MultiplayerServerListPinger.mapping b/mappings/net/minecraft/client/network/MultiplayerServerListPinger.mapping index 69dbcc9037..ec0998b2bc 100644 --- a/mappings/net/minecraft/client/network/MultiplayerServerListPinger.mapping +++ b/mappings/net/minecraft/client/network/MultiplayerServerListPinger.mapping @@ -1,15 +1,15 @@ CLASS net/minecraft/class_644 net/minecraft/client/network/MultiplayerServerListPinger FIELD field_33740 CANNOT_CONNECT_TEXT Lnet/minecraft/class_2561; FIELD field_3769 clientConnections Ljava/util/List; - FIELD field_3770 ZERO_SPLITTER Lcom/google/common/base/Splitter; FIELD field_3771 LOGGER Lorg/slf4j/Logger; METHOD method_27647 createPlayerCountText (II)Lnet/minecraft/class_2561; ARG 0 current ARG 1 max METHOD method_3000 tick ()V - METHOD method_3001 ping (Ljava/net/InetSocketAddress;Lnet/minecraft/class_642;)V - ARG 1 address - ARG 2 info + METHOD method_3001 ping (Ljava/net/InetSocketAddress;Lnet/minecraft/class_639;Lnet/minecraft/class_642;)V + ARG 1 socketAddress + ARG 2 address + ARG 3 serverInfo METHOD method_3003 add (Lnet/minecraft/class_642;Ljava/lang/Runnable;)V ARG 1 entry ARG 2 saver @@ -17,19 +17,24 @@ CLASS net/minecraft/class_644 net/minecraft/client/network/MultiplayerServerList METHOD method_36897 showError (Lnet/minecraft/class_2561;Lnet/minecraft/class_642;)V ARG 1 error ARG 2 info + METHOD method_48297 (Lnet/minecraft/class_2583;)Lnet/minecraft/class_2583; + ARG 0 style CLASS 1 FIELD field_3772 startTime J FIELD field_3773 received Z FIELD field_3775 sentQuery Z + METHOD method_49308 (Lnet/minecraft/class_642;Lnet/minecraft/class_2926$class_2927;)V + ARG 1 players + METHOD method_49309 (Lnet/minecraft/class_642;Lnet/minecraft/class_2926$class_2930;)V + ARG 1 version + METHOD method_49310 (Lnet/minecraft/class_642;Ljava/lang/Runnable;Lnet/minecraft/class_2926$class_8145;)V + ARG 2 favicon CLASS 2 METHOD initChannel (Lio/netty/channel/Channel;)V ARG 1 channel - CLASS 1 - METHOD channelActive (Lio/netty/channel/ChannelHandlerContext;)V - ARG 1 context - METHOD channelRead0 (Lio/netty/channel/ChannelHandlerContext;Ljava/lang/Object;)V - ARG 1 context - ARG 2 buf - METHOD exceptionCaught (Lio/netty/channel/ChannelHandlerContext;Ljava/lang/Throwable;)V - ARG 1 context - ARG 2 throwable + METHOD method_52813 (Lnet/minecraft/class_642;ILjava/lang/String;Ljava/lang/String;II)V + ARG 1 protocolVersion + ARG 2 version + ARG 3 label + ARG 4 currentPlayers + ARG 5 maxPlayers diff --git a/mappings/net/minecraft/client/network/OtherClientPlayerEntity.mapping b/mappings/net/minecraft/client/network/OtherClientPlayerEntity.mapping index 89ef0e8d3a..1c4b4b7557 100644 --- a/mappings/net/minecraft/client/network/OtherClientPlayerEntity.mapping +++ b/mappings/net/minecraft/client/network/OtherClientPlayerEntity.mapping @@ -1,2 +1,4 @@ CLASS net/minecraft/class_745 net/minecraft/client/network/OtherClientPlayerEntity COMMENT Represents a player entity that is present on the client but is not the client's own player. + FIELD field_42907 clientVelocity Lnet/minecraft/class_243; + FIELD field_42908 velocityLerpDivisor I diff --git a/mappings/net/minecraft/client/network/PingMeasurer.mapping b/mappings/net/minecraft/client/network/PingMeasurer.mapping new file mode 100644 index 0000000000..676d51f5f3 --- /dev/null +++ b/mappings/net/minecraft/client/network/PingMeasurer.mapping @@ -0,0 +1,9 @@ +CLASS net/minecraft/class_8761 net/minecraft/client/network/PingMeasurer + FIELD field_45948 handler Lnet/minecraft/class_634; + FIELD field_45949 log Lnet/minecraft/class_8743; + METHOD (Lnet/minecraft/class_634;Lnet/minecraft/class_8743;)V + ARG 1 handler + ARG 2 log + METHOD method_53486 ping ()V + METHOD method_53487 onPingResult (Lnet/minecraft/class_2923;)V + ARG 1 packet diff --git a/mappings/net/minecraft/client/network/PlayerListEntry.mapping b/mappings/net/minecraft/client/network/PlayerListEntry.mapping index 81d7213483..673d3acd1c 100644 --- a/mappings/net/minecraft/client/network/PlayerListEntry.mapping +++ b/mappings/net/minecraft/client/network/PlayerListEntry.mapping @@ -1,62 +1,34 @@ CLASS net/minecraft/class_640 net/minecraft/client/network/PlayerListEntry - FIELD field_3736 health I - FIELD field_3737 lastHealthTime J - FIELD field_3738 lastHealth I FIELD field_3739 latency I - FIELD field_3740 texturesLoaded Z FIELD field_3741 profile Lcom/mojang/authlib/GameProfile; - FIELD field_3742 textures Ljava/util/Map; FIELD field_3743 displayName Lnet/minecraft/class_2561; FIELD field_3744 gameMode Lnet/minecraft/class_1934; - FIELD field_3745 model Ljava/lang/String; - FIELD field_3746 showTime J - FIELD field_3747 blinkingHeartTime J - FIELD field_39072 LOGGER Lorg/slf4j/Logger; - FIELD field_39073 publicKeyData Lnet/minecraft/class_7428; FIELD field_39809 messageVerifier Lnet/minecraft/class_7615; - METHOD (Lnet/minecraft/class_2703$class_2705;Lnet/minecraft/class_7500;Z)V - ARG 1 playerListPacketEntry - ARG 2 servicesSignatureVerifier - ARG 3 secureChatEnforced + FIELD field_40495 session Lnet/minecraft/class_7822; + FIELD field_45607 texturesSupplier Ljava/util/function/Supplier; + METHOD (Lcom/mojang/authlib/GameProfile;Z)V + ARG 1 profile + ARG 2 secureChatEnforced METHOD method_2955 getScoreboardTeam ()Lnet/minecraft/class_268; - METHOD method_2956 (Lcom/mojang/authlib/minecraft/MinecraftProfileTexture$Type;Lnet/minecraft/class_2960;Lcom/mojang/authlib/minecraft/MinecraftProfileTexture;)V - ARG 1 type - ARG 2 id - ARG 3 texture - METHOD method_2957 getElytraTexture ()Lnet/minecraft/class_2960; METHOD method_2958 getGameMode ()Lnet/minecraft/class_1934; METHOD method_2959 getLatency ()I - METHOD method_2960 getHealth ()I - METHOD method_2961 getBlinkingHeartTime ()J 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_2964 setShowTime (J)V - ARG 1 showTime - METHOD method_2965 setHealth (I)V - ARG 1 health 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. - COMMENT - COMMENT

If the player has the default skin, this will return false. - METHOD method_2968 getSkinTexture ()Lnet/minecraft/class_2960; - METHOD method_2969 loadTextures ()V METHOD method_2970 setLatency (I)V ARG 1 latency METHOD method_2971 getDisplayName ()Lnet/minecraft/class_2561; - METHOD method_2972 setLastHealth (I)V - ARG 1 lastHealth - METHOD method_2973 getLastHealth ()I - METHOD method_2974 getLastHealthTime ()J - METHOD method_2975 setBlinkingHeartTime (J)V - ARG 1 blinkingHeartTime - METHOD method_2976 getShowTime ()J - METHOD method_2977 getModel ()Ljava/lang/String; - METHOD method_2978 setLastHealthTime (J)V - ARG 1 lastHealthTime - METHOD method_2979 getCapeTexture ()Lnet/minecraft/class_2960; - METHOD method_35757 hasCape ()Z - METHOD method_43598 getPublicKeyData ()Lnet/minecraft/class_7428; METHOD method_44817 getMessageVerifier ()Lnet/minecraft/class_7615; + METHOD method_45740 setSession (Lnet/minecraft/class_7822;)V + ARG 1 session + METHOD method_45741 getSession ()Lnet/minecraft/class_7822; + METHOD method_45742 hasPublicKey ()Z + METHOD method_46530 resetSession (Z)V + ARG 1 secureChatEnforced + METHOD method_46531 getInitialVerifier (Z)Lnet/minecraft/class_7615; + ARG 0 secureChatEnforced + METHOD method_52803 texturesSupplier (Lcom/mojang/authlib/GameProfile;)Ljava/util/function/Supplier; + ARG 0 profile + METHOD method_52810 getSkinTextures ()Lnet/minecraft/class_8685; diff --git a/mappings/net/minecraft/client/network/ServerInfo.mapping b/mappings/net/minecraft/client/network/ServerInfo.mapping index 37b695c12e..09711b51a5 100644 --- a/mappings/net/minecraft/client/network/ServerInfo.mapping +++ b/mappings/net/minecraft/client/network/ServerInfo.mapping @@ -14,24 +14,20 @@ CLASS net/minecraft/class_642 net/minecraft/client/network/ServerInfo FIELD field_3756 protocolVersion I FIELD field_3757 label Lnet/minecraft/class_2561; FIELD field_3758 ping J - FIELD field_3759 icon Ljava/lang/String; FIELD field_3760 version Lnet/minecraft/class_2561; FIELD field_3761 address Ljava/lang/String; FIELD field_3762 playerListSummary Ljava/util/List; - FIELD field_3763 local Z - FIELD field_39355 LOGGER Lorg/slf4j/Logger; - FIELD field_39356 chatPreview Lnet/minecraft/class_642$class_7484; - FIELD field_39436 temporaryChatPreviewState Z FIELD field_39918 secureChatEnforced Z - METHOD (Ljava/lang/String;Ljava/lang/String;Z)V + FIELD field_41861 players Lnet/minecraft/class_2926$class_2927; + FIELD field_42889 LOGGER Lorg/slf4j/Logger; + FIELD field_42890 favicon [B + FIELD field_45608 serverType Lnet/minecraft/class_642$class_8678; + METHOD (Ljava/lang/String;Ljava/lang/String;Lnet/minecraft/class_642$class_8678;)V ARG 1 name ARG 2 address - ARG 3 local - METHOD method_2989 setIcon (Ljava/lang/String;)V - ARG 1 icon + ARG 3 serverType METHOD method_2990 getResourcePackPolicy ()Lnet/minecraft/class_642$class_643; COMMENT {@return the policy on resource packs sent by this server} - METHOD method_2991 getIcon ()Ljava/lang/String; METHOD method_2992 toNbt ()Lnet/minecraft/class_2487; METHOD method_2993 fromNbt (Lnet/minecraft/class_2487;)Lnet/minecraft/class_642; ARG 0 root @@ -44,30 +40,18 @@ CLASS net/minecraft/class_642 net/minecraft/client/network/ServerInfo ARG 1 resourcePackPolicy METHOD method_2996 copyWithSettingsFrom (Lnet/minecraft/class_642;)V ARG 1 serverInfo - METHOD method_44077 (Lnet/minecraft/class_642;Lnet/minecraft/class_642$class_7484;)V - ARG 1 chatPreview - METHOD method_44078 parseFavicon (Ljava/lang/String;)Ljava/lang/String; - ARG 0 favicon - METHOD method_44079 (Lnet/minecraft/class_2487;Lnet/minecraft/class_2520;)V - ARG 1 chatPreview - METHOD method_44080 setPreviewsChat (Z)V - COMMENT Sets whether the chat preview is enabled. This affects the saved server info; - COMMENT to disable the chat preview temporarily use {@link #setTemporaryChatPreviewState}. - ARG 1 enabled - METHOD method_44081 getChatPreview ()Lnet/minecraft/class_642$class_7484; - METHOD method_44082 shouldPreviewChat ()Z METHOD method_44292 copyFrom (Lnet/minecraft/class_642;)V ARG 1 serverInfo - METHOD method_44293 setTemporaryChatPreviewState (Z)V - COMMENT Sets the temporary chat preview state. Unlike {@link #setPreviewsChat}, this - COMMENT does not affect the saved server info. - ARG 1 temporaryChatPreviewState METHOD method_45055 setSecureChatEnforced (Z)V ARG 1 secureChatEnforced METHOD method_45056 isSecureChatEnforced ()Z + METHOD method_49305 setFavicon ([B)V + ARG 1 favicon + METHOD method_49306 getFavicon ()[B + METHOD method_52811 isRealm ()Z CLASS class_643 ResourcePackPolicy COMMENT The policy of the client when this server sends a {@linkplain - COMMENT net.minecraft.network.packet.s2c.play.ResourcePackSendS2CPacket server + COMMENT net.minecraft.network.packet.s2c.common.ResourcePackSendS2CPacket server COMMENT resource pack}. COMMENT COMMENT @see ServerInfo#getResourcePackPolicy() @@ -83,23 +67,4 @@ CLASS net/minecraft/class_642 net/minecraft/client/network/ServerInfo METHOD (Ljava/lang/String;ILjava/lang/String;)V ARG 3 name METHOD method_2997 getName ()Lnet/minecraft/class_2561; - CLASS class_7484 ChatPreview - FIELD field_39357 CODEC Lcom/mojang/serialization/Codec; - FIELD field_39358 acknowledged Z - FIELD field_39359 toastShown Z - METHOD (ZZ)V - ARG 1 acknowledged - ARG 2 toastShown - METHOD method_44083 setAcknowledged ()V - METHOD method_44084 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; - ARG 0 instance - METHOD method_44085 (Lnet/minecraft/class_642$class_7484;)Ljava/lang/Boolean; - ARG 0 chatPreview - METHOD method_44086 showToast ()Z - COMMENT If the chat preview toast is never shown, returns {@code true} and marks that the - COMMENT toast was shown; otherwise, returns {@code false}. - METHOD method_44087 (Lnet/minecraft/class_642$class_7484;)Ljava/lang/Boolean; - ARG 0 chatPreview - METHOD method_44088 isAcknowledged ()Z - COMMENT {@return whether the player acknowledged the chat preview warning} - METHOD method_44089 copy ()Lnet/minecraft/class_642$class_7484; + CLASS class_8678 ServerType diff --git a/mappings/net/minecraft/client/network/message/MessageHandler.mapping b/mappings/net/minecraft/client/network/message/MessageHandler.mapping index 908b6fd4e8..a6358f2ad1 100644 --- a/mappings/net/minecraft/client/network/message/MessageHandler.mapping +++ b/mappings/net/minecraft/client/network/message/MessageHandler.mapping @@ -4,14 +4,10 @@ CLASS net/minecraft/class_7594 net/minecraft/client/network/message/MessageHandl FIELD field_39796 delayedMessages Ljava/util/Deque; FIELD field_39797 chatDelay J FIELD field_39798 lastProcessTime J - FIELD field_39904 CHAT_VALIDATION_FAILED_DISCONNECT_REASON Lnet/minecraft/class_2561; + FIELD field_45950 VALIDATION_ERROR_TEXT Lnet/minecraft/class_2561; METHOD (Lnet/minecraft/class_310;)V ARG 1 client - METHOD method_44731 getPlayerListEntry (Ljava/util/UUID;)Lnet/minecraft/class_640; - COMMENT {@return the player list entry for {@code sender}, or {@code null} if the sender's - COMMENT UUID did not correspond to any known players} - ARG 1 sender - METHOD method_44732 getStatus (Lnet/minecraft/class_7471;Lnet/minecraft/class_2561;Lnet/minecraft/class_640;Ljava/time/Instant;)Lnet/minecraft/class_7595; + METHOD method_44732 getStatus (Lnet/minecraft/class_7471;Lnet/minecraft/class_2561;Ljava/time/Instant;)Lnet/minecraft/class_7595; COMMENT {@return the trust status of {@code message}} COMMENT COMMENT

This returns {@link MessageTrustStatus#SECURE} for messages that are @@ -21,17 +17,7 @@ CLASS net/minecraft/class_7594 net/minecraft/client/network/message/MessageHandl COMMENT @see MessageTrustStatus#getStatus ARG 1 message ARG 2 decorated - ARG 3 senderEntry - ARG 4 receptionTimestamp - METHOD method_44733 onChatMessage (Lnet/minecraft/class_7471;Lnet/minecraft/class_2556$class_7602;)V - COMMENT Called when a chat message is received. - COMMENT - COMMENT

This enqueues the message to be processed after the chat delay set in - COMMENT options, if any. - COMMENT - COMMENT @see #processChatMessage - ARG 1 message - ARG 2 params + ARG 3 receptionTimestamp METHOD method_44734 extractSender (Lnet/minecraft/class_2561;)Ljava/util/UUID; ARG 1 text METHOD method_44735 addToChatLog (Lnet/minecraft/class_2561;Ljava/time/Instant;)V @@ -43,10 +29,10 @@ CLASS net/minecraft/class_7594 net/minecraft/client/network/message/MessageHandl COMMENT

Game messages ignore chat delay. ARG 1 message ARG 2 overlay - METHOD method_44737 addToChatLog (Lnet/minecraft/class_7471;Lnet/minecraft/class_2556$class_7602;Lnet/minecraft/class_640;Lnet/minecraft/class_7595;)V + METHOD method_44737 addToChatLog (Lnet/minecraft/class_7471;Lnet/minecraft/class_2556$class_7602;Lcom/mojang/authlib/GameProfile;Lnet/minecraft/class_7595;)V ARG 1 message ARG 2 params - ARG 3 senderEntry + ARG 3 sender ARG 4 trustStatus METHOD method_44738 isAlwaysTrusted (Ljava/util/UUID;)Z COMMENT {@return whether messages from {@code sender} are always trusted} @@ -60,33 +46,6 @@ CLASS net/minecraft/class_7594 net/minecraft/client/network/message/MessageHandl COMMENT Sets the chat delay to {@code chatDelay} seconds. If the chat delay was changed COMMENT to {@code 0}, this also processes all queued messages. ARG 1 chatDelay - METHOD method_44767 processProfilelessMessage (Lnet/minecraft/class_2556$class_7602;Lnet/minecraft/class_7471;Lnet/minecraft/class_2561;)Z - COMMENT Processes a message that is sent as chat message but lacks the sender. - COMMENT - COMMENT

This is usually a message sent via commands executed from {@code /execute} - COMMENT command. - COMMENT - COMMENT

This adds the message to the hud, narrates it, and appends it to the - COMMENT chat log. The message is not verified. - ARG 1 params - ARG 2 message - ARG 3 decorated - METHOD method_44768 processChatMessage (Lnet/minecraft/class_2556$class_7602;Lnet/minecraft/class_7471;Lnet/minecraft/class_2561;Lnet/minecraft/class_640;ZLjava/time/Instant;)Z - COMMENT Processes a chat message and sends acknowledgment to the server. - COMMENT - COMMENT

The message can still end up not being displayed if the verification - COMMENT fails and {@code onlyShowSecureChat} is {@code true} or if the sender is - COMMENT blocked via the social interactions screen. - COMMENT - COMMENT @return whether the message was actually displayed - COMMENT @see #processChatMessageInternal - ARG 1 params - ARG 2 message - ARG 3 decorated - ARG 4 senderEntry - ARG 5 onlyShowSecureChat - ARG 6 receptionTimestamp - COMMENT the timestamp when the message was received by this client METHOD method_44769 process ()V COMMENT Processes one delayed message from the queue's beginning. METHOD method_44772 narrate (Lnet/minecraft/class_2556$class_7602;Lnet/minecraft/class_2561;)V @@ -97,10 +56,11 @@ CLASS net/minecraft/class_7594 net/minecraft/client/network/message/MessageHandl ARG 2 message METHOD method_44775 shouldDelay ()Z COMMENT {@return if the chat delay is set and the message should be delayed} - METHOD method_44818 process (Lnet/minecraft/class_7594$class_7627;)V + METHOD method_44818 process (Lnet/minecraft/class_7469;Ljava/util/function/BooleanSupplier;)V COMMENT Queues {@code processor} during {@linkplain #shouldDelay the chat delay}, COMMENT otherwise runs the processor. - ARG 1 message + ARG 1 signature + ARG 2 processor METHOD method_44819 removeDelayedMessage (Lnet/minecraft/class_7469;)Z COMMENT Removes a delayed message whose signature matches {@code signature}. COMMENT If this returns {@code false}, either the message is not received or it it @@ -108,36 +68,7 @@ CLASS net/minecraft/class_7594 net/minecraft/client/network/message/MessageHandl COMMENT COMMENT @return whether the message was removed ARG 1 signature - METHOD method_44820 onMessageHeader (Lnet/minecraft/class_7614;Lnet/minecraft/class_7469;[B)V - COMMENT Called when a message header is received. - COMMENT - COMMENT

Message header is received instead of the full message when a message is censored - COMMENT or when the message is originally sent without metadata due to it being originated from - COMMENT entities. This is to keep the integrity of the "message chain". - ARG 1 header - ARG 2 signature - ARG 3 bodyDigest - METHOD method_44821 processHeader (Lnet/minecraft/class_7614;Lnet/minecraft/class_7469;[B)Z - COMMENT Processes a received message header. - COMMENT - COMMENT

Message header is received instead of the full message when a message is censored - COMMENT or when the message is originally sent without metadata due to it being originated from - COMMENT entities. This is to keep the integrity of the "message chain". - COMMENT - COMMENT

If the header cannot be verified due to a broken chain, this disconnects - COMMENT the client from the server. - COMMENT - COMMENT

This adds the header to the chat log. - ARG 1 header - ARG 2 signature - ARG 3 bodyDigest - METHOD method_44822 addToChatLog (Lnet/minecraft/class_7614;Lnet/minecraft/class_7469;[B)V - ARG 1 header - ARG 2 signatures - ARG 3 bodyDigest - METHOD method_44942 (Lnet/minecraft/class_7594$class_7627;)V - ARG 0 message - METHOD method_44943 processChatMessageInternal (Lnet/minecraft/class_2556$class_7602;Lnet/minecraft/class_7471;Lnet/minecraft/class_2561;Lnet/minecraft/class_640;ZLjava/time/Instant;)Z + METHOD method_44943 processChatMessageInternal (Lnet/minecraft/class_2556$class_7602;Lnet/minecraft/class_7471;Lnet/minecraft/class_2561;Lcom/mojang/authlib/GameProfile;ZLjava/time/Instant;)Z COMMENT Processes a chat message. COMMENT COMMENT

If the message cannot be verified due to a broken chain, this disconnects @@ -154,7 +85,7 @@ CLASS net/minecraft/class_7594 net/minecraft/client/network/message/MessageHandl ARG 1 params ARG 2 message ARG 3 decorated - ARG 4 senderEntry + ARG 4 sender ARG 5 onlyShowSecureChat ARG 6 receptionTimestamp COMMENT the timestamp when the message was received by this client @@ -162,22 +93,20 @@ CLASS net/minecraft/class_7594 net/minecraft/client/network/message/MessageHandl COMMENT {@return the number of delayed messages that are not processed yet} METHOD method_44945 processAll ()V COMMENT Processes all delayed messages from the queue. - METHOD method_45031 disconnect ()V - COMMENT Disconnects from the server with reason {@link #CHAT_VALIDATION_FAILED_DISCONNECT_REASON}. - CLASS 1 - FIELD field_39868 processed Z + METHOD method_45746 onProfilelessMessage (Lnet/minecraft/class_2561;Lnet/minecraft/class_2556$class_7602;)V + ARG 1 content + ARG 2 params + METHOD method_45747 (Lnet/minecraft/class_7469;Lnet/minecraft/class_7594$class_7627;)Z + ARG 1 message + METHOD method_45748 onChatMessage (Lnet/minecraft/class_7471;Lcom/mojang/authlib/GameProfile;Lnet/minecraft/class_2556$class_7602;)V + ARG 1 message + ARG 2 sender + ARG 3 params + METHOD method_53488 onUnverifiedMessage (Ljava/util/UUID;Lnet/minecraft/class_2556$class_7602;)V + ARG 1 sender + ARG 2 parameters CLASS class_7627 ProcessableMessage COMMENT A message to be processed. An instance is created for each received message. - METHOD accept ()Z + METHOD method_45750 accept ()Z COMMENT If this is not processed yet, adds the message to the hud; otherwise, processes COMMENT the message header without adding to the hud. - METHOD method_44946 markProcessed ()V - COMMENT Marks this as processed. - METHOD method_44947 removeMatching (Lnet/minecraft/class_7469;)Z - COMMENT If {@code signature} equals this message's signature, marks this - COMMENT as processed and returns {@code true}. Otherwise, returns {@code false}. - COMMENT - COMMENT @return whether the passed signature matches the message's signature - ARG 1 signature - METHOD method_44948 isUnprocessed ()Z - COMMENT {@return {@code true} if this is not processed yet} diff --git a/mappings/net/minecraft/client/network/message/MessageTrustStatus.mapping b/mappings/net/minecraft/client/network/message/MessageTrustStatus.mapping index fd2a352f2d..a5b3806246 100644 --- a/mappings/net/minecraft/client/network/message/MessageTrustStatus.mapping +++ b/mappings/net/minecraft/client/network/message/MessageTrustStatus.mapping @@ -1,9 +1,22 @@ CLASS net/minecraft/class_7595 net/minecraft/client/network/message/MessageTrustStatus + FIELD field_40801 CODEC Lcom/mojang/serialization/Codec; + FIELD field_40802 id Ljava/lang/String; + METHOD (Ljava/lang/String;ILjava/lang/String;)V + ARG 3 id METHOD method_44740 isInsecure ()Z METHOD method_44741 createIndicator (Lnet/minecraft/class_7471;)Lnet/minecraft/class_7591; ARG 1 message - METHOD method_44742 getStatus (Lnet/minecraft/class_7471;Lnet/minecraft/class_2561;Lnet/minecraft/class_640;Ljava/time/Instant;)Lnet/minecraft/class_7595; + METHOD method_44742 getStatus (Lnet/minecraft/class_7471;Lnet/minecraft/class_2561;Ljava/time/Instant;)Lnet/minecraft/class_7595; ARG 0 message ARG 1 decorated - ARG 2 sender - ARG 3 receptionTimestamp + ARG 2 receptionTimestamp + METHOD method_45754 isNotInDefaultFont (Lnet/minecraft/class_2561;)Z + ARG 0 content + METHOD method_45755 isModified (Lnet/minecraft/class_7471;Lnet/minecraft/class_2561;)Z + ARG 0 message + ARG 1 decorated + METHOD method_45756 isNotInDefaultFont (Lnet/minecraft/class_2583;)Z + ARG 0 style + METHOD method_45757 (Lnet/minecraft/class_2583;Ljava/lang/String;)Ljava/util/Optional; + ARG 0 style + ARG 1 part diff --git a/mappings/net/minecraft/client/option/AoMode.mapping b/mappings/net/minecraft/client/option/AoMode.mapping deleted file mode 100644 index aa17ce7b8b..0000000000 --- a/mappings/net/minecraft/client/option/AoMode.mapping +++ /dev/null @@ -1,9 +0,0 @@ -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; - METHOD (Ljava/lang/String;IILjava/lang/String;)V - ARG 3 id - ARG 4 translationKey - METHOD method_18484 byId (I)Lnet/minecraft/class_4060; - ARG 0 id diff --git a/mappings/net/minecraft/client/option/AttackIndicator.mapping b/mappings/net/minecraft/client/option/AttackIndicator.mapping index 3af7778022..ce0ba70b07 100644 --- a/mappings/net/minecraft/client/option/AttackIndicator.mapping +++ b/mappings/net/minecraft/client/option/AttackIndicator.mapping @@ -1,5 +1,5 @@ CLASS net/minecraft/class_4061 net/minecraft/client/option/AttackIndicator - FIELD field_18154 VALUES [Lnet/minecraft/class_4061; + FIELD field_18154 BY_ID Ljava/util/function/IntFunction; FIELD field_18155 id I FIELD field_18156 translationKey Ljava/lang/String; METHOD (Ljava/lang/String;IILjava/lang/String;)V diff --git a/mappings/net/minecraft/client/option/ChatPreviewMode.mapping b/mappings/net/minecraft/client/option/ChatPreviewMode.mapping deleted file mode 100644 index 3f74782c2b..0000000000 --- a/mappings/net/minecraft/client/option/ChatPreviewMode.mapping +++ /dev/null @@ -1,9 +0,0 @@ -CLASS net/minecraft/class_7628 net/minecraft/client/option/ChatPreviewMode - FIELD field_39876 VALUES [Lnet/minecraft/class_7628; - FIELD field_39877 id I - FIELD field_39878 translationKey Ljava/lang/String; - METHOD (Ljava/lang/String;IILjava/lang/String;)V - ARG 3 id - ARG 4 translationKey - METHOD method_44952 byId (I)Lnet/minecraft/class_7628; - ARG 0 id diff --git a/mappings/net/minecraft/client/option/ChatVisibility.mapping b/mappings/net/minecraft/client/option/ChatVisibility.mapping index 9d5284d65a..df5dab6212 100644 --- a/mappings/net/minecraft/client/option/ChatVisibility.mapping +++ b/mappings/net/minecraft/client/option/ChatVisibility.mapping @@ -1,5 +1,5 @@ CLASS net/minecraft/class_1659 net/minecraft/client/option/ChatVisibility - FIELD field_7534 VALUES [Lnet/minecraft/class_1659; + FIELD field_7534 BY_ID Ljava/util/function/IntFunction; FIELD field_7535 id I FIELD field_7540 translationKey Ljava/lang/String; METHOD (Ljava/lang/String;IILjava/lang/String;)V diff --git a/mappings/net/minecraft/client/option/CloudRenderMode.mapping b/mappings/net/minecraft/client/option/CloudRenderMode.mapping index 632d9a9df8..53f245761f 100644 --- a/mappings/net/minecraft/client/option/CloudRenderMode.mapping +++ b/mappings/net/minecraft/client/option/CloudRenderMode.mapping @@ -1,6 +1,9 @@ CLASS net/minecraft/class_4063 net/minecraft/client/option/CloudRenderMode FIELD field_18167 translationKey Ljava/lang/String; FIELD field_38440 id I - METHOD (Ljava/lang/String;IILjava/lang/String;)V + FIELD field_45285 CODEC Lcom/mojang/serialization/Codec; + FIELD field_45286 serializedId Ljava/lang/String; + METHOD (Ljava/lang/String;IILjava/lang/String;Ljava/lang/String;)V ARG 3 id - ARG 4 translationKey + ARG 4 serializedId + ARG 5 translationKey diff --git a/mappings/net/minecraft/client/option/GameOptions.mapping b/mappings/net/minecraft/client/option/GameOptions.mapping index e239083d47..f596732d45 100644 --- a/mappings/net/minecraft/client/option/GameOptions.mapping +++ b/mappings/net/minecraft/client/option/GameOptions.mapping @@ -74,7 +74,6 @@ CLASS net/minecraft/class_315 net/minecraft/client/option/GameOptions FIELD field_1863 client Lnet/minecraft/class_310; FIELD field_1864 lastServer Ljava/lang/String; FIELD field_1865 invertYMouse Lnet/minecraft/class_7172; - FIELD field_1866 debugEnabled Z FIELD field_1867 sprintKey Lnet/minecraft/class_304; COMMENT A key binding for sprinting. COMMENT Bound to {@linkplain org.lwjgl.glfw.GLFW#GLFW_KEY_LEFT_CONTROL the left control key} by default. @@ -105,7 +104,6 @@ CLASS net/minecraft/class_315 net/minecraft/client/option/GameOptions FIELD field_1879 saveToolbarActivatorKey Lnet/minecraft/class_304; COMMENT A key binding for saving the hotbar items in {@linkplain net.minecraft.world.GameMode#CREATIVE creative mode}. COMMENT Bound to {@linkplain org.lwjgl.glfw.GLFW#GLFW_KEY_C the C key} by default. - FIELD field_1880 debugProfilerEnabled Z FIELD field_1881 backKey Lnet/minecraft/class_304; COMMENT A key binding for moving backward. COMMENT Bound to {@linkplain org.lwjgl.glfw.GLFW#GLFW_KEY_S the S key} by default. @@ -124,7 +122,6 @@ CLASS net/minecraft/class_315 net/minecraft/client/option/GameOptions COMMENT Bound to {@linkplain org.lwjgl.glfw.GLFW#GLFW_KEY_T the T key} by default. FIELD field_1891 bobView Lnet/minecraft/class_7172; FIELD field_1892 enabledPlayerModelParts Ljava/util/Set; - FIELD field_1893 debugTpsEnabled Z FIELD field_1894 forwardKey Lnet/minecraft/class_304; COMMENT A key binding for moving forward. COMMENT Bound to {@linkplain org.lwjgl.glfw.GLFW#GLFW_KEY_W the W key} by default. @@ -139,7 +136,6 @@ CLASS net/minecraft/class_315 net/minecraft/client/option/GameOptions FIELD field_1904 useKey Lnet/minecraft/class_304; COMMENT A key binding for using an item, such as placing a block. COMMENT Bound to {@linkplain org.lwjgl.glfw.GLFW#GLFW_MOUSE_BUTTON_RIGHT the right mouse button} by default. - FIELD field_1905 heldItemTooltips Z FIELD field_1906 spectatorOutlinesKey Lnet/minecraft/class_304; COMMENT A key binding for highlighting players in {@linkplain net.minecraft.world.GameMode#SPECTATOR spectator mode}. COMMENT Not bound to any keys by default. @@ -155,7 +151,7 @@ CLASS net/minecraft/class_315 net/minecraft/client/option/GameOptions COMMENT Bound to {@linkplain org.lwjgl.glfw.GLFW#GLFW_KEY_A the A key} by default. FIELD field_1914 smoothCameraEnabled Z FIELD field_1915 chatWidth Lnet/minecraft/class_7172; - FIELD field_1916 soundVolumeLevels Lit/unimi/dsi/fastutil/objects/Object2FloatMap; + FIELD field_1916 soundVolumeLevels Ljava/util/Map; FIELD field_19244 discreteMouseScroll Lnet/minecraft/class_7172; FIELD field_20308 rawMouseInput Lnet/minecraft/class_7172; FIELD field_21332 sneakToggled Lnet/minecraft/class_7172; @@ -205,18 +201,28 @@ CLASS net/minecraft/class_315 net/minecraft/client/option/GameOptions FIELD field_38298 HOLD_KEY_TEXT Lnet/minecraft/class_2561; FIELD field_38299 HIDE_MATCHED_NAMES_TOOLTIP Lnet/minecraft/class_2561; FIELD field_38300 MAX_FRAMERATE I - FIELD field_39319 chatPreview Lnet/minecraft/class_7172; FIELD field_39320 ONLY_SHOW_SECURE_CHAT_TOOLTIP Lnet/minecraft/class_2561; FIELD field_39321 onlyShowSecureChat Lnet/minecraft/class_7172; - FIELD field_39835 OFF_CHAT_PREVIEW_TOOLTIP Lnet/minecraft/class_2561; - FIELD field_39836 LIVE_CHAT_PREVIEW_TOOLTIP Lnet/minecraft/class_2561; - FIELD field_39837 CONFIRM_CHAT_PREVIEW_TOOLTIP Lnet/minecraft/class_2561; + FIELD field_40382 panoramaSpeed Lnet/minecraft/class_7172; + FIELD field_41094 operatorItemsTab Lnet/minecraft/class_7172; + FIELD field_41335 TELEMETRY_TOOLTIP Lnet/minecraft/class_2561; + FIELD field_41336 telemetryOptInExtra Lnet/minecraft/class_7172; + FIELD field_41783 NOTIFICATION_DISPLAY_TIME_TOOLTIP Lnet/minecraft/class_2561; + FIELD field_41784 notificationDisplayTime Lnet/minecraft/class_7172; + FIELD field_41785 onboardAccessibility Z + FIELD field_42112 GLINT_SPEED_TOOLTIP Lnet/minecraft/class_2561; + FIELD field_42113 glintSpeed Lnet/minecraft/class_7172; + FIELD field_42114 GLINT_STRENGTH_TOOLTIP Lnet/minecraft/class_2561; + FIELD field_42115 glintStrength Lnet/minecraft/class_7172; + FIELD field_42481 DAMAGE_TILT_STRENGTH_TOOLTIP Lnet/minecraft/class_2561; + FIELD field_42482 damageTiltStrength Lnet/minecraft/class_7172; + FIELD field_43043 HIGH_CONTRAST_TOOLTIP Lnet/minecraft/class_2561; + FIELD field_43044 highContrast Lnet/minecraft/class_7172; + FIELD field_43110 MAX_SERIALIZABLE_GUI_SCALE I + FIELD field_45987 narratorHotkey Lnet/minecraft/class_7172; METHOD (Lnet/minecraft/class_310;Ljava/io/File;)V ARG 1 client ARG 2 optionsFile - METHOD method_1624 setSoundVolume (Lnet/minecraft/class_3419;F)V - ARG 1 category - ARG 2 volume METHOD method_1626 update (Lnet/minecraft/class_2487;)Lnet/minecraft/class_2487; ARG 1 nbt METHOD method_1627 addResourcePackProfilesToManager (Lnet/minecraft/class_3283;)V @@ -261,11 +267,6 @@ CLASS net/minecraft/class_315 net/minecraft/client/option/GameOptions ARG 0 value METHOD method_33666 accept (Lnet/minecraft/class_315$class_5823;)V ARG 1 visitor - METHOD method_33667 (Lnet/minecraft/class_315$class_5823;Lnet/minecraft/class_3419;Ljava/lang/Float;)Ljava/lang/Float; - ARG 1 category - ARG 2 currentLevel - METHOD method_33668 (Lit/unimi/dsi/fastutil/objects/Object2FloatOpenHashMap;)V - ARG 0 map METHOD method_33671 parseList (Ljava/lang/String;)Ljava/util/List; ARG 0 content METHOD method_37293 (Lcom/mojang/datafixers/util/Pair;)Ljava/lang/String; @@ -278,10 +279,6 @@ CLASS net/minecraft/class_315 net/minecraft/client/option/GameOptions METHOD method_41772 getMonochromeLogo ()Lnet/minecraft/class_7172; METHOD method_41773 toMouseWheelSensitivitySliderProgressValue (D)I ARG 0 value - METHOD method_41774 (Lnet/minecraft/class_310;)Lnet/minecraft/class_7172$class_7277; - ARG 0 client - METHOD method_41775 (Ljava/util/List;Ljava/util/List;Ljava/util/List;Lnet/minecraft/class_6597;)Ljava/util/List; - ARG 3 value METHOD method_41776 (Lnet/minecraft/class_6597;)V ARG 0 value METHOD method_41777 (Ljava/lang/Boolean;)V @@ -300,8 +297,6 @@ CLASS net/minecraft/class_315 net/minecraft/client/option/GameOptions ARG 0 prefix ARG 1 value METHOD method_41784 getHideLightningFlashes ()Lnet/minecraft/class_7172; - METHOD method_41785 (Lnet/minecraft/class_4060;)V - ARG 0 value METHOD method_41788 (Lnet/minecraft/class_2561;Ljava/lang/Double;)Lnet/minecraft/class_2561; ARG 0 optionText ARG 1 value @@ -379,8 +374,6 @@ CLASS net/minecraft/class_315 net/minecraft/client/option/GameOptions ARG 1 value METHOD method_42456 (Lnet/minecraft/class_1659;)V ARG 0 value - METHOD method_42457 (Lcom/mojang/datafixers/util/Either;)Ljava/lang/Integer; - ARG 0 either METHOD method_42458 (Lnet/minecraft/class_4061;)V ARG 0 value METHOD method_42459 (Lnet/minecraft/class_4063;)V @@ -400,22 +393,12 @@ CLASS net/minecraft/class_315 net/minecraft/client/option/GameOptions ARG 0 value METHOD method_42468 (Ljava/lang/Integer;)V ARG 0 value - METHOD method_42470 (Ljava/util/List;Ljava/util/List;Ljava/lang/Boolean;)Ljava/util/List; - ARG 2 value - METHOD method_42471 (Ljava/util/List;Ljava/util/List;Ljava/util/List;Lnet/minecraft/class_5365;)Ljava/util/List; - ARG 3 graphicsMode METHOD method_42472 getDarknessEffectScale ()Lnet/minecraft/class_7172; METHOD method_42473 getGamma ()Lnet/minecraft/class_7172; METHOD method_42474 getGuiScale ()Lnet/minecraft/class_7172; METHOD method_42475 getParticles ()Lnet/minecraft/class_7172; METHOD method_42476 getNarrator ()Lnet/minecraft/class_7172; METHOD method_42477 getSoundDevice ()Lnet/minecraft/class_7172; - METHOD method_42481 (Lnet/minecraft/class_1306;)Ljava/lang/String; - ARG 0 value - METHOD method_42483 (Lcom/mojang/datafixers/util/Either;)Lnet/minecraft/class_4063; - ARG 0 either - METHOD method_42485 (Lnet/minecraft/class_4063;)Lcom/mojang/datafixers/util/Either; - ARG 0 cloudRenderMode METHOD method_42486 (Lnet/minecraft/class_5365;)Z ARG 0 graphicsMode METHOD method_42489 (Lnet/minecraft/class_2561;Lnet/minecraft/class_4065;)Lnet/minecraft/class_2561; @@ -454,8 +437,6 @@ CLASS net/minecraft/class_315 net/minecraft/client/option/GameOptions METHOD method_42510 getSimulationDistance ()Lnet/minecraft/class_7172; METHOD method_42511 (I)Ljava/lang/Integer; ARG 0 value - METHOD method_42512 (Lnet/minecraft/class_310;)Lnet/minecraft/class_7172$class_7277; - ARG 0 client METHOD method_42513 (Ljava/lang/Boolean;)V ARG 1 value METHOD method_42514 (Ljava/lang/Double;)V @@ -481,17 +462,11 @@ CLASS net/minecraft/class_315 net/minecraft/client/option/GameOptions ARG 1 value METHOD method_42526 (Ljava/lang/Double;)V ARG 0 value - METHOD method_42527 (Ljava/lang/String;)Lnet/minecraft/class_1306; - ARG 0 value METHOD method_42528 getCloudRenderMode ()Lnet/minecraft/class_7172; - METHOD method_42529 (Lnet/minecraft/class_310;)Lnet/minecraft/class_7172$class_7277; - ARG 0 client METHOD method_42530 (Ljava/lang/Boolean;)V ARG 0 value METHOD method_42532 (Ljava/lang/Integer;)Ljava/lang/Double; ARG 0 value - METHOD method_42533 (Ljava/lang/String;)Lnet/minecraft/class_4063; - ARG 0 cloudRenderMode METHOD method_42534 getGraphicsMode ()Lnet/minecraft/class_7172; METHOD method_42535 (Ljava/lang/Boolean;)V ARG 1 value @@ -507,27 +482,17 @@ CLASS net/minecraft/class_315 net/minecraft/client/option/GameOptions METHOD method_42541 (Ljava/lang/Integer;)V ARG 0 value METHOD method_42542 getChatOpacity ()Lnet/minecraft/class_7172; - METHOD method_42543 (Ljava/lang/Boolean;)Ljava/lang/Integer; - ARG 0 value METHOD method_42544 (Ljava/lang/Double;)I ARG 0 value METHOD method_42545 (Lnet/minecraft/class_2561;Ljava/lang/Integer;)Lnet/minecraft/class_2561; ARG 0 optionText ARG 1 value METHOD method_42546 getChatLineSpacing ()Lnet/minecraft/class_7172; - METHOD method_42547 (Ljava/lang/Boolean;)Lnet/minecraft/class_4063; - ARG 0 value METHOD method_42548 (Lnet/minecraft/class_2561;Ljava/lang/Double;)Lnet/minecraft/class_2561; ARG 0 optionText ARG 1 value - METHOD method_42549 (Ljava/lang/Integer;)Ljava/lang/Integer; - ARG 0 value METHOD method_42550 getTextBackgroundOpacity ()Lnet/minecraft/class_7172; - METHOD method_42551 (Ljava/lang/Integer;)Ljava/lang/Integer; - ARG 0 value METHOD method_42552 getMainArm ()Lnet/minecraft/class_7172; - METHOD method_42553 (Ljava/lang/Integer;)Ljava/lang/Boolean; - ARG 0 value METHOD method_42554 getChatScale ()Lnet/minecraft/class_7172; METHOD method_42555 (Ljava/lang/Integer;)V ARG 0 value @@ -563,14 +528,71 @@ CLASS net/minecraft/class_315 net/minecraft/client/option/GameOptions METHOD method_42728 (Lnet/minecraft/class_2561;Ljava/lang/Double;)Lnet/minecraft/class_2561; ARG 0 optionText ARG 1 value - METHOD method_44025 getChatPreview ()Lnet/minecraft/class_7172; METHOD method_44026 getOnlyShowSecureChat ()Lnet/minecraft/class_7172; - METHOD method_44915 (Lnet/minecraft/class_310;)Lnet/minecraft/class_7172$class_7277; - ARG 0 client - METHOD method_44916 (Lnet/minecraft/class_310;Lnet/minecraft/class_7628;)Ljava/util/List; + METHOD method_45575 (Lnet/minecraft/class_3419;Ljava/lang/Double;)V + ARG 1 value + METHOD method_45576 createSoundVolumeOption (Ljava/lang/String;Lnet/minecraft/class_3419;)Lnet/minecraft/class_7172; + ARG 1 key + ARG 2 category + METHOD method_45577 (Ljava/util/EnumMap;)V + ARG 1 soundVolumeLevels + METHOD method_45578 getSoundVolumeOption (Lnet/minecraft/class_3419;)Lnet/minecraft/class_7172; + ARG 1 category + METHOD method_45579 (Lnet/minecraft/class_2561;Ljava/lang/Double;)Lnet/minecraft/class_2561; + ARG 0 prefix + ARG 1 value + METHOD method_45580 (Ljava/lang/Double;)V + ARG 0 value + METHOD method_45581 getPanoramaSpeed ()Lnet/minecraft/class_7172; + METHOD method_47395 getOperatorItemsTab ()Lnet/minecraft/class_7172; + METHOD method_47396 (Lnet/minecraft/class_6597;)Lnet/minecraft/class_7919; + ARG 0 value + METHOD method_47397 (Lnet/minecraft/class_5365;)Lnet/minecraft/class_7919; + ARG 0 value + METHOD method_47398 (Ljava/lang/Boolean;)Lnet/minecraft/class_7919; + ARG 0 value + METHOD method_47607 (Ljava/lang/Boolean;)V + ARG 0 value + METHOD method_47608 (Lnet/minecraft/class_2561;Ljava/lang/Boolean;)Lnet/minecraft/class_2561; + ARG 0 optionText + ARG 1 value + METHOD method_47609 getTelemetryOptInExtra ()Lnet/minecraft/class_7172; + METHOD method_47999 (Ljava/lang/Boolean;)V + ARG 0 value + METHOD method_48187 (I)Ljava/lang/Double; + ARG 0 sliderProgressValue + METHOD method_48188 (Ljava/lang/Double;)V + ARG 0 value + METHOD method_48189 (Lnet/minecraft/class_2561;Ljava/lang/Double;)Lnet/minecraft/class_2561; + ARG 0 optionText + ARG 1 value + METHOD method_48190 (Ljava/lang/Double;)I + ARG 0 value + METHOD method_48191 getNotificationDisplayTime ()Lnet/minecraft/class_7172; + METHOD method_48580 getGlintSpeed ()Lnet/minecraft/class_7172; + METHOD method_48581 getGlintStrength ()Lnet/minecraft/class_7172; + METHOD method_48582 (Ljava/lang/Double;)V + ARG 0 value + METHOD method_48583 (Lnet/minecraft/class_2561;Ljava/lang/Double;)Lnet/minecraft/class_2561; + ARG 0 optionText + ARG 1 value + METHOD method_48584 (Lnet/minecraft/class_2561;Ljava/lang/Double;)Lnet/minecraft/class_2561; + ARG 0 optionText + ARG 1 value + METHOD method_48974 getDamageTiltStrength ()Lnet/minecraft/class_7172; + METHOD method_48975 (Ljava/lang/Double;)V + ARG 0 value + METHOD method_48976 (Lnet/minecraft/class_2561;Ljava/lang/Double;)Lnet/minecraft/class_2561; + ARG 0 optionText + ARG 1 value + METHOD method_49598 refreshResourcePacks (Lnet/minecraft/class_3283;)V + ARG 1 resourcePackManager + METHOD method_49599 (Ljava/lang/Boolean;)V ARG 1 value - METHOD method_44917 (Lnet/minecraft/class_7628;)V + METHOD method_49600 getHighContrast ()Lnet/minecraft/class_7172; + METHOD method_52704 (Ljava/lang/Boolean;)Lnet/minecraft/class_4063; ARG 0 value + METHOD method_53530 getNarratorHotkey ()Lnet/minecraft/class_7172; CLASS 2 METHOD method_33676 find (Ljava/lang/String;)Ljava/lang/String; ARG 1 key diff --git a/mappings/net/minecraft/client/option/GraphicsMode.mapping b/mappings/net/minecraft/client/option/GraphicsMode.mapping index 74f7f0bc0b..bd8a432470 100644 --- a/mappings/net/minecraft/client/option/GraphicsMode.mapping +++ b/mappings/net/minecraft/client/option/GraphicsMode.mapping @@ -1,5 +1,5 @@ CLASS net/minecraft/class_5365 net/minecraft/client/option/GraphicsMode - FIELD field_25430 VALUES [Lnet/minecraft/class_5365; + FIELD field_25430 BY_ID Ljava/util/function/IntFunction; FIELD field_25431 id I FIELD field_25432 translationKey Ljava/lang/String; METHOD (Ljava/lang/String;IILjava/lang/String;)V diff --git a/mappings/net/minecraft/client/option/KeyBinding.mapping b/mappings/net/minecraft/client/option/KeyBinding.mapping index dd9174c8cc..14252a4ef4 100644 --- a/mappings/net/minecraft/client/option/KeyBinding.mapping +++ b/mappings/net/minecraft/client/option/KeyBinding.mapping @@ -84,3 +84,4 @@ CLASS net/minecraft/class_304 net/minecraft/client/option/KeyBinding METHOD method_16007 getBoundKeyLocalizedText ()Lnet/minecraft/class_2561; METHOD method_23481 setPressed (Z)V ARG 1 pressed + METHOD method_52231 untoggleStickyKeys ()V diff --git a/mappings/net/minecraft/client/option/NarratorMode.mapping b/mappings/net/minecraft/client/option/NarratorMode.mapping index 00d4a18729..bc1e210530 100644 --- a/mappings/net/minecraft/client/option/NarratorMode.mapping +++ b/mappings/net/minecraft/client/option/NarratorMode.mapping @@ -9,7 +9,7 @@ CLASS net/minecraft/class_4065 net/minecraft/client/option/NarratorMode COMMENT The narrator narrates chat messages. FIELD field_18179 Lnet/minecraft/class_4065; COMMENT The narrator narrates system text, including screens. - FIELD field_18180 VALUES [Lnet/minecraft/class_4065; + FIELD field_18180 BY_ID Ljava/util/function/IntFunction; FIELD field_18181 id I FIELD field_24212 name Lnet/minecraft/class_2561; METHOD (Ljava/lang/String;IILjava/lang/String;)V diff --git a/mappings/net/minecraft/client/option/ParticlesMode.mapping b/mappings/net/minecraft/client/option/ParticlesMode.mapping index e5af6dd599..6d64a56851 100644 --- a/mappings/net/minecraft/client/option/ParticlesMode.mapping +++ b/mappings/net/minecraft/client/option/ParticlesMode.mapping @@ -1,5 +1,5 @@ CLASS net/minecraft/class_4066 net/minecraft/client/option/ParticlesMode - FIELD field_18200 VALUES [Lnet/minecraft/class_4066; + FIELD field_18200 BY_ID Ljava/util/function/IntFunction; FIELD field_18201 id I FIELD field_18202 translationKey Ljava/lang/String; METHOD (Ljava/lang/String;IILjava/lang/String;)V diff --git a/mappings/net/minecraft/client/option/SimpleOption.mapping b/mappings/net/minecraft/client/option/SimpleOption.mapping index 924fdca310..7e2d0e0803 100644 --- a/mappings/net/minecraft/client/option/SimpleOption.mapping +++ b/mappings/net/minecraft/client/option/SimpleOption.mapping @@ -62,7 +62,7 @@ CLASS net/minecraft/class_7172 net/minecraft/client/option/SimpleOption COMMENT option has no tooltips, you can pass {@link #emptyTooltip()}, and if the option always COMMENT uses one tooltip, you can pass {@link #constantTooltip(Text)}. FIELD field_37862 LOGGER Lorg/slf4j/Logger; - FIELD field_37863 tooltipFactoryGetter Lnet/minecraft/class_7172$class_7307; + FIELD field_37863 tooltipFactory Lnet/minecraft/class_7172$class_7277; FIELD field_37864 textGetter Ljava/util/function/Function; FIELD field_37865 callbacks Lnet/minecraft/class_7172$class_7178; FIELD field_37866 defaultValue Ljava/lang/Object; @@ -75,30 +75,27 @@ CLASS net/minecraft/class_7172 net/minecraft/client/option/SimpleOption COMMENT of creating a boolean option. FIELD field_38279 codec Lcom/mojang/serialization/Codec; FIELD field_38280 text Lnet/minecraft/class_2561; - FIELD field_38441 TOOLTIP_WIDTH I - METHOD (Ljava/lang/String;Lnet/minecraft/class_7172$class_7307;Lnet/minecraft/class_7172$class_7303;Lnet/minecraft/class_7172$class_7178;Lcom/mojang/serialization/Codec;Ljava/lang/Object;Ljava/util/function/Consumer;)V + FIELD field_41333 BOOLEAN_TEXT_GETTER Lnet/minecraft/class_7172$class_7303; + METHOD (Ljava/lang/String;Lnet/minecraft/class_7172$class_7277;Lnet/minecraft/class_7172$class_7303;Lnet/minecraft/class_7172$class_7178;Lcom/mojang/serialization/Codec;Ljava/lang/Object;Ljava/util/function/Consumer;)V ARG 1 key - ARG 2 tooltipFactoryGetter + ARG 2 tooltipFactory ARG 3 valueTextGetter ARG 4 callbacks ARG 5 codec ARG 6 defaultValue ARG 7 changeCallback - METHOD (Ljava/lang/String;Lnet/minecraft/class_7172$class_7307;Lnet/minecraft/class_7172$class_7303;Lnet/minecraft/class_7172$class_7178;Ljava/lang/Object;Ljava/util/function/Consumer;)V + METHOD (Ljava/lang/String;Lnet/minecraft/class_7172$class_7277;Lnet/minecraft/class_7172$class_7303;Lnet/minecraft/class_7172$class_7178;Ljava/lang/Object;Ljava/util/function/Consumer;)V ARG 1 key - ARG 2 tooltipFactoryGetter + ARG 2 tooltipFactory ARG 3 valueTextGetter ARG 4 callbacks ARG 5 defaultValue ARG 6 changeCallback - METHOD method_18520 createButton (Lnet/minecraft/class_315;III)Lnet/minecraft/class_339; + METHOD method_18520 createWidget (Lnet/minecraft/class_315;III)Lnet/minecraft/class_339; ARG 1 options ARG 2 x ARG 3 y ARG 4 width - METHOD method_41747 (Lnet/minecraft/class_2561;Ljava/lang/Boolean;)Lnet/minecraft/class_2561; - ARG 0 optionText - ARG 1 value METHOD method_41748 setValue (Ljava/lang/Object;)V COMMENT Sets the option's value. COMMENT @@ -108,15 +105,15 @@ CLASS net/minecraft/class_7172 net/minecraft/client/option/SimpleOption COMMENT COMMENT

If the new value differs from the new value, {@link #changeCallback} will trigger. ARG 1 value - METHOD method_41749 ofBoolean (Ljava/lang/String;Lnet/minecraft/class_7172$class_7307;Z)Lnet/minecraft/class_7172; + METHOD method_41749 ofBoolean (Ljava/lang/String;Lnet/minecraft/class_7172$class_7277;Z)Lnet/minecraft/class_7172; COMMENT Creates a boolean option. ARG 0 key - ARG 1 tooltipFactoryGetter + ARG 1 tooltipFactory ARG 2 defaultValue - METHOD method_41750 ofBoolean (Ljava/lang/String;Lnet/minecraft/class_7172$class_7307;ZLjava/util/function/Consumer;)Lnet/minecraft/class_7172; + METHOD method_41750 ofBoolean (Ljava/lang/String;Lnet/minecraft/class_7172$class_7277;ZLjava/util/function/Consumer;)Lnet/minecraft/class_7172; COMMENT Creates a boolean option. ARG 0 key - ARG 1 tooltipFactoryGetter + ARG 1 tooltipFactory ARG 2 defaultValue ARG 3 changeCallback METHOD method_41751 ofBoolean (Ljava/lang/String;ZLjava/util/function/Consumer;)Lnet/minecraft/class_7172; @@ -129,11 +126,9 @@ CLASS net/minecraft/class_7172 net/minecraft/client/option/SimpleOption METHOD method_41753 getValue ()Ljava/lang/Object; COMMENT {@return the option's current value} METHOD method_41754 getCallbacks ()Lnet/minecraft/class_7172$class_7178; - METHOD method_42399 emptyTooltip ()Lnet/minecraft/class_7172$class_7307; + METHOD method_42399 emptyTooltip ()Lnet/minecraft/class_7172$class_7277; COMMENT {@return the getter for the {@code tooltipFactoryGetter} parameter of the constructor COMMENT to indicate empty tooltips} - METHOD method_42401 (Lnet/minecraft/class_310;)Lnet/minecraft/class_7172$class_7277; - ARG 0 client METHOD method_42402 ofBoolean (Ljava/lang/String;Z)Lnet/minecraft/class_7172; COMMENT Creates a boolean option. ARG 0 key @@ -141,29 +136,41 @@ CLASS net/minecraft/class_7172 net/minecraft/client/option/SimpleOption METHOD method_42404 getCodec ()Lcom/mojang/serialization/Codec; METHOD method_42405 (Ljava/lang/Boolean;)V ARG 0 value - METHOD method_42406 (Ljava/lang/Object;)Ljava/util/List; - ARG 0 value - METHOD method_42714 wrapLines (Lnet/minecraft/class_310;Lnet/minecraft/class_2561;)Ljava/util/List; - ARG 0 client - ARG 1 text METHOD method_42715 (Lnet/minecraft/class_7172$class_7303;Ljava/lang/Object;)Lnet/minecraft/class_2561; ARG 2 value - METHOD method_42716 (Ljava/util/List;Ljava/lang/Object;)Ljava/util/List; - ARG 1 value - METHOD method_42717 constantTooltip (Lnet/minecraft/class_2561;)Lnet/minecraft/class_7172$class_7307; + METHOD method_42717 constantTooltip (Lnet/minecraft/class_2561;)Lnet/minecraft/class_7172$class_7277; COMMENT {@return the getter for the {@code tooltipFactoryGetter} parameter of the constructor COMMENT to indicate constant tooltips} ARG 0 text METHOD method_42718 (Lnet/minecraft/class_2561;Lnet/minecraft/class_7291;)Lnet/minecraft/class_2561; ARG 0 optionText ARG 1 value - METHOD method_42719 (Lnet/minecraft/class_2561;Lnet/minecraft/class_310;)Lnet/minecraft/class_7172$class_7277; - ARG 1 client METHOD method_42720 enumValueText ()Lnet/minecraft/class_7172$class_7303; COMMENT {@return the getter for the {@code valueTextGetter} parameter of the constructor COMMENT to use the value's text as the option's rendered text} COMMENT COMMENT @apiNote This requires the value to be an enum implementing {@link TranslatableOption}. + METHOD method_47393 (Lnet/minecraft/class_2561;Ljava/lang/Object;)Lnet/minecraft/class_7919; + ARG 1 value + METHOD method_47394 (Ljava/lang/Object;)Lnet/minecraft/class_7919; + ARG 0 value + METHOD method_47603 createWidget (Lnet/minecraft/class_315;IIILjava/util/function/Consumer;)Lnet/minecraft/class_339; + ARG 1 options + ARG 2 x + ARG 3 y + ARG 4 width + ARG 5 changeCallback + METHOD method_47604 ofBoolean (Ljava/lang/String;Lnet/minecraft/class_7172$class_7277;Lnet/minecraft/class_7172$class_7303;ZLjava/util/function/Consumer;)Lnet/minecraft/class_7172; + ARG 0 key + ARG 1 tooltipFactory + ARG 2 valueTextGetter + ARG 3 defaultValue + ARG 4 changeCallback + METHOD method_47605 (Lnet/minecraft/class_2561;Ljava/lang/Boolean;)Lnet/minecraft/class_2561; + ARG 0 optionText + ARG 1 value + METHOD method_47606 (Ljava/lang/Object;)V + ARG 0 value CLASS class_7173 PotentialValuesBasedCallbacks COMMENT A set of callbacks for a cycling option. COMMENT @@ -176,7 +183,8 @@ CLASS net/minecraft/class_7172 net/minecraft/client/option/SimpleOption FIELD field_37872 option Lnet/minecraft/class_7172; FIELD field_37873 callbacks Lnet/minecraft/class_7172$class_7176; FIELD field_37874 tooltipFactory Lnet/minecraft/class_7172$class_7277; - METHOD (Lnet/minecraft/class_315;IIIILnet/minecraft/class_7172;Lnet/minecraft/class_7172$class_7176;Lnet/minecraft/class_7172$class_7277;)V + FIELD field_41334 changeCallback Ljava/util/function/Consumer; + METHOD (Lnet/minecraft/class_315;IIIILnet/minecraft/class_7172;Lnet/minecraft/class_7172$class_7176;Lnet/minecraft/class_7172$class_7277;Ljava/util/function/Consumer;)V ARG 1 options ARG 2 x ARG 3 y @@ -185,6 +193,7 @@ CLASS net/minecraft/class_7172 net/minecraft/client/option/SimpleOption ARG 6 option ARG 7 callbacks ARG 8 tooltipFactory + ARG 9 changeCallback CLASS class_7176 SliderCallbacks COMMENT A set of callbacks for slider options. COMMENT @@ -195,15 +204,13 @@ CLASS net/minecraft/class_7172 net/minecraft/client/option/SimpleOption METHOD method_41765 toSliderProgress (Ljava/lang/Object;)D COMMENT {@return the progress ({@code 0.0} to {@code 1.0}, both inclusive) of the slider} ARG 1 value - METHOD method_42725 (Lnet/minecraft/class_315;IIILnet/minecraft/class_7172$class_7277;Lnet/minecraft/class_7172;)Lnet/minecraft/class_339; - ARG 6 option + METHOD method_42725 (Lnet/minecraft/class_315;IIILnet/minecraft/class_7172$class_7277;Ljava/util/function/Consumer;Lnet/minecraft/class_7172;)Lnet/minecraft/class_339; + ARG 7 option CLASS class_7177 DoubleSliderCallbacks COMMENT A set of callbacks for a slider of values from {@code 0.0} to {@code 1.0} (both COMMENT inclusive). There is only one instance of this callbacks. COMMENT COMMENT @see Callbacks - METHOD method_42418 (Lcom/mojang/datafixers/util/Either;)Ljava/lang/Double; - ARG 0 either METHOD method_42419 (Ljava/lang/Boolean;)Ljava/lang/Double; ARG 0 value METHOD method_42420 withModifier (Ljava/util/function/DoubleFunction;Ljava/util/function/ToDoubleFunction;)Lnet/minecraft/class_7172$class_7176; @@ -212,22 +219,22 @@ CLASS net/minecraft/class_7172 net/minecraft/client/option/SimpleOption COMMENT @see Callback Modifiers ARG 1 sliderProgressValueToValue ARG 2 valueToSliderProgressValue - METHOD method_42421 (Ljava/lang/Double;)Ljava/lang/Double; - ARG 0 value CLASS 1 CLASS class_7178 Callbacks COMMENT A set of callbacks to customize an option's behavior. COMMENT COMMENT @see Callbacks - METHOD method_41756 getButtonCreator (Lnet/minecraft/class_7172$class_7277;Lnet/minecraft/class_315;III)Ljava/util/function/Function; - COMMENT {@return the button creator} + METHOD method_41756 getWidgetCreator (Lnet/minecraft/class_7172$class_7277;Lnet/minecraft/class_315;IIILjava/util/function/Consumer;)Ljava/util/function/Function; + COMMENT {@return the widget creator} COMMENT - COMMENT

Button creators are responsible for rendering the option. + COMMENT

Widget creators are responsible for rendering the option into + COMMENT a {@link ClickableWidget}. ARG 1 tooltipFactory ARG 2 gameOptions ARG 3 x ARG 4 y ARG 5 width + ARG 6 changeCallback METHOD method_41758 validate (Ljava/lang/Object;)Ljava/util/Optional; COMMENT {@return the validated value} COMMENT @@ -255,6 +262,8 @@ CLASS net/minecraft/class_7172 net/minecraft/client/option/SimpleOption COMMENT COMMENT @see Callbacks CLASS class_7277 TooltipFactory + METHOD apply (Ljava/lang/Object;)Lnet/minecraft/class_7919; + ARG 1 value CLASS class_7303 ValueTextGetter METHOD toString (Lnet/minecraft/class_2561;Ljava/lang/Object;)Lnet/minecraft/class_2561; ARG 1 optionText @@ -268,15 +277,14 @@ CLASS net/minecraft/class_7172 net/minecraft/client/option/SimpleOption ARG 1 value CLASS class_7305 CyclingCallbacks METHOD method_42721 getValues ()Lnet/minecraft/class_5676$class_5680; - METHOD method_42723 (Lnet/minecraft/class_7172$class_7277;IIILnet/minecraft/class_315;Lnet/minecraft/class_7172;)Lnet/minecraft/class_339; - ARG 6 option - METHOD method_42724 (Lnet/minecraft/class_7172;Lnet/minecraft/class_315;Lnet/minecraft/class_5676;Ljava/lang/Object;)V - ARG 3 button - ARG 4 value + METHOD method_42723 (Lnet/minecraft/class_7172$class_7277;IIILnet/minecraft/class_315;Ljava/util/function/Consumer;Lnet/minecraft/class_7172;)Lnet/minecraft/class_339; + ARG 7 option + METHOD method_42724 (Lnet/minecraft/class_7172;Lnet/minecraft/class_315;Ljava/util/function/Consumer;Lnet/minecraft/class_5676;Ljava/lang/Object;)V + ARG 4 button + ARG 5 value CLASS class_7274 ValueSetter METHOD set (Lnet/minecraft/class_7172;Ljava/lang/Object;)V ARG 1 option ARG 2 value CLASS class_7306 TypeChangeableCallbacks METHOD method_42722 isCycling ()Z - CLASS class_7307 TooltipFactoryGetter diff --git a/mappings/net/minecraft/client/option/StickyKeyBinding.mapping b/mappings/net/minecraft/client/option/StickyKeyBinding.mapping index 8ac840e182..5deed88a1f 100644 --- a/mappings/net/minecraft/client/option/StickyKeyBinding.mapping +++ b/mappings/net/minecraft/client/option/StickyKeyBinding.mapping @@ -5,3 +5,4 @@ CLASS net/minecraft/class_4666 net/minecraft/client/option/StickyKeyBinding ARG 2 code ARG 3 category ARG 4 toggleGetter + METHOD method_52232 untoggle ()V diff --git a/mappings/net/minecraft/client/particle/BillboardParticle.mapping b/mappings/net/minecraft/client/particle/BillboardParticle.mapping index c37bda40c9..d796930b01 100644 --- a/mappings/net/minecraft/client/particle/BillboardParticle.mapping +++ b/mappings/net/minecraft/client/particle/BillboardParticle.mapping @@ -1,8 +1,14 @@ CLASS net/minecraft/class_3940 net/minecraft/client/particle/BillboardParticle + COMMENT A {@link Particle} which renders a camera-facing sprite with a target texture scale. FIELD field_17867 scale F METHOD method_18132 getSize (F)F + COMMENT {@return the draw scale of this particle, which is used while rendering in {@link #buildGeometry}} ARG 1 tickDelta METHOD method_18133 getMinU ()F + COMMENT {@return the lower U coordinate of the UV coordinates used to draw this particle} METHOD method_18134 getMaxU ()F + COMMENT {@return the upper U coordinate of the UV coordinates used to draw this particle} METHOD method_18135 getMinV ()F + COMMENT {@return the lower V coordinate of the UV coordinates used to draw this particle} METHOD method_18136 getMaxV ()F + COMMENT {@return the upper V coordinate of the UV coordinates used to draw this particle} diff --git a/mappings/net/minecraft/client/particle/BlockLeakParticle.mapping b/mappings/net/minecraft/client/particle/BlockLeakParticle.mapping index 764bbed3e5..cf9379d3b3 100644 --- a/mappings/net/minecraft/client/particle/BlockLeakParticle.mapping +++ b/mappings/net/minecraft/client/particle/BlockLeakParticle.mapping @@ -10,14 +10,159 @@ CLASS net/minecraft/class_663 net/minecraft/client/particle/BlockLeakParticle METHOD method_18821 updateAge ()V METHOD method_18822 updateVelocity ()V METHOD method_32791 getFluid ()Lnet/minecraft/class_3611; - CLASS class_664 DrippingLavaFactory - FIELD field_18295 spriteProvider Lnet/minecraft/class_4002; - METHOD (Lnet/minecraft/class_4002;)V - ARG 1 spriteProvider - CLASS class_665 FallingWaterFactory - FIELD field_18297 spriteProvider Lnet/minecraft/class_4002; - METHOD (Lnet/minecraft/class_4002;)V - ARG 1 spriteProvider + METHOD method_49316 createDrippingWater (Lnet/minecraft/class_2400;Lnet/minecraft/class_638;DDDDDD)Lnet/minecraft/class_4003; + ARG 0 type + ARG 1 world + ARG 2 x + ARG 4 y + ARG 6 z + ARG 8 velocityX + ARG 10 velocityY + ARG 12 velocityZ + METHOD method_49317 createFallingWater (Lnet/minecraft/class_2400;Lnet/minecraft/class_638;DDDDDD)Lnet/minecraft/class_4003; + ARG 0 type + ARG 1 world + ARG 2 x + ARG 4 y + ARG 6 z + ARG 8 velocityX + ARG 10 velocityY + ARG 12 velocityZ + METHOD method_49318 createDrippingLava (Lnet/minecraft/class_2400;Lnet/minecraft/class_638;DDDDDD)Lnet/minecraft/class_4003; + ARG 0 type + ARG 1 world + ARG 2 x + ARG 4 y + ARG 6 z + ARG 8 velocityX + ARG 10 velocityY + ARG 12 velocityZ + METHOD method_49319 createFallingLava (Lnet/minecraft/class_2400;Lnet/minecraft/class_638;DDDDDD)Lnet/minecraft/class_4003; + ARG 0 type + ARG 1 world + ARG 2 x + ARG 4 y + ARG 6 z + ARG 8 velocityX + ARG 10 velocityY + ARG 12 velocityZ + METHOD method_49320 createLandingLava (Lnet/minecraft/class_2400;Lnet/minecraft/class_638;DDDDDD)Lnet/minecraft/class_4003; + ARG 0 type + ARG 1 world + ARG 2 x + ARG 4 y + ARG 6 z + ARG 8 velocityX + ARG 10 velocityY + ARG 12 velocityZ + METHOD method_49324 createDrippingHoney (Lnet/minecraft/class_2400;Lnet/minecraft/class_638;DDDDDD)Lnet/minecraft/class_4003; + ARG 0 type + ARG 1 world + ARG 2 x + ARG 4 y + ARG 6 z + ARG 8 velocityX + ARG 10 velocityY + ARG 12 velocityZ + METHOD method_49325 createFallingHoney (Lnet/minecraft/class_2400;Lnet/minecraft/class_638;DDDDDD)Lnet/minecraft/class_4003; + ARG 0 type + ARG 1 world + ARG 2 x + ARG 4 y + ARG 6 z + ARG 8 velocityX + ARG 10 velocityY + ARG 12 velocityZ + METHOD method_49326 createLandingHoney (Lnet/minecraft/class_2400;Lnet/minecraft/class_638;DDDDDD)Lnet/minecraft/class_4003; + ARG 0 type + ARG 1 world + ARG 2 x + ARG 4 y + ARG 6 z + ARG 8 velocityX + ARG 10 velocityY + ARG 12 velocityZ + METHOD method_49327 createDrippingDripstoneWater (Lnet/minecraft/class_2400;Lnet/minecraft/class_638;DDDDDD)Lnet/minecraft/class_4003; + ARG 0 type + ARG 1 world + ARG 2 x + ARG 4 y + ARG 6 z + ARG 8 velocityX + ARG 10 velocityY + ARG 12 velocityZ + METHOD method_49328 createFallingDripstoneWater (Lnet/minecraft/class_2400;Lnet/minecraft/class_638;DDDDDD)Lnet/minecraft/class_4003; + ARG 0 type + ARG 1 world + ARG 2 x + ARG 4 y + ARG 6 z + ARG 8 velocityX + ARG 10 velocityY + ARG 12 velocityZ + METHOD method_49329 createDrippingDripstoneLava (Lnet/minecraft/class_2400;Lnet/minecraft/class_638;DDDDDD)Lnet/minecraft/class_4003; + ARG 0 type + ARG 1 world + ARG 2 x + ARG 4 y + ARG 6 z + ARG 8 velocityX + ARG 10 velocityY + ARG 12 velocityZ + METHOD method_49330 createFallingDripstoneLava (Lnet/minecraft/class_2400;Lnet/minecraft/class_638;DDDDDD)Lnet/minecraft/class_4003; + ARG 0 type + ARG 1 world + ARG 2 x + ARG 4 y + ARG 6 z + ARG 8 velocityX + ARG 10 velocityY + ARG 12 velocityZ + METHOD method_49331 createFallingNectar (Lnet/minecraft/class_2400;Lnet/minecraft/class_638;DDDDDD)Lnet/minecraft/class_4003; + ARG 0 type + ARG 1 world + ARG 2 x + ARG 4 y + ARG 6 z + ARG 8 velocityX + ARG 10 velocityY + ARG 12 velocityZ + METHOD method_49332 createFallingSporeBlossom (Lnet/minecraft/class_2400;Lnet/minecraft/class_638;DDDDDD)Lnet/minecraft/class_4003; + ARG 0 type + ARG 1 world + ARG 2 x + ARG 4 y + ARG 6 z + ARG 8 velocityX + ARG 10 velocityY + ARG 12 velocityZ + METHOD method_49333 createDrippingObsidianTear (Lnet/minecraft/class_2400;Lnet/minecraft/class_638;DDDDDD)Lnet/minecraft/class_4003; + ARG 0 type + ARG 1 world + ARG 2 x + ARG 4 y + ARG 6 z + ARG 8 velocityX + ARG 10 velocityY + ARG 12 velocityZ + METHOD method_49334 createFallingObsidianTear (Lnet/minecraft/class_2400;Lnet/minecraft/class_638;DDDDDD)Lnet/minecraft/class_4003; + ARG 0 type + ARG 1 world + ARG 2 x + ARG 4 y + ARG 6 z + ARG 8 velocityX + ARG 10 velocityY + ARG 12 velocityZ + METHOD method_49335 createLandingObsidianTear (Lnet/minecraft/class_2400;Lnet/minecraft/class_638;DDDDDD)Lnet/minecraft/class_4003; + ARG 0 type + ARG 1 world + ARG 2 x + ARG 4 y + ARG 6 z + ARG 8 velocityX + ARG 10 velocityY + ARG 12 velocityZ CLASS class_4082 DrippingLava CLASS class_4083 ContinuousFalling FIELD field_18292 nextParticle Lnet/minecraft/class_2394; @@ -38,18 +183,6 @@ CLASS net/minecraft/class_663 net/minecraft/client/particle/BlockLeakParticle ARG 8 fluid ARG 9 nextParticle CLASS class_4085 Landing - CLASS class_4086 FallingLavaFactory - FIELD field_18294 spriteProvider Lnet/minecraft/class_4002; - METHOD (Lnet/minecraft/class_4002;)V - ARG 1 spriteProvider - CLASS class_4087 LandingLavaFactory - FIELD field_18296 spriteProvider Lnet/minecraft/class_4002; - METHOD (Lnet/minecraft/class_4002;)V - ARG 1 spriteProvider - CLASS class_4088 DrippingWaterFactory - FIELD field_18298 spriteProvider Lnet/minecraft/class_4002; - METHOD (Lnet/minecraft/class_4002;)V - ARG 1 spriteProvider CLASS class_4497 Falling METHOD (Lnet/minecraft/class_638;DDDLnet/minecraft/class_3611;I)V ARG 1 world @@ -59,53 +192,4 @@ CLASS net/minecraft/class_663 net/minecraft/client/particle/BlockLeakParticle ARG 8 fluid ARG 9 maxAge CLASS class_4498 FallingHoney - CLASS class_4499 FallingHoneyFactory - FIELD field_20515 spriteProvider Lnet/minecraft/class_4002; - METHOD (Lnet/minecraft/class_4002;)V - ARG 1 spriteProvider - CLASS class_4500 DrippingHoneyFactory - FIELD field_20516 spriteProvider Lnet/minecraft/class_4002; - METHOD (Lnet/minecraft/class_4002;)V - ARG 1 spriteProvider - CLASS class_4501 LandingHoneyFactory - FIELD field_20517 spriteProvider Lnet/minecraft/class_4002; - METHOD (Lnet/minecraft/class_4002;)V - ARG 1 spriteProvider - CLASS class_4502 FallingNectarFactory - FIELD field_20518 spriteProvider Lnet/minecraft/class_4002; - METHOD (Lnet/minecraft/class_4002;)V - ARG 1 spriteProvider - CLASS class_4853 FallingObsidianTearFactory - FIELD field_22438 spriteProvider Lnet/minecraft/class_4002; - METHOD (Lnet/minecraft/class_4002;)V - ARG 1 spriteProvider - CLASS class_4854 DrippingObsidianTearFactory - FIELD field_22439 spriteProvider Lnet/minecraft/class_4002; - METHOD (Lnet/minecraft/class_4002;)V - ARG 1 spriteProvider - CLASS class_4855 LandingObsidianTearFactory - FIELD field_22440 spriteProvider Lnet/minecraft/class_4002; - METHOD (Lnet/minecraft/class_4002;)V - ARG 1 spriteProvider CLASS class_5692 DripstoneLavaDrip - CLASS class_5693 LandingDripstoneLavaFactory - FIELD field_28071 spriteProvider Lnet/minecraft/class_4002; - METHOD (Lnet/minecraft/class_4002;)V - ARG 1 spriteProvider - CLASS class_5694 FallingDripstoneLavaFactory - FIELD field_28072 spriteProvider Lnet/minecraft/class_4002; - METHOD (Lnet/minecraft/class_4002;)V - ARG 1 spriteProvider - CLASS class_5695 DripstoneLavaSplashFactory - FIELD field_28073 spriteProvider Lnet/minecraft/class_4002; - METHOD (Lnet/minecraft/class_4002;)V - ARG 1 spriteProvider - CLASS class_5696 FallingDripstoneWaterFactory - FIELD field_28074 spriteProvider Lnet/minecraft/class_4002; - METHOD (Lnet/minecraft/class_4002;)V - ARG 1 spriteProvider - CLASS class_5824 FallingSporeBlossomFactory - FIELD field_28784 spriteProvider Lnet/minecraft/class_4002; - FIELD field_28785 random Lnet/minecraft/class_5819; - METHOD (Lnet/minecraft/class_4002;)V - ARG 1 spriteProvider diff --git a/mappings/net/minecraft/client/particle/CherryLeavesParticle.mapping b/mappings/net/minecraft/client/particle/CherryLeavesParticle.mapping new file mode 100644 index 0000000000..bc381562f0 --- /dev/null +++ b/mappings/net/minecraft/client/particle/CherryLeavesParticle.mapping @@ -0,0 +1,7 @@ +CLASS net/minecraft/class_8253 net/minecraft/client/particle/CherryLeavesParticle + METHOD (Lnet/minecraft/class_638;DDDLnet/minecraft/class_4002;)V + ARG 1 world + ARG 2 x + ARG 4 y + ARG 6 z + ARG 8 spriteProvider diff --git a/mappings/net/minecraft/client/particle/DragonBreathParticle.mapping b/mappings/net/minecraft/client/particle/DragonBreathParticle.mapping index f46216cf6f..86f9cc7965 100644 --- a/mappings/net/minecraft/client/particle/DragonBreathParticle.mapping +++ b/mappings/net/minecraft/client/particle/DragonBreathParticle.mapping @@ -1,5 +1,13 @@ CLASS net/minecraft/class_666 net/minecraft/client/particle/DragonBreathParticle FIELD field_17793 spriteProvider Lnet/minecraft/class_4002; + FIELD field_32648 MIN_RED F + FIELD field_32649 MIN_GREEN F + FIELD field_32650 MIN_BLUE F + FIELD field_32651 MAX_RED F + FIELD field_32652 MAX_GREEN F + FIELD field_32653 MAX_BLUE F + FIELD field_32654 MIN_COLOR I + FIELD field_32655 MAX_COLOR I FIELD field_3792 reachedGround Z METHOD (Lnet/minecraft/class_638;DDDDDDLnet/minecraft/class_4002;)V ARG 1 world diff --git a/mappings/net/minecraft/client/particle/DustColorTransitionParticle.mapping b/mappings/net/minecraft/client/particle/DustColorTransitionParticle.mapping index 9ac66e4fd9..f9209b06a0 100644 --- a/mappings/net/minecraft/client/particle/DustColorTransitionParticle.mapping +++ b/mappings/net/minecraft/client/particle/DustColorTransitionParticle.mapping @@ -1,6 +1,6 @@ CLASS net/minecraft/class_5734 net/minecraft/client/particle/DustColorTransitionParticle - FIELD field_28244 startColor Lnet/minecraft/class_1160; - FIELD field_28245 endColor Lnet/minecraft/class_1160; + FIELD field_28244 startColor Lorg/joml/Vector3f; + FIELD field_28245 endColor Lorg/joml/Vector3f; METHOD (Lnet/minecraft/class_638;DDDDDDLnet/minecraft/class_5743;Lnet/minecraft/class_4002;)V ARG 1 world ARG 2 x @@ -11,7 +11,7 @@ CLASS net/minecraft/class_5734 net/minecraft/client/particle/DustColorTransition ARG 12 velocityZ ARG 14 parameters ARG 15 spriteProvider - METHOD method_33073 darken (Lnet/minecraft/class_1160;F)Lnet/minecraft/class_1160; + METHOD method_33073 darken (Lorg/joml/Vector3f;F)Lorg/joml/Vector3f; ARG 1 color ARG 2 multiplier METHOD method_33074 updateColor (F)V diff --git a/mappings/net/minecraft/client/particle/GlowParticle.mapping b/mappings/net/minecraft/client/particle/GlowParticle.mapping index fa0a8ff2b1..3d9038473c 100644 --- a/mappings/net/minecraft/client/particle/GlowParticle.mapping +++ b/mappings/net/minecraft/client/particle/GlowParticle.mapping @@ -11,6 +11,7 @@ CLASS net/minecraft/class_5786 net/minecraft/client/particle/GlowParticle ARG 12 velocityZ ARG 14 spriteProvider CLASS class_5956 ElectricSparkFactory + FIELD field_29570 velocityMultiplier D FIELD field_29571 spriteProvider Lnet/minecraft/class_4002; METHOD (Lnet/minecraft/class_4002;)V ARG 1 spriteProvider @@ -19,14 +20,17 @@ CLASS net/minecraft/class_5786 net/minecraft/client/particle/GlowParticle METHOD (Lnet/minecraft/class_4002;)V ARG 1 spriteProvider CLASS class_5958 ScrapeFactory + FIELD field_29573 velocityMultiplier D FIELD field_29574 spriteProvider Lnet/minecraft/class_4002; METHOD (Lnet/minecraft/class_4002;)V ARG 1 spriteProvider CLASS class_5959 WaxOffFactory + FIELD field_29575 velocityMultiplier D FIELD field_29576 spriteProvider Lnet/minecraft/class_4002; METHOD (Lnet/minecraft/class_4002;)V ARG 1 spriteProvider CLASS class_5960 WaxOnFactory + FIELD field_29577 velocityMultiplier D FIELD field_29578 spriteProvider Lnet/minecraft/class_4002; METHOD (Lnet/minecraft/class_4002;)V ARG 1 spriteProvider diff --git a/mappings/net/minecraft/client/particle/NoRenderParticle.mapping b/mappings/net/minecraft/client/particle/NoRenderParticle.mapping index a1e01d89e3..6f35482e74 100644 --- a/mappings/net/minecraft/client/particle/NoRenderParticle.mapping +++ b/mappings/net/minecraft/client/particle/NoRenderParticle.mapping @@ -1 +1,3 @@ CLASS net/minecraft/class_3998 net/minecraft/client/particle/NoRenderParticle + COMMENT A {@link Particle} with no rendered texture. Useful for emitter particles (such as {@link EmitterParticle}) + COMMENT that spawn other particles while ticking, but do not render anything themselves. diff --git a/mappings/net/minecraft/client/particle/Particle.mapping b/mappings/net/minecraft/client/particle/Particle.mapping index efa2203a08..9528f8575a 100644 --- a/mappings/net/minecraft/client/particle/Particle.mapping +++ b/mappings/net/minecraft/client/particle/Particle.mapping @@ -1,5 +1,15 @@ CLASS net/minecraft/class_703 net/minecraft/client/particle/Particle + COMMENT A client-side visual effect with position, velocity, collision, and additional render properties. + COMMENT + COMMENT

+ COMMENT Each particle is typically rendered as a camera-facing texture quad. + COMMENT {@link net.minecraft.client.particle.SpriteBillboardParticle} provides this behavior, and most vanilla particles inherit from it. + COMMENT + COMMENT

+ COMMENT If you would like a particle with no direct rendering effects, inherit from {@link NoRenderParticle}. + FIELD field_21507 stopped Z FIELD field_28786 velocityMultiplier F + FIELD field_28787 ascending Z FIELD field_36193 MAX_SQUARED_COLLISION_CHECK_DISTANCE D FIELD field_3838 prevPosY D FIELD field_3839 angle F @@ -42,43 +52,95 @@ CLASS net/minecraft/class_703 net/minecraft/client/particle/Particle ARG 10 velocityY ARG 12 velocityZ METHOD method_18122 getType ()Lnet/minecraft/class_3999; + COMMENT {@return the rendering category this particle is rendered under} + COMMENT + COMMENT

+ COMMENT For more information on the properties and types available to each {@code Particle}, visit {@link ParticleTextureSheet}. METHOD method_3063 setPos (DDD)V + COMMENT Updates the position and bounding box of this particle to the target {@code x}, {@code y}, {@code z} position. ARG 1 x + COMMENT the x position to move this particle to ARG 3 y + COMMENT the y position to move this particle to ARG 5 z + COMMENT the z position to move this particle to METHOD method_3064 getBoundingBox ()Lnet/minecraft/class_238; + COMMENT {@return the bounding {@link Box} of this particle used for collision and movement logic} + COMMENT + COMMENT

+ COMMENT By default, this bounding box is automatically repositioned when a particle moves in {@link Particle#tick()}. + COMMENT To adjust the size of the returned box, visit {@link Particle#setBoundingBoxSpacing(float, float)}. + COMMENT To directly update the current bounding box, visit {@link Particle#setBoundingBox(Box)}; METHOD method_3067 setBoundingBox (Lnet/minecraft/class_238;)V ARG 1 boundingBox METHOD method_3068 getBrightness (F)I + COMMENT {@return the packed light level this particle should render at} + COMMENT + COMMENT @see net.minecraft.client.render.LightmapTextureManager ARG 1 tint METHOD method_3069 move (DDD)V + COMMENT Moves this particle by the specified delta amounts, re-positioning bounding boxes and adjusting movement for collision with the world. ARG 1 dx + COMMENT the delta x to move this particle by ARG 3 dy + COMMENT the delta y to move this particle by ARG 5 dz + COMMENT the delta z to move this particle by METHOD method_3070 tick ()V + COMMENT Called each game tick (20 times per second), and should be used to do core particle logic, such as movement and collision. METHOD method_3072 repositionFromBoundingBox ()V METHOD method_3074 buildGeometry (Lnet/minecraft/class_4588;Lnet/minecraft/class_4184;F)V + COMMENT Renders this particle to the given {@link VertexConsumer} buffer. ARG 1 vertexConsumer + COMMENT the buffer to render to ARG 2 camera + COMMENT the current active game {@link Camera} ARG 3 tickDelta + COMMENT frame tick delta amount METHOD method_3075 move (F)Lnet/minecraft/class_703; + COMMENT Multiplies this particle's current velocity by the target {@code speed} amount. ARG 1 speed + COMMENT the velocity multiplier to apply to this particle METHOD method_3077 setMaxAge (I)V + COMMENT Sets the maximum age, in ticks, that this particle can exist for. ARG 1 maxAge + COMMENT the new maximum age of this particle, in ticks METHOD method_3080 setBoundingBoxSpacing (FF)V ARG 1 spacingXZ ARG 2 spacingY METHOD method_3082 getMaxAge ()I + COMMENT {@return the maximum age, in ticks, of this particle} + COMMENT If this particle's age exceeds this value, it will be removed from the world. METHOD method_3083 setAlpha (F)V + COMMENT Updates the alpha value of this particle to use while rendering. + COMMENT + COMMENT

+ COMMENT Note that a particle cannot render with transparency unless {@link Particle#getType()} is + COMMENT {@link ParticleTextureSheet#PARTICLE_SHEET_TRANSLUCENT}, or another sheet that supports transparency. + COMMENT + COMMENT

+ COMMENT Also note that the default particle shader (core/particle.fsh) will discard all transparent pixels below 0.1 alpha. ARG 1 alpha + COMMENT the new alpha value of this particle METHOD method_3084 setColor (FFF)V + COMMENT Updates the rendering color of this particle. + COMMENT Each value should be between 0.0 (no channel color) and 1.0 (full channel color). ARG 1 red + COMMENT the target red color to use while rendering ARG 2 green + COMMENT the target green color to use while rendering ARG 3 blue + COMMENT the target blue color to use while rendering METHOD method_3085 markDead ()V + COMMENT Marks this particle as ready to be removed from the containing {@link ClientWorld}. METHOD method_3086 isAlive ()Z + COMMENT {@return {@code false} if this particle is finished and should be removed from the parent {@link ParticleManager}, otherwise {@code true} if the particle is still alive} METHOD method_3087 scale (F)Lnet/minecraft/class_703; + COMMENT Scales the size of this particle by the given {@code scale} amount. + COMMENT + COMMENT @return this particle ARG 1 scale + COMMENT the amount to scale this particle's size by METHOD method_34019 getGroup ()Ljava/util/Optional; COMMENT {@return the optional group that this particle belongs to} COMMENT @@ -86,6 +148,10 @@ CLASS net/minecraft/class_703 net/minecraft/client/particle/Particle COMMENT can be rendered in a client world. If the particle does not have a group, COMMENT it is not restricted. METHOD method_34753 setVelocity (DDD)V + COMMENT Updates this particle's velocity to the target X, Y, and Z values. ARG 1 velocityX + COMMENT the new x-velocity of this particle ARG 3 velocityY + COMMENT the new y-velocity of this particle ARG 5 velocityZ + COMMENT the new z-velocity of this particle diff --git a/mappings/net/minecraft/client/particle/ParticleFactory.mapping b/mappings/net/minecraft/client/particle/ParticleFactory.mapping index 58132c316e..19bf232167 100644 --- a/mappings/net/minecraft/client/particle/ParticleFactory.mapping +++ b/mappings/net/minecraft/client/particle/ParticleFactory.mapping @@ -8,3 +8,13 @@ CLASS net/minecraft/class_707 net/minecraft/client/particle/ParticleFactory ARG 9 velocityX ARG 11 velocityY ARG 13 velocityZ + CLASS class_8187 BlockLeakParticleFactory + METHOD createParticle (Lnet/minecraft/class_2394;Lnet/minecraft/class_638;DDDDDD)Lnet/minecraft/class_4003; + ARG 1 parameters + ARG 2 world + ARG 3 x + ARG 5 y + ARG 7 z + ARG 9 velocityX + ARG 11 velocityY + ARG 13 velocityZ diff --git a/mappings/net/minecraft/client/particle/ParticleManager.mapping b/mappings/net/minecraft/client/particle/ParticleManager.mapping index fca757fa70..2a10708b27 100644 --- a/mappings/net/minecraft/client/particle/ParticleManager.mapping +++ b/mappings/net/minecraft/client/particle/ParticleManager.mapping @@ -11,6 +11,9 @@ CLASS net/minecraft/class_702 net/minecraft/client/particle/ParticleManager FIELD field_3835 factories Lit/unimi/dsi/fastutil/ints/Int2ObjectMap; FIELD field_3836 newParticles Ljava/util/Queue; FIELD field_3837 newEmitterParticles Ljava/util/Queue; + FIELD field_40505 LOGGER Lorg/slf4j/Logger; + FIELD field_40506 FINDER Lnet/minecraft/class_7654; + FIELD field_41385 PARTICLES_PATH Lnet/minecraft/class_2960; METHOD (Lnet/minecraft/class_638;Lnet/minecraft/class_1060;)V ARG 1 world ARG 2 textureManager @@ -20,17 +23,12 @@ CLASS net/minecraft/class_702 net/minecraft/client/particle/ParticleManager ARG 1 sheet ARG 2 queue METHOD method_18829 clearAtlas ()V - METHOD method_18832 (Lnet/minecraft/class_3695;Lnet/minecraft/class_3300;Ljava/util/Map;Ljava/lang/Void;)Lnet/minecraft/class_1059$class_4007; - ARG 4 v METHOD method_18834 registerFactory (Lnet/minecraft/class_2396;Lnet/minecraft/class_702$class_4091;)V ARG 1 type ARG 2 factory - METHOD method_18835 (Lnet/minecraft/class_3300;Ljava/util/Map;Ljava/util/concurrent/Executor;Lnet/minecraft/class_2960;)Ljava/util/concurrent/CompletableFuture; - ARG 4 id - METHOD method_18836 loadTextureList (Lnet/minecraft/class_3300;Lnet/minecraft/class_2960;Ljava/util/Map;)V - ARG 1 resourceManager - ARG 2 id - ARG 3 result + METHOD method_18836 loadTextureList (Lnet/minecraft/class_2960;Lnet/minecraft/class_3298;)Ljava/util/Optional; + ARG 1 id + ARG 2 resource METHOD method_3043 registerFactory (Lnet/minecraft/class_2396;Lnet/minecraft/class_707;)V ARG 1 type ARG 2 factory @@ -98,6 +96,39 @@ CLASS net/minecraft/class_702 net/minecraft/client/particle/ParticleManager ARG 2 count METHOD method_34023 (Lnet/minecraft/class_5878;)V ARG 1 group + METHOD method_45767 (Lnet/minecraft/class_7766$class_7767;Ljava/util/Set;Lnet/minecraft/class_1058;Lnet/minecraft/class_702$class_7759;)V + ARG 4 result + METHOD method_45768 (Ljava/util/List;Ljava/util/concurrent/Executor;Lnet/minecraft/class_2960;Lnet/minecraft/class_3298;)V + ARG 3 id + ARG 4 resource + METHOD method_45772 (Ljava/util/concurrent/Executor;Ljava/util/Map;)Ljava/util/concurrent/CompletionStage; + ARG 2 particles + METHOD method_48015 clearParticles ()V + METHOD method_49336 (Lnet/minecraft/class_707$class_8187;Lnet/minecraft/class_4002;)Lnet/minecraft/class_707; + ARG 1 spriteBillboardParticle + METHOD method_49337 (Lnet/minecraft/class_707$class_8187;Lnet/minecraft/class_4002;Lnet/minecraft/class_2394;Lnet/minecraft/class_638;DDDDDD)Lnet/minecraft/class_703; + ARG 2 type + ARG 3 world + ARG 4 x + ARG 6 y + ARG 8 z + ARG 10 velocityX + ARG 12 velocityY + ARG 14 velocityZ + METHOD method_49338 registerBlockLeakFactory (Lnet/minecraft/class_2396;Lnet/minecraft/class_707$class_8187;)V + ARG 1 type + ARG 2 factory + METHOD method_49915 (Lnet/minecraft/class_4002;)Lnet/minecraft/class_707; + ARG 0 spriteProvider + METHOD method_49916 (Lnet/minecraft/class_4002;Lnet/minecraft/class_2400;Lnet/minecraft/class_638;DDDDDD)Lnet/minecraft/class_703; + ARG 1 parameters + ARG 2 world + ARG 3 x + ARG 5 y + ARG 7 z + ARG 9 velocityX + ARG 11 velocityY + ARG 13 velocityZ CLASS class_4090 SimpleSpriteProvider FIELD field_18303 sprites Ljava/util/List; METHOD method_18838 setSprites (Ljava/util/List;)V @@ -105,3 +136,4 @@ CLASS net/minecraft/class_702 net/minecraft/client/particle/ParticleManager CLASS class_4091 SpriteAwareFactory METHOD create (Lnet/minecraft/class_4002;)Lnet/minecraft/class_707; ARG 1 spriteProvider + CLASS class_7759 ReloadResult diff --git a/mappings/net/minecraft/client/particle/ParticleTextureSheet.mapping b/mappings/net/minecraft/client/particle/ParticleTextureSheet.mapping index e6547fe7c3..377631a819 100644 --- a/mappings/net/minecraft/client/particle/ParticleTextureSheet.mapping +++ b/mappings/net/minecraft/client/particle/ParticleTextureSheet.mapping @@ -1,4 +1,10 @@ CLASS net/minecraft/class_3999 net/minecraft/client/particle/ParticleTextureSheet + COMMENT Defines rendering setup and draw logic for particles based on their requirements for depth checking, textures, and transparency. + COMMENT + COMMENT

+ COMMENT Each {@link Particle} returns a sheet in {@link Particle#getType()}. + COMMENT When particles are rendered, each sheet will be drawn once. + COMMENT {@link #begin(BufferBuilder, TextureManager)} is first called to set up render state, and after each particle has emitted geometry, {@link #draw(Tessellator)} is called to draw to a target buffer. FIELD field_17827 TERRAIN_SHEET Lnet/minecraft/class_3999; FIELD field_17828 PARTICLE_SHEET_OPAQUE Lnet/minecraft/class_3999; FIELD field_17829 PARTICLE_SHEET_TRANSLUCENT Lnet/minecraft/class_3999; @@ -6,7 +12,12 @@ CLASS net/minecraft/class_3999 net/minecraft/client/particle/ParticleTextureShee FIELD field_17831 CUSTOM Lnet/minecraft/class_3999; FIELD field_17832 NO_RENDER Lnet/minecraft/class_3999; METHOD method_18130 begin (Lnet/minecraft/class_287;Lnet/minecraft/class_1060;)V + COMMENT Called to set up OpenGL render state for drawing particles of a given type. ARG 1 builder + COMMENT the buffer particles will draw to in {@link Particle#buildGeometry(VertexConsumer, Camera, float)} ARG 2 textureManager + COMMENT texture loading context METHOD method_18131 draw (Lnet/minecraft/class_289;)V + COMMENT Called after all particles of a sheet have finished drawing. ARG 1 tessellator + COMMENT the {@code Tessellator} all particles in this sheet drew to diff --git a/mappings/net/minecraft/client/particle/ShriekParticle.mapping b/mappings/net/minecraft/client/particle/ShriekParticle.mapping index 9687ae465e..942b24ec90 100644 --- a/mappings/net/minecraft/client/particle/ShriekParticle.mapping +++ b/mappings/net/minecraft/client/particle/ShriekParticle.mapping @@ -12,15 +12,15 @@ CLASS net/minecraft/class_7281 net/minecraft/client/particle/ShriekParticle ARG 2 camera ARG 3 tickDelta ARG 4 rotator - METHOD method_42584 vertex (Lnet/minecraft/class_4588;Lnet/minecraft/class_1160;FFI)V + METHOD method_42584 vertex (Lnet/minecraft/class_4588;Lorg/joml/Vector3f;FFI)V ARG 1 vertexConsumer ARG 2 pos ARG 3 u ARG 4 v ARG 5 light - METHOD method_42585 (Lnet/minecraft/class_1158;)V + METHOD method_42585 (Lorg/joml/Quaternionf;)V ARG 0 quaternion - METHOD method_42586 (Lnet/minecraft/class_1158;)V + METHOD method_42586 (Lorg/joml/Quaternionf;)V ARG 0 quaternion CLASS class_7282 Factory FIELD field_38336 spriteProvider Lnet/minecraft/class_4002; diff --git a/mappings/net/minecraft/client/particle/SpriteBillboardParticle.mapping b/mappings/net/minecraft/client/particle/SpriteBillboardParticle.mapping index 5a970ba82d..3aedf4772e 100644 --- a/mappings/net/minecraft/client/particle/SpriteBillboardParticle.mapping +++ b/mappings/net/minecraft/client/particle/SpriteBillboardParticle.mapping @@ -1,8 +1,18 @@ CLASS net/minecraft/class_4003 net/minecraft/client/particle/SpriteBillboardParticle + COMMENT A {@link BillboardParticle} implementation class that renders a {@link Sprite} as its camera-facing texture. FIELD field_17886 sprite Lnet/minecraft/class_1058; METHOD method_18140 setSprite (Lnet/minecraft/class_4002;)V + COMMENT Sets the current {@link Sprite} of this particle to a random frame in its atlas sheet. ARG 1 spriteProvider + COMMENT sprite access for retrieving random {@link Sprite} frames METHOD method_18141 setSprite (Lnet/minecraft/class_1058;)V + COMMENT Sets the current {@link Sprite} of this particle. + COMMENT + COMMENT

+ COMMENT To assign a {@link Sprite} based on particle age, see {@link #setSpriteForAge}. ARG 1 sprite + COMMENT the new {@link Sprite} to assign to this {@link Particle} METHOD method_18142 setSpriteForAge (Lnet/minecraft/class_4002;)V + COMMENT Sets the current {@link Sprite} of this particle based on the age of the particle, assuming the particle texture is an atlas with multiple frames. ARG 1 spriteProvider + COMMENT sprite access for retrieving the proper {@link Sprite} based on lifetime progress diff --git a/mappings/net/minecraft/client/particle/SpriteProvider.mapping b/mappings/net/minecraft/client/particle/SpriteProvider.mapping index dab73c137d..36e95c832c 100644 --- a/mappings/net/minecraft/client/particle/SpriteProvider.mapping +++ b/mappings/net/minecraft/client/particle/SpriteProvider.mapping @@ -1,4 +1,6 @@ CLASS net/minecraft/class_4002 net/minecraft/client/particle/SpriteProvider METHOD method_18138 getSprite (II)Lnet/minecraft/class_1058; + ARG 1 age + ARG 2 maxAge METHOD method_18139 getSprite (Lnet/minecraft/class_5819;)Lnet/minecraft/class_1058; ARG 1 random diff --git a/mappings/net/minecraft/client/particle/SuspendParticle.mapping b/mappings/net/minecraft/client/particle/SuspendParticle.mapping index d670e3cb35..b68e57ce3f 100644 --- a/mappings/net/minecraft/client/particle/SuspendParticle.mapping +++ b/mappings/net/minecraft/client/particle/SuspendParticle.mapping @@ -15,3 +15,7 @@ CLASS net/minecraft/class_729 net/minecraft/client/particle/SuspendParticle FIELD field_17880 spriteProvider Lnet/minecraft/class_4002; METHOD (Lnet/minecraft/class_4002;)V ARG 1 spriteProvider + CLASS class_8254 EggCrackFactory + FIELD field_43374 spriteProvider Lnet/minecraft/class_4002; + METHOD (Lnet/minecraft/class_4002;)V + ARG 1 spriteProvider diff --git a/mappings/net/minecraft/client/particle/VibrationParticle.mapping b/mappings/net/minecraft/client/particle/VibrationParticle.mapping index b7dbb8f74c..7aee712930 100644 --- a/mappings/net/minecraft/client/particle/VibrationParticle.mapping +++ b/mappings/net/minecraft/client/particle/VibrationParticle.mapping @@ -2,15 +2,20 @@ CLASS net/minecraft/class_5737 net/minecraft/client/particle/VibrationParticle FIELD field_28249 vibration Lnet/minecraft/class_5716; METHOD (Lnet/minecraft/class_638;DDDLnet/minecraft/class_5716;I)V ARG 1 world - METHOD method_33077 (FFLnet/minecraft/class_1158;)V - ARG 2 quaternion + ARG 2 x + ARG 4 y + ARG 6 z + ARG 8 vibration + ARG 9 maxAge + METHOD method_33077 (FFFLorg/joml/Quaternionf;)V + ARG 3 rotationQuaternion METHOD method_33078 render (Lnet/minecraft/class_4588;Lnet/minecraft/class_4184;FLjava/util/function/Consumer;)V ARG 1 vertexConsumer ARG 2 camera ARG 3 tickDelta ARG 4 transforms - METHOD method_33079 (FFLnet/minecraft/class_1158;)V - ARG 2 quaternion + METHOD method_33079 (FFFLorg/joml/Quaternionf;)V + ARG 3 rotationQuaternion CLASS class_5738 Factory FIELD field_28251 spriteProvider Lnet/minecraft/class_4002; METHOD (Lnet/minecraft/class_4002;)V diff --git a/mappings/net/minecraft/client/particle/WhiteAshParticle.mapping b/mappings/net/minecraft/client/particle/WhiteAshParticle.mapping index 7646ddb9e6..89c34f7c1f 100644 --- a/mappings/net/minecraft/client/particle/WhiteAshParticle.mapping +++ b/mappings/net/minecraft/client/particle/WhiteAshParticle.mapping @@ -1,4 +1,5 @@ CLASS net/minecraft/class_5165 net/minecraft/client/particle/WhiteAshParticle + FIELD field_32658 COLOR I METHOD (Lnet/minecraft/class_638;DDDDDDFLnet/minecraft/class_4002;)V ARG 1 world ARG 2 x diff --git a/mappings/net/minecraft/client/realms/CheckedGson.mapping b/mappings/net/minecraft/client/realms/CheckedGson.mapping index 0f8cb3d32b..767aef1ec8 100644 --- a/mappings/net/minecraft/client/realms/CheckedGson.mapping +++ b/mappings/net/minecraft/client/realms/CheckedGson.mapping @@ -7,3 +7,5 @@ CLASS net/minecraft/class_4869 net/minecraft/client/realms/CheckedGson METHOD method_25038 fromJson (Ljava/lang/String;Ljava/lang/Class;)Lnet/minecraft/class_4885; ARG 1 json ARG 2 type + METHOD method_49573 toJson (Lcom/google/gson/JsonElement;)Ljava/lang/String; + ARG 1 json diff --git a/mappings/net/minecraft/client/realms/KeyCombo.mapping b/mappings/net/minecraft/client/realms/KeyCombo.mapping deleted file mode 100644 index 3fd0af9cb9..0000000000 --- a/mappings/net/minecraft/client/realms/KeyCombo.mapping +++ /dev/null @@ -1,12 +0,0 @@ -CLASS net/minecraft/class_4324 net/minecraft/client/realms/KeyCombo - FIELD field_19453 chars [C - FIELD field_19454 matchIndex I - FIELD field_19455 onCompletion Ljava/lang/Runnable; - METHOD ([C)V - ARG 1 keys - METHOD ([CLjava/lang/Runnable;)V - ARG 1 keys - ARG 2 task - METHOD method_20832 reset ()V - METHOD method_20833 keyPressed (C)Z - ARG 1 key diff --git a/mappings/net/minecraft/client/realms/RealmsAvailability.mapping b/mappings/net/minecraft/client/realms/RealmsAvailability.mapping new file mode 100644 index 0000000000..f86c98d711 --- /dev/null +++ b/mappings/net/minecraft/client/realms/RealmsAvailability.mapping @@ -0,0 +1,15 @@ +CLASS net/minecraft/class_8647 net/minecraft/client/realms/RealmsAvailability + FIELD field_45182 LOGGER Lorg/slf4j/Logger; + FIELD field_45183 currentFuture Ljava/util/concurrent/CompletableFuture; + METHOD method_52624 check ()Ljava/util/concurrent/CompletableFuture; + METHOD method_52625 wasUnsuccessful (Ljava/util/concurrent/CompletableFuture;)Z + ARG 0 future + METHOD method_52626 checkInternal ()Ljava/util/concurrent/CompletableFuture; + CLASS class_8648 Info + METHOD (Lnet/minecraft/class_4355;)V + ARG 1 exception + METHOD (Lnet/minecraft/class_8647$class_8649;)V + ARG 1 type + METHOD method_52628 createScreen (Lnet/minecraft/class_437;)Lnet/minecraft/class_437; + ARG 1 parent + CLASS class_8649 Type diff --git a/mappings/net/minecraft/client/realms/RealmsClient.mapping b/mappings/net/minecraft/client/realms/RealmsClient.mapping index 9065e7a0a1..18f6fdf6ef 100644 --- a/mappings/net/minecraft/client/realms/RealmsClient.mapping +++ b/mappings/net/minecraft/client/realms/RealmsClient.mapping @@ -1,6 +1,4 @@ CLASS net/minecraft/class_4341 net/minecraft/client/realms/RealmsClient - FIELD field_19576 currentEnvironment Lnet/minecraft/class_4341$class_4343; - FIELD field_19577 initialized Z FIELD field_19578 LOGGER Lorg/slf4j/Logger; FIELD field_19579 sessionId Ljava/lang/String; FIELD field_19580 username Ljava/lang/String; @@ -23,7 +21,6 @@ CLASS net/minecraft/class_4341 net/minecraft/client/realms/RealmsClient FIELD field_32072 CLIENT_COMPATIBLE_ENDPOINT Ljava/lang/String; FIELD field_32073 TOS_AGREED_ENDPOINT Ljava/lang/String; FIELD field_32074 NEWS_ENDPOINT Ljava/lang/String; - FIELD field_32075 STAGE_AVAILABLE_ENDPOINT Ljava/lang/String; FIELD field_32076 WORLDS_ENDPOINT Ljava/lang/String; FIELD field_32077 INVITES_ENDPOINT Ljava/lang/String; FIELD field_32078 MCO_ENDPOINT Ljava/lang/String; @@ -44,6 +41,10 @@ CLASS net/minecraft/class_4341 net/minecraft/client/realms/RealmsClient FIELD field_32093 ID_ENDPOINT Ljava/lang/String; FIELD field_32094 WORLD_ENDPOINT_3 Ljava/lang/String; FIELD field_32095 INVITE_ENDPOINT Ljava/lang/String; + FIELD field_43012 SEEN_ENDPOINT Ljava/lang/String; + FIELD field_43013 DISMISS_ENDPOINT Ljava/lang/String; + FIELD field_43014 NOTIFICATIONS_ENDPOINT Ljava/lang/String; + FIELD field_45232 ENVIRONMENT Lnet/minecraft/class_4341$class_4343; METHOD (Ljava/lang/String;Ljava/lang/String;Lnet/minecraft/class_310;)V ARG 1 sessionId ARG 2 username @@ -63,7 +64,7 @@ CLASS net/minecraft/class_4341 net/minecraft/client/realms/RealmsClient ARG 1 worldId ARG 3 slot ARG 4 options - METHOD method_20994 uninvite (JLjava/lang/String;)V + METHOD method_20994 uninvite (JLjava/util/UUID;)V ARG 1 worldId ARG 3 profileUuid METHOD method_20995 resetWorldWithSeed (JLnet/minecraft/class_4413;)Ljava/lang/Boolean; @@ -79,7 +80,6 @@ CLASS net/minecraft/class_4341 net/minecraft/client/realms/RealmsClient ARG 1 r METHOD method_20999 acceptInvitation (Ljava/lang/String;)V ARG 1 invitationId - METHOD method_21001 switchToStage ()V METHOD method_21003 download (JI)Lnet/minecraft/class_4889; ARG 1 worldId ARG 3 slotId @@ -95,7 +95,6 @@ CLASS net/minecraft/class_4341 net/minecraft/client/realms/RealmsClient METHOD method_21007 url (Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String; ARG 1 path ARG 2 queryString - METHOD method_21008 switchToProd ()V METHOD method_21009 join (J)Lnet/minecraft/class_4878; ARG 1 worldId METHOD method_21010 restoreWorld (JLjava/lang/String;)V @@ -103,7 +102,6 @@ CLASS net/minecraft/class_4341 net/minecraft/client/realms/RealmsClient ARG 3 backupId METHOD method_21011 url (Ljava/lang/String;)Ljava/lang/String; ARG 1 path - METHOD method_21012 switchToLocal ()V METHOD method_21013 uninviteMyselfFrom (J)V ARG 1 worldId METHOD method_21014 putIntoMinigameMode (JLjava/lang/String;)Ljava/lang/Boolean; @@ -112,22 +110,20 @@ CLASS net/minecraft/class_4341 net/minecraft/client/realms/RealmsClient METHOD method_21015 listWorlds ()Lnet/minecraft/class_4879; METHOD method_21016 backupsFor (J)Lnet/minecraft/class_4868; ARG 1 worldId - METHOD method_21017 op (JLjava/lang/String;)Lnet/minecraft/class_4870; + METHOD method_21017 op (JLjava/util/UUID;)Lnet/minecraft/class_4870; ARG 1 worldId ARG 3 profileUuid METHOD method_21018 getLiveStats ()Lnet/minecraft/class_4882; METHOD method_21019 open (J)Ljava/lang/Boolean; ARG 1 worldId - METHOD method_21020 deop (JLjava/lang/String;)Lnet/minecraft/class_4870; + METHOD method_21020 deop (JLjava/util/UUID;)Lnet/minecraft/class_4870; ARG 1 worldId ARG 3 profileUuid - METHOD method_21021 mcoEnabled ()Ljava/lang/Boolean; METHOD method_21022 close (J)Ljava/lang/Boolean; ARG 1 worldId METHOD method_21023 resetWorldWithTemplate (JLjava/lang/String;)Ljava/lang/Boolean; ARG 1 worldId ARG 3 worldTemplateId - METHOD method_21024 stageAvailable ()Ljava/lang/Boolean; METHOD method_21025 subscriptionFor (J)Lnet/minecraft/class_4887; ARG 1 worldId METHOD method_21026 upload (JLjava/lang/String;)Lnet/minecraft/class_4888; @@ -142,12 +138,18 @@ CLASS net/minecraft/class_4341 net/minecraft/client/realms/RealmsClient METHOD method_21032 getNews ()Lnet/minecraft/class_4876; METHOD method_21033 trialAvailable ()Ljava/lang/Boolean; METHOD method_31381 isOwnerBlocked (Lnet/minecraft/class_4871;)Z - ARG 1 pendingInvite + ARG 1 invite METHOD method_35684 getPlayerActivities (J)Lnet/minecraft/class_6193; ARG 1 worldId - METHOD method_39979 getErrorMessage (I)Ljava/lang/String; - ARG 0 httpResultCode METHOD method_44616 create ()Lnet/minecraft/class_4341; + METHOD method_49569 markNotificationsAsSeen (Ljava/util/List;)V + ARG 1 notifications + METHOD method_49570 dismissNotifications (Ljava/util/List;)V + ARG 1 notifications + METHOD method_49571 toJsonArray (Ljava/util/List;)Lcom/google/gson/JsonArray; + ARG 0 uuids + METHOD method_49572 listNotifications ()Ljava/util/List; + METHOD method_52655 mcoEnabled ()Z CLASS class_4342 CompatibleVersionResponse FIELD field_19582 COMPATIBLE Lnet/minecraft/class_4341$class_4342; FIELD field_19583 OUTDATED Lnet/minecraft/class_4341$class_4342; @@ -163,5 +165,7 @@ CLASS net/minecraft/class_4341 net/minecraft/client/realms/RealmsClient METHOD (Ljava/lang/String;ILjava/lang/String;Ljava/lang/String;)V ARG 3 baseUrl ARG 4 protocol + METHOD method_52215 fromName (Ljava/lang/String;)Ljava/util/Optional; + ARG 0 name METHOD valueOf (Ljava/lang/String;)Lnet/minecraft/class_4341$class_4343; ARG 0 name diff --git a/mappings/net/minecraft/client/realms/RealmsError.mapping b/mappings/net/minecraft/client/realms/RealmsError.mapping index fc1f04bdcf..89e3855275 100644 --- a/mappings/net/minecraft/client/realms/RealmsError.mapping +++ b/mappings/net/minecraft/client/realms/RealmsError.mapping @@ -1,11 +1,24 @@ CLASS net/minecraft/class_4345 net/minecraft/client/realms/RealmsError FIELD field_19593 LOGGER Lorg/slf4j/Logger; - FIELD field_19594 errorMessage Ljava/lang/String; - FIELD field_19595 errorCode I - METHOD (Ljava/lang/String;I)V - ARG 1 errorMessage - ARG 2 errorCode + FIELD field_45233 NO_DETAILS_TEXT Lnet/minecraft/class_2561; METHOD method_21036 getErrorMessage ()Ljava/lang/String; METHOD method_21037 getErrorCode ()I - METHOD method_30162 create (Ljava/lang/String;)Lnet/minecraft/class_4345; - ARG 0 error + METHOD method_30162 ofHttp (ILjava/lang/String;)Lnet/minecraft/class_4345; + ARG 0 statusCode + ARG 1 response + METHOD method_52657 getText ()Lnet/minecraft/class_2561; + CLASS class_8652 AuthenticationError + FIELD field_45234 ERROR_CODE I + CLASS class_8653 SimpleHttpError + FIELD field_45235 SERVICE_BUSY Lnet/minecraft/class_4345$class_8653; + FIELD field_45236 RETRY_TEXT Lnet/minecraft/class_2561; + METHOD method_52658 retryable (I)Lnet/minecraft/class_4345$class_8653; + ARG 0 statusCode + METHOD method_52659 connectivity (Lnet/minecraft/class_4354;)Lnet/minecraft/class_4345$class_8653; + ARG 0 exception + METHOD method_52660 unknownCompatibility (Ljava/lang/String;)Lnet/minecraft/class_4345$class_8653; + ARG 0 response + METHOD method_52661 statusCodeOnly (I)Lnet/minecraft/class_4345$class_8653; + ARG 0 statusCode + CLASS class_8654 DetailedHttpError + CLASS class_8655 RawHttpPayloadError diff --git a/mappings/net/minecraft/client/realms/RealmsObjectSelectionList.mapping b/mappings/net/minecraft/client/realms/RealmsObjectSelectionList.mapping index b9169194f3..49ce80d1d4 100644 --- a/mappings/net/minecraft/client/realms/RealmsObjectSelectionList.mapping +++ b/mappings/net/minecraft/client/realms/RealmsObjectSelectionList.mapping @@ -7,12 +7,6 @@ CLASS net/minecraft/class_4904 net/minecraft/client/realms/RealmsObjectSelection ARG 5 itemHeight METHOD method_25489 setSelected (I)V ARG 1 index - METHOD method_25490 itemClicked (IIDDI)V - ARG 1 cursorY - ARG 2 selectionIndex - ARG 3 mouseX - ARG 5 mouseY - ARG 7 listWidth METHOD method_25492 setSelectedItem (I)V ARG 1 index METHOD method_25493 clear ()V diff --git a/mappings/net/minecraft/client/realms/RealmsPeriodicCheckers.mapping b/mappings/net/minecraft/client/realms/RealmsPeriodicCheckers.mapping index 3abb6dde47..180e58028e 100644 --- a/mappings/net/minecraft/client/realms/RealmsPeriodicCheckers.mapping +++ b/mappings/net/minecraft/client/realms/RealmsPeriodicCheckers.mapping @@ -6,5 +6,6 @@ CLASS net/minecraft/class_7578 net/minecraft/client/realms/RealmsPeriodicChecker FIELD field_39686 trialAvailability Lnet/minecraft/class_7581$class_7586; FIELD field_39687 news Lnet/minecraft/class_7581$class_7586; FIELD field_39688 newsUpdater Lnet/minecraft/class_7579; + FIELD field_43035 notifications Lnet/minecraft/class_7581$class_7586; METHOD (Lnet/minecraft/class_4341;)V ARG 1 client diff --git a/mappings/net/minecraft/client/realms/dto/Backup.mapping b/mappings/net/minecraft/client/realms/dto/Backup.mapping index b5ef031500..117e299c1a 100644 --- a/mappings/net/minecraft/client/realms/dto/Backup.mapping +++ b/mappings/net/minecraft/client/realms/dto/Backup.mapping @@ -9,7 +9,5 @@ CLASS net/minecraft/class_4867 net/minecraft/client/realms/dto/Backup METHOD method_25032 isUploadedVersion ()Z METHOD method_25033 parse (Lcom/google/gson/JsonElement;)Lnet/minecraft/class_4867; ARG 0 node - METHOD method_25034 format (Ljava/lang/String;)Ljava/lang/String; - ARG 0 key METHOD method_25035 setUploadedVersion (Z)V ARG 1 uploadedVersion diff --git a/mappings/net/minecraft/client/realms/dto/PendingInvite.mapping b/mappings/net/minecraft/client/realms/dto/PendingInvite.mapping index c3c97c120b..3b4af78cef 100644 --- a/mappings/net/minecraft/client/realms/dto/PendingInvite.mapping +++ b/mappings/net/minecraft/client/realms/dto/PendingInvite.mapping @@ -2,7 +2,7 @@ CLASS net/minecraft/class_4871 net/minecraft/client/realms/dto/PendingInvite FIELD field_22580 invitationId Ljava/lang/String; FIELD field_22581 worldName Ljava/lang/String; FIELD field_22582 worldOwnerName Ljava/lang/String; - FIELD field_22583 worldOwnerUuid Ljava/lang/String; + FIELD field_22583 worldOwnerUuid Ljava/util/UUID; FIELD field_22584 date Ljava/util/Date; FIELD field_22585 LOGGER Lorg/slf4j/Logger; METHOD method_25040 parse (Lcom/google/gson/JsonObject;)Lnet/minecraft/class_4871; diff --git a/mappings/net/minecraft/client/realms/dto/PlayerInfo.mapping b/mappings/net/minecraft/client/realms/dto/PlayerInfo.mapping index 22f426ea43..23d5e7d1f6 100644 --- a/mappings/net/minecraft/client/realms/dto/PlayerInfo.mapping +++ b/mappings/net/minecraft/client/realms/dto/PlayerInfo.mapping @@ -1,6 +1,6 @@ CLASS net/minecraft/class_4874 net/minecraft/client/realms/dto/PlayerInfo FIELD field_22590 name Ljava/lang/String; - FIELD field_22591 uuid Ljava/lang/String; + FIELD field_22591 uuid Ljava/util/UUID; FIELD field_22592 operator Z FIELD field_22593 accepted Z FIELD field_22594 online Z @@ -9,8 +9,8 @@ CLASS net/minecraft/class_4874 net/minecraft/client/realms/dto/PlayerInfo ARG 1 name METHOD method_25044 setOperator (Z)V ARG 1 operator - METHOD method_25045 getUuid ()Ljava/lang/String; - METHOD method_25046 setUuid (Ljava/lang/String;)V + METHOD method_25045 getUuid ()Ljava/util/UUID; + METHOD method_25046 setUuid (Ljava/util/UUID;)V ARG 1 uuid METHOD method_25047 setAccepted (Z)V ARG 1 accepted diff --git a/mappings/net/minecraft/client/realms/dto/RealmsNotification.mapping b/mappings/net/minecraft/client/realms/dto/RealmsNotification.mapping new file mode 100644 index 0000000000..7869588e6e --- /dev/null +++ b/mappings/net/minecraft/client/realms/dto/RealmsNotification.mapping @@ -0,0 +1,41 @@ +CLASS net/minecraft/class_8204 net/minecraft/client/realms/dto/RealmsNotification + FIELD field_43015 LOGGER Lorg/slf4j/Logger; + FIELD field_43016 NOTIFICATION_UUID_KEY Ljava/lang/String; + FIELD field_43017 DISMISSABLE_KEY Ljava/lang/String; + FIELD field_43018 SEEN_KEY Ljava/lang/String; + FIELD field_43019 TYPE_KEY Ljava/lang/String; + FIELD field_43020 VISIT_URL_TYPE Ljava/lang/String; + FIELD field_43021 uuid Ljava/util/UUID; + FIELD field_43022 dismissable Z + FIELD field_43023 seen Z + FIELD field_43024 type Ljava/lang/String; + METHOD (Ljava/util/UUID;ZZLjava/lang/String;)V + ARG 1 uuid + ARG 2 dismissable + ARG 3 seen + ARG 4 type + METHOD method_49574 isSeen ()Z + METHOD method_49575 fromJson (Lcom/google/gson/JsonObject;)Lnet/minecraft/class_8204; + ARG 0 json + METHOD method_49576 parse (Ljava/lang/String;)Ljava/util/List; + ARG 0 json + METHOD method_49577 isDismissable ()Z + METHOD method_49578 getUuid ()Ljava/util/UUID; + CLASS class_8205 VisitUrl + FIELD field_43025 URL_KEY Ljava/lang/String; + FIELD field_43026 BUTTON_TEXT_KEY Ljava/lang/String; + FIELD field_43027 MESSAGE_KEY Ljava/lang/String; + FIELD field_43028 url Ljava/lang/String; + FIELD field_43029 buttonText Lnet/minecraft/class_8206; + FIELD field_43030 message Lnet/minecraft/class_8206; + METHOD (Lnet/minecraft/class_8204;Ljava/lang/String;Lnet/minecraft/class_8206;Lnet/minecraft/class_8206;)V + ARG 1 parent + ARG 2 url + ARG 3 buttonText + ARG 4 message + METHOD method_49579 fromJson (Lnet/minecraft/class_8204;Lcom/google/gson/JsonObject;)Lnet/minecraft/class_8204$class_8205; + ARG 0 parent + ARG 1 json + METHOD method_49580 createButton (Lnet/minecraft/class_437;)Lnet/minecraft/class_4185; + ARG 1 currentScreen + METHOD method_49581 getDefaultMessage ()Lnet/minecraft/class_2561; diff --git a/mappings/net/minecraft/client/realms/dto/RealmsServer.mapping b/mappings/net/minecraft/client/realms/dto/RealmsServer.mapping index 4d1ab97a9e..56061fcc60 100644 --- a/mappings/net/minecraft/client/realms/dto/RealmsServer.mapping +++ b/mappings/net/minecraft/client/realms/dto/RealmsServer.mapping @@ -5,7 +5,7 @@ CLASS net/minecraft/class_4877 net/minecraft/client/realms/dto/RealmsServer FIELD field_22602 description Ljava/lang/String; FIELD field_22603 state Lnet/minecraft/class_4877$class_4320; FIELD field_22604 owner Ljava/lang/String; - FIELD field_22605 ownerUUID Ljava/lang/String; + FIELD field_22605 ownerUUID Ljava/util/UUID; FIELD field_22606 players Ljava/util/List; FIELD field_22607 slots Ljava/util/Map; FIELD field_22608 expired Z diff --git a/mappings/net/minecraft/client/realms/dto/RealmsServerPlayerList.mapping b/mappings/net/minecraft/client/realms/dto/RealmsServerPlayerList.mapping index de24aeffb1..5fde640ab9 100644 --- a/mappings/net/minecraft/client/realms/dto/RealmsServerPlayerList.mapping +++ b/mappings/net/minecraft/client/realms/dto/RealmsServerPlayerList.mapping @@ -2,7 +2,6 @@ CLASS net/minecraft/class_4881 net/minecraft/client/realms/dto/RealmsServerPlaye FIELD field_22626 serverId J FIELD field_22627 players Ljava/util/List; FIELD field_22628 LOGGER Lorg/slf4j/Logger; - FIELD field_22629 JSON_PARSER Lcom/google/gson/JsonParser; METHOD method_25073 parsePlayers (Lcom/google/gson/JsonArray;)Ljava/util/List; ARG 0 jsonArray METHOD method_25074 parse (Lcom/google/gson/JsonObject;)Lnet/minecraft/class_4881; diff --git a/mappings/net/minecraft/client/realms/dto/RealmsText.mapping b/mappings/net/minecraft/client/realms/dto/RealmsText.mapping new file mode 100644 index 0000000000..94d74a3b59 --- /dev/null +++ b/mappings/net/minecraft/client/realms/dto/RealmsText.mapping @@ -0,0 +1,12 @@ +CLASS net/minecraft/class_8206 net/minecraft/client/realms/dto/RealmsText + FIELD field_43031 TRANSLATION_KEY_KEY Ljava/lang/String; + FIELD field_43032 ARGS_KEY Ljava/lang/String; + FIELD field_43033 translationKey Ljava/lang/String; + FIELD field_43034 args [Ljava/lang/Object; + METHOD (Ljava/lang/String;[Ljava/lang/Object;)V + ARG 1 translationKey + ARG 2 args + METHOD method_49582 fromJson (Lcom/google/gson/JsonObject;)Lnet/minecraft/class_8206; + ARG 0 json + METHOD method_49583 toText (Lnet/minecraft/class_2561;)Lnet/minecraft/class_2561; + ARG 1 fallback diff --git a/mappings/net/minecraft/client/realms/exception/RealmsServiceException.mapping b/mappings/net/minecraft/client/realms/exception/RealmsServiceException.mapping index a429d8bda9..ec4098a64f 100644 --- a/mappings/net/minecraft/client/realms/exception/RealmsServiceException.mapping +++ b/mappings/net/minecraft/client/realms/exception/RealmsServiceException.mapping @@ -1,13 +1,4 @@ CLASS net/minecraft/class_4355 net/minecraft/client/realms/exception/RealmsServiceException - FIELD field_19604 httpResultCode I - FIELD field_36319 httpResponseText Ljava/lang/String; FIELD field_36320 error Lnet/minecraft/class_4345; - METHOD (ILjava/lang/String;)V - ARG 1 httpResultCode - ARG 2 httpResponseText - METHOD (ILjava/lang/String;Lnet/minecraft/class_4345;)V - ARG 1 httpResultCode - ARG 2 httpResponseText - ARG 3 error - METHOD method_39980 getErrorCode (I)I - ARG 1 fallback + METHOD (Lnet/minecraft/class_4345;)V + ARG 1 error diff --git a/mappings/net/minecraft/client/realms/gui/RealmsLoadingWidget.mapping b/mappings/net/minecraft/client/realms/gui/RealmsLoadingWidget.mapping new file mode 100644 index 0000000000..339e38fe11 --- /dev/null +++ b/mappings/net/minecraft/client/realms/gui/RealmsLoadingWidget.mapping @@ -0,0 +1,5 @@ +CLASS net/minecraft/class_8661 net/minecraft/client/realms/gui/RealmsLoadingWidget + FIELD field_45361 textRenderer Lnet/minecraft/class_327; + METHOD (Lnet/minecraft/class_327;Lnet/minecraft/class_2561;)V + ARG 1 textRenderer + ARG 2 message diff --git a/mappings/net/minecraft/client/realms/gui/RealmsWorldSlotButton.mapping b/mappings/net/minecraft/client/realms/gui/RealmsWorldSlotButton.mapping index 3a86d6c708..8a0f04ef41 100644 --- a/mappings/net/minecraft/client/realms/gui/RealmsWorldSlotButton.mapping +++ b/mappings/net/minecraft/client/realms/gui/RealmsWorldSlotButton.mapping @@ -12,6 +12,7 @@ CLASS net/minecraft/class_4367 net/minecraft/client/realms/gui/RealmsWorldSlotBu FIELD field_26469 MINIGAME_TOOLTIP Lnet/minecraft/class_2561; FIELD field_26470 TOOLTIP Lnet/minecraft/class_2561; FIELD field_39067 CHECKMARK Lnet/minecraft/class_2960; + FIELD field_44894 MINIGAME_SLOT_NAME Lnet/minecraft/class_2561; METHOD (IIIILjava/util/function/Supplier;Ljava/util/function/Consumer;ILnet/minecraft/class_4185$class_4241;)V ARG 1 x ARG 2 y @@ -21,8 +22,8 @@ CLASS net/minecraft/class_4367 net/minecraft/client/realms/gui/RealmsWorldSlotBu ARG 6 tooltipSetter ARG 7 id ARG 8 action - METHOD method_21107 drawSlotFrame (Lnet/minecraft/class_4587;IIIIZLjava/lang/String;IJLjava/lang/String;ZZLnet/minecraft/class_4367$class_4368;Lnet/minecraft/class_2561;)V - ARG 1 matrices + METHOD method_21107 drawSlotFrame (Lnet/minecraft/class_332;IIIIZLjava/lang/String;IJLjava/lang/String;ZZLnet/minecraft/class_4367$class_4368;Lnet/minecraft/class_2561;)V + ARG 1 context ARG 2 x ARG 3 y ARG 4 mouseX @@ -48,8 +49,8 @@ CLASS net/minecraft/class_4367 net/minecraft/client/realms/gui/RealmsWorldSlotBu ARG 1 active ARG 2 minigame METHOD method_37007 tick ()V - METHOD method_43586 drawCheckmark (Lnet/minecraft/class_4587;II)V - ARG 1 matrices + METHOD method_43586 drawCheckmark (Lnet/minecraft/class_332;II)V + ARG 1 context ARG 2 x ARG 3 y CLASS class_4368 Action diff --git a/mappings/net/minecraft/client/realms/gui/screen/BuyRealmsScreen.mapping b/mappings/net/minecraft/client/realms/gui/screen/BuyRealmsScreen.mapping new file mode 100644 index 0000000000..82d03d21dc --- /dev/null +++ b/mappings/net/minecraft/client/realms/gui/screen/BuyRealmsScreen.mapping @@ -0,0 +1,38 @@ +CLASS net/minecraft/class_8656 net/minecraft/client/realms/gui/screen/BuyRealmsScreen + FIELD field_45267 realmsImages Ljava/util/List; + FIELD field_45268 parent Lnet/minecraft/class_437; + FIELD field_45269 trialAvailable Z + FIELD field_45270 trialButton Lnet/minecraft/class_4185; + FIELD field_45271 realmsImageIndex I + FIELD field_45272 realmsImageDisplayTime I + FIELD field_45273 POPUP_TEXT Lnet/minecraft/class_2561; + FIELD field_45274 CLOSE_TEXT Lnet/minecraft/class_2561; + FIELD field_45275 POPUP_BACKGROUND_TEXTURE Lnet/minecraft/class_2960; + FIELD field_45276 TRIAL_AVAILABLE_TEXTURE Lnet/minecraft/class_2960; + FIELD field_45277 CROSS_BUTTON_TEXTURES Lnet/minecraft/class_8666; + METHOD (Lnet/minecraft/class_437;Z)V + ARG 1 parent + ARG 2 trialAvailable + METHOD method_52680 getLeft ()I + METHOD method_52681 getTop ()I + METHOD method_52682 getRight ()I + METHOD method_52683 getBottom ()I + METHOD method_52684 (Lnet/minecraft/class_2960;)Z + ARG 0 id + METHOD method_52685 refreshImages (Lnet/minecraft/class_3300;)V + ARG 0 resourceManager + METHOD method_52686 drawTrialAvailableTexture (Lnet/minecraft/class_332;Lnet/minecraft/class_4185;)V + ARG 0 context + ARG 1 button + METHOD method_52687 (Lnet/minecraft/class_4185;)V + ARG 1 button + METHOD method_52688 (Lnet/minecraft/class_2960;)Z + ARG 0 id + METHOD method_52689 (Lnet/minecraft/class_4185;)V + ARG 1 button + METHOD method_52690 (Lnet/minecraft/class_4185;)V + ARG 1 button + METHOD method_52691 (Z)V + ARG 1 confirmed + METHOD method_52692 (Z)V + ARG 1 confirmed diff --git a/mappings/net/minecraft/client/realms/gui/screen/DisconnectedRealmsScreen.mapping b/mappings/net/minecraft/client/realms/gui/screen/DisconnectedRealmsScreen.mapping index c9d733a8d0..0abe729f69 100644 --- a/mappings/net/minecraft/client/realms/gui/screen/DisconnectedRealmsScreen.mapping +++ b/mappings/net/minecraft/client/realms/gui/screen/DisconnectedRealmsScreen.mapping @@ -7,5 +7,3 @@ CLASS net/minecraft/class_4899 net/minecraft/client/realms/gui/screen/Disconnect ARG 1 parent ARG 2 title ARG 3 reason - METHOD method_25468 (Lnet/minecraft/class_310;Lnet/minecraft/class_4185;)V - ARG 2 button diff --git a/mappings/net/minecraft/client/realms/gui/screen/RealmsAcceptRejectButton.mapping b/mappings/net/minecraft/client/realms/gui/screen/RealmsAcceptRejectButton.mapping index cdf0347f8b..a09787f787 100644 --- a/mappings/net/minecraft/client/realms/gui/screen/RealmsAcceptRejectButton.mapping +++ b/mappings/net/minecraft/client/realms/gui/screen/RealmsAcceptRejectButton.mapping @@ -11,19 +11,19 @@ CLASS net/minecraft/class_4371 net/minecraft/client/realms/gui/screen/RealmsAcce METHOD method_21109 getRight ()I METHOD method_21110 handleClick (I)V ARG 1 index - METHOD method_21111 render (Lnet/minecraft/class_4587;IIII)V - ARG 1 matrices + METHOD method_21111 render (Lnet/minecraft/class_332;IIII)V + ARG 1 context ARG 2 x ARG 3 y ARG 4 mouseX ARG 5 mouseY - METHOD method_21112 render (Lnet/minecraft/class_4587;IIZ)V - ARG 1 matrices + METHOD method_21112 render (Lnet/minecraft/class_332;IIZ)V + ARG 1 context ARG 2 x ARG 3 y ARG 4 showTooltip - METHOD method_21113 render (Lnet/minecraft/class_4587;Ljava/util/List;Lnet/minecraft/class_4904;IIII)V - ARG 0 matrices + METHOD method_21113 render (Lnet/minecraft/class_332;Ljava/util/List;Lnet/minecraft/class_4904;IIII)V + ARG 0 context ARG 1 buttons ARG 2 selectionList ARG 3 x diff --git a/mappings/net/minecraft/client/realms/gui/screen/RealmsBackupInfoScreen.mapping b/mappings/net/minecraft/client/realms/gui/screen/RealmsBackupInfoScreen.mapping index a2e0ca7297..d13b3f56c0 100644 --- a/mappings/net/minecraft/client/realms/gui/screen/RealmsBackupInfoScreen.mapping +++ b/mappings/net/minecraft/client/realms/gui/screen/RealmsBackupInfoScreen.mapping @@ -3,6 +3,8 @@ CLASS net/minecraft/class_4379 net/minecraft/client/realms/gui/screen/RealmsBack FIELD field_19736 backup Lnet/minecraft/class_4867; FIELD field_19738 backupInfoList Lnet/minecraft/class_4379$class_4380; FIELD field_27937 UNKNOWN Lnet/minecraft/class_2561; + FIELD field_45972 TITLE Lnet/minecraft/class_2561; + FIELD field_45973 layout Lnet/minecraft/class_8132; METHOD (Lnet/minecraft/class_437;Lnet/minecraft/class_4867;)V ARG 1 parent ARG 2 backup @@ -15,6 +17,8 @@ CLASS net/minecraft/class_4379 net/minecraft/client/realms/gui/screen/RealmsBack ARG 1 value METHOD method_25105 (Lnet/minecraft/class_4185;)V ARG 1 button + METHOD method_53513 (Lnet/minecraft/class_4379;Lnet/minecraft/class_364;)V + ARG 1 child CLASS class_4380 BackupInfoList METHOD (Lnet/minecraft/class_4379;Lnet/minecraft/class_310;)V ARG 2 client @@ -24,6 +28,19 @@ CLASS net/minecraft/class_4379 net/minecraft/client/realms/gui/screen/RealmsBack CLASS class_5344 BackupInfoListEntry FIELD field_25258 key Ljava/lang/String; FIELD field_25259 value Ljava/lang/String; + FIELD field_44895 TEMPLATE_NAME_TEXT Lnet/minecraft/class_2561; + FIELD field_44896 GAME_DIFFICULTY_TEXT Lnet/minecraft/class_2561; + FIELD field_44897 NAME_TEXT Lnet/minecraft/class_2561; + FIELD field_44898 GAME_SERVER_VERSION_TEXT Lnet/minecraft/class_2561; + FIELD field_44899 UPLOADED_TEXT Lnet/minecraft/class_2561; + FIELD field_44900 ENABLED_PACK_TEXT Lnet/minecraft/class_2561; + FIELD field_44901 DESCRIPTION_TEXT Lnet/minecraft/class_2561; + FIELD field_44902 GAME_MODE_TEXT Lnet/minecraft/class_2561; + FIELD field_44903 SEED_TEXT Lnet/minecraft/class_2561; + FIELD field_44904 WORLD_TYPE_TEXT Lnet/minecraft/class_2561; + FIELD field_44905 UNDEFINED_TEXT Lnet/minecraft/class_2561; METHOD (Lnet/minecraft/class_4379;Ljava/lang/String;Ljava/lang/String;)V ARG 2 key ARG 3 value + METHOD method_51886 getTextFromKey (Ljava/lang/String;)Lnet/minecraft/class_2561; + ARG 1 key diff --git a/mappings/net/minecraft/client/realms/gui/screen/RealmsBackupScreen.mapping b/mappings/net/minecraft/client/realms/gui/screen/RealmsBackupScreen.mapping index 6cebba51fa..f5cf4d4d33 100644 --- a/mappings/net/minecraft/client/realms/gui/screen/RealmsBackupScreen.mapping +++ b/mappings/net/minecraft/client/realms/gui/screen/RealmsBackupScreen.mapping @@ -1,9 +1,7 @@ CLASS net/minecraft/class_4381 net/minecraft/client/realms/gui/screen/RealmsBackupScreen FIELD field_19741 LOGGER Lorg/slf4j/Logger; - FIELD field_19742 lastScrollPosition I FIELD field_19743 parent Lnet/minecraft/class_4388; FIELD field_19744 backups Ljava/util/List; - FIELD field_19745 tooltip Lnet/minecraft/class_2561; FIELD field_19746 backupObjectSelectionList Lnet/minecraft/class_4381$class_4382; FIELD field_19747 selectedBackup I FIELD field_19748 slotId I @@ -12,8 +10,6 @@ CLASS net/minecraft/class_4381 net/minecraft/client/realms/gui/screen/RealmsBack FIELD field_19751 changesButton Lnet/minecraft/class_4185; FIELD field_19752 noBackups Ljava/lang/Boolean; FIELD field_19753 serverData Lnet/minecraft/class_4877; - FIELD field_22686 PLUS_ICON Lnet/minecraft/class_2960; - FIELD field_22687 RESTORE_ICON Lnet/minecraft/class_2960; FIELD field_26471 RESTORE_TEXT Lnet/minecraft/class_2561; FIELD field_26472 CHANGES_TOOLTIP Lnet/minecraft/class_2561; FIELD field_26473 BACKUPS_TEXT Lnet/minecraft/class_2561; @@ -23,15 +19,6 @@ CLASS net/minecraft/class_4381 net/minecraft/client/realms/gui/screen/RealmsBack ARG 1 parent ARG 2 serverData ARG 3 slotId - METHOD method_21147 addToChangeList (Lnet/minecraft/class_4867;Ljava/lang/String;)V - ARG 1 backup - ARG 2 key - METHOD method_21153 renderMousehoverTooltip (Lnet/minecraft/class_4587;Lnet/minecraft/class_2561;II)V - ARG 1 matrices - ARG 2 text - ARG 3 mouseX - ARG 4 mouseY - METHOD method_21154 generateChangeList ()V METHOD method_21155 restoreClicked (I)V ARG 1 selectedBackup METHOD method_21160 updateButtonStates ()V @@ -59,26 +46,24 @@ CLASS net/minecraft/class_4381 net/minecraft/client/realms/gui/screen/RealmsBack ARG 1 backup CLASS class_4383 BackupObjectSelectionListEntry FIELD field_19761 mBackup Lnet/minecraft/class_4867; + FIELD field_44527 buttons Ljava/util/List; + FIELD field_44528 restoreButton Lnet/minecraft/class_344; + FIELD field_44529 infoButton Lnet/minecraft/class_344; + FIELD field_45237 CHANGES_BUTTON_TEXTURES Lnet/minecraft/class_8666; + FIELD field_45238 RESTORE_BUTTON_TEXTURES Lnet/minecraft/class_8666; METHOD (Lnet/minecraft/class_4381;Lnet/minecraft/class_4867;)V ARG 2 backup - METHOD method_21174 drawRestore (Lnet/minecraft/class_4587;IIII)V - ARG 1 matrices - ARG 2 x - ARG 3 y - ARG 4 mouseX - ARG 5 mouseY - METHOD method_21175 renderBackupItem (Lnet/minecraft/class_4587;Lnet/minecraft/class_4867;IIII)V - ARG 1 matrices - ARG 2 backup - ARG 3 x - ARG 4 y - ARG 5 mouseX - ARG 6 mouseY METHOD method_21176 getMediumDatePresentation (Ljava/util/Date;)Ljava/lang/String; ARG 1 lastModifiedDate - METHOD method_21177 drawInfo (Lnet/minecraft/class_4587;IIII)V - ARG 1 matrices - ARG 2 x - ARG 3 y - ARG 4 mouseX - ARG 5 mouseY + METHOD method_51238 (ILnet/minecraft/class_332;IIFLnet/minecraft/class_339;)V + ARG 5 button + METHOD method_51239 updateChangeList (Lnet/minecraft/class_4867;)V + ARG 1 backup + METHOD method_51240 (Lnet/minecraft/class_4185;)V + ARG 1 button + METHOD method_51241 addChange (Ljava/lang/String;)V + ARG 1 metadataKey + METHOD method_51242 addInfoButton ()V + METHOD method_51243 (Lnet/minecraft/class_4185;)V + ARG 1 button + METHOD method_51244 addRestoreButton ()V diff --git a/mappings/net/minecraft/client/realms/gui/screen/RealmsBrokenWorldScreen.mapping b/mappings/net/minecraft/client/realms/gui/screen/RealmsBrokenWorldScreen.mapping index 418d8f09f7..1a6123515f 100644 --- a/mappings/net/minecraft/client/realms/gui/screen/RealmsBrokenWorldScreen.mapping +++ b/mappings/net/minecraft/client/realms/gui/screen/RealmsBrokenWorldScreen.mapping @@ -5,10 +5,10 @@ CLASS net/minecraft/class_4384 net/minecraft/client/realms/gui/screen/RealmsBrok FIELD field_19767 serverId J FIELD field_19769 message [Lnet/minecraft/class_2561; FIELD field_19770 left_x I - FIELD field_19771 right_x I FIELD field_19778 slotsThatHasBeenDownloaded Ljava/util/List; FIELD field_19779 animTick I FIELD field_20492 serverData Lnet/minecraft/class_4877; + FIELD field_45239 SLOT_FRAME_TEXTURE Lnet/minecraft/class_2960; METHOD (Lnet/minecraft/class_437;Lnet/minecraft/class_4325;JZ)V ARG 1 parent ARG 2 mainScreen @@ -17,8 +17,8 @@ CLASS net/minecraft/class_4384 net/minecraft/client/realms/gui/screen/RealmsBrok METHOD method_21178 addButtons ()V 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 + METHOD method_21180 drawSlotFrame (Lnet/minecraft/class_332;IIIIZLjava/lang/String;IJLjava/lang/String;Z)V + ARG 1 context ARG 2 x ARG 3 y ARG 4 mouseX @@ -33,7 +33,6 @@ CLASS net/minecraft/class_4384 net/minecraft/client/realms/gui/screen/RealmsBrok ARG 1 worldId METHOD method_21187 downloadWorld (I)V ARG 1 slotId - METHOD method_21194 backButtonClicked ()V METHOD method_21196 isMinigame ()Z METHOD method_25120 (ILnet/minecraft/class_4185;)V ARG 2 button @@ -46,5 +45,3 @@ CLASS net/minecraft/class_4384 net/minecraft/client/realms/gui/screen/RealmsBrok ARG 2 button METHOD method_25125 (IZ)V ARG 2 confirmed - METHOD method_25126 (ILnet/minecraft/class_4185;)V - ARG 2 button diff --git a/mappings/net/minecraft/client/realms/gui/screen/RealmsClientOutdatedScreen.mapping b/mappings/net/minecraft/client/realms/gui/screen/RealmsClientIncompatibleScreen.mapping similarity index 93% rename from mappings/net/minecraft/client/realms/gui/screen/RealmsClientOutdatedScreen.mapping rename to mappings/net/minecraft/client/realms/gui/screen/RealmsClientIncompatibleScreen.mapping index b9beb51e71..b290626046 100644 --- a/mappings/net/minecraft/client/realms/gui/screen/RealmsClientOutdatedScreen.mapping +++ b/mappings/net/minecraft/client/realms/gui/screen/RealmsClientIncompatibleScreen.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_4387 net/minecraft/client/realms/gui/screen/RealmsClientOutdatedScreen +CLASS net/minecraft/class_4387 net/minecraft/client/realms/gui/screen/RealmsClientIncompatibleScreen FIELD field_19787 parent Lnet/minecraft/class_437; FIELD field_26477 INCOMPATIBLE_TITLE Lnet/minecraft/class_2561; FIELD field_26478 INCOMPATIBLE_LINES [Lnet/minecraft/class_2561; diff --git a/mappings/net/minecraft/client/realms/gui/screen/RealmsConfigureWorldScreen.mapping b/mappings/net/minecraft/client/realms/gui/screen/RealmsConfigureWorldScreen.mapping index f7a4ad7721..7e1e1be51e 100644 --- a/mappings/net/minecraft/client/realms/gui/screen/RealmsConfigureWorldScreen.mapping +++ b/mappings/net/minecraft/client/realms/gui/screen/RealmsConfigureWorldScreen.mapping @@ -13,22 +13,20 @@ CLASS net/minecraft/class_4388 net/minecraft/client/realms/gui/screen/RealmsConf FIELD field_19804 resetWorldButton Lnet/minecraft/class_4185; FIELD field_19805 switchMinigameButton Lnet/minecraft/class_4185; FIELD field_19806 stateChanged Z - FIELD field_19807 animTick I FIELD field_19808 clicks I FIELD field_20493 server Lnet/minecraft/class_4877; - FIELD field_22688 ON_ICON Lnet/minecraft/class_2960; - FIELD field_22689 OFF_ICON Lnet/minecraft/class_2960; - FIELD field_22690 EXPIRED_ICON Lnet/minecraft/class_2960; - FIELD field_22691 EXPIRES_SOON_ICON Lnet/minecraft/class_2960; + FIELD field_22690 EXPIRED_STATUS_TEXTURE Lnet/minecraft/class_2960; + FIELD field_22691 EXPIRES_SOON_STATUS_TEXTURE Lnet/minecraft/class_2960; FIELD field_26479 WORLDS_TITLE Lnet/minecraft/class_2561; FIELD field_26480 CONFIGURE_REALM_TITLE Lnet/minecraft/class_2561; - FIELD field_26481 CURRENT_MINIGAME_TEXT Lnet/minecraft/class_2561; FIELD field_26482 EXPIRED_TEXT Lnet/minecraft/class_2561; FIELD field_26483 EXPIRES_SOON_TEXT Lnet/minecraft/class_2561; FIELD field_26484 EXPIRES_IN_A_DAY_TEXT Lnet/minecraft/class_2561; FIELD field_26485 OPEN_TEXT Lnet/minecraft/class_2561; FIELD field_26486 CLOSED_TEXT Lnet/minecraft/class_2561; FIELD field_33777 slotButtons Ljava/util/List; + FIELD field_45240 OPEN_STATUS_TEXTURE Lnet/minecraft/class_2960; + FIELD field_45241 CLOSED_STATUS_TEXTURE Lnet/minecraft/class_2960; METHOD (Lnet/minecraft/class_4325;J)V ARG 1 parent ARG 2 serverId @@ -38,19 +36,12 @@ CLASS net/minecraft/class_4388 net/minecraft/client/realms/gui/screen/RealmsConf METHOD method_21200 buttonCenter (II)I ARG 1 i ARG 2 total - METHOD method_21201 drawServerStatus (Lnet/minecraft/class_4587;IIII)V - ARG 1 matrices + METHOD method_21201 drawServerState (Lnet/minecraft/class_332;IIII)V + ARG 1 context ARG 2 x ARG 3 y ARG 4 mouseX ARG 5 mouseY - METHOD method_21202 drawExpiring (Lnet/minecraft/class_4587;IIIII)V - ARG 1 matrices - ARG 2 x - ARG 3 y - ARG 4 mouseX - ARG 5 mouseY - ARG 6 remainingDays METHOD method_21203 switchToFullSlot (ILnet/minecraft/class_4877;)V ARG 1 selectedSlot ARG 2 serverData @@ -60,11 +51,6 @@ CLASS net/minecraft/class_4388 net/minecraft/client/realms/gui/screen/RealmsConf ARG 1 serverData 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 - ARG 2 text - ARG 3 mouseX - ARG 4 mouseY METHOD method_21215 saveSettings (Ljava/lang/String;Ljava/lang/String;)V ARG 1 name ARG 2 desc @@ -76,12 +62,6 @@ CLASS net/minecraft/class_4388 net/minecraft/client/realms/gui/screen/RealmsConf METHOD method_21219 getNewScreen ()Lnet/minecraft/class_4388; METHOD method_21220 buttonLeft (I)I ARG 1 i - METHOD method_21221 drawExpired (Lnet/minecraft/class_4587;IIII)V - ARG 1 matrices - ARG 2 x - ARG 3 y - ARG 4 mouseX - ARG 5 mouseY METHOD method_21222 switchToEmptySlot (ILnet/minecraft/class_4877;)V ARG 1 selectedSlot ARG 2 serverData @@ -89,12 +69,6 @@ CLASS net/minecraft/class_4388 net/minecraft/client/realms/gui/screen/RealmsConf ARG 1 button METHOD method_21228 frame (I)I ARG 1 ordinal - METHOD method_21229 drawOpen (Lnet/minecraft/class_4587;IIII)V - ARG 1 matrices - ARG 2 x - ARG 3 y - ARG 4 mouseX - ARG 5 mouseY METHOD method_21231 backButtonClicked ()V METHOD method_21234 disableButtons ()V METHOD method_21236 switchToMinigame ()V @@ -103,7 +77,7 @@ CLASS net/minecraft/class_4388 net/minecraft/client/realms/gui/screen/RealmsConf METHOD method_21242 hideMinigameButtons ()V METHOD method_25135 (ILnet/minecraft/class_4185;)V ARG 2 button - METHOD method_25136 (Lnet/minecraft/class_4877;IZ)V + METHOD method_25136 (ILnet/minecraft/class_4877;Z)V ARG 3 confirmed METHOD method_25138 removeButton (Lnet/minecraft/class_4185;)V ARG 1 button @@ -115,12 +89,6 @@ CLASS net/minecraft/class_4388 net/minecraft/client/realms/gui/screen/RealmsConf ARG 1 button METHOD method_25142 (Lnet/minecraft/class_4185;)V ARG 1 button - METHOD method_25143 drawClosed (Lnet/minecraft/class_4587;IIII)V - ARG 1 matrices - ARG 2 x - ARG 3 y - ARG 4 mouseX - ARG 5 mouseY METHOD method_25144 (Lnet/minecraft/class_4185;)V ARG 1 button METHOD method_25145 (Lnet/minecraft/class_4185;)V @@ -135,3 +103,11 @@ CLASS net/minecraft/class_4388 net/minecraft/client/realms/gui/screen/RealmsConf ARG 1 tooltip METHOD method_32484 switchMinigame (Lnet/minecraft/class_4890;)V ARG 1 template + METHOD method_53460 drawServerState (Lnet/minecraft/class_332;IIIILnet/minecraft/class_2960;Ljava/util/function/Supplier;)V + ARG 1 context + ARG 2 x + ARG 3 y + ARG 4 mouseX + ARG 5 mouseY + ARG 6 texture + ARG 7 tooltipGetter diff --git a/mappings/net/minecraft/client/realms/gui/screen/RealmsCreateRealmScreen.mapping b/mappings/net/minecraft/client/realms/gui/screen/RealmsCreateRealmScreen.mapping index acdbe4a088..962f85f013 100644 --- a/mappings/net/minecraft/client/realms/gui/screen/RealmsCreateRealmScreen.mapping +++ b/mappings/net/minecraft/client/realms/gui/screen/RealmsCreateRealmScreen.mapping @@ -3,15 +3,18 @@ CLASS net/minecraft/class_4390 net/minecraft/client/realms/gui/screen/RealmsCrea FIELD field_19830 parent Lnet/minecraft/class_4325; FIELD field_19831 nameBox Lnet/minecraft/class_342; FIELD field_19832 descriptionBox Lnet/minecraft/class_342; - FIELD field_19833 createButton Lnet/minecraft/class_4185; FIELD field_26487 WORLD_NAME_TEXT Lnet/minecraft/class_2561; FIELD field_26488 WORLD_DESCRIPTION_TEXT Lnet/minecraft/class_2561; + FIELD field_45242 layout Lnet/minecraft/class_8132; METHOD (Lnet/minecraft/class_4877;Lnet/minecraft/class_4325;)V ARG 1 server ARG 2 parent METHOD method_21245 createWorld ()V - METHOD method_21247 valid ()Z - METHOD method_25154 (Lnet/minecraft/class_4185;)V - ARG 1 button METHOD method_25155 (Lnet/minecraft/class_4185;)V ARG 1 button + METHOD method_52665 (Lnet/minecraft/class_4390;Lnet/minecraft/class_364;)V + ARG 1 child + METHOD method_52666 (Lnet/minecraft/class_4185;)V + ARG 1 button + METHOD method_52667 (Lnet/minecraft/class_4185;Ljava/lang/String;)V + ARG 1 name diff --git a/mappings/net/minecraft/client/realms/gui/screen/RealmsDownloadLatestWorldScreen.mapping b/mappings/net/minecraft/client/realms/gui/screen/RealmsDownloadLatestWorldScreen.mapping index d0745ccd46..02540ff765 100644 --- a/mappings/net/minecraft/client/realms/gui/screen/RealmsDownloadLatestWorldScreen.mapping +++ b/mappings/net/minecraft/client/realms/gui/screen/RealmsDownloadLatestWorldScreen.mapping @@ -31,16 +31,16 @@ CLASS net/minecraft/class_4392 net/minecraft/client/realms/gui/screen/RealmsDown METHOD method_21259 getContentLength (Ljava/lang/String;)J ARG 1 downloadLink METHOD method_21265 checkDownloadSize ()V - METHOD method_21266 drawDownloadSpeed0 (Lnet/minecraft/class_4587;J)V - ARG 1 matrices + METHOD method_21266 drawDownloadSpeed0 (Lnet/minecraft/class_332;J)V + ARG 1 context ARG 2 bytesPerSecond 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_21272 drawDots (Lnet/minecraft/class_332;)V + ARG 1 context + METHOD method_21274 drawProgressBar (Lnet/minecraft/class_332;)V + ARG 1 context + METHOD method_21276 drawDownloadSpeed (Lnet/minecraft/class_332;)V + ARG 1 context METHOD method_21278 downloadSave ()V METHOD method_21279 downloadCancelled ()V METHOD method_25158 (Lnet/minecraft/class_4185;)V diff --git a/mappings/net/minecraft/client/realms/gui/screen/RealmsGenericErrorScreen.mapping b/mappings/net/minecraft/client/realms/gui/screen/RealmsGenericErrorScreen.mapping index a51cc1aa36..9992b637a7 100644 --- a/mappings/net/minecraft/client/realms/gui/screen/RealmsGenericErrorScreen.mapping +++ b/mappings/net/minecraft/client/realms/gui/screen/RealmsGenericErrorScreen.mapping @@ -1,6 +1,6 @@ CLASS net/minecraft/class_4394 net/minecraft/client/realms/gui/screen/RealmsGenericErrorScreen FIELD field_22695 parent Lnet/minecraft/class_437; - FIELD field_36321 errorMessages Lcom/mojang/datafixers/util/Pair; + FIELD field_36321 errorMessages Lnet/minecraft/class_4394$class_8570; FIELD field_36322 description Lnet/minecraft/class_5489; METHOD (Lnet/minecraft/class_2561;Lnet/minecraft/class_2561;Lnet/minecraft/class_437;)V ARG 1 title @@ -12,12 +12,13 @@ CLASS net/minecraft/class_4394 net/minecraft/client/realms/gui/screen/RealmsGene METHOD (Lnet/minecraft/class_4355;Lnet/minecraft/class_437;)V ARG 1 realmsServiceException ARG 2 parent - METHOD method_21282 getErrorMessages (Lnet/minecraft/class_2561;)Lcom/mojang/datafixers/util/Pair; + METHOD method_21282 getErrorMessages (Lnet/minecraft/class_2561;)Lnet/minecraft/class_4394$class_8570; ARG 0 description - METHOD method_21283 getErrorMessages (Lnet/minecraft/class_2561;Lnet/minecraft/class_2561;)Lcom/mojang/datafixers/util/Pair; + METHOD method_21283 getErrorMessages (Lnet/minecraft/class_2561;Lnet/minecraft/class_2561;)Lnet/minecraft/class_4394$class_8570; ARG 0 title ARG 1 description METHOD method_25160 (Lnet/minecraft/class_4185;)V ARG 1 button - METHOD method_39981 getErrorMessages (Lnet/minecraft/class_4355;)Lcom/mojang/datafixers/util/Pair; + METHOD method_39981 getErrorMessages (Lnet/minecraft/class_4355;)Lnet/minecraft/class_4394$class_8570; ARG 0 exception + CLASS class_8570 ErrorMessages diff --git a/mappings/net/minecraft/client/realms/gui/screen/RealmsInviteScreen.mapping b/mappings/net/minecraft/client/realms/gui/screen/RealmsInviteScreen.mapping index 46a1445b3d..901a893c87 100644 --- a/mappings/net/minecraft/client/realms/gui/screen/RealmsInviteScreen.mapping +++ b/mappings/net/minecraft/client/realms/gui/screen/RealmsInviteScreen.mapping @@ -7,6 +7,8 @@ CLASS net/minecraft/class_4395 net/minecraft/client/realms/gui/screen/RealmsInvi FIELD field_22696 nameWidget Lnet/minecraft/class_342; FIELD field_26489 INVITE_PROFILE_NAME_TEXT Lnet/minecraft/class_2561; FIELD field_26490 PLAYER_ERROR_TEXT Lnet/minecraft/class_2561; + FIELD field_44942 inviteButton Lnet/minecraft/class_4185; + FIELD field_44943 INVITING_TEXT Lnet/minecraft/class_2561; METHOD (Lnet/minecraft/class_4388;Lnet/minecraft/class_437;Lnet/minecraft/class_4877;)V ARG 1 configureScreen ARG 2 parent @@ -18,3 +20,9 @@ CLASS net/minecraft/class_4395 net/minecraft/client/realms/gui/screen/RealmsInvi ARG 1 button METHOD method_25162 (Lnet/minecraft/class_4185;)V ARG 1 button + METHOD method_52218 (Lnet/minecraft/class_2583;)Lnet/minecraft/class_2583; + ARG 0 style + METHOD method_52219 (Lnet/minecraft/class_2583;)Lnet/minecraft/class_2583; + ARG 0 style + METHOD method_52220 (Lnet/minecraft/class_2583;)Lnet/minecraft/class_2583; + ARG 0 style diff --git a/mappings/net/minecraft/client/realms/gui/screen/RealmsLongConfirmationScreen.mapping b/mappings/net/minecraft/client/realms/gui/screen/RealmsLongConfirmationScreen.mapping index cab38c87eb..f1b06897c7 100644 --- a/mappings/net/minecraft/client/realms/gui/screen/RealmsLongConfirmationScreen.mapping +++ b/mappings/net/minecraft/client/realms/gui/screen/RealmsLongConfirmationScreen.mapping @@ -4,6 +4,8 @@ CLASS net/minecraft/class_4396 net/minecraft/client/realms/gui/screen/RealmsLong FIELD field_19897 line3 Lnet/minecraft/class_2561; FIELD field_19899 yesNoQuestion Z FIELD field_22697 callback Lit/unimi/dsi/fastutil/booleans/BooleanConsumer; + FIELD field_44906 WARNING_TEXT Lnet/minecraft/class_2561; + FIELD field_44907 INFO_TEXT Lnet/minecraft/class_2561; METHOD (Lit/unimi/dsi/fastutil/booleans/BooleanConsumer;Lnet/minecraft/class_4396$class_4397;Lnet/minecraft/class_2561;Lnet/minecraft/class_2561;Z)V ARG 1 callback ARG 2 type @@ -21,7 +23,7 @@ CLASS net/minecraft/class_4396 net/minecraft/client/realms/gui/screen/RealmsLong FIELD field_19904 INFO Lnet/minecraft/class_4396$class_4397; FIELD field_19905 colorCode I FIELD field_19906 text Lnet/minecraft/class_2561; - METHOD (Ljava/lang/String;ILjava/lang/String;I)V + METHOD (Ljava/lang/String;ILnet/minecraft/class_2561;I)V ARG 3 text ARG 4 colorCode METHOD valueOf (Ljava/lang/String;)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 ffe61a1a04..f7f9bb0cdd 100644 --- a/mappings/net/minecraft/client/realms/gui/screen/RealmsLongRunningMcoTaskScreen.mapping +++ b/mappings/net/minecraft/client/realms/gui/screen/RealmsLongRunningMcoTaskScreen.mapping @@ -1,23 +1,10 @@ CLASS net/minecraft/class_4398 net/minecraft/client/realms/gui/screen/RealmsLongRunningMcoTaskScreen - FIELD field_19908 SYMBOLS [Ljava/lang/String; FIELD field_19909 LOGGER Lorg/slf4j/Logger; FIELD field_19912 parent Lnet/minecraft/class_437; FIELD field_19914 title Lnet/minecraft/class_2561; - FIELD field_19916 errorMessage Lnet/minecraft/class_2561; - FIELD field_19917 aborted Z - FIELD field_19918 animTicks I FIELD field_19919 task Lnet/minecraft/class_4358; - FIELD field_19920 buttonLength I - FIELD field_33778 cancelButton Lnet/minecraft/class_4185; FIELD field_33779 NARRATOR Lnet/minecraft/class_4907; METHOD (Lnet/minecraft/class_437;Lnet/minecraft/class_4358;)V ARG 1 parent - 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_25167 (Lnet/minecraft/class_4185;)V - ARG 1 button METHOD method_25168 (Lnet/minecraft/class_4185;)V ARG 1 button diff --git a/mappings/net/minecraft/client/realms/gui/screen/RealmsMainScreen.mapping b/mappings/net/minecraft/client/realms/gui/screen/RealmsMainScreen.mapping index 9c5b7e12bd..f8a14ddede 100644 --- a/mappings/net/minecraft/client/realms/gui/screen/RealmsMainScreen.mapping +++ b/mappings/net/minecraft/client/realms/gui/screen/RealmsMainScreen.mapping @@ -1,293 +1,233 @@ CLASS net/minecraft/class_4325 net/minecraft/client/realms/gui/screen/RealmsMainScreen - FIELD field_19456 createdTrial Z - FIELD field_19457 showingPopup Z - FIELD field_19458 hasUnreadNews Z - FIELD field_19459 newsLink Ljava/lang/String; - FIELD field_19460 carouselIndex I - FIELD field_19461 carouselTick I - FIELD field_19462 hasSwitchedCarouselImage Z - FIELD field_19463 realmsGenericErrorScreen Lnet/minecraft/class_437; FIELD field_19464 regionsPinged Z - FIELD field_19465 keyCombos Ljava/util/List; FIELD field_19467 connectLock Ljava/util/concurrent/locks/ReentrantLock; - FIELD field_19469 showPopupButton Lnet/minecraft/class_4185; - FIELD field_19470 pendingInvitesButton Lnet/minecraft/class_4325$class_4328; - FIELD field_19471 newsButton Lnet/minecraft/class_4185; - FIELD field_19472 createTrialButton Lnet/minecraft/class_4185; - FIELD field_19473 buyARealmButton Lnet/minecraft/class_4185; - FIELD field_19474 closeButton Lnet/minecraft/class_4185; FIELD field_19475 LOGGER Lorg/slf4j/Logger; - FIELD field_19476 overrideConfigure Z FIELD field_19477 rateLimiter Lcom/google/common/util/concurrent/RateLimiter; - FIELD field_19478 dontSetConnectedToRealms Z - FIELD field_19481 lastScrollYPosition I - FIELD field_19482 lastScreen Lnet/minecraft/class_437; + FIELD field_19482 parent Lnet/minecraft/class_437; FIELD field_19483 realmSelectionList Lnet/minecraft/class_4325$class_4329; - FIELD field_19485 playButton Lnet/minecraft/class_4185; FIELD field_19486 backButton Lnet/minecraft/class_4185; FIELD field_19487 renewButton Lnet/minecraft/class_4185; FIELD field_19488 configureButton Lnet/minecraft/class_4185; FIELD field_19489 leaveButton Lnet/minecraft/class_4185; - FIELD field_19490 tooltip Ljava/util/List; - FIELD field_19491 realmsServers Ljava/util/List; - FIELD field_19492 pendingInvitesCount I - FIELD field_19493 animTick I - FIELD field_19494 hasParentalConsent Z - FIELD field_19495 checkedParentalConsent Z - FIELD field_19496 checkedClientCompatibility Z - FIELD field_19497 hasFetchedServers Z - FIELD field_19498 popupOpenedByUser Z - FIELD field_19499 justClosedPopup Z FIELD field_19500 trialAvailable Z - FIELD field_21517 IMAGES Ljava/util/List; - FIELD field_22548 DARKEN Lnet/minecraft/class_2960; - FIELD field_22549 CROSS_ICON Lnet/minecraft/class_2960; - FIELD field_22550 TRIAL_ICON Lnet/minecraft/class_2960; - FIELD field_22551 WIDGETS Lnet/minecraft/class_2960; - FIELD field_22552 ON_ICON Lnet/minecraft/class_2960; - FIELD field_22553 OFF_ICON Lnet/minecraft/class_2960; - FIELD field_22554 EXPIRED_ICON Lnet/minecraft/class_2960; - FIELD field_22555 EXPIRES_SOON_ICON Lnet/minecraft/class_2960; - FIELD field_22556 LEAVE_ICON Lnet/minecraft/class_2960; - FIELD field_22557 INVITATION_ICON Lnet/minecraft/class_2960; - FIELD field_22558 INVITE_ICON Lnet/minecraft/class_2960; - FIELD field_22559 WORLD_ICON Lnet/minecraft/class_2960; - FIELD field_22560 REALMS Lnet/minecraft/class_2960; - FIELD field_22561 CONFIGURE_ICON Lnet/minecraft/class_2960; - FIELD field_22563 NEWS_ICON Lnet/minecraft/class_2960; - FIELD field_22564 POPUP Lnet/minecraft/class_2960; - FIELD field_24198 hoverState Lnet/minecraft/class_4325$class_5220; - FIELD field_26447 NO_PENDING_TEXT Lnet/minecraft/class_2561; - FIELD field_26448 PENDING_TEXT Lnet/minecraft/class_2561; - FIELD field_26449 TRIAL_MESSAGE_LINES Ljava/util/List; FIELD field_26450 UNINITIALIZED_TEXT Lnet/minecraft/class_2561; FIELD field_26451 EXPIRED_LIST_TEXT Lnet/minecraft/class_2561; FIELD field_26452 EXPIRED_RENEW_TEXT Lnet/minecraft/class_2561; FIELD field_26453 EXPIRED_TRIAL_TEXT Lnet/minecraft/class_2561; - FIELD field_26454 EXPIRED_SUBSCRIBE_TEXT Lnet/minecraft/class_2561; FIELD field_26455 MINIGAME_TEXT Lnet/minecraft/class_2561; - FIELD field_26456 POPUP_TEXT Lnet/minecraft/class_2561; FIELD field_26457 EXPIRED_TEXT Lnet/minecraft/class_2561; FIELD field_26458 EXPIRES_SOON_TEXT Lnet/minecraft/class_2561; FIELD field_26459 EXPIRES_IN_A_DAY_TEXT Lnet/minecraft/class_2561; FIELD field_26460 OPEN_TEXT Lnet/minecraft/class_2561; FIELD field_26461 CLOSED_TEXT Lnet/minecraft/class_2561; - FIELD field_26462 LEAVE_TEXT Lnet/minecraft/class_2561; - FIELD field_26463 CONFIGURE_TEXT Lnet/minecraft/class_2561; - FIELD field_26465 NEWS_TEXT Lnet/minecraft/class_2561; - FIELD field_26466 popupText Lnet/minecraft/class_5489; - FIELD field_33774 TRIAL_NARRATION Lnet/minecraft/class_2561; - FIELD field_33775 hasSelectionList Z FIELD field_33776 UNINITIALIZED_BUTTON_NARRATION Lnet/minecraft/class_2561; FIELD field_37267 lastPlayButtonClickTime J - FIELD field_39680 periodicRunnersManager Lnet/minecraft/class_7581$class_7584; FIELD field_39681 serverFilterer Lnet/minecraft/class_7580; + FIELD field_42859 PLAY_TEXT Lnet/minecraft/class_2561; + FIELD field_42860 LEAVE_TEXT Lnet/minecraft/class_2561; + FIELD field_42861 CONFIGURE_TEXT Lnet/minecraft/class_2561; + FIELD field_42996 seenNotifications Ljava/util/Set; + FIELD field_42997 notifications Ljava/util/List; + FIELD field_45191 CLOSED_STATUS_TEXTURE Lnet/minecraft/class_2960; + FIELD field_45192 INVITE_ICON_TEXTURE Lnet/minecraft/class_2960; + FIELD field_45193 NEWS_ICON_TEXTURE Lnet/minecraft/class_2960; + FIELD field_45194 REALMS_TITLE_TEXTURE Lnet/minecraft/class_2960; + FIELD field_45195 NO_REALMS_TEXTURE Lnet/minecraft/class_2960; + FIELD field_45196 MENU_TEXT Lnet/minecraft/class_2561; + FIELD field_45197 LOADING_TEXT Lnet/minecraft/class_2561; + FIELD field_45198 NO_REALMS_TEXT Lnet/minecraft/class_2561; + FIELD field_45199 NO_PENDING_TOOLTIP Lnet/minecraft/class_7919; + FIELD field_45200 PENDING_TOOLTIP Lnet/minecraft/class_7919; + FIELD field_45201 INFO_ICON_TEXTURE Lnet/minecraft/class_2960; + FIELD field_45203 newsLink Ljava/lang/String; + FIELD field_45204 purchaseButton Lnet/minecraft/class_4185; + FIELD field_45205 inviteButton Lnet/minecraft/class_4325$class_8651; + FIELD field_45206 newsButton Lnet/minecraft/class_4325$class_8651; + FIELD field_45207 loadStatus Lnet/minecraft/class_4325$class_8650; + FIELD field_45208 layout Lnet/minecraft/class_8132; + FIELD field_45213 availabilityInfo Ljava/util/concurrent/CompletableFuture; + FIELD field_45214 periodicRunnersManager Lnet/minecraft/class_7581$class_7584; + FIELD field_45215 playButton Lnet/minecraft/class_4185; + FIELD field_45216 NEW_REALM_ICON_TEXTURE Lnet/minecraft/class_2960; + FIELD field_45217 EXPIRED_STATUS_TEXTURE Lnet/minecraft/class_2960; + FIELD field_45218 EXPIRES_SOON_STATUS_TEXTURE Lnet/minecraft/class_2960; + FIELD field_45219 OPEN_STATUS_TEXTURE Lnet/minecraft/class_2960; METHOD (Lnet/minecraft/class_437;)V - ARG 1 lastScreen - METHOD method_20834 onClosePopup ()V - METHOD method_20835 popupX0 ()I - METHOD method_20836 popupY0 ()I - METHOD method_20837 renderLocal (Lnet/minecraft/class_4587;)V - ARG 1 matrices - METHOD method_20838 renderStage (Lnet/minecraft/class_4587;)V - ARG 1 matrices - METHOD method_20842 shouldShowMessageInList ()Z - METHOD method_20843 (CLnet/minecraft/class_4324;)V - ARG 1 keyCombo - METHOD method_20844 isOutsidePopup (DD)Z - ARG 1 xm - ARG 3 ym - METHOD method_20845 drawRealmsLogo (Lnet/minecraft/class_4587;II)V - ARG 1 matrices - ARG 2 x - ARG 3 y - METHOD method_20846 drawExpired (Lnet/minecraft/class_4587;IIII)V - ARG 1 matrices - ARG 2 x - ARG 3 y - ARG 4 mouseX - ARG 5 mouseY - METHOD method_20849 drawInvitationPendingIcon (Lnet/minecraft/class_4587;IIIIZZ)V - ARG 1 matrices - ARG 2 mouseX - ARG 3 mouseY - ARG 4 x - ARG 5 y - ARG 6 hovered - ARG 7 active - METHOD method_20850 renderNews (Lnet/minecraft/class_4587;IIZIIZZ)V - ARG 1 matrices - ARG 2 mouseX - ARG 3 mouseY - ARG 4 hasUnread - ARG 5 x - ARG 6 y - ARG 7 hovered - ARG 8 active - METHOD method_20852 updateButtonStates (Lnet/minecraft/class_4877;)V - ARG 1 server + ARG 1 parent METHOD method_20853 play (Lnet/minecraft/class_4877;Lnet/minecraft/class_437;)V ARG 1 serverData ARG 2 parent - METHOD method_20867 renderMousehoverTooltip (Lnet/minecraft/class_4587;Ljava/util/List;II)V - ARG 1 matrices - ARG 2 tooltips - ARG 3 x - ARG 4 y - METHOD method_20870 shouldShowPopup ()Z - METHOD method_20871 inPendingInvitationArea (DD)Z - ARG 1 xm - ARG 3 ym - METHOD method_20872 drawPopup (Lnet/minecraft/class_4587;)V - ARG 1 matrices - METHOD method_20873 drawOpen (Lnet/minecraft/class_4587;IIII)V - ARG 1 matrices - ARG 2 x - ARG 3 y - ARG 4 mouseX - ARG 5 mouseY METHOD method_20874 shouldPlayButtonBeActive (Lnet/minecraft/class_4877;)Z ARG 1 server - METHOD method_20882 addButtons ()V - METHOD method_20883 drawClose (Lnet/minecraft/class_4587;IIII)V - ARG 1 matrices - ARG 2 x - ARG 3 y - ARG 4 mouseX - ARG 5 mouseY METHOD method_20884 shouldRenewButtonBeActive (Lnet/minecraft/class_4877;)Z ARG 1 server - METHOD method_20891 drawLeave (Lnet/minecraft/class_4587;IIII)V - ARG 1 matrices - ARG 2 x - ARG 3 y - ARG 4 mouseX - ARG 5 mouseY - METHOD method_20892 shouldConfigureButtonBeVisible (Lnet/minecraft/class_4877;)Z - ARG 1 server - METHOD method_20898 drawConfigure (Lnet/minecraft/class_4587;IIII)V - ARG 1 matrices - ARG 2 x - ARG 3 y - ARG 4 mouseX - ARG 5 mouseY - METHOD method_20899 shouldLeaveButtonBeVisible (Lnet/minecraft/class_4877;)Z - ARG 1 server METHOD method_20902 newScreen ()Lnet/minecraft/class_4325; METHOD method_20903 configureClicked (Lnet/minecraft/class_4877;)V ARG 1 serverData METHOD method_20906 leaveClicked (Lnet/minecraft/class_4877;)V ARG 1 selectedServer METHOD method_20909 isSelfOwnedServer (Lnet/minecraft/class_4877;)Z - ARG 1 serverData - METHOD method_20918 hasParentalConsent ()Z - METHOD method_20920 shouldShowPopupButton ()Z + ARG 1 server METHOD method_20922 pingRegions ()V METHOD method_20924 getOwnedNonExpiredWorldIds ()Ljava/util/List; METHOD method_20928 onRenew (Lnet/minecraft/class_4877;)V ARG 1 realmsServer - METHOD method_20932 checkClientCompatibility ()V - METHOD method_20936 checkParentalConsent ()V - METHOD method_20938 switchToStage ()V - METHOD method_20940 switchToLocal ()V - METHOD method_20941 switchToProd ()V - METHOD method_20943 saveListScrollPosition ()V - METHOD method_23764 (Lnet/minecraft/class_2960;)Z - ARG 0 id - METHOD method_23765 loadImages (Lnet/minecraft/class_3300;)V - ARG 0 manager - METHOD method_23766 (Lnet/minecraft/class_2960;)Z - ARG 0 filename - METHOD method_24985 openPendingInvitesScreen (Lnet/minecraft/class_4185;)V - ARG 1 button - METHOD method_24987 drawExpiring (Lnet/minecraft/class_4587;IIIII)V - ARG 1 matrices - ARG 2 x - ARG 3 y - ARG 4 mouseX - ARG 5 mouseY - ARG 6 remainingDays - METHOD method_24988 (Lnet/minecraft/class_4185;)V - ARG 0 button - METHOD method_24989 (Lnet/minecraft/class_4185;)V - ARG 1 button METHOD method_24991 leaveServer (ZLnet/minecraft/class_4877;)V ARG 1 confirmed ARG 2 realmsServer - METHOD method_24993 (Lnet/minecraft/class_4185;)V - ARG 1 button - METHOD method_24995 (Lnet/minecraft/class_4185;)V - ARG 1 button - METHOD method_24997 (Lnet/minecraft/class_4185;)V - ARG 1 button METHOD method_25001 isOwnedNotExpired (Lnet/minecraft/class_4877;)Z ARG 1 serverData - METHOD method_27452 setTooltips ([Lnet/minecraft/class_2561;)V - ARG 1 tooltips METHOD method_31172 (Lnet/minecraft/class_4877;Lnet/minecraft/class_4325$class_4866;)Z ARG 1 child METHOD method_31174 removeServer (Lnet/minecraft/class_4877;)V ARG 1 serverData - METHOD method_31379 (Lnet/minecraft/class_4185;)V - ARG 1 button - METHOD method_31380 (Lnet/minecraft/class_4185;)V - ARG 1 button - METHOD method_35682 setCreatedTrial (Z)V - ARG 1 createdTrial METHOD method_38503 findServer ()Lnet/minecraft/class_4877; METHOD method_38504 (Lnet/minecraft/class_4877;Z)V ARG 2 confirmed METHOD method_38505 removeSelection ()V - METHOD method_42398 (Lnet/minecraft/class_4185;)V - ARG 1 button - METHOD method_44609 resetPeriodicRunnersManager ()V METHOD method_44610 (Lnet/minecraft/class_4882;)V ARG 1 liveStats METHOD method_44611 createPeriodicRunnersManager (Lnet/minecraft/class_7578;)Lnet/minecraft/class_7581$class_7584; ARG 1 periodicCheckers METHOD method_44612 (Lnet/minecraft/class_7578;Lnet/minecraft/class_4876;)V ARG 2 news - METHOD method_44613 (Ljava/lang/Boolean;)V - ARG 1 trialAvailable METHOD method_44614 (Ljava/lang/Integer;)V ARG 1 pendingInvitesCount METHOD method_44615 (Ljava/util/List;)V ARG 1 servers - CLASS class_4326 CloseButton - METHOD method_25021 (Lnet/minecraft/class_4325;Lnet/minecraft/class_4185;)V - ARG 1 button - CLASS class_4327 NewsButton - METHOD method_25022 (Lnet/minecraft/class_4325;Lnet/minecraft/class_4185;)V - ARG 1 button - CLASS class_4328 PendingInvitesButton - METHOD method_37005 updatePendingText ()V + METHOD method_49285 shouldConfigureButtonBeActive (Lnet/minecraft/class_4877;)Z + ARG 1 server + METHOD method_49288 shouldLeaveButtonBeActive (Lnet/minecraft/class_4877;)Z + ARG 1 server + METHOD method_49550 refresh ()V + METHOD method_49551 addNotificationEntry (Lnet/minecraft/class_4325$class_4329;Lnet/minecraft/class_8204;)V + ARG 1 selectionList + ARG 2 notification + METHOD method_49553 request (Lnet/minecraft/class_4325$class_8203;Ljava/util/function/Consumer;)V + ARG 0 request + ARG 1 resultConsumer + METHOD method_49554 (Ljava/lang/Throwable;)Ljava/lang/Void; + ARG 0 throwable + METHOD method_49555 (Ljava/util/List;Lnet/minecraft/class_4341;)Ljava/lang/Object; + ARG 1 client + METHOD method_49556 (Ljava/util/List;Ljava/lang/Object;)V + ARG 2 void_ + METHOD method_49557 dismissNotification (Ljava/util/UUID;)V + ARG 1 notification + METHOD method_49558 (Ljava/util/UUID;Lnet/minecraft/class_4341;)Ljava/lang/Object; + ARG 1 client + METHOD method_49559 (Ljava/util/UUID;Lnet/minecraft/class_8204;)Z + ARG 1 notificationId + METHOD method_49560 (Ljava/util/UUID;Ljava/lang/Object;)V + ARG 2 void_ + METHOD method_49561 (Ljava/util/List;)V + ARG 1 notifications + METHOD method_52630 makeHeader ()Lnet/minecraft/class_8133; + METHOD method_52631 makeNoRealmsLayout ()Lnet/minecraft/class_8667; + METHOD method_52632 refreshButtons ()V + METHOD method_52634 (Lnet/minecraft/class_8647$class_8648;)V + ARG 1 availabilityInfo + METHOD method_52635 onLoadStatusChange (Lnet/minecraft/class_4325$class_8650;)V + ARG 1 loadStatus + METHOD method_52636 (Lnet/minecraft/class_4325;Lnet/minecraft/class_364;)V + ARG 1 child + METHOD method_52637 drawEnvironmentText (Lnet/minecraft/class_332;Ljava/lang/String;I)V + ARG 1 context + ARG 2 text + ARG 3 color + METHOD method_52638 (Lnet/minecraft/class_4185;)V + ARG 1 button + METHOD method_52639 (Ljava/lang/Boolean;)V + ARG 1 trialAvailable + METHOD method_52640 (Lnet/minecraft/class_2561;Lnet/minecraft/class_4185;)V + ARG 2 button + METHOD method_52641 makeLayoutFor (Lnet/minecraft/class_4325$class_8650;)Lnet/minecraft/class_8132; + ARG 1 loadStatus + METHOD method_52642 (Lnet/minecraft/class_4325;Lnet/minecraft/class_364;)V + ARG 1 child + METHOD method_52643 (Lnet/minecraft/class_4185;)V + ARG 1 button + METHOD method_52644 makeInnerLayout (Lnet/minecraft/class_4325$class_8650;)Lnet/minecraft/class_8133; + ARG 1 loadStatus + METHOD method_52645 (Lnet/minecraft/class_4185;)V + ARG 1 button + METHOD method_52646 (Lnet/minecraft/class_4185;)V + ARG 1 button + METHOD method_52647 (Lnet/minecraft/class_4185;)V + ARG 1 button + METHOD method_52648 (Lnet/minecraft/class_4185;)V + ARG 1 button + METHOD method_52649 (Lnet/minecraft/class_4185;)V + ARG 1 button CLASS class_4329 RealmSelectionList CLASS class_4330 RealmSelectionListEntry - FIELD field_19518 mServerData Lnet/minecraft/class_4877; + FIELD field_19518 server Lnet/minecraft/class_4877; METHOD (Lnet/minecraft/class_4325;Lnet/minecraft/class_4877;)V - ARG 2 serverData - METHOD method_20945 render (Lnet/minecraft/class_4877;Lnet/minecraft/class_4587;IIII)V - ARG 1 serverData - ARG 2 matrices - ARG 3 x - ARG 4 y - ARG 5 mouseX - ARG 6 mouseY - METHOD method_20946 renderMcoServerItem (Lnet/minecraft/class_4877;Lnet/minecraft/class_4587;IIII)V - ARG 1 serverData - ARG 2 matrices - ARG 3 x - ARG 4 y - ARG 5 mouseX - ARG 6 mouseY - CLASS class_4331 RealmSelectionListTrialEntry - METHOD method_20947 renderTrialItem (Lnet/minecraft/class_4587;IIIII)V - ARG 1 matrices - ARG 2 index + ARG 2 server + METHOD method_49291 drawServerState (Lnet/minecraft/class_4877;Lnet/minecraft/class_332;IIIIII)V + ARG 1 server + ARG 2 context ARG 3 x ARG 4 y ARG 5 mouseX ARG 6 mouseY + ARG 7 xOffset + ARG 8 yOffset + METHOD method_52653 play ()V + METHOD method_52654 createRealm ()V + METHOD method_53452 drawServerState (Lnet/minecraft/class_332;IIIILnet/minecraft/class_2960;Ljava/util/function/Supplier;)V + ARG 1 context + ARG 2 x + ARG 3 y + ARG 4 mouseX + ARG 5 mouseY + ARG 6 texture + ARG 7 tooltipGetter CLASS class_4866 Entry METHOD method_38506 getRealmsServer ()Lnet/minecraft/class_4877; - CLASS class_5220 HoverState + CLASS class_8200 VisitButtonEntry + FIELD field_42999 button Lnet/minecraft/class_4185; + FIELD field_43000 x I + METHOD (Lnet/minecraft/class_4325;Lnet/minecraft/class_4185;)V + ARG 2 button + CLASS class_8201 CrossButton + FIELD field_45222 TEXTURES Lnet/minecraft/class_8666; + METHOD (Lnet/minecraft/class_4185$class_4241;Lnet/minecraft/class_2561;)V + ARG 1 onPress + ARG 2 tooltip + CLASS class_8202 VisitUrlNotification + FIELD field_43005 message Lnet/minecraft/class_2561; + FIELD field_43006 gridChildren Ljava/util/List; + FIELD field_43007 dismissButton Lnet/minecraft/class_4325$class_8201; + FIELD field_43008 textWidget Lnet/minecraft/class_7940; + FIELD field_43009 grid Lnet/minecraft/class_7845; + FIELD field_43010 textGrid Lnet/minecraft/class_7843; + FIELD field_43011 width I + METHOD (Lnet/minecraft/class_4325;Lnet/minecraft/class_2561;Lnet/minecraft/class_8204;)V + ARG 2 message + ARG 3 notification + METHOD method_49564 setWidth (I)V + ARG 1 width + METHOD method_49565 (Lnet/minecraft/class_332;IIFLnet/minecraft/class_339;)V + ARG 4 child + METHOD method_49566 (Lnet/minecraft/class_8204;Lnet/minecraft/class_4185;)V + ARG 2 button + METHOD method_49567 updateWidth (I)V + ARG 1 width + CLASS class_8203 Request + METHOD request (Lnet/minecraft/class_4341;)Ljava/lang/Object; + ARG 1 client + CLASS class_8650 LoadStatus + CLASS class_8651 NotificationButtonWidget + FIELD field_45227 TEXTURES [Lnet/minecraft/class_2960; + FIELD field_45229 SIZE I + FIELD field_45230 TEXTURE_SIZE I + FIELD field_45231 notificationCount I + METHOD (Lnet/minecraft/class_2561;Lnet/minecraft/class_2960;Lnet/minecraft/class_4185$class_4241;)V + ARG 1 message + ARG 2 texture + ARG 3 onPress + METHOD method_52651 setNotificationCount (I)V + ARG 1 notificationCount + METHOD method_52652 render (Lnet/minecraft/class_332;)V + ARG 1 context diff --git a/mappings/net/minecraft/client/realms/gui/screen/RealmsNotificationsScreen.mapping b/mappings/net/minecraft/client/realms/gui/screen/RealmsNotificationsScreen.mapping index e524b4efba..557bf7694d 100644 --- a/mappings/net/minecraft/client/realms/gui/screen/RealmsNotificationsScreen.mapping +++ b/mappings/net/minecraft/client/realms/gui/screen/RealmsNotificationsScreen.mapping @@ -1,25 +1,39 @@ CLASS net/minecraft/class_4399 net/minecraft/client/realms/gui/screen/RealmsNotificationsScreen FIELD field_19924 pendingInvitesCount I - FIELD field_19925 checkedMcoAvailability Z FIELD field_19926 trialAvailable Z - FIELD field_19927 validClient Z + FIELD field_19927 validClient Ljava/util/concurrent/CompletableFuture; FIELD field_19928 hasUnreadNews Z - FIELD field_22698 INVITE_ICON Lnet/minecraft/class_2960; - FIELD field_22699 TRIAL_ICON Lnet/minecraft/class_2960; - FIELD field_22700 NEWS_NOTIFICATION Lnet/minecraft/class_2960; FIELD field_39695 periodicRunnersManager Lnet/minecraft/class_7581$class_7584; - METHOD method_21294 checkIfMcoEnabled ()V - METHOD method_21295 drawIcons (Lnet/minecraft/class_4587;II)V - ARG 1 matrices - ARG 2 mouseX - ARG 3 mouseY - METHOD method_25169 shouldShowNotifications ()Z + FIELD field_43037 currentRunnersFactory Lnet/minecraft/class_4399$class_8207; + FIELD field_43038 hasUnseenNotification Z + FIELD field_43039 newsAndNotifications Lnet/minecraft/class_4399$class_8207; + FIELD field_43040 notificationsOnly Lnet/minecraft/class_4399$class_8207; + FIELD field_45245 UNSEEN_NOTIFICATION_ICON_TEXTURE Lnet/minecraft/class_2960; + FIELD field_45246 NEWS_ICON_TEXTURE Lnet/minecraft/class_2960; + FIELD field_45247 INVITE_ICON_TEXTURE Lnet/minecraft/class_2960; + FIELD field_45248 TRIAL_AVAILABLE_ICON_TEXTURE Lnet/minecraft/class_2960; + METHOD method_21295 drawIcons (Lnet/minecraft/class_332;)V + ARG 1 context + METHOD method_25169 shouldShowRealmsNews ()Z METHOD method_25170 isTitleScreen ()Z - METHOD method_44624 createPeriodicRunnersManager (Lnet/minecraft/class_7578;)Lnet/minecraft/class_7581$class_7584; - ARG 1 periodicCheckers - METHOD method_44625 (Lnet/minecraft/class_7578;Lnet/minecraft/class_4876;)V + METHOD method_49584 getRunnersFactory ()Lnet/minecraft/class_4399$class_8207; + METHOD method_49585 (Lnet/minecraft/class_7578;Lnet/minecraft/class_4876;)V ARG 1 news - METHOD method_44626 (Ljava/lang/Boolean;)V + METHOD method_49586 addRunners (Lnet/minecraft/class_7578;Lnet/minecraft/class_7581$class_7584;)V + ARG 1 checkers + ARG 2 manager + METHOD method_49587 (Ljava/lang/Boolean;)V ARG 0 trialAvailable - METHOD method_44627 (Ljava/lang/Integer;)V + METHOD method_49588 (Ljava/lang/Integer;)V ARG 1 pendingInvitesCount + METHOD method_49590 addNotificationRunner (Lnet/minecraft/class_7578;Lnet/minecraft/class_7581$class_7584;)V + ARG 1 checkers + ARG 2 manager + METHOD method_49591 (Ljava/util/List;)V + ARG 0 notifications + METHOD method_52670 (Lnet/minecraft/class_8647$class_8648;)Ljava/lang/Boolean; + ARG 0 info + CLASS class_8207 NotificationRunnersFactory + METHOD method_49592 isNews ()Z + METHOD method_49593 createPeriodicRunnersManager (Lnet/minecraft/class_7578;)Lnet/minecraft/class_7581$class_7584; + ARG 1 checkers diff --git a/mappings/net/minecraft/client/realms/gui/screen/RealmsPendingInvitesScreen.mapping b/mappings/net/minecraft/client/realms/gui/screen/RealmsPendingInvitesScreen.mapping index 52a090ca22..07fbfe51cf 100644 --- a/mappings/net/minecraft/client/realms/gui/screen/RealmsPendingInvitesScreen.mapping +++ b/mappings/net/minecraft/client/realms/gui/screen/RealmsPendingInvitesScreen.mapping @@ -2,30 +2,22 @@ CLASS net/minecraft/class_4401 net/minecraft/client/realms/gui/screen/RealmsPend FIELD field_19935 LOGGER Lorg/slf4j/Logger; FIELD field_19936 parent Lnet/minecraft/class_437; FIELD field_19937 tooltip Lnet/minecraft/class_2561; - FIELD field_19938 loaded Z FIELD field_19939 pendingInvitationSelectionList Lnet/minecraft/class_4401$class_4402; FIELD field_19941 selectedInvite I FIELD field_19942 acceptButton Lnet/minecraft/class_4185; FIELD field_19943 rejectButton Lnet/minecraft/class_4185; - FIELD field_22702 ACCEPT_ICON Lnet/minecraft/class_2960; - FIELD field_22703 REJECT_ICON Lnet/minecraft/class_2960; + FIELD field_22702 ACCEPT_ICON_TEXTURE Lnet/minecraft/class_2960; + FIELD field_22703 REJECT_ICON_TEXTURE Lnet/minecraft/class_2960; FIELD field_26493 NO_PENDING_TEXT Lnet/minecraft/class_2561; FIELD field_26494 ACCEPT_TEXT Lnet/minecraft/class_2561; FIELD field_26495 REJECT_TEXT Lnet/minecraft/class_2561; - METHOD (Lnet/minecraft/class_437;)V + FIELD field_45249 pendingInvites Ljava/util/concurrent/CompletableFuture; + FIELD field_45250 ACCEPT_HIGHLIGHTED_ICON_TEXTURE Lnet/minecraft/class_2960; + FIELD field_45251 REJECT_HIGHLIGHTED_ICON_TEXTURE Lnet/minecraft/class_2960; + METHOD (Lnet/minecraft/class_437;Lnet/minecraft/class_2561;)V ARG 1 parent - 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 - ARG 2 tooltip - ARG 3 mouseX - ARG 4 mouseY + ARG 2 title METHOD method_21307 updateButtonStates ()V - METHOD method_21308 reject (I)V - ARG 1 slot - METHOD method_21311 accept (I)V - ARG 1 slot METHOD method_21314 shouldAcceptAndRejectButtonBeVisible (I)Z ARG 1 invite METHOD method_25175 (Lnet/minecraft/class_4185;)V @@ -34,9 +26,15 @@ CLASS net/minecraft/class_4401 net/minecraft/client/realms/gui/screen/RealmsPend ARG 1 button METHOD method_25179 (Lnet/minecraft/class_4185;)V ARG 1 button - CLASS 1 - METHOD method_21317 (Lnet/minecraft/class_4871;)Lnet/minecraft/class_4401$class_4403; - ARG 1 invite + METHOD method_52672 handle (IZ)V + ARG 1 index + ARG 2 accepted + METHOD method_52673 (IZLjava/lang/Boolean;)V + ARG 3 result + METHOD method_52674 (Lnet/minecraft/class_4871;)Lnet/minecraft/class_4401$class_4403; + ARG 1 invite + METHOD method_52679 (Ljava/util/List;)V + ARG 1 pendingInvites CLASS class_4402 PendingInvitationSelectionList METHOD method_21321 removeAtIndex (I)V ARG 1 index @@ -47,8 +45,8 @@ CLASS net/minecraft/class_4401 net/minecraft/client/realms/gui/screen/RealmsPend FIELD field_19955 buttons Ljava/util/List; METHOD (Lnet/minecraft/class_4401;Lnet/minecraft/class_4871;)V ARG 2 pendingInvite - METHOD method_21324 renderPendingInvitationItem (Lnet/minecraft/class_4587;Lnet/minecraft/class_4871;IIII)V - ARG 1 matrices + METHOD method_21324 renderPendingInvitationItem (Lnet/minecraft/class_332;Lnet/minecraft/class_4871;IIII)V + ARG 1 context ARG 2 invite ARG 3 x ARG 4 y diff --git a/mappings/net/minecraft/client/realms/gui/screen/RealmsPlayerScreen.mapping b/mappings/net/minecraft/client/realms/gui/screen/RealmsPlayerScreen.mapping index ab556f2498..fa9db5e6b8 100644 --- a/mappings/net/minecraft/client/realms/gui/screen/RealmsPlayerScreen.mapping +++ b/mappings/net/minecraft/client/realms/gui/screen/RealmsPlayerScreen.mapping @@ -1,75 +1,42 @@ CLASS net/minecraft/class_4406 net/minecraft/client/realms/gui/screen/RealmsPlayerScreen FIELD field_19958 LOGGER Lorg/slf4j/Logger; - FIELD field_19959 tooltip Lnet/minecraft/class_2561; FIELD field_19960 parent Lnet/minecraft/class_4388; FIELD field_19961 serverData Lnet/minecraft/class_4877; FIELD field_19962 invitedObjectSelectionList Lnet/minecraft/class_4406$class_4407; FIELD field_19963 column1_x I FIELD field_19964 column_width I - FIELD field_19965 column2_x I FIELD field_19966 removeButton Lnet/minecraft/class_4185; FIELD field_19967 opdeopButton Lnet/minecraft/class_4185; - FIELD field_19968 selectedInvitedIndex I - FIELD field_19969 selectedInvited Ljava/lang/String; FIELD field_19970 player I FIELD field_19971 stateChanged Z - FIELD field_22704 OP_ICON Lnet/minecraft/class_2960; - FIELD field_22705 USER_ICON Lnet/minecraft/class_2960; - FIELD field_22706 CROSS_PLAYER_ICON Lnet/minecraft/class_2960; FIELD field_22707 OPTIONS_BACKGROUND Lnet/minecraft/class_2960; - FIELD field_26496 operation Lnet/minecraft/class_4406$class_5488; FIELD field_26498 NORMAL_TOOLTIP Lnet/minecraft/class_2561; FIELD field_26499 OPERATOR_TOOLTIP Lnet/minecraft/class_2561; FIELD field_26500 REMOVE_TOOLTIP Lnet/minecraft/class_2561; - FIELD field_26501 INVITED_TEXT Lnet/minecraft/class_2561; + FIELD field_44908 QUESTION_TEXT Lnet/minecraft/class_2561; METHOD (Lnet/minecraft/class_4388;Lnet/minecraft/class_4877;)V ARG 1 parent ARG 2 serverData METHOD method_21325 updateButtonStates ()V METHOD method_21326 shouldRemoveAndOpdeopButtonBeVisible (I)Z ARG 1 player - METHOD method_21327 drawRemoveIcon (Lnet/minecraft/class_4587;IIII)V - ARG 1 matrices - ARG 2 x - ARG 3 y - ARG 4 mouseX - ARG 5 mouseY 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 - ARG 1 matrices - ARG 2 tooltip - ARG 3 mouseX - ARG 4 mouseY METHOD method_21333 backButtonClicked ()V METHOD method_21334 op (I)V ARG 1 index - METHOD method_21335 drawOpped (Lnet/minecraft/class_4587;IIII)V - ARG 1 matrices - ARG 2 x - ARG 3 y - ARG 4 mouseX - ARG 5 mouseY METHOD method_21339 deop (I)V ARG 1 index - METHOD method_21340 drawNormal (Lnet/minecraft/class_4587;IIII)V - ARG 1 matrices - ARG 2 x - ARG 3 y - ARG 4 mouseX - ARG 5 mouseY METHOD method_21344 uninvite (I)V ARG 1 index - METHOD method_21347 deleteFromInvitedList (I)V - ARG 1 selectedInvitedIndex METHOD method_25190 (Lnet/minecraft/class_4185;)V ARG 1 button METHOD method_25192 (Lnet/minecraft/class_4185;)V ARG 1 button METHOD method_25194 (Lnet/minecraft/class_4185;)V ARG 1 button - METHOD method_25195 (Z)V - ARG 1 confirmed + METHOD method_25195 (Lnet/minecraft/class_4874;Z)V + ARG 2 confirmed METHOD method_25197 (Lnet/minecraft/class_4185;)V ARG 1 button CLASS class_4407 InvitedObjectSelectionList @@ -77,15 +44,24 @@ CLASS net/minecraft/class_4406 net/minecraft/client/realms/gui/screen/RealmsPlay ARG 1 item METHOD method_21354 addEntry (Lnet/minecraft/class_4874;)V ARG 1 playerInfo + METHOD method_51250 updateButtonStates ()V CLASS class_4408 InvitedObjectSelectionListEntry FIELD field_19979 playerInfo Lnet/minecraft/class_4874; + FIELD field_44535 buttons Ljava/util/List; + FIELD field_44536 uninviteButton Lnet/minecraft/class_344; + FIELD field_44537 opButton Lnet/minecraft/class_344; + FIELD field_44538 deopButton Lnet/minecraft/class_344; + FIELD field_45252 REMOVE_PLAYER_TEXTURES Lnet/minecraft/class_8666; + FIELD field_45253 MAKE_OPERATOR_TEXTURES Lnet/minecraft/class_8666; + FIELD field_45254 REMOVE_OPERATOR_TEXTURES Lnet/minecraft/class_8666; METHOD (Lnet/minecraft/class_4406;Lnet/minecraft/class_4874;)V ARG 2 playerInfo - METHOD method_21356 renderInvitedItem (Lnet/minecraft/class_4587;Lnet/minecraft/class_4874;IIII)V - ARG 1 matrices - ARG 2 playerInfo - ARG 3 x - ARG 4 y - ARG 5 mouseX - ARG 6 mouseY - CLASS class_5488 PlayerOperation + METHOD method_51245 (ILnet/minecraft/class_332;IIFLnet/minecraft/class_339;)V + ARG 5 button + METHOD method_51246 (ILnet/minecraft/class_4185;)V + ARG 2 button + METHOD method_51247 updateButtonStates ()V + METHOD method_51248 (ILnet/minecraft/class_4185;)V + ARG 2 button + METHOD method_51249 (ILnet/minecraft/class_4185;)V + ARG 2 button diff --git a/mappings/net/minecraft/client/realms/gui/screen/RealmsResetNormalWorldScreen.mapping b/mappings/net/minecraft/client/realms/gui/screen/RealmsResetNormalWorldScreen.mapping index 2f6378abcf..5d8e9cf196 100644 --- a/mappings/net/minecraft/client/realms/gui/screen/RealmsResetNormalWorldScreen.mapping +++ b/mappings/net/minecraft/client/realms/gui/screen/RealmsResetNormalWorldScreen.mapping @@ -5,6 +5,7 @@ CLASS net/minecraft/class_4409 net/minecraft/client/realms/gui/screen/RealmsRese FIELD field_27938 callback Ljava/util/function/Consumer; FIELD field_27939 generatorType Lnet/minecraft/class_5672; FIELD field_27940 mapFeatures Z + FIELD field_45280 layout Lnet/minecraft/class_8132; METHOD (Ljava/util/function/Consumer;Lnet/minecraft/class_2561;)V ARG 1 callback ARG 2 parentTitle @@ -18,3 +19,6 @@ CLASS net/minecraft/class_4409 net/minecraft/client/realms/gui/screen/RealmsRese METHOD method_32487 (Lnet/minecraft/class_5676;Ljava/lang/Boolean;)V ARG 1 button ARG 2 mapFeatures + METHOD method_52693 createResetWorldInfo ()Lnet/minecraft/class_4413; + METHOD method_52694 (Lnet/minecraft/class_4409;Lnet/minecraft/class_364;)V + ARG 1 child diff --git a/mappings/net/minecraft/client/realms/gui/screen/RealmsResetWorldScreen.mapping b/mappings/net/minecraft/client/realms/gui/screen/RealmsResetWorldScreen.mapping index 58a1f499a2..908f280a27 100644 --- a/mappings/net/minecraft/client/realms/gui/screen/RealmsResetWorldScreen.mapping +++ b/mappings/net/minecraft/client/realms/gui/screen/RealmsResetWorldScreen.mapping @@ -4,7 +4,6 @@ CLASS net/minecraft/class_4410 net/minecraft/client/realms/gui/screen/RealmsRese FIELD field_20000 parent Lnet/minecraft/class_437; FIELD field_20001 serverData Lnet/minecraft/class_4877; FIELD field_20006 subtitle Lnet/minecraft/class_2561; - FIELD field_20007 buttonTitle Lnet/minecraft/class_2561; FIELD field_20008 subtitleColor I FIELD field_20495 normalWorldTemplates Lnet/minecraft/class_4891; FIELD field_20496 adventureWorldTemplates Lnet/minecraft/class_4891; @@ -15,55 +14,14 @@ CLASS net/minecraft/class_4410 net/minecraft/client/realms/gui/screen/RealmsRese FIELD field_22709 EXPERIENCE_TEXTURE Lnet/minecraft/class_2960; FIELD field_22710 INSPIRATION_TEXTURE Lnet/minecraft/class_2960; FIELD field_22711 resetCallback Ljava/lang/Runnable; - FIELD field_22712 selectFileUploadCallback Ljava/lang/Runnable; FIELD field_22713 SLOT_FRAME_TEXTURE Lnet/minecraft/class_2960; FIELD field_22714 UPLOAD_TEXTURE Lnet/minecraft/class_2960; FIELD field_22715 ADVENTURE_TEXTURE Lnet/minecraft/class_2960; FIELD field_22716 SURVIVAL_SPAWN_TEXTURE Lnet/minecraft/class_2960; - METHOD (Lnet/minecraft/class_437;Lnet/minecraft/class_4877;Ljava/lang/Runnable;Ljava/lang/Runnable;)V - ARG 1 parent - ARG 2 serverData - ARG 3 resetCallback - ARG 4 selectFileUploadCallback - METHOD (Lnet/minecraft/class_437;Lnet/minecraft/class_4877;Lnet/minecraft/class_2561;Ljava/lang/Runnable;Ljava/lang/Runnable;)V - ARG 1 parent - ARG 2 server - ARG 3 title - ARG 4 resetCallback - ARG 5 selectFileUploadCallback - 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 1 matrices - ARG 2 x - ARG 3 y - ARG 4 text - ARG 5 texture - ARG 6 hovered - ARG 7 mouseOver - 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_21379 setSlot (I)V - ARG 1 slot METHOD method_21384 frame (I)I ARG 1 i - METHOD method_25206 (Lnet/minecraft/class_4185;)V - ARG 1 button - METHOD method_25208 (Lnet/minecraft/class_4185;)V - ARG 1 button - METHOD method_25209 (Lnet/minecraft/class_4185;)V - ARG 1 button - METHOD method_25210 (Lnet/minecraft/class_4185;)V - ARG 1 button METHOD method_25211 (Lnet/minecraft/class_4185;)V ARG 1 button METHOD method_25212 (Lnet/minecraft/class_4185;)V diff --git a/mappings/net/minecraft/client/realms/gui/screen/RealmsScreen.mapping b/mappings/net/minecraft/client/realms/gui/screen/RealmsScreen.mapping index 46e6608c7a..a7b6843624 100644 --- a/mappings/net/minecraft/client/realms/gui/screen/RealmsScreen.mapping +++ b/mappings/net/minecraft/client/realms/gui/screen/RealmsScreen.mapping @@ -1,8 +1,5 @@ CLASS net/minecraft/class_4905 net/minecraft/client/realms/gui/screen/RealmsScreen - FIELD field_33044 ADVENTURE_MAPS_IN_1_9_URL Ljava/lang/String; FIELD field_33058 MAX_FILE_SIZE J - FIELD field_33059 WHITE I - FIELD field_33065 RED I FIELD field_33848 labels Ljava/util/List; METHOD method_25494 row (I)I COMMENT Moved from RealmsConstants in 20w10a diff --git a/mappings/net/minecraft/client/realms/gui/screen/RealmsSelectFileToUploadScreen.mapping b/mappings/net/minecraft/client/realms/gui/screen/RealmsSelectFileToUploadScreen.mapping index b924b69267..3b42495215 100644 --- a/mappings/net/minecraft/client/realms/gui/screen/RealmsSelectFileToUploadScreen.mapping +++ b/mappings/net/minecraft/client/realms/gui/screen/RealmsSelectFileToUploadScreen.mapping @@ -9,14 +9,13 @@ CLASS net/minecraft/class_4416 net/minecraft/client/realms/gui/screen/RealmsSele FIELD field_20056 selectedWorld I FIELD field_20057 worldSelectionList Lnet/minecraft/class_4416$class_4418; FIELD field_20058 WORLD_LANG Lnet/minecraft/class_2561; - FIELD field_22717 onBack Ljava/lang/Runnable; FIELD field_26507 HARDCORE_TEXT Lnet/minecraft/class_2561; FIELD field_26508 CHEATS_TEXT Lnet/minecraft/class_2561; - METHOD (JILnet/minecraft/class_4410;Ljava/lang/Runnable;)V + FIELD field_44909 LOADING_ERROR_TEXT Lnet/minecraft/class_2561; + METHOD (JILnet/minecraft/class_4410;)V ARG 1 worldId ARG 3 slotId ARG 4 parent - ARG 5 onBack METHOD method_21396 loadLevelList ()V METHOD method_21400 getGameModeName (Lnet/minecraft/class_34;)Lnet/minecraft/class_2561; ARG 0 summary @@ -29,15 +28,17 @@ CLASS net/minecraft/class_4416 net/minecraft/client/realms/gui/screen/RealmsSele ARG 1 button METHOD method_38508 (Lnet/minecraft/class_4185;)V ARG 1 button + METHOD method_48181 (Lnet/minecraft/class_2583;)Lnet/minecraft/class_2583; + ARG 0 style CLASS class_4417 WorldListEntry FIELD field_22718 summary Lnet/minecraft/class_34; FIELD field_26509 displayName Ljava/lang/String; - FIELD field_26510 nameAndLastPlayed Ljava/lang/String; + FIELD field_26510 nameAndLastPlayed Lnet/minecraft/class_2561; FIELD field_26511 details Lnet/minecraft/class_2561; METHOD (Lnet/minecraft/class_4416;Lnet/minecraft/class_34;)V ARG 2 summary - METHOD method_21411 renderItem (Lnet/minecraft/class_4587;III)V - ARG 1 matrices + METHOD method_21411 renderItem (Lnet/minecraft/class_332;III)V + ARG 1 context ARG 2 index ARG 3 x ARG 4 y diff --git a/mappings/net/minecraft/client/realms/gui/screen/RealmsSelectWorldTemplateScreen.mapping b/mappings/net/minecraft/client/realms/gui/screen/RealmsSelectWorldTemplateScreen.mapping index 8a5757d175..ae116817df 100644 --- a/mappings/net/minecraft/client/realms/gui/screen/RealmsSelectWorldTemplateScreen.mapping +++ b/mappings/net/minecraft/client/realms/gui/screen/RealmsSelectWorldTemplateScreen.mapping @@ -1,25 +1,20 @@ CLASS net/minecraft/class_4419 net/minecraft/client/realms/gui/screen/RealmsSelectWorldTemplateScreen FIELD field_20069 LOGGER Lorg/slf4j/Logger; FIELD field_20071 templateList Lnet/minecraft/class_4419$class_4420; - FIELD field_20072 selectedTemplate I + FIELD field_20072 selectedTemplate Lnet/minecraft/class_4890; FIELD field_20074 selectButton Lnet/minecraft/class_4185; FIELD field_20075 trailerButton Lnet/minecraft/class_4185; FIELD field_20076 publisherButton Lnet/minecraft/class_4185; - FIELD field_20077 tooltip Lnet/minecraft/class_2561; FIELD field_20078 currentLink Ljava/lang/String; FIELD field_20079 worldType Lnet/minecraft/class_4877$class_4321; - FIELD field_20080 clicks I FIELD field_20081 warning [Lnet/minecraft/class_2561; - FIELD field_20082 warningURL Ljava/lang/String; - FIELD field_20083 displayWarning Z - FIELD field_20084 hoverWarning Z FIELD field_20085 noTemplatesMessage Ljava/util/List; - FIELD field_22719 LINK_ICONS Lnet/minecraft/class_2960; - FIELD field_22720 TRAILER_ICONS Lnet/minecraft/class_2960; - FIELD field_22721 SLOT_FRAME Lnet/minecraft/class_2960; - FIELD field_26512 INFO_TOOLTIP Lnet/minecraft/class_2561; - FIELD field_26513 TRAILER_TOOLTIP Lnet/minecraft/class_2561; + FIELD field_22721 SLOT_FRAME_TEXTURE Lnet/minecraft/class_2960; FIELD field_27941 callback Ljava/util/function/Consumer; + FIELD field_45976 layout Lnet/minecraft/class_8132; + FIELD field_45977 SELECT_TEXT Lnet/minecraft/class_2561; + FIELD field_45978 TRAILER_TEXT Lnet/minecraft/class_2561; + FIELD field_45979 PUBLISHER_TEXT Lnet/minecraft/class_2561; METHOD (Lnet/minecraft/class_2561;Ljava/util/function/Consumer;Lnet/minecraft/class_4877$class_4321;)V ARG 1 title ARG 2 callback @@ -29,8 +24,8 @@ CLASS net/minecraft/class_4419 net/minecraft/client/realms/gui/screen/RealmsSele ARG 2 callback ARG 3 worldType ARG 4 templateList - METHOD method_21414 renderMessages (Lnet/minecraft/class_4587;IILjava/util/List;)V - ARG 1 matrices + METHOD method_21414 renderMessages (Lnet/minecraft/class_332;IILjava/util/List;)V + ARG 1 context ARG 2 x ARG 3 y ARG 4 messages @@ -39,18 +34,9 @@ CLASS net/minecraft/class_4419 net/minecraft/client/realms/gui/screen/RealmsSele METHOD method_21416 fetchWorldTemplates (Lnet/minecraft/class_4891;Lnet/minecraft/class_4341;)Lcom/mojang/datafixers/util/Either; ARG 1 templateList ARG 2 realms - METHOD method_21424 renderMousehoverTooltip (Lnet/minecraft/class_4587;Lnet/minecraft/class_2561;II)V - ARG 1 matrices - ARG 2 tooltip - ARG 3 mouseX - ARG 4 mouseY 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_21434 getSelectedTemplate ()Lnet/minecraft/class_4890; - METHOD method_21436 shouldTrailerBeVisible ()Z METHOD method_21440 selectTemplate ()V METHOD method_21442 onTrailer ()V METHOD method_21444 onPublish ()V @@ -64,15 +50,17 @@ CLASS net/minecraft/class_4419 net/minecraft/client/realms/gui/screen/RealmsSele ARG 1 button METHOD method_25236 (Lnet/minecraft/class_4185;)V ARG 1 button - METHOD method_25247 isSelectionValid ()Z + METHOD method_53514 getTemplateListTop ()I + METHOD method_53515 (Lnet/minecraft/class_4419;Lnet/minecraft/class_364;)V + ARG 1 child + METHOD method_53517 (Z)V + ARG 1 confirmed CLASS class_4420 WorldTemplateObjectSelectionList METHOD (Lnet/minecraft/class_4419;)V ARG 1 screen METHOD (Lnet/minecraft/class_4419;Ljava/lang/Iterable;)V ARG 2 templates METHOD method_21446 isEmpty ()Z - METHOD method_21447 getItem (I)Lnet/minecraft/class_4890; - ARG 1 index METHOD method_21448 addEntry (Lnet/minecraft/class_4890;)V ARG 1 template METHOD method_21450 getValues ()Ljava/util/List; @@ -80,28 +68,12 @@ CLASS net/minecraft/class_4419 net/minecraft/client/realms/gui/screen/RealmsSele ARG 0 child CLASS class_4421 WorldTemplateObjectSelectionListEntry FIELD field_20094 mTemplate Lnet/minecraft/class_4890; + FIELD field_45980 LINK_TEXTURES Lnet/minecraft/class_8666; + FIELD field_45981 VIDEO_LINK_TEXTURES Lnet/minecraft/class_8666; + FIELD field_45982 INFO_TOOLTIP_TEXT Lnet/minecraft/class_2561; + FIELD field_45983 TRAILER_TOOLTIP_TEXT Lnet/minecraft/class_2561; + FIELD field_45984 prevClickTime J + FIELD field_45985 infoButton Lnet/minecraft/class_344; + FIELD field_45986 trailerButton Lnet/minecraft/class_344; METHOD (Lnet/minecraft/class_4419;Lnet/minecraft/class_4890;)V ARG 2 template - METHOD method_21451 drawImage (Lnet/minecraft/class_4587;IIIILnet/minecraft/class_4890;)V - ARG 1 matrices - ARG 2 x - ARG 3 y - ARG 4 mouseX - ARG 5 mouseY - ARG 6 template - METHOD method_21452 drawIcons (Lnet/minecraft/class_4587;IIIILjava/lang/String;Ljava/lang/String;Ljava/lang/String;)V - ARG 1 matrices - ARG 2 x - ARG 3 y - ARG 4 mouseX - ARG 5 mouseY - ARG 6 link - ARG 7 trailer - ARG 8 recommendedPlayers - METHOD method_21453 renderWorldTemplateItem (Lnet/minecraft/class_4587;Lnet/minecraft/class_4890;IIII)V - ARG 1 matrices - ARG 2 template - ARG 3 x - ARG 4 y - ARG 5 mouseX - ARG 6 mouseY diff --git a/mappings/net/minecraft/client/realms/gui/screen/RealmsSubscriptionInfoScreen.mapping b/mappings/net/minecraft/client/realms/gui/screen/RealmsSubscriptionInfoScreen.mapping index d2767ab0f7..01dcd2deca 100644 --- a/mappings/net/minecraft/client/realms/gui/screen/RealmsSubscriptionInfoScreen.mapping +++ b/mappings/net/minecraft/client/realms/gui/screen/RealmsSubscriptionInfoScreen.mapping @@ -12,12 +12,8 @@ CLASS net/minecraft/class_4425 net/minecraft/client/realms/gui/screen/RealmsSubs FIELD field_20159 type Lnet/minecraft/class_4887$class_4322; FIELD field_26517 EXPIRED_TEXT Lnet/minecraft/class_2561; FIELD field_26518 EXPIRES_IN_LESS_THAN_A_DAY_TEXT Lnet/minecraft/class_2561; - FIELD field_26519 MONTH_TEXT Lnet/minecraft/class_2561; - FIELD field_26520 MONTHS_TEXT Lnet/minecraft/class_2561; - FIELD field_26521 DAY_TEXT Lnet/minecraft/class_2561; - FIELD field_26522 DAYS_TEXT Lnet/minecraft/class_2561; - FIELD field_32127 EXTEND_JAVA_REALMS_URL Ljava/lang/String; FIELD field_34033 UNKNOWN_TEXT Lnet/minecraft/class_2561; + FIELD field_43152 RECURRING_INFO_TEXT Lnet/minecraft/class_2561; METHOD (Lnet/minecraft/class_437;Lnet/minecraft/class_4877;Lnet/minecraft/class_437;)V ARG 1 parent ARG 2 serverData diff --git a/mappings/net/minecraft/client/realms/gui/screen/RealmsTermsScreen.mapping b/mappings/net/minecraft/client/realms/gui/screen/RealmsTermsScreen.mapping index e9b860cdf9..4bc3962fa3 100644 --- a/mappings/net/minecraft/client/realms/gui/screen/RealmsTermsScreen.mapping +++ b/mappings/net/minecraft/client/realms/gui/screen/RealmsTermsScreen.mapping @@ -3,7 +3,6 @@ CLASS net/minecraft/class_4426 net/minecraft/client/realms/gui/screen/RealmsTerm FIELD field_20167 mainScreen Lnet/minecraft/class_4325; FIELD field_20168 realmsServer Lnet/minecraft/class_4877; FIELD field_20170 onLink Z - FIELD field_20171 realmsToSUrl Ljava/lang/String; FIELD field_22727 parent Lnet/minecraft/class_437; FIELD field_26523 TITLE Lnet/minecraft/class_2561; FIELD field_26524 SENTENCE_ONE_TEXT Lnet/minecraft/class_2561; diff --git a/mappings/net/minecraft/client/realms/gui/screen/RealmsUploadScreen.mapping b/mappings/net/minecraft/client/realms/gui/screen/RealmsUploadScreen.mapping index 2c3de33686..d650694117 100644 --- a/mappings/net/minecraft/client/realms/gui/screen/RealmsUploadScreen.mapping +++ b/mappings/net/minecraft/client/realms/gui/screen/RealmsUploadScreen.mapping @@ -21,14 +21,12 @@ CLASS net/minecraft/class_4427 net/minecraft/client/realms/gui/screen/RealmsUplo FIELD field_20195 bytesPerSecond J FIELD field_20196 UPLOAD_LOCK Ljava/util/concurrent/locks/ReentrantLock; FIELD field_20503 statusTexts [Lnet/minecraft/class_2561; - FIELD field_22728 onBack Ljava/lang/Runnable; FIELD field_26526 VERIFYING_TEXT Lnet/minecraft/class_2561; - METHOD (JILnet/minecraft/class_4410;Lnet/minecraft/class_34;Ljava/lang/Runnable;)V + METHOD (JILnet/minecraft/class_4410;Lnet/minecraft/class_34;)V ARG 1 worldId ARG 3 slotId ARG 4 parent ARG 5 selectedLevel - ARG 6 onBack METHOD method_21515 verify (Ljava/io/File;)Z ARG 1 archive METHOD method_21516 addFileToTarGz (Lorg/apache/commons/compress/archivers/tar/TarArchiveOutputStream;Ljava/lang/String;Ljava/lang/String;Z)V @@ -39,16 +37,16 @@ CLASS net/minecraft/class_4427 net/minecraft/client/realms/gui/screen/RealmsUplo METHOD method_21524 tarGzipArchive (Ljava/io/File;)Ljava/io/File; ARG 1 pathToDirectoryFile METHOD method_21525 onBack ()V - METHOD method_21526 drawUploadSpeed0 (Lnet/minecraft/class_4587;J)V - ARG 1 matrices + METHOD method_21526 drawUploadSpeed0 (Lnet/minecraft/class_332;J)V + ARG 1 context ARG 2 bytesPerSecond 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_21530 drawDots (Lnet/minecraft/class_332;)V + ARG 1 context + METHOD method_21532 drawProgressBar (Lnet/minecraft/class_332;)V + ARG 1 context + METHOD method_21534 drawUploadSpeed (Lnet/minecraft/class_332;)V + ARG 1 context METHOD method_21536 upload ()V METHOD method_21538 uploadCancelled ()V METHOD method_22105 (JLnet/minecraft/class_4429;)V diff --git a/mappings/net/minecraft/client/realms/task/CloseServerTask.mapping b/mappings/net/minecraft/client/realms/task/CloseServerTask.mapping index 72fe353b0c..70cef8968a 100644 --- a/mappings/net/minecraft/client/realms/task/CloseServerTask.mapping +++ b/mappings/net/minecraft/client/realms/task/CloseServerTask.mapping @@ -1,6 +1,7 @@ CLASS net/minecraft/class_4435 net/minecraft/client/realms/task/CloseServerTask FIELD field_20212 serverData Lnet/minecraft/class_4877; FIELD field_20213 configureScreen Lnet/minecraft/class_4388; + FIELD field_36354 LOGGER Lorg/slf4j/Logger; METHOD (Lnet/minecraft/class_4877;Lnet/minecraft/class_4388;)V ARG 1 realmsServer ARG 2 configureWorldScreen diff --git a/mappings/net/minecraft/client/realms/task/DownloadTask.mapping b/mappings/net/minecraft/client/realms/task/DownloadTask.mapping index 3f52a87e11..7ef5755552 100644 --- a/mappings/net/minecraft/client/realms/task/DownloadTask.mapping +++ b/mappings/net/minecraft/client/realms/task/DownloadTask.mapping @@ -3,6 +3,7 @@ CLASS net/minecraft/class_4436 net/minecraft/client/realms/task/DownloadTask FIELD field_20215 slot I FIELD field_20216 lastScreen Lnet/minecraft/class_437; FIELD field_20217 downloadName Ljava/lang/String; + FIELD field_36355 LOGGER Lorg/slf4j/Logger; METHOD (JILjava/lang/String;Lnet/minecraft/class_437;)V ARG 1 worldId ARG 3 slot diff --git a/mappings/net/minecraft/client/realms/task/LongRunningTask.mapping b/mappings/net/minecraft/client/realms/task/LongRunningTask.mapping index 2b1f9e8b78..30af1b7290 100644 --- a/mappings/net/minecraft/client/realms/task/LongRunningTask.mapping +++ b/mappings/net/minecraft/client/realms/task/LongRunningTask.mapping @@ -1,13 +1,9 @@ CLASS net/minecraft/class_4358 net/minecraft/client/realms/task/LongRunningTask - FIELD field_19638 screen Lnet/minecraft/class_4398; FIELD field_22731 LOGGER Lorg/slf4j/Logger; FIELD field_32132 MAX_RETRIES I METHOD method_21065 aborted ()Z - METHOD method_21066 setScreen (Lnet/minecraft/class_4398;)V - ARG 1 screen + METHOD method_21067 error (Lnet/minecraft/class_2561;)V 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 (J)V diff --git a/mappings/net/minecraft/client/realms/task/OpenServerTask.mapping b/mappings/net/minecraft/client/realms/task/OpenServerTask.mapping index 003fd39e34..d1001112e3 100644 --- a/mappings/net/minecraft/client/realms/task/OpenServerTask.mapping +++ b/mappings/net/minecraft/client/realms/task/OpenServerTask.mapping @@ -4,6 +4,7 @@ CLASS net/minecraft/class_4437 net/minecraft/client/realms/task/OpenServerTask FIELD field_20220 join Z FIELD field_20221 mainScreen Lnet/minecraft/class_4325; FIELD field_34016 client Lnet/minecraft/class_310; + FIELD field_36357 LOGGER Lorg/slf4j/Logger; METHOD (Lnet/minecraft/class_4877;Lnet/minecraft/class_437;Lnet/minecraft/class_4325;ZLnet/minecraft/class_310;)V ARG 1 realmsServer ARG 2 returnScreen diff --git a/mappings/net/minecraft/client/realms/task/RealmsGetServerDetailsTask.mapping b/mappings/net/minecraft/client/realms/task/RealmsGetServerDetailsTask.mapping index e61a103de9..6a2198b658 100644 --- a/mappings/net/minecraft/client/realms/task/RealmsGetServerDetailsTask.mapping +++ b/mappings/net/minecraft/client/realms/task/RealmsGetServerDetailsTask.mapping @@ -3,6 +3,7 @@ CLASS net/minecraft/class_4439 net/minecraft/client/realms/task/RealmsGetServerD FIELD field_20225 lastScreen Lnet/minecraft/class_437; FIELD field_20226 mainScreen Lnet/minecraft/class_4325; FIELD field_20227 connectLock Ljava/util/concurrent/locks/ReentrantLock; + FIELD field_36356 LOGGER Lorg/slf4j/Logger; METHOD (Lnet/minecraft/class_4325;Lnet/minecraft/class_437;Lnet/minecraft/class_4877;Ljava/util/concurrent/locks/ReentrantLock;)V ARG 1 mainScreen ARG 2 lastScreen diff --git a/mappings/net/minecraft/client/realms/task/ResettingWorldTask.mapping b/mappings/net/minecraft/client/realms/task/ResettingWorldTask.mapping index c0bb9e5100..5af66e6c26 100644 --- a/mappings/net/minecraft/client/realms/task/ResettingWorldTask.mapping +++ b/mappings/net/minecraft/client/realms/task/ResettingWorldTask.mapping @@ -2,6 +2,7 @@ CLASS net/minecraft/class_4440 net/minecraft/client/realms/task/ResettingWorldTa FIELD field_20232 serverId J FIELD field_20235 title Lnet/minecraft/class_2561; FIELD field_22732 callback Ljava/lang/Runnable; + FIELD field_36358 LOGGER Lorg/slf4j/Logger; METHOD (JLnet/minecraft/class_2561;Ljava/lang/Runnable;)V ARG 1 serverId ARG 3 title diff --git a/mappings/net/minecraft/client/realms/task/RestoreTask.mapping b/mappings/net/minecraft/client/realms/task/RestoreTask.mapping index 436f3fc366..7b70848ce2 100644 --- a/mappings/net/minecraft/client/realms/task/RestoreTask.mapping +++ b/mappings/net/minecraft/client/realms/task/RestoreTask.mapping @@ -2,6 +2,7 @@ CLASS net/minecraft/class_4441 net/minecraft/client/realms/task/RestoreTask FIELD field_20236 backup Lnet/minecraft/class_4867; FIELD field_20237 worldId J FIELD field_20238 lastScreen Lnet/minecraft/class_4388; + FIELD field_36359 LOGGER Lorg/slf4j/Logger; METHOD (Lnet/minecraft/class_4867;JLnet/minecraft/class_4388;)V ARG 1 backup ARG 2 worldId diff --git a/mappings/net/minecraft/client/realms/task/SwitchMinigameTask.mapping b/mappings/net/minecraft/client/realms/task/SwitchMinigameTask.mapping index 32b65247db..8e16775970 100644 --- a/mappings/net/minecraft/client/realms/task/SwitchMinigameTask.mapping +++ b/mappings/net/minecraft/client/realms/task/SwitchMinigameTask.mapping @@ -2,6 +2,7 @@ CLASS net/minecraft/class_4442 net/minecraft/client/realms/task/SwitchMinigameTa FIELD field_20239 worldId J FIELD field_20240 worldTemplate Lnet/minecraft/class_4890; FIELD field_20241 lastScreen Lnet/minecraft/class_4388; + FIELD field_36360 LOGGER Lorg/slf4j/Logger; METHOD (JLnet/minecraft/class_4890;Lnet/minecraft/class_4388;)V ARG 1 worldId ARG 3 worldTemplate diff --git a/mappings/net/minecraft/client/realms/task/SwitchSlotTask.mapping b/mappings/net/minecraft/client/realms/task/SwitchSlotTask.mapping index 0f6d465504..3334bf4a00 100644 --- a/mappings/net/minecraft/client/realms/task/SwitchSlotTask.mapping +++ b/mappings/net/minecraft/client/realms/task/SwitchSlotTask.mapping @@ -2,6 +2,7 @@ CLASS net/minecraft/class_4443 net/minecraft/client/realms/task/SwitchSlotTask FIELD field_20242 worldId J FIELD field_20243 slot I FIELD field_22733 callback Ljava/lang/Runnable; + FIELD field_36361 LOGGER Lorg/slf4j/Logger; METHOD (JILjava/lang/Runnable;)V ARG 1 worldId ARG 3 slot diff --git a/mappings/net/minecraft/client/realms/task/WorldCreationTask.mapping b/mappings/net/minecraft/client/realms/task/WorldCreationTask.mapping index f8e8a9e415..94306ee4e5 100644 --- a/mappings/net/minecraft/client/realms/task/WorldCreationTask.mapping +++ b/mappings/net/minecraft/client/realms/task/WorldCreationTask.mapping @@ -3,6 +3,7 @@ CLASS net/minecraft/class_4445 net/minecraft/client/realms/task/WorldCreationTas FIELD field_20250 motd Ljava/lang/String; FIELD field_20251 worldId J FIELD field_20252 lastScreen Lnet/minecraft/class_437; + FIELD field_36362 LOGGER Lorg/slf4j/Logger; METHOD (JLjava/lang/String;Ljava/lang/String;Lnet/minecraft/class_437;)V ARG 1 worldId ARG 3 name diff --git a/mappings/net/minecraft/client/realms/util/Errable.mapping b/mappings/net/minecraft/client/realms/util/Errable.mapping deleted file mode 100644 index 71cd8949b6..0000000000 --- a/mappings/net/minecraft/client/realms/util/Errable.mapping +++ /dev/null @@ -1,5 +0,0 @@ -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/JsonUtils.mapping b/mappings/net/minecraft/client/realms/util/JsonUtils.mapping index e7341fad78..5c5a14cb55 100644 --- a/mappings/net/minecraft/client/realms/util/JsonUtils.mapping +++ b/mappings/net/minecraft/client/realms/util/JsonUtils.mapping @@ -18,3 +18,14 @@ CLASS net/minecraft/class_4431 net/minecraft/client/realms/util/JsonUtils ARG 0 key ARG 1 node ARG 2 defaultValue + METHOD method_49594 getString (Ljava/lang/String;Lcom/google/gson/JsonObject;)Ljava/lang/String; + ARG 0 key + ARG 1 node + METHOD method_49595 getUuidOr (Ljava/lang/String;Lcom/google/gson/JsonObject;Ljava/util/UUID;)Ljava/util/UUID; + ARG 0 key + ARG 1 node + ARG 2 defaultValue + METHOD method_49596 get (Ljava/lang/String;Lcom/google/gson/JsonObject;Ljava/util/function/Function;)Ljava/lang/Object; + ARG 0 key + ARG 1 node + ARG 2 deserializer diff --git a/mappings/net/minecraft/client/realms/util/RealmsPersistence.mapping b/mappings/net/minecraft/client/realms/util/RealmsPersistence.mapping index 0e35c3f1aa..7650b1d124 100644 --- a/mappings/net/minecraft/client/realms/util/RealmsPersistence.mapping +++ b/mappings/net/minecraft/client/realms/util/RealmsPersistence.mapping @@ -5,7 +5,7 @@ CLASS net/minecraft/class_4432 net/minecraft/client/realms/util/RealmsPersistenc METHOD method_21549 readFile ()Lnet/minecraft/class_4432$class_4433; METHOD method_21550 writeFile (Lnet/minecraft/class_4432$class_4433;)V ARG 0 data - METHOD method_25279 getFile ()Ljava/io/File; + METHOD method_25279 getFile ()Ljava/nio/file/Path; METHOD method_33423 load ()Lnet/minecraft/class_4432$class_4433; METHOD method_33424 save (Lnet/minecraft/class_4432$class_4433;)V ARG 1 data diff --git a/mappings/net/minecraft/client/realms/util/RealmsServerFilterer.mapping b/mappings/net/minecraft/client/realms/util/RealmsServerFilterer.mapping index e8588d6c2a..19a3db3dd0 100644 --- a/mappings/net/minecraft/client/realms/util/RealmsServerFilterer.mapping +++ b/mappings/net/minecraft/client/realms/util/RealmsServerFilterer.mapping @@ -4,7 +4,8 @@ CLASS net/minecraft/class_7580 net/minecraft/client/realms/util/RealmsServerFilt FIELD field_39694 sortedServers Ljava/util/List; METHOD (Lnet/minecraft/class_310;)V ARG 1 client - METHOD method_44622 remove (Lnet/minecraft/class_4877;)Ljava/util/List; + METHOD method_44622 remove (Lnet/minecraft/class_4877;)V ARG 1 server - METHOD method_44623 filterAndSort (Ljava/util/List;)Ljava/util/List; + METHOD method_44623 filterAndSort (Ljava/util/List;)V ARG 1 servers + METHOD method_52664 isEmpty ()Z diff --git a/mappings/net/minecraft/client/realms/util/RealmsTextureManager.mapping b/mappings/net/minecraft/client/realms/util/RealmsTextureManager.mapping index 79c3f961e9..90f73d0b9a 100644 --- a/mappings/net/minecraft/client/realms/util/RealmsTextureManager.mapping +++ b/mappings/net/minecraft/client/realms/util/RealmsTextureManager.mapping @@ -1,36 +1,19 @@ CLASS net/minecraft/class_4446 net/minecraft/client/realms/util/RealmsTextureManager FIELD field_20253 TEXTURES Ljava/util/Map; - FIELD field_20254 SKIN_FETCH_STATUS Ljava/util/Map; - FIELD field_20255 FETCHED_SKINS Ljava/util/Map; FIELD field_20256 LOGGER Lorg/slf4j/Logger; FIELD field_22730 ISLES Lnet/minecraft/class_2960; - METHOD method_21558 bindFace (Ljava/lang/String;)V - ARG 0 uuid - METHOD method_21559 withBoundFace (Ljava/lang/String;Ljava/lang/Runnable;)V - ARG 0 uuid - ARG 1 r - METHOD method_21560 bindWorldTemplate (Ljava/lang/String;Ljava/lang/String;)V + METHOD method_21564 getTextureIdInternal (Ljava/lang/String;Ljava/lang/String;)Lnet/minecraft/class_2960; ARG 0 id ARG 1 image - METHOD method_21561 bindDefaultFace (Ljava/util/UUID;)V - ARG 0 uuid - METHOD method_21564 getTextureId (Ljava/lang/String;Ljava/lang/String;)I + METHOD method_48970 loadImage (Ljava/lang/String;)Lnet/minecraft/class_1011; + ARG 0 image + METHOD method_48971 getTextureId (Ljava/lang/String;Ljava/lang/String;)Lnet/minecraft/class_2960; ARG 0 id ARG 1 image CLASS class_4447 RealmsTexture - FIELD field_20258 image Ljava/lang/String; - FIELD field_20259 textureId I - METHOD (Ljava/lang/String;I)V + FIELD comp_1254 image Ljava/lang/String; + FIELD comp_1255 textureId Lnet/minecraft/class_2960; + METHOD (Ljava/lang/String;Lnet/minecraft/class_2960;)V ARG 1 image - ARG 2 textureId - CLASS class_6596 RealmsTextureImage - FIELD field_34775 width I - FIELD field_34776 height I - FIELD field_34777 buffer Ljava/nio/IntBuffer; - FIELD field_34778 FALLBACK Ljava/util/function/Supplier; - METHOD (IILjava/nio/IntBuffer;)V - ARG 1 width - ARG 2 height - ARG 3 buffer - METHOD method_38510 fromBase64 (Ljava/lang/String;)Lnet/minecraft/class_4446$class_6596; - ARG 0 string + METHOD comp_1254 image ()Ljava/lang/String; + METHOD comp_1255 textureId ()Lnet/minecraft/class_2960; diff --git a/mappings/net/minecraft/client/realms/util/RealmsUtil.mapping b/mappings/net/minecraft/client/realms/util/RealmsUtil.mapping index 6e5d993bc0..68321b35e3 100644 --- a/mappings/net/minecraft/client/realms/util/RealmsUtil.mapping +++ b/mappings/net/minecraft/client/realms/util/RealmsUtil.mapping @@ -1,18 +1,15 @@ CLASS net/minecraft/class_4448 net/minecraft/client/realms/util/RealmsUtil - FIELD field_20260 gameProfileCache Lcom/google/common/cache/LoadingCache; - FIELD field_20261 AUTHENTICATION_SERVICE Lcom/mojang/authlib/yggdrasil/YggdrasilAuthenticationService; - FIELD field_20262 SESSION_SERVICE Lcom/mojang/authlib/minecraft/MinecraftSessionService; FIELD field_32129 SECONDS_PER_MINUTE I FIELD field_32130 SECONDS_PER_HOUR I FIELD field_32131 SECONDS_PER_DAY I - METHOD method_21567 convertToAgePresentation (J)Ljava/lang/String; + FIELD field_44910 NOW_TEXT Lnet/minecraft/class_2561; + METHOD method_21567 convertToAgePresentation (J)Lnet/minecraft/class_2561; 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; - ARG 0 uuid - METHOD method_25282 convertToAgePresentation (Ljava/util/Date;)Ljava/lang/String; + METHOD method_25282 convertToAgePresentation (Ljava/util/Date;)Lnet/minecraft/class_2561; ARG 0 date - CLASS 1 - METHOD load (Ljava/lang/Object;)Ljava/lang/Object; - ARG 1 uuid + METHOD method_48972 drawPlayerHead (Lnet/minecraft/class_332;IIILjava/util/UUID;)V + ARG 0 context + ARG 1 x + ARG 2 y + ARG 3 size + ARG 4 playerUuid diff --git a/mappings/net/minecraft/client/realms/util/SkinProcessor.mapping b/mappings/net/minecraft/client/realms/util/SkinProcessor.mapping deleted file mode 100644 index 52886ec8ea..0000000000 --- a/mappings/net/minecraft/client/realms/util/SkinProcessor.mapping +++ /dev/null @@ -1,16 +0,0 @@ -CLASS net/minecraft/class_4449 net/minecraft/client/realms/util/SkinProcessor - FIELD field_20263 pixels [I - FIELD field_20264 width I - FIELD field_20265 height I - METHOD method_21572 doNotchTransparencyHack (IIII)V - ARG 1 x0 - ARG 2 y0 - ARG 3 x1 - ARG 4 y1 - METHOD method_21573 process (Ljava/awt/image/BufferedImage;)Ljava/awt/image/BufferedImage; - ARG 1 image - METHOD method_21574 setNoAlpha (IIII)V - ARG 1 x0 - ARG 2 y0 - ARG 3 x1 - ARG 4 y1 diff --git a/mappings/net/minecraft/client/recipebook/ClientRecipeBook.mapping b/mappings/net/minecraft/client/recipebook/ClientRecipeBook.mapping index 96aefe85a0..1252d11d15 100644 --- a/mappings/net/minecraft/client/recipebook/ClientRecipeBook.mapping +++ b/mappings/net/minecraft/client/recipebook/ClientRecipeBook.mapping @@ -5,13 +5,12 @@ CLASS net/minecraft/class_299 net/minecraft/client/recipebook/ClientRecipeBook METHOD method_1393 getOrderedResults ()Ljava/util/List; 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 + METHOD method_1400 getGroupForRecipe (Lnet/minecraft/class_8786;)Lnet/minecraft/class_314; + METHOD method_1401 reload (Ljava/lang/Iterable;Lnet/minecraft/class_5455;)V ARG 1 recipes - METHOD method_30279 (Ljava/util/Map;Lcom/google/common/collect/ImmutableList$Builder;Lnet/minecraft/class_314;Ljava/util/List;)V - ARG 2 group - ARG 3 recipes + ARG 2 registryManager + METHOD method_30279 (Ljava/util/Map;Lnet/minecraft/class_5455;Lcom/google/common/collect/ImmutableList$Builder;Lnet/minecraft/class_314;Ljava/util/List;)V + ARG 3 recipeBookGroup METHOD method_30280 (Ljava/util/Map;Lnet/minecraft/class_314;)Ljava/util/stream/Stream; ARG 1 searchGroup METHOD method_30281 (Ljava/util/Map;Lnet/minecraft/class_314;Ljava/util/List;)V @@ -23,3 +22,5 @@ CLASS net/minecraft/class_299 net/minecraft/client/recipebook/ClientRecipeBook ARG 0 recipes METHOD method_30284 (Lnet/minecraft/class_314;)Ljava/util/List; ARG 0 group + METHOD method_48464 (Lnet/minecraft/class_5455;Ljava/util/List;)Lnet/minecraft/class_516; + ARG 1 recipes diff --git a/mappings/net/minecraft/client/render/BufferBuilder.mapping b/mappings/net/minecraft/client/render/BufferBuilder.mapping index 918685ba7f..82fcaceac9 100644 --- a/mappings/net/minecraft/client/render/BufferBuilder.mapping +++ b/mappings/net/minecraft/client/render/BufferBuilder.mapping @@ -12,7 +12,7 @@ CLASS net/minecraft/class_287 net/minecraft/client/render/BufferBuilder COMMENT

For {@link VertexFormat.DrawMode#LINES LINES} and {@link COMMENT VertexFormat.DrawMode#LINE_STRIP LINE_STRIP} draw modes, this builder COMMENT duplicates every vertex in a line to produce a quad with zero area. See - COMMENT {@link GameRenderer#getRenderTypeLinesShader}. + COMMENT {@link GameRenderer#getRenderTypeLinesProgram}. FIELD field_1553 currentElementId I FIELD field_1554 vertexCount I FIELD field_1555 buffer Ljava/nio/ByteBuffer; @@ -22,19 +22,22 @@ CLASS net/minecraft/class_287 net/minecraft/client/render/BufferBuilder FIELD field_1565 format Lnet/minecraft/class_293; FIELD field_1567 drawMode Lnet/minecraft/class_293$class_5596; FIELD field_20884 elementOffset I - FIELD field_21594 textured Z + FIELD field_21594 canSkipElementChecks Z + COMMENT Whether this builder is aware of the vertex format and can skip checks + COMMENT for the current target element while building a vertex in {@link + COMMENT #vertex(float, float, float, float, float, float, float, float, float, int, int, float, float, float)}. FIELD field_21595 hasOverlay Z - FIELD field_27348 sortingPrimitiveCenters [Lnet/minecraft/class_1160; - FIELD field_27349 sortingCameraX F - FIELD field_27350 sortingCameraY F - FIELD field_27351 sortingCameraZ F + FIELD field_27348 sortingPrimitiveCenters [Lorg/joml/Vector3f; FIELD field_27352 hasNoVertexBuffer Z - FIELD field_32050 MAX_BUFFER_SIZE I + FIELD field_32050 ROUND_SIZE_CHANGE I + COMMENT An integer a size change of a buffer must be a + COMMENT multiple of FIELD field_39061 builtBufferCount I FIELD field_39062 batchOffset I + FIELD field_43358 sorter Lnet/minecraft/class_8251; METHOD (I)V ARG 1 initialCapacity - METHOD method_1324 restoreState (Lnet/minecraft/class_287$class_5594;)V + METHOD method_1324 beginSortedIndexBuffer (Lnet/minecraft/class_287$class_5594;)V ARG 1 state METHOD method_1326 end ()Lnet/minecraft/class_287$class_7433; COMMENT Builds a buffer from the current batch and resets the building state. @@ -48,36 +51,25 @@ CLASS net/minecraft/class_287 net/minecraft/client/render/BufferBuilder METHOD method_1328 begin (Lnet/minecraft/class_293$class_5596;Lnet/minecraft/class_293;)V ARG 1 drawMode ARG 2 format - METHOD method_1334 popState ()Lnet/minecraft/class_287$class_5594; + METHOD method_1334 getSortingData ()Lnet/minecraft/class_287$class_5594; METHOD method_1335 grow (I)V ARG 1 size METHOD method_1343 clear ()V METHOD method_16005 roundBufferSize (I)I ARG 0 amount - METHOD method_22625 ([FII)I - ARG 1 a - ARG 2 b METHOD method_22892 grow ()V METHOD method_22893 isBuilding ()Z METHOD method_23477 reset ()V METHOD method_23918 setFormat (Lnet/minecraft/class_293;)V ARG 1 format - METHOD method_31948 sortFrom (FFF)V - ARG 1 cameraX - ARG 2 cameraY - ARG 3 cameraZ - METHOD method_31949 createIndexWriter (ILnet/minecraft/class_293$class_5595;)Lit/unimi/dsi/fastutil/ints/IntConsumer; + METHOD method_31949 getIndexConsumer (ILnet/minecraft/class_293$class_5595;)Lit/unimi/dsi/fastutil/ints/IntConsumer; ARG 1 offset ARG 2 indexType METHOD method_31950 writeSortedIndices (Lnet/minecraft/class_293$class_5595;)V ARG 1 indexType - METHOD method_31951 (Lorg/apache/commons/lang3/mutable/MutableInt;I)V - ARG 2 index - METHOD method_31952 (Lorg/apache/commons/lang3/mutable/MutableInt;I)V - ARG 2 index METHOD method_31953 (Lorg/apache/commons/lang3/mutable/MutableInt;I)V ARG 2 index - METHOD method_31954 buildPrimitiveCenters ()[Lnet/minecraft/class_1160; + METHOD method_31954 buildPrimitiveCenters ()[Lorg/joml/Vector3f; METHOD method_43574 isBatchEmpty ()Z METHOD method_43575 endNullable ()Lnet/minecraft/class_287$class_7433; COMMENT Builds a buffer if there are vertices in the current batch and resets @@ -95,28 +87,30 @@ CLASS net/minecraft/class_287 net/minecraft/client/render/BufferBuilder METHOD method_43578 build ()Lnet/minecraft/class_287$class_7433; METHOD method_43579 resetBuilding ()V METHOD method_43580 releaseBuiltBuffer ()V - CLASS class_4574 DrawArrayParameters - METHOD method_31957 getIndexBufferStart ()I - METHOD method_31958 getIndexBufferEnd ()I - METHOD method_31961 getIndexBufferLength ()I - METHOD method_43429 getVertexBufferPosition ()I - METHOD method_43430 getVertexBufferLimit ()I - METHOD method_43431 getIndexBufferPosition ()I - METHOD method_43432 getIndexBufferLimit ()I - CLASS class_5594 State + METHOD method_49904 setSorter (Lnet/minecraft/class_8251;)V + ARG 1 sorter + METHOD method_49905 (Lorg/apache/commons/lang3/mutable/MutableInt;I)V + ARG 2 index + CLASS class_4574 DrawParameters + METHOD method_31957 getVertexBufferSize ()I + METHOD method_31958 getBufferSize ()I + COMMENT {@return the total size of the index buffer and the vertex buffer + COMMENT combined} + METHOD method_31961 getIndexBufferSize ()I + METHOD method_43429 getVertexBufferStart ()I + METHOD method_43430 getVertexBufferEnd ()I + METHOD method_43431 getIndexBufferStart ()I + METHOD method_43432 getIndexBufferEnd ()I + CLASS class_5594 TransparentSortingData FIELD field_27358 drawMode Lnet/minecraft/class_293$class_5596; FIELD field_27359 vertexCount I - FIELD field_27360 sortingPrimitiveCenters [Lnet/minecraft/class_1160; - FIELD field_27361 sortingCameraX F - FIELD field_27362 sortingCameraY F - FIELD field_27363 sortingCameraZ F - METHOD (Lnet/minecraft/class_293$class_5596;I[Lnet/minecraft/class_1160;FFF)V + FIELD field_27360 primitiveCenters [Lorg/joml/Vector3f; + FIELD field_43359 sorter Lnet/minecraft/class_8251; + METHOD (Lnet/minecraft/class_293$class_5596;I[Lorg/joml/Vector3f;Lnet/minecraft/class_8251;)V ARG 1 drawMode ARG 2 vertexCount - ARG 3 currentParameters - ARG 4 cameraX - ARG 5 cameraY - ARG 6 cameraZ + ARG 3 primitiveCenters + ARG 4 sorter CLASS class_7433 BuiltBuffer COMMENT An output of {@link BufferBuilder}. It contains a {@link ByteBuffer} of COMMENT vertices, a {@code ByteBuffer} of indices if sorting has been done, and diff --git a/mappings/net/minecraft/client/render/BufferRenderer.mapping b/mappings/net/minecraft/client/render/BufferRenderer.mapping index 45f6c70e2c..01eb93aa57 100644 --- a/mappings/net/minecraft/client/render/BufferRenderer.mapping +++ b/mappings/net/minecraft/client/render/BufferRenderer.mapping @@ -2,26 +2,26 @@ CLASS net/minecraft/class_286 net/minecraft/client/render/BufferRenderer COMMENT Containing methods for immediately drawing a buffer built with {@link COMMENT BufferBuilder}. FIELD field_38982 currentVertexBuffer Lnet/minecraft/class_291; - METHOD method_34420 unbindAll ()V - METHOD method_43433 drawWithShader (Lnet/minecraft/class_287$class_7433;)V - COMMENT Draws {@code buffer} using the shader specified with {@link + METHOD method_34420 reset ()V + METHOD method_43433 drawWithGlobalProgram (Lnet/minecraft/class_287$class_7433;)V + COMMENT Draws {@code buffer} using the shader program specified with {@link COMMENT com.mojang.blaze3d.systems.RenderSystem#setShader COMMENT RenderSystem#setShader} ARG 0 buffer - METHOD method_43434 bindAndSet (Lnet/minecraft/class_291;)V + METHOD method_43434 bind (Lnet/minecraft/class_291;)V ARG 0 vertexBuffer - METHOD method_43435 bindAndSet (Lnet/minecraft/class_293;)Lnet/minecraft/class_291; + METHOD method_43435 bind (Lnet/minecraft/class_293;)Lnet/minecraft/class_291; ARG 0 vertexFormat METHOD method_43436 resetCurrentVertexBuffer ()V - METHOD method_43437 drawWithoutShader (Lnet/minecraft/class_287$class_7433;)V + METHOD method_43437 draw (Lnet/minecraft/class_287$class_7433;)V COMMENT Draws {@code buffer}. COMMENT - COMMENT

Unlike {@link #drawWithShader}, the shader cannot be specified with - COMMENT {@link com.mojang.blaze3d.systems.RenderSystem#setShader + COMMENT

Unlike {@link #drawWithGlobalProgram}, the shader program cannot be + COMMENT specified with {@link com.mojang.blaze3d.systems.RenderSystem#setShader COMMENT RenderSystem#setShader}. The caller of this method must manually bind a - COMMENT shader before calling this method. + COMMENT shader program before calling this method. ARG 0 buffer - METHOD method_43438 drawWithShaderInternal (Lnet/minecraft/class_287$class_7433;)V + METHOD method_43438 drawWithGlobalProgramInternal (Lnet/minecraft/class_287$class_7433;)V ARG 0 buffer - METHOD method_43439 getVertexBuffer (Lnet/minecraft/class_287$class_7433;)Lnet/minecraft/class_291; + METHOD method_43439 upload (Lnet/minecraft/class_287$class_7433;)Lnet/minecraft/class_291; ARG 0 buffer diff --git a/mappings/net/minecraft/client/render/BufferVertexConsumer.mapping b/mappings/net/minecraft/client/render/BufferVertexConsumer.mapping index c267057d4d..008a16b482 100644 --- a/mappings/net/minecraft/client/render/BufferVertexConsumer.mapping +++ b/mappings/net/minecraft/client/render/BufferVertexConsumer.mapping @@ -9,7 +9,7 @@ CLASS net/minecraft/class_4584 net/minecraft/client/render/BufferVertexConsumer METHOD method_22898 putShort (IS)V ARG 1 index ARG 2 value - METHOD method_22899 texture (SSI)Lnet/minecraft/class_4588; + METHOD method_22899 uv (SSI)Lnet/minecraft/class_4588; ARG 1 u ARG 2 v ARG 3 index diff --git a/mappings/net/minecraft/client/render/BuiltChunkStorage.mapping b/mappings/net/minecraft/client/render/BuiltChunkStorage.mapping index 51fb221c95..fd076505e6 100644 --- a/mappings/net/minecraft/client/render/BuiltChunkStorage.mapping +++ b/mappings/net/minecraft/client/render/BuiltChunkStorage.mapping @@ -5,6 +5,7 @@ CLASS net/minecraft/class_769 net/minecraft/client/render/BuiltChunkStorage FIELD field_4149 sizeY I FIELD field_4150 chunks [Lnet/minecraft/class_846$class_851; FIELD field_4151 world Lnet/minecraft/class_1937; + FIELD field_45629 viewDistance I METHOD (Lnet/minecraft/class_846;Lnet/minecraft/class_1937;ILnet/minecraft/class_761;)V ARG 1 chunkBuilder ARG 2 world @@ -29,3 +30,5 @@ CLASS net/minecraft/class_769 net/minecraft/client/render/BuiltChunkStorage METHOD method_3330 updateCameraPosition (DD)V ARG 1 x ARG 3 z + METHOD method_52839 getViewDistance ()I + METHOD method_52840 getWorld ()Lnet/minecraft/class_5539; diff --git a/mappings/net/minecraft/client/render/Camera.mapping b/mappings/net/minecraft/client/render/Camera.mapping index 6c201380ad..602efde3ab 100644 --- a/mappings/net/minecraft/client/render/Camera.mapping +++ b/mappings/net/minecraft/client/render/Camera.mapping @@ -4,15 +4,15 @@ CLASS net/minecraft/class_4184 net/minecraft/client/render/Camera FIELD field_18711 focusedEntity Lnet/minecraft/class_1297; FIELD field_18712 pos Lnet/minecraft/class_243; FIELD field_18713 blockPos Lnet/minecraft/class_2338$class_2339; - FIELD field_18714 horizontalPlane Lnet/minecraft/class_1160; - FIELD field_18715 verticalPlane Lnet/minecraft/class_1160; - FIELD field_18716 diagonalPlane Lnet/minecraft/class_1160; + FIELD field_18714 horizontalPlane Lorg/joml/Vector3f; + FIELD field_18715 verticalPlane Lorg/joml/Vector3f; + FIELD field_18716 diagonalPlane Lorg/joml/Vector3f; FIELD field_18717 pitch F FIELD field_18718 yaw F FIELD field_18719 thirdPerson Z FIELD field_18721 cameraY F FIELD field_18722 lastCameraY F - FIELD field_21518 rotation Lnet/minecraft/class_1158; + FIELD field_21518 rotation Lorg/joml/Quaternionf; METHOD method_19317 updateEyeHeight ()V METHOD method_19318 clipToSpace (D)D ARG 1 desiredCameraDistance @@ -43,16 +43,15 @@ CLASS net/minecraft/class_4184 net/minecraft/client/render/Camera METHOD method_19332 isReady ()Z METHOD method_19333 isThirdPerson ()Z METHOD method_19334 getSubmersionType ()Lnet/minecraft/class_5636; - METHOD method_19335 getHorizontalPlane ()Lnet/minecraft/class_1160; - METHOD method_19336 getVerticalPlane ()Lnet/minecraft/class_1160; + METHOD method_19335 getHorizontalPlane ()Lorg/joml/Vector3f; + METHOD method_19336 getVerticalPlane ()Lorg/joml/Vector3f; METHOD method_19337 reset ()V - METHOD method_23767 getRotation ()Lnet/minecraft/class_1158; - METHOD method_35689 getDiagonalPlane ()Lnet/minecraft/class_1160; + METHOD method_23767 getRotation ()Lorg/joml/Quaternionf; + METHOD method_35689 getDiagonalPlane ()Lorg/joml/Vector3f; METHOD method_36425 getProjection ()Lnet/minecraft/class_4184$class_6355; COMMENT {@return the field of vision of this camera} COMMENT COMMENT @see GameRenderer#CAMERA_DEPTH - COMMENT @see net.minecraft.util.math.Matrix4f#viewboxMatrix CLASS class_6355 Projection COMMENT A projection of a camera. It is a 2-D rectangle in a 3-D volume. COMMENT diff --git a/mappings/net/minecraft/client/render/ChunkBuilderMode.mapping b/mappings/net/minecraft/client/render/ChunkBuilderMode.mapping index ff0403d881..fabc3d5c10 100644 --- a/mappings/net/minecraft/client/render/ChunkBuilderMode.mapping +++ b/mappings/net/minecraft/client/render/ChunkBuilderMode.mapping @@ -1,5 +1,5 @@ CLASS net/minecraft/class_6597 net/minecraft/client/render/ChunkBuilderMode - FIELD field_34791 modes [Lnet/minecraft/class_6597; + FIELD field_34791 BY_ID Ljava/util/function/IntFunction; FIELD field_34792 id I FIELD field_34793 name Ljava/lang/String; METHOD (Ljava/lang/String;IILjava/lang/String;)V diff --git a/mappings/net/minecraft/client/render/ChunkRenderingDataPreparer.mapping b/mappings/net/minecraft/client/render/ChunkRenderingDataPreparer.mapping new file mode 100644 index 0000000000..71cbbca858 --- /dev/null +++ b/mappings/net/minecraft/client/render/ChunkRenderingDataPreparer.mapping @@ -0,0 +1,35 @@ +CLASS net/minecraft/class_8679 net/minecraft/client/render/ChunkRenderingDataPreparer + CLASS class_762 ChunkInfo + FIELD field_4122 propagationLevel I + FIELD field_4124 chunk Lnet/minecraft/class_846$class_851; + FIELD field_4125 direction B + FIELD field_4126 cullingState B + METHOD (Lnet/minecraft/class_846$class_851;Lnet/minecraft/class_2350;I)V + ARG 1 chunk + ARG 2 direction + ARG 3 propagationLevel + METHOD equals (Ljava/lang/Object;)Z + ARG 1 o + METHOD method_3298 canCull (Lnet/minecraft/class_2350;)Z + ARG 1 from + METHOD method_3299 updateCullingState (BLnet/minecraft/class_2350;)V + ARG 1 parentCullingState + ARG 2 from + METHOD method_34813 hasAnyDirection ()Z + METHOD method_34814 hasDirection (I)Z + ARG 1 ordinal + METHOD method_34816 addDirection (Lnet/minecraft/class_2350;)V + ARG 1 direction + CLASS class_5972 ChunkInfoList + FIELD field_29620 current [Lnet/minecraft/class_8679$class_762; + METHOD (I)V + ARG 1 size + METHOD method_34820 getInfo (Lnet/minecraft/class_846$class_851;)Lnet/minecraft/class_8679$class_762; + ARG 1 chunk + METHOD method_34821 setInfo (Lnet/minecraft/class_846$class_851;Lnet/minecraft/class_8679$class_762;)V + ARG 1 chunk + ARG 2 info + CLASS class_6600 RenderableChunks + FIELD field_34819 chunks Ljava/util/LinkedHashSet; + METHOD (I)V + ARG 1 chunkCount diff --git a/mappings/net/minecraft/client/render/DiffuseLighting.mapping b/mappings/net/minecraft/client/render/DiffuseLighting.mapping index a81e379eb5..03f8f5a375 100644 --- a/mappings/net/minecraft/client/render/DiffuseLighting.mapping +++ b/mappings/net/minecraft/client/render/DiffuseLighting.mapping @@ -1,7 +1,7 @@ CLASS net/minecraft/class_308 net/minecraft/client/render/DiffuseLighting - METHOD method_1452 enableForLevel (Lnet/minecraft/class_1159;)V + METHOD method_1452 enableForLevel (Lorg/joml/Matrix4f;)V ARG 0 positionMatrix METHOD method_24210 disableGuiDepthLighting ()V METHOD method_24211 enableGuiDepthLighting ()V - METHOD method_27869 disableForLevel (Lnet/minecraft/class_1159;)V + METHOD method_27869 disableForLevel (Lorg/joml/Matrix4f;)V ARG 0 positionMatrix diff --git a/mappings/net/minecraft/client/render/Frustum.mapping b/mappings/net/minecraft/client/render/Frustum.mapping index 61f53d0ae5..fd2586a2f2 100644 --- a/mappings/net/minecraft/client/render/Frustum.mapping +++ b/mappings/net/minecraft/client/render/Frustum.mapping @@ -1,13 +1,17 @@ CLASS net/minecraft/class_4604 net/minecraft/client/render/Frustum - FIELD field_20994 homogeneousCoordinates [Lnet/minecraft/class_1162; FIELD field_20995 x D FIELD field_20996 y D FIELD field_20997 z D - METHOD (Lnet/minecraft/class_1159;Lnet/minecraft/class_1159;)V - ARG 1 positionMatrix - ARG 2 projectionMatrix + FIELD field_34820 RECESSION_SCALE I + FIELD field_34821 recession Lorg/joml/Vector4f; + COMMENT The vector corresponding to the direction toward the far plane of the frustum. + FIELD field_40823 frustumIntersection Lorg/joml/FrustumIntersection; + FIELD field_40824 positionProjectionMatrix Lorg/joml/Matrix4f; METHOD (Lnet/minecraft/class_4604;)V ARG 1 frustum + METHOD (Lorg/joml/Matrix4f;Lorg/joml/Matrix4f;)V + ARG 1 positionMatrix + ARG 2 projectionMatrix METHOD method_23088 setPosition (DDD)V ARG 1 cameraX ARG 3 cameraY @@ -19,21 +23,14 @@ CLASS net/minecraft/class_4604 net/minecraft/client/render/Frustum ARG 7 maxX ARG 9 maxY ARG 11 maxZ - METHOD method_23090 isAnyCornerVisible (FFFFFF)Z - ARG 1 x1 - ARG 2 y1 - ARG 3 z1 - ARG 4 x2 - ARG 5 y2 - ARG 6 z2 - METHOD method_23091 transform (Lnet/minecraft/class_1159;IIII)V - ARG 1 function - ARG 2 x - ARG 3 y - ARG 4 z - ARG 5 index - METHOD method_23092 init (Lnet/minecraft/class_1159;Lnet/minecraft/class_1159;)V + METHOD method_23092 init (Lorg/joml/Matrix4f;Lorg/joml/Matrix4f;)V + COMMENT @implNote The upper-left 3x3 matrix of {@code positionMatrix * projectionMatrix} + COMMENT should be orthogonal for {@link Frustum#recession} to be set to a meaningful value. ARG 1 positionMatrix ARG 2 projectionMatrix METHOD method_23093 isVisible (Lnet/minecraft/class_238;)Z ARG 1 box + METHOD method_38557 coverBoxAroundSetPosition (I)Lnet/minecraft/class_4604; + COMMENT Moves the frustum backwards until it entirely covers the cell containing the + COMMENT current position in a cubic lattice with cell size {@code boxSize}. + ARG 1 boxSize diff --git a/mappings/net/minecraft/client/render/GameRenderer.mapping b/mappings/net/minecraft/client/render/GameRenderer.mapping index b75c5051d0..0cc5c9f224 100644 --- a/mappings/net/minecraft/client/render/GameRenderer.mapping +++ b/mappings/net/minecraft/client/render/GameRenderer.mapping @@ -3,75 +3,72 @@ CLASS net/minecraft/class_757 net/minecraft/client/render/GameRenderer FIELD field_20948 buffers Lnet/minecraft/class_4599; FIELD field_20949 overlayTexture Lnet/minecraft/class_4608; FIELD field_26730 NAUSEA_OVERLAY Lnet/minecraft/class_2960; - FIELD field_29350 shaders Ljava/util/Map; - FIELD field_29351 positionShader Lnet/minecraft/class_5944; - FIELD field_29352 positionColorShader Lnet/minecraft/class_5944; - FIELD field_29353 positionColorTexShader Lnet/minecraft/class_5944; - FIELD field_29354 positionTexShader Lnet/minecraft/class_5944; - FIELD field_29355 positionTexColorShader Lnet/minecraft/class_5944; - FIELD field_29356 blockShader Lnet/minecraft/class_5944; - FIELD field_29357 newEntityShader Lnet/minecraft/class_5944; - FIELD field_29358 particleShader Lnet/minecraft/class_5944; - FIELD field_29359 positionColorLightmapShader Lnet/minecraft/class_5944; - FIELD field_29360 positionColorTexLightmapShader Lnet/minecraft/class_5944; - FIELD field_29361 positionTexColorNormalShader Lnet/minecraft/class_5944; - FIELD field_29362 positionTexLightmapColorShader Lnet/minecraft/class_5944; - FIELD field_29363 renderTypeSolidShader Lnet/minecraft/class_5944; - FIELD field_29364 renderTypeCutoutMippedShader Lnet/minecraft/class_5944; - FIELD field_29365 renderTypeCutoutShader Lnet/minecraft/class_5944; - FIELD field_29366 renderTypeTranslucentShader Lnet/minecraft/class_5944; - FIELD field_29367 renderTypeEntityGlintShader Lnet/minecraft/class_5944; - FIELD field_29368 renderTypeEntityGlintDirectShader Lnet/minecraft/class_5944; - FIELD field_29369 renderTypeTextShader Lnet/minecraft/class_5944; - FIELD field_29370 renderTypeTextSeeThroughShader Lnet/minecraft/class_5944; - FIELD field_29371 renderTypeLightningShader Lnet/minecraft/class_5944; - FIELD field_29372 renderTypeTripwireShader Lnet/minecraft/class_5944; - FIELD field_29373 renderTypeEndPortalShader Lnet/minecraft/class_5944; - FIELD field_29374 renderTypeEndGatewayShader Lnet/minecraft/class_5944; - FIELD field_29375 renderTypeLinesShader Lnet/minecraft/class_5944; - FIELD field_29376 renderTypeCrumblingShader Lnet/minecraft/class_5944; - FIELD field_29377 renderTypeTranslucentMovingBlockShader Lnet/minecraft/class_5944; - FIELD field_29378 renderTypeTranslucentNoCrumblingShader Lnet/minecraft/class_5944; - FIELD field_29379 renderTypeArmorCutoutNoCullShader Lnet/minecraft/class_5944; - FIELD field_29380 renderTypeEntitySolidShader Lnet/minecraft/class_5944; - FIELD field_29381 renderTypeEntityCutoutShader Lnet/minecraft/class_5944; - FIELD field_29382 renderTypeEntityCutoutNoNullShader Lnet/minecraft/class_5944; - FIELD field_29383 renderTypeEntityCutoutNoNullZOffsetShader Lnet/minecraft/class_5944; - FIELD field_29384 renderTypeItemEntityTranslucentCullShader Lnet/minecraft/class_5944; - FIELD field_29385 renderTypeEntityTranslucentCullShader Lnet/minecraft/class_5944; - FIELD field_29386 renderTypeEntityTranslucentShader Lnet/minecraft/class_5944; - FIELD field_29387 renderTypeEntitySmoothCutoutShader Lnet/minecraft/class_5944; - FIELD field_29388 renderTypeBeaconBeamShader Lnet/minecraft/class_5944; - FIELD field_29389 renderTypeEntityDecalShader Lnet/minecraft/class_5944; - FIELD field_29390 renderTypeEntityNoOutlineShader Lnet/minecraft/class_5944; - FIELD field_29391 renderTypeEntityShadowShader Lnet/minecraft/class_5944; - FIELD field_29392 renderTypeEntityAlphaShader Lnet/minecraft/class_5944; - FIELD field_29393 renderTypeEyesShader Lnet/minecraft/class_5944; - FIELD field_29394 renderTypeEnergySwirlShader Lnet/minecraft/class_5944; - FIELD field_29395 renderTypeLeashShader Lnet/minecraft/class_5944; - FIELD field_29396 renderTypeWaterMaskShader Lnet/minecraft/class_5944; - FIELD field_29397 renderTypeOutlineShader Lnet/minecraft/class_5944; - FIELD field_29398 renderTypeArmorGlintShader Lnet/minecraft/class_5944; - FIELD field_29399 renderTypeArmorEntityGlintShader Lnet/minecraft/class_5944; - FIELD field_29400 renderTypeGlintTranslucentShader Lnet/minecraft/class_5944; - FIELD field_29401 renderTypeGlintShader Lnet/minecraft/class_5944; - FIELD field_29402 renderTypeGlintDirectShader Lnet/minecraft/class_5944; - FIELD field_29403 blitScreenShader Lnet/minecraft/class_5944; + FIELD field_29350 programs Ljava/util/Map; + FIELD field_29351 positionProgram Lnet/minecraft/class_5944; + FIELD field_29352 positionColorProgram Lnet/minecraft/class_5944; + FIELD field_29353 positionColorTexProgram Lnet/minecraft/class_5944; + FIELD field_29354 positionTexProgram Lnet/minecraft/class_5944; + FIELD field_29355 positionTexColorProgram Lnet/minecraft/class_5944; + FIELD field_29358 particleProgram Lnet/minecraft/class_5944; + FIELD field_29359 positionColorLightmapProgram Lnet/minecraft/class_5944; + FIELD field_29360 positionColorTexLightmapProgram Lnet/minecraft/class_5944; + FIELD field_29361 positionTexColorNormalProgram Lnet/minecraft/class_5944; + FIELD field_29362 positionTexLightmapColorProgram Lnet/minecraft/class_5944; + FIELD field_29363 renderTypeSolidProgram Lnet/minecraft/class_5944; + FIELD field_29364 renderTypeCutoutMippedProgram Lnet/minecraft/class_5944; + FIELD field_29365 renderTypeCutoutProgram Lnet/minecraft/class_5944; + FIELD field_29366 renderTypeTranslucentProgram Lnet/minecraft/class_5944; + FIELD field_29367 renderTypeEntityGlintProgram Lnet/minecraft/class_5944; + FIELD field_29368 renderTypeEntityGlintDirectProgram Lnet/minecraft/class_5944; + FIELD field_29369 renderTypeTextProgram Lnet/minecraft/class_5944; + FIELD field_29370 renderTypeTextSeeThroughProgram Lnet/minecraft/class_5944; + FIELD field_29371 renderTypeLightningProgram Lnet/minecraft/class_5944; + FIELD field_29372 renderTypeTripwireProgram Lnet/minecraft/class_5944; + FIELD field_29373 renderTypeEndPortalProgram Lnet/minecraft/class_5944; + FIELD field_29374 renderTypeEndGatewayProgram Lnet/minecraft/class_5944; + FIELD field_29375 renderTypeLinesProgram Lnet/minecraft/class_5944; + FIELD field_29376 renderTypeCrumblingProgram Lnet/minecraft/class_5944; + FIELD field_29377 renderTypeTranslucentMovingBlockProgram Lnet/minecraft/class_5944; + FIELD field_29378 renderTypeTranslucentNoCrumblingProgram Lnet/minecraft/class_5944; + FIELD field_29379 renderTypeArmorCutoutNoCullProgram Lnet/minecraft/class_5944; + FIELD field_29380 renderTypeEntitySolidProgram Lnet/minecraft/class_5944; + FIELD field_29381 renderTypeEntityCutoutProgram Lnet/minecraft/class_5944; + FIELD field_29382 renderTypeEntityCutoutNoNullProgram Lnet/minecraft/class_5944; + FIELD field_29383 renderTypeEntityCutoutNoNullZOffsetProgram Lnet/minecraft/class_5944; + FIELD field_29384 renderTypeItemEntityTranslucentCullProgram Lnet/minecraft/class_5944; + FIELD field_29385 renderTypeEntityTranslucentCullProgram Lnet/minecraft/class_5944; + FIELD field_29386 renderTypeEntityTranslucentProgram Lnet/minecraft/class_5944; + FIELD field_29387 renderTypeEntitySmoothCutoutProgram Lnet/minecraft/class_5944; + FIELD field_29388 renderTypeBeaconBeamProgram Lnet/minecraft/class_5944; + FIELD field_29389 renderTypeEntityDecalProgram Lnet/minecraft/class_5944; + FIELD field_29390 renderTypeEntityNoOutlineProgram Lnet/minecraft/class_5944; + FIELD field_29391 renderTypeEntityShadowProgram Lnet/minecraft/class_5944; + FIELD field_29392 renderTypeEntityAlphaProgram Lnet/minecraft/class_5944; + FIELD field_29393 renderTypeEyesProgram Lnet/minecraft/class_5944; + FIELD field_29394 renderTypeEnergySwirlProgram Lnet/minecraft/class_5944; + FIELD field_29395 renderTypeLeashProgram Lnet/minecraft/class_5944; + FIELD field_29396 renderTypeWaterMaskProgram Lnet/minecraft/class_5944; + FIELD field_29397 renderTypeOutlineProgram Lnet/minecraft/class_5944; + FIELD field_29398 renderTypeArmorGlintProgram Lnet/minecraft/class_5944; + FIELD field_29399 renderTypeArmorEntityGlintProgram Lnet/minecraft/class_5944; + FIELD field_29400 renderTypeGlintTranslucentProgram Lnet/minecraft/class_5944; + FIELD field_29401 renderTypeGlintProgram Lnet/minecraft/class_5944; + FIELD field_29402 renderTypeGlintDirectProgram Lnet/minecraft/class_5944; + FIELD field_29403 blitScreenProgram Lnet/minecraft/class_5944; FIELD field_32686 CAMERA_DEPTH F COMMENT Since the camera is conceptualized as a single point, a depth of {@value} COMMENT blocks is used to define a rectangular area to be rendered. COMMENT COMMENT @see Camera#getProjection() - COMMENT @see Matrix4f#viewboxMatrix - FIELD field_33626 renderTypeTextIntensityShader Lnet/minecraft/class_5944; - FIELD field_33627 renderTypeTextIntensitySeeThroughShader Lnet/minecraft/class_5944; + FIELD field_33626 renderTypeTextIntensityProgram Lnet/minecraft/class_5944; + FIELD field_33627 renderTypeTextIntensitySeeThroughProgram Lnet/minecraft/class_5944; FIELD field_34055 hasWorldIcon Z - FIELD field_38343 renderTypeEntityTranslucentEmissiveShader Lnet/minecraft/class_5944; + FIELD field_38343 renderTypeEntityTranslucentEmissiveProgram Lnet/minecraft/class_5944; FIELD field_3988 zoomX F FIELD field_3992 renderHand Z FIELD field_3993 LOGGER Lorg/slf4j/Logger; FIELD field_3994 random Lnet/minecraft/class_5819; - FIELD field_3996 SHADERS_LOCATIONS [Lnet/minecraft/class_2960; + FIELD field_3996 SUPER_SECRET_SETTING_PROGRAMS [Lnet/minecraft/class_2960; FIELD field_3997 lastSkyDarkness F FIELD field_3998 lastWindowFocusedTime J FIELD field_3999 lastFovMultiplier F @@ -83,20 +80,26 @@ CLASS net/minecraft/class_757 net/minecraft/client/render/GameRenderer FIELD field_4006 floatingItem Lnet/minecraft/class_1799; FIELD field_4007 floatingItemTimeLeft I FIELD field_4009 blockOutlineEnabled Z - FIELD field_4010 SHADER_COUNT I + FIELD field_4010 SUPER_SECRET_SETTING_COUNT I FIELD field_4012 firstPersonRenderer Lnet/minecraft/class_759; - FIELD field_4013 shadersEnabled Z + FIELD field_4013 postProcessorEnabled Z FIELD field_4015 client Lnet/minecraft/class_310; FIELD field_4017 lastWorldIconUpdate J FIELD field_4018 resourceManager Lnet/minecraft/class_3300; FIELD field_4019 fovMultiplier F - FIELD field_4023 forcedShaderIndex I - FIELD field_4024 shader Lnet/minecraft/class_279; + FIELD field_4023 superSecretSettingIndex I + FIELD field_4024 postProcessor Lnet/minecraft/class_279; FIELD field_4025 viewDistance F FIELD field_4026 mapRenderer Lnet/minecraft/class_330; FIELD field_4027 ticks I FIELD field_4028 lightmapTextureManager Lnet/minecraft/class_765; FIELD field_4029 floatingItemWidth F + FIELD field_42515 renderTypeTextBackgroundProgram Lnet/minecraft/class_5944; + FIELD field_42516 renderTypeTextBackgroundSeeThroughProgram Lnet/minecraft/class_5944; + FIELD field_44810 renderTypeGuiProgram Lnet/minecraft/class_5944; + FIELD field_44811 renderTypeGuiOverlayProgram Lnet/minecraft/class_5944; + FIELD field_44812 renderTypeGuiTextHighlightProgram Lnet/minecraft/class_5944; + FIELD field_44813 renderTypeGuiGhostRecipeOverlayProgram Lnet/minecraft/class_5944; METHOD (Lnet/minecraft/class_310;Lnet/minecraft/class_759;Lnet/minecraft/class_3300;Lnet/minecraft/class_4599;)V ARG 1 client ARG 2 heldItemRenderer @@ -105,17 +108,18 @@ CLASS net/minecraft/class_757 net/minecraft/client/render/GameRenderer METHOD method_18144 (Lnet/minecraft/class_1297;)Z ARG 0 entity METHOD method_19418 getCamera ()Lnet/minecraft/class_4184; - METHOD method_22709 loadProjectionMatrix (Lnet/minecraft/class_1159;)V + METHOD method_22709 loadProjectionMatrix (Lorg/joml/Matrix4f;)V ARG 1 projectionMatrix - METHOD method_22973 getBasicProjectionMatrix (D)Lnet/minecraft/class_1159; + METHOD method_22973 getBasicProjectionMatrix (D)Lorg/joml/Matrix4f; ARG 1 fov METHOD method_22974 getLightmapTextureManager ()Lnet/minecraft/class_765; METHOD method_22975 getOverlayTexture ()Lnet/minecraft/class_4608; - METHOD method_31136 renderNausea (F)V - ARG 1 distortionStrength + METHOD method_31136 renderNausea (Lnet/minecraft/class_332;F)V + ARG 1 context + ARG 2 distortionStrength METHOD method_3167 onCameraEntitySet (Lnet/minecraft/class_1297;)V ARG 1 entity - METHOD method_3168 loadShader (Lnet/minecraft/class_2960;)V + METHOD method_3168 loadPostProcessor (Lnet/minecraft/class_2960;)V ARG 1 id METHOD method_3169 onResized (II)V ARG 1 width @@ -134,8 +138,8 @@ CLASS net/minecraft/class_757 net/minecraft/client/render/GameRenderer METHOD method_3176 updateWorldIcon (Ljava/nio/file/Path;)V ARG 1 path METHOD method_3182 tick ()V - METHOD method_3183 getShader ()Lnet/minecraft/class_279; - METHOD method_3184 toggleShadersEnabled ()V + METHOD method_3183 getPostProcessor ()Lnet/minecraft/class_279; + METHOD method_3184 togglePostProcessorEnabled ()V METHOD method_3186 bobView (Lnet/minecraft/class_4587;F)V ARG 1 matrices ARG 2 tickDelta @@ -159,97 +163,97 @@ CLASS net/minecraft/class_757 net/minecraft/client/render/GameRenderer ARG 1 camera ARG 2 tickDelta ARG 3 changingFov - METHOD method_3198 bobViewWhenHurt (Lnet/minecraft/class_4587;F)V + METHOD method_3198 tiltViewWhenHurt (Lnet/minecraft/class_4587;F)V ARG 1 matrices ARG 2 tickDelta METHOD method_3199 updateFovMultiplier ()V METHOD method_3202 shouldRenderBlockOutline ()Z METHOD method_3203 reset ()V - METHOD method_3207 disableShader ()V - METHOD method_34495 getRenderTypeSolidShader ()Lnet/minecraft/class_5944; - METHOD method_34496 getRenderTypeCutoutMippedShader ()Lnet/minecraft/class_5944; - METHOD method_34497 getRenderTypeCutoutShader ()Lnet/minecraft/class_5944; - METHOD method_34498 getRenderTypeTranslucentShader ()Lnet/minecraft/class_5944; - METHOD method_34499 getRenderTypeTranslucentMovingBlockShader ()Lnet/minecraft/class_5944; - METHOD method_34500 getRenderTypeTranslucentNoCrumblingShader ()Lnet/minecraft/class_5944; - METHOD method_34501 getRenderTypeArmorCutoutNoCullShader ()Lnet/minecraft/class_5944; - METHOD method_34502 getRenderTypeEntitySolidShader ()Lnet/minecraft/class_5944; - METHOD method_34503 getRenderTypeEntityCutoutShader ()Lnet/minecraft/class_5944; - METHOD method_34504 getRenderTypeEntityCutoutNoNullShader ()Lnet/minecraft/class_5944; - METHOD method_34505 getRenderTypeEntityCutoutNoNullZOffsetShader ()Lnet/minecraft/class_5944; - METHOD method_34506 getRenderTypeItemEntityTranslucentCullShader ()Lnet/minecraft/class_5944; - METHOD method_34507 getRenderTypeEntityTranslucentCullShader ()Lnet/minecraft/class_5944; - METHOD method_34508 getRenderTypeEntityTranslucentShader ()Lnet/minecraft/class_5944; - METHOD method_34509 getRenderTypeEntitySmoothCutoutShader ()Lnet/minecraft/class_5944; - METHOD method_34510 getRenderTypeBeaconBeamShader ()Lnet/minecraft/class_5944; - METHOD method_34511 getRenderTypeEntityDecalShader ()Lnet/minecraft/class_5944; - METHOD method_34512 getRenderTypeEntityNoOutlineShader ()Lnet/minecraft/class_5944; - METHOD method_34513 getRenderTypeEntityShadowShader ()Lnet/minecraft/class_5944; - METHOD method_34514 getRenderTypeEntityAlphaShader ()Lnet/minecraft/class_5944; - METHOD method_34515 getRenderTypeEyesShader ()Lnet/minecraft/class_5944; - METHOD method_34516 getRenderTypeEnergySwirlShader ()Lnet/minecraft/class_5944; - METHOD method_34517 getRenderTypeLeashShader ()Lnet/minecraft/class_5944; - METHOD method_34518 getRenderTypeWaterMaskShader ()Lnet/minecraft/class_5944; - METHOD method_34519 getRenderTypeOutlineShader ()Lnet/minecraft/class_5944; - METHOD method_34520 getRenderTypeArmorGlintShader ()Lnet/minecraft/class_5944; - METHOD method_34521 preloadShaders (Lnet/minecraft/class_5912;)V + METHOD method_3207 disablePostProcessor ()V + METHOD method_32796 getFarPlaneDistance ()F + METHOD method_34495 getRenderTypeSolidProgram ()Lnet/minecraft/class_5944; + METHOD method_34496 getRenderTypeCutoutMippedProgram ()Lnet/minecraft/class_5944; + METHOD method_34497 getRenderTypeCutoutProgram ()Lnet/minecraft/class_5944; + METHOD method_34498 getRenderTypeTranslucentProgram ()Lnet/minecraft/class_5944; + METHOD method_34499 getRenderTypeTranslucentMovingBlockProgram ()Lnet/minecraft/class_5944; + METHOD method_34500 getRenderTypeTranslucentNoCrumblingProgram ()Lnet/minecraft/class_5944; + METHOD method_34501 getRenderTypeArmorCutoutNoCullProgram ()Lnet/minecraft/class_5944; + METHOD method_34502 getRenderTypeEntitySolidProgram ()Lnet/minecraft/class_5944; + METHOD method_34503 getRenderTypeEntityCutoutProgram ()Lnet/minecraft/class_5944; + METHOD method_34504 getRenderTypeEntityCutoutNoNullProgram ()Lnet/minecraft/class_5944; + METHOD method_34505 getRenderTypeEntityCutoutNoNullZOffsetProgram ()Lnet/minecraft/class_5944; + METHOD method_34506 getRenderTypeItemEntityTranslucentCullProgram ()Lnet/minecraft/class_5944; + METHOD method_34507 getRenderTypeEntityTranslucentCullProgram ()Lnet/minecraft/class_5944; + METHOD method_34508 getRenderTypeEntityTranslucentProgram ()Lnet/minecraft/class_5944; + METHOD method_34509 getRenderTypeEntitySmoothCutoutProgram ()Lnet/minecraft/class_5944; + METHOD method_34510 getRenderTypeBeaconBeamProgram ()Lnet/minecraft/class_5944; + METHOD method_34511 getRenderTypeEntityDecalProgram ()Lnet/minecraft/class_5944; + METHOD method_34512 getRenderTypeEntityNoOutlineProgram ()Lnet/minecraft/class_5944; + METHOD method_34513 getRenderTypeEntityShadowProgram ()Lnet/minecraft/class_5944; + METHOD method_34514 getRenderTypeEntityAlphaProgram ()Lnet/minecraft/class_5944; + METHOD method_34515 getRenderTypeEyesProgram ()Lnet/minecraft/class_5944; + METHOD method_34516 getRenderTypeEnergySwirlProgram ()Lnet/minecraft/class_5944; + METHOD method_34517 getRenderTypeLeashProgram ()Lnet/minecraft/class_5944; + METHOD method_34518 getRenderTypeWaterMaskProgram ()Lnet/minecraft/class_5944; + METHOD method_34519 getRenderTypeOutlineProgram ()Lnet/minecraft/class_5944; + METHOD method_34520 getRenderTypeArmorGlintProgram ()Lnet/minecraft/class_5944; + METHOD method_34521 preloadPrograms (Lnet/minecraft/class_5912;)V ARG 1 factory - METHOD method_34522 loadShader (Lnet/minecraft/class_5912;Ljava/lang/String;Lnet/minecraft/class_293;)Lnet/minecraft/class_5944; + METHOD method_34522 preloadProgram (Lnet/minecraft/class_5912;Ljava/lang/String;Lnet/minecraft/class_293;)Lnet/minecraft/class_5944; ARG 1 factory ARG 2 name - ARG 3 vertexFormat - METHOD method_34523 getRenderTypeArmorEntityGlintShader ()Lnet/minecraft/class_5944; - METHOD method_34524 getRenderTypeGlintTranslucentShader ()Lnet/minecraft/class_5944; - METHOD method_34525 getRenderTypeGlintShader ()Lnet/minecraft/class_5944; - METHOD method_34526 getRenderTypeGlintDirectShader ()Lnet/minecraft/class_5944; - METHOD method_34527 getRenderTypeEntityGlintShader ()Lnet/minecraft/class_5944; - METHOD method_34528 getRenderTypeEntityGlintDirectShader ()Lnet/minecraft/class_5944; - METHOD method_34529 getRenderTypeTextShader ()Lnet/minecraft/class_5944; - METHOD method_34530 getRenderTypeTextSeeThroughShader ()Lnet/minecraft/class_5944; - METHOD method_34531 getRenderTypeLightningShader ()Lnet/minecraft/class_5944; - METHOD method_34532 getRenderTypeTripwireShader ()Lnet/minecraft/class_5944; - METHOD method_34533 getRenderTypeEndPortalShader ()Lnet/minecraft/class_5944; - METHOD method_34534 getRenderTypeEndGatewayShader ()Lnet/minecraft/class_5944; - METHOD method_34535 getRenderTypeLinesShader ()Lnet/minecraft/class_5944; - COMMENT {@return the {@code rendertype_lines} shader} + ARG 3 format + METHOD method_34523 getRenderTypeArmorEntityGlintProgram ()Lnet/minecraft/class_5944; + METHOD method_34524 getRenderTypeGlintTranslucentProgram ()Lnet/minecraft/class_5944; + METHOD method_34525 getRenderTypeGlintProgram ()Lnet/minecraft/class_5944; + METHOD method_34526 getRenderTypeGlintDirectProgram ()Lnet/minecraft/class_5944; + METHOD method_34527 getRenderTypeEntityGlintProgram ()Lnet/minecraft/class_5944; + METHOD method_34528 getRenderTypeEntityGlintDirectProgram ()Lnet/minecraft/class_5944; + METHOD method_34529 getRenderTypeTextProgram ()Lnet/minecraft/class_5944; + METHOD method_34530 getRenderTypeTextSeeThroughProgram ()Lnet/minecraft/class_5944; + METHOD method_34531 getRenderTypeLightningProgram ()Lnet/minecraft/class_5944; + METHOD method_34532 getRenderTypeTripwireProgram ()Lnet/minecraft/class_5944; + METHOD method_34533 getRenderTypeEndPortalProgram ()Lnet/minecraft/class_5944; + METHOD method_34534 getRenderTypeEndGatewayProgram ()Lnet/minecraft/class_5944; + METHOD method_34535 getRenderTypeLinesProgram ()Lnet/minecraft/class_5944; + COMMENT {@return the {@code rendertype_lines} shader program} COMMENT - COMMENT

This shader draws a line by drawing a quad (two triangles pushed - COMMENT together). Each line takes four vertices. The first vertex is the line - COMMENT start. The second one is a duplicate of the first one. The third one - COMMENT is the line end. The fourth one is a duplicate of the third one. + COMMENT

This shader program draws a line by drawing a quad (two triangles + COMMENT pushed together). Each line takes four vertices. The first vertex is + COMMENT the line start. The second one is a duplicate of the first one. The + COMMENT third one is the line end. The fourth one is a duplicate of the third + COMMENT one. COMMENT - COMMENT

The user of this shader should use {@link VertexFormats#LINES} for - COMMENT the vertex format. The normal element is a direction vector from the - COMMENT starting position to the ending position. It's used to calculate in - COMMENT what directions the duplicated vertices should be offset to achieve - COMMENT thick lines. All four vertices should share the same value for the - COMMENT normal element. + COMMENT

The user of this shader program should use {@link + COMMENT VertexFormats#LINES} for the vertex format. The normal element is a + COMMENT direction vector from the starting position to the ending position. + COMMENT It's used to calculate in what directions the duplicated vertices + COMMENT should be offset to achieve thick lines. All four vertices should + COMMENT share the same value for the normal element. COMMENT COMMENT

The width of the line can be set with {@link COMMENT com.mojang.blaze3d.systems.RenderSystem#lineWidth COMMENT RenderSystem#lineWidth}. - METHOD method_34536 getRenderTypeCrumblingShader ()Lnet/minecraft/class_5944; - METHOD method_34537 clearShaders ()V - METHOD method_34538 loadShaders (Lnet/minecraft/class_3300;)V - ARG 1 manager - METHOD method_34539 getPositionShader ()Lnet/minecraft/class_5944; - METHOD method_34540 getPositionColorShader ()Lnet/minecraft/class_5944; - METHOD method_34541 getPositionColorTexShader ()Lnet/minecraft/class_5944; - METHOD method_34542 getPositionTexShader ()Lnet/minecraft/class_5944; - METHOD method_34543 getPositionTexColorShader ()Lnet/minecraft/class_5944; - METHOD method_34544 getBlockShader ()Lnet/minecraft/class_5944; - METHOD method_34545 getNewEntityShader ()Lnet/minecraft/class_5944; - METHOD method_34546 getParticleShader ()Lnet/minecraft/class_5944; - METHOD method_34547 getPositionColorLightmapShader ()Lnet/minecraft/class_5944; - METHOD method_34548 getPositionColorTexLightmapShader ()Lnet/minecraft/class_5944; - METHOD method_34549 getPositionTexColorNormalShader ()Lnet/minecraft/class_5944; - METHOD method_35764 getPositionTexLightmapColorShader ()Lnet/minecraft/class_5944; + METHOD method_34536 getRenderTypeCrumblingProgram ()Lnet/minecraft/class_5944; + METHOD method_34537 clearPrograms ()V + METHOD method_34538 loadPrograms (Lnet/minecraft/class_5912;)V + ARG 1 factory + METHOD method_34539 getPositionProgram ()Lnet/minecraft/class_5944; + METHOD method_34540 getPositionColorProgram ()Lnet/minecraft/class_5944; + METHOD method_34541 getPositionColorTexProgram ()Lnet/minecraft/class_5944; + METHOD method_34542 getPositionTexProgram ()Lnet/minecraft/class_5944; + METHOD method_34543 getPositionTexColorProgram ()Lnet/minecraft/class_5944; + METHOD method_34546 getParticleProgram ()Lnet/minecraft/class_5944; + METHOD method_34547 getPositionColorLightmapProgram ()Lnet/minecraft/class_5944; + METHOD method_34548 getPositionColorTexLightmapProgram ()Lnet/minecraft/class_5944; + METHOD method_34549 getPositionTexColorNormalProgram ()Lnet/minecraft/class_5944; + METHOD method_35764 getPositionTexLightmapColorProgram ()Lnet/minecraft/class_5944; METHOD method_35765 isRenderingPanorama ()Z METHOD method_35766 renderWithZoom (FFF)V ARG 1 zoom ARG 2 zoomX ARG 3 zoomY - METHOD method_35767 getShader (Ljava/lang/String;)Lnet/minecraft/class_5944; + METHOD method_35767 getProgram (Ljava/lang/String;)Lnet/minecraft/class_5944; ARG 1 name METHOD method_35768 setRenderHand (Z)V ARG 1 renderHand @@ -257,125 +261,147 @@ CLASS net/minecraft/class_757 net/minecraft/client/render/GameRenderer ARG 1 blockOutlineEnabled METHOD method_35770 setRenderingPanorama (Z)V ARG 1 renderingPanorama - METHOD method_35771 loadForcedShader ()V + METHOD method_35771 cycleSuperSecretSetting ()V METHOD method_35772 getClient ()Lnet/minecraft/class_310; - METHOD method_36432 getRenderTypeTextIntensityShader ()Lnet/minecraft/class_5944; - METHOD method_36433 getRenderTypeTextIntensitySeeThroughShader ()Lnet/minecraft/class_5944; + METHOD method_36432 getRenderTypeTextIntensityProgram ()Lnet/minecraft/class_5944; + METHOD method_36433 getRenderTypeTextIntensitySeeThroughProgram ()Lnet/minecraft/class_5944; METHOD method_36486 (Lnet/minecraft/class_5944;)V - ARG 0 shader + ARG 0 program METHOD method_36487 (Lnet/minecraft/class_5944;)V - ARG 0 shader + ARG 0 program METHOD method_36488 (Lnet/minecraft/class_5944;)V - ARG 0 shader + ARG 0 program METHOD method_36489 (Lnet/minecraft/class_5944;)V - ARG 0 shader + ARG 0 program METHOD method_36490 (Lnet/minecraft/class_5944;)V - ARG 0 shader + ARG 0 program METHOD method_36491 (Lnet/minecraft/class_5944;)V - ARG 0 shader + ARG 0 program METHOD method_36492 (Lnet/minecraft/class_5944;)V - ARG 0 shader + ARG 0 program METHOD method_36493 (Lnet/minecraft/class_5944;)V - ARG 0 shader + ARG 0 program METHOD method_36494 (Lnet/minecraft/class_5944;)V - ARG 0 shader + ARG 0 program METHOD method_36495 (Lnet/minecraft/class_5944;)V - ARG 0 shader + ARG 0 program METHOD method_36496 (Lnet/minecraft/class_5944;)V - ARG 0 shader + ARG 0 program METHOD method_36497 (Lnet/minecraft/class_5944;)V - ARG 0 shader + ARG 0 program METHOD method_36498 (Lnet/minecraft/class_5944;)V - ARG 0 shader + ARG 0 program METHOD method_36499 (Lnet/minecraft/class_5944;)V - ARG 0 shader + ARG 0 program METHOD method_36500 (Lnet/minecraft/class_5944;)V - ARG 0 shader + ARG 0 program METHOD method_36501 (Lnet/minecraft/class_5944;)V - ARG 0 shader + ARG 0 program METHOD method_36502 (Lnet/minecraft/class_5944;)V - ARG 0 shader + ARG 0 program METHOD method_36503 (Lnet/minecraft/class_5944;)V - ARG 0 shader + ARG 0 program METHOD method_36504 (Lnet/minecraft/class_5944;)V - ARG 0 shader + ARG 0 program METHOD method_36505 (Lnet/minecraft/class_5944;)V - ARG 0 shader + ARG 0 program METHOD method_36506 (Lnet/minecraft/class_5944;)V - ARG 0 shader + ARG 0 program METHOD method_36507 (Lnet/minecraft/class_5944;)V - ARG 0 shader + ARG 0 program METHOD method_36508 (Lnet/minecraft/class_5944;)V - ARG 0 shader + ARG 0 program METHOD method_36509 (Lnet/minecraft/class_5944;)V - ARG 0 shader + ARG 0 program METHOD method_36510 (Lnet/minecraft/class_5944;)V - ARG 0 shader + ARG 0 program METHOD method_36511 (Lnet/minecraft/class_5944;)V - ARG 0 shader + ARG 0 program METHOD method_36512 (Lcom/mojang/datafixers/util/Pair;)V ARG 1 pair METHOD method_36513 (Lnet/minecraft/class_5944;)V - ARG 0 shader - METHOD method_36514 (Lnet/minecraft/class_5944;)V - ARG 0 shader - METHOD method_36515 (Lnet/minecraft/class_5944;)V - ARG 0 shader + ARG 0 program METHOD method_36516 (Lcom/mojang/datafixers/util/Pair;)V ARG 0 pair METHOD method_36517 (Lnet/minecraft/class_5944;)V - ARG 0 shader + ARG 0 program METHOD method_36518 (Lnet/minecraft/class_5944;)V - ARG 0 shader + ARG 0 program METHOD method_36519 (Lnet/minecraft/class_5944;)V - ARG 0 shader + ARG 0 program METHOD method_36520 (Lnet/minecraft/class_5944;)V - ARG 0 shader + ARG 0 program METHOD method_36521 (Lnet/minecraft/class_5944;)V - ARG 0 shader + ARG 0 program METHOD method_36522 (Lnet/minecraft/class_5944;)V - ARG 0 shader + ARG 0 program METHOD method_36523 (Lnet/minecraft/class_5944;)V - ARG 0 shader + ARG 0 program METHOD method_36524 (Lnet/minecraft/class_5944;)V - ARG 0 shader + ARG 0 program METHOD method_36525 (Lnet/minecraft/class_5944;)V - ARG 0 shader + ARG 0 program METHOD method_36526 (Lnet/minecraft/class_5944;)V - ARG 0 shader + ARG 0 program METHOD method_36527 (Lnet/minecraft/class_5944;)V - ARG 0 shader + ARG 0 program METHOD method_36528 (Lnet/minecraft/class_5944;)V - ARG 0 shader + ARG 0 program METHOD method_36529 (Lnet/minecraft/class_5944;)V - ARG 0 shader + ARG 0 program METHOD method_36530 (Lnet/minecraft/class_5944;)V - ARG 0 shader + ARG 0 program METHOD method_36531 (Lnet/minecraft/class_5944;)V - ARG 0 shader + ARG 0 program METHOD method_36532 (Lnet/minecraft/class_5944;)V - ARG 0 shader + ARG 0 program METHOD method_36533 (Lnet/minecraft/class_5944;)V - ARG 0 shader + ARG 0 program METHOD method_36534 (Lnet/minecraft/class_5944;)V - ARG 0 shader + ARG 0 program METHOD method_36535 (Lnet/minecraft/class_5944;)V - ARG 0 shader + ARG 0 program METHOD method_36536 (Lnet/minecraft/class_5944;)V - ARG 0 shader + ARG 0 program METHOD method_36537 (Lnet/minecraft/class_5944;)V - ARG 0 shader + ARG 0 program METHOD method_36538 (Lnet/minecraft/class_5944;)V - ARG 0 shader + ARG 0 program METHOD method_36539 (Lnet/minecraft/class_5944;)V - ARG 0 shader + ARG 0 program METHOD method_36540 (Lnet/minecraft/class_5944;)V - ARG 0 shader + ARG 0 program METHOD method_36541 (Lnet/minecraft/class_5944;)V - ARG 0 shader + ARG 0 program METHOD method_37473 updateWorldIcon ()V METHOD method_37474 (Ljava/nio/file/Path;)V ARG 1 path METHOD method_42594 (Lnet/minecraft/class_5944;)V - ARG 0 shader - METHOD method_42595 getRenderTypeEntityTranslucentEmissiveShader ()Lnet/minecraft/class_5944; + ARG 0 program + METHOD method_42595 getRenderTypeEntityTranslucentEmissiveProgram ()Lnet/minecraft/class_5944; + METHOD method_45774 createProgramReloader ()Lnet/minecraft/class_3302; + METHOD method_49037 getRenderTypeTextBackgroundProgram ()Lnet/minecraft/class_5944; + METHOD method_49038 getRenderTypeTextBackgroundSeeThroughProgram ()Lnet/minecraft/class_5944; + METHOD method_49039 (Lnet/minecraft/class_5944;)V + ARG 0 program + METHOD method_49040 (Lnet/minecraft/class_5944;)V + ARG 0 program + METHOD method_51770 (Lnet/minecraft/class_5944;)V + ARG 0 program + METHOD method_51771 getRenderTypeGuiProgram ()Lnet/minecraft/class_5944; + METHOD method_51772 getRenderTypeGuiOverlayProgram ()Lnet/minecraft/class_5944; + METHOD method_51773 getRenderTypeGuiTextHighlightProgram ()Lnet/minecraft/class_5944; + METHOD method_51774 getRenderTypeGuiGhostRecipeOverlayProgram ()Lnet/minecraft/class_5944; + METHOD method_51775 (Lnet/minecraft/class_5944;)V + ARG 0 program + METHOD method_51776 (Lnet/minecraft/class_5944;)V + ARG 0 program + METHOD method_51777 (Lnet/minecraft/class_5944;)V + ARG 0 program + CLASS 1 + METHOD method_45775 (Lnet/minecraft/class_2960;)Z + ARG 0 id + METHOD method_45778 (Ljava/util/Map;Lnet/minecraft/class_2960;Lnet/minecraft/class_3298;)V + ARG 1 id + ARG 2 resource + CLASS class_7760 CachedResourceFactory diff --git a/mappings/net/minecraft/client/render/LightmapTextureManager.mapping b/mappings/net/minecraft/client/render/LightmapTextureManager.mapping index eab3fc272d..255e89791a 100644 --- a/mappings/net/minecraft/client/render/LightmapTextureManager.mapping +++ b/mappings/net/minecraft/client/render/LightmapTextureManager.mapping @@ -53,3 +53,6 @@ CLASS net/minecraft/class_765 net/minecraft/client/render/LightmapTextureManager ARG 3 delta METHOD method_42597 getDarknessFactor (F)F ARG 1 delta + METHOD method_46557 clamp (Lorg/joml/Vector3f;)V + COMMENT Clamps each component of {@code vec} between {@code 0.0f} and {@code 1.0f}. + ARG 0 vec diff --git a/mappings/net/minecraft/client/render/OutlineVertexConsumerProvider.mapping b/mappings/net/minecraft/client/render/OutlineVertexConsumerProvider.mapping index 05b6467c85..e0f82ddd5f 100644 --- a/mappings/net/minecraft/client/render/OutlineVertexConsumerProvider.mapping +++ b/mappings/net/minecraft/client/render/OutlineVertexConsumerProvider.mapping @@ -18,8 +18,8 @@ CLASS net/minecraft/class_4618 net/minecraft/client/render/OutlineVertexConsumer FIELD field_21064 x D FIELD field_21065 y D FIELD field_21066 z D - FIELD field_21067 u F - FIELD field_21068 v F + FIELD field_21067 textureU F + FIELD field_21068 textureV F METHOD (Lnet/minecraft/class_4588;IIII)V ARG 1 delegate ARG 2 red diff --git a/mappings/net/minecraft/client/render/OverlayVertexConsumer.mapping b/mappings/net/minecraft/client/render/OverlayVertexConsumer.mapping index af6a06bf02..94cdc72f60 100644 --- a/mappings/net/minecraft/client/render/OverlayVertexConsumer.mapping +++ b/mappings/net/minecraft/client/render/OverlayVertexConsumer.mapping @@ -1,5 +1,5 @@ CLASS net/minecraft/class_4583 net/minecraft/client/render/OverlayVertexConsumer - FIELD field_20866 vertexConsumer Lnet/minecraft/class_4588; + FIELD field_20866 delegate Lnet/minecraft/class_4588; FIELD field_20870 x F FIELD field_20871 y F FIELD field_20872 z F @@ -9,10 +9,12 @@ CLASS net/minecraft/class_4583 net/minecraft/client/render/OverlayVertexConsumer FIELD field_20880 normalX F FIELD field_20881 normalY F FIELD field_20882 normalZ F - FIELD field_21053 textureMatrix Lnet/minecraft/class_1159; - FIELD field_21054 normalMatrix Lnet/minecraft/class_4581; - METHOD (Lnet/minecraft/class_4588;Lnet/minecraft/class_1159;Lnet/minecraft/class_4581;)V - ARG 1 vertexConsumer + FIELD field_21053 inverseTextureMatrix Lorg/joml/Matrix4f; + FIELD field_21054 inverseNormalMatrix Lorg/joml/Matrix3f; + FIELD field_41091 textureScale F + METHOD (Lnet/minecraft/class_4588;Lorg/joml/Matrix4f;Lorg/joml/Matrix3f;F)V + ARG 1 delegate ARG 2 textureMatrix ARG 3 normalMatrix + ARG 4 textureScale METHOD method_22891 init ()V diff --git a/mappings/net/minecraft/client/render/RenderLayer.mapping b/mappings/net/minecraft/client/render/RenderLayer.mapping index 4c46051dfb..74280b9e0a 100644 --- a/mappings/net/minecraft/client/render/RenderLayer.mapping +++ b/mappings/net/minecraft/client/render/RenderLayer.mapping @@ -2,10 +2,12 @@ CLASS net/minecraft/class_1921 net/minecraft/client/render/RenderLayer COMMENT Defines settings that should be used when rendering something. COMMENT COMMENT

This includes {@linkplain VertexFormat vertex format}, {@linkplain - COMMENT VertexFormat.DrawMode draw mode}, {@linkplain Shader shader}, texture, + COMMENT VertexFormat.DrawMode draw mode}, {@linkplain + COMMENT net.minecraft.client.gl.ShaderProgram shader program}, texture, COMMENT some uniform variables values (such as {@code LineWidth} when using the - COMMENT {@link GameRenderer#getRenderTypeLinesShader rendertype_lines} shader), - COMMENT and some GL state values (such as whether to enable depth testing). + COMMENT {@link GameRenderer#getRenderTypeLinesProgram rendertype_lines} shader + COMMENT program), and some GL state values (such as whether to enable depth + COMMENT testing). COMMENT COMMENT

Before drawing something, a render layer setups these states. After COMMENT drawing something, a render layer resets those states to default. @@ -45,6 +47,7 @@ CLASS net/minecraft/class_1921 net/minecraft/client/render/RenderLayer FIELD field_34003 TEXT_INTENSITY_POLYGON_OFFSET Ljava/util/function/Function; FIELD field_38345 ENTITY_TRANSLUCENT_EMISSIVE Ljava/util/function/BiFunction; FIELD field_39002 BLOCK_LAYERS Lcom/google/common/collect/ImmutableList; + FIELD field_42521 DEBUG_LINE_STRIP Ljava/util/function/Function; METHOD (Ljava/lang/String;Lnet/minecraft/class_293;Lnet/minecraft/class_293$class_5596;IZZLjava/lang/Runnable;Ljava/lang/Runnable;)V ARG 1 name ARG 2 vertexFormat @@ -56,11 +59,9 @@ CLASS net/minecraft/class_1921 net/minecraft/client/render/RenderLayer ARG 8 endAction METHOD method_22720 getBlockLayers ()Ljava/util/List; METHOD method_22722 getExpectedBufferSize ()I - METHOD method_23012 draw (Lnet/minecraft/class_287;III)V + METHOD method_23012 draw (Lnet/minecraft/class_287;Lnet/minecraft/class_8251;)V ARG 1 buffer - ARG 2 cameraX - ARG 3 cameraY - ARG 4 cameraZ + ARG 2 sorter METHOD method_23018 getEnergySwirl (Lnet/minecraft/class_2960;FF)Lnet/minecraft/class_1921; ARG 0 texture ARG 1 x @@ -155,7 +156,7 @@ CLASS net/minecraft/class_1921 net/minecraft/client/render/RenderLayer METHOD method_29997 getTripwire ()Lnet/minecraft/class_1921; METHOD method_30676 getGlintTranslucent ()Lnet/minecraft/class_1921; METHOD method_34569 of (Lnet/minecraft/class_4668$class_5942;)Lnet/minecraft/class_1921$class_4688; - ARG 0 shader + ARG 0 program METHOD method_34571 getEndGateway ()Lnet/minecraft/class_1921; METHOD method_34572 getLineStrip ()Lnet/minecraft/class_1921; METHOD method_34822 (Lnet/minecraft/class_2960;)Lnet/minecraft/class_1921; @@ -223,6 +224,25 @@ CLASS net/minecraft/class_1921 net/minecraft/client/render/RenderLayer METHOD method_42600 getEntityTranslucentEmissive (Lnet/minecraft/class_2960;)Lnet/minecraft/class_1921; ARG 0 texture METHOD method_43332 areVerticesNotShared ()Z + METHOD method_49042 getDebugQuads ()Lnet/minecraft/class_1921; + METHOD method_49043 getDebugLineStrip (D)Lnet/minecraft/class_1921; + ARG 0 lineWidth + METHOD method_49044 (Ljava/lang/Double;)Lnet/minecraft/class_1921$class_4687; + ARG 0 lineWidth + METHOD method_49045 getTextBackground ()Lnet/minecraft/class_1921; + METHOD method_49046 getTextBackgroundSeeThrough ()Lnet/minecraft/class_1921; + METHOD method_49047 getDebugFilledBox ()Lnet/minecraft/class_1921; + METHOD method_51456 getDebugSectionQuads ()Lnet/minecraft/class_1921; + METHOD method_51784 getGui ()Lnet/minecraft/class_1921; + METHOD method_51785 getGuiOverlay ()Lnet/minecraft/class_1921; + METHOD method_51786 getGuiTextHighlight ()Lnet/minecraft/class_1921; + METHOD method_51787 getGuiGhostRecipeOverlay ()Lnet/minecraft/class_1921; + METHOD method_53490 createArmorCutoutNoCull (Ljava/lang/String;Lnet/minecraft/class_2960;Z)Lnet/minecraft/class_1921$class_4687; + ARG 0 name + ARG 1 texture + ARG 2 decal + METHOD method_53491 createArmorDecalCutoutNoCull (Lnet/minecraft/class_2960;)Lnet/minecraft/class_1921; + ARG 0 texture CLASS class_4687 MultiPhase FIELD field_21403 phases Lnet/minecraft/class_1921$class_4688; FIELD field_21697 affectedOutline Ljava/util/Optional; @@ -256,10 +276,11 @@ CLASS net/minecraft/class_1921 net/minecraft/client/render/RenderLayer FIELD field_21420 lineWidth Lnet/minecraft/class_4668$class_4677; FIELD field_21422 phases Lcom/google/common/collect/ImmutableList; FIELD field_21852 outlineMode Lnet/minecraft/class_1921$class_4750; - FIELD field_29461 shader Lnet/minecraft/class_4668$class_5942; - METHOD (Lnet/minecraft/class_4668$class_5939;Lnet/minecraft/class_4668$class_5942;Lnet/minecraft/class_4668$class_4685;Lnet/minecraft/class_4668$class_4672;Lnet/minecraft/class_4668$class_4671;Lnet/minecraft/class_4668$class_4676;Lnet/minecraft/class_4668$class_4679;Lnet/minecraft/class_4668$class_4675;Lnet/minecraft/class_4668$class_4678;Lnet/minecraft/class_4668$class_4684;Lnet/minecraft/class_4668$class_4686;Lnet/minecraft/class_4668$class_4677;Lnet/minecraft/class_1921$class_4750;)V + FIELD field_29461 program Lnet/minecraft/class_4668$class_5942; + FIELD field_44825 colorLogic Lnet/minecraft/class_4668$class_8559; + METHOD (Lnet/minecraft/class_4668$class_5939;Lnet/minecraft/class_4668$class_5942;Lnet/minecraft/class_4668$class_4685;Lnet/minecraft/class_4668$class_4672;Lnet/minecraft/class_4668$class_4671;Lnet/minecraft/class_4668$class_4676;Lnet/minecraft/class_4668$class_4679;Lnet/minecraft/class_4668$class_4675;Lnet/minecraft/class_4668$class_4678;Lnet/minecraft/class_4668$class_4684;Lnet/minecraft/class_4668$class_4686;Lnet/minecraft/class_4668$class_4677;Lnet/minecraft/class_4668$class_8559;Lnet/minecraft/class_1921$class_4750;)V ARG 1 texture - ARG 2 shader + ARG 2 program ARG 3 transparency ARG 4 depthTest ARG 5 cull @@ -270,7 +291,8 @@ CLASS net/minecraft/class_1921 net/minecraft/client/render/RenderLayer ARG 10 texturing ARG 11 writeMaskState ARG 12 lineWidth - ARG 13 outlineMode + ARG 13 colorLogic + ARG 14 outlineMode METHOD method_23598 builder ()Lnet/minecraft/class_1921$class_4688$class_4689; CLASS class_4689 Builder FIELD field_21424 transparency Lnet/minecraft/class_4668$class_4685; @@ -284,7 +306,8 @@ CLASS net/minecraft/class_1921 net/minecraft/client/render/RenderLayer FIELD field_21436 writeMaskState Lnet/minecraft/class_4668$class_4686; FIELD field_21437 lineWidth Lnet/minecraft/class_4668$class_4677; FIELD field_29462 texture Lnet/minecraft/class_4668$class_5939; - FIELD field_29463 shader Lnet/minecraft/class_4668$class_5942; + FIELD field_29463 program Lnet/minecraft/class_4668$class_5942; + FIELD field_44826 colorLogic Lnet/minecraft/class_4668$class_8559; METHOD method_23603 cull (Lnet/minecraft/class_4668$class_4671;)Lnet/minecraft/class_1921$class_4688$class_4689; ARG 1 cull METHOD method_23604 depthTest (Lnet/minecraft/class_4668$class_4672;)Lnet/minecraft/class_1921$class_4688$class_4689; @@ -311,8 +334,10 @@ CLASS net/minecraft/class_1921 net/minecraft/client/render/RenderLayer ARG 1 outlineMode METHOD method_34577 texture (Lnet/minecraft/class_4668$class_5939;)Lnet/minecraft/class_1921$class_4688$class_4689; ARG 1 texture - METHOD method_34578 shader (Lnet/minecraft/class_4668$class_5942;)Lnet/minecraft/class_1921$class_4688$class_4689; - ARG 1 shader + METHOD method_34578 program (Lnet/minecraft/class_4668$class_5942;)Lnet/minecraft/class_1921$class_4688$class_4689; + ARG 1 program + METHOD method_51788 colorLogic (Lnet/minecraft/class_4668$class_8559;)Lnet/minecraft/class_1921$class_4688$class_4689; + ARG 1 colorLogic CLASS class_4750 OutlineMode FIELD field_22243 name Ljava/lang/String; METHOD (Ljava/lang/String;ILjava/lang/String;)V diff --git a/mappings/net/minecraft/client/render/RenderPhase.mapping b/mappings/net/minecraft/client/render/RenderPhase.mapping index c663c590a5..42aa986796 100644 --- a/mappings/net/minecraft/client/render/RenderPhase.mapping +++ b/mappings/net/minecraft/client/render/RenderPhase.mapping @@ -36,60 +36,67 @@ CLASS net/minecraft/class_4668 net/minecraft/client/render/RenderPhase FIELD field_25281 PARTICLES_TARGET Lnet/minecraft/class_4668$class_4678; FIELD field_25282 WEATHER_TARGET Lnet/minecraft/class_4668$class_4678; FIELD field_25283 CLOUDS_TARGET Lnet/minecraft/class_4668$class_4678; - FIELD field_25643 ITEM_TARGET Lnet/minecraft/class_4668$class_4678; - FIELD field_29404 ENTITY_CUTOUT_NONULL_OFFSET_Z_SHADER Lnet/minecraft/class_4668$class_5942; - FIELD field_29405 ITEM_ENTITY_TRANSLUCENT_CULL_SHADER Lnet/minecraft/class_4668$class_5942; - FIELD field_29406 ENTITY_TRANSLUCENT_CULL_SHADER Lnet/minecraft/class_4668$class_5942; - FIELD field_29407 ENTITY_TRANSLUCENT_SHADER Lnet/minecraft/class_4668$class_5942; - FIELD field_29408 ENTITY_SMOOTH_CUTOUT_SHADER Lnet/minecraft/class_4668$class_5942; - FIELD field_29409 BEACON_BEAM_SHADER Lnet/minecraft/class_4668$class_5942; - FIELD field_29410 ENTITY_DECAL_SHADER Lnet/minecraft/class_4668$class_5942; - FIELD field_29411 ENTITY_NO_OUTLINE_SHADER Lnet/minecraft/class_4668$class_5942; - FIELD field_29412 ENTITY_SHADOW_SHADER Lnet/minecraft/class_4668$class_5942; - FIELD field_29413 ENTITY_ALPHA_SHADER Lnet/minecraft/class_4668$class_5942; - FIELD field_29414 EYES_SHADER Lnet/minecraft/class_4668$class_5942; - FIELD field_29415 ENERGY_SWIRL_SHADER Lnet/minecraft/class_4668$class_5942; - FIELD field_29416 LEASH_SHADER Lnet/minecraft/class_4668$class_5942; - FIELD field_29417 WATER_MASK_SHADER Lnet/minecraft/class_4668$class_5942; - FIELD field_29418 OUTLINE_SHADER Lnet/minecraft/class_4668$class_5942; - FIELD field_29419 ARMOR_GLINT_SHADER Lnet/minecraft/class_4668$class_5942; - FIELD field_29420 ARMOR_ENTITY_GLINT_SHADER Lnet/minecraft/class_4668$class_5942; - FIELD field_29421 TRANSLUCENT_GLINT_SHADER Lnet/minecraft/class_4668$class_5942; - FIELD field_29422 GLINT_SHADER Lnet/minecraft/class_4668$class_5942; - FIELD field_29423 DIRECT_GLINT_SHADER Lnet/minecraft/class_4668$class_5942; - FIELD field_29424 ENTITY_GLINT_SHADER Lnet/minecraft/class_4668$class_5942; - FIELD field_29425 DIRECT_ENTITY_GLINT_SHADER Lnet/minecraft/class_4668$class_5942; - FIELD field_29426 CRUMBLING_SHADER Lnet/minecraft/class_4668$class_5942; - FIELD field_29427 TEXT_SHADER Lnet/minecraft/class_4668$class_5942; - FIELD field_29428 TRANSPARENT_TEXT_SHADER Lnet/minecraft/class_4668$class_5942; - FIELD field_29429 LIGHTNING_SHADER Lnet/minecraft/class_4668$class_5942; - FIELD field_29430 TRIPWIRE_SHADER Lnet/minecraft/class_4668$class_5942; - FIELD field_29431 END_PORTAL_SHADER Lnet/minecraft/class_4668$class_5942; - FIELD field_29432 END_GATEWAY_SHADER Lnet/minecraft/class_4668$class_5942; - FIELD field_29433 LINES_SHADER Lnet/minecraft/class_4668$class_5942; - FIELD field_29434 NO_SHADER Lnet/minecraft/class_4668$class_5942; - FIELD field_29435 BLOCK_SHADER Lnet/minecraft/class_4668$class_5942; - FIELD field_29436 NEW_ENTITY_SHADER Lnet/minecraft/class_4668$class_5942; - FIELD field_29437 POSITION_COLOR_LIGHTMAP_SHADER Lnet/minecraft/class_4668$class_5942; - FIELD field_29438 POSITION_SHADER Lnet/minecraft/class_4668$class_5942; - FIELD field_29439 POSITION_COLOR_TEXTURE_SHADER Lnet/minecraft/class_4668$class_5942; - FIELD field_29440 POSITION_TEXTURE_SHADER Lnet/minecraft/class_4668$class_5942; - FIELD field_29441 POSITION_COLOR_TEXTURE_LIGHTMAP_SHADER Lnet/minecraft/class_4668$class_5942; - FIELD field_29442 COLOR_SHADER Lnet/minecraft/class_4668$class_5942; - FIELD field_29443 SOLID_SHADER Lnet/minecraft/class_4668$class_5942; - FIELD field_29444 CUTOUT_MIPPED_SHADER Lnet/minecraft/class_4668$class_5942; - FIELD field_29445 CUTOUT_SHADER Lnet/minecraft/class_4668$class_5942; - FIELD field_29446 TRANSLUCENT_SHADER Lnet/minecraft/class_4668$class_5942; - FIELD field_29447 TRANSLUCENT_MOVING_BLOCK_SHADER Lnet/minecraft/class_4668$class_5942; - FIELD field_29448 TRANSLUCENT_NO_CRUMBLING_SHADER Lnet/minecraft/class_4668$class_5942; - FIELD field_29449 ARMOR_CUTOUT_NO_CULL_SHADER Lnet/minecraft/class_4668$class_5942; - FIELD field_29450 ENTITY_SOLID_SHADER Lnet/minecraft/class_4668$class_5942; - FIELD field_29451 ENTITY_CUTOUT_SHADER Lnet/minecraft/class_4668$class_5942; - FIELD field_29452 ENTITY_CUTOUT_NONULL_SHADER Lnet/minecraft/class_4668$class_5942; + FIELD field_25643 ITEM_ENTITY_TARGET Lnet/minecraft/class_4668$class_4678; + FIELD field_29404 ENTITY_CUTOUT_NONULL_OFFSET_Z_PROGRAM Lnet/minecraft/class_4668$class_5942; + FIELD field_29405 ITEM_ENTITY_TRANSLUCENT_CULL_PROGRAM Lnet/minecraft/class_4668$class_5942; + FIELD field_29406 ENTITY_TRANSLUCENT_CULL_PROGRAM Lnet/minecraft/class_4668$class_5942; + FIELD field_29407 ENTITY_TRANSLUCENT_PROGRAM Lnet/minecraft/class_4668$class_5942; + FIELD field_29408 ENTITY_SMOOTH_CUTOUT_PROGRAM Lnet/minecraft/class_4668$class_5942; + FIELD field_29409 BEACON_BEAM_PROGRAM Lnet/minecraft/class_4668$class_5942; + FIELD field_29410 ENTITY_DECAL_PROGRAM Lnet/minecraft/class_4668$class_5942; + FIELD field_29411 ENTITY_NO_OUTLINE_PROGRAM Lnet/minecraft/class_4668$class_5942; + FIELD field_29412 ENTITY_SHADOW_PROGRAM Lnet/minecraft/class_4668$class_5942; + FIELD field_29413 ENTITY_ALPHA_PROGRAM Lnet/minecraft/class_4668$class_5942; + FIELD field_29414 EYES_PROGRAM Lnet/minecraft/class_4668$class_5942; + FIELD field_29415 ENERGY_SWIRL_PROGRAM Lnet/minecraft/class_4668$class_5942; + FIELD field_29416 LEASH_PROGRAM Lnet/minecraft/class_4668$class_5942; + FIELD field_29417 WATER_MASK_PROGRAM Lnet/minecraft/class_4668$class_5942; + FIELD field_29418 OUTLINE_PROGRAM Lnet/minecraft/class_4668$class_5942; + FIELD field_29419 ARMOR_GLINT_PROGRAM Lnet/minecraft/class_4668$class_5942; + FIELD field_29420 ARMOR_ENTITY_GLINT_PROGRAM Lnet/minecraft/class_4668$class_5942; + FIELD field_29421 TRANSLUCENT_GLINT_PROGRAM Lnet/minecraft/class_4668$class_5942; + FIELD field_29422 GLINT_PROGRAM Lnet/minecraft/class_4668$class_5942; + FIELD field_29423 DIRECT_GLINT_PROGRAM Lnet/minecraft/class_4668$class_5942; + FIELD field_29424 ENTITY_GLINT_PROGRAM Lnet/minecraft/class_4668$class_5942; + FIELD field_29425 DIRECT_ENTITY_GLINT_PROGRAM Lnet/minecraft/class_4668$class_5942; + FIELD field_29426 CRUMBLING_PROGRAM Lnet/minecraft/class_4668$class_5942; + FIELD field_29427 TEXT_PROGRAM Lnet/minecraft/class_4668$class_5942; + FIELD field_29428 TRANSPARENT_TEXT_PROGRAM Lnet/minecraft/class_4668$class_5942; + FIELD field_29429 LIGHTNING_PROGRAM Lnet/minecraft/class_4668$class_5942; + FIELD field_29430 TRIPWIRE_PROGRAM Lnet/minecraft/class_4668$class_5942; + FIELD field_29431 END_PORTAL_PROGRAM Lnet/minecraft/class_4668$class_5942; + FIELD field_29432 END_GATEWAY_PROGRAM Lnet/minecraft/class_4668$class_5942; + FIELD field_29433 LINES_PROGRAM Lnet/minecraft/class_4668$class_5942; + FIELD field_29434 NO_PROGRAM Lnet/minecraft/class_4668$class_5942; + FIELD field_29437 POSITION_COLOR_LIGHTMAP_PROGRAM Lnet/minecraft/class_4668$class_5942; + FIELD field_29438 POSITION_PROGRAM Lnet/minecraft/class_4668$class_5942; + FIELD field_29439 POSITION_COLOR_TEXTURE_PROGRAM Lnet/minecraft/class_4668$class_5942; + FIELD field_29440 POSITION_TEXTURE_PROGRAM Lnet/minecraft/class_4668$class_5942; + FIELD field_29441 POSITION_COLOR_TEXTURE_LIGHTMAP_PROGRAM Lnet/minecraft/class_4668$class_5942; + FIELD field_29442 COLOR_PROGRAM Lnet/minecraft/class_4668$class_5942; + FIELD field_29443 SOLID_PROGRAM Lnet/minecraft/class_4668$class_5942; + FIELD field_29444 CUTOUT_MIPPED_PROGRAM Lnet/minecraft/class_4668$class_5942; + FIELD field_29445 CUTOUT_PROGRAM Lnet/minecraft/class_4668$class_5942; + FIELD field_29446 TRANSLUCENT_PROGRAM Lnet/minecraft/class_4668$class_5942; + FIELD field_29447 TRANSLUCENT_MOVING_BLOCK_PROGRAM Lnet/minecraft/class_4668$class_5942; + FIELD field_29448 TRANSLUCENT_NO_CRUMBLING_PROGRAM Lnet/minecraft/class_4668$class_5942; + FIELD field_29449 ARMOR_CUTOUT_NO_CULL_PROGRAM Lnet/minecraft/class_4668$class_5942; + FIELD field_29450 ENTITY_SOLID_PROGRAM Lnet/minecraft/class_4668$class_5942; + FIELD field_29451 ENTITY_CUTOUT_PROGRAM Lnet/minecraft/class_4668$class_5942; + FIELD field_29452 ENTITY_CUTOUT_NONULL_PROGRAM Lnet/minecraft/class_4668$class_5942; FIELD field_32771 VIEW_OFFSET_Z_LAYERING_SCALE F - FIELD field_33628 TEXT_INTENSITY_SHADER Lnet/minecraft/class_4668$class_5942; - FIELD field_33629 TRANSPARENT_TEXT_INTENSITY_SHADER Lnet/minecraft/class_4668$class_5942; - FIELD field_38344 ENTITY_TRANSLUCENT_EMISSIVE_SHADER Lnet/minecraft/class_4668$class_5942; + FIELD field_33628 TEXT_INTENSITY_PROGRAM Lnet/minecraft/class_4668$class_5942; + FIELD field_33629 TRANSPARENT_TEXT_INTENSITY_PROGRAM Lnet/minecraft/class_4668$class_5942; + FIELD field_38344 ENTITY_TRANSLUCENT_EMISSIVE_PROGRAM Lnet/minecraft/class_4668$class_5942; + FIELD field_42517 TEXT_BACKGROUND_PROGRAM Lnet/minecraft/class_4668$class_5942; + FIELD field_42518 TRANSPARENT_TEXT_BACKGROUND_PROGRAM Lnet/minecraft/class_4668$class_5942; + FIELD field_44814 BIGGER_DEPTH_TEST Lnet/minecraft/class_4668$class_4672; + FIELD field_44815 NO_COLOR_LOGIC Lnet/minecraft/class_4668$class_8559; + FIELD field_44816 OR_REVERSE Lnet/minecraft/class_4668$class_8559; + FIELD field_44817 GUI_PROGRAM Lnet/minecraft/class_4668$class_5942; + FIELD field_44818 GUI_OVERLAY_PROGRAM Lnet/minecraft/class_4668$class_5942; + FIELD field_44819 GUI_TEXT_HIGHLIGHT_PROGRAM Lnet/minecraft/class_4668$class_5942; + FIELD field_44820 GUI_GHOST_RECIPE_OVERLAY_PROGRAM Lnet/minecraft/class_4668$class_5942; METHOD (Ljava/lang/String;Ljava/lang/Runnable;Ljava/lang/Runnable;)V ARG 1 name ARG 2 beginAction @@ -164,7 +171,8 @@ CLASS net/minecraft/class_4668 net/minecraft/client/render/RenderPhase ARG 1 id ARG 2 blur ARG 3 mipmap - CLASS class_5942 Shader + CLASS class_5942 ShaderProgram FIELD field_29455 supplier Ljava/util/Optional; METHOD (Ljava/util/function/Supplier;)V ARG 1 supplier + CLASS class_8559 ColorLogic diff --git a/mappings/net/minecraft/client/render/SpriteTexturedVertexConsumer.mapping b/mappings/net/minecraft/client/render/SpriteTexturedVertexConsumer.mapping index 0a4f999c86..368b6ac4d6 100644 --- a/mappings/net/minecraft/client/render/SpriteTexturedVertexConsumer.mapping +++ b/mappings/net/minecraft/client/render/SpriteTexturedVertexConsumer.mapping @@ -1,6 +1,6 @@ CLASS net/minecraft/class_4723 net/minecraft/client/render/SpriteTexturedVertexConsumer - FIELD field_21730 parent Lnet/minecraft/class_4588; + FIELD field_21730 delegate Lnet/minecraft/class_4588; FIELD field_21731 sprite Lnet/minecraft/class_1058; METHOD (Lnet/minecraft/class_4588;Lnet/minecraft/class_1058;)V - ARG 1 parent + ARG 1 delegate ARG 2 sprite diff --git a/mappings/net/minecraft/client/render/Tessellator.mapping b/mappings/net/minecraft/client/render/Tessellator.mapping index 27dae948dc..610cced007 100644 --- a/mappings/net/minecraft/client/render/Tessellator.mapping +++ b/mappings/net/minecraft/client/render/Tessellator.mapping @@ -11,6 +11,6 @@ CLASS net/minecraft/class_289 net/minecraft/client/render/Tessellator METHOD method_1348 getInstance ()Lnet/minecraft/class_289; METHOD method_1349 getBuffer ()Lnet/minecraft/class_287; METHOD method_1350 draw ()V - COMMENT Draws the contents of the buffer builder using the shader specified with - COMMENT {@link com.mojang.blaze3d.systems.RenderSystem#setShader + COMMENT Draws the contents of the buffer builder using the shader program + COMMENT specified with {@link com.mojang.blaze3d.systems.RenderSystem#setShader COMMENT RenderSystem#setShader}. diff --git a/mappings/net/minecraft/client/render/TexturedRenderLayers.mapping b/mappings/net/minecraft/client/render/TexturedRenderLayers.mapping index 80516b1d0b..e508a53b58 100644 --- a/mappings/net/minecraft/client/render/TexturedRenderLayers.mapping +++ b/mappings/net/minecraft/client/render/TexturedRenderLayers.mapping @@ -10,7 +10,7 @@ CLASS net/minecraft/class_4722 net/minecraft/client/render/TexturedRenderLayers FIELD field_21709 CHEST_ATLAS_TEXTURE Lnet/minecraft/class_2960; FIELD field_21710 SHULKER_TEXTURE_ID Lnet/minecraft/class_4730; FIELD field_21711 COLORED_SHULKER_BOXES_TEXTURES Ljava/util/List; - FIELD field_21712 WOOD_TYPE_TEXTURES Ljava/util/Map; + FIELD field_21712 SIGN_TYPE_TEXTURES Ljava/util/Map; FIELD field_21713 BED_TEXTURES [Lnet/minecraft/class_4730; FIELD field_21724 SHULKER_BOXES_RENDER_LAYER Lnet/minecraft/class_1921; FIELD field_21725 BEDS_RENDER_LAYER Lnet/minecraft/class_1921; @@ -21,23 +21,33 @@ CLASS net/minecraft/class_4722 net/minecraft/client/render/TexturedRenderLayers FIELD field_25286 ITEM_ENTITY_TRANSLUCENT_CULL Lnet/minecraft/class_1921; FIELD field_28252 BANNER_PATTERN_TEXTURES Ljava/util/Map; FIELD field_28253 SHIELD_PATTERN_TEXTURES Ljava/util/Map; + FIELD field_40515 HANGING_SIGN_TYPE_TEXTURES Ljava/util/Map; + FIELD field_42070 ARMOR_TRIMS_RENDER_LAYER Lnet/minecraft/class_1921; + FIELD field_42071 ARMOR_TRIMS_ATLAS_TEXTURE Lnet/minecraft/class_2960; + FIELD field_42910 DECORATED_POT_ATLAS_TEXTURE Lnet/minecraft/class_2960; + FIELD field_42911 DECORATED_POT_PATTERN_TEXTURES Ljava/util/Map; + FIELD field_46070 ARMOR_TRIMS_DECAL_RENDER_LAYER Lnet/minecraft/class_1921; METHOD method_24059 getBannerPatterns ()Lnet/minecraft/class_1921; - METHOD method_24062 getChestTexture (Lnet/minecraft/class_2586;Lnet/minecraft/class_2745;Z)Lnet/minecraft/class_4730; + METHOD method_24061 (Lnet/minecraft/class_1767;)Lnet/minecraft/class_4730; + ARG 0 color + METHOD method_24062 getChestTextureId (Lnet/minecraft/class_2586;Lnet/minecraft/class_2745;Z)Lnet/minecraft/class_4730; ARG 0 blockEntity ARG 1 type ARG 2 christmas - METHOD method_24063 getChestTexture (Lnet/minecraft/class_2745;Lnet/minecraft/class_4730;Lnet/minecraft/class_4730;Lnet/minecraft/class_4730;)Lnet/minecraft/class_4730; + METHOD method_24063 getChestTextureId (Lnet/minecraft/class_2745;Lnet/minecraft/class_4730;Lnet/minecraft/class_4730;Lnet/minecraft/class_4730;)Lnet/minecraft/class_4730; ARG 0 type ARG 1 single ARG 2 left ARG 3 right 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; + METHOD method_24065 createChestTextureId (Ljava/lang/String;)Lnet/minecraft/class_4730; ARG 0 variant METHOD method_24066 addDefaultTextures (Ljava/util/function/Consumer;)V ARG 0 adder METHOD method_24067 getShieldPatterns ()Lnet/minecraft/class_1921; + METHOD method_24068 (Ljava/lang/String;)Lnet/minecraft/class_4730; + ARG 0 colorName METHOD method_24069 getBeds ()Lnet/minecraft/class_1921; METHOD method_24070 getShulkerBoxes ()Lnet/minecraft/class_1921; METHOD method_24071 getSign ()Lnet/minecraft/class_1921; @@ -56,3 +66,14 @@ CLASS net/minecraft/class_4722 net/minecraft/client/render/TexturedRenderLayers ARG 0 bannerPattern METHOD method_33085 createShieldPatternTextureId (Lnet/minecraft/class_5321;)Lnet/minecraft/class_4730; ARG 0 bannerPattern + METHOD method_45781 getHangingSignTextureId (Lnet/minecraft/class_4719;)Lnet/minecraft/class_4730; + ARG 0 signType + METHOD method_45782 createHangingSignTextureId (Lnet/minecraft/class_4719;)Lnet/minecraft/class_4730; + ARG 0 type + METHOD method_45783 getHangingSign ()Lnet/minecraft/class_1921; + METHOD method_48480 getArmorTrims (Z)Lnet/minecraft/class_1921; + ARG 0 decal + METHOD method_49341 getDecoratedPotPatternTextureId (Lnet/minecraft/class_5321;)Lnet/minecraft/class_4730; + ARG 0 potPatternKey + METHOD method_49342 createDecoratedPotPatternTextureId (Lnet/minecraft/class_5321;)Lnet/minecraft/class_4730; + ARG 0 potPatternKey diff --git a/mappings/net/minecraft/client/render/VertexConsumer.mapping b/mappings/net/minecraft/client/render/VertexConsumer.mapping index 1ee674887c..5102d0dbf9 100644 --- a/mappings/net/minecraft/client/render/VertexConsumer.mapping +++ b/mappings/net/minecraft/client/render/VertexConsumer.mapping @@ -98,7 +98,7 @@ CLASS net/minecraft/class_4588 net/minecraft/client/render/VertexConsumer COMMENT @return this consumer, for chaining ARG 1 u ARG 2 v - METHOD method_22918 vertex (Lnet/minecraft/class_1159;FFF)Lnet/minecraft/class_4588; + METHOD method_22918 vertex (Lorg/joml/Matrix4f;FFF)Lnet/minecraft/class_4588; COMMENT Specifies the {@linkplain VertexFormats#POSITION_ELEMENT COMMENT position element} of the current vertex. COMMENT @@ -160,7 +160,7 @@ CLASS net/minecraft/class_4588 net/minecraft/client/render/VertexConsumer COMMENT COMMENT @return this consumer, for chaining ARG 1 uv - METHOD method_23763 normal (Lnet/minecraft/class_4581;FFF)Lnet/minecraft/class_4588; + METHOD method_23763 normal (Lorg/joml/Matrix3f;FFF)Lnet/minecraft/class_4588; COMMENT Specifies the {@linkplain VertexFormats#NORMAL_ELEMENT COMMENT normal element} of the current vertex. COMMENT diff --git a/mappings/net/minecraft/client/render/VertexConsumers.mapping b/mappings/net/minecraft/client/render/VertexConsumers.mapping index e27ae717cc..86e99139b4 100644 --- a/mappings/net/minecraft/client/render/VertexConsumers.mapping +++ b/mappings/net/minecraft/client/render/VertexConsumers.mapping @@ -24,20 +24,20 @@ CLASS net/minecraft/class_4720 net/minecraft/client/render/VertexConsumers METHOD ([Lnet/minecraft/class_4588;)V ARG 1 delegates METHOD method_35671 (DDDLnet/minecraft/class_4588;)V - ARG 6 i + ARG 6 vertexConsumer METHOD method_35672 (FFFFFFFFFIIFFFLnet/minecraft/class_4588;)V - ARG 14 i + ARG 14 vertexConsumer METHOD method_35673 (FFFLnet/minecraft/class_4588;)V - ARG 3 i + ARG 3 vertexConsumer METHOD method_35674 (FFLnet/minecraft/class_4588;)V - ARG 2 i + ARG 2 vertexConsumer METHOD method_35675 (IIIILnet/minecraft/class_4588;)V - ARG 4 i + ARG 4 vertexConsumer METHOD method_35676 (IILnet/minecraft/class_4588;)V - ARG 2 i + ARG 2 vertexConsumer METHOD method_35677 delegate (Ljava/util/function/Consumer;)V ARG 1 action METHOD method_35678 (IIIILnet/minecraft/class_4588;)V - ARG 4 i + ARG 4 vertexConsumer METHOD method_35679 (IILnet/minecraft/class_4588;)V - ARG 2 i + ARG 2 vertexConsumer diff --git a/mappings/net/minecraft/client/render/WorldRenderer.mapping b/mappings/net/minecraft/client/render/WorldRenderer.mapping index ddbb58e3ca..3f1a577e4a 100644 --- a/mappings/net/minecraft/client/render/WorldRenderer.mapping +++ b/mappings/net/minecraft/client/render/WorldRenderer.mapping @@ -1,5 +1,12 @@ CLASS net/minecraft/class_761 net/minecraft/client/render/WorldRenderer FIELD field_20793 rainSoundCounter I + FIELD field_20794 NORMAL_LINE_DX [F + COMMENT Given {@code -16 <= z < 16} and {@code -16 <= x < 16}, let {@code i = 32 * (z + 16) + (x + 16)}. + COMMENT Then {@code NORMAL_LINE_DX[i]} and {@code NORMAL_LINE_DZ[i]} describe the + COMMENT unit vector perpendicular to {@code (x, z)}. + COMMENT + COMMENT These lookup tables are used for rendering rain and snow. + FIELD field_20795 NORMAL_LINE_DZ [F FIELD field_20797 RAIN Lnet/minecraft/class_2960; FIELD field_20798 SNOW Lnet/minecraft/class_2960; FIELD field_20950 blockBreakingProgressions Lit/unimi/dsi/fastutil/longs/Long2ObjectMap; @@ -10,27 +17,19 @@ CLASS net/minecraft/class_761 net/minecraft/client/render/WorldRenderer FIELD field_25276 particlesFramebuffer Lnet/minecraft/class_276; FIELD field_25277 weatherFramebuffer Lnet/minecraft/class_276; FIELD field_25278 cloudsFramebuffer Lnet/minecraft/class_276; - FIELD field_25279 transparencyShader Lnet/minecraft/class_279; + FIELD field_25279 transparencyPostProcessor Lnet/minecraft/class_279; FIELD field_27740 frustum Lnet/minecraft/class_4604; FIELD field_27741 blockEntityRenderDispatcher Lnet/minecraft/class_824; - FIELD field_34807 chunkInfos Lit/unimi/dsi/fastutil/objects/ObjectArrayList; - FIELD field_34808 fullUpdateFuture Ljava/util/concurrent/Future; - FIELD field_34809 updateFinished Ljava/util/concurrent/atomic/AtomicBoolean; - FIELD field_34810 shouldUpdate Z - FIELD field_34811 nextUpdateTime Ljava/util/concurrent/atomic/AtomicLong; - FIELD field_34816 builtChunks Ljava/util/concurrent/BlockingQueue; - FIELD field_34817 renderableChunks Ljava/util/concurrent/atomic/AtomicReference; FIELD field_4055 noCullingBlockEntities Ljava/util/Set; FIELD field_4056 capturedFrustum Lnet/minecraft/class_4604; FIELD field_4058 blockBreakingInfos Lit/unimi/dsi/fastutil/ints/Int2ObjectMap; - FIELD field_4059 entityOutlineShader Lnet/minecraft/class_279; + FIELD field_4059 entityOutlinePostProcessor Lnet/minecraft/class_279; FIELD field_4060 LOGGER Lorg/slf4j/Logger; FIELD field_4061 END_SKY Lnet/minecraft/class_2960; FIELD field_4062 viewDistance I FIELD field_4064 lastCameraYaw D - FIELD field_4065 capturedFrustumOrientation [Lnet/minecraft/class_1162; + FIELD field_4065 capturedFrustumOrientation [Lorg/joml/Vector4f; FIELD field_4069 lastCameraX D - FIELD field_4070 lastCameraChunkUpdateZ D FIELD field_4071 FORCEFIELD Lnet/minecraft/class_2960; FIELD field_4072 lastCloudsColor Lnet/minecraft/class_243; FIELD field_4073 ticks I @@ -44,7 +43,7 @@ CLASS net/minecraft/class_761 net/minecraft/client/render/WorldRenderer FIELD field_4088 client Lnet/minecraft/class_310; FIELD field_4089 regularEntityCount I FIELD field_4090 shouldCaptureFrustum Z - FIELD field_4091 capturedFrustumPosition Lnet/minecraft/class_1161; + FIELD field_4091 capturedFrustumPosition Lorg/joml/Vector3d; FIELD field_4094 cloudsBuffer Lnet/minecraft/class_291; FIELD field_4095 DIRECTIONS [Lnet/minecraft/class_2350; FIELD field_4096 lastCameraZ D @@ -53,9 +52,7 @@ CLASS net/minecraft/class_761 net/minecraft/client/render/WorldRenderer FIELD field_4101 entityOutlinesFramebuffer Lnet/minecraft/class_276; FIELD field_4102 darkSkyBuffer Lnet/minecraft/class_291; FIELD field_4103 lastTranslucentSortY D - FIELD field_4104 lastCameraChunkUpdateX D FIELD field_4105 cameraChunkY I - FIELD field_4106 chunkBuilder Lnet/minecraft/class_846; FIELD field_4107 cloudsDirty Z FIELD field_4108 CLOUDS Lnet/minecraft/class_2960; FIELD field_4109 entityRenderDispatcher Lnet/minecraft/class_898; @@ -67,7 +64,6 @@ CLASS net/minecraft/class_761 net/minecraft/client/render/WorldRenderer FIELD field_4116 lastCloudsBlockZ I FIELD field_4118 lastTranslucentSortZ D FIELD field_4119 playingSongs Ljava/util/Map; - FIELD field_4120 lastCameraChunkUpdateY D FIELD field_4121 cameraChunkZ I METHOD (Lnet/minecraft/class_310;Lnet/minecraft/class_898;Lnet/minecraft/class_824;Lnet/minecraft/class_4599;)V ARG 1 client @@ -92,7 +88,7 @@ CLASS net/minecraft/class_761 net/minecraft/client/render/WorldRenderer ARG 1 pos ARG 2 old ARG 3 updated - METHOD method_22710 render (Lnet/minecraft/class_4587;FJZLnet/minecraft/class_4184;Lnet/minecraft/class_757;Lnet/minecraft/class_765;Lnet/minecraft/class_1159;)V + METHOD method_22710 render (Lnet/minecraft/class_4587;FJZLnet/minecraft/class_4184;Lnet/minecraft/class_757;Lnet/minecraft/class_765;Lorg/joml/Matrix4f;)V ARG 1 matrices ARG 2 tickDelta ARG 3 limitTime @@ -100,7 +96,7 @@ CLASS net/minecraft/class_761 net/minecraft/client/render/WorldRenderer ARG 6 camera ARG 7 gameRenderer ARG 8 lightmapTextureManager - ARG 9 positionMatrix + ARG 9 projectionMatrix 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 ARG 2 vertexConsumer @@ -175,7 +171,7 @@ CLASS net/minecraft/class_761 net/minecraft/client/render/WorldRenderer ARG 4 green ARG 5 blue ARG 6 alpha - METHOD method_22983 drawShapeOutline (Lnet/minecraft/class_4587;Lnet/minecraft/class_4588;Lnet/minecraft/class_265;DDDFFFF)V + METHOD method_22983 drawShapeOutline (Lnet/minecraft/class_4587;Lnet/minecraft/class_4588;Lnet/minecraft/class_265;DDDFFFFZ)V ARG 0 matrices ARG 1 vertexConsumer ARG 2 shape @@ -186,12 +182,27 @@ CLASS net/minecraft/class_761 net/minecraft/client/render/WorldRenderer ARG 10 green ARG 11 blue ARG 12 alpha + ARG 13 colorize + METHOD method_22984 renderCapturedFrustumVertex (Lnet/minecraft/class_4588;Lorg/joml/Matrix4f;I)V + ARG 1 vertexConsumer + ARG 3 planeNum + METHOD method_22985 renderCapturedFrustumFace (Lnet/minecraft/class_4588;Lorg/joml/Matrix4f;IIIIIII)V + ARG 1 vertexConsumer + ARG 3 plane0 + ARG 4 plane1 + ARG 5 plane2 + ARG 6 plane3 + ARG 7 r + ARG 8 g + ARG 9 b METHOD method_22986 (Lnet/minecraft/class_4597$class_4598;Lnet/minecraft/class_4588;Lnet/minecraft/class_1921;)Lnet/minecraft/class_4588; ARG 2 renderLayer METHOD method_22987 removeBlockBreakingInfo (Lnet/minecraft/class_3191;)V ARG 1 info - METHOD method_22989 renderChunkDebugInfo (Lnet/minecraft/class_4184;)V - ARG 1 camera + METHOD method_22989 renderChunkDebugInfo (Lnet/minecraft/class_4587;Lnet/minecraft/class_4597;Lnet/minecraft/class_4184;)V + ARG 1 matrices + ARG 2 vertexConsumers + ARG 3 camera METHOD method_22990 getEntityOutlinesFramebuffer ()Lnet/minecraft/class_276; METHOD method_23793 getLightmapCoordinates (Lnet/minecraft/class_1920;Lnet/minecraft/class_2680;Lnet/minecraft/class_2338;)I ARG 0 world @@ -205,9 +216,9 @@ CLASS net/minecraft/class_761 net/minecraft/client/render/WorldRenderer METHOD method_29362 getParticlesFramebuffer ()Lnet/minecraft/class_276; METHOD method_29363 getWeatherFramebuffer ()Lnet/minecraft/class_276; METHOD method_29364 getCloudsFramebuffer ()Lnet/minecraft/class_276; - METHOD method_29365 loadTransparencyShader ()V - METHOD method_29701 resetTransparencyShader ()V - METHOD method_32133 setupFrustum (Lnet/minecraft/class_4587;Lnet/minecraft/class_243;Lnet/minecraft/class_1159;)V + METHOD method_29365 loadTransparencyPostProcessor ()V + METHOD method_29701 resetTransparencyPostProcessor ()V + METHOD method_32133 setupFrustum (Lnet/minecraft/class_4587;Lnet/minecraft/class_243;Lorg/joml/Matrix4f;)V ARG 1 matrices ARG 2 pos ARG 3 projectionMatrix @@ -217,10 +228,6 @@ CLASS net/minecraft/class_761 net/minecraft/client/render/WorldRenderer ARG 4 y ARG 6 z ARG 8 color - METHOD method_3241 getAdjacentChunk (Lnet/minecraft/class_2338;Lnet/minecraft/class_846$class_851;Lnet/minecraft/class_2350;)Lnet/minecraft/class_846$class_851; - ARG 1 pos - ARG 2 chunk - ARG 3 direction METHOD method_3242 onResized (II)V ARG 1 width ARG 2 height @@ -238,7 +245,7 @@ CLASS net/minecraft/class_761 net/minecraft/client/render/WorldRenderer ARG 3 playing METHOD method_3250 renderEndSky (Lnet/minecraft/class_4587;)V ARG 1 matrices - METHOD method_3251 renderLayer (Lnet/minecraft/class_1921;Lnet/minecraft/class_4587;DDDLnet/minecraft/class_1159;)V + METHOD method_3251 renderLayer (Lnet/minecraft/class_1921;Lnet/minecraft/class_4587;DDDLorg/joml/Matrix4f;)V ARG 1 renderLayer ARG 2 matrices ARG 3 cameraX @@ -249,26 +256,33 @@ CLASS net/minecraft/class_761 net/minecraft/client/render/WorldRenderer METHOD method_3254 drawEntityOutlinesFramebuffer ()V METHOD method_3255 renderStars (Lnet/minecraft/class_287;)Lnet/minecraft/class_287$class_7433; ARG 1 buffer - METHOD method_3257 renderSky (Lnet/minecraft/class_4587;Lnet/minecraft/class_1159;FLnet/minecraft/class_4184;ZLjava/lang/Runnable;)V + METHOD method_3257 renderSky (Lnet/minecraft/class_4587;Lorg/joml/Matrix4f;FLnet/minecraft/class_4184;ZLjava/lang/Runnable;)V ARG 1 matrices ARG 2 projectionMatrix ARG 3 tickDelta - METHOD method_3258 drawBox (Lnet/minecraft/class_287;DDDDDDFFFF)V - ARG 0 buffer - ARG 1 x1 - ARG 3 y1 - ARG 5 z1 - ARG 7 x2 - ARG 9 y2 - ARG 11 z2 - ARG 13 red - ARG 14 green - ARG 15 blue - ARG 16 alpha - METHOD method_3259 renderClouds (Lnet/minecraft/class_4587;Lnet/minecraft/class_1159;FDDD)V + ARG 4 camera + ARG 5 thickFog + ARG 6 fogCallback + METHOD method_3258 renderFilledBox (Lnet/minecraft/class_4587;Lnet/minecraft/class_4588;DDDDDDFFFF)V + ARG 0 matrices + ARG 1 vertexConsumer + ARG 2 minX + ARG 4 minY + ARG 6 minZ + ARG 8 maxX + ARG 10 maxY + ARG 12 maxZ + ARG 14 red + ARG 15 green + ARG 16 blue + ARG 17 alpha + METHOD method_3259 renderClouds (Lnet/minecraft/class_4587;Lorg/joml/Matrix4f;FDDD)V ARG 1 matrices ARG 2 projectionMatrix ARG 3 tickDelta + ARG 4 cameraX + ARG 6 cameraY + ARG 8 cameraZ METHOD method_3265 renderDarkSky ()V METHOD method_3267 cleanUp ()V METHOD method_3268 getRandomParticleSpawnChance (Z)Lnet/minecraft/class_4066; @@ -282,8 +296,9 @@ CLASS net/minecraft/class_761 net/minecraft/client/render/WorldRenderer ARG 2 frustum ARG 3 hasForcedFrustum ARG 4 spectator - METHOD method_3275 captureFrustum (Lnet/minecraft/class_1159;Lnet/minecraft/class_1159;DDDLnet/minecraft/class_4604;)V + METHOD method_3275 captureFrustum (Lorg/joml/Matrix4f;Lorg/joml/Matrix4f;DDDLnet/minecraft/class_4604;)V ARG 1 positionMatrix + ARG 2 projectionMatrix ARG 3 x ARG 5 y ARG 7 z @@ -344,15 +359,9 @@ CLASS net/minecraft/class_761 net/minecraft/client/render/WorldRenderer ARG 2 y ARG 3 z ARG 4 important - METHOD method_3296 loadEntityOutlineShader ()V + METHOD method_3296 loadEntityOutlinePostProcessor ()V METHOD method_34550 renderSky (Lnet/minecraft/class_287;F)Lnet/minecraft/class_287$class_7433; ARG 0 builder - METHOD method_34808 collectRenderableChunks (Ljava/util/LinkedHashSet;Lnet/minecraft/class_761$class_5972;Lnet/minecraft/class_243;Ljava/util/Queue;Z)V - ARG 1 chunks - ARG 2 chunkInfoList - ARG 3 cameraPos - ARG 4 queue - ARG 5 chunkCullingEnabled METHOD method_34810 getChunkBuilder ()Lnet/minecraft/class_846; METHOD method_34811 getChunkCount ()D METHOD method_34812 getViewDistance ()D @@ -369,25 +378,37 @@ CLASS net/minecraft/class_761 net/minecraft/client/render/WorldRenderer ARG 14 green ARG 15 blue ARG 16 alpha - METHOD method_35774 reloadTransparencyShader ()V + METHOD method_35774 reloadTransparencyPostProcessor ()V METHOD method_35775 captureFrustum ()V METHOD method_35776 killFrustum ()V - METHOD method_38549 enqueueChunksInViewDistance (Lnet/minecraft/class_4184;Ljava/util/Queue;)V - ARG 1 camera - ARG 2 queue METHOD method_38550 addBuiltChunk (Lnet/minecraft/class_846$class_851;)V ARG 1 chunk METHOD method_38551 applyFrustum (Lnet/minecraft/class_4604;)V ARG 1 frustum - METHOD method_38552 (Lnet/minecraft/class_2338;Lnet/minecraft/class_761$class_762;)D - ARG 1 chunkInfo - METHOD method_38553 isOutsideViewDistance (Lnet/minecraft/class_2338;Lnet/minecraft/class_846$class_851;)Z - ARG 1 pos - ARG 2 chunk - METHOD method_38554 (J)J - ARG 1 nextUpdateTime METHOD method_40050 isRenderingReady (Lnet/minecraft/class_2338;)Z ARG 1 pos + METHOD method_43788 hasBlindnessOrDarkness (Lnet/minecraft/class_4184;)Z + ARG 1 camera + METHOD method_49041 renderFilledBox (Lnet/minecraft/class_4587;Lnet/minecraft/class_4588;FFFFFFFFFF)V + ARG 0 matrices + ARG 1 vertexConsumer + ARG 2 minX + ARG 3 minY + ARG 4 minZ + ARG 5 maxX + ARG 6 maxY + ARG 7 maxZ + ARG 8 red + ARG 9 green + ARG 10 blue + ARG 11 alpha + METHOD method_51778 getMaxIntensityColor (F)Lnet/minecraft/class_243; + ARG 0 hue + METHOD method_51779 shiftHue (FFFF)Lnet/minecraft/class_243; + ARG 0 red + ARG 1 green + ARG 2 blue + ARG 3 hueOffset METHOD method_8562 playSong (Lnet/minecraft/class_3414;Lnet/minecraft/class_2338;)V ARG 1 song ARG 2 songPosition @@ -432,42 +453,7 @@ CLASS net/minecraft/class_761 net/minecraft/client/render/WorldRenderer ARG 1 x ARG 2 y ARG 3 z - CLASS class_762 ChunkInfo - FIELD field_4122 propagationLevel I - FIELD field_4124 chunk Lnet/minecraft/class_846$class_851; - FIELD field_4125 direction B - FIELD field_4126 cullingState B - METHOD (Lnet/minecraft/class_846$class_851;Lnet/minecraft/class_2350;I)V - ARG 1 chunk - ARG 2 direction - ARG 3 propagationLevel - METHOD equals (Ljava/lang/Object;)Z - ARG 1 o - METHOD method_3298 canCull (Lnet/minecraft/class_2350;)Z - ARG 1 from - METHOD method_3299 updateCullingState (BLnet/minecraft/class_2350;)V - ARG 1 parentCullingState - ARG 2 from - METHOD method_34813 hasAnyDirection ()Z - METHOD method_34814 hasDirection (I)Z - ARG 1 ordinal - METHOD method_34816 addDirection (Lnet/minecraft/class_2350;)V - ARG 1 direction - CLASS class_5347 ShaderException + CLASS class_5347 ProgramInitException METHOD (Ljava/lang/String;Ljava/lang/Throwable;)V ARG 1 message ARG 2 cause - CLASS class_5972 ChunkInfoList - FIELD field_29620 current [Lnet/minecraft/class_761$class_762; - METHOD (I)V - ARG 1 size - METHOD method_34820 getInfo (Lnet/minecraft/class_846$class_851;)Lnet/minecraft/class_761$class_762; - ARG 1 chunk - METHOD method_34821 setInfo (Lnet/minecraft/class_846$class_851;Lnet/minecraft/class_761$class_762;)V - ARG 1 chunk - ARG 2 info - CLASS class_6600 RenderableChunks - FIELD field_34818 chunkInfoList Lnet/minecraft/class_761$class_5972; - FIELD field_34819 chunks Ljava/util/LinkedHashSet; - METHOD (I)V - ARG 1 chunkCount diff --git a/mappings/net/minecraft/client/render/block/BlockModels.mapping b/mappings/net/minecraft/client/render/block/BlockModels.mapping index 9176be3091..0597d9543b 100644 --- a/mappings/net/minecraft/client/render/block/BlockModels.mapping +++ b/mappings/net/minecraft/client/render/block/BlockModels.mapping @@ -12,12 +12,11 @@ CLASS net/minecraft/class_773 net/minecraft/client/render/block/BlockModels METHOD method_3336 getModelId (Lnet/minecraft/class_2960;Lnet/minecraft/class_2680;)Lnet/minecraft/class_1091; ARG 0 id ARG 1 state - METHOD method_3337 (Lnet/minecraft/class_2680;)V - ARG 1 state METHOD method_3338 propertyMapToString (Ljava/util/Map;)Ljava/lang/String; ARG 0 map METHOD method_3339 getModelParticleSprite (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 + METHOD method_45784 setModels (Ljava/util/Map;)V + ARG 1 models diff --git a/mappings/net/minecraft/client/render/block/BlockRenderManager.mapping b/mappings/net/minecraft/client/render/block/BlockRenderManager.mapping index dc8d8175a8..9908f8ed8d 100644 --- a/mappings/net/minecraft/client/render/block/BlockRenderManager.mapping +++ b/mappings/net/minecraft/client/render/block/BlockRenderManager.mapping @@ -28,7 +28,7 @@ CLASS net/minecraft/class_776 net/minecraft/client/render/block/BlockRenderManag METHOD method_3353 renderBlockAsEntity (Lnet/minecraft/class_2680;Lnet/minecraft/class_4587;Lnet/minecraft/class_4597;II)V ARG 1 state ARG 2 matrices - ARG 3 vertexConsumer + ARG 3 vertexConsumers ARG 4 light ARG 5 overlay METHOD method_3355 renderBlock (Lnet/minecraft/class_2680;Lnet/minecraft/class_2338;Lnet/minecraft/class_1920;Lnet/minecraft/class_4587;Lnet/minecraft/class_4588;ZLnet/minecraft/class_5819;)V diff --git a/mappings/net/minecraft/client/render/block/entity/BeaconBlockEntityRenderer.mapping b/mappings/net/minecraft/client/render/block/entity/BeaconBlockEntityRenderer.mapping index 6bf734965d..19f42be3f2 100644 --- a/mappings/net/minecraft/client/render/block/entity/BeaconBlockEntityRenderer.mapping +++ b/mappings/net/minecraft/client/render/block/entity/BeaconBlockEntityRenderer.mapping @@ -3,7 +3,7 @@ CLASS net/minecraft/class_822 net/minecraft/client/render/block/entity/BeaconBlo FIELD field_4338 BEAM_TEXTURE Lnet/minecraft/class_2960; METHOD (Lnet/minecraft/class_5614$class_5615;)V ARG 1 ctx - METHOD method_22740 renderBeamFace (Lnet/minecraft/class_1159;Lnet/minecraft/class_4581;Lnet/minecraft/class_4588;FFFFIIFFFFFFFF)V + METHOD method_22740 renderBeamFace (Lorg/joml/Matrix4f;Lorg/joml/Matrix3f;Lnet/minecraft/class_4588;FFFFIIFFFFFFFF)V ARG 0 positionMatrix ARG 1 normalMatrix ARG 2 vertices @@ -42,7 +42,7 @@ CLASS net/minecraft/class_822 net/minecraft/client/render/block/entity/BeaconBlo ARG 17 u2 ARG 18 v1 ARG 19 v2 - METHOD method_23076 renderBeamVertex (Lnet/minecraft/class_1159;Lnet/minecraft/class_4581;Lnet/minecraft/class_4588;FFFFIFFFF)V + METHOD method_23076 renderBeamVertex (Lorg/joml/Matrix4f;Lorg/joml/Matrix3f;Lnet/minecraft/class_4588;FFFFIFFFF)V ARG 0 positionMatrix ARG 1 normalMatrix ARG 2 vertices diff --git a/mappings/net/minecraft/client/render/block/entity/BrushableBlockEntityRenderer.mapping b/mappings/net/minecraft/client/render/block/entity/BrushableBlockEntityRenderer.mapping new file mode 100644 index 0000000000..0120005448 --- /dev/null +++ b/mappings/net/minecraft/client/render/block/entity/BrushableBlockEntityRenderer.mapping @@ -0,0 +1,7 @@ +CLASS net/minecraft/class_8189 net/minecraft/client/render/block/entity/BrushableBlockEntityRenderer + FIELD field_42928 itemRenderer Lnet/minecraft/class_918; + METHOD (Lnet/minecraft/class_5614$class_5615;)V + ARG 1 context + METHOD method_49349 getTranslation (Lnet/minecraft/class_2350;I)[F + ARG 1 direction + ARG 2 dustedLevel diff --git a/mappings/net/minecraft/client/render/block/entity/DecoratedPotBlockEntityRenderer.mapping b/mappings/net/minecraft/client/render/block/entity/DecoratedPotBlockEntityRenderer.mapping new file mode 100644 index 0000000000..ab32233ddd --- /dev/null +++ b/mappings/net/minecraft/client/render/block/entity/DecoratedPotBlockEntityRenderer.mapping @@ -0,0 +1,29 @@ +CLASS net/minecraft/class_8188 net/minecraft/client/render/block/entity/DecoratedPotBlockEntityRenderer + FIELD field_42913 NECK Ljava/lang/String; + FIELD field_42914 FRONT Ljava/lang/String; + FIELD field_42915 BACK Ljava/lang/String; + FIELD field_42916 LEFT Ljava/lang/String; + FIELD field_42917 RIGHT Ljava/lang/String; + FIELD field_42918 TOP Ljava/lang/String; + FIELD field_42919 BOTTOM Ljava/lang/String; + FIELD field_42920 neck Lnet/minecraft/class_630; + FIELD field_42921 front Lnet/minecraft/class_630; + FIELD field_42922 back Lnet/minecraft/class_630; + FIELD field_42923 left Lnet/minecraft/class_630; + FIELD field_42924 right Lnet/minecraft/class_630; + FIELD field_42925 top Lnet/minecraft/class_630; + FIELD field_42926 bottom Lnet/minecraft/class_630; + FIELD field_42927 baseTexture Lnet/minecraft/class_4730; + METHOD (Lnet/minecraft/class_5614$class_5615;)V + ARG 1 context + METHOD method_49343 getTextureIdFromSherd (Lnet/minecraft/class_1792;)Lnet/minecraft/class_4730; + ARG 0 item + METHOD method_49345 renderDecoratedSide (Lnet/minecraft/class_630;Lnet/minecraft/class_4587;Lnet/minecraft/class_4597;IILnet/minecraft/class_4730;)V + ARG 1 part + ARG 2 matrices + ARG 3 vertexConsumers + ARG 4 light + ARG 5 overlay + ARG 6 textureId + METHOD method_49346 getTopBottomNeckTexturedModelData ()Lnet/minecraft/class_5607; + METHOD method_49347 getSidesTexturedModelData ()Lnet/minecraft/class_5607; diff --git a/mappings/net/minecraft/client/render/block/entity/EndPortalBlockEntityRenderer.mapping b/mappings/net/minecraft/client/render/block/entity/EndPortalBlockEntityRenderer.mapping index 063df14b3f..3d9029d4ca 100644 --- a/mappings/net/minecraft/client/render/block/entity/EndPortalBlockEntityRenderer.mapping +++ b/mappings/net/minecraft/client/render/block/entity/EndPortalBlockEntityRenderer.mapping @@ -3,11 +3,11 @@ CLASS net/minecraft/class_840 net/minecraft/client/render/block/entity/EndPortal FIELD field_4407 PORTAL_TEXTURE Lnet/minecraft/class_2960; METHOD (Lnet/minecraft/class_5614$class_5615;)V ARG 1 ctx - METHOD method_23084 renderSides (Lnet/minecraft/class_2640;Lnet/minecraft/class_1159;Lnet/minecraft/class_4588;)V + METHOD method_23084 renderSides (Lnet/minecraft/class_2640;Lorg/joml/Matrix4f;Lnet/minecraft/class_4588;)V ARG 1 entity ARG 2 matrix ARG 3 vertexConsumer - METHOD method_23085 renderSide (Lnet/minecraft/class_2640;Lnet/minecraft/class_1159;Lnet/minecraft/class_4588;FFFFFFFFLnet/minecraft/class_2350;)V + METHOD method_23085 renderSide (Lnet/minecraft/class_2640;Lorg/joml/Matrix4f;Lnet/minecraft/class_4588;FFFFFFFFLnet/minecraft/class_2350;)V ARG 1 entity ARG 2 model ARG 3 vertices diff --git a/mappings/net/minecraft/client/render/block/entity/HangingSignBlockEntityRenderer.mapping b/mappings/net/minecraft/client/render/block/entity/HangingSignBlockEntityRenderer.mapping new file mode 100644 index 0000000000..6b2ab6f2f4 --- /dev/null +++ b/mappings/net/minecraft/client/render/block/entity/HangingSignBlockEntityRenderer.mapping @@ -0,0 +1,25 @@ +CLASS net/minecraft/class_7761 net/minecraft/client/render/block/entity/HangingSignBlockEntityRenderer + FIELD field_40516 NORMAL_CHAINS Ljava/lang/String; + FIELD field_40517 CHAIN_L1 Ljava/lang/String; + FIELD field_40518 CHAIN_L2 Ljava/lang/String; + FIELD field_40519 CHAIN_R1 Ljava/lang/String; + FIELD field_40520 CHAIN_R2 Ljava/lang/String; + FIELD field_40521 BOARD Ljava/lang/String; + FIELD field_40522 PLANK Ljava/lang/String; + FIELD field_40523 V_CHAINS Ljava/lang/String; + FIELD field_40524 MODELS Ljava/util/Map; + FIELD field_44574 MODEL_SCALE F + FIELD field_44575 TEXT_SCALE F + FIELD field_44576 TEXT_OFFSET Lnet/minecraft/class_243; + METHOD method_45794 (Lnet/minecraft/class_5614$class_5615;Lnet/minecraft/class_4719;)Lnet/minecraft/class_7761$class_7762; + ARG 1 type + METHOD method_45795 getTexturedModelData ()Lnet/minecraft/class_5607; + CLASS class_7762 HangingSignModel + FIELD field_40525 root Lnet/minecraft/class_630; + FIELD field_40526 plank Lnet/minecraft/class_630; + FIELD field_40527 vChains Lnet/minecraft/class_630; + FIELD field_40528 normalChains Lnet/minecraft/class_630; + METHOD (Lnet/minecraft/class_630;)V + ARG 1 root + METHOD method_45797 updateVisibleParts (Lnet/minecraft/class_2680;)V + ARG 1 state diff --git a/mappings/net/minecraft/client/render/block/entity/SignBlockEntityRenderer.mapping b/mappings/net/minecraft/client/render/block/entity/SignBlockEntityRenderer.mapping index 60a7d0db2c..b34648acff 100644 --- a/mappings/net/minecraft/client/render/block/entity/SignBlockEntityRenderer.mapping +++ b/mappings/net/minecraft/client/render/block/entity/SignBlockEntityRenderer.mapping @@ -1,16 +1,14 @@ CLASS net/minecraft/class_837 net/minecraft/client/render/block/entity/SignBlockEntityRenderer FIELD field_27754 typeToModel Ljava/util/Map; FIELD field_27755 textRenderer Lnet/minecraft/class_327; - FIELD field_32828 MAX_TEXT_WIDTH I - FIELD field_32829 TEXT_HEIGHT I FIELD field_32830 STICK Ljava/lang/String; FIELD field_33962 GLOWING_BLACK_COLOR I FIELD field_33963 RENDER_DISTANCE I + FIELD field_44577 SCALE F + FIELD field_44578 TEXT_OFFSET Lnet/minecraft/class_243; METHOD (Lnet/minecraft/class_5614$class_5615;)V ARG 1 ctx METHOD method_32154 getTexturedModelData ()Lnet/minecraft/class_5607; - METHOD method_32155 getSignType (Lnet/minecraft/class_2248;)Lnet/minecraft/class_4719; - ARG 0 block METHOD method_32156 (Lnet/minecraft/class_4719;)Lnet/minecraft/class_4719; ARG 0 signType METHOD method_32157 createSignModel (Lnet/minecraft/class_5599;Lnet/minecraft/class_4719;)Lnet/minecraft/class_837$class_4702; @@ -18,13 +16,58 @@ CLASS net/minecraft/class_837 net/minecraft/client/render/block/entity/SignBlock ARG 1 type METHOD method_32158 (Lnet/minecraft/class_5614$class_5615;Lnet/minecraft/class_4719;)Lnet/minecraft/class_837$class_4702; ARG 1 signType - METHOD method_32159 (Lnet/minecraft/class_2561;)Lnet/minecraft/class_5481; - ARG 1 text - METHOD method_37311 getColor (Lnet/minecraft/class_2625;)I - ARG 0 sign - METHOD method_37312 shouldRender (Lnet/minecraft/class_2625;I)Z + METHOD method_37311 getColor (Lnet/minecraft/class_8242;)I ARG 0 sign + METHOD method_37312 shouldRender (Lnet/minecraft/class_2338;I)Z + ARG 0 pos ARG 1 signColor + METHOD method_45790 getTextOffset ()Lnet/minecraft/class_243; + METHOD method_45792 getTextureId (Lnet/minecraft/class_4719;)Lnet/minecraft/class_4730; + ARG 1 signType + METHOD method_45793 renderSignModel (Lnet/minecraft/class_4587;IILnet/minecraft/class_3879;Lnet/minecraft/class_4588;)V + ARG 1 matrices + ARG 2 light + ARG 3 overlay + ARG 4 model + ARG 5 vertexConsumers + METHOD method_45798 renderText (Lnet/minecraft/class_2338;Lnet/minecraft/class_8242;Lnet/minecraft/class_4587;Lnet/minecraft/class_4597;IIIZ)V + ARG 1 pos + ARG 2 signText + ARG 3 matrices + ARG 4 vertexConsumers + ARG 5 light + ARG 6 lineHeight + ARG 7 lineWidth + ARG 8 front + METHOD method_45799 (ILnet/minecraft/class_2561;)Lnet/minecraft/class_5481; + ARG 2 text + METHOD method_45800 renderSign (Lnet/minecraft/class_4587;Lnet/minecraft/class_4597;IILnet/minecraft/class_4719;Lnet/minecraft/class_3879;)V + ARG 1 matrices + ARG 2 vertexConsumers + ARG 3 light + ARG 4 overlay + ARG 5 woodType + ARG 6 model + METHOD method_49918 setAngles (Lnet/minecraft/class_4587;FLnet/minecraft/class_2680;)V + ARG 1 matrices + ARG 2 rotationDegrees + ARG 3 state + METHOD method_49919 setTextAngles (Lnet/minecraft/class_4587;ZLnet/minecraft/class_243;)V + ARG 1 matrices + ARG 2 front + ARG 3 translation + METHOD method_49920 render (Lnet/minecraft/class_2625;Lnet/minecraft/class_4587;Lnet/minecraft/class_4597;IILnet/minecraft/class_2680;Lnet/minecraft/class_2478;Lnet/minecraft/class_4719;Lnet/minecraft/class_3879;)V + ARG 1 entity + ARG 2 matrices + ARG 3 vertexConsumers + ARG 4 light + ARG 5 overlay + ARG 6 state + ARG 7 block + ARG 8 woodType + ARG 9 model + METHOD method_51272 getSignScale ()F + METHOD method_51273 getTextScale ()F CLASS class_4702 SignModel FIELD field_21531 stick Lnet/minecraft/class_630; FIELD field_27756 root Lnet/minecraft/class_630; diff --git a/mappings/net/minecraft/client/render/chunk/ChunkBuilder.mapping b/mappings/net/minecraft/client/render/chunk/ChunkBuilder.mapping index b496650c0f..ccce1c3acd 100644 --- a/mappings/net/minecraft/client/render/chunk/ChunkBuilder.mapping +++ b/mappings/net/minecraft/client/render/chunk/ChunkBuilder.mapping @@ -8,7 +8,6 @@ CLASS net/minecraft/class_846 net/minecraft/client/render/chunk/ChunkBuilder FIELD field_20832 worldRenderer Lnet/minecraft/class_761; FIELD field_20992 queuedTaskCount I FIELD field_20993 bufferCount I - FIELD field_29500 POSITION_COLOR_TEXTURE_LIGHT_NORMAL Lnet/minecraft/class_293; FIELD field_35301 prioritizedTaskQueue Ljava/util/concurrent/PriorityBlockingQueue; FIELD field_35302 taskQueue Ljava/util/Queue; FIELD field_35303 processablePrioritizedTaskCount I @@ -46,6 +45,7 @@ CLASS net/minecraft/class_846 net/minecraft/client/render/chunk/ChunkBuilder METHOD method_3632 reset ()V METHOD method_3633 clear ()V METHOD method_3635 scheduleUpload (Lnet/minecraft/class_287$class_7433;Lnet/minecraft/class_291;)Ljava/util/concurrent/CompletableFuture; + ARG 1 builtBuffer ARG 2 glBuffer METHOD method_38555 (Ljava/util/concurrent/CompletableFuture;)Ljava/util/concurrent/CompletionStage; ARG 0 future @@ -53,7 +53,7 @@ CLASS net/minecraft/class_846 net/minecraft/client/render/chunk/ChunkBuilder CLASS class_849 ChunkData FIELD field_4450 nonEmptyLayers Ljava/util/Set; FIELD field_4451 EMPTY Lnet/minecraft/class_846$class_849; - FIELD field_4453 bufferState Lnet/minecraft/class_287$class_5594; + FIELD field_4453 transparentSortingData Lnet/minecraft/class_287$class_5594; FIELD field_4455 occlusionGraph Lnet/minecraft/class_854; FIELD field_4456 blockEntities Ljava/util/List; METHOD method_3641 isEmpty (Lnet/minecraft/class_1921;)Z @@ -66,6 +66,7 @@ CLASS net/minecraft/class_846 net/minecraft/client/render/chunk/ChunkBuilder CLASS class_851 BuiltChunk FIELD field_20834 rebuildTask Lnet/minecraft/class_846$class_851$class_4578; FIELD field_29641 index I + FIELD field_36374 numFailures Ljava/util/concurrent/atomic/AtomicInteger; FIELD field_4457 blockEntities Ljava/util/Set; FIELD field_4458 boundingBox Lnet/minecraft/class_238; FIELD field_4459 data Ljava/util/concurrent/atomic/AtomicReference; @@ -87,6 +88,11 @@ CLASS net/minecraft/class_846 net/minecraft/client/render/chunk/ChunkBuilder ARG 1 chunkRenderer ARG 2 builder METHOD method_22778 setNoCullingBlockEntities (Ljava/util/Collection;)V + ARG 1 blockEntities + METHOD method_22779 (Lnet/minecraft/class_1921;)Lnet/minecraft/class_291; + ARG 0 layer + METHOD method_22780 (Lnet/minecraft/class_1921;)Lnet/minecraft/class_1921; + ARG 0 layer METHOD method_22781 rebuild (Lnet/minecraft/class_6850;)V ARG 1 builder METHOD method_3651 isChunkNonEmpty (Lnet/minecraft/class_2338;)Z @@ -141,6 +147,10 @@ CLASS net/minecraft/class_846 net/minecraft/client/render/chunk/ChunkBuilder ARG 1 cameraX ARG 2 cameraY ARG 3 cameraZ + ARG 4 storage + METHOD method_22788 (Ljava/util/List;Lnet/minecraft/class_846$class_849;Lnet/minecraft/class_1921;Lnet/minecraft/class_287$class_7433;)V + ARG 3 renderLayer + ARG 4 buffer METHOD method_23087 addBlockEntity (Lnet/minecraft/class_846$class_851$class_4578$class_7435;Lnet/minecraft/class_2586;)V ARG 1 renderData ARG 2 blockEntity @@ -150,6 +160,7 @@ CLASS net/minecraft/class_846 net/minecraft/client/render/chunk/ChunkBuilder CLASS class_7435 RenderData FIELD field_39079 noCullingBlockEntities Ljava/util/List; FIELD field_39080 blockEntities Ljava/util/List; + FIELD field_39081 buffers Ljava/util/Map; FIELD field_39082 chunkOcclusionData Lnet/minecraft/class_854; FIELD field_39083 translucencySortingData Lnet/minecraft/class_287$class_5594; CLASS class_4579 SortTask diff --git a/mappings/net/minecraft/client/render/debug/BeeDebugRenderer.mapping b/mappings/net/minecraft/client/render/debug/BeeDebugRenderer.mapping index 46235b501f..ee899a12ed 100644 --- a/mappings/net/minecraft/client/render/debug/BeeDebugRenderer.mapping +++ b/mappings/net/minecraft/client/render/debug/BeeDebugRenderer.mapping @@ -20,127 +20,108 @@ CLASS net/minecraft/class_4703 net/minecraft/client/render/debug/BeeDebugRendere ARG 2 hive METHOD method_23804 (Lnet/minecraft/class_1297;)V ARG 1 entity - METHOD method_23805 addBee (Lnet/minecraft/class_4703$class_5243;)V + METHOD method_23805 addBee (Lnet/minecraft/class_8707$class_5243;)V ARG 1 bee - METHOD method_23806 getPositionString (Lnet/minecraft/class_4703$class_5243;Lnet/minecraft/class_2338;)Ljava/lang/String; + METHOD method_23806 getPositionString (Lnet/minecraft/class_8707$class_5243;Lnet/minecraft/class_2338;)Ljava/lang/String; ARG 1 bee ARG 2 pos - METHOD method_23807 addHive (Lnet/minecraft/class_4703$class_4705;)V + METHOD method_23807 addHive (Lnet/minecraft/class_8718$class_8719;J)V ARG 1 hive - METHOD method_23808 drawHive (Lnet/minecraft/class_2338;)V - ARG 0 pos - METHOD method_23809 drawBox (Lnet/minecraft/class_2338;FFFFF)V - ARG 0 pos - ARG 1 expand - ARG 2 red - ARG 3 green - ARG 4 blue - ARG 5 alpha - METHOD method_23810 (Lnet/minecraft/class_2338;Lnet/minecraft/class_4703$class_5243;)Z + ARG 2 time + METHOD method_23808 drawHive (Lnet/minecraft/class_4587;Lnet/minecraft/class_4597;Lnet/minecraft/class_2338;)V + ARG 0 matrices + ARG 1 vertexConsumers + ARG 2 pos + METHOD method_23810 (Lnet/minecraft/class_2338;Lnet/minecraft/class_8707$class_5243;)Z ARG 1 bee - METHOD method_23811 (Lnet/minecraft/class_2338;Ljava/util/Map;Lnet/minecraft/class_4703$class_4705;)V + METHOD method_23811 (Lnet/minecraft/class_2338;Ljava/util/Map;Lnet/minecraft/class_4587;Lnet/minecraft/class_4597;Lnet/minecraft/class_4703$class_8682;)V + ARG 5 hive + METHOD method_23812 (Lnet/minecraft/class_2338;Lnet/minecraft/class_4587;Lnet/minecraft/class_4597;Lnet/minecraft/class_2338;Ljava/util/List;)V + ARG 4 hive + ARG 5 bees + METHOD method_23813 drawHiveBees (Lnet/minecraft/class_4587;Lnet/minecraft/class_4597;Lnet/minecraft/class_2338;Ljava/util/List;)V + ARG 1 matrices + ARG 2 vertexConsumers + ARG 3 pos + ARG 4 bees + METHOD method_23814 drawString (Lnet/minecraft/class_4587;Lnet/minecraft/class_4597;Lnet/minecraft/class_2374;ILjava/lang/String;IF)V + ARG 0 matrices + ARG 1 vertexConsumers + ARG 2 pos + ARG 3 line + ARG 4 string + ARG 5 color + ARG 6 size + METHOD method_23815 drawString (Lnet/minecraft/class_4587;Lnet/minecraft/class_4597;Ljava/lang/String;Lnet/minecraft/class_8718$class_8719;II)V + ARG 0 matrices + ARG 1 vertexConsumers + ARG 2 string ARG 3 hive - METHOD method_23812 (Lnet/minecraft/class_2338;Lnet/minecraft/class_2338;Ljava/util/List;)V - ARG 2 hivePos - ARG 3 bees - METHOD method_23813 drawHiveBees (Lnet/minecraft/class_2338;Ljava/util/List;)V - ARG 1 pos - ARG 2 bees - METHOD method_23814 drawString (Lnet/minecraft/class_2374;ILjava/lang/String;IF)V - ARG 0 pos - ARG 1 line + ARG 4 line + ARG 5 color + METHOD method_23816 drawString (Lnet/minecraft/class_4587;Lnet/minecraft/class_4597;Ljava/lang/String;Lnet/minecraft/class_2338;II)V + ARG 0 matrices + ARG 1 vertexConsumers ARG 2 string - ARG 3 color - ARG 4 size - METHOD method_23815 drawString (Ljava/lang/String;Lnet/minecraft/class_4703$class_4705;II)V - ARG 0 string - ARG 1 hive - ARG 2 line - ARG 3 color - METHOD method_23816 drawString (Ljava/lang/String;Lnet/minecraft/class_2338;II)V - ARG 0 string - ARG 1 pos - ARG 2 line - ARG 3 color - METHOD method_23817 (Ljava/util/Map$Entry;)V - ARG 0 entry - METHOD method_23818 (Ljava/util/Map;Lnet/minecraft/class_4703$class_5243;)V + ARG 3 pos + ARG 4 line + ARG 5 color + METHOD method_23817 (Lnet/minecraft/class_4587;Lnet/minecraft/class_4597;Lnet/minecraft/class_2338;Ljava/util/Set;)V + ARG 2 flowerPos + ARG 3 bees + METHOD method_23818 (Ljava/util/Map;Lnet/minecraft/class_8707$class_5243;)V ARG 1 bee METHOD method_23819 removeOutdatedHives ()V - METHOD method_23820 drawPath (Lnet/minecraft/class_4703$class_5243;)V - ARG 1 bee - METHOD method_23821 drawHiveInfo (Lnet/minecraft/class_4703$class_4705;Ljava/util/Collection;)V - ARG 1 hive - ARG 2 blacklistingBees + METHOD method_23820 drawPath (Lnet/minecraft/class_4587;Lnet/minecraft/class_4597;Lnet/minecraft/class_8707$class_5243;)V + ARG 1 matrices + ARG 2 vertexConsumers + ARG 3 bee + METHOD method_23821 drawHiveInfo (Lnet/minecraft/class_4587;Lnet/minecraft/class_4597;Lnet/minecraft/class_8718$class_8719;Ljava/util/Collection;)V + ARG 1 matrices + ARG 2 vertexConsumers + ARG 3 hive + ARG 4 blacklistingBees METHOD method_23822 getBeesForHive (Lnet/minecraft/class_2338;)Ljava/util/Collection; ARG 1 hivePos - METHOD method_23823 render ()V - METHOD method_23824 drawBee (Lnet/minecraft/class_4703$class_5243;)V - ARG 1 bee + METHOD method_23823 render (Lnet/minecraft/class_4587;Lnet/minecraft/class_4597;)V + ARG 1 matrices + ARG 2 vertexConsumers + METHOD method_23824 drawBee (Lnet/minecraft/class_4587;Lnet/minecraft/class_4597;Lnet/minecraft/class_8707$class_5243;)V + ARG 1 matrices + ARG 2 vertexConsumers + ARG 3 bee METHOD method_23825 toString (Ljava/util/Collection;)Ljava/lang/String; ARG 0 bees - METHOD method_23826 drawFlowers ()V - METHOD method_23827 isTargeted (Lnet/minecraft/class_4703$class_5243;)Z + METHOD method_23826 drawFlowers (Lnet/minecraft/class_4587;Lnet/minecraft/class_4597;)V + ARG 1 matrices + ARG 2 vertexConsumers + METHOD method_23827 isTargeted (Lnet/minecraft/class_8707$class_5243;)Z ARG 1 bee METHOD method_23828 getCameraPos ()Lnet/minecraft/class_4184; - METHOD method_23829 isInRange (Lnet/minecraft/class_4703$class_5243;)Z + METHOD method_23829 isInRange (Lnet/minecraft/class_8707$class_5243;)Z ARG 1 bee METHOD method_23830 getBeesByHive ()Ljava/util/Map; - METHOD method_23831 (Lnet/minecraft/class_4703$class_5243;)V - ARG 1 bee + METHOD method_23831 (Lnet/minecraft/class_4587;Lnet/minecraft/class_4597;Lnet/minecraft/class_8707$class_5243;)V + ARG 3 bee METHOD method_23832 updateTargetedEntity ()V METHOD method_23952 removeInvalidBees ()V METHOD method_23953 (Ljava/util/Map$Entry;)Z ARG 1 bee - METHOD method_24082 (Ljava/util/Map;Lnet/minecraft/class_4703$class_5243;)V + METHOD method_24082 (Ljava/util/Map;Lnet/minecraft/class_8707$class_5243;)V ARG 1 bee - METHOD method_24083 (Ljava/util/Map;Lnet/minecraft/class_4703$class_5243;Lnet/minecraft/class_2338;)V + METHOD method_24083 (Ljava/util/Map;Lnet/minecraft/class_8707$class_5243;Lnet/minecraft/class_2338;)V ARG 2 pos METHOD method_24084 getBlacklistingBees ()Ljava/util/Map; METHOD method_30109 (Lnet/minecraft/class_2338;)Ljava/util/List; ARG 0 hive METHOD method_30110 (Lnet/minecraft/class_2338;)Ljava/util/Set; ARG 0 flower + METHOD method_30111 (Lnet/minecraft/class_2338;)Ljava/util/Set; + ARG 0 pos2 METHOD method_35794 removeBee (I)V ARG 1 id - METHOD method_35795 (ILnet/minecraft/class_4703$class_5243;)Z + METHOD method_35795 (ILnet/minecraft/class_8707$class_5243;)Z ARG 1 bee - METHOD method_35796 getBeeNamesForHive (Lnet/minecraft/class_4703$class_4705;)Ljava/util/Set; + METHOD method_35796 getBeeNamesForHive (Lnet/minecraft/class_8718$class_8719;)Ljava/util/Set; ARG 1 hive - CLASS class_4705 Hive - FIELD field_21543 pos Lnet/minecraft/class_2338; - FIELD field_21544 label Ljava/lang/String; - FIELD field_21545 beeCount I - FIELD field_21546 time J - FIELD field_21625 honeyLevel I - FIELD field_21626 sedated Z - METHOD (Lnet/minecraft/class_2338;Ljava/lang/String;IIZJ)V - ARG 1 pos - ARG 2 label - ARG 3 beeCount - ARG 4 honeyLevel - ARG 5 sedated - ARG 6 time - CLASS class_5243 Bee - FIELD field_24322 uuid Ljava/util/UUID; - FIELD field_24323 entityId I - FIELD field_24324 position Lnet/minecraft/class_2374; - FIELD field_24325 path Lnet/minecraft/class_11; - FIELD field_24326 hive Lnet/minecraft/class_2338; - FIELD field_24327 flower Lnet/minecraft/class_2338; - FIELD field_24328 travelTicks I - FIELD field_24329 labels Ljava/util/List; - FIELD field_24330 blacklist Ljava/util/Set; - METHOD (Ljava/util/UUID;ILnet/minecraft/class_2374;Lnet/minecraft/class_11;Lnet/minecraft/class_2338;Lnet/minecraft/class_2338;I)V - ARG 1 uuid - ARG 2 entityId - ARG 3 position - ARG 4 path - ARG 5 hive - ARG 6 flower - ARG 7 travelTicks - METHOD method_27648 getUuid ()Ljava/util/UUID; - METHOD method_27649 isHiveAt (Lnet/minecraft/class_2338;)Z - ARG 1 pos - METHOD method_27650 getName ()Ljava/lang/String; - METHOD method_27651 hasFlower ()Z + CLASS class_8682 Hive diff --git a/mappings/net/minecraft/client/render/debug/ChunkBorderDebugRenderer.mapping b/mappings/net/minecraft/client/render/debug/ChunkBorderDebugRenderer.mapping index 21e41dee91..576e3934da 100644 --- a/mappings/net/minecraft/client/render/debug/ChunkBorderDebugRenderer.mapping +++ b/mappings/net/minecraft/client/render/debug/ChunkBorderDebugRenderer.mapping @@ -1,4 +1,6 @@ CLASS net/minecraft/class_862 net/minecraft/client/render/debug/ChunkBorderDebugRenderer + FIELD field_35557 DARK_CYAN I + FIELD field_35558 YELLOW I FIELD field_4516 client Lnet/minecraft/class_310; METHOD (Lnet/minecraft/class_310;)V ARG 1 client diff --git a/mappings/net/minecraft/client/render/debug/DebugRenderer.mapping b/mappings/net/minecraft/client/render/debug/DebugRenderer.mapping index d5f3e07e64..8c3932a47a 100644 --- a/mappings/net/minecraft/client/render/debug/DebugRenderer.mapping +++ b/mappings/net/minecraft/client/render/debug/DebugRenderer.mapping @@ -6,6 +6,8 @@ CLASS net/minecraft/class_863 net/minecraft/client/render/debug/DebugRenderer FIELD field_21547 beeDebugRenderer Lnet/minecraft/class_4703; FIELD field_22408 villageSectionsDebugRenderer Lnet/minecraft/class_4841; FIELD field_28254 gameEventDebugRenderer Lnet/minecraft/class_5739; + FIELD field_44674 lightDebugRenderer Lnet/minecraft/class_8520; + FIELD field_44827 supportingBlockDebugRenderer Lnet/minecraft/class_863$class_864; FIELD field_4517 blockOutlineDebugRenderer Lnet/minecraft/class_863$class_864; FIELD field_4523 pathfindingDebugRenderer Lnet/minecraft/class_868; FIELD field_4528 waterDebugRenderer Lnet/minecraft/class_863$class_864; @@ -21,17 +23,19 @@ CLASS net/minecraft/class_863 net/minecraft/client/render/debug/DebugRenderer METHOD (Lnet/minecraft/class_310;)V ARG 1 client METHOD method_20413 reset ()V - METHOD method_23098 drawBox (DDDDDDFFFF)V - ARG 0 minX - ARG 2 minY - ARG 4 minZ - ARG 6 maxX - ARG 8 maxY - ARG 10 maxZ - ARG 12 red - ARG 13 green - ARG 14 blue - ARG 15 alpha + METHOD method_23098 drawBox (Lnet/minecraft/class_4587;Lnet/minecraft/class_4597;DDDDDDFFFF)V + ARG 0 matrices + ARG 1 vertexConsumers + ARG 2 minX + ARG 4 minY + ARG 6 minZ + ARG 8 maxX + ARG 10 maxY + ARG 12 maxZ + ARG 14 red + ARG 15 green + ARG 16 blue + ARG 17 alpha METHOD method_23099 render (Lnet/minecraft/class_4587;Lnet/minecraft/class_4597$class_4598;DDD)V ARG 1 matrices ARG 2 vertexConsumers @@ -41,55 +45,69 @@ CLASS net/minecraft/class_863 net/minecraft/client/render/debug/DebugRenderer METHOD method_23101 getTargetedEntity (Lnet/minecraft/class_1297;I)Ljava/util/Optional; ARG 0 entity ARG 1 maxDistance - METHOD method_23102 drawBox (Lnet/minecraft/class_238;FFFF)V - ARG 0 box - ARG 1 red - ARG 2 green - ARG 3 blue - ARG 4 alpha - METHOD method_23103 drawBox (Lnet/minecraft/class_2338;FFFFF)V - ARG 0 pos - ARG 1 expand - ARG 2 red - ARG 3 green - ARG 4 blue - ARG 5 alpha - METHOD method_23104 drawBox (Lnet/minecraft/class_2338;Lnet/minecraft/class_2338;FFFF)V - ARG 0 pos1 - ARG 1 pos2 - ARG 2 red - ARG 3 green - ARG 4 blue - ARG 5 alpha - METHOD method_23105 drawString (Ljava/lang/String;DDDI)V - ARG 0 string - ARG 1 x - ARG 3 y + METHOD method_23102 drawBox (Lnet/minecraft/class_4587;Lnet/minecraft/class_4597;Lnet/minecraft/class_238;FFFF)V + ARG 0 matrices + ARG 1 vertexConsumers + ARG 2 box + ARG 3 red + ARG 4 green + ARG 5 blue + ARG 6 alpha + METHOD method_23103 drawBox (Lnet/minecraft/class_4587;Lnet/minecraft/class_4597;Lnet/minecraft/class_2338;FFFFF)V + ARG 0 matrices + ARG 1 vertexConsumers + ARG 2 pos + ARG 3 expand + ARG 4 red + ARG 5 green + ARG 6 blue + ARG 7 alpha + METHOD method_23104 drawBox (Lnet/minecraft/class_4587;Lnet/minecraft/class_4597;Lnet/minecraft/class_2338;Lnet/minecraft/class_2338;FFFF)V + ARG 0 matrices + ARG 1 vertexConsumers + ARG 2 pos1 + ARG 3 pos2 + ARG 4 red + ARG 5 green + ARG 6 blue + ARG 7 alpha + METHOD method_23105 drawString (Lnet/minecraft/class_4587;Lnet/minecraft/class_4597;Ljava/lang/String;DDDI)V + ARG 0 matrices + ARG 1 vertexConsumers + ARG 2 string + ARG 3 x + ARG 5 y + ARG 7 z + ARG 9 color + METHOD method_23106 drawString (Lnet/minecraft/class_4587;Lnet/minecraft/class_4597;Ljava/lang/String;DDDIF)V + ARG 0 matrices + ARG 1 vertexConsumers + ARG 2 string + ARG 3 x + ARG 5 y + ARG 7 z + ARG 9 color + ARG 10 size + METHOD method_23107 drawString (Lnet/minecraft/class_4587;Lnet/minecraft/class_4597;Ljava/lang/String;DDDIFZFZ)V + ARG 0 matrices + ARG 1 vertexConsumers + ARG 2 string + ARG 3 x + ARG 5 y + ARG 7 z + ARG 9 color + ARG 10 size + ARG 11 center + ARG 12 offset + ARG 13 visibleThroughObjects + METHOD method_23108 drawString (Lnet/minecraft/class_4587;Lnet/minecraft/class_4597;Ljava/lang/String;IIII)V + ARG 0 matrices + ARG 1 vertexConsumers + ARG 2 string + ARG 3 x + ARG 4 y ARG 5 z - ARG 7 color - METHOD method_23106 drawString (Ljava/lang/String;DDDIF)V - ARG 0 string - ARG 1 x - ARG 3 y - ARG 5 z - ARG 7 color - ARG 8 size - METHOD method_23107 drawString (Ljava/lang/String;DDDIFZFZ)V - ARG 0 string - ARG 1 x - ARG 3 y - ARG 5 z - ARG 7 color - ARG 8 size - ARG 9 center - ARG 10 offset - ARG 11 visibleThroughObjects - METHOD method_23108 drawString (Ljava/lang/String;IIII)V - ARG 0 string - ARG 1 x - ARG 2 y - ARG 3 z - ARG 4 color + ARG 6 color METHOD method_3713 toggleShowChunkBorder ()Z CLASS class_864 Renderer METHOD method_20414 clear ()V diff --git a/mappings/net/minecraft/client/render/debug/GameEventDebugRenderer.mapping b/mappings/net/minecraft/client/render/debug/GameEventDebugRenderer.mapping index caa1bd6409..ca86bc5fbe 100644 --- a/mappings/net/minecraft/client/render/debug/GameEventDebugRenderer.mapping +++ b/mappings/net/minecraft/client/render/debug/GameEventDebugRenderer.mapping @@ -6,34 +6,35 @@ CLASS net/minecraft/class_5739 net/minecraft/client/render/debug/GameEventDebugR ARG 1 client METHOD method_33086 (Lnet/minecraft/class_1937;Lnet/minecraft/class_243;Lnet/minecraft/class_5739$class_5741;)Z ARG 2 listener - METHOD method_33087 addEvent (Lnet/minecraft/class_5712;Lnet/minecraft/class_243;)V - ARG 1 event + METHOD method_33087 addEvent (Lnet/minecraft/class_5321;Lnet/minecraft/class_243;)V + ARG 1 eventKey ARG 2 pos METHOD method_33088 addListener (Lnet/minecraft/class_5716;I)V ARG 1 positionSource ARG 2 range - METHOD method_33089 drawBoxIfCameraReady (Lnet/minecraft/class_238;FFFF)V - ARG 0 box - ARG 1 red - ARG 2 green - ARG 3 blue - ARG 4 alpha - METHOD method_33090 (Lnet/minecraft/class_287;DDDLnet/minecraft/class_243;)V - ARG 7 pos + METHOD method_33089 drawBoxIfCameraReady (Lnet/minecraft/class_4587;Lnet/minecraft/class_4597;Lnet/minecraft/class_238;FFFF)V + ARG 0 matrices + ARG 1 vertexConsumers + ARG 2 box + ARG 3 red + ARG 4 green + ARG 5 blue + ARG 6 alpha + METHOD method_33090 (Lnet/minecraft/class_4587;Lnet/minecraft/class_4588;DDDLnet/minecraft/class_243;)V + ARG 8 pos METHOD method_33091 (Lnet/minecraft/class_5739$class_5741;Lnet/minecraft/class_4587;Lnet/minecraft/class_4588;DDDLnet/minecraft/class_243;)V ARG 9 pos - METHOD method_33092 (Lnet/minecraft/class_243;)V - ARG 0 pos + METHOD method_33092 (Lnet/minecraft/class_4587;Lnet/minecraft/class_4597;Lnet/minecraft/class_243;)V + ARG 2 pos CLASS class_5740 Entry FIELD comp_678 startingMs J - FIELD comp_679 event Lnet/minecraft/class_5712; + FIELD comp_679 event Lnet/minecraft/class_5321; FIELD comp_680 pos Lnet/minecraft/class_243; - METHOD (JLnet/minecraft/class_5712;Lnet/minecraft/class_243;)V + METHOD (JLnet/minecraft/class_5321;Lnet/minecraft/class_243;)V ARG 1 startingMs - ARG 3 event ARG 4 pos METHOD comp_678 startingMs ()J - METHOD comp_679 event ()Lnet/minecraft/class_5712; + METHOD comp_679 event ()Lnet/minecraft/class_5321; METHOD comp_680 pos ()Lnet/minecraft/class_243; METHOD method_33093 hasExpired ()Z CLASS class_5741 Listener diff --git a/mappings/net/minecraft/client/render/debug/GameTestDebugRenderer.mapping b/mappings/net/minecraft/client/render/debug/GameTestDebugRenderer.mapping index 79d3971c04..4348e05803 100644 --- a/mappings/net/minecraft/client/render/debug/GameTestDebugRenderer.mapping +++ b/mappings/net/minecraft/client/render/debug/GameTestDebugRenderer.mapping @@ -8,9 +8,14 @@ CLASS net/minecraft/class_4503 net/minecraft/client/render/debug/GameTestDebugRe ARG 4 duration METHOD method_23110 (JLjava/util/Map$Entry;)Z ARG 2 entry - METHOD method_23111 renderMarker (Lnet/minecraft/class_2338;Lnet/minecraft/class_4503$class_4504;)V - ARG 1 pos - ARG 2 marker + METHOD method_23111 renderMarker (Lnet/minecraft/class_4587;Lnet/minecraft/class_4597;Lnet/minecraft/class_2338;Lnet/minecraft/class_4503$class_4504;)V + ARG 1 matrices + ARG 2 vertexConsumers + ARG 3 pos + ARG 4 marker + METHOD method_49048 (Lnet/minecraft/class_4587;Lnet/minecraft/class_4597;Lnet/minecraft/class_2338;Lnet/minecraft/class_4503$class_4504;)V + ARG 3 pos + ARG 4 marker CLASS class_4504 Marker FIELD field_20521 color I FIELD field_20522 message Ljava/lang/String; diff --git a/mappings/net/minecraft/client/render/debug/GoalSelectorDebugRenderer.mapping b/mappings/net/minecraft/client/render/debug/GoalSelectorDebugRenderer.mapping index 958833395c..1ef30218f6 100644 --- a/mappings/net/minecraft/client/render/debug/GoalSelectorDebugRenderer.mapping +++ b/mappings/net/minecraft/client/render/debug/GoalSelectorDebugRenderer.mapping @@ -1,20 +1,13 @@ CLASS net/minecraft/class_4205 net/minecraft/client/render/debug/GoalSelectorDebugRenderer FIELD field_18780 client Lnet/minecraft/class_310; - FIELD field_18781 goalSelectors Ljava/util/Map; + FIELD field_18781 goalSelectors Lit/unimi/dsi/fastutil/ints/Int2ObjectMap; FIELD field_32902 RANGE I METHOD (Lnet/minecraft/class_310;)V ARG 1 client - METHOD method_19430 setGoalSelectorList (ILjava/util/List;)V + METHOD method_19430 setGoalSelectorList (ILnet/minecraft/class_2338;Ljava/util/List;)V ARG 1 index - ARG 2 selectors - METHOD method_23116 (Lnet/minecraft/class_2338;Ljava/lang/Integer;Ljava/util/List;)V - ARG 1 index - ARG 2 selectors + ARG 2 pos + ARG 3 goals METHOD method_35799 removeGoalSelectorList (I)V ARG 1 index - CLASS class_4206 GoalSelector - FIELD field_18782 pos Lnet/minecraft/class_2338; - FIELD field_18784 name Ljava/lang/String; - METHOD (Lnet/minecraft/class_2338;ILjava/lang/String;Z)V - ARG 1 pos - ARG 3 name + CLASS class_8683 Entity diff --git a/mappings/net/minecraft/client/render/debug/HeightmapDebugRenderer.mapping b/mappings/net/minecraft/client/render/debug/HeightmapDebugRenderer.mapping index 06ef9f7950..f27a674a07 100644 --- a/mappings/net/minecraft/client/render/debug/HeightmapDebugRenderer.mapping +++ b/mappings/net/minecraft/client/render/debug/HeightmapDebugRenderer.mapping @@ -4,5 +4,5 @@ CLASS net/minecraft/class_867 net/minecraft/client/render/debug/HeightmapDebugRe FIELD field_4613 client Lnet/minecraft/class_310; METHOD (Lnet/minecraft/class_310;)V ARG 1 client - METHOD method_27037 getColorForHeightmapType (Lnet/minecraft/class_2902$class_2903;)Lnet/minecraft/class_1160; + METHOD method_27037 getColorForHeightmapType (Lnet/minecraft/class_2902$class_2903;)Lorg/joml/Vector3f; ARG 1 type diff --git a/mappings/net/minecraft/client/render/debug/LightDebugRenderer.mapping b/mappings/net/minecraft/client/render/debug/LightDebugRenderer.mapping new file mode 100644 index 0000000000..dc3f1b75d2 --- /dev/null +++ b/mappings/net/minecraft/client/render/debug/LightDebugRenderer.mapping @@ -0,0 +1,75 @@ +CLASS net/minecraft/class_8520 net/minecraft/client/render/debug/LightDebugRenderer + FIELD field_44675 UPDATE_INTERVAL Ljava/time/Duration; + FIELD field_44676 RADIUS I + FIELD field_44677 READY_SHAPE_COLOR Lorg/joml/Vector4f; + FIELD field_44678 DEFAULT_SHAPE_COLOR Lorg/joml/Vector4f; + FIELD field_44679 client Lnet/minecraft/class_310; + FIELD field_44680 lightType Lnet/minecraft/class_1944; + FIELD field_44681 prevUpdateTime Ljava/time/Instant; + FIELD field_44682 data Lnet/minecraft/class_8520$class_8521; + METHOD (Lnet/minecraft/class_310;Lnet/minecraft/class_1944;)V + ARG 1 client + ARG 2 lightType + METHOD method_51457 drawFaces (Lnet/minecraft/class_4587;Lnet/minecraft/class_251;Lnet/minecraft/class_4076;Lnet/minecraft/class_4588;DDDLorg/joml/Vector4f;)V + ARG 0 matrices + ARG 1 shape + ARG 2 sectionPos + ARG 3 vertexConsumer + ARG 4 cameraX + ARG 6 cameraY + ARG 8 cameraZ + ARG 10 color + METHOD method_51458 drawEdges (Lnet/minecraft/class_4587;Lnet/minecraft/class_251;Lnet/minecraft/class_4076;Lnet/minecraft/class_4597;DDDLorg/joml/Vector4f;)V + ARG 0 matrices + ARG 1 shape + ARG 2 sectionPos + ARG 3 vertexConsumers + ARG 4 cameraX + ARG 6 cameraY + ARG 8 cameraZ + ARG 10 color + METHOD method_51459 drawEdge (Lnet/minecraft/class_4587;Lnet/minecraft/class_4588;DDDIIIIIILorg/joml/Vector4f;)V + ARG 0 matrices + ARG 1 vertexConsumer + ARG 2 cameraX + ARG 4 cameraY + ARG 6 cameraZ + ARG 8 x1 + ARG 9 y1 + ARG 10 z1 + ARG 11 x2 + ARG 12 y2 + ARG 13 z + ARG 14 color + METHOD method_51460 drawFace (Lnet/minecraft/class_4587;Lnet/minecraft/class_4588;Lnet/minecraft/class_2350;DDDIIILorg/joml/Vector4f;)V + ARG 0 matrices + ARG 1 vertexConsumer + ARG 2 direction + ARG 3 cameraX + ARG 5 cameraY + ARG 7 cameraZ + ARG 9 x + ARG 10 y + ARG 11 z + ARG 12 color + METHOD method_51461 (Lnet/minecraft/class_4076;Lnet/minecraft/class_4587;Lnet/minecraft/class_4588;DDDLorg/joml/Vector4f;Lnet/minecraft/class_2350;III)V + ARG 10 direction + ARG 11 offsetX + ARG 12 offsetY + ARG 13 offsetZ + METHOD method_51462 (Lnet/minecraft/class_4076;Lnet/minecraft/class_4597;Lnet/minecraft/class_4587;DDDLorg/joml/Vector4f;IIIIII)V + ARG 10 x1 + ARG 11 y1 + ARG 12 z1 + ARG 13 x2 + ARG 14 y2 + ARG 15 z2 + CLASS class_8521 Data + FIELD field_44684 readyShape Lnet/minecraft/class_251; + FIELD field_44685 shape Lnet/minecraft/class_251; + FIELD field_44686 minSectionPos Lnet/minecraft/class_4076; + METHOD (Lnet/minecraft/class_3568;Lnet/minecraft/class_4076;ILnet/minecraft/class_1944;)V + ARG 1 lightingProvider + ARG 2 sectionPos + ARG 3 radius + ARG 4 lightType diff --git a/mappings/net/minecraft/client/render/debug/PathfindingDebugRenderer.mapping b/mappings/net/minecraft/client/render/debug/PathfindingDebugRenderer.mapping index fd0ee16d46..2ca6017530 100644 --- a/mappings/net/minecraft/client/render/debug/PathfindingDebugRenderer.mapping +++ b/mappings/net/minecraft/client/render/debug/PathfindingDebugRenderer.mapping @@ -5,32 +5,28 @@ CLASS net/minecraft/class_868 net/minecraft/client/render/debug/PathfindingDebug FIELD field_4615 pathTimes Ljava/util/Map; FIELD field_4616 paths Ljava/util/Map; FIELD field_4617 nodeSizes Ljava/util/Map; - METHOD method_23117 drawPathLines (Lnet/minecraft/class_11;DDD)V - ARG 0 path - ARG 1 cameraX - ARG 3 cameraY - ARG 5 cameraZ - METHOD method_23118 drawPath (Lnet/minecraft/class_11;FZZDDD)V - ARG 0 path - ARG 1 nodeSize - ARG 2 drawDebugNodes - ARG 3 drawLabels - ARG 4 cameraX - ARG 6 cameraY - ARG 8 cameraZ + METHOD method_23117 drawPathLines (Lnet/minecraft/class_4587;Lnet/minecraft/class_4588;Lnet/minecraft/class_11;DDD)V + ARG 0 matrices + ARG 1 vertexConsumers + ARG 2 path + ARG 3 cameraX + ARG 5 cameraY + ARG 7 cameraZ + METHOD method_23118 drawPath (Lnet/minecraft/class_4587;Lnet/minecraft/class_4597;Lnet/minecraft/class_11;FZZDDD)V + ARG 0 matrices + ARG 1 vertexConsumers + ARG 2 path + ARG 3 nodeSize + ARG 4 drawDebugNodes + ARG 5 drawLabels + ARG 6 cameraX + ARG 8 cameraY + ARG 10 cameraZ METHOD method_23119 getManhattanDistance (Lnet/minecraft/class_2338;DDD)F ARG 0 pos ARG 1 x ARG 3 y ARG 5 z - METHOD method_23121 drawPathInternal (Lnet/minecraft/class_11;FZZDDD)V - ARG 0 path - ARG 1 nodeSize - ARG 2 drawDebugNodes - ARG 3 drawLabels - ARG 4 cameraX - ARG 6 cameraY - ARG 8 cameraZ METHOD method_3869 addPath (ILnet/minecraft/class_11;F)V ARG 1 id ARG 2 path diff --git a/mappings/net/minecraft/client/render/debug/RaidCenterDebugRenderer.mapping b/mappings/net/minecraft/client/render/debug/RaidCenterDebugRenderer.mapping index 5003e83b92..93b5506a95 100644 --- a/mappings/net/minecraft/client/render/debug/RaidCenterDebugRenderer.mapping +++ b/mappings/net/minecraft/client/render/debug/RaidCenterDebugRenderer.mapping @@ -7,10 +7,14 @@ CLASS net/minecraft/class_4304 net/minecraft/client/render/debug/RaidCenterDebug ARG 1 client METHOD method_20561 setRaidCenters (Ljava/util/Collection;)V ARG 1 raidCenters - METHOD method_23122 drawRaidCenter (Lnet/minecraft/class_2338;)V - ARG 0 pos - METHOD method_23123 drawString (Ljava/lang/String;Lnet/minecraft/class_2338;I)V - ARG 0 string - ARG 1 pos - ARG 2 color + METHOD method_23122 drawRaidCenter (Lnet/minecraft/class_4587;Lnet/minecraft/class_4597;Lnet/minecraft/class_2338;)V + ARG 0 matrices + ARG 1 vertexConsumers + ARG 2 pos + METHOD method_23123 drawString (Lnet/minecraft/class_4587;Lnet/minecraft/class_4597;Ljava/lang/String;Lnet/minecraft/class_2338;I)V + ARG 0 matrices + ARG 1 vertexConsumers + ARG 2 string + ARG 3 pos + ARG 4 color METHOD method_23125 getCamera ()Lnet/minecraft/class_4184; diff --git a/mappings/net/minecraft/client/render/debug/StructureDebugRenderer.mapping b/mappings/net/minecraft/client/render/debug/StructureDebugRenderer.mapping index ff72ed1af2..fa183d37c4 100644 --- a/mappings/net/minecraft/client/render/debug/StructureDebugRenderer.mapping +++ b/mappings/net/minecraft/client/render/debug/StructureDebugRenderer.mapping @@ -5,7 +5,11 @@ CLASS net/minecraft/class_870 net/minecraft/client/render/debug/StructureDebugRe FIELD field_4627 structurePiecesBoundingBoxes Ljava/util/Map; METHOD (Lnet/minecraft/class_310;)V ARG 1 client - METHOD method_3871 addStructure (Lnet/minecraft/class_3341;Ljava/util/List;Ljava/util/List;Lnet/minecraft/class_2874;)V + METHOD method_3871 addStructure (Lnet/minecraft/class_3341;Ljava/util/List;Lnet/minecraft/class_5321;)V ARG 1 boundingBox - ARG 2 piecesBoundingBoxes - ARG 4 dimension + ARG 2 pieces + ARG 3 dimensionKey + METHOD method_52842 (Lnet/minecraft/class_5321;)Ljava/util/Map; + ARG 0 dimension + METHOD method_52843 (Lnet/minecraft/class_5321;)Ljava/util/Map; + ARG 0 dimension diff --git a/mappings/net/minecraft/client/render/debug/SupportingBlockDebugRenderer.mapping b/mappings/net/minecraft/client/render/debug/SupportingBlockDebugRenderer.mapping new file mode 100644 index 0000000000..c4cf4a209c --- /dev/null +++ b/mappings/net/minecraft/client/render/debug/SupportingBlockDebugRenderer.mapping @@ -0,0 +1,32 @@ +CLASS net/minecraft/class_8560 net/minecraft/client/render/debug/SupportingBlockDebugRenderer + FIELD field_44828 client Lnet/minecraft/class_310; + FIELD field_44829 lastEntityCheckTime D + FIELD field_44830 entities Ljava/util/List; + METHOD (Lnet/minecraft/class_310;)V + ARG 1 client + METHOD method_51789 getAdditionalDilation (Lnet/minecraft/class_1297;)D + ARG 1 entity + METHOD method_51790 renderBlockHighlights (Lnet/minecraft/class_4587;Lnet/minecraft/class_4597;DDDLnet/minecraft/class_1297;Ljava/util/function/DoubleSupplier;FFF)V + ARG 1 matrices + ARG 2 vertexConsumers + ARG 3 cameraX + ARG 5 cameraY + ARG 7 cameraZ + ARG 9 entity + ARG 10 extraDilation + ARG 11 red + ARG 12 green + ARG 13 blue + METHOD method_51791 renderBlockHighlight (Lnet/minecraft/class_2338;Lnet/minecraft/class_4587;DDDLnet/minecraft/class_4597;DFFF)V + ARG 1 pos + ARG 2 matrices + ARG 3 cameraX + ARG 5 cameraY + ARG 7 cameraZ + ARG 9 vertexConsumers + ARG 10 dilation + ARG 12 red + ARG 13 green + ARG 14 blue + METHOD method_51792 (Ljava/util/function/DoubleSupplier;Lnet/minecraft/class_1297;Lnet/minecraft/class_4587;DDDLnet/minecraft/class_4597;FFFLnet/minecraft/class_2338;)V + ARG 14 pos diff --git a/mappings/net/minecraft/client/render/debug/VillageDebugRenderer.mapping b/mappings/net/minecraft/client/render/debug/VillageDebugRenderer.mapping index 85a8295345..e1992b3679 100644 --- a/mappings/net/minecraft/client/render/debug/VillageDebugRenderer.mapping +++ b/mappings/net/minecraft/client/render/debug/VillageDebugRenderer.mapping @@ -18,7 +18,7 @@ CLASS net/minecraft/class_4207 net/minecraft/client/render/debug/VillageDebugRen FIELD field_32898 WHITE I METHOD (Lnet/minecraft/class_310;)V ARG 1 client - METHOD method_19432 addBrain (Lnet/minecraft/class_4207$class_4232;)V + METHOD method_19432 addBrain (Lnet/minecraft/class_8708$class_4232;)V ARG 1 brain METHOD method_19434 removePointOfInterest (Lnet/minecraft/class_2338;)V ARG 1 pos @@ -29,66 +29,84 @@ CLASS net/minecraft/class_4207 net/minecraft/client/render/debug/VillageDebugRen ARG 2 freeTicketCount METHOD method_23126 (Lnet/minecraft/class_1297;)V ARG 1 entity - METHOD method_23127 (Lnet/minecraft/class_2338;Lnet/minecraft/class_4207$class_4232;)Z + METHOD method_23127 (Lnet/minecraft/class_2338;Lnet/minecraft/class_8708$class_4232;)Z ARG 1 brain - METHOD method_23128 (Lnet/minecraft/class_2338;Lnet/minecraft/class_4207$class_4233;)V - ARG 2 poi - METHOD method_23129 (Lnet/minecraft/class_2338;Lnet/minecraft/class_2338;Ljava/util/List;)V + METHOD method_23128 (Lnet/minecraft/class_2338;Lnet/minecraft/class_4587;Lnet/minecraft/class_4597;Lnet/minecraft/class_4207$class_4233;)V + ARG 4 poi + METHOD method_23129 (Lnet/minecraft/class_2338;Lnet/minecraft/class_4587;Lnet/minecraft/class_4597;Lnet/minecraft/class_2338;Ljava/util/List;)V + ARG 4 pos + ARG 5 brains + METHOD method_23131 drawGhostPointOfInterest (Lnet/minecraft/class_4587;Lnet/minecraft/class_4597;Lnet/minecraft/class_2338;Ljava/util/List;)V + ARG 1 matrices + ARG 2 vertexConsumers + ARG 3 pos + ARG 4 brains + METHOD method_23132 drawString (Lnet/minecraft/class_4587;Lnet/minecraft/class_4597;Lnet/minecraft/class_2374;ILjava/lang/String;IF)V + ARG 0 matrices + ARG 1 vertexConsumers ARG 2 pos - ARG 3 brains - METHOD method_23131 drawGhostPointOfInterest (Lnet/minecraft/class_2338;Ljava/util/List;)V - ARG 1 pos - ARG 2 brains - METHOD method_23132 drawString (Lnet/minecraft/class_2374;ILjava/lang/String;IF)V - ARG 0 pos - ARG 1 offsetY + ARG 3 offsetY + ARG 4 string + ARG 5 color + ARG 6 size + METHOD method_23133 drawString (Lnet/minecraft/class_4587;Lnet/minecraft/class_4597;Ljava/lang/String;Lnet/minecraft/class_4207$class_4233;II)V + ARG 0 matrices + ARG 1 vertexConsumers ARG 2 string - ARG 3 color - ARG 4 size - METHOD method_23133 drawString (Ljava/lang/String;Lnet/minecraft/class_4207$class_4233;II)V - ARG 0 string - ARG 1 pointOfInterest - ARG 2 offsetY - ARG 3 color - METHOD method_23134 drawString (Ljava/lang/String;Lnet/minecraft/class_2338;II)V - ARG 0 string - ARG 1 pos - ARG 2 offsetY - ARG 3 color - METHOD method_23135 draw (DDD)V - ARG 1 x - ARG 3 y - ARG 5 z - METHOD method_23136 drawPath (Lnet/minecraft/class_4207$class_4232;DDD)V - ARG 1 brain - ARG 2 cameraX - ARG 4 cameraY - ARG 6 cameraZ - METHOD method_23137 drawPointOfInterestInfo (Lnet/minecraft/class_4207$class_4233;)V - ARG 1 pointOfInterest - METHOD method_23138 drawPointOfInterest (Lnet/minecraft/class_2338;)V - ARG 0 pos - METHOD method_23140 drawBrain (Lnet/minecraft/class_4207$class_4232;DDD)V - ARG 1 brain - ARG 2 cameraX - ARG 4 cameraY - ARG 6 cameraZ + ARG 3 pointOfInterest + ARG 4 offsetY + ARG 5 color + METHOD method_23134 drawString (Lnet/minecraft/class_4587;Lnet/minecraft/class_4597;Ljava/lang/String;Lnet/minecraft/class_2338;II)V + ARG 0 matrices + ARG 1 vertexConsumers + ARG 2 string + ARG 3 pos + ARG 4 offsetY + ARG 5 color + METHOD method_23135 draw (Lnet/minecraft/class_4587;Lnet/minecraft/class_4597;DDD)V + ARG 1 matrices + ARG 2 vertexConsumers + ARG 3 x + ARG 5 y + ARG 7 z + METHOD method_23136 drawPath (Lnet/minecraft/class_4587;Lnet/minecraft/class_4597;Lnet/minecraft/class_8708$class_4232;DDD)V + ARG 1 matrices + ARG 2 vertexConsumers + ARG 3 brain + ARG 4 cameraX + ARG 6 cameraY + ARG 8 cameraZ + METHOD method_23137 drawPointOfInterestInfo (Lnet/minecraft/class_4587;Lnet/minecraft/class_4597;Lnet/minecraft/class_4207$class_4233;)V + ARG 1 matrices + ARG 2 vertexConsumers + ARG 3 pointOfInterest + METHOD method_23138 drawPointOfInterest (Lnet/minecraft/class_4587;Lnet/minecraft/class_4597;Lnet/minecraft/class_2338;)V + ARG 0 matrices + ARG 1 vertexConsumers + ARG 2 pos + METHOD method_23140 drawBrain (Lnet/minecraft/class_4587;Lnet/minecraft/class_4597;Lnet/minecraft/class_8708$class_4232;DDD)V + ARG 1 matrices + ARG 2 vertexConsumers + ARG 3 brain + ARG 4 cameraX + ARG 6 cameraY + ARG 8 cameraZ METHOD method_23141 getNamesOfPointOfInterestTicketHolders (Lnet/minecraft/class_4207$class_4233;)Ljava/util/Set; ARG 1 pointOfInterest METHOD method_23142 getBrainsContainingPointOfInterest (Lnet/minecraft/class_2338;)Ljava/util/Collection; ARG 1 pointOfInterest METHOD method_23144 getGhostPointsOfInterest ()Ljava/util/Map; - METHOD method_23145 isTargeted (Lnet/minecraft/class_4207$class_4232;)Z + METHOD method_23145 isTargeted (Lnet/minecraft/class_8708$class_4232;)Z ARG 1 brain METHOD method_23146 updateTargetedEntity ()V - METHOD method_23147 isClose (Lnet/minecraft/class_4207$class_4232;)Z + METHOD method_23147 isClose (Lnet/minecraft/class_8708$class_4232;)Z ARG 1 brain - METHOD method_23148 (DDDLnet/minecraft/class_4207$class_4232;)V - ARG 7 brain + METHOD method_23148 (Lnet/minecraft/class_4587;Lnet/minecraft/class_4597;DDDLnet/minecraft/class_8708$class_4232;)V + ARG 9 brain METHOD method_24804 (Ljava/util/Map$Entry;)Z ARG 1 entry METHOD method_24805 removeRemovedBrains ()V - METHOD method_29384 (Lnet/minecraft/class_2338;Lnet/minecraft/class_4207$class_4232;)Z + METHOD method_29384 (Lnet/minecraft/class_2338;Lnet/minecraft/class_8708$class_4232;)Z ARG 1 brain METHOD method_29385 getNamesOfJobSitePotentialOwners (Lnet/minecraft/class_4207$class_4233;)Ljava/util/Set; ARG 1 potentialJobSite @@ -98,48 +116,13 @@ CLASS net/minecraft/class_4207 net/minecraft/client/render/debug/VillageDebugRen ARG 0 pos METHOD method_35797 removeBrain (I)V ARG 1 entityId - METHOD method_35798 (ILnet/minecraft/class_4207$class_4232;)Z + METHOD method_35798 (ILnet/minecraft/class_8708$class_4232;)Z ARG 1 brain - CLASS class_4232 Brain - FIELD field_18923 uuid Ljava/util/UUID; - FIELD field_18924 entityId I - FIELD field_18925 profession Ljava/lang/String; - FIELD field_18926 pos Lnet/minecraft/class_2374; - FIELD field_18927 possibleActivities Ljava/util/List; - FIELD field_18928 runningTasks Ljava/util/List; - FIELD field_18930 pointsOfInterest Ljava/util/Set; - FIELD field_19328 name Ljava/lang/String; - FIELD field_19329 xp I - FIELD field_19330 path Lnet/minecraft/class_11; - FIELD field_19372 inventory Ljava/lang/String; - FIELD field_19373 wantsGolem Z - FIELD field_19374 memories Ljava/util/List; - FIELD field_19375 gossips Ljava/util/List; - FIELD field_22406 health F - FIELD field_22407 maxHealth F - FIELD field_25287 potentialJobSites Ljava/util/Set; - FIELD field_38348 angerLevel I - METHOD (Ljava/util/UUID;ILjava/lang/String;Ljava/lang/String;IFFLnet/minecraft/class_2374;Ljava/lang/String;Lnet/minecraft/class_11;ZI)V - ARG 1 uuid - ARG 2 entityId - ARG 3 name - ARG 4 profession - ARG 5 xp - ARG 6 health - ARG 7 maxHealth - ARG 8 pos - ARG 9 inventory - ARG 10 path - ARG 11 wantsGolem - ARG 12 angerLevel - METHOD method_23149 getUuid ()Ljava/util/UUID; - METHOD method_23151 isPointOfInterest (Lnet/minecraft/class_2338;)Z - ARG 1 pos - METHOD method_29388 isPotentialJobSite (Lnet/minecraft/class_2338;)Z - ARG 1 pos CLASS class_4233 PointOfInterest FIELD field_18931 pos Lnet/minecraft/class_2338; + FIELD field_18932 type Ljava/lang/String; FIELD field_18933 freeTicketCount I METHOD (Lnet/minecraft/class_2338;Ljava/lang/String;I)V ARG 1 pos + ARG 2 type ARG 3 freeTicketCount diff --git a/mappings/net/minecraft/client/render/debug/VillageSectionsDebugRenderer.mapping b/mappings/net/minecraft/client/render/debug/VillageSectionsDebugRenderer.mapping index f614c465b1..eb26a1b1eb 100644 --- a/mappings/net/minecraft/client/render/debug/VillageSectionsDebugRenderer.mapping +++ b/mappings/net/minecraft/client/render/debug/VillageSectionsDebugRenderer.mapping @@ -1,15 +1,13 @@ CLASS net/minecraft/class_4841 net/minecraft/client/render/debug/VillageSectionsDebugRenderer FIELD field_22409 sections Ljava/util/Set; FIELD field_32917 RANGE I - METHOD method_24806 drawSections (DDD)V - ARG 1 cameraX - ARG 3 cameraY - ARG 5 cameraZ - METHOD method_24807 (Lnet/minecraft/class_2338;Lnet/minecraft/class_4076;)V - ARG 1 section METHOD method_24808 addSection (Lnet/minecraft/class_4076;)V ARG 1 pos METHOD method_24809 removeSection (Lnet/minecraft/class_4076;)V ARG 1 pos - METHOD method_24810 drawBoxAtCenterOf (Lnet/minecraft/class_4076;)V - ARG 0 pos + METHOD method_24810 drawBoxAtCenterOf (Lnet/minecraft/class_4587;Lnet/minecraft/class_4597;Lnet/minecraft/class_4076;)V + ARG 0 matrices + ARG 1 vertexConsumers + ARG 2 sectionPos + METHOD method_49049 (Lnet/minecraft/class_2338;Lnet/minecraft/class_4587;Lnet/minecraft/class_4597;Lnet/minecraft/class_4076;)V + ARG 3 section diff --git a/mappings/net/minecraft/client/render/entity/BipedEntityRenderer.mapping b/mappings/net/minecraft/client/render/entity/BipedEntityRenderer.mapping index bea9f2fca5..e995070a04 100644 --- a/mappings/net/minecraft/client/render/entity/BipedEntityRenderer.mapping +++ b/mappings/net/minecraft/client/render/entity/BipedEntityRenderer.mapping @@ -1,5 +1,4 @@ CLASS net/minecraft/class_909 net/minecraft/client/render/entity/BipedEntityRenderer - FIELD field_4713 TEXTURE Lnet/minecraft/class_2960; METHOD (Lnet/minecraft/class_5617$class_5618;Lnet/minecraft/class_572;F)V ARG 1 ctx ARG 2 model diff --git a/mappings/net/minecraft/client/render/entity/BoatEntityRenderer.mapping b/mappings/net/minecraft/client/render/entity/BoatEntityRenderer.mapping index e78a2f3b4d..3f802d7d63 100644 --- a/mappings/net/minecraft/client/render/entity/BoatEntityRenderer.mapping +++ b/mappings/net/minecraft/client/render/entity/BoatEntityRenderer.mapping @@ -10,7 +10,7 @@ CLASS net/minecraft/class_881 net/minecraft/client/render/entity/BoatEntityRende METHOD method_42602 getTexture (Lnet/minecraft/class_1690$class_1692;Z)Ljava/lang/String; ARG 0 type ARG 1 chest - METHOD method_42603 createModel (Lnet/minecraft/class_5617$class_5618;Lnet/minecraft/class_1690$class_1692;Z)Lnet/minecraft/class_554; + METHOD method_42603 createModel (Lnet/minecraft/class_5617$class_5618;Lnet/minecraft/class_1690$class_1692;Z)Lnet/minecraft/class_4595; ARG 1 ctx ARG 2 type ARG 3 chest diff --git a/mappings/net/minecraft/client/render/entity/CamelEntityRenderer.mapping b/mappings/net/minecraft/client/render/entity/CamelEntityRenderer.mapping new file mode 100644 index 0000000000..8db6bd140d --- /dev/null +++ b/mappings/net/minecraft/client/render/entity/CamelEntityRenderer.mapping @@ -0,0 +1,5 @@ +CLASS net/minecraft/class_7763 net/minecraft/client/render/entity/CamelEntityRenderer + FIELD field_40529 TEXTURE Lnet/minecraft/class_2960; + METHOD (Lnet/minecraft/class_5617$class_5618;Lnet/minecraft/class_5601;)V + ARG 1 ctx + ARG 2 layer diff --git a/mappings/net/minecraft/client/render/entity/DisplayEntityRenderer.mapping b/mappings/net/minecraft/client/render/entity/DisplayEntityRenderer.mapping new file mode 100644 index 0000000000..023c8daa12 --- /dev/null +++ b/mappings/net/minecraft/client/render/entity/DisplayEntityRenderer.mapping @@ -0,0 +1,25 @@ +CLASS net/minecraft/class_8138 net/minecraft/client/render/entity/DisplayEntityRenderer + FIELD field_42525 renderDispatcher Lnet/minecraft/class_898; + METHOD method_49052 render (Lnet/minecraft/class_8113;Ljava/lang/Object;Lnet/minecraft/class_4587;Lnet/minecraft/class_4597;IF)V + ARG 1 entity + ARG 2 data + ARG 3 matrices + ARG 4 vertexConsumers + ARG 5 brightness + ARG 6 lerpProgress + METHOD method_49053 getBillboardRotation (Lnet/minecraft/class_8113$class_8229;Lnet/minecraft/class_8113;FLorg/joml/Quaternionf;)Lorg/joml/Quaternionf; + ARG 1 renderState + ARG 2 entity + ARG 3 yaw + ARG 4 rotation + METHOD method_49921 getData (Lnet/minecraft/class_8113;)Ljava/lang/Object; + ARG 1 entity + CLASS class_8139 BlockDisplayEntityRenderer + FIELD field_42528 blockRenderManager Lnet/minecraft/class_776; + CLASS class_8140 ItemDisplayEntityRenderer + FIELD field_42529 itemRenderer Lnet/minecraft/class_918; + CLASS class_8141 TextDisplayEntityRenderer + FIELD field_42531 displayTextRenderer Lnet/minecraft/class_327; + METHOD method_49057 getLines (Lnet/minecraft/class_2561;I)Lnet/minecraft/class_8113$class_8123$class_8125; + ARG 1 text + ARG 2 width diff --git a/mappings/net/minecraft/client/render/entity/DragonFireballEntityRenderer.mapping b/mappings/net/minecraft/client/render/entity/DragonFireballEntityRenderer.mapping index 3ea583b2a6..bb226a828a 100644 --- a/mappings/net/minecraft/client/render/entity/DragonFireballEntityRenderer.mapping +++ b/mappings/net/minecraft/client/render/entity/DragonFireballEntityRenderer.mapping @@ -1,7 +1,7 @@ CLASS net/minecraft/class_891 net/minecraft/client/render/entity/DragonFireballEntityRenderer FIELD field_21735 LAYER Lnet/minecraft/class_1921; FIELD field_4661 TEXTURE Lnet/minecraft/class_2960; - METHOD method_23837 produceVertex (Lnet/minecraft/class_4588;Lnet/minecraft/class_1159;Lnet/minecraft/class_4581;IFIII)V + METHOD method_23837 produceVertex (Lnet/minecraft/class_4588;Lorg/joml/Matrix4f;Lorg/joml/Matrix3f;IFIII)V ARG 0 vertexConsumer ARG 1 positionMatrix ARG 2 normalMatrix diff --git a/mappings/net/minecraft/client/render/entity/EnderDragonEntityRenderer.mapping b/mappings/net/minecraft/client/render/entity/EnderDragonEntityRenderer.mapping index 8f22ec61e1..99c6174723 100644 --- a/mappings/net/minecraft/client/render/entity/EnderDragonEntityRenderer.mapping +++ b/mappings/net/minecraft/client/render/entity/EnderDragonEntityRenderer.mapping @@ -9,25 +9,25 @@ CLASS net/minecraft/class_895 net/minecraft/client/render/entity/EnderDragonEnti FIELD field_4668 CRYSTAL_BEAM_TEXTURE Lnet/minecraft/class_2960; FIELD field_4669 EXPLOSION_TEXTURE Lnet/minecraft/class_2960; FIELD field_4670 TEXTURE Lnet/minecraft/class_2960; - METHOD method_23156 (Lnet/minecraft/class_4588;Lnet/minecraft/class_1159;FF)V - ARG 0 vertices + METHOD method_23156 putDeathLightNegativeXTerminalVertex (Lnet/minecraft/class_4588;Lorg/joml/Matrix4f;FF)V + ARG 0 buffer ARG 1 matrix - ARG 2 y - ARG 3 x - METHOD method_23157 (Lnet/minecraft/class_4588;Lnet/minecraft/class_1159;I)V - ARG 0 vertices + ARG 2 radius + ARG 3 width + METHOD method_23157 putDeathLightSourceVertex (Lnet/minecraft/class_4588;Lorg/joml/Matrix4f;I)V + ARG 0 buffer ARG 1 matrix ARG 2 alpha - METHOD method_23158 (Lnet/minecraft/class_4588;Lnet/minecraft/class_1159;FF)V - ARG 0 vertices + METHOD method_23158 putDeathLightPositiveXTerminalVertex (Lnet/minecraft/class_4588;Lorg/joml/Matrix4f;FF)V + ARG 0 buffer ARG 1 matrix - ARG 2 y - ARG 3 x - METHOD method_23159 (Lnet/minecraft/class_4588;Lnet/minecraft/class_1159;FF)V - ARG 0 vertices + ARG 2 radius + ARG 3 width + METHOD method_23159 putDeathLightPositiveZTerminalVertex (Lnet/minecraft/class_4588;Lorg/joml/Matrix4f;FF)V + ARG 0 buffer ARG 1 matrix - ARG 2 y - ARG 3 z + ARG 2 radius + ARG 3 width METHOD method_32165 getTexturedModelData ()Lnet/minecraft/class_5607; METHOD method_3917 renderCrystalBeam (FFFFILnet/minecraft/class_4587;Lnet/minecraft/class_4597;I)V ARG 0 dx diff --git a/mappings/net/minecraft/client/render/entity/EntityRenderDispatcher.mapping b/mappings/net/minecraft/client/render/entity/EntityRenderDispatcher.mapping index 7294d1eb2c..49d1b6b09e 100644 --- a/mappings/net/minecraft/client/render/entity/EntityRenderDispatcher.mapping +++ b/mappings/net/minecraft/client/render/entity/EntityRenderDispatcher.mapping @@ -1,6 +1,6 @@ CLASS net/minecraft/class_898 net/minecraft/client/render/entity/EntityRenderDispatcher FIELD field_21009 SHADOW_LAYER Lnet/minecraft/class_1921; - FIELD field_21794 rotation Lnet/minecraft/class_1158; + FIELD field_21794 rotation Lorg/joml/Quaternionf; FIELD field_27759 itemRenderer Lnet/minecraft/class_918; FIELD field_27760 modelLoader Lnet/minecraft/class_5599; FIELD field_38886 blockRenderManager Lnet/minecraft/class_776; @@ -40,16 +40,17 @@ CLASS net/minecraft/class_898 net/minecraft/client/render/entity/EntityRenderDis ARG 5 z ARG 6 u ARG 7 v - METHOD method_23163 renderShadowPart (Lnet/minecraft/class_4587$class_4665;Lnet/minecraft/class_4588;Lnet/minecraft/class_4538;Lnet/minecraft/class_2338;DDDFF)V + METHOD method_23163 renderShadowPart (Lnet/minecraft/class_4587$class_4665;Lnet/minecraft/class_4588;Lnet/minecraft/class_2791;Lnet/minecraft/class_4538;Lnet/minecraft/class_2338;DDDFF)V ARG 0 entry ARG 1 vertices - ARG 2 world - ARG 3 pos - ARG 4 x - ARG 6 y - ARG 8 z - ARG 10 radius - ARG 11 opacity + ARG 2 chunk + ARG 3 world + ARG 4 pos + ARG 5 x + ARG 7 y + ARG 9 z + ARG 11 radius + ARG 12 opacity METHOD method_23165 renderFire (Lnet/minecraft/class_4587;Lnet/minecraft/class_4597;Lnet/minecraft/class_1297;)V ARG 1 matrices ARG 2 vertexConsumers @@ -67,9 +68,9 @@ CLASS net/minecraft/class_898 net/minecraft/client/render/entity/EntityRenderDis METHOD method_23839 getLight (Lnet/minecraft/class_1297;F)I ARG 1 entity ARG 2 tickDelta - METHOD method_24196 setRotation (Lnet/minecraft/class_1158;)V + METHOD method_24196 setRotation (Lorg/joml/Quaternionf;)V ARG 1 rotation - METHOD method_24197 getRotation ()Lnet/minecraft/class_1158; + METHOD method_24197 getRotation ()Lorg/joml/Quaternionf; METHOD method_3941 configure (Lnet/minecraft/class_1937;Lnet/minecraft/class_4184;Lnet/minecraft/class_1297;)V ARG 1 world ARG 2 camera diff --git a/mappings/net/minecraft/client/render/entity/EntityRendererFactory.mapping b/mappings/net/minecraft/client/render/entity/EntityRendererFactory.mapping index dac270b1bd..169519206a 100644 --- a/mappings/net/minecraft/client/render/entity/EntityRendererFactory.mapping +++ b/mappings/net/minecraft/client/render/entity/EntityRendererFactory.mapping @@ -26,3 +26,4 @@ CLASS net/minecraft/class_5617 net/minecraft/client/render/entity/EntityRenderer METHOD method_32171 getTextRenderer ()Lnet/minecraft/class_327; METHOD method_43337 getBlockRenderManager ()Lnet/minecraft/class_776; METHOD method_43338 getHeldItemRenderer ()Lnet/minecraft/class_759; + METHOD method_48481 getModelManager ()Lnet/minecraft/class_1092; diff --git a/mappings/net/minecraft/client/render/entity/EntityRenderers.mapping b/mappings/net/minecraft/client/render/entity/EntityRenderers.mapping index 272199eaaf..ec9d2bf749 100644 --- a/mappings/net/minecraft/client/render/entity/EntityRenderers.mapping +++ b/mappings/net/minecraft/client/render/entity/EntityRenderers.mapping @@ -2,7 +2,6 @@ CLASS net/minecraft/class_5619 net/minecraft/client/render/entity/EntityRenderer FIELD field_27767 LOGGER Lorg/slf4j/Logger; FIELD field_27768 RENDERER_FACTORIES Ljava/util/Map; FIELD field_27769 PLAYER_RENDERER_FACTORIES Ljava/util/Map; - FIELD field_32922 DEFAULT Ljava/lang/String; METHOD method_32172 isMissingRendererFactories ()Z METHOD method_32173 register (Lnet/minecraft/class_1299;Lnet/minecraft/class_5617;)V ARG 0 type @@ -10,8 +9,8 @@ CLASS net/minecraft/class_5619 net/minecraft/client/render/entity/EntityRenderer METHOD method_32174 (Lcom/google/common/collect/ImmutableMap$Builder;Lnet/minecraft/class_5617$class_5618;Lnet/minecraft/class_1299;Lnet/minecraft/class_5617;)V ARG 2 entityType ARG 3 factory - METHOD method_32175 (Lcom/google/common/collect/ImmutableMap$Builder;Lnet/minecraft/class_5617$class_5618;Ljava/lang/String;Lnet/minecraft/class_5617;)V - ARG 2 type + METHOD method_32175 (Lcom/google/common/collect/ImmutableMap$Builder;Lnet/minecraft/class_5617$class_5618;Lnet/minecraft/class_8685$class_7920;Lnet/minecraft/class_5617;)V + ARG 2 model ARG 3 factory METHOD method_32176 reloadEntityRenderers (Lnet/minecraft/class_5617$class_5618;)Ljava/util/Map; ARG 0 ctx @@ -67,3 +66,5 @@ CLASS net/minecraft/class_5619 net/minecraft/client/render/entity/EntityRenderer ARG 0 context METHOD method_42605 (Lnet/minecraft/class_5617$class_5618;)Lnet/minecraft/class_897; ARG 0 context + METHOD method_45802 (Lnet/minecraft/class_5617$class_5618;)Lnet/minecraft/class_897; + ARG 0 context diff --git a/mappings/net/minecraft/client/render/entity/ExperienceOrbEntityRenderer.mapping b/mappings/net/minecraft/client/render/entity/ExperienceOrbEntityRenderer.mapping index 04f901311e..ec58ba269d 100644 --- a/mappings/net/minecraft/client/render/entity/ExperienceOrbEntityRenderer.mapping +++ b/mappings/net/minecraft/client/render/entity/ExperienceOrbEntityRenderer.mapping @@ -1,7 +1,7 @@ CLASS net/minecraft/class_902 net/minecraft/client/render/entity/ExperienceOrbEntityRenderer FIELD field_21741 LAYER Lnet/minecraft/class_1921; FIELD field_4701 TEXTURE Lnet/minecraft/class_2960; - METHOD method_23171 vertex (Lnet/minecraft/class_4588;Lnet/minecraft/class_1159;Lnet/minecraft/class_4581;FFIIIFFI)V + METHOD method_23171 vertex (Lnet/minecraft/class_4588;Lorg/joml/Matrix4f;Lorg/joml/Matrix3f;FFIIIFFI)V ARG 0 vertexConsumer ARG 1 positionMatrix ARG 2 normalMatrix diff --git a/mappings/net/minecraft/client/render/entity/FishingBobberEntityRenderer.mapping b/mappings/net/minecraft/client/render/entity/FishingBobberEntityRenderer.mapping index 173e83d681..85381d8c41 100644 --- a/mappings/net/minecraft/client/render/entity/FishingBobberEntityRenderer.mapping +++ b/mappings/net/minecraft/client/render/entity/FishingBobberEntityRenderer.mapping @@ -9,7 +9,7 @@ CLASS net/minecraft/class_906 net/minecraft/client/render/entity/FishingBobberEn ARG 4 matrices ARG 5 segmentStart ARG 6 segmentEnd - METHOD method_23840 vertex (Lnet/minecraft/class_4588;Lnet/minecraft/class_1159;Lnet/minecraft/class_4581;IFIII)V + METHOD method_23840 vertex (Lnet/minecraft/class_4588;Lorg/joml/Matrix4f;Lorg/joml/Matrix3f;IFIII)V ARG 0 buffer ARG 1 matrix ARG 2 normalMatrix diff --git a/mappings/net/minecraft/client/render/entity/GuardianEntityRenderer.mapping b/mappings/net/minecraft/client/render/entity/GuardianEntityRenderer.mapping index 0c070284f7..1a8ad96706 100644 --- a/mappings/net/minecraft/client/render/entity/GuardianEntityRenderer.mapping +++ b/mappings/net/minecraft/client/render/entity/GuardianEntityRenderer.mapping @@ -6,7 +6,7 @@ CLASS net/minecraft/class_907 net/minecraft/client/render/entity/GuardianEntityR ARG 1 ctx ARG 2 shadowRadius ARG 3 layer - METHOD method_23173 vertex (Lnet/minecraft/class_4588;Lnet/minecraft/class_1159;Lnet/minecraft/class_4581;FFFIIIFF)V + METHOD method_23173 vertex (Lnet/minecraft/class_4588;Lorg/joml/Matrix4f;Lorg/joml/Matrix3f;FFFIIIFF)V ARG 0 vertexConsumer ARG 1 positionMatrix ARG 2 normalMatrix diff --git a/mappings/net/minecraft/client/render/entity/LightningEntityRenderer.mapping b/mappings/net/minecraft/client/render/entity/LightningEntityRenderer.mapping index 9e50f857d5..5d51957912 100644 --- a/mappings/net/minecraft/client/render/entity/LightningEntityRenderer.mapping +++ b/mappings/net/minecraft/client/render/entity/LightningEntityRenderer.mapping @@ -1,5 +1,5 @@ CLASS net/minecraft/class_919 net/minecraft/client/render/entity/LightningEntityRenderer - METHOD method_23183 drawBranch (Lnet/minecraft/class_1159;Lnet/minecraft/class_4588;FFIFFFFFFFZZZZ)V + METHOD method_23183 drawBranch (Lorg/joml/Matrix4f;Lnet/minecraft/class_4588;FFIFFFFFFFZZZZ)V ARG 0 matrix ARG 1 buffer ARG 2 x1 diff --git a/mappings/net/minecraft/client/render/entity/LlamaEntityRenderer.mapping b/mappings/net/minecraft/client/render/entity/LlamaEntityRenderer.mapping index 023fffca3a..957f7e57d5 100644 --- a/mappings/net/minecraft/client/render/entity/LlamaEntityRenderer.mapping +++ b/mappings/net/minecraft/client/render/entity/LlamaEntityRenderer.mapping @@ -1,5 +1,8 @@ CLASS net/minecraft/class_921 net/minecraft/client/render/entity/LlamaEntityRenderer - FIELD field_4736 TEXTURES [Lnet/minecraft/class_2960; + FIELD field_41631 CREAMY_TEXTURE Lnet/minecraft/class_2960; + FIELD field_41632 WHITE_TEXTURE Lnet/minecraft/class_2960; + FIELD field_41633 BROWN_TEXTURE Lnet/minecraft/class_2960; + FIELD field_41634 GRAY_TEXTURE Lnet/minecraft/class_2960; METHOD (Lnet/minecraft/class_5617$class_5618;Lnet/minecraft/class_5601;)V ARG 1 ctx ARG 2 layer diff --git a/mappings/net/minecraft/client/render/entity/MobEntityRenderer.mapping b/mappings/net/minecraft/client/render/entity/MobEntityRenderer.mapping index 07b2efb47e..e0bdae9504 100644 --- a/mappings/net/minecraft/client/render/entity/MobEntityRenderer.mapping +++ b/mappings/net/minecraft/client/render/entity/MobEntityRenderer.mapping @@ -1,6 +1,6 @@ CLASS net/minecraft/class_927 net/minecraft/client/render/entity/MobEntityRenderer FIELD field_32940 LEASH_PIECE_COUNT I - METHOD method_23187 renderLeashPiece (Lnet/minecraft/class_4588;Lnet/minecraft/class_1159;FFFIIIIFFFFIZ)V + METHOD method_23187 renderLeashPiece (Lnet/minecraft/class_4588;Lorg/joml/Matrix4f;FFFIIIIFFFFIZ)V ARG 0 vertexConsumer ARG 1 positionMatrix ARG 5 leashedEntityBlockLight diff --git a/mappings/net/minecraft/client/render/entity/PaintingEntityRenderer.mapping b/mappings/net/minecraft/client/render/entity/PaintingEntityRenderer.mapping index 7f0dcee2bd..f93b186df9 100644 --- a/mappings/net/minecraft/client/render/entity/PaintingEntityRenderer.mapping +++ b/mappings/net/minecraft/client/render/entity/PaintingEntityRenderer.mapping @@ -1,5 +1,5 @@ CLASS net/minecraft/class_928 net/minecraft/client/render/entity/PaintingEntityRenderer - METHOD method_23188 vertex (Lnet/minecraft/class_1159;Lnet/minecraft/class_4581;Lnet/minecraft/class_4588;FFFFFIIII)V + METHOD method_23188 vertex (Lorg/joml/Matrix4f;Lorg/joml/Matrix3f;Lnet/minecraft/class_4588;FFFFFIIII)V ARG 1 positionMatrix ARG 2 normalMatrix ARG 3 vertexConsumer diff --git a/mappings/net/minecraft/client/render/entity/ParrotEntityRenderer.mapping b/mappings/net/minecraft/client/render/entity/ParrotEntityRenderer.mapping index 598b9e4d03..fb78ab50dd 100644 --- a/mappings/net/minecraft/client/render/entity/ParrotEntityRenderer.mapping +++ b/mappings/net/minecraft/client/render/entity/ParrotEntityRenderer.mapping @@ -1,2 +1,8 @@ CLASS net/minecraft/class_930 net/minecraft/client/render/entity/ParrotEntityRenderer - FIELD field_4754 TEXTURES [Lnet/minecraft/class_2960; + FIELD field_41636 RED_BLUE_TEXTURE Lnet/minecraft/class_2960; + FIELD field_41637 BLUE_TEXTURE Lnet/minecraft/class_2960; + FIELD field_41638 GREEN_TEXTURE Lnet/minecraft/class_2960; + FIELD field_41639 YELLOW_TEXTURE Lnet/minecraft/class_2960; + FIELD field_41640 GREY_TEXTURE Lnet/minecraft/class_2960; + METHOD method_47906 getTexture (Lnet/minecraft/class_1453$class_7989;)Lnet/minecraft/class_2960; + ARG 0 variant diff --git a/mappings/net/minecraft/client/render/entity/ProjectileEntityRenderer.mapping b/mappings/net/minecraft/client/render/entity/ProjectileEntityRenderer.mapping index 3b58ceac21..2a0610b70e 100644 --- a/mappings/net/minecraft/client/render/entity/ProjectileEntityRenderer.mapping +++ b/mappings/net/minecraft/client/render/entity/ProjectileEntityRenderer.mapping @@ -1,5 +1,5 @@ CLASS net/minecraft/class_876 net/minecraft/client/render/entity/ProjectileEntityRenderer - METHOD method_23153 vertex (Lnet/minecraft/class_1159;Lnet/minecraft/class_4581;Lnet/minecraft/class_4588;IIIFFIIII)V + METHOD method_23153 vertex (Lorg/joml/Matrix4f;Lorg/joml/Matrix3f;Lnet/minecraft/class_4588;IIIFFIIII)V ARG 1 positionMatrix ARG 2 normalMatrix ARG 3 vertexConsumer diff --git a/mappings/net/minecraft/client/render/entity/RabbitEntityRenderer.mapping b/mappings/net/minecraft/client/render/entity/RabbitEntityRenderer.mapping index e60b2b9284..69375e9dd3 100644 --- a/mappings/net/minecraft/client/render/entity/RabbitEntityRenderer.mapping +++ b/mappings/net/minecraft/client/render/entity/RabbitEntityRenderer.mapping @@ -3,7 +3,7 @@ CLASS net/minecraft/class_939 net/minecraft/client/render/entity/RabbitEntityRen FIELD field_4769 CAERBANNOG_TEXTURE Lnet/minecraft/class_2960; FIELD field_4770 BROWN_TEXTURE Lnet/minecraft/class_2960; FIELD field_4771 TOAST_TEXTURE Lnet/minecraft/class_2960; - FIELD field_4772 WHITE_SPOTTED_TEXTURE Lnet/minecraft/class_2960; + FIELD field_4772 WHITE_SPLOTCHED_TEXTURE Lnet/minecraft/class_2960; FIELD field_4773 WHITE_TEXTURE Lnet/minecraft/class_2960; FIELD field_4774 SALT_TEXTURE Lnet/minecraft/class_2960; FIELD field_4775 BLACK_TEXTURE Lnet/minecraft/class_2960; diff --git a/mappings/net/minecraft/client/render/entity/ShulkerEntityRenderer.mapping b/mappings/net/minecraft/client/render/entity/ShulkerEntityRenderer.mapping index 25ea699f3d..6ba66656e6 100644 --- a/mappings/net/minecraft/client/render/entity/ShulkerEntityRenderer.mapping +++ b/mappings/net/minecraft/client/render/entity/ShulkerEntityRenderer.mapping @@ -1,5 +1,9 @@ CLASS net/minecraft/class_943 net/minecraft/client/render/entity/ShulkerEntityRenderer FIELD field_4780 COLORED_TEXTURES [Lnet/minecraft/class_2960; FIELD field_4781 TEXTURE Lnet/minecraft/class_2960; + METHOD method_22792 (Lnet/minecraft/class_4730;)Lnet/minecraft/class_2960; + ARG 0 spriteId + METHOD method_33436 (Lnet/minecraft/class_1606;Lnet/minecraft/class_4604;Lnet/minecraft/class_243;)Z + ARG 2 renderPositionOffset METHOD method_37105 getTexture (Lnet/minecraft/class_1767;)Lnet/minecraft/class_2960; ARG 0 shulkerColor diff --git a/mappings/net/minecraft/client/render/entity/SnifferEntityRenderer.mapping b/mappings/net/minecraft/client/render/entity/SnifferEntityRenderer.mapping new file mode 100644 index 0000000000..6e7e5a7ab2 --- /dev/null +++ b/mappings/net/minecraft/client/render/entity/SnifferEntityRenderer.mapping @@ -0,0 +1,2 @@ +CLASS net/minecraft/class_8190 net/minecraft/client/render/entity/SnifferEntityRenderer + FIELD field_42930 TEXTURE Lnet/minecraft/class_2960; diff --git a/mappings/net/minecraft/client/render/entity/TropicalFishEntityRenderer.mapping b/mappings/net/minecraft/client/render/entity/TropicalFishEntityRenderer.mapping index 7f55b4e725..f481d54797 100644 --- a/mappings/net/minecraft/client/render/entity/TropicalFishEntityRenderer.mapping +++ b/mappings/net/minecraft/client/render/entity/TropicalFishEntityRenderer.mapping @@ -1,3 +1,5 @@ CLASS net/minecraft/class_959 net/minecraft/client/render/entity/TropicalFishEntityRenderer + FIELD field_41643 A_TEXTURE Lnet/minecraft/class_2960; + FIELD field_41644 B_TEXTURE Lnet/minecraft/class_2960; FIELD field_4799 largeModel Lnet/minecraft/class_4594; FIELD field_4800 smallModel Lnet/minecraft/class_4594; diff --git a/mappings/net/minecraft/client/render/entity/animation/AnimationHelper.mapping b/mappings/net/minecraft/client/render/entity/animation/AnimationHelper.mapping index d39656dee7..f6095fdd1a 100644 --- a/mappings/net/minecraft/client/render/entity/animation/AnimationHelper.mapping +++ b/mappings/net/minecraft/client/render/entity/animation/AnimationHelper.mapping @@ -1,17 +1,28 @@ CLASS net/minecraft/class_7187 net/minecraft/client/render/entity/animation/AnimationHelper - METHOD method_41822 createScalingVector (DDD)Lnet/minecraft/class_1160; - METHOD method_41823 createTranslationalVector (FFF)Lnet/minecraft/class_1160; - METHOD method_41824 (FLnet/minecraft/class_1160;FLnet/minecraft/class_630;Lnet/minecraft/class_7179;)V + METHOD method_41822 createScalingVector (DDD)Lorg/joml/Vector3f; + ARG 0 x + ARG 2 y + ARG 4 z + METHOD method_41823 createTranslationalVector (FFF)Lorg/joml/Vector3f; + ARG 0 x + ARG 1 y + ARG 2 z + METHOD method_41824 (FLorg/joml/Vector3f;FLnet/minecraft/class_630;Lnet/minecraft/class_7179;)V ARG 4 transformation METHOD method_41825 (F[Lnet/minecraft/class_7186;I)Z ARG 2 index METHOD method_41826 getRunningSeconds (Lnet/minecraft/class_7184;J)F ARG 0 animation ARG 1 runningTime - METHOD method_41827 animate (Lnet/minecraft/class_5597;Lnet/minecraft/class_7184;JFLnet/minecraft/class_1160;)V + METHOD method_41827 animate (Lnet/minecraft/class_5597;Lnet/minecraft/class_7184;JFLorg/joml/Vector3f;)V ARG 0 model ARG 1 animation ARG 2 runningTime - METHOD method_41828 (Ljava/util/List;FLnet/minecraft/class_1160;FLnet/minecraft/class_630;)V + ARG 4 scale + ARG 5 tempVec + METHOD method_41828 (Ljava/util/List;FLorg/joml/Vector3f;FLnet/minecraft/class_630;)V ARG 4 part - METHOD method_41829 createRotationalVector (FFF)Lnet/minecraft/class_1160; + METHOD method_41829 createRotationalVector (FFF)Lorg/joml/Vector3f; + ARG 0 x + ARG 1 y + ARG 2 z diff --git a/mappings/net/minecraft/client/render/entity/animation/CamelAnimations.mapping b/mappings/net/minecraft/client/render/entity/animation/CamelAnimations.mapping new file mode 100644 index 0000000000..73af4578a9 --- /dev/null +++ b/mappings/net/minecraft/client/render/entity/animation/CamelAnimations.mapping @@ -0,0 +1,7 @@ +CLASS net/minecraft/class_7730 net/minecraft/client/render/entity/animation/CamelAnimations + FIELD field_40384 WALKING Lnet/minecraft/class_7184; + FIELD field_40385 SITTING_TRANSITION Lnet/minecraft/class_7184; + FIELD field_40386 STANDING_TRANSITION Lnet/minecraft/class_7184; + FIELD field_40387 DASHING Lnet/minecraft/class_7184; + FIELD field_40388 IDLING Lnet/minecraft/class_7184; + FIELD field_40749 SITTING Lnet/minecraft/class_7184; diff --git a/mappings/net/minecraft/client/render/entity/animation/SnifferAnimations.mapping b/mappings/net/minecraft/client/render/entity/animation/SnifferAnimations.mapping new file mode 100644 index 0000000000..a57342a400 --- /dev/null +++ b/mappings/net/minecraft/client/render/entity/animation/SnifferAnimations.mapping @@ -0,0 +1,9 @@ +CLASS net/minecraft/class_8182 net/minecraft/client/render/entity/animation/SnifferAnimations + FIELD field_42866 SCENTING Lnet/minecraft/class_7184; + FIELD field_42867 SNIFFING Lnet/minecraft/class_7184; + FIELD field_42868 WALKING Lnet/minecraft/class_7184; + FIELD field_42869 SEARCHING Lnet/minecraft/class_7184; + FIELD field_42870 DIGGING Lnet/minecraft/class_7184; + FIELD field_42871 RISING Lnet/minecraft/class_7184; + FIELD field_42873 FEELING_HAPPY Lnet/minecraft/class_7184; + FIELD field_43406 BABY_GROWTH Lnet/minecraft/class_7184; diff --git a/mappings/net/minecraft/client/render/entity/animation/Transformation.mapping b/mappings/net/minecraft/client/render/entity/animation/Transformation.mapping index 49c02a0cf2..95f2832f5b 100644 --- a/mappings/net/minecraft/client/render/entity/animation/Transformation.mapping +++ b/mappings/net/minecraft/client/render/entity/animation/Transformation.mapping @@ -1,26 +1,33 @@ CLASS net/minecraft/class_7179 net/minecraft/client/render/entity/animation/Transformation CLASS class_7180 Interpolation - METHOD apply (Lnet/minecraft/class_1160;F[Lnet/minecraft/class_7186;IIF)Lnet/minecraft/class_1160; + METHOD apply (Lorg/joml/Vector3f;F[Lnet/minecraft/class_7186;IIF)Lorg/joml/Vector3f; + ARG 1 dest ARG 2 delta ARG 3 keyframes ARG 4 start ARG 5 end + ARG 6 scale CLASS class_7181 Interpolations FIELD field_37884 LINEAR Lnet/minecraft/class_7179$class_7180; FIELD field_37885 CUBIC Lnet/minecraft/class_7179$class_7180; - METHOD method_41815 (Lnet/minecraft/class_1160;F[Lnet/minecraft/class_7186;IIF)Lnet/minecraft/class_1160; + METHOD method_41815 (Lorg/joml/Vector3f;F[Lnet/minecraft/class_7186;IIF)Lorg/joml/Vector3f; + ARG 0 dest ARG 1 delta ARG 2 keyframes ARG 3 start ARG 4 end - METHOD method_41816 (Lnet/minecraft/class_1160;F[Lnet/minecraft/class_7186;IIF)Lnet/minecraft/class_1160; + ARG 5 scale + METHOD method_41816 (Lorg/joml/Vector3f;F[Lnet/minecraft/class_7186;IIF)Lorg/joml/Vector3f; + ARG 0 dest ARG 1 delta ARG 2 keyframes ARG 3 start ARG 4 end + ARG 5 scale CLASS class_7182 Target - METHOD apply (Lnet/minecraft/class_630;Lnet/minecraft/class_1160;)V + METHOD apply (Lnet/minecraft/class_630;Lorg/joml/Vector3f;)V ARG 1 modelPart + ARG 2 vec CLASS class_7183 Targets FIELD field_37886 TRANSLATE Lnet/minecraft/class_7179$class_7182; FIELD field_37887 ROTATE Lnet/minecraft/class_7179$class_7182; diff --git a/mappings/net/minecraft/client/render/entity/feature/ArmorFeatureRenderer.mapping b/mappings/net/minecraft/client/render/entity/feature/ArmorFeatureRenderer.mapping index ee9f2ce0a5..afbad9b3b9 100644 --- a/mappings/net/minecraft/client/render/entity/feature/ArmorFeatureRenderer.mapping +++ b/mappings/net/minecraft/client/render/entity/feature/ArmorFeatureRenderer.mapping @@ -1,23 +1,24 @@ CLASS net/minecraft/class_970 net/minecraft/client/render/entity/feature/ArmorFeatureRenderer + FIELD field_42074 armorTrimsAtlas Lnet/minecraft/class_1059; FIELD field_4829 ARMOR_TEXTURE_CACHE Ljava/util/Map; FIELD field_4830 innerModel Lnet/minecraft/class_572; FIELD field_4831 outerModel Lnet/minecraft/class_572; - METHOD (Lnet/minecraft/class_3883;Lnet/minecraft/class_572;Lnet/minecraft/class_572;)V + METHOD (Lnet/minecraft/class_3883;Lnet/minecraft/class_572;Lnet/minecraft/class_572;Lnet/minecraft/class_1092;)V ARG 1 context ARG 2 innerModel ARG 3 outerModel - 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 4 bakery + METHOD method_23192 renderArmorParts (Lnet/minecraft/class_4587;Lnet/minecraft/class_4597;ILnet/minecraft/class_1738;Lnet/minecraft/class_572;ZFFFLjava/lang/String;)V ARG 1 matrices ARG 2 vertexConsumers ARG 3 light ARG 4 item - ARG 5 glint - ARG 6 model - ARG 7 secondTextureLayer - ARG 8 red - ARG 9 green - ARG 10 blue - ARG 11 overlay + ARG 5 model + ARG 6 secondTextureLayer + ARG 7 red + ARG 8 green + ARG 9 blue + ARG 10 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 @@ -36,3 +37,18 @@ CLASS net/minecraft/class_970 net/minecraft/client/render/entity/feature/ArmorFe ARG 1 item ARG 2 secondLayer ARG 3 overlay + METHOD method_48482 renderTrim (Lnet/minecraft/class_1741;Lnet/minecraft/class_4587;Lnet/minecraft/class_4597;ILnet/minecraft/class_8053;Lnet/minecraft/class_572;Z)V + ARG 1 material + ARG 2 matrices + ARG 3 vertexConsumers + ARG 4 light + ARG 5 trim + ARG 6 model + ARG 7 leggings + METHOD method_48483 (Lnet/minecraft/class_1738;Lnet/minecraft/class_4587;Lnet/minecraft/class_4597;ILnet/minecraft/class_572;ZLnet/minecraft/class_8053;)V + ARG 7 trim + METHOD method_52224 renderGlint (Lnet/minecraft/class_4587;Lnet/minecraft/class_4597;ILnet/minecraft/class_572;)V + ARG 1 matrices + ARG 2 vertexConsumers + ARG 3 light + ARG 4 model diff --git a/mappings/net/minecraft/client/render/entity/feature/HeldItemFeatureRenderer.mapping b/mappings/net/minecraft/client/render/entity/feature/HeldItemFeatureRenderer.mapping index 225e4ea783..6423904fde 100644 --- a/mappings/net/minecraft/client/render/entity/feature/HeldItemFeatureRenderer.mapping +++ b/mappings/net/minecraft/client/render/entity/feature/HeldItemFeatureRenderer.mapping @@ -3,7 +3,7 @@ CLASS net/minecraft/class_989 net/minecraft/client/render/entity/feature/HeldIte METHOD (Lnet/minecraft/class_3883;Lnet/minecraft/class_759;)V ARG 1 context ARG 2 heldItemRenderer - METHOD method_4192 renderItem (Lnet/minecraft/class_1309;Lnet/minecraft/class_1799;Lnet/minecraft/class_809$class_811;Lnet/minecraft/class_1306;Lnet/minecraft/class_4587;Lnet/minecraft/class_4597;I)V + METHOD method_4192 renderItem (Lnet/minecraft/class_1309;Lnet/minecraft/class_1799;Lnet/minecraft/class_811;Lnet/minecraft/class_1306;Lnet/minecraft/class_4587;Lnet/minecraft/class_4597;I)V ARG 1 entity ARG 2 stack ARG 3 transformationMode diff --git a/mappings/net/minecraft/client/render/entity/feature/ShoulderParrotFeatureRenderer.mapping b/mappings/net/minecraft/client/render/entity/feature/ShoulderParrotFeatureRenderer.mapping index 2cb0e9646d..6ae9b552ca 100644 --- a/mappings/net/minecraft/client/render/entity/feature/ShoulderParrotFeatureRenderer.mapping +++ b/mappings/net/minecraft/client/render/entity/feature/ShoulderParrotFeatureRenderer.mapping @@ -5,7 +5,7 @@ CLASS net/minecraft/class_983 net/minecraft/client/render/entity/feature/Shoulde ARG 2 loader METHOD method_17957 (Lnet/minecraft/class_1299;)Z ARG 0 type - METHOD method_17958 (Lnet/minecraft/class_4587;ZLnet/minecraft/class_1657;Lnet/minecraft/class_4597;Lnet/minecraft/class_2487;IFFFFLnet/minecraft/class_1299;)V + METHOD method_17958 (Lnet/minecraft/class_4587;ZLnet/minecraft/class_1657;Lnet/minecraft/class_2487;Lnet/minecraft/class_4597;IFFFFLnet/minecraft/class_1299;)V ARG 11 type METHOD method_4186 renderShoulderParrot (Lnet/minecraft/class_4587;Lnet/minecraft/class_4597;ILnet/minecraft/class_1657;FFFFZ)V ARG 1 matrices diff --git a/mappings/net/minecraft/client/render/entity/feature/StuckStingersFeatureRenderer.mapping b/mappings/net/minecraft/client/render/entity/feature/StuckStingersFeatureRenderer.mapping index 81e6a8a188..ae2da9dfd8 100644 --- a/mappings/net/minecraft/client/render/entity/feature/StuckStingersFeatureRenderer.mapping +++ b/mappings/net/minecraft/client/render/entity/feature/StuckStingersFeatureRenderer.mapping @@ -1,6 +1,6 @@ CLASS net/minecraft/class_4506 net/minecraft/client/render/entity/feature/StuckStingersFeatureRenderer FIELD field_20529 TEXTURE Lnet/minecraft/class_2960; - METHOD method_23295 produceVertex (Lnet/minecraft/class_4588;Lnet/minecraft/class_1159;Lnet/minecraft/class_4581;FIFFI)V + METHOD method_23295 produceVertex (Lnet/minecraft/class_4588;Lorg/joml/Matrix4f;Lorg/joml/Matrix3f;FIFFI)V ARG 0 vertexConsumer ARG 1 vertexTransform ARG 2 normalTransform diff --git a/mappings/net/minecraft/client/render/entity/feature/TropicalFishColorFeatureRenderer.mapping b/mappings/net/minecraft/client/render/entity/feature/TropicalFishColorFeatureRenderer.mapping index 373ba0818e..15634eb099 100644 --- a/mappings/net/minecraft/client/render/entity/feature/TropicalFishColorFeatureRenderer.mapping +++ b/mappings/net/minecraft/client/render/entity/feature/TropicalFishColorFeatureRenderer.mapping @@ -1,5 +1,17 @@ CLASS net/minecraft/class_1001 net/minecraft/client/render/entity/feature/TropicalFishColorFeatureRenderer FIELD field_17157 smallModel Lnet/minecraft/class_612; + FIELD field_41646 KOB_TEXTURE Lnet/minecraft/class_2960; + FIELD field_41647 SUNSTREAK_TEXTURE Lnet/minecraft/class_2960; + FIELD field_41648 SNOOPER_TEXTURE Lnet/minecraft/class_2960; + FIELD field_41649 DASHER_TEXTURE Lnet/minecraft/class_2960; + FIELD field_41650 BRINELY_TEXTURE Lnet/minecraft/class_2960; + FIELD field_41651 SPOTTY_TEXTURE Lnet/minecraft/class_2960; + FIELD field_41652 FLOPPER_TEXTURE Lnet/minecraft/class_2960; + FIELD field_41653 STRIPEY_TEXTURE Lnet/minecraft/class_2960; + FIELD field_41654 GLITTER_TEXTURE Lnet/minecraft/class_2960; + FIELD field_41655 BLOCKFISH_TEXTURE Lnet/minecraft/class_2960; + FIELD field_41656 BETTY_TEXTURE Lnet/minecraft/class_2960; + FIELD field_41657 CLAYFISH_TEXTURE Lnet/minecraft/class_2960; FIELD field_4903 largeModel Lnet/minecraft/class_615; METHOD (Lnet/minecraft/class_3883;Lnet/minecraft/class_5599;)V ARG 1 context diff --git a/mappings/net/minecraft/client/render/entity/feature/VillagerClothingFeatureRenderer.mapping b/mappings/net/minecraft/client/render/entity/feature/VillagerClothingFeatureRenderer.mapping index f2b6ac9e4e..24be54dddb 100644 --- a/mappings/net/minecraft/client/render/entity/feature/VillagerClothingFeatureRenderer.mapping +++ b/mappings/net/minecraft/client/render/entity/feature/VillagerClothingFeatureRenderer.mapping @@ -10,13 +10,17 @@ CLASS net/minecraft/class_3885 net/minecraft/client/render/entity/feature/Villag ARG 3 entityType METHOD method_17152 (Lit/unimi/dsi/fastutil/ints/Int2ObjectOpenHashMap;)V ARG 0 levelToId - METHOD method_17153 getHatType (Lit/unimi/dsi/fastutil/objects/Object2ObjectMap;Ljava/lang/String;Lnet/minecraft/class_2348;Ljava/lang/Object;)Lnet/minecraft/class_3888$class_3889; + METHOD method_17153 getHatType (Lit/unimi/dsi/fastutil/objects/Object2ObjectMap;Ljava/lang/String;Lnet/minecraft/class_7922;Ljava/lang/Object;)Lnet/minecraft/class_3888$class_3889; ARG 1 hatLookUp ARG 2 keyType ARG 3 registry ARG 4 key - METHOD method_17154 (Ljava/lang/String;Lnet/minecraft/class_2348;Ljava/lang/Object;Ljava/lang/Object;)Lnet/minecraft/class_3888$class_3889; + METHOD method_17154 (Ljava/lang/String;Lnet/minecraft/class_7922;Ljava/lang/Object;Ljava/lang/Object;)Lnet/minecraft/class_3888$class_3889; ARG 4 k METHOD method_17155 findTexture (Ljava/lang/String;Lnet/minecraft/class_2960;)Lnet/minecraft/class_2960; ARG 1 keyType ARG 2 keyId + METHOD method_43211 (Lnet/minecraft/class_3298;)Ljava/util/Optional; + ARG 0 resource + METHOD method_45803 (Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String; + ARG 2 path diff --git a/mappings/net/minecraft/client/render/entity/model/ArmorEntityModel.mapping b/mappings/net/minecraft/client/render/entity/model/ArmorEntityModel.mapping new file mode 100644 index 0000000000..f8a6e90449 --- /dev/null +++ b/mappings/net/minecraft/client/render/entity/model/ArmorEntityModel.mapping @@ -0,0 +1,3 @@ +CLASS net/minecraft/class_8136 net/minecraft/client/render/entity/model/ArmorEntityModel + METHOD method_49032 getModelData (Lnet/minecraft/class_5605;)Lnet/minecraft/class_5609; + ARG 0 dilation diff --git a/mappings/net/minecraft/client/render/entity/model/AxolotlEntityModel.mapping b/mappings/net/minecraft/client/render/entity/model/AxolotlEntityModel.mapping index 79e250c9f5..9b5428f0c7 100644 --- a/mappings/net/minecraft/client/render/entity/model/AxolotlEntityModel.mapping +++ b/mappings/net/minecraft/client/render/entity/model/AxolotlEntityModel.mapping @@ -83,13 +83,13 @@ CLASS net/minecraft/class_5772 net/minecraft/client/render/entity/model/AxolotlE ARG 3 end METHOD method_37093 updateAnglesCache (Lnet/minecraft/class_5762;)V ARG 1 axolotl - METHOD method_37094 getAngles (Lnet/minecraft/class_630;)Lnet/minecraft/class_1160; + METHOD method_37094 getAngles (Lnet/minecraft/class_630;)Lorg/joml/Vector3f; ARG 1 part METHOD method_37095 setAngles (Lnet/minecraft/class_630;FFF)V ARG 1 part ARG 2 pitch ARG 3 yaw ARG 4 roll - METHOD method_37096 setAngles (Lnet/minecraft/class_630;Lnet/minecraft/class_1160;)V + METHOD method_37096 setAngles (Lnet/minecraft/class_630;Lorg/joml/Vector3f;)V ARG 1 part ARG 2 angles diff --git a/mappings/net/minecraft/client/render/entity/model/BipedEntityModel.mapping b/mappings/net/minecraft/client/render/entity/model/BipedEntityModel.mapping index 8743f0b961..0db7cf8e64 100644 --- a/mappings/net/minecraft/client/render/entity/model/BipedEntityModel.mapping +++ b/mappings/net/minecraft/client/render/entity/model/BipedEntityModel.mapping @@ -59,7 +59,7 @@ CLASS net/minecraft/class_572 net/minecraft/client/render/entity/model/BipedEnti ARG 1 entity METHOD method_2808 getArm (Lnet/minecraft/class_1306;)Lnet/minecraft/class_630; ARG 1 arm - METHOD method_2818 setAttributes (Lnet/minecraft/class_572;)V + METHOD method_2818 copyBipedStateTo (Lnet/minecraft/class_572;)V ARG 1 model METHOD method_29353 animateArms (Lnet/minecraft/class_1309;F)V ARG 1 entity diff --git a/mappings/net/minecraft/client/render/entity/model/BoatEntityModel.mapping b/mappings/net/minecraft/client/render/entity/model/BoatEntityModel.mapping index 4708824fc0..935bec7b1c 100644 --- a/mappings/net/minecraft/client/render/entity/model/BoatEntityModel.mapping +++ b/mappings/net/minecraft/client/render/entity/model/BoatEntityModel.mapping @@ -53,20 +53,15 @@ CLASS net/minecraft/class_554 net/minecraft/client/render/entity/model/BoatEntit FIELD field_32465 LEFT Ljava/lang/String; COMMENT The key of the left model part, whose value is {@value}. FIELD field_3326 waterPatch Lnet/minecraft/class_630; - FIELD field_38312 CHEST_BOTTOM Ljava/lang/String; - COMMENT The key of the chest bottom model part, whose value is {@value}. - FIELD field_38313 CHEST_LID Ljava/lang/String; - COMMENT The key of the chest lid model part, whose value is {@value}. - FIELD field_38314 CHEST_LOCK Ljava/lang/String; - COMMENT The key of the chest lock model part, whose value is {@value}. - METHOD (Lnet/minecraft/class_630;Z)V + METHOD (Lnet/minecraft/class_630;)V ARG 1 root - ARG 2 chest - METHOD method_22954 getWaterPatch ()Lnet/minecraft/class_630; METHOD method_2797 setPaddleAngle (Lnet/minecraft/class_1690;ILnet/minecraft/class_630;F)V ARG 0 entity ARG 1 sigma ARG 2 part ARG 3 angle - METHOD method_31985 getTexturedModelData (Z)Lnet/minecraft/class_5607; - ARG 0 chest + METHOD method_31985 getTexturedModelData ()Lnet/minecraft/class_5607; + METHOD method_45702 getParts (Lnet/minecraft/class_630;)Lcom/google/common/collect/ImmutableList$Builder; + ARG 1 root + METHOD method_45703 addParts (Lnet/minecraft/class_5610;)V + ARG 0 modelPartData diff --git a/mappings/net/minecraft/client/render/entity/model/CamelEntityModel.mapping b/mappings/net/minecraft/client/render/entity/model/CamelEntityModel.mapping new file mode 100644 index 0000000000..d4cdd9dfa7 --- /dev/null +++ b/mappings/net/minecraft/client/render/entity/model/CamelEntityModel.mapping @@ -0,0 +1,20 @@ +CLASS net/minecraft/class_7751 net/minecraft/client/render/entity/model/CamelEntityModel + FIELD field_40459 LIMB_ANGLE_SCALE F + FIELD field_40460 SADDLE Ljava/lang/String; + FIELD field_40461 BRIDLE Ljava/lang/String; + FIELD field_40462 REINS Ljava/lang/String; + FIELD field_40463 root Lnet/minecraft/class_630; + FIELD field_40464 head Lnet/minecraft/class_630; + FIELD field_40465 saddleAndBridle [Lnet/minecraft/class_630; + FIELD field_40466 reins [Lnet/minecraft/class_630; + FIELD field_42227 LIMB_DISTANCE_SCALE F + METHOD (Lnet/minecraft/class_630;)V + ARG 1 root + METHOD method_45704 updateVisibleParts (Lnet/minecraft/class_7689;)V + ARG 1 camel + METHOD method_45705 setHeadAngles (Lnet/minecraft/class_7689;FFF)V + ARG 1 entity + ARG 2 headYaw + ARG 3 headPitch + ARG 4 animationProgress + METHOD method_45707 getTexturedModelData ()Lnet/minecraft/class_5607; diff --git a/mappings/net/minecraft/client/render/entity/model/ChestBoatEntityModel.mapping b/mappings/net/minecraft/client/render/entity/model/ChestBoatEntityModel.mapping new file mode 100644 index 0000000000..6871e0907f --- /dev/null +++ b/mappings/net/minecraft/client/render/entity/model/ChestBoatEntityModel.mapping @@ -0,0 +1,5 @@ +CLASS net/minecraft/class_7752 net/minecraft/client/render/entity/model/ChestBoatEntityModel + FIELD field_40467 CHEST_BOTTOM Ljava/lang/String; + FIELD field_40468 CHEST_LID Ljava/lang/String; + FIELD field_40469 CHEST_LOCK Ljava/lang/String; + METHOD method_45708 getTexturedModelData ()Lnet/minecraft/class_5607; diff --git a/mappings/net/minecraft/client/render/entity/model/ChestRaftEntityModel.mapping b/mappings/net/minecraft/client/render/entity/model/ChestRaftEntityModel.mapping new file mode 100644 index 0000000000..77898bebfb --- /dev/null +++ b/mappings/net/minecraft/client/render/entity/model/ChestRaftEntityModel.mapping @@ -0,0 +1,5 @@ +CLASS net/minecraft/class_7753 net/minecraft/client/render/entity/model/ChestRaftEntityModel + FIELD field_40470 CHEST_BOTTOM Ljava/lang/String; + FIELD field_40471 CHEST_LID Ljava/lang/String; + FIELD field_40472 CHEST_LOCK Ljava/lang/String; + METHOD method_45709 getTexturedModelData ()Lnet/minecraft/class_5607; diff --git a/mappings/net/minecraft/client/render/entity/model/EntityModelLayers.mapping b/mappings/net/minecraft/client/render/entity/model/EntityModelLayers.mapping index f5d5ec080c..863e9f7390 100644 --- a/mappings/net/minecraft/client/render/entity/model/EntityModelLayers.mapping +++ b/mappings/net/minecraft/client/render/entity/model/EntityModelLayers.mapping @@ -63,3 +63,9 @@ CLASS net/minecraft/class_5602 net/minecraft/client/render/entity/model/EntityMo ARG 0 id METHOD method_42582 createChestBoat (Lnet/minecraft/class_1690$class_1692;)Lnet/minecraft/class_5601; ARG 0 type + METHOD method_45717 createRaft (Lnet/minecraft/class_1690$class_1692;)Lnet/minecraft/class_5601; + ARG 0 type + METHOD method_45718 createChestRaft (Lnet/minecraft/class_1690$class_1692;)Lnet/minecraft/class_5601; + ARG 0 type + METHOD method_45719 createHangingSign (Lnet/minecraft/class_4719;)Lnet/minecraft/class_5601; + ARG 0 type diff --git a/mappings/net/minecraft/client/render/entity/model/EntityModelPartNames.mapping b/mappings/net/minecraft/client/render/entity/model/EntityModelPartNames.mapping index 1be9c9e56b..6778d41706 100644 --- a/mappings/net/minecraft/client/render/entity/model/EntityModelPartNames.mapping +++ b/mappings/net/minecraft/client/render/entity/model/EntityModelPartNames.mapping @@ -142,3 +142,7 @@ CLASS net/minecraft/class_6230 net/minecraft/client/render/entity/model/EntityMo COMMENT The key of a right ribcage model part, whose value is {@value}. FIELD field_38458 LEFT_RIBCAGE Ljava/lang/String; COMMENT The key of a left ribcage model part, whose value is {@value}. + FIELD field_42885 LEFT_MID_LEG Ljava/lang/String; + COMMENT The key of a left mid leg part, whose value is {@value}. + FIELD field_42886 RIGHT_MID_LEG Ljava/lang/String; + COMMENT The key of a right mid leg part, whose value is {@value}. diff --git a/mappings/net/minecraft/client/render/entity/model/EntityModels.mapping b/mappings/net/minecraft/client/render/entity/model/EntityModels.mapping index f01351ddea..8a56a580b6 100644 --- a/mappings/net/minecraft/client/render/entity/model/EntityModels.mapping +++ b/mappings/net/minecraft/client/render/entity/model/EntityModels.mapping @@ -7,3 +7,5 @@ CLASS net/minecraft/class_5600 net/minecraft/client/render/entity/model/EntityMo ARG 2 signType METHOD method_32075 (Lcom/google/common/collect/ImmutableMap;Lnet/minecraft/class_5601;)Z ARG 1 layer + METHOD method_45716 (Lcom/google/common/collect/ImmutableMap$Builder;Lnet/minecraft/class_5607;Lnet/minecraft/class_4719;)V + ARG 2 signType diff --git a/mappings/net/minecraft/client/render/entity/model/FrogEntityModel.mapping b/mappings/net/minecraft/client/render/entity/model/FrogEntityModel.mapping index 60d2d85db1..ef417b191b 100644 --- a/mappings/net/minecraft/client/render/entity/model/FrogEntityModel.mapping +++ b/mappings/net/minecraft/client/render/entity/model/FrogEntityModel.mapping @@ -9,6 +9,9 @@ CLASS net/minecraft/class_7198 net/minecraft/client/render/entity/model/FrogEnti FIELD field_37926 leftLeg Lnet/minecraft/class_630; FIELD field_37927 rightLeg Lnet/minecraft/class_630; FIELD field_38448 croakingBody Lnet/minecraft/class_630; + FIELD field_39193 WALKING_LIMB_ANGLE_SCALE F + FIELD field_42228 SWIMMING_LIMB_ANGLE_SCALE F + FIELD field_42229 LIMB_DISTANCE_SCALE F METHOD (Lnet/minecraft/class_630;)V ARG 1 root METHOD method_41905 getTexturedModelData ()Lnet/minecraft/class_5607; diff --git a/mappings/net/minecraft/client/render/entity/model/ModelWithWaterPatch.mapping b/mappings/net/minecraft/client/render/entity/model/ModelWithWaterPatch.mapping new file mode 100644 index 0000000000..976202e620 --- /dev/null +++ b/mappings/net/minecraft/client/render/entity/model/ModelWithWaterPatch.mapping @@ -0,0 +1,2 @@ +CLASS net/minecraft/class_7755 net/minecraft/client/render/entity/model/ModelWithWaterPatch + METHOD method_22954 getWaterPatch ()Lnet/minecraft/class_630; diff --git a/mappings/net/minecraft/client/render/entity/model/PiglinEntityModel.mapping b/mappings/net/minecraft/client/render/entity/model/PiglinEntityModel.mapping index a448b1f812..22d524b78d 100644 --- a/mappings/net/minecraft/client/render/entity/model/PiglinEntityModel.mapping +++ b/mappings/net/minecraft/client/render/entity/model/PiglinEntityModel.mapping @@ -67,3 +67,6 @@ CLASS net/minecraft/class_4840 net/minecraft/client/render/entity/model/PiglinEn ARG 1 entity METHOD method_32026 getModelData (Lnet/minecraft/class_5605;)Lnet/minecraft/class_5609; ARG 0 dilation + METHOD method_47656 addHead (Lnet/minecraft/class_5605;Lnet/minecraft/class_5609;)V + ARG 0 dilation + ARG 1 baseModelData diff --git a/mappings/net/minecraft/client/render/entity/model/PiglinHeadEntityModel.mapping b/mappings/net/minecraft/client/render/entity/model/PiglinHeadEntityModel.mapping new file mode 100644 index 0000000000..255035bac9 --- /dev/null +++ b/mappings/net/minecraft/client/render/entity/model/PiglinHeadEntityModel.mapping @@ -0,0 +1,7 @@ +CLASS net/minecraft/class_7946 net/minecraft/client/render/entity/model/PiglinHeadEntityModel + FIELD field_41379 head Lnet/minecraft/class_630; + FIELD field_41380 leftEar Lnet/minecraft/class_630; + FIELD field_41381 rightEar Lnet/minecraft/class_630; + METHOD (Lnet/minecraft/class_630;)V + ARG 1 root + METHOD method_47655 getModelData ()Lnet/minecraft/class_5609; diff --git a/mappings/net/minecraft/client/render/entity/model/RaftEntityModel.mapping b/mappings/net/minecraft/client/render/entity/model/RaftEntityModel.mapping new file mode 100644 index 0000000000..a422bf73c8 --- /dev/null +++ b/mappings/net/minecraft/client/render/entity/model/RaftEntityModel.mapping @@ -0,0 +1,19 @@ +CLASS net/minecraft/class_7754 net/minecraft/client/render/entity/model/RaftEntityModel + FIELD field_40473 LEFT_PADDLE Ljava/lang/String; + FIELD field_40474 RIGHT_PADDLE Ljava/lang/String; + FIELD field_40475 BOTTOM Ljava/lang/String; + FIELD field_40476 leftPaddle Lnet/minecraft/class_630; + FIELD field_40477 rightPaddle Lnet/minecraft/class_630; + FIELD field_40478 parts Lcom/google/common/collect/ImmutableList; + METHOD (Lnet/minecraft/class_630;)V + ARG 1 root + METHOD method_45710 getParts (Lnet/minecraft/class_630;)Lcom/google/common/collect/ImmutableList$Builder; + ARG 1 root + METHOD method_45712 setPaddleAngle (Lnet/minecraft/class_1690;ILnet/minecraft/class_630;F)V + ARG 0 entity + ARG 1 sigma + ARG 2 part + ARG 3 angle + METHOD method_45713 addParts (Lnet/minecraft/class_5610;)V + ARG 0 modelPartData + METHOD method_45714 getTexturedModelData ()Lnet/minecraft/class_5607; diff --git a/mappings/net/minecraft/client/render/entity/model/SinglePartEntityModel.mapping b/mappings/net/minecraft/client/render/entity/model/SinglePartEntityModel.mapping index 54724f76df..cea3c76ce5 100644 --- a/mappings/net/minecraft/client/render/entity/model/SinglePartEntityModel.mapping +++ b/mappings/net/minecraft/client/render/entity/model/SinglePartEntityModel.mapping @@ -1,4 +1,5 @@ CLASS net/minecraft/class_5597 net/minecraft/client/render/entity/model/SinglePartEntityModel + FIELD field_39195 TEMP Lorg/joml/Vector3f; METHOD method_32008 getPart ()Lnet/minecraft/class_630; METHOD method_41909 getChild (Ljava/lang/String;)Ljava/util/Optional; ARG 1 name @@ -17,3 +18,11 @@ CLASS net/minecraft/class_5597 net/minecraft/client/render/entity/model/SinglePa ARG 4 speedMultiplier METHOD method_43783 (Lnet/minecraft/class_7184;Lnet/minecraft/class_7094;)V ARG 2 state + METHOD method_48741 animateMovement (Lnet/minecraft/class_7184;FFFF)V + ARG 1 animation + ARG 2 limbAngle + ARG 3 limbDistance + ARG 4 limbAngleScale + ARG 5 limbDistanceScale + METHOD method_52185 animate (Lnet/minecraft/class_7184;)V + ARG 1 animation diff --git a/mappings/net/minecraft/client/render/entity/model/SinglePartEntityModelWithChildTransform.mapping b/mappings/net/minecraft/client/render/entity/model/SinglePartEntityModelWithChildTransform.mapping new file mode 100644 index 0000000000..3b634cf7d9 --- /dev/null +++ b/mappings/net/minecraft/client/render/entity/model/SinglePartEntityModelWithChildTransform.mapping @@ -0,0 +1,10 @@ +CLASS net/minecraft/class_8184 net/minecraft/client/render/entity/model/SinglePartEntityModelWithChildTransform + FIELD field_42875 childScale F + FIELD field_42876 childTranslation F + METHOD (FF)V + ARG 1 childScale + ARG 2 childTranslation + METHOD (FFLjava/util/function/Function;)V + ARG 1 childScale + ARG 2 childTranslation + ARG 3 layerFactory diff --git a/mappings/net/minecraft/client/render/entity/model/SnifferEntityModel.mapping b/mappings/net/minecraft/client/render/entity/model/SnifferEntityModel.mapping new file mode 100644 index 0000000000..1dab150e50 --- /dev/null +++ b/mappings/net/minecraft/client/render/entity/model/SnifferEntityModel.mapping @@ -0,0 +1,8 @@ +CLASS net/minecraft/class_8185 net/minecraft/client/render/entity/model/SnifferEntityModel + FIELD field_42881 root Lnet/minecraft/class_630; + FIELD field_43085 head Lnet/minecraft/class_630; + FIELD field_43364 LIMB_ANGLE_SCALE F + FIELD field_43407 LIMB_DISTANCE_SCALE F + METHOD (Lnet/minecraft/class_630;)V + ARG 1 root + METHOD method_49303 getTexturedModelData ()Lnet/minecraft/class_5607; diff --git a/mappings/net/minecraft/client/render/entity/model/VexEntityModel.mapping b/mappings/net/minecraft/client/render/entity/model/VexEntityModel.mapping index e9d294eccd..f51b0a038d 100644 --- a/mappings/net/minecraft/client/render/entity/model/VexEntityModel.mapping +++ b/mappings/net/minecraft/client/render/entity/model/VexEntityModel.mapping @@ -8,10 +8,7 @@ CLASS net/minecraft/class_617 net/minecraft/client/render/entity/model/VexEntity COMMENT Part NameParentCorresponding Field COMMENT COMMENT - COMMENT {@value EntityModelPartNames#HAT}Root part{@link #hat} - COMMENT - COMMENT - COMMENT {@value EntityModelPartNames#HEAD}Root part{@link #head} + COMMENT {@value EntityModelPartNames#HEAD}Root part COMMENT COMMENT COMMENT {@value EntityModelPartNames#BODY}Root part{@link #body} @@ -23,12 +20,6 @@ CLASS net/minecraft/class_617 net/minecraft/client/render/entity/model/VexEntity COMMENT {@value EntityModelPartNames#LEFT_ARM}Root part{@link #leftArm} COMMENT COMMENT - COMMENT {@value EntityModelPartNames#RIGHT_LEG}Root part{@link #rightLeg} - COMMENT - COMMENT - COMMENT {@value EntityModelPartNames#LEFT_LEG}Root part{@link #leftLeg} - COMMENT - COMMENT COMMENT {@value EntityModelPartNames#RIGHT_WING}Root part{@link #rightWing} COMMENT COMMENT @@ -38,4 +29,17 @@ CLASS net/minecraft/class_617 net/minecraft/client/render/entity/model/VexEntity COMMENT FIELD field_3601 leftWing Lnet/minecraft/class_630; FIELD field_3602 rightWing Lnet/minecraft/class_630; + FIELD field_41116 root Lnet/minecraft/class_630; + FIELD field_41117 body Lnet/minecraft/class_630; + FIELD field_41118 rightArm Lnet/minecraft/class_630; + FIELD field_41119 leftArm Lnet/minecraft/class_630; + FIELD field_41711 head Lnet/minecraft/class_630; + METHOD (Lnet/minecraft/class_630;)V + ARG 1 root METHOD method_32063 getTexturedModelData ()Lnet/minecraft/class_5607; + METHOD method_47977 translateForHand (Lnet/minecraft/class_4587;Z)V + ARG 1 matrices + ARG 2 mainHand + METHOD method_48293 setChargingArmAngles (Lnet/minecraft/class_1799;Lnet/minecraft/class_1799;F)V + ARG 1 mainHandStack + ARG 2 offHandStack diff --git a/mappings/net/minecraft/client/render/item/BuiltinModelItemRenderer.mapping b/mappings/net/minecraft/client/render/item/BuiltinModelItemRenderer.mapping index dbdc2acff2..2287f94e1a 100644 --- a/mappings/net/minecraft/client/render/item/BuiltinModelItemRenderer.mapping +++ b/mappings/net/minecraft/client/render/item/BuiltinModelItemRenderer.mapping @@ -12,15 +12,16 @@ CLASS net/minecraft/class_756 net/minecraft/client/render/item/BuiltinModelItemR FIELD field_3983 renderBanner Lnet/minecraft/class_2573; FIELD field_3984 RENDER_SHULKER_BOX Lnet/minecraft/class_2627; FIELD field_3985 modelTrident Lnet/minecraft/class_613; + FIELD field_42909 renderDecoratedPot Lnet/minecraft/class_8172; METHOD (Lnet/minecraft/class_824;Lnet/minecraft/class_5599;)V ARG 1 blockEntityRenderDispatcher ARG 2 entityModelLoader - METHOD method_3166 render (Lnet/minecraft/class_1799;Lnet/minecraft/class_809$class_811;Lnet/minecraft/class_4587;Lnet/minecraft/class_4597;II)V + METHOD method_3166 render (Lnet/minecraft/class_1799;Lnet/minecraft/class_811;Lnet/minecraft/class_4587;Lnet/minecraft/class_4597;II)V ARG 1 stack ARG 2 mode ARG 3 matrices ARG 4 vertexConsumers ARG 5 light ARG 6 overlay - METHOD method_37310 (Lnet/minecraft/class_2487;Lcom/mojang/authlib/GameProfile;)V - ARG 1 profile + METHOD method_32132 (Lnet/minecraft/class_1767;)Lnet/minecraft/class_2627; + ARG 0 color diff --git a/mappings/net/minecraft/client/render/item/HeldItemRenderer.mapping b/mappings/net/minecraft/client/render/item/HeldItemRenderer.mapping index 999147dde0..7c3ee6bb07 100644 --- a/mappings/net/minecraft/client/render/item/HeldItemRenderer.mapping +++ b/mappings/net/minecraft/client/render/item/HeldItemRenderer.mapping @@ -104,7 +104,7 @@ CLASS net/minecraft/class_759 net/minecraft/client/render/item/HeldItemRenderer ARG 4 pitch ARG 5 equipProgress ARG 6 swingProgress - METHOD method_3233 renderItem (Lnet/minecraft/class_1309;Lnet/minecraft/class_1799;Lnet/minecraft/class_809$class_811;ZLnet/minecraft/class_4587;Lnet/minecraft/class_4597;I)V + METHOD method_3233 renderItem (Lnet/minecraft/class_1309;Lnet/minecraft/class_1799;Lnet/minecraft/class_811;ZLnet/minecraft/class_4587;Lnet/minecraft/class_4597;I)V ARG 1 entity ARG 2 stack ARG 3 renderMode @@ -118,6 +118,12 @@ CLASS net/minecraft/class_759 net/minecraft/client/render/item/HeldItemRenderer ARG 0 player METHOD method_33304 getUsingItemHandRenderType (Lnet/minecraft/class_746;)Lnet/minecraft/class_759$class_5773; ARG 0 player + METHOD method_49340 applyBrushTransformation (Lnet/minecraft/class_4587;FLnet/minecraft/class_1306;Lnet/minecraft/class_1799;F)V + ARG 1 matrices + ARG 2 tickDelta + ARG 3 arm + ARG 4 stack + ARG 5 equipProgress CLASS class_5773 HandRenderType FIELD field_28387 renderMainHand Z FIELD field_28388 renderOffHand Z diff --git a/mappings/net/minecraft/client/render/item/ItemRenderer.mapping b/mappings/net/minecraft/client/render/item/ItemRenderer.mapping index 361949ab66..e3405b06ad 100644 --- a/mappings/net/minecraft/client/render/item/ItemRenderer.mapping +++ b/mappings/net/minecraft/client/render/item/ItemRenderer.mapping @@ -1,19 +1,25 @@ CLASS net/minecraft/class_918 net/minecraft/client/render/item/ItemRenderer - FIELD field_21010 ENCHANTED_ITEM_GLINT Lnet/minecraft/class_2960; FIELD field_27770 builtinModelItemRenderer Lnet/minecraft/class_756; FIELD field_32935 COMPASS_WITH_GLINT_GUI_MODEL_MULTIPLIER F FIELD field_32936 COMPASS_WITH_GLINT_FIRST_PERSON_MODEL_MULTIPLIER F + FIELD field_40530 TRIDENT_IN_HAND Lnet/minecraft/class_1091; + FIELD field_40531 SPYGLASS_IN_HAND Lnet/minecraft/class_1091; + FIELD field_40532 TRIDENT Lnet/minecraft/class_1091; + FIELD field_40533 SPYGLASS Lnet/minecraft/class_1091; + FIELD field_42073 client Lnet/minecraft/class_310; + FIELD field_43086 ENTITY_ENCHANTMENT_GLINT Lnet/minecraft/class_2960; + FIELD field_43087 ITEM_ENCHANTMENT_GLINT Lnet/minecraft/class_2960; FIELD field_4728 WITHOUT_MODELS Ljava/util/Set; FIELD field_4729 textureManager Lnet/minecraft/class_1060; - FIELD field_4730 zOffset F FIELD field_4732 models Lnet/minecraft/class_763; FIELD field_4733 colors Lnet/minecraft/class_325; - METHOD (Lnet/minecraft/class_1060;Lnet/minecraft/class_1092;Lnet/minecraft/class_325;Lnet/minecraft/class_756;)V - ARG 1 manager - ARG 2 bakery - ARG 3 colors - ARG 4 builtinModelItemRenderer - METHOD method_23177 renderItem (Lnet/minecraft/class_1309;Lnet/minecraft/class_1799;Lnet/minecraft/class_809$class_811;ZLnet/minecraft/class_4587;Lnet/minecraft/class_4597;Lnet/minecraft/class_1937;III)V + METHOD (Lnet/minecraft/class_310;Lnet/minecraft/class_1060;Lnet/minecraft/class_1092;Lnet/minecraft/class_325;Lnet/minecraft/class_756;)V + ARG 1 client + ARG 2 manager + ARG 3 bakery + ARG 4 colors + ARG 5 builtinModelItemRenderer + METHOD method_23177 renderItem (Lnet/minecraft/class_1309;Lnet/minecraft/class_1799;Lnet/minecraft/class_811;ZLnet/minecraft/class_4587;Lnet/minecraft/class_4597;Lnet/minecraft/class_1937;III)V ARG 1 entity ARG 2 item ARG 3 renderMode @@ -24,15 +30,16 @@ CLASS net/minecraft/class_918 net/minecraft/client/render/item/ItemRenderer ARG 8 light ARG 9 overlay ARG 10 seed - METHOD method_23178 renderItem (Lnet/minecraft/class_1799;Lnet/minecraft/class_809$class_811;IILnet/minecraft/class_4587;Lnet/minecraft/class_4597;I)V + METHOD method_23178 renderItem (Lnet/minecraft/class_1799;Lnet/minecraft/class_811;IILnet/minecraft/class_4587;Lnet/minecraft/class_4597;Lnet/minecraft/class_1937;I)V ARG 1 stack ARG 2 transformationType ARG 3 light ARG 4 overlay ARG 5 matrices ARG 6 vertexConsumers - ARG 7 seed - METHOD method_23179 renderItem (Lnet/minecraft/class_1799;Lnet/minecraft/class_809$class_811;ZLnet/minecraft/class_4587;Lnet/minecraft/class_4597;IILnet/minecraft/class_1087;)V + ARG 7 world + ARG 8 seed + METHOD method_23179 renderItem (Lnet/minecraft/class_1799;Lnet/minecraft/class_811;ZLnet/minecraft/class_4587;Lnet/minecraft/class_4597;IILnet/minecraft/class_1087;)V ARG 1 stack ARG 2 renderMode ARG 3 leftHanded @@ -60,104 +67,29 @@ CLASS net/minecraft/class_918 net/minecraft/client/render/item/ItemRenderer ARG 4 overlay ARG 5 matrices ARG 6 vertices - METHOD method_27951 renderInGuiWithOverrides (Lnet/minecraft/class_1309;Lnet/minecraft/class_1799;III)V - COMMENT Renders an item in a GUI with an attached entity. - COMMENT - COMMENT

The entity is used to calculate model overrides for the item. - ARG 1 entity - ARG 2 stack - ARG 3 x - ARG 4 y - ARG 5 seed METHOD method_27952 getArmorGlintConsumer (Lnet/minecraft/class_4597;Lnet/minecraft/class_1921;ZZ)Lnet/minecraft/class_4588; ARG 0 provider ARG 1 layer ARG 2 solid ARG 3 glint - METHOD method_27953 renderInGui (Lnet/minecraft/class_1799;II)V - COMMENT Renders an item in a GUI without an attached entity. - ARG 1 stack - ARG 2 x - ARG 3 y METHOD method_29711 getDirectItemGlintConsumer (Lnet/minecraft/class_4597;Lnet/minecraft/class_1921;ZZ)Lnet/minecraft/class_4588; ARG 0 provider ARG 1 layer ARG 2 solid ARG 3 glint - METHOD method_30114 getCompassGlintConsumer (Lnet/minecraft/class_4597;Lnet/minecraft/class_1921;Lnet/minecraft/class_4587$class_4665;)Lnet/minecraft/class_4588; + METHOD method_30114 getDynamicDisplayGlintConsumer (Lnet/minecraft/class_4597;Lnet/minecraft/class_1921;Lnet/minecraft/class_4587$class_4665;)Lnet/minecraft/class_4588; ARG 0 provider ARG 1 layer ARG 2 entry - METHOD method_30115 getDirectCompassGlintConsumer (Lnet/minecraft/class_4597;Lnet/minecraft/class_1921;Lnet/minecraft/class_4587$class_4665;)Lnet/minecraft/class_4588; + METHOD method_30115 getDirectDynamicDisplayGlintConsumer (Lnet/minecraft/class_4597;Lnet/minecraft/class_1921;Lnet/minecraft/class_4587$class_4665;)Lnet/minecraft/class_4588; ARG 0 provider ARG 1 layer ARG 2 entry - METHOD method_32797 renderInGuiWithOverrides (Lnet/minecraft/class_1799;III)V - ARG 1 stack - ARG 2 x - ARG 3 y - ARG 4 seed - METHOD method_36542 renderInGuiWithOverrides (Lnet/minecraft/class_1799;IIII)V - ARG 1 stack - ARG 2 x - ARG 3 y - ARG 4 seed - ARG 5 depth - METHOD method_36543 innerRenderInGui (Lnet/minecraft/class_1309;Lnet/minecraft/class_1799;III)V - ARG 1 entity - ARG 2 stack - ARG 3 x - ARG 4 y - ARG 5 seed - METHOD method_4004 renderGuiQuad (Lnet/minecraft/class_287;IIIIIIII)V - ARG 1 buffer - ARG 2 x - ARG 3 y - ARG 4 width - ARG 5 height - ARG 6 red - ARG 7 green - ARG 8 blue - ARG 9 alpha - METHOD method_4010 renderGuiItemIcon (Lnet/minecraft/class_1799;II)V - ARG 1 stack - ARG 2 x - ARG 3 y METHOD method_4012 getModels ()Lnet/minecraft/class_763; METHOD method_4019 getModel (Lnet/minecraft/class_1799;Lnet/minecraft/class_1937;Lnet/minecraft/class_1309;I)Lnet/minecraft/class_1087; ARG 1 stack ARG 2 world ARG 3 entity ARG 4 seed - METHOD method_4021 renderGuiItemModel (Lnet/minecraft/class_1799;IILnet/minecraft/class_1087;)V - ARG 1 stack - ARG 2 x - ARG 3 y - ARG 4 model - METHOD method_4022 renderGuiItemOverlay (Lnet/minecraft/class_327;Lnet/minecraft/class_1799;IILjava/lang/String;)V - COMMENT Renders the overlay for items in GUIs, including the damage bar and the item count. - ARG 1 renderer - ARG 2 stack - ARG 3 x - ARG 4 y - ARG 5 countLabel - COMMENT a label for the stack; if null, the stack count is drawn instead - METHOD method_4023 renderInGuiWithOverrides (Lnet/minecraft/class_1799;II)V - COMMENT Renders an item in a GUI with the player as the attached entity - COMMENT for calculating model overrides. - ARG 1 stack - ARG 2 x - ARG 3 y - METHOD method_4025 renderGuiItemOverlay (Lnet/minecraft/class_327;Lnet/minecraft/class_1799;II)V - COMMENT Renders the overlay for items in GUIs, including the damage bar and the item count. - ARG 1 renderer - ARG 2 stack - ARG 3 x - ARG 4 y - METHOD method_4026 innerRenderInGui (Lnet/minecraft/class_1309;Lnet/minecraft/class_1799;IIII)V - ARG 1 entity - ARG 2 itemStack - ARG 3 x - ARG 4 y - ARG 5 seed - ARG 6 depth + METHOD method_51795 usesDynamicDisplay (Lnet/minecraft/class_1799;)Z + ARG 0 stack diff --git a/mappings/net/minecraft/client/render/model/BakedModelManager.mapping b/mappings/net/minecraft/client/render/model/BakedModelManager.mapping index 105f1633e4..c30f794f97 100644 --- a/mappings/net/minecraft/client/render/model/BakedModelManager.mapping +++ b/mappings/net/minecraft/client/render/model/BakedModelManager.mapping @@ -2,8 +2,9 @@ CLASS net/minecraft/class_1092 net/minecraft/client/render/model/BakedModelManag FIELD field_20277 colorMap Lnet/minecraft/class_324; 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 mipmapLevels I + FIELD field_40573 LOGGER Lorg/slf4j/Logger; + FIELD field_40574 LAYERS_TO_LOADERS Ljava/util/Map; FIELD field_5407 missingModel Lnet/minecraft/class_1087; FIELD field_5408 models Ljava/util/Map; FIELD field_5410 blockModelCache Lnet/minecraft/class_773; @@ -11,6 +12,9 @@ CLASS net/minecraft/class_1092 net/minecraft/client/render/model/BakedModelManag ARG 1 textureManager ARG 2 colorMap ARG 3 mipmap + METHOD method_18179 upload (Lnet/minecraft/class_1092$class_7779;Lnet/minecraft/class_3695;)V + ARG 1 bakingResult + ARG 2 profiler METHOD method_21611 shouldRerender (Lnet/minecraft/class_2680;Lnet/minecraft/class_2680;)Z ARG 1 from ARG 2 to @@ -18,7 +22,47 @@ CLASS net/minecraft/class_1092 net/minecraft/client/render/model/BakedModelManag ARG 1 mipmapLevels METHOD method_24153 getAtlas (Lnet/minecraft/class_2960;)Lnet/minecraft/class_1059; ARG 1 id + METHOD method_45879 (Lnet/minecraft/class_2960;Ljava/util/Collection;)V + ARG 0 modelId + ARG 1 spriteIds + METHOD method_45881 reloadModels (Lnet/minecraft/class_3300;Ljava/util/concurrent/Executor;)Ljava/util/concurrent/CompletableFuture; + ARG 0 resourceManager + ARG 1 executor + METHOD method_45882 (Lnet/minecraft/class_3695;Lnet/minecraft/class_1092$class_7779;)V + ARG 2 result + METHOD method_45883 bake (Lnet/minecraft/class_3695;Ljava/util/Map;Lnet/minecraft/class_1088;)Lnet/minecraft/class_1092$class_7779; + ARG 1 profiler + ARG 2 preparations + ARG 3 modelLoader + METHOD method_45884 (Lnet/minecraft/class_3695;Ljava/util/Map;Ljava/util/Map;)Lnet/minecraft/class_1088; + ARG 2 jsonUnbakedModels + ARG 3 blockStates + METHOD method_45885 (Lnet/minecraft/class_3695;Ljava/util/Map;Ljava/util/concurrent/CompletableFuture;Ljava/lang/Void;)Lnet/minecraft/class_1092$class_7779; + ARG 1 void_ + METHOD method_45887 (Lnet/minecraft/class_1092$class_7779;)Ljava/util/concurrent/CompletionStage; + ARG 0 result + METHOD method_45888 (Lnet/minecraft/class_1092$class_7779;Ljava/lang/Void;)Lnet/minecraft/class_1092$class_7779; + ARG 1 void_ + METHOD method_45889 (Ljava/util/List;)Ljava/util/Map; + ARG 0 blockStates + METHOD method_45891 (Ljava/util/Map;Lcom/google/common/collect/Multimap;Lnet/minecraft/class_2960;Lnet/minecraft/class_4730;)Lnet/minecraft/class_1058; + ARG 2 id + ARG 3 spriteId + METHOD method_45892 (Ljava/util/Map;Lnet/minecraft/class_1087;Ljava/util/Map;Lnet/minecraft/class_2680;)V + ARG 3 state + METHOD method_45893 (Ljava/util/concurrent/Executor;Ljava/util/Map;)Ljava/util/concurrent/CompletionStage; + ARG 1 blockStates + METHOD method_45896 reloadBlockStates (Lnet/minecraft/class_3300;Ljava/util/concurrent/Executor;)Ljava/util/concurrent/CompletableFuture; + ARG 0 resourceManager + ARG 1 executor + METHOD method_45897 (Ljava/util/List;)Ljava/util/Map; + ARG 0 models + METHOD method_45899 (Ljava/util/concurrent/Executor;Ljava/util/Map;)Ljava/util/concurrent/CompletionStage; + ARG 1 models METHOD method_4742 getModel (Lnet/minecraft/class_1091;)Lnet/minecraft/class_1087; ARG 1 id METHOD method_4743 getBlockModels ()Lnet/minecraft/class_773; METHOD method_4744 getMissingModel ()Lnet/minecraft/class_1087; + CLASS class_7779 BakingResult + FIELD comp_1058 modelLoader Lnet/minecraft/class_1088; + METHOD comp_1058 modelLoader ()Lnet/minecraft/class_1088; diff --git a/mappings/net/minecraft/client/render/model/BakedQuadFactory.mapping b/mappings/net/minecraft/client/render/model/BakedQuadFactory.mapping index 8db642bb6d..abcfb6a5e1 100644 --- a/mappings/net/minecraft/client/render/model/BakedQuadFactory.mapping +++ b/mappings/net/minecraft/client/render/model/BakedQuadFactory.mapping @@ -6,7 +6,7 @@ CLASS net/minecraft/class_796 net/minecraft/client/render/model/BakedQuadFactory ARG 1 orientation ARG 2 rotation ARG 3 modelId - METHOD method_3455 transformVertex (Lnet/minecraft/class_1160;Lnet/minecraft/class_4590;)V + METHOD method_3455 transformVertex (Lorg/joml/Vector3f;Lnet/minecraft/class_4590;)V ARG 1 vertex ARG 2 transformation METHOD method_3458 packVertexData (Lnet/minecraft/class_787;Lnet/minecraft/class_1058;Lnet/minecraft/class_2350;[FLnet/minecraft/class_4590;Lnet/minecraft/class_789;Z)[I @@ -17,10 +17,10 @@ CLASS net/minecraft/class_796 net/minecraft/client/render/model/BakedQuadFactory ARG 5 orientation ARG 6 rotation ARG 7 shaded - METHOD method_3459 getPositionMatrix (Lnet/minecraft/class_1160;Lnet/minecraft/class_1160;)[F + METHOD method_3459 getPositionMatrix (Lorg/joml/Vector3f;Lorg/joml/Vector3f;)[F ARG 1 from ARG 2 to - METHOD method_3460 packVertexData ([IILnet/minecraft/class_1160;Lnet/minecraft/class_1058;Lnet/minecraft/class_787;)V + METHOD method_3460 packVertexData ([IILorg/joml/Vector3f;Lnet/minecraft/class_1058;Lnet/minecraft/class_787;)V ARG 1 vertices ARG 2 cornerIndex ARG 3 position @@ -39,17 +39,17 @@ CLASS net/minecraft/class_796 net/minecraft/client/render/model/BakedQuadFactory METHOD method_3462 encodeDirection ([ILnet/minecraft/class_2350;)V ARG 1 rotationMatrix ARG 2 direction - METHOD method_3463 rotateVertex (Lnet/minecraft/class_1160;Lnet/minecraft/class_789;)V + METHOD method_3463 rotateVertex (Lorg/joml/Vector3f;Lnet/minecraft/class_789;)V ARG 1 vector ARG 2 rotation - METHOD method_3464 transformVertex (Lnet/minecraft/class_1160;Lnet/minecraft/class_1160;Lnet/minecraft/class_1159;Lnet/minecraft/class_1160;)V + METHOD method_3464 transformVertex (Lorg/joml/Vector3f;Lorg/joml/Vector3f;Lorg/joml/Matrix4f;Lorg/joml/Vector3f;)V ARG 1 vertex ARG 2 origin ARG 3 transformationMatrix ARG 4 scale METHOD method_3467 decodeDirection ([I)Lnet/minecraft/class_2350; ARG 0 rotationMatrix - METHOD method_3468 bake (Lnet/minecraft/class_1160;Lnet/minecraft/class_1160;Lnet/minecraft/class_783;Lnet/minecraft/class_1058;Lnet/minecraft/class_2350;Lnet/minecraft/class_3665;Lnet/minecraft/class_789;ZLnet/minecraft/class_2960;)Lnet/minecraft/class_777; + METHOD method_3468 bake (Lorg/joml/Vector3f;Lorg/joml/Vector3f;Lnet/minecraft/class_783;Lnet/minecraft/class_1058;Lnet/minecraft/class_2350;Lnet/minecraft/class_3665;Lnet/minecraft/class_789;ZLnet/minecraft/class_2960;)Lnet/minecraft/class_777; ARG 1 from ARG 2 to ARG 3 face diff --git a/mappings/net/minecraft/client/render/model/Baker.mapping b/mappings/net/minecraft/client/render/model/Baker.mapping new file mode 100644 index 0000000000..5874ffa567 --- /dev/null +++ b/mappings/net/minecraft/client/render/model/Baker.mapping @@ -0,0 +1,6 @@ +CLASS net/minecraft/class_7775 net/minecraft/client/render/model/Baker + METHOD method_45872 getOrLoadModel (Lnet/minecraft/class_2960;)Lnet/minecraft/class_1100; + ARG 1 id + METHOD method_45873 bake (Lnet/minecraft/class_2960;Lnet/minecraft/class_3665;)Lnet/minecraft/class_1087; + ARG 1 id + ARG 2 settings diff --git a/mappings/net/minecraft/client/render/model/ModelLoader.mapping b/mappings/net/minecraft/client/render/model/ModelLoader.mapping index 402e542abd..90321df79b 100644 --- a/mappings/net/minecraft/client/render/model/ModelLoader.mapping +++ b/mappings/net/minecraft/client/render/model/ModelLoader.mapping @@ -1,5 +1,4 @@ CLASS net/minecraft/class_1088 net/minecraft/client/render/model/ModelLoader - FIELD field_17907 spriteAtlasData Ljava/util/Map; FIELD field_20272 blockColors Lnet/minecraft/class_324; FIELD field_20273 nextStateId I FIELD field_20274 stateLookup Lit/unimi/dsi/fastutil/objects/Object2IntMap; @@ -9,20 +8,20 @@ CLASS net/minecraft/class_1088 net/minecraft/client/render/model/ModelLoader FIELD field_21557 SHIELD_BASE Lnet/minecraft/class_4730; FIELD field_21558 SHIELD_BASE_NO_PATTERN Lnet/minecraft/class_4730; FIELD field_21772 BLOCK_DESTRUCTION_RENDER_LAYERS Ljava/util/List; - FIELD field_21773 MISSING_ID_STRING Ljava/lang/String; - FIELD field_21774 spriteAtlasManager Lnet/minecraft/class_4724; FIELD field_32986 BUILTIN Ljava/lang/String; FIELD field_32987 BUILTIN_GENERATED Ljava/lang/String; FIELD field_32988 BUILTIN_ENTITY Ljava/lang/String; FIELD field_32989 MISSING Ljava/lang/String; + FIELD field_40567 jsonUnbakedModels Ljava/util/Map; + FIELD field_40568 blockStates Ljava/util/Map; + FIELD field_40569 BLOCK_STATES_FINDER Lnet/minecraft/class_7654; + FIELD field_40570 MODELS_FINDER Lnet/minecraft/class_7654; FIELD field_5370 FIRE_1 Lnet/minecraft/class_4730; 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_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; FIELD field_5380 LOGGER Lorg/slf4j/Logger; FIELD field_5381 LAVA_FLOW Lnet/minecraft/class_4730; FIELD field_5383 STATIC_DEFINITIONS Ljava/util/Map; @@ -39,17 +38,11 @@ CLASS net/minecraft/class_1088 net/minecraft/client/render/model/ModelLoader FIELD field_5398 bakedModelCache Ljava/util/Map; FIELD field_5399 variantMapDeserializationContext Lnet/minecraft/class_790$class_791; 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 - ARG 3 profiler - ARG 4 mipmapLevel - 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; - ARG 1 textureManager + METHOD (Lnet/minecraft/class_324;Lnet/minecraft/class_3695;Ljava/util/Map;Ljava/util/Map;)V + ARG 1 blockColors ARG 2 profiler + ARG 3 jsonUnbakedModels + ARG 4 blockStates METHOD method_21597 (ILnet/minecraft/class_2680;)V ARG 2 state METHOD method_21600 (Lnet/minecraft/class_1088$class_4455;)Ljava/util/Set; @@ -69,10 +62,14 @@ CLASS net/minecraft/class_1088 net/minecraft/client/render/model/ModelLoader ARG 0 stage METHOD method_23216 (Lnet/minecraft/class_2960;)Lnet/minecraft/class_2960; ARG 0 id - METHOD method_24149 (Lcom/mojang/datafixers/util/Pair;)V - ARG 0 pair - METHOD method_24150 (Ljava/util/HashSet;)V - ARG 0 textures + METHOD method_45874 (Lnet/minecraft/class_2960;Lnet/minecraft/class_1088$class_7777;)Lcom/mojang/datafixers/util/Pair; + ARG 2 blockState + METHOD method_45875 (Lnet/minecraft/class_1100;)V + ARG 1 model + METHOD method_45876 bake (Ljava/util/function/BiFunction;)V + ARG 1 spriteLoader + METHOD method_45877 (Ljava/util/function/BiFunction;Lnet/minecraft/class_2960;)V + ARG 2 modelId METHOD method_4715 loadModel (Lnet/minecraft/class_2960;)V ARG 1 id METHOD method_4716 (Lnet/minecraft/class_2680;)V @@ -81,8 +78,12 @@ CLASS net/minecraft/class_1088 net/minecraft/client/render/model/ModelLoader ARG 2 state METHOD method_4718 loadModelFromJson (Lnet/minecraft/class_2960;)Lnet/minecraft/class_793; ARG 1 id + METHOD method_4719 (Lnet/minecraft/class_793;)V + ARG 0 model METHOD method_4720 (Ljava/util/Map;Lnet/minecraft/class_2960;Lnet/minecraft/class_2680;)V ARG 2 state + METHOD method_4721 (Lnet/minecraft/class_793;)V + ARG 0 model METHOD method_4722 (Ljava/util/Map;Lnet/minecraft/class_807;Ljava/util/List;Lnet/minecraft/class_816;Lcom/mojang/datafixers/util/Pair;Lnet/minecraft/class_790;Lnet/minecraft/class_2680;)V ARG 6 state METHOD method_4723 (Lnet/minecraft/class_2960;Lnet/minecraft/class_2689;)V @@ -106,18 +107,14 @@ CLASS net/minecraft/class_1088 net/minecraft/client/render/model/ModelLoader METHOD method_4731 (Lcom/google/common/collect/ImmutableList;Lnet/minecraft/class_2689;Ljava/util/Map;Ljava/util/List;Lnet/minecraft/class_816;Lcom/mojang/datafixers/util/Pair;Lnet/minecraft/class_790;Lnet/minecraft/class_2960;Lcom/mojang/datafixers/util/Pair;Ljava/lang/String;Lnet/minecraft/class_807;)V ARG 9 key ARG 10 model - METHOD method_4732 (Ljava/util/Set;Lnet/minecraft/class_1100;)Ljava/util/stream/Stream; - ARG 2 model - METHOD method_4733 (Lnet/minecraft/class_2960;)V - ARG 1 id METHOD method_4734 getBakedModelMap ()Ljava/util/Map; - METHOD method_4737 (Lnet/minecraft/class_2960;Lnet/minecraft/class_3298;)Lcom/mojang/datafixers/util/Pair; - ARG 2 resource METHOD method_4738 (Ljava/util/Map;Lnet/minecraft/class_816;Ljava/util/List;Lnet/minecraft/class_2680;)V ARG 3 state METHOD method_4739 (Lnet/minecraft/class_2248;Ljava/util/Map;Lnet/minecraft/class_2680;)Z ARG 2 state CLASS class_1089 ModelLoaderException + METHOD (Ljava/lang/String;)V + ARG 1 message CLASS class_4455 ModelDefinition FIELD field_20275 components Ljava/util/List; FIELD field_20276 values Ljava/util/List; @@ -139,3 +136,12 @@ CLASS net/minecraft/class_1088 net/minecraft/client/render/model/ModelLoader ARG 1 properties METHOD method_21610 (Lnet/minecraft/class_2689;Lnet/minecraft/class_2680;Lnet/minecraft/class_819;)Z ARG 2 component + CLASS class_7776 BakedModelCacheKey + CLASS class_7777 SourceTrackedData + CLASS class_7778 BakerImpl + FIELD field_40572 textureGetter Ljava/util/function/Function; + METHOD (Lnet/minecraft/class_1088;Ljava/util/function/BiFunction;Lnet/minecraft/class_2960;)V + ARG 2 spriteLoader + ARG 3 modelId + METHOD method_45878 (Ljava/util/function/BiFunction;Lnet/minecraft/class_2960;Lnet/minecraft/class_4730;)Lnet/minecraft/class_1058; + ARG 2 spriteId diff --git a/mappings/net/minecraft/client/render/model/ModelRotation.mapping b/mappings/net/minecraft/client/render/model/ModelRotation.mapping index 9ac58b904d..ff5becc09b 100644 --- a/mappings/net/minecraft/client/render/model/ModelRotation.mapping +++ b/mappings/net/minecraft/client/render/model/ModelRotation.mapping @@ -11,6 +11,8 @@ CLASS net/minecraft/class_1086 net/minecraft/client/render/model/ModelRotation METHOD method_4699 get (II)Lnet/minecraft/class_1086; ARG 0 x ARG 1 y + METHOD method_4700 (Lnet/minecraft/class_1086;)Lnet/minecraft/class_1086; + ARG 0 rotation METHOD method_4701 (Lnet/minecraft/class_1086;)Ljava/lang/Integer; ARG 0 rotation METHOD method_4703 getIndex (II)I diff --git a/mappings/net/minecraft/client/render/model/MultipartUnbakedModel.mapping b/mappings/net/minecraft/client/render/model/MultipartUnbakedModel.mapping index eb993306cd..a02177b879 100644 --- a/mappings/net/minecraft/client/render/model/MultipartUnbakedModel.mapping +++ b/mappings/net/minecraft/client/render/model/MultipartUnbakedModel.mapping @@ -10,8 +10,8 @@ CLASS net/minecraft/class_816 net/minecraft/client/render/model/MultipartUnbaked ARG 0 component METHOD method_3519 getComponents ()Ljava/util/List; METHOD method_3520 getModels ()Ljava/util/Set; - METHOD method_3521 (Ljava/util/function/Function;Ljava/util/Set;Lnet/minecraft/class_819;)Ljava/util/stream/Stream; - ARG 2 component + METHOD method_45789 (Ljava/util/function/Function;Lnet/minecraft/class_819;)V + ARG 1 component CLASS class_817 Deserializer FIELD field_4331 context Lnet/minecraft/class_790$class_791; METHOD (Lnet/minecraft/class_790$class_791;)V diff --git a/mappings/net/minecraft/client/render/model/SpriteAtlasManager.mapping b/mappings/net/minecraft/client/render/model/SpriteAtlasManager.mapping index 0e573c6538..ce711ce446 100644 --- a/mappings/net/minecraft/client/render/model/SpriteAtlasManager.mapping +++ b/mappings/net/minecraft/client/render/model/SpriteAtlasManager.mapping @@ -1,8 +1,29 @@ CLASS net/minecraft/class_4724 net/minecraft/client/render/model/SpriteAtlasManager FIELD field_21746 atlases Ljava/util/Map; - METHOD (Ljava/util/Collection;)V - ARG 1 atlases - METHOD method_24097 getSprite (Lnet/minecraft/class_4730;)Lnet/minecraft/class_1058; - ARG 1 id + METHOD (Ljava/util/Map;Lnet/minecraft/class_1060;)V + ARG 1 loaders + ARG 2 textureManager METHOD method_24098 getAtlas (Lnet/minecraft/class_2960;)Lnet/minecraft/class_1059; ARG 1 id + METHOD method_45862 reload (Lnet/minecraft/class_3300;ILjava/util/concurrent/Executor;)Ljava/util/Map; + ARG 1 resourceManager + ARG 2 mipmapLevels + ARG 3 executor + METHOD method_45863 (Lnet/minecraft/class_3300;ILjava/util/concurrent/Executor;Ljava/util/Map$Entry;)Ljava/util/concurrent/CompletableFuture; + ARG 3 entry + METHOD method_45864 (Lnet/minecraft/class_1060;Ljava/util/Map$Entry;)Lnet/minecraft/class_4724$class_7772; + ARG 1 entry + METHOD method_45867 (Lnet/minecraft/class_4724$class_7772;Lnet/minecraft/class_7766$class_7767;)Lnet/minecraft/class_4724$class_7774; + ARG 1 stitchResult + CLASS class_7772 Atlas + CLASS class_7774 AtlasPreparation + FIELD field_40564 atlasTexture Lnet/minecraft/class_1059; + FIELD field_40565 stitchResult Lnet/minecraft/class_7766$class_7767; + METHOD (Lnet/minecraft/class_1059;Lnet/minecraft/class_7766$class_7767;)V + ARG 1 atlasTexture + ARG 2 stitchResult + METHOD method_45868 getMissingSprite ()Lnet/minecraft/class_1058; + METHOD method_45869 getSprite (Lnet/minecraft/class_2960;)Lnet/minecraft/class_1058; + ARG 1 id + METHOD method_45870 whenComplete ()Ljava/util/concurrent/CompletableFuture; + METHOD method_45871 upload ()V diff --git a/mappings/net/minecraft/client/render/model/UnbakedModel.mapping b/mappings/net/minecraft/client/render/model/UnbakedModel.mapping index 532ea83379..469a339410 100644 --- a/mappings/net/minecraft/client/render/model/UnbakedModel.mapping +++ b/mappings/net/minecraft/client/render/model/UnbakedModel.mapping @@ -1,10 +1,9 @@ CLASS net/minecraft/class_1100 net/minecraft/client/render/model/UnbakedModel - METHOD method_4753 bake (Lnet/minecraft/class_1088;Ljava/util/function/Function;Lnet/minecraft/class_3665;Lnet/minecraft/class_2960;)Lnet/minecraft/class_1087; - ARG 1 loader + METHOD method_45785 setParents (Ljava/util/function/Function;)V + ARG 1 modelLoader + METHOD method_4753 bake (Lnet/minecraft/class_7775;Ljava/util/function/Function;Lnet/minecraft/class_3665;Lnet/minecraft/class_2960;)Lnet/minecraft/class_1087; + ARG 1 baker ARG 2 textureGetter ARG 3 rotationContainer ARG 4 modelId - METHOD method_4754 getTextureDependencies (Ljava/util/function/Function;Ljava/util/Set;)Ljava/util/Collection; - ARG 1 unbakedModelGetter - ARG 2 unresolvedTextureReferences METHOD method_4755 getModelDependencies ()Ljava/util/Collection; diff --git a/mappings/net/minecraft/client/render/model/json/ItemModelGenerator.mapping b/mappings/net/minecraft/client/render/model/json/ItemModelGenerator.mapping index cb1f4a4f48..0c0959bc5a 100644 --- a/mappings/net/minecraft/client/render/model/json/ItemModelGenerator.mapping +++ b/mappings/net/minecraft/client/render/model/json/ItemModelGenerator.mapping @@ -1,8 +1,8 @@ CLASS net/minecraft/class_801 net/minecraft/client/render/model/json/ItemModelGenerator FIELD field_4270 LAYERS Ljava/util/List; - METHOD method_33428 (IILnet/minecraft/class_1058;Ljava/util/List;I)V + METHOD method_33428 (IILnet/minecraft/class_7764;Ljava/util/List;I)V ARG 5 frame - METHOD method_3476 buildCube (Lnet/minecraft/class_801$class_803;Ljava/util/List;Lnet/minecraft/class_1058;IIIIIZ)V + METHOD method_3476 buildCube (Lnet/minecraft/class_801$class_803;Ljava/util/List;Lnet/minecraft/class_7764;IIIIIZ)V ARG 1 side ARG 2 cubes ARG 3 sprite @@ -11,23 +11,23 @@ CLASS net/minecraft/class_801 net/minecraft/client/render/model/json/ItemModelGe ARG 6 y ARG 7 width ARG 8 height - METHOD method_3477 isPixelTransparent (Lnet/minecraft/class_1058;IIIII)Z + METHOD method_3477 isPixelTransparent (Lnet/minecraft/class_7764;IIIII)Z ARG 1 sprite ARG 2 frame ARG 3 x ARG 4 y ARG 5 width ARG 6 height - METHOD method_3478 getFrames (Lnet/minecraft/class_1058;)Ljava/util/List; + METHOD method_3478 getFrames (Lnet/minecraft/class_7764;)Ljava/util/List; ARG 1 sprite METHOD method_3479 create (Ljava/util/function/Function;Lnet/minecraft/class_793;)Lnet/minecraft/class_793; ARG 1 textureGetter ARG 2 blockModel - METHOD method_3480 addLayerElements (ILjava/lang/String;Lnet/minecraft/class_1058;)Ljava/util/List; + METHOD method_3480 addLayerElements (ILjava/lang/String;Lnet/minecraft/class_7764;)Ljava/util/List; ARG 1 layer ARG 2 key ARG 3 sprite - METHOD method_3481 addSubComponents (Lnet/minecraft/class_1058;Ljava/lang/String;I)Ljava/util/List; + METHOD method_3481 addSubComponents (Lnet/minecraft/class_7764;Ljava/lang/String;I)Ljava/util/List; ARG 1 sprite ARG 2 key ARG 3 layer diff --git a/mappings/net/minecraft/client/render/model/json/JsonUnbakedModel.mapping b/mappings/net/minecraft/client/render/model/json/JsonUnbakedModel.mapping index 38d3486014..af50e878fa 100644 --- a/mappings/net/minecraft/client/render/model/json/JsonUnbakedModel.mapping +++ b/mappings/net/minecraft/client/render/model/json/JsonUnbakedModel.mapping @@ -4,7 +4,7 @@ CLASS net/minecraft/class_793 net/minecraft/client/render/model/json/JsonUnbaked FIELD field_32793 TEXTURE_REFERENCE_INITIAL C COMMENT The initial character ({@value}) of a texture reference in JSON; used to COMMENT distinguish texture references from other references. - FIELD field_4244 ambientOcclusion Z + FIELD field_4244 ambientOcclusion Ljava/lang/Boolean; FIELD field_4245 elements Ljava/util/List; FIELD field_4247 parentId Lnet/minecraft/class_2960; FIELD field_4248 LOGGER Lorg/slf4j/Logger; @@ -15,7 +15,7 @@ CLASS net/minecraft/class_793 net/minecraft/client/render/model/json/JsonUnbaked FIELD field_4253 parent Lnet/minecraft/class_793; FIELD field_4254 GSON Lcom/google/gson/Gson; FIELD field_4255 overrides Ljava/util/List; - METHOD (Lnet/minecraft/class_2960;Ljava/util/List;Ljava/util/Map;ZLnet/minecraft/class_793$class_4751;Lnet/minecraft/class_809;Ljava/util/List;)V + METHOD (Lnet/minecraft/class_2960;Ljava/util/List;Ljava/util/Map;Ljava/lang/Boolean;Lnet/minecraft/class_793$class_4751;Lnet/minecraft/class_809;Ljava/util/List;)V ARG 1 parentId ARG 2 elements ARG 3 textureMap @@ -33,25 +33,21 @@ CLASS net/minecraft/class_793 net/minecraft/client/render/model/json/JsonUnbaked ARG 1 name METHOD method_3433 getElements ()Ljava/util/List; METHOD method_3434 getOverrides ()Ljava/util/List; - METHOD method_3435 (Ljava/util/Set;Ljava/lang/String;)V - ARG 2 layer METHOD method_3437 deserialize (Ljava/io/Reader;)Lnet/minecraft/class_793; ARG 0 input - METHOD method_3438 getTransformation (Lnet/minecraft/class_809$class_811;)Lnet/minecraft/class_804; + METHOD method_3438 getTransformation (Lnet/minecraft/class_811;)Lnet/minecraft/class_804; ARG 1 renderMode METHOD method_3439 isTextureReference (Ljava/lang/String;)Z ARG 0 reference - METHOD method_3440 compileOverrides (Lnet/minecraft/class_1088;Lnet/minecraft/class_793;)Lnet/minecraft/class_806; - ARG 1 modelLoader + METHOD method_3440 compileOverrides (Lnet/minecraft/class_7775;Lnet/minecraft/class_793;)Lnet/minecraft/class_806; + ARG 1 baker ARG 2 parent - METHOD method_3441 (Ljava/util/function/Function;Ljava/util/Set;Ljava/util/Set;Lnet/minecraft/class_799;)V - ARG 4 override METHOD method_3442 resolveTexture (Ljava/lang/String;)Lcom/mojang/datafixers/util/Either; ARG 1 name METHOD method_3443 getTransformations ()Lnet/minecraft/class_809; METHOD method_3444 useAmbientOcclusion ()Z - METHOD method_3446 bake (Lnet/minecraft/class_1088;Lnet/minecraft/class_793;Ljava/util/function/Function;Lnet/minecraft/class_3665;Lnet/minecraft/class_2960;Z)Lnet/minecraft/class_1087; - ARG 1 loader + METHOD method_3446 bake (Lnet/minecraft/class_7775;Lnet/minecraft/class_793;Ljava/util/function/Function;Lnet/minecraft/class_3665;Lnet/minecraft/class_2960;Z)Lnet/minecraft/class_1087; + ARG 1 baker ARG 2 parent ARG 3 textureGetter ARG 4 settings @@ -65,9 +61,9 @@ CLASS net/minecraft/class_793 net/minecraft/client/render/model/json/JsonUnbaked ARG 4 settings ARG 5 id METHOD method_35789 needsResolution ()Z + METHOD method_45786 (Ljava/util/function/Function;Lnet/minecraft/class_799;)V + ARG 2 override CLASS class_795 Deserializer - FIELD field_32794 DEFAULT_AMBIENT_OCCLUSION Z - COMMENT The default value for ambient occlusion if unspecified in JSON; is {@value}. METHOD deserialize (Lcom/google/gson/JsonElement;Ljava/lang/reflect/Type;Lcom/google/gson/JsonDeserializationContext;)Ljava/lang/Object; ARG 1 element ARG 2 unused @@ -85,7 +81,7 @@ CLASS net/minecraft/class_793 net/minecraft/client/render/model/json/JsonUnbaked METHOD method_3452 overridesFromJson (Lcom/google/gson/JsonDeserializationContext;Lcom/google/gson/JsonObject;)Ljava/util/List; ARG 1 context ARG 2 object - METHOD method_3453 ambientOcclusionFromJson (Lcom/google/gson/JsonObject;)Z + METHOD method_3453 ambientOcclusionFromJson (Lcom/google/gson/JsonObject;)Ljava/lang/Boolean; ARG 1 json CLASS class_4751 GuiLight FIELD field_21858 ITEM Lnet/minecraft/class_793$class_4751; diff --git a/mappings/net/minecraft/client/render/model/json/ModelElement.mapping b/mappings/net/minecraft/client/render/model/json/ModelElement.mapping index ab19a6e1cd..16027eb93d 100644 --- a/mappings/net/minecraft/client/render/model/json/ModelElement.mapping +++ b/mappings/net/minecraft/client/render/model/json/ModelElement.mapping @@ -1,10 +1,10 @@ CLASS net/minecraft/class_785 net/minecraft/client/render/model/json/ModelElement - FIELD field_4228 from Lnet/minecraft/class_1160; + FIELD field_4228 from Lorg/joml/Vector3f; FIELD field_4229 shade Z FIELD field_4230 faces Ljava/util/Map; - FIELD field_4231 to Lnet/minecraft/class_1160; + FIELD field_4231 to Lorg/joml/Vector3f; FIELD field_4232 rotation Lnet/minecraft/class_789; - METHOD (Lnet/minecraft/class_1160;Lnet/minecraft/class_1160;Ljava/util/Map;Lnet/minecraft/class_789;Z)V + METHOD (Lorg/joml/Vector3f;Lorg/joml/Vector3f;Ljava/util/Map;Lnet/minecraft/class_789;Z)V ARG 1 from ARG 2 to ARG 3 faces @@ -24,13 +24,13 @@ CLASS net/minecraft/class_785 net/minecraft/client/render/model/json/ModelElemen METHOD method_3404 deserializeFaces (Lcom/google/gson/JsonDeserializationContext;Lcom/google/gson/JsonObject;)Ljava/util/Map; ARG 1 context ARG 2 object - METHOD method_3405 deserializeTo (Lcom/google/gson/JsonObject;)Lnet/minecraft/class_1160; + METHOD method_3405 deserializeTo (Lcom/google/gson/JsonObject;)Lorg/joml/Vector3f; ARG 1 object - METHOD method_3407 deserializeFrom (Lcom/google/gson/JsonObject;)Lnet/minecraft/class_1160; + METHOD method_3407 deserializeFrom (Lcom/google/gson/JsonObject;)Lorg/joml/Vector3f; ARG 1 object METHOD method_3408 getDirection (Ljava/lang/String;)Lnet/minecraft/class_2350; ARG 1 name - METHOD method_3409 deserializeVec3f (Lcom/google/gson/JsonObject;Ljava/lang/String;)Lnet/minecraft/class_1160; + METHOD method_3409 deserializeVec3f (Lcom/google/gson/JsonObject;Ljava/lang/String;)Lorg/joml/Vector3f; ARG 1 object ARG 2 name METHOD method_3410 deserializeRotation (Lcom/google/gson/JsonObject;)Lnet/minecraft/class_789; diff --git a/mappings/net/minecraft/client/render/model/json/ModelOverrideList.mapping b/mappings/net/minecraft/client/render/model/json/ModelOverrideList.mapping index 6806318e4f..f0587cefbd 100644 --- a/mappings/net/minecraft/client/render/model/json/ModelOverrideList.mapping +++ b/mappings/net/minecraft/client/render/model/json/ModelOverrideList.mapping @@ -2,16 +2,14 @@ CLASS net/minecraft/class_806 net/minecraft/client/render/model/json/ModelOverri FIELD field_28792 overrides [Lnet/minecraft/class_806$class_5827; FIELD field_28793 conditionTypes [Lnet/minecraft/class_2960; FIELD field_4292 EMPTY Lnet/minecraft/class_806; - METHOD (Lnet/minecraft/class_1088;Lnet/minecraft/class_793;Ljava/util/function/Function;Ljava/util/List;)V - ARG 1 modelLoader + METHOD (Lnet/minecraft/class_7775;Lnet/minecraft/class_793;Ljava/util/List;)V + ARG 1 baker ARG 2 parent - ARG 3 unbakedModelGetter - ARG 4 overrides - METHOD method_33695 bakeOverridingModel (Lnet/minecraft/class_1088;Lnet/minecraft/class_793;Ljava/util/function/Function;Lnet/minecraft/class_799;)Lnet/minecraft/class_1087; - ARG 1 loader + ARG 3 overrides + METHOD method_33695 bakeOverridingModel (Lnet/minecraft/class_7775;Lnet/minecraft/class_793;Lnet/minecraft/class_799;)Lnet/minecraft/class_1087; + ARG 1 baker ARG 2 parent - ARG 3 unbakedModelGetter - ARG 4 override + ARG 3 override METHOD method_33696 (Lit/unimi/dsi/fastutil/objects/Object2IntMap;Lnet/minecraft/class_799$class_5826;)Lnet/minecraft/class_806$class_5828; ARG 0 map ARG 1 condition diff --git a/mappings/net/minecraft/client/render/model/json/ModelRotation.mapping b/mappings/net/minecraft/client/render/model/json/ModelRotation.mapping index 52347c7d42..6aac87c309 100644 --- a/mappings/net/minecraft/client/render/model/json/ModelRotation.mapping +++ b/mappings/net/minecraft/client/render/model/json/ModelRotation.mapping @@ -1,10 +1,13 @@ CLASS net/minecraft/class_789 net/minecraft/client/render/model/json/ModelRotation - FIELD field_4236 origin Lnet/minecraft/class_1160; - FIELD field_4237 angle F - FIELD field_4238 rescale Z - FIELD field_4239 axis Lnet/minecraft/class_2350$class_2351; - METHOD (Lnet/minecraft/class_1160;Lnet/minecraft/class_2350$class_2351;FZ)V - ARG 1 origin + FIELD comp_1118 origin Lorg/joml/Vector3f; + FIELD comp_1119 axis Lnet/minecraft/class_2350$class_2351; + FIELD comp_1120 angle F + FIELD comp_1121 rescale Z + METHOD (Lorg/joml/Vector3f;Lnet/minecraft/class_2350$class_2351;FZ)V ARG 2 axis ARG 3 angle ARG 4 rescale + METHOD comp_1118 origin ()Lorg/joml/Vector3f; + METHOD comp_1119 axis ()Lnet/minecraft/class_2350$class_2351; + METHOD comp_1120 angle ()F + METHOD comp_1121 rescale ()Z diff --git a/mappings/net/minecraft/client/render/model/json/ModelTransformation.mapping b/mappings/net/minecraft/client/render/model/json/ModelTransformation.mapping index be17af23bf..646300fc4e 100644 --- a/mappings/net/minecraft/client/render/model/json/ModelTransformation.mapping +++ b/mappings/net/minecraft/client/render/model/json/ModelTransformation.mapping @@ -19,18 +19,14 @@ CLASS net/minecraft/class_809 net/minecraft/client/render/model/json/ModelTransf ARG 8 fixed METHOD (Lnet/minecraft/class_809;)V ARG 1 other - METHOD method_3501 isTransformationDefined (Lnet/minecraft/class_809$class_811;)Z + METHOD method_3501 isTransformationDefined (Lnet/minecraft/class_811;)Z ARG 1 renderMode - METHOD method_3503 getTransformation (Lnet/minecraft/class_809$class_811;)Lnet/minecraft/class_804; + METHOD method_3503 getTransformation (Lnet/minecraft/class_811;)Lnet/minecraft/class_804; ARG 1 renderMode CLASS class_810 Deserializer METHOD deserialize (Lcom/google/gson/JsonElement;Ljava/lang/reflect/Type;Lcom/google/gson/JsonDeserializationContext;)Ljava/lang/Object; ARG 1 functionJson ARG 2 unused ARG 3 context - METHOD method_3504 parseModelTransformation (Lcom/google/gson/JsonDeserializationContext;Lcom/google/gson/JsonObject;Ljava/lang/String;)Lnet/minecraft/class_804; + METHOD method_3504 parseModelTransformation (Lcom/google/gson/JsonDeserializationContext;Lcom/google/gson/JsonObject;Lnet/minecraft/class_811;)Lnet/minecraft/class_804; ARG 1 ctx - ARG 2 json - ARG 3 key - CLASS class_811 Mode - METHOD method_29998 isFirstPerson ()Z diff --git a/mappings/net/minecraft/client/render/model/json/ModelTransformationMode.mapping b/mappings/net/minecraft/client/render/model/json/ModelTransformationMode.mapping new file mode 100644 index 0000000000..0c6f632bed --- /dev/null +++ b/mappings/net/minecraft/client/render/model/json/ModelTransformationMode.mapping @@ -0,0 +1,10 @@ +CLASS net/minecraft/class_811 net/minecraft/client/render/model/json/ModelTransformationMode + FIELD field_42468 CODEC Lcom/mojang/serialization/Codec; + FIELD field_42469 FROM_INDEX Ljava/util/function/IntFunction; + FIELD field_42470 index B + FIELD field_42471 name Ljava/lang/String; + METHOD (Ljava/lang/String;IILjava/lang/String;)V + ARG 3 index + ARG 4 name + METHOD method_29998 isFirstPerson ()Z + METHOD method_48961 getIndex ()B diff --git a/mappings/net/minecraft/client/render/model/json/ModelVariantMap.mapping b/mappings/net/minecraft/client/render/model/json/ModelVariantMap.mapping index 3e3428122f..36fe96dcdf 100644 --- a/mappings/net/minecraft/client/render/model/json/ModelVariantMap.mapping +++ b/mappings/net/minecraft/client/render/model/json/ModelVariantMap.mapping @@ -30,6 +30,9 @@ CLASS net/minecraft/class_790 net/minecraft/client/render/model/json/ModelVarian COMMENT @throws VariantAbsentException if no variant with the given {@code key} exists ARG 1 key COMMENT the variant's key + METHOD method_45787 fromJson (Lnet/minecraft/class_790$class_791;Lcom/google/gson/JsonElement;)Lnet/minecraft/class_790; + ARG 0 context + ARG 1 json CLASS class_791 DeserializationContext FIELD field_4242 stateFactory Lnet/minecraft/class_2689; FIELD field_4243 gson Lcom/google/gson/Gson; diff --git a/mappings/net/minecraft/client/render/model/json/Transformation.mapping b/mappings/net/minecraft/client/render/model/json/Transformation.mapping index 1ac7f5165d..1c0b3b0754 100644 --- a/mappings/net/minecraft/client/render/model/json/Transformation.mapping +++ b/mappings/net/minecraft/client/render/model/json/Transformation.mapping @@ -1,9 +1,9 @@ CLASS net/minecraft/class_804 net/minecraft/client/render/model/json/Transformation FIELD field_4284 IDENTITY Lnet/minecraft/class_804; - FIELD field_4285 scale Lnet/minecraft/class_1160; - FIELD field_4286 translation Lnet/minecraft/class_1160; - FIELD field_4287 rotation Lnet/minecraft/class_1160; - METHOD (Lnet/minecraft/class_1160;Lnet/minecraft/class_1160;Lnet/minecraft/class_1160;)V + FIELD field_4285 scale Lorg/joml/Vector3f; + FIELD field_4286 translation Lorg/joml/Vector3f; + FIELD field_4287 rotation Lorg/joml/Vector3f; + METHOD (Lorg/joml/Vector3f;Lorg/joml/Vector3f;Lorg/joml/Vector3f;)V ARG 1 rotation ARG 2 translation ARG 3 scale @@ -13,14 +13,14 @@ CLASS net/minecraft/class_804 net/minecraft/client/render/model/json/Transformat ARG 1 leftHanded ARG 2 matrices CLASS class_805 Deserializer - FIELD field_4288 DEFAULT_ROTATION Lnet/minecraft/class_1160; - FIELD field_4289 DEFAULT_SCALE Lnet/minecraft/class_1160; - FIELD field_4290 DEFAULT_TRANSLATION Lnet/minecraft/class_1160; + FIELD field_4288 DEFAULT_ROTATION Lorg/joml/Vector3f; + FIELD field_4289 DEFAULT_SCALE Lorg/joml/Vector3f; + FIELD field_4290 DEFAULT_TRANSLATION Lorg/joml/Vector3f; METHOD deserialize (Lcom/google/gson/JsonElement;Ljava/lang/reflect/Type;Lcom/google/gson/JsonDeserializationContext;)Ljava/lang/Object; ARG 1 functionJson ARG 2 unused ARG 3 context - METHOD method_3493 parseVector3f (Lcom/google/gson/JsonObject;Ljava/lang/String;Lnet/minecraft/class_1160;)Lnet/minecraft/class_1160; + METHOD method_3493 parseVector3f (Lcom/google/gson/JsonObject;Ljava/lang/String;Lorg/joml/Vector3f;)Lorg/joml/Vector3f; ARG 1 json ARG 2 key ARG 3 fallback diff --git a/mappings/net/minecraft/client/render/model/json/WeightedUnbakedModel.mapping b/mappings/net/minecraft/client/render/model/json/WeightedUnbakedModel.mapping index 8e3b66354c..3ca9cbf6bf 100644 --- a/mappings/net/minecraft/client/render/model/json/WeightedUnbakedModel.mapping +++ b/mappings/net/minecraft/client/render/model/json/WeightedUnbakedModel.mapping @@ -5,6 +5,8 @@ CLASS net/minecraft/class_807 net/minecraft/client/render/model/json/WeightedUnb METHOD equals (Ljava/lang/Object;)Z ARG 1 o METHOD method_3497 getVariants ()Ljava/util/List; + METHOD method_45788 (Ljava/util/function/Function;Lnet/minecraft/class_2960;)V + ARG 1 id CLASS class_808 Deserializer METHOD deserialize (Lcom/google/gson/JsonElement;Ljava/lang/reflect/Type;Lcom/google/gson/JsonDeserializationContext;)Ljava/lang/Object; ARG 1 functionJson diff --git a/mappings/net/minecraft/client/report/AbuseReport.mapping b/mappings/net/minecraft/client/report/AbuseReport.mapping new file mode 100644 index 0000000000..b83c17f974 --- /dev/null +++ b/mappings/net/minecraft/client/report/AbuseReport.mapping @@ -0,0 +1,41 @@ +CLASS net/minecraft/class_7855 net/minecraft/client/report/AbuseReport + FIELD field_40813 reportId Ljava/util/UUID; + FIELD field_40814 currentTime Ljava/time/Instant; + FIELD field_40815 reportedPlayerUuid Ljava/util/UUID; + FIELD field_40817 opinionComments Ljava/lang/String; + FIELD field_40818 reason Lnet/minecraft/class_7573; + METHOD (Ljava/util/UUID;Ljava/time/Instant;Ljava/util/UUID;)V + ARG 1 reportId + ARG 2 currentTime + ARG 3 reportedPlayerUuid + METHOD method_46547 copy ()Lnet/minecraft/class_7855; + METHOD method_46549 playerUuidEquals (Ljava/util/UUID;)Z + ARG 1 uuid + METHOD method_53596 createReportScreen (Lnet/minecraft/class_437;Lnet/minecraft/class_7574;)Lnet/minecraft/class_437; + ARG 1 parent + ARG 2 context + CLASS class_7567 ValidationError + FIELD field_39655 NO_REASON Lnet/minecraft/class_7855$class_7567; + FIELD field_39656 NO_REPORTED_MESSAGES Lnet/minecraft/class_7855$class_7567; + FIELD field_39657 TOO_MANY_MESSAGES Lnet/minecraft/class_7855$class_7567; + FIELD field_39658 COMMENTS_TOO_LONG Lnet/minecraft/class_7855$class_7567; + METHOD method_53615 createTooltip ()Lnet/minecraft/class_7919; + CLASS class_7568 ReportWithId + CLASS class_8775 Builder + FIELD field_46061 report Lnet/minecraft/class_7855; + FIELD field_46062 limits Lcom/mojang/authlib/minecraft/report/AbuseReportLimits; + METHOD (Lnet/minecraft/class_7855;Lcom/mojang/authlib/minecraft/report/AbuseReportLimits;)V + ARG 1 report + ARG 2 limits + METHOD method_53600 build (Lnet/minecraft/class_7574;)Lcom/mojang/datafixers/util/Either; + ARG 1 context + METHOD method_53602 hasEnoughInfo ()Z + METHOD method_53605 validate ()Lnet/minecraft/class_7855$class_7567; + METHOD method_53609 setReason (Lnet/minecraft/class_7573;)V + ARG 1 reason + METHOD method_53610 setOpinionComments (Ljava/lang/String;)V + ARG 1 opinionComments + METHOD method_53611 getReport ()Lnet/minecraft/class_7855; + METHOD method_53612 getReportedPlayerUuid ()Ljava/util/UUID; + METHOD method_53613 getOpinionComments ()Ljava/lang/String; + METHOD method_53614 getReason ()Lnet/minecraft/class_7573; diff --git a/mappings/net/minecraft/client/report/AbuseReportContext.mapping b/mappings/net/minecraft/client/report/AbuseReportContext.mapping index daa3bdeda3..3f882bf702 100644 --- a/mappings/net/minecraft/client/report/AbuseReportContext.mapping +++ b/mappings/net/minecraft/client/report/AbuseReportContext.mapping @@ -1,7 +1,29 @@ CLASS net/minecraft/class_7574 net/minecraft/client/report/AbuseReportContext FIELD field_39675 MAX_LOGS I + FIELD field_40819 sender Lnet/minecraft/class_7563; + FIELD field_40820 environment Lnet/minecraft/class_7569; + FIELD field_40821 chatLog Lnet/minecraft/class_7555; + FIELD field_40822 draft Lnet/minecraft/class_7855; + METHOD (Lnet/minecraft/class_7563;Lnet/minecraft/class_7569;Lnet/minecraft/class_7555;)V + ARG 1 sender + ARG 2 environment + ARG 3 chatLog METHOD method_44598 environmentEquals (Lnet/minecraft/class_7569;)Z ARG 1 environment METHOD method_44599 create (Lnet/minecraft/class_7569;Lcom/mojang/authlib/minecraft/UserApiService;)Lnet/minecraft/class_7574; ARG 0 environment ARG 1 userApiService + METHOD method_46550 getSender ()Lnet/minecraft/class_7563; + METHOD method_46551 (Lnet/minecraft/class_310;Lnet/minecraft/class_7855;Lnet/minecraft/class_437;Ljava/lang/Runnable;Z)V + ARG 5 confirmed + METHOD method_46552 tryShowDraftScreen (Lnet/minecraft/class_310;Lnet/minecraft/class_437;Ljava/lang/Runnable;Z)V + ARG 1 client + ARG 2 parent + ARG 3 callback + ARG 4 quit + METHOD method_46553 setDraft (Lnet/minecraft/class_7855;)V + ARG 1 draft + METHOD method_46554 draftPlayerUuidEquals (Ljava/util/UUID;)Z + ARG 1 uuid + METHOD method_46555 getChatLog ()Lnet/minecraft/class_7555; + METHOD method_46556 hasDraft ()Z diff --git a/mappings/net/minecraft/client/report/AbuseReportReason.mapping b/mappings/net/minecraft/client/report/AbuseReportReason.mapping index d98698f85f..8a5bd33ff1 100644 --- a/mappings/net/minecraft/client/report/AbuseReportReason.mapping +++ b/mappings/net/minecraft/client/report/AbuseReportReason.mapping @@ -2,15 +2,8 @@ CLASS net/minecraft/class_7573 net/minecraft/client/report/AbuseReportReason FIELD field_39671 id Ljava/lang/String; FIELD field_39672 text Lnet/minecraft/class_2561; FIELD field_39673 description Lnet/minecraft/class_2561; - FIELD field_39741 banReasonId I - FIELD field_39907 reportable Z - METHOD (Ljava/lang/String;IILjava/lang/String;Z)V - ARG 3 banReasonId - ARG 4 id - ARG 5 reportable + METHOD (Ljava/lang/String;ILjava/lang/String;)V + ARG 3 id METHOD method_44594 getId ()Ljava/lang/String; METHOD method_44595 getText ()Lnet/minecraft/class_2561; METHOD method_44596 getDescription ()Lnet/minecraft/class_2561; - METHOD method_44681 getText (I)Lnet/minecraft/class_2561; - ARG 0 banReasonId - METHOD method_45032 isReportable ()Z diff --git a/mappings/net/minecraft/client/report/AbuseReportSender.mapping b/mappings/net/minecraft/client/report/AbuseReportSender.mapping index 7dce641be8..fbcf778612 100644 --- a/mappings/net/minecraft/client/report/AbuseReportSender.mapping +++ b/mappings/net/minecraft/client/report/AbuseReportSender.mapping @@ -3,9 +3,10 @@ CLASS net/minecraft/class_7563 net/minecraft/client/report/AbuseReportSender METHOD method_44562 create (Lnet/minecraft/class_7569;Lcom/mojang/authlib/minecraft/UserApiService;)Lnet/minecraft/class_7563; ARG 0 environment ARG 1 userApiService - METHOD method_44563 send (Ljava/util/UUID;Lcom/mojang/authlib/minecraft/report/AbuseReport;)Ljava/util/concurrent/CompletableFuture; + METHOD method_44563 send (Ljava/util/UUID;Lnet/minecraft/class_8776;Lcom/mojang/authlib/minecraft/report/AbuseReport;)Ljava/util/concurrent/CompletableFuture; ARG 1 id - ARG 2 report + ARG 2 type + ARG 3 report METHOD method_44564 getLimits ()Lcom/mojang/authlib/minecraft/report/AbuseReportLimits; CLASS class_7564 AbuseReportException CLASS class_7565 Impl diff --git a/mappings/net/minecraft/client/report/AbuseReportType.mapping b/mappings/net/minecraft/client/report/AbuseReportType.mapping new file mode 100644 index 0000000000..d8e8b8d88f --- /dev/null +++ b/mappings/net/minecraft/client/report/AbuseReportType.mapping @@ -0,0 +1,5 @@ +CLASS net/minecraft/class_8776 net/minecraft/client/report/AbuseReportType + FIELD field_46067 name Ljava/lang/String; + METHOD (Ljava/lang/String;ILjava/lang/String;)V + ARG 3 name + METHOD method_53616 getName ()Ljava/lang/String; diff --git a/mappings/net/minecraft/client/report/ChatAbuseReport.mapping b/mappings/net/minecraft/client/report/ChatAbuseReport.mapping index c1eaea4c46..7af5ec0205 100644 --- a/mappings/net/minecraft/client/report/ChatAbuseReport.mapping +++ b/mappings/net/minecraft/client/report/ChatAbuseReport.mapping @@ -1,88 +1,26 @@ CLASS net/minecraft/class_7566 net/minecraft/client/report/ChatAbuseReport - FIELD field_39648 id Ljava/util/UUID; - FIELD field_39649 timestamp Ljava/time/Instant; - FIELD field_39650 reportedPlayerUuid Ljava/util/UUID; - FIELD field_39651 limits Lcom/mojang/authlib/minecraft/report/AbuseReportLimits; - FIELD field_39652 selections Lit/unimi/dsi/fastutil/ints/IntSet; - FIELD field_39653 opinionComments Ljava/lang/String; - FIELD field_39654 reason Lnet/minecraft/class_7573; - METHOD (Ljava/util/UUID;Lcom/mojang/authlib/minecraft/report/AbuseReportLimits;)V - ARG 1 reportedPlayerUuid - ARG 2 limits - METHOD (Ljava/util/UUID;Ljava/time/Instant;Ljava/util/UUID;Lcom/mojang/authlib/minecraft/report/AbuseReportLimits;)V - ARG 1 id - ARG 2 timestamp - ARG 3 reportedPlayerUuid - ARG 4 limits - METHOD method_44568 getReportedPlayerUuid ()Ljava/util/UUID; - METHOD method_44569 toggleMessageSelection (I)V - ARG 1 index - METHOD method_44570 toReportChatMessage (ILnet/minecraft/class_7557$class_7558;)Lcom/mojang/authlib/minecraft/report/ReportChatMessage; - ARG 1 index - ARG 2 message - METHOD method_44571 collectEvidence (Lnet/minecraft/class_7555;)Lcom/mojang/authlib/minecraft/report/ReportEvidence; - ARG 1 log - METHOD method_44574 setReason (Lnet/minecraft/class_7573;)V - ARG 1 reason - METHOD method_44575 finalizeReport (Lnet/minecraft/class_7574;)Lcom/mojang/datafixers/util/Either; - ARG 1 reporter - METHOD method_44576 setOpinionComments (Ljava/lang/String;)V - ARG 1 opinionComments - METHOD method_44577 serializeContent (Lnet/minecraft/class_2561;)Ljava/lang/String; - ARG 0 content - METHOD method_44579 getSelections ()Lit/unimi/dsi/fastutil/ints/IntSet; - METHOD method_44580 hasSelectedMessage (I)Z + FIELD field_46059 selectedMessages Lit/unimi/dsi/fastutil/ints/IntSet; + METHOD method_44569 toggleMessageSelection (ILcom/mojang/authlib/minecraft/report/AbuseReportLimits;)V ARG 1 index - METHOD method_44582 getOpinionComments ()Ljava/lang/String; - METHOD method_44583 getReason ()Lnet/minecraft/class_7573; - METHOD method_44584 validate ()Lnet/minecraft/class_7566$class_7567; - METHOD method_44585 copy ()Lnet/minecraft/class_7566; - METHOD method_44956 (Lnet/minecraft/class_7555$class_7560;)Lnet/minecraft/class_7555$class_7560; - ARG 0 indexedEntry - METHOD method_44957 streamSucceedingMessages (Lnet/minecraft/class_7555;II)Ljava/util/stream/Stream; - ARG 0 log - ARG 1 selectedIndex - ARG 2 maxCount - METHOD method_44958 collectEvidences (Lnet/minecraft/class_7555;ILcom/mojang/authlib/minecraft/report/AbuseReportLimits;)Lit/unimi/dsi/fastutil/ints/Int2ObjectMap; - ARG 0 log - ARG 1 selectedIndex - ARG 2 abuseReportLimits - METHOD method_44959 collectIndicesUntilLastSeen (Lnet/minecraft/class_7555;ILnet/minecraft/class_7471;)Lit/unimi/dsi/fastutil/ints/IntCollection; - ARG 0 log - ARG 1 selectedIndex - ARG 2 message - METHOD method_44960 collectPrecedingMessages (Lnet/minecraft/class_7555;ILnet/minecraft/class_7566$class_7632;)V - ARG 0 log - ARG 1 selectedIndex - ARG 2 consumer - METHOD method_44961 streamHeadersFrom (Lnet/minecraft/class_7555;Lit/unimi/dsi/fastutil/ints/Int2ObjectMap;Ljava/util/UUID;)Ljava/util/stream/Stream; - ARG 1 log - ARG 2 evidences - ARG 3 senderUuid - METHOD method_44962 (Lnet/minecraft/class_7555;Lit/unimi/dsi/fastutil/ints/Int2ObjectSortedMap;I)V - ARG 1 selection - METHOD method_44963 toReportChatMessage (Lnet/minecraft/class_7630;)Lcom/mojang/authlib/minecraft/report/ReportChatMessage; - ARG 1 headerEntry - METHOD method_44964 (Lit/unimi/dsi/fastutil/ints/Int2ObjectMap;IILnet/minecraft/class_7557$class_7558;)Z - ARG 0 index - ARG 1 message - METHOD method_44965 (Lit/unimi/dsi/fastutil/ints/Int2ObjectMap;Lnet/minecraft/class_7555$class_7560;)V - ARG 0 message - METHOD method_44966 (Lit/unimi/dsi/fastutil/ints/Int2ObjectSortedMap;Lnet/minecraft/class_7555$class_7560;)V - ARG 2 entry - METHOD method_44967 (Ljava/util/UUID;Lnet/minecraft/class_7555$class_7560;)Z - ARG 1 headerEntry - METHOD method_44968 (Lnet/minecraft/class_7635$class_7609;)Lcom/mojang/authlib/minecraft/report/ReportChatMessageBody$LastSeenSignature; - ARG 0 entry - METHOD method_44969 (Lnet/minecraft/class_7555$class_7560;)Lnet/minecraft/class_7555$class_7560; - ARG 0 indexedEntry - CLASS class_7567 ValidationError - FIELD field_39655 NO_REASON Lnet/minecraft/class_7566$class_7567; - FIELD field_39656 NO_REPORTED_MESSAGES Lnet/minecraft/class_7566$class_7567; - FIELD field_39657 TOO_MANY_MESSAGES Lnet/minecraft/class_7566$class_7567; - FIELD field_39658 COMMENTS_TOO_LONG Lnet/minecraft/class_7566$class_7567; - CLASS class_7568 ReportWithId - CLASS class_7632 IndexedMessageConsumer - METHOD accept (ILnet/minecraft/class_7557$class_7558;)Z + ARG 2 limits + CLASS class_8772 Builder + METHOD (Ljava/util/UUID;Lcom/mojang/authlib/minecraft/report/AbuseReportLimits;)V + ARG 1 reportedPlayerUuid + ARG 2 limits + METHOD (Lnet/minecraft/class_7566;Lcom/mojang/authlib/minecraft/report/AbuseReportLimits;)V + ARG 1 report + ARG 2 limits + METHOD method_53597 getSelectedMessages ()Lit/unimi/dsi/fastutil/ints/IntSet; + METHOD method_53598 toggleMessageSelection (I)V + ARG 1 index + METHOD method_53599 toReportChatMessage (Lnet/minecraft/class_7557$class_7558;Z)Lcom/mojang/authlib/minecraft/report/ReportChatMessage; + ARG 1 message + ARG 2 selected + METHOD method_53601 (Ljava/util/List;ILnet/minecraft/class_7557$class_7558;)V + ARG 2 index + ARG 3 message + METHOD method_53603 isMessageSelected (I)Z ARG 1 index - ARG 2 message + METHOD method_53604 collectEvidences (Lnet/minecraft/class_7574;)Lcom/mojang/authlib/minecraft/report/ReportEvidence; + ARG 1 context + METHOD method_53606 copy ()Lnet/minecraft/class_7566$class_8772; diff --git a/mappings/net/minecraft/client/report/ContextMessageCollector.mapping b/mappings/net/minecraft/client/report/ContextMessageCollector.mapping new file mode 100644 index 0000000000..0891cb8013 --- /dev/null +++ b/mappings/net/minecraft/client/report/ContextMessageCollector.mapping @@ -0,0 +1,28 @@ +CLASS net/minecraft/class_7757 net/minecraft/client/report/ContextMessageCollector + FIELD field_40498 leadingContextMessageCount I + FIELD field_40499 contextMessages Ljava/util/List; + METHOD (I)V + ARG 1 leadingContextMessageCount + METHOD method_45758 hasContextMessage ()Z + METHOD method_45759 add (Lnet/minecraft/class_7555;Lit/unimi/dsi/fastutil/ints/IntCollection;Lnet/minecraft/class_7757$class_7632;)V + ARG 1 log + ARG 2 selections + ARG 3 consumer + METHOD method_45760 add (Lnet/minecraft/class_7471;)V + ARG 1 message + METHOD method_45761 tryLink (Lnet/minecraft/class_7471;)Z + ARG 1 message + CLASS class_7632 IndexedMessageConsumer + METHOD accept (ILnet/minecraft/class_7557$class_7558;)V + ARG 1 index + ARG 2 message + CLASS class_7758 ContextMessage + FIELD field_40501 lastSeenEntries Ljava/util/Set; + FIELD field_40502 message Lnet/minecraft/class_7471; + FIELD field_40503 linkSuccessful Z + FIELD field_40504 count I + METHOD (Lnet/minecraft/class_7757;Lnet/minecraft/class_7471;)V + ARG 2 message + METHOD method_45762 isInvalid ()Z + METHOD method_45763 linkTo (Lnet/minecraft/class_7471;)Z + ARG 1 message diff --git a/mappings/net/minecraft/client/report/GroupedMessagesCollector.mapping b/mappings/net/minecraft/client/report/GroupedMessagesCollector.mapping deleted file mode 100644 index ca9ac2fea9..0000000000 --- a/mappings/net/minecraft/client/report/GroupedMessagesCollector.mapping +++ /dev/null @@ -1,12 +0,0 @@ -CLASS net/minecraft/class_7535 net/minecraft/client/report/GroupedMessagesCollector - FIELD field_39549 reportTypeGetter Ljava/util/function/Function; - FIELD field_39550 messages Ljava/util/List; - FIELD field_39551 reportType Lnet/minecraft/class_7535$class_7536; - METHOD (Ljava/util/function/Function;)V - ARG 1 reportTypeGetter - METHOD method_44452 collect ()Lnet/minecraft/class_7535$class_7537; - METHOD method_44453 add (Lnet/minecraft/class_7555$class_7560;)Z - ARG 1 message - CLASS class_7536 ReportType - METHOD method_44454 isContext ()Z - CLASS class_7537 GroupedMessages diff --git a/mappings/net/minecraft/client/report/MessagesListAdder.mapping b/mappings/net/minecraft/client/report/MessagesListAdder.mapping index ad559c6a8d..7407fd16be 100644 --- a/mappings/net/minecraft/client/report/MessagesListAdder.mapping +++ b/mappings/net/minecraft/client/report/MessagesListAdder.mapping @@ -1,34 +1,23 @@ CLASS net/minecraft/class_7541 net/minecraft/client/report/MessagesListAdder - FIELD field_39580 MAX_CONTIGUOUS_CONTEXT_MESSAGES I FIELD field_39581 log Lnet/minecraft/class_7555; FIELD field_39582 reportablePredicate Ljava/util/function/Predicate; - FIELD field_39583 logMaxIndex I - FIELD field_39903 collectedMessageClass Ljava/lang/Class; - METHOD (Lnet/minecraft/class_7555;Ljava/util/function/Predicate;Ljava/lang/Class;)V - ARG 1 log + FIELD field_40439 contextMessageCollector Lnet/minecraft/class_7757; + FIELD field_40440 maxLogIndex I + FIELD field_40441 foldedMessageCount I + FIELD field_40442 lastMessage Lnet/minecraft/class_7471; + FIELD field_40795 link Lnet/minecraft/class_7826; + METHOD (Lnet/minecraft/class_7574;Ljava/util/function/Predicate;)V + ARG 1 context ARG 2 reportablePredicate - ARG 3 collectedMessageClass - METHOD method_44484 collectGroupedMessages ()Lnet/minecraft/class_7535$class_7537; - METHOD method_44485 (II)I - ARG 0 acc - ARG 1 cur METHOD method_44486 add (ILnet/minecraft/class_7541$class_7542;)V ARG 1 minAmount - ARG 2 messagesList - METHOD method_44487 (Lnet/minecraft/class_7555$class_7560;)Lnet/minecraft/class_7535$class_7536; - ARG 1 message - METHOD method_44488 getReportType (Lnet/minecraft/class_7557;)Lnet/minecraft/class_7535$class_7536; - ARG 1 message - METHOD method_44489 addContextMessages (Ljava/util/List;Lnet/minecraft/class_7541$class_7542;)I + ARG 2 messages + METHOD method_45664 tryAdd (Lnet/minecraft/class_7541$class_7542;Lnet/minecraft/class_7557$class_7558;)Z ARG 1 messages - ARG 2 messagesList - METHOD method_44939 (Lnet/minecraft/class_7555$class_7560;)Lnet/minecraft/class_7555$class_7560; - ARG 1 entry + ARG 2 message CLASS class_7542 MessagesList - METHOD method_44490 addMessage (ILnet/minecraft/class_7557;)V + METHOD method_44490 addMessage (ILnet/minecraft/class_7557$class_7558;)V ARG 1 index ARG 2 message - METHOD method_44491 addMessages (Ljava/lang/Iterable;)V - ARG 1 messages METHOD method_44492 addText (Lnet/minecraft/class_2561;)V ARG 1 text diff --git a/mappings/net/minecraft/client/report/SkinAbuseReport.mapping b/mappings/net/minecraft/client/report/SkinAbuseReport.mapping new file mode 100644 index 0000000000..ec6a2da280 --- /dev/null +++ b/mappings/net/minecraft/client/report/SkinAbuseReport.mapping @@ -0,0 +1,16 @@ +CLASS net/minecraft/class_8777 net/minecraft/client/report/SkinAbuseReport + FIELD field_46069 skinSupplier Ljava/util/function/Supplier; + METHOD (Ljava/util/UUID;Ljava/time/Instant;Ljava/util/UUID;Ljava/util/function/Supplier;)V + ARG 1 reportId + ARG 2 currentTime + ARG 3 reportedPlayerUuid + ARG 4 skinSupplier + METHOD method_53618 getSkinSupplier ()Ljava/util/function/Supplier; + CLASS class_8778 Builder + METHOD (Ljava/util/UUID;Ljava/util/function/Supplier;Lcom/mojang/authlib/minecraft/report/AbuseReportLimits;)V + ARG 1 reportedPlayerUuid + ARG 2 skinSupplier + ARG 3 limits + METHOD (Lnet/minecraft/class_8777;Lcom/mojang/authlib/minecraft/report/AbuseReportLimits;)V + ARG 1 report + ARG 2 limits diff --git a/mappings/net/minecraft/client/report/UsernameAbuseReport.mapping b/mappings/net/minecraft/client/report/UsernameAbuseReport.mapping new file mode 100644 index 0000000000..95d92d2bcb --- /dev/null +++ b/mappings/net/minecraft/client/report/UsernameAbuseReport.mapping @@ -0,0 +1,16 @@ +CLASS net/minecraft/class_8773 net/minecraft/client/report/UsernameAbuseReport + FIELD field_46060 username Ljava/lang/String; + METHOD (Ljava/util/UUID;Ljava/time/Instant;Ljava/util/UUID;Ljava/lang/String;)V + ARG 1 reportId + ARG 2 currentTime + ARG 3 reportedPlayerUuid + ARG 4 username + METHOD method_53607 getUsername ()Ljava/lang/String; + CLASS class_8774 Builder + METHOD (Ljava/util/UUID;Ljava/lang/String;Lcom/mojang/authlib/minecraft/report/AbuseReportLimits;)V + ARG 1 reportedPlayerUuid + ARG 2 username + ARG 3 limits + METHOD (Lnet/minecraft/class_8773;Lcom/mojang/authlib/minecraft/report/AbuseReportLimits;)V + ARG 1 report + ARG 2 limits diff --git a/mappings/net/minecraft/client/report/log/ChatLog.mapping b/mappings/net/minecraft/client/report/log/ChatLog.mapping index a37bb1be5b..52870493ab 100644 --- a/mappings/net/minecraft/client/report/log/ChatLog.mapping +++ b/mappings/net/minecraft/client/report/log/ChatLog.mapping @@ -1,122 +1,32 @@ CLASS net/minecraft/class_7555 net/minecraft/client/report/log/ChatLog COMMENT A chat log holds received message entries with sequential indices, where - COMMENT newer entries receive bigger indices. An implementation using fixed-size array - COMMENT is available at {@link ChatLogImpl}. + COMMENT newer entries receive bigger indices. COMMENT - COMMENT

There are two types of entries. {@link HeaderEntry} is an entry containing only - COMMENT the message's header, and is used for censored messages. {@link ReceivedMessage} - COMMENT is an entry for full chat or game messages. - FIELD field_39629 MISSING_NEXT_INDEX I - METHOD method_44531 getMaxIndex ()I - COMMENT {@return the maximum index currently used within the log} - COMMENT - COMMENT

This value changes every time a new entry gets added. The entry - COMMENT associated with this index is the newest one in the log. + COMMENT

Currently there is only one type of entries; {@link ReceivedMessage}, which is + COMMENT an entry for full chat or game messages. + FIELD field_40496 entries [Lnet/minecraft/class_7629; + FIELD field_40497 currentIndex I + METHOD (I)V + ARG 1 maxSize + METHOD (ILjava/util/List;)V + ARG 1 size + ARG 2 entries METHOD method_44532 get (I)Lnet/minecraft/class_7629; COMMENT {@return the entry with index {@code index}, or {@code null} if there is no COMMENT such entry in the log} ARG 1 index - METHOD method_44533 getOffsetIndex (II)I - COMMENT {@return the index offset by {@code offset} if there is an entry with that index, or - COMMENT {@value #MISSING_NEXT_INDEX} if there is no entry with the offset index} - ARG 1 index - ARG 2 offset - METHOD method_44534 stream (ILjava/util/function/IntUnaryOperator;)Lnet/minecraft/class_7555$class_7556; - COMMENT {@return the streams starting from {@code startIndex}} - COMMENT - COMMENT @implNote If {@code startIndex} is not in the log, this returns {@link #emptyStreams}. - ARG 1 startIndex - ARG 2 nextIndexGetter - COMMENT a function that, when given an index, returns the next index - COMMENT or {@value #MISSING_NEXT_INDEX} to indicate the end of the stream METHOD method_44535 add (Lnet/minecraft/class_7629;)V COMMENT Adds {@code entry} to the log. ARG 1 entry - METHOD method_44536 getMinIndex ()I - COMMENT {@return the minimum index currently used within the log} - COMMENT - COMMENT

This value can change every time a new entry gets added. The entry - COMMENT associated with this index is the oldest one in the log. - METHOD method_44537 getIndexed (I)Lnet/minecraft/class_7555$class_7560; - COMMENT {@return the indexed entry with index {@code index}, or {@code null} if there is no - COMMENT such entry in the log} - ARG 1 index - METHOD method_44539 streamForward ()Lnet/minecraft/class_7555$class_7556; - COMMENT {@return the streams starting from {@linkplain #getMinIndex the smallest index - COMMENT in the log} with entires ordered chronologically (in ascending order)} - METHOD method_44540 contains (I)Z - COMMENT {@return whether the log contains an entry with index {@code index}} - ARG 1 index - METHOD method_44541 streamForward (II)Lnet/minecraft/class_7555$class_7556; - COMMENT {@return the streams starting from {@code startIndex} with entires ordered - COMMENT chronologically (in ascending order) up to and including {@code endIndex}} - COMMENT - COMMENT @implNote If either {@code startIndex} or {@code endIndex} is not in the log, - COMMENT this returns {@link #emptyStreams}. - ARG 1 startIndex - ARG 2 endIndex - METHOD method_44542 emptyStreams ()Lnet/minecraft/class_7555$class_7556; - COMMENT {@return the empty stream} - METHOD method_44543 getPreviousIndex (I)I - COMMENT {@return the index offset by {@code -1} if there is an entry with that index, or - COMMENT {@value #MISSING_NEXT_INDEX} if there is no entry with the offset index} - COMMENT - COMMENT @see #getOffsetIndex - ARG 1 index - METHOD method_44544 (II)I - ARG 2 currentIndex - METHOD method_44545 getNextIndex (I)I - COMMENT {@return the index offset by {@code 1} if there is an entry with that index, or - COMMENT {@value #MISSING_NEXT_INDEX} if there is no entry with the offset index} - COMMENT - COMMENT @see #getOffsetIndex + METHOD method_45751 getMinIndex ()I + METHOD method_45752 getMaxIndex ()I + METHOD method_45753 wrapIndex (I)I ARG 1 index - METHOD method_44546 streamForward (I)Lnet/minecraft/class_7555$class_7556; - COMMENT {@return the streams starting from {@code startIndex} with entires ordered - COMMENT chronologically (in ascending order)} - COMMENT - COMMENT @implNote If {@code startIndex} is not in the log, this returns {@link #emptyStreams}. - ARG 1 startIndex - METHOD method_44547 streamBackward (I)Lnet/minecraft/class_7555$class_7556; - COMMENT {@return the streams starting from {@code startIndex} with entires ordered - COMMENT antichronologically (in descending order)} - COMMENT - COMMENT @implNote If {@code startIndex} is not in the log, this returns {@link #emptyStreams}. - ARG 1 startIndex - METHOD method_44702 streamBackward ()Lnet/minecraft/class_7555$class_7556; - COMMENT {@return the streams starting from {@linkplain #getMaxIndex the biggest index - COMMENT in the log} with entires ordered antichronologically (in descending order)} - CLASS 1 - FIELD field_39633 nextIndex I - CLASS class_7556 Streams - COMMENT A set of streams of log entries. - FIELD field_39634 CHARACTERISTICS I - FIELD field_39635 log Lnet/minecraft/class_7555; - FIELD field_39636 indicesIterator Ljava/util/PrimitiveIterator$OfInt; - METHOD (Lnet/minecraft/class_7555;Ljava/util/PrimitiveIterator$OfInt;)V - ARG 1 log - ARG 2 indicesIterator - METHOD method_44548 streamIndices ()Ljava/util/stream/IntStream; - COMMENT {@return the stream of entry indices} - METHOD method_44703 (Lnet/minecraft/class_7629;)Lcom/mojang/authlib/GameProfile; - ARG 0 message - METHOD method_44704 collectSenderProfiles ()Ljava/util/Collection; - COMMENT {@return the collection of profiles of message senders} - COMMENT - COMMENT

This ignores game messages, and the returned collection has no duplicates. - METHOD method_44950 streamLogEntries ()Ljava/util/stream/Stream; - COMMENT {@return the stream of log entries} - METHOD method_44951 streamIndexedEntries ()Ljava/util/stream/Stream; - COMMENT {@return the stream of indexed log entries} - CLASS class_7560 IndexedEntry - COMMENT A pair of the entry's index and the entry itself. - COMMENT - COMMENT @see ChatLog - FIELD comp_873 index I - FIELD comp_959 entry Lnet/minecraft/class_7629; - METHOD comp_873 index ()I - METHOD comp_959 entry ()Lnet/minecraft/class_7629; - METHOD method_44949 cast (Ljava/lang/Class;)Lnet/minecraft/class_7555$class_7560; - COMMENT {@return the indexed entry with the entry instance cast to {@code clazz}, - COMMENT or {@code null} if it cannot be cast} - ARG 1 clazz + METHOD method_46533 createCodec (I)Lcom/mojang/serialization/Codec; + ARG 0 maxSize + METHOD method_46534 (II)[Lnet/minecraft/class_7629; + ARG 1 currentIndex + METHOD method_46535 (ILjava/util/List;)Lcom/mojang/serialization/DataResult; + ARG 1 entries + METHOD method_46536 toList ()Ljava/util/List; + METHOD method_46537 size ()I diff --git a/mappings/net/minecraft/client/report/log/ChatLogEntry.mapping b/mappings/net/minecraft/client/report/log/ChatLogEntry.mapping index 90fd34c59b..8be32ab644 100644 --- a/mappings/net/minecraft/client/report/log/ChatLogEntry.mapping +++ b/mappings/net/minecraft/client/report/log/ChatLogEntry.mapping @@ -1,2 +1,11 @@ CLASS net/minecraft/class_7629 net/minecraft/client/report/log/ChatLogEntry COMMENT An entry logged to {@link ChatLog}. + FIELD field_40803 CODEC Lcom/mojang/serialization/Codec; + METHOD method_46538 getType ()Lnet/minecraft/class_7629$class_7854; + CLASS class_7854 Type + FIELD field_40806 id Ljava/lang/String; + FIELD field_40807 codecSupplier Ljava/util/function/Supplier; + METHOD (Ljava/lang/String;ILjava/lang/String;Ljava/util/function/Supplier;)V + ARG 3 id + ARG 4 codecSupplier + METHOD method_46539 getCodec ()Lcom/mojang/serialization/Codec; diff --git a/mappings/net/minecraft/client/report/log/ChatLogImpl.mapping b/mappings/net/minecraft/client/report/log/ChatLogImpl.mapping deleted file mode 100644 index 4e4dc0d3d7..0000000000 --- a/mappings/net/minecraft/client/report/log/ChatLogImpl.mapping +++ /dev/null @@ -1,22 +0,0 @@ -CLASS net/minecraft/class_7561 net/minecraft/client/report/log/ChatLogImpl - COMMENT An implementation of {@link ChatLog} using a fixed-size array and {@code 0} as the - COMMENT starting index. When adding a log, the index is incremented, and the entry at the - COMMENT index is overwritten. If the index goes above the array size, the array index wraps - COMMENT around but the entry index is still incremented. - COMMENT - COMMENT

For example, if the size is {@code 10}, after adding the 10th item, the next index is - COMMENT {@code 10} because the log is 0-indexed. However, the next message will be stored at - COMMENT {@code messages[0]}. Use {@link #wrapIndex} to calculate the wrapped index. - FIELD field_39638 entries [Lnet/minecraft/class_7629; - FIELD field_39639 maxIndex I - FIELD field_39640 minIndex I - METHOD (I)V - ARG 1 maxEntries - METHOD method_44559 incrementIndex ()I - COMMENT {@return the incremented index} - COMMENT - COMMENT @implNote This always increments {@link #maxIndex}, and increments {@link #minIndex} - COMMENT only if the array is already full. - METHOD method_44560 wrapIndex (I)I - COMMENT {@return the entry {@code index} wrapped for accessing the backing array} - ARG 1 index diff --git a/mappings/net/minecraft/client/report/log/HeaderEntry.mapping b/mappings/net/minecraft/client/report/log/HeaderEntry.mapping deleted file mode 100644 index 3929b67356..0000000000 --- a/mappings/net/minecraft/client/report/log/HeaderEntry.mapping +++ /dev/null @@ -1,7 +0,0 @@ -CLASS net/minecraft/class_7630 net/minecraft/client/report/log/HeaderEntry - COMMENT An entry of {@link ChatLog} containing only the message header. - METHOD method_44955 of (Lnet/minecraft/class_7614;Lnet/minecraft/class_7469;[B)Lnet/minecraft/class_7630$class_7631; - ARG 0 header - ARG 1 headerSignature - ARG 2 bodyDigest - CLASS class_7631 Impl diff --git a/mappings/net/minecraft/client/report/log/ReceivedMessage.mapping b/mappings/net/minecraft/client/report/log/ReceivedMessage.mapping index 4c89b50eb3..a4a274ecba 100644 --- a/mappings/net/minecraft/client/report/log/ReceivedMessage.mapping +++ b/mappings/net/minecraft/client/report/log/ReceivedMessage.mapping @@ -10,15 +10,12 @@ CLASS net/minecraft/class_7557 net/minecraft/client/report/log/ReceivedMessage COMMENT @implNote If the message is a chat message and it contains an unsigned part, the unsigned COMMENT part will be returned. Note that in vanilla, unsigned part is stripped prior to COMMENT construction of the received message instance if the client requires secure chat. - METHOD method_44552 of (Lcom/mojang/authlib/GameProfile;Lnet/minecraft/class_2561;Lnet/minecraft/class_7471;Lnet/minecraft/class_7595;)Lnet/minecraft/class_7557$class_7558; - COMMENT {@return the received message constructed from a chat message's elements} + METHOD method_44552 of (Lcom/mojang/authlib/GameProfile;Lnet/minecraft/class_7471;Lnet/minecraft/class_7595;)Lnet/minecraft/class_7557$class_7558; + COMMENT {@return the received message constructed from a chat message} ARG 0 gameProfile COMMENT the game profile of the message's sender - ARG 1 displayName - COMMENT the displayed name of the sender - ARG 2 message - COMMENT the message content - ARG 3 trustStatus + ARG 1 message + ARG 2 trustStatus METHOD method_44553 isSentFrom (Ljava/util/UUID;)Z COMMENT {@return whether the sender's UUID equals {@code uuid}} ARG 1 uuid @@ -34,6 +31,7 @@ CLASS net/minecraft/class_7557 net/minecraft/client/report/log/ReceivedMessage COMMENT A chat message received by the client. FIELD comp_905 trustStatus Lnet/minecraft/class_7595; FIELD field_39637 DATE_TIME_FORMATTER Ljava/time/format/DateTimeFormatter; + FIELD field_40809 CHAT_MESSAGE_CODEC Lcom/mojang/serialization/Codec; METHOD comp_905 trustStatus ()Lnet/minecraft/class_7595; METHOD method_44556 getHeadingText ()Lnet/minecraft/class_2561; COMMENT {@return the heading text used by Chat Selection screen} @@ -43,7 +41,12 @@ CLASS net/minecraft/class_7557 net/minecraft/client/report/log/ReceivedMessage COMMENT {@return the UUID of the sender} METHOD method_44558 getFormattedTimestamp ()Lnet/minecraft/class_2561; COMMENT {@return the formatted timestamp text of this message} + METHOD method_46543 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 0 instance CLASS class_7559 GameMessage COMMENT A game message received by the client. FIELD comp_872 timestamp Ljava/time/Instant; + FIELD field_40810 GAME_MESSAGE_CODEC Lcom/mojang/serialization/Codec; METHOD comp_872 timestamp ()Ljava/time/Instant; + METHOD method_46544 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 0 instance diff --git a/mappings/net/minecraft/client/resource/DefaultClientResourcePack.mapping b/mappings/net/minecraft/client/resource/DefaultClientResourcePack.mapping deleted file mode 100644 index 317f81cd32..0000000000 --- a/mappings/net/minecraft/client/resource/DefaultClientResourcePack.mapping +++ /dev/null @@ -1,5 +0,0 @@ -CLASS net/minecraft/class_1065 net/minecraft/client/resource/DefaultClientResourcePack - FIELD field_5291 index Lnet/minecraft/class_1064; - METHOD (Lnet/minecraft/class_3272;Lnet/minecraft/class_1064;)V - ARG 1 metadata - ARG 2 index diff --git a/mappings/net/minecraft/client/resource/DefaultClientResourcePackProvider.mapping b/mappings/net/minecraft/client/resource/DefaultClientResourcePackProvider.mapping new file mode 100644 index 0000000000..535d6ac7eb --- /dev/null +++ b/mappings/net/minecraft/client/resource/DefaultClientResourcePackProvider.mapping @@ -0,0 +1,15 @@ +CLASS net/minecraft/class_1065 net/minecraft/client/resource/DefaultClientResourcePackProvider + FIELD field_40556 METADATA Lnet/minecraft/class_3272; + FIELD field_40557 METADATA_MAP Lnet/minecraft/class_7662; + FIELD field_40558 VANILLA_NAME_TEXT Lnet/minecraft/class_2561; + FIELD field_40559 PROFILE_NAME_TEXTS Ljava/util/Map; + FIELD field_40560 ID Lnet/minecraft/class_2960; + FIELD field_40561 resourcePacksPath Ljava/nio/file/Path; + FIELD field_43088 HIGH_CONTRAST_NAME Ljava/lang/String; + METHOD (Ljava/nio/file/Path;Lnet/minecraft/class_8580;)V + ARG 1 assetsPath + ARG 2 symlinkFinder + METHOD method_45856 getResourcePacksPath (Ljava/nio/file/Path;)Ljava/nio/file/Path; + ARG 1 path + METHOD method_45857 createDefaultPack (Ljava/nio/file/Path;)Lnet/minecraft/class_3268; + ARG 0 assetsPath diff --git a/mappings/net/minecraft/client/resource/DirectResourceIndex.mapping b/mappings/net/minecraft/client/resource/DirectResourceIndex.mapping deleted file mode 100644 index 8b287d848c..0000000000 --- a/mappings/net/minecraft/client/resource/DirectResourceIndex.mapping +++ /dev/null @@ -1,10 +0,0 @@ -CLASS net/minecraft/class_1067 net/minecraft/client/resource/DirectResourceIndex - FIELD field_5299 assetDir Ljava/io/File; - METHOD (Ljava/io/File;)V - ARG 1 assetDir - METHOD method_23844 (Ljava/lang/String;Ljava/nio/file/Path;Ljava/nio/file/Path;)Lnet/minecraft/class_2960; - ARG 2 path - METHOD method_4644 (Ljava/nio/file/Path;)Z - ARG 0 path - METHOD method_4646 (Ljava/nio/file/Path;)Z - ARG 0 path diff --git a/mappings/net/minecraft/client/resource/Format3ResourcePack.mapping b/mappings/net/minecraft/client/resource/Format3ResourcePack.mapping deleted file mode 100644 index b21aa4a99d..0000000000 --- a/mappings/net/minecraft/client/resource/Format3ResourcePack.mapping +++ /dev/null @@ -1,14 +0,0 @@ -CLASS net/minecraft/class_1073 net/minecraft/client/resource/Format3ResourcePack - FIELD field_5316 parent Lnet/minecraft/class_3262; - FIELD field_5317 NEW_TO_OLD_MAP Ljava/util/Map; - FIELD field_5318 idMap Ljava/util/Map; - METHOD (Lnet/minecraft/class_3262;Ljava/util/Map;)V - ARG 1 parent - ARG 2 idMap - METHOD method_29712 (Lcom/google/common/collect/ImmutableMap$Builder;Ljava/lang/String;Ljava/lang/String;)V - ARG 1 newId - ARG 2 oldId - 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/Format4ResourcePack.mapping b/mappings/net/minecraft/client/resource/Format4ResourcePack.mapping deleted file mode 100644 index 8b29020288..0000000000 --- a/mappings/net/minecraft/client/resource/Format4ResourcePack.mapping +++ /dev/null @@ -1,46 +0,0 @@ -CLASS net/minecraft/class_4729 net/minecraft/client/resource/Format4ResourcePack - FIELD field_21759 OLD_SHIELD_BASE_TEXTURE Lnet/minecraft/class_2960; - FIELD field_21760 OLD_BANNER_BASE_TEXTURE Lnet/minecraft/class_2960; - FIELD field_21761 IRON_GOLEM_TEXTURE Lnet/minecraft/class_2960; - FIELD field_21762 NEW_TO_OLD_CHEST_TEXTURES Ljava/util/Map; - FIELD field_21763 BANNER_PATTERN_TYPES Ljava/util/List; - FIELD field_21764 SHIELD_PATTERN_TEXTURES Ljava/util/Set; - FIELD field_21765 BANNER_PATTERN_TEXTURES Ljava/util/Set; - FIELD field_21766 parent Lnet/minecraft/class_3262; - FIELD field_32969 IRON_GOLEM_TEXTURE_PATH Ljava/lang/String; - METHOD (Lnet/minecraft/class_3262;)V - ARG 1 parent - METHOD method_24132 loadBytes (Lnet/minecraft/class_1011;Lnet/minecraft/class_1011;IIIIIIIZZ)V - ARG 0 source - ARG 1 target - ARG 2 sourceLeft - ARG 3 sourceTop - ARG 4 left - ARG 5 top - ARG 6 right - ARG 7 bottom - ARG 8 multiplier - ARG 9 mirrorX - ARG 10 mirrorY - METHOD method_24133 cropLeftChestTexture (Ljava/io/InputStream;)Ljava/io/InputStream; - ARG 0 stream - METHOD method_24134 openCroppedStream (Ljava/io/InputStream;Ljava/io/InputStream;IIIII)Ljava/io/InputStream; - ARG 0 base - ARG 1 overlay - ARG 2 width - ARG 3 left - ARG 4 top - ARG 5 right - ARG 6 bottom - METHOD method_24135 (Ljava/lang/String;)Ljava/lang/String; - ARG 0 patternName - METHOD method_24136 (Ljava/util/HashMap;)V - ARG 0 map - METHOD method_24137 cropRightChestTexture (Ljava/io/InputStream;)Ljava/io/InputStream; - ARG 0 stream - METHOD method_24138 cropSingleChestTexture (Ljava/io/InputStream;)Ljava/io/InputStream; - ARG 0 stream - METHOD method_24139 (Ljava/lang/String;)Ljava/lang/String; - ARG 0 patternName - METHOD method_24199 cropConduitTexture (Ljava/io/InputStream;)Ljava/io/InputStream; - ARG 0 stream diff --git a/mappings/net/minecraft/client/resource/ResourceIndex.mapping b/mappings/net/minecraft/client/resource/ResourceIndex.mapping index 3990d5ad5e..5464c633f0 100644 --- a/mappings/net/minecraft/client/resource/ResourceIndex.mapping +++ b/mappings/net/minecraft/client/resource/ResourceIndex.mapping @@ -1,17 +1,9 @@ CLASS net/minecraft/class_1064 net/minecraft/client/resource/ResourceIndex - FIELD field_21556 namespacedIndex Ljava/util/Map; - FIELD field_5289 rootIndex Ljava/util/Map; + FIELD field_40563 SEPARATOR_SPLITTER Lcom/google/common/base/Splitter; FIELD field_5290 LOGGER Lorg/slf4j/Logger; - METHOD (Ljava/io/File;Ljava/lang/String;)V - ARG 1 directory - ARG 2 indexName - METHOD method_23843 (Ljava/lang/String;Ljava/lang/String;Ljava/util/function/Predicate;Lnet/minecraft/class_2960;)Z - ARG 3 id - METHOD method_4630 getResource (Lnet/minecraft/class_2960;)Ljava/io/File; - ARG 1 identifier - METHOD method_4631 findFile (Ljava/lang/String;)Ljava/io/File; - ARG 1 path - METHOD method_4632 getFilesRecursively (Ljava/lang/String;Ljava/lang/String;Ljava/util/function/Predicate;)Ljava/util/Collection; - ARG 1 prefix - ARG 2 namespace - ARG 3 allowedPathPredicate + METHOD method_45858 buildFileSystem (Ljava/nio/file/Path;Ljava/lang/String;)Ljava/nio/file/Path; + COMMENT Builds the resource file system from the index. + COMMENT + COMMENT @return the root path of the resource file system + ARG 0 assetsDir + ARG 1 indexName diff --git a/mappings/net/minecraft/client/resource/ClientBuiltinResourcePackProvider.mapping b/mappings/net/minecraft/client/resource/ServerResourcePackProvider.mapping similarity index 60% rename from mappings/net/minecraft/client/resource/ClientBuiltinResourcePackProvider.mapping rename to mappings/net/minecraft/client/resource/ServerResourcePackProvider.mapping index 1a5a3bf597..abe037344b 100644 --- a/mappings/net/minecraft/client/resource/ClientBuiltinResourcePackProvider.mapping +++ b/mappings/net/minecraft/client/resource/ServerResourcePackProvider.mapping @@ -1,36 +1,21 @@ -CLASS net/minecraft/class_1066 net/minecraft/client/resource/ClientBuiltinResourcePackProvider - FIELD field_16263 index Lnet/minecraft/class_1064; - FIELD field_27772 DEFAULT_PACK_METADATA Lnet/minecraft/class_3272; +CLASS net/minecraft/class_1066 net/minecraft/client/resource/ServerResourcePackProvider FIELD field_32958 MAX_FILE_SIZE I FIELD field_32959 MAX_SAVED_PACKS I - FIELD field_32960 VANILLA Ljava/lang/String; FIELD field_32961 SERVER Ljava/lang/String; - FIELD field_32962 PROGRAMER_ART_ID Ljava/lang/String; - FIELD field_32963 PROGRAMMER_ART_NAME Ljava/lang/String; FIELD field_33633 APPLYING_PACK_TEXT Lnet/minecraft/class_2561; + FIELD field_40562 SERVER_NAME_TEXT Lnet/minecraft/class_2561; FIELD field_5292 serverPacksRoot Ljava/io/File; - FIELD field_5293 pack Lnet/minecraft/class_3268; FIELD field_5294 downloadTask Ljava/util/concurrent/CompletableFuture; FIELD field_5295 serverContainer Lnet/minecraft/class_3288; FIELD field_5296 SHA1_PATTERN Ljava/util/regex/Pattern; FIELD field_5297 lock Ljava/util/concurrent/locks/ReentrantLock; FIELD field_5298 LOGGER Lorg/slf4j/Logger; - METHOD (Ljava/io/File;Lnet/minecraft/class_1064;)V + METHOD (Ljava/io/File;)V ARG 1 serverPacksRoot - ARG 2 index - METHOD method_16048 getProgrammerArtResourcePackFromZipFile (Ljava/io/File;)Lnet/minecraft/class_3262; - ARG 0 zipFile METHOD method_19436 (Ljava/io/File;Lnet/minecraft/class_310;Ljava/lang/Throwable;)Ljava/util/concurrent/CompletionStage; ARG 3 throwable METHOD method_19437 delete (Ljava/io/File;)V ARG 0 file - METHOD method_25453 getProgrammerArtResourcePackProfile (Lnet/minecraft/class_3288$class_5351;Ljava/util/function/Supplier;)Lnet/minecraft/class_3288; - ARG 0 factory - ARG 1 packSupplier - METHOD method_25454 getProgrammerArtResourcePackProfile (Lnet/minecraft/class_3288$class_5351;)Lnet/minecraft/class_3288; - ARG 1 factory - METHOD method_25455 getProgrammerArtResourcePackFromDirectory (Ljava/io/File;)Lnet/minecraft/class_3259; - ARG 0 packDirectory METHOD method_36323 (Lnet/minecraft/class_310;Ljava/lang/Void;)V ARG 1 void_ METHOD method_36324 (Lnet/minecraft/class_310;Z)V @@ -41,7 +26,8 @@ CLASS net/minecraft/class_1066 net/minecraft/client/resource/ClientBuiltinResour ARG 2 void_ METHOD method_44603 (Ljava/lang/Void;)V ARG 1 void_ - METHOD method_4633 getPack ()Lnet/minecraft/class_3268; + METHOD method_4634 (Ljava/lang/String;Ljava/io/File;Lnet/minecraft/class_310;ZLjava/lang/Object;)Ljava/util/concurrent/CompletionStage; + ARG 5 object 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 diff --git a/mappings/net/minecraft/client/resource/SplashTextResourceSupplier.mapping b/mappings/net/minecraft/client/resource/SplashTextResourceSupplier.mapping index a3a28f4383..fc400c9557 100644 --- a/mappings/net/minecraft/client/resource/SplashTextResourceSupplier.mapping +++ b/mappings/net/minecraft/client/resource/SplashTextResourceSupplier.mapping @@ -5,6 +5,6 @@ CLASS net/minecraft/class_4008 net/minecraft/client/resource/SplashTextResourceS FIELD field_18934 session Lnet/minecraft/class_320; METHOD (Lnet/minecraft/class_320;)V ARG 1 session - METHOD method_18174 get ()Ljava/lang/String; + METHOD method_18174 get ()Lnet/minecraft/class_8519; METHOD method_18664 (Ljava/lang/String;)Z ARG 0 splashText diff --git a/mappings/net/minecraft/client/resource/language/LanguageDefinition.mapping b/mappings/net/minecraft/client/resource/language/LanguageDefinition.mapping index c2d8e16ec5..61a98c805f 100644 --- a/mappings/net/minecraft/client/resource/language/LanguageDefinition.mapping +++ b/mappings/net/minecraft/client/resource/language/LanguageDefinition.mapping @@ -1,15 +1,12 @@ CLASS net/minecraft/class_1077 net/minecraft/client/resource/language/LanguageDefinition - FIELD field_5326 code Ljava/lang/String; - FIELD field_5327 name Ljava/lang/String; - FIELD field_5328 rightToLeft Z - FIELD field_5329 region Ljava/lang/String; - METHOD (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Z)V + FIELD comp_1200 rightToLeft Z + FIELD field_41862 CODEC Lcom/mojang/serialization/Codec; + METHOD (Ljava/lang/String;Ljava/lang/String;Z)V ARG 1 code ARG 2 region - ARG 3 name - ARG 4 rightToLeft - METHOD compareTo (Ljava/lang/Object;)I - ARG 1 other + METHOD comp_1200 rightToLeft ()Z METHOD equals (Ljava/lang/Object;)Z ARG 1 o - METHOD method_4672 isRightToLeft ()Z + METHOD method_48303 getDisplayText ()Lnet/minecraft/class_2561; + METHOD method_48304 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 0 instance diff --git a/mappings/net/minecraft/client/resource/language/LanguageManager.mapping b/mappings/net/minecraft/client/resource/language/LanguageManager.mapping index fd6a644cce..ea9254e551 100644 --- a/mappings/net/minecraft/client/resource/language/LanguageManager.mapping +++ b/mappings/net/minecraft/client/resource/language/LanguageManager.mapping @@ -1,6 +1,5 @@ CLASS net/minecraft/class_1076 net/minecraft/client/resource/language/LanguageManager FIELD field_25291 ENGLISH_US Lnet/minecraft/class_1077; - FIELD field_25292 language Lnet/minecraft/class_1077; FIELD field_32971 DEFAULT_LANGUAGE_CODE Ljava/lang/String; FIELD field_5323 currentLanguageCode Ljava/lang/String; FIELD field_5324 languageDefs Ljava/util/Map; @@ -11,9 +10,9 @@ CLASS net/minecraft/class_1076 net/minecraft/client/resource/language/LanguageMa ARG 1 pack METHOD method_29393 loadAvailableLanguages (Ljava/util/stream/Stream;)Ljava/util/Map; ARG 0 packs - METHOD method_4665 getAllLanguages ()Ljava/util/SortedSet; - METHOD method_4667 setLanguage (Lnet/minecraft/class_1077;)V - ARG 1 language + METHOD method_4665 getAllLanguages ()Ljava/util/SortedMap; + METHOD method_4667 setLanguage (Ljava/lang/String;)V + ARG 1 languageCode METHOD method_4668 getLanguage (Ljava/lang/String;)Lnet/minecraft/class_1077; ARG 1 code - METHOD method_4669 getLanguage ()Lnet/minecraft/class_1077; + METHOD method_4669 getLanguage ()Ljava/lang/String; diff --git a/mappings/net/minecraft/client/resource/language/TranslationStorage.mapping b/mappings/net/minecraft/client/resource/language/TranslationStorage.mapping index e8a0e73203..21f8bcb6b6 100644 --- a/mappings/net/minecraft/client/resource/language/TranslationStorage.mapping +++ b/mappings/net/minecraft/client/resource/language/TranslationStorage.mapping @@ -5,9 +5,10 @@ CLASS net/minecraft/class_1078 net/minecraft/client/resource/language/Translatio METHOD (Ljava/util/Map;Z)V ARG 1 translations ARG 2 rightToLeft - METHOD method_4675 load (Lnet/minecraft/class_3300;Ljava/util/List;)Lnet/minecraft/class_1078; + METHOD method_4675 load (Lnet/minecraft/class_3300;Ljava/util/List;Z)Lnet/minecraft/class_1078; ARG 0 resourceManager ARG 1 definitions + ARG 2 rightToLeft METHOD method_4676 load (Ljava/lang/String;Ljava/util/List;Ljava/util/Map;)V ARG 0 langCode ARG 1 resourceRefs diff --git a/mappings/net/minecraft/client/resource/metadata/AnimationResourceMetadata.mapping b/mappings/net/minecraft/client/resource/metadata/AnimationResourceMetadata.mapping index 8e3f7f0491..02f6b2596b 100644 --- a/mappings/net/minecraft/client/resource/metadata/AnimationResourceMetadata.mapping +++ b/mappings/net/minecraft/client/resource/metadata/AnimationResourceMetadata.mapping @@ -15,23 +15,13 @@ CLASS net/minecraft/class_1079 net/minecraft/client/resource/metadata/AnimationR ARG 3 height ARG 4 defaultFrameTime ARG 5 interpolate - METHOD method_24141 ensureImageSize (II)Lcom/mojang/datafixers/util/Pair; - ARG 1 x - ARG 2 y - METHOD method_24142 isMultipleOf (II)Z - ARG 0 dividend - ARG 1 divisor - METHOD method_24143 getSize (II)Lcom/mojang/datafixers/util/Pair; + METHOD method_24143 getSize (II)Lnet/minecraft/class_7771; ARG 1 defaultWidth ARG 2 defaultHeight METHOD method_33460 forEachFrame (Lnet/minecraft/class_1079$class_5792;)V ARG 1 consumer 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 CLASS class_5792 FrameConsumer METHOD accept (II)V ARG 1 index diff --git a/mappings/net/minecraft/client/resource/metadata/GuiResourceMetadata.mapping b/mappings/net/minecraft/client/resource/metadata/GuiResourceMetadata.mapping new file mode 100644 index 0000000000..4a46f91ceb --- /dev/null +++ b/mappings/net/minecraft/client/resource/metadata/GuiResourceMetadata.mapping @@ -0,0 +1,6 @@ +CLASS net/minecraft/class_8689 net/minecraft/client/resource/metadata/GuiResourceMetadata + FIELD field_45645 DEFAULT Lnet/minecraft/class_8689; + FIELD field_45646 CODEC Lcom/mojang/serialization/Codec; + FIELD field_45647 SERIALIZER Lnet/minecraft/class_7677; + METHOD method_52875 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 0 instance diff --git a/mappings/net/minecraft/client/resource/metadata/LanguageResourceMetadata.mapping b/mappings/net/minecraft/client/resource/metadata/LanguageResourceMetadata.mapping index 416d9c66bd..62b087e8c7 100644 --- a/mappings/net/minecraft/client/resource/metadata/LanguageResourceMetadata.mapping +++ b/mappings/net/minecraft/client/resource/metadata/LanguageResourceMetadata.mapping @@ -1,6 +1,6 @@ CLASS net/minecraft/class_1082 net/minecraft/client/resource/metadata/LanguageResourceMetadata - FIELD field_5342 definitions Ljava/util/Collection; - FIELD field_5343 READER Lnet/minecraft/class_1083; - METHOD (Ljava/util/Collection;)V - ARG 1 definitions - METHOD method_4694 getLanguageDefinitions ()Ljava/util/Collection; + FIELD comp_1201 definitions Ljava/util/Map; + FIELD field_41863 LANGUAGE_CODE_CODEC Lcom/mojang/serialization/Codec; + FIELD field_41864 CODEC Lcom/mojang/serialization/Codec; + FIELD field_41865 SERIALIZER Lnet/minecraft/class_7677; + METHOD comp_1201 definitions ()Ljava/util/Map; diff --git a/mappings/net/minecraft/client/resource/metadata/LanguageResourceMetadataReader.mapping b/mappings/net/minecraft/client/resource/metadata/LanguageResourceMetadataReader.mapping deleted file mode 100644 index 715bb0a550..0000000000 --- a/mappings/net/minecraft/client/resource/metadata/LanguageResourceMetadataReader.mapping +++ /dev/null @@ -1,2 +0,0 @@ -CLASS net/minecraft/class_1083 net/minecraft/client/resource/metadata/LanguageResourceMetadataReader - FIELD field_32979 MAX_CODE_LENGTH I diff --git a/mappings/net/minecraft/client/sound/AbstractSoundInstance.mapping b/mappings/net/minecraft/client/sound/AbstractSoundInstance.mapping index d7ba8992ff..5905a17ace 100644 --- a/mappings/net/minecraft/client/sound/AbstractSoundInstance.mapping +++ b/mappings/net/minecraft/client/sound/AbstractSoundInstance.mapping @@ -1,5 +1,6 @@ CLASS net/minecraft/class_1102 net/minecraft/client/sound/AbstractSoundInstance FIELD field_18936 relative Z + FIELD field_38800 random Lnet/minecraft/class_5819; FIELD field_5439 x D FIELD field_5440 attenuationType Lnet/minecraft/class_1113$class_1114; FIELD field_5441 pitch F @@ -14,6 +15,7 @@ CLASS net/minecraft/class_1102 net/minecraft/client/sound/AbstractSoundInstance METHOD (Lnet/minecraft/class_2960;Lnet/minecraft/class_3419;Lnet/minecraft/class_5819;)V ARG 1 soundId ARG 2 category + ARG 3 random METHOD (Lnet/minecraft/class_3414;Lnet/minecraft/class_3419;Lnet/minecraft/class_5819;)V ARG 1 sound ARG 2 category diff --git a/mappings/net/minecraft/client/sound/AmbientSoundLoops.mapping b/mappings/net/minecraft/client/sound/AmbientSoundLoops.mapping index 2af59a69aa..efabb5be9d 100644 --- a/mappings/net/minecraft/client/sound/AmbientSoundLoops.mapping +++ b/mappings/net/minecraft/client/sound/AmbientSoundLoops.mapping @@ -5,6 +5,7 @@ CLASS net/minecraft/class_1118 net/minecraft/client/sound/AmbientSoundLoops ARG 1 player ARG 2 soundEvent CLASS class_1120 Underwater + FIELD field_33012 MAX_TRANSITION_TIMER I FIELD field_5483 player Lnet/minecraft/class_746; FIELD field_5484 transitionTimer I METHOD (Lnet/minecraft/class_746;)V diff --git a/mappings/net/minecraft/client/sound/AmbientSoundPlayer.mapping b/mappings/net/minecraft/client/sound/AmbientSoundPlayer.mapping index bf559e65af..c5b6ab377b 100644 --- a/mappings/net/minecraft/client/sound/AmbientSoundPlayer.mapping +++ b/mappings/net/minecraft/client/sound/AmbientSoundPlayer.mapping @@ -1,4 +1,8 @@ CLASS net/minecraft/class_1116 net/minecraft/client/sound/AmbientSoundPlayer + FIELD field_33008 MAX_TICKS_FOR_BASE_SOUND_LOOP F + FIELD field_33009 MAX_TICKS_FOR_RARE_SOUND_LOOP F + FIELD field_33010 MAX_TICKS_FOR_ULTRA_RARE_SOUND_LOOP F + FIELD field_33011 DEFAULT_TICKS_UNTIL_PLAY I FIELD field_5479 soundManager Lnet/minecraft/class_1144; FIELD field_5480 ticksUntilPlay I FIELD field_5481 player Lnet/minecraft/class_746; diff --git a/mappings/net/minecraft/client/sound/BiomeEffectSoundPlayer.mapping b/mappings/net/minecraft/client/sound/BiomeEffectSoundPlayer.mapping index 85a4f85170..49149fda93 100644 --- a/mappings/net/minecraft/client/sound/BiomeEffectSoundPlayer.mapping +++ b/mappings/net/minecraft/client/sound/BiomeEffectSoundPlayer.mapping @@ -8,14 +8,15 @@ CLASS net/minecraft/class_4897 net/minecraft/client/sound/BiomeEffectSoundPlayer FIELD field_22802 additionsSound Ljava/util/Optional; FIELD field_22804 activeBiome Lnet/minecraft/class_1959; FIELD field_23189 moodPercentage F + FIELD field_32994 MAX_STRENGTH I METHOD (Lnet/minecraft/class_746;Lnet/minecraft/class_1144;Lnet/minecraft/class_4543;)V ARG 1 player ARG 2 soundManager ARG 3 biomeAccess - METHOD method_25459 (Lnet/minecraft/class_3414;Lnet/minecraft/class_1959;Lnet/minecraft/class_4897$class_4898;)Lnet/minecraft/class_4897$class_4898; + METHOD method_25459 (Lnet/minecraft/class_6880;Lnet/minecraft/class_1959;Lnet/minecraft/class_4897$class_4898;)Lnet/minecraft/class_4897$class_4898; ARG 2 sound ARG 3 loop - METHOD method_25460 (Lnet/minecraft/class_1959;Lnet/minecraft/class_3414;)V + METHOD method_25460 (Lnet/minecraft/class_1959;Lnet/minecraft/class_6880;)V ARG 2 sound METHOD method_26270 (Lnet/minecraft/class_4967;)V ARG 1 sound diff --git a/mappings/net/minecraft/client/sound/GuardianAttackSoundInstance.mapping b/mappings/net/minecraft/client/sound/GuardianAttackSoundInstance.mapping index 83cf9a8272..0c27c7c0aa 100644 --- a/mappings/net/minecraft/client/sound/GuardianAttackSoundInstance.mapping +++ b/mappings/net/minecraft/client/sound/GuardianAttackSoundInstance.mapping @@ -1,4 +1,8 @@ CLASS net/minecraft/class_1105 net/minecraft/client/sound/GuardianAttackSoundInstance + FIELD field_32997 BASE_VOLUME F + FIELD field_32998 BEAM_PROGRESS_VOLUME_MULTIPLIER F + FIELD field_32999 BASE_PITCH F + FIELD field_33000 BEAM_PROGRESS_PITCH_MULTIPLIER F FIELD field_5454 guardian Lnet/minecraft/class_1577; METHOD (Lnet/minecraft/class_1577;)V ARG 1 guardian diff --git a/mappings/net/minecraft/client/sound/MusicTracker.mapping b/mappings/net/minecraft/client/sound/MusicTracker.mapping index c58f9af227..a79b815b2b 100644 --- a/mappings/net/minecraft/client/sound/MusicTracker.mapping +++ b/mappings/net/minecraft/client/sound/MusicTracker.mapping @@ -1,4 +1,5 @@ CLASS net/minecraft/class_1142 net/minecraft/client/sound/MusicTracker + FIELD field_33019 DEFAULT_TIME_UNTIL_NEXT_SONG I FIELD field_5571 random Lnet/minecraft/class_5819; FIELD field_5572 timeUntilNextSong I FIELD field_5574 current Lnet/minecraft/class_1113; @@ -11,3 +12,5 @@ CLASS net/minecraft/class_1142 net/minecraft/client/sound/MusicTracker METHOD method_4859 stop ()V METHOD method_4860 isPlayingType (Lnet/minecraft/class_5195;)Z ARG 1 type + METHOD method_50025 stop (Lnet/minecraft/class_5195;)V + ARG 1 type diff --git a/mappings/net/minecraft/client/sound/MusicType.mapping b/mappings/net/minecraft/client/sound/MusicType.mapping index 043d9cffee..346993aeb4 100644 --- a/mappings/net/minecraft/client/sound/MusicType.mapping +++ b/mappings/net/minecraft/client/sound/MusicType.mapping @@ -11,5 +11,5 @@ CLASS net/minecraft/class_1143 net/minecraft/client/sound/MusicType FIELD field_5583 END Lnet/minecraft/class_5195; FIELD field_5585 MENU Lnet/minecraft/class_5195; FIELD field_5586 GAME Lnet/minecraft/class_5195; - METHOD method_27283 createIngameMusic (Lnet/minecraft/class_3414;)Lnet/minecraft/class_5195; - ARG 0 event + METHOD method_27283 createIngameMusic (Lnet/minecraft/class_6880;)Lnet/minecraft/class_5195; + ARG 0 sound diff --git a/mappings/net/minecraft/client/sound/PositionedSoundInstance.mapping b/mappings/net/minecraft/client/sound/PositionedSoundInstance.mapping index 70f7119e6e..de92d733b2 100644 --- a/mappings/net/minecraft/client/sound/PositionedSoundInstance.mapping +++ b/mappings/net/minecraft/client/sound/PositionedSoundInstance.mapping @@ -61,8 +61,9 @@ CLASS net/minecraft/class_1109 net/minecraft/client/sound/PositionedSoundInstanc ARG 1 pitch METHOD method_4759 music (Lnet/minecraft/class_3414;)Lnet/minecraft/class_1109; ARG 0 sound - METHOD method_4760 record (Lnet/minecraft/class_3414;DDD)Lnet/minecraft/class_1109; + METHOD method_4760 record (Lnet/minecraft/class_3414;Lnet/minecraft/class_243;)Lnet/minecraft/class_1109; ARG 0 sound - ARG 1 x - ARG 3 y - ARG 5 z + ARG 1 pos + METHOD method_47978 master (Lnet/minecraft/class_6880;F)Lnet/minecraft/class_1109; + ARG 0 sound + ARG 1 pitch diff --git a/mappings/net/minecraft/client/sound/SnifferDigSoundInstance.mapping b/mappings/net/minecraft/client/sound/SnifferDigSoundInstance.mapping new file mode 100644 index 0000000000..3020d0de7a --- /dev/null +++ b/mappings/net/minecraft/client/sound/SnifferDigSoundInstance.mapping @@ -0,0 +1,4 @@ +CLASS net/minecraft/class_8191 net/minecraft/client/sound/SnifferDigSoundInstance + FIELD field_42933 sniffer Lnet/minecraft/class_8153; + METHOD (Lnet/minecraft/class_8153;)V + ARG 1 sniffer diff --git a/mappings/net/minecraft/client/sound/Sound.mapping b/mappings/net/minecraft/client/sound/Sound.mapping index 4592fd2ddd..240d9c6f00 100644 --- a/mappings/net/minecraft/client/sound/Sound.mapping +++ b/mappings/net/minecraft/client/sound/Sound.mapping @@ -1,4 +1,5 @@ CLASS net/minecraft/class_1111 net/minecraft/client/sound/Sound + FIELD field_40575 FINDER Lnet/minecraft/class_7654; FIELD field_5463 attenuation I FIELD field_5464 pitch Lnet/minecraft/class_7373; FIELD field_5465 preload Z diff --git a/mappings/net/minecraft/client/sound/SoundListener.mapping b/mappings/net/minecraft/client/sound/SoundListener.mapping index 15a4fa75a6..ed7bee9db0 100644 --- a/mappings/net/minecraft/client/sound/SoundListener.mapping +++ b/mappings/net/minecraft/client/sound/SoundListener.mapping @@ -6,7 +6,7 @@ CLASS net/minecraft/class_4227 net/minecraft/client/sound/SoundListener ARG 1 volume METHOD method_19671 setPosition (Lnet/minecraft/class_243;)V ARG 1 position - METHOD method_19672 setOrientation (Lnet/minecraft/class_1160;Lnet/minecraft/class_1160;)V + METHOD method_19672 setOrientation (Lorg/joml/Vector3f;Lorg/joml/Vector3f;)V ARG 1 at ARG 2 up METHOD method_19673 init ()V diff --git a/mappings/net/minecraft/client/sound/SoundLoader.mapping b/mappings/net/minecraft/client/sound/SoundLoader.mapping index 10e11a7ac8..c37d67efc1 100644 --- a/mappings/net/minecraft/client/sound/SoundLoader.mapping +++ b/mappings/net/minecraft/client/sound/SoundLoader.mapping @@ -1,8 +1,8 @@ CLASS net/minecraft/class_4237 net/minecraft/client/sound/SoundLoader - FIELD field_18943 resourceManager Lnet/minecraft/class_3300; + FIELD field_18943 resourceFactory Lnet/minecraft/class_5912; FIELD field_18944 loadedSounds Ljava/util/Map; - METHOD (Lnet/minecraft/class_3300;)V - ARG 1 resourceManager + METHOD (Lnet/minecraft/class_5912;)V + ARG 1 resourceFactory METHOD method_19738 close ()V METHOD method_19740 (Lnet/minecraft/class_1111;)Ljava/util/concurrent/CompletableFuture; ARG 1 sound diff --git a/mappings/net/minecraft/client/sound/SoundManager.mapping b/mappings/net/minecraft/client/sound/SoundManager.mapping index add6c321e3..5dc6695918 100644 --- a/mappings/net/minecraft/client/sound/SoundManager.mapping +++ b/mappings/net/minecraft/client/sound/SoundManager.mapping @@ -1,14 +1,17 @@ CLASS net/minecraft/class_1144 net/minecraft/client/sound/SoundManager FIELD field_33026 SOUNDS_JSON Ljava/lang/String; + FIELD field_40576 soundResources Ljava/util/Map; + FIELD field_42934 INTENTIONALLY_EMPTY_ID Lnet/minecraft/class_2960; + FIELD field_42935 INTENTIONALLY_EMPTY_SOUND_SET Lnet/minecraft/class_1146; + FIELD field_42936 INTENTIONALLY_EMPTY_SOUND Lnet/minecraft/class_1111; FIELD field_5588 sounds Ljava/util/Map; FIELD field_5590 soundSystem Lnet/minecraft/class_1140; FIELD field_5591 TYPE Lcom/google/gson/reflect/TypeToken; FIELD field_5592 MISSING_SOUND Lnet/minecraft/class_1111; FIELD field_5593 LOGGER Lorg/slf4j/Logger; FIELD field_5594 GSON Lcom/google/gson/Gson; - METHOD (Lnet/minecraft/class_3300;Lnet/minecraft/class_315;)V - ARG 1 resourceManager - ARG 2 gameOptions + METHOD (Lnet/minecraft/class_315;)V + ARG 1 gameOptions METHOD method_18670 tick (Z)V ARG 1 paused METHOD method_20305 getDebugString ()Ljava/lang/String; @@ -22,10 +25,10 @@ CLASS net/minecraft/class_1144 net/minecraft/client/sound/SoundManager 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 + METHOD method_4868 isSoundResourcePresent (Lnet/minecraft/class_1111;Lnet/minecraft/class_2960;Lnet/minecraft/class_5912;)Z ARG 0 sound ARG 1 id - ARG 2 resourceManager + ARG 2 resourceFactory METHOD method_4869 get (Lnet/minecraft/class_2960;)Lnet/minecraft/class_1146; ARG 1 id METHOD method_4870 stop (Lnet/minecraft/class_1113;)V @@ -50,10 +53,13 @@ CLASS net/minecraft/class_1144 net/minecraft/client/sound/SoundManager METHOD method_4882 close ()V CLASS class_4009 SoundList FIELD field_17908 loadedSounds Ljava/util/Map; - METHOD method_18186 reload (Ljava/util/Map;Lnet/minecraft/class_1140;)V + FIELD field_40577 foundSounds Ljava/util/Map; + METHOD method_18186 reload (Ljava/util/Map;Ljava/util/Map;Lnet/minecraft/class_1140;)V ARG 1 sounds - ARG 2 soundSystem - METHOD method_18187 register (Lnet/minecraft/class_2960;Lnet/minecraft/class_1110;Lnet/minecraft/class_3300;)V + ARG 2 soundResources + ARG 3 system + METHOD method_18187 register (Lnet/minecraft/class_2960;Lnet/minecraft/class_1110;)V ARG 1 id ARG 2 entry - ARG 3 resourceManager + METHOD method_45913 findSounds (Lnet/minecraft/class_3300;)V + ARG 1 resourceManager diff --git a/mappings/net/minecraft/client/sound/SoundSystem.mapping b/mappings/net/minecraft/client/sound/SoundSystem.mapping index 1aa41cfaaf..7151db9b10 100644 --- a/mappings/net/minecraft/client/sound/SoundSystem.mapping +++ b/mappings/net/minecraft/client/sound/SoundSystem.mapping @@ -9,8 +9,13 @@ CLASS net/minecraft/class_1140 net/minecraft/client/sound/SoundSystem FIELD field_18952 soundEndTicks Ljava/util/Map; FIELD field_20532 soundsToPlayNextTick Ljava/util/List; FIELD field_33020 FOR_THE_DEBUG Ljava/lang/String; + FIELD field_33021 MIN_PITCH F + FIELD field_33022 MAX_PITCH F + FIELD field_33023 MIN_VOLUME F + FIELD field_33024 MAX_VOLUME F FIELD field_34827 OPENAL_SOFT_ON Ljava/lang/String; FIELD field_34828 OPENAL_SOFT_ON_LENGTH I + FIELD field_34966 MIN_TIME_INTERVAL_TO_RELOAD_SOUNDS J FIELD field_34967 lastSoundDeviceCheckTime J FIELD field_35083 deviceChangeStatus Ljava/util/concurrent/atomic/AtomicReference; FIELD field_5550 ticks I @@ -24,10 +29,10 @@ CLASS net/minecraft/class_1140 net/minecraft/client/sound/SoundSystem FIELD field_5561 UNKNOWN_SOUNDS Ljava/util/Set; FIELD field_5563 started Z FIELD field_5566 startTicks Ljava/util/Map; - METHOD (Lnet/minecraft/class_1144;Lnet/minecraft/class_315;Lnet/minecraft/class_3300;)V + METHOD (Lnet/minecraft/class_1144;Lnet/minecraft/class_315;Lnet/minecraft/class_5912;)V ARG 1 loader ARG 2 settings - ARG 3 resourceManager + ARG 3 resourceFactory METHOD method_19748 (FFLnet/minecraft/class_243;Lnet/minecraft/class_4224;)V ARG 3 source METHOD method_19749 (FFLnet/minecraft/class_1113$class_1114;FZZLnet/minecraft/class_243;ZLnet/minecraft/class_4224;)V diff --git a/mappings/net/minecraft/client/sound/WeightedSoundSet.mapping b/mappings/net/minecraft/client/sound/WeightedSoundSet.mapping index 86b266795b..9464a1bab7 100644 --- a/mappings/net/minecraft/client/sound/WeightedSoundSet.mapping +++ b/mappings/net/minecraft/client/sound/WeightedSoundSet.mapping @@ -1,12 +1,9 @@ CLASS net/minecraft/class_1146 net/minecraft/client/sound/WeightedSoundSet FIELD field_5599 subtitle Lnet/minecraft/class_2561; FIELD field_5600 sounds Ljava/util/List; - FIELD field_5601 random Lnet/minecraft/class_5819; - FIELD field_5602 id Lnet/minecraft/class_2960; METHOD (Lnet/minecraft/class_2960;Ljava/lang/String;)V ARG 1 id ARG 2 subtitle - METHOD method_35812 getId ()Lnet/minecraft/class_2960; METHOD method_4885 add (Lnet/minecraft/class_1148;)V ARG 1 container METHOD method_4886 getSubtitle ()Lnet/minecraft/class_2561; diff --git a/mappings/net/minecraft/client/texture/Animator.mapping b/mappings/net/minecraft/client/texture/Animator.mapping new file mode 100644 index 0000000000..d1fd6adf74 --- /dev/null +++ b/mappings/net/minecraft/client/texture/Animator.mapping @@ -0,0 +1,4 @@ +CLASS net/minecraft/class_7768 net/minecraft/client/texture/Animator + METHOD method_45824 tick (II)V + ARG 1 x + ARG 2 y diff --git a/mappings/net/minecraft/client/texture/DynamicTexture.mapping b/mappings/net/minecraft/client/texture/DynamicTexture.mapping new file mode 100644 index 0000000000..18d163148f --- /dev/null +++ b/mappings/net/minecraft/client/texture/DynamicTexture.mapping @@ -0,0 +1,4 @@ +CLASS net/minecraft/class_8215 net/minecraft/client/texture/DynamicTexture + METHOD method_49712 save (Lnet/minecraft/class_2960;Ljava/nio/file/Path;)V + ARG 1 id + ARG 2 path diff --git a/mappings/net/minecraft/client/texture/GuiAtlasManager.mapping b/mappings/net/minecraft/client/texture/GuiAtlasManager.mapping new file mode 100644 index 0000000000..013d9d3fa9 --- /dev/null +++ b/mappings/net/minecraft/client/texture/GuiAtlasManager.mapping @@ -0,0 +1,8 @@ +CLASS net/minecraft/class_8658 net/minecraft/client/texture/GuiAtlasManager + FIELD field_45338 METADATA_READERS Ljava/util/Set; + METHOD (Lnet/minecraft/class_1060;)V + ARG 1 manager + METHOD method_52714 getScaling (Lnet/minecraft/class_1058;)Lnet/minecraft/class_8690; + ARG 1 sprite + METHOD method_52715 getGuiMetadata (Lnet/minecraft/class_1058;)Lnet/minecraft/class_8689; + ARG 1 sprite diff --git a/mappings/net/minecraft/client/texture/MipmapHelper.mapping b/mappings/net/minecraft/client/texture/MipmapHelper.mapping index 86c0efdbac..b3ed4ee839 100644 --- a/mappings/net/minecraft/client/texture/MipmapHelper.mapping +++ b/mappings/net/minecraft/client/texture/MipmapHelper.mapping @@ -1,5 +1,6 @@ CLASS net/minecraft/class_4725 net/minecraft/client/texture/MipmapHelper FIELD field_21747 COLOR_FRACTIONS [F + FIELD field_32949 MIN_ALPHA I METHOD method_24099 getColorFraction (I)F ARG 0 value METHOD method_24100 getColorComponent (IIIII)I @@ -14,8 +15,10 @@ CLASS net/minecraft/class_4725 net/minecraft/client/texture/MipmapHelper ARG 2 three ARG 3 four ARG 4 checkAlpha - METHOD method_24102 getMipmapLevelsImages (Lnet/minecraft/class_1011;I)[Lnet/minecraft/class_1011; - ARG 0 image + METHOD method_24102 getMipmapLevelsImages ([Lnet/minecraft/class_1011;I)[Lnet/minecraft/class_1011; + ARG 0 originals ARG 1 mipmap METHOD method_24103 ([F)V ARG 0 list + METHOD method_45804 hasAlpha (Lnet/minecraft/class_1011;)Z + ARG 0 image diff --git a/mappings/net/minecraft/client/texture/MissingSprite.mapping b/mappings/net/minecraft/client/texture/MissingSprite.mapping index cb8f4f0fc1..732aab4e58 100644 --- a/mappings/net/minecraft/client/texture/MissingSprite.mapping +++ b/mappings/net/minecraft/client/texture/MissingSprite.mapping @@ -1,23 +1,13 @@ CLASS net/minecraft/class_1047 net/minecraft/client/texture/MissingSprite - FIELD field_21748 INFO Lnet/minecraft/class_1058$class_4727; + FIELD field_32950 WIDTH I + FIELD field_32951 HEIGHT I FIELD field_32952 MISSINGNO_ID Ljava/lang/String; + FIELD field_45630 METADATA Lnet/minecraft/class_7368; FIELD field_5219 MISSINGNO Lnet/minecraft/class_2960; FIELD field_5220 texture Lnet/minecraft/class_1043; - FIELD field_5221 IMAGE Lnet/minecraft/class_3528; - METHOD (Lnet/minecraft/class_1059;IIIII)V - ARG 1 texture - ARG 2 maxLevel - ARG 3 atlasWidth - ARG 4 atlasHeight - ARG 5 x - ARG 6 y - METHOD method_24104 getMissingInfo ()Lnet/minecraft/class_1058$class_4727; METHOD method_4539 getMissingSpriteId ()Lnet/minecraft/class_2960; METHOD method_4540 getMissingSpriteTexture ()Lnet/minecraft/class_1043; - METHOD method_4541 getMissingSprite (Lnet/minecraft/class_1059;IIIII)Lnet/minecraft/class_1047; - ARG 0 texture - ARG 1 maxLevel - ARG 2 atlasWidth - ARG 3 atlasHeight - ARG 4 x - ARG 5 y + METHOD method_45805 createSpriteContents ()Lnet/minecraft/class_7764; + METHOD method_45806 createImage (II)Lnet/minecraft/class_1011; + ARG 0 width + ARG 1 height diff --git a/mappings/net/minecraft/client/texture/NativeImage.mapping b/mappings/net/minecraft/client/texture/NativeImage.mapping index f68d9c347c..badce1cb0f 100644 --- a/mappings/net/minecraft/client/texture/NativeImage.mapping +++ b/mappings/net/minecraft/client/texture/NativeImage.mapping @@ -1,18 +1,5 @@ CLASS net/minecraft/class_1011 net/minecraft/client/texture/NativeImage FIELD field_21684 LOGGER Lorg/slf4j/Logger; - FIELD field_32031 ALPHA_OFFSET I - COMMENT The bit offset of the alpha data in the {@linkplain Format#RGBA RGBA} format. - COMMENT Is {@value}. Notice the alpha data in {@linkplain Format#LUMINANCE_ALPHA - COMMENT luminance-alpha} format has a different offset of {@code 8}. - FIELD field_32032 BLUE_OFFSET I - COMMENT The bit offset of the blue data in the {@linkplain Format#RGBA RGBA} or the - COMMENT {@linkplain Format#RGB RGB} formats. Is {@value}. - FIELD field_32033 GREEN_OFFSET I - COMMENT The bit offset of the green data in the {@linkplain Format#RGBA RGBA} or the - COMMENT {@linkplain Format#RGB RGB} formats. Is {@value}. - FIELD field_32034 RED_OFFSET I - COMMENT The bit offset of the red data in the {@linkplain Format#RGBA RGBA} or the - COMMENT {@linkplain Format#RGB RGB} formats. Is {@value}. FIELD field_4986 format Lnet/minecraft/class_1011$class_1012; FIELD field_4987 sizeBytes J FIELD field_4988 pointer J @@ -35,8 +22,6 @@ CLASS net/minecraft/class_1011 net/minecraft/client/texture/NativeImage ARG 3 height ARG 4 useStb ARG 5 pointer - METHOD method_15990 read (Ljava/lang/String;)Lnet/minecraft/class_1011; - ARG 0 dataUri METHOD method_22619 upload (IIIIIIIZZZZ)V ARG 1 level ARG 2 offsetX @@ -49,23 +34,8 @@ CLASS net/minecraft/class_1011 net/minecraft/client/texture/NativeImage ARG 9 clamp ARG 10 mipmap ARG 11 close - METHOD method_24030 getAlpha (I)I - ARG 0 color - METHOD method_24031 packColor (IIII)I - COMMENT The resulting color of this operation is stored as RGBA from least to most - COMMENT significant bits, or from smallest to biggest bits. - ARG 0 alpha - ARG 1 blue - ARG 2 green - ARG 3 red METHOD method_24032 write (Ljava/nio/channels/WritableByteChannel;)Z ARG 1 channel - METHOD method_24033 getRed (I)I - ARG 0 color - METHOD method_24034 getGreen (I)I - ARG 0 color - METHOD method_24035 getBlue (I)I - ARG 0 color METHOD method_24036 getBytes ()[B METHOD method_35620 readDepthComponent (F)V ARG 1 unused @@ -73,8 +43,6 @@ CLASS net/minecraft/class_1011 net/minecraft/client/texture/NativeImage ARG 1 x ARG 2 y ARG 3 luminance - METHOD method_35622 writeTo (Ljava/lang/String;)V - ARG 1 path METHOD method_35623 getRed (II)B ARG 1 x ARG 2 y @@ -206,6 +174,23 @@ CLASS net/minecraft/class_1011 net/minecraft/client/texture/NativeImage METHOD method_4327 loadFromTextureImage (IZ)V ARG 1 level ARG 2 removeAlpha + METHOD method_47594 copyRect (Lnet/minecraft/class_1011;IIIIIIZZ)V + ARG 1 image + ARG 2 x + ARG 3 y + ARG 4 destX + ARG 5 destY + ARG 6 width + ARG 7 height + ARG 8 flipX + ARG 9 flipY + METHOD method_48462 applyToCopy (Ljava/util/function/IntUnaryOperator;)Lnet/minecraft/class_1011; + ARG 1 operator + METHOD method_48463 copyPixelsRgba ()[I + METHOD method_49277 read ([B)Lnet/minecraft/class_1011; + ARG 0 bytes + METHOD method_51596 apply (Ljava/util/function/IntUnaryOperator;)V + ARG 1 operator CLASS class_1012 Format FIELD field_4993 glFormat I FIELD field_4994 channelCount I @@ -264,7 +249,7 @@ CLASS net/minecraft/class_1011 net/minecraft/client/texture/NativeImage METHOD method_4332 getAlphaOffset ()I METHOD method_4333 toGl ()I METHOD method_4335 getChannelCount ()I - METHOD method_4336 fromGl (I)Lnet/minecraft/class_1011$class_1012; + METHOD method_4336 fromChannelCount (I)Lnet/minecraft/class_1011$class_1012; ARG 0 glFormat METHOD method_4337 hasOpacityChannel ()Z METHOD method_4338 isWriteable ()Z diff --git a/mappings/net/minecraft/client/texture/PlayerSkinProvider.mapping b/mappings/net/minecraft/client/texture/PlayerSkinProvider.mapping index 40ff302654..4b8c938b12 100644 --- a/mappings/net/minecraft/client/texture/PlayerSkinProvider.mapping +++ b/mappings/net/minecraft/client/texture/PlayerSkinProvider.mapping @@ -1,40 +1,51 @@ CLASS net/minecraft/class_1071 net/minecraft/client/texture/PlayerSkinProvider FIELD field_32970 TEXTURES Ljava/lang/String; - FIELD field_5304 textureManager Lnet/minecraft/class_1060; - FIELD field_5305 skinCacheDir Ljava/io/File; - FIELD field_5306 skinCache Lcom/google/common/cache/LoadingCache; - FIELD field_5308 sessionService Lcom/mojang/authlib/minecraft/MinecraftSessionService; - METHOD (Lnet/minecraft/class_1060;Ljava/io/File;Lcom/mojang/authlib/minecraft/MinecraftSessionService;)V + FIELD field_45634 cache Lcom/google/common/cache/LoadingCache; + FIELD field_45635 skinCache Lnet/minecraft/class_1071$class_8687; + FIELD field_45636 capeCache Lnet/minecraft/class_1071$class_8687; + FIELD field_45637 elytraCache Lnet/minecraft/class_1071$class_8687; + METHOD (Lnet/minecraft/class_1060;Ljava/nio/file/Path;Lcom/mojang/authlib/minecraft/MinecraftSessionService;Ljava/util/concurrent/Executor;)V ARG 1 textureManager - ARG 2 skinCacheDir + ARG 2 directory ARG 3 sessionService - METHOD method_22819 (Ljava/util/Map;Lnet/minecraft/class_1071$class_1072;Lcom/mojang/authlib/minecraft/MinecraftProfileTexture$Type;)V - ARG 3 textureType - METHOD method_44705 loadSkin (Lcom/mojang/authlib/GameProfile;)Lnet/minecraft/class_2960; - COMMENT {@return the ID of {@code profile}'s skin, or the default skin for the profile's - COMMENT UUID if the skin is missing} + ARG 4 executor + METHOD method_52858 getSkinTexturesSupplier (Lcom/mojang/authlib/GameProfile;)Ljava/util/function/Supplier; ARG 1 profile - METHOD method_45033 getSkinId (Lcom/mojang/authlib/minecraft/MinecraftProfileTexture$Type;Ljava/lang/String;)Lnet/minecraft/class_2960; - ARG 0 skinType - ARG 1 hash - METHOD method_4651 loadSkin (Lcom/mojang/authlib/minecraft/MinecraftProfileTexture;Lcom/mojang/authlib/minecraft/MinecraftProfileTexture$Type;Lnet/minecraft/class_1071$class_1072;)Lnet/minecraft/class_2960; - ARG 1 profileTexture - ARG 2 type - ARG 3 callback - METHOD method_4652 loadSkin (Lcom/mojang/authlib/GameProfile;Lnet/minecraft/class_1071$class_1072;Z)V + METHOD method_52859 fetchSkinTextures (Lcom/mojang/authlib/GameProfile;Lnet/minecraft/class_1071$class_8688;)Ljava/util/concurrent/CompletableFuture; ARG 1 profile - ARG 2 callback - ARG 3 requireSecure - METHOD method_4654 getTextures (Lcom/mojang/authlib/GameProfile;)Ljava/util/Map; + ARG 2 textures + METHOD method_52862 getSkinTextures (Lcom/mojang/authlib/GameProfile;)Lnet/minecraft/class_8685; 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 + METHOD method_52863 fetchSkinTextures (Lcom/mojang/authlib/GameProfile;)Ljava/util/concurrent/CompletableFuture; + ARG 1 profile + METHOD method_52865 getTextureEntry (Lcom/mojang/authlib/GameProfile;)Lcom/mojang/authlib/properties/Property; + ARG 0 profile CLASS 1 METHOD load (Ljava/lang/Object;)Ljava/lang/Object; ARG 1 value - CLASS class_1072 SkinTextureAvailableCallback - METHOD onSkinTextureAvailable (Lcom/mojang/authlib/minecraft/MinecraftProfileTexture$Type;Lnet/minecraft/class_2960;Lcom/mojang/authlib/minecraft/MinecraftProfileTexture;)V - ARG 1 type - ARG 2 id - ARG 3 texture + METHOD method_52866 (Lcom/mojang/authlib/GameProfile;Lnet/minecraft/class_1071$class_8688;)Ljava/util/concurrent/CompletionStage; + ARG 2 textures + CLASS class_8686 Key + METHOD equals (Ljava/lang/Object;)Z + ARG 1 o + METHOD method_52869 getTextureEntry ()Ljava/lang/String; + CLASS class_8687 FileCache + FIELD field_45639 textureManager Lnet/minecraft/class_1060; + FIELD field_45640 directory Ljava/nio/file/Path; + FIELD field_45641 type Lcom/mojang/authlib/minecraft/MinecraftProfileTexture$Type; + FIELD field_45642 hashToTexture Ljava/util/Map; + METHOD (Lnet/minecraft/class_1060;Ljava/nio/file/Path;Lcom/mojang/authlib/minecraft/MinecraftProfileTexture$Type;)V + ARG 1 textureManager + ARG 2 directory + ARG 3 type + METHOD method_52870 get (Lcom/mojang/authlib/minecraft/MinecraftProfileTexture;)Ljava/util/concurrent/CompletableFuture; + ARG 1 texture + METHOD method_52871 getTexturePath (Ljava/lang/String;)Lnet/minecraft/class_2960; + ARG 1 hash + METHOD method_52873 store (Lcom/mojang/authlib/minecraft/MinecraftProfileTexture;)Ljava/util/concurrent/CompletableFuture; + ARG 1 texture + CLASS class_8688 Textures + FIELD field_45643 MISSING Lnet/minecraft/class_1071$class_8688; + METHOD method_52874 fromMap (Ljava/util/Map;Z)Lnet/minecraft/class_1071$class_8688; + ARG 0 textures + ARG 1 secure diff --git a/mappings/net/minecraft/client/texture/Scaling.mapping b/mappings/net/minecraft/client/texture/Scaling.mapping new file mode 100644 index 0000000000..762be1dd0c --- /dev/null +++ b/mappings/net/minecraft/client/texture/Scaling.mapping @@ -0,0 +1,35 @@ +CLASS net/minecraft/class_8690 net/minecraft/client/texture/Scaling + FIELD field_45648 CODEC Lcom/mojang/serialization/Codec; + FIELD field_45649 STRETCH Lnet/minecraft/class_8690; + METHOD method_52876 getType ()Lnet/minecraft/class_8690$class_8695; + CLASS class_8691 NineSlice + FIELD field_45650 CODEC Lcom/mojang/serialization/Codec; + METHOD method_52877 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 0 instance + METHOD method_53493 validate (Lnet/minecraft/class_8690$class_8691;)Lcom/mojang/serialization/DataResult; + ARG 0 nineSlice + CLASS class_8692 Border + FIELD field_45651 UNIFORM_SIDE_SIZES_CODEC Lcom/mojang/serialization/Codec; + FIELD field_45652 DIFFERENT_SIDE_SIZES_CODEC Lcom/mojang/serialization/Codec; + FIELD field_45653 CODEC Lcom/mojang/serialization/Codec; + METHOD method_52880 (Lnet/minecraft/class_8690$class_8691$class_8692;)Lcom/mojang/datafixers/util/Either; + ARG 0 border + METHOD method_52881 (Ljava/lang/Integer;)Lnet/minecraft/class_8690$class_8691$class_8692; + ARG 0 size + METHOD method_52882 (Lnet/minecraft/class_8690$class_8691$class_8692;)Lcom/mojang/serialization/DataResult; + ARG 0 border + METHOD method_52883 getUniformSideSize ()Ljava/util/OptionalInt; + CLASS class_8693 Stretch + FIELD field_45654 CODEC Lcom/mojang/serialization/Codec; + CLASS class_8694 Tile + FIELD field_45655 CODEC Lcom/mojang/serialization/Codec; + METHOD method_52885 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 0 instance + CLASS class_8695 Type + FIELD field_45659 CODEC Lcom/mojang/serialization/Codec; + FIELD field_45660 name Ljava/lang/String; + FIELD field_45661 codec Lcom/mojang/serialization/Codec; + METHOD (Ljava/lang/String;ILjava/lang/String;Lcom/mojang/serialization/Codec;)V + ARG 3 name + ARG 4 codec + METHOD method_52886 getCodec ()Lcom/mojang/serialization/Codec; diff --git a/mappings/net/minecraft/client/texture/Sprite.mapping b/mappings/net/minecraft/client/texture/Sprite.mapping index f34f9094d9..ca4b723058 100644 --- a/mappings/net/minecraft/client/texture/Sprite.mapping +++ b/mappings/net/minecraft/client/texture/Sprite.mapping @@ -1,125 +1,40 @@ CLASS net/minecraft/class_1058 net/minecraft/client/texture/Sprite - FIELD field_21750 atlas Lnet/minecraft/class_1059; - FIELD field_28464 LOGGER Lorg/slf4j/Logger; - FIELD field_28465 id Lnet/minecraft/class_2960; - FIELD field_28466 width I - FIELD field_28467 height I - FIELD field_28468 animation Lnet/minecraft/class_1058$class_5790; + FIELD field_40552 atlasId Lnet/minecraft/class_2960; + FIELD field_40553 contents Lnet/minecraft/class_7764; FIELD field_5256 y I FIELD field_5258 x I - FIELD field_5262 images [Lnet/minecraft/class_1011; - FIELD field_5267 vMax F - FIELD field_5268 vMin F - FIELD field_5269 uMax F - FIELD field_5270 uMin F - METHOD (Lnet/minecraft/class_1059;Lnet/minecraft/class_1058$class_4727;IIIIILnet/minecraft/class_1011;)V - ARG 1 atlas - ARG 2 info - ARG 3 maxLevel - ARG 4 atlasWidth - ARG 5 atlasHeight - ARG 6 x - ARG 7 y - ARG 8 image + FIELD field_5267 maxV F + FIELD field_5268 minV F + FIELD field_5269 maxU F + FIELD field_5270 minU F + METHOD (Lnet/minecraft/class_2960;Lnet/minecraft/class_7764;IIII)V + ARG 1 atlasId + ARG 2 contents + ARG 3 atlasWidth + ARG 4 atlasHeight + ARG 5 x + ARG 6 y METHOD method_23841 getFrameDeltaFactor ()F METHOD method_23842 getAnimationFrameDelta ()F METHOD method_24108 getTextureSpecificVertexConsumer (Lnet/minecraft/class_4588;)Lnet/minecraft/class_4588; ARG 1 consumer - METHOD method_24119 getAtlas ()Lnet/minecraft/class_1059; - METHOD method_33437 createAnimation (Lnet/minecraft/class_1058$class_4727;III)Lnet/minecraft/class_1058$class_5790; - ARG 1 info - ARG 2 nativeImageWidth - ARG 3 nativeImageHeight - ARG 4 maxLevel - METHOD method_33439 (Lit/unimi/dsi/fastutil/ints/IntSet;I)Z - ARG 0 index - METHOD method_33440 (Ljava/util/List;II)V - ARG 1 index - ARG 2 time - METHOD method_33442 getDistinctFrameCount ()Ljava/util/stream/IntStream; - METHOD method_33443 getAnimation ()Lnet/minecraft/class_1061; + METHOD method_33437 createAnimation ()Lnet/minecraft/class_1058$class_7770; + METHOD method_35804 getFrameFromU (F)F + ARG 1 u + METHOD method_35805 getFrameFromV (F)F + ARG 1 v METHOD method_35806 getX ()I METHOD method_35807 getY ()I - METHOD method_4570 getFrameV (D)F + METHOD method_4570 getFrameV (F)F ARG 1 frame METHOD method_4575 getMaxV ()F METHOD method_4577 getMaxU ()F - METHOD method_4578 getWidth ()I - METHOD method_4579 upload (II[Lnet/minecraft/class_1011;)V - ARG 1 frameX - ARG 2 frameY - ARG 3 output - METHOD method_4580 getFrameU (D)F + METHOD method_4580 getFrameU (F)F ARG 1 frame - METHOD method_4583 isPixelTransparent (III)Z - ARG 1 frame - ARG 2 x - ARG 3 y METHOD method_4584 upload ()V - METHOD method_4592 getFrameCount ()I + METHOD method_45851 getContents ()Lnet/minecraft/class_7764; + METHOD method_45852 getAtlasId ()Lnet/minecraft/class_2960; METHOD method_4593 getMinV ()F METHOD method_4594 getMinU ()F - METHOD method_4595 getHeight ()I - METHOD method_4598 getId ()Lnet/minecraft/class_2960; - CLASS class_4727 Info - FIELD field_21753 id Lnet/minecraft/class_2960; - FIELD field_21754 width I - FIELD field_21755 height I - FIELD field_21756 animationData Lnet/minecraft/class_1079; - METHOD (Lnet/minecraft/class_2960;IILnet/minecraft/class_1079;)V - ARG 1 id - ARG 2 width - ARG 3 height - ARG 4 animationData - METHOD method_24121 getId ()Lnet/minecraft/class_2960; - METHOD method_24123 getWidth ()I - METHOD method_24125 getHeight ()I - CLASS class_4728 Interpolation - FIELD field_21758 images [Lnet/minecraft/class_1011; - METHOD (Lnet/minecraft/class_1058;Lnet/minecraft/class_1058$class_4727;I)V - ARG 2 info - ARG 3 maxLevel - METHOD method_24128 apply (Lnet/minecraft/class_1058$class_5790;)V - COMMENT Linearly interpolate between the current and next frame on all mip levels - COMMENT based on the tick position within the current frame, - COMMENT and upload the results to the currently bound texture to the frame slot at position (0,0). - ARG 1 animation - METHOD method_24129 lerp (DII)I - COMMENT Purely mathematical single-value linear interpolation. - COMMENT {@code lerp(0, a, b) == b}, {@code lerp(1, a, b) == a}. - ARG 1 delta - ARG 3 to - ARG 4 from - METHOD method_24130 getPixelColor (Lnet/minecraft/class_1058$class_5790;IIII)I - COMMENT {@return the pixel color at frame {@code frameIndex} within mipmap {@code layer} at sprite relative coordinates} - ARG 1 animation - ARG 2 frameIndex - ARG 3 layer - ARG 4 x - ARG 5 y - CLASS class_5790 Animation - FIELD field_28470 frameIndex I - FIELD field_28471 frameTicks I - FIELD field_28472 frames Ljava/util/List; - FIELD field_28473 frameCount I - FIELD field_28474 interpolation Lnet/minecraft/class_1058$class_4728; - METHOD (Lnet/minecraft/class_1058;Ljava/util/List;ILnet/minecraft/class_1058$class_4728;)V - ARG 2 frames - ARG 3 frameCount - ARG 4 interpolation - METHOD method_33445 upload ()V - METHOD method_33446 getFrameX (I)I - ARG 1 frame - METHOD method_33449 (Lnet/minecraft/class_1058$class_5791;)I - ARG 0 frame - METHOD method_33450 getDistinctFrameCount ()Ljava/util/stream/IntStream; - METHOD method_33451 getFrameY (I)I - ARG 1 frame - METHOD method_33455 upload (I)V - ARG 1 frameIndex - CLASS class_5791 AnimationFrame - FIELD field_28475 index I - FIELD field_28476 time I - METHOD (II)V - ARG 1 index - ARG 2 time + CLASS class_7770 TickableAnimation + METHOD method_45853 tick ()V diff --git a/mappings/net/minecraft/client/texture/SpriteAtlasHolder.mapping b/mappings/net/minecraft/client/texture/SpriteAtlasHolder.mapping index f7b475d961..14b933754f 100644 --- a/mappings/net/minecraft/client/texture/SpriteAtlasHolder.mapping +++ b/mappings/net/minecraft/client/texture/SpriteAtlasHolder.mapping @@ -1,12 +1,20 @@ CLASS net/minecraft/class_4075 net/minecraft/client/texture/SpriteAtlasHolder FIELD field_18230 atlas Lnet/minecraft/class_1059; - FIELD field_21767 pathPrefix Ljava/lang/String; - METHOD (Lnet/minecraft/class_1060;Lnet/minecraft/class_2960;Ljava/lang/String;)V + FIELD field_41425 sourcePath Lnet/minecraft/class_2960; + FIELD field_45644 metadataReaders Ljava/util/Set; + METHOD (Lnet/minecraft/class_1060;Lnet/minecraft/class_2960;Lnet/minecraft/class_2960;)V ARG 1 textureManager ARG 2 atlasId - ARG 3 pathPrefix - METHOD method_18665 getSprites ()Ljava/util/stream/Stream; + ARG 3 sourcePath + METHOD (Lnet/minecraft/class_1060;Lnet/minecraft/class_2960;Lnet/minecraft/class_2960;Ljava/util/Set;)V + ARG 1 textureManager + ARG 2 atlasId + ARG 3 sourcePath + ARG 4 metadataReaders + METHOD method_18666 afterReload (Lnet/minecraft/class_7766$class_7767;Lnet/minecraft/class_3695;)V + ARG 1 stitchResult + ARG 2 profiler METHOD method_18667 getSprite (Lnet/minecraft/class_2960;)Lnet/minecraft/class_1058; ARG 1 objectId - METHOD method_24140 toSpriteId (Lnet/minecraft/class_2960;)Lnet/minecraft/class_2960; - ARG 1 objectId + METHOD method_45860 (Lnet/minecraft/class_3695;Lnet/minecraft/class_7766$class_7767;)V + ARG 2 stitchResult diff --git a/mappings/net/minecraft/client/texture/SpriteAtlasTexture.mapping b/mappings/net/minecraft/client/texture/SpriteAtlasTexture.mapping index ef719e840e..a78948a394 100644 --- a/mappings/net/minecraft/client/texture/SpriteAtlasTexture.mapping +++ b/mappings/net/minecraft/client/texture/SpriteAtlasTexture.mapping @@ -2,64 +2,29 @@ CLASS net/minecraft/class_1059 net/minecraft/client/texture/SpriteAtlasTexture FIELD field_17898 PARTICLE_ATLAS_TEXTURE Lnet/minecraft/class_2960; FIELD field_17899 maxTextureSize I FIELD field_21749 id Lnet/minecraft/class_2960; - FIELD field_32957 PNG_EXTENSION Ljava/lang/String; + FIELD field_43113 width I + FIELD field_43114 height I + FIELD field_43115 mipLevel I FIELD field_5275 BLOCK_ATLAS_TEXTURE Lnet/minecraft/class_2960; FIELD field_5276 animatedSprites Ljava/util/List; - FIELD field_5277 spritesToLoad Ljava/util/Set; + FIELD field_5277 spritesToLoad Ljava/util/List; FIELD field_5278 LOGGER Lorg/slf4j/Logger; FIELD field_5280 sprites Ljava/util/Map; METHOD (Lnet/minecraft/class_2960;)V ARG 1 id - METHOD method_18159 upload (Lnet/minecraft/class_1059$class_4007;)V - ARG 1 data - METHOD method_18161 loadSprites (Lnet/minecraft/class_3300;Lnet/minecraft/class_1055;I)Ljava/util/List; - ARG 1 resourceManager - ARG 2 textureStitcher - ARG 3 maxLevel - METHOD method_18163 stitch (Lnet/minecraft/class_3300;Ljava/util/stream/Stream;Lnet/minecraft/class_3695;I)Lnet/minecraft/class_1059$class_4007; - ARG 1 resourceManager - ARG 2 idStream - ARG 3 profiler - ARG 4 mipmapLevel - METHOD method_18164 loadSprites (Lnet/minecraft/class_3300;Ljava/util/Set;)Ljava/util/Collection; - ARG 1 resourceManager - ARG 2 ids - METHOD method_18165 (Lnet/minecraft/class_2960;)V - ARG 0 id - METHOD method_21688 (Lnet/minecraft/class_1058$class_4727;)Ljava/lang/String; - ARG 0 sprite - METHOD method_24105 (ILjava/util/Queue;Ljava/util/List;Lnet/minecraft/class_3300;Lnet/minecraft/class_1058$class_4727;IIII)V - ARG 5 info - ARG 6 atlasWidth - ARG 7 atlasHeight - ARG 8 x - ARG 9 y METHOD method_24106 getId ()Lnet/minecraft/class_2960; - METHOD method_24198 applyTextureFilter (Lnet/minecraft/class_1059$class_4007;)V + METHOD method_24198 applyTextureFilter (Lnet/minecraft/class_7766$class_7767;)V ARG 1 data - METHOD method_4601 clear ()V - METHOD method_4603 getTexturePath (Lnet/minecraft/class_2960;)Lnet/minecraft/class_2960; + METHOD method_45848 upload (Lnet/minecraft/class_7766$class_7767;)V + ARG 1 stitchResult + METHOD method_45849 dumpAtlasInfos (Ljava/nio/file/Path;Ljava/lang/String;Ljava/util/Map;)V + ARG 0 path 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 2 info - ARG 3 atlasWidth - ARG 4 atlasHeight - ARG 5 maxLevel - ARG 6 x - ARG 7 y + ARG 2 sprites + METHOD method_45850 getMaxTextureSize ()I + METHOD method_4601 clear ()V METHOD method_4608 getSprite (Lnet/minecraft/class_2960;)Lnet/minecraft/class_1058; ARG 1 id METHOD method_4612 tickAnimatedSprites ()V - CLASS class_4007 Data - FIELD field_17900 spriteIds Ljava/util/Set; - FIELD field_17901 width I - FIELD field_17902 height I - FIELD field_17903 sprites Ljava/util/List; - FIELD field_21795 maxLevel I - METHOD (Ljava/util/Set;IIILjava/util/List;)V - ARG 1 spriteIds - ARG 2 width - ARG 3 height - ARG 4 maxLevel - ARG 5 sprites + METHOD method_49713 getWidth ()I + METHOD method_49714 getHeight ()I diff --git a/mappings/net/minecraft/client/texture/SpriteContents.mapping b/mappings/net/minecraft/client/texture/SpriteContents.mapping new file mode 100644 index 0000000000..1c9fa87f98 --- /dev/null +++ b/mappings/net/minecraft/client/texture/SpriteContents.mapping @@ -0,0 +1,102 @@ +CLASS net/minecraft/class_7764 net/minecraft/client/texture/SpriteContents + FIELD field_40535 LOGGER Lorg/slf4j/Logger; + FIELD field_40536 id Lnet/minecraft/class_2960; + FIELD field_40537 width I + FIELD field_40538 height I + FIELD field_40539 image Lnet/minecraft/class_1011; + FIELD field_40540 mipmapLevelsImages [Lnet/minecraft/class_1011; + FIELD field_40541 animation Lnet/minecraft/class_7764$class_5790; + FIELD field_45631 metadata Lnet/minecraft/class_7368; + METHOD (Lnet/minecraft/class_2960;Lnet/minecraft/class_7771;Lnet/minecraft/class_1011;Lnet/minecraft/class_7368;)V + ARG 1 id + ARG 2 dimensions + ARG 3 image + ARG 4 metadata + METHOD method_45808 generateMipmaps (I)V + ARG 1 mipmapLevels + METHOD method_45809 upload (II)V + ARG 1 x + ARG 2 y + METHOD method_45810 isPixelTransparent (III)Z + ARG 1 frame + ARG 2 x + ARG 3 y + METHOD method_45811 upload (IIII[Lnet/minecraft/class_1011;)V + ARG 1 x + ARG 2 y + ARG 3 unpackSkipPixels + ARG 4 unpackSkipRows + ARG 5 images + METHOD method_45812 createAnimation (Lnet/minecraft/class_7771;IILnet/minecraft/class_1079;)Lnet/minecraft/class_7764$class_5790; + ARG 1 dimensions + ARG 2 imageWidth + ARG 3 imageHeight + ARG 4 metadata + METHOD method_45813 (Lit/unimi/dsi/fastutil/ints/IntSet;I)Z + ARG 0 frameIndex + METHOD method_45814 (Ljava/util/List;II)V + ARG 1 index + ARG 2 frameTime + METHOD method_45817 getDistinctFrameCount ()Ljava/util/stream/IntStream; + METHOD method_45818 createAnimator ()Lnet/minecraft/class_7768; + METHOD method_45819 getFrameCount ()I + METHOD method_52848 getMetadata ()Lnet/minecraft/class_7368; + CLASS class_4728 Interpolation + FIELD field_21758 images [Lnet/minecraft/class_1011; + METHOD method_24128 apply (IILnet/minecraft/class_7764$class_7765;)V + COMMENT Linearly interpolate between the current and next frame on all mip levels + COMMENT based on the tick position within the current frame, + COMMENT and upload the results to the currently bound texture to the frame slot at position (0,0). + ARG 1 x + ARG 2 y + ARG 3 animator + METHOD method_24129 lerp (DII)I + COMMENT Purely mathematical single-value linear interpolation. + COMMENT {@code lerp(0, a, b) == b}, {@code lerp(1, a, b) == a}. + ARG 1 delta + ARG 3 to + ARG 4 from + METHOD method_24130 getPixelColor (Lnet/minecraft/class_7764$class_5790;IIII)I + COMMENT {@return the pixel color at frame {@code frameIndex} within mipmap {@code layer} at sprite relative coordinates} + ARG 1 animation + ARG 2 frameIndex + ARG 3 layer + ARG 4 x + ARG 5 y + CLASS class_5790 Animation + FIELD field_28472 frames Ljava/util/List; + FIELD field_28473 frameCount I + FIELD field_40542 interpolation Z + METHOD (Lnet/minecraft/class_7764;Ljava/util/List;IZ)V + ARG 2 frames + ARG 3 frameCount + ARG 4 interpolation + METHOD method_33445 upload (II)V + ARG 1 x + ARG 2 y + METHOD method_33446 getFrameX (I)I + ARG 1 frame + METHOD method_33449 (Lnet/minecraft/class_7764$class_5791;)I + ARG 0 frame + METHOD method_33450 getDistinctFrameCount ()Ljava/util/stream/IntStream; + METHOD method_33451 getFrameY (I)I + ARG 1 frame + METHOD method_33455 upload (III)V + ARG 1 x + ARG 2 y + ARG 3 frame + METHOD method_45823 createAnimator ()Lnet/minecraft/class_7768; + CLASS class_5791 AnimationFrame + FIELD field_28475 index I + FIELD field_28476 time I + METHOD (II)V + ARG 1 index + ARG 2 time + CLASS class_7765 AnimatorImpl + FIELD field_40544 frame I + FIELD field_40545 currentTime I + FIELD field_40546 animation Lnet/minecraft/class_7764$class_5790; + FIELD field_40547 interpolation Lnet/minecraft/class_7764$class_4728; + METHOD (Lnet/minecraft/class_7764;Lnet/minecraft/class_7764$class_5790;Lnet/minecraft/class_7764$class_4728;)V + ARG 2 animation + ARG 3 interpolation diff --git a/mappings/net/minecraft/client/texture/SpriteDimensions.mapping b/mappings/net/minecraft/client/texture/SpriteDimensions.mapping new file mode 100644 index 0000000000..33f54a6a94 --- /dev/null +++ b/mappings/net/minecraft/client/texture/SpriteDimensions.mapping @@ -0,0 +1 @@ +CLASS net/minecraft/class_7771 net/minecraft/client/texture/SpriteDimensions diff --git a/mappings/net/minecraft/client/texture/SpriteLoader.mapping b/mappings/net/minecraft/client/texture/SpriteLoader.mapping new file mode 100644 index 0000000000..16f4ca04c4 --- /dev/null +++ b/mappings/net/minecraft/client/texture/SpriteLoader.mapping @@ -0,0 +1,57 @@ +CLASS net/minecraft/class_7766 net/minecraft/client/texture/SpriteLoader + FIELD field_40548 LOGGER Lorg/slf4j/Logger; + FIELD field_40549 id Lnet/minecraft/class_2960; + FIELD field_40550 maxTextureSize I + FIELD field_43111 width I + FIELD field_43112 height I + FIELD field_45632 METADATA_READERS Ljava/util/Set; + METHOD (Lnet/minecraft/class_2960;III)V + ARG 1 id + ARG 2 maxTextureSize + ARG 3 width + ARG 4 height + METHOD method_45826 (ILnet/minecraft/class_1058;)V + ARG 1 sprite + METHOD method_45835 (Lnet/minecraft/class_1055$class_7769;)Ljava/lang/String; + ARG 0 sprite + METHOD method_45836 collectStitchedSprites (Lnet/minecraft/class_1055;II)Ljava/util/Map; + ARG 1 stitcher + ARG 2 atlasWidth + ARG 3 atlasHeight + METHOD method_45837 fromAtlas (Lnet/minecraft/class_1059;)Lnet/minecraft/class_7766; + ARG 0 atlasTexture + METHOD method_45841 (Ljava/util/Map;IILnet/minecraft/class_7764;II)V + ARG 4 info + ARG 5 x + ARG 6 y + METHOD method_47659 (ILjava/util/concurrent/Executor;Ljava/util/List;)Lnet/minecraft/class_7766$class_7767; + ARG 3 sprites + METHOD method_47661 load (Lnet/minecraft/class_3300;Lnet/minecraft/class_2960;ILjava/util/concurrent/Executor;Ljava/util/Collection;)Ljava/util/concurrent/CompletableFuture; + ARG 1 resourceManager + ARG 2 path + ARG 3 mipLevel + ARG 4 executor + ARG 5 metadatas + METHOD method_47662 (Ljava/util/List;)Ljava/util/List; + ARG 0 sprites + METHOD method_47663 stitch (Ljava/util/List;ILjava/util/concurrent/Executor;)Lnet/minecraft/class_7766$class_7767; + ARG 1 sprites + ARG 2 mipLevel + ARG 3 executor + METHOD method_47664 loadAll (Lnet/minecraft/class_8684;Ljava/util/List;Ljava/util/concurrent/Executor;)Ljava/util/concurrent/CompletableFuture; + ARG 0 opener + ARG 1 sources + ARG 2 executor + METHOD method_47665 (Lnet/minecraft/class_8684;Ljava/util/concurrent/Executor;Ljava/util/List;)Ljava/util/concurrent/CompletionStage; + ARG 2 sources + METHOD method_47666 (Lnet/minecraft/class_8684;Ljava/util/concurrent/Executor;Ljava/util/function/Function;)Ljava/util/concurrent/CompletableFuture; + ARG 2 sprite + METHOD method_52849 load (Lnet/minecraft/class_3300;Lnet/minecraft/class_2960;ILjava/util/concurrent/Executor;)Ljava/util/concurrent/CompletableFuture; + ARG 1 resourceManager + ARG 2 path + ARG 3 mipLevel + ARG 4 executor + CLASS class_7767 StitchResult + METHOD method_45845 whenComplete ()Ljava/util/concurrent/CompletableFuture; + METHOD method_45846 (Ljava/lang/Void;)Lnet/minecraft/class_7766$class_7767; + ARG 1 void_ diff --git a/mappings/net/minecraft/client/texture/SpriteOpener.mapping b/mappings/net/minecraft/client/texture/SpriteOpener.mapping new file mode 100644 index 0000000000..3dc68eb259 --- /dev/null +++ b/mappings/net/minecraft/client/texture/SpriteOpener.mapping @@ -0,0 +1,10 @@ +CLASS net/minecraft/class_8684 net/minecraft/client/texture/SpriteOpener + FIELD field_45633 LOGGER Lorg/slf4j/Logger; + METHOD create (Ljava/util/Collection;)Lnet/minecraft/class_8684; + ARG 0 metadatas + METHOD loadSprite (Lnet/minecraft/class_2960;Lnet/minecraft/class_3298;)Lnet/minecraft/class_7764; + ARG 1 id + ARG 2 resource + METHOD method_52851 (Ljava/util/Collection;Lnet/minecraft/class_2960;Lnet/minecraft/class_3298;)Lnet/minecraft/class_7764; + ARG 1 id + ARG 2 resource diff --git a/mappings/net/minecraft/client/texture/TextureManager.mapping b/mappings/net/minecraft/client/texture/TextureManager.mapping index 651cb6434b..ce88810d48 100644 --- a/mappings/net/minecraft/client/texture/TextureManager.mapping +++ b/mappings/net/minecraft/client/texture/TextureManager.mapping @@ -37,3 +37,10 @@ CLASS net/minecraft/class_1060 net/minecraft/client/texture/TextureManager ARG 1 id METHOD method_4619 getTexture (Lnet/minecraft/class_2960;)Lnet/minecraft/class_1044; ARG 1 id + METHOD method_49715 dumpDynamicTextures (Ljava/nio/file/Path;)V + ARG 1 path + METHOD method_49716 (Ljava/nio/file/Path;Lnet/minecraft/class_2960;Lnet/minecraft/class_1044;)V + ARG 1 id + ARG 2 texture + METHOD method_49717 dumpDynamicTexturesInternal (Ljava/nio/file/Path;)V + ARG 1 path diff --git a/mappings/net/minecraft/client/texture/TextureStitcher.mapping b/mappings/net/minecraft/client/texture/TextureStitcher.mapping index d2f0b86ab4..8dde68a6a1 100644 --- a/mappings/net/minecraft/client/texture/TextureStitcher.mapping +++ b/mappings/net/minecraft/client/texture/TextureStitcher.mapping @@ -1,6 +1,6 @@ CLASS net/minecraft/class_1055 net/minecraft/client/texture/TextureStitcher FIELD field_18030 COMPARATOR Ljava/util/Comparator; - FIELD field_5237 holders Ljava/util/Set; + FIELD field_5237 holders Ljava/util/List; FIELD field_5238 maxHeight I FIELD field_5239 slots Ljava/util/List; FIELD field_5240 maxWidth I @@ -11,15 +11,13 @@ CLASS net/minecraft/class_1055 net/minecraft/client/texture/TextureStitcher ARG 1 maxWidth ARG 2 maxHeight ARG 3 mipLevel - METHOD method_18336 (Lnet/minecraft/class_1055$class_4726;Lnet/minecraft/class_1055$class_1057;)V - ARG 2 slot METHOD method_18337 (Lnet/minecraft/class_1055$class_1056;)Lnet/minecraft/class_2960; ARG 0 holder METHOD method_18338 (Lnet/minecraft/class_1055$class_1056;)Ljava/lang/Integer; ARG 0 holder METHOD method_18339 (Lnet/minecraft/class_1055$class_1056;)Ljava/lang/Integer; ARG 0 holder - METHOD method_21686 (Lnet/minecraft/class_1055$class_1056;)Lnet/minecraft/class_1058$class_4727; + METHOD method_21686 (Lnet/minecraft/class_1055$class_1056;)Lnet/minecraft/class_1055$class_7769; ARG 0 holder METHOD method_4549 getStitchedSprites (Lnet/minecraft/class_1055$class_4726;)V ARG 1 consumer @@ -30,18 +28,21 @@ CLASS net/minecraft/class_1055 net/minecraft/client/texture/TextureStitcher ARG 1 mipLevel METHOD method_4552 growAndFit (Lnet/minecraft/class_1055$class_1056;)Z ARG 1 holder - METHOD method_4553 add (Lnet/minecraft/class_1058$class_4727;)V + METHOD method_4553 add (Lnet/minecraft/class_1055$class_7769;)V ARG 1 info METHOD method_4554 getWidth ()I METHOD method_4555 getHeight ()I METHOD method_4557 stitch ()V CLASS class_1056 Holder - FIELD field_5247 height I - FIELD field_5248 width I - FIELD field_5249 sprite Lnet/minecraft/class_1058$class_4727; - METHOD (Lnet/minecraft/class_1058$class_4727;I)V + FIELD comp_1046 sprite Lnet/minecraft/class_1055$class_7769; + FIELD comp_1047 width I + FIELD comp_1048 height I + METHOD (Lnet/minecraft/class_1055$class_7769;I)V ARG 1 sprite ARG 2 mipLevel + METHOD comp_1046 sprite ()Lnet/minecraft/class_1055$class_7769; + METHOD comp_1047 width ()I + METHOD comp_1048 height ()I CLASS class_1057 Slot FIELD field_5250 height I FIELD field_5251 width I @@ -54,17 +55,18 @@ CLASS net/minecraft/class_1055 net/minecraft/client/texture/TextureStitcher ARG 2 y ARG 3 width ARG 4 height - METHOD method_4565 getTexture ()Lnet/minecraft/class_1055$class_1056; METHOD method_4566 fit (Lnet/minecraft/class_1055$class_1056;)Z ARG 1 holder METHOD method_4567 getY ()I - METHOD method_4568 addAllFilledSlots (Ljava/util/function/Consumer;)V - ARG 1 slotConsumer + METHOD method_4568 addAllFilledSlots (Lnet/minecraft/class_1055$class_4726;)V + ARG 1 consumer METHOD method_4569 getX ()I CLASS class_4726 SpriteConsumer - METHOD load (Lnet/minecraft/class_1058$class_4727;IIII)V + METHOD load (Lnet/minecraft/class_1055$class_7769;II)V ARG 1 info - ARG 2 width - ARG 3 height - ARG 4 x - ARG 5 y + ARG 2 x + ARG 3 y + CLASS class_7769 Stitchable + METHOD method_45807 getWidth ()I + METHOD method_45815 getHeight ()I + METHOD method_45816 getId ()Lnet/minecraft/class_2960; diff --git a/mappings/net/minecraft/client/texture/TextureStitcherCannotFitException.mapping b/mappings/net/minecraft/client/texture/TextureStitcherCannotFitException.mapping index 00f5aba161..7e30b1fc91 100644 --- a/mappings/net/minecraft/client/texture/TextureStitcherCannotFitException.mapping +++ b/mappings/net/minecraft/client/texture/TextureStitcherCannotFitException.mapping @@ -1,6 +1,6 @@ CLASS net/minecraft/class_1054 net/minecraft/client/texture/TextureStitcherCannotFitException FIELD field_20311 sprites Ljava/util/Collection; - METHOD (Lnet/minecraft/class_1058$class_4727;Ljava/util/Collection;)V + METHOD (Lnet/minecraft/class_1055$class_7769;Ljava/util/Collection;)V ARG 1 sprite ARG 2 sprites METHOD method_21687 getSprites ()Ljava/util/Collection; diff --git a/mappings/net/minecraft/client/texture/atlas/AtlasLoader.mapping b/mappings/net/minecraft/client/texture/atlas/AtlasLoader.mapping new file mode 100644 index 0000000000..cd44ca787f --- /dev/null +++ b/mappings/net/minecraft/client/texture/atlas/AtlasLoader.mapping @@ -0,0 +1,15 @@ +CLASS net/minecraft/class_7947 net/minecraft/client/texture/atlas/AtlasLoader + FIELD field_41386 LOGGER Lorg/slf4j/Logger; + FIELD field_41387 FINDER Lnet/minecraft/class_7654; + FIELD field_41388 sources Ljava/util/List; + METHOD (Ljava/util/List;)V + ARG 1 sources + METHOD method_47667 loadSources (Lnet/minecraft/class_3300;)Ljava/util/List; + ARG 1 resourceManager + METHOD method_47668 of (Lnet/minecraft/class_3300;Lnet/minecraft/class_2960;)Lnet/minecraft/class_7947; + ARG 0 resourceManager + ARG 1 id + METHOD method_47669 (Lnet/minecraft/class_3300;Lnet/minecraft/class_7948$class_7949;Lnet/minecraft/class_7948;)V + ARG 2 source + METHOD method_52852 (Lnet/minecraft/class_8684;)Lnet/minecraft/class_7764; + ARG 0 opener diff --git a/mappings/net/minecraft/client/texture/atlas/AtlasSource.mapping b/mappings/net/minecraft/client/texture/atlas/AtlasSource.mapping new file mode 100644 index 0000000000..c85b4c2355 --- /dev/null +++ b/mappings/net/minecraft/client/texture/atlas/AtlasSource.mapping @@ -0,0 +1,19 @@ +CLASS net/minecraft/class_7948 net/minecraft/client/texture/atlas/AtlasSource + FIELD field_42075 RESOURCE_FINDER Lnet/minecraft/class_7654; + METHOD method_47672 getType ()Lnet/minecraft/class_7951; + METHOD method_47673 load (Lnet/minecraft/class_3300;Lnet/minecraft/class_7948$class_7949;)V + ARG 1 resourceManager + ARG 2 regions + CLASS class_7949 SpriteRegions + METHOD method_47670 add (Lnet/minecraft/class_2960;Lnet/minecraft/class_7948$class_7950;)V + ARG 1 arg + ARG 2 region + METHOD method_47671 removeIf (Ljava/util/function/Predicate;)V + ARG 1 predicate + METHOD method_47674 add (Lnet/minecraft/class_2960;Lnet/minecraft/class_3298;)V + ARG 1 id + ARG 2 resource + METHOD method_47675 (Lnet/minecraft/class_2960;Lnet/minecraft/class_3298;Lnet/minecraft/class_8684;)Lnet/minecraft/class_7764; + ARG 2 opener + CLASS class_7950 SpriteRegion + METHOD method_47676 close ()V diff --git a/mappings/net/minecraft/client/texture/atlas/AtlasSourceManager.mapping b/mappings/net/minecraft/client/texture/atlas/AtlasSourceManager.mapping new file mode 100644 index 0000000000..aa5c7ac9bb --- /dev/null +++ b/mappings/net/minecraft/client/texture/atlas/AtlasSourceManager.mapping @@ -0,0 +1,12 @@ +CLASS net/minecraft/class_7952 net/minecraft/client/texture/atlas/AtlasSourceManager + FIELD field_41395 CODEC Lcom/mojang/serialization/Codec; + FIELD field_41396 TYPE_CODEC Lcom/mojang/serialization/Codec; + FIELD field_41397 LIST_CODEC Lcom/mojang/serialization/Codec; + FIELD field_41398 SOURCE_TYPE_BY_ID Lcom/google/common/collect/BiMap; + METHOD method_47677 (Lnet/minecraft/class_2960;)Lcom/mojang/serialization/DataResult; + ARG 0 id + METHOD method_47679 (Lnet/minecraft/class_7951;)Lcom/mojang/serialization/DataResult; + ARG 0 type + METHOD method_47680 register (Ljava/lang/String;Lcom/mojang/serialization/Codec;)Lnet/minecraft/class_7951; + ARG 0 id + ARG 1 codec diff --git a/mappings/net/minecraft/client/texture/atlas/AtlasSourceType.mapping b/mappings/net/minecraft/client/texture/atlas/AtlasSourceType.mapping new file mode 100644 index 0000000000..0e8ba38958 --- /dev/null +++ b/mappings/net/minecraft/client/texture/atlas/AtlasSourceType.mapping @@ -0,0 +1 @@ +CLASS net/minecraft/class_7951 net/minecraft/client/texture/atlas/AtlasSourceType diff --git a/mappings/net/minecraft/client/texture/atlas/DirectoryAtlasSource.mapping b/mappings/net/minecraft/client/texture/atlas/DirectoryAtlasSource.mapping new file mode 100644 index 0000000000..cc9c2b3960 --- /dev/null +++ b/mappings/net/minecraft/client/texture/atlas/DirectoryAtlasSource.mapping @@ -0,0 +1,9 @@ +CLASS net/minecraft/class_7954 net/minecraft/client/texture/atlas/DirectoryAtlasSource + FIELD field_41399 CODEC Lcom/mojang/serialization/Codec; + FIELD field_41400 source Ljava/lang/String; + FIELD field_41401 prefix Ljava/lang/String; + METHOD (Ljava/lang/String;Ljava/lang/String;)V + ARG 1 source + ARG 2 prefix + METHOD method_47683 (Lnet/minecraft/class_7654;Lnet/minecraft/class_7948$class_7949;Lnet/minecraft/class_2960;Lnet/minecraft/class_3298;)V + ARG 4 resource diff --git a/mappings/net/minecraft/client/texture/atlas/FilterAtlasSource.mapping b/mappings/net/minecraft/client/texture/atlas/FilterAtlasSource.mapping new file mode 100644 index 0000000000..fe34988847 --- /dev/null +++ b/mappings/net/minecraft/client/texture/atlas/FilterAtlasSource.mapping @@ -0,0 +1,5 @@ +CLASS net/minecraft/class_7956 net/minecraft/client/texture/atlas/FilterAtlasSource + FIELD field_41407 CODEC Lcom/mojang/serialization/Codec; + FIELD field_41408 pattern Lnet/minecraft/class_7085; + METHOD (Lnet/minecraft/class_7085;)V + ARG 1 pattern diff --git a/mappings/net/minecraft/client/texture/atlas/PalettedPermutationsAtlasSource.mapping b/mappings/net/minecraft/client/texture/atlas/PalettedPermutationsAtlasSource.mapping new file mode 100644 index 0000000000..7bc4ac50a1 --- /dev/null +++ b/mappings/net/minecraft/client/texture/atlas/PalettedPermutationsAtlasSource.mapping @@ -0,0 +1,32 @@ +CLASS net/minecraft/class_8066 net/minecraft/client/texture/atlas/PalettedPermutationsAtlasSource + FIELD field_42077 CODEC Lcom/mojang/serialization/Codec; + FIELD field_42078 LOGGER Lorg/slf4j/Logger; + FIELD field_42079 textures Ljava/util/List; + FIELD field_42080 permutations Ljava/util/Map; + FIELD field_42081 paletteKey Lnet/minecraft/class_2960; + METHOD (Ljava/util/List;Lnet/minecraft/class_2960;Ljava/util/Map;)V + ARG 1 textures + ARG 2 paletteKey + ARG 3 permutations + METHOD method_48486 open (Lnet/minecraft/class_3300;Lnet/minecraft/class_2960;)[I + ARG 0 resourceManager + ARG 1 texture + METHOD method_48487 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 0 instance + METHOD method_48488 (Lnet/minecraft/class_8066;)Ljava/util/Map; + ARG 0 source + METHOD method_48489 (Lit/unimi/dsi/fastutil/ints/Int2IntMap;I)I + ARG 1 color + METHOD method_48490 (Ljava/util/Map;Ljava/util/function/Supplier;Lnet/minecraft/class_3300;Ljava/lang/String;Lnet/minecraft/class_2960;)V + ARG 3 key + ARG 4 texture + METHOD method_48492 toMapper ([I[I)Ljava/util/function/IntUnaryOperator; + ARG 0 from + ARG 1 to + METHOD method_48493 (Lnet/minecraft/class_8066;)Lnet/minecraft/class_2960; + ARG 0 source + METHOD method_48494 (Lnet/minecraft/class_8066;)Ljava/util/List; + ARG 0 source + CLASS class_8067 PalettedSpriteRegion + METHOD apply (Ljava/lang/Object;)Ljava/lang/Object; + ARG 1 opener diff --git a/mappings/net/minecraft/client/texture/atlas/SingleAtlasSource.mapping b/mappings/net/minecraft/client/texture/atlas/SingleAtlasSource.mapping new file mode 100644 index 0000000000..04f2b8708b --- /dev/null +++ b/mappings/net/minecraft/client/texture/atlas/SingleAtlasSource.mapping @@ -0,0 +1,8 @@ +CLASS net/minecraft/class_7955 net/minecraft/client/texture/atlas/SingleAtlasSource + FIELD field_41402 CODEC Lcom/mojang/serialization/Codec; + FIELD field_41403 LOGGER Lorg/slf4j/Logger; + FIELD field_41405 resource Lnet/minecraft/class_2960; + FIELD field_41406 sprite Ljava/util/Optional; + METHOD (Lnet/minecraft/class_2960;Ljava/util/Optional;)V + ARG 1 resource + ARG 2 sprite diff --git a/mappings/net/minecraft/client/texture/atlas/Sprite.mapping b/mappings/net/minecraft/client/texture/atlas/Sprite.mapping new file mode 100644 index 0000000000..d50ad34d1f --- /dev/null +++ b/mappings/net/minecraft/client/texture/atlas/Sprite.mapping @@ -0,0 +1,11 @@ +CLASS net/minecraft/class_7958 net/minecraft/client/texture/atlas/Sprite + FIELD field_41416 id Lnet/minecraft/class_2960; + FIELD field_41417 resource Lnet/minecraft/class_3298; + FIELD field_41418 image Ljava/util/concurrent/atomic/AtomicReference; + FIELD field_41419 regionCount Ljava/util/concurrent/atomic/AtomicInteger; + METHOD (Lnet/minecraft/class_2960;Lnet/minecraft/class_3298;I)V + ARG 1 id + ARG 2 resource + ARG 3 regionCount + METHOD method_47697 read ()Lnet/minecraft/class_1011; + METHOD method_47698 close ()V diff --git a/mappings/net/minecraft/client/texture/atlas/UnstitchAtlasSource.mapping b/mappings/net/minecraft/client/texture/atlas/UnstitchAtlasSource.mapping new file mode 100644 index 0000000000..b6a96dba44 --- /dev/null +++ b/mappings/net/minecraft/client/texture/atlas/UnstitchAtlasSource.mapping @@ -0,0 +1,38 @@ +CLASS net/minecraft/class_7957 net/minecraft/client/texture/atlas/UnstitchAtlasSource + FIELD field_41409 CODEC Lcom/mojang/serialization/Codec; + FIELD field_41410 LOGGER Lorg/slf4j/Logger; + FIELD field_41412 resource Lnet/minecraft/class_2960; + FIELD field_41413 regions Ljava/util/List; + FIELD field_41414 divisorX D + FIELD field_41415 divisorY D + METHOD (Lnet/minecraft/class_2960;Ljava/util/List;DD)V + ARG 1 resource + ARG 2 regions + ARG 3 divisorX + ARG 5 divisorY + METHOD method_47692 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 0 instance + METHOD method_47693 (Lnet/minecraft/class_7957;)Ljava/lang/Double; + ARG 0 source + METHOD method_47694 (Lnet/minecraft/class_7957;)Ljava/lang/Double; + ARG 0 source + METHOD method_47695 (Lnet/minecraft/class_7957;)Ljava/util/List; + ARG 0 source + METHOD method_47696 (Lnet/minecraft/class_7957;)Lnet/minecraft/class_2960; + ARG 0 source + CLASS class_7959 Region + FIELD field_41420 CODEC Lcom/mojang/serialization/Codec; + METHOD method_47699 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 0 instance + CLASS class_7960 SpriteRegion + FIELD field_41421 sprite Lnet/minecraft/class_7958; + FIELD field_41422 region Lnet/minecraft/class_7957$class_7959; + FIELD field_41423 divisorX D + FIELD field_41424 divisorY D + METHOD (Lnet/minecraft/class_7958;Lnet/minecraft/class_7957$class_7959;DD)V + ARG 1 sprite + ARG 2 region + ARG 3 divisorX + ARG 5 divisorY + METHOD apply (Ljava/lang/Object;)Ljava/lang/Object; + ARG 1 opener diff --git a/mappings/net/minecraft/client/toast/AdvancementToast.mapping b/mappings/net/minecraft/client/toast/AdvancementToast.mapping index 816ade53ff..0fffdc0590 100644 --- a/mappings/net/minecraft/client/toast/AdvancementToast.mapping +++ b/mappings/net/minecraft/client/toast/AdvancementToast.mapping @@ -1,5 +1,7 @@ CLASS net/minecraft/class_367 net/minecraft/client/toast/AdvancementToast - FIELD field_2205 advancement Lnet/minecraft/class_161; + FIELD field_2205 advancement Lnet/minecraft/class_8779; FIELD field_2206 soundPlayed Z - METHOD (Lnet/minecraft/class_161;)V + FIELD field_41812 DEFAULT_DURATION_MS I + FIELD field_45394 TEXTURE Lnet/minecraft/class_2960; + METHOD (Lnet/minecraft/class_8779;)V ARG 1 advancement diff --git a/mappings/net/minecraft/client/toast/RecipeToast.mapping b/mappings/net/minecraft/client/toast/RecipeToast.mapping index a2bdd8bef7..1fccb95736 100644 --- a/mappings/net/minecraft/client/toast/RecipeToast.mapping +++ b/mappings/net/minecraft/client/toast/RecipeToast.mapping @@ -4,11 +4,8 @@ CLASS net/minecraft/class_366 net/minecraft/client/toast/RecipeToast FIELD field_2204 startTime J FIELD field_26533 TITLE Lnet/minecraft/class_2561; FIELD field_26534 DESCRIPTION Lnet/minecraft/class_2561; - FIELD field_32217 DURATION J - METHOD (Lnet/minecraft/class_1860;)V - ARG 1 recipes - METHOD method_1984 addRecipes (Lnet/minecraft/class_1860;)V - ARG 1 recipes - METHOD method_1985 show (Lnet/minecraft/class_374;Lnet/minecraft/class_1860;)V + FIELD field_32217 DEFAULT_DURATION_MS J + FIELD field_45395 TEXTURE Lnet/minecraft/class_2960; + METHOD method_1984 addRecipes (Lnet/minecraft/class_8786;)V + METHOD method_1985 show (Lnet/minecraft/class_374;Lnet/minecraft/class_8786;)V ARG 0 manager - ARG 1 recipes diff --git a/mappings/net/minecraft/client/toast/SystemToast.mapping b/mappings/net/minecraft/client/toast/SystemToast.mapping index 443b20f795..34884d7f32 100644 --- a/mappings/net/minecraft/client/toast/SystemToast.mapping +++ b/mappings/net/minecraft/client/toast/SystemToast.mapping @@ -8,6 +8,7 @@ CLASS net/minecraft/class_370 net/minecraft/client/toast/SystemToast FIELD field_32219 MIN_WIDTH I FIELD field_39926 LINE_HEIGHT I FIELD field_39927 PADDING_Y I + FIELD field_45396 TEXTURE Lnet/minecraft/class_2960; METHOD (Lnet/minecraft/class_370$class_371;Lnet/minecraft/class_2561;Ljava/util/List;I)V ARG 1 type ARG 2 title @@ -36,13 +37,8 @@ CLASS net/minecraft/class_370 net/minecraft/client/toast/SystemToast METHOD method_27025 addWorldDeleteFailureToast (Lnet/minecraft/class_310;Ljava/lang/String;)V ARG 0 client ARG 1 worldName - METHOD method_29046 drawPart (Lnet/minecraft/class_4587;Lnet/minecraft/class_374;IIII)V - ARG 1 matrices - ARG 2 manager - ARG 3 width - ARG 4 textureV - ARG 5 y - ARG 6 height + METHOD method_29046 drawPart (Lnet/minecraft/class_332;IIII)V + ARG 1 context METHOD method_29047 create (Lnet/minecraft/class_310;Lnet/minecraft/class_370$class_371;Lnet/minecraft/class_2561;Lnet/minecraft/class_2561;)Lnet/minecraft/class_370; ARG 0 client ARG 1 type diff --git a/mappings/net/minecraft/client/toast/Toast.mapping b/mappings/net/minecraft/client/toast/Toast.mapping index 5c25fc9de4..97c98782aa 100644 --- a/mappings/net/minecraft/client/toast/Toast.mapping +++ b/mappings/net/minecraft/client/toast/Toast.mapping @@ -1,9 +1,8 @@ CLASS net/minecraft/class_368 net/minecraft/client/toast/Toast - FIELD field_2207 TEXTURE Lnet/minecraft/class_2960; FIELD field_2208 TYPE Ljava/lang/Object; FIELD field_39928 BASE_HEIGHT I - METHOD method_1986 draw (Lnet/minecraft/class_4587;Lnet/minecraft/class_374;J)Lnet/minecraft/class_368$class_369; - ARG 1 matrices + METHOD method_1986 draw (Lnet/minecraft/class_332;Lnet/minecraft/class_374;J)Lnet/minecraft/class_368$class_369; + ARG 1 context ARG 2 manager ARG 3 startTime METHOD method_1987 getType ()Ljava/lang/Object; diff --git a/mappings/net/minecraft/client/toast/ToastManager.mapping b/mappings/net/minecraft/client/toast/ToastManager.mapping index 9f8203d343..88d185d6b2 100644 --- a/mappings/net/minecraft/client/toast/ToastManager.mapping +++ b/mappings/net/minecraft/client/toast/ToastManager.mapping @@ -8,8 +8,8 @@ CLASS net/minecraft/class_374 net/minecraft/client/toast/ToastManager METHOD (Lnet/minecraft/class_310;)V ARG 1 client METHOD method_1995 getClient ()Lnet/minecraft/class_310; - METHOD method_1996 draw (Lnet/minecraft/class_4587;)V - ARG 1 matrices + METHOD method_1996 draw (Lnet/minecraft/class_332;)V + ARG 1 context METHOD method_1997 getToast (Ljava/lang/Class;Ljava/lang/Object;)Lnet/minecraft/class_368; ARG 1 toastClass ARG 2 type @@ -18,11 +18,12 @@ CLASS net/minecraft/class_374 net/minecraft/client/toast/ToastManager METHOD method_2000 clear ()V METHOD method_45073 getTopIndex (I)I ARG 1 requiredSpaces - METHOD method_45074 (ILnet/minecraft/class_4587;Lnet/minecraft/class_374$class_375;)Z + METHOD method_45074 (ILnet/minecraft/class_332;Lnet/minecraft/class_374$class_375;)Z ARG 3 visibleEntry METHOD method_45075 (Lnet/minecraft/class_368;)Z ARG 1 toast METHOD method_45076 getEmptySpaceCount ()I + METHOD method_48221 getNotificationDisplayTimeMultiplier ()D CLASS class_375 Entry FIELD field_2241 instance Lnet/minecraft/class_368; FIELD field_2242 showTime J @@ -36,8 +37,8 @@ CLASS net/minecraft/class_374 net/minecraft/client/toast/ToastManager ARG 3 topIndex ARG 4 requiredSpaceCount METHOD method_2001 getInstance ()Lnet/minecraft/class_368; - METHOD method_2002 draw (ILnet/minecraft/class_4587;)Z + METHOD method_2002 draw (ILnet/minecraft/class_332;)Z ARG 1 x - ARG 2 matrices + ARG 2 context METHOD method_2003 getDisappearProgress (J)F ARG 1 time diff --git a/mappings/net/minecraft/client/toast/TutorialToast.mapping b/mappings/net/minecraft/client/toast/TutorialToast.mapping index d6d392d20f..e405b781ce 100644 --- a/mappings/net/minecraft/client/toast/TutorialToast.mapping +++ b/mappings/net/minecraft/client/toast/TutorialToast.mapping @@ -7,6 +7,11 @@ CLASS net/minecraft/class_372 net/minecraft/client/toast/TutorialToast FIELD field_2227 visibility Lnet/minecraft/class_368$class_369; FIELD field_2228 progress F FIELD field_2229 lastProgress F + FIELD field_32222 PROGRESS_BAR_WIDTH I + FIELD field_32223 PROGRESS_BAR_HEIGHT I + FIELD field_32224 PROGRESS_BAR_X I + FIELD field_32225 PROGRESS_BAR_Y I + FIELD field_45397 TEXTURE Lnet/minecraft/class_2960; METHOD (Lnet/minecraft/class_372$class_373;Lnet/minecraft/class_2561;Lnet/minecraft/class_2561;Z)V ARG 1 type ARG 2 title @@ -16,13 +21,10 @@ CLASS net/minecraft/class_372 net/minecraft/client/toast/TutorialToast ARG 1 progress METHOD method_1993 hide ()V CLASS class_373 Type - FIELD field_2231 textureSlotY I - FIELD field_2232 textureSlotX I - METHOD (Ljava/lang/String;III)V - ARG 3 textureSlotX - ARG 4 textureSlotY - METHOD method_1994 drawIcon (Lnet/minecraft/class_4587;Lnet/minecraft/class_332;II)V - ARG 1 matrices - ARG 2 helper - ARG 3 x - ARG 4 y + FIELD field_45398 texture Lnet/minecraft/class_2960; + METHOD (Ljava/lang/String;ILnet/minecraft/class_2960;)V + ARG 3 texture + METHOD method_1994 drawIcon (Lnet/minecraft/class_332;II)V + ARG 1 context + ARG 2 x + ARG 3 y diff --git a/mappings/net/minecraft/client/util/BanReason.mapping b/mappings/net/minecraft/client/util/BanReason.mapping new file mode 100644 index 0000000000..a0e3528d80 --- /dev/null +++ b/mappings/net/minecraft/client/util/BanReason.mapping @@ -0,0 +1,7 @@ +CLASS net/minecraft/class_8186 net/minecraft/client/util/BanReason + FIELD field_42904 description Lnet/minecraft/class_2561; + METHOD (Ljava/lang/String;ILjava/lang/String;)V + ARG 3 id + METHOD method_49312 getDescription ()Lnet/minecraft/class_2561; + METHOD method_49313 byId (I)Lnet/minecraft/class_8186; + ARG 0 id diff --git a/mappings/net/minecraft/client/network/Bans.mapping b/mappings/net/minecraft/client/util/Bans.mapping similarity index 62% rename from mappings/net/minecraft/client/network/Bans.mapping rename to mappings/net/minecraft/client/util/Bans.mapping index 943ac58c97..32c708dfdc 100644 --- a/mappings/net/minecraft/client/network/Bans.mapping +++ b/mappings/net/minecraft/client/util/Bans.mapping @@ -1,7 +1,9 @@ -CLASS net/minecraft/class_7588 net/minecraft/client/network/Bans - FIELD field_39719 JAVA_MODERATION_URL Ljava/lang/String; +CLASS net/minecraft/class_7588 net/minecraft/client/util/Bans FIELD field_39720 TEMPORARY_TITLE Lnet/minecraft/class_2561; FIELD field_39721 PERMANENT_TITLE Lnet/minecraft/class_2561; + FIELD field_46009 NAME_TITLE Lnet/minecraft/class_2561; + FIELD field_46010 SKIN_TITLE Lnet/minecraft/class_2561; + FIELD field_46011 SKIN_DESCRIPTION Lnet/minecraft/class_2561; METHOD method_44651 getTitle (Lcom/mojang/authlib/minecraft/BanDetails;)Lnet/minecraft/class_2561; ARG 0 banDetails METHOD method_44652 createBanScreen (Lit/unimi/dsi/fastutil/booleans/BooleanConsumer;Lcom/mojang/authlib/minecraft/BanDetails;)Lnet/minecraft/class_407; @@ -17,3 +19,12 @@ CLASS net/minecraft/class_7588 net/minecraft/client/network/Bans ARG 0 banDetails METHOD method_44657 isTemporary (Lcom/mojang/authlib/minecraft/BanDetails;)Z ARG 0 banDetails + METHOD method_53554 createSkinBanScreen (Ljava/lang/Runnable;)Lnet/minecraft/class_407; + ARG 0 onClose + METHOD method_53555 (Ljava/lang/Runnable;Z)V + ARG 1 confirmed + METHOD method_53556 createUsernameBanScreen (Ljava/lang/String;Ljava/lang/Runnable;)Lnet/minecraft/class_407; + ARG 0 username + ARG 1 onClose + METHOD method_53557 (Ljava/lang/Runnable;Z)V + ARG 1 confirmed diff --git a/mappings/net/minecraft/client/util/CommandHistoryManager.mapping b/mappings/net/minecraft/client/util/CommandHistoryManager.mapping new file mode 100644 index 0000000000..5fd1efa252 --- /dev/null +++ b/mappings/net/minecraft/client/util/CommandHistoryManager.mapping @@ -0,0 +1,12 @@ +CLASS net/minecraft/class_8657 net/minecraft/client/util/CommandHistoryManager + FIELD field_45287 LOGGER Lorg/slf4j/Logger; + FIELD field_45288 MAX_SIZE I + FIELD field_45289 FILENAME Ljava/lang/String; + FIELD field_45290 path Ljava/nio/file/Path; + FIELD field_45291 history Lnet/minecraft/class_8623; + METHOD (Ljava/nio/file/Path;)V + ARG 1 directoryPath + METHOD method_52696 getHistory ()Ljava/util/Collection; + METHOD method_52697 add (Ljava/lang/String;)V + ARG 1 command + METHOD method_52698 write ()V diff --git a/mappings/net/minecraft/client/util/DefaultSkinHelper.mapping b/mappings/net/minecraft/client/util/DefaultSkinHelper.mapping index 56cf6a28af..1c718ed250 100644 --- a/mappings/net/minecraft/client/util/DefaultSkinHelper.mapping +++ b/mappings/net/minecraft/client/util/DefaultSkinHelper.mapping @@ -1,12 +1,10 @@ CLASS net/minecraft/class_1068 net/minecraft/client/util/DefaultSkinHelper - FIELD field_32964 DEFAULT Ljava/lang/String; - FIELD field_32965 SLIM Ljava/lang/String; - FIELD field_5300 ALEX_SKIN Lnet/minecraft/class_2960; - FIELD field_5301 STEVE_SKIN Lnet/minecraft/class_2960; - METHOD method_4647 getModel (Ljava/util/UUID;)Ljava/lang/String; - ARG 0 uuid - METHOD method_4648 getTexture (Ljava/util/UUID;)Lnet/minecraft/class_2960; + FIELD field_41121 SKINS [Lnet/minecraft/class_8685; + METHOD method_4648 getTexture (Ljava/util/UUID;)Lnet/minecraft/class_8685; ARG 0 uuid METHOD method_4649 getTexture ()Lnet/minecraft/class_2960; - METHOD method_4650 shouldUseSlimModel (Ljava/util/UUID;)Z - ARG 0 uuid + METHOD method_52854 getTexture (Lcom/mojang/authlib/GameProfile;)Lnet/minecraft/class_8685; + ARG 0 profile + METHOD method_52855 createSkinTextures (Ljava/lang/String;Lnet/minecraft/class_8685$class_7920;)Lnet/minecraft/class_8685; + ARG 0 texture + ARG 1 model diff --git a/mappings/net/minecraft/client/util/Icons.mapping b/mappings/net/minecraft/client/util/Icons.mapping new file mode 100644 index 0000000000..d1dc102929 --- /dev/null +++ b/mappings/net/minecraft/client/util/Icons.mapping @@ -0,0 +1,11 @@ +CLASS net/minecraft/class_8518 net/minecraft/client/util/Icons + FIELD field_44652 path [Ljava/lang/String; + METHOD (Ljava/lang/String;I[Ljava/lang/String;)V + ARG 3 path + METHOD method_51418 getIcons (Lnet/minecraft/class_3262;)Ljava/util/List; + ARG 1 resourcePack + METHOD method_51419 getIcon (Lnet/minecraft/class_3262;Ljava/lang/String;)Lnet/minecraft/class_7367; + ARG 1 resourcePack + ARG 2 fileName + METHOD method_51420 getMacIcon (Lnet/minecraft/class_3262;)Lnet/minecraft/class_7367; + ARG 1 resourcePack diff --git a/mappings/net/minecraft/client/util/InputUtil.mapping b/mappings/net/minecraft/client/util/InputUtil.mapping index ce8718a03c..df4fac0721 100644 --- a/mappings/net/minecraft/client/util/InputUtil.mapping +++ b/mappings/net/minecraft/client/util/InputUtil.mapping @@ -168,6 +168,7 @@ CLASS net/minecraft/class_3675 net/minecraft/client/util/InputUtil FIELD field_1673 name Ljava/lang/String; FIELD field_1674 map Lit/unimi/dsi/fastutil/ints/Int2ObjectMap; FIELD field_24197 textTranslator Ljava/util/function/BiFunction; + FIELD field_44919 UNKNOWN_TRANSLATION_KEY Ljava/lang/String; METHOD (Ljava/lang/String;ILjava/lang/String;Ljava/util/function/BiFunction;)V ARG 3 name ARG 4 textTranslator diff --git a/mappings/net/minecraft/client/util/MacWindowUtil.mapping b/mappings/net/minecraft/client/util/MacWindowUtil.mapping index a309570a48..8b1ec9c0fa 100644 --- a/mappings/net/minecraft/client/util/MacWindowUtil.mapping +++ b/mappings/net/minecraft/client/util/MacWindowUtil.mapping @@ -8,5 +8,5 @@ CLASS net/minecraft/class_6417 net/minecraft/client/util/MacWindowUtil ARG 0 handle METHOD method_37464 toggleFullscreen (Lca/weblite/objc/NSObject;)V ARG 0 handle - METHOD method_41718 setApplicationIconImage (Ljava/io/InputStream;)V - ARG 0 stream + METHOD method_41718 setApplicationIconImage (Lnet/minecraft/class_7367;)V + ARG 0 iconSupplier diff --git a/mappings/net/minecraft/client/util/ModelIdentifier.mapping b/mappings/net/minecraft/client/util/ModelIdentifier.mapping index c740599510..d3a722f351 100644 --- a/mappings/net/minecraft/client/util/ModelIdentifier.mapping +++ b/mappings/net/minecraft/client/util/ModelIdentifier.mapping @@ -5,9 +5,17 @@ CLASS net/minecraft/class_1091 net/minecraft/client/util/ModelIdentifier ARG 1 namespace ARG 2 path ARG 3 variant + METHOD (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Lnet/minecraft/class_2960$class_7658;)V + ARG 1 namespace + ARG 2 path + ARG 3 variant + ARG 4 extraData METHOD (Lnet/minecraft/class_2960;Ljava/lang/String;)V ARG 1 id ARG 2 variant + METHOD method_45910 ofVanilla (Ljava/lang/String;Ljava/lang/String;)Lnet/minecraft/class_1091; + ARG 0 path + ARG 1 variant + METHOD method_45911 toLowerCase (Ljava/lang/String;)Ljava/lang/String; + ARG 0 string METHOD method_4740 getVariant ()Ljava/lang/String; - METHOD method_4741 split (Ljava/lang/String;)[Ljava/lang/String; - ARG 0 id diff --git a/mappings/net/minecraft/client/util/NarratorManager.mapping b/mappings/net/minecraft/client/util/NarratorManager.mapping index a904b632d2..049ebd09a1 100644 --- a/mappings/net/minecraft/client/util/NarratorManager.mapping +++ b/mappings/net/minecraft/client/util/NarratorManager.mapping @@ -34,9 +34,16 @@ CLASS net/minecraft/class_333 net/minecraft/client/util/NarratorManager COMMENT in a development environment}, logs a debug message for a narrated string. ARG 1 message COMMENT the narrated message - METHOD method_44708 narrateChatMessage (Ljava/util/function/Supplier;)V - COMMENT Narrates a lazily supplied chat message. + METHOD method_44708 narrateChatMessage (Lnet/minecraft/class_2561;)V + COMMENT Narrates a chat message. COMMENT COMMENT @see NarratorMode#shouldNarrateChat - ARG 1 messageSupplier - COMMENT the message to narrate + ARG 1 text + METHOD method_47976 narrateSystemMessage (Lnet/minecraft/class_2561;)V + COMMENT Narrates a system message. + COMMENT + COMMENT @see NarratorMode#shouldNarrateSystem + ARG 1 text + METHOD method_52183 checkNarratorLibrary (Z)V + ARG 1 narratorEnabled + CLASS class_8571 InactiveNarratorLibraryException diff --git a/mappings/net/minecraft/client/util/NetworkUtils.mapping b/mappings/net/minecraft/client/util/NetworkUtils.mapping index 1a2afc4617..befec011aa 100644 --- a/mappings/net/minecraft/client/util/NetworkUtils.mapping +++ b/mappings/net/minecraft/client/util/NetworkUtils.mapping @@ -14,3 +14,5 @@ CLASS net/minecraft/class_3521 net/minecraft/client/util/NetworkUtils ARG 4 progressListener ARG 5 proxy METHOD method_15302 findLocalPort ()I + METHOD method_46872 isPortAvailable (I)Z + ARG 0 port diff --git a/mappings/net/minecraft/client/util/OrderableTooltip.mapping b/mappings/net/minecraft/client/util/OrderableTooltip.mapping deleted file mode 100644 index 4747d3a3c4..0000000000 --- a/mappings/net/minecraft/client/util/OrderableTooltip.mapping +++ /dev/null @@ -1,2 +0,0 @@ -CLASS net/minecraft/class_5499 net/minecraft/client/util/OrderableTooltip - METHOD method_31047 getOrderedTooltip ()Ljava/util/List; diff --git a/mappings/net/minecraft/client/util/ParticleUtil.mapping b/mappings/net/minecraft/client/util/ParticleUtil.mapping index 032cca24a7..9ed9bfda50 100644 --- a/mappings/net/minecraft/client/util/ParticleUtil.mapping +++ b/mappings/net/minecraft/client/util/ParticleUtil.mapping @@ -28,3 +28,8 @@ CLASS net/minecraft/class_5945 net/minecraft/client/util/ParticleUtil ARG 6 offsetMultiplier METHOD method_41306 getRandomVelocity (Lnet/minecraft/class_5819;)Lnet/minecraft/class_243; ARG 0 random + METHOD method_49099 spawnParticle (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_5819;Lnet/minecraft/class_2394;)V + ARG 0 world + ARG 1 pos + ARG 2 random + ARG 3 effect diff --git a/mappings/net/minecraft/client/util/PngFile.mapping b/mappings/net/minecraft/client/util/PngFile.mapping deleted file mode 100644 index 57cfd96431..0000000000 --- a/mappings/net/minecraft/client/util/PngFile.mapping +++ /dev/null @@ -1,39 +0,0 @@ -CLASS net/minecraft/class_1050 net/minecraft/client/util/PngFile - FIELD field_5226 height I - FIELD field_5227 width I - METHOD (Ljava/util/function/Supplier;Ljava/io/InputStream;)V - ARG 1 filenameSupplier - ARG 2 in - METHOD method_4542 createReader (Ljava/io/InputStream;)Lnet/minecraft/class_1050$class_1051; - ARG 0 is - CLASS class_1051 Reader - FIELD field_5228 errored Z - METHOD method_4543 read (JJI)I - ARG 1 user - ARG 3 data - ARG 5 size - METHOD method_4544 read (JI)I - ARG 1 data - ARG 3 size - METHOD method_4545 skip (I)V - ARG 1 n - METHOD method_4546 eof (J)I - ARG 1 user - METHOD method_4547 skip (JI)V - ARG 1 user - ARG 3 n - CLASS class_1052 ChannelReader - FIELD field_32035 BUFFER_SIZE I - FIELD field_5229 channel Ljava/nio/channels/ReadableByteChannel; - FIELD field_5230 readPosition I - FIELD field_5231 bufferPosition I - FIELD field_5232 bufferSize I - FIELD field_5233 buffer J - METHOD (Ljava/nio/channels/ReadableByteChannel;)V - ARG 1 channel - METHOD method_4548 readToBuffer (I)V - ARG 1 size - CLASS class_1053 SeekableChannelReader - FIELD field_5234 channel Ljava/nio/channels/SeekableByteChannel; - METHOD (Ljava/nio/channels/SeekableByteChannel;)V - ARG 1 channel diff --git a/mappings/net/minecraft/client/util/ProfileKeys.mapping b/mappings/net/minecraft/client/util/ProfileKeys.mapping index 74fa575298..2f7f6c55df 100644 --- a/mappings/net/minecraft/client/util/ProfileKeys.mapping +++ b/mappings/net/minecraft/client/util/ProfileKeys.mapping @@ -1,60 +1,8 @@ -CLASS net/minecraft/class_7434 net/minecraft/client/util/ProfileKeys - COMMENT A class to fetch, load, and save the player's public and private keys. - FIELD field_39074 LOGGER Lorg/slf4j/Logger; - FIELD field_39075 PROFILE_KEYS_PATH Ljava/nio/file/Path; - FIELD field_39076 jsonPath Ljava/nio/file/Path; - FIELD field_39958 userApiService Lcom/mojang/authlib/minecraft/UserApiService; - FIELD field_39959 keyFuture Ljava/util/concurrent/CompletableFuture; - METHOD (Lcom/mojang/authlib/minecraft/UserApiService;Ljava/util/UUID;Ljava/nio/file/Path;)V - ARG 1 userApiService - ARG 2 uuid - ARG 3 root - METHOD method_43600 saveKeyPairToFile (Lnet/minecraft/class_7427;)V - COMMENT Saves the {@code keyPair} to the cache file if {@link - COMMENT net.minecraft.SharedConstants#isDevelopment} is {@code true}; - COMMENT otherwise, just deletes the cache file. - ARG 1 keyPair - METHOD method_43601 (Lcom/google/gson/JsonElement;)V - ARG 1 json - METHOD method_43602 getKeyPair (Ljava/util/Optional;)Ljava/util/concurrent/CompletableFuture; - COMMENT Gets the key pair from the file cache, or if it is unavailable or expired, - COMMENT the Mojang server. - ARG 1 currentKey - METHOD method_43603 getPublicKey ()Ljava/util/Optional; - COMMENT {@return the public key, or {@link java.util.Optional#empty} if there is no - COMMENT public key associated with the profile} - METHOD method_43605 fetchKeyPair (Lcom/mojang/authlib/minecraft/UserApiService;)Lnet/minecraft/class_7427; - COMMENT {@return the key pair fetched from Mojang's server} - COMMENT - COMMENT @throws NetworkEncryptionException when the fetched key is malformed - COMMENT @throws IOException when fetching fails - ARG 1 userApiService - METHOD method_43606 loadKeyPairFromFile ()Ljava/util/Optional; - COMMENT {@return the profile keys from the local cache} - COMMENT - COMMENT

This can return expired keys. - COMMENT - COMMENT @implNote The cache file is stored at {@code .minecraft/profilekeys/.json}. - METHOD method_44076 decodeKeyPairResponse (Lcom/mojang/authlib/yggdrasil/response/KeyPairResponse;)Lnet/minecraft/class_7428$class_7443; - COMMENT {@return {@code keyPairResponse} decoded to {@link PlayerPublicKey.PublicKeyData}} - COMMENT - COMMENT @throws NetworkEncryptionException when the response is malformed - ARG 0 keyPairResponse - METHOD method_44287 getSigner ()Lnet/minecraft/class_7501; - COMMENT {@return the signer, or {@code null} if there is no key pair associated with the profile} - METHOD method_45104 refresh ()Ljava/util/concurrent/CompletableFuture; - METHOD method_45105 (Lnet/minecraft/class_7434$class_7653;)Lnet/minecraft/class_7428; - ARG 0 key - METHOD method_45106 (Ljava/util/Optional;)Ljava/util/Optional; - ARG 0 key - METHOD method_45107 (Lnet/minecraft/class_7434$class_7653;)Lnet/minecraft/class_7428$class_7443; - ARG 0 key - METHOD method_45108 (Ljava/util/Optional;)Ljava/util/Optional; - ARG 0 maybeKey - METHOD method_45109 (Lnet/minecraft/class_7427;)Z - ARG 0 key - METHOD method_45111 (Ljava/util/Optional;)Ljava/util/concurrent/CompletionStage; - ARG 1 key - CLASS class_7653 SignableKey - METHOD (Lnet/minecraft/class_7427;)V - ARG 1 keyPair +CLASS net/minecraft/class_7853 net/minecraft/client/util/ProfileKeys + FIELD field_40800 MISSING Lnet/minecraft/class_7853; + METHOD method_46522 fetchKeyPair ()Ljava/util/concurrent/CompletableFuture; + METHOD method_46523 isExpired ()Z + METHOD method_46532 create (Lcom/mojang/authlib/minecraft/UserApiService;Lnet/minecraft/class_320;Ljava/nio/file/Path;)Lnet/minecraft/class_7853; + ARG 0 userApiService + ARG 1 session + ARG 2 root diff --git a/mappings/net/minecraft/client/util/ProfileKeysImpl.mapping b/mappings/net/minecraft/client/util/ProfileKeysImpl.mapping new file mode 100644 index 0000000000..1ee1d99a5f --- /dev/null +++ b/mappings/net/minecraft/client/util/ProfileKeysImpl.mapping @@ -0,0 +1,43 @@ +CLASS net/minecraft/class_7434 net/minecraft/client/util/ProfileKeysImpl + COMMENT A class to fetch, load, and save the player's public and private keys. + FIELD field_39074 LOGGER Lorg/slf4j/Logger; + FIELD field_39075 PROFILE_KEYS_PATH Ljava/nio/file/Path; + FIELD field_39076 jsonPath Ljava/nio/file/Path; + FIELD field_39958 userApiService Lcom/mojang/authlib/minecraft/UserApiService; + FIELD field_39959 keyFuture Ljava/util/concurrent/CompletableFuture; + FIELD field_40797 TIME_UNTIL_FIRST_EXPIRY_CHECK Ljava/time/Duration; + FIELD field_40798 expiryCheckTime Ljava/time/Instant; + METHOD (Lcom/mojang/authlib/minecraft/UserApiService;Ljava/util/UUID;Ljava/nio/file/Path;)V + ARG 1 userApiService + ARG 2 uuid + ARG 3 root + METHOD method_43600 saveKeyPairToFile (Lnet/minecraft/class_7427;)V + COMMENT Saves the {@code keyPair} to the cache file if {@link + COMMENT net.minecraft.SharedConstants#isDevelopment} is {@code true}; + COMMENT otherwise, just deletes the cache file. + ARG 1 keyPair + METHOD method_43601 (Lcom/google/gson/JsonElement;)V + ARG 1 json + METHOD method_43602 getKeyPair (Ljava/util/Optional;)Ljava/util/concurrent/CompletableFuture; + COMMENT Gets the key pair from the file cache, or if it is unavailable or expired, + COMMENT the Mojang server. + ARG 1 currentKey + METHOD method_43605 fetchKeyPair (Lcom/mojang/authlib/minecraft/UserApiService;)Lnet/minecraft/class_7427; + COMMENT {@return the key pair fetched from Mojang's server} + COMMENT + COMMENT @throws NetworkEncryptionException when the fetched key is malformed + COMMENT @throws IOException when fetching fails + ARG 1 userApiService + METHOD method_43606 loadKeyPairFromFile ()Ljava/util/Optional; + COMMENT {@return the profile keys from the local cache} + COMMENT + COMMENT

This can return expired keys. + COMMENT + COMMENT @implNote The cache file is stored at {@code .minecraft/profilekeys/.json}. + METHOD method_44076 decodeKeyPairResponse (Lcom/mojang/authlib/yggdrasil/response/KeyPairResponse;)Lnet/minecraft/class_7428$class_7443; + COMMENT {@return {@code keyPairResponse} decoded to {@link PlayerPublicKey.PublicKeyData}} + COMMENT + COMMENT @throws NetworkEncryptionException when the response is malformed + ARG 0 keyPairResponse + METHOD method_45109 (Lnet/minecraft/class_7427;)Z + ARG 0 key diff --git a/mappings/net/minecraft/client/util/ScreenshotRecorder.mapping b/mappings/net/minecraft/client/util/ScreenshotRecorder.mapping index 06014d4763..e729afd8ff 100644 --- a/mappings/net/minecraft/client/util/ScreenshotRecorder.mapping +++ b/mappings/net/minecraft/client/util/ScreenshotRecorder.mapping @@ -8,6 +8,7 @@ CLASS net/minecraft/class_318 net/minecraft/client/util/ScreenshotRecorder FIELD field_32160 width I FIELD field_32161 height I FIELD field_32162 file Ljava/io/File; + FIELD field_41337 SCREENSHOTS_DIRECTORY Ljava/lang/String; METHOD (Ljava/io/File;III)V COMMENT Creates a screenshot recorder for huge screenshots. COMMENT @@ -29,6 +30,8 @@ CLASS net/minecraft/class_318 net/minecraft/client/util/ScreenshotRecorder ARG 3 messageReceiver METHOD method_1663 takeScreenshot (Lnet/minecraft/class_276;)Lnet/minecraft/class_1011; ARG 0 framebuffer + METHOD method_1664 (Ljava/io/File;Lnet/minecraft/class_2583;)Lnet/minecraft/class_2583; + ARG 1 style METHOD method_22690 saveScreenshot (Ljava/io/File;Ljava/lang/String;Lnet/minecraft/class_276;Ljava/util/function/Consumer;)V ARG 0 gameDirectory ARG 1 fileName diff --git a/mappings/net/minecraft/client/util/Session.mapping b/mappings/net/minecraft/client/util/Session.mapping index 7570dfe065..d59d96cbd3 100644 --- a/mappings/net/minecraft/client/util/Session.mapping +++ b/mappings/net/minecraft/client/util/Session.mapping @@ -2,21 +2,19 @@ CLASS net/minecraft/class_320 net/minecraft/client/util/Session FIELD field_1982 username Ljava/lang/String; FIELD field_1983 accessToken Ljava/lang/String; FIELD field_1984 accountType Lnet/minecraft/class_320$class_321; - FIELD field_1985 uuid Ljava/lang/String; + FIELD field_1985 uuid Ljava/util/UUID; FIELD field_34960 xuid Ljava/util/Optional; FIELD field_34961 clientId Ljava/util/Optional; - METHOD (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/util/Optional;Ljava/util/Optional;Lnet/minecraft/class_320$class_321;)V + METHOD (Ljava/lang/String;Ljava/util/UUID;Ljava/lang/String;Ljava/util/Optional;Ljava/util/Optional;Lnet/minecraft/class_320$class_321;)V ARG 1 username ARG 2 uuid ARG 3 accessToken ARG 4 xuid ARG 5 clientId ARG 6 accountType - METHOD method_1673 getUuid ()Ljava/lang/String; METHOD method_1674 getAccessToken ()Ljava/lang/String; METHOD method_1675 getSessionId ()Ljava/lang/String; METHOD method_1676 getUsername ()Ljava/lang/String; - METHOD method_1677 getProfile ()Lcom/mojang/authlib/GameProfile; METHOD method_35718 getAccountType ()Lnet/minecraft/class_320$class_321; METHOD method_38740 getClientId ()Ljava/util/Optional; METHOD method_38741 getXuid ()Ljava/util/Optional; diff --git a/mappings/net/minecraft/client/util/SkinTextures.mapping b/mappings/net/minecraft/client/util/SkinTextures.mapping new file mode 100644 index 0000000000..23bace7f97 --- /dev/null +++ b/mappings/net/minecraft/client/util/SkinTextures.mapping @@ -0,0 +1,8 @@ +CLASS net/minecraft/class_8685 net/minecraft/client/util/SkinTextures + CLASS class_7920 Model + FIELD field_41124 name Ljava/lang/String; + METHOD (Ljava/lang/String;ILjava/lang/String;)V + ARG 3 name + METHOD method_52856 getName ()Ljava/lang/String; + METHOD method_52857 fromName (Ljava/lang/String;)Lnet/minecraft/class_8685$class_7920; + ARG 0 name diff --git a/mappings/net/minecraft/client/util/SpriteIdentifier.mapping b/mappings/net/minecraft/client/util/SpriteIdentifier.mapping index 6125c8069e..34b6aaf662 100644 --- a/mappings/net/minecraft/client/util/SpriteIdentifier.mapping +++ b/mappings/net/minecraft/client/util/SpriteIdentifier.mapping @@ -2,6 +2,7 @@ CLASS net/minecraft/class_4730 net/minecraft/client/util/SpriteIdentifier FIELD field_21769 atlas Lnet/minecraft/class_2960; FIELD field_21770 texture Lnet/minecraft/class_2960; FIELD field_21771 layer Lnet/minecraft/class_1921; + FIELD field_40566 COMPARATOR Ljava/util/Comparator; METHOD (Lnet/minecraft/class_2960;Lnet/minecraft/class_2960;)V ARG 1 atlas ARG 2 texture diff --git a/mappings/net/minecraft/client/util/Window.mapping b/mappings/net/minecraft/client/util/Window.mapping index 6a7d54a6bf..0479a775ce 100644 --- a/mappings/net/minecraft/client/util/Window.mapping +++ b/mappings/net/minecraft/client/util/Window.mapping @@ -80,9 +80,9 @@ CLASS net/minecraft/class_1041 net/minecraft/client/util/Window ARG 4 height METHOD method_4489 getFramebufferWidth ()I METHOD method_4490 getHandle ()J - METHOD method_4491 setIcon (Ljava/io/InputStream;Ljava/io/InputStream;)V - ARG 1 icon16 - ARG 2 icon32 + METHOD method_4491 setIcon (Lnet/minecraft/class_3262;Lnet/minecraft/class_8518;)V + ARG 1 resourcePack + ARG 2 icons METHOD method_4492 acceptError (Ljava/util/function/BiConsumer;)V ARG 0 consumer METHOD method_4494 onWindowFocusChanged (JZ)V @@ -106,11 +106,6 @@ CLASS net/minecraft/class_1041 net/minecraft/client/util/Window ARG 1 videoMode METHOD method_4506 getFramebufferHeight ()I METHOD method_4507 getHeight ()I - METHOD method_4510 readImage (Ljava/io/InputStream;Ljava/nio/IntBuffer;Ljava/nio/IntBuffer;Ljava/nio/IntBuffer;)Ljava/nio/ByteBuffer; - ARG 1 in - ARG 2 x - ARG 3 y - ARG 4 channels METHOD method_4511 getVideoMode ()Ljava/util/Optional; METHOD method_4513 logOnGlError ()V CLASS class_4716 GlErroredException diff --git a/mappings/net/minecraft/client/util/math/MatrixStack.mapping b/mappings/net/minecraft/client/util/math/MatrixStack.mapping index 0bbfffd31a..f70a4b987d 100644 --- a/mappings/net/minecraft/client/util/math/MatrixStack.mapping +++ b/mappings/net/minecraft/client/util/math/MatrixStack.mapping @@ -29,7 +29,7 @@ CLASS net/minecraft/class_4587 net/minecraft/client/util/math/MatrixStack ARG 1 x ARG 2 y ARG 3 z - METHOD method_22907 multiply (Lnet/minecraft/class_1158;)V + METHOD method_22907 multiply (Lorg/joml/Quaternionf;)V COMMENT Applies the rotation transformation to the top entry. ARG 1 quaternion METHOD method_22908 (Ljava/util/ArrayDeque;)V @@ -40,7 +40,7 @@ CLASS net/minecraft/class_4587 net/minecraft/client/util/math/MatrixStack COMMENT {@return whether this stack contains exactly one entry} METHOD method_23760 peek ()Lnet/minecraft/class_4587$class_4665; COMMENT {@return the entry at the top of this stack} - METHOD method_34425 multiplyPositionMatrix (Lnet/minecraft/class_1159;)V + METHOD method_34425 multiplyPositionMatrix (Lorg/joml/Matrix4f;)V COMMENT Multiplies the top position matrix with the given matrix. COMMENT COMMENT

This does not update the normal matrix unlike other transformation @@ -48,13 +48,22 @@ CLASS net/minecraft/class_4587 net/minecraft/client/util/math/MatrixStack ARG 1 matrix METHOD method_34426 loadIdentity ()V COMMENT Sets the top entry to be the identity matrix. + METHOD method_46416 translate (FFF)V + ARG 1 x + ARG 2 y + ARG 3 z + METHOD method_49278 multiply (Lorg/joml/Quaternionf;FFF)V + ARG 1 quaternion + ARG 2 originX + ARG 3 originY + ARG 4 originZ CLASS class_4665 Entry - FIELD field_21327 positionMatrix Lnet/minecraft/class_1159; - FIELD field_21328 normalMatrix Lnet/minecraft/class_4581; - METHOD (Lnet/minecraft/class_1159;Lnet/minecraft/class_4581;)V + FIELD field_21327 positionMatrix Lorg/joml/Matrix4f; + FIELD field_21328 normalMatrix Lorg/joml/Matrix3f; + METHOD (Lorg/joml/Matrix4f;Lorg/joml/Matrix3f;)V ARG 1 positionMatrix ARG 2 normalMatrix - METHOD method_23761 getPositionMatrix ()Lnet/minecraft/class_1159; + METHOD method_23761 getPositionMatrix ()Lorg/joml/Matrix4f; COMMENT {@return the matrix used to transform positions} - METHOD method_23762 getNormalMatrix ()Lnet/minecraft/class_4581; + METHOD method_23762 getNormalMatrix ()Lorg/joml/Matrix3f; COMMENT {@return the matrix used to transform normal vectors} diff --git a/mappings/net/minecraft/client/util/math/Vector3d.mapping b/mappings/net/minecraft/client/util/math/Vector3d.mapping deleted file mode 100644 index f22bf673ee..0000000000 --- a/mappings/net/minecraft/client/util/math/Vector3d.mapping +++ /dev/null @@ -1,18 +0,0 @@ -CLASS net/minecraft/class_1161 net/minecraft/client/util/math/Vector3d - FIELD field_5659 z D - FIELD field_5660 y D - FIELD field_5661 x D - METHOD (DDD)V - ARG 1 x - ARG 3 y - ARG 5 z - METHOD method_35873 multiply (D)V - ARG 1 amount - METHOD method_35874 set (DDD)V - ARG 1 x - ARG 3 y - ARG 5 z - METHOD method_35875 copy (Lnet/minecraft/class_1161;)V - ARG 1 vector3d - METHOD method_35876 add (Lnet/minecraft/class_1161;)V - ARG 1 vector3d diff --git a/mappings/net/minecraft/client/util/telemetry/GameLoadTimeEvent.mapping b/mappings/net/minecraft/client/util/telemetry/GameLoadTimeEvent.mapping new file mode 100644 index 0000000000..7e2a9a3a99 --- /dev/null +++ b/mappings/net/minecraft/client/util/telemetry/GameLoadTimeEvent.mapping @@ -0,0 +1,37 @@ +CLASS net/minecraft/class_8561 net/minecraft/client/util/telemetry/GameLoadTimeEvent + FIELD field_44842 INSTANCE Lnet/minecraft/class_8561; + FIELD field_44843 LOGGER Lorg/slf4j/Logger; + FIELD field_44844 ticker Lcom/google/common/base/Ticker; + FIELD field_44845 stopwatches Ljava/util/Map; + FIELD field_44846 bootstrapTime Ljava/util/OptionalLong; + METHOD (Lcom/google/common/base/Ticker;)V + ARG 1 ticker + METHOD method_51803 setBootstrapTime (J)V + ARG 1 bootstrapTime + METHOD method_51804 (Lcom/google/common/base/Stopwatch;Lnet/minecraft/class_7969;)Lcom/google/common/base/Stopwatch; + ARG 1 property + METHOD method_51805 send (Lnet/minecraft/class_7965;)V + ARG 1 sender + METHOD method_51806 startTimer (Lnet/minecraft/class_7969;)V + ARG 1 property + METHOD method_51807 addTimer (Lnet/minecraft/class_7969;Lcom/google/common/base/Stopwatch;)V + ARG 1 property + ARG 2 stopwatch + METHOD method_51808 addTimer (Lnet/minecraft/class_7969;Ljava/util/function/Function;)V + ARG 1 property + ARG 2 stopwatchProvider + METHOD method_51809 (Lnet/minecraft/class_7973$class_7974;)V + ARG 1 properties + METHOD method_51810 (Lnet/minecraft/class_7973$class_7974;J)V + ARG 1 bootstrapTime + METHOD method_51811 (Lnet/minecraft/class_7973$class_7974;Lnet/minecraft/class_7969;Lcom/google/common/base/Stopwatch;)V + ARG 1 property + ARG 2 stopwatch + METHOD method_51812 stopTimer (Lnet/minecraft/class_7969;)V + ARG 1 property + METHOD method_51813 (Lnet/minecraft/class_7969;)Lcom/google/common/base/Stopwatch; + ARG 1 property + CLASS class_8562 Measurement + FIELD field_44847 CODEC Lcom/mojang/serialization/Codec; + METHOD method_51814 (Lnet/minecraft/class_8561$class_8562;)Ljava/lang/Integer; + ARG 0 measurement diff --git a/mappings/net/minecraft/client/util/telemetry/PerformanceMetricsEvent.mapping b/mappings/net/minecraft/client/util/telemetry/PerformanceMetricsEvent.mapping new file mode 100644 index 0000000000..f837dc883d --- /dev/null +++ b/mappings/net/minecraft/client/util/telemetry/PerformanceMetricsEvent.mapping @@ -0,0 +1,11 @@ +CLASS net/minecraft/class_7977 net/minecraft/client/util/telemetry/PerformanceMetricsEvent + FIELD field_41510 MAX_MEMORY_KB J + FIELD field_41511 frameRateSamples Lit/unimi/dsi/fastutil/longs/LongList; + FIELD field_41512 renderTimeSamples Lit/unimi/dsi/fastutil/longs/LongList; + FIELD field_41513 usedMemorySamples Lit/unimi/dsi/fastutil/longs/LongList; + METHOD method_47785 toKilos (J)J + ARG 0 bytes + METHOD method_47788 clearSamples ()V + METHOD method_47789 sampleUsedMemory ()V + METHOD method_47979 (Lnet/minecraft/class_7973$class_7974;)V + ARG 1 map diff --git a/mappings/net/minecraft/client/util/telemetry/PropertyMap.mapping b/mappings/net/minecraft/client/util/telemetry/PropertyMap.mapping new file mode 100644 index 0000000000..f918e8c546 --- /dev/null +++ b/mappings/net/minecraft/client/util/telemetry/PropertyMap.mapping @@ -0,0 +1,43 @@ +CLASS net/minecraft/class_7973 net/minecraft/client/util/telemetry/PropertyMap + FIELD field_41496 backingMap Ljava/util/Map; + METHOD (Ljava/util/Map;)V + ARG 1 backingMap + METHOD method_47759 builder ()Lnet/minecraft/class_7973$class_7974; + METHOD method_47760 get (Lnet/minecraft/class_7969;)Ljava/lang/Object; + ARG 1 property + METHOD method_47761 createCodec (Ljava/util/List;)Lcom/mojang/serialization/Codec; + ARG 0 properties + METHOD method_47762 keySet ()Ljava/util/Set; + CLASS 1 + METHOD decode (Lcom/mojang/serialization/DynamicOps;Lcom/mojang/serialization/MapLike;)Lcom/mojang/serialization/DataResult; + ARG 1 ops + ARG 2 map + METHOD encode (Ljava/lang/Object;Lcom/mojang/serialization/DynamicOps;Lcom/mojang/serialization/RecordBuilder;)Lcom/mojang/serialization/RecordBuilder; + ARG 1 map + ARG 2 ops + ARG 3 builder + METHOD keys (Lcom/mojang/serialization/DynamicOps;)Ljava/util/stream/Stream; + ARG 1 ops + METHOD method_47763 decode (Lcom/mojang/serialization/DataResult;Lcom/mojang/serialization/DynamicOps;Lcom/mojang/serialization/MapLike;Lnet/minecraft/class_7969;)Lcom/mojang/serialization/DataResult; + ARG 1 result + ARG 2 ops + ARG 3 map + ARG 4 property + METHOD method_47764 (Lnet/minecraft/class_7969;Lnet/minecraft/class_7973$class_7974;Ljava/lang/Object;)Lnet/minecraft/class_7973$class_7974; + ARG 1 mapBuilder + ARG 2 value + METHOD method_47766 encode (Lnet/minecraft/class_7973;Lcom/mojang/serialization/RecordBuilder;Lnet/minecraft/class_7969;)Lcom/mojang/serialization/RecordBuilder; + ARG 1 map + ARG 2 builder + ARG 3 property + CLASS class_7974 Builder + FIELD field_41498 backingMap Ljava/util/Map; + METHOD method_47767 build ()Lnet/minecraft/class_7973; + METHOD method_47768 put (Lnet/minecraft/class_7969;Ljava/lang/Object;)Lnet/minecraft/class_7973$class_7974; + ARG 1 property + ARG 2 value + METHOD method_47769 putAll (Lnet/minecraft/class_7973;)Lnet/minecraft/class_7973$class_7974; + ARG 1 map + METHOD method_51800 putIfNonNull (Lnet/minecraft/class_7969;Ljava/lang/Object;)Lnet/minecraft/class_7973$class_7974; + ARG 1 property + ARG 2 value diff --git a/mappings/net/minecraft/client/util/telemetry/SampleEvent.mapping b/mappings/net/minecraft/client/util/telemetry/SampleEvent.mapping new file mode 100644 index 0000000000..9dc2fbf616 --- /dev/null +++ b/mappings/net/minecraft/client/util/telemetry/SampleEvent.mapping @@ -0,0 +1,16 @@ +CLASS net/minecraft/class_7976 net/minecraft/client/util/telemetry/SampleEvent + FIELD field_41505 INTERVAL_IN_MILLIS I + FIELD field_41506 BATCH_SIZE I + FIELD field_41507 sampleCount I + FIELD field_41508 enabled Z + FIELD field_41509 lastSampleTime Ljava/time/Instant; + METHOD method_47777 start ()V + METHOD method_47778 tick (Lnet/minecraft/class_7965;)V + ARG 1 sender + METHOD method_47779 shouldSample ()Z + METHOD method_47780 shouldSend ()Z + METHOD method_47781 disableSampling ()V + METHOD method_47782 getSampleCount ()I + METHOD method_47783 sample ()V + METHOD method_47784 send (Lnet/minecraft/class_7965;)V + ARG 1 sender diff --git a/mappings/net/minecraft/client/util/telemetry/SentTelemetryEvent.mapping b/mappings/net/minecraft/client/util/telemetry/SentTelemetryEvent.mapping new file mode 100644 index 0000000000..951c985174 --- /dev/null +++ b/mappings/net/minecraft/client/util/telemetry/SentTelemetryEvent.mapping @@ -0,0 +1,6 @@ +CLASS net/minecraft/class_7962 net/minecraft/client/util/telemetry/SentTelemetryEvent + FIELD field_41430 CODEC Lcom/mojang/serialization/Codec; + METHOD method_47711 createEvent (Lcom/mojang/authlib/minecraft/TelemetrySession;)Lcom/mojang/authlib/minecraft/TelemetryEvent; + ARG 1 session + METHOD method_47712 (Lnet/minecraft/class_7966;Lnet/minecraft/class_7969;)V + ARG 1 property diff --git a/mappings/net/minecraft/client/util/telemetry/TelemetryConstants.mapping b/mappings/net/minecraft/client/util/telemetry/TelemetryConstants.mapping deleted file mode 100644 index 0f34c82e97..0000000000 --- a/mappings/net/minecraft/client/util/telemetry/TelemetryConstants.mapping +++ /dev/null @@ -1,24 +0,0 @@ -CLASS net/minecraft/class_6610 net/minecraft/client/util/telemetry/TelemetryConstants - FIELD field_34897 DATE_TIME_FORMATTER Ljava/time/format/DateTimeFormatter; - FIELD field_34898 WORLD_LOADED Ljava/lang/String; - FIELD field_34899 SERVER_MODDED Ljava/lang/String; - FIELD field_34900 USER_ID Ljava/lang/String; - FIELD field_34901 CLIENT_ID Ljava/lang/String; - FIELD field_34902 DEVICE_SESSION_ID Ljava/lang/String; - FIELD field_34903 WORLD_SESSION_ID Ljava/lang/String; - FIELD field_34904 EVENT_TIMESTAMP_UTC Ljava/lang/String; - FIELD field_34905 BUILD_DISPLAY_NAME Ljava/lang/String; - FIELD field_34906 CLIENT_MODDED Ljava/lang/String; - FIELD field_34907 SERVER_TYPE Ljava/lang/String; - FIELD field_34908 BUILD_PLAT Ljava/lang/String; - FIELD field_34909 PLAT Ljava/lang/String; - FIELD field_34910 JAVA_VERSION Ljava/lang/String; - FIELD field_34911 PLAYER_GAME_MODE Ljava/lang/String; - FIELD field_34912 SURVIVAL I - FIELD field_34913 CREATIVE I - FIELD field_34914 ADVENTURE I - FIELD field_34915 SPECTATOR I - FIELD field_34916 HARDCORE I - FIELD field_34917 REALM Ljava/lang/String; - FIELD field_34918 LOCAL Ljava/lang/String; - FIELD field_34919 SERVER Ljava/lang/String; diff --git a/mappings/net/minecraft/client/util/telemetry/TelemetryEventProperty.mapping b/mappings/net/minecraft/client/util/telemetry/TelemetryEventProperty.mapping new file mode 100644 index 0000000000..3c296be8eb --- /dev/null +++ b/mappings/net/minecraft/client/util/telemetry/TelemetryEventProperty.mapping @@ -0,0 +1,74 @@ +CLASS net/minecraft/class_7969 net/minecraft/client/util/telemetry/TelemetryEventProperty + FIELD field_41457 DATE_TIME_FORMATTER Ljava/time/format/DateTimeFormatter; + METHOD method_47743 getTitle ()Lnet/minecraft/class_5250; + METHOD method_47744 (Lcom/mojang/authlib/minecraft/TelemetryPropertyContainer;Ljava/lang/String;Lnet/minecraft/class_7969$class_7971;)V + ARG 0 container + ARG 1 exportKey + ARG 2 value + METHOD method_47745 (Lcom/mojang/authlib/minecraft/TelemetryPropertyContainer;Ljava/lang/String;Lnet/minecraft/class_7969$class_7972;)V + ARG 0 container + ARG 1 exportKey + ARG 2 value + METHOD method_47746 (Lcom/mojang/authlib/minecraft/TelemetryPropertyContainer;Ljava/lang/String;Lit/unimi/dsi/fastutil/longs/LongList;)V + ARG 0 container + ARG 1 key + ARG 2 value + METHOD method_47747 (Lcom/mojang/authlib/minecraft/TelemetryPropertyContainer;Ljava/lang/String;Ljava/time/Instant;)V + ARG 0 container + ARG 1 exportKey + ARG 2 value + METHOD method_47748 (Lcom/mojang/authlib/minecraft/TelemetryPropertyContainer;Ljava/lang/String;Ljava/util/UUID;)V + ARG 0 container + ARG 1 key + ARG 2 value + METHOD method_47749 addTo (Lnet/minecraft/class_7973;Lcom/mojang/authlib/minecraft/TelemetryPropertyContainer;)V + ARG 1 map + ARG 2 container + METHOD method_47750 ofBoolean (Ljava/lang/String;Ljava/lang/String;)Lnet/minecraft/class_7969; + ARG 0 id + ARG 1 exportKey + METHOD method_47751 of (Ljava/lang/String;Ljava/lang/String;Lcom/mojang/serialization/Codec;Lnet/minecraft/class_7969$class_7970;)Lnet/minecraft/class_7969; + ARG 0 id + ARG 1 exportKey + ARG 2 codec + ARG 3 exporter + METHOD method_47752 ofString (Ljava/lang/String;Ljava/lang/String;)Lnet/minecraft/class_7969; + ARG 0 id + ARG 1 exportKey + METHOD method_47753 ofInteger (Ljava/lang/String;Ljava/lang/String;)Lnet/minecraft/class_7969; + ARG 0 id + ARG 1 exportKey + METHOD method_47754 ofUuid (Ljava/lang/String;Ljava/lang/String;)Lnet/minecraft/class_7969; + ARG 0 id + ARG 1 exportKey + METHOD method_47755 ofLongList (Ljava/lang/String;Ljava/lang/String;)Lnet/minecraft/class_7969; + ARG 0 id + ARG 1 exportKey + METHOD method_51797 (Lcom/mojang/authlib/minecraft/TelemetryPropertyContainer;Ljava/lang/String;Lnet/minecraft/class_8561$class_8562;)V + ARG 0 container + ARG 1 key + ARG 2 value + METHOD method_51798 ofLong (Ljava/lang/String;Ljava/lang/String;)Lnet/minecraft/class_7969; + ARG 0 id + ARG 1 exportKey + METHOD method_51799 ofTimeMeasurement (Ljava/lang/String;Ljava/lang/String;)Lnet/minecraft/class_7969; + ARG 0 id + ARG 1 exportKey + CLASS class_7970 PropertyExporter + METHOD apply (Lcom/mojang/authlib/minecraft/TelemetryPropertyContainer;Ljava/lang/String;Ljava/lang/Object;)V + ARG 1 container + ARG 2 key + ARG 3 value + CLASS class_7971 GameMode + FIELD field_41486 CODEC Lcom/mojang/serialization/Codec; + FIELD field_41487 id Ljava/lang/String; + FIELD field_41488 rawId I + METHOD (Ljava/lang/String;ILjava/lang/String;I)V + ARG 3 id + ARG 4 rawId + METHOD method_47756 getRawId ()I + CLASS class_7972 ServerType + FIELD field_41493 CODEC Lcom/mojang/serialization/Codec; + FIELD field_41494 id Ljava/lang/String; + METHOD (Ljava/lang/String;ILjava/lang/String;)V + ARG 3 id diff --git a/mappings/net/minecraft/client/util/telemetry/TelemetryEventType.mapping b/mappings/net/minecraft/client/util/telemetry/TelemetryEventType.mapping new file mode 100644 index 0000000000..de30ba35d8 --- /dev/null +++ b/mappings/net/minecraft/client/util/telemetry/TelemetryEventType.mapping @@ -0,0 +1,56 @@ +CLASS net/minecraft/class_7966 net/minecraft/client/util/telemetry/TelemetryEventType + FIELD field_41435 CODEC Lcom/mojang/serialization/Codec; + FIELD field_41436 WORLD_LOADED Lnet/minecraft/class_7966; + FIELD field_41437 PERFORMANCE_METRICS Lnet/minecraft/class_7966; + FIELD field_41438 WORLD_LOAD_TIMES Lnet/minecraft/class_7966; + FIELD field_41439 WORLD_UNLOADED Lnet/minecraft/class_7966; + FIELD field_41440 TYPES Ljava/util/Map; + FIELD field_41441 BASIC_PROPERTIES Ljava/util/List; + FIELD field_41442 REQUIRED_PROPERTIES Ljava/util/List; + FIELD field_41443 id Ljava/lang/String; + FIELD field_41444 exportKey Ljava/lang/String; + FIELD field_41445 properties Ljava/util/List; + FIELD field_41446 optional Z + FIELD field_41447 codec Lcom/mojang/serialization/Codec; + FIELD field_44832 ADVANCEMENT_MADE Lnet/minecraft/class_7966; + FIELD field_44833 GAME_LOAD_TIMES Lnet/minecraft/class_7966; + METHOD (Ljava/lang/String;Ljava/lang/String;Ljava/util/List;Z)V + ARG 1 id + ARG 2 exportKey + ARG 3 properties + ARG 4 optional + METHOD method_47720 getId ()Ljava/lang/String; + METHOD method_47721 createEvent (Lcom/mojang/authlib/minecraft/TelemetrySession;Lnet/minecraft/class_7973;)Lcom/mojang/authlib/minecraft/TelemetryEvent; + ARG 1 session + ARG 2 properties + METHOD method_47722 hasProperty (Lnet/minecraft/class_7969;)Z + ARG 1 property + METHOD method_47723 (Lnet/minecraft/class_7973;)Lnet/minecraft/class_7962; + ARG 1 map + METHOD method_47724 getText (Ljava/lang/String;)Lnet/minecraft/class_5250; + ARG 1 key + METHOD method_47725 builder (Ljava/lang/String;Ljava/lang/String;)Lnet/minecraft/class_7966$class_7967; + ARG 0 id + ARG 1 sentEventId + METHOD method_47726 getProperties ()Ljava/util/List; + METHOD method_47727 (Ljava/lang/String;)Lcom/mojang/serialization/DataResult; + ARG 0 id + METHOD method_47728 getCodec ()Lcom/mojang/serialization/Codec; + METHOD method_47729 isOptional ()Z + METHOD method_47730 getTitle ()Lnet/minecraft/class_5250; + METHOD method_47731 getDescription ()Lnet/minecraft/class_5250; + METHOD method_47732 getTypes ()Ljava/util/List; + CLASS class_7967 Builder + FIELD field_41448 id Ljava/lang/String; + FIELD field_41449 exportKey Ljava/lang/String; + FIELD field_41450 properties Ljava/util/List; + FIELD field_41451 optional Z + METHOD (Ljava/lang/String;Ljava/lang/String;)V + ARG 1 id + ARG 2 exportKey + METHOD method_47733 optional ()Lnet/minecraft/class_7966$class_7967; + METHOD method_47734 properties (Lnet/minecraft/class_7969;)Lnet/minecraft/class_7966$class_7967; + ARG 1 property + METHOD method_47735 properties (Ljava/util/List;)Lnet/minecraft/class_7966$class_7967; + ARG 1 properties + METHOD method_47736 build ()Lnet/minecraft/class_7966; diff --git a/mappings/net/minecraft/client/util/telemetry/TelemetryLogManager.mapping b/mappings/net/minecraft/client/util/telemetry/TelemetryLogManager.mapping new file mode 100644 index 0000000000..9b11a8dd5e --- /dev/null +++ b/mappings/net/minecraft/client/util/telemetry/TelemetryLogManager.mapping @@ -0,0 +1,15 @@ +CLASS net/minecraft/class_7968 net/minecraft/client/util/telemetry/TelemetryLogManager + FIELD field_41452 LOGGER Lorg/slf4j/Logger; + FIELD field_41453 FILE_EXTENSION Ljava/lang/String; + FIELD field_41454 RETENTION_DAYS I + FIELD field_41455 compressor Lnet/minecraft/class_7929; + FIELD field_41456 writer Ljava/util/concurrent/CompletableFuture; + METHOD (Lnet/minecraft/class_7929;)V + ARG 1 compressor + METHOD method_47737 getLogger ()Ljava/util/concurrent/CompletableFuture; + METHOD method_47738 create (Ljava/nio/file/Path;)Ljava/util/concurrent/CompletableFuture; + ARG 0 directory + METHOD method_47739 (Ljava/util/Optional;)V + ARG 0 writer + METHOD method_47742 (Ljava/util/Optional;)Ljava/util/Optional; + ARG 0 writer diff --git a/mappings/net/minecraft/client/util/telemetry/TelemetryLogger.mapping b/mappings/net/minecraft/client/util/telemetry/TelemetryLogger.mapping new file mode 100644 index 0000000000..e480960821 --- /dev/null +++ b/mappings/net/minecraft/client/util/telemetry/TelemetryLogger.mapping @@ -0,0 +1,3 @@ +CLASS net/minecraft/class_7964 net/minecraft/client/util/telemetry/TelemetryLogger + METHOD log (Lnet/minecraft/class_7962;)V + ARG 1 event diff --git a/mappings/net/minecraft/client/util/telemetry/TelemetryManager.mapping b/mappings/net/minecraft/client/util/telemetry/TelemetryManager.mapping new file mode 100644 index 0000000000..191dbf5fa6 --- /dev/null +++ b/mappings/net/minecraft/client/util/telemetry/TelemetryManager.mapping @@ -0,0 +1,36 @@ +CLASS net/minecraft/class_6628 net/minecraft/client/util/telemetry/TelemetryManager + FIELD field_34948 NEXT_WORKER_ID Ljava/util/concurrent/atomic/AtomicInteger; + FIELD field_34949 EXECUTOR Ljava/util/concurrent/Executor; + FIELD field_41426 userApiService Lcom/mojang/authlib/minecraft/UserApiService; + FIELD field_41427 propertyMap Lnet/minecraft/class_7973; + FIELD field_41428 logDirectory Ljava/nio/file/Path; + FIELD field_41429 logManager Ljava/util/concurrent/CompletableFuture; + FIELD field_44831 lazySenderSupplier Ljava/util/function/Supplier; + METHOD (Lnet/minecraft/class_310;Lcom/mojang/authlib/minecraft/UserApiService;Lnet/minecraft/class_320;)V + ARG 1 client + ARG 2 userApiService + ARG 3 session + METHOD method_38731 (Ljava/lang/Runnable;)Ljava/lang/Thread; + ARG 0 runnable + METHOD method_47701 getLogManager ()Ljava/nio/file/Path; + METHOD method_47702 (Lnet/minecraft/class_7962;Lcom/mojang/authlib/minecraft/TelemetrySession;Ljava/util/Optional;)V + ARG 2 logger + METHOD method_47703 (Lnet/minecraft/class_7973$class_7974;Ljava/lang/String;)V + ARG 1 clientId + METHOD method_47704 (Ljava/util/Optional;)V + ARG 0 manager + METHOD method_47705 (Ljava/util/concurrent/CompletableFuture;Lcom/mojang/authlib/minecraft/TelemetrySession;Lnet/minecraft/class_7966;Ljava/util/function/Consumer;)V + ARG 1 future + ARG 2 session + ARG 3 eventType + ARG 4 adder + METHOD method_47706 createWorldSession (ZLjava/time/Duration;Ljava/lang/String;)Lnet/minecraft/class_7975; + ARG 1 newWorld + ARG 2 worldLoadTime + ARG 3 minigameName + METHOD method_47707 computeSender ()Lnet/minecraft/class_7965; + METHOD method_47708 (Lnet/minecraft/class_7973$class_7974;Ljava/lang/String;)V + ARG 1 xuid + METHOD method_47709 (Ljava/util/Optional;)Ljava/util/concurrent/CompletionStage; + ARG 0 manager + METHOD method_51796 getSender ()Lnet/minecraft/class_7965; diff --git a/mappings/net/minecraft/client/util/telemetry/TelemetrySender.mapping b/mappings/net/minecraft/client/util/telemetry/TelemetrySender.mapping index ad274a1156..6bd7e3e2e8 100644 --- a/mappings/net/minecraft/client/util/telemetry/TelemetrySender.mapping +++ b/mappings/net/minecraft/client/util/telemetry/TelemetrySender.mapping @@ -1,41 +1,15 @@ -CLASS net/minecraft/class_6628 net/minecraft/client/util/telemetry/TelemetrySender - FIELD field_34948 NEXT_WORKER_ID Ljava/util/concurrent/atomic/AtomicInteger; - FIELD field_34949 EXECUTOR Ljava/util/concurrent/Executor; - FIELD field_34950 client Lnet/minecraft/class_310; - FIELD field_34951 session Lcom/mojang/authlib/minecraft/TelemetrySession; - FIELD field_34952 sent Z - FIELD field_34953 gameMode Lnet/minecraft/class_6628$class_6629; - FIELD field_34954 serverBrand Ljava/lang/String; - METHOD (Lnet/minecraft/class_310;Lcom/mojang/authlib/minecraft/UserApiService;Ljava/util/Optional;Ljava/util/Optional;Ljava/util/UUID;)V - ARG 1 client - ARG 2 userApiService - ARG 3 userId - ARG 4 clientId - ARG 5 deviceSessionId - METHOD method_38725 send ()V - METHOD method_38726 setGameModeAndSend (Lnet/minecraft/class_1934;Z)V - ARG 1 gameMode - ARG 2 hardcore - METHOD method_38727 (Lcom/mojang/authlib/minecraft/TelemetryPropertyContainer;)V - ARG 0 container - METHOD method_38729 (Lcom/mojang/authlib/minecraft/TelemetryPropertyContainer;Ljava/lang/String;Ljava/lang/String;)V - ARG 2 value - METHOD method_38730 send (Lnet/minecraft/class_6628$class_6629;)V - ARG 1 gameMode - METHOD method_38731 (Ljava/lang/Runnable;)Ljava/lang/Thread; - ARG 0 runnable - METHOD method_38732 setServerBrandAndSend (Ljava/lang/String;)V - ARG 1 brand - METHOD method_38733 addProperty (Ljava/lang/String;Ljava/util/Optional;Lcom/mojang/authlib/minecraft/TelemetryPropertyContainer;)V - ARG 0 name - ARG 1 propertyValue - ARG 2 container - METHOD method_38734 getServerType ()Ljava/lang/String; - CLASS class_6629 PlayerGameMode - FIELD comp_136 gameMode Lnet/minecraft/class_1934; - FIELD comp_137 hardcore Z - METHOD comp_136 gameMode ()Lnet/minecraft/class_1934; - METHOD comp_137 hardcore ()Z - METHOD equals (Ljava/lang/Object;)Z - ARG 1 o - METHOD method_38735 getId ()I +CLASS net/minecraft/class_7965 net/minecraft/client/util/telemetry/TelemetrySender + FIELD field_41434 NOOP Lnet/minecraft/class_7965; + METHOD decorate (Ljava/util/function/Consumer;)Lnet/minecraft/class_7965; + ARG 1 decorationAdder + METHOD method_47717 (Lnet/minecraft/class_7966;Ljava/util/function/Consumer;)V + ARG 0 eventType + ARG 1 propertyAdder + METHOD method_47718 (Ljava/util/function/Consumer;Lnet/minecraft/class_7966;Ljava/util/function/Consumer;)V + ARG 2 eventType + ARG 3 propertyAdder + METHOD method_47719 (Ljava/util/function/Consumer;Ljava/util/function/Consumer;Lnet/minecraft/class_7973$class_7974;)V + ARG 2 builder + METHOD send (Lnet/minecraft/class_7966;Ljava/util/function/Consumer;)V + ARG 1 eventType + ARG 2 propertyAdder diff --git a/mappings/net/minecraft/client/util/telemetry/ThreadedLogWriter.mapping b/mappings/net/minecraft/client/util/telemetry/ThreadedLogWriter.mapping new file mode 100644 index 0000000000..2df6980b87 --- /dev/null +++ b/mappings/net/minecraft/client/util/telemetry/ThreadedLogWriter.mapping @@ -0,0 +1,10 @@ +CLASS net/minecraft/class_7963 net/minecraft/client/util/telemetry/ThreadedLogWriter + FIELD field_41431 LOGGER Lorg/slf4j/Logger; + FIELD field_41432 writer Lnet/minecraft/class_7935; + FIELD field_41433 executor Lnet/minecraft/class_3846; + METHOD (Ljava/nio/channels/FileChannel;Ljava/util/concurrent/Executor;)V + ARG 1 channel + ARG 2 executor + METHOD method_47713 getLogger ()Lnet/minecraft/class_7964; + METHOD method_47714 (Lnet/minecraft/class_7962;)V + ARG 1 event diff --git a/mappings/net/minecraft/client/util/telemetry/WorldLoadTimesEvent.mapping b/mappings/net/minecraft/client/util/telemetry/WorldLoadTimesEvent.mapping new file mode 100644 index 0000000000..c31aa57947 --- /dev/null +++ b/mappings/net/minecraft/client/util/telemetry/WorldLoadTimesEvent.mapping @@ -0,0 +1,10 @@ +CLASS net/minecraft/class_7981 net/minecraft/client/util/telemetry/WorldLoadTimesEvent + FIELD field_41519 newWorld Z + FIELD field_41520 worldLoadTime Ljava/time/Duration; + METHOD (ZLjava/time/Duration;)V + ARG 1 newWorld + ARG 2 worldLoadTime + METHOD method_47796 (Lnet/minecraft/class_7973$class_7974;)V + ARG 1 builder + METHOD method_47981 send (Lnet/minecraft/class_7965;)V + ARG 1 sender diff --git a/mappings/net/minecraft/client/util/telemetry/WorldLoadedEvent.mapping b/mappings/net/minecraft/client/util/telemetry/WorldLoadedEvent.mapping new file mode 100644 index 0000000000..0d31dfdd35 --- /dev/null +++ b/mappings/net/minecraft/client/util/telemetry/WorldLoadedEvent.mapping @@ -0,0 +1,19 @@ +CLASS net/minecraft/class_7979 net/minecraft/client/util/telemetry/WorldLoadedEvent + FIELD field_41516 sent Z + FIELD field_41517 gameMode Lnet/minecraft/class_7969$class_7971; + FIELD field_41518 brand Ljava/lang/String; + FIELD field_44848 minigameName Ljava/lang/String; + METHOD (Ljava/lang/String;)V + ARG 1 minigameName + METHOD method_47791 setGameMode (Lnet/minecraft/class_1934;Z)V + ARG 1 gameMode + ARG 2 hardcore + METHOD method_47792 putServerType (Lnet/minecraft/class_7973$class_7974;)V + ARG 1 builder + METHOD method_47793 setBrand (Ljava/lang/String;)V + ARG 1 brand + METHOD method_47794 getServerType ()Lnet/minecraft/class_7969$class_7972; + METHOD method_47795 (Lnet/minecraft/class_7973$class_7974;)V + ARG 1 adder + METHOD method_47980 send (Lnet/minecraft/class_7965;)Z + ARG 1 sender diff --git a/mappings/net/minecraft/client/util/telemetry/WorldSession.mapping b/mappings/net/minecraft/client/util/telemetry/WorldSession.mapping new file mode 100644 index 0000000000..2344ebdb93 --- /dev/null +++ b/mappings/net/minecraft/client/util/telemetry/WorldSession.mapping @@ -0,0 +1,29 @@ +CLASS net/minecraft/class_7975 net/minecraft/client/util/telemetry/WorldSession + FIELD field_41499 sessionId Ljava/util/UUID; + FIELD field_41500 sender Lnet/minecraft/class_7965; + FIELD field_41501 worldLoadedEvent Lnet/minecraft/class_7979; + FIELD field_41502 worldUnloadedEvent Lnet/minecraft/class_7982; + FIELD field_41503 performanceMetricsEvent Lnet/minecraft/class_7977; + FIELD field_41504 worldLoadTimesEvent Lnet/minecraft/class_7981; + METHOD (Lnet/minecraft/class_7965;ZLjava/time/Duration;Ljava/lang/String;)V + ARG 1 sender + ARG 2 newWorld + ARG 3 worldLoadTime + ARG 4 minigameName + METHOD method_47770 tick ()V + METHOD method_47771 setTick (J)V + ARG 1 tick + METHOD method_47772 setGameMode (Lnet/minecraft/class_1934;Z)V + ARG 1 gameMode + ARG 2 hardcore + METHOD method_47773 (Lnet/minecraft/class_7973$class_7974;)V + ARG 1 builder + METHOD method_47774 setBrand (Ljava/lang/String;)V + ARG 1 brand + METHOD method_47775 onLoad ()V + METHOD method_47776 onUnload ()V + METHOD method_51801 (Lnet/minecraft/class_2960;JLnet/minecraft/class_7973$class_7974;)V + ARG 3 properties + METHOD method_51802 onAdvancementMade (Lnet/minecraft/class_1937;Lnet/minecraft/class_8779;)V + ARG 1 world + ARG 2 advancement diff --git a/mappings/net/minecraft/client/util/telemetry/WorldUnloadedEvent.mapping b/mappings/net/minecraft/client/util/telemetry/WorldUnloadedEvent.mapping new file mode 100644 index 0000000000..5fc8809f47 --- /dev/null +++ b/mappings/net/minecraft/client/util/telemetry/WorldUnloadedEvent.mapping @@ -0,0 +1,16 @@ +CLASS net/minecraft/class_7982 net/minecraft/client/util/telemetry/WorldUnloadedEvent + FIELD field_41521 startTime Ljava/util/Optional; + FIELD field_41522 ticksSinceLoad J + FIELD field_41523 lastTick J + FIELD field_41712 ABSENT_LAST_TICK I + METHOD method_47786 send (Lnet/minecraft/class_7965;)V + ARG 1 sender + METHOD method_47798 setTick (J)V + ARG 1 tick + METHOD method_47799 (Lnet/minecraft/class_7965;Ljava/time/Instant;)V + ARG 2 startTime + METHOD method_47800 getSecondsSinceLoad (Ljava/time/Instant;)I + ARG 1 startTime + METHOD method_47801 (Ljava/time/Instant;Lnet/minecraft/class_7973$class_7974;)V + ARG 2 builder + METHOD method_47982 start ()V diff --git a/mappings/net/minecraft/client/world/BiomeColorCache.mapping b/mappings/net/minecraft/client/world/BiomeColorCache.mapping index e4de1a0760..b9b44a2d32 100644 --- a/mappings/net/minecraft/client/world/BiomeColorCache.mapping +++ b/mappings/net/minecraft/client/world/BiomeColorCache.mapping @@ -23,8 +23,11 @@ CLASS net/minecraft/class_4700 net/minecraft/client/world/BiomeColorCache FIELD field_34796 colors Lit/unimi/dsi/fastutil/ints/Int2ObjectArrayMap; FIELD field_34797 lock Ljava/util/concurrent/locks/ReentrantReadWriteLock; FIELD field_34798 XZ_COLORS_SIZE I + FIELD field_41610 needsCacheRefresh Z METHOD method_38527 createDefault ()[I METHOD method_38528 get (I)[I ARG 1 y METHOD method_38529 (I)[I ARG 1 y + METHOD method_47894 needsCacheRefresh ()Z + METHOD method_47895 setNeedsCacheRefresh ()V diff --git a/mappings/net/minecraft/client/world/ClientChunkManager.mapping b/mappings/net/minecraft/client/world/ClientChunkManager.mapping index 9f6131fa8e..79c2b62bb4 100644 --- a/mappings/net/minecraft/client/world/ClientChunkManager.mapping +++ b/mappings/net/minecraft/client/world/ClientChunkManager.mapping @@ -23,9 +23,12 @@ CLASS net/minecraft/class_631 net/minecraft/client/world/ClientChunkManager METHOD method_20317 setChunkMapCenter (II)V ARG 1 x ARG 2 z - METHOD method_2859 unload (II)V - ARG 1 chunkX - ARG 2 chunkZ + METHOD method_2859 unload (Lnet/minecraft/class_1923;)V + ARG 1 pos + METHOD method_49630 onChunkBiomeData (IILnet/minecraft/class_2540;)V + ARG 1 x + ARG 2 z + ARG 3 buf CLASS class_3681 ClientChunkMap FIELD field_16251 chunks Ljava/util/concurrent/atomic/AtomicReferenceArray; FIELD field_16252 diameter I diff --git a/mappings/net/minecraft/client/world/ClientWorld.mapping b/mappings/net/minecraft/client/world/ClientWorld.mapping index c335ad188c..5b5a366258 100644 --- a/mappings/net/minecraft/client/world/ClientWorld.mapping +++ b/mappings/net/minecraft/client/world/ClientWorld.mapping @@ -63,7 +63,7 @@ CLASS net/minecraft/class_638 net/minecraft/client/world/ClientWorld ARG 2 colorResolver METHOD method_23782 resetChunkColor (Lnet/minecraft/class_1923;)V ARG 1 chunkPos - METHOD method_23783 getStarBrightness (F)F + METHOD method_23783 getSkyBrightness (F)F ARG 1 tickDelta METHOD method_23784 reloadColor ()V METHOD method_23785 getCloudsColor (F)Lnet/minecraft/class_243; @@ -89,6 +89,7 @@ CLASS net/minecraft/class_638 net/minecraft/client/world/ClientWorld ARG 1 pos ARG 2 state ARG 3 parameters + ARG 4 solidBelow METHOD method_2941 doRandomBlockDisplayTicks (III)V ARG 1 centerX ARG 2 centerY @@ -109,13 +110,6 @@ CLASS net/minecraft/class_638 net/minecraft/client/world/ClientWorld METHOD method_2945 removeEntity (ILnet/minecraft/class_1297$class_5529;)V ARG 1 entityId ARG 2 removalReason - METHOD method_2947 playSound (Lnet/minecraft/class_2338;Lnet/minecraft/class_3414;Lnet/minecraft/class_3419;FFZ)V - ARG 1 pos - ARG 2 sound - ARG 3 category - ARG 4 volume - ARG 5 pitch - ARG 6 useDistance METHOD method_2948 addParticle (Lnet/minecraft/class_2338;Lnet/minecraft/class_2394;Lnet/minecraft/class_265;D)V ARG 1 pos ARG 2 parameters @@ -147,9 +141,6 @@ CLASS net/minecraft/class_638 net/minecraft/client/world/ClientWorld METHOD method_39023 setSimulationDistance (I)V ARG 1 simulationDistance METHOD method_39024 getSimulationDistance ()I - METHOD method_39849 markChunkRenderability (II)V - ARG 1 chunkX - ARG 2 chunkZ METHOD method_41925 getPendingUpdateManager ()Lnet/minecraft/class_7202; METHOD method_41926 processPendingUpdate (Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;Lnet/minecraft/class_243;)V ARG 1 pos @@ -171,6 +162,9 @@ CLASS net/minecraft/class_638 net/minecraft/client/world/ClientWorld ARG 10 pitch ARG 11 useDistance ARG 12 seed + METHOD method_47437 putClientsideMapState (Ljava/lang/String;Lnet/minecraft/class_22;)V + ARG 1 id + ARG 2 state METHOD method_8435 setTimeOfDay (J)V ARG 1 timeOfDay METHOD method_8441 tick (Ljava/util/function/BooleanSupplier;)V diff --git a/mappings/net/minecraft/client/world/GeneratorOptionsHolder.mapping b/mappings/net/minecraft/client/world/GeneratorOptionsHolder.mapping index db9723a6a6..5a32f4d37d 100644 --- a/mappings/net/minecraft/client/world/GeneratorOptionsHolder.mapping +++ b/mappings/net/minecraft/client/world/GeneratorOptionsHolder.mapping @@ -1,15 +1,30 @@ CLASS net/minecraft/class_7193 net/minecraft/client/world/GeneratorOptionsHolder + FIELD comp_1027 dimensionOptionsRegistry Lnet/minecraft/class_2378; + FIELD comp_1029 combinedDynamicRegistries Lnet/minecraft/class_7780; FIELD comp_616 generatorOptions Lnet/minecraft/class_5285; - FIELD comp_618 dynamicRegistryManager Lnet/minecraft/class_5455$class_6890; FIELD comp_619 dataPackContents Lnet/minecraft/class_5350; + METHOD (Lnet/minecraft/class_5285;Lnet/minecraft/class_7723;Lnet/minecraft/class_7780;Lnet/minecraft/class_5350;Lnet/minecraft/class_7712;)V + ARG 1 generatorOptions + ARG 2 selectedDimensions + ARG 3 combinedDynamicRegistries + ARG 4 dataPackContents + ARG 5 dataConfiguration + METHOD (Lnet/minecraft/class_7726;Lnet/minecraft/class_7780;Lnet/minecraft/class_5350;Lnet/minecraft/class_7712;)V + ARG 1 worldGenSettings + ARG 2 combinedDynamicRegistries + ARG 3 dataPackContents + ARG 4 dataConfiguration + METHOD comp_1027 dimensionOptionsRegistry ()Lnet/minecraft/class_2378; + METHOD comp_1029 combinedDynamicRegistries ()Lnet/minecraft/class_7780; METHOD comp_616 generatorOptions ()Lnet/minecraft/class_5285; - METHOD comp_618 dynamicRegistryManager ()Lnet/minecraft/class_5455$class_6890; METHOD comp_619 dataPackContents ()Lnet/minecraft/class_5350; - METHOD method_41864 with (Lnet/minecraft/class_5285;)Lnet/minecraft/class_7193; + METHOD method_41864 with (Lnet/minecraft/class_5285;Lnet/minecraft/class_7723;)Lnet/minecraft/class_7193; ARG 1 generatorOptions - METHOD method_41865 apply (Lnet/minecraft/class_7193$class_7194;)Lnet/minecraft/class_7193; - ARG 1 modifier + ARG 2 selectedDimensions METHOD method_41866 apply (Lnet/minecraft/class_7193$class_7195;)Lnet/minecraft/class_7193; ARG 1 modifier + METHOD method_45689 getCombinedRegistryManager ()Lnet/minecraft/class_5455$class_6890; + METHOD method_45690 apply (Lnet/minecraft/class_7193$class_7194;)Lnet/minecraft/class_7193; + ARG 1 modifier CLASS class_7194 Modifier CLASS class_7195 RegistryAwareModifier diff --git a/mappings/net/minecraft/command/CommandRegistryAccess.mapping b/mappings/net/minecraft/command/CommandRegistryAccess.mapping index 63536639f2..9582724362 100644 --- a/mappings/net/minecraft/command/CommandRegistryAccess.mapping +++ b/mappings/net/minecraft/command/CommandRegistryAccess.mapping @@ -1,30 +1,30 @@ CLASS net/minecraft/class_7157 net/minecraft/command/CommandRegistryAccess - COMMENT A class that creates {@link CommandRegistryWrapper} with ability to set a policy on + COMMENT A class that creates {@link RegistryWrapper} with ability to set a policy on COMMENT how to handle unrecognized tags. COMMENT COMMENT @apiNote You usually do not need to create your own instance; the command registration COMMENT callbacks (such as {@link net.minecraft.server.command.CommandManager} constructor) COMMENT provides an instance with proper configurations. - FIELD field_37820 dynamicRegistryManager Lnet/minecraft/class_5455; - FIELD field_37821 entryListCreationPolicy Lnet/minecraft/class_7157$class_7158; - METHOD (Lnet/minecraft/class_5455;)V - ARG 1 dynamicRegistryManager - METHOD method_41698 setEntryListCreationPolicy (Lnet/minecraft/class_7157$class_7158;)V - COMMENT Sets the policy on how to handle unrecognized tags. - COMMENT - COMMENT

See {@link CommandRegistryAccess.EntryListCreationPolicy} for the description of - COMMENT each policy. - ARG 1 entryListCreationPolicy METHOD method_41699 createWrapper (Lnet/minecraft/class_5321;)Lnet/minecraft/class_7225; COMMENT Creates a registry wrapper that follows the entry list creation policy. ARG 1 registryRef COMMENT the registry key of the registry to wrap + METHOD method_46722 of (Lnet/minecraft/class_7225$class_7874;Lnet/minecraft/class_7699;)Lnet/minecraft/class_7157; + ARG 0 wrapperLookup + ARG 1 enabledFeatures + METHOD method_46723 of (Lnet/minecraft/class_5455;Lnet/minecraft/class_7699;)Lnet/minecraft/class_7157$class_7870; + ARG 0 registryManager + ARG 1 enabledFeatures + CLASS 2 + FIELD field_40912 entryListCreationPolicy Lnet/minecraft/class_7157$class_7158; CLASS class_7158 EntryListCreationPolicy - COMMENT A policy on how to handle a {@link net.minecraft.tag.TagKey} that does not resolve - COMMENT to an existing tag (unrecognized tag) in {@link CommandRegistryWrapper#getEntryList}. + COMMENT A policy on how to handle a {@link net.minecraft.registry.tag.TagKey} that does not resolve + COMMENT to an existing tag (unrecognized tag) in {@link + COMMENT net.minecraft.registry.RegistryWrapper#getOptional(net.minecraft.registry.tag.TagKey)}. FIELD field_37824 Lnet/minecraft/class_7157$class_7158; - COMMENT Creates a new {@link net.minecraft.util.registry.RegistryEntryList}, stores it and returns it. - FIELD field_37825 Lnet/minecraft/class_7157$class_7158; - COMMENT Returns a new, empty {@link net.minecraft.util.registry.RegistryEntryList} every time. + COMMENT Creates a new {@link net.minecraft.registry.entry.RegistryEntryList}, stores it and returns it. FIELD field_37826 Lnet/minecraft/class_7157$class_7158; - COMMENT Returns {@link java.util.Optional#empty()}. + COMMENT Throws an exception. + CLASS class_7870 EntryListCreationPolicySettable + METHOD method_46724 setEntryListCreationPolicy (Lnet/minecraft/class_7157$class_7158;)V + ARG 1 entryListCreationPolicy diff --git a/mappings/net/minecraft/command/CommandRegistryWrapper.mapping b/mappings/net/minecraft/command/CommandRegistryWrapper.mapping deleted file mode 100644 index 56cd1256b6..0000000000 --- a/mappings/net/minecraft/command/CommandRegistryWrapper.mapping +++ /dev/null @@ -1,37 +0,0 @@ -CLASS net/minecraft/class_7225 net/minecraft/command/CommandRegistryWrapper - COMMENT A wrapper of a registry, used in command arguments. - COMMENT - COMMENT

The methods in this class in most cases perform the same as ones defined - COMMENT in {@link Registry}. However, subclasses may have slightly different behaviors - COMMENT to make it easier to handle user-passed arguments. For example, {@link #getEntryList(TagKey)} - COMMENT may return an empty {@link RegistryEntryList} instead of {@link Optional#empty()}. - COMMENT - COMMENT

A wrapper without any special behaviors can be created by calling {@link of(Registry)}. - METHOD method_41700 getEntryList (Lnet/minecraft/class_6862;)Ljava/util/Optional; - COMMENT {@return the entry list for the provided tag} - COMMENT - COMMENT

Implementations have different behaviors for unrecognized tags. The - COMMENT {@linkplain CommandRegistryWrapper.Impl#getEntryList default implementation} - COMMENT returns {@link Optional#empty()}; however, the ones created by - COMMENT {@link CommandRegistryAccess#createWrapper} can create and return a new entry list, or - COMMENT return an empty entry list. - COMMENT - COMMENT @see Registry#getEntryList - COMMENT @see CommandRegistryAccess.EntryListCreationPolicy - ARG 1 tag - METHOD method_42017 streamKeys ()Ljava/util/stream/Stream; - COMMENT {@return a stream of registry keys defined in the wrapped registry} - COMMENT - COMMENT @see Registry#getKeys - METHOD method_42018 of (Lnet/minecraft/class_2378;)Lnet/minecraft/class_7225; - COMMENT {@return a new wrapper for the {@code registry} without any special behaviors} - ARG 0 registry - METHOD method_42019 getEntry (Lnet/minecraft/class_5321;)Ljava/util/Optional; - COMMENT @see Registry#getEntry - ARG 1 key - METHOD method_42020 streamTags ()Ljava/util/stream/Stream; - COMMENT @see Registry#streamTags - CLASS class_7226 Impl - FIELD field_37996 registry Lnet/minecraft/class_2378; - METHOD (Lnet/minecraft/class_2378;)V - ARG 1 registry diff --git a/mappings/net/minecraft/command/CommandSource.mapping b/mappings/net/minecraft/command/CommandSource.mapping index f572b59de6..e526f4afa2 100644 --- a/mappings/net/minecraft/command/CommandSource.mapping +++ b/mappings/net/minecraft/command/CommandSource.mapping @@ -29,6 +29,7 @@ CLASS net/minecraft/class_2172 net/minecraft/command/CommandSource ARG 2 suggestedIdType ARG 3 builder METHOD method_44750 getChatSuggestions ()Ljava/util/Collection; + METHOD method_45549 getEnabledFeatures ()Lnet/minecraft/class_7699; METHOD method_9250 forEachMatching (Ljava/lang/Iterable;Ljava/lang/String;Ljava/lang/String;Ljava/util/function/Function;Ljava/util/function/Consumer;)V ARG 0 candidates ARG 1 remaining @@ -45,7 +46,7 @@ CLASS net/minecraft/class_2172 net/minecraft/command/CommandSource METHOD method_9253 suggestMatching ([Ljava/lang/String;Lcom/mojang/brigadier/suggestion/SuggestionsBuilder;)Ljava/util/concurrent/CompletableFuture; ARG 0 candidates ARG 1 builder - METHOD method_9254 getSoundIds ()Ljava/util/Collection; + METHOD method_9254 getSoundIds ()Ljava/util/stream/Stream; METHOD method_9255 suggestFromIdentifier (Ljava/lang/Iterable;Lcom/mojang/brigadier/suggestion/SuggestionsBuilder;Ljava/util/function/Function;Ljava/util/function/Function;)Ljava/util/concurrent/CompletableFuture; ARG 0 candidates ARG 1 builder diff --git a/mappings/net/minecraft/command/DataCommandStorage.mapping b/mappings/net/minecraft/command/DataCommandStorage.mapping index b7ea7d9466..f49f6cdcab 100644 --- a/mappings/net/minecraft/command/DataCommandStorage.mapping +++ b/mappings/net/minecraft/command/DataCommandStorage.mapping @@ -16,10 +16,10 @@ CLASS net/minecraft/class_4565 net/minecraft/command/DataCommandStorage METHOD method_22547 set (Lnet/minecraft/class_2960;Lnet/minecraft/class_2487;)V ARG 1 id ARG 2 nbt - METHOD method_22549 (Ljava/lang/String;Lnet/minecraft/class_2487;)Lnet/minecraft/class_4565$class_4566; - ARG 2 data - METHOD method_32381 (Ljava/lang/String;Lnet/minecraft/class_2487;)Lnet/minecraft/class_4565$class_4566; - ARG 2 data + METHOD method_52613 (Ljava/lang/String;Lnet/minecraft/class_2487;)Lnet/minecraft/class_4565$class_4566; + ARG 2 nbt + METHOD method_52614 getPersistentStateType (Ljava/lang/String;)Lnet/minecraft/class_18$class_8645; + ARG 1 namespace CLASS class_4566 PersistentState FIELD field_20749 map Ljava/util/Map; FIELD field_31835 CONTENTS_KEY Ljava/lang/String; diff --git a/mappings/net/minecraft/command/EntitySelector.mapping b/mappings/net/minecraft/command/EntitySelector.mapping index 6e2a4a49c0..b913e0036c 100644 --- a/mappings/net/minecraft/command/EntitySelector.mapping +++ b/mappings/net/minecraft/command/EntitySelector.mapping @@ -14,6 +14,7 @@ CLASS net/minecraft/class_2300 net/minecraft/command/EntitySelector FIELD field_10832 entityFilter Lnet/minecraft/class_5575; FIELD field_27774 PASSTHROUGH_FILTER Lnet/minecraft/class_5575; FIELD field_33068 MAX_VALUE I + FIELD field_41524 ARBITRARY Ljava/util/function/BiConsumer; METHOD (IZZLjava/util/function/Predicate;Lnet/minecraft/class_2096$class_2099;Ljava/util/function/Function;Lnet/minecraft/class_238;Ljava/util/function/BiConsumer;ZLjava/lang/String;Ljava/util/UUID;Lnet/minecraft/class_1299;Z)V ARG 1 count ARG 2 includesNonPlayers @@ -29,6 +30,14 @@ CLASS net/minecraft/class_2300 net/minecraft/command/EntitySelector ARG 12 type ARG 13 usesAt METHOD method_35815 usesAt ()Z + METHOD method_45914 (Lnet/minecraft/class_2168;Lnet/minecraft/class_1297;)Z + ARG 1 entity + METHOD method_45915 getUnfilteredEntities (Lnet/minecraft/class_2168;)Ljava/util/List; + ARG 1 source + METHOD method_47802 (Lnet/minecraft/class_243;Ljava/util/List;)V + ARG 0 pos + ARG 1 entities + METHOD method_47803 getAppendLimit ()I METHOD method_9809 getEntity (Lnet/minecraft/class_2168;)Lnet/minecraft/class_1297; ARG 1 source METHOD method_9810 (Lnet/minecraft/class_238;Lnet/minecraft/class_1297;)Z @@ -55,7 +64,7 @@ CLASS net/minecraft/class_2300 net/minecraft/command/EntitySelector METHOD method_9822 getNames (Ljava/util/List;)Lnet/minecraft/class_2561; ARG 0 entities METHOD method_9823 appendEntitiesFromWorld (Ljava/util/List;Lnet/minecraft/class_3218;Lnet/minecraft/class_243;Ljava/util/function/Predicate;)V - ARG 1 result + ARG 1 entities ARG 2 world ARG 3 pos ARG 4 predicate diff --git a/mappings/net/minecraft/command/EntitySelectorOptions.mapping b/mappings/net/minecraft/command/EntitySelectorOptions.mapping index b8b77a637a..4ceff7b2b8 100644 --- a/mappings/net/minecraft/command/EntitySelectorOptions.mapping +++ b/mappings/net/minecraft/command/EntitySelectorOptions.mapping @@ -17,7 +17,7 @@ CLASS net/minecraft/class_2306 net/minecraft/command/EntitySelectorOptions METHOD method_9919 (Lnet/minecraft/class_1299;ZLnet/minecraft/class_1297;)Z ARG 2 entity METHOD method_9920 (Ljava/lang/String;ZLnet/minecraft/class_1297;)Z - ARG 2 reader + ARG 2 readerx METHOD method_9921 (Lnet/minecraft/class_2303;Lcom/mojang/brigadier/suggestion/SuggestionsBuilder;Ljava/util/function/Consumer;)Ljava/util/concurrent/CompletableFuture; ARG 1 builder ARG 2 consumer @@ -79,6 +79,8 @@ CLASS net/minecraft/class_2306 net/minecraft/command/EntitySelectorOptions ARG 0 reader METHOD method_9949 (Lnet/minecraft/class_2303;)Z ARG 0 reader + METHOD method_9950 (Lnet/minecraft/class_6862;ZLnet/minecraft/class_1297;)Z + ARG 2 entity METHOD method_9951 (Lnet/minecraft/class_2303;)V ARG 0 reader METHOD method_9952 (Lnet/minecraft/class_2303;)Z @@ -152,10 +154,13 @@ CLASS net/minecraft/class_2306 net/minecraft/command/EntitySelectorOptions METHOD handle (Lnet/minecraft/class_2303;)V ARG 1 reader CLASS class_2308 SelectorOption - FIELD field_10894 description Lnet/minecraft/class_2561; - FIELD field_10895 handler Lnet/minecraft/class_2306$class_2307; - FIELD field_10896 condition Ljava/util/function/Predicate; + FIELD comp_1063 handler Lnet/minecraft/class_2306$class_2307; + FIELD comp_1064 condition Ljava/util/function/Predicate; + FIELD comp_1065 description Lnet/minecraft/class_2561; METHOD (Lnet/minecraft/class_2306$class_2307;Ljava/util/function/Predicate;Lnet/minecraft/class_2561;)V ARG 1 handler ARG 2 condition ARG 3 description + METHOD comp_1063 handler ()Lnet/minecraft/class_2306$class_2307; + METHOD comp_1064 condition ()Ljava/util/function/Predicate; + METHOD comp_1065 description ()Lnet/minecraft/class_2561; diff --git a/mappings/net/minecraft/command/EntitySelectorReader.mapping b/mappings/net/minecraft/command/EntitySelectorReader.mapping index e74010cb5d..d8568f4e8c 100644 --- a/mappings/net/minecraft/command/EntitySelectorReader.mapping +++ b/mappings/net/minecraft/command/EntitySelectorReader.mapping @@ -18,7 +18,6 @@ CLASS net/minecraft/class_2303 net/minecraft/command/EntitySelectorReader FIELD field_10853 UNKNOWN_SELECTOR_EXCEPTION Lcom/mojang/brigadier/exceptions/DynamicCommandExceptionType; FIELD field_10854 selectsName Z FIELD field_10855 VALUELESS_EXCEPTION Lcom/mojang/brigadier/exceptions/DynamicCommandExceptionType; - FIELD field_10856 ARBITRARY Ljava/util/function/BiConsumer; FIELD field_10857 x Ljava/lang/Double; FIELD field_10858 limit I FIELD field_10859 yawRange Lnet/minecraft/class_2152; @@ -73,9 +72,6 @@ CLASS net/minecraft/class_2303 net/minecraft/command/EntitySelectorReader ARG 1 builder ARG 2 consumer METHOD method_9835 getReader ()Lcom/mojang/brigadier/StringReader; - METHOD method_9836 (Lnet/minecraft/class_243;Ljava/util/List;)V - ARG 0 pos - ARG 1 entities METHOD method_9837 excludesGameMode ()Z METHOD method_9838 (Lnet/minecraft/class_1297;)Z ARG 0 entity diff --git a/mappings/net/minecraft/command/FloatRangeArgument.mapping b/mappings/net/minecraft/command/FloatRangeArgument.mapping index 4cb5a73fb1..1a12a1ac5d 100644 --- a/mappings/net/minecraft/command/FloatRangeArgument.mapping +++ b/mappings/net/minecraft/command/FloatRangeArgument.mapping @@ -1,6 +1,4 @@ CLASS net/minecraft/class_2152 net/minecraft/command/FloatRangeArgument - FIELD field_9778 min Ljava/lang/Float; - FIELD field_9779 max Ljava/lang/Float; FIELD field_9780 ANY Lnet/minecraft/class_2152; FIELD field_9781 ONLY_INTS_EXCEPTION Lcom/mojang/brigadier/exceptions/SimpleCommandExceptionType; METHOD (Ljava/lang/Float;Ljava/lang/Float;)V @@ -37,8 +35,6 @@ CLASS net/minecraft/class_2152 net/minecraft/command/FloatRangeArgument 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 ARG 1 allowFloats - METHOD method_9177 getMax ()Ljava/lang/Float; diff --git a/mappings/net/minecraft/command/argument/BlockArgumentParser.mapping b/mappings/net/minecraft/command/argument/BlockArgumentParser.mapping index 37f948c719..057a98e945 100644 --- a/mappings/net/minecraft/command/argument/BlockArgumentParser.mapping +++ b/mappings/net/minecraft/command/argument/BlockArgumentParser.mapping @@ -35,12 +35,8 @@ CLASS net/minecraft/class_2259 net/minecraft/command/argument/BlockArgumentParse ARG 0 registryWrapper ARG 1 reader ARG 2 allowSnbt - METHOD method_41956 block (Lnet/minecraft/class_2378;Lcom/mojang/brigadier/StringReader;Z)Lnet/minecraft/class_2259$class_7211; - ARG 0 registry - ARG 1 reader - ARG 2 allowSnbt - METHOD method_41957 block (Lnet/minecraft/class_2378;Ljava/lang/String;Z)Lnet/minecraft/class_2259$class_7211; - ARG 0 registry + METHOD method_41957 block (Lnet/minecraft/class_7225;Ljava/lang/String;Z)Lnet/minecraft/class_2259$class_7211; + ARG 0 registryWrapper ARG 1 string ARG 2 allowSnbt METHOD method_41958 (Ljava/lang/Object;)Lcom/mojang/brigadier/Message; @@ -51,12 +47,8 @@ CLASS net/minecraft/class_2259 net/minecraft/command/argument/BlockArgumentParse ARG 0 registryWrapper ARG 1 reader ARG 2 allowSnbt - METHOD method_41961 blockOrTag (Lnet/minecraft/class_2378;Lcom/mojang/brigadier/StringReader;Z)Lcom/mojang/datafixers/util/Either; - ARG 0 registry - ARG 1 reader - ARG 2 allowSnbt - METHOD method_41962 blockOrTag (Lnet/minecraft/class_2378;Ljava/lang/String;Z)Lcom/mojang/datafixers/util/Either; - ARG 0 registry + METHOD method_41962 blockOrTag (Lnet/minecraft/class_7225;Ljava/lang/String;Z)Lcom/mojang/datafixers/util/Either; + ARG 0 registryWrapper ARG 1 string ARG 2 allowSnbt METHOD method_41963 suggestBlockId (Lcom/mojang/brigadier/suggestion/SuggestionsBuilder;)Ljava/util/concurrent/CompletableFuture; diff --git a/mappings/net/minecraft/command/argument/BlockPosArgumentType.mapping b/mappings/net/minecraft/command/argument/BlockPosArgumentType.mapping index ef1825a796..556a5bb5bf 100644 --- a/mappings/net/minecraft/command/argument/BlockPosArgumentType.mapping +++ b/mappings/net/minecraft/command/argument/BlockPosArgumentType.mapping @@ -6,10 +6,17 @@ CLASS net/minecraft/class_2262 net/minecraft/command/argument/BlockPosArgumentTy METHOD listSuggestions (Lcom/mojang/brigadier/context/CommandContext;Lcom/mojang/brigadier/suggestion/SuggestionsBuilder;)Ljava/util/concurrent/CompletableFuture; ARG 1 context ARG 2 builder + METHOD method_48298 getLoadedBlockPos (Lcom/mojang/brigadier/context/CommandContext;Lnet/minecraft/class_3218;Ljava/lang/String;)Lnet/minecraft/class_2338; + ARG 0 context + ARG 1 world + ARG 2 name + METHOD method_48299 getBlockPos (Lcom/mojang/brigadier/context/CommandContext;Ljava/lang/String;)Lnet/minecraft/class_2338; + ARG 0 context + ARG 1 name METHOD method_9696 getLoadedBlockPos (Lcom/mojang/brigadier/context/CommandContext;Ljava/lang/String;)Lnet/minecraft/class_2338; ARG 0 context ARG 1 name - METHOD method_9697 getBlockPos (Lcom/mojang/brigadier/context/CommandContext;Ljava/lang/String;)Lnet/minecraft/class_2338; + METHOD method_9697 getValidBlockPos (Lcom/mojang/brigadier/context/CommandContext;Ljava/lang/String;)Lnet/minecraft/class_2338; ARG 0 context ARG 1 name METHOD method_9698 blockPos ()Lnet/minecraft/class_2262; diff --git a/mappings/net/minecraft/command/argument/DecoratableArgumentList.mapping b/mappings/net/minecraft/command/argument/DecoratableArgumentList.mapping deleted file mode 100644 index 641daec1a9..0000000000 --- a/mappings/net/minecraft/command/argument/DecoratableArgumentList.mapping +++ /dev/null @@ -1,17 +0,0 @@ -CLASS net/minecraft/class_7644 net/minecraft/command/argument/DecoratableArgumentList - COMMENT A list of parsed {@linkplain DecoratableArgumentType decoratable arguments}. - COMMENT - COMMENT @see #of - METHOD method_45043 of (Lcom/mojang/brigadier/ParseResults;)Lnet/minecraft/class_7644; - COMMENT {@return a new instance of this list from {@code parseResults}} - ARG 0 parseResults - METHOD method_45044 collectDecoratableArguments (Lcom/mojang/brigadier/context/CommandContextBuilder;)Ljava/util/List; - ARG 0 contextBuilder - METHOD method_45045 contains (Lcom/mojang/brigadier/tree/CommandNode;)Z - COMMENT {@return whether {@code node} is in this list of parsed decorated arguments} - ARG 1 node - CLASS class_7645 ParsedArgument - COMMENT A parsed decoratable argument, also used as the entry of {@link DecoratableArgumentList}. - FIELD comp_977 argumentType Lnet/minecraft/class_7517; - METHOD comp_977 argumentType ()Lnet/minecraft/class_7517; - METHOD method_45046 getNodeName ()Ljava/lang/String; diff --git a/mappings/net/minecraft/command/argument/DecoratableArgumentType.mapping b/mappings/net/minecraft/command/argument/DecoratableArgumentType.mapping deleted file mode 100644 index c9e15bfac3..0000000000 --- a/mappings/net/minecraft/command/argument/DecoratableArgumentType.mapping +++ /dev/null @@ -1,8 +0,0 @@ -CLASS net/minecraft/class_7517 net/minecraft/command/argument/DecoratableArgumentType - METHOD method_44258 decorate (Lnet/minecraft/class_2168;Ljava/lang/Object;)Ljava/util/concurrent/CompletableFuture; - ARG 1 source - ARG 2 format - METHOD method_44261 getFormatClass ()Ljava/lang/Class; - METHOD method_44282 decorate (Lnet/minecraft/class_2168;Lcom/mojang/brigadier/context/ParsedArgument;)Ljava/util/concurrent/CompletableFuture; - ARG 1 source - ARG 2 parsedValue diff --git a/mappings/net/minecraft/command/argument/EnchantmentArgumentType.mapping b/mappings/net/minecraft/command/argument/EnchantmentArgumentType.mapping deleted file mode 100644 index 5d811c3bfb..0000000000 --- a/mappings/net/minecraft/command/argument/EnchantmentArgumentType.mapping +++ /dev/null @@ -1,14 +0,0 @@ -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; - ARG 1 context - ARG 2 builder - METHOD method_9333 (Ljava/lang/Object;)Lcom/mojang/brigadier/Message; - ARG 0 id - 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 enchantment ()Lnet/minecraft/class_2194; - METHOD parse (Lcom/mojang/brigadier/StringReader;)Ljava/lang/Object; - ARG 1 reader diff --git a/mappings/net/minecraft/command/argument/EntitySummonArgumentType.mapping b/mappings/net/minecraft/command/argument/EntitySummonArgumentType.mapping deleted file mode 100644 index 6c0e94b10a..0000000000 --- a/mappings/net/minecraft/command/argument/EntitySummonArgumentType.mapping +++ /dev/null @@ -1,13 +0,0 @@ -CLASS net/minecraft/class_2188 net/minecraft/command/argument/EntitySummonArgumentType - FIELD field_9865 EXAMPLES Ljava/util/Collection; - FIELD field_9866 NOT_FOUND_EXCEPTION Lcom/mojang/brigadier/exceptions/DynamicCommandExceptionType; - METHOD method_9322 getEntitySummon (Lcom/mojang/brigadier/context/CommandContext;Ljava/lang/String;)Lnet/minecraft/class_2960; - ARG 0 context - ARG 1 name - METHOD method_9323 (Ljava/lang/Object;)Lcom/mojang/brigadier/Message; - ARG 0 id - METHOD method_9324 entitySummon ()Lnet/minecraft/class_2188; - METHOD method_9326 validate (Lnet/minecraft/class_2960;)Lnet/minecraft/class_2960; - ARG 0 id - METHOD parse (Lcom/mojang/brigadier/StringReader;)Ljava/lang/Object; - ARG 1 reader diff --git a/mappings/net/minecraft/command/argument/EnumArgumentType.mapping b/mappings/net/minecraft/command/argument/EnumArgumentType.mapping index 07bba39672..1895f868d8 100644 --- a/mappings/net/minecraft/command/argument/EnumArgumentType.mapping +++ b/mappings/net/minecraft/command/argument/EnumArgumentType.mapping @@ -14,5 +14,7 @@ CLASS net/minecraft/class_7485 net/minecraft/command/argument/EnumArgumentType ARG 0 enum_ METHOD method_44095 (Ljava/lang/Object;)Lcom/mojang/brigadier/Message; ARG 0 value + METHOD method_49545 transformValueName (Ljava/lang/String;)Ljava/lang/String; + ARG 1 name METHOD parse (Lcom/mojang/brigadier/StringReader;)Ljava/lang/Object; ARG 1 reader diff --git a/mappings/net/minecraft/command/argument/GameModeArgumentType.mapping b/mappings/net/minecraft/command/argument/GameModeArgumentType.mapping new file mode 100644 index 0000000000..f96b309dc4 --- /dev/null +++ b/mappings/net/minecraft/command/argument/GameModeArgumentType.mapping @@ -0,0 +1,15 @@ +CLASS net/minecraft/class_7918 net/minecraft/command/argument/GameModeArgumentType + FIELD field_41088 EXAMPLES Ljava/util/Collection; + FIELD field_41089 VALUES [Lnet/minecraft/class_1934; + FIELD field_41090 INVALID_GAME_MODE_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_47383 gameMode ()Lnet/minecraft/class_7918; + METHOD method_47385 getGameMode (Lcom/mojang/brigadier/context/CommandContext;Ljava/lang/String;)Lnet/minecraft/class_1934; + ARG 0 context + ARG 1 name + METHOD method_47386 (Ljava/lang/Object;)Lcom/mojang/brigadier/Message; + ARG 0 gameMode + METHOD parse (Lcom/mojang/brigadier/StringReader;)Ljava/lang/Object; + ARG 1 reader diff --git a/mappings/net/minecraft/command/argument/HeightmapArgumentType.mapping b/mappings/net/minecraft/command/argument/HeightmapArgumentType.mapping new file mode 100644 index 0000000000..59204b2df3 --- /dev/null +++ b/mappings/net/minecraft/command/argument/HeightmapArgumentType.mapping @@ -0,0 +1,9 @@ +CLASS net/minecraft/class_8199 net/minecraft/command/argument/HeightmapArgumentType + FIELD field_42994 HEIGHTMAP_CODEC Lcom/mojang/serialization/Codec; + METHOD method_49542 heightmap ()Lnet/minecraft/class_8199; + METHOD method_49544 getHeightmap (Lcom/mojang/brigadier/context/CommandContext;Ljava/lang/String;)Lnet/minecraft/class_2902$class_2903; + ARG 0 context + ARG 1 id + METHOD method_49546 getHeightmapTypes ()[Lnet/minecraft/class_2902$class_2903; + METHOD method_49547 (Ljava/lang/String;)Ljava/lang/String; + ARG 0 name diff --git a/mappings/net/minecraft/command/argument/IdentifierArgumentType.mapping b/mappings/net/minecraft/command/argument/IdentifierArgumentType.mapping index d7180ca423..588cf0df08 100644 --- a/mappings/net/minecraft/command/argument/IdentifierArgumentType.mapping +++ b/mappings/net/minecraft/command/argument/IdentifierArgumentType.mapping @@ -12,13 +12,13 @@ CLASS net/minecraft/class_2232 net/minecraft/command/argument/IdentifierArgument METHOD method_32688 getItemModifierArgument (Lcom/mojang/brigadier/context/CommandContext;Ljava/lang/String;)Lnet/minecraft/class_117; ARG 0 context ARG 1 argumentName - METHOD method_9439 getAdvancementArgument (Lcom/mojang/brigadier/context/CommandContext;Ljava/lang/String;)Lnet/minecraft/class_161; + METHOD method_9439 getAdvancementArgument (Lcom/mojang/brigadier/context/CommandContext;Ljava/lang/String;)Lnet/minecraft/class_8779; ARG 0 context ARG 1 argumentName METHOD method_9440 (Ljava/lang/Object;)Lcom/mojang/brigadier/Message; ARG 0 id METHOD method_9441 identifier ()Lnet/minecraft/class_2232; - METHOD method_9442 getRecipeArgument (Lcom/mojang/brigadier/context/CommandContext;Ljava/lang/String;)Lnet/minecraft/class_1860; + METHOD method_9442 getRecipeArgument (Lcom/mojang/brigadier/context/CommandContext;Ljava/lang/String;)Lnet/minecraft/class_8786; ARG 0 context ARG 1 argumentName METHOD method_9443 getIdentifier (Lcom/mojang/brigadier/context/CommandContext;Ljava/lang/String;)Lnet/minecraft/class_2960; diff --git a/mappings/net/minecraft/command/argument/MessageArgumentType.mapping b/mappings/net/minecraft/command/argument/MessageArgumentType.mapping index b3e328e991..022bc4e3b2 100644 --- a/mappings/net/minecraft/command/argument/MessageArgumentType.mapping +++ b/mappings/net/minecraft/command/argument/MessageArgumentType.mapping @@ -1,14 +1,22 @@ CLASS net/minecraft/class_2196 net/minecraft/command/argument/MessageArgumentType - FIELD field_39422 LOGGER Lorg/slf4j/Logger; FIELD field_9876 EXAMPLES Ljava/util/Collection; - METHOD method_43770 getSignedMessage (Lcom/mojang/brigadier/context/CommandContext;Ljava/lang/String;)Lnet/minecraft/class_2196$class_7515; + METHOD method_45562 getSignedMessage (Lcom/mojang/brigadier/context/CommandContext;Ljava/lang/String;Ljava/util/function/Consumer;)V ARG 0 context ARG 1 name - METHOD method_44259 (Lnet/minecraft/class_2168;Ljava/lang/Throwable;)Ljava/lang/Object; - ARG 1 throwable - METHOD method_44260 handleResolvingFailure (Lnet/minecraft/class_2168;Ljava/util/concurrent/CompletableFuture;)V + ARG 2 callback + METHOD method_45563 filterText (Lnet/minecraft/class_2168;Lnet/minecraft/class_7471;)Ljava/util/concurrent/CompletableFuture; ARG 0 source - ARG 1 future + ARG 1 message + METHOD method_45564 (Ljava/util/concurrent/CompletableFuture;Lnet/minecraft/class_7471;Lnet/minecraft/class_2561;Ljava/util/function/Consumer;Ljava/util/concurrent/Executor;)Ljava/util/concurrent/CompletableFuture; + ARG 4 executor + METHOD method_45566 chain (Ljava/util/function/Consumer;Lnet/minecraft/class_2168;Lnet/minecraft/class_7471;)V + ARG 0 callback + ARG 1 source + ARG 2 message + METHOD method_45569 chainUnsigned (Ljava/util/function/Consumer;Lnet/minecraft/class_2168;Lnet/minecraft/class_7471;)V + ARG 0 callback + ARG 1 source + ARG 2 message METHOD method_9339 getMessage (Lcom/mojang/brigadier/context/CommandContext;Ljava/lang/String;)Lnet/minecraft/class_2561; ARG 0 context ARG 1 name @@ -23,8 +31,6 @@ CLASS net/minecraft/class_2196 net/minecraft/command/argument/MessageArgumentTyp ARG 2 selectors METHOD method_35691 getContents ()Ljava/lang/String; METHOD method_35692 getSelectors ()[Lnet/minecraft/class_2196$class_2198; - METHOD method_44267 decorate (Lnet/minecraft/class_2168;)Ljava/util/concurrent/CompletableFuture; - ARG 1 source METHOD method_44268 format (Lnet/minecraft/class_2168;)Lnet/minecraft/class_2561; ARG 1 source METHOD method_9341 format (Lnet/minecraft/class_2168;Z)Lnet/minecraft/class_2561; @@ -46,20 +52,3 @@ CLASS net/minecraft/class_2196 net/minecraft/command/argument/MessageArgumentTyp METHOD method_9344 getEnd ()I METHOD method_9345 format (Lnet/minecraft/class_2168;)Lnet/minecraft/class_2561; ARG 1 source - CLASS class_7515 SignedMessage - METHOD method_44262 decorate (Lnet/minecraft/class_2168;Ljava/util/function/Consumer;)V - ARG 1 source - ARG 2 callback - METHOD method_44806 sendHeader (Lnet/minecraft/class_2168;)V - COMMENT Sends the message's header to all players. - COMMENT - COMMENT

This should be called if the message could not be sent due to an exception. - COMMENT See {@link net.minecraft.server.command.MessageCommand} for an example. - ARG 1 source - METHOD method_44807 (Lnet/minecraft/class_2168;Lnet/minecraft/class_7471;)V - ARG 1 message - METHOD method_44808 filterText (Lnet/minecraft/class_2168;Ljava/lang/String;)Ljava/util/concurrent/CompletableFuture; - ARG 1 source - ARG 2 text - METHOD method_45070 (Ljava/util/concurrent/CompletableFuture;Ljava/util/concurrent/CompletableFuture;Ljava/util/function/Consumer;Ljava/lang/Void;)V - ARG 3 void_ diff --git a/mappings/net/minecraft/command/argument/NbtPathArgumentType.mapping b/mappings/net/minecraft/command/argument/NbtPathArgumentType.mapping index 908da63abf..93b2fb62dc 100644 --- a/mappings/net/minecraft/command/argument/NbtPathArgumentType.mapping +++ b/mappings/net/minecraft/command/argument/NbtPathArgumentType.mapping @@ -4,9 +4,17 @@ CLASS net/minecraft/class_2203 net/minecraft/command/argument/NbtPathArgumentTyp FIELD field_32184 LEFT_CURLY_BRACKET C FIELD field_32185 RIGHT_CURLY_BRACKET C FIELD field_32186 DOUBLE_QUOTE C + FIELD field_41706 TOO_DEEP_EXCEPTION Lcom/mojang/brigadier/exceptions/SimpleCommandExceptionType; + FIELD field_41708 EXPECTED_LIST_EXCEPTION Lcom/mojang/brigadier/exceptions/DynamicCommandExceptionType; + FIELD field_41709 INVALID_INDEX_EXCEPTION Lcom/mojang/brigadier/exceptions/DynamicCommandExceptionType; + FIELD field_44920 SINGLE_QUOTE C FIELD field_9898 EXAMPLES Ljava/util/Collection; FIELD field_9899 NOTHING_FOUND_EXCEPTION Lcom/mojang/brigadier/exceptions/DynamicCommandExceptionType; FIELD field_9900 INVALID_PATH_NODE_EXCEPTION Lcom/mojang/brigadier/exceptions/SimpleCommandExceptionType; + METHOD method_47969 (Ljava/lang/Object;)Lcom/mojang/brigadier/Message; + ARG 0 index + METHOD method_47970 (Ljava/lang/Object;)Lcom/mojang/brigadier/Message; + ARG 0 nbt METHOD method_9352 readCompoundChildNode (Lcom/mojang/brigadier/StringReader;Ljava/lang/String;)Lnet/minecraft/class_2203$class_2210; ARG 0 reader ARG 1 name @@ -64,14 +72,19 @@ CLASS net/minecraft/class_2203 net/minecraft/command/argument/NbtPathArgumentTyp METHOD method_35722 put (Lnet/minecraft/class_2520;Lnet/minecraft/class_2520;)I ARG 1 element ARG 2 source + METHOD method_47971 getDepth ()I + METHOD method_47972 insert (ILnet/minecraft/class_2487;Ljava/util/List;)I + ARG 1 index + ARG 2 compound + ARG 3 elements + METHOD method_47975 isTooDeep (Lnet/minecraft/class_2520;I)Z + ARG 0 element + ARG 1 depth METHOD method_9366 get (Lnet/minecraft/class_2520;)Ljava/util/List; ARG 1 element METHOD method_9367 getOrInit (Lnet/minecraft/class_2520;Ljava/util/function/Supplier;)Ljava/util/List; ARG 1 element ARG 2 source - METHOD method_9368 put (Lnet/minecraft/class_2520;Ljava/util/function/Supplier;)I - ARG 1 element - ARG 2 source METHOD method_9369 getTerminals (Lnet/minecraft/class_2520;)Ljava/util/List; ARG 1 start METHOD method_9370 (Ljava/lang/Integer;Ljava/lang/Integer;)Ljava/lang/Integer; @@ -82,8 +95,6 @@ CLASS net/minecraft/class_2203 net/minecraft/command/argument/NbtPathArgumentTyp ARG 1 operation METHOD method_9372 remove (Lnet/minecraft/class_2520;)I ARG 1 element - METHOD method_9373 (Lnet/minecraft/class_2203$class_2210;Ljava/util/function/Supplier;Lnet/minecraft/class_2520;)Ljava/lang/Integer; - ARG 2 nbt METHOD method_9374 count (Lnet/minecraft/class_2520;)I ARG 1 element METHOD method_9375 createNothingFoundException (Lnet/minecraft/class_2203$class_2210;)Lcom/mojang/brigadier/exceptions/CommandSyntaxException; diff --git a/mappings/net/minecraft/command/argument/ParticleEffectArgumentType.mapping b/mappings/net/minecraft/command/argument/ParticleEffectArgumentType.mapping index 2b4d0fb2ba..c1f7e860a3 100644 --- a/mappings/net/minecraft/command/argument/ParticleEffectArgumentType.mapping +++ b/mappings/net/minecraft/command/argument/ParticleEffectArgumentType.mapping @@ -1,12 +1,20 @@ CLASS net/minecraft/class_2223 net/minecraft/command/argument/ParticleEffectArgumentType + FIELD field_40383 registryWrapper Lnet/minecraft/class_7225; FIELD field_9935 EXAMPLES Ljava/util/Collection; FIELD field_9936 UNKNOWN_PARTICLE_EXCEPTION Lcom/mojang/brigadier/exceptions/DynamicCommandExceptionType; + METHOD (Lnet/minecraft/class_7157;)V + ARG 1 registryAccess 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 particleEffect ()Lnet/minecraft/class_2223; - METHOD method_9418 readParameters (Lcom/mojang/brigadier/StringReader;)Lnet/minecraft/class_2394; + METHOD method_45583 getType (Lcom/mojang/brigadier/StringReader;Lnet/minecraft/class_7225;)Lnet/minecraft/class_2396; ARG 0 reader + ARG 1 registryWrapper + METHOD method_9417 particleEffect (Lnet/minecraft/class_7157;)Lnet/minecraft/class_2223; + ARG 0 registryAccess + METHOD method_9418 readParameters (Lcom/mojang/brigadier/StringReader;Lnet/minecraft/class_7225;)Lnet/minecraft/class_2394; + ARG 0 reader + ARG 1 registryWrapper METHOD method_9419 (Ljava/lang/Object;)Lcom/mojang/brigadier/Message; ARG 0 id METHOD method_9420 readParameters (Lcom/mojang/brigadier/StringReader;Lnet/minecraft/class_2396;)Lnet/minecraft/class_2394; diff --git a/mappings/net/minecraft/command/argument/RegistryEntryArgumentType.mapping b/mappings/net/minecraft/command/argument/RegistryEntryArgumentType.mapping new file mode 100644 index 0000000000..ec029b3bdd --- /dev/null +++ b/mappings/net/minecraft/command/argument/RegistryEntryArgumentType.mapping @@ -0,0 +1,57 @@ +CLASS net/minecraft/class_7733 net/minecraft/command/argument/RegistryEntryArgumentType + FIELD field_40401 NOT_FOUND_EXCEPTION Lcom/mojang/brigadier/exceptions/Dynamic2CommandExceptionType; + FIELD field_40402 INVALID_TYPE_EXCEPTION Lcom/mojang/brigadier/exceptions/Dynamic3CommandExceptionType; + FIELD field_40403 EXAMPLES Ljava/util/Collection; + FIELD field_40404 NOT_SUMMONABLE_EXCEPTION Lcom/mojang/brigadier/exceptions/DynamicCommandExceptionType; + FIELD field_40405 registryRef Lnet/minecraft/class_5321; + FIELD field_40406 registryWrapper Lnet/minecraft/class_7225; + METHOD (Lnet/minecraft/class_7157;Lnet/minecraft/class_5321;)V + ARG 1 registryAccess + ARG 2 registryRef + METHOD listSuggestions (Lcom/mojang/brigadier/context/CommandContext;Lcom/mojang/brigadier/suggestion/SuggestionsBuilder;)Ljava/util/concurrent/CompletableFuture; + ARG 1 context + ARG 2 builder + METHOD method_45601 getEntityAttribute (Lcom/mojang/brigadier/context/CommandContext;Ljava/lang/String;)Lnet/minecraft/class_6880$class_6883; + ARG 0 context + ARG 1 name + METHOD method_45602 getRegistryEntry (Lcom/mojang/brigadier/context/CommandContext;Ljava/lang/String;Lnet/minecraft/class_5321;)Lnet/minecraft/class_6880$class_6883; + ARG 0 context + ARG 1 name + ARG 2 registryRef + METHOD method_45603 registryEntry (Lnet/minecraft/class_7157;Lnet/minecraft/class_5321;)Lnet/minecraft/class_7733; + ARG 0 registryAccess + ARG 1 registryRef + METHOD method_45604 (Ljava/lang/Object;)Lcom/mojang/brigadier/Message; + ARG 0 id + METHOD method_45605 (Ljava/lang/Object;Ljava/lang/Object;)Lcom/mojang/brigadier/Message; + ARG 0 element + ARG 1 type + METHOD method_45606 (Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Lcom/mojang/brigadier/Message; + ARG 0 element + ARG 1 type + ARG 2 expectedType + METHOD method_45607 getConfiguredFeature (Lcom/mojang/brigadier/context/CommandContext;Ljava/lang/String;)Lnet/minecraft/class_6880$class_6883; + ARG 0 context + ARG 1 name + METHOD method_45608 getStructure (Lcom/mojang/brigadier/context/CommandContext;Ljava/lang/String;)Lnet/minecraft/class_6880$class_6883; + ARG 0 context + ARG 1 name + METHOD method_45609 getEntityType (Lcom/mojang/brigadier/context/CommandContext;Ljava/lang/String;)Lnet/minecraft/class_6880$class_6883; + ARG 0 context + ARG 1 name + METHOD method_45610 getSummonableEntityType (Lcom/mojang/brigadier/context/CommandContext;Ljava/lang/String;)Lnet/minecraft/class_6880$class_6883; + ARG 0 context + ARG 1 name + METHOD method_45611 getStatusEffect (Lcom/mojang/brigadier/context/CommandContext;Ljava/lang/String;)Lnet/minecraft/class_6880$class_6883; + ARG 0 context + ARG 1 name + METHOD method_45612 getEnchantment (Lcom/mojang/brigadier/context/CommandContext;Ljava/lang/String;)Lnet/minecraft/class_6880$class_6883; + ARG 0 context + ARG 1 name + METHOD parse (Lcom/mojang/brigadier/StringReader;)Ljava/lang/Object; + ARG 1 reader + CLASS class_7734 Serializer + CLASS class_7735 Properties + FIELD field_40408 registryRef Lnet/minecraft/class_5321; + METHOD (Lnet/minecraft/class_7733$class_7734;Lnet/minecraft/class_5321;)V + ARG 2 registryRef diff --git a/mappings/net/minecraft/command/argument/RegistryEntryPredicateArgumentType.mapping b/mappings/net/minecraft/command/argument/RegistryEntryPredicateArgumentType.mapping new file mode 100644 index 0000000000..67414f19b7 --- /dev/null +++ b/mappings/net/minecraft/command/argument/RegistryEntryPredicateArgumentType.mapping @@ -0,0 +1,48 @@ +CLASS net/minecraft/class_7737 net/minecraft/command/argument/RegistryEntryPredicateArgumentType + FIELD field_40417 EXAMPLES Ljava/util/Collection; + FIELD field_40418 NOT_FOUND_EXCEPTION Lcom/mojang/brigadier/exceptions/Dynamic2CommandExceptionType; + FIELD field_40419 WRONG_TYPE_EXCEPTION Lcom/mojang/brigadier/exceptions/Dynamic3CommandExceptionType; + FIELD field_40420 registryWrapper Lnet/minecraft/class_7225; + FIELD field_40421 registryRef Lnet/minecraft/class_5321; + METHOD (Lnet/minecraft/class_7157;Lnet/minecraft/class_5321;)V + ARG 1 registryAccess + ARG 2 registryRef + METHOD listSuggestions (Lcom/mojang/brigadier/context/CommandContext;Lcom/mojang/brigadier/suggestion/SuggestionsBuilder;)Ljava/util/concurrent/CompletableFuture; + ARG 1 context + ARG 2 builder + METHOD method_45632 (Lnet/minecraft/class_5321;Lnet/minecraft/class_6880$class_6883;)Lcom/mojang/brigadier/exceptions/CommandSyntaxException; + ARG 1 entry + METHOD method_45633 (Lnet/minecraft/class_5321;Lnet/minecraft/class_6885$class_6888;)Lcom/mojang/brigadier/exceptions/CommandSyntaxException; + ARG 1 entryList + METHOD method_45636 getRegistryEntryPredicate (Lcom/mojang/brigadier/context/CommandContext;Ljava/lang/String;Lnet/minecraft/class_5321;)Lnet/minecraft/class_7737$class_7741; + ARG 0 context + ARG 1 name + ARG 2 registryRef + METHOD method_45637 registryEntryPredicate (Lnet/minecraft/class_7157;Lnet/minecraft/class_5321;)Lnet/minecraft/class_7737; + ARG 0 registryRef + ARG 1 registryAccess + METHOD method_45639 (Ljava/lang/Object;Ljava/lang/Object;)Lcom/mojang/brigadier/Message; + ARG 0 tag + ARG 1 type + METHOD method_45640 (Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Lcom/mojang/brigadier/Message; + ARG 0 tag + ARG 1 type + ARG 2 expectedType + METHOD parse (Lcom/mojang/brigadier/StringReader;)Ljava/lang/Object; + ARG 1 reader + CLASS class_7738 Serializer + CLASS class_7739 Properties + FIELD field_40423 registryRef Lnet/minecraft/class_5321; + METHOD (Lnet/minecraft/class_7737$class_7738;Lnet/minecraft/class_5321;)V + ARG 2 registryRef + CLASS class_7740 EntryBased + METHOD test (Ljava/lang/Object;)Z + ARG 1 entry + CLASS class_7741 EntryPredicate + METHOD method_45647 getEntry ()Lcom/mojang/datafixers/util/Either; + METHOD method_45648 tryCast (Lnet/minecraft/class_5321;)Ljava/util/Optional; + ARG 1 registryRef + METHOD method_45650 asString ()Ljava/lang/String; + CLASS class_7742 TagBased + METHOD test (Ljava/lang/Object;)Z + ARG 1 entry diff --git a/mappings/net/minecraft/command/argument/RegistryKeyArgumentType.mapping b/mappings/net/minecraft/command/argument/RegistryKeyArgumentType.mapping index 1556f48f67..f260cc249d 100644 --- a/mappings/net/minecraft/command/argument/RegistryKeyArgumentType.mapping +++ b/mappings/net/minecraft/command/argument/RegistryKeyArgumentType.mapping @@ -1,6 +1,5 @@ CLASS net/minecraft/class_7079 net/minecraft/command/argument/RegistryKeyArgumentType FIELD field_37269 EXAMPLES Ljava/util/Collection; - FIELD field_37270 UNKNOWN_ATTRIBUTE_EXCEPTION Lcom/mojang/brigadier/exceptions/DynamicCommandExceptionType; FIELD field_37271 INVALID_FEATURE_EXCEPTION Lcom/mojang/brigadier/exceptions/DynamicCommandExceptionType; FIELD field_37272 registryRef Lnet/minecraft/class_5321; FIELD field_39191 INVALID_STRUCTURE_EXCEPTION Lcom/mojang/brigadier/exceptions/DynamicCommandExceptionType; @@ -10,9 +9,6 @@ CLASS net/minecraft/class_7079 net/minecraft/command/argument/RegistryKeyArgumen METHOD listSuggestions (Lcom/mojang/brigadier/context/CommandContext;Lcom/mojang/brigadier/suggestion/SuggestionsBuilder;)Ljava/util/concurrent/CompletableFuture; ARG 1 context ARG 2 builder - METHOD method_41219 getAttribute (Lcom/mojang/brigadier/context/CommandContext;Ljava/lang/String;)Lnet/minecraft/class_1320; - ARG 0 context - ARG 1 name METHOD method_41220 getKey (Lcom/mojang/brigadier/context/CommandContext;Ljava/lang/String;Lnet/minecraft/class_5321;Lcom/mojang/brigadier/exceptions/DynamicCommandExceptionType;)Lnet/minecraft/class_5321; ARG 0 context ARG 1 name @@ -21,28 +17,26 @@ CLASS net/minecraft/class_7079 net/minecraft/command/argument/RegistryKeyArgumen METHOD method_41221 getRegistry (Lcom/mojang/brigadier/context/CommandContext;Lnet/minecraft/class_5321;)Lnet/minecraft/class_2378; ARG 0 context ARG 1 registryRef - METHOD method_41223 (Ljava/lang/Object;)Lcom/mojang/brigadier/Message; - ARG 0 id METHOD method_41224 registryKey (Lnet/minecraft/class_5321;)Lnet/minecraft/class_7079; ARG 0 registryRef - METHOD method_41225 getConfiguredFeatureEntry (Lcom/mojang/brigadier/context/CommandContext;Ljava/lang/String;)Lnet/minecraft/class_6880; + METHOD method_41225 getConfiguredFeatureEntry (Lcom/mojang/brigadier/context/CommandContext;Ljava/lang/String;)Lnet/minecraft/class_6880$class_6883; ARG 0 context ARG 1 name METHOD method_41226 (Ljava/lang/Object;)Lcom/mojang/brigadier/Message; ARG 0 id METHOD method_43776 (Ljava/lang/Object;)Lcom/mojang/brigadier/Message; ARG 0 id - METHOD method_43777 getRegistryEntry (Lcom/mojang/brigadier/context/CommandContext;Ljava/lang/String;Lnet/minecraft/class_5321;Lcom/mojang/brigadier/exceptions/DynamicCommandExceptionType;)Lnet/minecraft/class_6880; + METHOD method_43777 getRegistryEntry (Lcom/mojang/brigadier/context/CommandContext;Ljava/lang/String;Lnet/minecraft/class_5321;Lcom/mojang/brigadier/exceptions/DynamicCommandExceptionType;)Lnet/minecraft/class_6880$class_6883; ARG 0 context ARG 1 name ARG 2 registryRef ARG 3 invalidException METHOD method_43778 (Ljava/lang/Object;)Lcom/mojang/brigadier/Message; ARG 0 id - METHOD method_43779 getStructureEntry (Lcom/mojang/brigadier/context/CommandContext;Ljava/lang/String;)Lnet/minecraft/class_6880; + METHOD method_43779 getStructureEntry (Lcom/mojang/brigadier/context/CommandContext;Ljava/lang/String;)Lnet/minecraft/class_6880$class_6883; ARG 0 context ARG 1 name - METHOD method_43780 getStructurePoolEntry (Lcom/mojang/brigadier/context/CommandContext;Ljava/lang/String;)Lnet/minecraft/class_6880; + METHOD method_43780 getStructurePoolEntry (Lcom/mojang/brigadier/context/CommandContext;Ljava/lang/String;)Lnet/minecraft/class_6880$class_6883; ARG 0 context ARG 1 name METHOD parse (Lcom/mojang/brigadier/StringReader;)Ljava/lang/Object; diff --git a/mappings/net/minecraft/command/argument/ScoreHolderArgumentType.mapping b/mappings/net/minecraft/command/argument/ScoreHolderArgumentType.mapping index 597689bb23..737d97fd53 100644 --- a/mappings/net/minecraft/command/argument/ScoreHolderArgumentType.mapping +++ b/mappings/net/minecraft/command/argument/ScoreHolderArgumentType.mapping @@ -7,7 +7,7 @@ CLASS net/minecraft/class_2233 net/minecraft/command/argument/ScoreHolderArgumen ARG 1 multiple METHOD method_9447 scoreHolder ()Lnet/minecraft/class_2233; METHOD method_9448 (Lcom/mojang/brigadier/context/CommandContext;Lcom/mojang/brigadier/suggestion/SuggestionsBuilder;)V - ARG 1 builder + ARG 1 builderx METHOD method_9449 getScoreboardScoreHolders (Lcom/mojang/brigadier/context/CommandContext;Ljava/lang/String;)Ljava/util/Collection; ARG 0 context ARG 1 name diff --git a/mappings/net/minecraft/command/argument/ScoreboardSlotArgumentType.mapping b/mappings/net/minecraft/command/argument/ScoreboardSlotArgumentType.mapping index 7a947b0cb5..905f413905 100644 --- a/mappings/net/minecraft/command/argument/ScoreboardSlotArgumentType.mapping +++ b/mappings/net/minecraft/command/argument/ScoreboardSlotArgumentType.mapping @@ -4,7 +4,7 @@ CLASS net/minecraft/class_2239 net/minecraft/command/argument/ScoreboardSlotArgu METHOD listSuggestions (Lcom/mojang/brigadier/context/CommandContext;Lcom/mojang/brigadier/suggestion/SuggestionsBuilder;)Ljava/util/concurrent/CompletableFuture; ARG 1 context ARG 2 builder - METHOD method_9465 getScoreboardSlot (Lcom/mojang/brigadier/context/CommandContext;Ljava/lang/String;)I + METHOD method_9465 getScoreboardSlot (Lcom/mojang/brigadier/context/CommandContext;Ljava/lang/String;)Lnet/minecraft/class_8646; ARG 0 context ARG 1 name METHOD method_9467 (Ljava/lang/Object;)Lcom/mojang/brigadier/Message; diff --git a/mappings/net/minecraft/command/argument/SignedArgumentList.mapping b/mappings/net/minecraft/command/argument/SignedArgumentList.mapping new file mode 100644 index 0000000000..6aef75252a --- /dev/null +++ b/mappings/net/minecraft/command/argument/SignedArgumentList.mapping @@ -0,0 +1,13 @@ +CLASS net/minecraft/class_7644 net/minecraft/command/argument/SignedArgumentList + COMMENT A list of parsed {@linkplain SignedArgumentType signed arguments}. + COMMENT + COMMENT @see #of + METHOD method_45043 of (Lcom/mojang/brigadier/ParseResults;)Lnet/minecraft/class_7644; + COMMENT {@return a new instance of this list from {@code parseResults}} + ARG 0 parseResults + METHOD method_45044 collectDecoratableArguments (Ljava/lang/String;Lcom/mojang/brigadier/context/CommandContextBuilder;)Ljava/util/List; + ARG 0 argumentName + ARG 1 builder + CLASS class_7645 ParsedArgument + COMMENT A parsed signed argument, also used as the entry of {@link SignedArgumentList}. + METHOD method_45046 getNodeName ()Ljava/lang/String; diff --git a/mappings/net/minecraft/command/argument/SignedArgumentType.mapping b/mappings/net/minecraft/command/argument/SignedArgumentType.mapping index 6f8f0d10b3..8cc2b98a3b 100644 --- a/mappings/net/minecraft/command/argument/SignedArgumentType.mapping +++ b/mappings/net/minecraft/command/argument/SignedArgumentType.mapping @@ -1,3 +1 @@ CLASS net/minecraft/class_7451 net/minecraft/command/argument/SignedArgumentType - METHOD method_43752 toSignedString (Ljava/lang/Object;)Ljava/lang/String; - ARG 1 value diff --git a/mappings/net/minecraft/command/argument/StatusEffectArgumentType.mapping b/mappings/net/minecraft/command/argument/StatusEffectArgumentType.mapping deleted file mode 100644 index 48ef1d957b..0000000000 --- a/mappings/net/minecraft/command/argument/StatusEffectArgumentType.mapping +++ /dev/null @@ -1,14 +0,0 @@ -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 getStatusEffect (Lcom/mojang/brigadier/context/CommandContext;Ljava/lang/String;)Lnet/minecraft/class_1291; - ARG 0 context - ARG 1 name - METHOD method_9349 (Ljava/lang/Object;)Lcom/mojang/brigadier/Message; - ARG 0 id - METHOD method_9350 statusEffect ()Lnet/minecraft/class_2201; - METHOD parse (Lcom/mojang/brigadier/StringReader;)Ljava/lang/Object; - ARG 1 reader diff --git a/mappings/net/minecraft/command/argument/TimeArgumentType.mapping b/mappings/net/minecraft/command/argument/TimeArgumentType.mapping index 7c99b42f62..450121dcdf 100644 --- a/mappings/net/minecraft/command/argument/TimeArgumentType.mapping +++ b/mappings/net/minecraft/command/argument/TimeArgumentType.mapping @@ -1,13 +1,24 @@ CLASS net/minecraft/class_2245 net/minecraft/command/argument/TimeArgumentType + FIELD field_41857 TICK_COUNT_TOO_LOW_EXCEPTION Lcom/mojang/brigadier/exceptions/Dynamic2CommandExceptionType; + FIELD field_41858 minimum I FIELD field_9969 EXAMPLES Ljava/util/Collection; FIELD field_9970 INVALID_UNIT_EXCEPTION Lcom/mojang/brigadier/exceptions/SimpleCommandExceptionType; - FIELD field_9971 INVALID_COUNT_EXCEPTION Lcom/mojang/brigadier/exceptions/DynamicCommandExceptionType; FIELD field_9972 UNITS Lit/unimi/dsi/fastutil/objects/Object2IntMap; + METHOD (I)V + ARG 1 minimum METHOD listSuggestions (Lcom/mojang/brigadier/context/CommandContext;Lcom/mojang/brigadier/suggestion/SuggestionsBuilder;)Ljava/util/concurrent/CompletableFuture; ARG 1 context ARG 2 builder + METHOD method_48287 time (I)Lnet/minecraft/class_2245; + ARG 0 minimum METHOD method_9489 time ()Lnet/minecraft/class_2245; - METHOD method_9491 (Ljava/lang/Object;)Lcom/mojang/brigadier/Message; - ARG 0 time + METHOD method_9491 (Ljava/lang/Object;Ljava/lang/Object;)Lcom/mojang/brigadier/Message; + ARG 0 value + ARG 1 minimum METHOD parse (Lcom/mojang/brigadier/StringReader;)Ljava/lang/Object; ARG 1 reader + CLASS class_8033 Serializer + CLASS class_8034 Properties + FIELD field_41860 minimum I + METHOD (Lnet/minecraft/class_2245$class_8033;I)V + ARG 2 minimum diff --git a/mappings/net/minecraft/data/DataCache.mapping b/mappings/net/minecraft/data/DataCache.mapping index 862f3d1403..4de1f0ab9a 100644 --- a/mappings/net/minecraft/data/DataCache.mapping +++ b/mappings/net/minecraft/data/DataCache.mapping @@ -4,52 +4,53 @@ CLASS net/minecraft/class_2408 net/minecraft/data/DataCache FIELD field_38912 HEADER Ljava/lang/String; FIELD field_38913 cachePath Ljava/nio/file/Path; FIELD field_38914 versionName Ljava/lang/String; - FIELD field_38915 cachedDatas Ljava/util/Map; - FIELD field_38916 dataWriters Ljava/util/Map; + FIELD field_38916 dataWriters Ljava/util/Set; FIELD field_38917 paths Ljava/util/Set; FIELD field_38918 totalSize I - METHOD (Ljava/nio/file/Path;Ljava/util/List;Lnet/minecraft/class_6489;)V + FIELD field_40832 cachedDatas Ljava/util/Map; + FIELD field_40833 totalCacheMissCount I + METHOD (Ljava/nio/file/Path;Ljava/util/Collection;Lnet/minecraft/class_6489;)V ARG 1 root - ARG 2 dataProviders + ARG 2 providerNames ARG 3 gameVersion METHOD method_10326 write ()V - METHOD method_43347 isVersionDifferent (Lnet/minecraft/class_2405;)Z - ARG 1 dataProvider + METHOD method_43347 isVersionDifferent (Ljava/lang/String;)Z + ARG 1 providerName METHOD method_43348 parseOrCreateCache (Ljava/nio/file/Path;Ljava/nio/file/Path;)Lnet/minecraft/class_2408$class_7405; ARG 0 root ARG 1 dataProviderPath - METHOD method_43349 (Ljava/util/Set;Lnet/minecraft/class_2408$class_7405;)V - ARG 1 cachedData - METHOD method_43350 (Lorg/apache/commons/lang3/mutable/MutableInt;Lnet/minecraft/class_2405;Lnet/minecraft/class_2408$class_7404;)V - ARG 2 dataProvider - ARG 3 writer METHOD method_43351 (Lorg/apache/commons/lang3/mutable/MutableInt;Ljava/util/Set;Lorg/apache/commons/lang3/mutable/MutableInt;Ljava/nio/file/Path;)V ARG 4 path - METHOD method_43352 getOrCreateWriter (Lnet/minecraft/class_2405;)Lnet/minecraft/class_7403; - ARG 1 dataProvider - METHOD method_43353 getPath (Lnet/minecraft/class_2405;)Ljava/nio/file/Path; - ARG 1 dataProvider - METHOD method_43354 (Lnet/minecraft/class_2405;)Lnet/minecraft/class_2408$class_7404; - ARG 1 provider + METHOD method_43353 getPath (Ljava/lang/String;)Ljava/nio/file/Path; + ARG 1 providerName + METHOD method_46568 (Lnet/minecraft/class_2408$class_7404;Ljava/lang/Object;)Lnet/minecraft/class_2408$class_7860; + ARG 1 void_ + METHOD method_46569 store (Lnet/minecraft/class_2408$class_7860;)V + ARG 1 runResult + METHOD method_46570 run (Ljava/lang/String;Lnet/minecraft/class_2408$class_7859;)Ljava/util/concurrent/CompletableFuture; + ARG 1 providerName + ARG 2 runner + METHOD method_46571 (Ljava/util/Set;Ljava/lang/String;Lnet/minecraft/class_2408$class_7405;)V + ARG 2 providerName + ARG 3 cachedData CLASS class_7404 CachedDataWriter FIELD field_38919 oldCache Lnet/minecraft/class_2408$class_7405; - FIELD field_38920 newCache Lnet/minecraft/class_2408$class_7405; - FIELD field_38921 cacheMissCount I - METHOD (Ljava/lang/String;Lnet/minecraft/class_2408$class_7405;)V - ARG 1 versionName - ARG 2 cachedData + FIELD field_38920 newCache Lnet/minecraft/class_2408$class_7858; + FIELD field_38921 cacheMissCount Ljava/util/concurrent/atomic/AtomicInteger; + FIELD field_40835 providerName Ljava/lang/String; + FIELD field_40836 closed Z + METHOD (Lnet/minecraft/class_2408;Ljava/lang/String;Ljava/lang/String;Lnet/minecraft/class_2408$class_7405;)V + ARG 2 providerName + ARG 3 version + ARG 4 oldCache METHOD method_43355 isCacheInvalid (Ljava/nio/file/Path;Lcom/google/common/hash/HashCode;)Z ARG 1 path ARG 2 hashCode + METHOD method_46572 finish ()Lnet/minecraft/class_2408$class_7860; CLASS class_7405 CachedData - METHOD (Ljava/lang/String;)V - ARG 1 version METHOD method_43356 size ()I METHOD method_43357 get (Ljava/nio/file/Path;)Lcom/google/common/hash/HashCode; ARG 1 path - METHOD method_43358 put (Ljava/nio/file/Path;Lcom/google/common/hash/HashCode;)V - ARG 1 path - ARG 2 hashCode METHOD method_43359 parseCache (Ljava/nio/file/Path;Ljava/nio/file/Path;)Lnet/minecraft/class_2408$class_7405; ARG 0 root ARG 1 dataProviderPath @@ -57,5 +58,20 @@ CLASS net/minecraft/class_2408 net/minecraft/data/DataCache ARG 1 root ARG 2 dataProviderPath ARG 3 description - METHOD method_43361 (Ljava/util/Map;Ljava/nio/file/Path;Ljava/lang/String;)V + METHOD method_43361 (Lcom/google/common/collect/ImmutableMap$Builder;Ljava/nio/file/Path;Ljava/lang/String;)V ARG 2 line + CLASS class_7858 IntermediaryCache + METHOD (Ljava/lang/String;)V + ARG 1 version + METHOD method_46573 toCachedData ()Lnet/minecraft/class_2408$class_7405; + METHOD method_46574 put (Ljava/nio/file/Path;Lcom/google/common/hash/HashCode;)V + ARG 1 path + ARG 2 hashCode + CLASS class_7859 Runner + METHOD update (Lnet/minecraft/class_7403;)Ljava/util/concurrent/CompletableFuture; + ARG 1 writer + CLASS class_7860 RunResult + FIELD comp_1124 providerName Ljava/lang/String; + FIELD comp_1126 cacheMissCount I + METHOD comp_1124 providerName ()Ljava/lang/String; + METHOD comp_1126 cacheMissCount ()I diff --git a/mappings/net/minecraft/data/DataGenerator.mapping b/mappings/net/minecraft/data/DataGenerator.mapping index 22d794f0b9..7502e32236 100644 --- a/mappings/net/minecraft/data/DataGenerator.mapping +++ b/mappings/net/minecraft/data/DataGenerator.mapping @@ -1,40 +1,31 @@ CLASS net/minecraft/class_2403 net/minecraft/data/DataGenerator - FIELD field_11272 inputs Ljava/util/Collection; - FIELD field_11273 providers Ljava/util/List; - FIELD field_11274 output Ljava/nio/file/Path; FIELD field_11275 LOGGER Lorg/slf4j/Logger; - FIELD field_38909 runningProviders Ljava/util/List; + FIELD field_38909 runningProviders Ljava/util/Map; FIELD field_38910 gameVersion Lnet/minecraft/class_6489; FIELD field_38911 ignoreCache Z - METHOD (Ljava/nio/file/Path;Ljava/util/Collection;Lnet/minecraft/class_6489;Z)V - ARG 1 output - ARG 2 inputs - ARG 3 gameVersion - ARG 4 ignoreCache - METHOD method_10312 getInputs ()Ljava/util/Collection; - METHOD method_10313 getOutput ()Ljava/nio/file/Path; - METHOD method_10314 addProvider (ZLnet/minecraft/class_2405;)V - ARG 1 shouldRun - ARG 2 provider + FIELD field_40595 outputPath Ljava/nio/file/Path; + FIELD field_40596 output Lnet/minecraft/class_7784; + FIELD field_40826 providerNames Ljava/util/Set; + METHOD (Ljava/nio/file/Path;Lnet/minecraft/class_6489;Z)V + ARG 1 outputPath + ARG 2 gameVersion + ARG 3 ignoreCache METHOD method_10315 run ()V - METHOD method_44105 resolveRootDirectoryPath (Lnet/minecraft/class_2403$class_7490;)Ljava/nio/file/Path; - ARG 1 outputType - METHOD method_44106 createPathResolver (Lnet/minecraft/class_2403$class_7490;Ljava/lang/String;)Lnet/minecraft/class_2403$class_7489; - ARG 1 outputType - ARG 2 directoryName - CLASS class_7489 PathResolver - FIELD field_39365 rootPath Ljava/nio/file/Path; - FIELD field_39366 directoryName Ljava/lang/String; - METHOD (Lnet/minecraft/class_2403;Lnet/minecraft/class_2403$class_7490;Ljava/lang/String;)V - ARG 1 dataGenerator - ARG 2 outputType - ARG 3 directoryName - METHOD method_44107 resolveJson (Lnet/minecraft/class_2960;)Ljava/nio/file/Path; - ARG 1 id - METHOD method_44108 resolve (Lnet/minecraft/class_2960;Ljava/lang/String;)Ljava/nio/file/Path; - ARG 1 id - ARG 2 fileExtension - CLASS class_7490 OutputType - FIELD field_39370 path Ljava/lang/String; - METHOD (Ljava/lang/String;ILjava/lang/String;)V - ARG 3 path + METHOD method_46563 (Lnet/minecraft/class_2408;Lcom/google/common/base/Stopwatch;Ljava/lang/String;Lnet/minecraft/class_2405;)V + ARG 3 name + ARG 4 provider + METHOD method_46564 createVanillaPack (Z)Lnet/minecraft/class_2403$class_7856; + ARG 1 shouldRun + METHOD method_46565 createVanillaSubPack (ZLjava/lang/String;)Lnet/minecraft/class_2403$class_7856; + ARG 1 shouldRun + ARG 2 packName + CLASS class_7856 Pack + FIELD field_40828 shouldRun Z + FIELD field_40829 packName Ljava/lang/String; + FIELD field_40830 output Lnet/minecraft/class_7784; + METHOD (Lnet/minecraft/class_2403;ZLjava/lang/String;Lnet/minecraft/class_7784;)V + ARG 2 shouldRun + ARG 3 name + ARG 4 output + METHOD method_46566 addProvider (Lnet/minecraft/class_2405$class_7857;)Lnet/minecraft/class_2405; + ARG 1 factory diff --git a/mappings/net/minecraft/data/DataOutput.mapping b/mappings/net/minecraft/data/DataOutput.mapping new file mode 100644 index 0000000000..b5d2e1c379 --- /dev/null +++ b/mappings/net/minecraft/data/DataOutput.mapping @@ -0,0 +1,26 @@ +CLASS net/minecraft/class_7784 net/minecraft/data/DataOutput + FIELD field_40597 path Ljava/nio/file/Path; + METHOD (Ljava/nio/file/Path;)V + ARG 1 path + METHOD method_45971 getPath ()Ljava/nio/file/Path; + METHOD method_45972 resolvePath (Lnet/minecraft/class_7784$class_7490;)Ljava/nio/file/Path; + ARG 1 outputType + METHOD method_45973 getResolver (Lnet/minecraft/class_7784$class_7490;Ljava/lang/String;)Lnet/minecraft/class_7784$class_7489; + ARG 1 outputType + ARG 2 directoryName + CLASS class_7489 PathResolver + FIELD field_39365 rootPath Ljava/nio/file/Path; + FIELD field_39366 directoryName Ljava/lang/String; + METHOD (Lnet/minecraft/class_7784;Lnet/minecraft/class_7784$class_7490;Ljava/lang/String;)V + ARG 1 dataGenerator + ARG 2 outputType + ARG 3 directoryName + METHOD method_44107 resolveJson (Lnet/minecraft/class_2960;)Ljava/nio/file/Path; + ARG 1 id + METHOD method_44108 resolve (Lnet/minecraft/class_2960;Ljava/lang/String;)Ljava/nio/file/Path; + ARG 1 id + ARG 2 fileExtension + CLASS class_7490 OutputType + FIELD field_39370 path Ljava/lang/String; + METHOD (Ljava/lang/String;ILjava/lang/String;)V + ARG 3 path diff --git a/mappings/net/minecraft/data/DataProvider.mapping b/mappings/net/minecraft/data/DataProvider.mapping index 09f571be57..4bfb438dd4 100644 --- a/mappings/net/minecraft/data/DataProvider.mapping +++ b/mappings/net/minecraft/data/DataProvider.mapping @@ -1,9 +1,10 @@ CLASS net/minecraft/class_2405 net/minecraft/data/DataProvider FIELD field_39212 JSON_KEY_SORT_ORDER Ljava/util/function/ToIntFunction; FIELD field_39213 JSON_KEY_SORTING_COMPARATOR Ljava/util/Comparator; - METHOD method_10319 run (Lnet/minecraft/class_7403;)V + FIELD field_40831 LOGGER Lorg/slf4j/Logger; + METHOD method_10319 run (Lnet/minecraft/class_7403;)Ljava/util/concurrent/CompletableFuture; ARG 1 writer - METHOD method_10320 writeToPath (Lnet/minecraft/class_7403;Lcom/google/gson/JsonElement;Ljava/nio/file/Path;)V + METHOD method_10320 writeToPath (Lnet/minecraft/class_7403;Lcom/google/gson/JsonElement;Ljava/nio/file/Path;)Ljava/util/concurrent/CompletableFuture; ARG 0 writer ARG 1 json ARG 2 path @@ -12,3 +13,11 @@ CLASS net/minecraft/class_2405 net/minecraft/data/DataProvider ARG 0 map METHOD method_43809 (Ljava/lang/String;)Ljava/lang/String; ARG 0 key + METHOD method_53496 writeCodecToPath (Lnet/minecraft/class_7403;Lcom/mojang/serialization/Codec;Ljava/lang/Object;Ljava/nio/file/Path;)Ljava/util/concurrent/CompletableFuture; + ARG 0 writer + ARG 1 codec + ARG 2 value + ARG 3 path + CLASS class_7857 Factory + METHOD create (Lnet/minecraft/class_7784;)Lnet/minecraft/class_2405; + ARG 1 output diff --git a/mappings/net/minecraft/data/Main.mapping b/mappings/net/minecraft/data/Main.mapping index 1cca7fd8e5..b0e6e4fd8a 100644 --- a/mappings/net/minecraft/data/Main.mapping +++ b/mappings/net/minecraft/data/Main.mapping @@ -1,6 +1,19 @@ CLASS net/minecraft/data/Main METHOD main ([Ljava/lang/String;)V ARG 0 args + METHOD method_46595 (Ljava/util/Collection;Lnet/minecraft/class_7784;)Lnet/minecraft/class_2461; + ARG 1 outputx + METHOD method_46597 (Lnet/minecraft/class_7784;)Lnet/minecraft/class_7796; + ARG 0 outputx + METHOD method_46598 (Ljava/util/Collection;Lnet/minecraft/class_7784;)Lnet/minecraft/class_2463; + ARG 1 outputx + METHOD method_46599 (Ljava/util/concurrent/CompletableFuture;Lnet/minecraft/class_2474;Lnet/minecraft/class_7784;)Lnet/minecraft/class_2471; + ARG 2 outputx + METHOD method_46839 toFactory (Ljava/util/function/BiFunction;Ljava/util/concurrent/CompletableFuture;)Lnet/minecraft/class_2405$class_7857; + ARG 0 baseFactory + ARG 1 registryLookupFuture + METHOD method_46840 (Ljava/util/function/BiFunction;Ljava/util/concurrent/CompletableFuture;Lnet/minecraft/class_7784;)Lnet/minecraft/class_2405; + ARG 2 output METHOD method_4967 (Ljava/lang/String;)Ljava/nio/file/Path; ARG 0 input METHOD method_4968 create (Ljava/nio/file/Path;Ljava/util/Collection;ZZZZZLnet/minecraft/class_6489;Z)Lnet/minecraft/class_2403; @@ -13,3 +26,5 @@ CLASS net/minecraft/data/Main ARG 6 validate ARG 7 gameVersion ARG 8 ignoreCache + METHOD method_52888 (Lnet/minecraft/class_7784;)Lnet/minecraft/class_7796; + ARG 0 outputx diff --git a/mappings/net/minecraft/data/MetadataProvider.mapping b/mappings/net/minecraft/data/MetadataProvider.mapping new file mode 100644 index 0000000000..86f230641f --- /dev/null +++ b/mappings/net/minecraft/data/MetadataProvider.mapping @@ -0,0 +1,18 @@ +CLASS net/minecraft/class_7796 net/minecraft/data/MetadataProvider + FIELD field_40619 output Lnet/minecraft/class_7784; + FIELD field_40620 metadata Ljava/util/Map; + METHOD (Lnet/minecraft/class_7784;)V + ARG 1 output + METHOD method_46185 add (Lnet/minecraft/class_7677;Ljava/lang/Object;)Lnet/minecraft/class_7796; + ARG 1 serializer + ARG 2 metadata + METHOD method_46186 (Lcom/google/gson/JsonObject;Ljava/lang/String;Ljava/util/function/Supplier;)V + ARG 1 key + ARG 2 jsonSupplier + METHOD method_46187 create (Lnet/minecraft/class_7784;Lnet/minecraft/class_2561;Lnet/minecraft/class_7699;)Lnet/minecraft/class_7796; + ARG 0 output + ARG 1 description + ARG 2 requiredFeatures + METHOD method_46812 create (Lnet/minecraft/class_7784;Lnet/minecraft/class_2561;)Lnet/minecraft/class_7796; + ARG 0 output + ARG 1 description diff --git a/mappings/net/minecraft/data/SnbtProvider.mapping b/mappings/net/minecraft/data/SnbtProvider.mapping index b5aaaa547e..7b8fffec39 100644 --- a/mappings/net/minecraft/data/SnbtProvider.mapping +++ b/mappings/net/minecraft/data/SnbtProvider.mapping @@ -1,10 +1,12 @@ CLASS net/minecraft/class_2463 net/minecraft/data/SnbtProvider - FIELD field_11453 root Lnet/minecraft/class_2403; FIELD field_11454 LOGGER Lorg/slf4j/Logger; FIELD field_20309 write Ljava/util/List; FIELD field_24615 DEBUG_OUTPUT_DIRECTORY Ljava/nio/file/Path; - METHOD (Lnet/minecraft/class_2403;)V - ARG 1 generator + FIELD field_40662 output Lnet/minecraft/class_7784; + FIELD field_40663 paths Ljava/lang/Iterable; + METHOD (Lnet/minecraft/class_7784;Ljava/lang/Iterable;)V + ARG 1 output + ARG 2 paths METHOD method_10497 write (Lnet/minecraft/class_7403;Lnet/minecraft/class_2463$class_4511;Ljava/nio/file/Path;)V ARG 1 cache ARG 2 data @@ -22,8 +24,10 @@ CLASS net/minecraft/class_2463 net/minecraft/data/SnbtProvider METHOD method_22144 toCompressedNbt (Ljava/nio/file/Path;Ljava/lang/String;)Lnet/minecraft/class_2463$class_4511; ARG 1 path ARG 2 name - METHOD method_22145 (Ljava/util/List;Ljava/nio/file/Path;Ljava/nio/file/Path;)V - ARG 3 path + METHOD method_46587 (Ljava/nio/file/Path;Lnet/minecraft/class_7403;Ljava/nio/file/Path;Ljava/nio/file/Path;)Ljava/util/concurrent/CompletableFuture; + ARG 4 path + METHOD method_46589 (Ljava/util/concurrent/CompletableFuture;)Ljava/util/concurrent/CompletionStage; + ARG 0 future CLASS class_4460 Tweaker METHOD method_21674 write (Ljava/lang/String;Lnet/minecraft/class_2487;)Lnet/minecraft/class_2487; ARG 1 name diff --git a/mappings/net/minecraft/data/client/BlockStateModelGenerator.mapping b/mappings/net/minecraft/data/client/BlockStateModelGenerator.mapping index 395dfd2581..24b11c748a 100644 --- a/mappings/net/minecraft/data/client/BlockStateModelGenerator.mapping +++ b/mappings/net/minecraft/data/client/BlockStateModelGenerator.mapping @@ -7,9 +7,10 @@ CLASS net/minecraft/class_4910 net/minecraft/data/client/BlockStateModelGenerato COMMENT function that creates a block state variant for connection on that COMMENT direction with a given connection model. FIELD field_28549 nonOrientableTrapdoors Ljava/util/List; - FIELD field_28551 sandstoneModels Ljava/util/Map; + FIELD field_28551 texturedModels Ljava/util/Map; FIELD field_28552 VARIANT_POOL_FUNCTIONS Ljava/util/Map; FIELD field_29504 stoneStateFactories Ljava/util/Map; + FIELD field_41526 CHISELED_BOOKSHELF_MODEL_CACHE Ljava/util/Map; METHOD (Ljava/util/function/Consumer;Ljava/util/function/BiConsumer;Ljava/util/function/Consumer;)V ARG 1 blockStateCollector ARG 2 modelCollector @@ -128,6 +129,10 @@ CLASS net/minecraft/class_4910 net/minecraft/data/client/BlockStateModelGenerato METHOD method_25572 fillDoorVariantMap (Lnet/minecraft/class_4926$class_4930;Lnet/minecraft/class_2756;Lnet/minecraft/class_2960;Lnet/minecraft/class_2960;Lnet/minecraft/class_2960;Lnet/minecraft/class_2960;)Lnet/minecraft/class_4926$class_4930; ARG 0 variantMap ARG 1 targetHalf + ARG 2 leftHingeClosedModelId + ARG 3 leftHingeOpenModelId + ARG 4 rightHingeClosedModelId + ARG 5 rightHingeOpenModelId METHOD method_25576 registerRandomHorizontalRotations (Lnet/minecraft/class_4946$class_4947;[Lnet/minecraft/class_2248;)V ARG 1 modelFactory ARG 2 blocks @@ -172,8 +177,14 @@ CLASS net/minecraft/class_4910 net/minecraft/data/client/BlockStateModelGenerato ARG 2 modelFactory METHOD method_25609 createDoorBlockState (Lnet/minecraft/class_2248;Lnet/minecraft/class_2960;Lnet/minecraft/class_2960;Lnet/minecraft/class_2960;Lnet/minecraft/class_2960;Lnet/minecraft/class_2960;Lnet/minecraft/class_2960;Lnet/minecraft/class_2960;Lnet/minecraft/class_2960;)Lnet/minecraft/class_4917; ARG 0 doorBlock - ARG 1 bottomModelId - ARG 2 bottomHingeModelId + ARG 1 bottomLeftHingeClosedModelId + ARG 2 bottomLeftHingeOpenModelId + ARG 3 bottomRightHingeClosedModelId + ARG 4 bottomRightHingeOpenModelId + ARG 5 topLeftHingeClosedModelId + ARG 6 topLeftHingeOpenModelId + ARG 7 topRightHingeClosedModelId + ARG 8 topRightHingeOpenModelId METHOD method_25614 registerSouthDefaultHorizontalFacing (Lnet/minecraft/class_4946$class_4947;[Lnet/minecraft/class_2248;)V ARG 1 modelFactory ARG 2 blocks @@ -192,12 +203,13 @@ CLASS net/minecraft/class_4910 net/minecraft/data/client/BlockStateModelGenerato METHOD method_25623 registerParentedItemModel (Lnet/minecraft/class_2248;Lnet/minecraft/class_2960;)V ARG 1 block ARG 2 parentModelId - METHOD method_25626 createFenceGateBlockState (Lnet/minecraft/class_2248;Lnet/minecraft/class_2960;Lnet/minecraft/class_2960;Lnet/minecraft/class_2960;Lnet/minecraft/class_2960;)Lnet/minecraft/class_4917; + METHOD method_25626 createFenceGateBlockState (Lnet/minecraft/class_2248;Lnet/minecraft/class_2960;Lnet/minecraft/class_2960;Lnet/minecraft/class_2960;Lnet/minecraft/class_2960;Z)Lnet/minecraft/class_4917; ARG 0 fenceGateBlock ARG 1 openModelId ARG 2 closedModelId ARG 3 openWallModelId ARG 4 closedWallModelId + ARG 5 uvlock METHOD method_25630 createEastDefaultHorizontalRotationStates ()Lnet/minecraft/class_4926; METHOD method_25631 registerRotatable (Lnet/minecraft/class_2248;)V ARG 1 block @@ -269,8 +281,8 @@ CLASS net/minecraft/class_4910 net/minecraft/data/client/BlockStateModelGenerato METHOD method_25664 registerTallSeagrass ()V METHOD method_25665 registerOrientableTrapdoor (Lnet/minecraft/class_2248;)V ARG 1 trapdoorBlock - METHOD method_25666 registerPressurePlate (Lnet/minecraft/class_2248;Lnet/minecraft/class_2248;)V - ARG 1 pressurePlate + METHOD method_25666 registerWeightedPressurePlate (Lnet/minecraft/class_2248;Lnet/minecraft/class_2248;)V + ARG 1 weightedPressurePlate ARG 2 textureSource METHOD method_25667 createAxisRotatedBlockState (Lnet/minecraft/class_2248;Lnet/minecraft/class_2960;Lnet/minecraft/class_2960;)Lnet/minecraft/class_4917; ARG 0 block @@ -375,6 +387,10 @@ CLASS net/minecraft/class_4910 net/minecraft/data/client/BlockStateModelGenerato ARG 2 thickness METHOD method_33128 registerSculkSensor ()V METHOD method_33504 registerPetrifiedOakSlab ()V + METHOD method_33509 (Lnet/minecraft/class_4944;)V + ARG 0 textureMap + METHOD method_33512 (Lnet/minecraft/class_4944;)V + ARG 0 textureMap METHOD method_33520 registerWallPlant (Lnet/minecraft/class_2248;)V ARG 1 block METHOD method_33710 registerCaveVines ()V @@ -386,6 +402,8 @@ CLASS net/minecraft/class_4910 net/minecraft/data/client/BlockStateModelGenerato ARG 1 item METHOD method_34605 (Lnet/minecraft/class_2248;Lnet/minecraft/class_4918$class_4921;Lnet/minecraft/class_2746;)V ARG 2 property + METHOD method_34606 (Lnet/minecraft/class_2248;Lnet/minecraft/class_4944;Ljava/lang/Integer;)Lnet/minecraft/class_4935; + ARG 3 age METHOD method_34608 createStoneState (Lnet/minecraft/class_2248;Lnet/minecraft/class_2960;Lnet/minecraft/class_4944;Ljava/util/function/BiConsumer;)Lnet/minecraft/class_4917; ARG 0 block ARG 1 modelId @@ -409,9 +427,15 @@ CLASS net/minecraft/class_4910 net/minecraft/data/client/BlockStateModelGenerato ARG 1 height METHOD method_34626 (Lnet/minecraft/class_2960;Lnet/minecraft/class_4944;)V ARG 1 textures + METHOD method_34627 (Lnet/minecraft/class_2960;Lnet/minecraft/class_2960;Lnet/minecraft/class_5705;)Lnet/minecraft/class_4935; + ARG 2 phase METHOD method_34628 (Lnet/minecraft/class_2960;Lnet/minecraft/class_2960;Lnet/minecraft/class_2960;Lnet/minecraft/class_2960;Lnet/minecraft/class_2960;Lnet/minecraft/class_2960;Ljava/lang/Boolean;Lnet/minecraft/class_2768;)Lnet/minecraft/class_4935; ARG 6 on ARG 7 shape + METHOD method_34629 ([ILit/unimi/dsi/fastutil/ints/Int2ObjectMap;Lnet/minecraft/class_2248;Ljava/lang/Integer;)Lnet/minecraft/class_4935; + ARG 1 age + METHOD method_34630 ([Lnet/minecraft/class_2960;Ljava/lang/Integer;)Lnet/minecraft/class_4935; + ARG 1 charges METHOD method_34631 createDeepslateState (Lnet/minecraft/class_2248;Lnet/minecraft/class_2960;Lnet/minecraft/class_4944;Ljava/util/function/BiConsumer;)Lnet/minecraft/class_4917; ARG 0 block ARG 1 modelId @@ -423,6 +447,8 @@ CLASS net/minecraft/class_4910 net/minecraft/data/client/BlockStateModelGenerato ARG 1 id METHOD method_34639 (Lnet/minecraft/class_2960;Lnet/minecraft/class_4944;)V ARG 1 textures + METHOD method_34643 (Lnet/minecraft/class_4944;)V + ARG 0 textureMap METHOD method_34645 (Lnet/minecraft/class_2960;Lnet/minecraft/class_4944;)V ARG 1 textures METHOD method_34657 (Lnet/minecraft/class_2960;)Lnet/minecraft/class_4935; @@ -439,6 +465,8 @@ CLASS net/minecraft/class_4910 net/minecraft/data/client/BlockStateModelGenerato METHOD method_42033 registerMuddyMangroveRoots ()V METHOD method_42034 registerMangrovePropagule ()V METHOD method_42035 registerFrogspawn ()V + METHOD method_42036 (Lnet/minecraft/class_2960;Lnet/minecraft/class_2960;Ljava/lang/Boolean;)Lnet/minecraft/class_4935; + ARG 2 bloom METHOD method_42037 registerSculkShrieker ()V METHOD method_42038 registerSculkCatalyst ()V METHOD method_42039 createMudBrickState (Lnet/minecraft/class_2248;Lnet/minecraft/class_2960;Lnet/minecraft/class_4944;Ljava/util/function/BiConsumer;)Lnet/minecraft/class_4917; @@ -446,6 +474,77 @@ CLASS net/minecraft/class_4910 net/minecraft/data/client/BlockStateModelGenerato ARG 1 modelId ARG 2 textures ARG 3 modelCollector + METHOD method_43818 (Lnet/minecraft/class_2960;)Lnet/minecraft/class_4935; + ARG 0 model + METHOD method_43819 (Lnet/minecraft/class_2960;)Lnet/minecraft/class_4935; + ARG 0 model + METHOD method_43820 (Lnet/minecraft/class_2960;)Lnet/minecraft/class_4935; + ARG 0 model + METHOD method_43821 (Lnet/minecraft/class_2960;)Lnet/minecraft/class_4935; + ARG 0 model + METHOD method_43822 (Lnet/minecraft/class_2960;)Lnet/minecraft/class_4935; + ARG 0 model + METHOD method_43823 (Lnet/minecraft/class_2960;)Lnet/minecraft/class_4935; + ARG 0 model + METHOD method_46189 createCustomFenceBlockState (Lnet/minecraft/class_2248;Lnet/minecraft/class_2960;Lnet/minecraft/class_2960;Lnet/minecraft/class_2960;Lnet/minecraft/class_2960;Lnet/minecraft/class_2960;)Lnet/minecraft/class_4917; + ARG 0 customFenceBlock + ARG 1 postModelId + ARG 2 northModelId + ARG 3 eastModelId + ARG 4 southModelId + ARG 5 westModelId + METHOD method_46190 registerHangingSign (Lnet/minecraft/class_2248;Lnet/minecraft/class_2248;Lnet/minecraft/class_2248;)V + ARG 1 strippedLog + ARG 2 hangingSign + ARG 3 wallHangingSign + METHOD method_46193 registerChiseledBookshelf ()V + METHOD method_47519 createUvLockedColumnBlockState (Lnet/minecraft/class_2248;Lnet/minecraft/class_4944;Ljava/util/function/BiConsumer;)Lnet/minecraft/class_4917; + ARG 0 block + ARG 1 textureMap + ARG 2 modelCollector + METHOD method_47811 (Lnet/minecraft/class_4922;Lnet/minecraft/class_2960;Lnet/minecraft/class_2350;Lnet/minecraft/class_4936$class_4937;)V + ARG 3 direction + ARG 4 rotation + METHOD method_47812 supplyChiseledBookshelfModels (Lnet/minecraft/class_4922;Lnet/minecraft/class_4918$class_4921;Lnet/minecraft/class_4936$class_4937;)V + ARG 1 blockStateSupplier + ARG 2 facingCondition + ARG 3 rotation + METHOD method_47813 (Lnet/minecraft/class_4922;Lnet/minecraft/class_4918$class_4921;Lnet/minecraft/class_4936$class_4937;Lnet/minecraft/class_2746;Lnet/minecraft/class_4942;)V + ARG 4 property + ARG 5 model + METHOD method_47814 supplyChiseledBookshelfModel (Lnet/minecraft/class_4922;Lnet/minecraft/class_4918$class_4921;Lnet/minecraft/class_4936$class_4937;Lnet/minecraft/class_2746;Lnet/minecraft/class_4942;Z)V + ARG 1 blockStateSupplier + ARG 2 facingCondition + ARG 3 rotation + ARG 4 property + ARG 5 model + ARG 6 occupied + METHOD method_47815 (Lnet/minecraft/class_4942;Ljava/lang/String;Lnet/minecraft/class_4944;Lnet/minecraft/class_4910$class_7987;)Lnet/minecraft/class_2960; + ARG 4 key + METHOD method_49374 registerTintableCrossBlockStateWithStages (Lnet/minecraft/class_2248;Lnet/minecraft/class_4910$class_4913;Lnet/minecraft/class_2769;[I)V + ARG 1 block + ARG 2 tintType + ARG 3 stageProperty + ARG 4 stages + METHOD method_49376 (Lnet/minecraft/class_2248;Ljava/lang/Integer;)Lnet/minecraft/class_4935; + ARG 2 dusted + METHOD method_49377 registerBrushableBlock (Lnet/minecraft/class_2248;)V + ARG 1 block + METHOD method_49378 registerFlowerbed (Lnet/minecraft/class_2248;)V + ARG 1 flowerbed + METHOD method_49985 (Lnet/minecraft/class_2960;Lnet/minecraft/class_2960;Lnet/minecraft/class_5705;)Lnet/minecraft/class_4935; + ARG 2 phase + METHOD method_49986 (Lnet/minecraft/class_2248;Ljava/lang/Integer;Lnet/minecraft/class_2756;)Lnet/minecraft/class_4935; + ARG 1 age + ARG 2 half + METHOD method_49987 (Ljava/lang/Integer;)Lnet/minecraft/class_2960; + ARG 1 hatch + METHOD method_49988 (Ljava/util/function/Function;Ljava/lang/Integer;)Lnet/minecraft/class_4935; + ARG 1 hatch + METHOD method_49989 registerCalibratedSculkSensor ()V + METHOD method_49990 registerSnifferEgg ()V + METHOD method_49991 registerPitcherPlant ()V + METHOD method_49992 registerPitcherCrop ()V CLASS class_4911 BuiltinModelPool FIELD field_22835 modelId Lnet/minecraft/class_2960; METHOD (Lnet/minecraft/class_4910;Lnet/minecraft/class_2960;Lnet/minecraft/class_2248;)V @@ -500,8 +599,12 @@ CLASS net/minecraft/class_4910 net/minecraft/data/client/BlockStateModelGenerato ARG 1 block METHOD method_33528 registerTrapdoor (Lnet/minecraft/class_2248;)V ARG 1 block - METHOD method_34661 sandstone (Lnet/minecraft/class_2248;)Lnet/minecraft/class_4910$class_4912; + METHOD method_34661 block (Lnet/minecraft/class_2248;)Lnet/minecraft/class_4910$class_4912; ARG 1 block + METHOD method_46194 customFence (Lnet/minecraft/class_2248;)Lnet/minecraft/class_4910$class_4912; + ARG 1 customFenceBlock + METHOD method_46195 customFenceGate (Lnet/minecraft/class_2248;)Lnet/minecraft/class_4910$class_4912; + ARG 1 customFenceGateBlock CLASS class_4913 TintType METHOD method_25726 getCrossModel ()Lnet/minecraft/class_4942; METHOD method_25727 getFlowerPotCrossModel ()Lnet/minecraft/class_4942; @@ -515,9 +618,12 @@ CLASS net/minecraft/class_4910 net/minecraft/data/client/BlockStateModelGenerato ARG 1 stemBlock METHOD method_25730 log (Lnet/minecraft/class_2248;)Lnet/minecraft/class_4910$class_4914; ARG 1 logBlock + METHOD method_47520 uvLockedLog (Lnet/minecraft/class_2248;)Lnet/minecraft/class_4910$class_4914; + ARG 1 logBlock CLASS class_5879 StateFactory METHOD create (Lnet/minecraft/class_2248;Lnet/minecraft/class_2960;Lnet/minecraft/class_4944;Ljava/util/function/BiConsumer;)Lnet/minecraft/class_4917; ARG 1 block ARG 2 modelId ARG 3 textures ARG 4 modelCollector + CLASS class_7987 ChiseledBookshelfModelCacheKey diff --git a/mappings/net/minecraft/data/client/ItemModelGenerator.mapping b/mappings/net/minecraft/data/client/ItemModelGenerator.mapping index 8817b9db4a..9a6f3938f1 100644 --- a/mappings/net/minecraft/data/client/ItemModelGenerator.mapping +++ b/mappings/net/minecraft/data/client/ItemModelGenerator.mapping @@ -1,5 +1,7 @@ CLASS net/minecraft/class_4915 net/minecraft/data/client/ItemModelGenerator FIELD field_22844 writer Ljava/util/function/BiConsumer; + FIELD field_42086 TRIM_TYPE Lnet/minecraft/class_2960; + FIELD field_42087 TRIM_MATERIALS Ljava/util/List; METHOD (Ljava/util/function/BiConsumer;)V ARG 1 writer METHOD method_25731 register ()V @@ -18,3 +20,30 @@ CLASS net/minecraft/class_4915 net/minecraft/data/client/ItemModelGenerator ARG 1 compass METHOD method_43229 registerClock (Lnet/minecraft/class_1792;)V ARG 1 clock + METHOD method_48517 uploadArmor (Lnet/minecraft/class_2960;Lnet/minecraft/class_2960;Lnet/minecraft/class_2960;)V + ARG 1 id + ARG 2 layer0 + ARG 3 layer1 + METHOD method_48518 suffixTrim (Lnet/minecraft/class_2960;Ljava/lang/String;)Lnet/minecraft/class_2960; + ARG 1 id + ARG 2 trimMaterialName + METHOD method_48519 createArmorJson (Lnet/minecraft/class_2960;Ljava/util/Map;Lnet/minecraft/class_1741;)Lcom/google/gson/JsonObject; + ARG 1 id + ARG 2 textures + ARG 3 armorMaterial + METHOD method_48522 (Lnet/minecraft/class_1738;Lnet/minecraft/class_2960;Ljava/util/Map;)Lcom/google/gson/JsonObject; + ARG 2 id + ARG 3 textures + METHOD method_48523 registerArmor (Lnet/minecraft/class_1738;)V + ARG 1 armor + METHOD method_48742 uploadArmor (Lnet/minecraft/class_2960;Lnet/minecraft/class_2960;Lnet/minecraft/class_2960;Lnet/minecraft/class_2960;)V + ARG 1 id + ARG 2 layer0 + ARG 3 layer1 + ARG 4 layer2 + METHOD method_48743 (Lnet/minecraft/class_1738;Lnet/minecraft/class_2960;Ljava/util/Map;)Lcom/google/gson/JsonObject; + ARG 2 id + ARG 3 textures + CLASS class_8072 TrimMaterial + METHOD method_48744 getAppliedName (Lnet/minecraft/class_1741;)Ljava/lang/String; + ARG 1 armorMaterial diff --git a/mappings/net/minecraft/data/client/Model.mapping b/mappings/net/minecraft/data/client/Model.mapping index 401d5eace8..97a0162c66 100644 --- a/mappings/net/minecraft/data/client/Model.mapping +++ b/mappings/net/minecraft/data/client/Model.mapping @@ -15,11 +15,6 @@ CLASS net/minecraft/class_4942 net/minecraft/data/client/Model ARG 2 suffix ARG 3 textures ARG 4 modelCollector - METHOD method_25848 (Lcom/google/gson/JsonObject;Lnet/minecraft/class_4945;Lnet/minecraft/class_2960;)V - ARG 1 textureKey - ARG 2 textureId - METHOD method_25849 (Lcom/google/gson/JsonObject;Lnet/minecraft/class_2960;)V - ARG 1 parentId METHOD method_25850 createTextureMap (Lnet/minecraft/class_4944;)Ljava/util/Map; ARG 1 textures METHOD method_25852 upload (Lnet/minecraft/class_2960;Lnet/minecraft/class_4944;Ljava/util/function/BiConsumer;)Lnet/minecraft/class_2960; @@ -31,3 +26,18 @@ CLASS net/minecraft/class_4942 net/minecraft/data/client/Model ARG 2 suffix ARG 3 textures ARG 4 modelCollector + METHOD method_48524 createJson (Lnet/minecraft/class_2960;Ljava/util/Map;)Lcom/google/gson/JsonObject; + ARG 1 id + ARG 2 textures + METHOD method_48525 upload (Lnet/minecraft/class_2960;Lnet/minecraft/class_4944;Ljava/util/function/BiConsumer;Lnet/minecraft/class_4942$class_8073;)Lnet/minecraft/class_2960; + ARG 1 id + ARG 2 textures + ARG 3 modelCollector + ARG 4 jsonFactory + METHOD method_48527 (Lcom/google/gson/JsonObject;Lnet/minecraft/class_4945;Lnet/minecraft/class_2960;)V + ARG 1 textureKey + ARG 2 texture + CLASS class_8073 JsonFactory + METHOD create (Lnet/minecraft/class_2960;Ljava/util/Map;)Lcom/google/gson/JsonObject; + ARG 1 id + ARG 2 textures diff --git a/mappings/net/minecraft/data/client/ModelIds.mapping b/mappings/net/minecraft/data/client/ModelIds.mapping index 72625bb88a..2425be5eae 100644 --- a/mappings/net/minecraft/data/client/ModelIds.mapping +++ b/mappings/net/minecraft/data/client/ModelIds.mapping @@ -13,3 +13,7 @@ CLASS net/minecraft/class_4941 net/minecraft/data/client/ModelIds ARG 0 name METHOD method_25845 getMinecraftNamespacedItem (Ljava/lang/String;)Lnet/minecraft/class_2960; ARG 0 name + METHOD method_46196 (Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String; + ARG 1 path + METHOD method_46197 (Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String; + ARG 1 path diff --git a/mappings/net/minecraft/data/client/ModelProvider.mapping b/mappings/net/minecraft/data/client/ModelProvider.mapping index d7b4969f59..e3f1877144 100644 --- a/mappings/net/minecraft/data/client/ModelProvider.mapping +++ b/mappings/net/minecraft/data/client/ModelProvider.mapping @@ -1,10 +1,9 @@ CLASS net/minecraft/class_4916 net/minecraft/data/client/ModelProvider - FIELD field_22845 LOGGER Lorg/slf4j/Logger; - FIELD field_39375 blockstatesPathResolver Lnet/minecraft/class_2403$class_7489; - FIELD field_39376 modelsPathResolver Lnet/minecraft/class_2403$class_7489; - METHOD (Lnet/minecraft/class_2403;)V - ARG 1 generator - METHOD method_25735 writeJsons (Lnet/minecraft/class_7403;Ljava/util/Map;Ljava/util/function/Function;)V + FIELD field_39375 blockstatesPathResolver Lnet/minecraft/class_7784$class_7489; + FIELD field_39376 modelsPathResolver Lnet/minecraft/class_7784$class_7489; + METHOD (Lnet/minecraft/class_7784;)V + ARG 1 output + METHOD method_25735 writeJsons (Lnet/minecraft/class_7403;Ljava/util/Map;Ljava/util/function/Function;)Ljava/util/concurrent/CompletableFuture; ARG 1 cache ARG 2 models ARG 3 pathGetter @@ -17,8 +16,7 @@ CLASS net/minecraft/class_4916 net/minecraft/data/client/ModelProvider ARG 2 jsonSupplier METHOD method_25741 (Ljava/util/Set;Ljava/util/Map;Lnet/minecraft/class_2248;)V ARG 2 block - METHOD method_25742 (Ljava/util/function/Function;Lnet/minecraft/class_7403;Ljava/lang/Object;Ljava/util/function/Supplier;)V - ARG 2 id - ARG 3 jsonSupplier + METHOD method_25742 (Ljava/util/function/Function;Lnet/minecraft/class_7403;Ljava/util/Map$Entry;)Ljava/util/concurrent/CompletableFuture; + ARG 2 entry METHOD method_44110 (Lnet/minecraft/class_2248;)Ljava/nio/file/Path; ARG 1 block diff --git a/mappings/net/minecraft/data/client/Models.mapping b/mappings/net/minecraft/data/client/Models.mapping index 15d878b479..80e3d9bf9f 100644 --- a/mappings/net/minecraft/data/client/Models.mapping +++ b/mappings/net/minecraft/data/client/Models.mapping @@ -1,6 +1,9 @@ CLASS net/minecraft/class_4943 net/minecraft/data/client/Models FIELD field_22908 PARTICLE Lnet/minecraft/class_4942; FIELD field_22958 STEM_GROWTH_STAGES [Lnet/minecraft/class_4942; + FIELD field_42232 GENERATED_TWO_LAYERS Lnet/minecraft/class_4942; + FIELD field_42233 GENERATED_THREE_LAYERS Lnet/minecraft/class_4942; + FIELD field_43408 TEMPLATE_POTTED_FLOWERING_AZALEA_BUSH Lnet/minecraft/class_4942; METHOD method_25855 block (Ljava/lang/String;Ljava/lang/String;[Lnet/minecraft/class_4945;)Lnet/minecraft/class_4942; ARG 0 parent ARG 1 variant diff --git a/mappings/net/minecraft/data/client/PropertiesMap.mapping b/mappings/net/minecraft/data/client/PropertiesMap.mapping index 37b6c3f7a1..ba7face2fa 100644 --- a/mappings/net/minecraft/data/client/PropertiesMap.mapping +++ b/mappings/net/minecraft/data/client/PropertiesMap.mapping @@ -18,3 +18,5 @@ CLASS net/minecraft/class_4934 net/minecraft/data/client/PropertiesMap METHOD method_25821 withValues ([Lnet/minecraft/class_2769$class_4933;)Lnet/minecraft/class_4934; ARG 0 values METHOD method_25822 asString ()Ljava/lang/String; + METHOD method_25823 (Lnet/minecraft/class_2769$class_4933;)Ljava/lang/String; + ARG 0 value diff --git a/mappings/net/minecraft/data/client/TextureMap.mapping b/mappings/net/minecraft/data/client/TextureMap.mapping index e9b02a69a5..29fd59db4c 100644 --- a/mappings/net/minecraft/data/client/TextureMap.mapping +++ b/mappings/net/minecraft/data/client/TextureMap.mapping @@ -137,3 +137,24 @@ CLASS net/minecraft/class_4944 net/minecraft/data/client/TextureMap ARG 0 id METHOD method_42753 sculkShrieker (Z)Lnet/minecraft/class_4944; ARG 0 canSummon + METHOD method_46198 (Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String; + ARG 1 path + METHOD method_46199 (Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String; + ARG 1 path + METHOD method_46200 textureSideTop (Lnet/minecraft/class_2248;)Lnet/minecraft/class_4944; + ARG 0 block + METHOD method_46201 textureParticle (Lnet/minecraft/class_2248;)Lnet/minecraft/class_4944; + ARG 0 block + METHOD method_48529 layered (Lnet/minecraft/class_2960;Lnet/minecraft/class_2960;)Lnet/minecraft/class_4944; + ARG 0 layer0 + ARG 1 layer1 + METHOD method_48745 layered (Lnet/minecraft/class_2960;Lnet/minecraft/class_2960;Lnet/minecraft/class_2960;)Lnet/minecraft/class_4944; + ARG 0 layer0 + ARG 1 layer1 + ARG 2 layer2 + METHOD method_49379 flowerbed (Lnet/minecraft/class_2248;)Lnet/minecraft/class_4944; + ARG 0 block + METHOD method_50027 snifferEgg (Ljava/lang/String;)Lnet/minecraft/class_4944; + ARG 0 age + METHOD method_50028 pottedAzaleaBush (Lnet/minecraft/class_2248;)Lnet/minecraft/class_4944; + ARG 0 block diff --git a/mappings/net/minecraft/data/client/TexturedModel.mapping b/mappings/net/minecraft/data/client/TexturedModel.mapping index 2355cfcab4..038583e948 100644 --- a/mappings/net/minecraft/data/client/TexturedModel.mapping +++ b/mappings/net/minecraft/data/client/TexturedModel.mapping @@ -23,6 +23,10 @@ CLASS net/minecraft/class_4946 net/minecraft/data/client/TexturedModel FIELD field_23058 textures Lnet/minecraft/class_4944; FIELD field_23059 model Lnet/minecraft/class_4942; FIELD field_23959 SIDE_END_WALL Lnet/minecraft/class_4946$class_4947; + FIELD field_42952 FLOWERBED_1 Lnet/minecraft/class_4946$class_4947; + FIELD field_42953 FLOWERBED_2 Lnet/minecraft/class_4946$class_4947; + FIELD field_42954 FLOWERBED_3 Lnet/minecraft/class_4946$class_4947; + FIELD field_42955 FLOWERBED_4 Lnet/minecraft/class_4946$class_4947; METHOD (Lnet/minecraft/class_4944;Lnet/minecraft/class_4942;)V ARG 1 textures ARG 2 model diff --git a/mappings/net/minecraft/data/dev/NbtProvider.mapping b/mappings/net/minecraft/data/dev/NbtProvider.mapping index 6059c7abb2..e1c24bf2f3 100644 --- a/mappings/net/minecraft/data/dev/NbtProvider.mapping +++ b/mappings/net/minecraft/data/dev/NbtProvider.mapping @@ -1,21 +1,25 @@ CLASS net/minecraft/class_2461 net/minecraft/data/dev/NbtProvider - FIELD field_11449 root Lnet/minecraft/class_2403; FIELD field_11450 LOGGER Lorg/slf4j/Logger; - METHOD (Lnet/minecraft/class_2403;)V - ARG 1 root + FIELD field_40660 paths Ljava/lang/Iterable; + FIELD field_40661 output Lnet/minecraft/class_7784; + METHOD (Lnet/minecraft/class_7784;Ljava/util/Collection;)V + ARG 1 output + ARG 2 paths METHOD method_10493 convertNbtToSnbt (Lnet/minecraft/class_7403;Ljava/nio/file/Path;Ljava/lang/String;Ljava/nio/file/Path;)Ljava/nio/file/Path; ARG 0 writer ARG 1 inputPath ARG 2 filename ARG 3 outputPath - METHOD method_10494 (Lnet/minecraft/class_7403;Ljava/nio/file/Path;Ljava/nio/file/Path;Ljava/nio/file/Path;)V - ARG 4 path METHOD method_10495 (Ljava/nio/file/Path;)Z ARG 0 path METHOD method_10496 getLocation (Ljava/nio/file/Path;Ljava/nio/file/Path;)Ljava/lang/String; - ARG 1 targetPath - ARG 2 rootPath + ARG 0 inputPath + ARG 1 filePath METHOD method_32234 writeTo (Lnet/minecraft/class_7403;Ljava/nio/file/Path;Ljava/lang/String;)V ARG 0 writer ARG 1 path ARG 2 content + METHOD method_46581 (Lnet/minecraft/class_7403;Ljava/nio/file/Path;Ljava/nio/file/Path;Ljava/nio/file/Path;)Ljava/util/concurrent/CompletableFuture; + ARG 3 path + METHOD method_46583 (Ljava/util/concurrent/CompletableFuture;)Ljava/util/concurrent/CompletionStage; + ARG 0 future diff --git a/mappings/net/minecraft/data/family/BlockFamilies.mapping b/mappings/net/minecraft/data/family/BlockFamilies.mapping index 3b6d0a39ad..64f9125224 100644 --- a/mappings/net/minecraft/data/family/BlockFamilies.mapping +++ b/mappings/net/minecraft/data/family/BlockFamilies.mapping @@ -65,6 +65,9 @@ CLASS net/minecraft/class_5793 net/minecraft/data/family/BlockFamilies FIELD field_33688 WEATHERED_COPPER Lnet/minecraft/class_5794; FIELD field_38007 MANGROVE Lnet/minecraft/class_5794; FIELD field_38008 MUD_BRICK Lnet/minecraft/class_5794; + FIELD field_40589 BAMBOO Lnet/minecraft/class_5794; + FIELD field_40590 BAMBOO_MOSAIC Lnet/minecraft/class_5794; + FIELD field_42942 CHERRY Lnet/minecraft/class_5794; METHOD method_33467 getFamilies ()Ljava/util/stream/Stream; METHOD method_33468 register (Lnet/minecraft/class_2248;)Lnet/minecraft/class_5794$class_5795; ARG 0 baseBlock diff --git a/mappings/net/minecraft/data/family/BlockFamily.mapping b/mappings/net/minecraft/data/family/BlockFamily.mapping index 7d5588beb8..72581ac226 100644 --- a/mappings/net/minecraft/data/family/BlockFamily.mapping +++ b/mappings/net/minecraft/data/family/BlockFamily.mapping @@ -5,6 +5,7 @@ CLASS net/minecraft/class_5794 net/minecraft/data/family/BlockFamily FIELD field_28529 generateRecipes Z FIELD field_28530 group Ljava/lang/String; FIELD field_28531 unlockCriterionName Ljava/lang/String; + FIELD field_40591 requiredFeatures Lnet/minecraft/class_7699; METHOD (Lnet/minecraft/class_2248;)V ARG 1 baseBlock METHOD method_33469 getBaseBlock ()Lnet/minecraft/class_2248; @@ -12,7 +13,8 @@ CLASS net/minecraft/class_5794 net/minecraft/data/family/BlockFamily ARG 1 variant METHOD method_33474 getVariants ()Ljava/util/Map; METHOD method_33477 shouldGenerateModels ()Z - METHOD method_33478 shouldGenerateRecipes ()Z + METHOD method_33478 shouldGenerateRecipes (Lnet/minecraft/class_7699;)Z + ARG 1 enabledFeatures METHOD method_33479 getGroup ()Ljava/util/Optional; METHOD method_33480 getUnlockCriterionName ()Ljava/util/Optional; CLASS class_5795 Builder @@ -55,6 +57,14 @@ CLASS net/minecraft/class_5794 net/minecraft/data/family/BlockFamily ARG 1 block METHOD method_36544 cut (Lnet/minecraft/class_2248;)Lnet/minecraft/class_5794$class_5795; ARG 1 block + METHOD method_45964 requires ([Lnet/minecraft/class_7696;)Lnet/minecraft/class_5794$class_5795; + ARG 1 features + METHOD method_45965 mosaic (Lnet/minecraft/class_2248;)Lnet/minecraft/class_5794$class_5795; + ARG 1 block + METHOD method_45966 customFence (Lnet/minecraft/class_2248;)Lnet/minecraft/class_5794$class_5795; + ARG 1 block + METHOD method_45967 customFenceGate (Lnet/minecraft/class_2248;)Lnet/minecraft/class_5794$class_5795; + ARG 1 block CLASS class_5796 Variant FIELD field_28546 name Ljava/lang/String; METHOD (Ljava/lang/String;ILjava/lang/String;)V diff --git a/mappings/net/minecraft/data/report/BlockListProvider.mapping b/mappings/net/minecraft/data/report/BlockListProvider.mapping index 2ebe435cdf..4a25c213a9 100644 --- a/mappings/net/minecraft/data/report/BlockListProvider.mapping +++ b/mappings/net/minecraft/data/report/BlockListProvider.mapping @@ -1,4 +1,4 @@ CLASS net/minecraft/class_2422 net/minecraft/data/report/BlockListProvider - FIELD field_11307 generator Lnet/minecraft/class_2403; - METHOD (Lnet/minecraft/class_2403;)V - ARG 1 generator + FIELD field_40599 output Lnet/minecraft/class_7784; + METHOD (Lnet/minecraft/class_7784;)V + ARG 1 output diff --git a/mappings/net/minecraft/data/report/CommandSyntaxProvider.mapping b/mappings/net/minecraft/data/report/CommandSyntaxProvider.mapping index c09ccaeff0..988d79385b 100644 --- a/mappings/net/minecraft/data/report/CommandSyntaxProvider.mapping +++ b/mappings/net/minecraft/data/report/CommandSyntaxProvider.mapping @@ -1,4 +1,8 @@ CLASS net/minecraft/class_2425 net/minecraft/data/report/CommandSyntaxProvider - FIELD field_11321 generator Lnet/minecraft/class_2403; - METHOD (Lnet/minecraft/class_2403;)V - ARG 1 generator + FIELD field_40600 output Lnet/minecraft/class_7784; + FIELD field_40951 registryLookupFuture Ljava/util/concurrent/CompletableFuture; + METHOD (Lnet/minecraft/class_7784;Ljava/util/concurrent/CompletableFuture;)V + ARG 1 output + ARG 2 registryLookupFuture + METHOD method_46811 (Lnet/minecraft/class_7403;Ljava/nio/file/Path;Lnet/minecraft/class_7225$class_7874;)Ljava/util/concurrent/CompletionStage; + ARG 2 lookup diff --git a/mappings/net/minecraft/data/report/DynamicRegistriesProvider.mapping b/mappings/net/minecraft/data/report/DynamicRegistriesProvider.mapping new file mode 100644 index 0000000000..d67351a5c6 --- /dev/null +++ b/mappings/net/minecraft/data/report/DynamicRegistriesProvider.mapping @@ -0,0 +1,28 @@ +CLASS net/minecraft/class_5475 net/minecraft/data/report/DynamicRegistriesProvider + FIELD field_26377 LOGGER Lorg/slf4j/Logger; + FIELD field_40665 output Lnet/minecraft/class_7784; + FIELD field_40952 registryLookupFuture Ljava/util/concurrent/CompletableFuture; + METHOD (Lnet/minecraft/class_7784;Ljava/util/concurrent/CompletableFuture;)V + ARG 1 output + ARG 2 registryLookupFuture + METHOD method_39678 writeRegistryEntries (Lnet/minecraft/class_7403;Lnet/minecraft/class_7225$class_7874;Lcom/mojang/serialization/DynamicOps;Lnet/minecraft/class_7655$class_7657;)Ljava/util/Optional; + ARG 1 writer + ARG 2 lookup + ARG 3 ops + ARG 4 registry + METHOD method_39680 writeToPath (Ljava/nio/file/Path;Lnet/minecraft/class_7403;Lcom/mojang/serialization/DynamicOps;Lcom/mojang/serialization/Encoder;Ljava/lang/Object;)Ljava/util/concurrent/CompletableFuture; + ARG 0 path + ARG 1 cache + ARG 2 json + ARG 3 encoder + ARG 4 value + METHOD method_40362 (Ljava/nio/file/Path;Ljava/lang/String;)V + ARG 1 error + METHOD method_46592 (Lnet/minecraft/class_7784$class_7489;Lnet/minecraft/class_7403;Lcom/mojang/serialization/DynamicOps;Lnet/minecraft/class_7655$class_7657;Lnet/minecraft/class_6880$class_6883;)Ljava/util/concurrent/CompletableFuture; + ARG 4 entry + METHOD method_46813 (Lnet/minecraft/class_5321;Lnet/minecraft/class_7403;Lcom/mojang/serialization/DynamicOps;Lnet/minecraft/class_7655$class_7657;Lnet/minecraft/class_7225$class_7226;)Ljava/util/concurrent/CompletableFuture; + ARG 5 wrapper + METHOD method_46814 (Lnet/minecraft/class_7403;Lnet/minecraft/class_7225$class_7874;)Ljava/util/concurrent/CompletionStage; + ARG 2 lookup + METHOD method_46816 (Lnet/minecraft/class_7403;Lnet/minecraft/class_7225$class_7874;Lcom/mojang/serialization/DynamicOps;Lnet/minecraft/class_7655$class_7657;)Ljava/util/stream/Stream; + ARG 4 entry diff --git a/mappings/net/minecraft/data/report/RegistryDumpProvider.mapping b/mappings/net/minecraft/data/report/RegistryDumpProvider.mapping index 0d9092361a..93b4ed2b6a 100644 --- a/mappings/net/minecraft/data/report/RegistryDumpProvider.mapping +++ b/mappings/net/minecraft/data/report/RegistryDumpProvider.mapping @@ -1,7 +1,7 @@ CLASS net/minecraft/class_2427 net/minecraft/data/report/RegistryDumpProvider - FIELD field_11323 generator Lnet/minecraft/class_2403; - METHOD (Lnet/minecraft/class_2403;)V - ARG 1 generator + FIELD field_40601 output Lnet/minecraft/class_7784; + METHOD (Lnet/minecraft/class_7784;)V + ARG 1 output METHOD method_17174 (Lcom/google/gson/JsonObject;Lnet/minecraft/class_6880$class_6883;)V ARG 1 entry METHOD method_17175 toJson (Lnet/minecraft/class_2378;)Lcom/google/gson/JsonElement; diff --git a/mappings/net/minecraft/data/report/WorldgenProvider.mapping b/mappings/net/minecraft/data/report/WorldgenProvider.mapping deleted file mode 100644 index 8bc526f2b4..0000000000 --- a/mappings/net/minecraft/data/report/WorldgenProvider.mapping +++ /dev/null @@ -1,20 +0,0 @@ -CLASS net/minecraft/class_5475 net/minecraft/data/report/WorldgenProvider - FIELD field_26377 LOGGER Lorg/slf4j/Logger; - FIELD field_26379 generator Lnet/minecraft/class_2403; - METHOD (Lnet/minecraft/class_2403;)V - ARG 1 generator - METHOD method_39678 writeRegistryEntries (Lnet/minecraft/class_7403;Lnet/minecraft/class_5455;Lcom/mojang/serialization/DynamicOps;Lnet/minecraft/class_5455$class_5456;)V - ARG 1 writer - ARG 2 registryManager - ARG 3 ops - ARG 4 registry - METHOD method_39680 writeToPath (Ljava/nio/file/Path;Lnet/minecraft/class_7403;Lcom/mojang/serialization/DynamicOps;Lcom/mojang/serialization/Encoder;Ljava/lang/Object;)V - ARG 0 path - ARG 1 cache - ARG 2 json - ARG 3 encoder - ARG 4 value - METHOD method_39682 (Lnet/minecraft/class_7403;Lnet/minecraft/class_5455;Lcom/mojang/serialization/DynamicOps;Lnet/minecraft/class_5455$class_5456;)V - ARG 4 info - METHOD method_40362 (Ljava/nio/file/Path;Ljava/lang/String;)V - ARG 1 error diff --git a/mappings/net/minecraft/data/server/AbstractTagProvider.mapping b/mappings/net/minecraft/data/server/AbstractTagProvider.mapping deleted file mode 100644 index b347a6c4ea..0000000000 --- a/mappings/net/minecraft/data/server/AbstractTagProvider.mapping +++ /dev/null @@ -1,40 +0,0 @@ -CLASS net/minecraft/class_2474 net/minecraft/data/server/AbstractTagProvider - FIELD field_11479 LOGGER Lorg/slf4j/Logger; - FIELD field_11481 tagBuilders Ljava/util/Map; - FIELD field_11482 registry Lnet/minecraft/class_2378; - FIELD field_39380 pathResolver Lnet/minecraft/class_2403$class_7489; - METHOD (Lnet/minecraft/class_2403;Lnet/minecraft/class_2378;)V - ARG 1 root - ARG 2 registry - METHOD method_10512 getOrCreateTagBuilder (Lnet/minecraft/class_6862;)Lnet/minecraft/class_2474$class_5124; - ARG 1 tag - METHOD method_10514 configure ()V - METHOD method_27046 (Lnet/minecraft/class_7403;Lnet/minecraft/class_2960;Lnet/minecraft/class_3495;)V - ARG 2 id - ARG 3 builder - METHOD method_27169 getTagBuilder (Lnet/minecraft/class_6862;)Lnet/minecraft/class_3495; - ARG 1 tag - METHOD method_27170 (Lnet/minecraft/class_2960;)Lnet/minecraft/class_3495; - ARG 0 id - METHOD method_33130 (Lnet/minecraft/class_3497;)Z - ARG 1 tag - CLASS class_5124 ObjectBuilder - FIELD field_23960 builder Lnet/minecraft/class_3495; - FIELD field_23961 registry Lnet/minecraft/class_2378; - METHOD (Lnet/minecraft/class_3495;Lnet/minecraft/class_2378;)V - ARG 1 builder - ARG 2 registry - METHOD method_26792 addTag (Lnet/minecraft/class_6862;)Lnet/minecraft/class_2474$class_5124; - ARG 1 identifiedTag - METHOD method_26793 add (Ljava/lang/Object;)Lnet/minecraft/class_2474$class_5124; - ARG 1 element - METHOD method_26795 add ([Ljava/lang/Object;)Lnet/minecraft/class_2474$class_5124; - ARG 1 elements - METHOD method_27171 (Lnet/minecraft/class_2960;)V - ARG 1 id - METHOD method_35922 addOptional (Lnet/minecraft/class_2960;)Lnet/minecraft/class_2474$class_5124; - ARG 1 id - METHOD method_35923 addOptionalTag (Lnet/minecraft/class_2960;)Lnet/minecraft/class_2474$class_5124; - ARG 1 id - METHOD method_40565 add ([Lnet/minecraft/class_5321;)Lnet/minecraft/class_2474$class_5124; - ARG 1 keys diff --git a/mappings/net/minecraft/data/server/AdvancementProvider.mapping b/mappings/net/minecraft/data/server/AdvancementProvider.mapping deleted file mode 100644 index 04aab33c27..0000000000 --- a/mappings/net/minecraft/data/server/AdvancementProvider.mapping +++ /dev/null @@ -1,8 +0,0 @@ -CLASS net/minecraft/class_2409 net/minecraft/data/server/AdvancementProvider - FIELD field_11289 tabGenerators Ljava/util/List; - FIELD field_11290 LOGGER Lorg/slf4j/Logger; - FIELD field_39372 pathResolver Lnet/minecraft/class_2403$class_7489; - METHOD (Lnet/minecraft/class_2403;)V - ARG 1 root - METHOD method_10333 (Ljava/util/Set;Lnet/minecraft/class_7403;Lnet/minecraft/class_161;)V - ARG 3 advancement diff --git a/mappings/net/minecraft/data/server/AdventureTabAdvancementGenerator.mapping b/mappings/net/minecraft/data/server/AdventureTabAdvancementGenerator.mapping deleted file mode 100644 index c865ba58fe..0000000000 --- a/mappings/net/minecraft/data/server/AdventureTabAdvancementGenerator.mapping +++ /dev/null @@ -1,19 +0,0 @@ -CLASS net/minecraft/class_2412 net/minecraft/data/server/AdventureTabAdvancementGenerator - FIELD field_11294 MONSTERS [Lnet/minecraft/class_1299; - FIELD field_35091 OVERWORLD_HEIGHT I - FIELD field_35092 OVERWORLD_MAX_Y I - FIELD field_35093 OVERWORLD_MIN_Y I - FIELD field_35094 OVERWORLD_BEDROCK_LAYER_HEIGHT I - METHOD accept (Ljava/lang/Object;)V - ARG 1 exporter - METHOD method_10336 requireListedMobsKilled (Lnet/minecraft/class_161$class_162;)Lnet/minecraft/class_161$class_162; - ARG 1 builder - METHOD method_10337 requireListedBiomesVisited (Lnet/minecraft/class_161$class_162;Ljava/util/List;)Lnet/minecraft/class_161$class_162; - ARG 0 builder - ARG 1 biomes - METHOD method_37315 createLookingAtEntityUsing (Lnet/minecraft/class_1299;Lnet/minecraft/class_1792;)Lnet/minecraft/class_6409$class_6410; - ARG 0 entity - ARG 1 item - METHOD method_37316 createLightningStrike (Lnet/minecraft/class_2096$class_2100;Lnet/minecraft/class_2048;)Lnet/minecraft/class_6405$class_6406; - ARG 0 range - ARG 1 entity diff --git a/mappings/net/minecraft/data/server/BannerPatternTagProvider.mapping b/mappings/net/minecraft/data/server/BannerPatternTagProvider.mapping deleted file mode 100644 index d62357eab0..0000000000 --- a/mappings/net/minecraft/data/server/BannerPatternTagProvider.mapping +++ /dev/null @@ -1,3 +0,0 @@ -CLASS net/minecraft/class_7458 net/minecraft/data/server/BannerPatternTagProvider - METHOD (Lnet/minecraft/class_2403;)V - ARG 1 dataGenerator diff --git a/mappings/net/minecraft/data/server/BarterLootTableGenerator.mapping b/mappings/net/minecraft/data/server/BarterLootTableGenerator.mapping deleted file mode 100644 index d293585e6f..0000000000 --- a/mappings/net/minecraft/data/server/BarterLootTableGenerator.mapping +++ /dev/null @@ -1,3 +0,0 @@ -CLASS net/minecraft/class_4845 net/minecraft/data/server/BarterLootTableGenerator - METHOD accept (Ljava/lang/Object;)V - ARG 1 exporter diff --git a/mappings/net/minecraft/data/server/BiomeParametersProvider.mapping b/mappings/net/minecraft/data/server/BiomeParametersProvider.mapping index dd53926a53..9ef27ab496 100644 --- a/mappings/net/minecraft/data/server/BiomeParametersProvider.mapping +++ b/mappings/net/minecraft/data/server/BiomeParametersProvider.mapping @@ -1,11 +1,13 @@ CLASS net/minecraft/class_7228 net/minecraft/data/server/BiomeParametersProvider FIELD field_38012 LOGGER Lorg/slf4j/Logger; FIELD field_39373 path Ljava/nio/file/Path; - METHOD (Lnet/minecraft/class_2403;)V - ARG 1 dataGenerator - METHOD method_42028 (Lnet/minecraft/class_2378;Lnet/minecraft/class_7403;Lcom/mojang/serialization/DynamicOps;Lcom/mojang/datafixers/util/Pair;)V - ARG 4 preset - METHOD method_42030 write (Ljava/nio/file/Path;Lnet/minecraft/class_7403;Lcom/mojang/serialization/DynamicOps;Lcom/mojang/serialization/Encoder;Ljava/lang/Object;)V + FIELD field_40950 registryLookupFuture Ljava/util/concurrent/CompletableFuture; + FIELD field_43090 BIOME_KEY_CODEC Lcom/mojang/serialization/MapCodec; + FIELD field_43091 BIOME_ENTRY_CODEC Lcom/mojang/serialization/Codec; + METHOD (Lnet/minecraft/class_7784;Ljava/util/concurrent/CompletableFuture;)V + ARG 1 output + ARG 2 registryLookupFuture + METHOD method_42030 write (Ljava/nio/file/Path;Lnet/minecraft/class_7403;Lcom/mojang/serialization/DynamicOps;Lcom/mojang/serialization/Encoder;Ljava/lang/Object;)Ljava/util/concurrent/CompletableFuture; ARG 0 path ARG 1 writer ARG 2 ops @@ -15,3 +17,8 @@ CLASS net/minecraft/class_7228 net/minecraft/data/server/BiomeParametersProvider ARG 1 error METHOD method_42032 resolvePath (Lnet/minecraft/class_2960;)Ljava/nio/file/Path; ARG 1 id + METHOD method_46810 (Lnet/minecraft/class_7403;Lnet/minecraft/class_7225$class_7874;)Ljava/util/concurrent/CompletionStage; + ARG 2 lookup + METHOD method_49648 (Ljava/util/List;Lnet/minecraft/class_7403;Lcom/mojang/serialization/DynamicOps;Lnet/minecraft/class_8197$class_5305;Lnet/minecraft/class_6544$class_6547;)V + ARG 4 preset + ARG 5 entries diff --git a/mappings/net/minecraft/data/server/BiomeTagProvider.mapping b/mappings/net/minecraft/data/server/BiomeTagProvider.mapping deleted file mode 100644 index 92c3f6daf4..0000000000 --- a/mappings/net/minecraft/data/server/BiomeTagProvider.mapping +++ /dev/null @@ -1,7 +0,0 @@ -CLASS net/minecraft/class_6957 net/minecraft/data/server/BiomeTagProvider - METHOD (Lnet/minecraft/class_2403;)V - ARG 1 dataGenerator - METHOD method_42040 (Lnet/minecraft/class_2474$class_5124;Lnet/minecraft/class_5321;)V - ARG 1 biome - METHOD method_42041 (Lnet/minecraft/class_2474$class_5124;Lnet/minecraft/class_5321;)V - ARG 1 biome diff --git a/mappings/net/minecraft/data/server/BlockLootTableGenerator.mapping b/mappings/net/minecraft/data/server/BlockLootTableGenerator.mapping deleted file mode 100644 index 967b6f4e1a..0000000000 --- a/mappings/net/minecraft/data/server/BlockLootTableGenerator.mapping +++ /dev/null @@ -1,309 +0,0 @@ -CLASS net/minecraft/class_2430 net/minecraft/data/server/BlockLootTableGenerator - FIELD field_11336 WITH_SILK_TOUCH Lnet/minecraft/class_5341$class_210; - FIELD field_11337 WITHOUT_SILK_TOUCH Lnet/minecraft/class_5341$class_210; - FIELD field_11338 JUNGLE_SAPLING_DROP_CHANCE [F - FIELD field_11339 SAPLING_DROP_CHANCE [F - FIELD field_11340 EXPLOSION_IMMUNE Ljava/util/Set; - FIELD field_11341 WITHOUT_SILK_TOUCH_NOR_SHEARS Lnet/minecraft/class_5341$class_210; - FIELD field_11342 WITH_SILK_TOUCH_OR_SHEARS Lnet/minecraft/class_5341$class_210; - FIELD field_11343 WITH_SHEARS Lnet/minecraft/class_5341$class_210; - FIELD field_16493 lootTables Ljava/util/Map; - FIELD field_38468 LEAVES_STICK_DROP_CHANCE [F - METHOD accept (Ljava/lang/Object;)V - ARG 1 exporter - METHOD method_10371 grassDrops (Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53; - ARG 0 dropWithShears - METHOD method_10372 dropsWithShears (Lnet/minecraft/class_1935;)Lnet/minecraft/class_52$class_53; - ARG 0 drop - METHOD method_10373 dropsWithSilkTouch (Lnet/minecraft/class_1935;)Lnet/minecraft/class_52$class_53; - ARG 0 drop - METHOD method_10375 dropsWithProperty (Lnet/minecraft/class_2248;Lnet/minecraft/class_2769;Ljava/lang/Comparable;)Lnet/minecraft/class_52$class_53; - ARG 0 drop - ARG 1 property - ARG 2 value - METHOD method_10377 oreDrops (Lnet/minecraft/class_2248;Lnet/minecraft/class_1792;)Lnet/minecraft/class_52$class_53; - ARG 0 dropWithSilkTouch - ARG 1 drop - METHOD method_10378 oakLeavesDrop (Lnet/minecraft/class_2248;Lnet/minecraft/class_2248;[F)Lnet/minecraft/class_52$class_53; - ARG 0 leaves - ARG 1 drop - ARG 2 chance - METHOD method_10380 dropsWithShears (Lnet/minecraft/class_2248;Lnet/minecraft/class_79$class_80;)Lnet/minecraft/class_52$class_53; - ARG 0 drop - ARG 1 child - METHOD method_10381 drops (Lnet/minecraft/class_2248;Lnet/minecraft/class_5341$class_210;Lnet/minecraft/class_79$class_80;)Lnet/minecraft/class_52$class_53; - ARG 0 drop - ARG 1 conditionBuilder - ARG 2 child - METHOD method_10382 drops (Lnet/minecraft/class_2248;Lnet/minecraft/class_1935;)Lnet/minecraft/class_52$class_53; - ARG 0 dropWithSilkTouch - ARG 1 drop - METHOD method_10383 slabDrops (Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53; - ARG 0 drop - METHOD method_10384 drops (Lnet/minecraft/class_1935;Lnet/minecraft/class_5658;)Lnet/minecraft/class_52$class_53; - ARG 0 drop - ARG 1 count - METHOD method_10385 mushroomBlockDrops (Lnet/minecraft/class_2248;Lnet/minecraft/class_1935;)Lnet/minecraft/class_52$class_53; - ARG 0 dropWithSilkTouch - ARG 1 drop - METHOD method_10386 drops (Lnet/minecraft/class_2248;Lnet/minecraft/class_1935;Lnet/minecraft/class_5658;)Lnet/minecraft/class_52$class_53; - ARG 0 dropWithSilkTouch - ARG 1 drop - ARG 2 count - METHOD method_10387 cropStemDrops (Lnet/minecraft/class_2248;Lnet/minecraft/class_1792;)Lnet/minecraft/class_52$class_53; - ARG 0 stem - ARG 1 drop - METHOD method_10388 dropsWithSilkTouchOrShears (Lnet/minecraft/class_2248;Lnet/minecraft/class_79$class_80;)Lnet/minecraft/class_52$class_53; - ARG 0 drop - ARG 1 child - METHOD method_10389 pottedPlantDrops (Lnet/minecraft/class_1935;)Lnet/minecraft/class_52$class_53; - ARG 0 plant - METHOD method_10390 leavesDrop (Lnet/minecraft/class_2248;Lnet/minecraft/class_2248;[F)Lnet/minecraft/class_52$class_53; - ARG 0 leaves - ARG 1 drop - ARG 2 chance - METHOD method_10391 cropDrops (Lnet/minecraft/class_2248;Lnet/minecraft/class_1792;Lnet/minecraft/class_1792;Lnet/minecraft/class_5341$class_210;)Lnet/minecraft/class_52$class_53; - ARG 0 crop - ARG 1 product - ARG 2 seeds - ARG 3 condition - METHOD method_10392 addSurvivesExplosionCondition (Lnet/minecraft/class_1935;Lnet/minecraft/class_192;)Lnet/minecraft/class_192; - ARG 0 drop - ARG 1 builder - METHOD method_10393 applyExplosionDecay (Lnet/minecraft/class_1935;Lnet/minecraft/class_116;)Lnet/minecraft/class_116; - ARG 0 drop - ARG 1 builder - METHOD method_10394 drops (Lnet/minecraft/class_1935;)Lnet/minecraft/class_52$class_53; - ARG 0 drop - METHOD method_10395 dropsNothing ()Lnet/minecraft/class_52$class_53; - METHOD method_10396 nameableContainerDrops (Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53; - ARG 0 drop - METHOD method_10397 dropsWithSilkTouch (Lnet/minecraft/class_2248;Lnet/minecraft/class_79$class_80;)Lnet/minecraft/class_52$class_53; - ARG 0 drop - ARG 1 child - METHOD method_16232 (Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53; - ARG 0 block - METHOD method_16233 (Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53; - ARG 0 block - METHOD method_16235 (Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53; - ARG 0 block - METHOD method_16237 (Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53; - ARG 0 block - METHOD method_16238 addDropWithSilkTouch (Lnet/minecraft/class_2248;Lnet/minecraft/class_2248;)V - ARG 1 block - ARG 2 drop - METHOD method_16241 (Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53; - ARG 0 block - METHOD method_16242 (Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53; - ARG 0 block - METHOD method_16243 (Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53; - ARG 0 block - METHOD method_16245 (Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53; - ARG 0 block - METHOD method_16246 (Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53; - ARG 0 block - METHOD method_16249 (Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53; - ARG 0 block - METHOD method_16250 (Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53; - ARG 0 block - METHOD method_16251 (Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53; - ARG 0 block - METHOD method_16252 (Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53; - ARG 0 block - METHOD method_16254 (Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53; - ARG 0 block - METHOD method_16255 (Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53; - ARG 0 block - 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_16263 (Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53; - ARG 0 block - METHOD method_16264 (Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53; - ARG 0 block - METHOD method_16266 (Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53; - ARG 0 block - METHOD method_16268 (Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53; - ARG 0 block - METHOD method_16269 (Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53; - ARG 0 block - METHOD method_16270 (Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53; - ARG 0 block - METHOD method_16273 (Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53; - ARG 0 block - METHOD method_16275 (Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53; - ARG 0 block - METHOD method_16277 (Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53; - ARG 0 block - METHOD method_16280 (Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53; - ARG 0 block - METHOD method_16282 (Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53; - ARG 0 block - METHOD method_16283 (Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53; - ARG 0 block - METHOD method_16284 (Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53; - ARG 0 block - METHOD method_16285 addPottedPlantDrop (Lnet/minecraft/class_2248;)V - ARG 1 block - METHOD method_16286 (Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53; - ARG 0 block - METHOD method_16290 (Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53; - ARG 0 block - METHOD method_16292 (Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53; - ARG 0 block - METHOD method_16293 addDrop (Lnet/minecraft/class_2248;Ljava/util/function/Function;)V - ARG 1 block - ARG 2 lootTableFunction - METHOD method_16295 (Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53; - ARG 0 block - METHOD method_16296 (Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53; - ARG 0 block - METHOD method_16300 (Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53; - ARG 0 block - METHOD method_16302 (Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53; - ARG 0 block - METHOD method_16303 (Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53; - ARG 0 block - METHOD method_16306 (Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53; - ARG 0 block - METHOD method_16307 (Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53; - ARG 0 block - METHOD method_16310 (Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53; - ARG 0 block - METHOD method_16311 (Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53; - ARG 0 block - METHOD method_16312 (Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53; - ARG 0 block - METHOD method_16314 (Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53; - ARG 0 block - METHOD method_16316 (Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53; - ARG 0 block - METHOD method_16317 (Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53; - ARG 0 block - METHOD method_16324 (Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53; - ARG 0 block - METHOD method_16325 (Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53; - ARG 0 block - METHOD method_16326 (Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53; - ARG 0 block - METHOD method_16327 (Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53; - ARG 0 block - METHOD method_16328 (Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53; - ARG 0 block - 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; - ARG 0 drop - METHOD method_22142 beeNestDrops (Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53; - ARG 0 drop - METHOD method_22143 beehiveDrops (Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53; - ARG 0 drop - METHOD method_23229 attachedCropStemDrops (Lnet/minecraft/class_2248;Lnet/minecraft/class_1792;)Lnet/minecraft/class_52$class_53; - ARG 0 stem - ARG 1 drop - METHOD method_23230 (Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53; - ARG 0 block - METHOD method_23231 (Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53; - ARG 0 block - METHOD method_24817 doorDrops (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 - METHOD method_26277 (Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53; - ARG 0 block - METHOD method_27164 (Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53; - ARG 0 block - METHOD method_27165 (Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53; - ARG 0 block - METHOD method_29399 (Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53; - ARG 0 block - METHOD method_29400 (Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53; - ARG 0 block - METHOD method_30157 (Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53; - ARG 0 block - METHOD method_30158 tallGrassDrops (Lnet/minecraft/class_2248;Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53; - ARG 0 tallGrass - ARG 1 grass - METHOD method_30159 seagrassDrops (Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53; - ARG 0 seagrass - METHOD method_32224 candleDrops (Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53; - ARG 0 candle - METHOD method_32225 candleCakeDrops (Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53; - ARG 0 candle - METHOD method_32226 (Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53; - ARG 0 block - METHOD method_33707 (Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53; - ARG 0 block - METHOD method_33708 (Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53; - ARG 0 block - METHOD method_33709 glowBerryDrops (Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53; - ARG 0 drop - METHOD method_34047 (Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53; - ARG 0 block - METHOD method_34048 (Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53; - ARG 0 block - METHOD method_34049 (Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53; - ARG 0 block - METHOD method_34050 (Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53; - ARG 0 block - METHOD method_34051 (Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53; - ARG 0 block - METHOD method_34052 (Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53; - ARG 0 block - METHOD method_34053 (Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53; - ARG 0 block - METHOD method_34054 (Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53; - ARG 0 block - METHOD method_34055 (Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53; - ARG 0 block - METHOD method_34056 (Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53; - ARG 0 block - METHOD method_34057 lapisOreDrops (Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53; - ARG 0 ore - METHOD method_34058 redstoneOreDrops (Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53; - ARG 0 ore - METHOD method_34594 (Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53; - ARG 0 block - METHOD method_34595 (Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53; - ARG 0 block - METHOD method_34596 (Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53; - ARG 0 block - METHOD method_34597 (Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53; - ARG 0 flowerPot - METHOD method_34598 (Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53; - ARG 0 block - METHOD method_34599 (Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53; - ARG 0 block - METHOD method_34600 (Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53; - ARG 0 block - METHOD method_34601 (Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53; - ARG 0 block - METHOD method_34602 (Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53; - ARG 0 block - METHOD method_36226 (Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53; - ARG 0 block - METHOD method_36229 (Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53; - ARG 0 block - METHOD method_36230 (Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53; - ARG 0 block - METHOD method_36231 (Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53; - ARG 0 block - METHOD method_36545 copperOreDrops (Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53; - ARG 0 ore - METHOD method_37108 multifaceGrowthDrops (Lnet/minecraft/class_2248;Lnet/minecraft/class_5341$class_210;)Lnet/minecraft/class_52$class_53; - ARG 0 multifaceGrowthBlock - ARG 1 conditionBuilder - METHOD method_42752 mangroveLeavesDrop (Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53; - ARG 0 leaves - METHOD method_43810 (Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53; - ARG 0 block - METHOD method_43813 (Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53; - ARG 0 block diff --git a/mappings/net/minecraft/data/server/BlockTagProvider.mapping b/mappings/net/minecraft/data/server/BlockTagProvider.mapping deleted file mode 100644 index 8c70185ba8..0000000000 --- a/mappings/net/minecraft/data/server/BlockTagProvider.mapping +++ /dev/null @@ -1,3 +0,0 @@ -CLASS net/minecraft/class_2466 net/minecraft/data/server/BlockTagProvider - METHOD (Lnet/minecraft/class_2403;)V - ARG 1 root diff --git a/mappings/net/minecraft/data/server/CatVariantTagProvider.mapping b/mappings/net/minecraft/data/server/CatVariantTagProvider.mapping deleted file mode 100644 index 87a9d51cf7..0000000000 --- a/mappings/net/minecraft/data/server/CatVariantTagProvider.mapping +++ /dev/null @@ -1,3 +0,0 @@ -CLASS net/minecraft/class_7393 net/minecraft/data/server/CatVariantTagProvider - METHOD (Lnet/minecraft/class_2403;)V - ARG 1 dataGenerator diff --git a/mappings/net/minecraft/data/server/ChestLootTableGenerator.mapping b/mappings/net/minecraft/data/server/ChestLootTableGenerator.mapping deleted file mode 100644 index f5212fba11..0000000000 --- a/mappings/net/minecraft/data/server/ChestLootTableGenerator.mapping +++ /dev/null @@ -1,3 +0,0 @@ -CLASS net/minecraft/class_2432 net/minecraft/data/server/ChestLootTableGenerator - METHOD accept (Ljava/lang/Object;)V - ARG 1 exporter diff --git a/mappings/net/minecraft/data/server/EndTabAdvancementGenerator.mapping b/mappings/net/minecraft/data/server/EndTabAdvancementGenerator.mapping deleted file mode 100644 index 33e017007f..0000000000 --- a/mappings/net/minecraft/data/server/EndTabAdvancementGenerator.mapping +++ /dev/null @@ -1,3 +0,0 @@ -CLASS net/minecraft/class_2419 net/minecraft/data/server/EndTabAdvancementGenerator - METHOD accept (Ljava/lang/Object;)V - ARG 1 exporter diff --git a/mappings/net/minecraft/data/server/EntityLootTableGenerator.mapping b/mappings/net/minecraft/data/server/EntityLootTableGenerator.mapping deleted file mode 100644 index c3d2e3ff81..0000000000 --- a/mappings/net/minecraft/data/server/EntityLootTableGenerator.mapping +++ /dev/null @@ -1,17 +0,0 @@ -CLASS net/minecraft/class_2434 net/minecraft/data/server/EntityLootTableGenerator - FIELD field_11344 NEEDS_ENTITY_ON_FIRE Lnet/minecraft/class_2048$class_2049; - FIELD field_16543 lootTables Ljava/util/Map; - FIELD field_19339 ENTITY_TYPES_IN_MISC_GROUP_TO_CHECK Ljava/util/Set; - METHOD accept (Ljava/lang/Object;)V - ARG 1 exporter - 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 - METHOD method_43226 killedByFrog ()Lnet/minecraft/class_5341$class_210; - METHOD method_43227 killedByFrog (Lnet/minecraft/class_7106;)Lnet/minecraft/class_5341$class_210; - ARG 1 variant diff --git a/mappings/net/minecraft/data/server/EntityTypeTagProvider.mapping b/mappings/net/minecraft/data/server/EntityTypeTagProvider.mapping deleted file mode 100644 index 5c439d95a3..0000000000 --- a/mappings/net/minecraft/data/server/EntityTypeTagProvider.mapping +++ /dev/null @@ -1,3 +0,0 @@ -CLASS net/minecraft/class_2467 net/minecraft/data/server/EntityTypeTagProvider - METHOD (Lnet/minecraft/class_2403;)V - ARG 1 root diff --git a/mappings/net/minecraft/data/server/FlatLevelGeneratorPresetTagProvider.mapping b/mappings/net/minecraft/data/server/FlatLevelGeneratorPresetTagProvider.mapping deleted file mode 100644 index e258435aac..0000000000 --- a/mappings/net/minecraft/data/server/FlatLevelGeneratorPresetTagProvider.mapping +++ /dev/null @@ -1,3 +0,0 @@ -CLASS net/minecraft/class_7229 net/minecraft/data/server/FlatLevelGeneratorPresetTagProvider - METHOD (Lnet/minecraft/class_2403;)V - ARG 1 dataGenerator diff --git a/mappings/net/minecraft/data/server/FluidTagProvider.mapping b/mappings/net/minecraft/data/server/FluidTagProvider.mapping deleted file mode 100644 index 0314466b58..0000000000 --- a/mappings/net/minecraft/data/server/FluidTagProvider.mapping +++ /dev/null @@ -1,3 +0,0 @@ -CLASS net/minecraft/class_2469 net/minecraft/data/server/FluidTagProvider - METHOD (Lnet/minecraft/class_2403;)V - ARG 1 root diff --git a/mappings/net/minecraft/data/server/GameEventTagProvider.mapping b/mappings/net/minecraft/data/server/GameEventTagProvider.mapping deleted file mode 100644 index 7ce32da1d2..0000000000 --- a/mappings/net/minecraft/data/server/GameEventTagProvider.mapping +++ /dev/null @@ -1,4 +0,0 @@ -CLASS net/minecraft/class_5746 net/minecraft/data/server/GameEventTagProvider - FIELD field_38363 BASIC_GAME_EVENTS [Lnet/minecraft/class_5712; - METHOD (Lnet/minecraft/class_2403;)V - ARG 1 root diff --git a/mappings/net/minecraft/data/server/GiftLootTableGenerator.mapping b/mappings/net/minecraft/data/server/GiftLootTableGenerator.mapping deleted file mode 100644 index 445e02cd5e..0000000000 --- a/mappings/net/minecraft/data/server/GiftLootTableGenerator.mapping +++ /dev/null @@ -1,3 +0,0 @@ -CLASS net/minecraft/class_3714 net/minecraft/data/server/GiftLootTableGenerator - METHOD accept (Ljava/lang/Object;)V - ARG 1 exporter diff --git a/mappings/net/minecraft/data/server/InstrumentTagProvider.mapping b/mappings/net/minecraft/data/server/InstrumentTagProvider.mapping deleted file mode 100644 index 1d80f2fcb8..0000000000 --- a/mappings/net/minecraft/data/server/InstrumentTagProvider.mapping +++ /dev/null @@ -1,3 +0,0 @@ -CLASS net/minecraft/class_7459 net/minecraft/data/server/InstrumentTagProvider - METHOD (Lnet/minecraft/class_2403;)V - ARG 1 dataGenerator diff --git a/mappings/net/minecraft/data/server/ItemTagProvider.mapping b/mappings/net/minecraft/data/server/ItemTagProvider.mapping deleted file mode 100644 index e8090f40b0..0000000000 --- a/mappings/net/minecraft/data/server/ItemTagProvider.mapping +++ /dev/null @@ -1,8 +0,0 @@ -CLASS net/minecraft/class_2471 net/minecraft/data/server/ItemTagProvider - FIELD field_23783 blockTags Ljava/util/function/Function; - METHOD (Lnet/minecraft/class_2403;Lnet/minecraft/class_2466;)V - ARG 1 root - ARG 2 blockTagsProvider - METHOD method_10505 copy (Lnet/minecraft/class_6862;Lnet/minecraft/class_6862;)V - ARG 1 blockTag - ARG 2 itemTag diff --git a/mappings/net/minecraft/data/server/LootTableProvider.mapping b/mappings/net/minecraft/data/server/LootTableProvider.mapping deleted file mode 100644 index 3ef45c8146..0000000000 --- a/mappings/net/minecraft/data/server/LootTableProvider.mapping +++ /dev/null @@ -1,22 +0,0 @@ -CLASS net/minecraft/class_2438 net/minecraft/data/server/LootTableProvider - FIELD field_11354 lootTypeGenerators Ljava/util/List; - FIELD field_11355 LOGGER Lorg/slf4j/Logger; - FIELD field_39374 pathResolver Lnet/minecraft/class_2403$class_7489; - METHOD (Lnet/minecraft/class_2403;)V - ARG 1 root - METHOD method_10407 (Ljava/lang/String;Ljava/lang/String;)V - ARG 0 name - ARG 1 message - METHOD method_10408 (Lnet/minecraft/class_7403;Lnet/minecraft/class_2960;Lnet/minecraft/class_52;)V - ARG 2 id - ARG 3 table - METHOD method_10410 (Ljava/util/Map;Lcom/mojang/datafixers/util/Pair;)V - ARG 1 generator - METHOD method_10411 (Lnet/minecraft/class_58;Lnet/minecraft/class_2960;Lnet/minecraft/class_52;)V - ARG 1 id - ARG 2 table - METHOD method_10412 (Ljava/util/Map;Lcom/mojang/datafixers/util/Pair;Lnet/minecraft/class_2960;Lnet/minecraft/class_52$class_53;)V - ARG 2 id - ARG 3 builder - METHOD method_22825 (Lnet/minecraft/class_2960;)Lnet/minecraft/class_5341; - ARG 0 id diff --git a/mappings/net/minecraft/data/server/NetherTabAdvancementGenerator.mapping b/mappings/net/minecraft/data/server/NetherTabAdvancementGenerator.mapping deleted file mode 100644 index 8c0db39886..0000000000 --- a/mappings/net/minecraft/data/server/NetherTabAdvancementGenerator.mapping +++ /dev/null @@ -1,5 +0,0 @@ -CLASS net/minecraft/class_2416 net/minecraft/data/server/NetherTabAdvancementGenerator - FIELD field_24614 NETHER_BIOMES Ljava/util/List; - FIELD field_25712 PIGLIN_DISTRACTION_PREDICATE Lnet/minecraft/class_2048$class_5258; - METHOD accept (Ljava/lang/Object;)V - ARG 1 exporter diff --git a/mappings/net/minecraft/data/server/PaintingVariantTagProvider.mapping b/mappings/net/minecraft/data/server/PaintingVariantTagProvider.mapping deleted file mode 100644 index 027da95b54..0000000000 --- a/mappings/net/minecraft/data/server/PaintingVariantTagProvider.mapping +++ /dev/null @@ -1,3 +0,0 @@ -CLASS net/minecraft/class_7416 net/minecraft/data/server/PaintingVariantTagProvider - METHOD (Lnet/minecraft/class_2403;)V - ARG 1 dataGenerator diff --git a/mappings/net/minecraft/data/server/PointOfInterestTypeTagProvider.mapping b/mappings/net/minecraft/data/server/PointOfInterestTypeTagProvider.mapping deleted file mode 100644 index 132be96e29..0000000000 --- a/mappings/net/minecraft/data/server/PointOfInterestTypeTagProvider.mapping +++ /dev/null @@ -1,3 +0,0 @@ -CLASS net/minecraft/class_7491 net/minecraft/data/server/PointOfInterestTypeTagProvider - METHOD (Lnet/minecraft/class_2403;)V - ARG 1 dataGenerator diff --git a/mappings/net/minecraft/data/server/RecipeProvider.mapping b/mappings/net/minecraft/data/server/RecipeProvider.mapping deleted file mode 100644 index 1cff03e689..0000000000 --- a/mappings/net/minecraft/data/server/RecipeProvider.mapping +++ /dev/null @@ -1,340 +0,0 @@ -CLASS net/minecraft/class_2446 net/minecraft/data/server/RecipeProvider - FIELD field_11374 LOGGER Lorg/slf4j/Logger; - FIELD field_28555 VARIANT_FACTORIES Ljava/util/Map; - FIELD field_33420 COAL_ORES Lcom/google/common/collect/ImmutableList; - FIELD field_33421 IRON_ORES Lcom/google/common/collect/ImmutableList; - FIELD field_33422 COPPER_ORES Lcom/google/common/collect/ImmutableList; - FIELD field_33423 GOLD_ORES Lcom/google/common/collect/ImmutableList; - FIELD field_33424 DIAMOND_ORES Lcom/google/common/collect/ImmutableList; - FIELD field_33425 LAPIS_ORES Lcom/google/common/collect/ImmutableList; - FIELD field_33426 REDSTONE_ORES Lcom/google/common/collect/ImmutableList; - FIELD field_33427 EMERALD_ORES Lcom/google/common/collect/ImmutableList; - FIELD field_39378 recipesPathResolver Lnet/minecraft/class_2403$class_7489; - FIELD field_39379 advancementsPathResolver Lnet/minecraft/class_2403$class_7489; - METHOD (Lnet/minecraft/class_2403;)V - ARG 1 root - METHOD method_10419 generate (Ljava/util/function/Consumer;)V - ARG 0 exporter - METHOD method_10420 conditionsFromTag (Lnet/minecraft/class_6862;)Lnet/minecraft/class_2066$class_2068; - ARG 0 tag - METHOD method_10421 (Ljava/util/Set;Lnet/minecraft/class_7403;Lnet/minecraft/class_2444;)V - ARG 3 provider - 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 predicates - METHOD method_10425 saveRecipe (Lnet/minecraft/class_7403;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_7403;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 - METHOD method_24475 offerPlanksRecipe2 (Ljava/util/function/Consumer;Lnet/minecraft/class_1935;Lnet/minecraft/class_6862;)V - ARG 0 exporter - ARG 1 output - ARG 2 input - METHOD method_24476 offerBarkBlockRecipe (Ljava/util/function/Consumer;Lnet/minecraft/class_1935;Lnet/minecraft/class_1935;)V - ARG 0 exporter - ARG 1 output - ARG 2 input - METHOD method_24477 offerPlanksRecipe (Ljava/util/function/Consumer;Lnet/minecraft/class_1935;Lnet/minecraft/class_6862;)V - ARG 0 exporter - ARG 1 output - ARG 2 input - METHOD method_24478 offerBoatRecipe (Ljava/util/function/Consumer;Lnet/minecraft/class_1935;Lnet/minecraft/class_1935;)V - ARG 0 exporter - ARG 1 output - ARG 2 input - METHOD method_24884 offerWoolDyeingRecipe (Ljava/util/function/Consumer;Lnet/minecraft/class_1935;Lnet/minecraft/class_1935;)V - ARG 0 exporter - ARG 1 output - ARG 2 input - METHOD method_24885 offerCarpetRecipe (Ljava/util/function/Consumer;Lnet/minecraft/class_1935;Lnet/minecraft/class_1935;)V - ARG 0 exporter - ARG 1 output - ARG 2 input - METHOD method_24886 offerCarpetDyeingRecipe (Ljava/util/function/Consumer;Lnet/minecraft/class_1935;Lnet/minecraft/class_1935;)V - ARG 0 exporter - ARG 1 output - ARG 2 input - METHOD method_24887 offerBedRecipe (Ljava/util/function/Consumer;Lnet/minecraft/class_1935;Lnet/minecraft/class_1935;)V - ARG 0 exporter - ARG 1 output - ARG 2 input - METHOD method_24888 offerBedDyeingRecipe (Ljava/util/function/Consumer;Lnet/minecraft/class_1935;Lnet/minecraft/class_1935;)V - ARG 0 exporter - ARG 1 output - ARG 2 input - METHOD method_24889 offerBannerRecipe (Ljava/util/function/Consumer;Lnet/minecraft/class_1935;Lnet/minecraft/class_1935;)V - ARG 0 exporter - ARG 1 output - ARG 2 input - METHOD method_24890 offerStainedGlassDyeingRecipe (Ljava/util/function/Consumer;Lnet/minecraft/class_1935;Lnet/minecraft/class_1935;)V - ARG 0 exporter - ARG 1 output - ARG 2 input - METHOD method_24891 offerStainedGlassPaneRecipe (Ljava/util/function/Consumer;Lnet/minecraft/class_1935;Lnet/minecraft/class_1935;)V - ARG 0 exporter - ARG 1 output - ARG 2 input - METHOD method_24892 offerStainedGlassPaneDyeingRecipe (Ljava/util/function/Consumer;Lnet/minecraft/class_1935;Lnet/minecraft/class_1935;)V - ARG 0 exporter - ARG 1 output - ARG 2 input - METHOD method_24893 offerTerracottaDyeingRecipe (Ljava/util/function/Consumer;Lnet/minecraft/class_1935;Lnet/minecraft/class_1935;)V - ARG 0 exporter - ARG 1 output - ARG 2 input - METHOD method_24894 offerConcretePowderDyeingRecipe (Ljava/util/function/Consumer;Lnet/minecraft/class_1935;Lnet/minecraft/class_1935;)V - ARG 0 exporter - ARG 1 output - ARG 2 input - METHOD method_29728 offerNetheriteUpgradeRecipe (Ljava/util/function/Consumer;Lnet/minecraft/class_1792;Lnet/minecraft/class_1792;)V - ARG 0 exporter - ARG 1 input - ARG 2 output - METHOD method_32233 offerCandleDyeingRecipe (Ljava/util/function/Consumer;Lnet/minecraft/class_1935;Lnet/minecraft/class_1935;)V - ARG 0 exporter - ARG 1 output - ARG 2 input - METHOD method_32804 createSlabRecipe (Lnet/minecraft/class_1935;Lnet/minecraft/class_1856;)Lnet/minecraft/class_5797; - ARG 0 output - ARG 1 input - METHOD method_32805 createChiseledBlockRecipe (Lnet/minecraft/class_1935;Lnet/minecraft/class_1856;)Lnet/minecraft/class_2447; - ARG 0 output - ARG 1 input - METHOD method_32806 createPressurePlateRecipe (Lnet/minecraft/class_1935;Lnet/minecraft/class_1856;)Lnet/minecraft/class_5797; - ARG 0 output - ARG 1 input - METHOD method_32807 hasItem (Lnet/minecraft/class_1935;)Ljava/lang/String; - ARG 0 item - METHOD method_32808 createStairsRecipe (Lnet/minecraft/class_1935;Lnet/minecraft/class_1856;)Lnet/minecraft/class_5797; - ARG 0 output - ARG 1 input - METHOD method_32809 offerWallRecipe (Ljava/util/function/Consumer;Lnet/minecraft/class_1935;Lnet/minecraft/class_1935;)V - ARG 0 exporter - ARG 1 output - ARG 2 input - METHOD method_32810 offerPolishedStoneRecipe (Ljava/util/function/Consumer;Lnet/minecraft/class_1935;Lnet/minecraft/class_1935;)V - ARG 0 exporter - ARG 1 output - ARG 2 input - METHOD method_32811 offerCutCopperRecipe (Ljava/util/function/Consumer;Lnet/minecraft/class_1935;Lnet/minecraft/class_1935;)V - ARG 0 exporter - ARG 1 output - ARG 2 input - METHOD method_32812 offerChiseledBlockRecipe (Ljava/util/function/Consumer;Lnet/minecraft/class_1935;Lnet/minecraft/class_1935;)V - ARG 0 exporter - ARG 1 output - ARG 2 input - METHOD method_32813 offerPressurePlateRecipe (Ljava/util/function/Consumer;Lnet/minecraft/class_1935;Lnet/minecraft/class_1935;)V - ARG 0 exporter - ARG 1 output - ARG 2 input - METHOD method_32814 offerSlabRecipe (Ljava/util/function/Consumer;Lnet/minecraft/class_1935;Lnet/minecraft/class_1935;)V - ARG 0 exporter - ARG 1 output - ARG 2 input - METHOD method_33531 getWallRecipe (Lnet/minecraft/class_1935;Lnet/minecraft/class_1856;)Lnet/minecraft/class_5797; - ARG 0 output - ARG 1 input - METHOD method_33532 (Lnet/minecraft/class_1935;Lnet/minecraft/class_1935;)Lnet/minecraft/class_5797; - ARG 0 output - ARG 1 input - METHOD method_33533 getVariantRecipeInput (Lnet/minecraft/class_5794;Lnet/minecraft/class_5794$class_5796;)Lnet/minecraft/class_2248; - COMMENT Gets the block used to craft a certain {@linkplain net.minecraft.data.family.BlockFamily.Variant variant} of a base block. - COMMENT - COMMENT

Normally, the block used to craft a variant is the base block. - COMMENT For chiseled variants, this is the slab variant of that block. - COMMENT - COMMENT

Purpur is handled separately because both purpur and purpur pillars can be used to craft purpur slabs and stairs. - ARG 0 family - ARG 1 variant - METHOD method_33534 (Lnet/minecraft/class_5794;Ljava/util/function/Consumer;Lnet/minecraft/class_5794$class_5796;Lnet/minecraft/class_2248;)V - ARG 2 variant - ARG 3 block - METHOD method_33535 generateFamily (Ljava/util/function/Consumer;Lnet/minecraft/class_5794;)V - ARG 0 exporter - ARG 1 family - METHOD method_33536 (Lnet/minecraft/class_5797;Lnet/minecraft/class_5794$class_5796;Ljava/lang/String;)V - ARG 2 group - METHOD method_33537 createCondensingRecipe (Lnet/minecraft/class_1935;Lnet/minecraft/class_1856;)Lnet/minecraft/class_5797; - ARG 0 output - ARG 1 input - METHOD method_33538 (Lnet/minecraft/class_1935;Lnet/minecraft/class_1935;)Lnet/minecraft/class_5797; - ARG 0 output - ARG 1 input - METHOD method_33539 (Ljava/util/function/Consumer;Lnet/minecraft/class_5794;)V - ARG 1 family - METHOD method_33541 (Lnet/minecraft/class_1935;Lnet/minecraft/class_1935;)Lnet/minecraft/class_5797; - ARG 0 output - ARG 1 input - METHOD method_33542 createTransmutationRecipe (Lnet/minecraft/class_1935;Lnet/minecraft/class_1856;)Lnet/minecraft/class_5797; - ARG 0 output - ARG 1 input - METHOD method_33543 (Lnet/minecraft/class_1935;Lnet/minecraft/class_1935;)Lnet/minecraft/class_5797; - ARG 0 output - ARG 1 input - METHOD method_33544 createDoorRecipe (Lnet/minecraft/class_1935;Lnet/minecraft/class_1856;)Lnet/minecraft/class_5797; - ARG 0 output - ARG 1 input - METHOD method_33545 (Lnet/minecraft/class_1935;Lnet/minecraft/class_1935;)Lnet/minecraft/class_5797; - ARG 0 output - ARG 1 input - METHOD method_33546 createFenceRecipe (Lnet/minecraft/class_1935;Lnet/minecraft/class_1856;)Lnet/minecraft/class_5797; - ARG 0 output - ARG 1 input - METHOD method_33547 (Lnet/minecraft/class_1935;Lnet/minecraft/class_1935;)Lnet/minecraft/class_5797; - ARG 0 output - ARG 1 input - METHOD method_33548 createFenceGateRecipe (Lnet/minecraft/class_1935;Lnet/minecraft/class_1856;)Lnet/minecraft/class_5797; - ARG 0 output - ARG 1 input - METHOD method_33549 (Lnet/minecraft/class_1935;Lnet/minecraft/class_1935;)Lnet/minecraft/class_5797; - ARG 0 output - ARG 1 input - METHOD method_33550 (Lnet/minecraft/class_1935;Lnet/minecraft/class_1935;)Lnet/minecraft/class_5797; - ARG 0 output - ARG 1 input - METHOD method_33551 (Lnet/minecraft/class_1935;Lnet/minecraft/class_1935;)Lnet/minecraft/class_5797; - ARG 0 output - ARG 1 input - METHOD method_33552 (Lnet/minecraft/class_1935;Lnet/minecraft/class_1935;)Lnet/minecraft/class_5797; - ARG 0 output - ARG 1 input - METHOD method_33553 createTrapdoorRecipe (Lnet/minecraft/class_1935;Lnet/minecraft/class_1856;)Lnet/minecraft/class_5797; - ARG 0 output - ARG 1 input - METHOD method_33554 (Lnet/minecraft/class_1935;Lnet/minecraft/class_1935;)Lnet/minecraft/class_5797; - ARG 0 output - ARG 1 input - METHOD method_33555 createSignRecipe (Lnet/minecraft/class_1935;Lnet/minecraft/class_1856;)Lnet/minecraft/class_5797; - ARG 0 output - ARG 1 input - METHOD method_33556 (Lnet/minecraft/class_1935;Lnet/minecraft/class_1935;)Lnet/minecraft/class_5797; - ARG 0 output - ARG 1 input - METHOD method_33714 convertBetween (Lnet/minecraft/class_1935;Lnet/minecraft/class_1935;)Ljava/lang/String; - ARG 0 to - ARG 1 from - METHOD method_33715 offerStonecuttingRecipe (Ljava/util/function/Consumer;Lnet/minecraft/class_1935;Lnet/minecraft/class_1935;I)V - ARG 0 exporter - ARG 1 output - ARG 2 input - ARG 3 count - METHOD method_33716 getItemPath (Lnet/minecraft/class_1935;)Ljava/lang/String; - ARG 0 item - METHOD method_33717 offerStonecuttingRecipe (Ljava/util/function/Consumer;Lnet/minecraft/class_1935;Lnet/minecraft/class_1935;)V - ARG 0 exporter - ARG 1 output - ARG 2 input - METHOD method_34662 offerCrackingRecipe (Ljava/util/function/Consumer;Lnet/minecraft/class_1935;Lnet/minecraft/class_1935;)V - COMMENT Offers a smelting recipe to the exporter that is used to convert the main block of a block family to its cracked variant. - ARG 0 exporter - ARG 1 output - ARG 2 input - METHOD method_34853 (Ljava/util/function/Consumer;Lnet/minecraft/class_2248;Lnet/minecraft/class_2248;)V - ARG 1 input - ARG 2 output - METHOD method_34854 offerWaxingRecipes (Ljava/util/function/Consumer;)V - ARG 0 exporter - METHOD method_35914 conditionsFromItem (Lnet/minecraft/class_2096$class_2100;Lnet/minecraft/class_1935;)Lnet/minecraft/class_2066$class_2068; - ARG 0 count - ARG 1 item - METHOD method_36232 offerMultipleOptions (Ljava/util/function/Consumer;Lnet/minecraft/class_3957;Ljava/util/List;Lnet/minecraft/class_1935;FILjava/lang/String;Ljava/lang/String;)V - ARG 0 exporter - ARG 1 serializer - ARG 2 inputs - ARG 3 output - ARG 4 experience - ARG 5 cookingTime - ARG 6 group - ARG 7 baseIdString - METHOD method_36233 offerSmelting (Ljava/util/function/Consumer;Ljava/util/List;Lnet/minecraft/class_1935;FILjava/lang/String;)V - ARG 0 exporter - ARG 1 inputs - ARG 2 output - ARG 3 experience - ARG 4 cookingTime - ARG 5 group - METHOD method_36234 offerBlasting (Ljava/util/function/Consumer;Ljava/util/List;Lnet/minecraft/class_1935;FILjava/lang/String;)V - ARG 0 exporter - ARG 1 inputs - ARG 2 output - ARG 3 experience - ARG 4 cookingTime - ARG 5 group - METHOD method_36325 offerReversibleCompactingRecipes (Ljava/util/function/Consumer;Lnet/minecraft/class_1935;Lnet/minecraft/class_1935;)V - COMMENT Offers two recipes to convert between a normal and compacted form of an item. - COMMENT - COMMENT

The shaped recipe converts 9 items in a square to a compacted form of the item. - COMMENT

The shapeless recipe converts the compacted form to 9 of the normal form. - ARG 0 exporter - ARG 1 input - COMMENT input item used to craft compacted item, e.g. copper ingot - ARG 2 compacted - COMMENT compacted output item, e.g. block of copper - METHOD method_36444 offerSingleOutputShapelessRecipe (Ljava/util/function/Consumer;Lnet/minecraft/class_1935;Lnet/minecraft/class_1935;Ljava/lang/String;)V - ARG 0 exporter - ARG 1 output - ARG 2 input - ARG 3 group - METHOD method_36445 offerShapelessRecipe (Ljava/util/function/Consumer;Lnet/minecraft/class_1935;Lnet/minecraft/class_1935;Ljava/lang/String;I)V - ARG 0 exporter - ARG 1 output - ARG 2 input - ARG 3 group - ARG 4 outputCount - METHOD method_36446 offerReversibleCompactingRecipesWithCompactingRecipeGroup (Ljava/util/function/Consumer;Lnet/minecraft/class_1935;Lnet/minecraft/class_1935;Ljava/lang/String;Ljava/lang/String;)V - ARG 0 exporter - ARG 1 input - ARG 2 compacted - ARG 3 compactingRecipeName - ARG 4 compactingRecipeGroup - METHOD method_36447 offerReversibleCompactingRecipes (Ljava/util/function/Consumer;Lnet/minecraft/class_1935;Lnet/minecraft/class_1935;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V - ARG 0 exporter - ARG 1 input - ARG 2 compacted - ARG 3 compactingRecipeName - ARG 4 compactingRecipeGroup - ARG 5 reverseRecipeName - ARG 6 reverseRecipeGroup - METHOD method_36448 offerCookingRecipe (Ljava/util/function/Consumer;Ljava/lang/String;Lnet/minecraft/class_3957;ILnet/minecraft/class_1935;Lnet/minecraft/class_1935;F)V - ARG 0 exporter - ARG 1 cooker - ARG 2 serializer - ARG 3 cookingTime - ARG 4 input - ARG 5 output - ARG 6 experience - METHOD method_36449 offerReversibleCompactingRecipesWithReverseRecipeGroup (Ljava/util/function/Consumer;Lnet/minecraft/class_1935;Lnet/minecraft/class_1935;Ljava/lang/String;Ljava/lang/String;)V - ARG 0 exporter - ARG 1 input - ARG 2 compacted - ARG 3 reverseRecipeName - ARG 4 reverseRecipeGroup - METHOD method_36450 getRecipeName (Lnet/minecraft/class_1935;)Ljava/lang/String; - ARG 0 item - METHOD method_36451 getSmeltingItemPath (Lnet/minecraft/class_1935;)Ljava/lang/String; - ARG 0 item - METHOD method_36452 getBlastingItemPath (Lnet/minecraft/class_1935;)Ljava/lang/String; - ARG 0 item - METHOD method_36546 (Lnet/minecraft/class_1935;Lnet/minecraft/class_1935;)Lnet/minecraft/class_5797; - ARG 0 output - ARG 1 input - METHOD method_36547 createCutCopperRecipe (Lnet/minecraft/class_1935;Lnet/minecraft/class_1856;)Lnet/minecraft/class_2447; - ARG 0 output - ARG 1 input - METHOD method_42754 offerChestBoatRecipe (Ljava/util/function/Consumer;Lnet/minecraft/class_1935;Lnet/minecraft/class_1935;)V - ARG 0 exporter - ARG 1 output - ARG 2 input diff --git a/mappings/net/minecraft/data/server/StoryTabAdvancementGenerator.mapping b/mappings/net/minecraft/data/server/StoryTabAdvancementGenerator.mapping deleted file mode 100644 index 0bd16b9c2c..0000000000 --- a/mappings/net/minecraft/data/server/StoryTabAdvancementGenerator.mapping +++ /dev/null @@ -1,3 +0,0 @@ -CLASS net/minecraft/class_2417 net/minecraft/data/server/StoryTabAdvancementGenerator - METHOD accept (Ljava/lang/Object;)V - ARG 1 exporter diff --git a/mappings/net/minecraft/data/server/StructureTagProvider.mapping b/mappings/net/minecraft/data/server/StructureTagProvider.mapping deleted file mode 100644 index a2027fd8ef..0000000000 --- a/mappings/net/minecraft/data/server/StructureTagProvider.mapping +++ /dev/null @@ -1,3 +0,0 @@ -CLASS net/minecraft/class_7071 net/minecraft/data/server/StructureTagProvider - METHOD (Lnet/minecraft/class_2403;)V - ARG 1 dataGenerator diff --git a/mappings/net/minecraft/data/server/WorldPresetTagProvider.mapping b/mappings/net/minecraft/data/server/WorldPresetTagProvider.mapping deleted file mode 100644 index a4fb0a58c2..0000000000 --- a/mappings/net/minecraft/data/server/WorldPresetTagProvider.mapping +++ /dev/null @@ -1,3 +0,0 @@ -CLASS net/minecraft/class_7230 net/minecraft/data/server/WorldPresetTagProvider - METHOD (Lnet/minecraft/class_2403;)V - ARG 1 dataGenerator diff --git a/mappings/net/minecraft/data/server/advancement/AdvancementProvider.mapping b/mappings/net/minecraft/data/server/advancement/AdvancementProvider.mapping new file mode 100644 index 0000000000..89bf3fd0a3 --- /dev/null +++ b/mappings/net/minecraft/data/server/advancement/AdvancementProvider.mapping @@ -0,0 +1,12 @@ +CLASS net/minecraft/class_2409 net/minecraft/data/server/advancement/AdvancementProvider + FIELD field_11289 tabGenerators Ljava/util/List; + FIELD field_39372 pathResolver Lnet/minecraft/class_7784$class_7489; + FIELD field_40949 registryLookupFuture Ljava/util/concurrent/CompletableFuture; + METHOD (Lnet/minecraft/class_7784;Ljava/util/concurrent/CompletableFuture;Ljava/util/List;)V + ARG 1 output + ARG 2 registryLookupFuture + ARG 3 tabGenerators + METHOD method_10333 (Ljava/util/Set;Ljava/util/List;Lnet/minecraft/class_7403;Lnet/minecraft/class_8779;)V + ARG 4 advancement + METHOD method_46809 (Lnet/minecraft/class_7403;Lnet/minecraft/class_7225$class_7874;)Ljava/util/concurrent/CompletionStage; + ARG 2 lookup diff --git a/mappings/net/minecraft/data/server/advancement/AdvancementTabGenerator.mapping b/mappings/net/minecraft/data/server/advancement/AdvancementTabGenerator.mapping new file mode 100644 index 0000000000..e233a5b3bf --- /dev/null +++ b/mappings/net/minecraft/data/server/advancement/AdvancementTabGenerator.mapping @@ -0,0 +1,4 @@ +CLASS net/minecraft/class_7785 net/minecraft/data/server/advancement/AdvancementTabGenerator + METHOD method_10335 accept (Lnet/minecraft/class_7225$class_7874;Ljava/util/function/Consumer;)V + ARG 1 lookup + ARG 2 exporter diff --git a/mappings/net/minecraft/data/server/advancement/vanilla/VanillaAdvancementProviders.mapping b/mappings/net/minecraft/data/server/advancement/vanilla/VanillaAdvancementProviders.mapping new file mode 100644 index 0000000000..9b019b8edd --- /dev/null +++ b/mappings/net/minecraft/data/server/advancement/vanilla/VanillaAdvancementProviders.mapping @@ -0,0 +1,4 @@ +CLASS net/minecraft/class_7786 net/minecraft/data/server/advancement/vanilla/VanillaAdvancementProviders + METHOD method_45974 createVanillaProvider (Lnet/minecraft/class_7784;Ljava/util/concurrent/CompletableFuture;)Lnet/minecraft/class_2409; + ARG 0 output + ARG 1 registryLookupFuture diff --git a/mappings/net/minecraft/data/server/advancement/vanilla/VanillaAdventureTabAdvancementGenerator.mapping b/mappings/net/minecraft/data/server/advancement/vanilla/VanillaAdventureTabAdvancementGenerator.mapping new file mode 100644 index 0000000000..bfba506aac --- /dev/null +++ b/mappings/net/minecraft/data/server/advancement/vanilla/VanillaAdventureTabAdvancementGenerator.mapping @@ -0,0 +1,37 @@ +CLASS net/minecraft/class_2412 net/minecraft/data/server/advancement/vanilla/VanillaAdventureTabAdvancementGenerator + FIELD field_11294 MONSTERS [Lnet/minecraft/class_1299; + FIELD field_35091 OVERWORLD_HEIGHT I + FIELD field_35092 OVERWORLD_MAX_Y I + FIELD field_35093 OVERWORLD_MIN_Y I + FIELD field_35094 OVERWORLD_BEDROCK_LAYER_HEIGHT I + METHOD method_10336 requireListedMobsKilled (Lnet/minecraft/class_161$class_162;)Lnet/minecraft/class_161$class_162; + ARG 0 builder + METHOD method_10337 requireListedBiomesVisited (Lnet/minecraft/class_161$class_162;Ljava/util/List;)Lnet/minecraft/class_161$class_162; + ARG 0 builder + ARG 1 biomes + METHOD method_37315 createLookingAtEntityUsing (Lnet/minecraft/class_1299;Lnet/minecraft/class_1792;)Lnet/minecraft/class_175; + ARG 0 entity + ARG 1 item + METHOD method_37316 createLightningStrike (Lnet/minecraft/class_2096$class_2100;Ljava/util/Optional;)Lnet/minecraft/class_175; + ARG 0 range + ARG 1 entity + METHOD method_49356 buildAdventuringTime (Ljava/util/function/Consumer;Lnet/minecraft/class_8779;Lnet/minecraft/class_8197$class_5305;)V + ARG 0 exporter + ARG 1 parent + ARG 2 preset + METHOD method_51689 requireAllExclusiveTrimmedArmor (Lnet/minecraft/class_161$class_162;)Lnet/minecraft/class_161$class_162; + ARG 0 builder + METHOD method_51690 (Ljava/util/Map;Lnet/minecraft/class_161$class_162;Lnet/minecraft/class_1792;)V + ARG 2 template + METHOD method_51691 requireTrimmedArmor (Lnet/minecraft/class_161$class_162;)Lnet/minecraft/class_161$class_162; + ARG 0 builder + METHOD method_51692 requireSalvagedSherd (Lnet/minecraft/class_161$class_162;)Lnet/minecraft/class_161$class_162; + ARG 0 builder + METHOD method_51815 requirePlacedBlockReadByComparator (Lnet/minecraft/class_2248;)Lnet/minecraft/class_175; + ARG 0 block + METHOD method_51816 (Lnet/minecraft/class_2248;Lnet/minecraft/class_2350;)Lnet/minecraft/class_8548$class_8549; + ARG 1 facing + METHOD method_51817 (Lnet/minecraft/class_2350;)Lnet/minecraft/class_5341$class_210; + ARG 0 facing + METHOD method_51819 requirePlacedComparatorReadingBlock (Lnet/minecraft/class_2248;)Lnet/minecraft/class_175; + ARG 0 block diff --git a/mappings/net/minecraft/data/server/advancement/vanilla/VanillaEndTabAdvancementGenerator.mapping b/mappings/net/minecraft/data/server/advancement/vanilla/VanillaEndTabAdvancementGenerator.mapping new file mode 100644 index 0000000000..311ed2e4b3 --- /dev/null +++ b/mappings/net/minecraft/data/server/advancement/vanilla/VanillaEndTabAdvancementGenerator.mapping @@ -0,0 +1 @@ +CLASS net/minecraft/class_2419 net/minecraft/data/server/advancement/vanilla/VanillaEndTabAdvancementGenerator diff --git a/mappings/net/minecraft/data/server/HusbandryTabAdvancementGenerator.mapping b/mappings/net/minecraft/data/server/advancement/vanilla/VanillaHusbandryTabAdvancementGenerator.mapping similarity index 52% rename from mappings/net/minecraft/data/server/HusbandryTabAdvancementGenerator.mapping rename to mappings/net/minecraft/data/server/advancement/vanilla/VanillaHusbandryTabAdvancementGenerator.mapping index 48ff78c4be..de8a18298d 100644 --- a/mappings/net/minecraft/data/server/HusbandryTabAdvancementGenerator.mapping +++ b/mappings/net/minecraft/data/server/advancement/vanilla/VanillaHusbandryTabAdvancementGenerator.mapping @@ -1,23 +1,32 @@ -CLASS net/minecraft/class_2414 net/minecraft/data/server/HusbandryTabAdvancementGenerator +CLASS net/minecraft/class_2414 net/minecraft/data/server/advancement/vanilla/VanillaHusbandryTabAdvancementGenerator FIELD field_11295 FISH_ITEMS [Lnet/minecraft/class_1792; - FIELD field_11296 BREEDABLE_ANIMALS [Lnet/minecraft/class_1299; + FIELD field_11296 BREEDABLE_ANIMALS Ljava/util/List; FIELD field_11297 FISH_BUCKET_ITEMS [Lnet/minecraft/class_1792; FIELD field_11298 FOOD_ITEMS [Lnet/minecraft/class_1792; FIELD field_33964 AXE_ITEMS [Lnet/minecraft/class_1792; - FIELD field_38467 EGG_LAYING_ANIMALS [Lnet/minecraft/class_1299; - METHOD accept (Ljava/lang/Object;)V - ARG 1 exporter + FIELD field_38467 EGG_LAYING_ANIMALS Ljava/util/List; METHOD method_10339 requireListedFishCaught (Lnet/minecraft/class_161$class_162;)Lnet/minecraft/class_161$class_162; - ARG 1 builder + ARG 0 builder METHOD method_10340 requireListedFishBucketsFilled (Lnet/minecraft/class_161$class_162;)Lnet/minecraft/class_161$class_162; - ARG 1 builder + ARG 0 builder METHOD method_10341 requireFoodItemsEaten (Lnet/minecraft/class_161$class_162;)Lnet/minecraft/class_161$class_162; - ARG 1 builder - METHOD method_10342 requireListedAnimalsBred (Lnet/minecraft/class_161$class_162;)Lnet/minecraft/class_161$class_162; - ARG 1 builder + ARG 0 builder + METHOD method_10342 requireListedAnimalsBred (Lnet/minecraft/class_161$class_162;Ljava/util/stream/Stream;Ljava/util/stream/Stream;)Lnet/minecraft/class_161$class_162; + ARG 0 advancementBuilder + ARG 1 breedableAnimals + ARG 2 eggLayingAnimals METHOD method_16118 requireAllCatsTamed (Lnet/minecraft/class_161$class_162;)Lnet/minecraft/class_161$class_162; - ARG 1 builder + ARG 0 builder METHOD method_43362 requireAllFrogsOnLeads (Lnet/minecraft/class_161$class_162;)Lnet/minecraft/class_161$class_162; - ARG 1 builder + ARG 0 builder METHOD method_43363 (Lnet/minecraft/class_161$class_162;Lnet/minecraft/class_6880$class_6883;)V ARG 1 variant + METHOD method_47810 createBreedAllAnimalsAdvancement (Lnet/minecraft/class_8779;Ljava/util/function/Consumer;Ljava/util/stream/Stream;Ljava/util/stream/Stream;)Lnet/minecraft/class_8779; + ARG 0 parent + ARG 1 exporter + ARG 2 breedableAnimals + ARG 3 eggLayingAnimals + METHOD method_48497 (Lnet/minecraft/class_161$class_162;Lnet/minecraft/class_1299;)V + ARG 1 type + METHOD method_48498 (Lnet/minecraft/class_161$class_162;Lnet/minecraft/class_1299;)V + ARG 1 type diff --git a/mappings/net/minecraft/data/server/advancement/vanilla/VanillaNetherTabAdvancementGenerator.mapping b/mappings/net/minecraft/data/server/advancement/vanilla/VanillaNetherTabAdvancementGenerator.mapping new file mode 100644 index 0000000000..f47b91902d --- /dev/null +++ b/mappings/net/minecraft/data/server/advancement/vanilla/VanillaNetherTabAdvancementGenerator.mapping @@ -0,0 +1,2 @@ +CLASS net/minecraft/class_2416 net/minecraft/data/server/advancement/vanilla/VanillaNetherTabAdvancementGenerator + FIELD field_25712 PIGLIN_DISTRACTION_PREDICATE Lnet/minecraft/class_5258; diff --git a/mappings/net/minecraft/data/server/advancement/vanilla/VanillaStoryTabAdvancementGenerator.mapping b/mappings/net/minecraft/data/server/advancement/vanilla/VanillaStoryTabAdvancementGenerator.mapping new file mode 100644 index 0000000000..3ed98bdf47 --- /dev/null +++ b/mappings/net/minecraft/data/server/advancement/vanilla/VanillaStoryTabAdvancementGenerator.mapping @@ -0,0 +1 @@ +CLASS net/minecraft/class_2417 net/minecraft/data/server/advancement/vanilla/VanillaStoryTabAdvancementGenerator diff --git a/mappings/net/minecraft/data/server/loottable/BlockLootTableGenerator.mapping b/mappings/net/minecraft/data/server/loottable/BlockLootTableGenerator.mapping new file mode 100644 index 0000000000..4acce20bca --- /dev/null +++ b/mappings/net/minecraft/data/server/loottable/BlockLootTableGenerator.mapping @@ -0,0 +1,153 @@ +CLASS net/minecraft/class_7788 net/minecraft/data/server/loottable/BlockLootTableGenerator + FIELD field_40602 WITH_SILK_TOUCH Lnet/minecraft/class_5341$class_210; + FIELD field_40603 WITHOUT_SILK_TOUCH Lnet/minecraft/class_5341$class_210; + FIELD field_40604 WITH_SHEARS Lnet/minecraft/class_5341$class_210; + FIELD field_40605 SAPLING_DROP_CHANCE [F + FIELD field_40606 WITH_SILK_TOUCH_OR_SHEARS Lnet/minecraft/class_5341$class_210; + FIELD field_40607 WITHOUT_SILK_TOUCH_NOR_SHEARS Lnet/minecraft/class_5341$class_210; + FIELD field_40608 explosionImmuneItems Ljava/util/Set; + FIELD field_40609 requiredFeatures Lnet/minecraft/class_7699; + FIELD field_40610 lootTables Ljava/util/Map; + FIELD field_40611 LEAVES_STICK_DROP_CHANCE [F + METHOD (Ljava/util/Set;Lnet/minecraft/class_7699;)V + ARG 1 explosionImmuneItems + ARG 2 requiredFeatures + METHOD (Ljava/util/Set;Lnet/minecraft/class_7699;Ljava/util/Map;)V + ARG 1 explosionImmuneItems + ARG 2 requiredFeatures + ARG 3 lootTables + METHOD method_10379 generate ()V + METHOD method_45975 dropsNothing ()Lnet/minecraft/class_52$class_53; + METHOD method_45976 drops (Lnet/minecraft/class_1935;)Lnet/minecraft/class_52$class_53; + ARG 1 drop + METHOD method_45977 applyExplosionDecay (Lnet/minecraft/class_1935;Lnet/minecraft/class_116;)Lnet/minecraft/class_116; + ARG 1 drop + ARG 2 builder + METHOD method_45978 addSurvivesExplosionCondition (Lnet/minecraft/class_1935;Lnet/minecraft/class_192;)Lnet/minecraft/class_192; + ARG 1 drop + ARG 2 builder + METHOD method_45979 drops (Lnet/minecraft/class_1935;Lnet/minecraft/class_5658;)Lnet/minecraft/class_52$class_53; + ARG 1 drop + ARG 2 count + METHOD method_45980 slabDrops (Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53; + ARG 1 drop + METHOD method_45981 oreDrops (Lnet/minecraft/class_2248;Lnet/minecraft/class_1792;)Lnet/minecraft/class_52$class_53; + ARG 1 dropWithSilkTouch + ARG 2 drop + METHOD method_45982 cropDrops (Lnet/minecraft/class_2248;Lnet/minecraft/class_1792;Lnet/minecraft/class_1792;Lnet/minecraft/class_5341$class_210;)Lnet/minecraft/class_52$class_53; + ARG 1 crop + ARG 2 product + ARG 3 seeds + ARG 4 condition + METHOD method_45983 drops (Lnet/minecraft/class_2248;Lnet/minecraft/class_1935;)Lnet/minecraft/class_52$class_53; + ARG 1 dropWithSilkTouch + ARG 2 drop + METHOD method_45984 drops (Lnet/minecraft/class_2248;Lnet/minecraft/class_1935;Lnet/minecraft/class_5658;)Lnet/minecraft/class_52$class_53; + ARG 1 dropWithSilkTouch + ARG 2 drop + ARG 3 count + METHOD method_45985 tallGrassDrops (Lnet/minecraft/class_2248;Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53; + ARG 1 tallGrass + ARG 2 grass + METHOD method_45986 leavesDrops (Lnet/minecraft/class_2248;Lnet/minecraft/class_2248;[F)Lnet/minecraft/class_52$class_53; + ARG 1 leaves + ARG 2 drop + ARG 3 chance + METHOD method_45987 dropsWithProperty (Lnet/minecraft/class_2248;Lnet/minecraft/class_2769;Ljava/lang/Comparable;)Lnet/minecraft/class_52$class_53; + ARG 1 drop + ARG 2 property + ARG 3 value + METHOD method_45988 addDrop (Lnet/minecraft/class_2248;Lnet/minecraft/class_52$class_53;)V + ARG 1 block + ARG 2 lootTable + METHOD method_45989 dropsWithSilkTouch (Lnet/minecraft/class_2248;Lnet/minecraft/class_79$class_80;)Lnet/minecraft/class_52$class_53; + ARG 0 drop + ARG 1 child + METHOD method_45990 multifaceGrowthDrops (Lnet/minecraft/class_2248;Lnet/minecraft/class_5341$class_210;)Lnet/minecraft/class_52$class_53; + ARG 1 drop + ARG 2 condition + METHOD method_45991 drops (Lnet/minecraft/class_2248;Lnet/minecraft/class_5341$class_210;Lnet/minecraft/class_79$class_80;)Lnet/minecraft/class_52$class_53; + ARG 0 drop + ARG 1 conditionBuilder + ARG 2 child + METHOD method_45993 (Lnet/minecraft/class_2248;Ljava/lang/Integer;)Lnet/minecraft/class_117$class_118; + ARG 1 candles + METHOD method_45994 addDrop (Lnet/minecraft/class_2248;Ljava/util/function/Function;)V + ARG 1 block + ARG 2 lootTableFunction + METHOD method_45995 dropsWithShears (Lnet/minecraft/class_1935;)Lnet/minecraft/class_52$class_53; + ARG 0 drop + METHOD method_45996 nameableContainerDrops (Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53; + ARG 1 drop + METHOD method_45997 cropStemDrops (Lnet/minecraft/class_2248;Lnet/minecraft/class_1792;)Lnet/minecraft/class_52$class_53; + ARG 1 stem + ARG 2 drop + METHOD method_45998 mushroomBlockDrops (Lnet/minecraft/class_2248;Lnet/minecraft/class_1935;)Lnet/minecraft/class_52$class_53; + ARG 1 dropWithSilkTouch + ARG 2 drop + METHOD method_45999 addVinePlantDrop (Lnet/minecraft/class_2248;Lnet/minecraft/class_2248;)V + ARG 1 block + ARG 2 drop + METHOD method_46000 oakLeavesDrops (Lnet/minecraft/class_2248;Lnet/minecraft/class_2248;[F)Lnet/minecraft/class_52$class_53; + ARG 1 leaves + ARG 2 drop + ARG 3 chance + METHOD method_46001 dropsWithShears (Lnet/minecraft/class_2248;Lnet/minecraft/class_79$class_80;)Lnet/minecraft/class_52$class_53; + ARG 0 drop + ARG 1 child + METHOD method_46003 dropsWithSilkTouch (Lnet/minecraft/class_1935;)Lnet/minecraft/class_52$class_53; + ARG 0 drop + METHOD method_46004 shulkerBoxDrops (Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53; + ARG 1 drop + METHOD method_46005 attachedCropStemDrops (Lnet/minecraft/class_2248;Lnet/minecraft/class_1792;)Lnet/minecraft/class_52$class_53; + ARG 1 stem + ARG 2 drop + METHOD method_46006 addDrop (Lnet/minecraft/class_2248;Lnet/minecraft/class_1935;)V + ARG 1 block + ARG 2 drop + METHOD method_46007 addDropWithSilkTouch (Lnet/minecraft/class_2248;Lnet/minecraft/class_2248;)V + ARG 1 block + ARG 2 drop + METHOD method_46008 dropsWithSilkTouchOrShears (Lnet/minecraft/class_2248;Lnet/minecraft/class_79$class_80;)Lnet/minecraft/class_52$class_53; + ARG 0 drop + ARG 1 child + METHOD method_46009 pottedPlantDrops (Lnet/minecraft/class_1935;)Lnet/minecraft/class_52$class_53; + ARG 1 drop + METHOD method_46010 copperOreDrops (Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53; + ARG 1 drop + METHOD method_46011 lapisOreDrops (Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53; + ARG 1 drop + METHOD method_46012 redstoneOreDrops (Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53; + ARG 1 drop + METHOD method_46013 bannerDrops (Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53; + ARG 1 drop + METHOD method_46014 beeNestDrops (Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53; + ARG 0 drop + METHOD method_46015 beehiveDrops (Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53; + ARG 0 drop + METHOD method_46016 glowBerryDrops (Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53; + ARG 0 drop + METHOD method_46017 grassDrops (Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53; + ARG 1 dropWithShears + METHOD method_46018 mangroveLeavesDrops (Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53; + ARG 1 leaves + METHOD method_46019 seagrassDrops (Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53; + ARG 0 seagrass + METHOD method_46020 candleDrops (Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53; + ARG 1 candle + METHOD method_46021 candleCakeDrops (Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53; + ARG 0 candleCake + METHOD method_46022 doorDrops (Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53; + ARG 1 block + METHOD method_46023 addPottedPlantDrops (Lnet/minecraft/class_2248;)V + ARG 1 block + METHOD method_46024 addDropWithSilkTouch (Lnet/minecraft/class_2248;)V + ARG 1 block + METHOD method_46025 addDrop (Lnet/minecraft/class_2248;)V + ARG 1 block + METHOD method_46026 (Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53; + ARG 1 flowerPot + METHOD method_49357 (Lnet/minecraft/class_2248;Ljava/lang/Integer;)Lnet/minecraft/class_117$class_118; + ARG 1 flowerAmount + METHOD method_49358 flowerbedDrops (Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53; + ARG 1 flowerbed diff --git a/mappings/net/minecraft/data/server/loottable/EntityLootTableGenerator.mapping b/mappings/net/minecraft/data/server/loottable/EntityLootTableGenerator.mapping new file mode 100644 index 0000000000..9ea5c25ef7 --- /dev/null +++ b/mappings/net/minecraft/data/server/loottable/EntityLootTableGenerator.mapping @@ -0,0 +1,33 @@ +CLASS net/minecraft/class_7789 net/minecraft/data/server/loottable/EntityLootTableGenerator + FIELD field_40612 NEEDS_ENTITY_ON_FIRE Lnet/minecraft/class_2048$class_2049; + FIELD field_40613 ENTITY_TYPES_IN_MISC_GROUP_TO_CHECK Ljava/util/Set; + FIELD field_40615 lootTables Ljava/util/Map; + FIELD field_42084 requiredFeatures Lnet/minecraft/class_7699; + FIELD field_42085 featureSet Lnet/minecraft/class_7699; + METHOD (Lnet/minecraft/class_7699;)V + ARG 1 requiredFeatures + METHOD (Lnet/minecraft/class_7699;Lnet/minecraft/class_7699;)V + ARG 1 requiredFeatures + ARG 2 featureSet + METHOD method_10400 generate ()V + METHOD method_46027 shouldCheck (Lnet/minecraft/class_1299;)Z + ARG 0 entityType + METHOD method_46028 register (Lnet/minecraft/class_1299;Lnet/minecraft/class_2960;Lnet/minecraft/class_52$class_53;)V + ARG 1 entityType + ARG 2 entityId + ARG 3 lootTable + METHOD method_46029 register (Lnet/minecraft/class_1299;Lnet/minecraft/class_52$class_53;)V + ARG 1 entityType + ARG 2 lootTable + METHOD method_46030 killedByFrog (Lnet/minecraft/class_7106;)Lnet/minecraft/class_5341$class_210; + ARG 1 variant + METHOD method_46031 createForSheep (Lnet/minecraft/class_1935;)Lnet/minecraft/class_52$class_53; + ARG 0 item + METHOD method_46032 (Ljava/util/Set;Lnet/minecraft/class_6880$class_6883;Ljava/util/function/BiConsumer;Lnet/minecraft/class_2960;Lnet/minecraft/class_52$class_53;)V + ARG 3 lootTableId + ARG 4 lootTableBuilder + METHOD method_46033 (Ljava/util/Set;Ljava/util/function/BiConsumer;Lnet/minecraft/class_6880$class_6883;)V + ARG 3 entityType + METHOD method_46034 killedByFrog ()Lnet/minecraft/class_5341$class_210; + METHOD method_46035 (Lnet/minecraft/class_1299;)Ljava/util/Map; + ARG 0 type diff --git a/mappings/net/minecraft/data/server/loottable/LootTableGenerator.mapping b/mappings/net/minecraft/data/server/loottable/LootTableGenerator.mapping new file mode 100644 index 0000000000..68236de7fc --- /dev/null +++ b/mappings/net/minecraft/data/server/loottable/LootTableGenerator.mapping @@ -0,0 +1,3 @@ +CLASS net/minecraft/class_7791 net/minecraft/data/server/loottable/LootTableGenerator + METHOD method_10399 accept (Ljava/util/function/BiConsumer;)V + ARG 1 exporter diff --git a/mappings/net/minecraft/data/server/loottable/LootTableProvider.mapping b/mappings/net/minecraft/data/server/loottable/LootTableProvider.mapping new file mode 100644 index 0000000000..6f3822115c --- /dev/null +++ b/mappings/net/minecraft/data/server/loottable/LootTableProvider.mapping @@ -0,0 +1,23 @@ +CLASS net/minecraft/class_2438 net/minecraft/data/server/loottable/LootTableProvider + FIELD field_11354 lootTypeGenerators Ljava/util/List; + FIELD field_11355 LOGGER Lorg/slf4j/Logger; + FIELD field_39374 pathResolver Lnet/minecraft/class_7784$class_7489; + FIELD field_40617 lootTableIds Ljava/util/Set; + METHOD (Lnet/minecraft/class_7784;Ljava/util/Set;Ljava/util/List;)V + ARG 1 output + ARG 2 lootTableIds + ARG 3 lootTypeGenerators + METHOD method_10407 (Ljava/lang/String;Ljava/lang/String;)V + ARG 0 name + ARG 1 message + METHOD method_10408 (Lnet/minecraft/class_7403;Ljava/util/Map$Entry;)Ljava/util/concurrent/CompletableFuture; + ARG 2 entry + METHOD method_10410 (Ljava/util/Map;Ljava/util/Map;Lnet/minecraft/class_2438$class_7790;)V + ARG 2 generator + METHOD method_10411 (Lnet/minecraft/class_58;Lnet/minecraft/class_2960;Lnet/minecraft/class_52;)V + ARG 1 id + ARG 2 table + METHOD method_10412 (Ljava/util/Map;Ljava/util/Map;Lnet/minecraft/class_2438$class_7790;Lnet/minecraft/class_2960;Lnet/minecraft/class_52$class_53;)V + ARG 3 id + ARG 4 builder + CLASS class_7790 LootTypeGenerator diff --git a/mappings/net/minecraft/data/server/loottable/vanilla/VanillaArchaeologyLootTableGenerator.mapping b/mappings/net/minecraft/data/server/loottable/vanilla/VanillaArchaeologyLootTableGenerator.mapping new file mode 100644 index 0000000000..cebaf3762b --- /dev/null +++ b/mappings/net/minecraft/data/server/loottable/vanilla/VanillaArchaeologyLootTableGenerator.mapping @@ -0,0 +1 @@ +CLASS net/minecraft/class_8255 net/minecraft/data/server/loottable/vanilla/VanillaArchaeologyLootTableGenerator diff --git a/mappings/net/minecraft/data/server/loottable/vanilla/VanillaBarterLootTableGenerator.mapping b/mappings/net/minecraft/data/server/loottable/vanilla/VanillaBarterLootTableGenerator.mapping new file mode 100644 index 0000000000..af13ac559b --- /dev/null +++ b/mappings/net/minecraft/data/server/loottable/vanilla/VanillaBarterLootTableGenerator.mapping @@ -0,0 +1 @@ +CLASS net/minecraft/class_4845 net/minecraft/data/server/loottable/vanilla/VanillaBarterLootTableGenerator diff --git a/mappings/net/minecraft/data/server/loottable/vanilla/VanillaBlockLootTableGenerator.mapping b/mappings/net/minecraft/data/server/loottable/vanilla/VanillaBlockLootTableGenerator.mapping new file mode 100644 index 0000000000..450aa12a85 --- /dev/null +++ b/mappings/net/minecraft/data/server/loottable/vanilla/VanillaBlockLootTableGenerator.mapping @@ -0,0 +1,480 @@ +CLASS net/minecraft/class_2430 net/minecraft/data/server/loottable/vanilla/VanillaBlockLootTableGenerator + FIELD field_11338 JUNGLE_SAPLING_DROP_CHANCE [F + FIELD field_11340 EXPLOSION_IMMUNE Ljava/util/Set; + METHOD method_16232 (Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53; + ARG 1 block + METHOD method_16233 (Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53; + ARG 1 block + METHOD method_16235 (Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53; + ARG 1 block + METHOD method_16237 (Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53; + ARG 1 block + METHOD method_16241 (Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53; + ARG 1 block + METHOD method_16242 (Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53; + ARG 1 block + METHOD method_16243 (Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53; + ARG 1 block + METHOD method_16245 (Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53; + ARG 1 block + METHOD method_16246 (Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53; + ARG 1 block + METHOD method_16249 (Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53; + ARG 1 block + METHOD method_16250 (Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53; + ARG 1 block + METHOD method_16251 (Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53; + ARG 1 block + METHOD method_16252 (Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53; + ARG 1 block + METHOD method_16254 (Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53; + ARG 1 block + METHOD method_16255 (Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53; + ARG 1 block + METHOD method_16263 (Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53; + ARG 1 block + METHOD method_16264 (Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53; + ARG 1 block + METHOD method_16266 (Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53; + ARG 1 block + METHOD method_16268 (Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53; + ARG 1 block + METHOD method_16269 (Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53; + ARG 1 block + METHOD method_16270 (Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53; + ARG 1 block + METHOD method_16273 (Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53; + ARG 1 block + METHOD method_16275 (Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53; + ARG 1 block + METHOD method_16277 (Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53; + ARG 1 block + METHOD method_16280 (Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53; + ARG 1 block + METHOD method_16282 (Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53; + ARG 1 block + METHOD method_16283 (Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53; + ARG 1 block + METHOD method_16284 (Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53; + ARG 1 block + METHOD method_16286 (Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53; + ARG 1 block + METHOD method_16290 (Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53; + ARG 1 block + METHOD method_16292 (Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53; + ARG 1 block + METHOD method_16295 (Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53; + ARG 1 block + METHOD method_16296 (Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53; + ARG 1 block + METHOD method_16300 (Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53; + ARG 1 block + METHOD method_16302 (Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53; + ARG 1 block + METHOD method_16303 (Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53; + ARG 1 block + METHOD method_16306 (Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53; + ARG 1 block + METHOD method_16307 (Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53; + ARG 1 block + METHOD method_16310 (Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53; + ARG 1 block + METHOD method_16311 (Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53; + ARG 1 block + METHOD method_16312 (Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53; + ARG 1 block + METHOD method_16314 (Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53; + ARG 1 block + METHOD method_16316 (Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53; + ARG 1 block + METHOD method_16317 (Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53; + ARG 1 block + METHOD method_16324 (Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53; + ARG 1 block + METHOD method_16325 (Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53; + ARG 1 block + METHOD method_16326 (Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53; + ARG 1 block + METHOD method_16327 (Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53; + ARG 1 block + METHOD method_16328 (Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53; + ARG 1 block + METHOD method_23230 (Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53; + ARG 1 block + METHOD method_23231 (Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53; + ARG 1 block + METHOD method_26277 (Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53; + ARG 1 block + METHOD method_27164 (Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53; + ARG 1 block + METHOD method_27165 (Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53; + ARG 1 block + METHOD method_29399 (Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53; + ARG 1 block + METHOD method_29400 (Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53; + ARG 1 block + METHOD method_30157 (Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53; + ARG 1 block + METHOD method_32226 (Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53; + ARG 1 block + METHOD method_33707 (Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53; + ARG 1 block + METHOD method_33708 (Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53; + ARG 1 block + METHOD method_34047 (Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53; + ARG 1 block + METHOD method_34048 (Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53; + ARG 1 block + METHOD method_34049 (Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53; + ARG 1 block + METHOD method_34050 (Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53; + ARG 1 block + METHOD method_34051 (Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53; + ARG 1 block + METHOD method_34052 (Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53; + ARG 1 block + METHOD method_34053 (Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53; + ARG 1 block + METHOD method_34054 (Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53; + ARG 1 block + METHOD method_34055 (Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53; + ARG 1 block + METHOD method_34056 (Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53; + ARG 1 block + METHOD method_34594 (Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53; + ARG 1 block + METHOD method_34595 (Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53; + ARG 1 block + METHOD method_34596 (Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53; + ARG 1 block + METHOD method_34598 (Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53; + ARG 1 block + METHOD method_34599 (Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53; + ARG 0 block + METHOD method_34600 (Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53; + ARG 1 block + METHOD method_34601 (Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53; + ARG 1 block + METHOD method_34602 (Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53; + ARG 1 block + METHOD method_36226 (Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53; + ARG 1 block + METHOD method_36229 (Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53; + ARG 1 block + METHOD method_36230 (Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53; + ARG 1 block + METHOD method_36231 (Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53; + ARG 1 block + METHOD method_43810 (Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53; + ARG 1 block + METHOD method_43813 (Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53; + ARG 1 block + METHOD method_43815 (Lnet/minecraft/class_2248;Ljava/lang/Integer;)Lnet/minecraft/class_117$class_118; + ARG 1 pickles + METHOD method_46040 (Lnet/minecraft/class_2430;Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53; + ARG 1 block + METHOD method_46041 (Lnet/minecraft/class_2430;Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53; + ARG 1 block + METHOD method_46042 (Lnet/minecraft/class_2430;Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53; + ARG 1 block + METHOD method_46043 (Lnet/minecraft/class_2430;Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53; + ARG 1 block + METHOD method_46044 (Lnet/minecraft/class_2430;Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53; + ARG 1 block + METHOD method_46045 (Lnet/minecraft/class_2430;Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53; + ARG 1 block + METHOD method_46046 (Lnet/minecraft/class_2430;Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53; + ARG 1 block + METHOD method_46047 (Lnet/minecraft/class_2430;Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53; + ARG 1 block + METHOD method_46048 (Lnet/minecraft/class_2430;Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53; + ARG 1 block + METHOD method_46049 (Lnet/minecraft/class_2430;Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53; + ARG 1 block + METHOD method_46050 (Lnet/minecraft/class_2430;Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53; + ARG 1 block + METHOD method_46051 (Lnet/minecraft/class_2430;Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53; + ARG 1 block + METHOD method_46052 (Lnet/minecraft/class_2430;Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53; + ARG 1 block + METHOD method_46053 (Lnet/minecraft/class_2430;Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53; + ARG 1 block + METHOD method_46054 (Lnet/minecraft/class_2430;Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53; + ARG 1 block + METHOD method_46055 (Lnet/minecraft/class_2430;Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53; + ARG 1 block + METHOD method_46056 (Lnet/minecraft/class_2430;Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53; + ARG 1 block + METHOD method_46057 (Lnet/minecraft/class_2430;Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53; + ARG 1 block + METHOD method_46058 (Lnet/minecraft/class_2430;Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53; + ARG 1 block + METHOD method_46059 (Lnet/minecraft/class_2430;Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53; + ARG 1 block + METHOD method_46060 (Lnet/minecraft/class_2430;Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53; + ARG 1 block + METHOD method_46061 (Lnet/minecraft/class_2430;Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53; + ARG 1 block + METHOD method_46062 (Lnet/minecraft/class_2430;Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53; + ARG 1 block + METHOD method_46063 (Lnet/minecraft/class_2430;Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53; + ARG 1 block + METHOD method_46064 (Lnet/minecraft/class_2430;Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53; + ARG 1 block + METHOD method_46065 (Lnet/minecraft/class_2430;Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53; + ARG 1 block + METHOD method_46066 (Lnet/minecraft/class_2430;Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53; + ARG 1 block + METHOD method_46067 (Lnet/minecraft/class_2430;Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53; + ARG 1 block + METHOD method_46068 (Lnet/minecraft/class_2430;Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53; + ARG 1 block + METHOD method_46069 (Lnet/minecraft/class_2430;Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53; + ARG 1 block + METHOD method_46093 (Lnet/minecraft/class_2430;Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53; + ARG 1 block + METHOD method_46094 (Lnet/minecraft/class_2430;Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53; + ARG 1 block + METHOD method_46095 (Lnet/minecraft/class_2430;Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53; + ARG 1 block + METHOD method_46096 (Lnet/minecraft/class_2430;Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53; + ARG 1 block + METHOD method_46097 (Lnet/minecraft/class_2430;Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53; + ARG 1 block + METHOD method_46098 (Lnet/minecraft/class_2430;Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53; + ARG 1 block + METHOD method_46099 (Lnet/minecraft/class_2430;Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53; + ARG 1 block + METHOD method_46100 (Lnet/minecraft/class_2430;Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53; + ARG 1 block + METHOD method_46101 (Lnet/minecraft/class_2430;Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53; + ARG 1 block + METHOD method_46102 (Lnet/minecraft/class_2430;Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53; + ARG 1 block + METHOD method_46103 (Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53; + ARG 0 block + METHOD method_46104 (Lnet/minecraft/class_2430;Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53; + ARG 1 block + METHOD method_46105 (Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53; + ARG 0 block + METHOD method_46106 (Lnet/minecraft/class_2430;Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53; + ARG 1 block + METHOD method_46107 (Lnet/minecraft/class_2430;Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53; + ARG 1 block + METHOD method_46108 (Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53; + ARG 0 block + METHOD method_46109 (Lnet/minecraft/class_2430;Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53; + ARG 1 block + METHOD method_46110 (Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53; + ARG 0 block + METHOD method_46111 (Lnet/minecraft/class_2430;Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53; + ARG 1 block + METHOD method_46112 (Lnet/minecraft/class_2430;Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53; + ARG 1 block + METHOD method_46113 (Lnet/minecraft/class_2430;Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53; + ARG 1 block + METHOD method_46114 (Lnet/minecraft/class_2430;Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53; + ARG 1 block + METHOD method_46115 (Lnet/minecraft/class_2430;Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53; + ARG 1 block + METHOD method_46116 (Lnet/minecraft/class_2430;Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53; + ARG 1 block + METHOD method_46117 (Lnet/minecraft/class_2430;Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53; + ARG 1 block + METHOD method_46119 (Lnet/minecraft/class_2430;Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53; + ARG 1 block + METHOD method_46120 (Lnet/minecraft/class_2430;Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53; + ARG 1 block + METHOD method_46121 (Lnet/minecraft/class_2430;Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53; + ARG 1 block + METHOD method_46122 (Lnet/minecraft/class_2430;Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53; + ARG 1 block + METHOD method_46123 (Lnet/minecraft/class_2430;Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53; + ARG 1 block + METHOD method_46155 (Lnet/minecraft/class_1935;)Lnet/minecraft/class_52$class_53; + ARG 0 block + METHOD method_46156 (Lnet/minecraft/class_2430;Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53; + ARG 1 block + METHOD method_46157 (Lnet/minecraft/class_1935;)Lnet/minecraft/class_52$class_53; + ARG 0 block + METHOD method_46158 (Lnet/minecraft/class_2430;Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53; + ARG 1 block + METHOD method_46159 (Lnet/minecraft/class_1935;)Lnet/minecraft/class_52$class_53; + ARG 0 block + METHOD method_46160 (Lnet/minecraft/class_2430;Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53; + ARG 1 block + METHOD method_46161 (Lnet/minecraft/class_1935;)Lnet/minecraft/class_52$class_53; + ARG 0 block + METHOD method_46162 (Lnet/minecraft/class_2430;Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53; + ARG 1 block + METHOD method_46163 (Lnet/minecraft/class_1935;)Lnet/minecraft/class_52$class_53; + ARG 0 block + METHOD method_46164 (Lnet/minecraft/class_2430;Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53; + ARG 1 block + METHOD method_46165 (Lnet/minecraft/class_2430;Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53; + ARG 1 block + METHOD method_46166 (Lnet/minecraft/class_2430;Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53; + ARG 1 block + METHOD method_46167 (Lnet/minecraft/class_2430;Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53; + ARG 1 block + METHOD method_46168 (Lnet/minecraft/class_2430;Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53; + ARG 1 block + METHOD method_46169 (Lnet/minecraft/class_2430;Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53; + ARG 1 block + METHOD method_46170 (Lnet/minecraft/class_2430;Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53; + ARG 1 block + METHOD method_46171 (Lnet/minecraft/class_2430;Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53; + ARG 1 block + METHOD method_46172 (Lnet/minecraft/class_2430;Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53; + ARG 1 block + METHOD method_46173 (Lnet/minecraft/class_2430;Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53; + ARG 1 block + METHOD method_46174 (Lnet/minecraft/class_2430;Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53; + ARG 1 block + METHOD method_46175 (Lnet/minecraft/class_2430;Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53; + ARG 1 block + METHOD method_46176 (Lnet/minecraft/class_2430;Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53; + ARG 1 block + METHOD method_46177 (Lnet/minecraft/class_2430;Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53; + ARG 1 block + METHOD method_46178 (Lnet/minecraft/class_2430;Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53; + ARG 1 block + METHOD method_46179 (Lnet/minecraft/class_2430;Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53; + ARG 1 block + METHOD method_46180 (Lnet/minecraft/class_2430;Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53; + ARG 1 block + METHOD method_46181 (Lnet/minecraft/class_2430;Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53; + ARG 1 block + METHOD method_46182 (Lnet/minecraft/class_2430;Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53; + ARG 1 block + METHOD method_46183 (Lnet/minecraft/class_2430;Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53; + ARG 1 block + METHOD method_49366 (Lnet/minecraft/class_2430;Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53; + ARG 1 block + METHOD method_49367 (Lnet/minecraft/class_2430;Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53; + ARG 1 block + METHOD method_49368 (Lnet/minecraft/class_2430;Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53; + ARG 1 block + METHOD method_49369 (Lnet/minecraft/class_2430;Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53; + ARG 1 block + METHOD method_49370 (Lnet/minecraft/class_2430;Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53; + ARG 1 block + METHOD method_49371 (Lnet/minecraft/class_2430;Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53; + ARG 1 block + METHOD method_49372 (Lnet/minecraft/class_2430;Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53; + ARG 1 block + METHOD method_49373 (Lnet/minecraft/class_2430;Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53; + ARG 1 block + METHOD method_49928 (Ljava/lang/Integer;)Lnet/minecraft/class_79$class_80; + ARG 0 age + METHOD method_49929 (Lnet/minecraft/class_2430;Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53; + ARG 1 block + METHOD method_49930 (Lnet/minecraft/class_2430;Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53; + ARG 1 block + METHOD method_49931 (Lnet/minecraft/class_2430;Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53; + ARG 1 block + METHOD method_49932 (Lnet/minecraft/class_2430;Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53; + ARG 1 block + METHOD method_49933 (Lnet/minecraft/class_2430;Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53; + ARG 1 block + METHOD method_49934 (Lnet/minecraft/class_2430;Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53; + ARG 1 block + METHOD method_49935 (Lnet/minecraft/class_2430;Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53; + ARG 1 block + METHOD method_49936 (Lnet/minecraft/class_2430;Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53; + ARG 1 block + METHOD method_49937 (Lnet/minecraft/class_2430;Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53; + ARG 1 block + METHOD method_49938 (Lnet/minecraft/class_2430;Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53; + ARG 1 block + METHOD method_49939 (Lnet/minecraft/class_2430;Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53; + ARG 1 block + METHOD method_49940 (Lnet/minecraft/class_2430;Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53; + ARG 1 block + METHOD method_49941 (Lnet/minecraft/class_2430;Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53; + ARG 1 block + METHOD method_49942 (Lnet/minecraft/class_2430;Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53; + ARG 1 block + METHOD method_49943 (Lnet/minecraft/class_2430;Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53; + ARG 1 block + METHOD method_49944 (Lnet/minecraft/class_2430;Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53; + ARG 1 block + METHOD method_49945 (Lnet/minecraft/class_2430;Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53; + ARG 1 block + METHOD method_49946 (Lnet/minecraft/class_2430;Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53; + ARG 1 block + METHOD method_49947 (Lnet/minecraft/class_2430;Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53; + ARG 1 block + METHOD method_49948 (Lnet/minecraft/class_2430;Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53; + ARG 1 block + METHOD method_49949 (Lnet/minecraft/class_2430;Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53; + ARG 1 block + METHOD method_49950 (Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53; + ARG 1 block + METHOD method_49951 (Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53; + ARG 1 block + METHOD method_49952 (Lnet/minecraft/class_2430;Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53; + ARG 1 block + METHOD method_49953 (Lnet/minecraft/class_2430;Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53; + ARG 1 block + METHOD method_49954 (Lnet/minecraft/class_2430;Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53; + ARG 1 block + METHOD method_49955 (Lnet/minecraft/class_2430;Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53; + ARG 1 block + METHOD method_49956 (Lnet/minecraft/class_2430;Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53; + ARG 1 block + METHOD method_49957 (Lnet/minecraft/class_2430;Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53; + ARG 1 block + METHOD method_49958 (Lnet/minecraft/class_2430;Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53; + ARG 1 block + METHOD method_49959 (Lnet/minecraft/class_2430;Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53; + ARG 1 block + METHOD method_49960 (Lnet/minecraft/class_2430;Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53; + ARG 1 block + METHOD method_49961 (Lnet/minecraft/class_2430;Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53; + ARG 1 block + METHOD method_49962 (Lnet/minecraft/class_2430;Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53; + ARG 1 block + METHOD method_49963 (Lnet/minecraft/class_2430;Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53; + ARG 1 block + METHOD method_49964 (Lnet/minecraft/class_2430;Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53; + ARG 1 block + METHOD method_49965 (Lnet/minecraft/class_2430;Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53; + ARG 1 block + METHOD method_49966 (Lnet/minecraft/class_2430;Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53; + ARG 1 block + METHOD method_49967 (Lnet/minecraft/class_2430;Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53; + ARG 1 block + METHOD method_49968 (Lnet/minecraft/class_2430;Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53; + ARG 1 block + METHOD method_49969 (Lnet/minecraft/class_2430;Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53; + ARG 1 block + METHOD method_49970 (Lnet/minecraft/class_2430;Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53; + ARG 1 block + METHOD method_49971 (Lnet/minecraft/class_2430;Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53; + ARG 1 block + METHOD method_49972 (Lnet/minecraft/class_2430;Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53; + ARG 1 block + METHOD method_49973 (Lnet/minecraft/class_2430;Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53; + ARG 1 block + METHOD method_49974 (Lnet/minecraft/class_2430;Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53; + ARG 1 block + METHOD method_49975 (Lnet/minecraft/class_2430;Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53; + ARG 1 block + METHOD method_49976 (Lnet/minecraft/class_2430;Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53; + ARG 1 block + METHOD method_49977 (Lnet/minecraft/class_2430;Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53; + ARG 1 block + METHOD method_49978 (Lnet/minecraft/class_2430;Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53; + ARG 1 block + METHOD method_49979 (Lnet/minecraft/class_2430;Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53; + ARG 1 block + METHOD method_49980 (Lnet/minecraft/class_2430;Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53; + ARG 1 block + METHOD method_49981 (Lnet/minecraft/class_2430;Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53; + ARG 1 block + METHOD method_49982 (Lnet/minecraft/class_2430;Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53; + ARG 1 block + METHOD method_49983 pitcherCropDrops ()Lnet/minecraft/class_52$class_53; + METHOD method_49984 decoratedPotDrops (Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53; + ARG 1 block diff --git a/mappings/net/minecraft/data/server/loottable/vanilla/VanillaChestLootTableGenerator.mapping b/mappings/net/minecraft/data/server/loottable/vanilla/VanillaChestLootTableGenerator.mapping new file mode 100644 index 0000000000..729e7d7ead --- /dev/null +++ b/mappings/net/minecraft/data/server/loottable/vanilla/VanillaChestLootTableGenerator.mapping @@ -0,0 +1,17 @@ +CLASS net/minecraft/class_2432 net/minecraft/data/server/loottable/vanilla/VanillaChestLootTableGenerator + METHOD method_48499 createShipwreckSupplyChestTableBuilder ()Lnet/minecraft/class_52$class_53; + METHOD method_48500 createShipwreckMapChestTableBuilder ()Lnet/minecraft/class_52$class_53; + METHOD method_48501 createBastionHoglinStableChestTableBuilder ()Lnet/minecraft/class_52$class_53; + METHOD method_48502 createBastionBridgeChestTableBuilder ()Lnet/minecraft/class_52$class_53; + METHOD method_48503 createEndCityTreasureChestTableBuilder ()Lnet/minecraft/class_52$class_53; + METHOD method_48504 createNetherBridgeChestTableBuilder ()Lnet/minecraft/class_52$class_53; + METHOD method_48505 createBastionTreasureChestTableBuilder ()Lnet/minecraft/class_52$class_53; + METHOD method_48506 createBastionOtherChestTableBuilder ()Lnet/minecraft/class_52$class_53; + METHOD method_48507 createWoodlandMansionChestTableBuilder ()Lnet/minecraft/class_52$class_53; + METHOD method_48508 createStrongholdLibraryChestTableBuilder ()Lnet/minecraft/class_52$class_53; + METHOD method_48509 createStrongholdCorridorChestTableBuilder ()Lnet/minecraft/class_52$class_53; + METHOD method_48510 createAncientCityChestTableBuilder ()Lnet/minecraft/class_52$class_53; + METHOD method_48511 createJungleTempleChestTableBuilder ()Lnet/minecraft/class_52$class_53; + METHOD method_48512 createShipwreckTreasureChestTableBuilder ()Lnet/minecraft/class_52$class_53; + METHOD method_48513 createPillagerOutpostChestTableBuilder ()Lnet/minecraft/class_52$class_53; + METHOD method_48514 createDesertPyramidChestTableBuilder ()Lnet/minecraft/class_52$class_53; diff --git a/mappings/net/minecraft/data/server/loottable/vanilla/VanillaEntityLootTableGenerator.mapping b/mappings/net/minecraft/data/server/loottable/vanilla/VanillaEntityLootTableGenerator.mapping new file mode 100644 index 0000000000..72ac1904d2 --- /dev/null +++ b/mappings/net/minecraft/data/server/loottable/vanilla/VanillaEntityLootTableGenerator.mapping @@ -0,0 +1,2 @@ +CLASS net/minecraft/class_2434 net/minecraft/data/server/loottable/vanilla/VanillaEntityLootTableGenerator + METHOD method_48515 createElderGuardianTableBuilder ()Lnet/minecraft/class_52$class_53; diff --git a/mappings/net/minecraft/data/server/FishingLootTableGenerator.mapping b/mappings/net/minecraft/data/server/loottable/vanilla/VanillaFishingLootTableGenerator.mapping similarity index 55% rename from mappings/net/minecraft/data/server/FishingLootTableGenerator.mapping rename to mappings/net/minecraft/data/server/loottable/vanilla/VanillaFishingLootTableGenerator.mapping index cf8a4b1ac2..8390a86a1e 100644 --- a/mappings/net/minecraft/data/server/FishingLootTableGenerator.mapping +++ b/mappings/net/minecraft/data/server/loottable/vanilla/VanillaFishingLootTableGenerator.mapping @@ -1,6 +1,5 @@ -CLASS net/minecraft/class_2437 net/minecraft/data/server/FishingLootTableGenerator +CLASS net/minecraft/class_2437 net/minecraft/data/server/loottable/vanilla/VanillaFishingLootTableGenerator FIELD field_11346 NEEDS_JUNGLE_BIOME Lnet/minecraft/class_5341$class_210; FIELD field_11349 NEEDS_BAMBOO_JUNGLE_BIOME Lnet/minecraft/class_5341$class_210; FIELD field_35165 NEEDS_SPARSE_JUNGLE_BIOME Lnet/minecraft/class_5341$class_210; - METHOD accept (Ljava/lang/Object;)V - ARG 1 exporter + METHOD method_48516 createFishTableBuilder ()Lnet/minecraft/class_52$class_53; diff --git a/mappings/net/minecraft/data/server/loottable/vanilla/VanillaGiftLootTableGenerator.mapping b/mappings/net/minecraft/data/server/loottable/vanilla/VanillaGiftLootTableGenerator.mapping new file mode 100644 index 0000000000..e9781ae38c --- /dev/null +++ b/mappings/net/minecraft/data/server/loottable/vanilla/VanillaGiftLootTableGenerator.mapping @@ -0,0 +1 @@ +CLASS net/minecraft/class_3714 net/minecraft/data/server/loottable/vanilla/VanillaGiftLootTableGenerator diff --git a/mappings/net/minecraft/data/server/loottable/vanilla/VanillaLootTableProviders.mapping b/mappings/net/minecraft/data/server/loottable/vanilla/VanillaLootTableProviders.mapping new file mode 100644 index 0000000000..251fb1c5bf --- /dev/null +++ b/mappings/net/minecraft/data/server/loottable/vanilla/VanillaLootTableProviders.mapping @@ -0,0 +1,3 @@ +CLASS net/minecraft/class_7794 net/minecraft/data/server/loottable/vanilla/VanillaLootTableProviders + METHOD method_46184 createVanillaProvider (Lnet/minecraft/class_7784;)Lnet/minecraft/class_2438; + ARG 0 output diff --git a/mappings/net/minecraft/data/server/recipe/BundleRecipeProvider.mapping b/mappings/net/minecraft/data/server/recipe/BundleRecipeProvider.mapping new file mode 100644 index 0000000000..99dbf0bce0 --- /dev/null +++ b/mappings/net/minecraft/data/server/recipe/BundleRecipeProvider.mapping @@ -0,0 +1 @@ +CLASS net/minecraft/class_7801 net/minecraft/data/server/recipe/BundleRecipeProvider diff --git a/mappings/net/minecraft/data/server/recipe/ComplexRecipeJsonBuilder.mapping b/mappings/net/minecraft/data/server/recipe/ComplexRecipeJsonBuilder.mapping index f34523eb76..d485347482 100644 --- a/mappings/net/minecraft/data/server/recipe/ComplexRecipeJsonBuilder.mapping +++ b/mappings/net/minecraft/data/server/recipe/ComplexRecipeJsonBuilder.mapping @@ -1,9 +1,7 @@ CLASS net/minecraft/class_2456 net/minecraft/data/server/recipe/ComplexRecipeJsonBuilder - FIELD field_11429 serializer Lnet/minecraft/class_1866; - METHOD (Lnet/minecraft/class_1866;)V + FIELD field_11429 serializer Lnet/minecraft/class_1865; + METHOD (Lnet/minecraft/class_1865;)V ARG 1 serializer - METHOD method_10475 offerTo (Ljava/util/function/Consumer;Ljava/lang/String;)V - ARG 1 exporter - ARG 2 recipeId - METHOD method_10476 create (Lnet/minecraft/class_1866;)Lnet/minecraft/class_2456; + METHOD method_10475 offerTo (Lnet/minecraft/class_8790;Lnet/minecraft/class_2960;)V + METHOD method_10476 create (Lnet/minecraft/class_1865;)Lnet/minecraft/class_2456; ARG 0 serializer diff --git a/mappings/net/minecraft/data/server/recipe/CookingRecipeJsonBuilder.mapping b/mappings/net/minecraft/data/server/recipe/CookingRecipeJsonBuilder.mapping index 36d5b62c9b..216be973d2 100644 --- a/mappings/net/minecraft/data/server/recipe/CookingRecipeJsonBuilder.mapping +++ b/mappings/net/minecraft/data/server/recipe/CookingRecipeJsonBuilder.mapping @@ -1,62 +1,81 @@ CLASS net/minecraft/class_2454 net/minecraft/data/server/recipe/CookingRecipeJsonBuilder FIELD field_11414 experience F FIELD field_11415 cookingTime I - FIELD field_11416 advancementBuilder Lnet/minecraft/class_161$class_162; 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 output - ARG 2 input + FIELD field_17599 serializer Lnet/minecraft/class_1865; + FIELD field_40647 category Lnet/minecraft/class_7800; + FIELD field_40648 cookingCategory Lnet/minecraft/class_7709; + METHOD (Lnet/minecraft/class_7800;Lnet/minecraft/class_7709;Lnet/minecraft/class_1935;Lnet/minecraft/class_1856;FILnet/minecraft/class_1865;)V + ARG 1 category + ARG 2 cookingCategory + ARG 3 output + ARG 4 input + ARG 5 experience + ARG 6 cookingTime + ARG 7 serializer + METHOD method_10471 validate (Lnet/minecraft/class_2960;)V + ARG 1 recipeId + METHOD method_10473 createBlasting (Lnet/minecraft/class_1856;Lnet/minecraft/class_7800;Lnet/minecraft/class_1935;FI)Lnet/minecraft/class_2454; + ARG 0 input + ARG 1 category + ARG 2 output + ARG 3 experience + ARG 4 cookingTime + METHOD method_17801 create (Lnet/minecraft/class_1856;Lnet/minecraft/class_7800;Lnet/minecraft/class_1935;FILnet/minecraft/class_1865;)Lnet/minecraft/class_2454; + ARG 0 input + ARG 1 category + ARG 2 output ARG 3 experience ARG 4 cookingTime ARG 5 serializer - METHOD method_10471 validate (Lnet/minecraft/class_2960;)V - ARG 1 recipeId - METHOD method_10473 createBlasting (Lnet/minecraft/class_1856;Lnet/minecraft/class_1935;FI)Lnet/minecraft/class_2454; - ARG 0 ingredient - ARG 1 result - ARG 2 experience - ARG 3 cookingTime - METHOD method_17801 create (Lnet/minecraft/class_1856;Lnet/minecraft/class_1935;FILnet/minecraft/class_3957;)Lnet/minecraft/class_2454; - ARG 0 ingredient - ARG 1 result - ARG 2 experience - ARG 3 cookingTime - ARG 4 serializer - METHOD method_17802 createSmelting (Lnet/minecraft/class_1856;Lnet/minecraft/class_1935;FI)Lnet/minecraft/class_2454; - ARG 0 ingredient - ARG 1 result - ARG 2 experience - ARG 3 cookingTime - METHOD method_35916 create (Lnet/minecraft/class_1856;Lnet/minecraft/class_1935;FI)Lnet/minecraft/class_2454; - ARG 0 result - ARG 1 ingredient - ARG 2 experience - ARG 3 cookingTime - METHOD method_35918 createSmoking (Lnet/minecraft/class_1856;Lnet/minecraft/class_1935;FI)Lnet/minecraft/class_2454; - ARG 0 result - ARG 1 ingredient - ARG 2 experience - ARG 3 cookingTime + METHOD method_17802 createSmelting (Lnet/minecraft/class_1856;Lnet/minecraft/class_7800;Lnet/minecraft/class_1935;FI)Lnet/minecraft/class_2454; + ARG 0 input + ARG 1 category + ARG 2 output + ARG 3 experience + ARG 4 cookingTime + METHOD method_35916 createCampfireCooking (Lnet/minecraft/class_1856;Lnet/minecraft/class_7800;Lnet/minecraft/class_1935;FI)Lnet/minecraft/class_2454; + ARG 0 input + ARG 1 category + ARG 2 output + ARG 3 experience + ARG 4 cookingTime + METHOD method_35918 createSmoking (Lnet/minecraft/class_1856;Lnet/minecraft/class_7800;Lnet/minecraft/class_1935;FI)Lnet/minecraft/class_2454; + ARG 0 input + ARG 1 category + ARG 2 output + ARG 3 experience + ARG 4 cookingTime + METHOD method_46215 getCookingRecipeCategory (Lnet/minecraft/class_1865;Lnet/minecraft/class_1935;)Lnet/minecraft/class_7709; + ARG 0 serializer + ARG 1 output + METHOD method_46216 getSmeltingRecipeCategory (Lnet/minecraft/class_1935;)Lnet/minecraft/class_7709; + ARG 0 output + METHOD method_46217 getBlastingRecipeCategory (Lnet/minecraft/class_1935;)Lnet/minecraft/class_7709; + ARG 0 output CLASS class_2455 CookingRecipeJsonProvider - FIELD field_11421 experience F - FIELD field_11422 cookingTime I - FIELD field_11423 advancementBuilder Lnet/minecraft/class_161$class_162; - FIELD field_11424 recipeId Lnet/minecraft/class_2960; - FIELD field_11425 input Lnet/minecraft/class_1856; - FIELD field_11426 group Ljava/lang/String; - FIELD field_11427 advancementId Lnet/minecraft/class_2960; - FIELD field_11428 result Lnet/minecraft/class_1792; - FIELD field_17600 serializer Lnet/minecraft/class_1865; - METHOD (Lnet/minecraft/class_2960;Ljava/lang/String;Lnet/minecraft/class_1856;Lnet/minecraft/class_1792;FILnet/minecraft/class_161$class_162;Lnet/minecraft/class_2960;Lnet/minecraft/class_1865;)V + FIELD comp_1222 recipeId Lnet/minecraft/class_2960; + FIELD comp_1223 serializer Lnet/minecraft/class_1865; + FIELD comp_1940 group Ljava/lang/String; + FIELD comp_1941 category Lnet/minecraft/class_7709; + FIELD comp_1942 input Lnet/minecraft/class_1856; + FIELD comp_1943 result Lnet/minecraft/class_1792; + FIELD comp_1944 experience F + FIELD comp_1945 cookingTime I + FIELD comp_1946 advancementBuilder Lnet/minecraft/class_8779; + METHOD (Lnet/minecraft/class_2960;Ljava/lang/String;Lnet/minecraft/class_7709;Lnet/minecraft/class_1856;Lnet/minecraft/class_1792;FILnet/minecraft/class_8779;Lnet/minecraft/class_1865;)V ARG 1 recipeId ARG 2 group - ARG 3 input - ARG 4 result - ARG 5 experience - ARG 6 cookingTime - ARG 7 advancementBuilder - ARG 8 advancementId - ARG 9 serializer + ARG 3 category + ARG 4 input + ARG 5 result + ARG 6 experience + ARG 7 cookingTime + METHOD comp_1940 group ()Ljava/lang/String; + METHOD comp_1941 category ()Lnet/minecraft/class_7709; + METHOD comp_1942 input ()Lnet/minecraft/class_1856; + METHOD comp_1943 result ()Lnet/minecraft/class_1792; + METHOD comp_1944 experience ()F + METHOD comp_1945 cookingTime ()I diff --git a/mappings/net/minecraft/data/server/recipe/CraftingRecipeJsonBuilder.mapping b/mappings/net/minecraft/data/server/recipe/CraftingRecipeJsonBuilder.mapping index 8c40f7ab1b..728b3369df 100644 --- a/mappings/net/minecraft/data/server/recipe/CraftingRecipeJsonBuilder.mapping +++ b/mappings/net/minecraft/data/server/recipe/CraftingRecipeJsonBuilder.mapping @@ -1,18 +1,14 @@ CLASS net/minecraft/class_5797 net/minecraft/data/server/recipe/CraftingRecipeJsonBuilder FIELD field_39377 ROOT Lnet/minecraft/class_2960; - METHOD method_10431 offerTo (Ljava/util/function/Consumer;)V - ARG 1 exporter - METHOD method_17972 offerTo (Ljava/util/function/Consumer;Lnet/minecraft/class_2960;)V - ARG 1 exporter + METHOD method_10431 offerTo (Lnet/minecraft/class_8790;)V + METHOD method_17972 offerTo (Lnet/minecraft/class_8790;Lnet/minecraft/class_2960;)V ARG 2 recipeId METHOD method_33529 group (Ljava/lang/String;)Lnet/minecraft/class_5797; ARG 1 group - METHOD method_33530 criterion (Ljava/lang/String;Lnet/minecraft/class_184;)Lnet/minecraft/class_5797; + METHOD method_33530 criterion (Ljava/lang/String;Lnet/minecraft/class_175;)Lnet/minecraft/class_5797; ARG 1 name - ARG 2 conditions METHOD method_36441 getOutputItem ()Lnet/minecraft/class_1792; METHOD method_36442 getItemId (Lnet/minecraft/class_1935;)Lnet/minecraft/class_2960; ARG 0 item - METHOD method_36443 offerTo (Ljava/util/function/Consumer;Ljava/lang/String;)V - ARG 1 exporter + METHOD method_36443 offerTo (Lnet/minecraft/class_8790;Ljava/lang/String;)V ARG 2 recipePath diff --git a/mappings/net/minecraft/data/server/recipe/RecipeJsonBuilder.mapping b/mappings/net/minecraft/data/server/recipe/RecipeJsonBuilder.mapping new file mode 100644 index 0000000000..630d2bd903 --- /dev/null +++ b/mappings/net/minecraft/data/server/recipe/RecipeJsonBuilder.mapping @@ -0,0 +1,7 @@ +CLASS net/minecraft/class_7798 net/minecraft/data/server/recipe/RecipeJsonBuilder + METHOD method_46202 getCraftingCategory (Lnet/minecraft/class_7800;)Lnet/minecraft/class_7710; + ARG 0 category + CLASS class_7799 CraftingRecipeJsonProvider + FIELD field_40633 craftingCategory Lnet/minecraft/class_7710; + METHOD (Lnet/minecraft/class_7710;)V + ARG 1 craftingCategory diff --git a/mappings/net/minecraft/data/server/recipe/RecipeJsonProvider.mapping b/mappings/net/minecraft/data/server/recipe/RecipeJsonProvider.mapping index 654766408e..bbd208918e 100644 --- a/mappings/net/minecraft/data/server/recipe/RecipeJsonProvider.mapping +++ b/mappings/net/minecraft/data/server/recipe/RecipeJsonProvider.mapping @@ -1,8 +1,7 @@ CLASS net/minecraft/class_2444 net/minecraft/data/server/recipe/RecipeJsonProvider - METHOD method_10415 toAdvancementJson ()Lcom/google/gson/JsonObject; + METHOD comp_1230 recipeId ()Lnet/minecraft/class_2960; + METHOD comp_1231 serializer ()Lnet/minecraft/class_1865; + METHOD comp_1235 advancementBuilder ()Lnet/minecraft/class_8779; METHOD method_10416 serialize (Lcom/google/gson/JsonObject;)V ARG 1 json - METHOD method_10417 getRecipeId ()Lnet/minecraft/class_2960; - METHOD method_10418 getAdvancementId ()Lnet/minecraft/class_2960; METHOD method_17799 toJson ()Lcom/google/gson/JsonObject; - METHOD method_17800 getSerializer ()Lnet/minecraft/class_1865; diff --git a/mappings/net/minecraft/data/server/recipe/RecipeProvider.mapping b/mappings/net/minecraft/data/server/recipe/RecipeProvider.mapping new file mode 100644 index 0000000000..fb81250d6f --- /dev/null +++ b/mappings/net/minecraft/data/server/recipe/RecipeProvider.mapping @@ -0,0 +1,339 @@ +CLASS net/minecraft/class_2446 net/minecraft/data/server/recipe/RecipeProvider + FIELD field_28555 VARIANT_FACTORIES Ljava/util/Map; + FIELD field_39378 recipesPathResolver Lnet/minecraft/class_7784$class_7489; + FIELD field_39379 advancementsPathResolver Lnet/minecraft/class_7784$class_7489; + METHOD (Lnet/minecraft/class_7784;)V + ARG 1 output + METHOD method_10419 generate (Lnet/minecraft/class_8790;)V + METHOD method_10420 conditionsFromTag (Lnet/minecraft/class_6862;)Lnet/minecraft/class_175; + ARG 0 tag + METHOD method_10422 requireEnteringFluid (Lnet/minecraft/class_2248;)Lnet/minecraft/class_175; + ARG 0 block + METHOD method_10423 conditionsFromItemPredicates ([Lnet/minecraft/class_2073;)Lnet/minecraft/class_175; + ARG 0 predicates + METHOD method_10426 conditionsFromItem (Lnet/minecraft/class_1935;)Lnet/minecraft/class_175; + ARG 0 item + METHOD method_17585 generateCookingRecipes (Lnet/minecraft/class_8790;Ljava/lang/String;Lnet/minecraft/class_1865;I)V + ARG 1 cooker + ARG 2 serializer + ARG 3 cookingTime + METHOD method_24475 offerPlanksRecipe2 (Lnet/minecraft/class_8790;Lnet/minecraft/class_1935;Lnet/minecraft/class_6862;I)V + ARG 1 output + ARG 2 input + ARG 3 count + METHOD method_24476 offerBarkBlockRecipe (Lnet/minecraft/class_8790;Lnet/minecraft/class_1935;Lnet/minecraft/class_1935;)V + ARG 1 output + ARG 2 input + METHOD method_24477 offerPlanksRecipe (Lnet/minecraft/class_8790;Lnet/minecraft/class_1935;Lnet/minecraft/class_6862;I)V + ARG 1 output + ARG 2 input + ARG 3 count + METHOD method_24478 offerBoatRecipe (Lnet/minecraft/class_8790;Lnet/minecraft/class_1935;Lnet/minecraft/class_1935;)V + ARG 1 output + ARG 2 input + METHOD method_24885 offerCarpetRecipe (Lnet/minecraft/class_8790;Lnet/minecraft/class_1935;Lnet/minecraft/class_1935;)V + ARG 1 output + ARG 2 input + METHOD method_24887 offerBedRecipe (Lnet/minecraft/class_8790;Lnet/minecraft/class_1935;Lnet/minecraft/class_1935;)V + ARG 1 output + ARG 2 input + METHOD method_24889 offerBannerRecipe (Lnet/minecraft/class_8790;Lnet/minecraft/class_1935;Lnet/minecraft/class_1935;)V + ARG 1 output + ARG 2 input + METHOD method_24890 offerStainedGlassDyeingRecipe (Lnet/minecraft/class_8790;Lnet/minecraft/class_1935;Lnet/minecraft/class_1935;)V + ARG 1 output + ARG 2 input + METHOD method_24891 offerStainedGlassPaneRecipe (Lnet/minecraft/class_8790;Lnet/minecraft/class_1935;Lnet/minecraft/class_1935;)V + ARG 1 output + ARG 2 input + METHOD method_24892 offerStainedGlassPaneDyeingRecipe (Lnet/minecraft/class_8790;Lnet/minecraft/class_1935;Lnet/minecraft/class_1935;)V + ARG 1 output + ARG 2 input + METHOD method_24893 offerTerracottaDyeingRecipe (Lnet/minecraft/class_8790;Lnet/minecraft/class_1935;Lnet/minecraft/class_1935;)V + ARG 1 output + ARG 2 input + METHOD method_24894 offerConcretePowderDyeingRecipe (Lnet/minecraft/class_8790;Lnet/minecraft/class_1935;Lnet/minecraft/class_1935;)V + ARG 1 output + ARG 2 input + METHOD method_29728 offerNetheriteUpgradeRecipe (Lnet/minecraft/class_8790;Lnet/minecraft/class_1792;Lnet/minecraft/class_7800;Lnet/minecraft/class_1792;)V + ARG 1 input + ARG 2 category + ARG 3 result + METHOD method_32233 offerCandleDyeingRecipe (Lnet/minecraft/class_8790;Lnet/minecraft/class_1935;Lnet/minecraft/class_1935;)V + ARG 1 output + ARG 2 input + METHOD method_32804 createSlabRecipe (Lnet/minecraft/class_7800;Lnet/minecraft/class_1935;Lnet/minecraft/class_1856;)Lnet/minecraft/class_5797; + ARG 0 category + ARG 1 output + ARG 2 input + METHOD method_32805 createChiseledBlockRecipe (Lnet/minecraft/class_7800;Lnet/minecraft/class_1935;Lnet/minecraft/class_1856;)Lnet/minecraft/class_2447; + ARG 0 category + ARG 1 output + ARG 2 input + METHOD method_32806 createPressurePlateRecipe (Lnet/minecraft/class_7800;Lnet/minecraft/class_1935;Lnet/minecraft/class_1856;)Lnet/minecraft/class_5797; + ARG 0 category + ARG 1 output + ARG 2 input + METHOD method_32807 hasItem (Lnet/minecraft/class_1935;)Ljava/lang/String; + ARG 0 item + METHOD method_32808 createStairsRecipe (Lnet/minecraft/class_1935;Lnet/minecraft/class_1856;)Lnet/minecraft/class_5797; + ARG 0 output + ARG 1 input + METHOD method_32809 offerWallRecipe (Lnet/minecraft/class_8790;Lnet/minecraft/class_7800;Lnet/minecraft/class_1935;Lnet/minecraft/class_1935;)V + ARG 1 category + ARG 2 output + ARG 3 input + METHOD method_32810 offerPolishedStoneRecipe (Lnet/minecraft/class_8790;Lnet/minecraft/class_7800;Lnet/minecraft/class_1935;Lnet/minecraft/class_1935;)V + ARG 1 category + ARG 2 output + ARG 3 input + METHOD method_32811 offerCutCopperRecipe (Lnet/minecraft/class_8790;Lnet/minecraft/class_7800;Lnet/minecraft/class_1935;Lnet/minecraft/class_1935;)V + ARG 1 category + ARG 2 output + ARG 3 input + METHOD method_32812 offerChiseledBlockRecipe (Lnet/minecraft/class_8790;Lnet/minecraft/class_7800;Lnet/minecraft/class_1935;Lnet/minecraft/class_1935;)V + ARG 1 category + ARG 2 output + ARG 3 input + METHOD method_32813 offerPressurePlateRecipe (Lnet/minecraft/class_8790;Lnet/minecraft/class_1935;Lnet/minecraft/class_1935;)V + ARG 1 output + ARG 2 input + METHOD method_32814 offerSlabRecipe (Lnet/minecraft/class_8790;Lnet/minecraft/class_7800;Lnet/minecraft/class_1935;Lnet/minecraft/class_1935;)V + ARG 1 category + ARG 2 output + ARG 3 input + METHOD method_33531 getWallRecipe (Lnet/minecraft/class_7800;Lnet/minecraft/class_1935;Lnet/minecraft/class_1856;)Lnet/minecraft/class_5797; + ARG 0 category + ARG 1 output + ARG 2 input + METHOD method_33532 (Lnet/minecraft/class_1935;Lnet/minecraft/class_1935;)Lnet/minecraft/class_5797; + ARG 0 output + ARG 1 input + METHOD method_33533 getVariantRecipeInput (Lnet/minecraft/class_5794;Lnet/minecraft/class_5794$class_5796;)Lnet/minecraft/class_2248; + COMMENT Gets the block used to craft a certain {@linkplain net.minecraft.data.family.BlockFamily.Variant variant} of a base block. + COMMENT + COMMENT

Normally, the block used to craft a variant is the base block. + COMMENT For chiseled variants, this is the slab variant of that block. + COMMENT + COMMENT

Purpur is handled separately because both purpur and purpur pillars can be used to craft purpur slabs and stairs. + ARG 0 family + ARG 1 variant + METHOD method_33534 (Lnet/minecraft/class_5794;Lnet/minecraft/class_8790;Lnet/minecraft/class_5794$class_5796;Lnet/minecraft/class_2248;)V + ARG 2 variant + ARG 3 block + METHOD method_33535 generateFamily (Lnet/minecraft/class_8790;Lnet/minecraft/class_5794;)V + ARG 1 family + METHOD method_33536 (Lnet/minecraft/class_5797;Lnet/minecraft/class_5794$class_5796;Ljava/lang/String;)V + ARG 2 group + METHOD method_33537 createCondensingRecipe (Lnet/minecraft/class_7800;Lnet/minecraft/class_1935;Lnet/minecraft/class_1856;)Lnet/minecraft/class_5797; + ARG 0 category + ARG 1 output + ARG 2 input + METHOD method_33538 (Lnet/minecraft/class_1935;Lnet/minecraft/class_1935;)Lnet/minecraft/class_5797; + ARG 0 output + ARG 1 input + METHOD method_33541 (Lnet/minecraft/class_1935;Lnet/minecraft/class_1935;)Lnet/minecraft/class_5797; + ARG 0 output + ARG 1 input + METHOD method_33542 createTransmutationRecipe (Lnet/minecraft/class_1935;Lnet/minecraft/class_1856;)Lnet/minecraft/class_5797; + ARG 0 output + ARG 1 input + METHOD method_33543 (Lnet/minecraft/class_1935;Lnet/minecraft/class_1935;)Lnet/minecraft/class_5797; + ARG 0 output + ARG 1 input + METHOD method_33544 createDoorRecipe (Lnet/minecraft/class_1935;Lnet/minecraft/class_1856;)Lnet/minecraft/class_5797; + ARG 0 output + ARG 1 input + METHOD method_33545 (Lnet/minecraft/class_1935;Lnet/minecraft/class_1935;)Lnet/minecraft/class_5797; + ARG 0 output + ARG 1 input + METHOD method_33546 createFenceRecipe (Lnet/minecraft/class_1935;Lnet/minecraft/class_1856;)Lnet/minecraft/class_5797; + ARG 0 output + ARG 1 input + METHOD method_33547 (Lnet/minecraft/class_1935;Lnet/minecraft/class_1935;)Lnet/minecraft/class_5797; + ARG 0 output + ARG 1 input + METHOD method_33548 createFenceGateRecipe (Lnet/minecraft/class_1935;Lnet/minecraft/class_1856;)Lnet/minecraft/class_5797; + ARG 0 output + ARG 1 input + METHOD method_33549 (Lnet/minecraft/class_1935;Lnet/minecraft/class_1935;)Lnet/minecraft/class_5797; + ARG 0 output + ARG 1 input + METHOD method_33550 (Lnet/minecraft/class_1935;Lnet/minecraft/class_1935;)Lnet/minecraft/class_5797; + ARG 0 output + ARG 1 input + METHOD method_33551 (Lnet/minecraft/class_1935;Lnet/minecraft/class_1935;)Lnet/minecraft/class_5797; + ARG 0 output + ARG 1 input + METHOD method_33552 (Lnet/minecraft/class_1935;Lnet/minecraft/class_1935;)Lnet/minecraft/class_5797; + ARG 0 output + ARG 1 input + METHOD method_33553 createTrapdoorRecipe (Lnet/minecraft/class_1935;Lnet/minecraft/class_1856;)Lnet/minecraft/class_5797; + ARG 0 output + ARG 1 input + METHOD method_33554 (Lnet/minecraft/class_1935;Lnet/minecraft/class_1935;)Lnet/minecraft/class_5797; + ARG 0 output + ARG 1 input + METHOD method_33555 createSignRecipe (Lnet/minecraft/class_1935;Lnet/minecraft/class_1856;)Lnet/minecraft/class_5797; + ARG 0 output + ARG 1 input + METHOD method_33556 (Lnet/minecraft/class_1935;Lnet/minecraft/class_1935;)Lnet/minecraft/class_5797; + ARG 0 output + ARG 1 input + METHOD method_33714 convertBetween (Lnet/minecraft/class_1935;Lnet/minecraft/class_1935;)Ljava/lang/String; + ARG 0 to + ARG 1 from + METHOD method_33715 offerStonecuttingRecipe (Lnet/minecraft/class_8790;Lnet/minecraft/class_7800;Lnet/minecraft/class_1935;Lnet/minecraft/class_1935;I)V + ARG 1 category + ARG 2 output + ARG 3 input + ARG 4 count + METHOD method_33716 getItemPath (Lnet/minecraft/class_1935;)Ljava/lang/String; + ARG 0 item + METHOD method_33717 offerStonecuttingRecipe (Lnet/minecraft/class_8790;Lnet/minecraft/class_7800;Lnet/minecraft/class_1935;Lnet/minecraft/class_1935;)V + ARG 1 category + ARG 2 output + ARG 3 input + METHOD method_34662 offerCrackingRecipe (Lnet/minecraft/class_8790;Lnet/minecraft/class_1935;Lnet/minecraft/class_1935;)V + COMMENT Offers a smelting recipe to the exporter that is used to convert the main block of a block family to its cracked variant. + ARG 1 output + ARG 2 input + METHOD method_34853 (Lnet/minecraft/class_8790;Lnet/minecraft/class_2248;Lnet/minecraft/class_2248;)V + ARG 1 input + ARG 2 output + METHOD method_34854 offerWaxingRecipes (Lnet/minecraft/class_8790;)V + METHOD method_35914 conditionsFromItem (Lnet/minecraft/class_2096$class_2100;Lnet/minecraft/class_1935;)Lnet/minecraft/class_175; + ARG 0 count + ARG 1 item + METHOD method_36232 offerMultipleOptions (Lnet/minecraft/class_8790;Lnet/minecraft/class_1865;Ljava/util/List;Lnet/minecraft/class_7800;Lnet/minecraft/class_1935;FILjava/lang/String;Ljava/lang/String;)V + ARG 1 serializer + ARG 2 inputs + ARG 3 category + ARG 4 output + ARG 5 experience + ARG 6 cookingTime + ARG 7 group + ARG 8 method + METHOD method_36233 offerSmelting (Lnet/minecraft/class_8790;Ljava/util/List;Lnet/minecraft/class_7800;Lnet/minecraft/class_1935;FILjava/lang/String;)V + ARG 1 inputs + ARG 2 category + ARG 3 output + ARG 4 experience + ARG 5 cookingTime + ARG 6 group + METHOD method_36234 offerBlasting (Lnet/minecraft/class_8790;Ljava/util/List;Lnet/minecraft/class_7800;Lnet/minecraft/class_1935;FILjava/lang/String;)V + ARG 1 inputs + ARG 2 category + ARG 3 output + ARG 4 experience + ARG 5 cookingTime + ARG 6 group + METHOD method_36325 offerReversibleCompactingRecipes (Lnet/minecraft/class_8790;Lnet/minecraft/class_7800;Lnet/minecraft/class_1935;Lnet/minecraft/class_7800;Lnet/minecraft/class_1935;)V + COMMENT Offers two recipes to convert between a normal and compacted form of an item. + COMMENT + COMMENT

The shaped recipe converts 9 items in a square to a compacted form of the item. + COMMENT

The shapeless recipe converts the compacted form to 9 of the normal form. + ARG 1 reverseCategory + ARG 2 baseItem + ARG 3 compactingCategory + ARG 4 compactItem + METHOD method_36444 offerSingleOutputShapelessRecipe (Lnet/minecraft/class_8790;Lnet/minecraft/class_1935;Lnet/minecraft/class_1935;Ljava/lang/String;)V + ARG 1 output + ARG 2 input + ARG 3 group + METHOD method_36445 offerShapelessRecipe (Lnet/minecraft/class_8790;Lnet/minecraft/class_1935;Lnet/minecraft/class_1935;Ljava/lang/String;I)V + ARG 1 output + ARG 2 input + ARG 3 group + ARG 4 outputCount + METHOD method_36446 offerReversibleCompactingRecipesWithCompactingRecipeGroup (Lnet/minecraft/class_8790;Lnet/minecraft/class_7800;Lnet/minecraft/class_1935;Lnet/minecraft/class_7800;Lnet/minecraft/class_1935;Ljava/lang/String;Ljava/lang/String;)V + ARG 1 reverseCategory + ARG 2 baseItem + ARG 3 compactingCategory + ARG 4 compactItem + ARG 5 compactingId + ARG 6 compactingGroup + METHOD method_36447 offerReversibleCompactingRecipes (Lnet/minecraft/class_8790;Lnet/minecraft/class_7800;Lnet/minecraft/class_1935;Lnet/minecraft/class_7800;Lnet/minecraft/class_1935;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V + ARG 1 reverseCategory + ARG 2 baseItem + ARG 3 compactingCategory + ARG 4 compactItem + ARG 5 compactingId + ARG 6 compactingGroup + ARG 7 reverseId + ARG 8 reverseGroup + METHOD method_36448 offerFoodCookingRecipe (Lnet/minecraft/class_8790;Ljava/lang/String;Lnet/minecraft/class_1865;ILnet/minecraft/class_1935;Lnet/minecraft/class_1935;F)V + ARG 1 cooker + ARG 2 serializer + ARG 3 cookingTime + ARG 4 input + ARG 5 output + ARG 6 experience + METHOD method_36449 offerReversibleCompactingRecipesWithReverseRecipeGroup (Lnet/minecraft/class_8790;Lnet/minecraft/class_7800;Lnet/minecraft/class_1935;Lnet/minecraft/class_7800;Lnet/minecraft/class_1935;Ljava/lang/String;Ljava/lang/String;)V + ARG 1 reverseCategory + ARG 2 baseItem + ARG 3 compactingCategory + ARG 4 compactItem + ARG 5 reverseId + ARG 6 reverseGroup + METHOD method_36450 getRecipeName (Lnet/minecraft/class_1935;)Ljava/lang/String; + ARG 0 item + METHOD method_36451 getSmeltingItemPath (Lnet/minecraft/class_1935;)Ljava/lang/String; + ARG 0 item + METHOD method_36452 getBlastingItemPath (Lnet/minecraft/class_1935;)Ljava/lang/String; + ARG 0 item + METHOD method_36546 (Lnet/minecraft/class_1935;Lnet/minecraft/class_1935;)Lnet/minecraft/class_5797; + ARG 0 output + ARG 1 input + METHOD method_36547 createCutCopperRecipe (Lnet/minecraft/class_7800;Lnet/minecraft/class_1935;Lnet/minecraft/class_1856;)Lnet/minecraft/class_2447; + ARG 0 category + ARG 1 output + ARG 2 input + METHOD method_42754 offerChestBoatRecipe (Lnet/minecraft/class_8790;Lnet/minecraft/class_1935;Lnet/minecraft/class_1935;)V + ARG 1 output + ARG 2 input + METHOD method_46205 (Lnet/minecraft/class_7699;Lnet/minecraft/class_5794;)Z + ARG 1 family + METHOD method_46206 saveRecipeAdvancement (Lnet/minecraft/class_7403;Lnet/minecraft/class_8779;)Ljava/util/concurrent/CompletableFuture; + ARG 1 cache + METHOD method_46207 generateFamilies (Lnet/minecraft/class_8790;Lnet/minecraft/class_7699;)V + ARG 1 enabledFeatures + METHOD method_46208 offerHangingSignRecipe (Lnet/minecraft/class_8790;Lnet/minecraft/class_1935;Lnet/minecraft/class_1935;)V + ARG 1 output + ARG 2 input + METHOD method_46209 offer2x2CompactingRecipe (Lnet/minecraft/class_8790;Lnet/minecraft/class_7800;Lnet/minecraft/class_1935;Lnet/minecraft/class_1935;)V + ARG 1 category + ARG 2 output + ARG 3 input + METHOD method_46210 (Lnet/minecraft/class_8790;Lnet/minecraft/class_5794;)V + ARG 1 family + METHOD method_46212 offerMosaicRecipe (Lnet/minecraft/class_8790;Lnet/minecraft/class_7800;Lnet/minecraft/class_1935;Lnet/minecraft/class_1935;)V + ARG 1 category + ARG 2 output + ARG 3 input + METHOD method_47521 offerCompactingRecipe (Lnet/minecraft/class_8790;Lnet/minecraft/class_7800;Lnet/minecraft/class_1935;Lnet/minecraft/class_1935;Ljava/lang/String;)V + ARG 1 category + ARG 2 output + ARG 3 input + ARG 4 criterionName + METHOD method_47522 offerCompactingRecipe (Lnet/minecraft/class_8790;Lnet/minecraft/class_7800;Lnet/minecraft/class_1935;Lnet/minecraft/class_1935;)V + ARG 1 category + ARG 2 output + ARG 3 input + METHOD method_48530 offerSmithingTrimRecipe (Lnet/minecraft/class_8790;Lnet/minecraft/class_1792;Lnet/minecraft/class_2960;)V + ARG 1 template + ARG 2 recipeId + METHOD method_48532 offerSmithingTemplateCopyingRecipe (Lnet/minecraft/class_8790;Lnet/minecraft/class_1935;Lnet/minecraft/class_6862;)V + ARG 1 template + ARG 2 resource + METHOD method_48533 offerSmithingTemplateCopyingRecipe (Lnet/minecraft/class_8790;Lnet/minecraft/class_1935;Lnet/minecraft/class_1935;)V + ARG 1 template + ARG 2 resource + METHOD method_51890 offerDyeableRecipes (Lnet/minecraft/class_8790;Ljava/util/List;Ljava/util/List;Ljava/lang/String;)V + ARG 1 dyes + ARG 2 dyeables + ARG 3 group + METHOD method_52186 (Lnet/minecraft/class_1792;Lnet/minecraft/class_1792;)Z + ARG 1 dyeable + METHOD method_53499 conditionsFromPredicates ([Lnet/minecraft/class_2073$class_2074;)Lnet/minecraft/class_175; + ARG 0 predicates diff --git a/mappings/net/minecraft/data/server/recipe/ShapedRecipeJsonBuilder.mapping b/mappings/net/minecraft/data/server/recipe/ShapedRecipeJsonBuilder.mapping index 7840928193..56db0f9cb9 100644 --- a/mappings/net/minecraft/data/server/recipe/ShapedRecipeJsonBuilder.mapping +++ b/mappings/net/minecraft/data/server/recipe/ShapedRecipeJsonBuilder.mapping @@ -1,13 +1,15 @@ CLASS net/minecraft/class_2447 net/minecraft/data/server/recipe/ShapedRecipeJsonBuilder FIELD field_11376 inputs Ljava/util/Map; FIELD field_11377 pattern Ljava/util/List; - FIELD field_11378 outputCount I - FIELD field_11379 advancementBuilder Lnet/minecraft/class_161$class_162; + FIELD field_11378 count I FIELD field_11380 output Lnet/minecraft/class_1792; FIELD field_11381 group Ljava/lang/String; - METHOD (Lnet/minecraft/class_1935;I)V - ARG 1 output - ARG 2 outputCount + FIELD field_40645 category Lnet/minecraft/class_7800; + FIELD field_42956 showNotification Z + METHOD (Lnet/minecraft/class_7800;Lnet/minecraft/class_1935;I)V + ARG 1 category + ARG 2 output + ARG 3 count METHOD method_10428 input (Ljava/lang/Character;Lnet/minecraft/class_1856;)Lnet/minecraft/class_2447; ARG 1 c ARG 2 ingredient @@ -19,13 +21,17 @@ CLASS net/minecraft/class_2447 net/minecraft/data/server/recipe/ShapedRecipeJson METHOD method_10434 input (Ljava/lang/Character;Lnet/minecraft/class_1935;)Lnet/minecraft/class_2447; ARG 1 c ARG 2 itemProvider - METHOD method_10436 create (Lnet/minecraft/class_1935;I)Lnet/minecraft/class_2447; - ARG 0 output - ARG 1 outputCount - METHOD method_10437 create (Lnet/minecraft/class_1935;)Lnet/minecraft/class_2447; - ARG 0 output + METHOD method_10436 create (Lnet/minecraft/class_7800;Lnet/minecraft/class_1935;I)Lnet/minecraft/class_2447; + ARG 0 category + ARG 1 output + ARG 2 count + METHOD method_10437 create (Lnet/minecraft/class_7800;Lnet/minecraft/class_1935;)Lnet/minecraft/class_2447; + ARG 0 category + ARG 1 output METHOD method_10439 pattern (Ljava/lang/String;)Lnet/minecraft/class_2447; ARG 1 patternStr + METHOD method_49380 showNotification (Z)Lnet/minecraft/class_2447; + ARG 1 showNotification CLASS class_2448 ShapedRecipeJsonProvider FIELD field_11383 output Lnet/minecraft/class_1792; FIELD field_11384 pattern Ljava/util/List; @@ -33,14 +39,14 @@ CLASS net/minecraft/class_2447 net/minecraft/data/server/recipe/ShapedRecipeJson FIELD field_11386 resultCount I FIELD field_11387 group Ljava/lang/String; FIELD field_11388 inputs Ljava/util/Map; - FIELD field_11389 advancementBuilder Lnet/minecraft/class_161$class_162; - FIELD field_11390 advancementId Lnet/minecraft/class_2960; - METHOD (Lnet/minecraft/class_2960;Lnet/minecraft/class_1792;ILjava/lang/String;Ljava/util/List;Ljava/util/Map;Lnet/minecraft/class_161$class_162;Lnet/minecraft/class_2960;)V + FIELD field_11389 advancementBuilder Lnet/minecraft/class_8779; + FIELD field_42957 showNotification Z + METHOD (Lnet/minecraft/class_2960;Lnet/minecraft/class_1792;ILjava/lang/String;Lnet/minecraft/class_7710;Ljava/util/List;Ljava/util/Map;Lnet/minecraft/class_8779;Z)V ARG 1 recipeId ARG 2 output ARG 3 resultCount ARG 4 group - ARG 5 pattern - ARG 6 inputs - ARG 7 advancementBuilder - ARG 8 advancementId + ARG 5 craftingCategory + ARG 6 pattern + ARG 7 inputs + ARG 8 advancementBuilder diff --git a/mappings/net/minecraft/data/server/recipe/ShapelessRecipeJsonBuilder.mapping b/mappings/net/minecraft/data/server/recipe/ShapelessRecipeJsonBuilder.mapping index 12cac46837..75899895df 100644 --- a/mappings/net/minecraft/data/server/recipe/ShapelessRecipeJsonBuilder.mapping +++ b/mappings/net/minecraft/data/server/recipe/ShapelessRecipeJsonBuilder.mapping @@ -1,21 +1,25 @@ CLASS net/minecraft/class_2450 net/minecraft/data/server/recipe/ShapelessRecipeJsonBuilder - FIELD field_11393 advancementBuilder Lnet/minecraft/class_161$class_162; + FIELD field_11393 advancementBuilder Ljava/util/Map; FIELD field_11394 inputs Ljava/util/List; - FIELD field_11395 outputCount I + FIELD field_11395 count I FIELD field_11396 output Lnet/minecraft/class_1792; FIELD field_11398 group Ljava/lang/String; - METHOD (Lnet/minecraft/class_1935;I)V - ARG 1 output - ARG 2 outputCount + FIELD field_40646 category Lnet/minecraft/class_7800; + METHOD (Lnet/minecraft/class_7800;Lnet/minecraft/class_1935;I)V + ARG 1 category + ARG 2 output + ARG 3 count METHOD method_10445 validate (Lnet/minecraft/class_2960;)V ARG 1 recipeId METHOD method_10446 input (Lnet/minecraft/class_6862;)Lnet/minecraft/class_2450; ARG 1 tag - METHOD method_10447 create (Lnet/minecraft/class_1935;)Lnet/minecraft/class_2450; - ARG 0 output - METHOD method_10448 create (Lnet/minecraft/class_1935;I)Lnet/minecraft/class_2450; - ARG 0 output - ARG 1 outputCount + METHOD method_10447 create (Lnet/minecraft/class_7800;Lnet/minecraft/class_1935;)Lnet/minecraft/class_2450; + ARG 0 category + ARG 1 output + METHOD method_10448 create (Lnet/minecraft/class_7800;Lnet/minecraft/class_1935;I)Lnet/minecraft/class_2450; + ARG 0 category + ARG 1 output + ARG 2 count METHOD method_10449 input (Lnet/minecraft/class_1935;I)Lnet/minecraft/class_2450; ARG 1 itemProvider ARG 2 size @@ -29,16 +33,15 @@ CLASS net/minecraft/class_2450 net/minecraft/data/server/recipe/ShapelessRecipeJ CLASS class_2451 ShapelessRecipeJsonProvider FIELD field_11399 group Ljava/lang/String; FIELD field_11400 count I - FIELD field_11401 advancementBuilder Lnet/minecraft/class_161$class_162; + FIELD field_11401 advancementBuilder Lnet/minecraft/class_8779; FIELD field_11402 recipeId Lnet/minecraft/class_2960; FIELD field_11403 output Lnet/minecraft/class_1792; FIELD field_11404 inputs Ljava/util/List; - FIELD field_11405 advancementId Lnet/minecraft/class_2960; - METHOD (Lnet/minecraft/class_2960;Lnet/minecraft/class_1792;ILjava/lang/String;Ljava/util/List;Lnet/minecraft/class_161$class_162;Lnet/minecraft/class_2960;)V + METHOD (Lnet/minecraft/class_2960;Lnet/minecraft/class_1792;ILjava/lang/String;Lnet/minecraft/class_7710;Ljava/util/List;Lnet/minecraft/class_8779;)V ARG 1 recipeId ARG 2 output ARG 3 outputCount ARG 4 group - ARG 5 inputs - ARG 6 advancementBuilder - ARG 7 advancementId + ARG 5 craftingCategory + ARG 6 inputs + ARG 7 advancementBuilder diff --git a/mappings/net/minecraft/data/server/recipe/SingleItemRecipeJsonBuilder.mapping b/mappings/net/minecraft/data/server/recipe/SingleItemRecipeJsonBuilder.mapping index 56641d7f95..abc77f2690 100644 --- a/mappings/net/minecraft/data/server/recipe/SingleItemRecipeJsonBuilder.mapping +++ b/mappings/net/minecraft/data/server/recipe/SingleItemRecipeJsonBuilder.mapping @@ -2,38 +2,42 @@ CLASS net/minecraft/class_3981 net/minecraft/data/server/recipe/SingleItemRecipe FIELD field_17690 output Lnet/minecraft/class_1792; FIELD field_17691 input Lnet/minecraft/class_1856; FIELD field_17692 count I - FIELD field_17693 advancementBuilder Lnet/minecraft/class_161$class_162; FIELD field_17694 group Ljava/lang/String; FIELD field_17695 serializer Lnet/minecraft/class_1865; - METHOD (Lnet/minecraft/class_1865;Lnet/minecraft/class_1856;Lnet/minecraft/class_1935;I)V - ARG 1 serializer - ARG 2 input - ARG 3 output - ARG 4 outputCount - METHOD method_17968 createStonecutting (Lnet/minecraft/class_1856;Lnet/minecraft/class_1935;)Lnet/minecraft/class_3981; + FIELD field_40650 category Lnet/minecraft/class_7800; + METHOD (Lnet/minecraft/class_7800;Lnet/minecraft/class_1865;Lnet/minecraft/class_1856;Lnet/minecraft/class_1935;I)V + ARG 1 category + ARG 2 serializer + ARG 3 input + ARG 4 output + ARG 5 count + METHOD method_17968 createStonecutting (Lnet/minecraft/class_1856;Lnet/minecraft/class_7800;Lnet/minecraft/class_1935;)Lnet/minecraft/class_3981; ARG 0 input - ARG 1 output - METHOD method_17969 createStonecutting (Lnet/minecraft/class_1856;Lnet/minecraft/class_1935;I)Lnet/minecraft/class_3981; + ARG 1 category + ARG 2 output + METHOD method_17969 createStonecutting (Lnet/minecraft/class_1856;Lnet/minecraft/class_7800;Lnet/minecraft/class_1935;I)Lnet/minecraft/class_3981; ARG 0 input - ARG 1 output - ARG 2 outputCount + ARG 1 category + ARG 2 output + ARG 3 count METHOD method_17973 validate (Lnet/minecraft/class_2960;)V ARG 1 recipeId CLASS class_3982 SingleItemRecipeJsonProvider - FIELD field_17696 recipeId Lnet/minecraft/class_2960; - FIELD field_17697 group Ljava/lang/String; - FIELD field_17698 input Lnet/minecraft/class_1856; - FIELD field_17699 output Lnet/minecraft/class_1792; - FIELD field_17700 count I - FIELD field_17701 advancementBuilder Lnet/minecraft/class_161$class_162; - FIELD field_17702 advancementId Lnet/minecraft/class_2960; - FIELD field_17703 serializer Lnet/minecraft/class_1865; - METHOD (Lnet/minecraft/class_2960;Lnet/minecraft/class_1865;Ljava/lang/String;Lnet/minecraft/class_1856;Lnet/minecraft/class_1792;ILnet/minecraft/class_161$class_162;Lnet/minecraft/class_2960;)V + FIELD comp_1222 recipeId Lnet/minecraft/class_2960; + FIELD comp_1223 serializer Lnet/minecraft/class_1865; + FIELD comp_1946 advancementBuilder Lnet/minecraft/class_8779; + FIELD comp_1947 group Ljava/lang/String; + FIELD comp_1948 input Lnet/minecraft/class_1856; + FIELD comp_1949 output Lnet/minecraft/class_1792; + FIELD comp_1950 count I + METHOD (Lnet/minecraft/class_2960;Lnet/minecraft/class_1865;Ljava/lang/String;Lnet/minecraft/class_1856;Lnet/minecraft/class_1792;ILnet/minecraft/class_8779;)V ARG 1 recipeId ARG 2 serializer ARG 3 group ARG 4 input ARG 5 output ARG 6 outputCount - ARG 7 advancementBuilder - ARG 8 advancementId + METHOD comp_1947 group ()Ljava/lang/String; + METHOD comp_1948 input ()Lnet/minecraft/class_1856; + METHOD comp_1949 output ()Lnet/minecraft/class_1792; + METHOD comp_1950 count ()I diff --git a/mappings/net/minecraft/data/server/recipe/SmithingRecipeJsonBuilder.mapping b/mappings/net/minecraft/data/server/recipe/SmithingRecipeJsonBuilder.mapping deleted file mode 100644 index d9d392818d..0000000000 --- a/mappings/net/minecraft/data/server/recipe/SmithingRecipeJsonBuilder.mapping +++ /dev/null @@ -1,42 +0,0 @@ -CLASS net/minecraft/class_5377 net/minecraft/data/server/recipe/SmithingRecipeJsonBuilder - FIELD field_25491 base Lnet/minecraft/class_1856; - FIELD field_25492 addition Lnet/minecraft/class_1856; - FIELD field_25493 result Lnet/minecraft/class_1792; - FIELD field_25494 advancementBuilder Lnet/minecraft/class_161$class_162; - FIELD field_25495 serializer Lnet/minecraft/class_1865; - METHOD (Lnet/minecraft/class_1865;Lnet/minecraft/class_1856;Lnet/minecraft/class_1856;Lnet/minecraft/class_1792;)V - ARG 1 serializer - ARG 2 base - ARG 3 addition - ARG 4 result - METHOD method_29729 create (Lnet/minecraft/class_1856;Lnet/minecraft/class_1856;Lnet/minecraft/class_1792;)Lnet/minecraft/class_5377; - ARG 0 base - ARG 1 addition - ARG 2 result - METHOD method_29730 criterion (Ljava/lang/String;Lnet/minecraft/class_184;)Lnet/minecraft/class_5377; - ARG 1 criterionName - ARG 2 conditions - METHOD method_29731 offerTo (Ljava/util/function/Consumer;Ljava/lang/String;)V - ARG 1 exporter - ARG 2 recipeId - METHOD method_29732 offerTo (Ljava/util/function/Consumer;Lnet/minecraft/class_2960;)V - ARG 1 exporter - ARG 2 recipeId - METHOD method_29733 validate (Lnet/minecraft/class_2960;)V - ARG 1 recipeId - CLASS class_5378 SmithingRecipeJsonProvider - FIELD field_25496 recipeId Lnet/minecraft/class_2960; - FIELD field_25497 base Lnet/minecraft/class_1856; - FIELD field_25498 addition Lnet/minecraft/class_1856; - FIELD field_25499 result Lnet/minecraft/class_1792; - FIELD field_25500 advancementBuilder Lnet/minecraft/class_161$class_162; - FIELD field_25501 advancementId Lnet/minecraft/class_2960; - FIELD field_25502 serializer Lnet/minecraft/class_1865; - METHOD (Lnet/minecraft/class_2960;Lnet/minecraft/class_1865;Lnet/minecraft/class_1856;Lnet/minecraft/class_1856;Lnet/minecraft/class_1792;Lnet/minecraft/class_161$class_162;Lnet/minecraft/class_2960;)V - ARG 1 recipeId - ARG 2 serializer - ARG 3 base - ARG 4 addition - ARG 5 result - ARG 6 advancementBuilder - ARG 7 advancementId diff --git a/mappings/net/minecraft/data/server/recipe/SmithingTransformRecipeJsonBuilder.mapping b/mappings/net/minecraft/data/server/recipe/SmithingTransformRecipeJsonBuilder.mapping new file mode 100644 index 0000000000..3ec1ed372b --- /dev/null +++ b/mappings/net/minecraft/data/server/recipe/SmithingTransformRecipeJsonBuilder.mapping @@ -0,0 +1,30 @@ +CLASS net/minecraft/class_8074 net/minecraft/data/server/recipe/SmithingTransformRecipeJsonBuilder + FIELD field_42090 template Lnet/minecraft/class_1856; + FIELD field_42091 base Lnet/minecraft/class_1856; + FIELD field_42092 addition Lnet/minecraft/class_1856; + FIELD field_42093 category Lnet/minecraft/class_7800; + FIELD field_42094 result Lnet/minecraft/class_1792; + FIELD field_42096 serializer Lnet/minecraft/class_1865; + METHOD (Lnet/minecraft/class_1865;Lnet/minecraft/class_1856;Lnet/minecraft/class_1856;Lnet/minecraft/class_1856;Lnet/minecraft/class_7800;Lnet/minecraft/class_1792;)V + ARG 1 serializer + ARG 2 template + ARG 3 base + ARG 4 addition + ARG 5 category + ARG 6 result + METHOD method_48534 validate (Lnet/minecraft/class_2960;)V + ARG 1 recipeId + METHOD method_48535 create (Lnet/minecraft/class_1856;Lnet/minecraft/class_1856;Lnet/minecraft/class_1856;Lnet/minecraft/class_7800;Lnet/minecraft/class_1792;)Lnet/minecraft/class_8074; + ARG 0 template + ARG 1 base + ARG 2 addition + ARG 3 category + ARG 4 result + METHOD method_48536 criterion (Ljava/lang/String;Lnet/minecraft/class_175;)Lnet/minecraft/class_8074; + ARG 1 name + METHOD method_48537 offerTo (Lnet/minecraft/class_8790;Lnet/minecraft/class_2960;)V + ARG 2 recipeId + METHOD method_48538 offerTo (Lnet/minecraft/class_8790;Ljava/lang/String;)V + ARG 2 recipeId + CLASS class_8075 SmithingTransformRecipeJsonProvider + FIELD comp_1228 getAdvancementId Lnet/minecraft/class_8779; diff --git a/mappings/net/minecraft/data/server/recipe/SmithingTrimRecipeJsonBuilder.mapping b/mappings/net/minecraft/data/server/recipe/SmithingTrimRecipeJsonBuilder.mapping new file mode 100644 index 0000000000..6ccd2aec85 --- /dev/null +++ b/mappings/net/minecraft/data/server/recipe/SmithingTrimRecipeJsonBuilder.mapping @@ -0,0 +1,27 @@ +CLASS net/minecraft/class_8076 net/minecraft/data/server/recipe/SmithingTrimRecipeJsonBuilder + FIELD field_42097 category Lnet/minecraft/class_7800; + FIELD field_42098 template Lnet/minecraft/class_1856; + FIELD field_42099 base Lnet/minecraft/class_1856; + FIELD field_42100 addition Lnet/minecraft/class_1856; + FIELD field_42102 serializer Lnet/minecraft/class_1865; + METHOD (Lnet/minecraft/class_1865;Lnet/minecraft/class_7800;Lnet/minecraft/class_1856;Lnet/minecraft/class_1856;Lnet/minecraft/class_1856;)V + ARG 1 serializer + ARG 2 category + ARG 3 template + ARG 4 base + ARG 5 addition + METHOD method_48539 validate (Lnet/minecraft/class_2960;)V + ARG 1 recipeId + METHOD method_48540 create (Lnet/minecraft/class_1856;Lnet/minecraft/class_1856;Lnet/minecraft/class_1856;Lnet/minecraft/class_7800;)Lnet/minecraft/class_8076; + ARG 0 template + ARG 1 base + ARG 2 addition + ARG 3 category + METHOD method_48541 criterion (Ljava/lang/String;Lnet/minecraft/class_175;)Lnet/minecraft/class_8076; + ARG 1 name + METHOD method_48542 offerTo (Lnet/minecraft/class_8790;Lnet/minecraft/class_2960;)V + ARG 2 recipeId + CLASS class_8077 SmithingTrimRecipeJsonProvider + FIELD comp_1230 recipeId Lnet/minecraft/class_2960; + FIELD comp_1231 serializer Lnet/minecraft/class_1865; + FIELD comp_1235 advancementBuilder Lnet/minecraft/class_8779; diff --git a/mappings/net/minecraft/data/server/recipe/VanillaRecipeProvider.mapping b/mappings/net/minecraft/data/server/recipe/VanillaRecipeProvider.mapping new file mode 100644 index 0000000000..a703fd4ace --- /dev/null +++ b/mappings/net/minecraft/data/server/recipe/VanillaRecipeProvider.mapping @@ -0,0 +1,13 @@ +CLASS net/minecraft/class_7803 net/minecraft/data/server/recipe/VanillaRecipeProvider + FIELD field_40652 COAL_ORES Lcom/google/common/collect/ImmutableList; + FIELD field_40653 IRON_ORES Lcom/google/common/collect/ImmutableList; + FIELD field_40654 COPPER_ORES Lcom/google/common/collect/ImmutableList; + FIELD field_40655 GOLD_ORES Lcom/google/common/collect/ImmutableList; + FIELD field_40656 DIAMOND_ORES Lcom/google/common/collect/ImmutableList; + FIELD field_40657 LAPIS_ORES Lcom/google/common/collect/ImmutableList; + FIELD field_40658 REDSTONE_ORES Lcom/google/common/collect/ImmutableList; + FIELD field_40659 EMERALD_ORES Lcom/google/common/collect/ImmutableList; + METHOD method_51694 getTrimSmithingTemplateMap ()Ljava/util/Map; + METHOD method_51695 (Lnet/minecraft/class_8790;Lnet/minecraft/class_1792;Lnet/minecraft/class_2960;)V + ARG 1 template + ARG 2 recipeId diff --git a/mappings/net/minecraft/data/server/tag/ItemTagProvider.mapping b/mappings/net/minecraft/data/server/tag/ItemTagProvider.mapping new file mode 100644 index 0000000000..8f96893448 --- /dev/null +++ b/mappings/net/minecraft/data/server/tag/ItemTagProvider.mapping @@ -0,0 +1,25 @@ +CLASS net/minecraft/class_7805 net/minecraft/data/server/tag/ItemTagProvider + FIELD field_40664 blockTags Ljava/util/concurrent/CompletableFuture; + FIELD field_43092 blockTagsToCopy Ljava/util/Map; + METHOD (Lnet/minecraft/class_7784;Ljava/util/concurrent/CompletableFuture;Ljava/util/concurrent/CompletableFuture;)V + ARG 1 output + ARG 2 registryLookupFuture + ARG 3 blockTagLookupFuture + METHOD (Lnet/minecraft/class_7784;Ljava/util/concurrent/CompletableFuture;Ljava/util/concurrent/CompletableFuture;Ljava/util/concurrent/CompletableFuture;)V + ARG 1 output + ARG 2 registryLookupFuture + ARG 3 parentTagLookupFuture + ARG 4 blockTagLookupFuture + METHOD method_46218 copy (Lnet/minecraft/class_6862;Lnet/minecraft/class_6862;)V + ARG 1 blockTag + ARG 2 itemTag + METHOD method_46831 (Lnet/minecraft/class_1792;)Lnet/minecraft/class_5321; + ARG 0 item + METHOD method_49649 (Lnet/minecraft/class_7225$class_7874;Lnet/minecraft/class_2474$class_8211;)Lnet/minecraft/class_7225$class_7874; + ARG 1 lookup + ARG 2 blockTags + METHOD method_49650 (Lnet/minecraft/class_2474$class_8211;Lnet/minecraft/class_6862;Lnet/minecraft/class_6862;)V + ARG 2 blockTag + ARG 3 itemTag + METHOD method_49652 (Lnet/minecraft/class_1792;)Lnet/minecraft/class_5321; + ARG 0 item diff --git a/mappings/net/minecraft/data/server/tag/TagProvider.mapping b/mappings/net/minecraft/data/server/tag/TagProvider.mapping new file mode 100644 index 0000000000..8443e5ceeb --- /dev/null +++ b/mappings/net/minecraft/data/server/tag/TagProvider.mapping @@ -0,0 +1,68 @@ +CLASS net/minecraft/class_2474 net/minecraft/data/server/tag/TagProvider + FIELD field_11479 LOGGER Lorg/slf4j/Logger; + FIELD field_11481 tagBuilders Ljava/util/Map; + FIELD field_39380 pathResolver Lnet/minecraft/class_7784$class_7489; + FIELD field_40957 registryRef Lnet/minecraft/class_5321; + FIELD field_43093 parentTagLookupFuture Ljava/util/concurrent/CompletableFuture; + FIELD field_43107 registryLookupFuture Ljava/util/concurrent/CompletableFuture; + FIELD field_43108 registryLoadFuture Ljava/util/concurrent/CompletableFuture; + METHOD (Lnet/minecraft/class_7784;Lnet/minecraft/class_5321;Ljava/util/concurrent/CompletableFuture;)V + ARG 1 output + ARG 2 registryRef + ARG 3 registryLookupFuture + METHOD (Lnet/minecraft/class_7784;Lnet/minecraft/class_5321;Ljava/util/concurrent/CompletableFuture;Ljava/util/concurrent/CompletableFuture;)V + ARG 1 output + ARG 2 registryRef + ARG 3 registryLookupFuture + ARG 4 parentTagLookupFuture + METHOD method_10512 getOrCreateTagBuilder (Lnet/minecraft/class_6862;)Lnet/minecraft/class_2474$class_5124; + ARG 1 tag + METHOD method_10514 configure (Lnet/minecraft/class_7225$class_7874;)V + ARG 1 lookup + METHOD method_27046 (Ljava/util/function/Predicate;Ljava/util/function/Predicate;Lnet/minecraft/class_7403;Ljava/util/Map$Entry;)Ljava/util/concurrent/CompletableFuture; + ARG 4 entry + METHOD method_27169 getTagBuilder (Lnet/minecraft/class_6862;)Lnet/minecraft/class_3495; + ARG 1 tag + METHOD method_27170 (Lnet/minecraft/class_2960;)Lnet/minecraft/class_3495; + ARG 0 id + METHOD method_46832 (Lnet/minecraft/class_7225$class_7226;Lnet/minecraft/class_2960;)Z + ARG 2 id + METHOD method_49651 getRegistryLookupFuture ()Ljava/util/concurrent/CompletableFuture; + METHOD method_49656 (Lnet/minecraft/class_6862;)Ljava/util/Optional; + ARG 1 tag + METHOD method_49657 (Lnet/minecraft/class_7225$class_7874;Lnet/minecraft/class_2474$class_8211;)Lnet/minecraft/class_2474$class_8210; + ARG 0 lookup + ARG 1 parent + METHOD method_49658 (Ljava/util/function/Predicate;Ljava/util/function/Predicate;Lnet/minecraft/class_3497;)Z + ARG 2 tagEntry + METHOD method_49659 (Lnet/minecraft/class_7403;Lnet/minecraft/class_2474$class_8210;)Ljava/util/concurrent/CompletionStage; + ARG 2 info + METHOD method_49660 (Lnet/minecraft/class_2474$class_8210;Lnet/minecraft/class_2960;)Z + ARG 2 id + METHOD method_49661 (Ljava/lang/Void;)Lnet/minecraft/class_2474$class_8211; + ARG 1 void_ + METHOD method_49662 getTagLookupFuture ()Ljava/util/concurrent/CompletableFuture; + METHOD method_49706 (Lnet/minecraft/class_7225$class_7874;)Lnet/minecraft/class_7225$class_7874; + ARG 1 lookup + METHOD method_49707 (Lnet/minecraft/class_7225$class_7874;)Lnet/minecraft/class_7225$class_7874; + ARG 1 registryLookupFuture + CLASS class_5124 ProvidedTagBuilder + FIELD field_23960 builder Lnet/minecraft/class_3495; + METHOD (Lnet/minecraft/class_3495;)V + ARG 1 builder + METHOD method_26792 addTag (Lnet/minecraft/class_6862;)Lnet/minecraft/class_2474$class_5124; + ARG 1 identifiedTag + METHOD method_35922 addOptional (Lnet/minecraft/class_2960;)Lnet/minecraft/class_2474$class_5124; + ARG 1 id + METHOD method_35923 addOptionalTag (Lnet/minecraft/class_2960;)Lnet/minecraft/class_2474$class_5124; + ARG 1 id + METHOD method_40565 add ([Lnet/minecraft/class_5321;)Lnet/minecraft/class_2474$class_5124; + ARG 1 keys + METHOD method_46835 add (Lnet/minecraft/class_5321;)Lnet/minecraft/class_2474$class_5124; + ARG 1 key + CLASS class_8210 RegistryInfo + CLASS class_8211 TagLookup + METHOD contains (Lnet/minecraft/class_6862;)Z + ARG 1 tag + METHOD method_49664 (Lnet/minecraft/class_6862;)Ljava/util/Optional; + ARG 0 tag diff --git a/mappings/net/minecraft/data/server/tag/ValueLookupTagProvider.mapping b/mappings/net/minecraft/data/server/tag/ValueLookupTagProvider.mapping new file mode 100644 index 0000000000..0ad2819d5e --- /dev/null +++ b/mappings/net/minecraft/data/server/tag/ValueLookupTagProvider.mapping @@ -0,0 +1,22 @@ +CLASS net/minecraft/class_7889 net/minecraft/data/server/tag/ValueLookupTagProvider + FIELD field_40954 valueToKey Ljava/util/function/Function; + METHOD (Lnet/minecraft/class_7784;Lnet/minecraft/class_5321;Ljava/util/concurrent/CompletableFuture;Ljava/util/concurrent/CompletableFuture;Ljava/util/function/Function;)V + ARG 1 output + ARG 2 registryRef + ARG 3 registryLookupFuture + ARG 4 parentTagLookupFuture + ARG 5 valueToKey + METHOD (Lnet/minecraft/class_7784;Lnet/minecraft/class_5321;Ljava/util/concurrent/CompletableFuture;Ljava/util/function/Function;)V + ARG 1 output + ARG 2 registryRef + ARG 3 registryLookupFuture + ARG 4 valueToKey + CLASS class_7890 ObjectBuilder + FIELD field_40955 valueToKey Ljava/util/function/Function; + METHOD (Lnet/minecraft/class_3495;Ljava/util/function/Function;)V + ARG 1 builder + ARG 2 valueToKey + METHOD method_46829 add (Ljava/lang/Object;)Lnet/minecraft/class_7889$class_7890; + ARG 1 value + METHOD method_46830 add ([Ljava/lang/Object;)Lnet/minecraft/class_7889$class_7890; + ARG 1 values diff --git a/mappings/net/minecraft/data/server/tag/vanilla/VanillaBannerPatternTagProvider.mapping b/mappings/net/minecraft/data/server/tag/vanilla/VanillaBannerPatternTagProvider.mapping new file mode 100644 index 0000000000..cd258b790a --- /dev/null +++ b/mappings/net/minecraft/data/server/tag/vanilla/VanillaBannerPatternTagProvider.mapping @@ -0,0 +1,4 @@ +CLASS net/minecraft/class_7458 net/minecraft/data/server/tag/vanilla/VanillaBannerPatternTagProvider + METHOD (Lnet/minecraft/class_7784;Ljava/util/concurrent/CompletableFuture;)V + ARG 1 dataGenerator + ARG 2 registryLookupFuture diff --git a/mappings/net/minecraft/data/server/tag/vanilla/VanillaBiomeTagProvider.mapping b/mappings/net/minecraft/data/server/tag/vanilla/VanillaBiomeTagProvider.mapping new file mode 100644 index 0000000000..57d97775c3 --- /dev/null +++ b/mappings/net/minecraft/data/server/tag/vanilla/VanillaBiomeTagProvider.mapping @@ -0,0 +1,4 @@ +CLASS net/minecraft/class_6957 net/minecraft/data/server/tag/vanilla/VanillaBiomeTagProvider + METHOD (Lnet/minecraft/class_7784;Ljava/util/concurrent/CompletableFuture;)V + ARG 1 output + ARG 2 registryLookupFuture diff --git a/mappings/net/minecraft/data/server/tag/vanilla/VanillaBlockTagProvider.mapping b/mappings/net/minecraft/data/server/tag/vanilla/VanillaBlockTagProvider.mapping new file mode 100644 index 0000000000..cdd72b082c --- /dev/null +++ b/mappings/net/minecraft/data/server/tag/vanilla/VanillaBlockTagProvider.mapping @@ -0,0 +1,8 @@ +CLASS net/minecraft/class_2466 net/minecraft/data/server/tag/vanilla/VanillaBlockTagProvider + METHOD (Lnet/minecraft/class_7784;Ljava/util/concurrent/CompletableFuture;)V + ARG 1 output + ARG 2 registryLookupFuture + METHOD method_46837 (Lnet/minecraft/class_2248;)Lnet/minecraft/class_5321; + ARG 0 block + METHOD method_51274 (Lnet/minecraft/class_2248;)Z + ARG 0 block diff --git a/mappings/net/minecraft/data/server/tag/vanilla/VanillaCatVariantTagProvider.mapping b/mappings/net/minecraft/data/server/tag/vanilla/VanillaCatVariantTagProvider.mapping new file mode 100644 index 0000000000..6b7acde8dc --- /dev/null +++ b/mappings/net/minecraft/data/server/tag/vanilla/VanillaCatVariantTagProvider.mapping @@ -0,0 +1,4 @@ +CLASS net/minecraft/class_7393 net/minecraft/data/server/tag/vanilla/VanillaCatVariantTagProvider + METHOD (Lnet/minecraft/class_7784;Ljava/util/concurrent/CompletableFuture;)V + ARG 1 output + ARG 2 registryLookupFuture diff --git a/mappings/net/minecraft/data/server/tag/vanilla/VanillaDamageTypeTagProvider.mapping b/mappings/net/minecraft/data/server/tag/vanilla/VanillaDamageTypeTagProvider.mapping new file mode 100644 index 0000000000..560eaf5a78 --- /dev/null +++ b/mappings/net/minecraft/data/server/tag/vanilla/VanillaDamageTypeTagProvider.mapping @@ -0,0 +1,4 @@ +CLASS net/minecraft/class_8142 net/minecraft/data/server/tag/vanilla/VanillaDamageTypeTagProvider + METHOD (Lnet/minecraft/class_7784;Ljava/util/concurrent/CompletableFuture;)V + ARG 1 output + ARG 2 maxChainedNeighborUpdates diff --git a/mappings/net/minecraft/data/server/tag/vanilla/VanillaEntityTypeTagProvider.mapping b/mappings/net/minecraft/data/server/tag/vanilla/VanillaEntityTypeTagProvider.mapping new file mode 100644 index 0000000000..e8f1a50b93 --- /dev/null +++ b/mappings/net/minecraft/data/server/tag/vanilla/VanillaEntityTypeTagProvider.mapping @@ -0,0 +1,6 @@ +CLASS net/minecraft/class_2467 net/minecraft/data/server/tag/vanilla/VanillaEntityTypeTagProvider + METHOD (Lnet/minecraft/class_7784;Ljava/util/concurrent/CompletableFuture;)V + ARG 1 output + ARG 2 registryLookupFuture + METHOD method_46824 (Lnet/minecraft/class_1299;)Lnet/minecraft/class_5321; + ARG 0 entityType diff --git a/mappings/net/minecraft/data/server/tag/vanilla/VanillaFlatLevelGeneratorPresetTagProvider.mapping b/mappings/net/minecraft/data/server/tag/vanilla/VanillaFlatLevelGeneratorPresetTagProvider.mapping new file mode 100644 index 0000000000..03da1887a1 --- /dev/null +++ b/mappings/net/minecraft/data/server/tag/vanilla/VanillaFlatLevelGeneratorPresetTagProvider.mapping @@ -0,0 +1,4 @@ +CLASS net/minecraft/class_7229 net/minecraft/data/server/tag/vanilla/VanillaFlatLevelGeneratorPresetTagProvider + METHOD (Lnet/minecraft/class_7784;Ljava/util/concurrent/CompletableFuture;)V + ARG 1 output + ARG 2 registryLookupFuture diff --git a/mappings/net/minecraft/data/server/tag/vanilla/VanillaFluidTagProvider.mapping b/mappings/net/minecraft/data/server/tag/vanilla/VanillaFluidTagProvider.mapping new file mode 100644 index 0000000000..277452f16f --- /dev/null +++ b/mappings/net/minecraft/data/server/tag/vanilla/VanillaFluidTagProvider.mapping @@ -0,0 +1,6 @@ +CLASS net/minecraft/class_2469 net/minecraft/data/server/tag/vanilla/VanillaFluidTagProvider + METHOD (Lnet/minecraft/class_7784;Ljava/util/concurrent/CompletableFuture;)V + ARG 1 output + ARG 2 registryLookupFuture + METHOD method_46825 (Lnet/minecraft/class_3611;)Lnet/minecraft/class_5321; + ARG 0 fluid diff --git a/mappings/net/minecraft/data/server/tag/vanilla/VanillaGameEventTagProvider.mapping b/mappings/net/minecraft/data/server/tag/vanilla/VanillaGameEventTagProvider.mapping new file mode 100644 index 0000000000..4cfbb297d5 --- /dev/null +++ b/mappings/net/minecraft/data/server/tag/vanilla/VanillaGameEventTagProvider.mapping @@ -0,0 +1,7 @@ +CLASS net/minecraft/class_5746 net/minecraft/data/server/tag/vanilla/VanillaGameEventTagProvider + FIELD field_38363 BASIC_GAME_EVENTS [Lnet/minecraft/class_5712; + METHOD (Lnet/minecraft/class_7784;Ljava/util/concurrent/CompletableFuture;)V + ARG 1 output + ARG 2 registryLookupFuture + METHOD method_46826 (Lnet/minecraft/class_5712;)Lnet/minecraft/class_5321; + ARG 0 gameEvent diff --git a/mappings/net/minecraft/data/server/tag/vanilla/VanillaInstrumentTagProvider.mapping b/mappings/net/minecraft/data/server/tag/vanilla/VanillaInstrumentTagProvider.mapping new file mode 100644 index 0000000000..351011895a --- /dev/null +++ b/mappings/net/minecraft/data/server/tag/vanilla/VanillaInstrumentTagProvider.mapping @@ -0,0 +1,4 @@ +CLASS net/minecraft/class_7459 net/minecraft/data/server/tag/vanilla/VanillaInstrumentTagProvider + METHOD (Lnet/minecraft/class_7784;Ljava/util/concurrent/CompletableFuture;)V + ARG 1 output + ARG 2 registryLookupFuture diff --git a/mappings/net/minecraft/data/server/tag/vanilla/VanillaItemTagProvider.mapping b/mappings/net/minecraft/data/server/tag/vanilla/VanillaItemTagProvider.mapping new file mode 100644 index 0000000000..38fac40682 --- /dev/null +++ b/mappings/net/minecraft/data/server/tag/vanilla/VanillaItemTagProvider.mapping @@ -0,0 +1 @@ +CLASS net/minecraft/class_2471 net/minecraft/data/server/tag/vanilla/VanillaItemTagProvider diff --git a/mappings/net/minecraft/data/server/tag/vanilla/VanillaPaintingVariantTagProvider.mapping b/mappings/net/minecraft/data/server/tag/vanilla/VanillaPaintingVariantTagProvider.mapping new file mode 100644 index 0000000000..78972528ee --- /dev/null +++ b/mappings/net/minecraft/data/server/tag/vanilla/VanillaPaintingVariantTagProvider.mapping @@ -0,0 +1,4 @@ +CLASS net/minecraft/class_7416 net/minecraft/data/server/tag/vanilla/VanillaPaintingVariantTagProvider + METHOD (Lnet/minecraft/class_7784;Ljava/util/concurrent/CompletableFuture;)V + ARG 1 output + ARG 2 registryLookupFuture diff --git a/mappings/net/minecraft/data/server/tag/vanilla/VanillaPointOfInterestTypeTagProvider.mapping b/mappings/net/minecraft/data/server/tag/vanilla/VanillaPointOfInterestTypeTagProvider.mapping new file mode 100644 index 0000000000..18ec856845 --- /dev/null +++ b/mappings/net/minecraft/data/server/tag/vanilla/VanillaPointOfInterestTypeTagProvider.mapping @@ -0,0 +1,4 @@ +CLASS net/minecraft/class_7491 net/minecraft/data/server/tag/vanilla/VanillaPointOfInterestTypeTagProvider + METHOD (Lnet/minecraft/class_7784;Ljava/util/concurrent/CompletableFuture;)V + ARG 1 output + ARG 2 registryLookupFuture diff --git a/mappings/net/minecraft/data/server/tag/vanilla/VanillaStructureTagProvider.mapping b/mappings/net/minecraft/data/server/tag/vanilla/VanillaStructureTagProvider.mapping new file mode 100644 index 0000000000..4576f2ecab --- /dev/null +++ b/mappings/net/minecraft/data/server/tag/vanilla/VanillaStructureTagProvider.mapping @@ -0,0 +1,4 @@ +CLASS net/minecraft/class_7071 net/minecraft/data/server/tag/vanilla/VanillaStructureTagProvider + METHOD (Lnet/minecraft/class_7784;Ljava/util/concurrent/CompletableFuture;)V + ARG 1 output + ARG 2 registryLookupFuture diff --git a/mappings/net/minecraft/data/server/tag/vanilla/VanillaWorldPresetTagProvider.mapping b/mappings/net/minecraft/data/server/tag/vanilla/VanillaWorldPresetTagProvider.mapping new file mode 100644 index 0000000000..0c5be0857b --- /dev/null +++ b/mappings/net/minecraft/data/server/tag/vanilla/VanillaWorldPresetTagProvider.mapping @@ -0,0 +1,4 @@ +CLASS net/minecraft/class_7230 net/minecraft/data/server/tag/vanilla/VanillaWorldPresetTagProvider + METHOD (Lnet/minecraft/class_7784;Ljava/util/concurrent/CompletableFuture;)V + ARG 1 output + ARG 2 registryLookupFuture diff --git a/mappings/net/minecraft/data/validate/StructureValidatorProvider.mapping b/mappings/net/minecraft/data/validate/StructureValidatorProvider.mapping index 2d839a144e..28af280639 100644 --- a/mappings/net/minecraft/data/validate/StructureValidatorProvider.mapping +++ b/mappings/net/minecraft/data/validate/StructureValidatorProvider.mapping @@ -1,10 +1,5 @@ CLASS net/minecraft/class_3843 net/minecraft/data/validate/StructureValidatorProvider FIELD field_24617 LOGGER Lorg/slf4j/Logger; - 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 METHOD method_32235 update (Ljava/lang/String;Lnet/minecraft/class_2487;)Lnet/minecraft/class_2487; ARG 0 name ARG 1 nbt diff --git a/mappings/net/minecraft/datafixer/DataFixTypes.mapping b/mappings/net/minecraft/datafixer/DataFixTypes.mapping index 666740904b..8382e1e0f5 100644 --- a/mappings/net/minecraft/datafixer/DataFixTypes.mapping +++ b/mappings/net/minecraft/datafixer/DataFixTypes.mapping @@ -1,5 +1,32 @@ CLASS net/minecraft/class_4284 net/minecraft/datafixer/DataFixTypes FIELD field_19222 typeReference Lcom/mojang/datafixers/DSL$TypeReference; + FIELD field_42975 REQUIRED_TYPES Ljava/util/Set; METHOD (Ljava/lang/String;ILcom/mojang/datafixers/DSL$TypeReference;)V ARG 3 typeReference - METHOD method_20329 getTypeReference ()Lcom/mojang/datafixers/DSL$TypeReference; + METHOD method_48128 update (Lcom/mojang/datafixers/DataFixer;Lcom/mojang/serialization/Dynamic;I)Lcom/mojang/serialization/Dynamic; + COMMENT {@return {@code dynamic} updated from {@code oldVersion} to the current version} + ARG 1 dataFixer + ARG 2 dynamic + ARG 3 oldVersion + METHOD method_48129 update (Lcom/mojang/datafixers/DataFixer;Lcom/mojang/serialization/Dynamic;II)Lcom/mojang/serialization/Dynamic; + COMMENT {@return {@code dynamic} updated from {@code oldVersion} to {@code newVersion}} + ARG 1 dataFixer + ARG 2 dynamic + ARG 3 oldVersion + ARG 4 newVersion + METHOD method_48130 update (Lcom/mojang/datafixers/DataFixer;Lnet/minecraft/class_2487;I)Lnet/minecraft/class_2487; + COMMENT {@return {@code nbt} updated from {@code oldVersion} to the current version} + COMMENT + COMMENT @see net.minecraft.nbt.NbtHelper#getDataVersion + ARG 1 dataFixer + ARG 2 nbt + ARG 3 oldVersion + METHOD method_48131 update (Lcom/mojang/datafixers/DataFixer;Lnet/minecraft/class_2487;II)Lnet/minecraft/class_2487; + COMMENT {@return {@code nbt} updated from {@code oldVersion} to {@code newVersion}} + COMMENT + COMMENT @see net.minecraft.nbt.NbtHelper#getDataVersion + ARG 1 dataFixer + ARG 2 nbt + ARG 3 oldVersion + ARG 4 newVersion + METHOD method_48132 getSaveVersionId ()I diff --git a/mappings/net/minecraft/datafixer/DataFixerPhase.mapping b/mappings/net/minecraft/datafixer/DataFixerPhase.mapping deleted file mode 100644 index 077546bd11..0000000000 --- a/mappings/net/minecraft/datafixer/DataFixerPhase.mapping +++ /dev/null @@ -1 +0,0 @@ -CLASS net/minecraft/class_7395 net/minecraft/datafixer/DataFixerPhase diff --git a/mappings/net/minecraft/datafixer/Schemas.mapping b/mappings/net/minecraft/datafixer/Schemas.mapping index d7a62b559d..71050c4dee 100644 --- a/mappings/net/minecraft/datafixer/Schemas.mapping +++ b/mappings/net/minecraft/datafixer/Schemas.mapping @@ -2,7 +2,6 @@ CLASS net/minecraft/class_3551 net/minecraft/datafixer/Schemas FIELD field_15775 EMPTY_IDENTIFIER_NORMALIZE Ljava/util/function/BiFunction; FIELD field_15776 EMPTY Ljava/util/function/BiFunction; FIELD field_15777 FIXER Lcom/mojang/datafixers/DataFixer; - FIELD field_38845 LOGGER Lorg/slf4j/Logger; METHOD method_15449 (Ljava/lang/String;)Ljava/lang/String; ARG 0 id METHOD method_15450 getFixer ()Lcom/mojang/datafixers/DataFixer; @@ -12,7 +11,8 @@ CLASS net/minecraft/class_3551 net/minecraft/datafixer/Schemas ARG 0 id METHOD method_15459 (Ljava/lang/String;)Ljava/lang/String; ARG 0 id - METHOD method_15471 create ()Lcom/mojang/datafixers/DataFixer; + METHOD method_15471 create (Ljava/util/Set;)Lcom/mojang/datafixers/DataFixer; + ARG 0 requiredTypes METHOD method_30068 replacing (Ljava/lang/String;Ljava/lang/String;)Ljava/util/function/UnaryOperator; ARG 0 old ARG 1 current diff --git a/mappings/net/minecraft/datafixer/TypeReferences.mapping b/mappings/net/minecraft/datafixer/TypeReferences.mapping index a2eedaf5cd..88d8c6c2a7 100644 --- a/mappings/net/minecraft/datafixer/TypeReferences.mapping +++ b/mappings/net/minecraft/datafixer/TypeReferences.mapping @@ -7,6 +7,15 @@ CLASS net/minecraft/class_1208 net/minecraft/datafixer/TypeReferences FIELD field_26993 ENTITY_CHUNK Lcom/mojang/datafixers/DSL$TypeReference; COMMENT A type reference which refers to the entity data in a chunk. FIELD field_38380 GAME_EVENT_NAME Lcom/mojang/datafixers/DSL$TypeReference; + FIELD field_43179 MULTI_NOISE_BIOME_SOURCE_PARAMETER_LIST Lcom/mojang/datafixers/DSL$TypeReference; + FIELD field_45090 SAVED_DATA_COMMAND_STORAGE Lcom/mojang/datafixers/DSL$TypeReference; + FIELD field_45091 SAVED_DATA_CHUNKS Lcom/mojang/datafixers/DSL$TypeReference; + FIELD field_45092 SAVED_DATA_MAP_DATA Lcom/mojang/datafixers/DSL$TypeReference; + FIELD field_45093 SAVED_DATA_IDCOUNTS Lcom/mojang/datafixers/DSL$TypeReference; + FIELD field_45094 SAVED_DATA_RAIDS Lcom/mojang/datafixers/DSL$TypeReference; + FIELD field_45095 SAVED_DATA_RANDOM_SEQUENCES Lcom/mojang/datafixers/DSL$TypeReference; + FIELD field_45096 SAVED_DATA_STRUCTURE_FEATURE_INDICES Lcom/mojang/datafixers/DSL$TypeReference; + FIELD field_45097 SAVED_DATA_SCOREBOARD Lcom/mojang/datafixers/DSL$TypeReference; FIELD field_5710 LEVEL Lcom/mojang/datafixers/DSL$TypeReference; FIELD field_5711 RECIPE Lcom/mojang/datafixers/DSL$TypeReference; FIELD field_5712 ITEM_STACK Lcom/mojang/datafixers/DSL$TypeReference; @@ -46,4 +55,3 @@ CLASS net/minecraft/class_1208 net/minecraft/datafixer/TypeReferences FIELD field_5730 STATS Lcom/mojang/datafixers/DSL$TypeReference; FIELD field_5731 BLOCK_NAME Lcom/mojang/datafixers/DSL$TypeReference; COMMENT A type reference which refers to a block's identifier. - FIELD field_5732 SAVED_DATA Lcom/mojang/datafixers/DSL$TypeReference; diff --git a/mappings/net/minecraft/datafixer/fix/AddFlagIfNotPresentFix.mapping b/mappings/net/minecraft/datafixer/fix/AddFlagIfNotPresentFix.mapping index dbf3777a4d..76191a4a81 100644 --- a/mappings/net/minecraft/datafixer/fix/AddFlagIfNotPresentFix.mapping +++ b/mappings/net/minecraft/datafixer/fix/AddFlagIfNotPresentFix.mapping @@ -4,7 +4,7 @@ CLASS net/minecraft/class_6636 net/minecraft/datafixer/fix/AddFlagIfNotPresentFi FIELD field_35011 key Ljava/lang/String; FIELD field_35012 typeReference Lcom/mojang/datafixers/DSL$TypeReference; METHOD (Lcom/mojang/datafixers/schemas/Schema;Lcom/mojang/datafixers/DSL$TypeReference;Ljava/lang/String;Z)V - ARG 1 schema + ARG 1 outputSchema ARG 2 typeReference ARG 3 key ARG 4 value diff --git a/mappings/net/minecraft/datafixer/fix/AddTrappedChestFix.mapping b/mappings/net/minecraft/datafixer/fix/AddTrappedChestFix.mapping index 3bffc1a7fc..808ace546d 100644 --- a/mappings/net/minecraft/datafixer/fix/AddTrappedChestFix.mapping +++ b/mappings/net/minecraft/datafixer/fix/AddTrappedChestFix.mapping @@ -1,5 +1,8 @@ CLASS net/minecraft/class_1215 net/minecraft/datafixer/fix/AddTrappedChestFix FIELD field_5740 LOGGER Lorg/slf4j/Logger; + METHOD (Lcom/mojang/datafixers/schemas/Schema;Z)V + ARG 1 outputSchema + ARG 2 changesType CLASS class_1216 ListFixer FIELD field_5741 targets Lit/unimi/dsi/fastutil/ints/IntSet; METHOD method_5180 isTarget (I)Z diff --git a/mappings/net/minecraft/datafixer/fix/AdvancementCriteriaRenameFix.mapping b/mappings/net/minecraft/datafixer/fix/AdvancementCriteriaRenameFix.mapping index 648ac747bc..3dc129994c 100644 --- a/mappings/net/minecraft/datafixer/fix/AdvancementCriteriaRenameFix.mapping +++ b/mappings/net/minecraft/datafixer/fix/AdvancementCriteriaRenameFix.mapping @@ -3,7 +3,7 @@ CLASS net/minecraft/class_7370 net/minecraft/datafixer/fix/AdvancementCriteriaRe FIELD field_38703 advancementId Ljava/lang/String; FIELD field_38704 renamer Ljava/util/function/UnaryOperator; METHOD (Lcom/mojang/datafixers/schemas/Schema;Ljava/lang/String;Ljava/lang/String;Ljava/util/function/UnaryOperator;)V - ARG 1 schema + ARG 1 outputSchema ARG 2 description ARG 3 advancementId ARG 4 renamer diff --git a/mappings/net/minecraft/datafixer/fix/AdvancementsFix.mapping b/mappings/net/minecraft/datafixer/fix/AdvancementsFix.mapping index 61a19adc42..d94854180b 100644 --- a/mappings/net/minecraft/datafixer/fix/AdvancementsFix.mapping +++ b/mappings/net/minecraft/datafixer/fix/AdvancementsFix.mapping @@ -1,2 +1,5 @@ CLASS net/minecraft/class_3555 net/minecraft/datafixer/fix/AdvancementsFix FIELD field_15788 RENAMED_ADVANCEMENTS Ljava/util/Map; + METHOD (Lcom/mojang/datafixers/schemas/Schema;Z)V + ARG 1 outputSchema + ARG 2 changesType diff --git a/mappings/net/minecraft/datafixer/fix/BedBlockEntityFix.mapping b/mappings/net/minecraft/datafixer/fix/BedBlockEntityFix.mapping index 146cf3c7df..827c604be9 100644 --- a/mappings/net/minecraft/datafixer/fix/BedBlockEntityFix.mapping +++ b/mappings/net/minecraft/datafixer/fix/BedBlockEntityFix.mapping @@ -1,4 +1,7 @@ CLASS net/minecraft/class_3557 net/minecraft/datafixer/fix/BedBlockEntityFix + METHOD (Lcom/mojang/datafixers/schemas/Schema;Z)V + ARG 1 outputSchema + ARG 2 changesType METHOD method_15506 fix (Lcom/mojang/datafixers/types/Type;Lcom/mojang/datafixers/types/templates/List$ListType;)Lcom/mojang/datafixers/TypeRewriteRule; ARG 1 level ARG 2 blockEntities diff --git a/mappings/net/minecraft/datafixer/fix/BedItemColorFix.mapping b/mappings/net/minecraft/datafixer/fix/BedItemColorFix.mapping index 991767addf..06b334407b 100644 --- a/mappings/net/minecraft/datafixer/fix/BedItemColorFix.mapping +++ b/mappings/net/minecraft/datafixer/fix/BedItemColorFix.mapping @@ -1 +1,4 @@ CLASS net/minecraft/class_3559 net/minecraft/datafixer/fix/BedItemColorFix + METHOD (Lcom/mojang/datafixers/schemas/Schema;Z)V + ARG 1 outputSchema + ARG 2 changesType diff --git a/mappings/net/minecraft/datafixer/fix/BiomeFormatFix.mapping b/mappings/net/minecraft/datafixer/fix/BiomeFormatFix.mapping index 7fb3d10d86..76824d8d40 100644 --- a/mappings/net/minecraft/datafixer/fix/BiomeFormatFix.mapping +++ b/mappings/net/minecraft/datafixer/fix/BiomeFormatFix.mapping @@ -1 +1,4 @@ CLASS net/minecraft/class_4541 net/minecraft/datafixer/fix/BiomeFormatFix + METHOD (Lcom/mojang/datafixers/schemas/Schema;Z)V + ARG 1 outputSchema + ARG 2 changesType diff --git a/mappings/net/minecraft/datafixer/fix/BiomeRenameFix.mapping b/mappings/net/minecraft/datafixer/fix/BiomeRenameFix.mapping deleted file mode 100644 index bddaa21f07..0000000000 --- a/mappings/net/minecraft/datafixer/fix/BiomeRenameFix.mapping +++ /dev/null @@ -1,8 +0,0 @@ -CLASS net/minecraft/class_4753 net/minecraft/datafixer/fix/BiomeRenameFix - FIELD field_21959 renames Ljava/util/Map; - FIELD field_23068 name Ljava/lang/String; - METHOD (Lcom/mojang/datafixers/schemas/Schema;ZLjava/lang/String;Ljava/util/Map;)V - ARG 1 outputSchema - ARG 2 changesType - ARG 3 name - ARG 4 changes diff --git a/mappings/net/minecraft/datafixer/fix/BiomesFix.mapping b/mappings/net/minecraft/datafixer/fix/BiomesFix.mapping deleted file mode 100644 index b2fed932de..0000000000 --- a/mappings/net/minecraft/datafixer/fix/BiomesFix.mapping +++ /dev/null @@ -1,2 +0,0 @@ -CLASS net/minecraft/class_3561 net/minecraft/datafixer/fix/BiomesFix - FIELD field_15810 RENAMED_BIOMES Ljava/util/Map; diff --git a/mappings/net/minecraft/datafixer/fix/BlendingDataFix.mapping b/mappings/net/minecraft/datafixer/fix/BlendingDataFix.mapping index b2e92b45ad..5f4c4482a9 100644 --- a/mappings/net/minecraft/datafixer/fix/BlendingDataFix.mapping +++ b/mappings/net/minecraft/datafixer/fix/BlendingDataFix.mapping @@ -2,7 +2,7 @@ CLASS net/minecraft/class_7090 net/minecraft/datafixer/fix/BlendingDataFix FIELD field_37414 name Ljava/lang/String; FIELD field_37415 SKIP_BLENDING_STATUSES Ljava/util/Set; METHOD (Lcom/mojang/datafixers/schemas/Schema;)V - ARG 1 schema + ARG 1 outputSchema METHOD method_41311 (Lcom/mojang/datafixers/Typed;)Lcom/mojang/datafixers/Typed; ARG 0 typed METHOD method_41312 update (Lcom/mojang/serialization/Dynamic;Lcom/mojang/serialization/OptionalDynamic;)Lcom/mojang/serialization/Dynamic; diff --git a/mappings/net/minecraft/datafixer/fix/BlendingDataRemoveFromNetherEndFix.mapping b/mappings/net/minecraft/datafixer/fix/BlendingDataRemoveFromNetherEndFix.mapping index f1ff4d1525..3cef78a090 100644 --- a/mappings/net/minecraft/datafixer/fix/BlendingDataRemoveFromNetherEndFix.mapping +++ b/mappings/net/minecraft/datafixer/fix/BlendingDataRemoveFromNetherEndFix.mapping @@ -1,6 +1,6 @@ CLASS net/minecraft/class_7589 net/minecraft/datafixer/fix/BlendingDataRemoveFromNetherEndFix METHOD (Lcom/mojang/datafixers/schemas/Schema;)V - ARG 1 schema + ARG 1 outputSchema METHOD method_44686 (Lcom/mojang/datafixers/Typed;)Lcom/mojang/datafixers/Typed; ARG 0 typed METHOD method_44687 (Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic; diff --git a/mappings/net/minecraft/datafixer/fix/BlockEntityBannerColorFix.mapping b/mappings/net/minecraft/datafixer/fix/BlockEntityBannerColorFix.mapping index 82a5d569ec..91f3d09331 100644 --- a/mappings/net/minecraft/datafixer/fix/BlockEntityBannerColorFix.mapping +++ b/mappings/net/minecraft/datafixer/fix/BlockEntityBannerColorFix.mapping @@ -1,2 +1,5 @@ CLASS net/minecraft/class_3564 net/minecraft/datafixer/fix/BlockEntityBannerColorFix + METHOD (Lcom/mojang/datafixers/schemas/Schema;Z)V + ARG 1 outputSchema + ARG 2 changesType METHOD method_15546 fixBannerColor (Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic; diff --git a/mappings/net/minecraft/datafixer/fix/BlockEntityBlockStateFix.mapping b/mappings/net/minecraft/datafixer/fix/BlockEntityBlockStateFix.mapping index 567719aac8..5fb0568a00 100644 --- a/mappings/net/minecraft/datafixer/fix/BlockEntityBlockStateFix.mapping +++ b/mappings/net/minecraft/datafixer/fix/BlockEntityBlockStateFix.mapping @@ -1 +1,4 @@ CLASS net/minecraft/class_3566 net/minecraft/datafixer/fix/BlockEntityBlockStateFix + METHOD (Lcom/mojang/datafixers/schemas/Schema;Z)V + ARG 1 outputSchema + ARG 2 changesType diff --git a/mappings/net/minecraft/datafixer/fix/BlockEntityCustomNameToTextFix.mapping b/mappings/net/minecraft/datafixer/fix/BlockEntityCustomNameToTextFix.mapping index a07b7c04e3..d347736c7d 100644 --- a/mappings/net/minecraft/datafixer/fix/BlockEntityCustomNameToTextFix.mapping +++ b/mappings/net/minecraft/datafixer/fix/BlockEntityCustomNameToTextFix.mapping @@ -1 +1,4 @@ CLASS net/minecraft/class_3567 net/minecraft/datafixer/fix/BlockEntityCustomNameToTextFix + METHOD (Lcom/mojang/datafixers/schemas/Schema;Z)V + ARG 1 outputSchema + ARG 2 changesType diff --git a/mappings/net/minecraft/datafixer/fix/BlockEntityIdFix.mapping b/mappings/net/minecraft/datafixer/fix/BlockEntityIdFix.mapping index 1809cb9ed8..4fe43834fb 100644 --- a/mappings/net/minecraft/datafixer/fix/BlockEntityIdFix.mapping +++ b/mappings/net/minecraft/datafixer/fix/BlockEntityIdFix.mapping @@ -1,4 +1,7 @@ CLASS net/minecraft/class_3571 net/minecraft/datafixer/fix/BlockEntityIdFix FIELD field_15824 RENAMED_BLOCK_ENTITIES Ljava/util/Map; + METHOD (Lcom/mojang/datafixers/schemas/Schema;Z)V + ARG 1 outputSchema + ARG 2 changesType METHOD method_15575 (Ljava/util/HashMap;)V ARG 0 map diff --git a/mappings/net/minecraft/datafixer/fix/BlockEntityJukeboxFix.mapping b/mappings/net/minecraft/datafixer/fix/BlockEntityJukeboxFix.mapping index b0933c6a62..36b324475f 100644 --- a/mappings/net/minecraft/datafixer/fix/BlockEntityJukeboxFix.mapping +++ b/mappings/net/minecraft/datafixer/fix/BlockEntityJukeboxFix.mapping @@ -1 +1,4 @@ CLASS net/minecraft/class_3573 net/minecraft/datafixer/fix/BlockEntityJukeboxFix + METHOD (Lcom/mojang/datafixers/schemas/Schema;Z)V + ARG 1 outputSchema + ARG 2 changesType diff --git a/mappings/net/minecraft/datafixer/fix/BlockEntityKeepPacked.mapping b/mappings/net/minecraft/datafixer/fix/BlockEntityKeepPackedFix.mapping similarity index 58% rename from mappings/net/minecraft/datafixer/fix/BlockEntityKeepPacked.mapping rename to mappings/net/minecraft/datafixer/fix/BlockEntityKeepPackedFix.mapping index 472750ddf8..026e1c1839 100644 --- a/mappings/net/minecraft/datafixer/fix/BlockEntityKeepPacked.mapping +++ b/mappings/net/minecraft/datafixer/fix/BlockEntityKeepPackedFix.mapping @@ -1,2 +1,5 @@ -CLASS net/minecraft/class_3574 net/minecraft/datafixer/fix/BlockEntityKeepPacked +CLASS net/minecraft/class_3574 net/minecraft/datafixer/fix/BlockEntityKeepPackedFix + METHOD (Lcom/mojang/datafixers/schemas/Schema;Z)V + ARG 1 outputSchema + ARG 2 changesType METHOD method_15579 keepPacked (Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic; diff --git a/mappings/net/minecraft/datafixer/fix/BlockEntityShulkerBoxColorFix.mapping b/mappings/net/minecraft/datafixer/fix/BlockEntityShulkerBoxColorFix.mapping index 8a763a7921..83935959bb 100644 --- a/mappings/net/minecraft/datafixer/fix/BlockEntityShulkerBoxColorFix.mapping +++ b/mappings/net/minecraft/datafixer/fix/BlockEntityShulkerBoxColorFix.mapping @@ -1 +1,4 @@ CLASS net/minecraft/class_3575 net/minecraft/datafixer/fix/BlockEntityShulkerBoxColorFix + METHOD (Lcom/mojang/datafixers/schemas/Schema;Z)V + ARG 1 outputSchema + ARG 2 changesType diff --git a/mappings/net/minecraft/datafixer/fix/BlockEntitySignTextStrictJsonFix.mapping b/mappings/net/minecraft/datafixer/fix/BlockEntitySignTextStrictJsonFix.mapping index 151cd0681c..41b1245dd0 100644 --- a/mappings/net/minecraft/datafixer/fix/BlockEntitySignTextStrictJsonFix.mapping +++ b/mappings/net/minecraft/datafixer/fix/BlockEntitySignTextStrictJsonFix.mapping @@ -1,5 +1,8 @@ CLASS net/minecraft/class_3577 net/minecraft/datafixer/fix/BlockEntitySignTextStrictJsonFix FIELD field_15827 GSON Lcom/google/gson/Gson; + METHOD (Lcom/mojang/datafixers/schemas/Schema;Z)V + ARG 1 outputSchema + ARG 2 changesType METHOD method_15582 fix (Lcom/mojang/serialization/Dynamic;Ljava/lang/String;)Lcom/mojang/serialization/Dynamic; ARG 2 lineName CLASS 1 diff --git a/mappings/net/minecraft/datafixer/fix/BlockNameFix.mapping b/mappings/net/minecraft/datafixer/fix/BlockNameFix.mapping index 308124170b..5af3d8d350 100644 --- a/mappings/net/minecraft/datafixer/fix/BlockNameFix.mapping +++ b/mappings/net/minecraft/datafixer/fix/BlockNameFix.mapping @@ -1,10 +1,10 @@ CLASS net/minecraft/class_3579 net/minecraft/datafixer/fix/BlockNameFix FIELD field_15828 name Ljava/lang/String; METHOD (Lcom/mojang/datafixers/schemas/Schema;Ljava/lang/String;)V - ARG 1 oldSchema + ARG 1 outputSchema ARG 2 name METHOD method_15589 create (Lcom/mojang/datafixers/schemas/Schema;Ljava/lang/String;Ljava/util/function/Function;)Lcom/mojang/datafixers/DataFix; - ARG 0 oldSchema + ARG 0 outputSchema ARG 1 name ARG 2 rename METHOD method_15593 rename (Ljava/lang/String;)Ljava/lang/String; diff --git a/mappings/net/minecraft/datafixer/fix/BlockNameFlatteningFix.mapping b/mappings/net/minecraft/datafixer/fix/BlockNameFlatteningFix.mapping index 79532b4cae..413529e8f5 100644 --- a/mappings/net/minecraft/datafixer/fix/BlockNameFlatteningFix.mapping +++ b/mappings/net/minecraft/datafixer/fix/BlockNameFlatteningFix.mapping @@ -1 +1,4 @@ CLASS net/minecraft/class_3578 net/minecraft/datafixer/fix/BlockNameFlatteningFix + METHOD (Lcom/mojang/datafixers/schemas/Schema;Z)V + ARG 1 outputSchema + ARG 2 changesType diff --git a/mappings/net/minecraft/datafixer/fix/BlockStateStructureTemplateFix.mapping b/mappings/net/minecraft/datafixer/fix/BlockStateStructureTemplateFix.mapping index 1dd88c2eb2..4e8cc93cb0 100644 --- a/mappings/net/minecraft/datafixer/fix/BlockStateStructureTemplateFix.mapping +++ b/mappings/net/minecraft/datafixer/fix/BlockStateStructureTemplateFix.mapping @@ -1 +1,4 @@ CLASS net/minecraft/class_3581 net/minecraft/datafixer/fix/BlockStateStructureTemplateFix + METHOD (Lcom/mojang/datafixers/schemas/Schema;Z)V + ARG 1 outputSchema + ARG 2 changesType diff --git a/mappings/net/minecraft/datafixer/fix/CatTypeFix.mapping b/mappings/net/minecraft/datafixer/fix/CatTypeFix.mapping index 0e94f92b7f..75efc7eb8d 100644 --- a/mappings/net/minecraft/datafixer/fix/CatTypeFix.mapping +++ b/mappings/net/minecraft/datafixer/fix/CatTypeFix.mapping @@ -1,2 +1,5 @@ CLASS net/minecraft/class_3903 net/minecraft/datafixer/fix/CatTypeFix + METHOD (Lcom/mojang/datafixers/schemas/Schema;Z)V + ARG 1 outputSchema + ARG 2 changesType METHOD method_17325 fixCatTypeData (Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic; diff --git a/mappings/net/minecraft/datafixer/fix/CauldronRenameFix.mapping b/mappings/net/minecraft/datafixer/fix/CauldronRenameFix.mapping index d0bbeed0ea..07ff0ad556 100644 --- a/mappings/net/minecraft/datafixer/fix/CauldronRenameFix.mapping +++ b/mappings/net/minecraft/datafixer/fix/CauldronRenameFix.mapping @@ -1,2 +1,5 @@ CLASS net/minecraft/class_5528 net/minecraft/datafixer/fix/CauldronRenameFix + METHOD (Lcom/mojang/datafixers/schemas/Schema;Z)V + ARG 1 outputSchema + ARG 2 changesType METHOD method_31465 rename (Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic; diff --git a/mappings/net/minecraft/datafixer/fix/ChunkDeleteIgnoredLightDataFix.mapping b/mappings/net/minecraft/datafixer/fix/ChunkDeleteIgnoredLightDataFix.mapping index 58f071c694..7d25e01ea2 100644 --- a/mappings/net/minecraft/datafixer/fix/ChunkDeleteIgnoredLightDataFix.mapping +++ b/mappings/net/minecraft/datafixer/fix/ChunkDeleteIgnoredLightDataFix.mapping @@ -1,3 +1,3 @@ CLASS net/minecraft/class_7091 net/minecraft/datafixer/fix/ChunkDeleteIgnoredLightDataFix METHOD (Lcom/mojang/datafixers/schemas/Schema;)V - ARG 1 schema + ARG 1 outputSchema diff --git a/mappings/net/minecraft/datafixer/fix/ChunkDeleteLightFix.mapping b/mappings/net/minecraft/datafixer/fix/ChunkDeleteLightFix.mapping new file mode 100644 index 0000000000..3f2746d85d --- /dev/null +++ b/mappings/net/minecraft/datafixer/fix/ChunkDeleteLightFix.mapping @@ -0,0 +1,3 @@ +CLASS net/minecraft/class_8525 net/minecraft/datafixer/fix/ChunkDeleteLightFix + METHOD (Lcom/mojang/datafixers/schemas/Schema;)V + ARG 1 outputSchema diff --git a/mappings/net/minecraft/datafixer/fix/ChunkHeightAndBiomeFix.mapping b/mappings/net/minecraft/datafixer/fix/ChunkHeightAndBiomeFix.mapping index 348b456f7a..a26100832b 100644 --- a/mappings/net/minecraft/datafixer/fix/ChunkHeightAndBiomeFix.mapping +++ b/mappings/net/minecraft/datafixer/fix/ChunkHeightAndBiomeFix.mapping @@ -10,7 +10,7 @@ CLASS net/minecraft/class_6637 net/minecraft/datafixer/fix/ChunkHeightAndBiomeFi FIELD field_35667 STATUSES_TO_SKIP_UPDATE Ljava/util/Set; FIELD field_35669 SURFACE_BLOCKS Ljava/util/Set; METHOD (Lcom/mojang/datafixers/schemas/Schema;)V - ARG 1 schema + ARG 1 outputSchema METHOD method_38793 ceilLog2 (I)I ARG 0 value METHOD method_38794 (IILcom/mojang/serialization/Dynamic;Lcom/mojang/datafixers/util/Pair;)Lcom/mojang/datafixers/util/Pair; diff --git a/mappings/net/minecraft/datafixer/fix/ChunkLevelTagRenameFix.mapping b/mappings/net/minecraft/datafixer/fix/ChunkLevelTagRenameFix.mapping index e7cc8c2352..92e8ad4f50 100644 --- a/mappings/net/minecraft/datafixer/fix/ChunkLevelTagRenameFix.mapping +++ b/mappings/net/minecraft/datafixer/fix/ChunkLevelTagRenameFix.mapping @@ -1,6 +1,6 @@ CLASS net/minecraft/class_6742 net/minecraft/datafixer/fix/ChunkLevelTagRenameFix METHOD (Lcom/mojang/datafixers/schemas/Schema;)V - ARG 1 schema + ARG 1 outputSchema METHOD method_39271 rename (Lcom/mojang/datafixers/Typed;Ljava/lang/String;Ljava/lang/String;)Lcom/mojang/datafixers/Typed; ARG 1 oldKey ARG 2 newKey diff --git a/mappings/net/minecraft/datafixer/fix/ChunkLightRemoveFix.mapping b/mappings/net/minecraft/datafixer/fix/ChunkLightRemoveFix.mapping index 302164b915..b093b3f28f 100644 --- a/mappings/net/minecraft/datafixer/fix/ChunkLightRemoveFix.mapping +++ b/mappings/net/minecraft/datafixer/fix/ChunkLightRemoveFix.mapping @@ -1 +1,4 @@ CLASS net/minecraft/class_3755 net/minecraft/datafixer/fix/ChunkLightRemoveFix + METHOD (Lcom/mojang/datafixers/schemas/Schema;Z)V + ARG 1 outputSchema + ARG 2 changesType diff --git a/mappings/net/minecraft/datafixer/fix/ChunkPalettedStorageFix.mapping b/mappings/net/minecraft/datafixer/fix/ChunkPalettedStorageFix.mapping index 242036345c..a9824ae790 100644 --- a/mappings/net/minecraft/datafixer/fix/ChunkPalettedStorageFix.mapping +++ b/mappings/net/minecraft/datafixer/fix/ChunkPalettedStorageFix.mapping @@ -20,10 +20,14 @@ CLASS net/minecraft/class_3582 net/minecraft/datafixer/fix/ChunkPalettedStorageF FIELD field_15852 PODZOL Lcom/mojang/serialization/Dynamic; FIELD field_15853 SKULL Ljava/util/Map; FIELD field_15854 BLOCKS_NEEDING_IN_PLACE_UPDATE Ljava/util/BitSet; + METHOD (Lcom/mojang/datafixers/schemas/Schema;Z)V + ARG 1 outputSchema + ARG 2 changesType METHOD method_15603 (Lit/unimi/dsi/fastutil/ints/Int2ObjectOpenHashMap;)V ARG 0 map METHOD method_15605 buildBanner (Ljava/util/Map;ILjava/lang/String;)V ARG 0 out + ARG 1 colorId ARG 2 color METHOD method_15607 (Ljava/util/HashMap;)V ARG 0 map @@ -31,11 +35,13 @@ CLASS net/minecraft/class_3582 net/minecraft/datafixer/fix/ChunkPalettedStorageF ARG 0 map METHOD method_15610 buildSkull (Ljava/util/Map;ILjava/lang/String;Ljava/lang/String;)V ARG 0 out + ARG 1 variant ARG 2 mob ARG 3 block METHOD method_15611 buildDoor (Ljava/util/Map;Ljava/lang/String;I)V ARG 0 out ARG 1 name + ARG 2 firstStateId METHOD method_15613 (Ljava/util/HashMap;)V ARG 0 map METHOD method_15615 getSideToUpgradeFlag (ZZZZ)I @@ -51,6 +57,7 @@ CLASS net/minecraft/class_3582 net/minecraft/datafixer/fix/ChunkPalettedStorageF METHOD method_15633 fixChunk (Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic; METHOD method_15636 buildBed (Ljava/util/Map;ILjava/lang/String;)V ARG 0 out + ARG 1 colorId ARG 2 color METHOD method_15637 getName (Lcom/mojang/serialization/Dynamic;)Ljava/lang/String; METHOD method_15638 getProperty (Lcom/mojang/serialization/Dynamic;Ljava/lang/String;)Ljava/lang/String; @@ -58,9 +65,13 @@ CLASS net/minecraft/class_3582 net/minecraft/datafixer/fix/ChunkPalettedStorageF ARG 0 map CLASS class_3583 ChunkNibbleArray FIELD field_15855 contents [B + FIELD field_29879 CONTENTS_LENGTH I + METHOD ([B)V + ARG 1 contents METHOD method_15640 get (III)I ARG 1 x ARG 2 y + ARG 3 z METHOD method_15641 usesLowNibble (I)Z ARG 1 index METHOD method_15642 getRawIndex (I)I @@ -70,11 +81,14 @@ CLASS net/minecraft/class_3582 net/minecraft/datafixer/fix/ChunkPalettedStorageF FIELD field_15864 axis Lnet/minecraft/class_3582$class_3584$class_3585; METHOD (Ljava/lang/String;ILnet/minecraft/class_3582$class_3584$class_3586;Lnet/minecraft/class_3582$class_3584$class_3585;)V ARG 3 direction + ARG 4 axis METHOD method_15643 getDirection ()Lnet/minecraft/class_3582$class_3584$class_3586; METHOD method_15644 getAxis ()Lnet/minecraft/class_3582$class_3584$class_3585; CLASS class_3585 Axis CLASS class_3586 Direction FIELD field_15872 offset I + METHOD (Ljava/lang/String;II)V + ARG 3 offset METHOD method_15645 getOffset ()I CLASS class_3587 Section FIELD field_15874 innerPositions Lit/unimi/dsi/fastutil/ints/IntList; @@ -86,6 +100,8 @@ CLASS net/minecraft/class_3582 net/minecraft/datafixer/fix/ChunkPalettedStorageF FIELD field_15880 paletteData Ljava/util/List; FIELD field_15881 inPlaceUpdates Lit/unimi/dsi/fastutil/ints/Int2ObjectMap; FIELD field_15882 paletteMap Lnet/minecraft/class_3513; + METHOD (Lcom/mojang/serialization/Dynamic;)V + ARG 1 section METHOD method_15647 setBlock (ILcom/mojang/serialization/Dynamic;)V ARG 1 pos METHOD method_15649 getBlock (I)Lcom/mojang/serialization/Dynamic; @@ -103,11 +119,23 @@ CLASS net/minecraft/class_3582 net/minecraft/datafixer/fix/ChunkPalettedStorageF FIELD field_15886 level Lcom/mojang/serialization/Dynamic; FIELD field_15887 blockEntities Lit/unimi/dsi/fastutil/ints/Int2ObjectMap; FIELD field_15888 sections [Lnet/minecraft/class_3582$class_3587; + METHOD (Lcom/mojang/serialization/Dynamic;)V + ARG 1 chunkTag METHOD method_15655 getBlockEntity (I)Lcom/mojang/serialization/Dynamic; + ARG 1 packedLocalPos + METHOD method_15656 (Lcom/mojang/serialization/Dynamic;)V + ARG 1 sectionTag METHOD method_15657 setBlock (ILcom/mojang/serialization/Dynamic;)V + ARG 1 packedLocalPos METHOD method_15658 getSection (I)Lnet/minecraft/class_3582$class_3587; + ARG 1 packedLocalPos METHOD method_15660 removeBlockEntity (I)Lcom/mojang/serialization/Dynamic; + ARG 1 packedLocalPos METHOD method_15662 getBlock (I)Lcom/mojang/serialization/Dynamic; + ARG 1 packedLocalPos METHOD method_15663 adjacentTo (ILnet/minecraft/class_3582$class_3584;)I + ARG 0 packedLocalPos ARG 1 direction METHOD method_15664 transform ()Lcom/mojang/serialization/Dynamic; + METHOD method_15665 (Lcom/mojang/serialization/Dynamic;)V + ARG 1 blockEntityTag diff --git a/mappings/net/minecraft/datafixer/fix/ChunkStatusFix.mapping b/mappings/net/minecraft/datafixer/fix/ChunkStatusFix.mapping index 923caabb15..d34ab5f938 100644 --- a/mappings/net/minecraft/datafixer/fix/ChunkStatusFix.mapping +++ b/mappings/net/minecraft/datafixer/fix/ChunkStatusFix.mapping @@ -1 +1,4 @@ CLASS net/minecraft/class_3589 net/minecraft/datafixer/fix/ChunkStatusFix + METHOD (Lcom/mojang/datafixers/schemas/Schema;Z)V + ARG 1 outputSchema + ARG 2 changesType diff --git a/mappings/net/minecraft/datafixer/fix/ChunkStatusFix2.mapping b/mappings/net/minecraft/datafixer/fix/ChunkStatusFix2.mapping index 94eb881a3f..17fa3cb536 100644 --- a/mappings/net/minecraft/datafixer/fix/ChunkStatusFix2.mapping +++ b/mappings/net/minecraft/datafixer/fix/ChunkStatusFix2.mapping @@ -1,2 +1,5 @@ CLASS net/minecraft/class_3788 net/minecraft/datafixer/fix/ChunkStatusFix2 FIELD field_16691 STATUS_MAP Ljava/util/Map; + METHOD (Lcom/mojang/datafixers/schemas/Schema;Z)V + ARG 1 outputSchema + ARG 2 changesType diff --git a/mappings/net/minecraft/datafixer/fix/ChunkStructuresTemplateRenameFix.mapping b/mappings/net/minecraft/datafixer/fix/ChunkStructuresTemplateRenameFix.mapping index d290e009d4..4aaa01ed83 100644 --- a/mappings/net/minecraft/datafixer/fix/ChunkStructuresTemplateRenameFix.mapping +++ b/mappings/net/minecraft/datafixer/fix/ChunkStructuresTemplateRenameFix.mapping @@ -1,3 +1,7 @@ CLASS net/minecraft/class_3590 net/minecraft/datafixer/fix/ChunkStructuresTemplateRenameFix FIELD field_15889 STRUCTURES Lcom/google/common/collect/ImmutableMap; + METHOD (Lcom/mojang/datafixers/schemas/Schema;Z)V + ARG 1 outputSchema + ARG 2 changesType METHOD method_15671 fix (Lcom/mojang/serialization/Dynamic;Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic; + METHOD method_49459 fixChildren (Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic; diff --git a/mappings/net/minecraft/datafixer/fix/ChunkToProtoChunkFix.mapping b/mappings/net/minecraft/datafixer/fix/ChunkToProtoChunkFix.mapping index f7af59b11c..f51d4dbe8c 100644 --- a/mappings/net/minecraft/datafixer/fix/ChunkToProtoChunkFix.mapping +++ b/mappings/net/minecraft/datafixer/fix/ChunkToProtoChunkFix.mapping @@ -1,8 +1,15 @@ CLASS net/minecraft/class_3591 net/minecraft/datafixer/fix/ChunkToProtoChunkFix + METHOD (Lcom/mojang/datafixers/schemas/Schema;Z)V + ARG 1 outputSchema + ARG 2 changesType METHOD method_15675 packChunkSectionPos (III)S ARG 0 x ARG 1 y ARG 2 z + METHOD method_39941 (I)Lit/unimi/dsi/fastutil/shorts/ShortArrayList; + ARG 0 sectionY METHOD method_39943 fixLevel (Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic; + METHOD method_39949 (Ljava/util/List;Lcom/mojang/serialization/Dynamic;)V + ARG 1 tickTag METHOD method_39951 fixBiomes (Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic; METHOD method_39952 fixTileTicks (Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic; diff --git a/mappings/net/minecraft/datafixer/fix/ColorlessShulkerEntityFix.mapping b/mappings/net/minecraft/datafixer/fix/ColorlessShulkerEntityFix.mapping index 58156ec886..4def5c2c8a 100644 --- a/mappings/net/minecraft/datafixer/fix/ColorlessShulkerEntityFix.mapping +++ b/mappings/net/minecraft/datafixer/fix/ColorlessShulkerEntityFix.mapping @@ -1 +1,4 @@ CLASS net/minecraft/class_3592 net/minecraft/datafixer/fix/ColorlessShulkerEntityFix + METHOD (Lcom/mojang/datafixers/schemas/Schema;Z)V + ARG 1 outputSchema + ARG 2 changesType diff --git a/mappings/net/minecraft/datafixer/fix/DecoratedPotFieldRenameFix.mapping b/mappings/net/minecraft/datafixer/fix/DecoratedPotFieldRenameFix.mapping new file mode 100644 index 0000000000..c86a13a8ad --- /dev/null +++ b/mappings/net/minecraft/datafixer/fix/DecoratedPotFieldRenameFix.mapping @@ -0,0 +1,4 @@ +CLASS net/minecraft/class_8504 net/minecraft/datafixer/fix/DecoratedPotFieldRenameFix + FIELD field_44593 DECORATED_POT_ID Ljava/lang/String; + METHOD (Lcom/mojang/datafixers/schemas/Schema;)V + ARG 1 outputSchema diff --git a/mappings/net/minecraft/datafixer/fix/DropInvalidSignDatafixDataFix.mapping b/mappings/net/minecraft/datafixer/fix/DropInvalidSignDatafixDataFix.mapping new file mode 100644 index 0000000000..faca953c0a --- /dev/null +++ b/mappings/net/minecraft/datafixer/fix/DropInvalidSignDatafixDataFix.mapping @@ -0,0 +1,16 @@ +CLASS net/minecraft/class_8625 net/minecraft/datafixer/fix/DropInvalidSignDatafixDataFix + FIELD field_45088 EMPTY_TEXT_JSON Ljava/lang/String; + FIELD field_45089 KEYS_TO_REMOVE [Ljava/lang/String; + METHOD (Lcom/mojang/datafixers/schemas/Schema;Ljava/lang/String;Ljava/lang/String;)V + ARG 1 outputSchema + ARG 2 name + ARG 3 blockEntityId + METHOD method_52475 dropInvalidDatafixData (Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic; + ARG 0 blockEntityData + METHOD method_52476 (Lcom/mojang/serialization/Dynamic;Lcom/mojang/serialization/Dynamic;)Z + ARG 1 message + METHOD method_52477 (Ljava/util/List;Lcom/mojang/serialization/Dynamic;Lcom/mojang/serialization/Dynamic;J)Lcom/mojang/serialization/Dynamic; + ARG 2 message + ARG 3 index + METHOD method_52478 dropInvalidDatafixDataOnSide (Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic; + ARG 0 textData diff --git a/mappings/net/minecraft/datafixer/fix/EntityArmorStandSilentFix.mapping b/mappings/net/minecraft/datafixer/fix/EntityArmorStandSilentFix.mapping index 2d1a75ed2a..d9f82097cc 100644 --- a/mappings/net/minecraft/datafixer/fix/EntityArmorStandSilentFix.mapping +++ b/mappings/net/minecraft/datafixer/fix/EntityArmorStandSilentFix.mapping @@ -1,2 +1,5 @@ CLASS net/minecraft/class_3594 net/minecraft/datafixer/fix/EntityArmorStandSilentFix + METHOD (Lcom/mojang/datafixers/schemas/Schema;Z)V + ARG 1 outputSchema + ARG 2 changesType METHOD method_15679 fixSilent (Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic; diff --git a/mappings/net/minecraft/datafixer/fix/EntityBlockStateFix.mapping b/mappings/net/minecraft/datafixer/fix/EntityBlockStateFix.mapping index 04606f789b..9cbc4d8a02 100644 --- a/mappings/net/minecraft/datafixer/fix/EntityBlockStateFix.mapping +++ b/mappings/net/minecraft/datafixer/fix/EntityBlockStateFix.mapping @@ -1,7 +1,7 @@ CLASS net/minecraft/class_3595 net/minecraft/datafixer/fix/EntityBlockStateFix FIELD field_15891 BLOCK_NAME_TO_ID Ljava/util/Map; METHOD (Lcom/mojang/datafixers/schemas/Schema;Z)V - ARG 1 schema + ARG 1 outputSchema ARG 2 changesType METHOD method_15680 (Lcom/mojang/datafixers/Typed;)Lcom/mojang/datafixers/Typed; ARG 1 arrow diff --git a/mappings/net/minecraft/datafixer/fix/EntityBrushableBlockFieldsRenameFix.mapping b/mappings/net/minecraft/datafixer/fix/EntityBrushableBlockFieldsRenameFix.mapping new file mode 100644 index 0000000000..c191cd605e --- /dev/null +++ b/mappings/net/minecraft/datafixer/fix/EntityBrushableBlockFieldsRenameFix.mapping @@ -0,0 +1,9 @@ +CLASS net/minecraft/class_8222 net/minecraft/datafixer/fix/EntityBrushableBlockFieldsRenameFix + METHOD (Lcom/mojang/datafixers/schemas/Schema;)V + ARG 1 outputSchema + METHOD method_49763 renameFields (Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic; + ARG 1 dynamic + METHOD method_49764 renameField (Lcom/mojang/serialization/Dynamic;Ljava/lang/String;Ljava/lang/String;)Lcom/mojang/serialization/Dynamic; + ARG 1 dynamic + ARG 2 oldName + ARG 3 newName diff --git a/mappings/net/minecraft/datafixer/fix/EntityCatSplitFix.mapping b/mappings/net/minecraft/datafixer/fix/EntityCatSplitFix.mapping index e3955bcebc..c3bbc23c67 100644 --- a/mappings/net/minecraft/datafixer/fix/EntityCatSplitFix.mapping +++ b/mappings/net/minecraft/datafixer/fix/EntityCatSplitFix.mapping @@ -1 +1,4 @@ CLASS net/minecraft/class_3725 net/minecraft/datafixer/fix/EntityCatSplitFix + METHOD (Lcom/mojang/datafixers/schemas/Schema;Z)V + ARG 1 outputSchema + ARG 2 changesType diff --git a/mappings/net/minecraft/datafixer/fix/EntityCodSalmonFix.mapping b/mappings/net/minecraft/datafixer/fix/EntityCodSalmonFix.mapping index 05bfa02b6f..eb00529db3 100644 --- a/mappings/net/minecraft/datafixer/fix/EntityCodSalmonFix.mapping +++ b/mappings/net/minecraft/datafixer/fix/EntityCodSalmonFix.mapping @@ -1,3 +1,6 @@ CLASS net/minecraft/class_3596 net/minecraft/datafixer/fix/EntityCodSalmonFix FIELD field_15892 ENTITIES Ljava/util/Map; FIELD field_15893 SPAWN_EGGS Ljava/util/Map; + METHOD (Lcom/mojang/datafixers/schemas/Schema;Z)V + ARG 1 outputSchema + ARG 2 changesType diff --git a/mappings/net/minecraft/datafixer/fix/EntityCustomNameToTextFix.mapping b/mappings/net/minecraft/datafixer/fix/EntityCustomNameToTextFix.mapping index 6496fb2b16..65f555dafc 100644 --- a/mappings/net/minecraft/datafixer/fix/EntityCustomNameToTextFix.mapping +++ b/mappings/net/minecraft/datafixer/fix/EntityCustomNameToTextFix.mapping @@ -1,2 +1,5 @@ CLASS net/minecraft/class_3597 net/minecraft/datafixer/fix/EntityCustomNameToTextFix + METHOD (Lcom/mojang/datafixers/schemas/Schema;Z)V + ARG 1 outputSchema + ARG 2 changesType METHOD method_15697 fixCustomName (Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic; diff --git a/mappings/net/minecraft/datafixer/fix/EntityElderGuardianSplitFix.mapping b/mappings/net/minecraft/datafixer/fix/EntityElderGuardianSplitFix.mapping index 76595f94d1..b4084345d2 100644 --- a/mappings/net/minecraft/datafixer/fix/EntityElderGuardianSplitFix.mapping +++ b/mappings/net/minecraft/datafixer/fix/EntityElderGuardianSplitFix.mapping @@ -1 +1,4 @@ CLASS net/minecraft/class_3598 net/minecraft/datafixer/fix/EntityElderGuardianSplitFix + METHOD (Lcom/mojang/datafixers/schemas/Schema;Z)V + ARG 1 outputSchema + ARG 2 changesType diff --git a/mappings/net/minecraft/datafixer/fix/EntityEquipmentToArmorAndHandFix.mapping b/mappings/net/minecraft/datafixer/fix/EntityEquipmentToArmorAndHandFix.mapping index d3ecbb0b66..175b4fb864 100644 --- a/mappings/net/minecraft/datafixer/fix/EntityEquipmentToArmorAndHandFix.mapping +++ b/mappings/net/minecraft/datafixer/fix/EntityEquipmentToArmorAndHandFix.mapping @@ -1,2 +1,5 @@ CLASS net/minecraft/class_3599 net/minecraft/datafixer/fix/EntityEquipmentToArmorAndHandFix + METHOD (Lcom/mojang/datafixers/schemas/Schema;Z)V + ARG 1 outputSchema + ARG 2 changesType METHOD method_15703 fixEquipment (Lcom/mojang/datafixers/types/Type;)Lcom/mojang/datafixers/TypeRewriteRule; diff --git a/mappings/net/minecraft/datafixer/fix/EntityHealthFix.mapping b/mappings/net/minecraft/datafixer/fix/EntityHealthFix.mapping index 019410f78a..11b46a2b5f 100644 --- a/mappings/net/minecraft/datafixer/fix/EntityHealthFix.mapping +++ b/mappings/net/minecraft/datafixer/fix/EntityHealthFix.mapping @@ -1,3 +1,6 @@ CLASS net/minecraft/class_3600 net/minecraft/datafixer/fix/EntityHealthFix FIELD field_15894 ENTITIES Ljava/util/Set; + METHOD (Lcom/mojang/datafixers/schemas/Schema;Z)V + ARG 1 outputSchema + ARG 2 changesType METHOD method_15704 fixHealth (Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic; diff --git a/mappings/net/minecraft/datafixer/fix/EntityHorseSaddleFix.mapping b/mappings/net/minecraft/datafixer/fix/EntityHorseSaddleFix.mapping index d41cf4522d..e56e3693ca 100644 --- a/mappings/net/minecraft/datafixer/fix/EntityHorseSaddleFix.mapping +++ b/mappings/net/minecraft/datafixer/fix/EntityHorseSaddleFix.mapping @@ -1 +1,4 @@ CLASS net/minecraft/class_3601 net/minecraft/datafixer/fix/EntityHorseSaddleFix + METHOD (Lcom/mojang/datafixers/schemas/Schema;Z)V + ARG 1 outputSchema + ARG 2 changesType diff --git a/mappings/net/minecraft/datafixer/fix/EntityHorseSplitFix.mapping b/mappings/net/minecraft/datafixer/fix/EntityHorseSplitFix.mapping index e47b57b2df..1c528ea4aa 100644 --- a/mappings/net/minecraft/datafixer/fix/EntityHorseSplitFix.mapping +++ b/mappings/net/minecraft/datafixer/fix/EntityHorseSplitFix.mapping @@ -1 +1,4 @@ CLASS net/minecraft/class_3602 net/minecraft/datafixer/fix/EntityHorseSplitFix + METHOD (Lcom/mojang/datafixers/schemas/Schema;Z)V + ARG 1 outputSchema + ARG 2 changesType diff --git a/mappings/net/minecraft/datafixer/fix/EntityIdFix.mapping b/mappings/net/minecraft/datafixer/fix/EntityIdFix.mapping index 0b801ed81c..fea40d3bf0 100644 --- a/mappings/net/minecraft/datafixer/fix/EntityIdFix.mapping +++ b/mappings/net/minecraft/datafixer/fix/EntityIdFix.mapping @@ -1,4 +1,7 @@ CLASS net/minecraft/class_3603 net/minecraft/datafixer/fix/EntityIdFix FIELD field_15895 RENAMED_ENTITIES Ljava/util/Map; + METHOD (Lcom/mojang/datafixers/schemas/Schema;Z)V + ARG 1 outputSchema + ARG 2 changesType METHOD method_15708 (Ljava/util/HashMap;)V ARG 0 map diff --git a/mappings/net/minecraft/datafixer/fix/EntityItemFrameDirectionFix.mapping b/mappings/net/minecraft/datafixer/fix/EntityItemFrameDirectionFix.mapping index 586caa835d..4275594b42 100644 --- a/mappings/net/minecraft/datafixer/fix/EntityItemFrameDirectionFix.mapping +++ b/mappings/net/minecraft/datafixer/fix/EntityItemFrameDirectionFix.mapping @@ -1,3 +1,7 @@ CLASS net/minecraft/class_3604 net/minecraft/datafixer/fix/EntityItemFrameDirectionFix + METHOD (Lcom/mojang/datafixers/schemas/Schema;Z)V + ARG 1 outputSchema + ARG 2 changesType METHOD method_15711 fixDirection (Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic; METHOD method_15712 updateDirection (B)B + ARG 0 oldDirection diff --git a/mappings/net/minecraft/datafixer/fix/EntityMinecartIdentifiersFix.mapping b/mappings/net/minecraft/datafixer/fix/EntityMinecartIdentifiersFix.mapping index 3723614032..349bfe8311 100644 --- a/mappings/net/minecraft/datafixer/fix/EntityMinecartIdentifiersFix.mapping +++ b/mappings/net/minecraft/datafixer/fix/EntityMinecartIdentifiersFix.mapping @@ -1,2 +1,5 @@ CLASS net/minecraft/class_3605 net/minecraft/datafixer/fix/EntityMinecartIdentifiersFix FIELD field_15896 MINECARTS Ljava/util/List; + METHOD (Lcom/mojang/datafixers/schemas/Schema;Z)V + ARG 1 outputSchema + ARG 2 changesType diff --git a/mappings/net/minecraft/datafixer/fix/EntityPaintingFieldsRenameFix.mapping b/mappings/net/minecraft/datafixer/fix/EntityPaintingFieldsRenameFix.mapping index 64a09de9c2..aedcf97b54 100644 --- a/mappings/net/minecraft/datafixer/fix/EntityPaintingFieldsRenameFix.mapping +++ b/mappings/net/minecraft/datafixer/fix/EntityPaintingFieldsRenameFix.mapping @@ -1,6 +1,6 @@ CLASS net/minecraft/class_7407 net/minecraft/datafixer/fix/EntityPaintingFieldsRenameFix METHOD (Lcom/mojang/datafixers/schemas/Schema;)V - ARG 1 schema + ARG 1 outputSchema METHOD method_43386 rename (Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic; ARG 1 dynamic METHOD method_43387 rename (Lcom/mojang/serialization/Dynamic;Ljava/lang/String;Ljava/lang/String;)Lcom/mojang/serialization/Dynamic; diff --git a/mappings/net/minecraft/datafixer/fix/EntityPaintingMotiveFix.mapping b/mappings/net/minecraft/datafixer/fix/EntityPaintingMotiveFix.mapping index 3e0b37ae9f..be90be7370 100644 --- a/mappings/net/minecraft/datafixer/fix/EntityPaintingMotiveFix.mapping +++ b/mappings/net/minecraft/datafixer/fix/EntityPaintingMotiveFix.mapping @@ -1,5 +1,8 @@ CLASS net/minecraft/class_3607 net/minecraft/datafixer/fix/EntityPaintingMotiveFix FIELD field_15898 RENAMED_MOTIVES Ljava/util/Map; + METHOD (Lcom/mojang/datafixers/schemas/Schema;Z)V + ARG 1 outputSchema + ARG 2 changesType METHOD method_15723 renameMotive (Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic; METHOD method_15724 (Ljava/util/HashMap;)V ARG 0 map diff --git a/mappings/net/minecraft/datafixer/fix/EntityPufferfishRenameFix.mapping b/mappings/net/minecraft/datafixer/fix/EntityPufferfishRenameFix.mapping index 1e51431ee9..223f6a5859 100644 --- a/mappings/net/minecraft/datafixer/fix/EntityPufferfishRenameFix.mapping +++ b/mappings/net/minecraft/datafixer/fix/EntityPufferfishRenameFix.mapping @@ -1,2 +1,5 @@ CLASS net/minecraft/class_3608 net/minecraft/datafixer/fix/EntityPufferfishRenameFix FIELD field_15899 RENAMED_FISH Ljava/util/Map; + METHOD (Lcom/mojang/datafixers/schemas/Schema;Z)V + ARG 1 outputSchema + ARG 2 changesType diff --git a/mappings/net/minecraft/datafixer/fix/EntityRavagerRenameFix.mapping b/mappings/net/minecraft/datafixer/fix/EntityRavagerRenameFix.mapping index 7b0ac06e5f..a0b3085edf 100644 --- a/mappings/net/minecraft/datafixer/fix/EntityRavagerRenameFix.mapping +++ b/mappings/net/minecraft/datafixer/fix/EntityRavagerRenameFix.mapping @@ -1,2 +1,5 @@ CLASS net/minecraft/class_3983 net/minecraft/datafixer/fix/EntityRavagerRenameFix FIELD field_17712 ITEMS Ljava/util/Map; + METHOD (Lcom/mojang/datafixers/schemas/Schema;Z)V + ARG 1 outputSchema + ARG 2 changesType diff --git a/mappings/net/minecraft/datafixer/fix/EntityRedundantChanceTagsFix.mapping b/mappings/net/minecraft/datafixer/fix/EntityRedundantChanceTagsFix.mapping index 6db9648732..c2061c82d1 100644 --- a/mappings/net/minecraft/datafixer/fix/EntityRedundantChanceTagsFix.mapping +++ b/mappings/net/minecraft/datafixer/fix/EntityRedundantChanceTagsFix.mapping @@ -1,2 +1,10 @@ CLASS net/minecraft/class_1165 net/minecraft/datafixer/fix/EntityRedundantChanceTagsFix + FIELD field_25695 FLOAT_LIST_CODEC Lcom/mojang/serialization/Codec; + METHOD (Lcom/mojang/datafixers/schemas/Schema;Z)V + ARG 1 outputSchema + ARG 2 changesType METHOD method_30073 hasZeroDropChance (Lcom/mojang/serialization/OptionalDynamic;I)Z + ARG 0 listTag + ARG 1 expectedLength + METHOD method_30074 (Ljava/lang/Float;)Z + ARG 0 chance diff --git a/mappings/net/minecraft/datafixer/fix/EntityRidingToPassengerFix.mapping b/mappings/net/minecraft/datafixer/fix/EntityRidingToPassengerFix.mapping index c26f922770..5eb1c52394 100644 --- a/mappings/net/minecraft/datafixer/fix/EntityRidingToPassengerFix.mapping +++ b/mappings/net/minecraft/datafixer/fix/EntityRidingToPassengerFix.mapping @@ -1,4 +1,7 @@ CLASS net/minecraft/class_1166 net/minecraft/datafixer/fix/EntityRidingToPassengerFix + METHOD (Lcom/mojang/datafixers/schemas/Schema;Z)V + ARG 1 outputSchema + ARG 2 changesType METHOD method_4978 fixEntityTree (Lcom/mojang/datafixers/schemas/Schema;Lcom/mojang/datafixers/schemas/Schema;Lcom/mojang/datafixers/types/Type;Lcom/mojang/datafixers/types/Type;Lcom/mojang/datafixers/types/Type;)Lcom/mojang/datafixers/TypeRewriteRule; ARG 1 inputSchema ARG 2 outputSchema diff --git a/mappings/net/minecraft/datafixer/fix/EntityShulkerColorFix.mapping b/mappings/net/minecraft/datafixer/fix/EntityShulkerColorFix.mapping index a0edb9b498..99aae2fba4 100644 --- a/mappings/net/minecraft/datafixer/fix/EntityShulkerColorFix.mapping +++ b/mappings/net/minecraft/datafixer/fix/EntityShulkerColorFix.mapping @@ -1,2 +1,5 @@ CLASS net/minecraft/class_1169 net/minecraft/datafixer/fix/EntityShulkerColorFix + METHOD (Lcom/mojang/datafixers/schemas/Schema;Z)V + ARG 1 outputSchema + ARG 2 changesType METHOD method_4985 fixShulkerColor (Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic; diff --git a/mappings/net/minecraft/datafixer/fix/EntitySkeletonSplitFix.mapping b/mappings/net/minecraft/datafixer/fix/EntitySkeletonSplitFix.mapping index 2029ecb972..86a8d36b51 100644 --- a/mappings/net/minecraft/datafixer/fix/EntitySkeletonSplitFix.mapping +++ b/mappings/net/minecraft/datafixer/fix/EntitySkeletonSplitFix.mapping @@ -1 +1,4 @@ CLASS net/minecraft/class_1168 net/minecraft/datafixer/fix/EntitySkeletonSplitFix + METHOD (Lcom/mojang/datafixers/schemas/Schema;Z)V + ARG 1 outputSchema + ARG 2 changesType diff --git a/mappings/net/minecraft/datafixer/fix/EntityStringUuidFix.mapping b/mappings/net/minecraft/datafixer/fix/EntityStringUuidFix.mapping index a884aba088..033c82072a 100644 --- a/mappings/net/minecraft/datafixer/fix/EntityStringUuidFix.mapping +++ b/mappings/net/minecraft/datafixer/fix/EntityStringUuidFix.mapping @@ -1 +1,4 @@ CLASS net/minecraft/class_1171 net/minecraft/datafixer/fix/EntityStringUuidFix + METHOD (Lcom/mojang/datafixers/schemas/Schema;Z)V + ARG 1 outputSchema + ARG 2 changesType diff --git a/mappings/net/minecraft/datafixer/fix/EntityTheRenameningBlock.mapping b/mappings/net/minecraft/datafixer/fix/EntityTheRenameningBlockFix.mapping similarity index 52% rename from mappings/net/minecraft/datafixer/fix/EntityTheRenameningBlock.mapping rename to mappings/net/minecraft/datafixer/fix/EntityTheRenameningBlockFix.mapping index 3ad62a8858..6043bb8e94 100644 --- a/mappings/net/minecraft/datafixer/fix/EntityTheRenameningBlock.mapping +++ b/mappings/net/minecraft/datafixer/fix/EntityTheRenameningBlockFix.mapping @@ -1,4 +1,8 @@ -CLASS net/minecraft/class_1170 net/minecraft/datafixer/fix/EntityTheRenameningBlock +CLASS net/minecraft/class_1170 net/minecraft/datafixer/fix/EntityTheRenameningBlockFix + FIELD field_29882 BRED_PREFIX Ljava/lang/String; FIELD field_5671 ENTITIES Ljava/util/Map; FIELD field_5672 BLOCKS Ljava/util/Map; FIELD field_5673 ITEMS Ljava/util/Map; + METHOD (Lcom/mojang/datafixers/schemas/Schema;Z)V + ARG 1 outputSchema + ARG 2 changesType diff --git a/mappings/net/minecraft/datafixer/fix/EntityTippedArrowFix.mapping b/mappings/net/minecraft/datafixer/fix/EntityTippedArrowFix.mapping index adc1ec0370..7c860016a9 100644 --- a/mappings/net/minecraft/datafixer/fix/EntityTippedArrowFix.mapping +++ b/mappings/net/minecraft/datafixer/fix/EntityTippedArrowFix.mapping @@ -1 +1,4 @@ CLASS net/minecraft/class_1173 net/minecraft/datafixer/fix/EntityTippedArrowFix + METHOD (Lcom/mojang/datafixers/schemas/Schema;Z)V + ARG 1 outputSchema + ARG 2 changesType diff --git a/mappings/net/minecraft/datafixer/fix/EntityUuidFix.mapping b/mappings/net/minecraft/datafixer/fix/EntityUuidFix.mapping index fc77182a84..8625fdfe47 100644 --- a/mappings/net/minecraft/datafixer/fix/EntityUuidFix.mapping +++ b/mappings/net/minecraft/datafixer/fix/EntityUuidFix.mapping @@ -5,6 +5,7 @@ CLASS net/minecraft/class_4960 net/minecraft/datafixer/fix/EntityUuidFix FIELD field_23125 LEASHABLES Ljava/util/Set; FIELD field_23126 OTHER_LIVINGS Ljava/util/Set; FIELD field_23127 PROJECTILES Ljava/util/Set; + FIELD field_36328 LOGGER Lorg/slf4j/Logger; METHOD (Lcom/mojang/datafixers/schemas/Schema;)V ARG 1 outputSchema METHOD method_26022 updateAngryAtMemory (Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic; diff --git a/mappings/net/minecraft/datafixer/fix/EntityVariantTypeFix.mapping b/mappings/net/minecraft/datafixer/fix/EntityVariantTypeFix.mapping index 7ab095fdcb..d379477bcc 100644 --- a/mappings/net/minecraft/datafixer/fix/EntityVariantTypeFix.mapping +++ b/mappings/net/minecraft/datafixer/fix/EntityVariantTypeFix.mapping @@ -2,8 +2,9 @@ CLASS net/minecraft/class_7371 net/minecraft/datafixer/fix/EntityVariantTypeFix FIELD field_38705 variantKey Ljava/lang/String; FIELD field_38706 variantIntToId Ljava/util/function/IntFunction; METHOD (Lcom/mojang/datafixers/schemas/Schema;Ljava/lang/String;Lcom/mojang/datafixers/DSL$TypeReference;Ljava/lang/String;Ljava/lang/String;Ljava/util/function/IntFunction;)V - ARG 1 schema + ARG 1 outputSchema ARG 2 name + ARG 3 type ARG 4 entityId ARG 5 variantKey ARG 6 variantIntToId diff --git a/mappings/net/minecraft/datafixer/fix/EntityWolfColorFix.mapping b/mappings/net/minecraft/datafixer/fix/EntityWolfColorFix.mapping index 935db4929d..05d603b612 100644 --- a/mappings/net/minecraft/datafixer/fix/EntityWolfColorFix.mapping +++ b/mappings/net/minecraft/datafixer/fix/EntityWolfColorFix.mapping @@ -1,2 +1,5 @@ CLASS net/minecraft/class_1172 net/minecraft/datafixer/fix/EntityWolfColorFix + METHOD (Lcom/mojang/datafixers/schemas/Schema;Z)V + ARG 1 outputSchema + ARG 2 changesType METHOD method_4988 fixCollarColor (Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic; diff --git a/mappings/net/minecraft/datafixer/fix/EntityZombieSplitFix.mapping b/mappings/net/minecraft/datafixer/fix/EntityZombieSplitFix.mapping index d44688a646..de17bfd18a 100644 --- a/mappings/net/minecraft/datafixer/fix/EntityZombieSplitFix.mapping +++ b/mappings/net/minecraft/datafixer/fix/EntityZombieSplitFix.mapping @@ -1 +1,4 @@ CLASS net/minecraft/class_1175 net/minecraft/datafixer/fix/EntityZombieSplitFix + METHOD (Lcom/mojang/datafixers/schemas/Schema;Z)V + ARG 1 outputSchema + ARG 2 changesType diff --git a/mappings/net/minecraft/datafixer/fix/EntityZombieVillagerTypeFix.mapping b/mappings/net/minecraft/datafixer/fix/EntityZombieVillagerTypeFix.mapping index 0fe0aa2f41..bcdfc86293 100644 --- a/mappings/net/minecraft/datafixer/fix/EntityZombieVillagerTypeFix.mapping +++ b/mappings/net/minecraft/datafixer/fix/EntityZombieVillagerTypeFix.mapping @@ -1,5 +1,8 @@ CLASS net/minecraft/class_1174 net/minecraft/datafixer/fix/EntityZombieVillagerTypeFix FIELD field_5674 RANDOM Lnet/minecraft/class_5819; + METHOD (Lcom/mojang/datafixers/schemas/Schema;Z)V + ARG 1 outputSchema + ARG 2 changesType METHOD method_4990 fixZombieType (Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic; METHOD method_4991 clampType (I)I ARG 1 type diff --git a/mappings/net/minecraft/datafixer/fix/FurnaceRecipesFix.mapping b/mappings/net/minecraft/datafixer/fix/FurnaceRecipesFix.mapping index 9d73c8b244..454ffc677d 100644 --- a/mappings/net/minecraft/datafixer/fix/FurnaceRecipesFix.mapping +++ b/mappings/net/minecraft/datafixer/fix/FurnaceRecipesFix.mapping @@ -1,3 +1,6 @@ CLASS net/minecraft/class_4752 net/minecraft/datafixer/fix/FurnaceRecipesFix + METHOD (Lcom/mojang/datafixers/schemas/Schema;Z)V + ARG 1 outputSchema + ARG 2 changesType METHOD method_24313 updateBlockEntities (Lcom/mojang/datafixers/types/Type;)Lcom/mojang/datafixers/TypeRewriteRule; METHOD method_24314 updateBlockEntityData (Lcom/mojang/datafixers/types/Type;Lcom/mojang/datafixers/types/Type;Lcom/mojang/datafixers/Typed;)Lcom/mojang/datafixers/Typed; diff --git a/mappings/net/minecraft/datafixer/fix/GameEventRenamesFix.mapping b/mappings/net/minecraft/datafixer/fix/GameEventRenamesFix.mapping index 6199a27135..28f1afda92 100644 --- a/mappings/net/minecraft/datafixer/fix/GameEventRenamesFix.mapping +++ b/mappings/net/minecraft/datafixer/fix/GameEventRenamesFix.mapping @@ -1,10 +1,9 @@ CLASS net/minecraft/class_7293 net/minecraft/datafixer/fix/GameEventRenamesFix FIELD field_38381 name Ljava/lang/String; - FIELD field_38382 renames Ljava/util/Map; - METHOD (Lcom/mojang/datafixers/schemas/Schema;Lcom/mojang/datafixers/DSL$TypeReference;Ljava/lang/String;Ljava/util/Map;)V - ARG 1 schema - ARG 3 name - ARG 4 renames - METHOD (Lcom/mojang/datafixers/schemas/Schema;Lcom/mojang/datafixers/DSL$TypeReference;Ljava/util/Map;)V - ARG 1 schema - ARG 3 renames + FIELD field_38383 typeReference Lcom/mojang/datafixers/DSL$TypeReference; + FIELD field_43178 renamer Ljava/util/function/UnaryOperator; + METHOD (Lcom/mojang/datafixers/schemas/Schema;Ljava/lang/String;Lcom/mojang/datafixers/DSL$TypeReference;Ljava/util/function/UnaryOperator;)V + ARG 1 outputSchema + ARG 2 name + ARG 3 typeReference + ARG 4 renamer diff --git a/mappings/net/minecraft/datafixer/fix/GoatHornIdFix.mapping b/mappings/net/minecraft/datafixer/fix/GoatHornIdFix.mapping index 9ad9848965..d8e7780554 100644 --- a/mappings/net/minecraft/datafixer/fix/GoatHornIdFix.mapping +++ b/mappings/net/minecraft/datafixer/fix/GoatHornIdFix.mapping @@ -1,6 +1,6 @@ CLASS net/minecraft/class_7442 net/minecraft/datafixer/fix/GoatHornIdFix FIELD field_39110 GOAT_HORN_IDS [Ljava/lang/String; METHOD (Lcom/mojang/datafixers/schemas/Schema;)V - ARG 1 schema + ARG 1 outputSchema METHOD method_44191 (Ljava/lang/String;)Z ARG 0 itemId diff --git a/mappings/net/minecraft/datafixer/fix/GoatMissingStateFix.mapping b/mappings/net/minecraft/datafixer/fix/GoatMissingStateFix.mapping index aa3b7cc927..c376da5c44 100644 --- a/mappings/net/minecraft/datafixer/fix/GoatMissingStateFix.mapping +++ b/mappings/net/minecraft/datafixer/fix/GoatMissingStateFix.mapping @@ -1,3 +1,3 @@ CLASS net/minecraft/class_7520 net/minecraft/datafixer/fix/GoatMissingStateFix METHOD (Lcom/mojang/datafixers/schemas/Schema;)V - ARG 1 schema + ARG 1 outputSchema diff --git a/mappings/net/minecraft/datafixer/fix/HangingEntityFix.mapping b/mappings/net/minecraft/datafixer/fix/HangingEntityFix.mapping index 8eb88135de..1d98e40f34 100644 --- a/mappings/net/minecraft/datafixer/fix/HangingEntityFix.mapping +++ b/mappings/net/minecraft/datafixer/fix/HangingEntityFix.mapping @@ -1,5 +1,8 @@ CLASS net/minecraft/class_3606 net/minecraft/datafixer/fix/HangingEntityFix FIELD field_15897 OFFSETS [[I + METHOD (Lcom/mojang/datafixers/schemas/Schema;Z)V + ARG 1 outputSchema + ARG 2 changesType METHOD method_15719 fixDecorationPosition (Lcom/mojang/serialization/Dynamic;ZZ)Lcom/mojang/serialization/Dynamic; ARG 2 isPainting ARG 3 isItemFrame diff --git a/mappings/net/minecraft/datafixer/fix/HeightmapRenamingFix.mapping b/mappings/net/minecraft/datafixer/fix/HeightmapRenamingFix.mapping index d4b2c66d64..2778cb4e7b 100644 --- a/mappings/net/minecraft/datafixer/fix/HeightmapRenamingFix.mapping +++ b/mappings/net/minecraft/datafixer/fix/HeightmapRenamingFix.mapping @@ -1,2 +1,5 @@ CLASS net/minecraft/class_1177 net/minecraft/datafixer/fix/HeightmapRenamingFix + METHOD (Lcom/mojang/datafixers/schemas/Schema;Z)V + ARG 1 outputSchema + ARG 2 changesType METHOD method_4998 renameHeightmapTags (Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic; diff --git a/mappings/net/minecraft/datafixer/fix/IglooMetadataRemovalFix.mapping b/mappings/net/minecraft/datafixer/fix/IglooMetadataRemovalFix.mapping index 9ddd205039..30bbaacda3 100644 --- a/mappings/net/minecraft/datafixer/fix/IglooMetadataRemovalFix.mapping +++ b/mappings/net/minecraft/datafixer/fix/IglooMetadataRemovalFix.mapping @@ -1,4 +1,7 @@ CLASS net/minecraft/class_1176 net/minecraft/datafixer/fix/IglooMetadataRemovalFix + METHOD (Lcom/mojang/datafixers/schemas/Schema;Z)V + ARG 1 outputSchema + ARG 2 changesType METHOD method_4993 removeMetadata (Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic; METHOD method_4996 removeIgloos (Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic; METHOD method_4997 isIgloo (Lcom/mojang/serialization/Dynamic;)Z diff --git a/mappings/net/minecraft/datafixer/fix/ItemBannerColorFix.mapping b/mappings/net/minecraft/datafixer/fix/ItemBannerColorFix.mapping index ef4f37376c..2cadb90d31 100644 --- a/mappings/net/minecraft/datafixer/fix/ItemBannerColorFix.mapping +++ b/mappings/net/minecraft/datafixer/fix/ItemBannerColorFix.mapping @@ -1 +1,4 @@ CLASS net/minecraft/class_1179 net/minecraft/datafixer/fix/ItemBannerColorFix + METHOD (Lcom/mojang/datafixers/schemas/Schema;Z)V + ARG 1 outputSchema + ARG 2 changesType diff --git a/mappings/net/minecraft/datafixer/fix/ItemCustomNameToComponentFix.mapping b/mappings/net/minecraft/datafixer/fix/ItemCustomNameToComponentFix.mapping index ccf04acb9e..5ddd5be653 100644 --- a/mappings/net/minecraft/datafixer/fix/ItemCustomNameToComponentFix.mapping +++ b/mappings/net/minecraft/datafixer/fix/ItemCustomNameToComponentFix.mapping @@ -1,2 +1,5 @@ CLASS net/minecraft/class_1178 net/minecraft/datafixer/fix/ItemCustomNameToComponentFix + METHOD (Lcom/mojang/datafixers/schemas/Schema;Z)V + ARG 1 outputSchema + ARG 2 changesType METHOD method_5001 fixCustomName (Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic; diff --git a/mappings/net/minecraft/datafixer/fix/ItemIdFix.mapping b/mappings/net/minecraft/datafixer/fix/ItemIdFix.mapping index 24008909b9..6afe1503e3 100644 --- a/mappings/net/minecraft/datafixer/fix/ItemIdFix.mapping +++ b/mappings/net/minecraft/datafixer/fix/ItemIdFix.mapping @@ -1,5 +1,8 @@ CLASS net/minecraft/class_1181 net/minecraft/datafixer/fix/ItemIdFix FIELD field_5675 NUMERICAL_ID_TO_STRING_ID_MAP Lit/unimi/dsi/fastutil/ints/Int2ObjectMap; + METHOD (Lcom/mojang/datafixers/schemas/Schema;Z)V + ARG 1 outputSchema + ARG 2 changesType METHOD method_5015 (Lit/unimi/dsi/fastutil/ints/Int2ObjectOpenHashMap;)V ARG 0 map METHOD method_5018 fromId (I)Ljava/lang/String; diff --git a/mappings/net/minecraft/datafixer/fix/ItemInstanceMapIdFix.mapping b/mappings/net/minecraft/datafixer/fix/ItemInstanceMapIdFix.mapping index 2a3db6647a..652441cf0d 100644 --- a/mappings/net/minecraft/datafixer/fix/ItemInstanceMapIdFix.mapping +++ b/mappings/net/minecraft/datafixer/fix/ItemInstanceMapIdFix.mapping @@ -1 +1,4 @@ CLASS net/minecraft/class_1186 net/minecraft/datafixer/fix/ItemInstanceMapIdFix + METHOD (Lcom/mojang/datafixers/schemas/Schema;Z)V + ARG 1 outputSchema + ARG 2 changesType diff --git a/mappings/net/minecraft/datafixer/fix/ItemInstanceSpawnEggFix.mapping b/mappings/net/minecraft/datafixer/fix/ItemInstanceSpawnEggFix.mapping index 1ef7a430e4..d171594377 100644 --- a/mappings/net/minecraft/datafixer/fix/ItemInstanceSpawnEggFix.mapping +++ b/mappings/net/minecraft/datafixer/fix/ItemInstanceSpawnEggFix.mapping @@ -1,4 +1,11 @@ CLASS net/minecraft/class_1189 net/minecraft/datafixer/fix/ItemInstanceSpawnEggFix + FIELD field_41287 spawnEggId Ljava/lang/String; FIELD field_5685 ENTITY_SPAWN_EGGS Ljava/util/Map; + METHOD (Lcom/mojang/datafixers/schemas/Schema;ZLjava/lang/String;)V + ARG 1 outputSchema + ARG 2 changesType + ARG 3 spawnEggId + METHOD method_5046 (Lcom/mojang/datafixers/OpticFinder;Lcom/mojang/datafixers/OpticFinder;Lcom/mojang/datafixers/OpticFinder;Lcom/mojang/datafixers/OpticFinder;Lcom/mojang/datafixers/Typed;)Lcom/mojang/datafixers/Typed; + ARG 5 stack METHOD method_5047 (Ljava/util/HashMap;)V ARG 0 map diff --git a/mappings/net/minecraft/datafixer/fix/ItemInstanceTheFlatteningFix.mapping b/mappings/net/minecraft/datafixer/fix/ItemInstanceTheFlatteningFix.mapping index 07fb28e4d4..7198f46262 100644 --- a/mappings/net/minecraft/datafixer/fix/ItemInstanceTheFlatteningFix.mapping +++ b/mappings/net/minecraft/datafixer/fix/ItemInstanceTheFlatteningFix.mapping @@ -2,6 +2,9 @@ CLASS net/minecraft/class_1188 net/minecraft/datafixer/fix/ItemInstanceTheFlatte FIELD field_5682 DAMAGEABLE_ITEMS Ljava/util/Set; FIELD field_5683 ORIGINAL_ITEM_NAMES Ljava/util/Set; FIELD field_5684 FLATTENING_MAP Ljava/util/Map; + METHOD (Lcom/mojang/datafixers/schemas/Schema;Z)V + ARG 1 outputSchema + ARG 2 changesType METHOD method_5042 getItem (Ljava/lang/String;I)Ljava/lang/String; ARG 0 originalName ARG 1 damage diff --git a/mappings/net/minecraft/datafixer/fix/ItemLoreToTextFix.mapping b/mappings/net/minecraft/datafixer/fix/ItemLoreToTextFix.mapping index ce451885c1..e42bc2008f 100644 --- a/mappings/net/minecraft/datafixer/fix/ItemLoreToTextFix.mapping +++ b/mappings/net/minecraft/datafixer/fix/ItemLoreToTextFix.mapping @@ -1,4 +1,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 fixLoreNbt (Ljava/util/stream/Stream;)Ljava/util/stream/Stream; ARG 0 nbt METHOD method_5012 componentize (Ljava/lang/String;)Ljava/lang/String; diff --git a/mappings/net/minecraft/datafixer/fix/ItemNbtFix.mapping b/mappings/net/minecraft/datafixer/fix/ItemNbtFix.mapping index 99308416f8..d791b7d53d 100644 --- a/mappings/net/minecraft/datafixer/fix/ItemNbtFix.mapping +++ b/mappings/net/minecraft/datafixer/fix/ItemNbtFix.mapping @@ -2,7 +2,7 @@ CLASS net/minecraft/class_7505 net/minecraft/datafixer/fix/ItemNbtFix FIELD field_39403 name Ljava/lang/String; FIELD field_39404 itemIdPredicate Ljava/util/function/Predicate; METHOD (Lcom/mojang/datafixers/schemas/Schema;Ljava/lang/String;Ljava/util/function/Predicate;)V - ARG 1 schema + ARG 1 outputSchema ARG 2 name ARG 3 itemIdPredicate METHOD method_20445 fixNbt (Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic; diff --git a/mappings/net/minecraft/datafixer/fix/ItemPotionFix.mapping b/mappings/net/minecraft/datafixer/fix/ItemPotionFix.mapping index 3b64075061..44c3da4922 100644 --- a/mappings/net/minecraft/datafixer/fix/ItemPotionFix.mapping +++ b/mappings/net/minecraft/datafixer/fix/ItemPotionFix.mapping @@ -1,3 +1,6 @@ CLASS net/minecraft/class_1183 net/minecraft/datafixer/fix/ItemPotionFix FIELD field_29884 WATER Ljava/lang/String; FIELD field_5678 ID_TO_POTIONS [Ljava/lang/String; + METHOD (Lcom/mojang/datafixers/schemas/Schema;Z)V + ARG 1 outputSchema + ARG 2 changesType diff --git a/mappings/net/minecraft/datafixer/fix/ItemRemoveBlockEntityTagFix.mapping b/mappings/net/minecraft/datafixer/fix/ItemRemoveBlockEntityTagFix.mapping index 3129fe2e6e..f8aadbff9f 100644 --- a/mappings/net/minecraft/datafixer/fix/ItemRemoveBlockEntityTagFix.mapping +++ b/mappings/net/minecraft/datafixer/fix/ItemRemoveBlockEntityTagFix.mapping @@ -1,7 +1,7 @@ CLASS net/minecraft/class_7641 net/minecraft/datafixer/fix/ItemRemoveBlockEntityTagFix FIELD field_39900 itemIds Ljava/util/Set; METHOD (Lcom/mojang/datafixers/schemas/Schema;ZLjava/util/Set;)V - ARG 1 schema + ARG 1 outputSchema ARG 2 changesType ARG 3 itemIds METHOD method_45014 (Lcom/mojang/datafixers/OpticFinder;Lcom/mojang/datafixers/OpticFinder;Lcom/mojang/datafixers/OpticFinder;Lcom/mojang/datafixers/Typed;)Lcom/mojang/datafixers/Typed; diff --git a/mappings/net/minecraft/datafixer/fix/ItemShulkerBoxColorFix.mapping b/mappings/net/minecraft/datafixer/fix/ItemShulkerBoxColorFix.mapping index c19a30bd31..d17264ea97 100644 --- a/mappings/net/minecraft/datafixer/fix/ItemShulkerBoxColorFix.mapping +++ b/mappings/net/minecraft/datafixer/fix/ItemShulkerBoxColorFix.mapping @@ -1,2 +1,5 @@ CLASS net/minecraft/class_1185 net/minecraft/datafixer/fix/ItemShulkerBoxColorFix FIELD field_5680 COLORED_SHULKER_BOX_IDS [Ljava/lang/String; + METHOD (Lcom/mojang/datafixers/schemas/Schema;Z)V + ARG 1 outputSchema + ARG 2 changesType diff --git a/mappings/net/minecraft/datafixer/fix/ItemSpawnEggFix.mapping b/mappings/net/minecraft/datafixer/fix/ItemSpawnEggFix.mapping index f1cc2d78bf..d4e9d8cc35 100644 --- a/mappings/net/minecraft/datafixer/fix/ItemSpawnEggFix.mapping +++ b/mappings/net/minecraft/datafixer/fix/ItemSpawnEggFix.mapping @@ -1,2 +1,5 @@ CLASS net/minecraft/class_1184 net/minecraft/datafixer/fix/ItemSpawnEggFix FIELD field_5679 DAMAGE_TO_ENTITY_IDS [Ljava/lang/String; + METHOD (Lcom/mojang/datafixers/schemas/Schema;Z)V + ARG 1 outputSchema + ARG 2 changesType diff --git a/mappings/net/minecraft/datafixer/fix/ItemStackEnchantmentFix.mapping b/mappings/net/minecraft/datafixer/fix/ItemStackEnchantmentFix.mapping index 1a7ce191e8..fec9fae463 100644 --- a/mappings/net/minecraft/datafixer/fix/ItemStackEnchantmentFix.mapping +++ b/mappings/net/minecraft/datafixer/fix/ItemStackEnchantmentFix.mapping @@ -1,5 +1,8 @@ CLASS net/minecraft/class_1187 net/minecraft/datafixer/fix/ItemStackEnchantmentFix FIELD field_5681 ID_TO_ENCHANTMENTS_MAP Lit/unimi/dsi/fastutil/ints/Int2ObjectMap; + METHOD (Lcom/mojang/datafixers/schemas/Schema;Z)V + ARG 1 outputSchema + ARG 2 changesType METHOD method_5033 (Lit/unimi/dsi/fastutil/ints/Int2ObjectOpenHashMap;)V ARG 0 map METHOD method_5035 fixEnchantments (Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic; diff --git a/mappings/net/minecraft/datafixer/fix/ItemWaterPotionFix.mapping b/mappings/net/minecraft/datafixer/fix/ItemWaterPotionFix.mapping index bc4a96f1cf..32f58a032c 100644 --- a/mappings/net/minecraft/datafixer/fix/ItemWaterPotionFix.mapping +++ b/mappings/net/minecraft/datafixer/fix/ItemWaterPotionFix.mapping @@ -1 +1,4 @@ CLASS net/minecraft/class_1190 net/minecraft/datafixer/fix/ItemWaterPotionFix + METHOD (Lcom/mojang/datafixers/schemas/Schema;Z)V + ARG 1 outputSchema + ARG 2 changesType diff --git a/mappings/net/minecraft/datafixer/fix/ItemWrittenBookPagesStrictJsonFix.mapping b/mappings/net/minecraft/datafixer/fix/ItemWrittenBookPagesStrictJsonFix.mapping index 1f3f6f3049..7728cf1d8c 100644 --- a/mappings/net/minecraft/datafixer/fix/ItemWrittenBookPagesStrictJsonFix.mapping +++ b/mappings/net/minecraft/datafixer/fix/ItemWrittenBookPagesStrictJsonFix.mapping @@ -1,2 +1,5 @@ CLASS net/minecraft/class_1194 net/minecraft/datafixer/fix/ItemWrittenBookPagesStrictJsonFix + METHOD (Lcom/mojang/datafixers/schemas/Schema;Z)V + ARG 1 outputSchema + ARG 2 changesType METHOD method_5085 fixBookPages (Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic; diff --git a/mappings/net/minecraft/datafixer/fix/JigsawPropertiesFix.mapping b/mappings/net/minecraft/datafixer/fix/JigsawPropertiesFix.mapping index 99db1891c9..80c51d2130 100644 --- a/mappings/net/minecraft/datafixer/fix/JigsawPropertiesFix.mapping +++ b/mappings/net/minecraft/datafixer/fix/JigsawPropertiesFix.mapping @@ -1,2 +1,5 @@ CLASS net/minecraft/class_4977 net/minecraft/datafixer/fix/JigsawPropertiesFix + METHOD (Lcom/mojang/datafixers/schemas/Schema;Z)V + ARG 1 outputSchema + ARG 2 changesType METHOD method_26300 renameProperties (Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic; diff --git a/mappings/net/minecraft/datafixer/fix/JigsawRotationFix.mapping b/mappings/net/minecraft/datafixer/fix/JigsawRotationFix.mapping index 21a0943b44..e69408c886 100644 --- a/mappings/net/minecraft/datafixer/fix/JigsawRotationFix.mapping +++ b/mappings/net/minecraft/datafixer/fix/JigsawRotationFix.mapping @@ -1,3 +1,6 @@ CLASS net/minecraft/class_4978 net/minecraft/datafixer/fix/JigsawRotationFix FIELD field_23213 ORIENTATION_UPDATES Ljava/util/Map; + METHOD (Lcom/mojang/datafixers/schemas/Schema;Z)V + ARG 1 outputSchema + ARG 2 changesType METHOD method_26301 updateBlockState (Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic; diff --git a/mappings/net/minecraft/datafixer/fix/LeavesFix.mapping b/mappings/net/minecraft/datafixer/fix/LeavesFix.mapping index e2ebc69bb7..bdaab28768 100644 --- a/mappings/net/minecraft/datafixer/fix/LeavesFix.mapping +++ b/mappings/net/minecraft/datafixer/fix/LeavesFix.mapping @@ -1,8 +1,27 @@ CLASS net/minecraft/class_1191 net/minecraft/datafixer/fix/LeavesFix FIELD field_5686 LOGS_MAP Ljava/util/Set; + FIELD field_5687 AXIAL_OFFSETS [[I FIELD field_5688 LEAVES_MAP Lit/unimi/dsi/fastutil/objects/Object2IntMap; + METHOD (Lcom/mojang/datafixers/schemas/Schema;Z)V + ARG 1 outputSchema + ARG 2 changesType + METHOD method_5050 getZ (I)I + ARG 1 packedLocalPos + METHOD method_5051 packLocalPos (III)I + ARG 0 localX + ARG 1 localY + ARG 2 localZ + METHOD method_5052 getX (I)I + ARG 1 packedLocalPos METHOD method_5055 (Lit/unimi/dsi/fastutil/objects/Object2IntOpenHashMap;)V ARG 0 map + METHOD method_5061 getBoundaryClassBit (ZZZZ)I + ARG 0 westernmost + ARG 1 easternmost + ARG 2 northernmost + ARG 3 southernmost + METHOD method_5062 getY (I)I + ARG 1 packedLocalPos CLASS class_1192 LeavesLogFixer FIELD field_29897 PERSISTENT Ljava/lang/String; FIELD field_29898 DECAYABLE Ljava/lang/String; @@ -13,20 +32,29 @@ CLASS net/minecraft/class_1191 net/minecraft/datafixer/fix/LeavesFix METHOD method_5065 getDistanceToLog (I)I METHOD method_5068 isLog (I)Z METHOD method_5070 computeLeafStates (III)V + ARG 3 distance METHOD method_5071 isLeaf (I)Z METHOD method_5072 createLeafProperties (Lcom/mojang/serialization/Dynamic;Ljava/lang/String;ZI)Lcom/mojang/serialization/Dynamic; + ARG 1 tag + ARG 2 name + ARG 3 persistent + ARG 4 distance CLASS class_1193 ListFixer FIELD field_29900 BLOCK_STATES_KEY Ljava/lang/String; FIELD field_29901 NAME_KEY Ljava/lang/String; FIELD field_29902 PROPERTIES_KEY Ljava/lang/String; FIELD field_5692 properties Ljava/util/List; + FIELD field_5693 paletteFinder Lcom/mojang/datafixers/OpticFinder; FIELD field_5694 y I + FIELD field_5695 blockStateType Lcom/mojang/datafixers/types/Type; FIELD field_5696 blockStateMap Lnet/minecraft/class_5298; METHOD method_5074 computeFixableBlockStates (Lcom/mojang/serialization/Dynamic;)V METHOD method_5075 needsFix (I)I + ARG 1 index METHOD method_5076 needsFix ()Z METHOD method_5077 getY ()I METHOD method_5079 isFixed ()Z METHOD method_5082 computeFlags (Ljava/lang/String;ZI)I ARG 1 leafBlockName ARG 2 persistent + ARG 3 distance diff --git a/mappings/net/minecraft/datafixer/fix/LegacyDragonFightFix.mapping b/mappings/net/minecraft/datafixer/fix/LegacyDragonFightFix.mapping new file mode 100644 index 0000000000..bb72bab30b --- /dev/null +++ b/mappings/net/minecraft/datafixer/fix/LegacyDragonFightFix.mapping @@ -0,0 +1,7 @@ +CLASS net/minecraft/class_8575 net/minecraft/datafixer/fix/LegacyDragonFightFix + METHOD (Lcom/mojang/datafixers/schemas/Schema;)V + ARG 1 outputSchema + METHOD method_52227 (Lcom/mojang/datafixers/Typed;)Lcom/mojang/datafixers/Typed; + ARG 0 typed + METHOD method_52228 (Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic; + ARG 0 levelData diff --git a/mappings/net/minecraft/datafixer/fix/LevelDataGeneratorOptionsFix.mapping b/mappings/net/minecraft/datafixer/fix/LevelDataGeneratorOptionsFix.mapping index 045e1e5e44..8c36e1d812 100644 --- a/mappings/net/minecraft/datafixer/fix/LevelDataGeneratorOptionsFix.mapping +++ b/mappings/net/minecraft/datafixer/fix/LevelDataGeneratorOptionsFix.mapping @@ -1,6 +1,9 @@ CLASS net/minecraft/class_1196 net/minecraft/datafixer/fix/LevelDataGeneratorOptionsFix FIELD field_29903 GENERATOR_OPTIONS_KEY Ljava/lang/String; FIELD field_5702 NUMERICAL_IDS_TO_BIOME_IDS Ljava/util/Map; + METHOD (Lcom/mojang/datafixers/schemas/Schema;Z)V + ARG 1 outputSchema + ARG 2 changesType METHOD method_5099 parseFlatLayer (Ljava/lang/String;)Lcom/mojang/datafixers/util/Pair; ARG 0 layer METHOD method_5100 fixGeneratorOptions (Ljava/lang/String;Lcom/mojang/serialization/DynamicOps;)Lcom/mojang/serialization/Dynamic; diff --git a/mappings/net/minecraft/datafixer/fix/LevelFlatGeneratorInfoFix.mapping b/mappings/net/minecraft/datafixer/fix/LevelFlatGeneratorInfoFix.mapping index 712d767f7b..26ae343564 100644 --- a/mappings/net/minecraft/datafixer/fix/LevelFlatGeneratorInfoFix.mapping +++ b/mappings/net/minecraft/datafixer/fix/LevelFlatGeneratorInfoFix.mapping @@ -6,6 +6,9 @@ CLASS net/minecraft/class_1195 net/minecraft/datafixer/fix/LevelFlatGeneratorInf FIELD field_5699 SPLIT_ON_LOWER_X Lcom/google/common/base/Splitter; FIELD field_5700 SPLIT_ON_SEMICOLON Lcom/google/common/base/Splitter; FIELD field_5701 SPLIT_ON_COMMA Lcom/google/common/base/Splitter; + METHOD (Lcom/mojang/datafixers/schemas/Schema;Z)V + ARG 1 outputSchema + ARG 2 changesType METHOD method_5090 fixGeneratorOptions (Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic; METHOD method_5094 fixFlatGeneratorOptions (Ljava/lang/String;)Ljava/lang/String; ARG 1 generatorOptions diff --git a/mappings/net/minecraft/datafixer/fix/MapIdFix.mapping b/mappings/net/minecraft/datafixer/fix/MapIdFix.mapping index fe1e336212..acb300d073 100644 --- a/mappings/net/minecraft/datafixer/fix/MapIdFix.mapping +++ b/mappings/net/minecraft/datafixer/fix/MapIdFix.mapping @@ -1 +1,4 @@ CLASS net/minecraft/class_3970 net/minecraft/datafixer/fix/MapIdFix + METHOD (Lcom/mojang/datafixers/schemas/Schema;Z)V + ARG 1 outputSchema + ARG 2 changesType diff --git a/mappings/net/minecraft/datafixer/fix/MissingDimensionFix.mapping b/mappings/net/minecraft/datafixer/fix/MissingDimensionFix.mapping index 46a04be12b..f159619bdb 100644 --- a/mappings/net/minecraft/datafixer/fix/MissingDimensionFix.mapping +++ b/mappings/net/minecraft/datafixer/fix/MissingDimensionFix.mapping @@ -1 +1,4 @@ CLASS net/minecraft/class_5396 net/minecraft/datafixer/fix/MissingDimensionFix + METHOD (Lcom/mojang/datafixers/schemas/Schema;Z)V + ARG 1 outputSchema + ARG 2 changesType diff --git a/mappings/net/minecraft/datafixer/fix/MobSpawnerEntityIdentifiersFix.mapping b/mappings/net/minecraft/datafixer/fix/MobSpawnerEntityIdentifiersFix.mapping index dd1d1fe394..7fd7e299b4 100644 --- a/mappings/net/minecraft/datafixer/fix/MobSpawnerEntityIdentifiersFix.mapping +++ b/mappings/net/minecraft/datafixer/fix/MobSpawnerEntityIdentifiersFix.mapping @@ -1,2 +1,5 @@ CLASS net/minecraft/class_1198 net/minecraft/datafixer/fix/MobSpawnerEntityIdentifiersFix + METHOD (Lcom/mojang/datafixers/schemas/Schema;Z)V + ARG 1 outputSchema + ARG 2 changesType METHOD method_5106 fixSpawner (Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic; diff --git a/mappings/net/minecraft/datafixer/fix/NewVillageFix.mapping b/mappings/net/minecraft/datafixer/fix/NewVillageFix.mapping index b52681cd7e..ab315812cc 100644 --- a/mappings/net/minecraft/datafixer/fix/NewVillageFix.mapping +++ b/mappings/net/minecraft/datafixer/fix/NewVillageFix.mapping @@ -1,2 +1,5 @@ CLASS net/minecraft/class_3904 net/minecraft/datafixer/fix/NewVillageFix + METHOD (Lcom/mojang/datafixers/schemas/Schema;Z)V + ARG 1 outputSchema + ARG 2 changesType METHOD method_17334 fix (Lcom/mojang/datafixers/types/templates/CompoundList$CompoundListType;)Lcom/mojang/datafixers/TypeRewriteRule; diff --git a/mappings/net/minecraft/datafixer/fix/ObjectiveDisplayNameFix.mapping b/mappings/net/minecraft/datafixer/fix/ObjectiveDisplayNameFix.mapping index 636bfde712..405dd157da 100644 --- a/mappings/net/minecraft/datafixer/fix/ObjectiveDisplayNameFix.mapping +++ b/mappings/net/minecraft/datafixer/fix/ObjectiveDisplayNameFix.mapping @@ -1 +1,4 @@ CLASS net/minecraft/class_1200 net/minecraft/datafixer/fix/ObjectiveDisplayNameFix + METHOD (Lcom/mojang/datafixers/schemas/Schema;Z)V + ARG 1 outputSchema + ARG 2 changesType diff --git a/mappings/net/minecraft/datafixer/fix/ObjectiveRenderTypeFix.mapping b/mappings/net/minecraft/datafixer/fix/ObjectiveRenderTypeFix.mapping index de9aa65d9e..4c81c28528 100644 --- a/mappings/net/minecraft/datafixer/fix/ObjectiveRenderTypeFix.mapping +++ b/mappings/net/minecraft/datafixer/fix/ObjectiveRenderTypeFix.mapping @@ -1,3 +1,10 @@ CLASS net/minecraft/class_1199 net/minecraft/datafixer/fix/ObjectiveRenderTypeFix - METHOD method_5112 parseLegacyRenderType (Ljava/lang/String;)Lnet/minecraft/class_274$class_275; + METHOD (Lcom/mojang/datafixers/schemas/Schema;Z)V + ARG 1 outputSchema + ARG 2 changesType + METHOD method_37376 (Lcom/mojang/datafixers/Typed;)Lcom/mojang/datafixers/Typed; + ARG 0 typed + METHOD method_37377 (Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic; + ARG 0 objective + METHOD method_5112 parseLegacyRenderType (Ljava/lang/String;)Ljava/lang/String; ARG 0 oldName diff --git a/mappings/net/minecraft/datafixer/fix/OminousBannerBlockEntityRenameFix.mapping b/mappings/net/minecraft/datafixer/fix/OminousBannerBlockEntityRenameFix.mapping index fdf6a50455..b8151a7fe3 100644 --- a/mappings/net/minecraft/datafixer/fix/OminousBannerBlockEntityRenameFix.mapping +++ b/mappings/net/minecraft/datafixer/fix/OminousBannerBlockEntityRenameFix.mapping @@ -1,2 +1,5 @@ CLASS net/minecraft/class_4299 net/minecraft/datafixer/fix/OminousBannerBlockEntityRenameFix + METHOD (Lcom/mojang/datafixers/schemas/Schema;Z)V + ARG 1 outputSchema + ARG 2 changesType METHOD method_20481 fixBannerName (Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic; diff --git a/mappings/net/minecraft/datafixer/fix/OminousBannerItemRenameFix.mapping b/mappings/net/minecraft/datafixer/fix/OminousBannerItemRenameFix.mapping index db9b009f54..bf98faa66c 100644 --- a/mappings/net/minecraft/datafixer/fix/OminousBannerItemRenameFix.mapping +++ b/mappings/net/minecraft/datafixer/fix/OminousBannerItemRenameFix.mapping @@ -1,5 +1,5 @@ CLASS net/minecraft/class_4294 net/minecraft/datafixer/fix/OminousBannerItemRenameFix METHOD (Lcom/mojang/datafixers/schemas/Schema;)V - ARG 1 schema + ARG 1 outputSchema METHOD method_44194 (Ljava/lang/String;)Z ARG 0 itemId diff --git a/mappings/net/minecraft/datafixer/fix/OptionsAccessibilityOnboardFix.mapping b/mappings/net/minecraft/datafixer/fix/OptionsAccessibilityOnboardFix.mapping new file mode 100644 index 0000000000..0566c90008 --- /dev/null +++ b/mappings/net/minecraft/datafixer/fix/OptionsAccessibilityOnboardFix.mapping @@ -0,0 +1,7 @@ +CLASS net/minecraft/class_8014 net/minecraft/datafixer/fix/OptionsAccessibilityOnboardFix + METHOD (Lcom/mojang/datafixers/schemas/Schema;)V + ARG 1 outputSchema + METHOD method_48133 (Lcom/mojang/datafixers/Typed;)Lcom/mojang/datafixers/Typed; + ARG 0 typed + METHOD method_48134 (Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic; + ARG 0 options diff --git a/mappings/net/minecraft/datafixer/fix/OptionsAddTextBackgroundFix.mapping b/mappings/net/minecraft/datafixer/fix/OptionsAddTextBackgroundFix.mapping index e9b6a47c30..d7d507169e 100644 --- a/mappings/net/minecraft/datafixer/fix/OptionsAddTextBackgroundFix.mapping +++ b/mappings/net/minecraft/datafixer/fix/OptionsAddTextBackgroundFix.mapping @@ -1,3 +1,6 @@ CLASS net/minecraft/class_4092 net/minecraft/datafixer/fix/OptionsAddTextBackgroundFix + METHOD (Lcom/mojang/datafixers/schemas/Schema;Z)V + ARG 1 outputSchema + ARG 2 changesType METHOD method_18853 convertToTextBackgroundOpacity (Ljava/lang/String;)D ARG 1 chatOpacity diff --git a/mappings/net/minecraft/datafixer/fix/OptionsAmbientOcclusionFix.mapping b/mappings/net/minecraft/datafixer/fix/OptionsAmbientOcclusionFix.mapping new file mode 100644 index 0000000000..ab27c5818b --- /dev/null +++ b/mappings/net/minecraft/datafixer/fix/OptionsAmbientOcclusionFix.mapping @@ -0,0 +1,5 @@ +CLASS net/minecraft/class_8004 net/minecraft/datafixer/fix/OptionsAmbientOcclusionFix + METHOD (Lcom/mojang/datafixers/schemas/Schema;)V + ARG 1 outputSchema + METHOD method_47998 fixValue (Ljava/lang/String;)Ljava/lang/String; + ARG 0 oldValue diff --git a/mappings/net/minecraft/datafixer/fix/OptionsForceVBOFix.mapping b/mappings/net/minecraft/datafixer/fix/OptionsForceVBOFix.mapping index 67009ef0a1..07f4b6c53c 100644 --- a/mappings/net/minecraft/datafixer/fix/OptionsForceVBOFix.mapping +++ b/mappings/net/minecraft/datafixer/fix/OptionsForceVBOFix.mapping @@ -1 +1,4 @@ CLASS net/minecraft/class_1202 net/minecraft/datafixer/fix/OptionsForceVBOFix + METHOD (Lcom/mojang/datafixers/schemas/Schema;Z)V + ARG 1 outputSchema + ARG 2 changesType diff --git a/mappings/net/minecraft/datafixer/fix/OptionsKeyLwjgl3Fix.mapping b/mappings/net/minecraft/datafixer/fix/OptionsKeyLwjgl3Fix.mapping index d1307124db..257f0ce4d1 100644 --- a/mappings/net/minecraft/datafixer/fix/OptionsKeyLwjgl3Fix.mapping +++ b/mappings/net/minecraft/datafixer/fix/OptionsKeyLwjgl3Fix.mapping @@ -1,4 +1,8 @@ CLASS net/minecraft/class_1201 net/minecraft/datafixer/fix/OptionsKeyLwjgl3Fix + FIELD field_29906 KEY_UNKNOWN Ljava/lang/String; FIELD field_5706 NUMERICAL_KEY_IDS_TO_KEY_NAMES Lit/unimi/dsi/fastutil/ints/Int2ObjectMap; + METHOD (Lcom/mojang/datafixers/schemas/Schema;Z)V + ARG 1 outputSchema + ARG 2 changesType METHOD method_5118 (Lit/unimi/dsi/fastutil/ints/Int2ObjectOpenHashMap;)V ARG 0 map diff --git a/mappings/net/minecraft/datafixer/fix/OptionsKeyTranslationFix.mapping b/mappings/net/minecraft/datafixer/fix/OptionsKeyTranslationFix.mapping index c20c55adfa..617e4642ef 100644 --- a/mappings/net/minecraft/datafixer/fix/OptionsKeyTranslationFix.mapping +++ b/mappings/net/minecraft/datafixer/fix/OptionsKeyTranslationFix.mapping @@ -1 +1,4 @@ CLASS net/minecraft/class_1204 net/minecraft/datafixer/fix/OptionsKeyTranslationFix + METHOD (Lcom/mojang/datafixers/schemas/Schema;Z)V + ARG 1 outputSchema + ARG 2 changesType diff --git a/mappings/net/minecraft/datafixer/fix/OptionsLowerCaseLanguageFix.mapping b/mappings/net/minecraft/datafixer/fix/OptionsLowerCaseLanguageFix.mapping index b1a088b975..c46a3a3570 100644 --- a/mappings/net/minecraft/datafixer/fix/OptionsLowerCaseLanguageFix.mapping +++ b/mappings/net/minecraft/datafixer/fix/OptionsLowerCaseLanguageFix.mapping @@ -1 +1,4 @@ CLASS net/minecraft/class_1203 net/minecraft/datafixer/fix/OptionsLowerCaseLanguageFix + METHOD (Lcom/mojang/datafixers/schemas/Schema;Z)V + ARG 1 outputSchema + ARG 2 changesType diff --git a/mappings/net/minecraft/datafixer/fix/OptionsProgrammerArtFix.mapping b/mappings/net/minecraft/datafixer/fix/OptionsProgrammerArtFix.mapping new file mode 100644 index 0000000000..e7b774236d --- /dev/null +++ b/mappings/net/minecraft/datafixer/fix/OptionsProgrammerArtFix.mapping @@ -0,0 +1,11 @@ +CLASS net/minecraft/class_7683 net/minecraft/datafixer/fix/OptionsProgrammerArtFix + METHOD (Lcom/mojang/datafixers/schemas/Schema;)V + ARG 1 outputSchema + METHOD method_45313 (Lcom/mojang/datafixers/Typed;)Lcom/mojang/datafixers/Typed; + ARG 1 typed + METHOD method_45314 replaceTypo (Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic; + ARG 1 option + METHOD method_45315 (Lcom/mojang/serialization/Dynamic;Ljava/lang/String;)Lcom/mojang/serialization/Dynamic; + ARG 1 value + METHOD method_45316 (Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic; + ARG 1 options diff --git a/mappings/net/minecraft/datafixer/fix/PersistentStateUuidFix.mapping b/mappings/net/minecraft/datafixer/fix/PersistentStateUuidFix.mapping index f04f0ff681..b3755606ea 100644 --- a/mappings/net/minecraft/datafixer/fix/PersistentStateUuidFix.mapping +++ b/mappings/net/minecraft/datafixer/fix/PersistentStateUuidFix.mapping @@ -1,3 +1,4 @@ CLASS net/minecraft/class_4964 net/minecraft/datafixer/fix/PersistentStateUuidFix + FIELD field_36330 LOGGER Lorg/slf4j/Logger; METHOD (Lcom/mojang/datafixers/schemas/Schema;)V ARG 1 outputSchema diff --git a/mappings/net/minecraft/datafixer/fix/PointOfInterestFix.mapping b/mappings/net/minecraft/datafixer/fix/PointOfInterestFix.mapping index d57b6fe576..cb7f4cab93 100644 --- a/mappings/net/minecraft/datafixer/fix/PointOfInterestFix.mapping +++ b/mappings/net/minecraft/datafixer/fix/PointOfInterestFix.mapping @@ -1,7 +1,7 @@ CLASS net/minecraft/class_4620 net/minecraft/datafixer/fix/PointOfInterestFix FIELD field_39402 name Ljava/lang/String; METHOD (Lcom/mojang/datafixers/schemas/Schema;Ljava/lang/String;)V - ARG 1 schema + ARG 1 outputSchema ARG 2 name METHOD method_23299 fixSections (Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic; ARG 1 dynamic diff --git a/mappings/net/minecraft/datafixer/fix/PointOfInterestRemoveFix.mapping b/mappings/net/minecraft/datafixer/fix/PointOfInterestRemoveFix.mapping index 5f4a834a7d..d4eae56f49 100644 --- a/mappings/net/minecraft/datafixer/fix/PointOfInterestRemoveFix.mapping +++ b/mappings/net/minecraft/datafixer/fix/PointOfInterestRemoveFix.mapping @@ -1,7 +1,7 @@ CLASS net/minecraft/class_7506 net/minecraft/datafixer/fix/PointOfInterestRemoveFix FIELD field_39405 keepPredicate Ljava/util/function/Predicate; METHOD (Lcom/mojang/datafixers/schemas/Schema;Ljava/lang/String;Ljava/util/function/Predicate;)V - ARG 1 schema + ARG 1 outputSchema ARG 2 name ARG 3 removePredicate METHOD method_44195 shouldKeepRecord (Lcom/mojang/serialization/Dynamic;)Z diff --git a/mappings/net/minecraft/datafixer/fix/PointOfInterestRenameFix.mapping b/mappings/net/minecraft/datafixer/fix/PointOfInterestRenameFix.mapping index 6908742323..5ad2d48a9b 100644 --- a/mappings/net/minecraft/datafixer/fix/PointOfInterestRenameFix.mapping +++ b/mappings/net/minecraft/datafixer/fix/PointOfInterestRenameFix.mapping @@ -1,6 +1,6 @@ CLASS net/minecraft/class_7507 net/minecraft/datafixer/fix/PointOfInterestRenameFix FIELD field_39406 renamer Ljava/util/function/Function; METHOD (Lcom/mojang/datafixers/schemas/Schema;Ljava/lang/String;Ljava/util/function/Function;)V - ARG 1 schema + ARG 1 outputSchema ARG 2 name ARG 3 renamer diff --git a/mappings/net/minecraft/datafixer/fix/PointOfInterestReorganizationFix.mapping b/mappings/net/minecraft/datafixer/fix/PointOfInterestReorganizationFix.mapping index b2173e96db..fb86c51672 100644 --- a/mappings/net/minecraft/datafixer/fix/PointOfInterestReorganizationFix.mapping +++ b/mappings/net/minecraft/datafixer/fix/PointOfInterestReorganizationFix.mapping @@ -1,2 +1,5 @@ CLASS net/minecraft/class_4285 net/minecraft/datafixer/fix/PointOfInterestReorganizationFix + METHOD (Lcom/mojang/datafixers/schemas/Schema;Z)V + ARG 1 outputSchema + ARG 2 changesType METHOD method_20340 reorganize (Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic; diff --git a/mappings/net/minecraft/datafixer/fix/ProtoChunkTickListFix.mapping b/mappings/net/minecraft/datafixer/fix/ProtoChunkTickListFix.mapping index c3d0769aed..f8750c51c3 100644 --- a/mappings/net/minecraft/datafixer/fix/ProtoChunkTickListFix.mapping +++ b/mappings/net/minecraft/datafixer/fix/ProtoChunkTickListFix.mapping @@ -1,7 +1,7 @@ CLASS net/minecraft/class_6740 net/minecraft/datafixer/fix/ProtoChunkTickListFix FIELD field_35447 ALWAYS_WATERLOGGED_BLOCK_IDS Lcom/google/common/collect/ImmutableSet; METHOD (Lcom/mojang/datafixers/schemas/Schema;)V - ARG 1 schema + ARG 1 outputSchema METHOD method_39252 getBlockIdToBeTicked (Lcom/mojang/serialization/Dynamic;)Ljava/lang/String; METHOD method_39254 fixToBeTicked (Lcom/mojang/serialization/Dynamic;Lit/unimi/dsi/fastutil/ints/Int2ObjectMap;BIILjava/lang/String;Ljava/util/function/Function;)Lcom/mojang/serialization/Dynamic; METHOD method_39259 getFluidBlockIdToBeTicked (Lcom/mojang/serialization/Dynamic;)Ljava/lang/String; diff --git a/mappings/net/minecraft/datafixer/fix/RandomSequenceSettingsFix.mapping b/mappings/net/minecraft/datafixer/fix/RandomSequenceSettingsFix.mapping new file mode 100644 index 0000000000..a79fb2b797 --- /dev/null +++ b/mappings/net/minecraft/datafixer/fix/RandomSequenceSettingsFix.mapping @@ -0,0 +1,9 @@ +CLASS net/minecraft/class_8626 net/minecraft/datafixer/fix/RandomSequenceSettingsFix + METHOD (Lcom/mojang/datafixers/schemas/Schema;)V + ARG 1 outputSchema + METHOD method_52479 (Lcom/mojang/datafixers/Typed;)Lcom/mojang/datafixers/Typed; + ARG 0 typed + METHOD method_52480 (Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic; + ARG 0 randomSequencesData + METHOD method_52481 (Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic; + ARG 0 data diff --git a/mappings/net/minecraft/datafixer/fix/RecipeFix.mapping b/mappings/net/minecraft/datafixer/fix/RecipeFix.mapping deleted file mode 100644 index 4d2dbcaabc..0000000000 --- a/mappings/net/minecraft/datafixer/fix/RecipeFix.mapping +++ /dev/null @@ -1,2 +0,0 @@ -CLASS net/minecraft/class_1206 net/minecraft/datafixer/fix/RecipeFix - FIELD field_5708 RECIPES Ljava/util/Map; diff --git a/mappings/net/minecraft/datafixer/fix/RecipeRenameFix.mapping b/mappings/net/minecraft/datafixer/fix/RecipeRenameFix.mapping deleted file mode 100644 index fd231a0a31..0000000000 --- a/mappings/net/minecraft/datafixer/fix/RecipeRenameFix.mapping +++ /dev/null @@ -1,8 +0,0 @@ -CLASS net/minecraft/class_4745 net/minecraft/datafixer/fix/RecipeRenameFix - FIELD field_21816 name Ljava/lang/String; - FIELD field_21817 renamer Ljava/util/function/Function; - METHOD (Lcom/mojang/datafixers/schemas/Schema;ZLjava/lang/String;Ljava/util/function/Function;)V - ARG 1 outputSchema - ARG 2 changesType - ARG 3 name - ARG 4 renamer diff --git a/mappings/net/minecraft/datafixer/fix/RecipeRenamingFix.mapping b/mappings/net/minecraft/datafixer/fix/RecipeRenamingFix.mapping deleted file mode 100644 index d467664bbc..0000000000 --- a/mappings/net/minecraft/datafixer/fix/RecipeRenamingFix.mapping +++ /dev/null @@ -1,2 +0,0 @@ -CLASS net/minecraft/class_1205 net/minecraft/datafixer/fix/RecipeRenamingFix - FIELD field_5707 RECIPES Ljava/util/Map; diff --git a/mappings/net/minecraft/datafixer/fix/RemoveFeatureTogglesFix.mapping b/mappings/net/minecraft/datafixer/fix/RemoveFeatureTogglesFix.mapping new file mode 100644 index 0000000000..ba7b67845b --- /dev/null +++ b/mappings/net/minecraft/datafixer/fix/RemoveFeatureTogglesFix.mapping @@ -0,0 +1,15 @@ +CLASS net/minecraft/class_8223 net/minecraft/datafixer/fix/RemoveFeatureTogglesFix + FIELD field_43176 name Ljava/lang/String; + FIELD field_43177 featureToggleIds Ljava/util/Set; + METHOD (Lcom/mojang/datafixers/schemas/Schema;Ljava/lang/String;Ljava/util/Set;)V + ARG 1 outputSchema + ARG 2 name + ARG 3 featureToggleIds + METHOD method_49767 removeFeatureToggles (Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic; + ARG 1 dynamic + METHOD method_49768 (Ljava/util/List;Lcom/mojang/serialization/Dynamic;Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic; + ARG 3 enabledFeatures + METHOD method_49769 (Ljava/util/List;Lcom/mojang/serialization/Dynamic;Ljava/util/stream/Stream;)Ljava/util/stream/Stream; + ARG 3 stream + METHOD method_49770 (Ljava/util/List;Lcom/mojang/serialization/Dynamic;Lcom/mojang/serialization/Dynamic;)Z + ARG 3 enabledFeature diff --git a/mappings/net/minecraft/datafixer/fix/RemoveFilteredBookTextFix.mapping b/mappings/net/minecraft/datafixer/fix/RemoveFilteredBookTextFix.mapping index b5f5a089e0..cf6c5cfd02 100644 --- a/mappings/net/minecraft/datafixer/fix/RemoveFilteredBookTextFix.mapping +++ b/mappings/net/minecraft/datafixer/fix/RemoveFilteredBookTextFix.mapping @@ -1,5 +1,5 @@ CLASS net/minecraft/class_7503 net/minecraft/datafixer/fix/RemoveFilteredBookTextFix METHOD (Lcom/mojang/datafixers/schemas/Schema;)V - ARG 1 schema + ARG 1 outputSchema METHOD method_44189 (Ljava/lang/String;)Z ARG 0 itemId diff --git a/mappings/net/minecraft/datafixer/fix/RemoveFilteredSignTextFix.mapping b/mappings/net/minecraft/datafixer/fix/RemoveFilteredSignTextFix.mapping index 960d379a18..cc738063eb 100644 --- a/mappings/net/minecraft/datafixer/fix/RemoveFilteredSignTextFix.mapping +++ b/mappings/net/minecraft/datafixer/fix/RemoveFilteredSignTextFix.mapping @@ -1,5 +1,5 @@ CLASS net/minecraft/class_7504 net/minecraft/datafixer/fix/RemoveFilteredSignTextFix METHOD (Lcom/mojang/datafixers/schemas/Schema;)V - ARG 1 schema + ARG 1 outputSchema METHOD method_44190 (Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic; ARG 0 blockEntity diff --git a/mappings/net/minecraft/datafixer/fix/RemoveGolemGossipFix.mapping b/mappings/net/minecraft/datafixer/fix/RemoveGolemGossipFix.mapping index fe96923b2f..0c119c1305 100644 --- a/mappings/net/minecraft/datafixer/fix/RemoveGolemGossipFix.mapping +++ b/mappings/net/minecraft/datafixer/fix/RemoveGolemGossipFix.mapping @@ -1,3 +1,6 @@ CLASS net/minecraft/class_5429 net/minecraft/datafixer/fix/RemoveGolemGossipFix + METHOD (Lcom/mojang/datafixers/schemas/Schema;Z)V + ARG 1 outputSchema + ARG 2 changesType METHOD method_30326 updateGossipsList (Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic; ARG 0 villagerData diff --git a/mappings/net/minecraft/datafixer/fix/RemovePoiValidTagFix.mapping b/mappings/net/minecraft/datafixer/fix/RemovePoiValidTagFix.mapping index b390a5ed67..4042c9fe3d 100644 --- a/mappings/net/minecraft/datafixer/fix/RemovePoiValidTagFix.mapping +++ b/mappings/net/minecraft/datafixer/fix/RemovePoiValidTagFix.mapping @@ -1,2 +1,5 @@ CLASS net/minecraft/class_4731 net/minecraft/datafixer/fix/RemovePoiValidTagFix + METHOD (Lcom/mojang/datafixers/schemas/Schema;Z)V + ARG 1 outputSchema + ARG 2 changesType METHOD method_24157 removeValidTag (Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic; diff --git a/mappings/net/minecraft/datafixer/fix/RenameBlockEntityFix.mapping b/mappings/net/minecraft/datafixer/fix/RenameBlockEntityFix.mapping new file mode 100644 index 0000000000..69169e4399 --- /dev/null +++ b/mappings/net/minecraft/datafixer/fix/RenameBlockEntityFix.mapping @@ -0,0 +1,15 @@ +CLASS net/minecraft/class_8220 net/minecraft/datafixer/fix/RenameBlockEntityFix + FIELD field_43174 name Ljava/lang/String; + FIELD field_43175 renamer Ljava/util/function/UnaryOperator; + METHOD (Lcom/mojang/datafixers/schemas/Schema;Ljava/lang/String;Ljava/util/function/UnaryOperator;)V + ARG 1 outputSchema + ARG 2 name + ARG 3 renamer + METHOD method_49756 create (Lcom/mojang/datafixers/schemas/Schema;Ljava/lang/String;Ljava/util/function/UnaryOperator;)Lcom/mojang/datafixers/DataFix; + ARG 0 outputSchema + ARG 1 name + ARG 2 renamer + METHOD method_49757 (Lcom/mojang/datafixers/util/Pair;)Lcom/mojang/datafixers/util/Pair; + ARG 1 pair + METHOD method_49758 (Lcom/mojang/serialization/DynamicOps;)Ljava/util/function/Function; + ARG 1 ops diff --git a/mappings/net/minecraft/datafixer/fix/RenameChunkStatusFix.mapping b/mappings/net/minecraft/datafixer/fix/RenameChunkStatusFix.mapping new file mode 100644 index 0000000000..ed28eb4039 --- /dev/null +++ b/mappings/net/minecraft/datafixer/fix/RenameChunkStatusFix.mapping @@ -0,0 +1,13 @@ +CLASS net/minecraft/class_8505 net/minecraft/datafixer/fix/RenameChunkStatusFix + FIELD field_44594 name Ljava/lang/String; + FIELD field_44595 mapper Ljava/util/function/UnaryOperator; + METHOD (Lcom/mojang/datafixers/schemas/Schema;Ljava/lang/String;Ljava/util/function/UnaryOperator;)V + ARG 1 outputSchema + ARG 2 name + ARG 3 mapper + METHOD method_51290 (Lcom/mojang/datafixers/Typed;)Lcom/mojang/datafixers/Typed; + ARG 1 typed + METHOD method_51291 updateStatus (Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic; + ARG 1 status + METHOD method_51292 (Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic; + ARG 1 chunk diff --git a/mappings/net/minecraft/datafixer/fix/RenameScoreboardDisplaySlotFix.mapping b/mappings/net/minecraft/datafixer/fix/RenameScoreboardDisplaySlotFix.mapping new file mode 100644 index 0000000000..0ea8eda624 --- /dev/null +++ b/mappings/net/minecraft/datafixer/fix/RenameScoreboardDisplaySlotFix.mapping @@ -0,0 +1,6 @@ +CLASS net/minecraft/class_8627 net/minecraft/datafixer/fix/RenameScoreboardDisplaySlotFix + FIELD field_45098 OLD_TO_NEW_SLOT_NAMES Ljava/util/Map; + METHOD (Lcom/mojang/datafixers/schemas/Schema;)V + ARG 1 outputSchema + METHOD method_52493 getUpdatedName (Ljava/lang/String;)Ljava/lang/String; + ARG 0 oldName diff --git a/mappings/net/minecraft/datafixer/fix/RenameVariantsFix.mapping b/mappings/net/minecraft/datafixer/fix/RenameVariantsFix.mapping index 3b7b36ea7f..7952956132 100644 --- a/mappings/net/minecraft/datafixer/fix/RenameVariantsFix.mapping +++ b/mappings/net/minecraft/datafixer/fix/RenameVariantsFix.mapping @@ -1,7 +1,7 @@ CLASS net/minecraft/class_7508 net/minecraft/datafixer/fix/RenameVariantsFix FIELD field_39407 oldToNewNames Ljava/util/Map; METHOD (Lcom/mojang/datafixers/schemas/Schema;Ljava/lang/String;Lcom/mojang/datafixers/DSL$TypeReference;Ljava/lang/String;Ljava/util/Map;)V - ARG 1 schema + ARG 1 outputSchema ARG 2 name ARG 3 type ARG 4 choiceName diff --git a/mappings/net/minecraft/datafixer/fix/SavedDataVillageCropFix.mapping b/mappings/net/minecraft/datafixer/fix/SavedDataVillageCropFix.mapping deleted file mode 100644 index c6856b6ec7..0000000000 --- a/mappings/net/minecraft/datafixer/fix/SavedDataVillageCropFix.mapping +++ /dev/null @@ -1,9 +0,0 @@ -CLASS net/minecraft/class_1209 net/minecraft/datafixer/fix/SavedDataVillageCropFix - METHOD method_5151 fixVillageChildren (Ljava/util/stream/Stream;)Ljava/util/stream/Stream; - ARG 0 villageChildren - METHOD method_5152 fix (Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic; - METHOD method_5154 fixSmallPlotCropIds (Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic; - METHOD method_5155 fixLargePlotCropIds (Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic; - METHOD method_5156 fixCropId (Lcom/mojang/serialization/Dynamic;Ljava/lang/String;)Lcom/mojang/serialization/Dynamic; - ARG 1 cropId - METHOD method_5157 fixVillageChildren (Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic; diff --git a/mappings/net/minecraft/datafixer/fix/StatsCounterFix.mapping b/mappings/net/minecraft/datafixer/fix/StatsCounterFix.mapping index 8cd05fce88..648cef17e7 100644 --- a/mappings/net/minecraft/datafixer/fix/StatsCounterFix.mapping +++ b/mappings/net/minecraft/datafixer/fix/StatsCounterFix.mapping @@ -2,10 +2,23 @@ CLASS net/minecraft/class_1214 net/minecraft/datafixer/fix/StatsCounterFix FIELD field_29907 OLD_MINE_BLOCK_ID Ljava/lang/String; FIELD field_29908 NEW_MINE_BLOCK_ID Ljava/lang/String; FIELD field_29909 CUSTOM Ljava/lang/String; + FIELD field_45099 SKIPPED_STATS Ljava/util/Set; FIELD field_5735 RENAMED_ENTITIES Ljava/util/Map; FIELD field_5736 RENAMED_ENTITY_STATS Ljava/util/Map; FIELD field_5737 RENAMED_GENERAL_STATS Ljava/util/Map; FIELD field_5738 RENAMED_ITEM_STATS Ljava/util/Map; - FIELD field_5739 SKIP Ljava/util/Set; + FIELD field_5739 REMOVED_STATS Ljava/util/Set; + METHOD (Lcom/mojang/datafixers/schemas/Schema;Z)V + ARG 1 outputSchema + ARG 2 changesType METHOD method_5172 getItem (Ljava/lang/String;)Ljava/lang/String; + ARG 0 id METHOD method_5173 getBlock (Ljava/lang/String;)Ljava/lang/String; + ARG 0 id + METHOD method_52496 makeFirstRoundRule ()Lcom/mojang/datafixers/TypeRewriteRule; + METHOD method_52500 rename (Ljava/lang/String;)Lnet/minecraft/class_1214$class_8628; + ARG 0 old + METHOD method_52501 makeSecondRoundRule ()Lcom/mojang/datafixers/TypeRewriteRule; + METHOD method_52505 (Ljava/lang/String;)Ljava/lang/String; + ARG 0 criteriaName + CLASS class_8628 Stat diff --git a/mappings/net/minecraft/datafixer/fix/StatusEffectDurationFix.mapping b/mappings/net/minecraft/datafixer/fix/StatusEffectDurationFix.mapping new file mode 100644 index 0000000000..85d3b552fb --- /dev/null +++ b/mappings/net/minecraft/datafixer/fix/StatusEffectDurationFix.mapping @@ -0,0 +1,7 @@ +CLASS net/minecraft/class_8079 net/minecraft/datafixer/fix/StatusEffectDurationFix + FIELD field_42105 POTION_ITEM_IDS Ljava/util/Set; + METHOD (Lcom/mojang/datafixers/schemas/Schema;)V + ARG 1 outputSchema + METHOD method_48551 fixPotionEffect (Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic; + METHOD method_48554 fixPotionEffects (Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic; + METHOD method_48555 fixEntityStatusEffects (Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic; diff --git a/mappings/net/minecraft/datafixer/fix/StatusEffectFix.mapping b/mappings/net/minecraft/datafixer/fix/StatusEffectFix.mapping new file mode 100644 index 0000000000..960fbc9d49 --- /dev/null +++ b/mappings/net/minecraft/datafixer/fix/StatusEffectFix.mapping @@ -0,0 +1,39 @@ +CLASS net/minecraft/class_8744 net/minecraft/datafixer/fix/StatusEffectFix + FIELD field_45725 OLD_TO_NEW_IDS Lit/unimi/dsi/fastutil/ints/Int2ObjectMap; + FIELD field_45726 POTION_ITEM_IDS Ljava/util/Set; + METHOD (Lcom/mojang/datafixers/schemas/Schema;)V + ARG 1 outputSchema + METHOD method_53078 makeBlockEntitiesRule ()Lcom/mojang/datafixers/TypeRewriteRule; + METHOD method_53082 fixEffect (Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic; + ARG 0 effectDynamic + METHOD method_53084 updateId (Lcom/mojang/serialization/Dynamic;Ljava/lang/String;)Ljava/util/Optional; + ARG 1 idKey + METHOD method_53085 renameKeyAndUpdateId (Lcom/mojang/serialization/Dynamic;Ljava/lang/String;Lcom/mojang/serialization/Dynamic;Ljava/lang/String;)Lcom/mojang/serialization/Dynamic; + ARG 1 oldKey + ARG 3 newKey + METHOD method_53086 renameKey (Lcom/mojang/serialization/Dynamic;Ljava/lang/String;Ljava/lang/String;)Lcom/mojang/serialization/Dynamic; + ARG 1 oldKey + ARG 2 newKey + METHOD method_53087 renameKey (Lcom/mojang/serialization/Dynamic;Ljava/lang/String;Ljava/lang/String;Ljava/util/Optional;)Lcom/mojang/serialization/Dynamic; + ARG 1 oldKey + ARG 2 newKey + ARG 3 value + METHOD method_53088 setOptionalValue (Lcom/mojang/serialization/Dynamic;Ljava/lang/String;Ljava/util/Optional;)Lcom/mojang/serialization/Dynamic; + ARG 1 key + ARG 2 value + METHOD method_53090 (Lit/unimi/dsi/fastutil/ints/Int2ObjectOpenHashMap;)V + ARG 0 idMap + METHOD method_53091 (Ljava/lang/Number;)Ljava/lang/String; + ARG 0 oldId + METHOD method_53093 makeEntitiesRule ()Lcom/mojang/datafixers/TypeRewriteRule; + METHOD method_53096 renameKeyAndUpdateId (Lcom/mojang/serialization/Dynamic;Ljava/lang/String;Ljava/lang/String;)Lcom/mojang/serialization/Dynamic; + ARG 1 oldKey + ARG 2 newKey + METHOD method_53098 makeItemStacksRule ()Lcom/mojang/datafixers/TypeRewriteRule; + METHOD method_53100 fixStewEffectsKey (Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic; + METHOD method_53101 fixEffectList (Lcom/mojang/serialization/Dynamic;Ljava/lang/String;Ljava/lang/String;)Lcom/mojang/serialization/Dynamic; + ARG 1 oldEffectListKey + ARG 2 newEffectListKey + METHOD method_53103 fixCustomPotionEffectsKey (Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic; + METHOD method_53104 fixEffectsKey (Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic; + METHOD method_53105 fixActiveEffectsKey (Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic; diff --git a/mappings/net/minecraft/datafixer/fix/StriderGravityFix.mapping b/mappings/net/minecraft/datafixer/fix/StriderGravityFix.mapping index ca3aadd24a..b7b1f6d9ad 100644 --- a/mappings/net/minecraft/datafixer/fix/StriderGravityFix.mapping +++ b/mappings/net/minecraft/datafixer/fix/StriderGravityFix.mapping @@ -1,2 +1,5 @@ CLASS net/minecraft/class_5256 net/minecraft/datafixer/fix/StriderGravityFix + METHOD (Lcom/mojang/datafixers/schemas/Schema;Z)V + ARG 1 outputSchema + ARG 2 changesType METHOD method_27789 updateNoGravityNbt (Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic; diff --git a/mappings/net/minecraft/datafixer/fix/StructureReferenceFix.mapping b/mappings/net/minecraft/datafixer/fix/StructureReferenceFix.mapping index 22b33f2545..2f019de928 100644 --- a/mappings/net/minecraft/datafixer/fix/StructureReferenceFix.mapping +++ b/mappings/net/minecraft/datafixer/fix/StructureReferenceFix.mapping @@ -1,2 +1,5 @@ CLASS net/minecraft/class_4695 net/minecraft/datafixer/fix/StructureReferenceFix + METHOD (Lcom/mojang/datafixers/schemas/Schema;Z)V + ARG 1 outputSchema + ARG 2 changesType METHOD method_23661 updateReferences (Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic; diff --git a/mappings/net/minecraft/datafixer/fix/StructureSettingsFlattenFix.mapping b/mappings/net/minecraft/datafixer/fix/StructureSettingsFlattenFix.mapping index 248895ca2e..3e7869bf4d 100644 --- a/mappings/net/minecraft/datafixer/fix/StructureSettingsFlattenFix.mapping +++ b/mappings/net/minecraft/datafixer/fix/StructureSettingsFlattenFix.mapping @@ -1,3 +1,3 @@ CLASS net/minecraft/class_6867 net/minecraft/datafixer/fix/StructureSettingsFlattenFix METHOD (Lcom/mojang/datafixers/schemas/Schema;)V - ARG 1 schema + ARG 1 outputSchema diff --git a/mappings/net/minecraft/datafixer/fix/StructuresToConfiguredStructuresFix.mapping b/mappings/net/minecraft/datafixer/fix/StructuresToConfiguredStructuresFix.mapping index 2a8ddfec2d..0c711af68f 100644 --- a/mappings/net/minecraft/datafixer/fix/StructuresToConfiguredStructuresFix.mapping +++ b/mappings/net/minecraft/datafixer/fix/StructuresToConfiguredStructuresFix.mapping @@ -1,7 +1,7 @@ CLASS net/minecraft/class_7046 net/minecraft/datafixer/fix/StructuresToConfiguredStructuresFix FIELD field_37050 STRUCTURE_TO_CONFIGURED_STRUCTURES_MAPPING Ljava/util/Map; METHOD (Lcom/mojang/datafixers/schemas/Schema;)V - ARG 1 schema + ARG 1 outputSchema CLASS class_7047 Mapping METHOD method_41027 create (Ljava/lang/String;)Lnet/minecraft/class_7046$class_7047; ARG 0 mapping diff --git a/mappings/net/minecraft/datafixer/fix/TeamDisplayNameFix.mapping b/mappings/net/minecraft/datafixer/fix/TeamDisplayNameFix.mapping index d5f2f09e9a..5e5585ac38 100644 --- a/mappings/net/minecraft/datafixer/fix/TeamDisplayNameFix.mapping +++ b/mappings/net/minecraft/datafixer/fix/TeamDisplayNameFix.mapping @@ -1 +1,4 @@ CLASS net/minecraft/class_1217 net/minecraft/datafixer/fix/TeamDisplayNameFix + METHOD (Lcom/mojang/datafixers/schemas/Schema;Z)V + ARG 1 outputSchema + ARG 2 changesType diff --git a/mappings/net/minecraft/datafixer/fix/TicksInWrongChunkFix.mapping b/mappings/net/minecraft/datafixer/fix/TicksInWrongChunkFix.mapping index 23c670ae1f..d36172d991 100644 --- a/mappings/net/minecraft/datafixer/fix/TicksInWrongChunkFix.mapping +++ b/mappings/net/minecraft/datafixer/fix/TicksInWrongChunkFix.mapping @@ -1,3 +1,11 @@ CLASS net/minecraft/class_6909 net/minecraft/datafixer/fix/TicksInWrongChunkFix METHOD (Lcom/mojang/datafixers/schemas/Schema;)V - ARG 1 schema + ARG 1 outputSchema + METHOD method_40439 putNeighborTicks (Lcom/mojang/serialization/Dynamic;IILjava/util/Optional;Ljava/lang/String;)Lcom/mojang/serialization/Dynamic; + ARG 0 chunkTag + ARG 1 chunkX + ARG 2 chunkZ + ARG 3 fluidTicks + ARG 4 upgradeDataKey + METHOD method_40440 (Ljava/util/Optional;Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic; + ARG 1 chunkTag diff --git a/mappings/net/minecraft/datafixer/fix/UntaggedSpawnerFix.mapping b/mappings/net/minecraft/datafixer/fix/UntaggedSpawnerFix.mapping index 15068635bf..b911f37e83 100644 --- a/mappings/net/minecraft/datafixer/fix/UntaggedSpawnerFix.mapping +++ b/mappings/net/minecraft/datafixer/fix/UntaggedSpawnerFix.mapping @@ -1,4 +1,7 @@ CLASS net/minecraft/class_6503 net/minecraft/datafixer/fix/UntaggedSpawnerFix METHOD (Lcom/mojang/datafixers/schemas/Schema;)V - ARG 1 schema + ARG 1 outputSchema + METHOD method_37974 (Lcom/mojang/datafixers/types/Type;Lcom/mojang/datafixers/Typed;)Lcom/mojang/datafixers/Typed; + ARG 1 spawnDataType METHOD method_37976 fixSpawner (Lcom/mojang/datafixers/types/Type;Lcom/mojang/datafixers/Typed;)Lcom/mojang/datafixers/Typed; + ARG 1 spawnPotentialsType diff --git a/mappings/net/minecraft/datafixer/fix/UpdateSignTextFormatFix.mapping b/mappings/net/minecraft/datafixer/fix/UpdateSignTextFormatFix.mapping new file mode 100644 index 0000000000..fe9f22afa3 --- /dev/null +++ b/mappings/net/minecraft/datafixer/fix/UpdateSignTextFormatFix.mapping @@ -0,0 +1,24 @@ +CLASS net/minecraft/class_8221 net/minecraft/datafixer/fix/UpdateSignTextFormatFix + FIELD field_45085 FILTERED_CORRECT Ljava/lang/String; + FIELD field_45086 DEFAULT_COLOR Ljava/lang/String; + FIELD field_45087 EMPTY_TEXT_JSON Ljava/lang/String; + METHOD (Lcom/mojang/datafixers/schemas/Schema;Ljava/lang/String;Ljava/lang/String;)V + ARG 1 outputSchema + ARG 2 name + ARG 3 blockEntityId + METHOD method_49760 updateSignTextFormat (Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic; + ARG 0 signData + METHOD method_52469 streamKeys (Lcom/mojang/serialization/Dynamic;Ljava/lang/String;)Ljava/util/stream/Stream; + ARG 0 signData + ARG 1 prefix + METHOD method_52470 (Lcom/mojang/serialization/Dynamic;Ljava/util/Optional;)Lcom/mojang/serialization/Dynamic; + ARG 1 text + METHOD method_52471 (Ljava/util/List;Ljava/util/Optional;J)Lcom/mojang/serialization/Dynamic; + ARG 1 message + ARG 2 index + METHOD method_52472 updateFront (Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic; + ARG 0 signData + METHOD method_52473 updateBack (Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic; + ARG 0 signData + METHOD method_52474 emptySignData (Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic; + ARG 0 signData diff --git a/mappings/net/minecraft/datafixer/fix/VillagerFollowRangeFix.mapping b/mappings/net/minecraft/datafixer/fix/VillagerFollowRangeFix.mapping index 35de7e32ad..ed1da8c8b1 100644 --- a/mappings/net/minecraft/datafixer/fix/VillagerFollowRangeFix.mapping +++ b/mappings/net/minecraft/datafixer/fix/VillagerFollowRangeFix.mapping @@ -1,4 +1,6 @@ CLASS net/minecraft/class_5273 net/minecraft/datafixer/fix/VillagerFollowRangeFix FIELD field_29912 OLD_RANGE D FIELD field_29913 NEW_RANGE D + METHOD (Lcom/mojang/datafixers/schemas/Schema;)V + ARG 1 outputSchema METHOD method_27914 fix (Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic; diff --git a/mappings/net/minecraft/datafixer/fix/VillagerTradeFix.mapping b/mappings/net/minecraft/datafixer/fix/VillagerTradeFix.mapping index 2f6efeebea..8cd302ba83 100644 --- a/mappings/net/minecraft/datafixer/fix/VillagerTradeFix.mapping +++ b/mappings/net/minecraft/datafixer/fix/VillagerTradeFix.mapping @@ -1,2 +1,5 @@ CLASS net/minecraft/class_1219 net/minecraft/datafixer/fix/VillagerTradeFix + METHOD (Lcom/mojang/datafixers/schemas/Schema;Z)V + ARG 1 outputSchema + ARG 2 changesType METHOD method_5187 fixPumpkinTrade (Lcom/mojang/datafixers/OpticFinder;Lcom/mojang/datafixers/Typed;)Lcom/mojang/datafixers/Typed; diff --git a/mappings/net/minecraft/datafixer/fix/VillagerXpRebuildFix.mapping b/mappings/net/minecraft/datafixer/fix/VillagerXpRebuildFix.mapping index 53e98fcd16..3530ceb092 100644 --- a/mappings/net/minecraft/datafixer/fix/VillagerXpRebuildFix.mapping +++ b/mappings/net/minecraft/datafixer/fix/VillagerXpRebuildFix.mapping @@ -1,6 +1,11 @@ CLASS net/minecraft/class_4300 net/minecraft/datafixer/fix/VillagerXpRebuildFix FIELD field_19285 LEVEL_TO_XP [I + METHOD (Lcom/mojang/datafixers/schemas/Schema;Z)V + ARG 1 outputSchema + ARG 2 changesType METHOD method_20482 levelToXp (I)I ARG 0 level METHOD method_20487 fixLevel (Lcom/mojang/datafixers/Typed;I)Lcom/mojang/datafixers/Typed; + ARG 1 level METHOD method_20490 fixXp (Lcom/mojang/datafixers/Typed;I)Lcom/mojang/datafixers/Typed; + ARG 1 level diff --git a/mappings/net/minecraft/datafixer/fix/WallPropertyFix.mapping b/mappings/net/minecraft/datafixer/fix/WallPropertyFix.mapping index 7e4e99a261..43e0aa41fc 100644 --- a/mappings/net/minecraft/datafixer/fix/WallPropertyFix.mapping +++ b/mappings/net/minecraft/datafixer/fix/WallPropertyFix.mapping @@ -1,5 +1,8 @@ CLASS net/minecraft/class_4754 net/minecraft/datafixer/fix/WallPropertyFix FIELD field_21960 TARGET_BLOCK_IDS Ljava/util/Set; + METHOD (Lcom/mojang/datafixers/schemas/Schema;Z)V + ARG 1 outputSchema + ARG 2 changesType METHOD method_24323 updateWallProperties (Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic; METHOD method_24324 updateWallValueReference (Lcom/mojang/serialization/Dynamic;Ljava/lang/String;)Lcom/mojang/serialization/Dynamic; METHOD method_24326 booleanToWallType (Ljava/lang/String;)Ljava/lang/String; diff --git a/mappings/net/minecraft/datafixer/fix/WeaponsmithChestLootTableFix.mapping b/mappings/net/minecraft/datafixer/fix/WeaponsmithChestLootTableFix.mapping index c42330a94f..8c08fdc6e7 100644 --- a/mappings/net/minecraft/datafixer/fix/WeaponsmithChestLootTableFix.mapping +++ b/mappings/net/minecraft/datafixer/fix/WeaponsmithChestLootTableFix.mapping @@ -1,3 +1,6 @@ CLASS net/minecraft/class_6858 net/minecraft/datafixer/fix/WeaponsmithChestLootTableFix + METHOD (Lcom/mojang/datafixers/schemas/Schema;Z)V + ARG 1 outputSchema + ARG 2 changesType METHOD method_40070 (Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic; ARG 0 dynamic diff --git a/mappings/net/minecraft/datafixer/fix/WorldGenSettingsDisallowOldCustomWorldsFix.mapping b/mappings/net/minecraft/datafixer/fix/WorldGenSettingsDisallowOldCustomWorldsFix.mapping index 91ed09b56d..27b5d829c6 100644 --- a/mappings/net/minecraft/datafixer/fix/WorldGenSettingsDisallowOldCustomWorldsFix.mapping +++ b/mappings/net/minecraft/datafixer/fix/WorldGenSettingsDisallowOldCustomWorldsFix.mapping @@ -1,3 +1,3 @@ CLASS net/minecraft/class_6638 net/minecraft/datafixer/fix/WorldGenSettingsDisallowOldCustomWorldsFix METHOD (Lcom/mojang/datafixers/schemas/Schema;)V - ARG 1 schema + ARG 1 outputSchema diff --git a/mappings/net/minecraft/datafixer/fix/WorldGenSettingsHeightAndBiomeFix.mapping b/mappings/net/minecraft/datafixer/fix/WorldGenSettingsHeightAndBiomeFix.mapping index d41a32000c..4fa68a13d5 100644 --- a/mappings/net/minecraft/datafixer/fix/WorldGenSettingsHeightAndBiomeFix.mapping +++ b/mappings/net/minecraft/datafixer/fix/WorldGenSettingsHeightAndBiomeFix.mapping @@ -2,5 +2,5 @@ CLASS net/minecraft/class_6639 net/minecraft/datafixer/fix/WorldGenSettingsHeigh FIELD field_35030 HAS_INCREASED_HEIGHT_ALREADY_KEY Ljava/lang/String; FIELD field_35031 NAME Ljava/lang/String; METHOD (Lcom/mojang/datafixers/schemas/Schema;)V - ARG 1 schema + ARG 1 outputSchema METHOD method_38828 fillWithAir (Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic; diff --git a/mappings/net/minecraft/datafixer/fix/WorldUuidFix.mapping b/mappings/net/minecraft/datafixer/fix/WorldUuidFix.mapping index 4ea3b555c3..a6a41382fb 100644 --- a/mappings/net/minecraft/datafixer/fix/WorldUuidFix.mapping +++ b/mappings/net/minecraft/datafixer/fix/WorldUuidFix.mapping @@ -1,4 +1,5 @@ CLASS net/minecraft/class_4962 net/minecraft/datafixer/fix/WorldUuidFix + FIELD field_36329 LOGGER Lorg/slf4j/Logger; METHOD (Lcom/mojang/datafixers/schemas/Schema;)V ARG 1 outputSchema METHOD method_26057 fixWanderingTraderId (Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic; diff --git a/mappings/net/minecraft/datafixer/fix/ZombieVillagerXpRebuildFix.mapping b/mappings/net/minecraft/datafixer/fix/ZombieVillagerXpRebuildFix.mapping index 4a48a8e5a2..a6fdfe3b59 100644 --- a/mappings/net/minecraft/datafixer/fix/ZombieVillagerXpRebuildFix.mapping +++ b/mappings/net/minecraft/datafixer/fix/ZombieVillagerXpRebuildFix.mapping @@ -1 +1,4 @@ CLASS net/minecraft/class_4301 net/minecraft/datafixer/fix/ZombieVillagerXpRebuildFix + METHOD (Lcom/mojang/datafixers/schemas/Schema;Z)V + ARG 1 outputSchema + ARG 2 changesType diff --git a/mappings/net/minecraft/datafixer/mapping/FlatteningBiomeMapping.mapping b/mappings/net/minecraft/datafixer/mapping/FlatteningBiomeMapping.mapping new file mode 100644 index 0000000000..1a22927a9f --- /dev/null +++ b/mappings/net/minecraft/datafixer/mapping/FlatteningBiomeMapping.mapping @@ -0,0 +1,2 @@ +CLASS net/minecraft/class_3561 net/minecraft/datafixer/mapping/FlatteningBiomeMapping + FIELD field_15810 RENAMED_BIOMES Ljava/util/Map; diff --git a/mappings/net/minecraft/datafixer/mapping/FlatteningRecipeMapping.mapping b/mappings/net/minecraft/datafixer/mapping/FlatteningRecipeMapping.mapping new file mode 100644 index 0000000000..27f8b2b3f9 --- /dev/null +++ b/mappings/net/minecraft/datafixer/mapping/FlatteningRecipeMapping.mapping @@ -0,0 +1,2 @@ +CLASS net/minecraft/class_1206 net/minecraft/datafixer/mapping/FlatteningRecipeMapping + FIELD field_5708 RECIPES Ljava/util/Map; diff --git a/mappings/net/minecraft/datafixer/mapping/WoodRecipeMapping.mapping b/mappings/net/minecraft/datafixer/mapping/WoodRecipeMapping.mapping new file mode 100644 index 0000000000..27d667e487 --- /dev/null +++ b/mappings/net/minecraft/datafixer/mapping/WoodRecipeMapping.mapping @@ -0,0 +1,2 @@ +CLASS net/minecraft/class_1205 net/minecraft/datafixer/mapping/WoodRecipeMapping + FIELD field_5707 RECIPES Ljava/util/Map; diff --git a/mappings/net/minecraft/datafixer/schema/IdentifierNormalizingSchema.mapping b/mappings/net/minecraft/datafixer/schema/IdentifierNormalizingSchema.mapping index 2c6d4a430b..854ad77fde 100644 --- a/mappings/net/minecraft/datafixer/schema/IdentifierNormalizingSchema.mapping +++ b/mappings/net/minecraft/datafixer/schema/IdentifierNormalizingSchema.mapping @@ -4,6 +4,16 @@ CLASS net/minecraft/class_1220 net/minecraft/datafixer/schema/IdentifierNormaliz METHOD (ILcom/mojang/datafixers/schemas/Schema;)V ARG 1 versionKey ARG 2 parent + METHOD getChoiceType (Lcom/mojang/datafixers/DSL$TypeReference;Ljava/lang/String;)Lcom/mojang/datafixers/types/Type; + ARG 1 type + ARG 2 choiceName METHOD method_28295 getIdentifierType ()Lcom/mojang/datafixers/types/Type; METHOD method_5193 normalize (Ljava/lang/String;)Ljava/lang/String; ARG 0 id + CLASS 1 + METHOD read (Lcom/mojang/serialization/DynamicOps;Ljava/lang/Object;)Lcom/mojang/serialization/DataResult; + ARG 1 ops + ARG 2 input + METHOD write (Lcom/mojang/serialization/DynamicOps;Ljava/lang/Object;)Ljava/lang/Object; + ARG 1 ops + ARG 2 value diff --git a/mappings/net/minecraft/datafixer/schema/Schema100.mapping b/mappings/net/minecraft/datafixer/schema/Schema100.mapping index bd731de126..70633a683f 100644 --- a/mappings/net/minecraft/datafixer/schema/Schema100.mapping +++ b/mappings/net/minecraft/datafixer/schema/Schema100.mapping @@ -3,8 +3,20 @@ CLASS net/minecraft/class_1222 net/minecraft/datafixer/schema/Schema100 ARG 1 versionKey ARG 2 parent METHOD method_5195 targetEntityItems (Lcom/mojang/datafixers/schemas/Schema;Ljava/util/Map;Ljava/lang/String;)V + ARG 0 schema + ARG 1 map ARG 2 entityId METHOD method_5196 targetItems (Lcom/mojang/datafixers/schemas/Schema;)Lcom/mojang/datafixers/types/templates/TypeTemplate; + ARG 0 schema + METHOD method_5197 (Lcom/mojang/datafixers/schemas/Schema;Ljava/lang/String;)Lcom/mojang/datafixers/types/templates/TypeTemplate; + ARG 1 name + METHOD method_5198 (Lcom/mojang/datafixers/schemas/Schema;Ljava/lang/String;)Lcom/mojang/datafixers/types/templates/TypeTemplate; + ARG 1 name + METHOD method_5199 (Lcom/mojang/datafixers/schemas/Schema;Ljava/lang/String;)Lcom/mojang/datafixers/types/templates/TypeTemplate; + ARG 1 name + METHOD registerEntities (Lcom/mojang/datafixers/schemas/Schema;)Ljava/util/Map; + ARG 1 schema METHOD registerTypes (Lcom/mojang/datafixers/schemas/Schema;Ljava/util/Map;Ljava/util/Map;)V + ARG 1 schema ARG 2 entityTypes ARG 3 blockEntityTypes diff --git a/mappings/net/minecraft/datafixer/schema/Schema102.mapping b/mappings/net/minecraft/datafixer/schema/Schema102.mapping index 11b627bde9..0d52213efe 100644 --- a/mappings/net/minecraft/datafixer/schema/Schema102.mapping +++ b/mappings/net/minecraft/datafixer/schema/Schema102.mapping @@ -3,5 +3,6 @@ CLASS net/minecraft/class_1221 net/minecraft/datafixer/schema/Schema102 ARG 1 versionKey ARG 2 parent METHOD registerTypes (Lcom/mojang/datafixers/schemas/Schema;Ljava/util/Map;Ljava/util/Map;)V + ARG 1 schema ARG 2 entityTypes ARG 3 blockEntityTypes diff --git a/mappings/net/minecraft/datafixer/schema/Schema1022.mapping b/mappings/net/minecraft/datafixer/schema/Schema1022.mapping index d89c653571..3ee1161233 100644 --- a/mappings/net/minecraft/datafixer/schema/Schema1022.mapping +++ b/mappings/net/minecraft/datafixer/schema/Schema1022.mapping @@ -3,5 +3,6 @@ CLASS net/minecraft/class_1224 net/minecraft/datafixer/schema/Schema1022 ARG 1 versionKey ARG 2 parent METHOD registerTypes (Lcom/mojang/datafixers/schemas/Schema;Ljava/util/Map;Ljava/util/Map;)V + ARG 1 schema ARG 2 entityTypes ARG 3 blockEntityTypes diff --git a/mappings/net/minecraft/datafixer/schema/Schema106.mapping b/mappings/net/minecraft/datafixer/schema/Schema106.mapping index e151b9554f..2e5f48f107 100644 --- a/mappings/net/minecraft/datafixer/schema/Schema106.mapping +++ b/mappings/net/minecraft/datafixer/schema/Schema106.mapping @@ -3,5 +3,6 @@ CLASS net/minecraft/class_1223 net/minecraft/datafixer/schema/Schema106 ARG 1 versionKey ARG 2 parent METHOD registerTypes (Lcom/mojang/datafixers/schemas/Schema;Ljava/util/Map;Ljava/util/Map;)V + ARG 1 schema ARG 2 entityTypes ARG 3 blockEntityTypes diff --git a/mappings/net/minecraft/datafixer/schema/Schema107.mapping b/mappings/net/minecraft/datafixer/schema/Schema107.mapping index a5bde9a34d..2e55dd6b96 100644 --- a/mappings/net/minecraft/datafixer/schema/Schema107.mapping +++ b/mappings/net/minecraft/datafixer/schema/Schema107.mapping @@ -2,3 +2,5 @@ CLASS net/minecraft/class_1226 net/minecraft/datafixer/schema/Schema107 METHOD (ILcom/mojang/datafixers/schemas/Schema;)V ARG 1 versionKey ARG 2 parent + METHOD registerEntities (Lcom/mojang/datafixers/schemas/Schema;)Ljava/util/Map; + ARG 1 schema diff --git a/mappings/net/minecraft/datafixer/schema/Schema1125.mapping b/mappings/net/minecraft/datafixer/schema/Schema1125.mapping index 7ecc50facd..e04d0585ba 100644 --- a/mappings/net/minecraft/datafixer/schema/Schema1125.mapping +++ b/mappings/net/minecraft/datafixer/schema/Schema1125.mapping @@ -1,4 +1,7 @@ CLASS net/minecraft/class_1225 net/minecraft/datafixer/schema/Schema1125 + METHOD registerBlockEntities (Lcom/mojang/datafixers/schemas/Schema;)Ljava/util/Map; + ARG 1 schema METHOD registerTypes (Lcom/mojang/datafixers/schemas/Schema;Ljava/util/Map;Ljava/util/Map;)V + ARG 1 schema ARG 2 entityTypes ARG 3 blockEntityTypes diff --git a/mappings/net/minecraft/datafixer/schema/Schema135.mapping b/mappings/net/minecraft/datafixer/schema/Schema135.mapping index 73cbc7bcca..de1ed2b3ae 100644 --- a/mappings/net/minecraft/datafixer/schema/Schema135.mapping +++ b/mappings/net/minecraft/datafixer/schema/Schema135.mapping @@ -3,5 +3,6 @@ CLASS net/minecraft/class_1228 net/minecraft/datafixer/schema/Schema135 ARG 1 versionKey ARG 2 parent METHOD registerTypes (Lcom/mojang/datafixers/schemas/Schema;Ljava/util/Map;Ljava/util/Map;)V + ARG 1 schema ARG 2 entityTypes ARG 3 blockEntityTypes diff --git a/mappings/net/minecraft/datafixer/schema/Schema143.mapping b/mappings/net/minecraft/datafixer/schema/Schema143.mapping index 895abe82f0..0567703916 100644 --- a/mappings/net/minecraft/datafixer/schema/Schema143.mapping +++ b/mappings/net/minecraft/datafixer/schema/Schema143.mapping @@ -2,3 +2,5 @@ CLASS net/minecraft/class_1227 net/minecraft/datafixer/schema/Schema143 METHOD (ILcom/mojang/datafixers/schemas/Schema;)V ARG 1 versionKey ARG 2 parent + METHOD registerEntities (Lcom/mojang/datafixers/schemas/Schema;)Ljava/util/Map; + ARG 1 schema diff --git a/mappings/net/minecraft/datafixer/schema/Schema1451.mapping b/mappings/net/minecraft/datafixer/schema/Schema1451.mapping index f847809873..1ba390ec42 100644 --- a/mappings/net/minecraft/datafixer/schema/Schema1451.mapping +++ b/mappings/net/minecraft/datafixer/schema/Schema1451.mapping @@ -1 +1,3 @@ CLASS net/minecraft/class_1230 net/minecraft/datafixer/schema/Schema1451 + METHOD registerBlockEntities (Lcom/mojang/datafixers/schemas/Schema;)Ljava/util/Map; + ARG 1 schema diff --git a/mappings/net/minecraft/datafixer/schema/Schema1451v1.mapping b/mappings/net/minecraft/datafixer/schema/Schema1451v1.mapping index 77ab3ba809..6549cd5904 100644 --- a/mappings/net/minecraft/datafixer/schema/Schema1451v1.mapping +++ b/mappings/net/minecraft/datafixer/schema/Schema1451v1.mapping @@ -1,4 +1,5 @@ CLASS net/minecraft/class_1229 net/minecraft/datafixer/schema/Schema1451v1 METHOD registerTypes (Lcom/mojang/datafixers/schemas/Schema;Ljava/util/Map;Ljava/util/Map;)V + ARG 1 schema ARG 2 entityTypes ARG 3 blockEntityTypes diff --git a/mappings/net/minecraft/datafixer/schema/Schema1451v2.mapping b/mappings/net/minecraft/datafixer/schema/Schema1451v2.mapping index 5e718bdea1..4bff2fceda 100644 --- a/mappings/net/minecraft/datafixer/schema/Schema1451v2.mapping +++ b/mappings/net/minecraft/datafixer/schema/Schema1451v2.mapping @@ -1 +1,5 @@ CLASS net/minecraft/class_1232 net/minecraft/datafixer/schema/Schema1451v2 + METHOD method_5225 (Lcom/mojang/datafixers/schemas/Schema;Ljava/lang/String;)Lcom/mojang/datafixers/types/templates/TypeTemplate; + ARG 1 name + METHOD registerBlockEntities (Lcom/mojang/datafixers/schemas/Schema;)Ljava/util/Map; + ARG 1 schema diff --git a/mappings/net/minecraft/datafixer/schema/Schema1451v3.mapping b/mappings/net/minecraft/datafixer/schema/Schema1451v3.mapping index ccf7d4b65e..3b9c173295 100644 --- a/mappings/net/minecraft/datafixer/schema/Schema1451v3.mapping +++ b/mappings/net/minecraft/datafixer/schema/Schema1451v3.mapping @@ -1 +1,5 @@ CLASS net/minecraft/class_1231 net/minecraft/datafixer/schema/Schema1451v3 + METHOD method_5217 (Lcom/mojang/datafixers/schemas/Schema;Ljava/lang/String;)Lcom/mojang/datafixers/types/templates/TypeTemplate; + ARG 1 name + METHOD registerEntities (Lcom/mojang/datafixers/schemas/Schema;)Ljava/util/Map; + ARG 1 schema diff --git a/mappings/net/minecraft/datafixer/schema/Schema1451v4.mapping b/mappings/net/minecraft/datafixer/schema/Schema1451v4.mapping index 65a47ec54f..6e0bf22d01 100644 --- a/mappings/net/minecraft/datafixer/schema/Schema1451v4.mapping +++ b/mappings/net/minecraft/datafixer/schema/Schema1451v4.mapping @@ -1,4 +1,5 @@ CLASS net/minecraft/class_1234 net/minecraft/datafixer/schema/Schema1451v4 METHOD registerTypes (Lcom/mojang/datafixers/schemas/Schema;Ljava/util/Map;Ljava/util/Map;)V + ARG 1 schema ARG 2 entityTypes ARG 3 blockEntityTypes diff --git a/mappings/net/minecraft/datafixer/schema/Schema1451v5.mapping b/mappings/net/minecraft/datafixer/schema/Schema1451v5.mapping index a84a87b477..a258577e4b 100644 --- a/mappings/net/minecraft/datafixer/schema/Schema1451v5.mapping +++ b/mappings/net/minecraft/datafixer/schema/Schema1451v5.mapping @@ -1 +1,3 @@ CLASS net/minecraft/class_1233 net/minecraft/datafixer/schema/Schema1451v5 + METHOD registerBlockEntities (Lcom/mojang/datafixers/schemas/Schema;)Ljava/util/Map; + ARG 1 schema diff --git a/mappings/net/minecraft/datafixer/schema/Schema1451v6.mapping b/mappings/net/minecraft/datafixer/schema/Schema1451v6.mapping index 4c1140fdd0..edb1ab1339 100644 --- a/mappings/net/minecraft/datafixer/schema/Schema1451v6.mapping +++ b/mappings/net/minecraft/datafixer/schema/Schema1451v6.mapping @@ -1,4 +1,24 @@ CLASS net/minecraft/class_1236 net/minecraft/datafixer/schema/Schema1451v6 + FIELD field_34013 SPECIAL_TYPE Ljava/lang/String; + METHOD method_37389 (Lcom/mojang/datafixers/schemas/Schema;)Ljava/util/Map; + ARG 0 schema + METHOD method_52506 toDotSeparated (Ljava/lang/String;)Ljava/lang/String; + ARG 0 id METHOD registerTypes (Lcom/mojang/datafixers/schemas/Schema;Ljava/util/Map;Ljava/util/Map;)V + ARG 1 schema ARG 2 entityTypes ARG 3 blockEntityTypes + CLASS 1 + METHOD apply (Lcom/mojang/serialization/DynamicOps;Ljava/lang/Object;)Ljava/lang/Object; + ARG 1 ops + ARG 2 value + METHOD method_37396 (Lcom/mojang/serialization/Dynamic;Lcom/mojang/datafixers/util/Pair;)Lcom/mojang/serialization/Dynamic; + ARG 1 pair + METHOD method_37397 (Ljava/lang/String;)Lcom/mojang/datafixers/util/Pair; + ARG 0 criteriaName + CLASS 2 + METHOD apply (Lcom/mojang/serialization/DynamicOps;Ljava/lang/Object;)Ljava/lang/Object; + ARG 1 ops + ARG 2 value + METHOD method_37398 (Lcom/mojang/serialization/Dynamic;Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic; + ARG 1 criteriaName diff --git a/mappings/net/minecraft/datafixer/schema/Schema1451v7.mapping b/mappings/net/minecraft/datafixer/schema/Schema1451v7.mapping deleted file mode 100644 index b3d862c794..0000000000 --- a/mappings/net/minecraft/datafixer/schema/Schema1451v7.mapping +++ /dev/null @@ -1,4 +0,0 @@ -CLASS net/minecraft/class_1235 net/minecraft/datafixer/schema/Schema1451v7 - METHOD registerTypes (Lcom/mojang/datafixers/schemas/Schema;Ljava/util/Map;Ljava/util/Map;)V - ARG 2 entityTypes - ARG 3 blockEntityTypes diff --git a/mappings/net/minecraft/datafixer/schema/Schema1460.mapping b/mappings/net/minecraft/datafixer/schema/Schema1460.mapping index 33688ce589..ba2e978aa6 100644 --- a/mappings/net/minecraft/datafixer/schema/Schema1460.mapping +++ b/mappings/net/minecraft/datafixer/schema/Schema1460.mapping @@ -1,4 +1,67 @@ CLASS net/minecraft/class_1238 net/minecraft/datafixer/schema/Schema1460 + METHOD method_5232 targetEntityItems (Lcom/mojang/datafixers/schemas/Schema;Ljava/util/Map;Ljava/lang/String;)V + ARG 0 schema + ARG 1 map + ARG 2 entityId + METHOD method_5233 (Lcom/mojang/datafixers/schemas/Schema;Ljava/lang/String;)Lcom/mojang/datafixers/types/templates/TypeTemplate; + ARG 1 name + METHOD method_5234 (Lcom/mojang/datafixers/schemas/Schema;Ljava/lang/String;)Lcom/mojang/datafixers/types/templates/TypeTemplate; + ARG 1 name + METHOD method_5238 (Lcom/mojang/datafixers/schemas/Schema;Ljava/lang/String;)Lcom/mojang/datafixers/types/templates/TypeTemplate; + ARG 1 name + METHOD method_5241 (Lcom/mojang/datafixers/schemas/Schema;Ljava/lang/String;)Lcom/mojang/datafixers/types/templates/TypeTemplate; + ARG 1 name + METHOD method_5244 (Lcom/mojang/datafixers/schemas/Schema;Ljava/lang/String;)Lcom/mojang/datafixers/types/templates/TypeTemplate; + ARG 1 name + METHOD method_5245 (Lcom/mojang/datafixers/schemas/Schema;Ljava/lang/String;)Lcom/mojang/datafixers/types/templates/TypeTemplate; + ARG 1 name + METHOD method_5246 (Lcom/mojang/datafixers/schemas/Schema;Ljava/lang/String;)Lcom/mojang/datafixers/types/templates/TypeTemplate; + ARG 1 name + METHOD method_5247 (Lcom/mojang/datafixers/schemas/Schema;Ljava/lang/String;)Lcom/mojang/datafixers/types/templates/TypeTemplate; + ARG 1 name + METHOD method_5249 (Lcom/mojang/datafixers/schemas/Schema;Ljava/lang/String;)Lcom/mojang/datafixers/types/templates/TypeTemplate; + ARG 1 name + METHOD method_5250 (Lcom/mojang/datafixers/schemas/Schema;Ljava/lang/String;)Lcom/mojang/datafixers/types/templates/TypeTemplate; + ARG 1 name + METHOD method_5252 (Lcom/mojang/datafixers/schemas/Schema;Ljava/lang/String;)Lcom/mojang/datafixers/types/templates/TypeTemplate; + ARG 1 name + METHOD method_5255 (Lcom/mojang/datafixers/schemas/Schema;Ljava/lang/String;)Lcom/mojang/datafixers/types/templates/TypeTemplate; + ARG 1 name + METHOD method_5256 (Lcom/mojang/datafixers/schemas/Schema;Ljava/lang/String;)Lcom/mojang/datafixers/types/templates/TypeTemplate; + ARG 1 name + METHOD method_5258 (Lcom/mojang/datafixers/schemas/Schema;Ljava/lang/String;)Lcom/mojang/datafixers/types/templates/TypeTemplate; + ARG 1 name + METHOD method_5262 (Lcom/mojang/datafixers/schemas/Schema;Ljava/lang/String;)Lcom/mojang/datafixers/types/templates/TypeTemplate; + ARG 1 name + METHOD method_5263 (Lcom/mojang/datafixers/schemas/Schema;Ljava/lang/String;)Lcom/mojang/datafixers/types/templates/TypeTemplate; + ARG 1 name + METHOD method_5264 (Lcom/mojang/datafixers/schemas/Schema;Ljava/lang/String;)Lcom/mojang/datafixers/types/templates/TypeTemplate; + ARG 1 name + METHOD method_5265 (Lcom/mojang/datafixers/schemas/Schema;Ljava/lang/String;)Lcom/mojang/datafixers/types/templates/TypeTemplate; + ARG 1 name + METHOD method_5270 (Lcom/mojang/datafixers/schemas/Schema;Ljava/lang/String;)Lcom/mojang/datafixers/types/templates/TypeTemplate; + ARG 1 name + METHOD method_5271 (Lcom/mojang/datafixers/schemas/Schema;Ljava/lang/String;)Lcom/mojang/datafixers/types/templates/TypeTemplate; + ARG 1 name + METHOD method_5272 (Lcom/mojang/datafixers/schemas/Schema;Ljava/lang/String;)Lcom/mojang/datafixers/types/templates/TypeTemplate; + ARG 1 name + METHOD method_5273 (Lcom/mojang/datafixers/schemas/Schema;Ljava/util/Map;Ljava/lang/String;)V + ARG 0 schema + ARG 1 map + ARG 2 name + METHOD method_5275 (Lcom/mojang/datafixers/schemas/Schema;Ljava/lang/String;)Lcom/mojang/datafixers/types/templates/TypeTemplate; + ARG 1 name + METHOD method_5277 (Lcom/mojang/datafixers/schemas/Schema;Ljava/lang/String;)Lcom/mojang/datafixers/types/templates/TypeTemplate; + ARG 1 name + METHOD method_5278 (Lcom/mojang/datafixers/schemas/Schema;Ljava/lang/String;)Lcom/mojang/datafixers/types/templates/TypeTemplate; + ARG 1 name + METHOD method_5279 (Lcom/mojang/datafixers/schemas/Schema;Ljava/lang/String;)Lcom/mojang/datafixers/types/templates/TypeTemplate; + ARG 1 name + METHOD registerBlockEntities (Lcom/mojang/datafixers/schemas/Schema;)Ljava/util/Map; + ARG 1 schema + METHOD registerEntities (Lcom/mojang/datafixers/schemas/Schema;)Ljava/util/Map; + ARG 1 schema METHOD registerTypes (Lcom/mojang/datafixers/schemas/Schema;Ljava/util/Map;Ljava/util/Map;)V + ARG 1 schema ARG 2 entityTypes ARG 3 blockEntityTypes diff --git a/mappings/net/minecraft/datafixer/schema/Schema1466.mapping b/mappings/net/minecraft/datafixer/schema/Schema1466.mapping index 236492a6e3..b0fa0b5e16 100644 --- a/mappings/net/minecraft/datafixer/schema/Schema1466.mapping +++ b/mappings/net/minecraft/datafixer/schema/Schema1466.mapping @@ -1,4 +1,7 @@ CLASS net/minecraft/class_1237 net/minecraft/datafixer/schema/Schema1466 + METHOD registerBlockEntities (Lcom/mojang/datafixers/schemas/Schema;)Ljava/util/Map; + ARG 1 schema METHOD registerTypes (Lcom/mojang/datafixers/schemas/Schema;Ljava/util/Map;Ljava/util/Map;)V + ARG 1 schema ARG 2 entityTypes ARG 3 blockEntityTypes diff --git a/mappings/net/minecraft/datafixer/schema/Schema1470.mapping b/mappings/net/minecraft/datafixer/schema/Schema1470.mapping index e6e4ca6a7e..0998a219ae 100644 --- a/mappings/net/minecraft/datafixer/schema/Schema1470.mapping +++ b/mappings/net/minecraft/datafixer/schema/Schema1470.mapping @@ -1 +1,9 @@ CLASS net/minecraft/class_1240 net/minecraft/datafixer/schema/Schema1470 + METHOD method_5280 targetEntityItems (Lcom/mojang/datafixers/schemas/Schema;Ljava/util/Map;Ljava/lang/String;)V + ARG 0 schema + ARG 1 map + ARG 2 entityId + METHOD method_5282 (Lcom/mojang/datafixers/schemas/Schema;Ljava/lang/String;)Lcom/mojang/datafixers/types/templates/TypeTemplate; + ARG 1 name + METHOD registerEntities (Lcom/mojang/datafixers/schemas/Schema;)Ljava/util/Map; + ARG 1 schema diff --git a/mappings/net/minecraft/datafixer/schema/Schema1481.mapping b/mappings/net/minecraft/datafixer/schema/Schema1481.mapping index 03b8cb91fd..7bcfa433c8 100644 --- a/mappings/net/minecraft/datafixer/schema/Schema1481.mapping +++ b/mappings/net/minecraft/datafixer/schema/Schema1481.mapping @@ -1 +1,3 @@ CLASS net/minecraft/class_1239 net/minecraft/datafixer/schema/Schema1481 + METHOD registerBlockEntities (Lcom/mojang/datafixers/schemas/Schema;)Ljava/util/Map; + ARG 1 schema diff --git a/mappings/net/minecraft/datafixer/schema/Schema1483.mapping b/mappings/net/minecraft/datafixer/schema/Schema1483.mapping index 4c43ce5d79..a533de8a45 100644 --- a/mappings/net/minecraft/datafixer/schema/Schema1483.mapping +++ b/mappings/net/minecraft/datafixer/schema/Schema1483.mapping @@ -1 +1,3 @@ CLASS net/minecraft/class_1242 net/minecraft/datafixer/schema/Schema1483 + METHOD registerEntities (Lcom/mojang/datafixers/schemas/Schema;)Ljava/util/Map; + ARG 1 schema diff --git a/mappings/net/minecraft/datafixer/schema/Schema1486.mapping b/mappings/net/minecraft/datafixer/schema/Schema1486.mapping index 43ee161c9e..260bce62ac 100644 --- a/mappings/net/minecraft/datafixer/schema/Schema1486.mapping +++ b/mappings/net/minecraft/datafixer/schema/Schema1486.mapping @@ -1 +1,3 @@ CLASS net/minecraft/class_1241 net/minecraft/datafixer/schema/Schema1486 + METHOD registerEntities (Lcom/mojang/datafixers/schemas/Schema;)Ljava/util/Map; + ARG 1 schema diff --git a/mappings/net/minecraft/datafixer/schema/Schema1510.mapping b/mappings/net/minecraft/datafixer/schema/Schema1510.mapping index 682c4fd27d..74db8501e7 100644 --- a/mappings/net/minecraft/datafixer/schema/Schema1510.mapping +++ b/mappings/net/minecraft/datafixer/schema/Schema1510.mapping @@ -1 +1,3 @@ CLASS net/minecraft/class_1243 net/minecraft/datafixer/schema/Schema1510 + METHOD registerEntities (Lcom/mojang/datafixers/schemas/Schema;)Ljava/util/Map; + ARG 1 schema diff --git a/mappings/net/minecraft/datafixer/schema/Schema1800.mapping b/mappings/net/minecraft/datafixer/schema/Schema1800.mapping index 9387c4328a..56f2d29abc 100644 --- a/mappings/net/minecraft/datafixer/schema/Schema1800.mapping +++ b/mappings/net/minecraft/datafixer/schema/Schema1800.mapping @@ -1,3 +1,5 @@ CLASS net/minecraft/class_1245 net/minecraft/datafixer/schema/Schema1800 - METHOD method_5285 targetEntityItems (Lcom/mojang/datafixers/schemas/Schema;Ljava/util/Map;Ljava/lang/String;)V - ARG 2 entityId + METHOD method_5287 (Lcom/mojang/datafixers/schemas/Schema;Ljava/lang/String;)Lcom/mojang/datafixers/types/templates/TypeTemplate; + ARG 1 name + METHOD registerEntities (Lcom/mojang/datafixers/schemas/Schema;)Ljava/util/Map; + ARG 1 schema diff --git a/mappings/net/minecraft/datafixer/schema/Schema1801.mapping b/mappings/net/minecraft/datafixer/schema/Schema1801.mapping index 013af4dfa7..accc5a5e0e 100644 --- a/mappings/net/minecraft/datafixer/schema/Schema1801.mapping +++ b/mappings/net/minecraft/datafixer/schema/Schema1801.mapping @@ -1 +1,3 @@ CLASS net/minecraft/class_1244 net/minecraft/datafixer/schema/Schema1801 + METHOD registerEntities (Lcom/mojang/datafixers/schemas/Schema;)Ljava/util/Map; + ARG 1 schema diff --git a/mappings/net/minecraft/datafixer/schema/Schema1904.mapping b/mappings/net/minecraft/datafixer/schema/Schema1904.mapping index 0791623ecd..106205714d 100644 --- a/mappings/net/minecraft/datafixer/schema/Schema1904.mapping +++ b/mappings/net/minecraft/datafixer/schema/Schema1904.mapping @@ -1 +1,3 @@ CLASS net/minecraft/class_3686 net/minecraft/datafixer/schema/Schema1904 + METHOD registerEntities (Lcom/mojang/datafixers/schemas/Schema;)Ljava/util/Map; + ARG 1 schema diff --git a/mappings/net/minecraft/datafixer/schema/Schema1906.mapping b/mappings/net/minecraft/datafixer/schema/Schema1906.mapping index fa066f0652..4792a11080 100644 --- a/mappings/net/minecraft/datafixer/schema/Schema1906.mapping +++ b/mappings/net/minecraft/datafixer/schema/Schema1906.mapping @@ -1 +1,9 @@ CLASS net/minecraft/class_3687 net/minecraft/datafixer/schema/Schema1906 + METHOD method_16052 (Lcom/mojang/datafixers/schemas/Schema;Ljava/util/Map;Ljava/lang/String;)V + ARG 0 schema + ARG 1 map + ARG 2 name + METHOD method_16054 (Lcom/mojang/datafixers/schemas/Schema;Ljava/lang/String;)Lcom/mojang/datafixers/types/templates/TypeTemplate; + ARG 1 name + METHOD registerBlockEntities (Lcom/mojang/datafixers/schemas/Schema;)Ljava/util/Map; + ARG 1 schema diff --git a/mappings/net/minecraft/datafixer/schema/Schema1909.mapping b/mappings/net/minecraft/datafixer/schema/Schema1909.mapping index 1a130eec41..f60529dd06 100644 --- a/mappings/net/minecraft/datafixer/schema/Schema1909.mapping +++ b/mappings/net/minecraft/datafixer/schema/Schema1909.mapping @@ -1 +1,3 @@ CLASS net/minecraft/class_3743 net/minecraft/datafixer/schema/Schema1909 + METHOD registerBlockEntities (Lcom/mojang/datafixers/schemas/Schema;)Ljava/util/Map; + ARG 1 schema diff --git a/mappings/net/minecraft/datafixer/schema/Schema1920.mapping b/mappings/net/minecraft/datafixer/schema/Schema1920.mapping index 90f50d847e..cc0f872a31 100644 --- a/mappings/net/minecraft/datafixer/schema/Schema1920.mapping +++ b/mappings/net/minecraft/datafixer/schema/Schema1920.mapping @@ -1 +1,7 @@ CLASS net/minecraft/class_3905 net/minecraft/datafixer/schema/Schema1920 + METHOD method_17343 (Lcom/mojang/datafixers/schemas/Schema;Ljava/util/Map;Ljava/lang/String;)V + ARG 0 schema + ARG 1 map + ARG 2 name + METHOD registerBlockEntities (Lcom/mojang/datafixers/schemas/Schema;)Ljava/util/Map; + ARG 1 schema diff --git a/mappings/net/minecraft/datafixer/schema/Schema1928.mapping b/mappings/net/minecraft/datafixer/schema/Schema1928.mapping index 830997e100..f129fe3fcc 100644 --- a/mappings/net/minecraft/datafixer/schema/Schema1928.mapping +++ b/mappings/net/minecraft/datafixer/schema/Schema1928.mapping @@ -1,4 +1,9 @@ CLASS net/minecraft/class_3984 net/minecraft/datafixer/schema/Schema1928 METHOD method_17997 targetItems (Lcom/mojang/datafixers/schemas/Schema;)Lcom/mojang/datafixers/types/templates/TypeTemplate; + ARG 0 schema METHOD method_17998 targetEntityItems (Lcom/mojang/datafixers/schemas/Schema;Ljava/util/Map;Ljava/lang/String;)V + ARG 0 schema + ARG 1 map ARG 2 entityId + METHOD registerEntities (Lcom/mojang/datafixers/schemas/Schema;)Ljava/util/Map; + ARG 1 schema diff --git a/mappings/net/minecraft/datafixer/schema/Schema1929.mapping b/mappings/net/minecraft/datafixer/schema/Schema1929.mapping index 148b145381..0bc9387344 100644 --- a/mappings/net/minecraft/datafixer/schema/Schema1929.mapping +++ b/mappings/net/minecraft/datafixer/schema/Schema1929.mapping @@ -1 +1,7 @@ CLASS net/minecraft/class_3985 net/minecraft/datafixer/schema/Schema1929 + METHOD method_18000 (Lcom/mojang/datafixers/schemas/Schema;Ljava/lang/String;)Lcom/mojang/datafixers/types/templates/TypeTemplate; + ARG 1 name + METHOD method_18001 (Lcom/mojang/datafixers/schemas/Schema;Ljava/lang/String;)Lcom/mojang/datafixers/types/templates/TypeTemplate; + ARG 1 name + METHOD registerEntities (Lcom/mojang/datafixers/schemas/Schema;)Ljava/util/Map; + ARG 1 schema diff --git a/mappings/net/minecraft/datafixer/schema/Schema1931.mapping b/mappings/net/minecraft/datafixer/schema/Schema1931.mapping index 5fca515ec2..a20330c120 100644 --- a/mappings/net/minecraft/datafixer/schema/Schema1931.mapping +++ b/mappings/net/minecraft/datafixer/schema/Schema1931.mapping @@ -1 +1,3 @@ CLASS net/minecraft/class_4016 net/minecraft/datafixer/schema/Schema1931 + METHOD registerEntities (Lcom/mojang/datafixers/schemas/Schema;)Ljava/util/Map; + ARG 1 schema diff --git a/mappings/net/minecraft/datafixer/schema/Schema2100.mapping b/mappings/net/minecraft/datafixer/schema/Schema2100.mapping index 62d64da394..a3f8f7e293 100644 --- a/mappings/net/minecraft/datafixer/schema/Schema2100.mapping +++ b/mappings/net/minecraft/datafixer/schema/Schema2100.mapping @@ -3,5 +3,7 @@ CLASS net/minecraft/class_4465 net/minecraft/datafixer/schema/Schema2100 ARG 0 schema ARG 1 entityTypes ARG 2 name + METHOD registerBlockEntities (Lcom/mojang/datafixers/schemas/Schema;)Ljava/util/Map; + ARG 1 schema METHOD registerEntities (Lcom/mojang/datafixers/schemas/Schema;)Ljava/util/Map; ARG 1 schema diff --git a/mappings/net/minecraft/datafixer/schema/Schema2502.mapping b/mappings/net/minecraft/datafixer/schema/Schema2502.mapping index eafa3a933e..016bc04b2d 100644 --- a/mappings/net/minecraft/datafixer/schema/Schema2502.mapping +++ b/mappings/net/minecraft/datafixer/schema/Schema2502.mapping @@ -1,7 +1,3 @@ CLASS net/minecraft/class_4756 net/minecraft/datafixer/schema/Schema2502 - 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 METHOD registerEntities (Lcom/mojang/datafixers/schemas/Schema;)Ljava/util/Map; ARG 1 schema diff --git a/mappings/net/minecraft/datafixer/schema/Schema2505.mapping b/mappings/net/minecraft/datafixer/schema/Schema2505.mapping index 3660cff96b..0077a68578 100644 --- a/mappings/net/minecraft/datafixer/schema/Schema2505.mapping +++ b/mappings/net/minecraft/datafixer/schema/Schema2505.mapping @@ -1,7 +1,3 @@ CLASS net/minecraft/class_4804 net/minecraft/datafixer/schema/Schema2505 - 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 METHOD registerEntities (Lcom/mojang/datafixers/schemas/Schema;)Ljava/util/Map; ARG 1 schema diff --git a/mappings/net/minecraft/datafixer/schema/Schema2509.mapping b/mappings/net/minecraft/datafixer/schema/Schema2509.mapping index cc083ac4b8..4589688e61 100644 --- a/mappings/net/minecraft/datafixer/schema/Schema2509.mapping +++ b/mappings/net/minecraft/datafixer/schema/Schema2509.mapping @@ -1,7 +1,3 @@ CLASS net/minecraft/class_4847 net/minecraft/datafixer/schema/Schema2509 - 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 METHOD registerEntities (Lcom/mojang/datafixers/schemas/Schema;)Ljava/util/Map; ARG 1 schema diff --git a/mappings/net/minecraft/datafixer/schema/Schema2519.mapping b/mappings/net/minecraft/datafixer/schema/Schema2519.mapping index 005728fe5a..06c13d7bc9 100644 --- a/mappings/net/minecraft/datafixer/schema/Schema2519.mapping +++ b/mappings/net/minecraft/datafixer/schema/Schema2519.mapping @@ -1,7 +1,3 @@ CLASS net/minecraft/class_4979 net/minecraft/datafixer/schema/Schema2519 - 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 METHOD registerEntities (Lcom/mojang/datafixers/schemas/Schema;)Ljava/util/Map; ARG 1 schema diff --git a/mappings/net/minecraft/datafixer/schema/Schema2522.mapping b/mappings/net/minecraft/datafixer/schema/Schema2522.mapping index 8e17a717f1..01bcb6769c 100644 --- a/mappings/net/minecraft/datafixer/schema/Schema2522.mapping +++ b/mappings/net/minecraft/datafixer/schema/Schema2522.mapping @@ -1,7 +1,3 @@ CLASS net/minecraft/class_5130 net/minecraft/datafixer/schema/Schema2522 - 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 METHOD registerEntities (Lcom/mojang/datafixers/schemas/Schema;)Ljava/util/Map; ARG 1 schema diff --git a/mappings/net/minecraft/datafixer/schema/Schema2568.mapping b/mappings/net/minecraft/datafixer/schema/Schema2568.mapping index 76f3827672..fbbce04cef 100644 --- a/mappings/net/minecraft/datafixer/schema/Schema2568.mapping +++ b/mappings/net/minecraft/datafixer/schema/Schema2568.mapping @@ -1,7 +1,3 @@ CLASS net/minecraft/class_5416 net/minecraft/datafixer/schema/Schema2568 - METHOD method_30226 registerEntity (Lcom/mojang/datafixers/schemas/Schema;Ljava/util/Map;Ljava/lang/String;)V - ARG 0 schema - ARG 1 entityTypes - ARG 2 name METHOD registerEntities (Lcom/mojang/datafixers/schemas/Schema;)Ljava/util/Map; ARG 1 schema diff --git a/mappings/net/minecraft/datafixer/schema/Schema2571.mapping b/mappings/net/minecraft/datafixer/schema/Schema2571.mapping index 87a15e1f22..9cad7e42ba 100644 --- a/mappings/net/minecraft/datafixer/schema/Schema2571.mapping +++ b/mappings/net/minecraft/datafixer/schema/Schema2571.mapping @@ -1,7 +1,3 @@ CLASS net/minecraft/class_5999 net/minecraft/datafixer/schema/Schema2571 - METHOD method_34967 registerEntity (Lcom/mojang/datafixers/schemas/Schema;Ljava/util/Map;Ljava/lang/String;)V - ARG 0 schema - ARG 1 entityTypes - ARG 2 name METHOD registerEntities (Lcom/mojang/datafixers/schemas/Schema;)Ljava/util/Map; ARG 1 schema diff --git a/mappings/net/minecraft/datafixer/schema/Schema2684.mapping b/mappings/net/minecraft/datafixer/schema/Schema2684.mapping index 9e5abd52b6..b138c74900 100644 --- a/mappings/net/minecraft/datafixer/schema/Schema2684.mapping +++ b/mappings/net/minecraft/datafixer/schema/Schema2684.mapping @@ -1,3 +1,7 @@ CLASS net/minecraft/class_5701 net/minecraft/datafixer/schema/Schema2684 METHOD registerBlockEntities (Lcom/mojang/datafixers/schemas/Schema;)Ljava/util/Map; ARG 1 schema + METHOD registerTypes (Lcom/mojang/datafixers/schemas/Schema;Ljava/util/Map;Ljava/util/Map;)V + ARG 1 schema + ARG 2 entityTypes + ARG 3 blockEntityTypes diff --git a/mappings/net/minecraft/datafixer/schema/Schema2686.mapping b/mappings/net/minecraft/datafixer/schema/Schema2686.mapping index 0ff4ddd5d3..62771f0bdb 100644 --- a/mappings/net/minecraft/datafixer/schema/Schema2686.mapping +++ b/mappings/net/minecraft/datafixer/schema/Schema2686.mapping @@ -1,7 +1,3 @@ CLASS net/minecraft/class_5752 net/minecraft/datafixer/schema/Schema2686 - METHOD method_33188 registerEntity (Lcom/mojang/datafixers/schemas/Schema;Ljava/util/Map;Ljava/lang/String;)V - ARG 0 schema - ARG 1 entityTypes - ARG 2 name METHOD registerEntities (Lcom/mojang/datafixers/schemas/Schema;)Ljava/util/Map; ARG 1 schema diff --git a/mappings/net/minecraft/datafixer/schema/Schema2688.mapping b/mappings/net/minecraft/datafixer/schema/Schema2688.mapping index 839d633ef1..9922412127 100644 --- a/mappings/net/minecraft/datafixer/schema/Schema2688.mapping +++ b/mappings/net/minecraft/datafixer/schema/Schema2688.mapping @@ -1,7 +1,3 @@ CLASS net/minecraft/class_5775 net/minecraft/datafixer/schema/Schema2688 - METHOD method_33328 registerEntity (Lcom/mojang/datafixers/schemas/Schema;Ljava/util/Map;Ljava/lang/String;)V - ARG 0 schema - ARG 1 entityTypes - ARG 2 name METHOD registerEntities (Lcom/mojang/datafixers/schemas/Schema;)Ljava/util/Map; ARG 1 schema diff --git a/mappings/net/minecraft/datafixer/schema/Schema2704.mapping b/mappings/net/minecraft/datafixer/schema/Schema2704.mapping index 55e7077409..e699e6bac3 100644 --- a/mappings/net/minecraft/datafixer/schema/Schema2704.mapping +++ b/mappings/net/minecraft/datafixer/schema/Schema2704.mapping @@ -1,7 +1,3 @@ CLASS net/minecraft/class_6000 net/minecraft/datafixer/schema/Schema2704 - METHOD method_34969 registerEntity (Lcom/mojang/datafixers/schemas/Schema;Ljava/util/Map;Ljava/lang/String;)V - ARG 0 schema - ARG 1 entityTypes - ARG 2 name METHOD registerEntities (Lcom/mojang/datafixers/schemas/Schema;)Ljava/util/Map; ARG 1 schema diff --git a/mappings/net/minecraft/datafixer/schema/Schema2707.mapping b/mappings/net/minecraft/datafixer/schema/Schema2707.mapping index ac4e127f86..a01d4bdfed 100644 --- a/mappings/net/minecraft/datafixer/schema/Schema2707.mapping +++ b/mappings/net/minecraft/datafixer/schema/Schema2707.mapping @@ -1,7 +1,3 @@ CLASS net/minecraft/class_6332 net/minecraft/datafixer/schema/Schema2707 - METHOD method_36248 registerEntity (Lcom/mojang/datafixers/schemas/Schema;Ljava/util/Map;Ljava/lang/String;)V - ARG 0 schema - ARG 1 entityTypes - ARG 2 name METHOD registerEntities (Lcom/mojang/datafixers/schemas/Schema;)Ljava/util/Map; ARG 1 schema diff --git a/mappings/net/minecraft/datafixer/schema/Schema2831.mapping b/mappings/net/minecraft/datafixer/schema/Schema2831.mapping index 0bd6c9150c..96d5b13599 100644 --- a/mappings/net/minecraft/datafixer/schema/Schema2831.mapping +++ b/mappings/net/minecraft/datafixer/schema/Schema2831.mapping @@ -1 +1,5 @@ CLASS net/minecraft/class_6504 net/minecraft/datafixer/schema/Schema2831 + METHOD registerTypes (Lcom/mojang/datafixers/schemas/Schema;Ljava/util/Map;Ljava/util/Map;)V + ARG 1 schema + ARG 2 entityTypes + ARG 3 blockEntityTypes diff --git a/mappings/net/minecraft/datafixer/schema/Schema2832.mapping b/mappings/net/minecraft/datafixer/schema/Schema2832.mapping index 4366f6d683..d26e26bef5 100644 --- a/mappings/net/minecraft/datafixer/schema/Schema2832.mapping +++ b/mappings/net/minecraft/datafixer/schema/Schema2832.mapping @@ -1 +1,5 @@ CLASS net/minecraft/class_6640 net/minecraft/datafixer/schema/Schema2832 + METHOD registerTypes (Lcom/mojang/datafixers/schemas/Schema;Ljava/util/Map;Ljava/util/Map;)V + ARG 1 schema + ARG 2 entityTypes + ARG 3 blockEntityTypes diff --git a/mappings/net/minecraft/datafixer/schema/Schema2842.mapping b/mappings/net/minecraft/datafixer/schema/Schema2842.mapping index 753f8a905d..a077229284 100644 --- a/mappings/net/minecraft/datafixer/schema/Schema2842.mapping +++ b/mappings/net/minecraft/datafixer/schema/Schema2842.mapping @@ -1 +1,5 @@ CLASS net/minecraft/class_6743 net/minecraft/datafixer/schema/Schema2842 + METHOD registerTypes (Lcom/mojang/datafixers/schemas/Schema;Ljava/util/Map;Ljava/util/Map;)V + ARG 1 schema + ARG 2 entityTypes + ARG 3 blockEntityTypes diff --git a/mappings/net/minecraft/datafixer/schema/Schema3076.mapping b/mappings/net/minecraft/datafixer/schema/Schema3076.mapping index 9404688b0f..6165d60ec3 100644 --- a/mappings/net/minecraft/datafixer/schema/Schema3076.mapping +++ b/mappings/net/minecraft/datafixer/schema/Schema3076.mapping @@ -1 +1,3 @@ CLASS net/minecraft/class_7092 net/minecraft/datafixer/schema/Schema3076 + METHOD registerBlockEntities (Lcom/mojang/datafixers/schemas/Schema;)Ljava/util/Map; + ARG 1 schema diff --git a/mappings/net/minecraft/datafixer/schema/Schema3078.mapping b/mappings/net/minecraft/datafixer/schema/Schema3078.mapping index b22f76ed26..6755a47c96 100644 --- a/mappings/net/minecraft/datafixer/schema/Schema3078.mapping +++ b/mappings/net/minecraft/datafixer/schema/Schema3078.mapping @@ -1 +1,9 @@ CLASS net/minecraft/class_7093 net/minecraft/datafixer/schema/Schema3078 + METHOD method_41318 targetEntityItems (Lcom/mojang/datafixers/schemas/Schema;Ljava/util/Map;Ljava/lang/String;)V + ARG 0 schema + ARG 1 map + ARG 2 entityId + METHOD registerBlockEntities (Lcom/mojang/datafixers/schemas/Schema;)Ljava/util/Map; + ARG 1 schema + METHOD registerEntities (Lcom/mojang/datafixers/schemas/Schema;)Ljava/util/Map; + ARG 1 schema diff --git a/mappings/net/minecraft/datafixer/schema/Schema3081.mapping b/mappings/net/minecraft/datafixer/schema/Schema3081.mapping index a556dd4087..22f4e26e07 100644 --- a/mappings/net/minecraft/datafixer/schema/Schema3081.mapping +++ b/mappings/net/minecraft/datafixer/schema/Schema3081.mapping @@ -1,7 +1,3 @@ CLASS net/minecraft/class_7245 net/minecraft/datafixer/schema/Schema3081 - METHOD method_42124 register (Lcom/mojang/datafixers/schemas/Schema;Ljava/util/Map;Ljava/lang/String;)V - ARG 0 schema - ARG 1 map - ARG 2 id METHOD registerEntities (Lcom/mojang/datafixers/schemas/Schema;)Ljava/util/Map; ARG 1 schema diff --git a/mappings/net/minecraft/datafixer/schema/Schema3083.mapping b/mappings/net/minecraft/datafixer/schema/Schema3083.mapping index b7b310a61f..981b25fba8 100644 --- a/mappings/net/minecraft/datafixer/schema/Schema3083.mapping +++ b/mappings/net/minecraft/datafixer/schema/Schema3083.mapping @@ -1 +1,7 @@ CLASS net/minecraft/class_7294 net/minecraft/datafixer/schema/Schema3083 + METHOD method_42645 (Lcom/mojang/datafixers/schemas/Schema;Ljava/util/Map;Ljava/lang/String;)V + ARG 0 schema + ARG 1 map + ARG 2 name + METHOD registerEntities (Lcom/mojang/datafixers/schemas/Schema;)Ljava/util/Map; + ARG 1 schema diff --git a/mappings/net/minecraft/datafixer/schema/Schema3202.mapping b/mappings/net/minecraft/datafixer/schema/Schema3202.mapping new file mode 100644 index 0000000000..cb3de1630c --- /dev/null +++ b/mappings/net/minecraft/datafixer/schema/Schema3202.mapping @@ -0,0 +1,3 @@ +CLASS net/minecraft/class_7684 net/minecraft/datafixer/schema/Schema3202 + METHOD registerBlockEntities (Lcom/mojang/datafixers/schemas/Schema;)Ljava/util/Map; + ARG 1 schema diff --git a/mappings/net/minecraft/datafixer/schema/Schema3203.mapping b/mappings/net/minecraft/datafixer/schema/Schema3203.mapping new file mode 100644 index 0000000000..1aab2bb604 --- /dev/null +++ b/mappings/net/minecraft/datafixer/schema/Schema3203.mapping @@ -0,0 +1,3 @@ +CLASS net/minecraft/class_7685 net/minecraft/datafixer/schema/Schema3203 + METHOD registerEntities (Lcom/mojang/datafixers/schemas/Schema;)Ljava/util/Map; + ARG 1 schema diff --git a/mappings/net/minecraft/datafixer/schema/Schema3204.mapping b/mappings/net/minecraft/datafixer/schema/Schema3204.mapping new file mode 100644 index 0000000000..d7965c4c6c --- /dev/null +++ b/mappings/net/minecraft/datafixer/schema/Schema3204.mapping @@ -0,0 +1,3 @@ +CLASS net/minecraft/class_7686 net/minecraft/datafixer/schema/Schema3204 + METHOD registerBlockEntities (Lcom/mojang/datafixers/schemas/Schema;)Ljava/util/Map; + ARG 1 schema diff --git a/mappings/net/minecraft/datafixer/schema/Schema3325.mapping b/mappings/net/minecraft/datafixer/schema/Schema3325.mapping new file mode 100644 index 0000000000..77be0336fd --- /dev/null +++ b/mappings/net/minecraft/datafixer/schema/Schema3325.mapping @@ -0,0 +1,3 @@ +CLASS net/minecraft/class_8106 net/minecraft/datafixer/schema/Schema3325 + METHOD registerEntities (Lcom/mojang/datafixers/schemas/Schema;)Ljava/util/Map; + ARG 1 schema diff --git a/mappings/net/minecraft/datafixer/schema/Schema3326.mapping b/mappings/net/minecraft/datafixer/schema/Schema3326.mapping new file mode 100644 index 0000000000..345e3ac239 --- /dev/null +++ b/mappings/net/minecraft/datafixer/schema/Schema3326.mapping @@ -0,0 +1,3 @@ +CLASS net/minecraft/class_8146 net/minecraft/datafixer/schema/Schema3326 + METHOD registerEntities (Lcom/mojang/datafixers/schemas/Schema;)Ljava/util/Map; + ARG 1 schema diff --git a/mappings/net/minecraft/datafixer/schema/Schema3327.mapping b/mappings/net/minecraft/datafixer/schema/Schema3327.mapping new file mode 100644 index 0000000000..99ac3dbd2b --- /dev/null +++ b/mappings/net/minecraft/datafixer/schema/Schema3327.mapping @@ -0,0 +1,3 @@ +CLASS net/minecraft/class_8147 net/minecraft/datafixer/schema/Schema3327 + METHOD registerBlockEntities (Lcom/mojang/datafixers/schemas/Schema;)Ljava/util/Map; + ARG 1 schema diff --git a/mappings/net/minecraft/datafixer/schema/Schema3328.mapping b/mappings/net/minecraft/datafixer/schema/Schema3328.mapping new file mode 100644 index 0000000000..62b9a74c0f --- /dev/null +++ b/mappings/net/minecraft/datafixer/schema/Schema3328.mapping @@ -0,0 +1,3 @@ +CLASS net/minecraft/class_8148 net/minecraft/datafixer/schema/Schema3328 + METHOD registerEntities (Lcom/mojang/datafixers/schemas/Schema;)Ljava/util/Map; + ARG 1 schema diff --git a/mappings/net/minecraft/datafixer/schema/Schema3438.mapping b/mappings/net/minecraft/datafixer/schema/Schema3438.mapping new file mode 100644 index 0000000000..52befc344c --- /dev/null +++ b/mappings/net/minecraft/datafixer/schema/Schema3438.mapping @@ -0,0 +1,3 @@ +CLASS net/minecraft/class_8224 net/minecraft/datafixer/schema/Schema3438 + METHOD registerBlockEntities (Lcom/mojang/datafixers/schemas/Schema;)Ljava/util/Map; + ARG 1 schema diff --git a/mappings/net/minecraft/datafixer/schema/Schema3448.mapping b/mappings/net/minecraft/datafixer/schema/Schema3448.mapping new file mode 100644 index 0000000000..6b2f6995a4 --- /dev/null +++ b/mappings/net/minecraft/datafixer/schema/Schema3448.mapping @@ -0,0 +1,3 @@ +CLASS net/minecraft/class_8506 net/minecraft/datafixer/schema/Schema3448 + METHOD registerBlockEntities (Lcom/mojang/datafixers/schemas/Schema;)Ljava/util/Map; + ARG 1 schema diff --git a/mappings/net/minecraft/datafixer/schema/Schema501.mapping b/mappings/net/minecraft/datafixer/schema/Schema501.mapping index 6fd069cd89..f10173df59 100644 --- a/mappings/net/minecraft/datafixer/schema/Schema501.mapping +++ b/mappings/net/minecraft/datafixer/schema/Schema501.mapping @@ -2,5 +2,5 @@ CLASS net/minecraft/class_1247 net/minecraft/datafixer/schema/Schema501 METHOD (ILcom/mojang/datafixers/schemas/Schema;)V ARG 1 versionKey ARG 2 parent - METHOD method_5290 targetEntityItems (Lcom/mojang/datafixers/schemas/Schema;Ljava/util/Map;Ljava/lang/String;)V - ARG 2 entityId + METHOD registerEntities (Lcom/mojang/datafixers/schemas/Schema;)Ljava/util/Map; + ARG 1 schema diff --git a/mappings/net/minecraft/datafixer/schema/Schema700.mapping b/mappings/net/minecraft/datafixer/schema/Schema700.mapping index ed8d888ddf..32984db5f6 100644 --- a/mappings/net/minecraft/datafixer/schema/Schema700.mapping +++ b/mappings/net/minecraft/datafixer/schema/Schema700.mapping @@ -2,5 +2,5 @@ CLASS net/minecraft/class_1246 net/minecraft/datafixer/schema/Schema700 METHOD (ILcom/mojang/datafixers/schemas/Schema;)V ARG 1 versionKey ARG 2 parent - METHOD method_5288 targetEntityItems (Lcom/mojang/datafixers/schemas/Schema;Ljava/util/Map;Ljava/lang/String;)V - ARG 2 entityId + METHOD registerEntities (Lcom/mojang/datafixers/schemas/Schema;)Ljava/util/Map; + ARG 1 schema diff --git a/mappings/net/minecraft/datafixer/schema/Schema701.mapping b/mappings/net/minecraft/datafixer/schema/Schema701.mapping index f1db56fb84..5a89632d55 100644 --- a/mappings/net/minecraft/datafixer/schema/Schema701.mapping +++ b/mappings/net/minecraft/datafixer/schema/Schema701.mapping @@ -3,4 +3,8 @@ CLASS net/minecraft/class_1249 net/minecraft/datafixer/schema/Schema701 ARG 1 versionKey ARG 2 parent METHOD method_5294 targetEntityItems (Lcom/mojang/datafixers/schemas/Schema;Ljava/util/Map;Ljava/lang/String;)V + ARG 0 schema + ARG 1 map ARG 2 entityId + METHOD registerEntities (Lcom/mojang/datafixers/schemas/Schema;)Ljava/util/Map; + ARG 1 schema diff --git a/mappings/net/minecraft/datafixer/schema/Schema702.mapping b/mappings/net/minecraft/datafixer/schema/Schema702.mapping index f6d6709a82..f076762b89 100644 --- a/mappings/net/minecraft/datafixer/schema/Schema702.mapping +++ b/mappings/net/minecraft/datafixer/schema/Schema702.mapping @@ -3,4 +3,8 @@ CLASS net/minecraft/class_1248 net/minecraft/datafixer/schema/Schema702 ARG 1 versionKey ARG 2 parent METHOD method_5292 targetEntityItems (Lcom/mojang/datafixers/schemas/Schema;Ljava/util/Map;Ljava/lang/String;)V + ARG 0 schema + ARG 1 map ARG 2 entityId + METHOD registerEntities (Lcom/mojang/datafixers/schemas/Schema;)Ljava/util/Map; + ARG 1 schema diff --git a/mappings/net/minecraft/datafixer/schema/Schema703.mapping b/mappings/net/minecraft/datafixer/schema/Schema703.mapping index 935f0ea082..d5efe790a4 100644 --- a/mappings/net/minecraft/datafixer/schema/Schema703.mapping +++ b/mappings/net/minecraft/datafixer/schema/Schema703.mapping @@ -2,3 +2,5 @@ CLASS net/minecraft/class_1251 net/minecraft/datafixer/schema/Schema703 METHOD (ILcom/mojang/datafixers/schemas/Schema;)V ARG 1 versionKey ARG 2 parent + METHOD registerEntities (Lcom/mojang/datafixers/schemas/Schema;)Ljava/util/Map; + ARG 1 schema diff --git a/mappings/net/minecraft/datafixer/schema/Schema704.mapping b/mappings/net/minecraft/datafixer/schema/Schema704.mapping index 3bcbc32070..dcde2d7bb8 100644 --- a/mappings/net/minecraft/datafixer/schema/Schema704.mapping +++ b/mappings/net/minecraft/datafixer/schema/Schema704.mapping @@ -3,8 +3,26 @@ CLASS net/minecraft/class_1250 net/minecraft/datafixer/schema/Schema704 METHOD (ILcom/mojang/datafixers/schemas/Schema;)V ARG 1 versionKey ARG 2 parent + METHOD getChoiceType (Lcom/mojang/datafixers/DSL$TypeReference;Ljava/lang/String;)Lcom/mojang/datafixers/types/Type; + ARG 1 type + ARG 2 choiceName METHOD method_5296 targetItems (Lcom/mojang/datafixers/schemas/Schema;Ljava/util/Map;Ljava/lang/String;)V + ARG 0 schema + ARG 1 map ARG 2 blockEntityId + METHOD method_5298 (Lcom/mojang/datafixers/schemas/Schema;Ljava/lang/String;)Lcom/mojang/datafixers/types/templates/TypeTemplate; + ARG 1 name + METHOD method_5301 (Lcom/mojang/datafixers/schemas/Schema;Ljava/lang/String;)Lcom/mojang/datafixers/types/templates/TypeTemplate; + ARG 1 name + METHOD method_5302 (Lcom/mojang/datafixers/schemas/Schema;Ljava/lang/String;)Lcom/mojang/datafixers/types/templates/TypeTemplate; + ARG 1 name + METHOD registerBlockEntities (Lcom/mojang/datafixers/schemas/Schema;)Ljava/util/Map; + ARG 1 schema METHOD registerTypes (Lcom/mojang/datafixers/schemas/Schema;Ljava/util/Map;Ljava/util/Map;)V + ARG 1 schema ARG 2 entityTypes ARG 3 blockEntityTypes + CLASS 1 + METHOD apply (Lcom/mojang/serialization/DynamicOps;Ljava/lang/Object;)Ljava/lang/Object; + ARG 1 ops + ARG 2 value diff --git a/mappings/net/minecraft/datafixer/schema/Schema705.mapping b/mappings/net/minecraft/datafixer/schema/Schema705.mapping index 238a67bd9b..87a44f0436 100644 --- a/mappings/net/minecraft/datafixer/schema/Schema705.mapping +++ b/mappings/net/minecraft/datafixer/schema/Schema705.mapping @@ -1,8 +1,63 @@ CLASS net/minecraft/class_1253 net/minecraft/datafixer/schema/Schema705 METHOD method_5311 targetEntityItems (Lcom/mojang/datafixers/schemas/Schema;Ljava/util/Map;Ljava/lang/String;)V + ARG 0 schema + ARG 1 map ARG 2 entityId + METHOD method_5312 (Lcom/mojang/datafixers/schemas/Schema;Ljava/lang/String;)Lcom/mojang/datafixers/types/templates/TypeTemplate; + ARG 1 name + METHOD method_5313 (Lcom/mojang/datafixers/schemas/Schema;Ljava/lang/String;)Lcom/mojang/datafixers/types/templates/TypeTemplate; + ARG 1 name + METHOD method_5314 (Lcom/mojang/datafixers/schemas/Schema;Ljava/lang/String;)Lcom/mojang/datafixers/types/templates/TypeTemplate; + ARG 1 name + METHOD method_5316 (Lcom/mojang/datafixers/schemas/Schema;Ljava/lang/String;)Lcom/mojang/datafixers/types/templates/TypeTemplate; + ARG 1 name + METHOD method_5317 (Lcom/mojang/datafixers/schemas/Schema;Ljava/lang/String;)Lcom/mojang/datafixers/types/templates/TypeTemplate; + ARG 1 name + METHOD method_5318 (Lcom/mojang/datafixers/schemas/Schema;Ljava/lang/String;)Lcom/mojang/datafixers/types/templates/TypeTemplate; + ARG 1 name + METHOD method_5320 (Lcom/mojang/datafixers/schemas/Schema;Ljava/lang/String;)Lcom/mojang/datafixers/types/templates/TypeTemplate; + ARG 1 name + METHOD method_5321 (Lcom/mojang/datafixers/schemas/Schema;Ljava/lang/String;)Lcom/mojang/datafixers/types/templates/TypeTemplate; + ARG 1 name + METHOD method_5322 (Lcom/mojang/datafixers/schemas/Schema;Ljava/lang/String;)Lcom/mojang/datafixers/types/templates/TypeTemplate; + ARG 1 name + METHOD method_5323 (Lcom/mojang/datafixers/schemas/Schema;Ljava/lang/String;)Lcom/mojang/datafixers/types/templates/TypeTemplate; + ARG 1 name + METHOD method_5324 (Lcom/mojang/datafixers/schemas/Schema;Ljava/lang/String;)Lcom/mojang/datafixers/types/templates/TypeTemplate; + ARG 1 name + METHOD method_5325 (Lcom/mojang/datafixers/schemas/Schema;Ljava/lang/String;)Lcom/mojang/datafixers/types/templates/TypeTemplate; + ARG 1 name + METHOD method_5326 (Lcom/mojang/datafixers/schemas/Schema;Ljava/lang/String;)Lcom/mojang/datafixers/types/templates/TypeTemplate; + ARG 1 name + METHOD method_5327 (Lcom/mojang/datafixers/schemas/Schema;Ljava/lang/String;)Lcom/mojang/datafixers/types/templates/TypeTemplate; + ARG 1 name + METHOD method_5328 (Lcom/mojang/datafixers/schemas/Schema;Ljava/lang/String;)Lcom/mojang/datafixers/types/templates/TypeTemplate; + ARG 1 name METHOD method_5330 targetInTile (Lcom/mojang/datafixers/schemas/Schema;Ljava/util/Map;Ljava/lang/String;)V + ARG 0 schema + ARG 1 map ARG 2 entityId + METHOD method_5331 (Lcom/mojang/datafixers/schemas/Schema;Ljava/lang/String;)Lcom/mojang/datafixers/types/templates/TypeTemplate; + ARG 1 name + METHOD method_5332 (Lcom/mojang/datafixers/schemas/Schema;Ljava/lang/String;)Lcom/mojang/datafixers/types/templates/TypeTemplate; + ARG 1 name + METHOD method_5333 (Lcom/mojang/datafixers/schemas/Schema;Ljava/lang/String;)Lcom/mojang/datafixers/types/templates/TypeTemplate; + ARG 1 name + METHOD method_5334 (Lcom/mojang/datafixers/schemas/Schema;Ljava/lang/String;)Lcom/mojang/datafixers/types/templates/TypeTemplate; + ARG 1 name + METHOD method_5335 (Lcom/mojang/datafixers/schemas/Schema;Ljava/lang/String;)Lcom/mojang/datafixers/types/templates/TypeTemplate; + ARG 1 name + METHOD method_5337 (Lcom/mojang/datafixers/schemas/Schema;Ljava/lang/String;)Lcom/mojang/datafixers/types/templates/TypeTemplate; + ARG 1 name + METHOD method_5338 (Lcom/mojang/datafixers/schemas/Schema;Ljava/lang/String;)Lcom/mojang/datafixers/types/templates/TypeTemplate; + ARG 1 name + METHOD registerEntities (Lcom/mojang/datafixers/schemas/Schema;)Ljava/util/Map; + ARG 1 schema METHOD registerTypes (Lcom/mojang/datafixers/schemas/Schema;Ljava/util/Map;Ljava/util/Map;)V + ARG 1 schema ARG 2 entityTypes ARG 3 blockEntityTypes + CLASS 1 + METHOD apply (Lcom/mojang/serialization/DynamicOps;Ljava/lang/Object;)Ljava/lang/Object; + ARG 1 ops + ARG 2 value diff --git a/mappings/net/minecraft/datafixer/schema/Schema808.mapping b/mappings/net/minecraft/datafixer/schema/Schema808.mapping index f25a9f7ba7..c642065764 100644 --- a/mappings/net/minecraft/datafixer/schema/Schema808.mapping +++ b/mappings/net/minecraft/datafixer/schema/Schema808.mapping @@ -1,3 +1,7 @@ CLASS net/minecraft/class_1252 net/minecraft/datafixer/schema/Schema808 METHOD method_5309 targetItems (Lcom/mojang/datafixers/schemas/Schema;Ljava/util/Map;Ljava/lang/String;)V + ARG 0 schema + ARG 1 map ARG 2 blockEntityId + METHOD registerBlockEntities (Lcom/mojang/datafixers/schemas/Schema;)Ljava/util/Map; + ARG 1 schema diff --git a/mappings/net/minecraft/datafixer/schema/Schema99.mapping b/mappings/net/minecraft/datafixer/schema/Schema99.mapping index 8aa6947bd0..63dfa1e3e7 100644 --- a/mappings/net/minecraft/datafixer/schema/Schema99.mapping +++ b/mappings/net/minecraft/datafixer/schema/Schema99.mapping @@ -1,17 +1,80 @@ CLASS net/minecraft/class_1254 net/minecraft/datafixer/schema/Schema99 + FIELD field_5748 BLOCKS_TO_BLOCK_ENTITIES Ljava/util/Map; FIELD field_5749 LOGGER Lorg/slf4j/Logger; METHOD (ILcom/mojang/datafixers/schemas/Schema;)V ARG 1 versionKey ARG 2 parent METHOD method_5339 targetEquipment (Lcom/mojang/datafixers/schemas/Schema;Ljava/util/Map;Ljava/lang/String;)V + ARG 0 schema + ARG 1 map ARG 2 entityId + METHOD method_5340 (Lcom/mojang/datafixers/schemas/Schema;Ljava/lang/String;)Lcom/mojang/datafixers/types/templates/TypeTemplate; + ARG 1 name + METHOD method_5342 (Lcom/mojang/datafixers/schemas/Schema;Ljava/lang/String;)Lcom/mojang/datafixers/types/templates/TypeTemplate; + ARG 1 name + METHOD method_5344 (Ljava/util/HashMap;)V + ARG 0 map METHOD method_5346 targetItems (Lcom/mojang/datafixers/schemas/Schema;Ljava/util/Map;Ljava/lang/String;)V + ARG 0 schema + ARG 1 map ARG 2 entityId + METHOD method_5349 (Lcom/mojang/datafixers/schemas/Schema;Ljava/lang/String;)Lcom/mojang/datafixers/types/templates/TypeTemplate; + ARG 1 name + METHOD method_5351 (Lcom/mojang/datafixers/schemas/Schema;Ljava/lang/String;)Lcom/mojang/datafixers/types/templates/TypeTemplate; + ARG 1 name METHOD method_5353 targetEquipment (Lcom/mojang/datafixers/schemas/Schema;)Lcom/mojang/datafixers/types/templates/TypeTemplate; + ARG 0 schema + METHOD method_5354 (Lcom/mojang/datafixers/schemas/Schema;Ljava/lang/String;)Lcom/mojang/datafixers/types/templates/TypeTemplate; + ARG 1 name + METHOD method_5356 (Lcom/mojang/datafixers/schemas/Schema;Ljava/lang/String;)Lcom/mojang/datafixers/types/templates/TypeTemplate; + ARG 1 name + METHOD method_5357 (Lcom/mojang/serialization/Dynamic;Ljava/util/Map;Ljava/lang/String;Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic; + ARG 3 tag + METHOD method_5358 (Lcom/mojang/datafixers/schemas/Schema;Ljava/lang/String;)Lcom/mojang/datafixers/types/templates/TypeTemplate; + ARG 1 name + METHOD method_5359 updateBlockEntityTags (Lcom/mojang/serialization/Dynamic;Ljava/util/Map;Ljava/lang/String;)Ljava/lang/Object; + ARG 0 stack + ARG 1 renames + ARG 2 newArmorStandId + METHOD method_5362 (Lcom/mojang/datafixers/schemas/Schema;Ljava/lang/String;)Lcom/mojang/datafixers/types/templates/TypeTemplate; + ARG 1 name + METHOD method_5363 (Lcom/mojang/datafixers/schemas/Schema;Ljava/lang/String;)Lcom/mojang/datafixers/types/templates/TypeTemplate; + ARG 1 name + METHOD method_5365 (Lcom/mojang/datafixers/schemas/Schema;Ljava/lang/String;)Lcom/mojang/datafixers/types/templates/TypeTemplate; + ARG 1 name + METHOD method_5366 (Lcom/mojang/datafixers/schemas/Schema;Ljava/lang/String;)Lcom/mojang/datafixers/types/templates/TypeTemplate; + ARG 1 name + METHOD method_5367 (Lcom/mojang/datafixers/schemas/Schema;Ljava/lang/String;)Lcom/mojang/datafixers/types/templates/TypeTemplate; + ARG 1 name METHOD method_5368 targetInTile (Lcom/mojang/datafixers/schemas/Schema;Ljava/util/Map;Ljava/lang/String;)V + ARG 0 schema + ARG 1 map ARG 2 entityId + METHOD method_5371 (Lcom/mojang/serialization/Dynamic;Ljava/lang/String;Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic; + ARG 2 entityTag + METHOD method_5372 (Lcom/mojang/datafixers/schemas/Schema;Ljava/lang/String;)Lcom/mojang/datafixers/types/templates/TypeTemplate; + ARG 1 name + METHOD method_5374 (Lcom/mojang/datafixers/schemas/Schema;Ljava/lang/String;)Lcom/mojang/datafixers/types/templates/TypeTemplate; + ARG 1 name + METHOD method_5375 (Lcom/mojang/serialization/Dynamic;Ljava/util/Map;Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic; + ARG 2 blockEntityTag + METHOD method_5376 (Lcom/mojang/datafixers/schemas/Schema;Ljava/lang/String;)Lcom/mojang/datafixers/types/templates/TypeTemplate; + ARG 1 name METHOD method_5377 targetDisplayTile (Lcom/mojang/datafixers/schemas/Schema;Ljava/util/Map;Ljava/lang/String;)V + ARG 0 schema + ARG 1 map ARG 2 entityId + METHOD method_5381 (Lcom/mojang/datafixers/schemas/Schema;Ljava/lang/String;)Lcom/mojang/datafixers/types/templates/TypeTemplate; + ARG 1 name + METHOD registerBlockEntities (Lcom/mojang/datafixers/schemas/Schema;)Ljava/util/Map; + ARG 1 schema + METHOD registerEntities (Lcom/mojang/datafixers/schemas/Schema;)Ljava/util/Map; + ARG 1 schema METHOD registerTypes (Lcom/mojang/datafixers/schemas/Schema;Ljava/util/Map;Ljava/util/Map;)V + ARG 1 schema ARG 2 entityTypes ARG 3 blockEntityTypes + CLASS 1 + METHOD apply (Lcom/mojang/serialization/DynamicOps;Ljava/lang/Object;)Ljava/lang/Object; + ARG 1 ops + ARG 2 value diff --git a/mappings/net/minecraft/enchantment/Enchantment.mapping b/mappings/net/minecraft/enchantment/Enchantment.mapping index 19fcb7a6a1..b851bb208a 100644 --- a/mappings/net/minecraft/enchantment/Enchantment.mapping +++ b/mappings/net/minecraft/enchantment/Enchantment.mapping @@ -1,11 +1,12 @@ CLASS net/minecraft/class_1887 net/minecraft/enchantment/Enchantment - FIELD field_9083 type Lnet/minecraft/class_1886; + FIELD field_45769 registryEntry Lnet/minecraft/class_6880$class_6883; + FIELD field_9083 target Lnet/minecraft/class_1886; FIELD field_9084 translationKey Ljava/lang/String; FIELD field_9085 rarity Lnet/minecraft/class_1887$class_1888; FIELD field_9086 slotTypes [Lnet/minecraft/class_1304; METHOD (Lnet/minecraft/class_1887$class_1888;Lnet/minecraft/class_1886;[Lnet/minecraft/class_1304;)V - ARG 1 weight - ARG 2 type + ARG 1 rarity + ARG 2 target ARG 3 slotTypes METHOD method_20742 getMaxPower (I)I ARG 1 level @@ -15,6 +16,7 @@ CLASS net/minecraft/class_1887 net/minecraft/enchantment/Enchantment METHOD method_25950 isAvailableForRandomSelection ()Z COMMENT {@return whether this enchantment will appear in the enchanting table or COMMENT loots with random enchant function} + METHOD method_53216 getRegistryEntry ()Lnet/minecraft/class_6880$class_6883; METHOD method_8178 onUserDamaged (Lnet/minecraft/class_1309;Lnet/minecraft/class_1297;I)V ARG 1 user ARG 2 attacker diff --git a/mappings/net/minecraft/enchantment/EnchantmentHelper.mapping b/mappings/net/minecraft/enchantment/EnchantmentHelper.mapping index d7f2ec9f89..37c73e38be 100644 --- a/mappings/net/minecraft/enchantment/EnchantmentHelper.mapping +++ b/mappings/net/minecraft/enchantment/EnchantmentHelper.mapping @@ -38,6 +38,9 @@ CLASS net/minecraft/class_1890 net/minecraft/enchantment/EnchantmentHelper METHOD method_37427 getIdFromNbt (Lnet/minecraft/class_2487;)Lnet/minecraft/class_2960; ARG 0 nbt METHOD method_42304 getSwiftSneakSpeedBoost (Lnet/minecraft/class_1309;)F + ARG 0 entity + METHOD method_49189 hasSilkTouch (Lnet/minecraft/class_1799;)Z + ARG 0 stack METHOD method_8198 (Lnet/minecraft/class_1309;Lnet/minecraft/class_1297;Lnet/minecraft/class_1887;I)V ARG 2 enchantment ARG 3 level diff --git a/mappings/net/minecraft/entity/AnimationState.mapping b/mappings/net/minecraft/entity/AnimationState.mapping index a2d8b107b9..fea335f42d 100644 --- a/mappings/net/minecraft/entity/AnimationState.mapping +++ b/mappings/net/minecraft/entity/AnimationState.mapping @@ -14,3 +14,6 @@ CLASS net/minecraft/class_7094 net/minecraft/entity/AnimationState ARG 1 animationProgress ARG 2 speedMultiplier METHOD method_43687 getTimeRunning ()J + METHOD method_45317 setRunning (ZI)V + ARG 1 running + ARG 2 age diff --git a/mappings/net/minecraft/entity/AreaEffectCloudEntity.mapping b/mappings/net/minecraft/entity/AreaEffectCloudEntity.mapping index 1fe92167e7..fa117895c9 100644 --- a/mappings/net/minecraft/entity/AreaEffectCloudEntity.mapping +++ b/mappings/net/minecraft/entity/AreaEffectCloudEntity.mapping @@ -1,5 +1,6 @@ CLASS net/minecraft/class_1295 net/minecraft/entity/AreaEffectCloudEntity FIELD field_29971 MAX_RADIUS F + FIELD field_45738 EFFECTS_NBT_KEY Ljava/lang/String; FIELD field_5928 customColor Z FIELD field_5929 radiusOnUse F FIELD field_5930 radiusGrowth F @@ -40,7 +41,6 @@ CLASS net/minecraft/class_1295 net/minecraft/entity/AreaEffectCloudEntity ARG 1 waiting METHOD method_5599 getRadius ()F METHOD method_5600 getParticleType ()Lnet/minecraft/class_2394; - METHOD method_5601 getOwner ()Lnet/minecraft/class_1309; METHOD method_5602 setColor (I)V ARG 1 rgb METHOD method_5603 setRadius (F)V diff --git a/mappings/net/minecraft/entity/Attackable.mapping b/mappings/net/minecraft/entity/Attackable.mapping new file mode 100644 index 0000000000..4c2a2f787f --- /dev/null +++ b/mappings/net/minecraft/entity/Attackable.mapping @@ -0,0 +1,2 @@ +CLASS net/minecraft/class_8149 net/minecraft/entity/Attackable + METHOD method_49107 getLastAttacker ()Lnet/minecraft/class_1309; diff --git a/mappings/net/minecraft/entity/CrossbowUser.mapping b/mappings/net/minecraft/entity/CrossbowUser.mapping index 83a73826d9..e8e16de0ed 100644 --- a/mappings/net/minecraft/entity/CrossbowUser.mapping +++ b/mappings/net/minecraft/entity/CrossbowUser.mapping @@ -11,7 +11,7 @@ CLASS net/minecraft/class_3745 net/minecraft/entity/CrossbowUser ARG 3 projectile ARG 4 multishotSpray ARG 5 speed - METHOD method_24653 getProjectileLaunchVelocity (Lnet/minecraft/class_1309;Lnet/minecraft/class_243;F)Lnet/minecraft/class_1160; + METHOD method_24653 getProjectileLaunchVelocity (Lnet/minecraft/class_1309;Lnet/minecraft/class_243;F)Lorg/joml/Vector3f; ARG 1 entity ARG 2 positionDelta ARG 3 multishotSpray diff --git a/mappings/net/minecraft/entity/Entity.mapping b/mappings/net/minecraft/entity/Entity.mapping index 547e7e65ef..537df605ee 100644 --- a/mappings/net/minecraft/entity/Entity.mapping +++ b/mappings/net/minecraft/entity/Entity.mapping @@ -133,11 +133,9 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity COMMENT @see Entity#removePassenger FIELD field_29988 DEFAULT_PORTAL_COOLDOWN I COMMENT @see Entity#getDefaultPortalCooldown - FIELD field_29989 MAX_SCOREBOARD_TAGS I - COMMENT @see Entity#addScoreboardTag + FIELD field_29989 MAX_COMMAND_TAGS I + COMMENT @see Entity#addCommandTag COMMENT @see Entity#readNbt - FIELD field_29990 VELOCITY_AFFECTING_POS_Y_OFFSET D - COMMENT @see Entity#getVelocityAffectingPos FIELD field_29992 DEFAULT_MIN_FREEZE_DAMAGE_TICKS I COMMENT @see Entity#getMinFreezeDamageTicks FIELD field_29993 FREEZING_DAMAGE_INTERVAL I @@ -147,7 +145,10 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity FIELD field_34927 collidedSoftly Z FIELD field_35101 chunkPos Lnet/minecraft/class_1923; FIELD field_35588 blockStateAtPos Lnet/minecraft/class_2680; + FIELD field_36331 groundCollision Z FIELD field_38931 trackedPosition Lnet/minecraft/class_7422; + FIELD field_44784 supportingBlockPos Ljava/util/Optional; + FIELD field_44873 forceUpdateSupportingBlockPos Z FIELD field_5951 ridingCooldown I FIELD field_5952 onGround Z FIELD field_5953 firstUpdate Z @@ -208,7 +209,7 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity FIELD field_6021 uuid Ljava/util/UUID; FIELD field_6025 NULL_BOX Lnet/minecraft/class_238; FIELD field_6027 CUSTOM_NAME Lnet/minecraft/class_2940; - FIELD field_6029 scoreboardTags Ljava/util/Set; + FIELD field_6029 commandTags Ljava/util/Set; FIELD field_6030 EMPTY_STACK_LIST Ljava/util/List; FIELD field_6031 yaw F FIELD field_6032 AIR Lnet/minecraft/class_2940; @@ -305,12 +306,6 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity COMMENT when the player is in a 1 block tall tunnel). COMMENT COMMENT @see #isCrawling - METHOD method_20233 wouldPoseNotCollide (Lnet/minecraft/class_4050;)Z - COMMENT {@return {@code true} if the entity would not collide with blocks if the pose is - COMMENT {@code pose}} - ARG 1 pose - METHOD method_20343 calculateBoundsForPose (Lnet/minecraft/class_4050;)Lnet/minecraft/class_238; - ARG 1 pos METHOD method_20448 isCrawling ()Z COMMENT {@return whether the entity is crawling} COMMENT @@ -325,6 +320,7 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity COMMENT COMMENT @see #requestTeleportAndDismount COMMENT @see #requestTeleport + COMMENT @see #teleport(ServerWorld, double, double, double, Set, float, float) COMMENT @see #refreshPositionAndAngles(double, double, double, float, float) ARG 1 destX ARG 3 destY @@ -419,9 +415,8 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity ARG 1 x ARG 3 y ARG 5 z - METHOD method_24201 updatePassengerPosition (Lnet/minecraft/class_1297;Lnet/minecraft/class_1297$class_4738;)V + METHOD method_24201 updatePassengerPosition (Lnet/minecraft/class_1297;)V ARG 1 passenger - ARG 2 positionUpdater METHOD method_24203 refreshPositionAfterTeleport (DDD)V ARG 1 x ARG 3 y @@ -527,7 +522,7 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity METHOD method_30633 positionInPortal (Lnet/minecraft/class_2350$class_2351;Lnet/minecraft/class_5459$class_5460;)Lnet/minecraft/class_243; COMMENT {@return the entity's position in the portal after teleportation} COMMENT - COMMENT @see net.minecraft.world.dimension.AreaHelper#entityPosInPortal + COMMENT @see net.minecraft.world.dimension.NetherPortal#entityPosInPortal ARG 1 portalAxis ARG 2 portalRect METHOD method_30634 updatePosition (DDD)V @@ -565,8 +560,6 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity ARG 1 tickDelta METHOD method_31469 (Lnet/minecraft/class_1297;)Z ARG 0 entity - METHOD method_31470 (Lnet/minecraft/class_1297;Lnet/minecraft/class_1297;)Z - ARG 1 entity METHOD method_31471 onSpawnPacket (Lnet/minecraft/class_2604;)V COMMENT Called on the client when the entity receives a spawn packet. COMMENT @@ -579,8 +572,8 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity COMMENT

This does not cause the entity to drop loot. METHOD method_31473 attemptTickInVoid ()V COMMENT Calls {@link #tickInVoid()} when the entity is 64 blocks below the world's {@linkplain net.minecraft.world.HeightLimitView#getBottomY() minimum Y position}. - METHOD method_31474 (Lnet/minecraft/class_1297;)V - ARG 0 entity + METHOD method_31475 (Lnet/minecraft/class_1297;Lnet/minecraft/class_1297;)Z + ARG 1 entity METHOD method_31476 getChunkPos ()Lnet/minecraft/class_1923; COMMENT {@return the chunk position of the entity} METHOD method_31477 getBlockX ()I @@ -607,11 +600,11 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity COMMENT {@return the first passenger of the {@linkplain #getPassengerList passenger list}, COMMENT or {@code null} if there is no passengers} COMMENT - COMMENT

Such passenger is usually also the {@linkplain #getPrimaryPassenger the - COMMENT primary passenger}. + COMMENT

Such passenger is usually also the {@linkplain #getControllingPassenger the + COMMENT controlling passenger}. COMMENT - COMMENT @see #getPrimaryPassenger - COMMENT @see #hasPrimaryPassenger + COMMENT @see #getControllingPassenger + COMMENT @see #hasControllingPassenger COMMENT @see #getPassengerList METHOD method_31484 streamIntoPassengers ()Ljava/util/stream/Stream; COMMENT {@return a recursive stream of all passengers} @@ -667,9 +660,9 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity COMMENT {@return whether the entity can freeze} COMMENT COMMENT @implNote Entities cannot be frozen if they are in the {@link - COMMENT net.minecraft.tag.EntityTypeTags#FREEZE_IMMUNE_ENTITY_TYPES} tag. In addition to this, {@link + COMMENT net.minecraft.registry.tag.EntityTypeTags#FREEZE_IMMUNE_ENTITY_TYPES} tag. In addition to this, {@link COMMENT LivingEntity} cannot be frozen if they are spectator or if they wear an - COMMENT item inside {@link net.minecraft.tag.ItemTags#FREEZE_IMMUNE_WEARABLES} tag. + COMMENT item inside {@link net.minecraft.registry.tag.ItemTags#FREEZE_IMMUNE_WEARABLES} tag. METHOD method_32317 setFrozenTicks (I)V COMMENT Sets how long the entity is freezing in ticks. COMMENT @@ -717,7 +710,8 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity COMMENT Requests the entity to teleport to the given position. If the entity is COMMENT a player, this also dismounts the player. COMMENT - COMMENT @see #teleport + COMMENT @see #teleport(double, double, double) + COMMENT @see #teleport(ServerWorld, double, double, double, Set, float, float) COMMENT @see #requestTeleport COMMENT @see #refreshPositionAndAngles(double, double, double, float, float) ARG 1 destX @@ -749,7 +743,7 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity COMMENT For living entities, {@link #refreshPositionAndAngles} should be used instead. COMMENT COMMENT @see #refreshPositionAndAngles - COMMENT @see #teleport + COMMENT @see #teleport(double, double, double) ARG 1 pos METHOD method_33724 isRegionUnloaded ()Z COMMENT {@return whether any part of this entity's bounding box is in an unloaded @@ -804,8 +798,7 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity METHOD method_36975 playExtinguishSound ()V COMMENT Plays the {@link COMMENT net.minecraft.sound.SoundEvents#ENTITY_GENERIC_EXTINGUISH_FIRE} sound. - METHOD method_37215 playAmethystChimeSound (Lnet/minecraft/class_2680;)V - ARG 1 state + METHOD method_37215 playAmethystChimeSound ()V METHOD method_37216 (Lnet/minecraft/class_1297;)V ARG 0 player METHOD method_37217 (Lnet/minecraft/class_1297;)Z @@ -846,10 +839,10 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity COMMENT } COMMENT } ARG 1 callback - METHOD method_42148 hasPrimaryPassenger ()Z + METHOD method_42148 hasControllingPassenger ()Z COMMENT {@return whether there is a passenger in control of this entity} COMMENT - COMMENT @see #getPrimaryPassenger + COMMENT @see #getControllingPassenger COMMENT @see #getPassengerList COMMENT @see #getFirstPassenger METHOD method_43077 playSoundIfNotSilent (Lnet/minecraft/class_3414;)V @@ -897,8 +890,122 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity ARG 1 x ARG 3 y ARG 5 z - METHOD method_43688 getMessageSourceProfile ()Lnet/minecraft/class_7436; - METHOD method_5621 getMountedHeightOffset ()D + METHOD method_45166 requestTeleportOffset (DDD)V + COMMENT Requests the entity to teleport to the current position offset by the given amount. + COMMENT + COMMENT

For players, this sends the teleport packet. For other entities, + COMMENT this just sets the position of the entity and its passengers. + COMMENT + COMMENT @see #teleport + COMMENT @see #requestTeleport(double, double, double) + COMMENT @see #requestTeleportAndDismount + COMMENT @see #refreshPositionAndAngles(double, double, double, float, float) + ARG 1 offsetX + ARG 3 offsetY + ARG 5 offsetZ + METHOD method_45318 limitFallDistance ()V + COMMENT Called when this entity is fall flying or on a lead. + COMMENT + COMMENT

Limits this entity's {@code fallDistance} if its downward velocity isn't fast enough + COMMENT in order to prevent unwarranted fall damage. + METHOD method_45319 addVelocity (Lnet/minecraft/class_243;)V + ARG 1 velocity + METHOD method_45321 getLeashOffset (F)Lnet/minecraft/class_243; + ARG 1 tickDelta + METHOD method_46395 extinguishWithSound ()V + METHOD method_46396 reinitDimensions ()V + METHOD method_48105 teleport (Lnet/minecraft/class_3218;DDDLjava/util/Set;FF)Z + COMMENT Teleports the entity to the given position. If {@code world} differs from + COMMENT the current world, it copies the entity and discards the current one. + COMMENT + COMMENT @see #requestTeleportAndDismount + COMMENT @see #requestTeleport + COMMENT @see #teleport(double, double, double) + COMMENT @see #refreshPositionAndAngles(double, double, double, float, float) + ARG 1 world + ARG 2 destX + ARG 4 destY + ARG 6 destZ + ARG 8 flags + ARG 9 yaw + ARG 10 pitch + METHOD method_48155 canSprintAsVehicle ()Z + METHOD method_48850 onDataTrackerUpdate (Ljava/util/List;)V + ARG 1 dataEntries + METHOD method_48921 couldAcceptPassenger ()Z + COMMENT {@return {@code true} if this entity supports passengers in general} + METHOD method_48922 onDamaged (Lnet/minecraft/class_1282;)V + ARG 1 damageSource + METHOD method_48923 getDamageSources ()Lnet/minecraft/class_8109; + METHOD method_49108 canBeHitByProjectile ()Z + METHOD method_49476 getStepHeight ()F + METHOD method_49477 setStepHeight (F)V + ARG 1 stepHeight + METHOD method_49693 shouldDismountUnderwater ()Z + COMMENT {@return whether this vehicle should dismount the passenger if submerged underwater} + METHOD method_49694 getControllingVehicle ()Lnet/minecraft/class_1297; + COMMENT {@return the entity this entity rides and controls, or {@code null} if there is none} + COMMENT + COMMENT @see #getRootVehicle + COMMENT @see #getVehicle + METHOD method_49787 playCombinationStepSounds (Lnet/minecraft/class_2680;Lnet/minecraft/class_2680;)V + ARG 1 primaryState + ARG 2 secondaryState + METHOD method_49788 getStepSoundPos (Lnet/minecraft/class_2338;)Lnet/minecraft/class_2338; + ARG 1 pos + METHOD method_49789 (Lnet/minecraft/class_1297;)V + ARG 0 entity + METHOD method_49790 shouldPlayAmethystChimeSound (Lnet/minecraft/class_2680;)Z + ARG 1 state + METHOD method_49792 teleportPassengers ()V + METHOD method_51152 getNameLabelHeight ()F + METHOD method_51295 playSwimSound ()V + METHOD method_51296 playSecondaryStepSound (Lnet/minecraft/class_2680;)V + ARG 1 state + METHOD method_51297 playStepSounds (Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;)V + ARG 1 pos + ARG 2 state + METHOD method_51502 setWorld (Lnet/minecraft/class_1937;)V + ARG 1 world + METHOD method_51701 stepOnBlock (Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;ZZLnet/minecraft/class_243;)Z + ARG 1 pos + ARG 2 state + ARG 3 playSound + ARG 4 emitEvent + ARG 5 movement + METHOD method_51702 canClimb (Lnet/minecraft/class_2680;)Z + ARG 1 state + METHOD method_51703 updateSupportingBlockPos (ZLnet/minecraft/class_243;)V + ARG 1 onGround + ARG 2 movement + METHOD method_51848 getPortalCooldown ()I + METHOD method_51849 isSupportedBy (Lnet/minecraft/class_2338;)Z + ARG 1 pos + METHOD method_51850 setPortalCooldown (I)V + ARG 1 portalCooldown + METHOD method_52172 isOnRail ()Z + METHOD method_52208 setOnGround (ZLnet/minecraft/class_243;)V + ARG 1 onGround + ARG 2 movement + METHOD method_52532 lerpPosAndRotation (IDDDDD)V + ARG 1 step + ARG 2 x + ARG 4 y + ARG 6 z + ARG 8 yaw + ARG 10 pitch + METHOD method_52533 getPassengerAttachmentPos (Lnet/minecraft/class_1297;Lnet/minecraft/class_4048;F)Lorg/joml/Vector3f; + ARG 1 passenger + ARG 2 dimensions + ARG 3 scaleFactor + METHOD method_52534 shouldControlVehicles ()Z + METHOD method_52535 isInFluid ()Z + METHOD method_52536 getRidingOffset (Lnet/minecraft/class_1297;)F + ARG 1 vehicle + METHOD method_52537 getUnscaledRidingOffset (Lnet/minecraft/class_1297;)F + ARG 1 vehicle + METHOD method_52538 getPassengerRidingPos (Lnet/minecraft/class_1297;)Lnet/minecraft/class_243; + ARG 1 passenger METHOD method_5622 onBlockCollision (Lnet/minecraft/class_2680;)V COMMENT Called when this entity's collision box intersects {@code state}. COMMENT @@ -996,13 +1103,13 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity ARG 5 z ARG 7 yaw ARG 8 pitch - METHOD method_5642 getPrimaryPassenger ()Lnet/minecraft/class_1297; + METHOD method_5642 getControllingPassenger ()Lnet/minecraft/class_1309; COMMENT {@return the passenger in control of this entity, or {@code null} if there is none} COMMENT COMMENT

Rideable entities should override this to return the entity. This is COMMENT usually {@code #getFirstPassenger}. COMMENT - COMMENT @see #hasPrimaryPassenger + COMMENT @see #hasControllingPassenger COMMENT @see #getPassengerList COMMENT @see #getFirstPassenger METHOD method_5643 damage (Lnet/minecraft/class_1282;F)Z @@ -1064,7 +1171,7 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity METHOD method_5651 readNbt (Lnet/minecraft/class_2487;)V ARG 1 nbt METHOD method_5652 writeCustomDataToNbt (Lnet/minecraft/class_2487;)V - COMMENT Writes custom data to {@code nbt}. Subclasses has to implement this. + COMMENT Writes custom data to {@code nbt}. Subclasses have to implement this. COMMENT COMMENT

NBT is a storage format; therefore, a data from NBT is loaded to an entity instance's COMMENT fields, which are used for other operations instead of the NBT. The data is written @@ -1085,7 +1192,8 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity COMMENT

This is saved on the {@code Invulnerable} NBT key. COMMENT COMMENT @implNote Invulnerable entities are immune from all damages except {@link - COMMENT DamageSource#OUT_OF_WORLD} and damages by creative mode players by default. + COMMENT net.minecraft.entity.damage.DamageTypes#OUT_OF_WORLD} + COMMENT and damages by creative mode players by default. COMMENT COMMENT @see #isInvulnerableTo COMMENT @see #setInvulnerable @@ -1172,7 +1280,6 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity COMMENT @apiNote Aquatic mobs should override this to return {@code false}. COMMENT Players are not pushed by fluids if they can fly (e.g. because of game mode). METHOD method_5676 getBurningDuration ()I - METHOD method_5678 getHeightOffset ()D METHOD method_5679 isInvulnerableTo (Lnet/minecraft/class_1282;)Z COMMENT {@return whether the entity is invulnerable to {@code damageSource}} COMMENT @@ -1180,11 +1287,13 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity COMMENT {@code super.isInvulnerableTo()} should be called in this case. COMMENT COMMENT @implNote Entity is invulnerable to all damages if it is {@linkplain #isRemoved - COMMENT removed}, and is invulnerable to all damages except {@link DamageSource#OUT_OF_WORLD} + COMMENT removed}, and is invulnerable to all damages except {@link + COMMENT net.minecraft.entity.damage.DamageTypes#OUT_OF_WORLD} COMMENT or damages from creative mode players if the entity is {@linkplain #isInvulnerable COMMENT invulnerable}. This also checks {@link #isFireImmune}. COMMENT - COMMENT @see DamageSource + COMMENT @see net.minecraft.entity.damage.DamageSources + COMMENT @see net.minecraft.registry.tag.DamageTypeTags COMMENT @see #isFireImmune COMMENT @see #damage COMMENT @see #isInvulnerable @@ -1213,7 +1322,8 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity COMMENT

This is saved on the {@code Invulnerable} NBT key. COMMENT COMMENT @implNote Invulnerable entities are immune from all damages except {@link - COMMENT DamageSource#OUT_OF_WORLD} and damages by creative mode players by default. + COMMENT net.minecraft.entity.damage.DamageTypes#OUT_OF_WORLD} + COMMENT and damages by creative mode players by default. COMMENT COMMENT @see #isInvulnerableTo COMMENT @see #isInvulnerable @@ -1221,7 +1331,7 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity METHOD method_5685 getPassengerList ()Ljava/util/List; COMMENT {@return the list of passengers of this entity} COMMENT - COMMENT @see #getPrimaryPassenger + COMMENT @see #getControllingPassenger COMMENT @see #getFirstPassenger COMMENT @see #streamIntoPassengers COMMENT @see #streamSelfAndPassengers @@ -1480,12 +1590,12 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity COMMENT @see #streamPassengersAndSelf METHOD method_5737 getSwimSound ()Lnet/minecraft/class_3414; METHOD method_5738 removeScoreboardTag (Ljava/lang/String;)Z - COMMENT Removes a scoreboard tag from this entity. + COMMENT Removes a command tag from this entity. COMMENT - COMMENT

Scoreboard tags are set using the {@linkplain net.minecraft.server.command.TagCommand + COMMENT

Command tags are set using the {@linkplain net.minecraft.server.command.TagCommand COMMENT /tag command}, and is different from entity type tags defined in data packs. COMMENT - COMMENT @return whether the scoreboard tag was successfully removed + COMMENT @return whether the command tag was successfully removed ARG 1 tag METHOD method_5739 distanceTo (Lnet/minecraft/class_1297;)F COMMENT {@return the distance between this entity and {@code entity}} @@ -1538,7 +1648,7 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity COMMENT @see #getAir COMMENT @see #setAir METHOD method_5749 readCustomDataFromNbt (Lnet/minecraft/class_2487;)V - COMMENT Reads custom data from {@code nbt}. Subclasses has to implement this. + COMMENT Reads custom data from {@code nbt}. Subclasses have to implement this. COMMENT COMMENT

NBT is a storage format; therefore, a data from NBT is loaded to an entity instance's COMMENT fields, which are used for other operations instead of the NBT. The data is written @@ -1560,13 +1670,14 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity COMMENT

This is used for calculating the leash offset. COMMENT COMMENT @see #getLeashOffset - METHOD method_5752 getScoreboardTags ()Ljava/util/Set; - COMMENT {@return all scoreboard tags the entity belongs to} + METHOD method_5752 getCommandTags ()Ljava/util/Set; + COMMENT {@return all command tags the entity belongs to} COMMENT COMMENT

Scoreboard tags are set using the {@linkplain net.minecraft.server.command.TagCommand COMMENT /tag command}, and is different from entity type tags defined in data packs. METHOD method_5753 isFireImmune ()Z - COMMENT {@return whether the entity is immune to {@linkplain DamageSource#setFire fire damage}} + COMMENT {@return whether the entity is immune to {@linkplain + COMMENT net.minecraft.registry.tag.DamageTypeTags#IS_FIRE fire damage}} COMMENT COMMENT @see EntityType.Builder#makeFireImmune METHOD method_5755 getMovementDirection ()Lnet/minecraft/class_2350; @@ -1586,14 +1697,13 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity COMMENT

This returns {@code false} if {@link #noClip} is {@code true}; otherwise, COMMENT this returns {@code true} if the eye position is occupied by a {@linkplain COMMENT net.minecraft.block.AbstractBlock.Settings#suffocates block that can suffocate}. - METHOD method_5759 updateTrackedPositionAndAngles (DDDFFIZ)V + METHOD method_5759 updateTrackedPositionAndAngles (DDDFFI)V ARG 1 x ARG 3 y ARG 5 z ARG 7 yaw ARG 8 pitch ARG 9 interpolationSteps - ARG 10 interpolate METHOD method_5760 tickPortalCooldown ()V METHOD method_5762 addVelocity (DDD)V ARG 1 deltaX @@ -1676,10 +1786,10 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity COMMENT @see #dropItem(ItemConvertible, int) COMMENT @see #dropStack(ItemStack, float) ARG 1 stack - METHOD method_5776 hasWings ()Z - COMMENT {@return whether the entity has wings} + METHOD method_5776 isFlappingWings ()Z + COMMENT {@return whether the entity is flapping their wings} COMMENT - COMMENT

Entities with wings will call {@link #addFlapEffects} inside + COMMENT

Entities flapping their wings will call {@link #addFlapEffects} inside COMMENT {@link #addAirTravelEffects}. METHOD method_5777 isSubmergedIn (Lnet/minecraft/class_6862;)Z COMMENT {@return whether the entity is submerged in a fluid in {@code fluidTag}} @@ -1693,14 +1803,14 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity COMMENT An ender dragon is composed of several entity parts; each part returns {@code true} COMMENT for {@code part.isPartOf(dragon)}. ARG 1 entity - METHOD method_5780 addScoreboardTag (Ljava/lang/String;)Z - COMMENT Adds a scoreboard tag to this entity. An entity can have up to {@code 1024} - COMMENT scoreboard tags. + METHOD method_5780 addCommandTag (Ljava/lang/String;)Z + COMMENT Adds a command tag to this entity. An entity can have up to {@code 1024} + COMMENT command tags. COMMENT - COMMENT

Scoreboard tags are set using the {@linkplain net.minecraft.server.command.TagCommand + COMMENT

Command tags are set using the {@linkplain net.minecraft.server.command.TagCommand COMMENT /tag command}, and is different from entity type tags defined in data packs. COMMENT - COMMENT @return whether the scoreboard tag was successfully added + COMMENT @return whether the command tag was successfully added ARG 1 tag METHOD method_5781 getScoreboardTeam ()Lnet/minecraft/class_270; COMMENT {@return the scoreboard team the entity belongs to, or {@code null} if there is none} @@ -1732,18 +1842,7 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity COMMENT on the server; for player-ridden entities, this checks whether the entity COMMENT is on the client. COMMENT - COMMENT @see #getPrimaryPassenger - METHOD method_5788 canBeRiddenInWater ()Z - COMMENT {@return whether the passenger dismounts this entity when the entity is submerged - COMMENT in water} - COMMENT - COMMENT

This is not used to check whether the entity can start riding this entity in the - COMMENT first place; override {@link #canAddPassenger} instead. - COMMENT - COMMENT @apiNote This returns {@code true} for non-living entities and {@link - COMMENT net.minecraft.entity.mob.SkeletonHorseEntity}. - COMMENT - COMMENT @see #canAddPassenger + COMMENT @see #getControllingPassenger METHOD method_5790 updateSwimming ()V METHOD method_5791 getHeadYaw ()F COMMENT {@return the head yaw of the entity} @@ -1791,7 +1890,7 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity COMMENT COMMENT

The actual flapping logic should be done in {@link #tick()} instead. COMMENT - COMMENT

This is only called when the entity {@linkplain #hasWings() has wings} + COMMENT

This is only called when the entity {@linkplain #isFlappingWings() is flapping wings} COMMENT and the entity {@linkplain #getMoveEffect() has any move effect}, from COMMENT {@link #addAirTravelEffects()}. METHOD method_5802 getRotationClient ()Lnet/minecraft/class_241; @@ -1864,7 +1963,7 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity COMMENT For living entities, {@link #refreshPositionAndAngles} should be used instead. COMMENT COMMENT @see #refreshPositionAndAngles - COMMENT @see #teleport + COMMENT @see #teleport(double, double, double) ARG 1 x ARG 3 y ARG 5 z @@ -1937,7 +2036,7 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity METHOD method_5825 tickInVoid ()V COMMENT Called when the entity is 64 blocks below the world's {@linkplain net.minecraft.world.HeightLimitView#getBottomY() minimum Y position}. COMMENT - COMMENT

{@linkplain LivingEntity Living entities} use this to deal {@linkplain net.minecraft.entity.damage.DamageSource#OUT_OF_WORLD out of world damage}. + COMMENT

{@linkplain LivingEntity Living entities} use this to deal {@linkplain net.minecraft.entity.damage.DamageTypes#OUT_OF_WORLD out of world damage}. METHOD method_5826 setUuid (Ljava/util/UUID;)V COMMENT Sets the UUID of the entity to {@code uuid}. COMMENT @@ -2051,6 +2150,7 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity COMMENT {@return the entity this entity rides, or {@code null} if there is none} COMMENT COMMENT @see #getRootVehicle + COMMENT @see #getControllingVehicle METHOD method_5855 setAir (I)V COMMENT Sets the air left for the entity in ticks. COMMENT @@ -2080,7 +2180,9 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity COMMENT

For players, this sends the teleport packet. For other entities, COMMENT this just sets the position of the entity and its passengers. COMMENT - COMMENT @see #teleport + COMMENT @see #teleport(double, double, double) + COMMENT @see #teleport(ServerWorld, double, double, double, Set, float, float) + COMMENT @see #requestTeleportOffset(double, double, double) COMMENT @see #requestTeleportAndDismount COMMENT @see #refreshPositionAndAngles(double, double, double, float, float) ARG 1 destX @@ -2116,8 +2218,9 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity COMMENT {@return whether the entity can be hit with a projectile or be targeted by COMMENT the player crosshair} METHOD method_5864 getType ()Lnet/minecraft/class_1299; - METHOD method_5865 updatePassengerPosition (Lnet/minecraft/class_1297;)V + METHOD method_5865 updatePassengerPosition (Lnet/minecraft/class_1297;Lnet/minecraft/class_1297$class_4738;)V ARG 1 passenger + ARG 2 positionUpdater METHOD method_5867 calculateNextStepSoundDistance ()F METHOD method_5869 isSubmergedInWater ()Z COMMENT {@return whether this entity's hitbox is fully submerged in water} @@ -2190,8 +2293,9 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity COMMENT @see #readNbt COMMENT @see #moveToWorld ARG 1 original - METHOD method_5879 animateDamage ()V + METHOD method_5879 animateDamage (F)V COMMENT Called on the client to animate the entity's damage (the wobble). + ARG 1 yaw METHOD method_5880 setCustomNameVisible (Z)V COMMENT Sets whether the custom name should be shown. COMMENT @@ -2205,6 +2309,7 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity COMMENT

To despawn this entity, call {@link #discard}. COMMENT COMMENT @see #discard + METHOD method_6034 canMoveVoluntarily ()Z METHOD method_7325 isSpectator ()Z COMMENT {@return whether the entity is a spectator} COMMENT diff --git a/mappings/net/minecraft/entity/EntityStatuses.mapping b/mappings/net/minecraft/entity/EntityStatuses.mapping index 9b979d64e0..51ccc47f90 100644 --- a/mappings/net/minecraft/entity/EntityStatuses.mapping +++ b/mappings/net/minecraft/entity/EntityStatuses.mapping @@ -5,18 +5,14 @@ CLASS net/minecraft/class_6024 net/minecraft/entity/EntityStatuses FIELD field_29998 BREAK_SHIELD B FIELD field_29999 PULL_HOOKED_ENTITY B FIELD field_30000 HIT_ARMOR_STAND B - FIELD field_30001 DAMAGE_FROM_THORNS B FIELD field_30002 STOP_LOOKING_AT_VILLAGER B FIELD field_30003 USE_TOTEM_OF_UNDYING B - FIELD field_30004 DAMAGE_FROM_DROWNING B - FIELD field_30005 DAMAGE_FROM_FIRE B FIELD field_30006 ADD_DOLPHIN_HAPPY_VILLAGER_PARTICLES B FIELD field_30007 STUN_RAVAGER B FIELD field_30008 TAME_OCELOT_FAILED B FIELD field_30009 TAME_OCELOT_SUCCESS B FIELD field_30010 ADD_SPLASH_PARTICLES B FIELD field_30011 ADD_CLOUD_PARTICLES B - FIELD field_30012 DAMAGE_FROM_BERRY_BUSH B FIELD field_30013 CREATE_EATING_PARTICLES B FIELD field_30014 ADD_PORTAL_PARTICLES B FIELD field_30015 BREAK_MAINHAND B @@ -30,8 +26,6 @@ CLASS net/minecraft/class_6024 net/minecraft/entity/EntityStatuses FIELD field_30023 DRIP_RICH_HONEY B FIELD field_30024 SWAP_HANDS B FIELD field_30025 RESET_WOLF_SHAKE B - FIELD field_30026 DAMAGE_FROM_FREEZING B - FIELD field_30027 DAMAGE_FROM_GENERIC_SOURCE B FIELD field_30028 PLAY_DEATH_SOUND_OR_ADD_PROJECTILE_HIT_PARTICLES B FIELD field_30029 PLAY_ATTACK_SOUND B FIELD field_30031 ADD_NEGATIVE_PLAYER_REACTION_PARTICLES B @@ -60,3 +54,4 @@ CLASS net/minecraft/class_6024 net/minecraft/entity/EntityStatuses FIELD field_33691 ADD_DEATH_PARTICLES B FIELD field_38094 EARS_TWITCH B FIELD field_38847 SONIC_BOOM B + FIELD field_42621 START_DIGGING B diff --git a/mappings/net/minecraft/entity/EntityType.mapping b/mappings/net/minecraft/entity/EntityType.mapping index 3d9e10ebcb..885792230b 100644 --- a/mappings/net/minecraft/entity/EntityType.mapping +++ b/mappings/net/minecraft/entity/EntityType.mapping @@ -8,6 +8,7 @@ CLASS net/minecraft/class_1299 net/minecraft/entity/EntityType FIELD field_25355 canSpawnInside Lcom/google/common/collect/ImmutableSet; FIELD field_30053 ENTITY_TAG_KEY Ljava/lang/String; FIELD field_36398 registryEntry Lnet/minecraft/class_6880$class_6883; + FIELD field_40115 requiredFeatures Lnet/minecraft/class_7699; FIELD field_6056 saveable Z FIELD field_6072 summonable Z FIELD field_6088 LOGGER Lorg/slf4j/Logger; @@ -15,7 +16,7 @@ CLASS net/minecraft/class_1299 net/minecraft/entity/EntityType FIELD field_6094 spawnGroup Lnet/minecraft/class_1311; FIELD field_6101 factory Lnet/minecraft/class_1299$class_4049; FIELD field_6106 translationKey Ljava/lang/String; - METHOD (Lnet/minecraft/class_1299$class_4049;Lnet/minecraft/class_1311;ZZZZLcom/google/common/collect/ImmutableSet;Lnet/minecraft/class_4048;II)V + METHOD (Lnet/minecraft/class_1299$class_4049;Lnet/minecraft/class_1311;ZZZZLcom/google/common/collect/ImmutableSet;Lnet/minecraft/class_4048;IILnet/minecraft/class_7699;)V ARG 1 factory ARG 2 spawnGroup ARG 3 saveable @@ -26,6 +27,7 @@ CLASS net/minecraft/class_1299 net/minecraft/entity/EntityType ARG 8 dimensions ARG 9 maxTrackDistance ARG 10 trackTickInterval + ARG 11 requiredFeatures METHOD method_16351 getLootTableId ()Lnet/minecraft/class_2960; METHOD method_17683 createSimpleBoundingBox (DDD)Lnet/minecraft/class_238; ARG 1 feetX @@ -72,6 +74,37 @@ CLASS net/minecraft/class_1299 net/minecraft/entity/EntityType ARG 1 world METHOD method_35050 getUntranslatedName ()Ljava/lang/String; METHOD method_40124 getRegistryEntry ()Lnet/minecraft/class_6880$class_6883; + METHOD method_47821 spawn (Lnet/minecraft/class_3218;Lnet/minecraft/class_2338;Lnet/minecraft/class_3730;)Lnet/minecraft/class_1297; + ARG 1 world + ARG 2 pos + ARG 3 reason + METHOD method_47823 (Lnet/minecraft/class_1297;)V + ARG 0 entity + METHOD method_48008 (Lnet/minecraft/class_3218;Lnet/minecraft/class_1657;Lnet/minecraft/class_2487;Lnet/minecraft/class_1297;)V + ARG 3 entity + METHOD method_48009 copier (Lnet/minecraft/class_3218;Lnet/minecraft/class_1799;Lnet/minecraft/class_1657;)Ljava/util/function/Consumer; + ARG 0 world + ARG 1 stack + ARG 2 player + METHOD method_48010 (Lnet/minecraft/class_1799;Lnet/minecraft/class_1297;)V + ARG 1 entity + METHOD method_48011 nbtCopier (Ljava/util/function/Consumer;Lnet/minecraft/class_3218;Lnet/minecraft/class_1799;Lnet/minecraft/class_1657;)Ljava/util/function/Consumer; + ARG 0 chained + ARG 1 world + ARG 2 stack + ARG 3 player + METHOD method_48012 customNameCopier (Ljava/util/function/Consumer;Lnet/minecraft/class_1799;)Ljava/util/function/Consumer; + ARG 0 chained + ARG 1 stack + METHOD method_48013 (Lnet/minecraft/class_1297;)V + ARG 0 entity + METHOD method_48156 copier (Ljava/util/function/Consumer;Lnet/minecraft/class_3218;Lnet/minecraft/class_1799;Lnet/minecraft/class_1657;)Ljava/util/function/Consumer; + ARG 0 chained + ARG 1 world + ARG 2 stack + ARG 3 player + METHOD method_53125 isIn (Lnet/minecraft/class_6885;)Z + ARG 1 entityTypeEntryList 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 @@ -85,15 +118,14 @@ CLASS net/minecraft/class_1299 net/minecraft/entity/EntityType ARG 1 pos ARG 2 invertY ARG 3 boundingBox - 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; + METHOD method_5888 create (Lnet/minecraft/class_3218;Lnet/minecraft/class_2487;Ljava/util/function/Consumer;Lnet/minecraft/class_2338;Lnet/minecraft/class_3730;ZZ)Lnet/minecraft/class_1297; ARG 1 world ARG 2 itemNbt - ARG 3 name - ARG 4 player - ARG 5 pos - ARG 6 spawnReason - ARG 7 alignPosition - ARG 8 invertY + ARG 3 afterConsumer + ARG 4 pos + ARG 5 reason + ARG 6 alignPosition + ARG 7 invertY METHOD method_5890 getId (Lnet/minecraft/class_1299;)Lnet/minecraft/class_2960; ARG 0 type METHOD method_5891 getSpawnGroup ()Lnet/minecraft/class_1311; @@ -116,15 +148,14 @@ CLASS net/minecraft/class_1299 net/minecraft/entity/EntityType METHOD method_5897 getName ()Lnet/minecraft/class_2561; 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; + METHOD method_5899 spawn (Lnet/minecraft/class_3218;Lnet/minecraft/class_2487;Ljava/util/function/Consumer;Lnet/minecraft/class_2338;Lnet/minecraft/class_3730;ZZ)Lnet/minecraft/class_1297; ARG 1 world ARG 2 itemNbt - ARG 3 name - ARG 4 player - ARG 5 pos - ARG 6 spawnReason - ARG 7 alignPosition - ARG 8 invertY + ARG 3 afterConsumer + ARG 4 pos + ARG 5 reason + ARG 6 alignPosition + ARG 7 invertY CLASS 1 METHOD method_31490 (Lnet/minecraft/class_1937;Ljava/util/function/Consumer;Lnet/minecraft/class_2520;)V ARG 2 nbt @@ -139,6 +170,7 @@ CLASS net/minecraft/class_1299 net/minecraft/entity/EntityType FIELD field_24087 maxTrackingRange I FIELD field_24088 trackingTickInterval I FIELD field_25356 canSpawnInside Lcom/google/common/collect/ImmutableSet; + FIELD field_40117 requiredFeatures Lnet/minecraft/class_7699; FIELD field_6148 factory Lnet/minecraft/class_1299$class_4049; FIELD field_6149 spawnGroup Lnet/minecraft/class_1311; FIELD field_6150 summonable Z @@ -165,6 +197,8 @@ CLASS net/minecraft/class_1299 net/minecraft/entity/EntityType COMMENT and wither skeletons can spawn in wither roses. If a block added is not in the default COMMENT blacklist, the addition has no effect. ARG 1 blocks + METHOD method_45323 requires ([Lnet/minecraft/class_7696;)Lnet/minecraft/class_1299$class_1300; + ARG 1 features METHOD method_5900 (Lnet/minecraft/class_1299;Lnet/minecraft/class_1937;)Lnet/minecraft/class_1297; ARG 0 type ARG 1 world diff --git a/mappings/net/minecraft/entity/EquipmentSlot.mapping b/mappings/net/minecraft/entity/EquipmentSlot.mapping index 13deb2d3c3..fae679909a 100644 --- a/mappings/net/minecraft/entity/EquipmentSlot.mapping +++ b/mappings/net/minecraft/entity/EquipmentSlot.mapping @@ -1,4 +1,18 @@ CLASS net/minecraft/class_1304 net/minecraft/entity/EquipmentSlot + COMMENT Provides enum types for several key slots found within an entity {@link net.minecraft.inventory.Inventory}. + COMMENT

+ COMMENT Each equipment slot has a type, which represents what inventory category it is contained within. + COMMENT The {@code HAND} category covers the mainhand and offhand slots, while the {@code ARMOR} category covers the 4 + COMMENT types of armor slots found in {@link net.minecraft.entity.LivingEntity}. + COMMENT

+ COMMENT Each equipment slot contains information on where that slot should be located within a parent {@link net.minecraft.inventory.Inventory}. + COMMENT {@link #getEntitySlotId()} will provide the base slot index a slot should occupy (starting from {@code 0}), + COMMENT while {@link #getOffsetEntitySlotId(int)} will return the same value added to an offset index. + COMMENT

+ COMMENT An equipment slot can be used to quickly access the item held by an inventory slot in a {@link LivingEntity} through + COMMENT methods such as {@link LivingEntity#getEquippedStack(EquipmentSlot)}, which will return the {@link net.minecraft.item.ItemStack} + COMMENT held in the entity's inventory slot pointed at by the target slot. + FIELD field_45739 CODEC Lnet/minecraft/class_3542$class_7292; FIELD field_6167 armorStandId I FIELD field_6168 entityId I FIELD field_6170 type Lnet/minecraft/class_1304$class_1305; @@ -9,14 +23,43 @@ CLASS net/minecraft/class_1304 net/minecraft/entity/EquipmentSlot ARG 5 armorStandId ARG 6 name METHOD method_20234 fromTypeIndex (Lnet/minecraft/class_1304$class_1305;I)Lnet/minecraft/class_1304; + COMMENT {@return the equipment slot where {@linkplain #getEntitySlotId() the slot ID} is equal to {@code index} and the type of the slot is equal to {@code type}} + COMMENT If no slot could be found matching the input {@code type} and {@code index}, throws {@link IllegalArgumentException}. + COMMENT + COMMENT @throws IllegalArgumentException if no slot type could be found matching {@code type} and {@code index} ARG 0 type ARG 1 index METHOD method_32320 getOffsetEntitySlotId (I)I + COMMENT {@return the index of the inventory slot this slot should occupy, plus the passed in {@code offset} amount} ARG 1 offset + METHOD method_46643 isArmorSlot ()Z METHOD method_5923 getName ()Ljava/lang/String; + COMMENT {@return the unique name of this equipment slot} + COMMENT + COMMENT

The returned value will be a lower-case string (such as "chest" for {@link #CHEST}). METHOD method_5924 byName (Ljava/lang/String;)Lnet/minecraft/class_1304; + COMMENT {@return the slot where {@linkplain #getName the name} is equal to {@code name}} + COMMENT If no slot matching the input name is found, this throws {@link IllegalArgumentException}. + COMMENT + COMMENT @throws IllegalArgumentException if no slot type could be found matching {@code name} ARG 0 name METHOD method_5925 getType ()Lnet/minecraft/class_1304$class_1305; + COMMENT {@return the target {@link EquipmentSlot.Type} that this slot targets} + COMMENT + COMMENT

+ COMMENT An equipment slot either targets the hand or body type, which can be used to determine whether a request + COMMENT to manipulate slot data on an entity should be applied to an armor inventory or general item inventory. METHOD method_5926 getArmorStandSlotId ()I + COMMENT {@return the index of the inventory slot this slot occupies in an {@link net.minecraft.entity.decoration.ArmorStandEntity}} METHOD method_5927 getEntitySlotId ()I + COMMENT {@return the index of the inventory slot this slot should occupy} + COMMENT + COMMENT

+ COMMENT In the case of {@link #MAINHAND} and {@link #OFFHAND}, this method will return 0 and 1, respectively. + COMMENT The remaining armor slots re-start at index 0 and end at index 3. + COMMENT + COMMENT

+ COMMENT To calculate the target index of an inventory slot for a slot relative to the offset index of an entire + COMMENT inventory, visit {@link #getOffsetEntitySlotId(int)}. CLASS class_1305 Type + COMMENT The type of body item slot an {@link EquipmentSlot} targets. diff --git a/mappings/net/minecraft/entity/ExperienceOrbEntity.mapping b/mappings/net/minecraft/entity/ExperienceOrbEntity.mapping index 26ad181171..bff1606002 100644 --- a/mappings/net/minecraft/entity/ExperienceOrbEntity.mapping +++ b/mappings/net/minecraft/entity/ExperienceOrbEntity.mapping @@ -2,6 +2,7 @@ CLASS net/minecraft/class_1303 net/minecraft/entity/ExperienceOrbEntity FIELD field_27009 pickingCount I FIELD field_30055 DESPAWN_AGE I FIELD field_30056 EXPENSIVE_UPDATE_INTERVAL I + FIELD field_30058 MERGING_CHANCE_FRACTION I FIELD field_6159 amount I FIELD field_6161 health I FIELD field_6162 target Lnet/minecraft/class_1657; diff --git a/mappings/net/minecraft/entity/EyeOfEnderEntity.mapping b/mappings/net/minecraft/entity/EyeOfEnderEntity.mapping index 1a47247678..f8b2220379 100644 --- a/mappings/net/minecraft/entity/EyeOfEnderEntity.mapping +++ b/mappings/net/minecraft/entity/EyeOfEnderEntity.mapping @@ -12,8 +12,6 @@ CLASS net/minecraft/class_1672 net/minecraft/entity/EyeOfEnderEntity ARG 6 z METHOD method_16933 setItem (Lnet/minecraft/class_1799;)V ARG 1 stack - METHOD method_16934 (Lnet/minecraft/class_1799;)V - ARG 0 stack METHOD method_16935 getTrackedItem ()Lnet/minecraft/class_1799; METHOD method_7478 initTargetPos (Lnet/minecraft/class_2338;)V COMMENT Sets where the eye will fly towards. diff --git a/mappings/net/minecraft/entity/FallingBlockEntity.mapping b/mappings/net/minecraft/entity/FallingBlockEntity.mapping index 6561b34aa9..6c7807d368 100644 --- a/mappings/net/minecraft/entity/FallingBlockEntity.mapping +++ b/mappings/net/minecraft/entity/FallingBlockEntity.mapping @@ -1,4 +1,5 @@ CLASS net/minecraft/class_1540 net/minecraft/entity/FallingBlockEntity + FIELD field_36333 LOGGER Lorg/slf4j/Logger; FIELD field_7187 fallHurtAmount F FIELD field_7188 block Lnet/minecraft/class_2680; FIELD field_7189 destroyedOnLanding Z @@ -25,6 +26,7 @@ CLASS net/minecraft/class_1540 net/minecraft/entity/FallingBlockEntity ARG 0 world ARG 1 pos ARG 2 state + METHOD method_49181 setDestroyedOnLanding ()V METHOD method_6962 getBlockState ()Lnet/minecraft/class_2680; METHOD method_6963 setFallingBlockPos (Lnet/minecraft/class_2338;)V ARG 1 pos diff --git a/mappings/net/minecraft/entity/InventoryOwner.mapping b/mappings/net/minecraft/entity/InventoryOwner.mapping index 29b3816b0d..ae20f287be 100644 --- a/mappings/net/minecraft/entity/InventoryOwner.mapping +++ b/mappings/net/minecraft/entity/InventoryOwner.mapping @@ -1,6 +1,11 @@ CLASS net/minecraft/class_6067 net/minecraft/entity/InventoryOwner + FIELD field_40736 INVENTORY_KEY Ljava/lang/String; METHOD method_35199 getInventory ()Lnet/minecraft/class_1277; METHOD method_43544 pickUpItem (Lnet/minecraft/class_1308;Lnet/minecraft/class_6067;Lnet/minecraft/class_1542;)V ARG 0 entity ARG 1 inventoryOwner ARG 2 item + METHOD method_46399 writeInventory (Lnet/minecraft/class_2487;)V + ARG 1 nbt + METHOD method_46400 readInventory (Lnet/minecraft/class_2487;)V + ARG 1 nbt diff --git a/mappings/net/minecraft/entity/ItemEntity.mapping b/mappings/net/minecraft/entity/ItemEntity.mapping index b3605cab3c..b1e143782b 100644 --- a/mappings/net/minecraft/entity/ItemEntity.mapping +++ b/mappings/net/minecraft/entity/ItemEntity.mapping @@ -2,6 +2,7 @@ CLASS net/minecraft/class_1542 net/minecraft/entity/ItemEntity FIELD field_30456 DESPAWN_AGE I FIELD field_30457 CANNOT_PICK_UP_DELAY I FIELD field_30458 NEVER_DESPAWN_AGE I + FIELD field_41893 owner Ljava/util/UUID; FIELD field_7199 STACK Lnet/minecraft/class_2940; FIELD field_7200 thrower Ljava/util/UUID; FIELD field_7201 health I @@ -12,7 +13,6 @@ CLASS net/minecraft/class_1542 net/minecraft/entity/ItemEntity 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_1542;)V ARG 1 entity METHOD (Lnet/minecraft/class_1937;DDDLnet/minecraft/class_1799;)V @@ -54,7 +54,8 @@ CLASS net/minecraft/class_1542 net/minecraft/entity/ItemEntity ARG 1 tickDelta METHOD method_29271 copy ()Lnet/minecraft/class_1542; METHOD method_35190 setNeverDespawn ()V - METHOD method_44329 getEventSource ()Lnet/minecraft/class_1297; + METHOD method_48349 setOwner (Ljava/util/UUID;)V + ARG 1 owner METHOD method_6972 tryMerge (Lnet/minecraft/class_1542;)V ARG 1 other METHOD method_6973 tryMerge ()V @@ -66,9 +67,6 @@ CLASS net/minecraft/class_1542 net/minecraft/entity/ItemEntity 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 @@ -81,12 +79,6 @@ CLASS net/minecraft/class_1542 net/minecraft/entity/ItemEntity 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 owner}. - 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 owner METHOD method_6985 getItemAge ()I COMMENT Returns the number of ticks since this item entity has been created. COMMENT @@ -97,12 +89,6 @@ CLASS net/minecraft/class_1542 net/minecraft/entity/ItemEntity 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 diff --git a/mappings/net/minecraft/entity/ItemSteerable.mapping b/mappings/net/minecraft/entity/ItemSteerable.mapping index d83d0291aa..fd25447056 100644 --- a/mappings/net/minecraft/entity/ItemSteerable.mapping +++ b/mappings/net/minecraft/entity/ItemSteerable.mapping @@ -1,9 +1,2 @@ CLASS net/minecraft/class_4981 net/minecraft/entity/ItemSteerable - METHOD method_26313 travel (Lnet/minecraft/class_1308;Lnet/minecraft/class_4980;Lnet/minecraft/class_243;)Z - ARG 1 entity - ARG 2 saddledEntity - ARG 3 movementInput - METHOD method_26315 setMovementInput (Lnet/minecraft/class_243;)V - ARG 1 movementInput - METHOD method_26316 getSaddledSpeed ()F METHOD method_6577 consumeOnAStickItem ()Z diff --git a/mappings/net/minecraft/entity/JumpingMount.mapping b/mappings/net/minecraft/entity/JumpingMount.mapping index 77111e37ed..c5c3c08e16 100644 --- a/mappings/net/minecraft/entity/JumpingMount.mapping +++ b/mappings/net/minecraft/entity/JumpingMount.mapping @@ -1,4 +1,5 @@ CLASS net/minecraft/class_1316 net/minecraft/entity/JumpingMount + METHOD method_45327 getJumpCooldown ()I METHOD method_6153 canJump ()Z METHOD method_6154 setJumpStrength (I)V ARG 1 strength diff --git a/mappings/net/minecraft/entity/LimbAnimator.mapping b/mappings/net/minecraft/entity/LimbAnimator.mapping new file mode 100644 index 0000000000..eee10f8255 --- /dev/null +++ b/mappings/net/minecraft/entity/LimbAnimator.mapping @@ -0,0 +1,16 @@ +CLASS net/minecraft/class_8080 net/minecraft/entity/LimbAnimator + FIELD field_42109 prevSpeed F + FIELD field_42110 speed F + FIELD field_42111 pos F + METHOD method_48566 getSpeed ()F + METHOD method_48567 setSpeed (F)V + ARG 1 speed + METHOD method_48568 updateLimbs (FF)V + ARG 1 speed + ARG 2 multiplier + METHOD method_48569 getPos ()F + METHOD method_48570 getSpeed (F)F + ARG 1 tickDelta + METHOD method_48571 isLimbMoving ()Z + METHOD method_48572 getPos (F)F + ARG 1 tickDelta diff --git a/mappings/net/minecraft/entity/LivingEntity.mapping b/mappings/net/minecraft/entity/LivingEntity.mapping index d8d65f15c5..9a2e719325 100644 --- a/mappings/net/minecraft/entity/LivingEntity.mapping +++ b/mappings/net/minecraft/entity/LivingEntity.mapping @@ -19,9 +19,12 @@ CLASS net/minecraft/class_1309 net/minecraft/entity/LivingEntity FIELD field_30079 FALL_FLYING_FLAG I FIELD field_30082 noDrag Z FIELD field_33908 MAX_ENTITY_VIEWING_DISTANCE D + FIELD field_36332 LOGGER Lorg/slf4j/Logger; FIELD field_37421 experienceDroppingDisabled Z + FIELD field_42108 limbAnimator Lnet/minecraft/class_8080; + FIELD field_45123 serverHeadYaw D + FIELD field_45740 ACTIVE_EFFECTS_NBT_KEY Ljava/lang/String; FIELD field_6210 bodyTrackingIncrements I - FIELD field_6211 lastLimbDistance F FIELD field_6212 sidewaysSpeed F FIELD field_6213 deathTime I FIELD field_6214 POTION_SWIRLS_AMBIENT Lnet/minecraft/class_2940; @@ -32,7 +35,6 @@ CLASS net/minecraft/class_1309 net/minecraft/entity/LivingEntity FIELD field_6221 serverPitch D FIELD field_6222 itemUseTimeLeft I FIELD field_6224 serverX D - FIELD field_6225 limbDistance F FIELD field_6226 lastDamageTime J FIELD field_6227 upwardSpeed F FIELD field_6228 jumpingCooldown I @@ -44,19 +46,16 @@ CLASS net/minecraft/class_1309 net/minecraft/entity/LivingEntity FIELD field_6234 syncedHandStacks Lnet/minecraft/class_2371; FIELD field_6235 hurtTime I FIELD field_6236 attacking Lnet/minecraft/class_1309; - FIELD field_6237 SPRINTING_SPEED_BOOST_ID Ljava/util/UUID; FIELD field_6238 playerHitTimer I FIELD field_6239 roll I FIELD field_6240 POTION_SWIRLS_COLOR Lnet/minecraft/class_2940; FIELD field_6241 headYaw F - FIELD field_6242 serverHeadYaw D FIELD field_6243 leaningPitch F FIELD field_6244 randomLargeSeed F FIELD field_6245 serverY D FIELD field_6246 absorptionAmount F FIELD field_6247 HEALTH Lnet/minecraft/class_2940; FIELD field_6248 syncedArmorStacks Lnet/minecraft/class_2371; - FIELD field_6249 limbAngle F FIELD field_6250 forwardSpeed F FIELD field_6251 handSwingProgress F FIELD field_6252 handSwinging Z @@ -77,7 +76,6 @@ CLASS net/minecraft/class_1309 net/minecraft/entity/LivingEntity FIELD field_6268 lastBlockPos Lnet/minecraft/class_2338; FIELD field_6269 defaultMaxHealth I FIELD field_6270 lastAttackTime I - FIELD field_6271 knockbackVelocity F FIELD field_6272 dead Z FIELD field_6273 lastAttackedTicks I FIELD field_6274 attacker Lnet/minecraft/class_1309; @@ -87,21 +85,15 @@ CLASS net/minecraft/class_1309 net/minecraft/entity/LivingEntity FIELD field_6278 despawnCounter I FIELD field_6279 handSwingTicks I FIELD field_6280 activeStatusEffects Ljava/util/Map; - FIELD field_6281 airStrafingSpeed F - COMMENT Affects horizontal aerial velocity of entities (eg. when a player jumps, - COMMENT is falling, or is flying, while holding the horizontal movement keys) FIELD field_6282 jumping Z FIELD field_6283 bodyYaw F FIELD field_6284 serverYaw D FIELD field_6285 effectsChanged Z FIELD field_6287 movementSpeed F METHOD method_16077 dropLoot (Lnet/minecraft/class_1282;Z)V - ARG 1 source + ARG 1 damageSource ARG 2 causedByPlayer METHOD method_16078 dropInventory ()V - METHOD method_16079 getLootContextBuilder (ZLnet/minecraft/class_1282;)Lnet/minecraft/class_47$class_48; - ARG 1 causedByPlayer - ARG 2 source METHOD method_16080 drop (Lnet/minecraft/class_1282;)V ARG 1 source METHOD method_16826 setDespawnCounter (I)V @@ -146,7 +138,7 @@ CLASS net/minecraft/class_1309 net/minecraft/entity/LivingEntity ARG 1 slipperiness METHOD method_18807 getDrinkSound (Lnet/minecraft/class_1799;)Lnet/minecraft/class_3414; ARG 1 stack - METHOD method_18808 getArrowType (Lnet/minecraft/class_1799;)Lnet/minecraft/class_1799; + METHOD method_18808 getProjectileType (Lnet/minecraft/class_1799;)Lnet/minecraft/class_1799; ARG 1 stack METHOD method_18865 applyFoodEffects (Lnet/minecraft/class_1799;Lnet/minecraft/class_1937;Lnet/minecraft/class_1309;)V ARG 1 stack @@ -248,9 +240,8 @@ CLASS net/minecraft/class_1309 net/minecraft/entity/LivingEntity METHOD method_28305 (Lnet/minecraft/class_2487;Lnet/minecraft/class_2520;)V ARG 1 brain METHOD method_28306 createBrainProfile ()Lnet/minecraft/class_4095$class_5303; - METHOD method_29242 updateLimbs (Lnet/minecraft/class_1309;Z)V - ARG 1 entity - ARG 2 flutter + METHOD method_29242 updateLimbs (Z)V + ARG 1 flutter METHOD method_29499 triggerItemPickedUpByEntityCriteria (Lnet/minecraft/class_1542;)V COMMENT Called to trigger advancement criteria when an entity picks up an item COMMENT thrown by a player. @@ -329,15 +320,53 @@ CLASS net/minecraft/class_1309 net/minecraft/entity/LivingEntity COMMENT the source entity or {@code null} for non-entity sources METHOD method_37410 processEquippedStack (Lnet/minecraft/class_1799;)V ARG 1 stack - METHOD method_37416 getJumpBoostVelocityModifier ()D + METHOD method_37416 getJumpBoostVelocityModifier ()F METHOD method_39760 getFallSounds ()Lnet/minecraft/class_1309$class_6823; METHOD method_41329 disableExperienceDropping ()V METHOD method_41330 isExperienceDroppingDisabled ()Z METHOD method_42149 disablesShield ()Z METHOD method_44201 isArmorSlot (Lnet/minecraft/class_1304;)Z ARG 1 slot - METHOD method_44202 playEquipSound (Lnet/minecraft/class_1799;)V + METHOD method_45324 areItemsDifferent (Lnet/minecraft/class_1799;Lnet/minecraft/class_1799;)Z ARG 1 stack + ARG 2 stack2 + METHOD method_45325 getAttributeValue (Lnet/minecraft/class_6880;)D + ARG 1 attribute + METHOD method_45326 getAttributeBaseValue (Lnet/minecraft/class_6880;)D + ARG 1 attribute + METHOD method_48157 getDamageTiltYaw ()F + METHOD method_48565 updateLimbs (F)V + ARG 1 posDelta + METHOD method_48761 tiltScreen (DD)V + ARG 1 deltaX + ARG 3 deltaZ + METHOD method_49481 tickControlled (Lnet/minecraft/class_1657;Lnet/minecraft/class_243;)V + ARG 1 controllingPlayer + ARG 2 movementInput + METHOD method_49482 getControlledMovementInput (Lnet/minecraft/class_1657;Lnet/minecraft/class_243;)Lnet/minecraft/class_243; + ARG 1 controllingPlayer + ARG 2 movementInput + METHOD method_49483 travelControlled (Lnet/minecraft/class_1657;Lnet/minecraft/class_243;)V + ARG 1 controllingPlayer + ARG 2 movementInput + METHOD method_49484 getOffGroundSpeed ()F + METHOD method_49485 getSaddledSpeed (Lnet/minecraft/class_1657;)F + ARG 1 controllingPlayer + METHOD method_51851 getLootTableSeed ()J + METHOD method_52197 sendEffectToControllingPlayer (Lnet/minecraft/class_1293;)V + ARG 1 effect + METHOD method_52540 updateAttribute (Lnet/minecraft/class_1320;)V + ARG 1 attribute + METHOD method_52541 getMaxAbsorption ()F + METHOD method_52542 wouldNotSuffocateInPose (Lnet/minecraft/class_4050;)Z + ARG 1 pose + METHOD method_52543 updateAttributes ()V + METHOD method_52544 setAbsorptionAmountUnclamped (F)V + ARG 1 absorptionAmount + METHOD method_53510 getHitbox ()Lnet/minecraft/class_238; + COMMENT Gets the area in which this entity can be attacked by mobs whose attack box overlaps it. + COMMENT + COMMENT @see net.minecraft.entity.mob.MobEntity#getAttackBox METHOD method_5973 canTarget (Lnet/minecraft/class_1299;)Z ARG 1 type METHOD method_5989 getLootTable ()Lnet/minecraft/class_2960; @@ -412,7 +441,6 @@ CLASS net/minecraft/class_1309 net/minecraft/entity/LivingEntity METHOD method_6032 getHealth ()F METHOD method_6033 setHealth (F)V ARG 1 health - METHOD method_6034 canMoveVoluntarily ()Z METHOD method_6035 tickRiptide (Lnet/minecraft/class_238;Lnet/minecraft/class_238;)V ARG 1 a ARG 2 b @@ -491,7 +519,7 @@ CLASS net/minecraft/class_1309 net/minecraft/entity/LivingEntity COMMENT @see #getXpToDrop() METHOD method_6072 updateLeaningPitch ()V METHOD method_6073 setAbsorptionAmount (F)V - ARG 1 amount + ARG 1 absorptionAmount METHOD method_6074 applyDamage (Lnet/minecraft/class_1282;F)V ARG 1 source ARG 2 amount diff --git a/mappings/net/minecraft/entity/Ownable.mapping b/mappings/net/minecraft/entity/Ownable.mapping new file mode 100644 index 0000000000..bf7da1f0fc --- /dev/null +++ b/mappings/net/minecraft/entity/Ownable.mapping @@ -0,0 +1,2 @@ +CLASS net/minecraft/class_8046 net/minecraft/entity/Ownable + METHOD method_24921 getOwner ()Lnet/minecraft/class_1297; diff --git a/mappings/net/minecraft/entity/Saddleable.mapping b/mappings/net/minecraft/entity/Saddleable.mapping index 22e1cd882f..92f11c3bda 100644 --- a/mappings/net/minecraft/entity/Saddleable.mapping +++ b/mappings/net/minecraft/entity/Saddleable.mapping @@ -1,6 +1,7 @@ CLASS net/minecraft/class_5146 net/minecraft/entity/Saddleable COMMENT Represents an entity that can be saddled, either by a player or a COMMENT dispenser. + METHOD method_45328 getSaddleSound ()Lnet/minecraft/class_3414; METHOD method_6576 saddle (Lnet/minecraft/class_3419;)V ARG 1 sound METHOD method_6725 isSaddled ()Z diff --git a/mappings/net/minecraft/entity/SaddledComponent.mapping b/mappings/net/minecraft/entity/SaddledComponent.mapping index ea9dde33ad..3ec623ccaf 100644 --- a/mappings/net/minecraft/entity/SaddledComponent.mapping +++ b/mappings/net/minecraft/entity/SaddledComponent.mapping @@ -1,7 +1,6 @@ CLASS net/minecraft/class_4980 net/minecraft/entity/SaddledComponent FIELD field_23215 boosted Z FIELD field_23216 boostedTime I - FIELD field_23217 currentBoostTime I FIELD field_23218 dataTracker Lnet/minecraft/class_2945; FIELD field_23219 boostTime Lnet/minecraft/class_2940; FIELD field_23220 saddled Lnet/minecraft/class_2940; @@ -20,3 +19,6 @@ CLASS net/minecraft/class_4980 net/minecraft/entity/SaddledComponent METHOD method_26311 isSaddled ()Z METHOD method_26312 readNbt (Lnet/minecraft/class_2487;)V ARG 1 nbt + METHOD method_49478 tickBoost ()V + METHOD method_49479 getMovementSpeedMultiplier ()F + METHOD method_49480 getBoostTime ()I diff --git a/mappings/net/minecraft/entity/Tameable.mapping b/mappings/net/minecraft/entity/Tameable.mapping index e93233898e..c63fda1091 100644 --- a/mappings/net/minecraft/entity/Tameable.mapping +++ b/mappings/net/minecraft/entity/Tameable.mapping @@ -1,3 +1,3 @@ CLASS net/minecraft/class_6025 net/minecraft/entity/Tameable - METHOD method_35057 getOwner ()Lnet/minecraft/class_1297; + METHOD method_35057 getOwner ()Lnet/minecraft/class_1309; METHOD method_6139 getOwnerUuid ()Ljava/util/UUID; diff --git a/mappings/net/minecraft/entity/Targeter.mapping b/mappings/net/minecraft/entity/Targeter.mapping new file mode 100644 index 0000000000..b3d5d95c35 --- /dev/null +++ b/mappings/net/minecraft/entity/Targeter.mapping @@ -0,0 +1,2 @@ +CLASS net/minecraft/class_8152 net/minecraft/entity/Targeter + METHOD method_5968 getTarget ()Lnet/minecraft/class_1309; diff --git a/mappings/net/minecraft/entity/TntEntity.mapping b/mappings/net/minecraft/entity/TntEntity.mapping index c593c8c31e..3601cd8cd9 100644 --- a/mappings/net/minecraft/entity/TntEntity.mapping +++ b/mappings/net/minecraft/entity/TntEntity.mapping @@ -11,5 +11,4 @@ CLASS net/minecraft/class_1541 net/minecraft/entity/TntEntity METHOD method_6967 setFuse (I)V ARG 1 fuse METHOD method_6969 getFuse ()I - METHOD method_6970 getCausingEntity ()Lnet/minecraft/class_1309; METHOD method_6971 explode ()V diff --git a/mappings/net/minecraft/entity/VariantHolder.mapping b/mappings/net/minecraft/entity/VariantHolder.mapping new file mode 100644 index 0000000000..e0e7b3057f --- /dev/null +++ b/mappings/net/minecraft/entity/VariantHolder.mapping @@ -0,0 +1,4 @@ +CLASS net/minecraft/class_7988 net/minecraft/entity/VariantHolder + METHOD method_47826 setVariant (Ljava/lang/Object;)V + ARG 1 variant + METHOD method_47827 getVariant ()Ljava/lang/Object; diff --git a/mappings/net/minecraft/entity/ai/RangedAttackMob.mapping b/mappings/net/minecraft/entity/ai/RangedAttackMob.mapping index 3f09befcdd..4e94fcf1b1 100644 --- a/mappings/net/minecraft/entity/ai/RangedAttackMob.mapping +++ b/mappings/net/minecraft/entity/ai/RangedAttackMob.mapping @@ -1,4 +1,4 @@ CLASS net/minecraft/class_1603 net/minecraft/entity/ai/RangedAttackMob - METHOD method_7105 attack (Lnet/minecraft/class_1309;F)V + METHOD method_7105 shootAt (Lnet/minecraft/class_1309;F)V ARG 1 target ARG 2 pullProgress diff --git a/mappings/net/minecraft/entity/ai/brain/BlockPosLookTarget.mapping b/mappings/net/minecraft/entity/ai/brain/BlockPosLookTarget.mapping index c3ae06f4e4..6444b7eb2a 100644 --- a/mappings/net/minecraft/entity/ai/brain/BlockPosLookTarget.mapping +++ b/mappings/net/minecraft/entity/ai/brain/BlockPosLookTarget.mapping @@ -3,3 +3,5 @@ CLASS net/minecraft/class_4099 net/minecraft/entity/ai/brain/BlockPosLookTarget FIELD field_18341 pos Lnet/minecraft/class_243; METHOD (Lnet/minecraft/class_2338;)V ARG 1 blockPos + METHOD (Lnet/minecraft/class_243;)V + ARG 1 pos diff --git a/mappings/net/minecraft/entity/ai/brain/Brain.mapping b/mappings/net/minecraft/entity/ai/brain/Brain.mapping index 3058f186a4..03baa21236 100644 --- a/mappings/net/minecraft/entity/ai/brain/Brain.mapping +++ b/mappings/net/minecraft/entity/ai/brain/Brain.mapping @@ -59,6 +59,8 @@ CLASS net/minecraft/class_4095 net/minecraft/entity/ai/brain/Brain ARG 3 list METHOD method_18884 setSchedule (Lnet/minecraft/class_4170;)V ARG 1 schedule + METHOD method_18887 (Ljava/lang/Integer;)Ljava/util/Map; + ARG 0 index METHOD method_18890 setCoreActivities (Ljava/util/Set;)V ARG 1 coreActivities METHOD method_18891 startTasks (Lnet/minecraft/class_3218;Lnet/minecraft/class_1309;)V @@ -72,10 +74,12 @@ CLASS net/minecraft/class_4095 net/minecraft/entity/ai/brain/Brain METHOD method_18900 stopAllTasks (Lnet/minecraft/class_3218;Lnet/minecraft/class_1309;)V ARG 1 world ARG 2 entity - METHOD method_18904 getOptionalMemory (Lnet/minecraft/class_4140;)Ljava/util/Optional; + METHOD method_18904 getOptionalRegisteredMemory (Lnet/minecraft/class_4140;)Ljava/util/Optional; ARG 1 type METHOD method_18906 hasActivity (Lnet/minecraft/class_4168;)Z ARG 1 activity + METHOD method_18910 (Lnet/minecraft/class_4168;)Ljava/util/Set; + ARG 0 activity2 METHOD method_18911 copy ()Lnet/minecraft/class_4095; METHOD method_19542 tick (Lnet/minecraft/class_3218;Lnet/minecraft/class_1309;)V ARG 1 world @@ -92,7 +96,7 @@ CLASS net/minecraft/class_4095 net/minecraft/entity/ai/brain/Brain METHOD method_24525 remember (Lnet/minecraft/class_4140;Ljava/lang/Object;J)V ARG 1 type ARG 2 value - ARG 3 startTime + ARG 3 expiry METHOD method_24526 doExclusively (Lnet/minecraft/class_4168;)V ARG 1 activity METHOD method_24527 setTaskList (Lnet/minecraft/class_4168;ILcom/google/common/collect/ImmutableList;Lnet/minecraft/class_4140;)V @@ -128,18 +132,57 @@ CLASS net/minecraft/class_4095 net/minecraft/entity/ai/brain/Brain METHOD method_28311 createProfile (Ljava/util/Collection;Ljava/util/Collection;)Lnet/minecraft/class_4095$class_5303; ARG 0 memoryModules ARG 1 sensors + METHOD method_28312 (Ljava/util/Map$Entry;)Lnet/minecraft/class_4095$class_5302; + ARG 0 entry METHOD method_28313 createBrainCodec (Ljava/util/Collection;Ljava/util/Collection;)Lcom/mojang/serialization/Codec; ARG 0 memoryModules ARG 1 sensors METHOD method_28315 streamMemories ()Ljava/util/stream/Stream; + METHOD method_29518 (Ljava/lang/Object;Ljava/lang/Object;)Z + ARG 1 memoryValue METHOD method_29519 hasMemoryModuleWithValue (Lnet/minecraft/class_4140;Ljava/lang/Object;)Z ARG 1 type ARG 2 value METHOD method_35058 getMemories ()Ljava/util/Map; METHOD method_35059 getPossibleActivities ()Ljava/util/Set; METHOD method_35060 clear ()V - METHOD method_36978 getMemory (Lnet/minecraft/class_4140;)J + METHOD method_36978 getMemoryExpiry (Lnet/minecraft/class_4140;)J ARG 1 type + METHOD method_46873 getOptionalMemory (Lnet/minecraft/class_4140;)Ljava/util/Optional; + ARG 1 type + METHOD method_49709 forgetAll ()V + METHOD method_49710 (Lnet/minecraft/class_4140;)V + ARG 1 type + CLASS 1 + METHOD decode (Lcom/mojang/serialization/DynamicOps;Lcom/mojang/serialization/MapLike;)Lcom/mojang/serialization/DataResult; + ARG 1 ops + ARG 2 map + METHOD encode (Ljava/lang/Object;Lcom/mojang/serialization/DynamicOps;Lcom/mojang/serialization/RecordBuilder;)Lcom/mojang/serialization/RecordBuilder; + ARG 1 brain + ARG 2 ops + ARG 3 recordBuilder + METHOD keys (Lcom/mojang/serialization/DynamicOps;)Ljava/util/stream/Stream; + ARG 1 ops + METHOD method_28318 (Lnet/minecraft/class_4140;Lnet/minecraft/class_4831;)Lnet/minecraft/class_4095$class_5302; + ARG 1 data + METHOD method_28319 (Lnet/minecraft/class_4140;Lcom/mojang/serialization/Codec;)Lnet/minecraft/class_2960; + ARG 1 codec + METHOD method_28320 parse (Lnet/minecraft/class_4140;Lcom/mojang/serialization/DynamicOps;Ljava/lang/Object;)Lcom/mojang/serialization/DataResult; + ARG 1 memoryType + ARG 2 ops + ARG 3 value + METHOD method_28321 (Lcom/mojang/serialization/DynamicOps;Lcom/mojang/datafixers/util/Pair;Lnet/minecraft/class_4140;)Lcom/mojang/serialization/DataResult; + ARG 3 memoryType + METHOD method_28322 (Lcom/mojang/serialization/DynamicOps;Lcom/mojang/serialization/RecordBuilder;Lnet/minecraft/class_4095$class_5302;)V + ARG 2 entry + METHOD method_28323 (Lcom/mojang/serialization/DynamicOps;Ljava/lang/Object;Lcom/mojang/serialization/Codec;)Lcom/mojang/serialization/DataResult; + ARG 2 codec + METHOD method_28324 (Lcom/mojang/serialization/DynamicOps;Lorg/apache/commons/lang3/mutable/MutableObject;Lcom/mojang/datafixers/util/Pair;)V + ARG 3 pair + METHOD method_28325 (Lcom/mojang/serialization/DynamicOps;Lnet/minecraft/class_2960;)Ljava/lang/Object; + ARG 1 id + METHOD method_28326 (Lnet/minecraft/class_4140;)Ljava/util/stream/Stream; + ARG 0 memoryType CLASS class_5302 MemoryEntry FIELD field_24661 type Lnet/minecraft/class_4140; FIELD field_24662 data Ljava/util/Optional; @@ -151,6 +194,10 @@ CLASS net/minecraft/class_4095 net/minecraft/entity/ai/brain/Brain METHOD method_28330 serialize (Lcom/mojang/serialization/DynamicOps;Lcom/mojang/serialization/RecordBuilder;)V ARG 1 ops ARG 2 builder + METHOD method_28331 (Lcom/mojang/serialization/RecordBuilder;Lcom/mojang/serialization/DynamicOps;Lcom/mojang/serialization/Codec;)V + ARG 3 codec + METHOD method_28332 (Lcom/mojang/serialization/RecordBuilder;Lcom/mojang/serialization/DynamicOps;Lcom/mojang/serialization/Codec;Lnet/minecraft/class_4831;)V + ARG 4 data METHOD method_28333 of (Lnet/minecraft/class_4140;Ljava/util/Optional;)Lnet/minecraft/class_4095$class_5302; ARG 0 type ARG 1 data diff --git a/mappings/net/minecraft/entity/ai/brain/Memory.mapping b/mappings/net/minecraft/entity/ai/brain/Memory.mapping index 149eecfd2f..a60e39a846 100644 --- a/mappings/net/minecraft/entity/ai/brain/Memory.mapping +++ b/mappings/net/minecraft/entity/ai/brain/Memory.mapping @@ -12,6 +12,8 @@ CLASS net/minecraft/class_4831 net/minecraft/entity/ai/brain/Memory METHOD method_24637 getValue ()Ljava/lang/Object; METHOD method_24913 tick ()V METHOD method_24914 isTimed ()Z + METHOD method_28352 (Lnet/minecraft/class_4831;)Ljava/util/Optional; + ARG 0 memory METHOD method_28353 createCodec (Lcom/mojang/serialization/Codec;)Lcom/mojang/serialization/Codec; ARG 0 codec METHOD method_28354 (Lcom/mojang/serialization/Codec;Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; @@ -19,4 +21,9 @@ CLASS net/minecraft/class_4831 net/minecraft/entity/ai/brain/Memory METHOD method_28355 permanent (Ljava/lang/Object;)Lnet/minecraft/class_4831; COMMENT Creates a memory without an expiry time. ARG 0 value + METHOD method_28356 (Ljava/lang/Object;Ljava/util/Optional;)Lnet/minecraft/class_4831; + ARG 0 value + ARG 1 expiry + METHOD method_28357 (Lnet/minecraft/class_4831;)Ljava/lang/Object; + ARG 0 memory METHOD method_35127 getExpiry ()J diff --git a/mappings/net/minecraft/entity/ai/brain/MemoryQuery.mapping b/mappings/net/minecraft/entity/ai/brain/MemoryQuery.mapping new file mode 100644 index 0000000000..3122c0c74d --- /dev/null +++ b/mappings/net/minecraft/entity/ai/brain/MemoryQuery.mapping @@ -0,0 +1,24 @@ +CLASS net/minecraft/class_7907 net/minecraft/entity/ai/brain/MemoryQuery + COMMENT A query of an entity's brain. There are three types, with each querying a different + COMMENT value. If a query fails, the task does not run. + COMMENT + COMMENT @see MemoryQueryResult + COMMENT @see net.minecraft.entity.ai.brain.task.TaskTriggerer.TaskContext + METHOD method_47253 toQueryResult (Lnet/minecraft/class_4095;Ljava/util/Optional;)Lnet/minecraft/class_7906; + ARG 1 brain + ARG 2 value + METHOD method_47254 getState ()Lnet/minecraft/class_4141; + CLASS class_7908 Absent + COMMENT A query that succeeds if a value is not present in the memory. The + COMMENT query result is always {@code Unit.INSTANCE}. + COMMENT + COMMENT @see net.minecraft.entity.ai.brain.task.TaskTriggerer.TaskContext#queryMemoryAbsent + CLASS class_7909 Value + COMMENT A query that succeeds if a value is present in the memory. The result is the queried value. + COMMENT + COMMENT @see net.minecraft.entity.ai.brain.task.TaskTriggerer.TaskContext#queryMemoryValue + CLASS class_7910 Optional + COMMENT A query that always succeeds. The value is an optional that contains the value if it + COMMENT is present in the memory. + COMMENT + COMMENT @see net.minecraft.entity.ai.brain.task.TaskTriggerer.TaskContext#queryMemoryOptional diff --git a/mappings/net/minecraft/entity/ai/brain/MemoryQueryResult.mapping b/mappings/net/minecraft/entity/ai/brain/MemoryQueryResult.mapping new file mode 100644 index 0000000000..02918ea65b --- /dev/null +++ b/mappings/net/minecraft/entity/ai/brain/MemoryQueryResult.mapping @@ -0,0 +1,27 @@ +CLASS net/minecraft/class_7906 net/minecraft/entity/ai/brain/MemoryQueryResult + COMMENT The result of a {@link MemoryQuery}. This is passed as a lambda argument to + COMMENT {@link net.minecraft.entity.ai.brain.task.TaskTriggerer#task}. Use + COMMENT {@link net.minecraft.entity.ai.brain.task.TaskTriggerer.TaskContext#getValue} to + COMMENT get the value. + COMMENT + COMMENT

It is also possible to set or forget the stored memory value using methods in + COMMENT this class. + COMMENT + COMMENT @see net.minecraft.entity.ai.brain.task.TaskTriggerer.TaskContext#getValue + COMMENT @see net.minecraft.entity.ai.brain.task.TaskTriggerer.TaskContext#getOptionalValue + FIELD field_41025 brain Lnet/minecraft/class_4095; + FIELD field_41026 memory Lnet/minecraft/class_4140; + FIELD field_41027 value Lcom/mojang/datafixers/kinds/App; + METHOD (Lnet/minecraft/class_4095;Lnet/minecraft/class_4140;Lcom/mojang/datafixers/kinds/App;)V + ARG 1 brain + ARG 2 memory + ARG 3 value + METHOD method_47248 getValue ()Lcom/mojang/datafixers/kinds/App; + METHOD method_47249 remember (Ljava/lang/Object;)V + ARG 1 value + METHOD method_47250 remember (Ljava/lang/Object;J)V + ARG 1 value + ARG 2 expiry + METHOD method_47251 remember (Ljava/util/Optional;)V + ARG 1 value + METHOD method_47252 forget ()V diff --git a/mappings/net/minecraft/entity/ai/brain/Schedule.mapping b/mappings/net/minecraft/entity/ai/brain/Schedule.mapping index cfe7df0a07..a27469aad3 100644 --- a/mappings/net/minecraft/entity/ai/brain/Schedule.mapping +++ b/mappings/net/minecraft/entity/ai/brain/Schedule.mapping @@ -7,8 +7,12 @@ CLASS net/minecraft/class_4170 net/minecraft/entity/ai/brain/Schedule FIELD field_30692 WORK_TIME I METHOD method_19213 getActivityForTime (I)Lnet/minecraft/class_4168; ARG 1 time + METHOD method_19214 (ILjava/util/Map$Entry;)D + ARG 1 rule METHOD method_19215 addActivity (Lnet/minecraft/class_4168;)V ARG 1 activity + METHOD method_19216 (Lnet/minecraft/class_4168;Ljava/util/Map$Entry;)Z + ARG 1 rule METHOD method_19217 register (Ljava/lang/String;)Lnet/minecraft/class_4171; ARG 0 id METHOD method_19218 getRule (Lnet/minecraft/class_4168;)Lnet/minecraft/class_4173; diff --git a/mappings/net/minecraft/entity/ai/brain/ScheduleBuilder.mapping b/mappings/net/minecraft/entity/ai/brain/ScheduleBuilder.mapping index efe85e57a7..677c2e0246 100644 --- a/mappings/net/minecraft/entity/ai/brain/ScheduleBuilder.mapping +++ b/mappings/net/minecraft/entity/ai/brain/ScheduleBuilder.mapping @@ -9,6 +9,8 @@ CLASS net/minecraft/class_4171 net/minecraft/entity/ai/brain/ScheduleBuilder ARG 2 activity METHOD method_19222 (Lnet/minecraft/class_4171$class_4172;)V ARG 1 activity + METHOD method_19223 (Lnet/minecraft/class_4171$class_4172;Lnet/minecraft/class_4173;)V + ARG 1 rule CLASS class_4172 ActivityEntry FIELD field_18610 startTime I FIELD field_18611 activity Lnet/minecraft/class_4168; diff --git a/mappings/net/minecraft/entity/ai/brain/ScheduleRule.mapping b/mappings/net/minecraft/entity/ai/brain/ScheduleRule.mapping index 43c9d0afb1..b04fbdcb1b 100644 --- a/mappings/net/minecraft/entity/ai/brain/ScheduleRule.mapping +++ b/mappings/net/minecraft/entity/ai/brain/ScheduleRule.mapping @@ -6,6 +6,8 @@ CLASS net/minecraft/class_4173 net/minecraft/entity/ai/brain/ScheduleRule METHOD method_19227 add (IF)Lnet/minecraft/class_4173; ARG 1 startTime ARG 2 priority + METHOD method_19228 (Lit/unimi/dsi/fastutil/ints/Int2ObjectSortedMap;Lnet/minecraft/class_4169;)V + ARG 0 entry METHOD method_19229 sort ()V METHOD method_35214 getEntries ()Lcom/google/common/collect/ImmutableList; METHOD method_35215 add (Ljava/util/Collection;)Lnet/minecraft/class_4173; diff --git a/mappings/net/minecraft/entity/ai/brain/sensor/WardenAttackablesSensor.mapping b/mappings/net/minecraft/entity/ai/brain/sensor/WardenAttackablesSensor.mapping index 721fab659e..f0a70d8b38 100644 --- a/mappings/net/minecraft/entity/ai/brain/sensor/WardenAttackablesSensor.mapping +++ b/mappings/net/minecraft/entity/ai/brain/sensor/WardenAttackablesSensor.mapping @@ -1,8 +1,10 @@ CLASS net/minecraft/class_7252 net/minecraft/entity/ai/brain/sensor/WardenAttackablesSensor METHOD method_42164 (Lnet/minecraft/class_7260;Lnet/minecraft/class_1309;)V - ARG 1 entity + ARG 1 entityx METHOD method_42166 (Lnet/minecraft/class_1309;)Z - ARG 0 entity + ARG 0 entityx + METHOD method_43084 (Lnet/minecraft/class_1309;)Z + ARG 0 entityx METHOD method_43086 findNearestTarget (Lnet/minecraft/class_7260;Ljava/util/function/Predicate;)Ljava/util/Optional; ARG 0 warden ARG 1 targetPredicate diff --git a/mappings/net/minecraft/entity/ai/brain/task/AdmireItemTask.mapping b/mappings/net/minecraft/entity/ai/brain/task/AdmireItemTask.mapping index cca8a8d82a..3bfe79520a 100644 --- a/mappings/net/minecraft/entity/ai/brain/task/AdmireItemTask.mapping +++ b/mappings/net/minecraft/entity/ai/brain/task/AdmireItemTask.mapping @@ -1,4 +1,14 @@ CLASS net/minecraft/class_4823 net/minecraft/entity/ai/brain/task/AdmireItemTask - FIELD field_22324 duration I - METHOD (I)V - ARG 1 duration + METHOD method_47279 create (I)Lnet/minecraft/class_7893; + ARG 0 duration + METHOD method_47280 (ILnet/minecraft/class_7898$class_7900;)Lcom/mojang/datafixers/kinds/App; + ARG 1 context + METHOD method_47281 (Lnet/minecraft/class_7898$class_7900;ILnet/minecraft/class_7906;Lnet/minecraft/class_7906;Lnet/minecraft/class_7906;Lnet/minecraft/class_7906;)Lnet/minecraft/class_7911; + ARG 2 nearestVisibleWantedItem + ARG 3 admiringItem + ARG 4 admiringDisabled + ARG 5 disableWalkToAdmireItem + METHOD method_47282 (Lnet/minecraft/class_7898$class_7900;Lnet/minecraft/class_7906;Lnet/minecraft/class_7906;ILnet/minecraft/class_3218;Lnet/minecraft/class_1309;J)Z + ARG 4 world + ARG 5 entity + ARG 6 time diff --git a/mappings/net/minecraft/entity/ai/brain/task/AdmireItemTimeLimitTask.mapping b/mappings/net/minecraft/entity/ai/brain/task/AdmireItemTimeLimitTask.mapping index 98a094e80c..ca7341fb72 100644 --- a/mappings/net/minecraft/entity/ai/brain/task/AdmireItemTimeLimitTask.mapping +++ b/mappings/net/minecraft/entity/ai/brain/task/AdmireItemTimeLimitTask.mapping @@ -1,6 +1,15 @@ CLASS net/minecraft/class_5430 net/minecraft/entity/ai/brain/task/AdmireItemTimeLimitTask - FIELD field_25815 timeLimit I - FIELD field_25816 cooldown I - METHOD (II)V + METHOD method_47294 create (II)Lnet/minecraft/class_7893; + ARG 0 cooldown ARG 1 timeLimit - ARG 2 cooldown + METHOD method_47295 (IILnet/minecraft/class_7898$class_7900;)Lcom/mojang/datafixers/kinds/App; + ARG 2 context + METHOD method_47296 (Lnet/minecraft/class_7898$class_7900;IILnet/minecraft/class_7906;Lnet/minecraft/class_7906;Lnet/minecraft/class_7906;Lnet/minecraft/class_7906;)Lnet/minecraft/class_7911; + ARG 3 admiringItem + ARG 4 nearestVisibleWantedItem + ARG 5 timeTryingToReachAdmireItem + ARG 6 disableWalkToAdmireItem + METHOD method_47297 (Lnet/minecraft/class_7898$class_7900;Lnet/minecraft/class_7906;ILnet/minecraft/class_7906;Lnet/minecraft/class_7906;ILnet/minecraft/class_3218;Lnet/minecraft/class_1309;J)Z + ARG 6 world + ARG 7 entity + ARG 8 time diff --git a/mappings/net/minecraft/entity/ai/brain/task/AquaticStrollTask.mapping b/mappings/net/minecraft/entity/ai/brain/task/AquaticStrollTask.mapping deleted file mode 100644 index bc62a00694..0000000000 --- a/mappings/net/minecraft/entity/ai/brain/task/AquaticStrollTask.mapping +++ /dev/null @@ -1,2 +0,0 @@ -CLASS net/minecraft/class_5755 net/minecraft/entity/ai/brain/task/AquaticStrollTask - FIELD field_34048 NORMALIZED_POS_MULTIPLIERS [[I diff --git a/mappings/net/minecraft/entity/ai/brain/task/AttackTask.mapping b/mappings/net/minecraft/entity/ai/brain/task/AttackTask.mapping index f62b94cb7e..89606d0284 100644 --- a/mappings/net/minecraft/entity/ai/brain/task/AttackTask.mapping +++ b/mappings/net/minecraft/entity/ai/brain/task/AttackTask.mapping @@ -1,12 +1,15 @@ CLASS net/minecraft/class_4807 net/minecraft/entity/ai/brain/task/AttackTask - FIELD field_22285 distance I - FIELD field_22286 forwardMovement F - METHOD (IF)V - ARG 1 distance - ARG 2 forwardMovement - METHOD method_24551 isAttackTargetVisible (Lnet/minecraft/class_1308;)Z - ARG 1 entity - METHOD method_24554 isNearAttackTarget (Lnet/minecraft/class_1308;)Z - ARG 1 entity - METHOD method_24555 getAttackTarget (Lnet/minecraft/class_1308;)Lnet/minecraft/class_1309; - ARG 1 entity + METHOD method_46901 create (IF)Lnet/minecraft/class_7894; + ARG 0 distance + ARG 1 forwardMovement + METHOD method_46902 (IFLnet/minecraft/class_7898$class_7900;)Lcom/mojang/datafixers/kinds/App; + ARG 2 context + METHOD method_46903 (Lnet/minecraft/class_7898$class_7900;IFLnet/minecraft/class_7906;Lnet/minecraft/class_7906;Lnet/minecraft/class_7906;Lnet/minecraft/class_7906;)Lnet/minecraft/class_7911; + ARG 3 walkTarget + ARG 4 lookTarget + ARG 5 attackTarget + ARG 6 visibleMobs + METHOD method_46904 (Lnet/minecraft/class_7898$class_7900;Lnet/minecraft/class_7906;ILnet/minecraft/class_7906;Lnet/minecraft/class_7906;FLnet/minecraft/class_3218;Lnet/minecraft/class_1308;J)Z + ARG 6 world + ARG 7 entity + ARG 8 time diff --git a/mappings/net/minecraft/entity/ai/brain/task/BiasedLongJumpTask.mapping b/mappings/net/minecraft/entity/ai/brain/task/BiasedLongJumpTask.mapping index 3b86319945..1c50968184 100644 --- a/mappings/net/minecraft/entity/ai/brain/task/BiasedLongJumpTask.mapping +++ b/mappings/net/minecraft/entity/ai/brain/task/BiasedLongJumpTask.mapping @@ -3,7 +3,7 @@ CLASS net/minecraft/class_7096 net/minecraft/entity/ai/brain/task/BiasedLongJump FIELD field_37428 biasChance F FIELD field_37429 unfavoredTargets Ljava/util/List; FIELD field_37430 useBias Z - METHOD (Lnet/minecraft/class_6019;IIFLjava/util/function/Function;Lnet/minecraft/class_6862;FLjava/util/function/Predicate;)V + METHOD (Lnet/minecraft/class_6019;IIFLjava/util/function/Function;Lnet/minecraft/class_6862;FLjava/util/function/BiPredicate;)V ARG 1 cooldownRange ARG 2 verticalRange ARG 3 horizontalRange @@ -12,6 +12,3 @@ CLASS net/minecraft/class_7096 net/minecraft/entity/ai/brain/task/BiasedLongJump ARG 6 favoredBlocks ARG 7 biasChance ARG 8 jumpToPredicate - METHOD method_41338 isFluidStateAndBelowEmpty (Lnet/minecraft/class_3218;Lnet/minecraft/class_2338;)Z - ARG 1 world - ARG 2 pos diff --git a/mappings/net/minecraft/entity/ai/brain/task/CompositeTask.mapping b/mappings/net/minecraft/entity/ai/brain/task/CompositeTask.mapping index 39e3c664db..dcec63bbaf 100644 --- a/mappings/net/minecraft/entity/ai/brain/task/CompositeTask.mapping +++ b/mappings/net/minecraft/entity/ai/brain/task/CompositeTask.mapping @@ -3,25 +3,29 @@ CLASS net/minecraft/class_4103 net/minecraft/entity/ai/brain/task/CompositeTask FIELD field_18345 order Lnet/minecraft/class_4103$class_4104; FIELD field_18346 runMode Lnet/minecraft/class_4103$class_4216; FIELD field_18347 tasks Lnet/minecraft/class_6032; + FIELD field_40992 requiredMemoryState Ljava/util/Map; + FIELD field_40993 status Lnet/minecraft/class_4097$class_4098; METHOD (Ljava/util/Map;Ljava/util/Set;Lnet/minecraft/class_4103$class_4104;Lnet/minecraft/class_4103$class_4216;Ljava/util/List;)V ARG 1 requiredMemoryState ARG 2 memoriesToForgetWhenStopped ARG 3 order ARG 4 runMode ARG 5 tasks - METHOD method_18928 (Lnet/minecraft/class_4097;)Z - ARG 0 task - METHOD method_18930 (Lnet/minecraft/class_3218;Lnet/minecraft/class_1309;JLnet/minecraft/class_4097;)V + METHOD method_18929 (Lcom/mojang/datafixers/util/Pair;)V + ARG 1 task + METHOD method_46923 (Lnet/minecraft/class_3218;Lnet/minecraft/class_1309;JLnet/minecraft/class_7893;)V ARG 4 task - METHOD method_18931 (Lnet/minecraft/class_4097;)Z + METHOD method_46924 shouldStart (Lnet/minecraft/class_1309;)Z + ARG 1 entity + METHOD method_46925 (Lnet/minecraft/class_7893;)Z ARG 0 task - METHOD method_18932 (Lnet/minecraft/class_3218;Lnet/minecraft/class_1309;JLnet/minecraft/class_4097;)V + METHOD method_46926 (Lnet/minecraft/class_3218;Lnet/minecraft/class_1309;JLnet/minecraft/class_7893;)V ARG 4 task - METHOD method_18937 (Lnet/minecraft/class_4097;)Z + METHOD method_46927 (Lnet/minecraft/class_7893;)Z ARG 0 task - METHOD method_18938 (Lnet/minecraft/class_3218;Lnet/minecraft/class_1309;JLnet/minecraft/class_4097;)Z - ARG 4 task - METHOD method_19955 (Lnet/minecraft/class_4097;)Z + METHOD method_46928 (Lnet/minecraft/class_7893;)Z + ARG 0 task + METHOD method_46929 (Lnet/minecraft/class_7893;)Z ARG 0 task CLASS class_4104 Order FIELD field_18350 listModifier Ljava/util/function/Consumer; @@ -29,6 +33,8 @@ CLASS net/minecraft/class_4103 net/minecraft/entity/ai/brain/task/CompositeTask ARG 3 listModifier METHOD method_18939 apply (Lnet/minecraft/class_6032;)V ARG 1 list + METHOD method_18940 (Lnet/minecraft/class_6032;)V + ARG 0 list CLASS class_4216 RunMode METHOD method_19559 run (Ljava/util/stream/Stream;Lnet/minecraft/class_3218;Lnet/minecraft/class_1309;J)V ARG 1 tasks @@ -36,12 +42,12 @@ CLASS net/minecraft/class_4103 net/minecraft/entity/ai/brain/task/CompositeTask ARG 3 entity ARG 4 time CLASS 1 - METHOD method_19560 (Lnet/minecraft/class_4097;)Z - ARG 0 task - METHOD method_19561 (Lnet/minecraft/class_3218;Lnet/minecraft/class_1309;JLnet/minecraft/class_4097;)Z + METHOD method_46930 (Lnet/minecraft/class_3218;Lnet/minecraft/class_1309;JLnet/minecraft/class_7893;)Z ARG 4 task - CLASS 2 - METHOD method_19562 (Lnet/minecraft/class_4097;)Z + METHOD method_46931 (Lnet/minecraft/class_7893;)Z ARG 0 task - METHOD method_19563 (Lnet/minecraft/class_3218;Lnet/minecraft/class_1309;JLnet/minecraft/class_4097;)V + CLASS 2 + METHOD method_46932 (Lnet/minecraft/class_3218;Lnet/minecraft/class_1309;JLnet/minecraft/class_7893;)V ARG 4 task + METHOD method_46933 (Lnet/minecraft/class_7893;)Z + ARG 0 task diff --git a/mappings/net/minecraft/entity/ai/brain/task/ConditionalTask.mapping b/mappings/net/minecraft/entity/ai/brain/task/ConditionalTask.mapping deleted file mode 100644 index fbcc034d69..0000000000 --- a/mappings/net/minecraft/entity/ai/brain/task/ConditionalTask.mapping +++ /dev/null @@ -1,22 +0,0 @@ -CLASS net/minecraft/class_4820 net/minecraft/entity/ai/brain/task/ConditionalTask - FIELD field_22313 condition Ljava/util/function/Predicate; - FIELD field_22314 delegate Lnet/minecraft/class_4097; - FIELD field_22315 allowsContinuation Z - METHOD (Ljava/util/Map;Ljava/util/function/Predicate;Lnet/minecraft/class_4097;Z)V - ARG 1 requiredMemoryStates - ARG 2 condition - ARG 3 delegate - ARG 4 allowsContinuation - METHOD (Ljava/util/Map;Lnet/minecraft/class_4097;)V - ARG 1 memory - ARG 2 delegate - METHOD (Ljava/util/function/Predicate;Lnet/minecraft/class_4097;)V - ARG 1 condition - ARG 2 delegate - METHOD (Ljava/util/function/Predicate;Lnet/minecraft/class_4097;Z)V - ARG 1 condition - ARG 2 delegate - ARG 3 allowsContinuation - METHOD method_24597 merge (Ljava/util/Map;Ljava/util/Map;)Ljava/util/Map; - ARG 0 first - ARG 1 second diff --git a/mappings/net/minecraft/entity/ai/brain/task/DefeatTargetTask.mapping b/mappings/net/minecraft/entity/ai/brain/task/DefeatTargetTask.mapping index caaa5e5fa3..4f51114e78 100644 --- a/mappings/net/minecraft/entity/ai/brain/task/DefeatTargetTask.mapping +++ b/mappings/net/minecraft/entity/ai/brain/task/DefeatTargetTask.mapping @@ -1,8 +1,15 @@ CLASS net/minecraft/class_4825 net/minecraft/entity/ai/brain/task/DefeatTargetTask - FIELD field_22327 duration I - FIELD field_25157 predicate Ljava/util/function/BiPredicate; - 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 + METHOD method_47124 create (ILjava/util/function/BiPredicate;)Lnet/minecraft/class_7893; + ARG 0 celebrationDuration + ARG 1 predicate + METHOD method_47125 (Lnet/minecraft/class_7898$class_7900;Lnet/minecraft/class_7906;Ljava/util/function/BiPredicate;Lnet/minecraft/class_7906;ILnet/minecraft/class_7906;Lnet/minecraft/class_7906;Lnet/minecraft/class_3218;Lnet/minecraft/class_1309;J)Z + ARG 7 world + ARG 8 entity + ARG 9 time + METHOD method_47126 (Lnet/minecraft/class_7898$class_7900;Ljava/util/function/BiPredicate;ILnet/minecraft/class_7906;Lnet/minecraft/class_7906;Lnet/minecraft/class_7906;Lnet/minecraft/class_7906;)Lnet/minecraft/class_7911; + ARG 3 attackTarget + ARG 4 angryAt + ARG 5 celebrateLocation + ARG 6 dancing + METHOD method_47127 (Ljava/util/function/BiPredicate;ILnet/minecraft/class_7898$class_7900;)Lcom/mojang/datafixers/kinds/App; + ARG 2 context diff --git a/mappings/net/minecraft/entity/ai/brain/task/EndRaidTask.mapping b/mappings/net/minecraft/entity/ai/brain/task/EndRaidTask.mapping index 2741cdae78..dcd20ea1dd 100644 --- a/mappings/net/minecraft/entity/ai/brain/task/EndRaidTask.mapping +++ b/mappings/net/minecraft/entity/ai/brain/task/EndRaidTask.mapping @@ -1 +1,8 @@ CLASS net/minecraft/class_4250 net/minecraft/entity/ai/brain/task/EndRaidTask + METHOD method_47041 create ()Lnet/minecraft/class_7893; + METHOD method_47042 (Lnet/minecraft/class_3218;Lnet/minecraft/class_1309;J)Z + ARG 0 world + ARG 1 entity + ARG 2 time + METHOD method_47043 (Lnet/minecraft/class_7898$class_7900;)Lcom/mojang/datafixers/kinds/App; + ARG 0 context diff --git a/mappings/net/minecraft/entity/ai/brain/task/FindEntityTask.mapping b/mappings/net/minecraft/entity/ai/brain/task/FindEntityTask.mapping index 396349dcde..b6db7b9f95 100644 --- a/mappings/net/minecraft/entity/ai/brain/task/FindEntityTask.mapping +++ b/mappings/net/minecraft/entity/ai/brain/task/FindEntityTask.mapping @@ -1,21 +1,6 @@ CLASS net/minecraft/class_4106 net/minecraft/entity/ai/brain/task/FindEntityTask - FIELD field_18355 completionRange I - FIELD field_18356 speed F - FIELD field_18357 entityType Lnet/minecraft/class_1299; - FIELD field_18358 maxSquaredDistance I - FIELD field_18359 predicate Ljava/util/function/Predicate; - FIELD field_18360 shouldRunPredicate Ljava/util/function/Predicate; - FIELD field_18361 targetModule Lnet/minecraft/class_4140; - METHOD (Lnet/minecraft/class_1299;ILjava/util/function/Predicate;Ljava/util/function/Predicate;Lnet/minecraft/class_4140;FI)V - ARG 1 entityType - ARG 2 maxDistance - ARG 3 shouldRunPredicate - ARG 4 predicate - ARG 5 targetModule - ARG 6 speed - ARG 7 completionRange - METHOD method_18941 create (Lnet/minecraft/class_1299;ILnet/minecraft/class_4140;FI)Lnet/minecraft/class_4106; - ARG 0 entityType + METHOD method_18941 create (Lnet/minecraft/class_1299;ILnet/minecraft/class_4140;FI)Lnet/minecraft/class_7893; + ARG 0 type ARG 1 maxDistance ARG 2 targetModule ARG 3 speed @@ -24,23 +9,28 @@ CLASS net/minecraft/class_4106 net/minecraft/entity/ai/brain/task/FindEntityTask ARG 0 entity METHOD method_18949 (Lnet/minecraft/class_1309;)Z ARG 0 entity - METHOD method_24582 anyVisibleTo (Lnet/minecraft/class_1309;)Z - ARG 1 entity - METHOD method_24583 testPredicate (Lnet/minecraft/class_1309;)Z - ARG 1 entity - METHOD method_35071 create (Lnet/minecraft/class_1299;ILjava/util/function/Predicate;Lnet/minecraft/class_4140;FI)Lnet/minecraft/class_4106; - ARG 0 entityType + METHOD method_46957 create (Lnet/minecraft/class_1299;ILjava/util/function/Predicate;Ljava/util/function/Predicate;Lnet/minecraft/class_4140;FI)Lnet/minecraft/class_7893; + ARG 0 type ARG 1 maxDistance - ARG 2 condition - ARG 3 moduleType - ARG 4 speed - ARG 5 completionRange - METHOD method_35072 (Lnet/minecraft/class_1309;)Z - ARG 0 entity - METHOD method_38963 shouldTarget (Lnet/minecraft/class_1309;Lnet/minecraft/class_1309;)Z - ARG 1 self - ARG 2 target - METHOD method_38964 (Lnet/minecraft/class_4095;Lnet/minecraft/class_1309;)V - ARG 2 target - METHOD method_38965 (Lnet/minecraft/class_1309;Lnet/minecraft/class_1309;)Z - ARG 2 target + ARG 2 entityPredicate + ARG 3 targetPredicate + ARG 4 targetModule + ARG 5 speed + ARG 6 completionRange + METHOD method_46958 (Lnet/minecraft/class_1299;Ljava/util/function/Predicate;Lnet/minecraft/class_1309;)Z + ARG 2 entity + METHOD method_46959 (Lnet/minecraft/class_1309;ILjava/util/function/Predicate;Lnet/minecraft/class_1309;)Z + ARG 3 target + METHOD method_46960 (Lnet/minecraft/class_7898$class_7900;Lnet/minecraft/class_7906;Ljava/util/function/Predicate;Ljava/util/function/Predicate;ILnet/minecraft/class_7906;Lnet/minecraft/class_7906;Lnet/minecraft/class_7906;FILnet/minecraft/class_3218;Lnet/minecraft/class_1309;J)Z + ARG 10 world + ARG 11 entity + ARG 12 time + METHOD method_46961 (Lnet/minecraft/class_7898$class_7900;Ljava/util/function/Predicate;Ljava/util/function/Predicate;IFILnet/minecraft/class_7906;Lnet/minecraft/class_7906;Lnet/minecraft/class_7906;Lnet/minecraft/class_7906;)Lnet/minecraft/class_7911; + ARG 6 targetValue + ARG 7 lookTarget + ARG 8 walkTarget + ARG 9 visibleMobs + METHOD method_46962 (Lnet/minecraft/class_7906;Lnet/minecraft/class_7906;Lnet/minecraft/class_7906;FILnet/minecraft/class_1309;)V + ARG 5 target + METHOD method_46963 (Lnet/minecraft/class_4140;Ljava/util/function/Predicate;Ljava/util/function/Predicate;IFILnet/minecraft/class_7898$class_7900;)Lcom/mojang/datafixers/kinds/App; + ARG 6 context diff --git a/mappings/net/minecraft/entity/ai/brain/task/FindInteractionTargetTask.mapping b/mappings/net/minecraft/entity/ai/brain/task/FindInteractionTargetTask.mapping index 62d9a43c3c..fa6632ef40 100644 --- a/mappings/net/minecraft/entity/ai/brain/task/FindInteractionTargetTask.mapping +++ b/mappings/net/minecraft/entity/ai/brain/task/FindInteractionTargetTask.mapping @@ -1,19 +1,16 @@ CLASS net/minecraft/class_4109 net/minecraft/entity/ai/brain/task/FindInteractionTargetTask - FIELD field_18363 entityType Lnet/minecraft/class_1299; - FIELD field_18364 maxSquaredDistance I - FIELD field_18365 predicate Ljava/util/function/Predicate; - FIELD field_18366 shouldRunPredicate Ljava/util/function/Predicate; - METHOD (Lnet/minecraft/class_1299;I)V - ARG 1 entityType - ARG 2 maxDistance - METHOD (Lnet/minecraft/class_1299;ILjava/util/function/Predicate;Ljava/util/function/Predicate;)V - ARG 1 entityType - ARG 2 maxDistance - ARG 3 shouldRunPredicate - ARG 4 predicate - METHOD method_18959 getVisibleMobs (Lnet/minecraft/class_1309;)Lnet/minecraft/class_6670; - ARG 1 entity - METHOD method_18962 test (Lnet/minecraft/class_1309;)Z - ARG 1 entity - METHOD method_38968 (Lnet/minecraft/class_4095;Lnet/minecraft/class_1309;)V - ARG 1 target + METHOD method_47081 (ILnet/minecraft/class_1299;Lnet/minecraft/class_7898$class_7900;)Lcom/mojang/datafixers/kinds/App; + ARG 2 context + METHOD method_47082 create (Lnet/minecraft/class_1299;I)Lnet/minecraft/class_7893; + ARG 0 type + ARG 1 maxDistance + METHOD method_47083 (Lnet/minecraft/class_1309;ILnet/minecraft/class_1299;Lnet/minecraft/class_1309;)Z + ARG 3 target + METHOD method_47084 (Lnet/minecraft/class_7898$class_7900;ILnet/minecraft/class_1299;Lnet/minecraft/class_7906;Lnet/minecraft/class_7906;Lnet/minecraft/class_7906;)Lnet/minecraft/class_7911; + ARG 3 lookTarget + ARG 4 interactionTarget + ARG 5 visibleMobs + METHOD method_47085 (Lnet/minecraft/class_7898$class_7900;Lnet/minecraft/class_7906;ILnet/minecraft/class_1299;Lnet/minecraft/class_7906;Lnet/minecraft/class_7906;Lnet/minecraft/class_3218;Lnet/minecraft/class_1309;J)Z + ARG 6 world + ARG 7 entity + ARG 8 time diff --git a/mappings/net/minecraft/entity/ai/brain/task/FindPointOfInterestTask.mapping b/mappings/net/minecraft/entity/ai/brain/task/FindPointOfInterestTask.mapping index 1d368ce5f1..ca64111ce0 100644 --- a/mappings/net/minecraft/entity/ai/brain/task/FindPointOfInterestTask.mapping +++ b/mappings/net/minecraft/entity/ai/brain/task/FindPointOfInterestTask.mapping @@ -1,32 +1,39 @@ CLASS net/minecraft/class_4096 net/minecraft/entity/ai/brain/task/FindPointOfInterestTask - FIELD field_18332 positionExpireTimeLimit J - FIELD field_18854 onlyRunIfChild Z - FIELD field_19287 poiTypePredicate Ljava/util/function/Predicate; - FIELD field_19289 foundPositionsToExpiry Lit/unimi/dsi/fastutil/longs/Long2ObjectMap; - FIELD field_20287 targetMemoryModuleType Lnet/minecraft/class_4140; - FIELD field_25812 entityStatus Ljava/util/Optional; FIELD field_30098 POI_SORTING_RADIUS I - FIELD field_30099 MAX_POSITIONS_PER_RUN I - FIELD field_30100 POSITION_EXPIRE_INTERVAL I - METHOD (Ljava/util/function/Predicate;Lnet/minecraft/class_4140;Lnet/minecraft/class_4140;ZLjava/util/Optional;)V - ARG 1 poiTypePredicate - ARG 2 moduleType - ARG 3 targetMemoryModuleType - ARG 4 onlyRunIfChild - ARG 5 entityStatus - METHOD (Ljava/util/function/Predicate;Lnet/minecraft/class_4140;ZLjava/util/Optional;)V - ARG 1 poiTypePredicate - ARG 2 moduleType - ARG 3 onlyRunIfChild - ARG 4 entityStatus - METHOD method_29245 create (Lnet/minecraft/class_4140;Lnet/minecraft/class_4140;)Lcom/google/common/collect/ImmutableMap; - ARG 0 firstModule - ARG 1 secondModule - METHOD method_29924 (JLnet/minecraft/class_2338;)Z - ARG 3 pos METHOD method_43965 findPathToPoi (Lnet/minecraft/class_1308;Ljava/util/Set;)Lnet/minecraft/class_11; ARG 0 entity ARG 1 pois + METHOD method_46874 (JLit/unimi/dsi/fastutil/longs/Long2ObjectMap$Entry;)Z + ARG 2 entry + METHOD method_46876 (Lnet/minecraft/class_3218;Lnet/minecraft/class_1314;Ljava/lang/Byte;)V + ARG 2 status + METHOD method_46877 (Lnet/minecraft/class_7894;Lnet/minecraft/class_7906;)Lnet/minecraft/class_7911; + ARG 1 poiPos + METHOD method_46878 (Lnet/minecraft/class_4140;Lnet/minecraft/class_7894;Lnet/minecraft/class_7898$class_7900;)Lcom/mojang/datafixers/kinds/App; + ARG 2 context + METHOD method_46879 (Lnet/minecraft/class_4140;ZLorg/apache/commons/lang3/mutable/MutableLong;Lit/unimi/dsi/fastutil/longs/Long2ObjectMap;Ljava/util/function/Predicate;Ljava/util/Optional;Lnet/minecraft/class_7898$class_7900;)Lcom/mojang/datafixers/kinds/App; + ARG 0 context + METHOD method_46880 (Lnet/minecraft/class_4153;Ljava/util/function/Predicate;Lnet/minecraft/class_2338;Lnet/minecraft/class_7906;Lnet/minecraft/class_3218;Ljava/util/Optional;Lnet/minecraft/class_1314;Lit/unimi/dsi/fastutil/longs/Long2ObjectMap;Lnet/minecraft/class_6880;)V + ARG 8 poiType + METHOD method_46882 (Lit/unimi/dsi/fastutil/longs/Long2ObjectMap;JLnet/minecraft/class_2338;)Z + ARG 3 pos + METHOD method_46883 create (Ljava/util/function/Predicate;Lnet/minecraft/class_4140;Lnet/minecraft/class_4140;ZLjava/util/Optional;)Lnet/minecraft/class_7893; + ARG 0 poiPredicate + ARG 1 poiPosModule + ARG 2 potentialPoiPosModule + ARG 3 onlyRunIfChild + ARG 4 entityStatus + METHOD method_46884 create (Ljava/util/function/Predicate;Lnet/minecraft/class_4140;ZLjava/util/Optional;)Lnet/minecraft/class_7893; + ARG 0 poiPredicate + ARG 1 poiPosModule + ARG 2 onlyRunIfChild + ARG 3 entityStatus + METHOD method_46885 (ZLorg/apache/commons/lang3/mutable/MutableLong;Lit/unimi/dsi/fastutil/longs/Long2ObjectMap;Ljava/util/function/Predicate;Lnet/minecraft/class_7906;Ljava/util/Optional;Lnet/minecraft/class_3218;Lnet/minecraft/class_1314;J)Z + ARG 6 world + ARG 7 entity + ARG 8 time + METHOD method_46886 (ZLorg/apache/commons/lang3/mutable/MutableLong;Lit/unimi/dsi/fastutil/longs/Long2ObjectMap;Ljava/util/function/Predicate;Ljava/util/Optional;Lnet/minecraft/class_7906;)Lnet/minecraft/class_7911; + ARG 5 queryResult CLASS class_5397 RetryMarker FIELD field_25600 random Lnet/minecraft/class_5819; FIELD field_25601 previousAttemptAt J diff --git a/mappings/net/minecraft/entity/ai/brain/task/FindRoarTargetTask.mapping b/mappings/net/minecraft/entity/ai/brain/task/FindRoarTargetTask.mapping index 19fc407444..3303f09bc2 100644 --- a/mappings/net/minecraft/entity/ai/brain/task/FindRoarTargetTask.mapping +++ b/mappings/net/minecraft/entity/ai/brain/task/FindRoarTargetTask.mapping @@ -1,6 +1,13 @@ CLASS net/minecraft/class_7256 net/minecraft/entity/ai/brain/task/FindRoarTargetTask - FIELD field_38132 targetFinder Ljava/util/function/Function; - METHOD (Ljava/util/function/Function;)V - ARG 1 targetFinder - METHOD method_42195 (Lnet/minecraft/class_7260;Lnet/minecraft/class_1309;)V - ARG 1 target + METHOD method_47255 create (Ljava/util/function/Function;)Lnet/minecraft/class_7893; + ARG 0 targetFinder + METHOD method_47256 (Ljava/util/function/Function;Lnet/minecraft/class_7898$class_7900;)Lcom/mojang/datafixers/kinds/App; + ARG 1 context + METHOD method_47257 (Ljava/util/function/Function;Lnet/minecraft/class_7906;Lnet/minecraft/class_7906;Lnet/minecraft/class_3218;Lnet/minecraft/class_7260;J)Z + ARG 3 world + ARG 4 entity + ARG 5 time + METHOD method_47258 (Ljava/util/function/Function;Lnet/minecraft/class_7906;Lnet/minecraft/class_7906;Lnet/minecraft/class_7906;)Lnet/minecraft/class_7911; + ARG 1 roarTarget + ARG 2 attackTarget + ARG 3 cantReachWalkTargetSince diff --git a/mappings/net/minecraft/entity/ai/brain/task/FindWalkTargetTask.mapping b/mappings/net/minecraft/entity/ai/brain/task/FindWalkTargetTask.mapping index caff55578a..21f071bb2f 100644 --- a/mappings/net/minecraft/entity/ai/brain/task/FindWalkTargetTask.mapping +++ b/mappings/net/minecraft/entity/ai/brain/task/FindWalkTargetTask.mapping @@ -1,21 +1,19 @@ CLASS net/minecraft/class_4117 net/minecraft/entity/ai/brain/task/FindWalkTargetTask - FIELD field_18375 walkSpeed F - FIELD field_19352 maxHorizontalDistance I - FIELD field_19353 maxVerticalDistance I - FIELD field_30186 MIN_RUN_TIME I - FIELD field_30187 MAX_RUN_TIME I - METHOD (F)V - ARG 1 walkSpeed - METHOD (FII)V - ARG 1 walkSpeed - ARG 2 maxHorizontalDistance - ARG 3 maxVerticalDistance - METHOD method_20429 updateWalkTarget (Lnet/minecraft/class_1314;)V - ARG 1 entity - METHOD method_20430 updateWalkTarget (Lnet/minecraft/class_1314;Lnet/minecraft/class_4076;)V - ARG 1 entity - ARG 2 pos - METHOD method_20431 (Lnet/minecraft/class_243;)Lnet/minecraft/class_4142; - ARG 1 pos - METHOD method_20432 (Lnet/minecraft/class_243;)Lnet/minecraft/class_4142; + FIELD field_30186 DEFAULT_HORIZONTAL_RANGE I + FIELD field_30187 DEFAULT_VERTICAL_RANGE I + METHOD method_47191 create (F)Lnet/minecraft/class_7894; + ARG 0 walkSpeed + METHOD method_47192 create (FII)Lnet/minecraft/class_7894; + ARG 0 walkSpeed + ARG 1 horizontalRange + ARG 2 verticalRange + METHOD method_47193 (FLnet/minecraft/class_243;)Lnet/minecraft/class_4142; ARG 1 pos + METHOD method_47194 (IIFLnet/minecraft/class_7898$class_7900;)Lcom/mojang/datafixers/kinds/App; + ARG 3 context + METHOD method_47195 (IIFLnet/minecraft/class_7906;)Lnet/minecraft/class_7911; + ARG 3 walkTarget + METHOD method_47196 (IILnet/minecraft/class_7906;FLnet/minecraft/class_3218;Lnet/minecraft/class_1314;J)Z + ARG 4 world + ARG 5 entity + ARG 6 time diff --git a/mappings/net/minecraft/entity/ai/brain/task/WalkTask.mapping b/mappings/net/minecraft/entity/ai/brain/task/FleeTask.mapping similarity index 57% rename from mappings/net/minecraft/entity/ai/brain/task/WalkTask.mapping rename to mappings/net/minecraft/entity/ai/brain/task/FleeTask.mapping index 42da7fec5a..2008c72a84 100644 --- a/mappings/net/minecraft/entity/ai/brain/task/WalkTask.mapping +++ b/mappings/net/minecraft/entity/ai/brain/task/FleeTask.mapping @@ -1,11 +1,16 @@ -CLASS net/minecraft/class_6028 net/minecraft/entity/ai/brain/task/WalkTask +CLASS net/minecraft/class_6028 net/minecraft/entity/ai/brain/task/FleeTask FIELD field_30107 MIN_RUN_TIME I FIELD field_30108 MAX_RUN_TIME I FIELD field_30109 HORIZONTAL_RANGE I FIELD field_30110 VERTICAL_RANGE I FIELD field_30111 speed F + FIELD field_42976 PANIC_PREDICATE Ljava/util/function/Predicate; + FIELD field_42977 predicate Ljava/util/function/Predicate; METHOD (F)V ARG 1 speed + METHOD (FLjava/util/function/Predicate;)V + ARG 1 speed + ARG 2 predicate METHOD method_39761 findTarget (Lnet/minecraft/class_1314;Lnet/minecraft/class_3218;)Lnet/minecraft/class_243; ARG 1 entity ARG 2 world @@ -14,3 +19,9 @@ CLASS net/minecraft/class_6028 net/minecraft/entity/ai/brain/task/WalkTask ARG 2 entity METHOD method_39763 (Lnet/minecraft/class_1922;Lnet/minecraft/class_2338;)Z ARG 1 pos + METHOD method_49488 (Lnet/minecraft/class_1314;)Z + ARG 0 entity + METHOD method_51505 (Lnet/minecraft/class_1922;Lnet/minecraft/class_2338;)Z + ARG 1 pos + METHOD method_51506 (Lnet/minecraft/class_1922;Lnet/minecraft/class_2338;)Z + ARG 1 posx diff --git a/mappings/net/minecraft/entity/ai/brain/task/FollowMobTask.mapping b/mappings/net/minecraft/entity/ai/brain/task/FollowMobTask.mapping deleted file mode 100644 index 688e5d90c1..0000000000 --- a/mappings/net/minecraft/entity/ai/brain/task/FollowMobTask.mapping +++ /dev/null @@ -1,26 +0,0 @@ -CLASS net/minecraft/class_4119 net/minecraft/entity/ai/brain/task/FollowMobTask - FIELD field_18376 predicate Ljava/util/function/Predicate; - FIELD field_18377 maxDistanceSquared F - FIELD field_35102 target Ljava/util/Optional; - METHOD (F)V - ARG 1 maxDistance - METHOD (Ljava/util/function/Predicate;F)V - ARG 1 predicate - ARG 2 maxDistance - METHOD (Lnet/minecraft/class_1299;F)V - ARG 1 entityType - ARG 2 maxDistance - METHOD (Lnet/minecraft/class_1311;F)V - ARG 1 group - ARG 2 maxDistance - METHOD (Lnet/minecraft/class_6862;F)V - ARG 1 entityType - ARG 2 maxDistance - METHOD method_18997 (Lnet/minecraft/class_1299;Lnet/minecraft/class_1309;)Z - ARG 1 entity - METHOD method_19000 (Lnet/minecraft/class_1311;Lnet/minecraft/class_1309;)Z - ARG 1 entity - METHOD method_24599 (Lnet/minecraft/class_1309;)Z - ARG 0 entity - METHOD method_35087 (Lnet/minecraft/class_6862;Lnet/minecraft/class_1309;)Z - ARG 1 entity diff --git a/mappings/net/minecraft/entity/ai/brain/task/ForgetAngryAtTargetTask.mapping b/mappings/net/minecraft/entity/ai/brain/task/ForgetAngryAtTargetTask.mapping index 3e3ca7dc83..d075d8031d 100644 --- a/mappings/net/minecraft/entity/ai/brain/task/ForgetAngryAtTargetTask.mapping +++ b/mappings/net/minecraft/entity/ai/brain/task/ForgetAngryAtTargetTask.mapping @@ -1,3 +1,16 @@ CLASS net/minecraft/class_4829 net/minecraft/entity/ai/brain/task/ForgetAngryAtTargetTask - METHOD method_29526 (Lnet/minecraft/class_3218;Lnet/minecraft/class_1308;Lnet/minecraft/class_1309;)V - ARG 2 target + METHOD method_47143 create ()Lnet/minecraft/class_7893; + METHOD method_47144 (Lnet/minecraft/class_3218;Lnet/minecraft/class_1309;)Z + ARG 1 target + METHOD method_47145 (Lnet/minecraft/class_1297;)Lnet/minecraft/class_1309; + ARG 0 target + METHOD method_47146 (Lnet/minecraft/class_7898$class_7900;)Lcom/mojang/datafixers/kinds/App; + ARG 0 context + METHOD method_47147 (Lnet/minecraft/class_7898$class_7900;Lnet/minecraft/class_7906;)Lnet/minecraft/class_7911; + ARG 1 angryAt + METHOD method_47148 (Lnet/minecraft/class_7898$class_7900;Lnet/minecraft/class_7906;Lnet/minecraft/class_3218;Lnet/minecraft/class_1309;J)Z + ARG 2 world + ARG 3 entity + ARG 4 time + METHOD method_47149 (Lnet/minecraft/class_7906;Lnet/minecraft/class_1309;)V + ARG 1 target diff --git a/mappings/net/minecraft/entity/ai/brain/task/ForgetAttackTargetTask.mapping b/mappings/net/minecraft/entity/ai/brain/task/ForgetAttackTargetTask.mapping index 5ee9ae0902..bc378f9158 100644 --- a/mappings/net/minecraft/entity/ai/brain/task/ForgetAttackTargetTask.mapping +++ b/mappings/net/minecraft/entity/ai/brain/task/ForgetAttackTargetTask.mapping @@ -1,30 +1,31 @@ CLASS net/minecraft/class_4828 net/minecraft/entity/ai/brain/task/ForgetAttackTargetTask - FIELD field_22329 alternativeCondition Ljava/util/function/Predicate; FIELD field_30177 REMEMBER_TIME I - FIELD field_30178 forgetCallback Ljava/util/function/BiConsumer; - FIELD field_38102 shouldForgetIfTargetUnreachable Z - METHOD (Ljava/util/function/BiConsumer;)V + METHOD method_24621 cannotReachTarget (Lnet/minecraft/class_1309;Ljava/util/Optional;)Z + METHOD method_47132 create ()Lnet/minecraft/class_7893; + METHOD method_47133 (Lnet/minecraft/class_1309;)Z + ARG 0 entity + METHOD method_47134 (Lnet/minecraft/class_1308;Lnet/minecraft/class_1309;)V + ARG 0 entity + ARG 1 target + METHOD method_47135 (Lnet/minecraft/class_7898$class_7900;Lnet/minecraft/class_7906;ZLnet/minecraft/class_7906;Ljava/util/function/Predicate;Ljava/util/function/BiConsumer;Lnet/minecraft/class_3218;Lnet/minecraft/class_1308;J)Z + ARG 6 world + ARG 7 entity + ARG 8 time + METHOD method_47136 (Lnet/minecraft/class_7898$class_7900;ZLjava/util/function/Predicate;Ljava/util/function/BiConsumer;Lnet/minecraft/class_7906;Lnet/minecraft/class_7906;)Lnet/minecraft/class_7911; + ARG 4 attackTarget + ARG 5 cantReachWalkTargetSince + METHOD method_47137 create (Ljava/util/function/BiConsumer;)Lnet/minecraft/class_7893; + ARG 0 forgetCallback + METHOD method_47138 create (Ljava/util/function/Predicate;)Lnet/minecraft/class_7893; + ARG 0 alternativeCondition + METHOD method_47139 create (Ljava/util/function/Predicate;Ljava/util/function/BiConsumer;Z)Lnet/minecraft/class_7893; + ARG 0 alternativeCondition ARG 1 forgetCallback - METHOD (Ljava/util/function/Predicate;)V - ARG 1 alternativePredicate - METHOD (Ljava/util/function/Predicate;Ljava/util/function/BiConsumer;)V - ARG 1 alternativePredicate - ARG 2 forgetCallback - METHOD (Ljava/util/function/Predicate;Ljava/util/function/BiConsumer;Z)V - ARG 1 alternativePredicate - ARG 2 forgetCallback - ARG 3 shouldForgetIfTargetUnreachable - METHOD method_24621 cannotReachTarget (Lnet/minecraft/class_1309;)Z + ARG 2 shouldForgetIfTargetUnreachable + METHOD method_47140 (ZLjava/util/function/Predicate;Ljava/util/function/BiConsumer;Lnet/minecraft/class_7898$class_7900;)Lcom/mojang/datafixers/kinds/App; + ARG 3 context + METHOD method_47141 (Lnet/minecraft/class_1309;)Z + ARG 0 entity + METHOD method_47142 (Lnet/minecraft/class_1308;Lnet/minecraft/class_1309;)V ARG 0 entity - METHOD method_24622 isAttackTargetInAnotherWorld (Lnet/minecraft/class_1308;)Z - ARG 1 entity - METHOD method_24624 (Lnet/minecraft/class_1309;)Z - ARG 0 target - METHOD method_24625 getAttackTarget (Lnet/minecraft/class_1308;)Lnet/minecraft/class_1309; - ARG 1 entity - METHOD method_24626 isAttackTargetDead (Lnet/minecraft/class_1308;)Z - ARG 1 entity - METHOD method_24627 forgetAttackTarget (Lnet/minecraft/class_1308;)V - ARG 1 entity - METHOD method_35107 (Lnet/minecraft/class_1309;)Z - ARG 0 target + ARG 1 target diff --git a/mappings/net/minecraft/entity/ai/brain/task/ForgetBellRingTask.mapping b/mappings/net/minecraft/entity/ai/brain/task/ForgetBellRingTask.mapping index df1b4d1da7..541755ec9b 100644 --- a/mappings/net/minecraft/entity/ai/brain/task/ForgetBellRingTask.mapping +++ b/mappings/net/minecraft/entity/ai/brain/task/ForgetBellRingTask.mapping @@ -1,8 +1,14 @@ CLASS net/minecraft/class_4252 net/minecraft/entity/ai/brain/task/ForgetBellRingTask - FIELD field_19000 maxHiddenTicks I - FIELD field_19001 hiddenTicks I - FIELD field_19154 distance I FIELD field_30165 MIN_HEARD_BELL_TIME I - METHOD (II)V - ARG 1 maxHiddenSeconds - ARG 2 distance + METHOD method_47077 create (II)Lnet/minecraft/class_7893; + ARG 0 maxHiddenSeconds + ARG 1 distance + METHOD method_47078 (Lnet/minecraft/class_7898$class_7900;Lnet/minecraft/class_7906;Lorg/apache/commons/lang3/mutable/MutableInt;ILnet/minecraft/class_7906;ILnet/minecraft/class_3218;Lnet/minecraft/class_1309;J)Z + ARG 6 world + ARG 7 entity + ARG 8 time + METHOD method_47079 (Lnet/minecraft/class_7898$class_7900;Lorg/apache/commons/lang3/mutable/MutableInt;IILnet/minecraft/class_7906;Lnet/minecraft/class_7906;)Lnet/minecraft/class_7911; + ARG 4 hidingPlace + ARG 5 heardBellTime + METHOD method_47080 (Lorg/apache/commons/lang3/mutable/MutableInt;IILnet/minecraft/class_7898$class_7900;)Lcom/mojang/datafixers/kinds/App; + ARG 3 context diff --git a/mappings/net/minecraft/entity/ai/brain/task/ForgetCompletedPointOfInterestTask.mapping b/mappings/net/minecraft/entity/ai/brain/task/ForgetCompletedPointOfInterestTask.mapping index 60cc1c385a..1309bef8ca 100644 --- a/mappings/net/minecraft/entity/ai/brain/task/ForgetCompletedPointOfInterestTask.mapping +++ b/mappings/net/minecraft/entity/ai/brain/task/ForgetCompletedPointOfInterestTask.mapping @@ -1,14 +1,17 @@ CLASS net/minecraft/class_4128 net/minecraft/entity/ai/brain/task/ForgetCompletedPointOfInterestTask - FIELD field_18390 memoryModule Lnet/minecraft/class_4140; - FIELD field_18391 poiTypePredicate Ljava/util/function/Predicate; FIELD field_30185 MAX_RANGE I - METHOD (Ljava/util/function/Predicate;Lnet/minecraft/class_4140;)V - ARG 1 poiTypePredicate - ARG 2 memoryModule - METHOD method_20499 hasCompletedPointOfInterest (Lnet/minecraft/class_3218;Lnet/minecraft/class_2338;)Z - ARG 1 world - ARG 2 pos METHOD method_20500 isBedOccupiedByOthers (Lnet/minecraft/class_3218;Lnet/minecraft/class_2338;Lnet/minecraft/class_1309;)Z - ARG 1 world - ARG 2 pos - ARG 3 entity + ARG 0 world + ARG 1 pos + ARG 2 entity + METHOD method_47187 (Lnet/minecraft/class_7898$class_7900;Lnet/minecraft/class_7906;Ljava/util/function/Predicate;Lnet/minecraft/class_3218;Lnet/minecraft/class_1309;J)Z + ARG 3 world + ARG 4 entity + ARG 5 time + METHOD method_47188 (Lnet/minecraft/class_7898$class_7900;Ljava/util/function/Predicate;Lnet/minecraft/class_7906;)Lnet/minecraft/class_7911; + ARG 2 poiPos + METHOD method_47189 (Lnet/minecraft/class_4140;Ljava/util/function/Predicate;Lnet/minecraft/class_7898$class_7900;)Lcom/mojang/datafixers/kinds/App; + ARG 2 context + METHOD method_47190 create (Ljava/util/function/Predicate;Lnet/minecraft/class_4140;)Lnet/minecraft/class_7893; + ARG 0 poiTypePredicate + ARG 1 poiPosModule diff --git a/mappings/net/minecraft/entity/ai/brain/task/ForgetTask.mapping b/mappings/net/minecraft/entity/ai/brain/task/ForgetTask.mapping index 93cb053023..a453ee831d 100644 --- a/mappings/net/minecraft/entity/ai/brain/task/ForgetTask.mapping +++ b/mappings/net/minecraft/entity/ai/brain/task/ForgetTask.mapping @@ -1,6 +1,12 @@ CLASS net/minecraft/class_4813 net/minecraft/entity/ai/brain/task/ForgetTask - FIELD field_22302 condition Ljava/util/function/Predicate; - FIELD field_22303 memory Lnet/minecraft/class_4140; - METHOD (Ljava/util/function/Predicate;Lnet/minecraft/class_4140;)V - ARG 1 condition - ARG 2 memory + METHOD method_46919 (Lnet/minecraft/class_4140;Ljava/util/function/Predicate;Lnet/minecraft/class_7898$class_7900;)Lcom/mojang/datafixers/kinds/App; + ARG 2 context + METHOD method_46920 (Ljava/util/function/Predicate;Lnet/minecraft/class_7906;)Lnet/minecraft/class_7911; + ARG 1 queryResult + METHOD method_46921 (Ljava/util/function/Predicate;Lnet/minecraft/class_7906;Lnet/minecraft/class_3218;Lnet/minecraft/class_1309;J)Z + ARG 2 world + ARG 3 entity + ARG 4 time + METHOD method_46922 create (Ljava/util/function/Predicate;Lnet/minecraft/class_4140;)Lnet/minecraft/class_7893; + ARG 0 condition + ARG 1 memory diff --git a/mappings/net/minecraft/entity/ai/brain/task/GatherItemsVillagerTask.mapping b/mappings/net/minecraft/entity/ai/brain/task/GatherItemsVillagerTask.mapping index 0fc382aa40..d75ef4b380 100644 --- a/mappings/net/minecraft/entity/ai/brain/task/GatherItemsVillagerTask.mapping +++ b/mappings/net/minecraft/entity/ai/brain/task/GatherItemsVillagerTask.mapping @@ -6,4 +6,8 @@ CLASS net/minecraft/class_4126 net/minecraft/entity/ai/brain/task/GatherItemsVil ARG 0 villager ARG 1 validItems ARG 2 target + METHOD method_19014 (Lcom/google/common/collect/ImmutableSet;Lnet/minecraft/class_1792;)Z + ARG 1 item METHOD method_19611 getGatherableItems (Lnet/minecraft/class_1646;Lnet/minecraft/class_1646;)Ljava/util/Set; + ARG 0 entity + ARG 1 target diff --git a/mappings/net/minecraft/entity/ai/brain/task/GiveGiftsToHeroTask.mapping b/mappings/net/minecraft/entity/ai/brain/task/GiveGiftsToHeroTask.mapping index ad521163b7..6d942088f7 100644 --- a/mappings/net/minecraft/entity/ai/brain/task/GiveGiftsToHeroTask.mapping +++ b/mappings/net/minecraft/entity/ai/brain/task/GiveGiftsToHeroTask.mapping @@ -20,6 +20,8 @@ CLASS net/minecraft/class_4243 net/minecraft/entity/ai/brain/task/GiveGiftsToHer ARG 2 player METHOD method_19959 isHero (Lnet/minecraft/class_1657;)Z ARG 1 player + METHOD method_19960 (Ljava/util/HashMap;)V + ARG 0 gifts METHOD method_19961 getNextGiftDelay (Lnet/minecraft/class_3218;)I ARG 0 world METHOD method_19964 isNearestPlayerHero (Lnet/minecraft/class_1646;)Z diff --git a/mappings/net/minecraft/entity/ai/brain/task/GiveInventoryToLookTargetTask.mapping b/mappings/net/minecraft/entity/ai/brain/task/GiveInventoryToLookTargetTask.mapping index 5cf83944ea..4a71baec4f 100644 --- a/mappings/net/minecraft/entity/ai/brain/task/GiveInventoryToLookTargetTask.mapping +++ b/mappings/net/minecraft/entity/ai/brain/task/GiveInventoryToLookTargetTask.mapping @@ -1,9 +1,12 @@ CLASS net/minecraft/class_7296 net/minecraft/entity/ai/brain/task/GiveInventoryToLookTargetTask + FIELD field_38387 COMPLETION_RANGE I + FIELD field_38388 ITEM_PICKUP_COOLDOWN_TICKS I FIELD field_38389 lookTargetFunction Ljava/util/function/Function; FIELD field_38390 speed F - METHOD (Ljava/util/function/Function;F)V + METHOD (Ljava/util/function/Function;FI)V ARG 1 lookTargetFunction ARG 2 speed + ARG 3 runTime METHOD method_42649 hasItemAndTarget (Lnet/minecraft/class_1309;)Z ARG 1 entity METHOD method_42650 (Lnet/minecraft/class_1309;Lnet/minecraft/class_4115;)V diff --git a/mappings/net/minecraft/entity/ai/brain/task/GoToCelebrateTask.mapping b/mappings/net/minecraft/entity/ai/brain/task/GoToCelebrateTask.mapping deleted file mode 100644 index fa4394c6b4..0000000000 --- a/mappings/net/minecraft/entity/ai/brain/task/GoToCelebrateTask.mapping +++ /dev/null @@ -1,15 +0,0 @@ -CLASS net/minecraft/class_4814 net/minecraft/entity/ai/brain/task/GoToCelebrateTask - FIELD field_22304 completionRange I - FIELD field_23130 speed F - FIELD field_38101 memoryModuleType Lnet/minecraft/class_4140; - METHOD (Lnet/minecraft/class_4140;IF)V - ARG 1 memoryModuleType - ARG 2 completionRange - ARG 3 speed - METHOD method_24576 getCelebrateLocation (Lnet/minecraft/class_1308;)Lnet/minecraft/class_2338; - ARG 1 entity - METHOD method_24577 fuzz (Lnet/minecraft/class_1308;Lnet/minecraft/class_2338;)Lnet/minecraft/class_2338; - ARG 0 mob - ARG 1 pos - METHOD method_24578 fuzz (Lnet/minecraft/class_5819;)I - ARG 0 random diff --git a/mappings/net/minecraft/entity/ai/brain/task/GoToIfNearbyTask.mapping b/mappings/net/minecraft/entity/ai/brain/task/GoToIfNearbyTask.mapping index f547fee1ed..6809b31a75 100644 --- a/mappings/net/minecraft/entity/ai/brain/task/GoToIfNearbyTask.mapping +++ b/mappings/net/minecraft/entity/ai/brain/task/GoToIfNearbyTask.mapping @@ -1,14 +1,19 @@ CLASS net/minecraft/class_4116 net/minecraft/entity/ai/brain/task/GoToIfNearbyTask - FIELD field_18372 target Lnet/minecraft/class_4140; - FIELD field_18373 nextUpdateTime J - FIELD field_18374 maxDistance I - FIELD field_25752 walkSpeed F FIELD field_30179 UPDATE_INTERVAL I FIELD field_30180 HORIZONTAL_RANGE I FIELD field_30181 VERTICAL_RANGE I - METHOD (Lnet/minecraft/class_4140;FI)V - ARG 1 target - ARG 2 walkSpeed - ARG 3 maxDistance - METHOD method_18992 (Lnet/minecraft/class_243;)Lnet/minecraft/class_4142; - ARG 1 pos + METHOD method_47150 (FLnet/minecraft/class_243;)Lnet/minecraft/class_4142; + ARG 1 targetPos + METHOD method_47151 (Lnet/minecraft/class_7898$class_7900;ILorg/apache/commons/lang3/mutable/MutableLong;FLnet/minecraft/class_7906;Lnet/minecraft/class_7906;)Lnet/minecraft/class_7911; + ARG 4 walkTarget + ARG 5 pos + METHOD method_47152 (Lnet/minecraft/class_7898$class_7900;Lnet/minecraft/class_7906;ILorg/apache/commons/lang3/mutable/MutableLong;Lnet/minecraft/class_7906;FLnet/minecraft/class_3218;Lnet/minecraft/class_1314;J)Z + ARG 6 world + ARG 7 entity + ARG 8 time + METHOD method_47153 create (Lnet/minecraft/class_4140;FI)Lnet/minecraft/class_7894; + ARG 0 posModule + ARG 1 walkSpeed + ARG 2 maxDistance + METHOD method_47154 (Lnet/minecraft/class_4140;ILorg/apache/commons/lang3/mutable/MutableLong;FLnet/minecraft/class_7898$class_7900;)Lcom/mojang/datafixers/kinds/App; + ARG 4 context diff --git a/mappings/net/minecraft/entity/ai/brain/task/GoToNearbyPositionTask.mapping b/mappings/net/minecraft/entity/ai/brain/task/GoToNearbyPositionTask.mapping index a63a56f4c6..c9a246b0d2 100644 --- a/mappings/net/minecraft/entity/ai/brain/task/GoToNearbyPositionTask.mapping +++ b/mappings/net/minecraft/entity/ai/brain/task/GoToNearbyPositionTask.mapping @@ -1,13 +1,15 @@ CLASS net/minecraft/class_4219 net/minecraft/entity/ai/brain/task/GoToNearbyPositionTask - FIELD field_18862 memoryModuleType Lnet/minecraft/class_4140; - FIELD field_18863 completionRange I - FIELD field_18864 maxDistance I - FIELD field_18865 nextRunTime J - FIELD field_25753 walkSpeed F - METHOD (Lnet/minecraft/class_4140;FII)V - ARG 1 memoryModuleType - ARG 2 walkSpeed - ARG 3 completionRange - ARG 4 maxDistance - METHOD method_19606 (Lnet/minecraft/class_4095;Lnet/minecraft/class_4208;)V - ARG 2 pos + METHOD method_47155 (Lnet/minecraft/class_7898$class_7900;ILorg/apache/commons/lang3/mutable/MutableLong;FILnet/minecraft/class_7906;Lnet/minecraft/class_7906;)Lnet/minecraft/class_7911; + ARG 5 walkTarget + ARG 6 pos + METHOD method_47156 (Lnet/minecraft/class_7898$class_7900;Lnet/minecraft/class_7906;ILorg/apache/commons/lang3/mutable/MutableLong;Lnet/minecraft/class_7906;FILnet/minecraft/class_3218;Lnet/minecraft/class_1314;J)Z + ARG 7 world + ARG 8 entity + ARG 9 time + METHOD method_47157 create (Lnet/minecraft/class_4140;FII)Lnet/minecraft/class_7893; + ARG 0 posModule + ARG 1 walkSpeed + ARG 2 completionRange + ARG 3 maxDistance + METHOD method_47158 (Lnet/minecraft/class_4140;ILorg/apache/commons/lang3/mutable/MutableLong;FILnet/minecraft/class_7898$class_7900;)Lcom/mojang/datafixers/kinds/App; + ARG 5 context diff --git a/mappings/net/minecraft/entity/ai/brain/task/GoToPointOfInterestTask.mapping b/mappings/net/minecraft/entity/ai/brain/task/GoToPointOfInterestTask.mapping index 98a34a8d5e..bde0ce0340 100644 --- a/mappings/net/minecraft/entity/ai/brain/task/GoToPointOfInterestTask.mapping +++ b/mappings/net/minecraft/entity/ai/brain/task/GoToPointOfInterestTask.mapping @@ -1,6 +1,14 @@ CLASS net/minecraft/class_4458 net/minecraft/entity/ai/brain/task/GoToPointOfInterestTask - FIELD field_20288 speed F - FIELD field_20289 completionRange I - METHOD (FI)V - ARG 1 speed - ARG 2 completionRange + METHOD method_46934 create (FI)Lnet/minecraft/class_7893; + ARG 0 speed + ARG 1 completionRange + METHOD method_46935 (FILnet/minecraft/class_7898$class_7900;)Lcom/mojang/datafixers/kinds/App; + ARG 2 context + METHOD method_46936 (FILnet/minecraft/class_7906;)Lnet/minecraft/class_7911; + ARG 2 walkTarget + METHOD method_46937 (Lnet/minecraft/class_7906;FILnet/minecraft/class_3218;Lnet/minecraft/class_1646;J)Z + ARG 3 world + ARG 4 entity + ARG 5 time + METHOD method_46938 (Lnet/minecraft/class_4153;Lnet/minecraft/class_2338;)D + ARG 1 pos diff --git a/mappings/net/minecraft/entity/ai/brain/task/GoToRememberedPositionTask.mapping b/mappings/net/minecraft/entity/ai/brain/task/GoToRememberedPositionTask.mapping index 4daa1ff358..191f40cb85 100644 --- a/mappings/net/minecraft/entity/ai/brain/task/GoToRememberedPositionTask.mapping +++ b/mappings/net/minecraft/entity/ai/brain/task/GoToRememberedPositionTask.mapping @@ -1,29 +1,26 @@ CLASS net/minecraft/class_4121 net/minecraft/entity/ai/brain/task/GoToRememberedPositionTask - FIELD field_18380 entityMemory Lnet/minecraft/class_4140; - FIELD field_18381 speed F - FIELD field_22321 range I - FIELD field_22322 posRetriever Ljava/util/function/Function; - METHOD (Lnet/minecraft/class_4140;FIZLjava/util/function/Function;)V - ARG 1 memoryType - ARG 2 speed - ARG 3 range - ARG 4 requiresWalkTarget - ARG 5 posRetriever - METHOD method_19596 setWalkTarget (Lnet/minecraft/class_1314;Lnet/minecraft/class_243;F)V - ARG 0 entity - ARG 1 pos - ARG 2 speed - METHOD method_24600 getPos (Lnet/minecraft/class_1314;)Lnet/minecraft/class_243; - ARG 1 entity - METHOD method_24601 toBlock (Lnet/minecraft/class_4140;FIZ)Lnet/minecraft/class_4121; - ARG 0 memoryType + METHOD method_24603 createEntityBased (Lnet/minecraft/class_4140;FIZ)Lnet/minecraft/class_7894; + ARG 0 entityModule ARG 1 speed 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 + METHOD method_47089 (Lnet/minecraft/class_7898$class_7900;Lnet/minecraft/class_7906;ZLjava/util/function/Function;Lnet/minecraft/class_7906;IFLnet/minecraft/class_3218;Lnet/minecraft/class_1314;J)Z + ARG 7 world + ARG 8 entity + ARG 9 time + METHOD method_47090 (Lnet/minecraft/class_7898$class_7900;ZLjava/util/function/Function;IFLnet/minecraft/class_7906;Lnet/minecraft/class_7906;)Lnet/minecraft/class_7911; + ARG 5 walkTarget + ARG 6 posSourcex + METHOD method_47091 createPosBased (Lnet/minecraft/class_4140;FIZ)Lnet/minecraft/class_7893; + ARG 0 posModule ARG 1 speed ARG 2 range ARG 3 requiresWalkTarget + METHOD method_47092 create (Lnet/minecraft/class_4140;FIZLjava/util/function/Function;)Lnet/minecraft/class_7894; + ARG 0 posSource + ARG 1 speed + ARG 2 range + ARG 3 requiresWalkTarget + ARG 4 posGetter + METHOD method_47093 (Lnet/minecraft/class_4140;ZLjava/util/function/Function;IFLnet/minecraft/class_7898$class_7900;)Lcom/mojang/datafixers/kinds/App; + ARG 5 context diff --git a/mappings/net/minecraft/entity/ai/brain/task/GoToSecondaryPositionTask.mapping b/mappings/net/minecraft/entity/ai/brain/task/GoToSecondaryPositionTask.mapping index 738f186022..6352cfb458 100644 --- a/mappings/net/minecraft/entity/ai/brain/task/GoToSecondaryPositionTask.mapping +++ b/mappings/net/minecraft/entity/ai/brain/task/GoToSecondaryPositionTask.mapping @@ -1,14 +1,17 @@ CLASS net/minecraft/class_4220 net/minecraft/entity/ai/brain/task/GoToSecondaryPositionTask - FIELD field_18866 secondaryPositions Lnet/minecraft/class_4140; - FIELD field_18867 primaryPosition Lnet/minecraft/class_4140; - FIELD field_18868 speed F - FIELD field_18869 completionRange I - FIELD field_18870 primaryPositionActivationDistance I - FIELD field_18871 nextRunTime J - FIELD field_18872 chosenPosition Lnet/minecraft/class_4208; - METHOD (Lnet/minecraft/class_4140;FIILnet/minecraft/class_4140;)V - ARG 1 secondaryPositions - ARG 2 speed - ARG 3 completionRange - ARG 4 primaryPositionActivationDistance - ARG 5 primaryPosition + METHOD method_47159 (Lnet/minecraft/class_7898$class_7900;ILorg/apache/commons/lang3/mutable/MutableLong;FILnet/minecraft/class_7906;Lnet/minecraft/class_7906;Lnet/minecraft/class_7906;)Lnet/minecraft/class_7911; + ARG 5 walkTarget + ARG 6 secondary + ARG 7 primary + METHOD method_47160 (Lnet/minecraft/class_7898$class_7900;Lnet/minecraft/class_7906;Lnet/minecraft/class_7906;ILorg/apache/commons/lang3/mutable/MutableLong;Lnet/minecraft/class_7906;FILnet/minecraft/class_3218;Lnet/minecraft/class_1646;J)Z + ARG 8 world + ARG 9 entity + ARG 10 time + METHOD method_47161 create (Lnet/minecraft/class_4140;FIILnet/minecraft/class_4140;)Lnet/minecraft/class_7893; + ARG 0 secondaryPositions + ARG 1 speed + ARG 2 completionRange + ARG 3 primaryPositionActivationDistance + ARG 4 primaryPosition + METHOD method_47162 (Lnet/minecraft/class_4140;Lnet/minecraft/class_4140;ILorg/apache/commons/lang3/mutable/MutableLong;FILnet/minecraft/class_7898$class_7900;)Lcom/mojang/datafixers/kinds/App; + ARG 6 context diff --git a/mappings/net/minecraft/entity/ai/brain/task/GoToWorkTask.mapping b/mappings/net/minecraft/entity/ai/brain/task/GoToWorkTask.mapping index eab3850653..68b114ff69 100644 --- a/mappings/net/minecraft/entity/ai/brain/task/GoToWorkTask.mapping +++ b/mappings/net/minecraft/entity/ai/brain/task/GoToWorkTask.mapping @@ -1,7 +1,19 @@ CLASS net/minecraft/class_4114 net/minecraft/entity/ai/brain/task/GoToWorkTask - METHOD method_18984 (Lnet/minecraft/class_6880;Lnet/minecraft/class_3852;)Z - ARG 1 profession - METHOD method_18986 (Lnet/minecraft/class_1646;Lnet/minecraft/class_3218;Lnet/minecraft/class_3852;)V + METHOD method_46887 create ()Lnet/minecraft/class_7893; + METHOD method_46888 (Lnet/minecraft/class_7898$class_7900;)Lcom/mojang/datafixers/kinds/App; + ARG 0 context + METHOD method_46889 (Lnet/minecraft/class_7898$class_7900;Lnet/minecraft/class_7906;Lnet/minecraft/class_7906;)Lnet/minecraft/class_7911; + ARG 1 potentialJobSite + ARG 2 jobSite + METHOD method_46890 (Lnet/minecraft/class_7898$class_7900;Lnet/minecraft/class_7906;Lnet/minecraft/class_7906;Lnet/minecraft/class_3218;Lnet/minecraft/class_1646;J)Z + ARG 3 world + ARG 4 entity + ARG 5 time + METHOD method_46891 (Lnet/minecraft/class_1646;Lnet/minecraft/class_3218;Lnet/minecraft/class_3852;)V ARG 2 profession - METHOD method_29929 (Lnet/minecraft/class_4208;Lnet/minecraft/class_3218;)Ljava/util/Optional; - ARG 1 world + METHOD method_46892 (Lnet/minecraft/class_4208;Lnet/minecraft/class_3218;)Ljava/util/Optional; + ARG 1 jobSiteWorld + METHOD method_46893 (Lnet/minecraft/class_6880;)Ljava/util/Optional; + ARG 0 poiType + METHOD method_46894 (Lnet/minecraft/class_6880;Lnet/minecraft/class_3852;)Z + ARG 1 profession diff --git a/mappings/net/minecraft/entity/ai/brain/task/GoTowardsLookTarget.mapping b/mappings/net/minecraft/entity/ai/brain/task/GoTowardsLookTarget.mapping deleted file mode 100644 index a5bb9cee96..0000000000 --- a/mappings/net/minecraft/entity/ai/brain/task/GoTowardsLookTarget.mapping +++ /dev/null @@ -1,15 +0,0 @@ -CLASS net/minecraft/class_4120 net/minecraft/entity/ai/brain/task/GoTowardsLookTarget - FIELD field_18378 speed Ljava/util/function/Function; - FIELD field_19002 completionRange I - FIELD field_34049 predicate Ljava/util/function/Predicate; - METHOD (FI)V - ARG 1 speed - ARG 2 completionRange - METHOD (Ljava/util/function/Predicate;Ljava/util/function/Function;I)V - ARG 1 predicate - ARG 2 speed - ARG 3 completionRange - METHOD method_33204 (Lnet/minecraft/class_1309;)Z - ARG 0 entity - METHOD method_37455 (FLnet/minecraft/class_1309;)Ljava/lang/Float; - ARG 1 entity diff --git a/mappings/net/minecraft/entity/ai/brain/task/GoTowardsLookTargetTask.mapping b/mappings/net/minecraft/entity/ai/brain/task/GoTowardsLookTargetTask.mapping new file mode 100644 index 0000000000..858ecc43fc --- /dev/null +++ b/mappings/net/minecraft/entity/ai/brain/task/GoTowardsLookTargetTask.mapping @@ -0,0 +1,21 @@ +CLASS net/minecraft/class_4120 net/minecraft/entity/ai/brain/task/GoTowardsLookTargetTask + METHOD method_47104 create (FI)Lnet/minecraft/class_7894; + ARG 0 speed + ARG 1 completionRange + METHOD method_47105 (FLnet/minecraft/class_1309;)Ljava/lang/Float; + ARG 1 entity + METHOD method_47106 (Lnet/minecraft/class_1309;)Z + ARG 0 entity + METHOD method_47107 (Ljava/util/function/Predicate;Lnet/minecraft/class_7898$class_7900;Ljava/util/function/Function;ILnet/minecraft/class_7906;Lnet/minecraft/class_7906;)Lnet/minecraft/class_7911; + ARG 4 walkTarget + ARG 5 lookTarget + METHOD method_47108 (Ljava/util/function/Predicate;Lnet/minecraft/class_7906;Lnet/minecraft/class_7898$class_7900;Lnet/minecraft/class_7906;Ljava/util/function/Function;ILnet/minecraft/class_3218;Lnet/minecraft/class_1309;J)Z + ARG 6 world + ARG 7 entity + ARG 8 time + METHOD method_47109 create (Ljava/util/function/Predicate;Ljava/util/function/Function;I)Lnet/minecraft/class_7894; + ARG 0 predicate + ARG 1 speed + ARG 2 completionRange + METHOD method_47110 (Ljava/util/function/Predicate;Ljava/util/function/Function;ILnet/minecraft/class_7898$class_7900;)Lcom/mojang/datafixers/kinds/App; + ARG 3 context diff --git a/mappings/net/minecraft/entity/ai/brain/task/HideInHomeDuringRaidTask.mapping b/mappings/net/minecraft/entity/ai/brain/task/HideInHomeDuringRaidTask.mapping deleted file mode 100644 index a94a3be902..0000000000 --- a/mappings/net/minecraft/entity/ai/brain/task/HideInHomeDuringRaidTask.mapping +++ /dev/null @@ -1,4 +0,0 @@ -CLASS net/minecraft/class_4247 net/minecraft/entity/ai/brain/task/HideInHomeDuringRaidTask - METHOD (IF)V - ARG 1 maxDistance - ARG 2 walkSpeed diff --git a/mappings/net/minecraft/entity/ai/brain/task/HideInHomeTask.mapping b/mappings/net/minecraft/entity/ai/brain/task/HideInHomeTask.mapping index aa55539e93..1d010d8420 100644 --- a/mappings/net/minecraft/entity/ai/brain/task/HideInHomeTask.mapping +++ b/mappings/net/minecraft/entity/ai/brain/task/HideInHomeTask.mapping @@ -1,17 +1,31 @@ CLASS net/minecraft/class_4246 net/minecraft/entity/ai/brain/task/HideInHomeTask - FIELD field_18993 walkSpeed F - FIELD field_18994 maxDistance I - FIELD field_18995 preferredDistance I - FIELD field_18998 homePosition Ljava/util/Optional; - METHOD (IFI)V - ARG 1 maxDistance - ARG 2 walkSpeed - ARG 3 preferredDistance - METHOD method_19983 (Lnet/minecraft/class_6880;)Z - ARG 0 poiType - METHOD method_19985 (Lnet/minecraft/class_6880;)Z - ARG 0 poiType - METHOD method_20211 (Lnet/minecraft/class_2338;)Z + METHOD method_46975 create (IFI)Lnet/minecraft/class_7894; + ARG 0 maxDistance + ARG 1 walkSpeed + ARG 2 preferredDistance + METHOD method_46976 (IIFLnet/minecraft/class_7898$class_7900;)Lcom/mojang/datafixers/kinds/App; + ARG 3 context + METHOD method_46977 (IILnet/minecraft/class_7898$class_7900;FLnet/minecraft/class_7906;Lnet/minecraft/class_7906;Lnet/minecraft/class_7906;Lnet/minecraft/class_7906;Lnet/minecraft/class_7906;Lnet/minecraft/class_7906;Lnet/minecraft/class_7906;)Lnet/minecraft/class_7911; + ARG 4 walkTarget + ARG 5 home + ARG 6 hidingPlace + ARG 7 path + ARG 8 lookTarget + ARG 9 breedTarget + ARG 10 interactionTarget + METHOD method_46978 (IILnet/minecraft/class_7898$class_7900;Lnet/minecraft/class_7906;Lnet/minecraft/class_7906;Lnet/minecraft/class_7906;Lnet/minecraft/class_7906;Lnet/minecraft/class_7906;Lnet/minecraft/class_7906;Lnet/minecraft/class_7906;FLnet/minecraft/class_3218;Lnet/minecraft/class_1309;J)Z + ARG 11 world + ARG 12 entity + ARG 13 time + METHOD method_46980 (Lnet/minecraft/class_1309;ILnet/minecraft/class_2338;)Z + ARG 2 pos + METHOD method_46982 (Lnet/minecraft/class_7906;Lnet/minecraft/class_7906;Lnet/minecraft/class_7906;Lnet/minecraft/class_7906;Lnet/minecraft/class_7906;Lnet/minecraft/class_3218;Lnet/minecraft/class_1309;ILnet/minecraft/class_7906;FLnet/minecraft/class_2338;)V + ARG 10 pos + METHOD method_46983 (Lnet/minecraft/class_2338;)Z ARG 0 pos - METHOD method_20212 (Lnet/minecraft/class_2338;)Z + METHOD method_46984 (Lnet/minecraft/class_6880;)Z + ARG 0 poiType + METHOD method_46985 (Lnet/minecraft/class_2338;)Z ARG 0 pos + METHOD method_46986 (Lnet/minecraft/class_6880;)Z + ARG 0 poiType diff --git a/mappings/net/minecraft/entity/ai/brain/task/HideWhenBellRingsTask.mapping b/mappings/net/minecraft/entity/ai/brain/task/HideWhenBellRingsTask.mapping index 5f55b643bd..1eafa57a67 100644 --- a/mappings/net/minecraft/entity/ai/brain/task/HideWhenBellRingsTask.mapping +++ b/mappings/net/minecraft/entity/ai/brain/task/HideWhenBellRingsTask.mapping @@ -1 +1,10 @@ CLASS net/minecraft/class_4249 net/minecraft/entity/ai/brain/task/HideWhenBellRingsTask + METHOD method_47033 create ()Lnet/minecraft/class_7893; + METHOD method_47034 (Lnet/minecraft/class_3218;Lnet/minecraft/class_1309;J)Z + ARG 0 world + ARG 1 entity + ARG 2 time + METHOD method_47035 (Lnet/minecraft/class_7898$class_7900;)Lcom/mojang/datafixers/kinds/App; + ARG 0 context + METHOD method_47036 (Lnet/minecraft/class_7906;)Lnet/minecraft/class_7911; + ARG 0 heardBellTime diff --git a/mappings/net/minecraft/entity/ai/brain/task/HuntFinishTask.mapping b/mappings/net/minecraft/entity/ai/brain/task/HuntFinishTask.mapping index e94f526811..f89c1c62d3 100644 --- a/mappings/net/minecraft/entity/ai/brain/task/HuntFinishTask.mapping +++ b/mappings/net/minecraft/entity/ai/brain/task/HuntFinishTask.mapping @@ -1,3 +1,11 @@ CLASS net/minecraft/class_4819 net/minecraft/entity/ai/brain/task/HuntFinishTask - METHOD method_24595 hasKilledHoglin (Lnet/minecraft/class_4836;)Z - ARG 1 piglin + METHOD method_47275 create ()Lnet/minecraft/class_7893; + METHOD method_47276 (Lnet/minecraft/class_7898$class_7900;)Lcom/mojang/datafixers/kinds/App; + ARG 0 context + METHOD method_47277 (Lnet/minecraft/class_7898$class_7900;Lnet/minecraft/class_7906;Lnet/minecraft/class_7906;)Lnet/minecraft/class_7911; + ARG 1 attackTarget + ARG 2 huntedRecently + METHOD method_47278 (Lnet/minecraft/class_7898$class_7900;Lnet/minecraft/class_7906;Lnet/minecraft/class_7906;Lnet/minecraft/class_3218;Lnet/minecraft/class_1309;J)Z + ARG 3 world + ARG 4 entity + ARG 5 time diff --git a/mappings/net/minecraft/entity/ai/brain/task/HuntHoglinTask.mapping b/mappings/net/minecraft/entity/ai/brain/task/HuntHoglinTask.mapping index b9b3d9336f..44d85f2ab8 100644 --- a/mappings/net/minecraft/entity/ai/brain/task/HuntHoglinTask.mapping +++ b/mappings/net/minecraft/entity/ai/brain/task/HuntHoglinTask.mapping @@ -1 +1,19 @@ CLASS net/minecraft/class_4826 net/minecraft/entity/ai/brain/task/HuntHoglinTask + METHOD method_47283 create ()Lnet/minecraft/class_7894; + METHOD method_47284 (Lnet/minecraft/class_7898$class_7900;)Lcom/mojang/datafixers/kinds/App; + ARG 0 context + METHOD method_47285 (Lnet/minecraft/class_7898$class_7900;Lnet/minecraft/class_7906;Lnet/minecraft/class_7906;Lnet/minecraft/class_3218;Lnet/minecraft/class_4836;J)Z + ARG 3 world + ARG 4 entity + ARG 5 time + METHOD method_47286 (Lnet/minecraft/class_7898$class_7900;Lnet/minecraft/class_7906;Lnet/minecraft/class_7906;Lnet/minecraft/class_7906;Lnet/minecraft/class_7906;)Lnet/minecraft/class_7911; + ARG 1 nearestVisibleHuntableHoglin + ARG 2 angryAt + ARG 3 huntedRecently + ARG 4 nearestVisibleAdultPiglins + METHOD method_47287 hasHuntedRecently (Lnet/minecraft/class_5418;)Z + ARG 0 piglin + METHOD method_47288 (Ljava/util/List;)V + ARG 0 piglin + METHOD method_47289 (Ljava/util/List;)Ljava/lang/Boolean; + ARG 0 piglin diff --git a/mappings/net/minecraft/entity/ai/brain/task/LayFrogSpawnTask.mapping b/mappings/net/minecraft/entity/ai/brain/task/LayFrogSpawnTask.mapping index 4210df5819..ae469ad308 100644 --- a/mappings/net/minecraft/entity/ai/brain/task/LayFrogSpawnTask.mapping +++ b/mappings/net/minecraft/entity/ai/brain/task/LayFrogSpawnTask.mapping @@ -1,6 +1,13 @@ CLASS net/minecraft/class_7099 net/minecraft/entity/ai/brain/task/LayFrogSpawnTask - FIELD field_37440 frogSpawn Lnet/minecraft/class_2248; - FIELD field_37441 triggerMemory Lnet/minecraft/class_4140; - METHOD (Lnet/minecraft/class_2248;Lnet/minecraft/class_4140;)V - ARG 1 frogSpawn - ARG 2 triggerMemory + METHOD method_47180 create (Lnet/minecraft/class_2248;)Lnet/minecraft/class_7893; + ARG 0 frogSpawn + METHOD method_47181 (Lnet/minecraft/class_2248;Lnet/minecraft/class_7898$class_7900;)Lcom/mojang/datafixers/kinds/App; + ARG 1 context + METHOD method_47182 (Lnet/minecraft/class_2248;Lnet/minecraft/class_7906;Lnet/minecraft/class_3218;Lnet/minecraft/class_1309;J)Z + ARG 2 world + ARG 3 entity + ARG 4 time + METHOD method_47183 (Lnet/minecraft/class_2248;Lnet/minecraft/class_7906;Lnet/minecraft/class_7906;Lnet/minecraft/class_7906;)Lnet/minecraft/class_7911; + ARG 1 attackTarget + ARG 2 walkTarget + ARG 3 isPregnant diff --git a/mappings/net/minecraft/entity/ai/brain/task/LongJumpTask.mapping b/mappings/net/minecraft/entity/ai/brain/task/LongJumpTask.mapping index 606bf088eb..c74e8d29f2 100644 --- a/mappings/net/minecraft/entity/ai/brain/task/LongJumpTask.mapping +++ b/mappings/net/minecraft/entity/ai/brain/task/LongJumpTask.mapping @@ -14,43 +14,43 @@ CLASS net/minecraft/class_6030 net/minecraft/entity/ai/brain/task/LongJumpTask FIELD field_30146 targetTime J FIELD field_33460 entityToSound Ljava/util/function/Function; FIELD field_37431 RAM_RANGES Ljava/util/List; - FIELD field_37432 jumpToPredicate Ljava/util/function/Predicate; + FIELD field_37432 jumpToPredicate Ljava/util/function/BiPredicate; METHOD (Lnet/minecraft/class_6019;IIFLjava/util/function/Function;)V ARG 1 cooldownRange ARG 2 verticalRange ARG 3 horizontalRange ARG 4 maxRange ARG 5 entityToSound - METHOD (Lnet/minecraft/class_6019;IIFLjava/util/function/Function;Ljava/util/function/Predicate;)V + METHOD (Lnet/minecraft/class_6019;IIFLjava/util/function/Function;Ljava/util/function/BiPredicate;)V ARG 1 cooldownRange ARG 2 verticalRange ARG 3 horizontalRange ARG 4 maxRange ARG 5 entityToSound ARG 6 jumpToPredicate - METHOD method_35078 getRammingVelocity (Lnet/minecraft/class_1308;Lnet/minecraft/class_243;)Lnet/minecraft/class_243; + METHOD method_35078 getJumpingVelocity (Lnet/minecraft/class_1308;Lnet/minecraft/class_243;)Lnet/minecraft/class_243; ARG 1 entity ARG 2 pos - METHOD method_35079 getRammingVelocity (Lnet/minecraft/class_1308;Lnet/minecraft/class_243;I)Lnet/minecraft/class_243; + METHOD method_35079 getJumpingVelocity (Lnet/minecraft/class_1308;Lnet/minecraft/class_243;I)Lnet/minecraft/class_243; ARG 1 entity ARG 2 pos ARG 3 range - METHOD method_35080 canReach (Lnet/minecraft/class_1308;Lnet/minecraft/class_243;Lnet/minecraft/class_243;)Z + METHOD method_35080 canReach (Lnet/minecraft/class_1308;Lnet/minecraft/class_4048;Lnet/minecraft/class_243;Lnet/minecraft/class_243;)Z ARG 1 entity - ARG 2 startPos - ARG 3 endPos + ARG 2 dimensions METHOD method_41336 getTarget (Lnet/minecraft/class_3218;)Ljava/util/Optional; ARG 1 world METHOD method_41337 canJumpTo (Lnet/minecraft/class_3218;Lnet/minecraft/class_1308;Lnet/minecraft/class_2338;)Z ARG 1 world ARG 2 entity ARG 3 pos - METHOD method_41339 (Lnet/minecraft/class_2680;)Z - ARG 0 state METHOD method_41342 findTarget (Lnet/minecraft/class_3218;Lnet/minecraft/class_1308;J)V ARG 1 world ARG 2 entity ARG 3 time + METHOD method_45333 shouldJumpTo (Lnet/minecraft/class_1308;Lnet/minecraft/class_2338;)Z + ARG 0 entity + ARG 1 pos CLASS class_6031 Target FIELD field_30147 pos Lnet/minecraft/class_2338; METHOD (Lnet/minecraft/class_2338;I)V diff --git a/mappings/net/minecraft/entity/ai/brain/task/LookAtDisturbanceTask.mapping b/mappings/net/minecraft/entity/ai/brain/task/LookAtDisturbanceTask.mapping index 9c625d8c21..769cd4b2d3 100644 --- a/mappings/net/minecraft/entity/ai/brain/task/LookAtDisturbanceTask.mapping +++ b/mappings/net/minecraft/entity/ai/brain/task/LookAtDisturbanceTask.mapping @@ -1 +1,13 @@ CLASS net/minecraft/class_7257 net/minecraft/entity/ai/brain/task/LookAtDisturbanceTask + METHOD method_47259 create ()Lnet/minecraft/class_7893; + METHOD method_47260 (Lnet/minecraft/class_7898$class_7900;)Lcom/mojang/datafixers/kinds/App; + ARG 0 context + METHOD method_47262 (Lnet/minecraft/class_7898$class_7900;Lnet/minecraft/class_7906;Lnet/minecraft/class_7906;Lnet/minecraft/class_7906;Lnet/minecraft/class_3218;Lnet/minecraft/class_1309;J)Z + ARG 4 world + ARG 5 entity + ARG 6 time + METHOD method_47263 (Lnet/minecraft/class_7898$class_7900;Lnet/minecraft/class_7906;Lnet/minecraft/class_7906;Lnet/minecraft/class_7906;Lnet/minecraft/class_7906;)Lnet/minecraft/class_7911; + ARG 1 lookTarget + ARG 2 disturbanceLocation + ARG 3 roarTarget + ARG 4 attackTarget diff --git a/mappings/net/minecraft/entity/ai/brain/task/LookAtMobTask.mapping b/mappings/net/minecraft/entity/ai/brain/task/LookAtMobTask.mapping new file mode 100644 index 0000000000..38fc39728f --- /dev/null +++ b/mappings/net/minecraft/entity/ai/brain/task/LookAtMobTask.mapping @@ -0,0 +1,29 @@ +CLASS net/minecraft/class_4119 net/minecraft/entity/ai/brain/task/LookAtMobTask + METHOD method_47056 create (F)Lnet/minecraft/class_7894; + ARG 0 maxDistance + METHOD method_47057 create (Lnet/minecraft/class_1299;F)Lnet/minecraft/class_7894; + ARG 0 type + ARG 1 maxDistance + METHOD method_47058 (Lnet/minecraft/class_1299;Lnet/minecraft/class_1309;)Z + ARG 1 entity + METHOD method_47059 (Lnet/minecraft/class_1309;)Z + ARG 0 entity + METHOD method_47060 (Lnet/minecraft/class_1309;FLnet/minecraft/class_1309;)Z + ARG 2 target + METHOD method_47061 create (Lnet/minecraft/class_1311;F)Lnet/minecraft/class_7893; + ARG 0 spawnGroup + ARG 1 maxDistance + METHOD method_47062 (Lnet/minecraft/class_1311;Lnet/minecraft/class_1309;)Z + ARG 1 entity + METHOD method_47063 (Lnet/minecraft/class_7898$class_7900;Lnet/minecraft/class_7906;Ljava/util/function/Predicate;FLnet/minecraft/class_7906;Lnet/minecraft/class_3218;Lnet/minecraft/class_1309;J)Z + ARG 5 world + ARG 6 entity + ARG 7 time + METHOD method_47064 (Lnet/minecraft/class_7898$class_7900;Ljava/util/function/Predicate;FLnet/minecraft/class_7906;Lnet/minecraft/class_7906;)Lnet/minecraft/class_7911; + ARG 3 lookTarget + ARG 4 visibleMobs + METHOD method_47065 create (Ljava/util/function/Predicate;F)Lnet/minecraft/class_7894; + ARG 0 predicate + ARG 1 maxDistance + METHOD method_47066 (Ljava/util/function/Predicate;FLnet/minecraft/class_7898$class_7900;)Lcom/mojang/datafixers/kinds/App; + ARG 2 context diff --git a/mappings/net/minecraft/entity/ai/brain/task/LookAtMobWithIntervalTask.mapping b/mappings/net/minecraft/entity/ai/brain/task/LookAtMobWithIntervalTask.mapping new file mode 100644 index 0000000000..67e2f71904 --- /dev/null +++ b/mappings/net/minecraft/entity/ai/brain/task/LookAtMobWithIntervalTask.mapping @@ -0,0 +1,34 @@ +CLASS net/minecraft/class_7895 net/minecraft/entity/ai/brain/task/LookAtMobWithIntervalTask + METHOD method_47067 follow (FLnet/minecraft/class_6019;)Lnet/minecraft/class_7893; + ARG 0 maxDistance + ARG 1 interval + METHOD method_47068 follow (FLnet/minecraft/class_6019;Ljava/util/function/Predicate;)Lnet/minecraft/class_7893; + ARG 0 maxDistance + ARG 1 interval + ARG 2 predicate + METHOD method_47069 follow (Lnet/minecraft/class_1299;FLnet/minecraft/class_6019;)Lnet/minecraft/class_7893; + ARG 0 type + ARG 1 maxDistance + ARG 2 interval + METHOD method_47070 (Lnet/minecraft/class_1299;Lnet/minecraft/class_1309;)Z + ARG 1 entity + METHOD method_47071 (Lnet/minecraft/class_1309;)Z + ARG 0 entity + METHOD method_47072 (Lnet/minecraft/class_1309;FLnet/minecraft/class_1309;)Z + ARG 2 other + METHOD method_47073 (Lnet/minecraft/class_7898$class_7900;Lnet/minecraft/class_7906;Ljava/util/function/Predicate;FLnet/minecraft/class_7895$class_7896;Lnet/minecraft/class_7906;Lnet/minecraft/class_3218;Lnet/minecraft/class_1309;J)Z + ARG 6 world + ARG 7 entity + ARG 8 time + METHOD method_47074 (Lnet/minecraft/class_7898$class_7900;Ljava/util/function/Predicate;FLnet/minecraft/class_7895$class_7896;Lnet/minecraft/class_7906;Lnet/minecraft/class_7906;)Lnet/minecraft/class_7911; + ARG 4 lookTarget + ARG 5 visibleMobs + METHOD method_47075 (Ljava/util/function/Predicate;FLnet/minecraft/class_7895$class_7896;Lnet/minecraft/class_7898$class_7900;)Lcom/mojang/datafixers/kinds/App; + ARG 3 context + CLASS class_7896 Interval + FIELD field_40996 interval Lnet/minecraft/class_6019; + FIELD field_40997 remainingTicks I + METHOD (Lnet/minecraft/class_6019;)V + ARG 1 interval + METHOD method_47076 shouldRun (Lnet/minecraft/class_5819;)Z + ARG 1 random diff --git a/mappings/net/minecraft/entity/ai/brain/task/LookTargetUtil.mapping b/mappings/net/minecraft/entity/ai/brain/task/LookTargetUtil.mapping index a735e652f7..01d89087b5 100644 --- a/mappings/net/minecraft/entity/ai/brain/task/LookTargetUtil.mapping +++ b/mappings/net/minecraft/entity/ai/brain/task/LookTargetUtil.mapping @@ -76,11 +76,6 @@ CLASS net/minecraft/class_4215 net/minecraft/entity/ai/brain/task/LookTargetUtil ARG 0 mob ARG 1 target ARG 2 rangedWeaponReachReduction - METHOD method_29247 (Lnet/minecraft/class_1646;Lnet/minecraft/class_1309;)Z - ARG 1 entity - METHOD method_29248 streamSeenVillagers (Lnet/minecraft/class_1646;Ljava/util/function/Predicate;)Ljava/util/stream/Stream; - ARG 0 villager - ARG 1 filter METHOD method_31500 (Lnet/minecraft/class_1297;)Lnet/minecraft/class_1309; ARG 0 target METHOD method_33193 find (Lnet/minecraft/class_1314;II)Lnet/minecraft/class_243; diff --git a/mappings/net/minecraft/entity/ai/brain/task/LoseJobOnSiteLossTask.mapping b/mappings/net/minecraft/entity/ai/brain/task/LoseJobOnSiteLossTask.mapping index bdc867f7c2..cbef9f64b6 100644 --- a/mappings/net/minecraft/entity/ai/brain/task/LoseJobOnSiteLossTask.mapping +++ b/mappings/net/minecraft/entity/ai/brain/task/LoseJobOnSiteLossTask.mapping @@ -1 +1,10 @@ CLASS net/minecraft/class_4295 net/minecraft/entity/ai/brain/task/LoseJobOnSiteLossTask + METHOD method_47037 create ()Lnet/minecraft/class_7893; + METHOD method_47038 (Lnet/minecraft/class_3218;Lnet/minecraft/class_1646;J)Z + ARG 0 world + ARG 1 entity + ARG 2 time + METHOD method_47039 (Lnet/minecraft/class_7898$class_7900;)Lcom/mojang/datafixers/kinds/App; + ARG 0 context + METHOD method_47040 (Lnet/minecraft/class_7906;)Lnet/minecraft/class_7911; + ARG 0 jobSite diff --git a/mappings/net/minecraft/entity/ai/brain/task/MeetVillagerTask.mapping b/mappings/net/minecraft/entity/ai/brain/task/MeetVillagerTask.mapping index 728e743ea7..65b0aee2e8 100644 --- a/mappings/net/minecraft/entity/ai/brain/task/MeetVillagerTask.mapping +++ b/mappings/net/minecraft/entity/ai/brain/task/MeetVillagerTask.mapping @@ -1,2 +1,21 @@ CLASS net/minecraft/class_4124 net/minecraft/entity/ai/brain/task/MeetVillagerTask FIELD field_30176 WALK_SPEED F + METHOD method_47111 create ()Lnet/minecraft/class_7894; + METHOD method_47112 (Lnet/minecraft/class_1309;)Z + ARG 0 target + METHOD method_47113 (Lnet/minecraft/class_1309;Lnet/minecraft/class_1309;)Z + ARG 1 target + METHOD method_47114 (Lnet/minecraft/class_7898$class_7900;)Lcom/mojang/datafixers/kinds/App; + ARG 0 context + METHOD method_47115 (Lnet/minecraft/class_7898$class_7900;Lnet/minecraft/class_7906;Lnet/minecraft/class_7906;Lnet/minecraft/class_7906;Lnet/minecraft/class_7906;Lnet/minecraft/class_7906;)Lnet/minecraft/class_7911; + ARG 1 walkTarget + ARG 2 lookTarget + ARG 3 meetingPoint + ARG 4 visibleMobs + ARG 5 interactionTarget + METHOD method_47116 (Lnet/minecraft/class_7898$class_7900;Lnet/minecraft/class_7906;Lnet/minecraft/class_7906;Lnet/minecraft/class_7906;Lnet/minecraft/class_7906;Lnet/minecraft/class_7906;Lnet/minecraft/class_3218;Lnet/minecraft/class_1309;J)Z + ARG 6 world + ARG 7 entity + ARG 8 time + METHOD method_47117 (Lnet/minecraft/class_7906;Lnet/minecraft/class_7906;Lnet/minecraft/class_7906;Lnet/minecraft/class_1309;)V + ARG 3 target diff --git a/mappings/net/minecraft/entity/ai/brain/task/MeleeAttackTask.mapping b/mappings/net/minecraft/entity/ai/brain/task/MeleeAttackTask.mapping index 021862ba67..7c92f7bf08 100644 --- a/mappings/net/minecraft/entity/ai/brain/task/MeleeAttackTask.mapping +++ b/mappings/net/minecraft/entity/ai/brain/task/MeleeAttackTask.mapping @@ -1,10 +1,18 @@ CLASS net/minecraft/class_4816 net/minecraft/entity/ai/brain/task/MeleeAttackTask - FIELD field_22308 interval I - METHOD (I)V - ARG 1 interval METHOD method_25942 isHoldingUsableRangedWeapon (Lnet/minecraft/class_1308;)Z - ARG 1 entity + ARG 0 mob METHOD method_25943 (Lnet/minecraft/class_1308;Lnet/minecraft/class_1799;)Z ARG 1 stack - METHOD method_25944 getAttackTarget (Lnet/minecraft/class_1308;)Lnet/minecraft/class_1309; - ARG 1 entity + METHOD method_46987 create (I)Lnet/minecraft/class_7894; + ARG 0 cooldown + METHOD method_46988 (ILnet/minecraft/class_7898$class_7900;)Lcom/mojang/datafixers/kinds/App; + ARG 1 context + METHOD method_46989 (Lnet/minecraft/class_7898$class_7900;ILnet/minecraft/class_7906;Lnet/minecraft/class_7906;Lnet/minecraft/class_7906;Lnet/minecraft/class_7906;)Lnet/minecraft/class_7911; + ARG 2 lookTarget + ARG 3 attackTarget + ARG 4 attackCoolingDown + ARG 5 visibleMobs + METHOD method_46990 (Lnet/minecraft/class_7898$class_7900;Lnet/minecraft/class_7906;Lnet/minecraft/class_7906;Lnet/minecraft/class_7906;Lnet/minecraft/class_7906;ILnet/minecraft/class_3218;Lnet/minecraft/class_1308;J)Z + ARG 6 world + ARG 7 entity + ARG 8 time diff --git a/mappings/net/minecraft/entity/ai/brain/task/MemoryTransferTask.mapping b/mappings/net/minecraft/entity/ai/brain/task/MemoryTransferTask.mapping index 0da146acfe..5323f07cd5 100644 --- a/mappings/net/minecraft/entity/ai/brain/task/MemoryTransferTask.mapping +++ b/mappings/net/minecraft/entity/ai/brain/task/MemoryTransferTask.mapping @@ -1,10 +1,15 @@ CLASS net/minecraft/class_4809 net/minecraft/entity/ai/brain/task/MemoryTransferTask - FIELD field_22288 runPredicate Ljava/util/function/Predicate; - FIELD field_22289 sourceType Lnet/minecraft/class_4140; - FIELD field_22290 targetType Lnet/minecraft/class_4140; - FIELD field_22291 duration Lnet/minecraft/class_6019; - METHOD (Ljava/util/function/Predicate;Lnet/minecraft/class_4140;Lnet/minecraft/class_4140;Lnet/minecraft/class_6019;)V - ARG 1 runPredicate - ARG 2 sourceType - ARG 3 targetType - ARG 4 duration + METHOD method_46911 (Lnet/minecraft/class_4140;Lnet/minecraft/class_4140;Ljava/util/function/Predicate;Lnet/minecraft/class_6019;Lnet/minecraft/class_7898$class_7900;)Lcom/mojang/datafixers/kinds/App; + ARG 4 context + METHOD method_46912 (Ljava/util/function/Predicate;Lnet/minecraft/class_7898$class_7900;Lnet/minecraft/class_6019;Lnet/minecraft/class_7906;Lnet/minecraft/class_7906;)Lnet/minecraft/class_7911; + ARG 3 source + ARG 4 target + METHOD method_46913 (Ljava/util/function/Predicate;Lnet/minecraft/class_7906;Lnet/minecraft/class_7898$class_7900;Lnet/minecraft/class_7906;Lnet/minecraft/class_6019;Lnet/minecraft/class_3218;Lnet/minecraft/class_1309;J)Z + ARG 5 world + ARG 6 entity + ARG 7 time + METHOD method_46914 create (Ljava/util/function/Predicate;Lnet/minecraft/class_4140;Lnet/minecraft/class_4140;Lnet/minecraft/class_6019;)Lnet/minecraft/class_7893; + ARG 0 runPredicate + ARG 1 sourceType + ARG 2 targetType + ARG 3 expiry diff --git a/mappings/net/minecraft/entity/ai/brain/task/MultiTickTask.mapping b/mappings/net/minecraft/entity/ai/brain/task/MultiTickTask.mapping new file mode 100644 index 0000000000..b64ef6e531 --- /dev/null +++ b/mappings/net/minecraft/entity/ai/brain/task/MultiTickTask.mapping @@ -0,0 +1,52 @@ +CLASS net/minecraft/class_4097 net/minecraft/entity/ai/brain/task/MultiTickTask + FIELD field_18333 status Lnet/minecraft/class_4097$class_4098; + FIELD field_18334 endTime J + FIELD field_18335 minRunTime I + FIELD field_18336 maxRunTime I + FIELD field_19291 requiredMemoryStates Ljava/util/Map; + FIELD field_30112 DEFAULT_RUN_TIME I + METHOD (Ljava/util/Map;)V + ARG 1 requiredMemoryState + METHOD (Ljava/util/Map;I)V + ARG 1 requiredMemoryState + ARG 2 runTime + METHOD (Ljava/util/Map;II)V + ARG 1 requiredMemoryState + ARG 2 minRunTime + ARG 3 maxRunTime + METHOD method_18915 isTimeLimitExceeded (J)Z + ARG 1 time + METHOD method_18919 shouldRun (Lnet/minecraft/class_3218;Lnet/minecraft/class_1309;)Z + ARG 1 world + ARG 2 entity + METHOD method_18920 run (Lnet/minecraft/class_3218;Lnet/minecraft/class_1309;J)V + ARG 1 world + ARG 2 entity + ARG 3 time + METHOD method_18922 (Lnet/minecraft/class_3218;Lnet/minecraft/class_1309;J)Z + ARG 1 world + ARG 2 entity + ARG 3 time + METHOD method_18923 (Lnet/minecraft/class_3218;Lnet/minecraft/class_1309;J)V + ARG 1 world + ARG 2 entity + ARG 3 time + METHOD method_18924 keepRunning (Lnet/minecraft/class_3218;Lnet/minecraft/class_1309;J)V + ARG 1 world + ARG 2 entity + ARG 3 time + METHOD method_18925 (Lnet/minecraft/class_3218;Lnet/minecraft/class_1309;J)V + ARG 1 world + ARG 2 entity + ARG 3 time + METHOD method_18926 finishRunning (Lnet/minecraft/class_3218;Lnet/minecraft/class_1309;J)V + ARG 1 world + ARG 2 entity + ARG 3 time + METHOD method_18927 shouldKeepRunning (Lnet/minecraft/class_3218;Lnet/minecraft/class_1309;J)Z + ARG 1 world + 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/NoPenaltyStrollTask.mapping b/mappings/net/minecraft/entity/ai/brain/task/NoPenaltyStrollTask.mapping deleted file mode 100644 index 61c5161d4b..0000000000 --- a/mappings/net/minecraft/entity/ai/brain/task/NoPenaltyStrollTask.mapping +++ /dev/null @@ -1 +0,0 @@ -CLASS net/minecraft/class_7295 net/minecraft/entity/ai/brain/task/NoPenaltyStrollTask diff --git a/mappings/net/minecraft/entity/ai/brain/task/OpenDoorsTask.mapping b/mappings/net/minecraft/entity/ai/brain/task/OpenDoorsTask.mapping index e33463ac6b..f281bacb08 100644 --- a/mappings/net/minecraft/entity/ai/brain/task/OpenDoorsTask.mapping +++ b/mappings/net/minecraft/entity/ai/brain/task/OpenDoorsTask.mapping @@ -1,33 +1,54 @@ CLASS net/minecraft/class_4107 net/minecraft/entity/ai/brain/task/OpenDoorsTask - FIELD field_26387 pathNode Lnet/minecraft/class_9; - FIELD field_26388 ticks I FIELD field_30125 RUN_TIME I FIELD field_30126 PATHING_DISTANCE D FIELD field_30127 REACH_DISTANCE D - METHOD method_30760 pathToDoor (Lnet/minecraft/class_3218;Lnet/minecraft/class_1309;Lnet/minecraft/class_9;Lnet/minecraft/class_9;)V + METHOD method_30760 pathToDoor (Lnet/minecraft/class_3218;Lnet/minecraft/class_1309;Lnet/minecraft/class_9;Lnet/minecraft/class_9;Ljava/util/Set;Ljava/util/Optional;)V ARG 0 world ARG 1 entity ARG 2 lastNode ARG 3 currentNode - METHOD method_30761 hasOtherMobReachedDoor (Lnet/minecraft/class_3218;Lnet/minecraft/class_1309;Lnet/minecraft/class_2338;)Z - ARG 0 world - ARG 1 entity - ARG 2 pos + ARG 4 doors + ARG 5 otherMobs + METHOD method_30761 hasOtherMobReachedDoor (Lnet/minecraft/class_1309;Lnet/minecraft/class_2338;Ljava/util/Optional;)Z + ARG 0 entity + ARG 1 pos + ARG 2 otherMobs METHOD method_30762 cannotReachDoor (Lnet/minecraft/class_3218;Lnet/minecraft/class_1309;Lnet/minecraft/class_4208;)Z ARG 0 world ARG 1 entity ARG 2 doorPos - METHOD method_30766 hasReached (Lnet/minecraft/class_3218;Lnet/minecraft/class_1309;Lnet/minecraft/class_2338;)Z - ARG 0 world - ARG 1 entity - ARG 2 pos - METHOD method_30767 rememberToCloseDoor (Lnet/minecraft/class_3218;Lnet/minecraft/class_1309;Lnet/minecraft/class_2338;)V - ARG 1 world - ARG 2 entity - ARG 3 pos + METHOD method_30764 (Lnet/minecraft/class_1309;Lnet/minecraft/class_1309;)Z + ARG 1 mob + METHOD method_30765 (Lnet/minecraft/class_2338;Lnet/minecraft/class_1309;)Z + ARG 1 mob + METHOD method_30766 hasReached (Lnet/minecraft/class_4095;Lnet/minecraft/class_2338;)Z + ARG 0 brain + ARG 1 pos METHOD method_40002 (Lnet/minecraft/class_4970$class_4971;)Z ARG 0 state - METHOD method_40003 (Lnet/minecraft/class_4970$class_4971;)Z + METHOD method_46964 create ()Lnet/minecraft/class_7893; + METHOD method_46965 (Lnet/minecraft/class_3218;Lnet/minecraft/class_1309;Lnet/minecraft/class_9;Lnet/minecraft/class_9;Lnet/minecraft/class_7898$class_7900;Lnet/minecraft/class_7906;Ljava/util/Set;)V + ARG 6 doors + METHOD method_46966 (Lnet/minecraft/class_7898$class_7900;Lnet/minecraft/class_7906;Lnet/minecraft/class_7906;Lorg/apache/commons/lang3/mutable/MutableObject;Lorg/apache/commons/lang3/mutable/MutableInt;Lnet/minecraft/class_7906;Lnet/minecraft/class_3218;Lnet/minecraft/class_1309;J)Z + ARG 6 world + ARG 7 entity + ARG 8 time + METHOD method_46967 (Lnet/minecraft/class_7898$class_7900;Lorg/apache/commons/lang3/mutable/MutableObject;Lorg/apache/commons/lang3/mutable/MutableInt;Lnet/minecraft/class_7906;Lnet/minecraft/class_7906;Lnet/minecraft/class_7906;)Lnet/minecraft/class_7911; + ARG 3 path + ARG 4 doorsToClose + ARG 5 mobs + METHOD method_46969 storePos (Lnet/minecraft/class_7906;Ljava/util/Optional;Lnet/minecraft/class_3218;Lnet/minecraft/class_2338;)Ljava/util/Optional; + ARG 0 queryResult + ARG 1 doors + ARG 2 world + ARG 3 pos + METHOD method_46970 (Lnet/minecraft/class_2338;Lnet/minecraft/class_1309;)Z + ARG 1 mob + METHOD method_46971 (Lnet/minecraft/class_4208;Ljava/util/Set;)Ljava/util/Set; + ARG 1 doorSet + METHOD method_46972 (Lorg/apache/commons/lang3/mutable/MutableObject;Lorg/apache/commons/lang3/mutable/MutableInt;Lnet/minecraft/class_7898$class_7900;)Lcom/mojang/datafixers/kinds/App; + ARG 2 context + METHOD method_46973 (Lnet/minecraft/class_4970$class_4971;)Z ARG 0 state - METHOD method_40004 (Lnet/minecraft/class_4970$class_4971;)Z + METHOD method_46974 (Lnet/minecraft/class_4970$class_4971;)Z ARG 0 state diff --git a/mappings/net/minecraft/entity/ai/brain/task/PacifyTask.mapping b/mappings/net/minecraft/entity/ai/brain/task/PacifyTask.mapping index 91dbc34e19..103100f209 100644 --- a/mappings/net/minecraft/entity/ai/brain/task/PacifyTask.mapping +++ b/mappings/net/minecraft/entity/ai/brain/task/PacifyTask.mapping @@ -1,5 +1,14 @@ CLASS net/minecraft/class_4808 net/minecraft/entity/ai/brain/task/PacifyTask - FIELD field_22287 duration I - METHOD (Lnet/minecraft/class_4140;I)V - ARG 1 requiredMemoryModuleType - ARG 2 duration + METHOD method_46905 (ILnet/minecraft/class_7906;Lnet/minecraft/class_7906;Lnet/minecraft/class_7906;)Lnet/minecraft/class_7911; + ARG 1 attackTarget + ARG 2 pacified + ARG 3 requiredMemoryResult + METHOD method_46906 (Lnet/minecraft/class_7906;ILnet/minecraft/class_7906;Lnet/minecraft/class_3218;Lnet/minecraft/class_1309;J)Z + ARG 3 world + ARG 4 entity + ARG 5 time + METHOD method_46908 create (Lnet/minecraft/class_4140;I)Lnet/minecraft/class_7893; + ARG 0 requiredMemory + ARG 1 duration + METHOD method_46909 (Lnet/minecraft/class_4140;ILnet/minecraft/class_7898$class_7900;)Lcom/mojang/datafixers/kinds/App; + ARG 2 context diff --git a/mappings/net/minecraft/entity/ai/brain/task/PlayDeadTimerTask.mapping b/mappings/net/minecraft/entity/ai/brain/task/PlayDeadTimerTask.mapping index 50343602cf..b9d315e8e0 100644 --- a/mappings/net/minecraft/entity/ai/brain/task/PlayDeadTimerTask.mapping +++ b/mappings/net/minecraft/entity/ai/brain/task/PlayDeadTimerTask.mapping @@ -1 +1,11 @@ CLASS net/minecraft/class_5770 net/minecraft/entity/ai/brain/task/PlayDeadTimerTask + METHOD method_47268 create ()Lnet/minecraft/class_7893; + METHOD method_47269 (Lnet/minecraft/class_7898$class_7900;)Lcom/mojang/datafixers/kinds/App; + ARG 0 context + METHOD method_47270 (Lnet/minecraft/class_7898$class_7900;Lnet/minecraft/class_7906;Lnet/minecraft/class_7906;)Lnet/minecraft/class_7911; + ARG 1 playDeadTicks + ARG 2 hurtByEntity + METHOD method_47271 (Lnet/minecraft/class_7898$class_7900;Lnet/minecraft/class_7906;Lnet/minecraft/class_7906;Lnet/minecraft/class_3218;Lnet/minecraft/class_1309;J)Z + ARG 3 world + ARG 4 entity + ARG 5 time diff --git a/mappings/net/minecraft/entity/ai/brain/task/PlayWithVillagerBabiesTask.mapping b/mappings/net/minecraft/entity/ai/brain/task/PlayWithVillagerBabiesTask.mapping index 019a2693df..4836f10adb 100644 --- a/mappings/net/minecraft/entity/ai/brain/task/PlayWithVillagerBabiesTask.mapping +++ b/mappings/net/minecraft/entity/ai/brain/task/PlayWithVillagerBabiesTask.mapping @@ -6,30 +6,43 @@ CLASS net/minecraft/class_4218 net/minecraft/entity/ai/brain/task/PlayWithVillag FIELD field_30155 MAX_BABY_INTERACTION_COUNT I FIELD field_30156 RUN_CHANCE I METHOD method_19576 getInteractionTarget (Lnet/minecraft/class_1309;)Lnet/minecraft/class_1309; - ARG 1 entity + ARG 0 baby METHOD method_19577 isInteractionTargetOf (Lnet/minecraft/class_1309;Lnet/minecraft/class_1309;)Z - ARG 1 entity - ARG 2 other - METHOD method_19579 getVisibleMob (Lnet/minecraft/class_1314;)Ljava/util/Optional; - ARG 1 entity - METHOD method_19580 setPlayTarget (Lnet/minecraft/class_1314;Lnet/minecraft/class_1309;)V ARG 0 entity + ARG 1 baby + METHOD method_19578 (Lnet/minecraft/class_1309;Ljava/lang/Integer;)Ljava/lang/Integer; + ARG 0 target + ARG 1 count + METHOD method_19580 setPlayTarget (Lnet/minecraft/class_7906;Lnet/minecraft/class_7906;Lnet/minecraft/class_7906;Lnet/minecraft/class_1309;)V + ARG 0 interactionTarget + ARG 1 lookTarget + ARG 2 walkTarget + ARG 3 baby + METHOD method_19581 (Ljava/util/Map$Entry;)Z + ARG 0 entry + METHOD method_19582 (Ljava/util/Map;Lnet/minecraft/class_1309;)V + ARG 1 baby + METHOD method_19587 (Lnet/minecraft/class_1309;Lnet/minecraft/class_1309;)Z ARG 1 target - METHOD method_19585 setGroundTarget (Lnet/minecraft/class_3218;Lnet/minecraft/class_1314;Lnet/minecraft/class_1309;)V - ARG 1 world - ARG 2 entity - ARG 3 unusedBaby - METHOD method_19586 findVisibleVillagerBaby (Lnet/minecraft/class_1309;)Lnet/minecraft/class_1309; - ARG 1 entity - METHOD method_19588 getLeastPopularBabyInteractionTarget (Lnet/minecraft/class_1314;)Ljava/util/Optional; - ARG 1 entity - METHOD method_19589 (Lnet/minecraft/class_1314;Lnet/minecraft/class_1309;)V - ARG 1 target - METHOD method_19590 hasVisibleVillagerBabies (Lnet/minecraft/class_1314;)Z - ARG 1 entity - METHOD method_19592 getBabyInteractionTargetCounts (Lnet/minecraft/class_1314;)Ljava/util/Map; - ARG 1 entity + METHOD method_19588 getLeastPopularBabyInteractionTarget (Ljava/util/List;)Ljava/util/Optional; + ARG 0 babies + METHOD method_19592 getBabyInteractionTargetCounts (Ljava/util/List;)Ljava/util/Map; + ARG 0 babies METHOD method_19593 hasInteractionTarget (Lnet/minecraft/class_1309;)Z - ARG 1 entity - METHOD method_19594 getVisibleVillagerBabies (Lnet/minecraft/class_1314;)Ljava/util/List; - ARG 1 entity + ARG 0 baby + METHOD method_47000 create ()Lnet/minecraft/class_7893; + METHOD method_47001 (Lnet/minecraft/class_1314;Lnet/minecraft/class_1309;)Z + ARG 1 baby + METHOD method_47002 (Lnet/minecraft/class_7898$class_7900;)Lcom/mojang/datafixers/kinds/App; + ARG 0 context + METHOD method_47003 (Lnet/minecraft/class_7898$class_7900;Lnet/minecraft/class_7906;Lnet/minecraft/class_7906;Lnet/minecraft/class_7906;Lnet/minecraft/class_7906;)Lnet/minecraft/class_7911; + ARG 1 visibleVillagerBabies + ARG 2 walkTarget + ARG 3 lookTarget + ARG 4 interactionTarget + METHOD method_47004 (Lnet/minecraft/class_7898$class_7900;Lnet/minecraft/class_7906;Lnet/minecraft/class_7906;Lnet/minecraft/class_7906;Lnet/minecraft/class_7906;Lnet/minecraft/class_3218;Lnet/minecraft/class_1314;J)Z + ARG 5 world + ARG 6 entity + ARG 7 time + METHOD method_47005 (Lnet/minecraft/class_7906;Lnet/minecraft/class_7906;Lnet/minecraft/class_7906;Lnet/minecraft/class_1309;)V + ARG 3 baby diff --git a/mappings/net/minecraft/entity/ai/brain/task/PrepareRamTask.mapping b/mappings/net/minecraft/entity/ai/brain/task/PrepareRamTask.mapping index 23cc7e805d..ce9323d10e 100644 --- a/mappings/net/minecraft/entity/ai/brain/task/PrepareRamTask.mapping +++ b/mappings/net/minecraft/entity/ai/brain/task/PrepareRamTask.mapping @@ -38,6 +38,8 @@ CLASS net/minecraft/class_6336 net/minecraft/entity/ai/brain/task/PrepareRamTask METHOD method_36263 canReach (Lnet/minecraft/class_1314;Lnet/minecraft/class_2338;)Z ARG 1 entity ARG 2 target + METHOD method_36264 (Lnet/minecraft/class_1314;Lnet/minecraft/class_6670;)Ljava/util/Optional; + ARG 2 mob METHOD method_36265 (Lnet/minecraft/class_1408;Lnet/minecraft/class_2338;)Z ARG 1 start METHOD method_36266 calculateRamTarget (Lnet/minecraft/class_2338;Lnet/minecraft/class_2338;)Lnet/minecraft/class_243; @@ -49,7 +51,7 @@ CLASS net/minecraft/class_6336 net/minecraft/entity/ai/brain/task/PrepareRamTask METHOD method_36270 (Lnet/minecraft/class_1314;Lnet/minecraft/class_1309;)V ARG 2 mob METHOD method_36272 (Lnet/minecraft/class_1314;Lnet/minecraft/class_1309;)Z - ARG 2 mob + ARG 2 mobx CLASS class_6337 Ram COMMENT A ram chosen during the preparation. FIELD field_33471 start Lnet/minecraft/class_2338; diff --git a/mappings/net/minecraft/entity/ai/brain/task/RandomLookAroundTask.mapping b/mappings/net/minecraft/entity/ai/brain/task/RandomLookAroundTask.mapping new file mode 100644 index 0000000000..39117e6c03 --- /dev/null +++ b/mappings/net/minecraft/entity/ai/brain/task/RandomLookAroundTask.mapping @@ -0,0 +1,10 @@ +CLASS net/minecraft/class_7687 net/minecraft/entity/ai/brain/task/RandomLookAroundTask + FIELD field_40119 cooldown Lnet/minecraft/class_6017; + FIELD field_40120 maxYaw F + FIELD field_40121 minPitch F + FIELD field_40122 pitchRange F + METHOD (Lnet/minecraft/class_6017;FFF)V + ARG 1 cooldown + ARG 2 maxYaw + ARG 3 minPitch + ARG 4 maxPitch diff --git a/mappings/net/minecraft/entity/ai/brain/task/RangedApproachTask.mapping b/mappings/net/minecraft/entity/ai/brain/task/RangedApproachTask.mapping index acb19c94b8..0b5ef2131b 100644 --- a/mappings/net/minecraft/entity/ai/brain/task/RangedApproachTask.mapping +++ b/mappings/net/minecraft/entity/ai/brain/task/RangedApproachTask.mapping @@ -1,12 +1,19 @@ CLASS net/minecraft/class_4822 net/minecraft/entity/ai/brain/task/RangedApproachTask - FIELD field_22323 speed Ljava/util/function/Function; FIELD field_30166 WEAPON_REACH_REDUCTION I - METHOD (F)V - ARG 1 speed - METHOD (Ljava/util/function/Function;)V - ARG 1 speed - METHOD method_24604 forgetWalkTarget (Lnet/minecraft/class_1309;)V + METHOD method_47094 create (F)Lnet/minecraft/class_7893; + ARG 0 speed + METHOD method_47095 (FLnet/minecraft/class_1309;)Ljava/lang/Float; ARG 1 entity - METHOD method_24605 rememberWalkTarget (Lnet/minecraft/class_1309;Lnet/minecraft/class_1309;)V - ARG 1 entity - ARG 2 target + METHOD method_47096 (Lnet/minecraft/class_7898$class_7900;Lnet/minecraft/class_7906;Lnet/minecraft/class_7906;Lnet/minecraft/class_7906;Lnet/minecraft/class_7906;Ljava/util/function/Function;Lnet/minecraft/class_3218;Lnet/minecraft/class_1308;J)Z + ARG 6 world + ARG 7 entity + ARG 8 time + METHOD method_47097 (Lnet/minecraft/class_7898$class_7900;Ljava/util/function/Function;Lnet/minecraft/class_7906;Lnet/minecraft/class_7906;Lnet/minecraft/class_7906;Lnet/minecraft/class_7906;)Lnet/minecraft/class_7911; + ARG 2 walkTarget + ARG 3 lookTarget + ARG 4 attackTarget + ARG 5 visibleMobs + METHOD method_47098 create (Ljava/util/function/Function;)Lnet/minecraft/class_7893; + ARG 0 speed + METHOD method_47099 (Ljava/util/function/Function;Lnet/minecraft/class_7898$class_7900;)Lcom/mojang/datafixers/kinds/App; + ARG 1 context diff --git a/mappings/net/minecraft/entity/ai/brain/task/RemoveOffHandItemTask.mapping b/mappings/net/minecraft/entity/ai/brain/task/RemoveOffHandItemTask.mapping index 859b1fe232..ce520e1039 100644 --- a/mappings/net/minecraft/entity/ai/brain/task/RemoveOffHandItemTask.mapping +++ b/mappings/net/minecraft/entity/ai/brain/task/RemoveOffHandItemTask.mapping @@ -1 +1,10 @@ CLASS net/minecraft/class_4830 net/minecraft/entity/ai/brain/task/RemoveOffHandItemTask + METHOD method_47298 create ()Lnet/minecraft/class_7893; + METHOD method_47299 (Lnet/minecraft/class_3218;Lnet/minecraft/class_4836;J)Z + ARG 0 world + ARG 1 entity + ARG 2 time + METHOD method_47300 (Lnet/minecraft/class_7898$class_7900;)Lcom/mojang/datafixers/kinds/App; + ARG 0 context + METHOD method_47301 (Lnet/minecraft/class_7906;)Lnet/minecraft/class_7911; + ARG 0 admiringItem diff --git a/mappings/net/minecraft/entity/ai/brain/task/RidingTask.mapping b/mappings/net/minecraft/entity/ai/brain/task/RidingTask.mapping index 6a5c83cf31..e556c9d545 100644 --- a/mappings/net/minecraft/entity/ai/brain/task/RidingTask.mapping +++ b/mappings/net/minecraft/entity/ai/brain/task/RidingTask.mapping @@ -1,9 +1,16 @@ CLASS net/minecraft/class_4812 net/minecraft/entity/ai/brain/task/RidingTask - FIELD field_22300 range I - FIELD field_22301 alternativeRideCondition Ljava/util/function/BiPredicate; - METHOD (ILjava/util/function/BiPredicate;)V - ARG 1 range - ARG 2 alternativeRideCondition - METHOD method_24575 canRideTarget (Lnet/minecraft/class_1309;Lnet/minecraft/class_1297;)Z - ARG 1 entity - ARG 2 target + METHOD method_24575 canRideTarget (Lnet/minecraft/class_1309;Lnet/minecraft/class_1297;I)Z + ARG 0 entity + ARG 1 vehicle + ARG 2 range + METHOD method_46915 create (ILjava/util/function/BiPredicate;)Lnet/minecraft/class_7893; + ARG 0 range + ARG 1 alternativeRideCondition + METHOD method_46916 (ILjava/util/function/BiPredicate;Lnet/minecraft/class_7898$class_7900;)Lcom/mojang/datafixers/kinds/App; + ARG 2 context + METHOD method_46917 (Lnet/minecraft/class_7898$class_7900;ILjava/util/function/BiPredicate;Lnet/minecraft/class_7906;)Lnet/minecraft/class_7911; + ARG 3 rideTarget + METHOD method_46918 (Lnet/minecraft/class_7898$class_7900;Lnet/minecraft/class_7906;ILjava/util/function/BiPredicate;Lnet/minecraft/class_3218;Lnet/minecraft/class_1309;J)Z + ARG 4 world + ARG 5 entity + ARG 6 time diff --git a/mappings/net/minecraft/entity/ai/brain/task/RingBellTask.mapping b/mappings/net/minecraft/entity/ai/brain/task/RingBellTask.mapping index 359ea6d754..008eb9940c 100644 --- a/mappings/net/minecraft/entity/ai/brain/task/RingBellTask.mapping +++ b/mappings/net/minecraft/entity/ai/brain/task/RingBellTask.mapping @@ -1,3 +1,12 @@ CLASS net/minecraft/class_4251 net/minecraft/entity/ai/brain/task/RingBellTask FIELD field_30159 MAX_DISTANCE I FIELD field_30160 RUN_CHANCE F + METHOD method_47044 create ()Lnet/minecraft/class_7893; + METHOD method_47045 (Lnet/minecraft/class_7898$class_7900;)Lcom/mojang/datafixers/kinds/App; + ARG 0 context + METHOD method_47046 (Lnet/minecraft/class_7898$class_7900;Lnet/minecraft/class_7906;)Lnet/minecraft/class_7911; + ARG 1 meetingPoint + METHOD method_47047 (Lnet/minecraft/class_7898$class_7900;Lnet/minecraft/class_7906;Lnet/minecraft/class_3218;Lnet/minecraft/class_1309;J)Z + ARG 2 world + ARG 3 entity + ARG 4 time diff --git a/mappings/net/minecraft/entity/ai/brain/task/RunAroundAfterRaidTask.mapping b/mappings/net/minecraft/entity/ai/brain/task/RunAroundAfterRaidTask.mapping deleted file mode 100644 index 7713e3b3ec..0000000000 --- a/mappings/net/minecraft/entity/ai/brain/task/RunAroundAfterRaidTask.mapping +++ /dev/null @@ -1 +0,0 @@ -CLASS net/minecraft/class_4254 net/minecraft/entity/ai/brain/task/RunAroundAfterRaidTask diff --git a/mappings/net/minecraft/entity/ai/brain/task/ScheduleActivityTask.mapping b/mappings/net/minecraft/entity/ai/brain/task/ScheduleActivityTask.mapping index 3793f743e9..460957c69f 100644 --- a/mappings/net/minecraft/entity/ai/brain/task/ScheduleActivityTask.mapping +++ b/mappings/net/minecraft/entity/ai/brain/task/ScheduleActivityTask.mapping @@ -1 +1,8 @@ CLASS net/minecraft/class_4127 net/minecraft/entity/ai/brain/task/ScheduleActivityTask + METHOD method_47184 create ()Lnet/minecraft/class_7893; + METHOD method_47185 (Lnet/minecraft/class_3218;Lnet/minecraft/class_1309;J)Z + ARG 0 world + ARG 1 entity + ARG 2 time + METHOD method_47186 (Lnet/minecraft/class_7898$class_7900;)Lcom/mojang/datafixers/kinds/App; + ARG 0 context diff --git a/mappings/net/minecraft/entity/ai/brain/task/SeekSkyAfterRaidWinTask.mapping b/mappings/net/minecraft/entity/ai/brain/task/SeekSkyAfterRaidWinTask.mapping deleted file mode 100644 index ca6fd7c04e..0000000000 --- a/mappings/net/minecraft/entity/ai/brain/task/SeekSkyAfterRaidWinTask.mapping +++ /dev/null @@ -1 +0,0 @@ -CLASS net/minecraft/class_4244 net/minecraft/entity/ai/brain/task/SeekSkyAfterRaidWinTask diff --git a/mappings/net/minecraft/entity/ai/brain/task/SeekSkyTask.mapping b/mappings/net/minecraft/entity/ai/brain/task/SeekSkyTask.mapping index 243cb6de08..60bdb95400 100644 --- a/mappings/net/minecraft/entity/ai/brain/task/SeekSkyTask.mapping +++ b/mappings/net/minecraft/entity/ai/brain/task/SeekSkyTask.mapping @@ -1,13 +1,20 @@ CLASS net/minecraft/class_4248 net/minecraft/entity/ai/brain/task/SeekSkyTask - FIELD field_18999 speed F - METHOD (F)V - ARG 1 speed - METHOD method_19986 (Lnet/minecraft/class_243;)Lnet/minecraft/class_4142; - ARG 1 pos METHOD method_19987 findNearbySky (Lnet/minecraft/class_3218;Lnet/minecraft/class_1309;)Lnet/minecraft/class_243; - ARG 1 world - ARG 2 entity + ARG 0 world + ARG 1 entity METHOD method_20497 isSkyVisible (Lnet/minecraft/class_3218;Lnet/minecraft/class_1309;Lnet/minecraft/class_2338;)Z ARG 0 world ARG 1 entity ARG 2 pos + METHOD method_46995 create (F)Lnet/minecraft/class_7894; + ARG 0 speed + METHOD method_46996 (FLnet/minecraft/class_7898$class_7900;)Lcom/mojang/datafixers/kinds/App; + ARG 1 context + METHOD method_46997 (FLnet/minecraft/class_7906;)Lnet/minecraft/class_7911; + ARG 1 walkTarget + METHOD method_46998 (Lnet/minecraft/class_7906;FLnet/minecraft/class_3218;Lnet/minecraft/class_1309;J)Z + ARG 2 world + ARG 3 entity + ARG 4 time + METHOD method_46999 (Lnet/minecraft/class_7906;FLnet/minecraft/class_243;)V + ARG 2 pos diff --git a/mappings/net/minecraft/entity/ai/brain/task/SeekWaterTask.mapping b/mappings/net/minecraft/entity/ai/brain/task/SeekWaterTask.mapping index 5ca70f3686..6562f25520 100644 --- a/mappings/net/minecraft/entity/ai/brain/task/SeekWaterTask.mapping +++ b/mappings/net/minecraft/entity/ai/brain/task/SeekWaterTask.mapping @@ -1,7 +1,14 @@ CLASS net/minecraft/class_5756 net/minecraft/entity/ai/brain/task/SeekWaterTask - FIELD field_28317 range I - FIELD field_28318 speed F - FIELD field_33759 seekWaterTime J - METHOD (IF)V - ARG 1 range - ARG 2 speed + METHOD method_47176 create (IF)Lnet/minecraft/class_7893; + ARG 0 range + ARG 1 speed + METHOD method_47177 (Lorg/apache/commons/lang3/mutable/MutableLong;IFLnet/minecraft/class_7898$class_7900;)Lcom/mojang/datafixers/kinds/App; + ARG 3 context + METHOD method_47178 (Lorg/apache/commons/lang3/mutable/MutableLong;IFLnet/minecraft/class_7906;Lnet/minecraft/class_7906;Lnet/minecraft/class_7906;)Lnet/minecraft/class_7911; + ARG 3 attackTarget + ARG 4 walkTarget + ARG 5 lookTarget + METHOD method_47179 (Lorg/apache/commons/lang3/mutable/MutableLong;ILnet/minecraft/class_7906;Lnet/minecraft/class_7906;FLnet/minecraft/class_3218;Lnet/minecraft/class_1314;J)Z + ARG 5 world + ARG 6 entity + ARG 7 time diff --git a/mappings/net/minecraft/entity/ai/brain/task/SingleTickTask.mapping b/mappings/net/minecraft/entity/ai/brain/task/SingleTickTask.mapping new file mode 100644 index 0000000000..5c859a586f --- /dev/null +++ b/mappings/net/minecraft/entity/ai/brain/task/SingleTickTask.mapping @@ -0,0 +1,2 @@ +CLASS net/minecraft/class_7894 net/minecraft/entity/ai/brain/task/SingleTickTask + FIELD field_40994 status Lnet/minecraft/class_4097$class_4098; diff --git a/mappings/net/minecraft/entity/ai/brain/task/StartRaidTask.mapping b/mappings/net/minecraft/entity/ai/brain/task/StartRaidTask.mapping index d07e23312f..53ea3556d1 100644 --- a/mappings/net/minecraft/entity/ai/brain/task/StartRaidTask.mapping +++ b/mappings/net/minecraft/entity/ai/brain/task/StartRaidTask.mapping @@ -1 +1,8 @@ CLASS net/minecraft/class_4253 net/minecraft/entity/ai/brain/task/StartRaidTask + METHOD method_47086 create ()Lnet/minecraft/class_7893; + METHOD method_47087 (Lnet/minecraft/class_3218;Lnet/minecraft/class_1309;J)Z + ARG 0 world + ARG 1 entity + ARG 2 time + METHOD method_47088 (Lnet/minecraft/class_7898$class_7900;)Lcom/mojang/datafixers/kinds/App; + ARG 0 context diff --git a/mappings/net/minecraft/entity/ai/brain/task/StartRidingTask.mapping b/mappings/net/minecraft/entity/ai/brain/task/StartRidingTask.mapping index ff93966b7e..5ccbe95693 100644 --- a/mappings/net/minecraft/entity/ai/brain/task/StartRidingTask.mapping +++ b/mappings/net/minecraft/entity/ai/brain/task/StartRidingTask.mapping @@ -1,9 +1,14 @@ CLASS net/minecraft/class_4817 net/minecraft/entity/ai/brain/task/StartRidingTask - FIELD field_23132 speed F FIELD field_30149 COMPLETION_RANGE I - METHOD (F)V - ARG 1 speed - METHOD method_24591 isRideTargetClose (Lnet/minecraft/class_1309;)Z - ARG 1 entity - METHOD method_24592 getRideTarget (Lnet/minecraft/class_1309;)Lnet/minecraft/class_1297; - ARG 1 entity + METHOD method_46991 create (F)Lnet/minecraft/class_7893; + ARG 0 speed + METHOD method_46992 (FLnet/minecraft/class_7898$class_7900;)Lcom/mojang/datafixers/kinds/App; + ARG 1 context + METHOD method_46993 (Lnet/minecraft/class_7898$class_7900;FLnet/minecraft/class_7906;Lnet/minecraft/class_7906;Lnet/minecraft/class_7906;)Lnet/minecraft/class_7911; + ARG 2 lookTarget + ARG 3 walkTarget + ARG 4 rideTarget + METHOD method_46994 (Lnet/minecraft/class_7898$class_7900;Lnet/minecraft/class_7906;Lnet/minecraft/class_7906;Lnet/minecraft/class_7906;FLnet/minecraft/class_3218;Lnet/minecraft/class_1309;J)Z + ARG 5 world + ARG 6 entity + ARG 7 time diff --git a/mappings/net/minecraft/entity/ai/brain/task/StartSniffingTask.mapping b/mappings/net/minecraft/entity/ai/brain/task/StartSniffingTask.mapping index b6044158db..5edafb7085 100644 --- a/mappings/net/minecraft/entity/ai/brain/task/StartSniffingTask.mapping +++ b/mappings/net/minecraft/entity/ai/brain/task/StartSniffingTask.mapping @@ -1,2 +1,15 @@ CLASS net/minecraft/class_7259 net/minecraft/entity/ai/brain/task/StartSniffingTask FIELD field_38133 COOLDOWN Lnet/minecraft/class_6017; + METHOD method_47264 create ()Lnet/minecraft/class_7893; + METHOD method_47265 (Lnet/minecraft/class_7898$class_7900;)Lcom/mojang/datafixers/kinds/App; + ARG 0 context + METHOD method_47266 (Lnet/minecraft/class_7906;Lnet/minecraft/class_7906;Lnet/minecraft/class_7906;Lnet/minecraft/class_3218;Lnet/minecraft/class_1309;J)Z + ARG 3 world + ARG 4 entity + ARG 5 time + METHOD method_47267 (Lnet/minecraft/class_7906;Lnet/minecraft/class_7906;Lnet/minecraft/class_7906;Lnet/minecraft/class_7906;Lnet/minecraft/class_7906;)Lnet/minecraft/class_7911; + ARG 0 isSniffing + ARG 1 walkTarget + ARG 2 sniffCooldown + ARG 3 nearestAttackable + ARG 4 disturbanceLocation diff --git a/mappings/net/minecraft/entity/ai/brain/task/StopPanickingTask.mapping b/mappings/net/minecraft/entity/ai/brain/task/StopPanickingTask.mapping index 90b004f463..a4c5947b35 100644 --- a/mappings/net/minecraft/entity/ai/brain/task/StopPanickingTask.mapping +++ b/mappings/net/minecraft/entity/ai/brain/task/StopPanickingTask.mapping @@ -1,4 +1,15 @@ CLASS net/minecraft/class_4100 net/minecraft/entity/ai/brain/task/StopPanickingTask FIELD field_30188 MAX_DISTANCE I - METHOD method_19557 wasHurtByNearbyEntity (Lnet/minecraft/class_1646;)Z - ARG 0 entity + METHOD method_47197 create ()Lnet/minecraft/class_7893; + METHOD method_47198 (Lnet/minecraft/class_1309;Lnet/minecraft/class_1309;)Z + ARG 1 hurtByx + METHOD method_47199 (Lnet/minecraft/class_7898$class_7900;)Lcom/mojang/datafixers/kinds/App; + ARG 0 context + METHOD method_47200 (Lnet/minecraft/class_7898$class_7900;Lnet/minecraft/class_7906;Lnet/minecraft/class_7906;Lnet/minecraft/class_7906;)Lnet/minecraft/class_7911; + ARG 1 hurtBy + ARG 2 hurtByEntity + ARG 3 nearestHostile + METHOD method_47201 (Lnet/minecraft/class_7898$class_7900;Lnet/minecraft/class_7906;Lnet/minecraft/class_7906;Lnet/minecraft/class_7906;Lnet/minecraft/class_3218;Lnet/minecraft/class_1309;J)Z + ARG 4 world + ARG 5 entity + ARG 6 time diff --git a/mappings/net/minecraft/entity/ai/brain/task/StrollTask.mapping b/mappings/net/minecraft/entity/ai/brain/task/StrollTask.mapping index 2e379c927f..d1a37f121d 100644 --- a/mappings/net/minecraft/entity/ai/brain/task/StrollTask.mapping +++ b/mappings/net/minecraft/entity/ai/brain/task/StrollTask.mapping @@ -1,25 +1,51 @@ CLASS net/minecraft/class_4818 net/minecraft/entity/ai/brain/task/StrollTask - FIELD field_22310 speed F - FIELD field_22311 horizontalRadius I - FIELD field_22312 verticalRadius I - FIELD field_30157 MIN_RUN_TIME I - FIELD field_30158 MAX_RUN_TIME I - FIELD field_34047 strollInsideWater Z - METHOD (F)V - ARG 1 speed - METHOD (FII)V - ARG 1 speed - ARG 2 horizontalRadius - ARG 3 verticalRadius - METHOD (FIIZ)V - ARG 1 speed - ARG 2 horizontalRadius - ARG 3 verticalRadius - ARG 4 strollInsideWater - METHOD (FZ)V - ARG 1 speed - ARG 2 strollInsideWater - METHOD method_24593 (Lnet/minecraft/class_243;)Lnet/minecraft/class_4142; + FIELD field_30157 DEFAULT_HORIZONTAL_RADIUS I + FIELD field_30158 DEFAULT_VERTICAL_RADIUS I + FIELD field_40995 RADII [[I + METHOD method_47014 create (F)Lnet/minecraft/class_7894; + ARG 0 speed + METHOD method_47015 create (FII)Lnet/minecraft/class_7893; + ARG 0 speed + ARG 1 horizontalRadius + ARG 2 verticalRadius + METHOD method_47016 (FLnet/minecraft/class_243;)Lnet/minecraft/class_4142; ARG 1 pos - METHOD method_33201 findWalkTarget (Lnet/minecraft/class_1314;)Lnet/minecraft/class_243; - ARG 1 entity + METHOD method_47017 create (FLjava/util/function/Function;Ljava/util/function/Predicate;)Lnet/minecraft/class_7894; + ARG 0 speed + ARG 1 targetGetter + ARG 2 shouldRun + METHOD method_47018 create (FZ)Lnet/minecraft/class_7894; + ARG 0 speed + ARG 1 strollInsideWater + METHOD method_47019 (IILnet/minecraft/class_1314;)Lnet/minecraft/class_243; + ARG 2 entity + METHOD method_47020 findTargetPos (Lnet/minecraft/class_1314;)Lnet/minecraft/class_243; + ARG 0 entity + METHOD method_47021 findTargetPos (Lnet/minecraft/class_1314;II)Lnet/minecraft/class_243; + ARG 0 entity + ARG 1 horizontalRadius + ARG 2 verticalRadius + METHOD method_47022 (Ljava/util/function/Predicate;Ljava/util/function/Function;FLnet/minecraft/class_7898$class_7900;)Lcom/mojang/datafixers/kinds/App; + ARG 3 context + METHOD method_47023 (Ljava/util/function/Predicate;Ljava/util/function/Function;FLnet/minecraft/class_7906;)Lnet/minecraft/class_7911; + ARG 3 walkTarget + METHOD method_47024 (Ljava/util/function/Predicate;Ljava/util/function/Function;Lnet/minecraft/class_7906;FLnet/minecraft/class_3218;Lnet/minecraft/class_1314;J)Z + ARG 4 world + ARG 5 entity + ARG 6 time + METHOD method_47025 createSolidTargeting (F)Lnet/minecraft/class_7893; + ARG 0 speed + METHOD method_47026 (Lnet/minecraft/class_1314;)Z + ARG 0 entity + METHOD method_47027 createDynamicRadius (F)Lnet/minecraft/class_7893; + ARG 0 speed + METHOD method_47028 (Lnet/minecraft/class_1314;)Lnet/minecraft/class_243; + ARG 0 entity + METHOD method_47029 (Lnet/minecraft/class_1314;)Z + ARG 0 entity + METHOD method_47030 (Lnet/minecraft/class_1314;)Z + ARG 0 entity + METHOD method_47031 (Lnet/minecraft/class_1314;)Z + ARG 0 entity + METHOD method_47032 (Lnet/minecraft/class_1314;)Lnet/minecraft/class_243; + ARG 0 entity diff --git a/mappings/net/minecraft/entity/ai/brain/task/TakeJobSiteTask.mapping b/mappings/net/minecraft/entity/ai/brain/task/TakeJobSiteTask.mapping index c893326732..52f2f3f7e7 100644 --- a/mappings/net/minecraft/entity/ai/brain/task/TakeJobSiteTask.mapping +++ b/mappings/net/minecraft/entity/ai/brain/task/TakeJobSiteTask.mapping @@ -1,20 +1,31 @@ CLASS net/minecraft/class_5327 net/minecraft/entity/ai/brain/task/TakeJobSiteTask - FIELD field_25158 speed F - METHOD (F)V - ARG 1 speed METHOD method_29260 canUseJobSite (Lnet/minecraft/class_6880;Lnet/minecraft/class_1646;Lnet/minecraft/class_2338;)Z - ARG 1 poiType - ARG 2 villager - ARG 3 pos - METHOD method_29261 forgetJobSiteAndWalkTarget (Lnet/minecraft/class_1646;)V - ARG 1 villager - METHOD method_29262 canReachJobSite (Lnet/minecraft/class_1646;Lnet/minecraft/class_2338;Lnet/minecraft/class_4158;)Z + ARG 0 poiType ARG 1 villager ARG 2 pos - ARG 3 poiType - METHOD method_29266 claimSite (Lnet/minecraft/class_3218;Lnet/minecraft/class_1646;Lnet/minecraft/class_1646;Lnet/minecraft/class_2338;Z)V - ARG 1 world - ARG 2 previousOwner - ARG 3 newOwner - ARG 4 pos - ARG 5 jobSitePresent + METHOD method_29262 canReachJobSite (Lnet/minecraft/class_1314;Lnet/minecraft/class_2338;Lnet/minecraft/class_4158;)Z + ARG 0 entity + ARG 1 pos + ARG 2 poiType + METHOD method_47207 create (F)Lnet/minecraft/class_7893; + ARG 0 speed + METHOD method_47208 (FLnet/minecraft/class_7898$class_7900;)Lcom/mojang/datafixers/kinds/App; + ARG 1 context + METHOD method_47209 (Lnet/minecraft/class_1309;)Lnet/minecraft/class_1646; + ARG 0 villager + METHOD method_47210 (Lnet/minecraft/class_7898$class_7900;FLnet/minecraft/class_7906;Lnet/minecraft/class_7906;Lnet/minecraft/class_7906;Lnet/minecraft/class_7906;Lnet/minecraft/class_7906;)Lnet/minecraft/class_7911; + ARG 2 potentialJobSite + ARG 3 jobSite + ARG 4 mobs + ARG 5 walkTarget + ARG 6 lookTarget + METHOD method_47211 (Lnet/minecraft/class_7898$class_7900;Lnet/minecraft/class_7906;Lnet/minecraft/class_7906;Lnet/minecraft/class_7906;Lnet/minecraft/class_7906;FLnet/minecraft/class_3218;Lnet/minecraft/class_1646;J)Z + ARG 6 world + ARG 7 entity + ARG 8 time + METHOD method_47212 (Lnet/minecraft/class_7906;Lnet/minecraft/class_7906;Lnet/minecraft/class_7906;Lnet/minecraft/class_2338;FLnet/minecraft/class_3218;Lnet/minecraft/class_1646;)V + ARG 6 villager + METHOD method_47213 (Lnet/minecraft/class_1646;Lnet/minecraft/class_1309;)Z + ARG 1 mob + METHOD method_47214 (Ljava/util/Optional;Lnet/minecraft/class_2338;Lnet/minecraft/class_1646;)Z + ARG 2 villager diff --git a/mappings/net/minecraft/entity/ai/brain/task/Task.mapping b/mappings/net/minecraft/entity/ai/brain/task/Task.mapping index 39678ff96a..db6ee0f8f7 100644 --- a/mappings/net/minecraft/entity/ai/brain/task/Task.mapping +++ b/mappings/net/minecraft/entity/ai/brain/task/Task.mapping @@ -1,28 +1,4 @@ -CLASS net/minecraft/class_4097 net/minecraft/entity/ai/brain/task/Task - FIELD field_18333 status Lnet/minecraft/class_4097$class_4098; - FIELD field_18334 endTime J - FIELD field_18335 minRunTime I - FIELD field_18336 maxRunTime I - FIELD field_19291 requiredMemoryStates Ljava/util/Map; - FIELD field_30112 DEFAULT_RUN_TIME I - METHOD (Ljava/util/Map;)V - ARG 1 requiredMemoryState - METHOD (Ljava/util/Map;I)V - ARG 1 requiredMemoryState - ARG 2 runTime - METHOD (Ljava/util/Map;II)V - ARG 1 requiredMemoryState - ARG 2 minRunTime - ARG 3 maxRunTime - METHOD method_18915 isTimeLimitExceeded (J)Z - ARG 1 time - METHOD method_18919 shouldRun (Lnet/minecraft/class_3218;Lnet/minecraft/class_1309;)Z - ARG 1 world - ARG 2 entity - METHOD method_18920 run (Lnet/minecraft/class_3218;Lnet/minecraft/class_1309;J)V - ARG 1 world - ARG 2 entity - ARG 3 time +CLASS net/minecraft/class_7893 net/minecraft/entity/ai/brain/task/Task METHOD method_18921 getStatus ()Lnet/minecraft/class_4097$class_4098; METHOD method_18922 tryStarting (Lnet/minecraft/class_3218;Lnet/minecraft/class_1309;J)Z ARG 1 world @@ -32,22 +8,8 @@ CLASS net/minecraft/class_4097 net/minecraft/entity/ai/brain/task/Task ARG 1 world ARG 2 entity ARG 3 time - METHOD method_18924 keepRunning (Lnet/minecraft/class_3218;Lnet/minecraft/class_1309;J)V - ARG 1 world - ARG 2 entity - ARG 3 time METHOD method_18925 stop (Lnet/minecraft/class_3218;Lnet/minecraft/class_1309;J)V ARG 1 world ARG 2 entity ARG 3 time - METHOD method_18926 finishRunning (Lnet/minecraft/class_3218;Lnet/minecraft/class_1309;J)V - ARG 1 world - ARG 2 entity - ARG 3 time - METHOD method_18927 shouldKeepRunning (Lnet/minecraft/class_3218;Lnet/minecraft/class_1309;J)Z - ARG 1 world - ARG 2 entity - ARG 3 time - METHOD method_19546 hasRequiredMemoryState (Lnet/minecraft/class_1309;)Z - ARG 1 entity - CLASS class_4098 Status + METHOD method_46910 getName ()Ljava/lang/String; diff --git a/mappings/net/minecraft/entity/ai/brain/task/TaskRunnable.mapping b/mappings/net/minecraft/entity/ai/brain/task/TaskRunnable.mapping new file mode 100644 index 0000000000..9e487923ad --- /dev/null +++ b/mappings/net/minecraft/entity/ai/brain/task/TaskRunnable.mapping @@ -0,0 +1,9 @@ +CLASS net/minecraft/class_7911 net/minecraft/entity/ai/brain/task/TaskRunnable + COMMENT A functional interface that represents a task. + METHOD trigger (Lnet/minecraft/class_3218;Lnet/minecraft/class_1309;J)Z + COMMENT Runs the task. + COMMENT + COMMENT @return whether the task successfully ran + ARG 1 world + ARG 2 entity + ARG 3 time diff --git a/mappings/net/minecraft/entity/ai/brain/task/TaskTriggerer.mapping b/mappings/net/minecraft/entity/ai/brain/task/TaskTriggerer.mapping new file mode 100644 index 0000000000..0cb0451fde --- /dev/null +++ b/mappings/net/minecraft/entity/ai/brain/task/TaskTriggerer.mapping @@ -0,0 +1,161 @@ +CLASS net/minecraft/class_7898 net/minecraft/entity/ai/brain/task/TaskTriggerer + COMMENT A lambda-based alternative to subclassing {@link Task}. + COMMENT + COMMENT

To use this, + COMMENT

    + COMMENT
  1. Make a static method with all configurable parameters (such as speed, range, etc).
    2. + COMMENT
  2. If there is a value that needs to be tracked between ticks (such as cooldown), + COMMENT declare a mutable variable (such as {@link org.apache.commons.lang3.mutable.MutableInt}).
    3. + COMMENT
  3. Return the result of {@link #task}. This method creates a new {@link SingleTickTask}.
    4. + COMMENT
+ COMMENT + COMMENT

A lambda is passed to the {@code task} method. This takes a {@link TaskTriggerer.TaskContext}. + COMMENT You can either call {@link TaskTriggerer.TaskContext#point} to set the actual task function, + COMMENT or declare a dependency on memory queries. The task function is a function that takes + COMMENT the server world, entity, and the current time, and returns a boolean indicating whether + COMMENT a task successfully ran. + COMMENT + COMMENT

Example of memory-independent task

+ COMMENT 
{@code
+	COMMENT public static Task createHealTask() {
+	COMMENT     return TaskTriggerer.task(context -> context.point((world, entity, time) -> {
+	COMMENT         entity.heal(1.0f);
+	COMMENT         return true;
+	COMMENT     }));
+	COMMENT }
+	COMMENT }
+ COMMENT + COMMENT

Memory-dependent task

+ COMMENT

Memory-dependent tasks (i.e. one that queries, remembers, or forgets a memory) first + COMMENT should call {@code TaskContext.group} with results of {@code Context.queryMemory} methods + COMMENT for all the dependent memories. Then, call {@code apply} with {@code context} and a + COMMENT lambda function taking the results of the query. This function returns the task function + COMMENT seen earlier. + COMMENT + COMMENT

If any of the query is not successful (e.g. because a value was not present), the task will + COMMENT not run. If all succeed, then the task runs, and the query result can be obtained via + COMMENT {@link TaskTriggerer.TaskContext#getValue}. + COMMENT + COMMENT

There are three query types: + COMMENT + COMMENT

+ COMMENT + COMMENT

For example, the following code queries {@link + COMMENT MemoryModuleType#MEETING_POINT} and forgets it: + COMMENT + COMMENT 

{@code
+	COMMENT public static Task createForgetMeetingPointTask() {
+	COMMENT     return TaskTriggerer.task(context -> context.group(context.queryMemoryValue(MemoryModuleType.MEETING_POINT)).apply(context, meetingPoint -> (world, entity, time) -> {
+	COMMENT         GlobalPos pos = (GlobalPos)context.getValue(meetingPoint);
+	COMMENT         // Do something with meetingPoint or pos
+	COMMENT         // For example, forget the meeting point:
+	COMMENT         meetingPoint.forget();
+	COMMENT         return true;
+	COMMENT     }));
+	COMMENT }
+	COMMENT }
+ FIELD field_40998 function Lnet/minecraft/class_7898$class_7904; + METHOD (Lnet/minecraft/class_7898$class_7904;)V + ARG 1 function + METHOD method_47215 newContext ()Lnet/minecraft/class_7898$class_7900; + METHOD method_47216 of (Lnet/minecraft/class_7898$class_7904;)Lnet/minecraft/class_7898; + ARG 0 function + METHOD method_47217 runIf (Lnet/minecraft/class_7911;Lnet/minecraft/class_7911;)Lnet/minecraft/class_7894; + ARG 0 predicate + ARG 1 task + METHOD method_47218 (Lnet/minecraft/class_7911;Lnet/minecraft/class_7911;Lnet/minecraft/class_7898$class_7900;)Lcom/mojang/datafixers/kinds/App; + ARG 2 context + METHOD method_47219 (Lnet/minecraft/class_7911;Lcom/mojang/datafixers/util/Unit;)Lnet/minecraft/class_7911; + ARG 1 unit + METHOD method_47220 cast (Lcom/mojang/datafixers/kinds/App;)Lnet/minecraft/class_7898; + ARG 0 app + METHOD method_47221 predicate (Ljava/util/function/BiPredicate;)Lnet/minecraft/class_7894; + ARG 0 predicate + METHOD method_47222 (Ljava/util/function/BiPredicate;Lnet/minecraft/class_3218;Lnet/minecraft/class_1309;J)Z + ARG 1 world + ARG 2 entity + ARG 3 time + METHOD method_47223 (Ljava/util/function/BiPredicate;Lnet/minecraft/class_7898$class_7900;)Lcom/mojang/datafixers/kinds/App; + ARG 1 context + METHOD method_47224 task (Ljava/util/function/Function;)Lnet/minecraft/class_7894; + ARG 0 creator + METHOD method_47225 predicate (Ljava/util/function/Predicate;)Lnet/minecraft/class_7894; + ARG 0 predicate + METHOD method_47226 (Ljava/util/function/Predicate;Lnet/minecraft/class_3218;Lnet/minecraft/class_1309;J)Z + ARG 1 world + ARG 2 entity + ARG 3 time + METHOD method_47227 runIf (Ljava/util/function/Predicate;Lnet/minecraft/class_7894;)Lnet/minecraft/class_7894; + ARG 0 predicate + ARG 1 task + METHOD method_47228 (Ljava/util/function/Predicate;Lnet/minecraft/class_7898$class_7900;)Lcom/mojang/datafixers/kinds/App; + ARG 1 context + METHOD method_47229 getFunction (Lcom/mojang/datafixers/kinds/App;)Lnet/minecraft/class_7898$class_7904; + ARG 0 app + CLASS class_7899 Supply + METHOD (Ljava/lang/Object;)V + ARG 1 value + METHOD (Ljava/lang/Object;Ljava/util/function/Supplier;)V + ARG 1 value + ARG 2 nameSupplier + CLASS class_7900 TaskContext + METHOD ap2 (Lcom/mojang/datafixers/kinds/App;Lcom/mojang/datafixers/kinds/App;Lcom/mojang/datafixers/kinds/App;)Lcom/mojang/datafixers/kinds/App; + ARG 1 app + ARG 2 function1 + ARG 3 function2 + METHOD ap3 (Lcom/mojang/datafixers/kinds/App;Lcom/mojang/datafixers/kinds/App;Lcom/mojang/datafixers/kinds/App;Lcom/mojang/datafixers/kinds/App;)Lcom/mojang/datafixers/kinds/App; + ARG 1 app + ARG 2 function1 + ARG 3 function2 + ARG 4 function3 + METHOD ap4 (Lcom/mojang/datafixers/kinds/App;Lcom/mojang/datafixers/kinds/App;Lcom/mojang/datafixers/kinds/App;Lcom/mojang/datafixers/kinds/App;Lcom/mojang/datafixers/kinds/App;)Lcom/mojang/datafixers/kinds/App; + ARG 1 app + ARG 2 function1 + ARG 3 function2 + ARG 4 function3 + ARG 5 function4 + METHOD lift1 (Lcom/mojang/datafixers/kinds/App;)Ljava/util/function/Function; + ARG 1 app + METHOD map (Ljava/util/function/Function;Lcom/mojang/datafixers/kinds/App;)Lcom/mojang/datafixers/kinds/App; + ARG 1 function + ARG 2 app + METHOD method_47233 getOptionalValue (Lnet/minecraft/class_7906;)Ljava/util/Optional; + ARG 1 result + METHOD method_47234 trigger (Lnet/minecraft/class_7911;)Lnet/minecraft/class_7898; + ARG 1 runnable + METHOD method_47235 queryMemoryOptional (Lnet/minecraft/class_4140;)Lnet/minecraft/class_7898; + ARG 1 type + METHOD method_47236 (Lcom/mojang/datafixers/kinds/App;Lcom/mojang/datafixers/kinds/App;)Lcom/mojang/datafixers/kinds/App; + ARG 2 app2 + METHOD method_47242 supply (Ljava/util/function/Supplier;Ljava/lang/Object;)Lnet/minecraft/class_7898; + ARG 1 nameSupplier + ARG 2 value + METHOD method_47243 getValue (Lnet/minecraft/class_7906;)Ljava/lang/Object; + ARG 1 result + METHOD method_47244 queryMemoryValue (Lnet/minecraft/class_4140;)Lnet/minecraft/class_7898; + ARG 1 type + METHOD method_47245 queryMemoryAbsent (Lnet/minecraft/class_4140;)Lnet/minecraft/class_7898; + ARG 1 type + METHOD point (Ljava/lang/Object;)Lcom/mojang/datafixers/kinds/App; + ARG 1 value + CLASS class_7901 Mu + CLASS class_7902 K1 + CLASS class_7903 QueryMemory + METHOD (Lnet/minecraft/class_7907;)V + ARG 1 query + CLASS class_7904 TaskFunction + METHOD method_47231 asString ()Ljava/lang/String; + METHOD method_47232 run (Lnet/minecraft/class_3218;Lnet/minecraft/class_1309;J)Ljava/lang/Object; + ARG 1 world + ARG 2 entity + ARG 3 time + CLASS class_7905 Trigger + METHOD (Lnet/minecraft/class_7911;)V + ARG 1 taskRunnable diff --git a/mappings/net/minecraft/entity/ai/brain/task/Tasks.mapping b/mappings/net/minecraft/entity/ai/brain/task/Tasks.mapping new file mode 100644 index 0000000000..3ef8b4f5bd --- /dev/null +++ b/mappings/net/minecraft/entity/ai/brain/task/Tasks.mapping @@ -0,0 +1,22 @@ +CLASS net/minecraft/class_7897 net/minecraft/entity/ai/brain/task/Tasks + COMMENT Contains task-related utility methods. + METHOD method_47163 (Lnet/minecraft/class_4103$class_4104;Lnet/minecraft/class_6032;Lnet/minecraft/class_4103$class_4216;Lnet/minecraft/class_3218;Lnet/minecraft/class_1309;J)Z + ARG 3 world + ARG 4 entity + ARG 5 time + METHOD method_47164 (Lnet/minecraft/class_4103$class_4104;Lnet/minecraft/class_6032;Lnet/minecraft/class_4103$class_4216;Lnet/minecraft/class_7898$class_7900;)Lcom/mojang/datafixers/kinds/App; + ARG 3 context + METHOD method_47165 (Lnet/minecraft/class_6032;Lcom/mojang/datafixers/util/Pair;)V + ARG 1 task + METHOD method_47166 pickRandomly (Ljava/util/List;)Lnet/minecraft/class_7894; + COMMENT {@return a task that picks and runs a task from {@code weightedTasks} randomly} + ARG 0 weightedTasks + COMMENT the list of pairs of the task function and its weight + METHOD method_47167 weighted (Ljava/util/List;Lnet/minecraft/class_4103$class_4104;Lnet/minecraft/class_4103$class_4216;)Lnet/minecraft/class_7894; + COMMENT {@return a task that runs task(s) from {@code weightedTasks}} + ARG 0 weightedTasks + COMMENT the list of pairs of the task function and its weight + ARG 1 order + COMMENT whether to sort or shuffle the task list + ARG 2 runMode + COMMENT whether to run all or just one of the tasks diff --git a/mappings/net/minecraft/entity/ai/brain/task/TemptTask.mapping b/mappings/net/minecraft/entity/ai/brain/task/TemptTask.mapping index 089e21382e..2d90a28d41 100644 --- a/mappings/net/minecraft/entity/ai/brain/task/TemptTask.mapping +++ b/mappings/net/minecraft/entity/ai/brain/task/TemptTask.mapping @@ -1,9 +1,17 @@ CLASS net/minecraft/class_5754 net/minecraft/entity/ai/brain/task/TemptTask FIELD field_28316 speed Ljava/util/function/Function; FIELD field_30115 TEMPTATION_COOLDOWN_TICKS I + FIELD field_44704 stopDistanceGetter Ljava/util/function/Function; + FIELD field_45125 DEFAULT_STOP_DISTANCE D + FIELD field_45126 LARGE_ENTITY_STOP_DISTANCE D METHOD (Ljava/util/function/Function;)V ARG 1 speed + METHOD (Ljava/util/function/Function;Ljava/util/function/Function;)V + ARG 1 speed + ARG 2 stopDistanceGetter METHOD method_33196 getSpeed (Lnet/minecraft/class_1314;)F ARG 1 entity METHOD method_33198 getTemptingPlayer (Lnet/minecraft/class_1314;)Ljava/util/Optional; ARG 1 entity + METHOD method_52173 (Lnet/minecraft/class_1309;)Ljava/lang/Double; + ARG 0 entity diff --git a/mappings/net/minecraft/entity/ai/brain/task/TimeLimitedTask.mapping b/mappings/net/minecraft/entity/ai/brain/task/TimeLimitedTask.mapping deleted file mode 100644 index bed5701408..0000000000 --- a/mappings/net/minecraft/entity/ai/brain/task/TimeLimitedTask.mapping +++ /dev/null @@ -1,15 +0,0 @@ -CLASS net/minecraft/class_4821 net/minecraft/entity/ai/brain/task/TimeLimitedTask - FIELD field_22316 needsTimeReset Z - FIELD field_22317 delegateRunning Z - FIELD field_22318 timeRange Lnet/minecraft/class_6019; - FIELD field_22319 delegate Lnet/minecraft/class_4097; - FIELD field_22320 timeLeft I - METHOD (Lnet/minecraft/class_4097;Lnet/minecraft/class_6019;)V - ARG 1 delegate - ARG 2 timeRange - METHOD (Lnet/minecraft/class_4097;ZLnet/minecraft/class_6019;)V - ARG 1 delegate - ARG 2 skipFirstRun - ARG 3 timeRange - METHOD method_24598 resetTimeLeft (Lnet/minecraft/class_3218;)V - ARG 1 world diff --git a/mappings/net/minecraft/entity/ai/brain/task/UpdateAttackTargetTask.mapping b/mappings/net/minecraft/entity/ai/brain/task/UpdateAttackTargetTask.mapping index 00b22306e0..4651919b47 100644 --- a/mappings/net/minecraft/entity/ai/brain/task/UpdateAttackTargetTask.mapping +++ b/mappings/net/minecraft/entity/ai/brain/task/UpdateAttackTargetTask.mapping @@ -1,19 +1,17 @@ CLASS net/minecraft/class_4824 net/minecraft/entity/ai/brain/task/UpdateAttackTargetTask - FIELD field_22325 startCondition Ljava/util/function/Predicate; - FIELD field_22326 targetGetter Ljava/util/function/Function; - METHOD (Ljava/util/function/Function;)V - ARG 1 targetGetter - METHOD (Ljava/util/function/Predicate;Ljava/util/function/Function;)V - ARG 1 startCondition - ARG 2 targetGetter - METHOD (Ljava/util/function/Predicate;Ljava/util/function/Function;I)V - ARG 1 startCondition - ARG 2 targetGetter - ARG 3 duration - METHOD method_24611 (Lnet/minecraft/class_1308;)Z - ARG 0 entity - METHOD method_24612 updateAttackTarget (Lnet/minecraft/class_1308;Lnet/minecraft/class_1309;)V + METHOD method_47118 (Lnet/minecraft/class_1308;)Z ARG 0 entity - ARG 1 target - METHOD method_24615 (Lnet/minecraft/class_1308;Lnet/minecraft/class_1309;)V - ARG 1 target + METHOD method_47119 create (Ljava/util/function/Function;)Lnet/minecraft/class_7893; + ARG 0 targetGetter + METHOD method_47120 create (Ljava/util/function/Predicate;Ljava/util/function/Function;)Lnet/minecraft/class_7893; + ARG 0 startCondition + ARG 1 targetGetter + METHOD method_47121 (Ljava/util/function/Predicate;Ljava/util/function/Function;Lnet/minecraft/class_7898$class_7900;)Lcom/mojang/datafixers/kinds/App; + ARG 2 context + METHOD method_47122 (Ljava/util/function/Predicate;Ljava/util/function/Function;Lnet/minecraft/class_7906;Lnet/minecraft/class_7906;)Lnet/minecraft/class_7911; + ARG 2 attackTarget + ARG 3 cantReachWalkTargetSince + METHOD method_47123 (Ljava/util/function/Predicate;Ljava/util/function/Function;Lnet/minecraft/class_7906;Lnet/minecraft/class_7906;Lnet/minecraft/class_3218;Lnet/minecraft/class_1308;J)Z + ARG 4 world + ARG 5 entity + ARG 6 time diff --git a/mappings/net/minecraft/entity/ai/brain/task/VillagerTaskListProvider.mapping b/mappings/net/minecraft/entity/ai/brain/task/VillagerTaskListProvider.mapping index 0b1ed41d22..02a35024b4 100644 --- a/mappings/net/minecraft/entity/ai/brain/task/VillagerTaskListProvider.mapping +++ b/mappings/net/minecraft/entity/ai/brain/task/VillagerTaskListProvider.mapping @@ -31,3 +31,17 @@ CLASS net/minecraft/class_4129 net/minecraft/entity/ai/brain/task/VillagerTaskLi ARG 1 speed METHOD method_20241 createFreeFollowTask ()Lcom/mojang/datafixers/util/Pair; METHOD method_20242 createBusyFollowTask ()Lcom/mojang/datafixers/util/Pair; + METHOD method_43968 (Lnet/minecraft/class_6880;)Z + ARG 0 poiType + METHOD method_43969 (Lnet/minecraft/class_6880;)Z + ARG 0 poiType + METHOD method_43970 (Lnet/minecraft/class_6880;)Z + ARG 0 poiType + METHOD method_43971 (Lnet/minecraft/class_6880;)Z + ARG 0 poiType + METHOD method_47202 hasActiveRaid (Lnet/minecraft/class_3218;Lnet/minecraft/class_1309;)Z + ARG 0 world + ARG 1 entity + METHOD method_47203 wonRaid (Lnet/minecraft/class_3218;Lnet/minecraft/class_1309;)Z + ARG 0 world + ARG 1 entity diff --git a/mappings/net/minecraft/entity/ai/brain/task/VillagerWalkTowardsTask.mapping b/mappings/net/minecraft/entity/ai/brain/task/VillagerWalkTowardsTask.mapping index 3d68d792c4..3c39ac6f06 100644 --- a/mappings/net/minecraft/entity/ai/brain/task/VillagerWalkTowardsTask.mapping +++ b/mappings/net/minecraft/entity/ai/brain/task/VillagerWalkTowardsTask.mapping @@ -1,30 +1,17 @@ CLASS net/minecraft/class_4122 net/minecraft/entity/ai/brain/task/VillagerWalkTowardsTask - FIELD field_18382 destination Lnet/minecraft/class_4140; - FIELD field_18383 speed F - FIELD field_18384 completionRange I - FIELD field_18385 maxRange I - FIELD field_19292 maxRunTime I - METHOD (Lnet/minecraft/class_4140;FIII)V - ARG 1 destination - ARG 2 speed - ARG 3 completionRange - ARG 4 maxRange - ARG 5 maxRunTime - METHOD method_19004 (Lnet/minecraft/class_3218;Lnet/minecraft/class_1646;JLnet/minecraft/class_4095;Lnet/minecraft/class_4208;)V - ARG 6 pos - 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 - ARG 3 pos - METHOD method_20498 shouldGiveUp (Lnet/minecraft/class_3218;Lnet/minecraft/class_1646;)Z - ARG 1 world - ARG 2 villager - METHOD method_21722 giveUp (Lnet/minecraft/class_1646;J)V - ARG 1 villager - ARG 2 time - METHOD method_30952 dimensionMismatches (Lnet/minecraft/class_3218;Lnet/minecraft/class_4208;)Z - ARG 1 world - ARG 2 pos + METHOD method_47100 (Lnet/minecraft/class_7898$class_7900;ILnet/minecraft/class_4140;IFILnet/minecraft/class_7906;Lnet/minecraft/class_7906;Lnet/minecraft/class_7906;)Lnet/minecraft/class_7911; + ARG 6 cantReachWalkTargetSince + ARG 7 walkTarget + ARG 8 destinationResult + METHOD method_47101 (Lnet/minecraft/class_7898$class_7900;Lnet/minecraft/class_7906;Lnet/minecraft/class_7906;ILnet/minecraft/class_4140;ILnet/minecraft/class_7906;FILnet/minecraft/class_3218;Lnet/minecraft/class_1646;J)Z + ARG 9 world + ARG 10 entity + ARG 11 time + METHOD method_47102 create (Lnet/minecraft/class_4140;FIII)Lnet/minecraft/class_7894; + ARG 0 destination + ARG 1 speed + ARG 2 completionRange + ARG 3 maxDistance + ARG 4 maxRunTime + METHOD method_47103 (Lnet/minecraft/class_4140;IIFILnet/minecraft/class_7898$class_7900;)Lcom/mojang/datafixers/kinds/App; + ARG 5 context diff --git a/mappings/net/minecraft/entity/ai/brain/task/WaitTask.mapping b/mappings/net/minecraft/entity/ai/brain/task/WaitTask.mapping index d8b0233431..f14cc3a28d 100644 --- a/mappings/net/minecraft/entity/ai/brain/task/WaitTask.mapping +++ b/mappings/net/minecraft/entity/ai/brain/task/WaitTask.mapping @@ -1,4 +1,8 @@ CLASS net/minecraft/class_4101 net/minecraft/entity/ai/brain/task/WaitTask + FIELD field_40988 minRunTime I + FIELD field_40989 maxRunTime I + FIELD field_40990 status Lnet/minecraft/class_4097$class_4098; + FIELD field_40991 waitUntil J METHOD (II)V ARG 1 minRunTime ARG 2 maxRunTime diff --git a/mappings/net/minecraft/entity/ai/brain/task/WakeUpTask.mapping b/mappings/net/minecraft/entity/ai/brain/task/WakeUpTask.mapping index 5133110fb1..97986b5830 100644 --- a/mappings/net/minecraft/entity/ai/brain/task/WakeUpTask.mapping +++ b/mappings/net/minecraft/entity/ai/brain/task/WakeUpTask.mapping @@ -1 +1,8 @@ CLASS net/minecraft/class_4214 net/minecraft/entity/ai/brain/task/WakeUpTask + METHOD method_47204 create ()Lnet/minecraft/class_7893; + METHOD method_47205 (Lnet/minecraft/class_3218;Lnet/minecraft/class_1309;J)Z + ARG 0 world + ARG 1 entity + ARG 2 time + METHOD method_47206 (Lnet/minecraft/class_7898$class_7900;)Lcom/mojang/datafixers/kinds/App; + ARG 0 context diff --git a/mappings/net/minecraft/entity/ai/brain/task/WalkHomeTask.mapping b/mappings/net/minecraft/entity/ai/brain/task/WalkHomeTask.mapping index edaebbc3f0..02094b03a2 100644 --- a/mappings/net/minecraft/entity/ai/brain/task/WalkHomeTask.mapping +++ b/mappings/net/minecraft/entity/ai/brain/task/WalkHomeTask.mapping @@ -1,19 +1,26 @@ CLASS net/minecraft/class_4290 net/minecraft/entity/ai/brain/task/WalkHomeTask - FIELD field_19260 expiryTimeLimit J - FIELD field_20290 speed F - FIELD field_20291 positionToExpiry Lit/unimi/dsi/fastutil/longs/Long2LongMap; - FIELD field_20292 tries I FIELD field_30161 POI_EXPIRY I COMMENT Represents the number of ticks ({@value}) that this task will COMMENT remember a point of interest after starting to move towards it. FIELD field_30162 MAX_TRIES I FIELD field_30163 RUN_TIME I FIELD field_30164 MAX_DISTANCE I - METHOD (F)V - ARG 1 speed - METHOD method_21639 (Lnet/minecraft/class_2338;)Z - ARG 1 pos - METHOD method_43966 (Lnet/minecraft/class_6880;)Z + METHOD method_47048 create (F)Lnet/minecraft/class_7893; + ARG 0 speed + METHOD method_47049 (Lnet/minecraft/class_6880;)Z ARG 0 poiType - METHOD method_43967 (Lnet/minecraft/class_6880;)Z + METHOD method_47050 (Lit/unimi/dsi/fastutil/longs/Long2LongMap;Lorg/apache/commons/lang3/mutable/MutableInt;Lorg/apache/commons/lang3/mutable/MutableLong;Lnet/minecraft/class_2338;)Z + ARG 3 pos + METHOD method_47051 (Lorg/apache/commons/lang3/mutable/MutableLong;Lit/unimi/dsi/fastutil/longs/Long2LongMap$Entry;)Z + ARG 1 entry + METHOD method_47052 (Lorg/apache/commons/lang3/mutable/MutableLong;Lit/unimi/dsi/fastutil/longs/Long2LongMap;FLnet/minecraft/class_7898$class_7900;)Lcom/mojang/datafixers/kinds/App; + ARG 0 context + METHOD method_47053 (Lorg/apache/commons/lang3/mutable/MutableLong;Lit/unimi/dsi/fastutil/longs/Long2LongMap;FLnet/minecraft/class_7906;Lnet/minecraft/class_7906;)Lnet/minecraft/class_7911; + ARG 3 walkTarget + ARG 4 home + METHOD method_47054 (Lorg/apache/commons/lang3/mutable/MutableLong;Lit/unimi/dsi/fastutil/longs/Long2LongMap;Lnet/minecraft/class_7906;FLnet/minecraft/class_3218;Lnet/minecraft/class_1314;J)Z + ARG 4 world + ARG 5 entity + ARG 6 time + METHOD method_47055 (Lnet/minecraft/class_6880;)Z ARG 0 poiType diff --git a/mappings/net/minecraft/entity/ai/brain/task/WalkToNearestVisibleWantedItemTask.mapping b/mappings/net/minecraft/entity/ai/brain/task/WalkToNearestVisibleWantedItemTask.mapping index f8fd83ee46..0be7c38334 100644 --- a/mappings/net/minecraft/entity/ai/brain/task/WalkToNearestVisibleWantedItemTask.mapping +++ b/mappings/net/minecraft/entity/ai/brain/task/WalkToNearestVisibleWantedItemTask.mapping @@ -1,19 +1,23 @@ CLASS net/minecraft/class_4815 net/minecraft/entity/ai/brain/task/WalkToNearestVisibleWantedItemTask - FIELD field_22305 startCondition Ljava/util/function/Predicate; - FIELD field_22306 radius I - FIELD field_23131 speed F - METHOD (FZI)V + METHOD method_46943 create (FZI)Lnet/minecraft/class_7893; + ARG 0 speed + ARG 1 requiresWalkTarget + ARG 2 radius + METHOD method_46944 (Lnet/minecraft/class_1309;)Z + ARG 0 entity + METHOD method_46945 (Lnet/minecraft/class_7898$class_7900;Lnet/minecraft/class_7906;Lnet/minecraft/class_7906;Ljava/util/function/Predicate;IFLnet/minecraft/class_7906;Lnet/minecraft/class_7906;Lnet/minecraft/class_3218;Lnet/minecraft/class_1309;J)Z + ARG 8 world + ARG 9 entity + ARG 10 time + METHOD method_46946 (Lnet/minecraft/class_7898$class_7900;Ljava/util/function/Predicate;IFLnet/minecraft/class_7906;Lnet/minecraft/class_7906;Lnet/minecraft/class_7906;Lnet/minecraft/class_7906;)Lnet/minecraft/class_7911; + ARG 4 lookTarget + ARG 5 walkTarget + ARG 6 nearestVisibleWantedItem + ARG 7 itemPickupCooldownTicks + METHOD method_46947 create (Ljava/util/function/Predicate;FZI)Lnet/minecraft/class_7893; + ARG 0 startCondition ARG 1 speed ARG 2 requiresWalkTarget ARG 3 radius - 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 - METHOD method_24581 (Lnet/minecraft/class_1309;)Z - ARG 0 entity - METHOD method_42652 isInPickupCooldown (Lnet/minecraft/class_1309;)Z - ARG 1 entity + METHOD method_46948 (ZLjava/util/function/Predicate;IFLnet/minecraft/class_7898$class_7900;)Lcom/mojang/datafixers/kinds/App; + ARG 4 context diff --git a/mappings/net/minecraft/entity/ai/brain/task/WalkTowardClosestAdultTask.mapping b/mappings/net/minecraft/entity/ai/brain/task/WalkTowardClosestAdultTask.mapping index ef95ebd6c3..d109d9a5f1 100644 --- a/mappings/net/minecraft/entity/ai/brain/task/WalkTowardClosestAdultTask.mapping +++ b/mappings/net/minecraft/entity/ai/brain/task/WalkTowardClosestAdultTask.mapping @@ -1,13 +1,19 @@ CLASS net/minecraft/class_5355 net/minecraft/entity/ai/brain/task/WalkTowardClosestAdultTask - FIELD field_25357 executionRange Lnet/minecraft/class_6019; - FIELD field_25358 speed Ljava/util/function/Function; - METHOD (Lnet/minecraft/class_6019;F)V - ARG 1 executionRange - ARG 2 speed - METHOD (Lnet/minecraft/class_6019;Ljava/util/function/Function;)V - ARG 1 executionRange - ARG 2 speed - METHOD method_29520 getNearestVisibleAdult (Lnet/minecraft/class_1296;)Lnet/minecraft/class_1296; - ARG 1 entity - METHOD method_33192 (FLnet/minecraft/class_1309;)Ljava/lang/Float; + METHOD method_46895 (FLnet/minecraft/class_1309;)Ljava/lang/Float; ARG 1 entity + METHOD method_46896 create (Lnet/minecraft/class_6019;F)Lnet/minecraft/class_7894; + ARG 0 executionRange + ARG 1 speed + METHOD method_46897 create (Lnet/minecraft/class_6019;Ljava/util/function/Function;)Lnet/minecraft/class_7894; + ARG 0 executionRange + ARG 1 speed + METHOD method_46898 (Lnet/minecraft/class_6019;Ljava/util/function/Function;Lnet/minecraft/class_7898$class_7900;)Lcom/mojang/datafixers/kinds/App; + ARG 2 context + METHOD method_46899 (Lnet/minecraft/class_7898$class_7900;Lnet/minecraft/class_6019;Ljava/util/function/Function;Lnet/minecraft/class_7906;Lnet/minecraft/class_7906;Lnet/minecraft/class_7906;)Lnet/minecraft/class_7911; + ARG 3 nearestVisibleAdult + ARG 4 lookTarget + ARG 5 walkTarget + METHOD method_46900 (Lnet/minecraft/class_7898$class_7900;Lnet/minecraft/class_7906;Lnet/minecraft/class_6019;Ljava/util/function/Function;Lnet/minecraft/class_7906;Lnet/minecraft/class_7906;Lnet/minecraft/class_3218;Lnet/minecraft/class_1296;J)Z + ARG 6 world + ARG 7 entity + ARG 8 time diff --git a/mappings/net/minecraft/entity/ai/brain/task/WalkTowardJobSiteTask.mapping b/mappings/net/minecraft/entity/ai/brain/task/WalkTowardJobSiteTask.mapping index 4ae51c5a3c..fb67293d02 100644 --- a/mappings/net/minecraft/entity/ai/brain/task/WalkTowardJobSiteTask.mapping +++ b/mappings/net/minecraft/entity/ai/brain/task/WalkTowardJobSiteTask.mapping @@ -7,3 +7,5 @@ CLASS net/minecraft/class_5325 net/minecraft/entity/ai/brain/task/WalkTowardJobS ARG 0 activity METHOD method_29524 (Lnet/minecraft/class_3218;Lnet/minecraft/class_4208;)V ARG 1 pos + METHOD method_29783 (Lnet/minecraft/class_6880;)Z + ARG 0 poiType diff --git a/mappings/net/minecraft/entity/ai/brain/task/WalkTowardsLandTask.mapping b/mappings/net/minecraft/entity/ai/brain/task/WalkTowardsLandTask.mapping index 90b783bb89..b622830164 100644 --- a/mappings/net/minecraft/entity/ai/brain/task/WalkTowardsLandTask.mapping +++ b/mappings/net/minecraft/entity/ai/brain/task/WalkTowardsLandTask.mapping @@ -1,8 +1,15 @@ CLASS net/minecraft/class_7097 net/minecraft/entity/ai/brain/task/WalkTowardsLandTask FIELD field_37433 TASK_COOLDOWN I - FIELD field_37434 range I - FIELD field_37435 speed F - FIELD field_37436 walkTowardsLandTime J - METHOD (IF)V - ARG 1 range - ARG 2 speed + METHOD method_47168 create (IF)Lnet/minecraft/class_7893; + ARG 0 range + ARG 1 speed + METHOD method_47169 (Lorg/apache/commons/lang3/mutable/MutableLong;IFLnet/minecraft/class_7898$class_7900;)Lcom/mojang/datafixers/kinds/App; + ARG 3 context + METHOD method_47170 (Lorg/apache/commons/lang3/mutable/MutableLong;IFLnet/minecraft/class_7906;Lnet/minecraft/class_7906;Lnet/minecraft/class_7906;)Lnet/minecraft/class_7911; + ARG 3 attackTarget + ARG 4 walkTarget + ARG 5 lookTarget + METHOD method_47171 (Lorg/apache/commons/lang3/mutable/MutableLong;ILnet/minecraft/class_7906;Lnet/minecraft/class_7906;FLnet/minecraft/class_3218;Lnet/minecraft/class_1314;J)Z + ARG 5 world + ARG 6 entity + ARG 7 time diff --git a/mappings/net/minecraft/entity/ai/brain/task/WalkTowardsLookTargetTask.mapping b/mappings/net/minecraft/entity/ai/brain/task/WalkTowardsLookTargetTask.mapping index dc5ed06d98..f40711896f 100644 --- a/mappings/net/minecraft/entity/ai/brain/task/WalkTowardsLookTargetTask.mapping +++ b/mappings/net/minecraft/entity/ai/brain/task/WalkTowardsLookTargetTask.mapping @@ -1,10 +1,16 @@ CLASS net/minecraft/class_7297 net/minecraft/entity/ai/brain/task/WalkTowardsLookTargetTask - FIELD field_38391 lookTargetFunction Ljava/util/function/Function; - FIELD field_38392 completionRange I - FIELD field_38393 speed F - FIELD field_38933 searchRange I - METHOD (Ljava/util/function/Function;IIF)V - ARG 1 lookTargetFunction + METHOD method_47128 (Ljava/util/function/Function;Ljava/util/function/Predicate;IFILnet/minecraft/class_7898$class_7900;)Lcom/mojang/datafixers/kinds/App; + ARG 5 context + METHOD method_47129 (Ljava/util/function/Function;Ljava/util/function/Predicate;IFILnet/minecraft/class_7906;Lnet/minecraft/class_7906;)Lnet/minecraft/class_7911; + ARG 5 lookTarget + ARG 6 walkTarget + METHOD method_47130 create (Ljava/util/function/Function;Ljava/util/function/Predicate;IIF)Lnet/minecraft/class_7893; + ARG 0 lookTargetFunction + ARG 1 predicate ARG 2 completionRange ARG 3 searchRange ARG 4 speed + METHOD method_47131 (Ljava/util/function/Function;Ljava/util/function/Predicate;ILnet/minecraft/class_7906;Lnet/minecraft/class_7906;FILnet/minecraft/class_3218;Lnet/minecraft/class_1309;J)Z + ARG 7 world + ARG 8 entity + ARG 9 time diff --git a/mappings/net/minecraft/entity/ai/brain/task/WalkTowardsPosTask.mapping b/mappings/net/minecraft/entity/ai/brain/task/WalkTowardsPosTask.mapping new file mode 100644 index 0000000000..3e005eb086 --- /dev/null +++ b/mappings/net/minecraft/entity/ai/brain/task/WalkTowardsPosTask.mapping @@ -0,0 +1,21 @@ +CLASS net/minecraft/class_4814 net/minecraft/entity/ai/brain/task/WalkTowardsPosTask + METHOD method_24577 fuzz (Lnet/minecraft/class_1308;Lnet/minecraft/class_2338;)Lnet/minecraft/class_2338; + ARG 0 mob + ARG 1 pos + METHOD method_24578 fuzz (Lnet/minecraft/class_5819;)I + ARG 0 random + METHOD method_46939 (Lnet/minecraft/class_7898$class_7900;IFLnet/minecraft/class_7906;Lnet/minecraft/class_7906;Lnet/minecraft/class_7906;Lnet/minecraft/class_7906;)Lnet/minecraft/class_7911; + ARG 3 pos + ARG 4 attackTarget + ARG 5 walkTarget + ARG 6 lookTarget + METHOD method_46940 (Lnet/minecraft/class_7898$class_7900;Lnet/minecraft/class_7906;IFLnet/minecraft/class_3218;Lnet/minecraft/class_1308;J)Z + ARG 4 world + ARG 5 entity + ARG 6 time + METHOD method_46941 create (Lnet/minecraft/class_4140;IF)Lnet/minecraft/class_7894; + ARG 0 posModule + ARG 1 completionRange + ARG 2 speed + METHOD method_46942 (Lnet/minecraft/class_4140;IFLnet/minecraft/class_7898$class_7900;)Lcom/mojang/datafixers/kinds/App; + ARG 3 context diff --git a/mappings/net/minecraft/entity/ai/brain/task/WalkTowardsWaterTask.mapping b/mappings/net/minecraft/entity/ai/brain/task/WalkTowardsWaterTask.mapping index 9597068a5b..60032dd8da 100644 --- a/mappings/net/minecraft/entity/ai/brain/task/WalkTowardsWaterTask.mapping +++ b/mappings/net/minecraft/entity/ai/brain/task/WalkTowardsWaterTask.mapping @@ -1,7 +1,14 @@ CLASS net/minecraft/class_7098 net/minecraft/entity/ai/brain/task/WalkTowardsWaterTask - FIELD field_37437 range I - FIELD field_37438 speed F - FIELD field_37439 walkTowardsWaterTime J - METHOD (IF)V - ARG 1 range - ARG 2 speed + METHOD method_47172 create (IF)Lnet/minecraft/class_7893; + ARG 0 range + ARG 1 speed + METHOD method_47173 (Lorg/apache/commons/lang3/mutable/MutableLong;IFLnet/minecraft/class_7898$class_7900;)Lcom/mojang/datafixers/kinds/App; + ARG 3 context + METHOD method_47174 (Lorg/apache/commons/lang3/mutable/MutableLong;IFLnet/minecraft/class_7906;Lnet/minecraft/class_7906;Lnet/minecraft/class_7906;)Lnet/minecraft/class_7911; + ARG 3 attackTarget + ARG 4 walkTarget + ARG 5 lookTarget + METHOD method_47175 (Lorg/apache/commons/lang3/mutable/MutableLong;ILnet/minecraft/class_7906;Lnet/minecraft/class_7906;FLnet/minecraft/class_3218;Lnet/minecraft/class_1314;J)Z + ARG 5 world + ARG 6 entity + ARG 7 time diff --git a/mappings/net/minecraft/entity/ai/brain/task/WanderAroundTask.mapping b/mappings/net/minecraft/entity/ai/brain/task/WanderAroundTask.mapping index 3d83f2c9ea..b268f7a23b 100644 --- a/mappings/net/minecraft/entity/ai/brain/task/WanderAroundTask.mapping +++ b/mappings/net/minecraft/entity/ai/brain/task/WanderAroundTask.mapping @@ -14,3 +14,5 @@ CLASS net/minecraft/class_4112 net/minecraft/entity/ai/brain/task/WanderAroundTa METHOD method_18980 hasReached (Lnet/minecraft/class_1308;Lnet/minecraft/class_4142;)Z ARG 1 entity ARG 2 walkTarget + METHOD method_49793 isTargetSpectator (Lnet/minecraft/class_4142;)Z + ARG 0 target diff --git a/mappings/net/minecraft/entity/ai/brain/task/WanderIndoorsTask.mapping b/mappings/net/minecraft/entity/ai/brain/task/WanderIndoorsTask.mapping index 94f4b9d15a..2e2f1ba61b 100644 --- a/mappings/net/minecraft/entity/ai/brain/task/WanderIndoorsTask.mapping +++ b/mappings/net/minecraft/entity/ai/brain/task/WanderIndoorsTask.mapping @@ -1,10 +1,19 @@ CLASS net/minecraft/class_4289 net/minecraft/entity/ai/brain/task/WanderIndoorsTask - FIELD field_19258 speed F - METHOD (F)V - ARG 1 speed - METHOD method_20420 (Lnet/minecraft/class_1314;Lnet/minecraft/class_2338;)V + METHOD method_46949 create (F)Lnet/minecraft/class_7893; + ARG 0 speed + METHOD method_46950 (FLnet/minecraft/class_7898$class_7900;)Lcom/mojang/datafixers/kinds/App; + ARG 1 context + METHOD method_46951 (FLnet/minecraft/class_7906;)Lnet/minecraft/class_7911; + ARG 1 walkTarget + METHOD method_46952 (Lnet/minecraft/class_3218;Lnet/minecraft/class_1314;Lnet/minecraft/class_2338;)Z ARG 2 pos - METHOD method_20424 (Lnet/minecraft/class_3218;Lnet/minecraft/class_2338;)Z + METHOD method_46953 (Lnet/minecraft/class_3218;Lnet/minecraft/class_2338;)Z ARG 1 pos - METHOD method_20425 (Lnet/minecraft/class_3218;Lnet/minecraft/class_1314;Lnet/minecraft/class_2338;)Z + METHOD method_46954 (Lnet/minecraft/class_7906;FLnet/minecraft/class_3218;Lnet/minecraft/class_1314;J)Z + ARG 2 world + ARG 3 entity + ARG 4 time + METHOD method_46955 (Lnet/minecraft/class_7906;FLnet/minecraft/class_2338;)V + ARG 2 pos + METHOD method_46956 (Lnet/minecraft/class_3218;Lnet/minecraft/class_1314;Lnet/minecraft/class_2338;)Z ARG 2 pos diff --git a/mappings/net/minecraft/entity/ai/brain/task/WantNewItemTask.mapping b/mappings/net/minecraft/entity/ai/brain/task/WantNewItemTask.mapping index d3c4700ae7..154dfca8f9 100644 --- a/mappings/net/minecraft/entity/ai/brain/task/WantNewItemTask.mapping +++ b/mappings/net/minecraft/entity/ai/brain/task/WantNewItemTask.mapping @@ -1,4 +1,12 @@ CLASS net/minecraft/class_4827 net/minecraft/entity/ai/brain/task/WantNewItemTask - FIELD field_22328 range I - METHOD (I)V - ARG 1 range + METHOD method_47290 create (I)Lnet/minecraft/class_7893; + ARG 0 range + METHOD method_47291 (ILnet/minecraft/class_7898$class_7900;)Lcom/mojang/datafixers/kinds/App; + ARG 1 context + METHOD method_47292 (Lnet/minecraft/class_7898$class_7900;ILnet/minecraft/class_7906;Lnet/minecraft/class_7906;)Lnet/minecraft/class_7911; + ARG 2 admiringItem + ARG 3 nearestVisibleWantedItem + METHOD method_47293 (Lnet/minecraft/class_7898$class_7900;Lnet/minecraft/class_7906;ILnet/minecraft/class_7906;Lnet/minecraft/class_3218;Lnet/minecraft/class_1309;J)Z + ARG 4 world + ARG 5 entity + ARG 6 time diff --git a/mappings/net/minecraft/entity/ai/brain/task/WorkStationCompetitionTask.mapping b/mappings/net/minecraft/entity/ai/brain/task/WorkStationCompetitionTask.mapping index 5885085be7..3e60e6de71 100644 --- a/mappings/net/minecraft/entity/ai/brain/task/WorkStationCompetitionTask.mapping +++ b/mappings/net/minecraft/entity/ai/brain/task/WorkStationCompetitionTask.mapping @@ -1,16 +1,29 @@ CLASS net/minecraft/class_5326 net/minecraft/entity/ai/brain/task/WorkStationCompetitionTask - FIELD field_25156 profession Lnet/minecraft/class_3852; - METHOD (Lnet/minecraft/class_3852;)V - ARG 1 profession METHOD method_29253 isCompletedWorkStation (Lnet/minecraft/class_6880;Lnet/minecraft/class_3852;)Z - ARG 1 poiType - ARG 2 profession - METHOD method_29254 hasJobSite (Lnet/minecraft/class_1646;)Z - ARG 1 villager + ARG 0 poiType + ARG 1 profession METHOD method_29255 keepJobSiteForMoreExperiencedVillager (Lnet/minecraft/class_1646;Lnet/minecraft/class_1646;)Lnet/minecraft/class_1646; ARG 0 first ARG 1 second METHOD method_29257 isUsingWorkStationAt (Lnet/minecraft/class_4208;Lnet/minecraft/class_6880;Lnet/minecraft/class_1646;)Z - ARG 1 pos - ARG 2 poiType - ARG 3 villager + ARG 0 pos + ARG 1 poiType + ARG 2 villager + METHOD method_47006 create ()Lnet/minecraft/class_7893; + METHOD method_47007 (Lnet/minecraft/class_1309;)Lnet/minecraft/class_1646; + ARG 0 villager + METHOD method_47008 (Lnet/minecraft/class_7898$class_7900;)Lcom/mojang/datafixers/kinds/App; + ARG 0 context + METHOD method_47009 (Lnet/minecraft/class_7898$class_7900;Lnet/minecraft/class_7906;Lnet/minecraft/class_7906;)Lnet/minecraft/class_7911; + ARG 1 jobSite + ARG 2 mobs + METHOD method_47010 (Lnet/minecraft/class_7898$class_7900;Lnet/minecraft/class_7906;Lnet/minecraft/class_7906;Lnet/minecraft/class_3218;Lnet/minecraft/class_1646;J)Z + ARG 3 world + ARG 4 entity + ARG 5 time + METHOD method_47011 (Lnet/minecraft/class_7898$class_7900;Lnet/minecraft/class_7906;Lnet/minecraft/class_1646;Lnet/minecraft/class_4208;Lnet/minecraft/class_6880;)V + ARG 4 poiType + METHOD method_47012 (Lnet/minecraft/class_1646;Lnet/minecraft/class_1309;)Z + ARG 1 mob + METHOD method_47013 (Lnet/minecraft/class_4208;Lnet/minecraft/class_6880;Lnet/minecraft/class_1646;)Z + ARG 2 villager diff --git a/mappings/net/minecraft/entity/ai/control/LookControl.mapping b/mappings/net/minecraft/entity/ai/control/LookControl.mapping index 769ae13949..e528c71ebd 100644 --- a/mappings/net/minecraft/entity/ai/control/LookControl.mapping +++ b/mappings/net/minecraft/entity/ai/control/LookControl.mapping @@ -1,5 +1,6 @@ CLASS net/minecraft/class_1333 net/minecraft/entity/ai/control/LookControl COMMENT The look control adjusts a mob's rotations to look at a target position. + FIELD field_35103 lookAtTimer I FIELD field_6358 maxPitchChange F FIELD field_6359 maxYawChange F FIELD field_6361 entity Lnet/minecraft/class_1308; @@ -26,6 +27,7 @@ CLASS net/minecraft/class_1333 net/minecraft/entity/ai/control/LookControl ARG 1 pitch METHOD method_37356 (Ljava/lang/Float;)V ARG 1 yaw + METHOD method_38970 isLookingAtSpecificPosition ()Z METHOD method_6225 getLookX ()D METHOD method_6226 lookAt (Lnet/minecraft/class_1297;FF)V ARG 1 entity diff --git a/mappings/net/minecraft/entity/ai/goal/AmbientStandGoal.mapping b/mappings/net/minecraft/entity/ai/goal/AmbientStandGoal.mapping new file mode 100644 index 0000000000..39abfc8d14 --- /dev/null +++ b/mappings/net/minecraft/entity/ai/goal/AmbientStandGoal.mapping @@ -0,0 +1,8 @@ +CLASS net/minecraft/class_7688 net/minecraft/entity/ai/goal/AmbientStandGoal + FIELD field_40125 entity Lnet/minecraft/class_1496; + FIELD field_40126 cooldown I + METHOD (Lnet/minecraft/class_1496;)V + ARG 1 entity + METHOD method_45336 resetCooldown (Lnet/minecraft/class_1496;)V + ARG 1 entity + METHOD method_45337 playAmbientStandSound ()V diff --git a/mappings/net/minecraft/entity/ai/goal/FollowOwnerGoal.mapping b/mappings/net/minecraft/entity/ai/goal/FollowOwnerGoal.mapping index 75d8b34a77..f2451cb240 100644 --- a/mappings/net/minecraft/entity/ai/goal/FollowOwnerGoal.mapping +++ b/mappings/net/minecraft/entity/ai/goal/FollowOwnerGoal.mapping @@ -29,3 +29,4 @@ CLASS net/minecraft/class_1350 net/minecraft/entity/ai/goal/FollowOwnerGoal METHOD method_23344 canTeleportTo (Lnet/minecraft/class_2338;)Z ARG 1 pos METHOD method_23345 tryTeleport ()V + METHOD method_49121 cannotFollow ()Z diff --git a/mappings/net/minecraft/entity/ai/goal/GoalSelector.mapping b/mappings/net/minecraft/entity/ai/goal/GoalSelector.mapping index 0e3d8ca38f..0f9031704c 100644 --- a/mappings/net/minecraft/entity/ai/goal/GoalSelector.mapping +++ b/mappings/net/minecraft/entity/ai/goal/GoalSelector.mapping @@ -20,7 +20,8 @@ CLASS net/minecraft/class_1355 net/minecraft/entity/ai/goal/GoalSelector METHOD (Ljava/util/function/Supplier;)V ARG 1 profiler METHOD method_19048 getRunningGoals ()Ljava/util/stream/Stream; - METHOD method_35113 clear ()V + METHOD method_35113 clear (Ljava/util/function/Predicate;)V + ARG 1 predicate METHOD method_35114 setTimeInterval (I)V ARG 1 timeInterval METHOD method_35115 getGoals ()Ljava/util/Set; @@ -32,6 +33,8 @@ CLASS net/minecraft/class_1355 net/minecraft/entity/ai/goal/GoalSelector ARG 1 goalsByControl METHOD method_38849 tickGoals (Z)V ARG 1 tickAll + METHOD method_47828 (Ljava/util/function/Predicate;Lnet/minecraft/class_4135;)Z + ARG 1 goal METHOD method_6273 enableControl (Lnet/minecraft/class_1352$class_4134;)V ARG 1 control METHOD method_6274 disableControl (Lnet/minecraft/class_1352$class_4134;)V diff --git a/mappings/net/minecraft/entity/ai/goal/MeleeAttackGoal.mapping b/mappings/net/minecraft/entity/ai/goal/MeleeAttackGoal.mapping index 78c1342a65..4dd294a14c 100644 --- a/mappings/net/minecraft/entity/ai/goal/MeleeAttackGoal.mapping +++ b/mappings/net/minecraft/entity/ai/goal/MeleeAttackGoal.mapping @@ -19,8 +19,5 @@ CLASS net/minecraft/class_1366 net/minecraft/entity/ai/goal/MeleeAttackGoal METHOD method_28347 isCooledDown ()Z METHOD method_28348 getCooldown ()I METHOD method_28349 getMaxCooldown ()I - METHOD method_6288 attack (Lnet/minecraft/class_1309;D)V + METHOD method_6288 attack (Lnet/minecraft/class_1309;)V ARG 1 target - ARG 2 squaredDistance - METHOD method_6289 getSquaredMaxAttackDistance (Lnet/minecraft/class_1309;)D - ARG 1 entity diff --git a/mappings/net/minecraft/entity/ai/goal/StepAndDestroyBlockGoal.mapping b/mappings/net/minecraft/entity/ai/goal/StepAndDestroyBlockGoal.mapping index afe60977da..8ff0c06dd1 100644 --- a/mappings/net/minecraft/entity/ai/goal/StepAndDestroyBlockGoal.mapping +++ b/mappings/net/minecraft/entity/ai/goal/StepAndDestroyBlockGoal.mapping @@ -8,7 +8,6 @@ CLASS net/minecraft/class_1382 net/minecraft/entity/ai/goal/StepAndDestroyBlockG ARG 2 mob ARG 3 speed ARG 5 maxYDifference - METHOD method_20307 hasAvailableTarget ()Z METHOD method_6307 tickStepping (Lnet/minecraft/class_1936;Lnet/minecraft/class_2338;)V ARG 1 world ARG 2 pos diff --git a/mappings/net/minecraft/entity/ai/pathing/AmphibiousSwimNavigation.mapping b/mappings/net/minecraft/entity/ai/pathing/AmphibiousSwimNavigation.mapping new file mode 100644 index 0000000000..69626b05e9 --- /dev/null +++ b/mappings/net/minecraft/entity/ai/pathing/AmphibiousSwimNavigation.mapping @@ -0,0 +1,3 @@ +CLASS net/minecraft/class_5766 net/minecraft/entity/ai/pathing/AmphibiousSwimNavigation + METHOD (Lnet/minecraft/class_1308;Lnet/minecraft/class_1937;)V + ARG 2 world diff --git a/mappings/net/minecraft/entity/ai/pathing/BirdPathNodeMaker.mapping b/mappings/net/minecraft/entity/ai/pathing/BirdPathNodeMaker.mapping index 07491442dd..6ecd718b69 100644 --- a/mappings/net/minecraft/entity/ai/pathing/BirdPathNodeMaker.mapping +++ b/mappings/net/minecraft/entity/ai/pathing/BirdPathNodeMaker.mapping @@ -8,4 +8,15 @@ CLASS net/minecraft/class_6 net/minecraft/entity/ai/pathing/BirdPathNodeMaker ARG 1 x ARG 2 y ARG 3 z + METHOD method_47933 getPassableNode (III)Lnet/minecraft/class_9; + ARG 1 x + ARG 2 y + ARG 3 z + METHOD method_47934 getPotentialEscapePositions (Lnet/minecraft/class_1308;)Ljava/lang/Iterable; + COMMENT {@return the iterable of positions that the entity should try to pathfind to when escaping} + COMMENT + COMMENT @apiNote This is used when the entity {@linkplain #canPathThrough cannot path through} + COMMENT the current position (e.g. because it is dangerous). + ARG 1 entity METHOD method_9 getNodeType (IIIJ)Lnet/minecraft/class_7; + ARG 4 pos diff --git a/mappings/net/minecraft/entity/ai/pathing/EntityNavigation.mapping b/mappings/net/minecraft/entity/ai/pathing/EntityNavigation.mapping index a31cb6de6c..593910785b 100644 --- a/mappings/net/minecraft/entity/ai/pathing/EntityNavigation.mapping +++ b/mappings/net/minecraft/entity/ai/pathing/EntityNavigation.mapping @@ -60,10 +60,13 @@ CLASS net/minecraft/class_1408 net/minecraft/entity/ai/pathing/EntityNavigation METHOD method_35143 getNodeReachProximity ()F METHOD method_38065 adjustTargetY (Lnet/minecraft/class_243;)D ARG 1 pos - METHOD method_43394 doesNotCollide (Lnet/minecraft/class_1308;Lnet/minecraft/class_243;Lnet/minecraft/class_243;)Z + METHOD method_43394 doesNotCollide (Lnet/minecraft/class_1308;Lnet/minecraft/class_243;Lnet/minecraft/class_243;Z)Z ARG 0 entity ARG 1 startPos ARG 2 entityPos + ARG 3 includeFluids + METHOD method_48158 canJumpToNext (Lnet/minecraft/class_7;)Z + ARG 1 nodeType METHOD method_6333 isValidPosition (Lnet/minecraft/class_2338;)Z ARG 1 pos METHOD method_6334 startMovingAlong (Lnet/minecraft/class_11;D)Z @@ -99,7 +102,6 @@ CLASS net/minecraft/class_1408 net/minecraft/entity/ai/pathing/EntityNavigation ARG 1 entity ARG 2 distance METHOD method_6350 canSwim ()Z - METHOD method_6351 isInLiquid ()Z METHOD method_6352 findPathTo (DDDI)Lnet/minecraft/class_11; ARG 1 x ARG 3 y diff --git a/mappings/net/minecraft/entity/ai/pathing/LandPathNodeMaker.mapping b/mappings/net/minecraft/entity/ai/pathing/LandPathNodeMaker.mapping index ba9ef05d1c..dd6b3abc5e 100644 --- a/mappings/net/minecraft/entity/ai/pathing/LandPathNodeMaker.mapping +++ b/mappings/net/minecraft/entity/ai/pathing/LandPathNodeMaker.mapping @@ -2,7 +2,7 @@ CLASS net/minecraft/class_14 net/minecraft/entity/ai/pathing/LandPathNodeMaker FIELD field_25190 nodeTypes Lit/unimi/dsi/fastutil/longs/Long2ObjectMap; FIELD field_25191 collidedBoxes Lit/unimi/dsi/fastutil/objects/Object2BooleanMap; FIELD field_31809 Y_OFFSET D - FIELD field_63 waterPathNodeTypeWeight F + FIELD field_40928 MIN_STEP_HEIGHT D METHOD method_20536 isValidAdjacentSuccessor (Lnet/minecraft/class_9;Lnet/minecraft/class_9;)Z ARG 1 node ARG 2 successor1 @@ -11,8 +11,6 @@ CLASS net/minecraft/class_14 net/minecraft/entity/ai/pathing/LandPathNodeMaker ARG 1 pos METHOD method_27138 inflictsFireDamage (Lnet/minecraft/class_2680;)Z ARG 0 state - METHOD method_27139 canPathThrough (Lnet/minecraft/class_2338;)Z - ARG 1 pos METHOD method_29303 getNodeType (Lnet/minecraft/class_1308;III)Lnet/minecraft/class_7; ARG 1 entity ARG 2 x @@ -20,6 +18,8 @@ CLASS net/minecraft/class_14 net/minecraft/entity/ai/pathing/LandPathNodeMaker ARG 4 z METHOD method_29304 checkBoxCollision (Lnet/minecraft/class_238;)Z ARG 1 box + METHOD method_29305 (Lnet/minecraft/class_238;Ljava/lang/Object;)Z + ARG 2 box2 METHOD method_29578 isBlocked (Lnet/minecraft/class_9;)Z ARG 1 node METHOD method_29579 isValidDiagonalSuccessor (Lnet/minecraft/class_9;Lnet/minecraft/class_9;Lnet/minecraft/class_9;Lnet/minecraft/class_9;)Z @@ -34,6 +34,19 @@ CLASS net/minecraft/class_14 net/minecraft/entity/ai/pathing/LandPathNodeMaker ARG 0 nodeType METHOD method_43415 getStart (Lnet/minecraft/class_2338;)Lnet/minecraft/class_9; ARG 1 pos + METHOD method_43569 getNodeWith (IIILnet/minecraft/class_7;F)Lnet/minecraft/class_9; + ARG 1 x + ARG 2 y + ARG 3 z + ARG 4 type + ARG 5 penalty + METHOD method_43570 getBlockedNode (III)Lnet/minecraft/class_9; + ARG 1 x + ARG 2 y + ARG 3 z + METHOD method_46739 getStepHeight ()D + METHOD method_47893 canPathThrough (Lnet/minecraft/class_2338;)Z + 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 @@ -44,12 +57,10 @@ CLASS net/minecraft/class_14 net/minecraft/entity/ai/pathing/LandPathNodeMaker METHOD method_60 getFeetY (Lnet/minecraft/class_1922;Lnet/minecraft/class_2338;)D ARG 0 world ARG 1 pos - METHOD method_61 adjustNodeType (Lnet/minecraft/class_1922;ZZLnet/minecraft/class_2338;Lnet/minecraft/class_7;)Lnet/minecraft/class_7; + METHOD method_61 adjustNodeType (Lnet/minecraft/class_1922;Lnet/minecraft/class_2338;Lnet/minecraft/class_7;)Lnet/minecraft/class_7; ARG 1 world - ARG 2 canOpenDoors - ARG 3 canEnterOpenDoors - ARG 4 pos - ARG 5 type + ARG 2 pos + ARG 3 type METHOD method_62 getPathNode (IIIIDLnet/minecraft/class_2350;Lnet/minecraft/class_7;)Lnet/minecraft/class_9; ARG 1 x ARG 2 y @@ -61,18 +72,13 @@ CLASS net/minecraft/class_14 net/minecraft/entity/ai/pathing/LandPathNodeMaker METHOD method_63 getNodeType (Lnet/minecraft/class_1308;Lnet/minecraft/class_2338;)Lnet/minecraft/class_7; ARG 1 entity ARG 2 pos - METHOD method_64 findNearbyNodeTypes (Lnet/minecraft/class_1922;IIIIIIZZLjava/util/EnumSet;Lnet/minecraft/class_7;Lnet/minecraft/class_2338;)Lnet/minecraft/class_7; + METHOD method_64 findNearbyNodeTypes (Lnet/minecraft/class_1922;IIILjava/util/EnumSet;Lnet/minecraft/class_7;Lnet/minecraft/class_2338;)Lnet/minecraft/class_7; COMMENT Adds the node types in the box with the given size to the input EnumSet. COMMENT @return The node type at the least coordinates of the input box. ARG 1 world ARG 2 x ARG 3 y ARG 4 z - ARG 5 sizeX - ARG 6 sizeY - ARG 7 sizeZ - ARG 8 canOpenDoors - ARG 9 canEnterOpenDoors - ARG 10 nearbyTypes - ARG 11 type - ARG 12 pos + ARG 5 nearbyTypes + ARG 6 type + ARG 7 pos diff --git a/mappings/net/minecraft/entity/ai/pathing/MobNavigation.mapping b/mappings/net/minecraft/entity/ai/pathing/MobNavigation.mapping index e330ea98e7..c245cd8b49 100644 --- a/mappings/net/minecraft/entity/ai/pathing/MobNavigation.mapping +++ b/mappings/net/minecraft/entity/ai/pathing/MobNavigation.mapping @@ -4,6 +4,8 @@ CLASS net/minecraft/class_1409 net/minecraft/entity/ai/pathing/MobNavigation ARG 1 pathType METHOD method_35139 setCanEnterOpenDoors (Z)V ARG 1 canEnterOpenDoors + METHOD method_46645 setCanWalkOverFences (Z)V + ARG 1 canWalkOverFences METHOD method_6361 setAvoidSunlight (Z)V ARG 1 avoidSunlight METHOD method_6362 getPathfindingY ()I diff --git a/mappings/net/minecraft/entity/ai/pathing/Path.mapping b/mappings/net/minecraft/entity/ai/pathing/Path.mapping index 414088b85f..890f5e4d9c 100644 --- a/mappings/net/minecraft/entity/ai/pathing/Path.mapping +++ b/mappings/net/minecraft/entity/ai/pathing/Path.mapping @@ -1,20 +1,16 @@ CLASS net/minecraft/class_11 net/minecraft/entity/ai/pathing/Path - FIELD field_20300 debugTargetNodes Ljava/util/Set; FIELD field_20301 target Lnet/minecraft/class_2338; FIELD field_20302 manhattanDistanceFromTarget F FIELD field_20303 reachesTarget Z + FIELD field_45155 debugNodeInfos Lnet/minecraft/class_11$class_8644; FIELD field_52 nodes Ljava/util/List; FIELD field_54 currentNodeIndex I - FIELD field_55 debugSecondNodes [Lnet/minecraft/class_9; - FIELD field_57 debugNodes [Lnet/minecraft/class_9; METHOD (Ljava/util/List;Lnet/minecraft/class_2338;Z)V ARG 1 nodes ARG 2 target ARG 3 reachesTarget METHOD method_21655 reachesTarget ()Z METHOD method_21656 getManhattanDistanceFromTarget ()F - METHOD method_22880 getDebugNodes ()[Lnet/minecraft/class_9; - METHOD method_22881 getDebugSecondNodes ()[Lnet/minecraft/class_9; METHOD method_29301 getCurrentNode ()Lnet/minecraft/class_9; METHOD method_30849 isStart ()Z METHOD method_30850 getLastNode ()Lnet/minecraft/class_9; @@ -24,10 +20,13 @@ CLASS net/minecraft/class_11 net/minecraft/entity/ai/pathing/Path METHOD method_33 setNode (ILnet/minecraft/class_9;)V ARG 1 index ARG 2 node - METHOD method_34 fromBuffer (Lnet/minecraft/class_2540;)Lnet/minecraft/class_11; - ARG 0 buffer - METHOD method_35498 toBuffer (Lnet/minecraft/class_2540;)V - ARG 1 buffer + METHOD method_34 fromBuf (Lnet/minecraft/class_2540;)Lnet/minecraft/class_11; + ARG 0 buf + METHOD method_35498 toBuf (Lnet/minecraft/class_2540;)V + ARG 1 buf + METHOD method_35499 (Lnet/minecraft/class_2540;Lnet/minecraft/class_9;)V + ARG 0 buf + ARG 1 node METHOD method_35500 setDebugInfo ([Lnet/minecraft/class_9;[Lnet/minecraft/class_9;Ljava/util/Set;)V ARG 1 debugNodes ARG 2 debugSecondNodes @@ -51,3 +50,18 @@ CLASS net/minecraft/class_11 net/minecraft/entity/ai/pathing/Path METHOD method_48 getTarget ()Lnet/minecraft/class_2338; METHOD method_49 getNodePosition (Lnet/minecraft/class_1297;)Lnet/minecraft/class_243; ARG 1 entity + METHOD method_52602 write (Lnet/minecraft/class_2540;[Lnet/minecraft/class_9;)V + ARG 0 buf + ARG 1 nodes + METHOD method_52603 nodesFromBuf (Lnet/minecraft/class_2540;)[Lnet/minecraft/class_9; + ARG 0 buf + METHOD method_52604 getDebugNodeInfos ()Lnet/minecraft/class_11$class_8644; + METHOD method_52605 copy ()Lnet/minecraft/class_11; + CLASS class_8644 DebugNodeInfo + METHOD method_52606 write (Lnet/minecraft/class_2540;)V + ARG 1 buf + METHOD method_52607 (Lnet/minecraft/class_2540;Lnet/minecraft/class_4459;)V + ARG 0 buf + ARG 1 node + METHOD method_52608 fromBuf (Lnet/minecraft/class_2540;)Lnet/minecraft/class_11$class_8644; + ARG 0 buf diff --git a/mappings/net/minecraft/entity/ai/pathing/PathNode.mapping b/mappings/net/minecraft/entity/ai/pathing/PathNode.mapping index 6dba2fd4a4..31c7142f58 100644 --- a/mappings/net/minecraft/entity/ai/pathing/PathNode.mapping +++ b/mappings/net/minecraft/entity/ai/pathing/PathNode.mapping @@ -28,7 +28,7 @@ CLASS net/minecraft/class_9 net/minecraft/entity/ai/pathing/PathNode ARG 2 y ARG 3 z METHOD method_27 isInHeap ()Z - METHOD method_28 readBuf (Lnet/minecraft/class_2540;)Lnet/minecraft/class_9; + METHOD method_28 fromBuf (Lnet/minecraft/class_2540;)Lnet/minecraft/class_9; ARG 0 buf METHOD method_30 hash (III)I ARG 0 x @@ -40,10 +40,13 @@ CLASS net/minecraft/class_9 net/minecraft/entity/ai/pathing/PathNode ARG 1 node METHOD method_35494 getDistance (Lnet/minecraft/class_2338;)F ARG 1 pos - METHOD method_35495 toBuffer (Lnet/minecraft/class_2540;)V - ARG 1 buffer + METHOD method_35495 write (Lnet/minecraft/class_2540;)V + ARG 1 buf METHOD method_35496 getPos ()Lnet/minecraft/class_243; METHOD method_35497 getSquaredDistance (Lnet/minecraft/class_2338;)F ARG 1 pos METHOD method_44022 getHorizontalDistance (Lnet/minecraft/class_9;)F ARG 1 node + METHOD method_47935 readFromBuf (Lnet/minecraft/class_2540;Lnet/minecraft/class_9;)V + ARG 0 buf + ARG 1 target diff --git a/mappings/net/minecraft/entity/ai/pathing/PathNodeMaker.mapping b/mappings/net/minecraft/entity/ai/pathing/PathNodeMaker.mapping index f472a7b5af..91bbf57ab2 100644 --- a/mappings/net/minecraft/entity/ai/pathing/PathNodeMaker.mapping +++ b/mappings/net/minecraft/entity/ai/pathing/PathNodeMaker.mapping @@ -8,6 +8,7 @@ CLASS net/minecraft/class_8 net/minecraft/entity/ai/pathing/PathNodeMaker FIELD field_31 entityBlockXSize I FIELD field_32 pathNodeCache Lit/unimi/dsi/fastutil/ints/Int2ObjectMap; FIELD field_33 entity Lnet/minecraft/class_1308; + FIELD field_40927 canWalkOverFences Z METHOD method_12 init (Lnet/minecraft/class_1950;Lnet/minecraft/class_1308;)V ARG 1 cachedWorld ARG 2 entity @@ -39,19 +40,17 @@ CLASS net/minecraft/class_8 net/minecraft/entity/ai/pathing/PathNodeMaker METHOD method_22 canSwim ()Z METHOD method_23 canEnterOpenDoors ()Z METHOD method_24 canOpenDoors ()Z - METHOD method_25 getNodeType (Lnet/minecraft/class_1922;IIILnet/minecraft/class_1308;IIIZZ)Lnet/minecraft/class_7; + METHOD method_25 getNodeType (Lnet/minecraft/class_1922;IIILnet/minecraft/class_1308;)Lnet/minecraft/class_7; COMMENT Gets the path node type at the given position without adjusting the node type according to whether the entity can enter or open doors ARG 1 world ARG 2 x ARG 3 y ARG 4 z ARG 5 mob - ARG 6 sizeX - ARG 7 sizeY - ARG 8 sizeZ - ARG 9 canOpenDoors - ARG 10 canEnterOpenDoors METHOD method_27137 getNode (Lnet/minecraft/class_2338;)Lnet/minecraft/class_9; ARG 1 pos METHOD method_43568 asTargetPathNode (Lnet/minecraft/class_9;)Lnet/minecraft/class_4459; ARG 1 node + METHOD method_46737 setCanWalkOverFences (Z)V + ARG 1 canWalkOverFences + METHOD method_46738 canWalkOverFences ()Z diff --git a/mappings/net/minecraft/entity/ai/pathing/WaterPathNodeMaker.mapping b/mappings/net/minecraft/entity/ai/pathing/WaterPathNodeMaker.mapping index 396bb8762d..52ae494f54 100644 --- a/mappings/net/minecraft/entity/ai/pathing/WaterPathNodeMaker.mapping +++ b/mappings/net/minecraft/entity/ai/pathing/WaterPathNodeMaker.mapping @@ -3,8 +3,19 @@ CLASS net/minecraft/class_12 net/minecraft/entity/ai/pathing/WaterPathNodeMaker FIELD field_58 canJumpOutOfWater Z METHOD (Z)V ARG 1 canJumpOutOfWater + METHOD method_38486 (IIIJ)Lnet/minecraft/class_7; + ARG 4 pos METHOD method_38487 hasNotVisited (Lnet/minecraft/class_9;)Z + ARG 1 node + METHOD method_38488 canPathThrough (Lnet/minecraft/class_9;Lnet/minecraft/class_9;Lnet/minecraft/class_9;)Z + ARG 1 diagonalNode + ARG 2 node1 + ARG 3 node2 METHOD method_38489 addPathNodePos (III)Lnet/minecraft/class_7; ARG 1 x ARG 2 y ARG 3 z + METHOD method_47936 getPassableNode (III)Lnet/minecraft/class_9; + ARG 1 x + ARG 2 y + ARG 3 z diff --git a/mappings/net/minecraft/entity/attribute/AttributeContainer.mapping b/mappings/net/minecraft/entity/attribute/AttributeContainer.mapping index ac49c75b21..b66d86ce4d 100644 --- a/mappings/net/minecraft/entity/attribute/AttributeContainer.mapping +++ b/mappings/net/minecraft/entity/attribute/AttributeContainer.mapping @@ -37,7 +37,7 @@ CLASS net/minecraft/class_5131 net/minecraft/entity/attribute/AttributeContainer METHOD method_26857 (Lnet/minecraft/class_1324;)Z ARG 0 attribute METHOD method_26858 (Lnet/minecraft/class_1320;)Lnet/minecraft/class_1324; - ARG 1 attribute + ARG 1 attributex METHOD method_27305 hasModifierForAttribute (Lnet/minecraft/class_1320;Ljava/util/UUID;)Z ARG 1 attribute ARG 2 uuid @@ -46,3 +46,15 @@ CLASS net/minecraft/class_5131 net/minecraft/entity/attribute/AttributeContainer METHOD method_27307 getModifierValue (Lnet/minecraft/class_1320;Ljava/util/UUID;)D ARG 1 attribute ARG 2 uuid + METHOD method_45329 getCustomInstance (Lnet/minecraft/class_6880;)Lnet/minecraft/class_1324; + ARG 1 attribute + METHOD method_45330 hasModifierForAttribute (Lnet/minecraft/class_6880;Ljava/util/UUID;)Z + ARG 1 attribute + ARG 2 uuid + METHOD method_45331 hasAttribute (Lnet/minecraft/class_6880;)Z + ARG 1 attribute + METHOD method_45332 getModifierValue (Lnet/minecraft/class_6880;Ljava/util/UUID;)D + ARG 1 attribute + ARG 2 uuid + METHOD method_52547 (Lnet/minecraft/class_1324;Lnet/minecraft/class_1322;)V + ARG 1 modifier diff --git a/mappings/net/minecraft/entity/attribute/AttributeModifierCreator.mapping b/mappings/net/minecraft/entity/attribute/AttributeModifierCreator.mapping new file mode 100644 index 0000000000..98806f9178 --- /dev/null +++ b/mappings/net/minecraft/entity/attribute/AttributeModifierCreator.mapping @@ -0,0 +1,4 @@ +CLASS net/minecraft/class_8630 net/minecraft/entity/attribute/AttributeModifierCreator + METHOD method_52521 getUuid ()Ljava/util/UUID; + METHOD method_52522 createAttributeModifier (I)Lnet/minecraft/class_1322; + ARG 1 amplifier diff --git a/mappings/net/minecraft/entity/attribute/DefaultAttributeContainer.mapping b/mappings/net/minecraft/entity/attribute/DefaultAttributeContainer.mapping index 02251b0b5b..76b3d4c11c 100644 --- a/mappings/net/minecraft/entity/attribute/DefaultAttributeContainer.mapping +++ b/mappings/net/minecraft/entity/attribute/DefaultAttributeContainer.mapping @@ -30,6 +30,6 @@ CLASS net/minecraft/class_5132 net/minecraft/entity/attribute/DefaultAttributeCo ARG 1 attribute ARG 2 baseValue METHOD method_26869 (Lnet/minecraft/class_1320;Lnet/minecraft/class_1324;)V - ARG 2 attribute + ARG 2 attributex METHOD method_26870 checkedAdd (Lnet/minecraft/class_1320;)Lnet/minecraft/class_1324; ARG 1 attribute diff --git a/mappings/net/minecraft/entity/attribute/EntityAttributeInstance.mapping b/mappings/net/minecraft/entity/attribute/EntityAttributeInstance.mapping index 13f964fd95..f2f0ca258f 100644 --- a/mappings/net/minecraft/entity/attribute/EntityAttributeInstance.mapping +++ b/mappings/net/minecraft/entity/attribute/EntityAttributeInstance.mapping @@ -28,7 +28,7 @@ CLASS net/minecraft/class_1324 net/minecraft/entity/attribute/EntityAttributeIns COMMENT The modifier will not be serialized. ARG 1 modifier METHOD method_26836 (Lnet/minecraft/class_1322$class_1323;)Ljava/util/Set; - ARG 0 operation + ARG 0 operationx METHOD method_26837 addPersistentModifier (Lnet/minecraft/class_1322;)V ARG 1 modifier METHOD method_26838 onUpdate ()V diff --git a/mappings/net/minecraft/entity/attribute/EntityAttributeModifier.mapping b/mappings/net/minecraft/entity/attribute/EntityAttributeModifier.mapping index 548add60da..df0af19e63 100644 --- a/mappings/net/minecraft/entity/attribute/EntityAttributeModifier.mapping +++ b/mappings/net/minecraft/entity/attribute/EntityAttributeModifier.mapping @@ -29,6 +29,8 @@ CLASS net/minecraft/class_1322 net/minecraft/entity/attribute/EntityAttributeMod METHOD method_6189 getId ()Ljava/util/UUID; CLASS class_1323 Operation COMMENT Represents an operation which can be applied to an attribute modifier. + FIELD field_45742 CODEC Lcom/mojang/serialization/Codec; + FIELD field_45743 name Ljava/lang/String; FIELD field_6328 ADDITION Lnet/minecraft/class_1322$class_1323; COMMENT Adds to the base value of an attribute. FIELD field_6329 id I @@ -41,8 +43,9 @@ CLASS net/minecraft/class_1322 net/minecraft/entity/attribute/EntityAttributeMod COMMENT COMMENT

The total value is equal to the sum of all additions and base multiplications applied by an attribute modifier. FIELD field_6332 VALUES [Lnet/minecraft/class_1322$class_1323; - METHOD (Ljava/lang/String;II)V - ARG 3 id + METHOD (Ljava/lang/String;ILjava/lang/String;I)V + ARG 3 name + ARG 4 id METHOD method_6190 fromId (I)Lnet/minecraft/class_1322$class_1323; ARG 0 id METHOD method_6191 getId ()I diff --git a/mappings/net/minecraft/entity/attribute/EntityAttributes.mapping b/mappings/net/minecraft/entity/attribute/EntityAttributes.mapping index 20c8633f3e..8e6fc6bba8 100644 --- a/mappings/net/minecraft/entity/attribute/EntityAttributes.mapping +++ b/mappings/net/minecraft/entity/attribute/EntityAttributes.mapping @@ -1,4 +1,5 @@ CLASS net/minecraft/class_5134 net/minecraft/entity/attribute/EntityAttributes + FIELD field_45124 GENERIC_MAX_ABSORPTION Lnet/minecraft/class_1320; METHOD method_26871 register (Ljava/lang/String;Lnet/minecraft/class_1320;)Lnet/minecraft/class_1320; ARG 0 id ARG 1 attribute diff --git a/mappings/net/minecraft/entity/boss/dragon/EnderDragonEntity.mapping b/mappings/net/minecraft/entity/boss/dragon/EnderDragonEntity.mapping index 77b3589a1f..1e1359af83 100644 --- a/mappings/net/minecraft/entity/boss/dragon/EnderDragonEntity.mapping +++ b/mappings/net/minecraft/entity/boss/dragon/EnderDragonEntity.mapping @@ -6,6 +6,7 @@ CLASS net/minecraft/class_1510 net/minecraft/entity/boss/dragon/EnderDragonEntit COMMENT The damage the dragon can take before it takes off, represented as a ratio to the full health. FIELD field_33910 DRAGON_DEATH_TIME_KEY Ljava/lang/String; FIELD field_33911 DRAGON_PHASE_KEY Ljava/lang/String; + FIELD field_44875 fightOrigin Lnet/minecraft/class_2338; FIELD field_7008 pathHeap Lnet/minecraft/class_5; FIELD field_7009 tail2 Lnet/minecraft/class_1508; FIELD field_7010 latestSegment I @@ -41,6 +42,11 @@ CLASS net/minecraft/class_1510 net/minecraft/entity/boss/dragon/EnderDragonEntit ARG 4 dy ARG 6 dz METHOD method_26903 createEnderDragonAttributes ()Lnet/minecraft/class_5132$class_5133; + METHOD method_51852 setFight (Lnet/minecraft/class_2881;)V + ARG 1 fight + METHOD method_51853 setFightOrigin (Lnet/minecraft/class_2338;)V + ARG 1 fightOrigin + METHOD method_51854 getFightOrigin ()Lnet/minecraft/class_2338; METHOD method_5690 getBodyParts ()[Lnet/minecraft/class_1508; METHOD method_6816 damagePart (Lnet/minecraft/class_1508;Lnet/minecraft/class_1282;F)Z ARG 1 part @@ -72,7 +78,7 @@ CLASS net/minecraft/class_1510 net/minecraft/entity/boss/dragon/EnderDragonEntit METHOD method_6827 damageLivingEntities (Ljava/util/List;)V ARG 1 entities METHOD method_6828 crystalDestroyed (Lnet/minecraft/class_1511;Lnet/minecraft/class_2338;Lnet/minecraft/class_1282;)V - ARG 1 crystal + ARG 1 endCrystal ARG 2 pos ARG 3 source METHOD method_6829 getFight ()Lnet/minecraft/class_2881; diff --git a/mappings/net/minecraft/entity/boss/dragon/EnderDragonFight.mapping b/mappings/net/minecraft/entity/boss/dragon/EnderDragonFight.mapping index 8e87d85aa0..602eb5cebd 100644 --- a/mappings/net/minecraft/entity/boss/dragon/EnderDragonFight.mapping +++ b/mappings/net/minecraft/entity/boss/dragon/EnderDragonFight.mapping @@ -7,7 +7,6 @@ CLASS net/minecraft/class_2881 net/minecraft/entity/boss/dragon/EnderDragonFight FIELD field_13110 endPortalPattern Lnet/minecraft/class_2700; FIELD field_13111 doLegacyCheck Z FIELD field_13112 LOGGER Lorg/slf4j/Logger; - FIELD field_13113 VALID_ENTITY Ljava/util/function/Predicate; FIELD field_13114 previouslyKilled Z FIELD field_13115 dragonKilled Z FIELD field_13116 dragonUuid Ljava/util/UUID; @@ -22,10 +21,18 @@ CLASS net/minecraft/class_2881 net/minecraft/entity/boss/dragon/EnderDragonFight FIELD field_31444 CRYSTAL_COUNTING_INTERVAL I FIELD field_31446 ISLAND_SIZE I FIELD field_31447 PLAYER_COUNTING_INTERVAL I - METHOD (Lnet/minecraft/class_3218;JLnet/minecraft/class_2487;)V + FIELD field_44876 showBossBarPredicate Ljava/util/function/Predicate; + FIELD field_44877 origin Lnet/minecraft/class_2338; + FIELD field_44878 skipChunksLoadedCheck Z + METHOD (Lnet/minecraft/class_3218;JLnet/minecraft/class_2881$class_8576;)V ARG 1 world ARG 2 gatewaysSeed - ARG 4 nbt + ARG 4 data + METHOD (Lnet/minecraft/class_3218;JLnet/minecraft/class_2881$class_8576;Lnet/minecraft/class_2338;)V + ARG 1 world + ARG 2 gatewaysSeed + ARG 4 data + ARG 5 origin METHOD method_12514 worldContainsEndPortal ()Z METHOD method_12515 convertFromLegacy ()V METHOD method_12516 generateEndGateway (Lnet/minecraft/class_2338;)V @@ -48,11 +55,19 @@ 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 toNbt ()Lnet/minecraft/class_2487; + METHOD method_12530 toData ()Lnet/minecraft/class_2881$class_8576; METHOD method_12531 findEndPortal ()Lnet/minecraft/class_2700$class_2702; METHOD method_12532 updateFight (Lnet/minecraft/class_1510;)V ARG 1 dragon - METHOD method_12533 loadChunks ()Z + METHOD method_12533 areChunksLoaded ()Z METHOD method_12535 countAliveCrystals ()V METHOD method_12536 hasPreviouslyKilled ()Z METHOD method_12538 tick ()V + METHOD method_51855 setSkipChunksLoadedCheck ()V + METHOD method_51856 clearGatewaysList ()V + METHOD method_52179 getDragonUuid ()Ljava/util/UUID; + CLASS class_8576 Data + FIELD field_44945 CODEC Lcom/mojang/serialization/Codec; + FIELD field_44946 DEFAULT Lnet/minecraft/class_2881$class_8576; + METHOD method_52230 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 0 instance diff --git a/mappings/net/minecraft/entity/damage/BadRespawnPointDamageSource.mapping b/mappings/net/minecraft/entity/damage/BadRespawnPointDamageSource.mapping deleted file mode 100644 index 68314efec4..0000000000 --- a/mappings/net/minecraft/entity/damage/BadRespawnPointDamageSource.mapping +++ /dev/null @@ -1,3 +0,0 @@ -CLASS net/minecraft/class_1286 net/minecraft/entity/damage/BadRespawnPointDamageSource - METHOD method_5551 (Lnet/minecraft/class_2583;)Lnet/minecraft/class_2583; - ARG 0 style diff --git a/mappings/net/minecraft/entity/damage/DamageEffects.mapping b/mappings/net/minecraft/entity/damage/DamageEffects.mapping new file mode 100644 index 0000000000..8489593237 --- /dev/null +++ b/mappings/net/minecraft/entity/damage/DamageEffects.mapping @@ -0,0 +1,8 @@ +CLASS net/minecraft/class_8107 net/minecraft/entity/damage/DamageEffects + FIELD field_42281 CODEC Lcom/mojang/serialization/Codec; + FIELD field_42282 id Ljava/lang/String; + FIELD field_42283 sound Lnet/minecraft/class_3414; + METHOD (Ljava/lang/String;ILjava/lang/String;Lnet/minecraft/class_3414;)V + ARG 3 id + ARG 4 sound + METHOD method_48786 getSound ()Lnet/minecraft/class_3414; diff --git a/mappings/net/minecraft/entity/damage/DamageRecord.mapping b/mappings/net/minecraft/entity/damage/DamageRecord.mapping index 3d4081a9aa..b26b96bc4a 100644 --- a/mappings/net/minecraft/entity/damage/DamageRecord.mapping +++ b/mappings/net/minecraft/entity/damage/DamageRecord.mapping @@ -1,24 +1,9 @@ CLASS net/minecraft/class_1281 net/minecraft/entity/damage/DamageRecord - FIELD field_5833 fallDistance F - FIELD field_5834 entityHealth F - FIELD field_5835 damage F - FIELD field_5836 entityAge I - FIELD field_5837 damageSource Lnet/minecraft/class_1282; - FIELD field_5838 fallDeathSuffix Ljava/lang/String; - METHOD (Lnet/minecraft/class_1282;IFFLjava/lang/String;F)V + FIELD comp_1535 damageSource Lnet/minecraft/class_1282; + FIELD comp_1536 damage F + FIELD comp_1538 fallDistance F + METHOD (Lnet/minecraft/class_1282;FLnet/minecraft/class_8572;F)V ARG 1 damageSource - ARG 2 entityAge - ARG 3 entityOriginalHealth - ARG 4 damage - ARG 5 fallDeathSuffix - ARG 6 fallDistance - METHOD method_35035 getEntityAge ()I - METHOD method_35036 getEntityHealth ()F - METHOD method_35037 getNewEntityHealth ()F - METHOD method_35038 getAttacker ()Lnet/minecraft/class_1297; - METHOD method_5498 getAttackerName ()Lnet/minecraft/class_2561; - METHOD method_5499 getDamageSource ()Lnet/minecraft/class_1282; - METHOD method_5500 getFallDeathSuffix ()Ljava/lang/String; - METHOD method_5501 getFallDistance ()F - METHOD method_5502 isAttackerLiving ()Z - METHOD method_5503 getDamage ()F + METHOD comp_1535 damageSource ()Lnet/minecraft/class_1282; + METHOD comp_1536 damage ()F + METHOD comp_1538 fallDistance ()F diff --git a/mappings/net/minecraft/entity/damage/DamageScaling.mapping b/mappings/net/minecraft/entity/damage/DamageScaling.mapping new file mode 100644 index 0000000000..9dad64efce --- /dev/null +++ b/mappings/net/minecraft/entity/damage/DamageScaling.mapping @@ -0,0 +1,5 @@ +CLASS net/minecraft/class_8108 net/minecraft/entity/damage/DamageScaling + FIELD field_42288 CODEC Lcom/mojang/serialization/Codec; + FIELD field_42289 id Ljava/lang/String; + METHOD (Ljava/lang/String;ILjava/lang/String;)V + ARG 3 id diff --git a/mappings/net/minecraft/entity/damage/DamageSource.mapping b/mappings/net/minecraft/entity/damage/DamageSource.mapping index ea304079b0..5b70179915 100644 --- a/mappings/net/minecraft/entity/damage/DamageSource.mapping +++ b/mappings/net/minecraft/entity/damage/DamageSource.mapping @@ -1,117 +1,39 @@ CLASS net/minecraft/class_1282 net/minecraft/entity/damage/DamageSource - FIELD field_16992 SWEET_BERRY_BUSH Lnet/minecraft/class_1282; - FIELD field_27856 FREEZE Lnet/minecraft/class_1282; - FIELD field_28099 FALLING_STALACTITE Lnet/minecraft/class_1282; - FIELD field_28100 fallingBlock Z - FIELD field_28399 fromFalling Z - FIELD field_28400 STALAGMITE Lnet/minecraft/class_1282; - FIELD field_34004 neutral Z - COMMENT Whether the attacked entity should be neutral to the attacker. - COMMENT - COMMENT @apiNote This is used by goats to prevent rammed mobs from retaliating. - COMMENT Damages that are neutral do not cause {@link LivingEntity#setAttacker(LivingEntity)} - COMMENT to be called. - FIELD field_39449 bypassesProtection Z - FIELD field_5839 unblockable Z - FIELD field_5840 bypassesArmor Z - FIELD field_5841 name Ljava/lang/String; - FIELD field_5842 DRYOUT Lnet/minecraft/class_1282; - FIELD field_5843 FLY_INTO_WALL Lnet/minecraft/class_1282; - FIELD field_5844 CRAMMING Lnet/minecraft/class_1282; - FIELD field_5845 exhaustion F - FIELD field_5846 MAGIC Lnet/minecraft/class_1282; - FIELD field_5847 FALLING_BLOCK Lnet/minecraft/class_1282; - FIELD field_5848 CACTUS Lnet/minecraft/class_1282; - FIELD field_5849 OUT_OF_WORLD Lnet/minecraft/class_1282; - FIELD field_5850 WITHER Lnet/minecraft/class_1282; - FIELD field_5851 magic Z - FIELD field_5852 STARVE Lnet/minecraft/class_1282; - FIELD field_5853 projectile Z - FIELD field_5854 ON_FIRE Lnet/minecraft/class_1282; - FIELD field_5855 IN_WALL Lnet/minecraft/class_1282; - FIELD field_5856 DRAGON_BREATH Lnet/minecraft/class_1282; - FIELD field_5857 outOfWorld Z - FIELD field_5858 HOT_FLOOR Lnet/minecraft/class_1282; - FIELD field_5859 DROWN Lnet/minecraft/class_1282; - FIELD field_5861 LIGHTNING_BOLT Lnet/minecraft/class_1282; - FIELD field_5862 explosive Z - FIELD field_5863 LAVA Lnet/minecraft/class_1282; - FIELD field_5864 scaleWithDifficulty Z - FIELD field_5865 ANVIL Lnet/minecraft/class_1282; - FIELD field_5866 fire Z - FIELD field_5867 IN_FIRE Lnet/minecraft/class_1282; - FIELD field_5868 FALL Lnet/minecraft/class_1282; - FIELD field_5869 GENERIC Lnet/minecraft/class_1282; - METHOD (Ljava/lang/String;)V - ARG 1 name - METHOD method_21748 sting (Lnet/minecraft/class_1309;)Lnet/minecraft/class_1282; - ARG 0 attacker - METHOD method_24907 firework (Lnet/minecraft/class_1671;Lnet/minecraft/class_1297;)Lnet/minecraft/class_1282; - ARG 0 firework - ARG 1 attacker - METHOD method_29238 witherSkull (Lnet/minecraft/class_1687;Lnet/minecraft/class_1297;)Lnet/minecraft/class_1282; - ARG 0 witherSkull - ARG 1 attacker - METHOD method_32872 isFallingBlock ()Z - METHOD method_32873 setFallingBlock ()Lnet/minecraft/class_1282; - METHOD method_33329 isFromFalling ()Z - METHOD method_33330 setFromFalling ()Lnet/minecraft/class_1282; - METHOD method_37353 setNeutral ()Lnet/minecraft/class_1282; - METHOD method_37354 isNeutral ()Z - METHOD method_43964 sonicBoom (Lnet/minecraft/class_1297;)Lnet/minecraft/class_1282; - ARG 0 attacker - METHOD method_44327 bypassesProtection ()Z - METHOD method_44328 setBypassesProtection ()Lnet/minecraft/class_1282; - METHOD method_5504 isUnblockable ()Z - METHOD method_5505 setOutOfWorld ()Lnet/minecraft/class_1282; + FIELD field_42291 type Lnet/minecraft/class_6880; + FIELD field_42292 attacker Lnet/minecraft/class_1297; + FIELD field_42293 source Lnet/minecraft/class_1297; + FIELD field_42294 position Lnet/minecraft/class_243; + METHOD (Lnet/minecraft/class_6880;)V + ARG 1 type + METHOD (Lnet/minecraft/class_6880;Lnet/minecraft/class_1297;)V + ARG 1 type + ARG 2 attacker + METHOD (Lnet/minecraft/class_6880;Lnet/minecraft/class_1297;Lnet/minecraft/class_1297;)V + ARG 1 type + ARG 2 source + ARG 3 attacker + METHOD (Lnet/minecraft/class_6880;Lnet/minecraft/class_1297;Lnet/minecraft/class_1297;Lnet/minecraft/class_243;)V + ARG 1 type + ARG 2 source + ARG 3 attacker + ARG 4 position + METHOD (Lnet/minecraft/class_6880;Lnet/minecraft/class_243;)V + ARG 1 type + ARG 2 position + METHOD method_48789 isIn (Lnet/minecraft/class_6862;)Z + ARG 1 tag + METHOD method_48790 isIndirect ()Z + METHOD method_48791 getStoredPosition ()Lnet/minecraft/class_243; + METHOD method_48792 getType ()Lnet/minecraft/class_8110; + METHOD method_48793 getTypeRegistryEntry ()Lnet/minecraft/class_6880; + METHOD method_49708 isOf (Lnet/minecraft/class_5321;)Z + ARG 1 typeKey METHOD method_5506 getDeathMessage (Lnet/minecraft/class_1309;)Lnet/minecraft/class_2561; - ARG 1 entity - METHOD method_5507 setFire ()Lnet/minecraft/class_1282; - METHOD method_5508 setBypassesArmor ()Lnet/minecraft/class_1282; - METHOD method_5509 setUnblockable ()Lnet/minecraft/class_1282; + ARG 1 killed METHOD method_5510 getPosition ()Lnet/minecraft/class_243; - METHOD method_5511 mob (Lnet/minecraft/class_1309;)Lnet/minecraft/class_1282; - ARG 0 attacker - METHOD method_5512 explosion (Lnet/minecraft/class_1309;)Lnet/minecraft/class_1282; - ARG 0 attacker - METHOD method_5513 thorns (Lnet/minecraft/class_1297;)Lnet/minecraft/class_1282; - ARG 0 attacker METHOD method_5514 isScaledWithDifficulty ()Z - METHOD method_5515 setUsesMagic ()Lnet/minecraft/class_1282; - METHOD method_5516 setScaledWithDifficulty ()Lnet/minecraft/class_1282; - METHOD method_5517 setProjectile ()Lnet/minecraft/class_1282; - METHOD method_5518 setExplosive ()Lnet/minecraft/class_1282; - METHOD method_5519 mobProjectile (Lnet/minecraft/class_1297;Lnet/minecraft/class_1309;)Lnet/minecraft/class_1282; - ARG 0 projectile - ARG 1 attacker - METHOD method_5520 trident (Lnet/minecraft/class_1297;Lnet/minecraft/class_1297;)Lnet/minecraft/class_1282; - ARG 0 trident - ARG 1 attacker - METHOD method_5521 fireball (Lnet/minecraft/class_3855;Lnet/minecraft/class_1297;)Lnet/minecraft/class_1282; - ARG 0 fireball - ARG 1 attacker - METHOD method_5522 arrow (Lnet/minecraft/class_1665;Lnet/minecraft/class_1297;)Lnet/minecraft/class_1282; - ARG 0 projectile - ARG 1 attacker - METHOD method_5523 badRespawnPoint ()Lnet/minecraft/class_1282; - METHOD method_5524 thrownProjectile (Lnet/minecraft/class_1297;Lnet/minecraft/class_1297;)Lnet/minecraft/class_1282; - ARG 0 projectile - ARG 1 attacker METHOD method_5525 getName ()Ljava/lang/String; METHOD method_5526 getSource ()Lnet/minecraft/class_1297; - METHOD method_5527 isMagic ()Z METHOD method_5528 getExhaustion ()F METHOD method_5529 getAttacker ()Lnet/minecraft/class_1297; METHOD method_5530 isSourceCreativePlayer ()Z - METHOD method_5531 explosion (Lnet/minecraft/class_1927;)Lnet/minecraft/class_1282; - ARG 0 explosion - METHOD method_5532 player (Lnet/minecraft/class_1657;)Lnet/minecraft/class_1282; - ARG 0 attacker - METHOD method_5533 isProjectile ()Z - METHOD method_5534 isFire ()Z - METHOD method_5535 isExplosive ()Z - METHOD method_5536 magic (Lnet/minecraft/class_1297;Lnet/minecraft/class_1297;)Lnet/minecraft/class_1282; - ARG 0 magic - ARG 1 attacker - METHOD method_5537 bypassesArmor ()Z - METHOD method_5538 isOutOfWorld ()Z diff --git a/mappings/net/minecraft/entity/damage/DamageSources.mapping b/mappings/net/minecraft/entity/damage/DamageSources.mapping new file mode 100644 index 0000000000..70a16d03dc --- /dev/null +++ b/mappings/net/minecraft/entity/damage/DamageSources.mapping @@ -0,0 +1,108 @@ +CLASS net/minecraft/class_8109 net/minecraft/entity/damage/DamageSources + FIELD field_42296 registry Lnet/minecraft/class_2378; + FIELD field_42297 inFire Lnet/minecraft/class_1282; + FIELD field_42298 lightningBolt Lnet/minecraft/class_1282; + FIELD field_42299 onFire Lnet/minecraft/class_1282; + FIELD field_42300 lava Lnet/minecraft/class_1282; + FIELD field_42301 hotFloor Lnet/minecraft/class_1282; + FIELD field_42302 inWall Lnet/minecraft/class_1282; + FIELD field_42303 cramming Lnet/minecraft/class_1282; + FIELD field_42304 drown Lnet/minecraft/class_1282; + FIELD field_42305 starve Lnet/minecraft/class_1282; + FIELD field_42306 cactus Lnet/minecraft/class_1282; + FIELD field_42307 fall Lnet/minecraft/class_1282; + FIELD field_42308 flyIntoWall Lnet/minecraft/class_1282; + FIELD field_42309 outOfWorld Lnet/minecraft/class_1282; + FIELD field_42310 generic Lnet/minecraft/class_1282; + FIELD field_42311 magic Lnet/minecraft/class_1282; + FIELD field_42312 wither Lnet/minecraft/class_1282; + FIELD field_42313 dragonBreath Lnet/minecraft/class_1282; + FIELD field_42314 dryOut Lnet/minecraft/class_1282; + FIELD field_42315 sweetBerryBush Lnet/minecraft/class_1282; + FIELD field_42316 freeze Lnet/minecraft/class_1282; + FIELD field_42317 stalagmite Lnet/minecraft/class_1282; + FIELD field_44866 outsideBorder Lnet/minecraft/class_1282; + FIELD field_44867 genericKill Lnet/minecraft/class_1282; + METHOD (Lnet/minecraft/class_5455;)V + ARG 1 registryManager + METHOD method_48794 inFire ()Lnet/minecraft/class_1282; + METHOD method_48795 create (Lnet/minecraft/class_5321;)Lnet/minecraft/class_1282; + ARG 1 key + METHOD method_48796 create (Lnet/minecraft/class_5321;Lnet/minecraft/class_1297;)Lnet/minecraft/class_1282; + ARG 1 key + ARG 2 attacker + METHOD method_48797 create (Lnet/minecraft/class_5321;Lnet/minecraft/class_1297;Lnet/minecraft/class_1297;)Lnet/minecraft/class_1282; + ARG 1 key + ARG 2 source + ARG 3 attacker + METHOD method_48798 fallingBlock (Lnet/minecraft/class_1297;)Lnet/minecraft/class_1282; + ARG 1 attacker + METHOD method_48799 trident (Lnet/minecraft/class_1297;Lnet/minecraft/class_1297;)Lnet/minecraft/class_1282; + ARG 1 source + ARG 2 attacker + METHOD method_48800 mobProjectile (Lnet/minecraft/class_1297;Lnet/minecraft/class_1309;)Lnet/minecraft/class_1282; + ARG 1 source + ARG 2 attacker + METHOD method_48801 sting (Lnet/minecraft/class_1309;)Lnet/minecraft/class_1282; + ARG 1 attacker + METHOD method_48802 playerAttack (Lnet/minecraft/class_1657;)Lnet/minecraft/class_1282; + ARG 1 attacker + METHOD method_48803 arrow (Lnet/minecraft/class_1665;Lnet/minecraft/class_1297;)Lnet/minecraft/class_1282; + ARG 1 source + ARG 2 attacker + METHOD method_48804 fireball (Lnet/minecraft/class_3855;Lnet/minecraft/class_1297;)Lnet/minecraft/class_1282; + ARG 1 source + ARG 2 attacker + METHOD method_48805 fireworks (Lnet/minecraft/class_1671;Lnet/minecraft/class_1297;)Lnet/minecraft/class_1282; + ARG 1 source + ARG 2 attacker + METHOD method_48806 witherSkull (Lnet/minecraft/class_1687;Lnet/minecraft/class_1297;)Lnet/minecraft/class_1282; + ARG 1 source + ARG 2 attacker + METHOD method_48807 explosion (Lnet/minecraft/class_1927;)Lnet/minecraft/class_1282; + ARG 1 explosion + METHOD method_48808 badRespawnPoint (Lnet/minecraft/class_243;)Lnet/minecraft/class_1282; + ARG 1 position + METHOD method_48809 lightningBolt ()Lnet/minecraft/class_1282; + METHOD method_48810 fallingAnvil (Lnet/minecraft/class_1297;)Lnet/minecraft/class_1282; + ARG 1 attacker + METHOD method_48811 thrown (Lnet/minecraft/class_1297;Lnet/minecraft/class_1297;)Lnet/minecraft/class_1282; + ARG 1 source + ARG 2 attacker + METHOD method_48812 mobAttack (Lnet/minecraft/class_1309;)Lnet/minecraft/class_1282; + ARG 1 attacker + METHOD method_48813 onFire ()Lnet/minecraft/class_1282; + METHOD method_48814 fallingStalactite (Lnet/minecraft/class_1297;)Lnet/minecraft/class_1282; + ARG 1 attacker + METHOD method_48815 indirectMagic (Lnet/minecraft/class_1297;Lnet/minecraft/class_1297;)Lnet/minecraft/class_1282; + ARG 1 source + ARG 2 attacker + METHOD method_48816 mobAttackNoAggro (Lnet/minecraft/class_1309;)Lnet/minecraft/class_1282; + ARG 1 attacker + METHOD method_48817 lava ()Lnet/minecraft/class_1282; + METHOD method_48818 thorns (Lnet/minecraft/class_1297;)Lnet/minecraft/class_1282; + ARG 1 attacker + METHOD method_48819 explosion (Lnet/minecraft/class_1297;Lnet/minecraft/class_1297;)Lnet/minecraft/class_1282; + ARG 1 source + ARG 2 attacker + METHOD method_48820 hotFloor ()Lnet/minecraft/class_1282; + METHOD method_48821 sonicBoom (Lnet/minecraft/class_1297;)Lnet/minecraft/class_1282; + ARG 1 attacker + METHOD method_48822 inWall ()Lnet/minecraft/class_1282; + METHOD method_48823 cramming ()Lnet/minecraft/class_1282; + METHOD method_48824 drown ()Lnet/minecraft/class_1282; + METHOD method_48825 starve ()Lnet/minecraft/class_1282; + METHOD method_48826 cactus ()Lnet/minecraft/class_1282; + METHOD method_48827 fall ()Lnet/minecraft/class_1282; + METHOD method_48828 flyIntoWall ()Lnet/minecraft/class_1282; + METHOD method_48829 outOfWorld ()Lnet/minecraft/class_1282; + METHOD method_48830 generic ()Lnet/minecraft/class_1282; + METHOD method_48831 magic ()Lnet/minecraft/class_1282; + METHOD method_48832 wither ()Lnet/minecraft/class_1282; + METHOD method_48833 dragonBreath ()Lnet/minecraft/class_1282; + METHOD method_48834 dryOut ()Lnet/minecraft/class_1282; + METHOD method_48835 sweetBerryBush ()Lnet/minecraft/class_1282; + METHOD method_48836 freeze ()Lnet/minecraft/class_1282; + METHOD method_48837 stalagmite ()Lnet/minecraft/class_1282; + METHOD method_51846 outsideBorder ()Lnet/minecraft/class_1282; + METHOD method_51847 genericKill ()Lnet/minecraft/class_1282; diff --git a/mappings/net/minecraft/entity/damage/DamageTracker.mapping b/mappings/net/minecraft/entity/damage/DamageTracker.mapping index 2f8e9551ab..7fcef72976 100644 --- a/mappings/net/minecraft/entity/damage/DamageTracker.mapping +++ b/mappings/net/minecraft/entity/damage/DamageTracker.mapping @@ -1,8 +1,8 @@ CLASS net/minecraft/class_1283 net/minecraft/entity/damage/DamageTracker FIELD field_29967 DAMAGE_COOLDOWN I FIELD field_29968 ATTACK_DAMAGE_COOLDOWN I + FIELD field_42274 INTENTIONAL_GAME_DESIGN_ISSUE_LINK_STYLE Lnet/minecraft/class_2583; FIELD field_5870 recentDamage Ljava/util/List; - FIELD field_5871 fallDeathSuffix Ljava/lang/String; FIELD field_5872 hasDamage Z FIELD field_5873 ageOnLastUpdate I FIELD field_5874 recentlyAttacked Z @@ -11,23 +11,22 @@ CLASS net/minecraft/class_1283 net/minecraft/entity/damage/DamageTracker FIELD field_5877 entity Lnet/minecraft/class_1309; METHOD (Lnet/minecraft/class_1309;)V ARG 1 entity - METHOD method_33937 getBiggestAttackerId ()I - COMMENT Gets the Entity ID of the biggest attacker - COMMENT @see #getBiggestAttacker() for getting the entity itself - METHOD method_35039 hasDamage ()Z - METHOD method_35040 wasRecentlyAttacked ()Z - METHOD method_35041 getMostRecentDamage ()Lnet/minecraft/class_1281; - METHOD method_5539 update ()V - METHOD method_5540 getEntity ()Lnet/minecraft/class_1309; - METHOD method_5541 getBiggestAttacker ()Lnet/minecraft/class_1309; - METHOD method_5542 setFallDeathSuffix ()V - METHOD method_5543 getFallDeathSuffix (Lnet/minecraft/class_1281;)Ljava/lang/String; + METHOD method_52190 getFallDeathMessage (Lnet/minecraft/class_1281;Lnet/minecraft/class_1297;)Lnet/minecraft/class_2561; ARG 1 damageRecord + ARG 2 attacker + METHOD method_52191 isAttackerLiving (Lnet/minecraft/class_1282;)Z + ARG 0 damageSource + METHOD method_52192 getDisplayName (Lnet/minecraft/class_1297;)Lnet/minecraft/class_2561; + ARG 0 entity + METHOD method_52193 getAttackedFallDeathMessage (Lnet/minecraft/class_1297;Lnet/minecraft/class_2561;Ljava/lang/String;Ljava/lang/String;)Lnet/minecraft/class_2561; + ARG 1 attacker + ARG 2 attackerDisplayName + ARG 3 itemDeathTranslationKey + ARG 4 deathTranslationKey + METHOD method_5539 update ()V 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 + METHOD method_5547 onDamage (Lnet/minecraft/class_1282;F)V ARG 1 damageSource - ARG 2 originalHealth - ARG 3 damage + ARG 2 damage METHOD method_5548 getDeathMessage ()Lnet/minecraft/class_2561; diff --git a/mappings/net/minecraft/entity/damage/DamageType.mapping b/mappings/net/minecraft/entity/damage/DamageType.mapping new file mode 100644 index 0000000000..309e4dc5da --- /dev/null +++ b/mappings/net/minecraft/entity/damage/DamageType.mapping @@ -0,0 +1,20 @@ +CLASS net/minecraft/class_8110 net/minecraft/entity/damage/DamageType + FIELD field_42318 CODEC Lcom/mojang/serialization/Codec; + METHOD (Ljava/lang/String;F)V + ARG 1 msgId + ARG 2 exhaustion + METHOD (Ljava/lang/String;FLnet/minecraft/class_8107;)V + ARG 1 msgId + ARG 2 exhaustion + ARG 3 effects + METHOD (Ljava/lang/String;Lnet/minecraft/class_8108;F)V + ARG 1 msgId + ARG 2 scaling + ARG 3 exhaustion + METHOD (Ljava/lang/String;Lnet/minecraft/class_8108;FLnet/minecraft/class_8107;)V + ARG 1 msgId + ARG 2 scaling + ARG 3 exhaustion + ARG 4 effects + METHOD method_48838 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 0 instance diff --git a/mappings/net/minecraft/entity/damage/DamageTypes.mapping b/mappings/net/minecraft/entity/damage/DamageTypes.mapping new file mode 100644 index 0000000000..8bed74a6a0 --- /dev/null +++ b/mappings/net/minecraft/entity/damage/DamageTypes.mapping @@ -0,0 +1,47 @@ +CLASS net/minecraft/class_8111 net/minecraft/entity/damage/DamageTypes + FIELD field_42319 MOB_ATTACK_NO_AGGRO Lnet/minecraft/class_5321; + FIELD field_42320 PLAYER_ATTACK Lnet/minecraft/class_5321; + FIELD field_42321 ARROW Lnet/minecraft/class_5321; + FIELD field_42322 TRIDENT Lnet/minecraft/class_5321; + FIELD field_42323 MOB_PROJECTILE Lnet/minecraft/class_5321; + FIELD field_42324 FIREWORKS Lnet/minecraft/class_5321; + FIELD field_42325 FIREBALL Lnet/minecraft/class_5321; + FIELD field_42326 UNATTRIBUTED_FIREBALL Lnet/minecraft/class_5321; + FIELD field_42327 WITHER_SKULL Lnet/minecraft/class_5321; + FIELD field_42328 THROWN Lnet/minecraft/class_5321; + FIELD field_42329 INDIRECT_MAGIC Lnet/minecraft/class_5321; + FIELD field_42330 THORNS Lnet/minecraft/class_5321; + FIELD field_42331 EXPLOSION Lnet/minecraft/class_5321; + FIELD field_42332 PLAYER_EXPLOSION Lnet/minecraft/class_5321; + FIELD field_42333 SONIC_BOOM Lnet/minecraft/class_5321; + FIELD field_42334 BAD_RESPAWN_POINT Lnet/minecraft/class_5321; + FIELD field_42335 IN_FIRE Lnet/minecraft/class_5321; + FIELD field_42336 LIGHTNING_BOLT Lnet/minecraft/class_5321; + FIELD field_42337 ON_FIRE Lnet/minecraft/class_5321; + FIELD field_42338 LAVA Lnet/minecraft/class_5321; + FIELD field_42339 HOT_FLOOR Lnet/minecraft/class_5321; + FIELD field_42340 IN_WALL Lnet/minecraft/class_5321; + FIELD field_42341 CRAMMING Lnet/minecraft/class_5321; + FIELD field_42342 DROWN Lnet/minecraft/class_5321; + FIELD field_42343 STARVE Lnet/minecraft/class_5321; + FIELD field_42344 CACTUS Lnet/minecraft/class_5321; + FIELD field_42345 FALL Lnet/minecraft/class_5321; + FIELD field_42346 FLY_INTO_WALL Lnet/minecraft/class_5321; + FIELD field_42347 OUT_OF_WORLD Lnet/minecraft/class_5321; + FIELD field_42348 GENERIC Lnet/minecraft/class_5321; + FIELD field_42349 MAGIC Lnet/minecraft/class_5321; + FIELD field_42350 WITHER Lnet/minecraft/class_5321; + FIELD field_42351 DRAGON_BREATH Lnet/minecraft/class_5321; + FIELD field_42352 DRY_OUT Lnet/minecraft/class_5321; + FIELD field_42353 SWEET_BERRY_BUSH Lnet/minecraft/class_5321; + FIELD field_42354 FREEZE Lnet/minecraft/class_5321; + FIELD field_42355 STALAGMITE Lnet/minecraft/class_5321; + FIELD field_42356 FALLING_BLOCK Lnet/minecraft/class_5321; + FIELD field_42357 FALLING_ANVIL Lnet/minecraft/class_5321; + FIELD field_42358 FALLING_STALACTITE Lnet/minecraft/class_5321; + FIELD field_42359 STING Lnet/minecraft/class_5321; + FIELD field_42360 MOB_ATTACK Lnet/minecraft/class_5321; + FIELD field_44868 OUTSIDE_BORDER Lnet/minecraft/class_5321; + FIELD field_44869 GENERIC_KILL Lnet/minecraft/class_5321; + METHOD method_48839 bootstrap (Lnet/minecraft/class_7891;)V + ARG 0 damageTypeRegisterable diff --git a/mappings/net/minecraft/entity/damage/DeathMessageType.mapping b/mappings/net/minecraft/entity/damage/DeathMessageType.mapping new file mode 100644 index 0000000000..4f5f7fb36e --- /dev/null +++ b/mappings/net/minecraft/entity/damage/DeathMessageType.mapping @@ -0,0 +1,5 @@ +CLASS net/minecraft/class_8112 net/minecraft/entity/damage/DeathMessageType + FIELD field_42364 CODEC Lcom/mojang/serialization/Codec; + FIELD field_42365 id Ljava/lang/String; + METHOD (Ljava/lang/String;ILjava/lang/String;)V + ARG 3 id diff --git a/mappings/net/minecraft/entity/damage/EntityDamageSource.mapping b/mappings/net/minecraft/entity/damage/EntityDamageSource.mapping deleted file mode 100644 index d9fb41d46b..0000000000 --- a/mappings/net/minecraft/entity/damage/EntityDamageSource.mapping +++ /dev/null @@ -1,8 +0,0 @@ -CLASS net/minecraft/class_1285 net/minecraft/entity/damage/EntityDamageSource - FIELD field_5879 source Lnet/minecraft/class_1297; - FIELD field_5880 thorns Z - METHOD (Ljava/lang/String;Lnet/minecraft/class_1297;)V - ARG 1 name - ARG 2 source - METHOD method_5549 isThorns ()Z - METHOD method_5550 setThorns ()Lnet/minecraft/class_1285; diff --git a/mappings/net/minecraft/entity/damage/FallLocation.mapping b/mappings/net/minecraft/entity/damage/FallLocation.mapping new file mode 100644 index 0000000000..45579a605a --- /dev/null +++ b/mappings/net/minecraft/entity/damage/FallLocation.mapping @@ -0,0 +1,6 @@ +CLASS net/minecraft/class_8572 net/minecraft/entity/damage/FallLocation + METHOD method_52194 getDeathMessageKey ()Ljava/lang/String; + METHOD method_52195 fromEntity (Lnet/minecraft/class_1309;)Lnet/minecraft/class_8572; + ARG 0 entity + METHOD method_52196 fromBlockState (Lnet/minecraft/class_2680;)Lnet/minecraft/class_8572; + ARG 0 state diff --git a/mappings/net/minecraft/entity/damage/ProjectileDamageSource.mapping b/mappings/net/minecraft/entity/damage/ProjectileDamageSource.mapping deleted file mode 100644 index 4fbf3287e2..0000000000 --- a/mappings/net/minecraft/entity/damage/ProjectileDamageSource.mapping +++ /dev/null @@ -1,6 +0,0 @@ -CLASS net/minecraft/class_1284 net/minecraft/entity/damage/ProjectileDamageSource - FIELD field_5878 attacker Lnet/minecraft/class_1297; - METHOD (Ljava/lang/String;Lnet/minecraft/class_1297;Lnet/minecraft/class_1297;)V - ARG 1 name - ARG 2 projectile - ARG 3 attacker diff --git a/mappings/net/minecraft/entity/data/DataTracker.mapping b/mappings/net/minecraft/entity/data/DataTracker.mapping index 51c5d68bf6..f9ba664d43 100644 --- a/mappings/net/minecraft/entity/data/DataTracker.mapping +++ b/mappings/net/minecraft/entity/data/DataTracker.mapping @@ -1,57 +1,49 @@ CLASS net/minecraft/class_2945 net/minecraft/entity/data/DataTracker FIELD field_13329 dirty Z - FIELD field_13330 empty Z FIELD field_13331 entries Lit/unimi/dsi/fastutil/ints/Int2ObjectMap; FIELD field_13332 TRACKED_ENTITIES Lit/unimi/dsi/fastutil/objects/Object2IntMap; FIELD field_13333 trackedEntity Lnet/minecraft/class_1297; FIELD field_13334 LOGGER Lorg/slf4j/Logger; FIELD field_13335 lock Ljava/util/concurrent/locks/ReadWriteLock; - FIELD field_33377 END_PACKET_WRITE I FIELD field_33378 MAX_DATA_VALUE_ID I METHOD (Lnet/minecraft/class_1297;)V ARG 1 trackedEntity METHOD method_12776 addTrackedData (Lnet/minecraft/class_2940;Ljava/lang/Object;)V ARG 1 key ARG 2 value - METHOD method_12777 entryFromPacket (Lnet/minecraft/class_2540;ILnet/minecraft/class_2941;)Lnet/minecraft/class_2945$class_2946; - ARG 0 buf - ARG 1 id - ARG 2 handler 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 ARG 1 entries 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; ARG 1 key METHOD method_12784 startTracking (Lnet/minecraft/class_2940;Ljava/lang/Object;)V ARG 1 key ARG 2 initialValue - METHOD method_12785 copyToFrom (Lnet/minecraft/class_2945$class_2946;Lnet/minecraft/class_2945$class_2946;)V + METHOD method_12785 copyToFrom (Lnet/minecraft/class_2945$class_2946;Lnet/minecraft/class_2945$class_7834;)V ARG 1 to ARG 2 from METHOD method_12786 isDirty ()Z - METHOD method_12787 entriesToPacket (Ljava/util/List;Lnet/minecraft/class_2540;)V - ARG 0 entries - ARG 1 buf - 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 ARG 1 dataHandler - METHOD method_12792 clearDirty ()V - METHOD method_12793 getAllEntries ()Ljava/util/List; + METHOD method_46357 getChangedEntries ()Ljava/util/List; + METHOD method_49743 set (Lnet/minecraft/class_2940;Ljava/lang/Object;Z)V + ARG 1 key + ARG 2 value + ARG 3 force + METHOD method_51696 containsKey (Lnet/minecraft/class_2940;)Z + ARG 1 key CLASS class_2946 Entry FIELD field_13336 dirty Z FIELD field_13337 data Lnet/minecraft/class_2940; FIELD field_13338 value Ljava/lang/Object; + FIELD field_40719 initialValue Ljava/lang/Object; METHOD (Lnet/minecraft/class_2940;Ljava/lang/Object;)V ARG 1 data ARG 2 value @@ -60,6 +52,22 @@ CLASS net/minecraft/class_2945 net/minecraft/entity/data/DataTracker ARG 1 dirty METHOD method_12796 isDirty ()Z METHOD method_12797 getData ()Lnet/minecraft/class_2940; - METHOD method_12798 copy ()Lnet/minecraft/class_2945$class_2946; METHOD method_12799 set (Ljava/lang/Object;)V ARG 1 value + METHOD method_46358 isUnchanged ()Z + METHOD method_46359 toSerialized ()Lnet/minecraft/class_2945$class_7834; + CLASS class_7834 SerializedEntry + FIELD comp_1116 handler Lnet/minecraft/class_2941; + METHOD comp_1116 handler ()Lnet/minecraft/class_2941; + METHOD method_46360 of (Lnet/minecraft/class_2940;Ljava/lang/Object;)Lnet/minecraft/class_2945$class_7834; + ARG 0 data + ARG 1 value + METHOD method_46361 write (Lnet/minecraft/class_2540;)V + ARG 1 buf + METHOD method_46362 fromBuf (Lnet/minecraft/class_2540;I)Lnet/minecraft/class_2945$class_7834; + ARG 0 buf + ARG 1 id + METHOD method_46363 fromBuf (Lnet/minecraft/class_2540;ILnet/minecraft/class_2941;)Lnet/minecraft/class_2945$class_7834; + ARG 0 buf + ARG 1 id + ARG 2 handler diff --git a/mappings/net/minecraft/entity/data/TrackedDataHandlerRegistry.mapping b/mappings/net/minecraft/entity/data/TrackedDataHandlerRegistry.mapping index 47f9d3eddc..0159f58980 100644 --- a/mappings/net/minecraft/entity/data/TrackedDataHandlerRegistry.mapping +++ b/mappings/net/minecraft/entity/data/TrackedDataHandlerRegistry.mapping @@ -1,5 +1,5 @@ CLASS net/minecraft/class_2943 net/minecraft/entity/data/TrackedDataHandlerRegistry - FIELD field_13312 OPTIONAL_BLOCK_STATE Lnet/minecraft/class_2941; + FIELD field_13312 BLOCK_STATE Lnet/minecraft/class_2941; FIELD field_13313 OPTIONAL_UUID Lnet/minecraft/class_2941; FIELD field_13314 PARTICLE Lnet/minecraft/class_2941; FIELD field_13315 OPTIONAL_BLOCK_POS Lnet/minecraft/class_2941; @@ -23,6 +23,11 @@ CLASS net/minecraft/class_2943 net/minecraft/entity/data/TrackedDataHandlerRegis FIELD field_38826 CAT_VARIANT Lnet/minecraft/class_2941; FIELD field_38827 FROG_VARIANT Lnet/minecraft/class_2941; FIELD field_39017 PAINTING_VARIANT Lnet/minecraft/class_2941; + FIELD field_39965 LONG Lnet/minecraft/class_2941; + FIELD field_42235 QUATERNIONF Lnet/minecraft/class_2941; + FIELD field_42236 OPTIONAL_BLOCK_STATE Lnet/minecraft/class_2941; + FIELD field_42237 VECTOR3F Lnet/minecraft/class_2941; + FIELD field_42543 SNIFFER_STATE Lnet/minecraft/class_2941; METHOD method_12719 getId (Lnet/minecraft/class_2941;)I ARG 0 handler METHOD method_12720 register (Lnet/minecraft/class_2941;)V diff --git a/mappings/net/minecraft/entity/decoration/AbstractDecorationEntity.mapping b/mappings/net/minecraft/entity/decoration/AbstractDecorationEntity.mapping index 49233eea3d..3584fe73bd 100644 --- a/mappings/net/minecraft/entity/decoration/AbstractDecorationEntity.mapping +++ b/mappings/net/minecraft/entity/decoration/AbstractDecorationEntity.mapping @@ -1,4 +1,5 @@ CLASS net/minecraft/class_1530 net/minecraft/entity/decoration/AbstractDecorationEntity + FIELD field_39455 LOGGER Lorg/slf4j/Logger; FIELD field_7097 obstructionCheckCounter I FIELD field_7098 PREDICATE Ljava/util/function/Predicate; FIELD field_7099 facing Lnet/minecraft/class_2350; diff --git a/mappings/net/minecraft/entity/decoration/Brightness.mapping b/mappings/net/minecraft/entity/decoration/Brightness.mapping new file mode 100644 index 0000000000..56d83049c8 --- /dev/null +++ b/mappings/net/minecraft/entity/decoration/Brightness.mapping @@ -0,0 +1,9 @@ +CLASS net/minecraft/class_8104 net/minecraft/entity/decoration/Brightness + FIELD field_42262 LIGHT_LEVEL_CODEC Lcom/mojang/serialization/Codec; + FIELD field_42263 CODEC Lcom/mojang/serialization/Codec; + FIELD field_42264 FULL Lnet/minecraft/class_8104; + METHOD method_48763 pack ()I + METHOD method_48764 unpack (I)Lnet/minecraft/class_8104; + ARG 0 packed + METHOD method_48765 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 0 instance diff --git a/mappings/net/minecraft/entity/decoration/DisplayEntity.mapping b/mappings/net/minecraft/entity/decoration/DisplayEntity.mapping new file mode 100644 index 0000000000..3fb731ec65 --- /dev/null +++ b/mappings/net/minecraft/entity/decoration/DisplayEntity.mapping @@ -0,0 +1,251 @@ +CLASS net/minecraft/class_8113 net/minecraft/entity/decoration/DisplayEntity + FIELD field_42367 RIGHT_ROTATION Lnet/minecraft/class_2940; + FIELD field_42368 BILLBOARD Lnet/minecraft/class_2940; + FIELD field_42369 BRIGHTNESS Lnet/minecraft/class_2940; + FIELD field_42370 VIEW_RANGE Lnet/minecraft/class_2940; + FIELD field_42371 SHADOW_RADIUS Lnet/minecraft/class_2940; + FIELD field_42372 SHADOW_STRENGTH Lnet/minecraft/class_2940; + FIELD field_42373 WIDTH Lnet/minecraft/class_2940; + FIELD field_42374 HEIGHT Lnet/minecraft/class_2940; + FIELD field_42375 GLOW_COLOR_OVERRIDE Lnet/minecraft/class_2940; + FIELD field_42383 visibilityBoundingBox Lnet/minecraft/class_238; + FIELD field_42387 TRANSFORMATION_NBT_KEY Ljava/lang/String; + FIELD field_42388 BILLBOARD_NBT_KEY Ljava/lang/String; + FIELD field_42389 BRIGHTNESS_NBT_KEY Ljava/lang/String; + FIELD field_42390 VIEW_RANGE_NBT_KEY Ljava/lang/String; + FIELD field_42391 SHADOW_RADIUS_NBT_KEY Ljava/lang/String; + FIELD field_42392 SHADOW_STRENGTH_NBT_KEY Ljava/lang/String; + FIELD field_42393 WIDTH_NBT_KEY Ljava/lang/String; + FIELD field_42394 HEIGHT_NBT_KEY Ljava/lang/String; + FIELD field_42395 GLOW_COLOR_OVERRIDE_NBT_KEY Ljava/lang/String; + FIELD field_42397 LOGGER Lorg/slf4j/Logger; + FIELD field_42401 TRANSLATION Lnet/minecraft/class_2940; + FIELD field_42402 SCALE Lnet/minecraft/class_2940; + FIELD field_42403 LEFT_ROTATION Lnet/minecraft/class_2940; + FIELD field_42620 interpolationStart J + FIELD field_43135 lerpProgress F + FIELD field_43180 RENDERING_DATA_IDS Lit/unimi/dsi/fastutil/ints/IntSet; + FIELD field_43181 interpolationDuration I + FIELD field_43182 startInterpolationSet Z + FIELD field_43183 interpolationDurationSet Z + FIELD field_43184 renderState Lnet/minecraft/class_8113$class_8229; + FIELD field_43185 renderingDataSet Z + FIELD field_45108 interpolationTarget Lnet/minecraft/class_8113$class_8639; + FIELD field_45109 TELEPORT_DURATION_KEY Ljava/lang/String; + FIELD field_45110 INTERPOLATION_DURATION_KEY Ljava/lang/String; + FIELD field_45111 START_INTERPOLATION_KEY Ljava/lang/String; + FIELD field_45112 START_INTERPOLATION Lnet/minecraft/class_2940; + FIELD field_45113 INTERPOLATION_DURATION Lnet/minecraft/class_2940; + FIELD field_45114 TELEPORT_DURATION Lnet/minecraft/class_2940; + METHOD method_48844 getLerpProgress (F)F + ARG 1 delta + METHOD method_48845 getTransformation (Lnet/minecraft/class_2945;)Lnet/minecraft/class_4590; + ARG 0 dataTracker + METHOD method_48846 setBrightness (Lnet/minecraft/class_8104;)V + ARG 1 brightness + METHOD method_48847 setBillboardMode (Lnet/minecraft/class_8113$class_8114;)V + ARG 1 billboardMode + METHOD method_48848 (Lcom/mojang/datafixers/util/Pair;)V + ARG 1 pair + METHOD method_48849 setTransformation (Lnet/minecraft/class_4590;)V + ARG 1 transformation + METHOD method_48851 (Lnet/minecraft/class_2487;Lnet/minecraft/class_2520;)V + ARG 1 brightness + METHOD method_48855 (Lcom/mojang/datafixers/util/Pair;)V + ARG 1 pair + METHOD method_48856 (Lnet/minecraft/class_2487;Lnet/minecraft/class_2520;)V + ARG 1 billboard + METHOD method_48858 setGlowColorOverride (I)V + ARG 1 glowColorOverride + METHOD method_48859 (Lcom/mojang/datafixers/util/Pair;)V + ARG 1 pair + METHOD method_48860 (Lnet/minecraft/class_2487;Lnet/minecraft/class_2520;)V + ARG 1 transformations + METHOD method_48861 setViewRange (F)V + ARG 1 viewRange + METHOD method_48862 setShadowRadius (F)V + ARG 1 shadowRadius + METHOD method_48864 getBillboardMode ()Lnet/minecraft/class_8113$class_8114; + METHOD method_48865 getBrightness ()I + METHOD method_48868 getBrightnessUnpacked ()Lnet/minecraft/class_8104; + METHOD method_48869 getViewRange ()F + METHOD method_48870 getShadowRadius ()F + METHOD method_48871 getShadowStrength ()F + METHOD method_48872 setShadowStrength (F)V + ARG 1 shadowStrength + METHOD method_48873 setDisplayWidth (F)V + ARG 1 width + METHOD method_48874 getDisplayWidth ()F + METHOD method_48875 setDisplayHeight (F)V + ARG 1 height + METHOD method_48876 getGlowColorOverride ()I + METHOD method_48877 getDisplayHeight ()F + METHOD method_48878 updateVisibilityBoundingBox ()V + METHOD method_49774 copyRenderState ()Lnet/minecraft/class_8113$class_8229; + METHOD method_49775 getLerpedRenderState (Lnet/minecraft/class_8113$class_8229;F)Lnet/minecraft/class_8113$class_8229; + ARG 1 state + ARG 2 lerpProgress + METHOD method_49776 refreshData (ZF)V + ARG 1 shouldLerp + ARG 2 lerpProgress + METHOD method_49777 getRenderState ()Lnet/minecraft/class_8113$class_8229; + METHOD method_52524 setInterpolationDuration (I)V + ARG 1 interpolationDuration + METHOD method_52525 setStartInterpolation (I)V + ARG 1 startInterpolation + METHOD method_52526 setTeleportDuration (I)V + ARG 1 teleportDuration + METHOD method_52527 getInterpolationDuration ()I + METHOD method_52528 getStartInterpolation ()I + METHOD method_52529 getTeleportDuration ()I + CLASS class_8114 BillboardMode + FIELD field_42410 CODEC Lcom/mojang/serialization/Codec; + FIELD field_42411 FROM_INDEX Ljava/util/function/IntFunction; + FIELD field_42412 index B + FIELD field_42413 name Ljava/lang/String; + METHOD (Ljava/lang/String;IBLjava/lang/String;)V + ARG 3 index + ARG 4 name + METHOD method_48881 getIndex ()B + CLASS class_8115 BlockDisplayEntity + FIELD field_42415 BLOCK_STATE_NBT_KEY Ljava/lang/String; + FIELD field_42416 BLOCK_STATE Lnet/minecraft/class_2940; + FIELD field_43186 data Lnet/minecraft/class_8113$class_8115$class_8225; + METHOD method_48883 setBlockState (Lnet/minecraft/class_2680;)V + ARG 1 state + METHOD method_48884 getBlockState ()Lnet/minecraft/class_2680; + METHOD method_49778 getData ()Lnet/minecraft/class_8113$class_8115$class_8225; + CLASS class_8225 Data + CLASS class_8116 ArgbLerper + CLASS class_8117 FloatLerper + METHOD constant (F)Lnet/minecraft/class_8113$class_8117; + ARG 0 value + METHOD method_48886 lerp (F)F + ARG 1 delta + METHOD method_49779 (FF)F + ARG 1 delta + CLASS class_8118 AbstractInterpolator + METHOD constant (Ljava/lang/Object;)Lnet/minecraft/class_8113$class_8118; + ARG 0 value + METHOD method_48888 interpolate (F)Ljava/lang/Object; + ARG 1 delta + METHOD method_49780 (Ljava/lang/Object;F)Ljava/lang/Object; + ARG 1 delta + CLASS class_8119 IntLerper + METHOD constant (I)Lnet/minecraft/class_8113$class_8119; + ARG 0 value + METHOD method_48889 lerp (F)I + ARG 1 delta + METHOD method_49781 (IF)I + ARG 1 delta + CLASS class_8122 ItemDisplayEntity + FIELD field_42421 ITEM_NBT_KEY Ljava/lang/String; + FIELD field_42422 ITEM_DISPLAY_NBT_KEY Ljava/lang/String; + FIELD field_42423 ITEM Lnet/minecraft/class_2940; + FIELD field_42424 ITEM_DISPLAY Lnet/minecraft/class_2940; + FIELD field_42425 stackReference Lnet/minecraft/class_5630; + FIELD field_43187 data Lnet/minecraft/class_8113$class_8122$class_8226; + METHOD method_48896 setTransformationMode (Lnet/minecraft/class_811;)V + ARG 1 transformationMode + METHOD method_48897 setItemStack (Lnet/minecraft/class_1799;)V + ARG 1 stack + METHOD method_48898 (Lcom/mojang/datafixers/util/Pair;)V + ARG 1 mode + METHOD method_48899 (Lnet/minecraft/class_2487;Lnet/minecraft/class_2520;)V + ARG 1 nbtx + METHOD method_48900 getItemStack ()Lnet/minecraft/class_1799; + METHOD method_48901 getTransformationMode ()Lnet/minecraft/class_811; + METHOD method_49782 getData ()Lnet/minecraft/class_8113$class_8122$class_8226; + CLASS class_8226 Data + CLASS class_8123 TextDisplayEntity + FIELD field_42427 LINE_WIDTH_NBT_KEY Ljava/lang/String; + FIELD field_42428 TEXT_OPACITY_NBT_KEY Ljava/lang/String; + FIELD field_42429 BACKGROUND_NBT_KEY Ljava/lang/String; + FIELD field_42430 SHADOW_NBT_KEY Ljava/lang/String; + FIELD field_42431 SEE_THROUGH_NBT_KEY Ljava/lang/String; + FIELD field_42432 DEFAULT_BACKGROUND_NBT_KEY Ljava/lang/String; + FIELD field_42433 ALIGNMENT_NBT_KEY Ljava/lang/String; + FIELD field_42434 INITIAL_TEXT_OPACITY B + FIELD field_42435 TEXT Lnet/minecraft/class_2940; + FIELD field_42436 LINE_WIDTH Lnet/minecraft/class_2940; + FIELD field_42437 BACKGROUND Lnet/minecraft/class_2940; + FIELD field_42438 TEXT_OPACITY Lnet/minecraft/class_2940; + FIELD field_42439 TEXT_DISPLAY_FLAGS Lnet/minecraft/class_2940; + FIELD field_42442 textLines Lnet/minecraft/class_8113$class_8123$class_8125; + FIELD field_42443 TEXT_NBT_KEY Ljava/lang/String; + FIELD field_42444 SHADOW_FLAG B + FIELD field_42445 SEE_THROUGH_FLAG B + FIELD field_42446 DEFAULT_BACKGROUND_FLAG B + FIELD field_42447 LEFT_ALIGNMENT_FLAG B + FIELD field_42448 RIGHT_ALIGNMENT_FLAG B + FIELD field_42449 INITIAL_BACKGROUND I + FIELD field_43188 TEXT_RENDERING_DATA_IDS Lit/unimi/dsi/fastutil/ints/IntSet; + FIELD field_43189 data Lnet/minecraft/class_8113$class_8123$class_8230; + METHOD method_48902 getAlignment (B)Lnet/minecraft/class_8113$class_8123$class_8124; + ARG 0 flags + METHOD method_48903 readFlag (BLnet/minecraft/class_2487;Ljava/lang/String;B)B + ARG 0 flags + ARG 1 nbt + ARG 2 nbtKey + ARG 3 flag + METHOD method_48905 splitLines (Lnet/minecraft/class_8113$class_8123$class_8127;)Lnet/minecraft/class_8113$class_8123$class_8125; + ARG 1 splitter + METHOD method_48907 writeFlag (BLnet/minecraft/class_2487;Ljava/lang/String;B)V + ARG 0 flags + ARG 1 nbt + ARG 2 nbtKey + ARG 3 flag + METHOD method_48908 setLineWidth (I)V + ARG 1 lineWidth + METHOD method_48909 setTextOpacity (B)V + ARG 1 textOpacity + METHOD method_48910 setBackground (I)V + ARG 1 background + METHOD method_48911 setText (Lnet/minecraft/class_2561;)V + ARG 1 text + METHOD method_48912 setDisplayFlags (B)V + ARG 1 flags + METHOD method_48915 getText ()Lnet/minecraft/class_2561; + METHOD method_48916 getLineWidth ()I + METHOD method_48917 getDisplayFlags ()B + METHOD method_48918 getTextOpacity ()B + METHOD method_48919 getBackground ()I + METHOD method_49783 getLerpedRenderState (Lnet/minecraft/class_8113$class_8123$class_8230;F)Lnet/minecraft/class_8113$class_8123$class_8230; + ARG 1 data + ARG 2 lerpProgress + METHOD method_49784 getData ()Lnet/minecraft/class_8113$class_8123$class_8230; + METHOD method_49785 copyData ()Lnet/minecraft/class_8113$class_8123$class_8230; + CLASS class_8124 TextAlignment + FIELD field_42453 CODEC Lcom/mojang/serialization/Codec; + FIELD field_42454 name Ljava/lang/String; + METHOD (Ljava/lang/String;ILjava/lang/String;)V + ARG 3 name + CLASS class_8125 TextLines + CLASS class_8126 TextLine + CLASS class_8127 LineSplitter + METHOD split (Lnet/minecraft/class_2561;I)Lnet/minecraft/class_8113$class_8123$class_8125; + ARG 1 text + ARG 2 lineWidth + CLASS class_8230 Data + CLASS class_8227 FloatLerperImpl + CLASS class_8228 IntLerperImpl + CLASS class_8229 RenderState + CLASS class_8231 AffineTransformationInterpolator + CLASS class_8639 InterpolationTarget + FIELD field_45115 step I + FIELD field_45116 x D + FIELD field_45117 y D + FIELD field_45118 z D + FIELD field_45119 yaw D + FIELD field_45120 pitch D + METHOD (IDDDDD)V + ARG 1 step + ARG 2 x + ARG 4 y + ARG 6 z + ARG 8 yaw + ARG 10 pitch + METHOD method_52530 apply (Lnet/minecraft/class_1297;)V + ARG 1 entity + METHOD method_52531 applyInterpolated (Lnet/minecraft/class_1297;)V + ARG 1 entity diff --git a/mappings/net/minecraft/entity/decoration/InteractionEntity.mapping b/mappings/net/minecraft/entity/decoration/InteractionEntity.mapping new file mode 100644 index 0000000000..b3205e85be --- /dev/null +++ b/mappings/net/minecraft/entity/decoration/InteractionEntity.mapping @@ -0,0 +1,29 @@ +CLASS net/minecraft/class_8150 net/minecraft/entity/decoration/InteractionEntity + FIELD field_42625 WIDTH Lnet/minecraft/class_2940; + FIELD field_42626 HEIGHT Lnet/minecraft/class_2940; + FIELD field_42627 RESPONSE Lnet/minecraft/class_2940; + FIELD field_42628 WIDTH_KEY Ljava/lang/String; + FIELD field_42629 HEIGHT_KEY Ljava/lang/String; + FIELD field_42630 ATTACK_KEY Ljava/lang/String; + FIELD field_42631 INTERACTION_KEY Ljava/lang/String; + FIELD field_42632 RESPONSE_KEY Ljava/lang/String; + FIELD field_42633 attack Lnet/minecraft/class_8150$class_8151; + FIELD field_42634 interaction Lnet/minecraft/class_8150$class_8151; + METHOD method_49109 setInteractionWidth (F)V + ARG 1 width + METHOD method_49110 (Lcom/mojang/datafixers/util/Pair;)V + ARG 1 pair + METHOD method_49112 setResponse (Z)V + ARG 1 response + METHOD method_49113 setInteractionHeight (F)V + ARG 1 height + METHOD method_49114 (Lcom/mojang/datafixers/util/Pair;)V + ARG 1 pair + METHOD method_49116 getInteractionWidth ()F + METHOD method_49117 getInteractionHeight ()F + METHOD method_49118 shouldRespond ()Z + METHOD method_49119 getDimensions ()Lnet/minecraft/class_4048; + CLASS class_8151 Interaction + FIELD field_42635 CODEC Lcom/mojang/serialization/Codec; + METHOD method_49120 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 0 instance diff --git a/mappings/net/minecraft/entity/decoration/painting/PaintingEntity.mapping b/mappings/net/minecraft/entity/decoration/painting/PaintingEntity.mapping index 2a005ef181..40bafccd6b 100644 --- a/mappings/net/minecraft/entity/decoration/painting/PaintingEntity.mapping +++ b/mappings/net/minecraft/entity/decoration/painting/PaintingEntity.mapping @@ -1,6 +1,7 @@ CLASS net/minecraft/class_1534 net/minecraft/entity/decoration/painting/PaintingEntity FIELD field_38941 VARIANT Lnet/minecraft/class_2940; FIELD field_38942 DEFAULT_VARIANT Lnet/minecraft/class_5321; + FIELD field_42463 VARIANT_NBT_KEY Ljava/lang/String; METHOD (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;)V ARG 1 world ARG 2 pos @@ -21,5 +22,11 @@ CLASS net/minecraft/class_1534 net/minecraft/entity/decoration/painting/Painting ARG 1 variant METHOD method_43403 getSize (Lnet/minecraft/class_6880;)I ARG 0 variant - METHOD method_43404 getVariant ()Lnet/minecraft/class_6880; METHOD method_43405 getDefaultVariant ()Lnet/minecraft/class_6880; + METHOD method_48927 (Lnet/minecraft/class_2960;)Lnet/minecraft/class_5321; + ARG 0 id + METHOD method_48928 writeVariantToNbt (Lnet/minecraft/class_2487;Lnet/minecraft/class_6880;)V + ARG 0 nbt + ARG 1 variant + METHOD method_48929 readVariantFromNbt (Lnet/minecraft/class_2487;)Ljava/util/Optional; + ARG 0 nbt diff --git a/mappings/net/minecraft/entity/effect/BadOmenStatusEffect.mapping b/mappings/net/minecraft/entity/effect/BadOmenStatusEffect.mapping new file mode 100644 index 0000000000..71101ae8a0 --- /dev/null +++ b/mappings/net/minecraft/entity/effect/BadOmenStatusEffect.mapping @@ -0,0 +1 @@ +CLASS net/minecraft/class_8631 net/minecraft/entity/effect/BadOmenStatusEffect diff --git a/mappings/net/minecraft/entity/effect/DamageModifierStatusEffect.mapping b/mappings/net/minecraft/entity/effect/DamageModifierStatusEffect.mapping deleted file mode 100644 index b7b2360a8b..0000000000 --- a/mappings/net/minecraft/entity/effect/DamageModifierStatusEffect.mapping +++ /dev/null @@ -1,6 +0,0 @@ -CLASS net/minecraft/class_1287 net/minecraft/entity/effect/DamageModifierStatusEffect - FIELD field_5881 modifier D - METHOD (Lnet/minecraft/class_4081;ID)V - ARG 1 category - ARG 2 color - ARG 3 modifier diff --git a/mappings/net/minecraft/entity/effect/HealthBoostStatusEffect.mapping b/mappings/net/minecraft/entity/effect/HealthBoostStatusEffect.mapping deleted file mode 100644 index da54ec4f50..0000000000 --- a/mappings/net/minecraft/entity/effect/HealthBoostStatusEffect.mapping +++ /dev/null @@ -1 +0,0 @@ -CLASS net/minecraft/class_1290 net/minecraft/entity/effect/HealthBoostStatusEffect diff --git a/mappings/net/minecraft/entity/effect/HungerStatusEffect.mapping b/mappings/net/minecraft/entity/effect/HungerStatusEffect.mapping new file mode 100644 index 0000000000..6077f0368d --- /dev/null +++ b/mappings/net/minecraft/entity/effect/HungerStatusEffect.mapping @@ -0,0 +1 @@ +CLASS net/minecraft/class_8633 net/minecraft/entity/effect/HungerStatusEffect diff --git a/mappings/net/minecraft/entity/effect/InstantHealthOrDamageStatusEffect.mapping b/mappings/net/minecraft/entity/effect/InstantHealthOrDamageStatusEffect.mapping new file mode 100644 index 0000000000..48355b639b --- /dev/null +++ b/mappings/net/minecraft/entity/effect/InstantHealthOrDamageStatusEffect.mapping @@ -0,0 +1,6 @@ +CLASS net/minecraft/class_8632 net/minecraft/entity/effect/InstantHealthOrDamageStatusEffect + FIELD field_45103 damage Z + METHOD (Lnet/minecraft/class_4081;IZ)V + ARG 1 category + ARG 2 color + ARG 3 damage diff --git a/mappings/net/minecraft/entity/effect/PoisonStatusEffect.mapping b/mappings/net/minecraft/entity/effect/PoisonStatusEffect.mapping new file mode 100644 index 0000000000..3f82e3f2a7 --- /dev/null +++ b/mappings/net/minecraft/entity/effect/PoisonStatusEffect.mapping @@ -0,0 +1 @@ +CLASS net/minecraft/class_8635 net/minecraft/entity/effect/PoisonStatusEffect diff --git a/mappings/net/minecraft/entity/effect/RegenerationStatusEffect.mapping b/mappings/net/minecraft/entity/effect/RegenerationStatusEffect.mapping new file mode 100644 index 0000000000..adfb00f704 --- /dev/null +++ b/mappings/net/minecraft/entity/effect/RegenerationStatusEffect.mapping @@ -0,0 +1 @@ +CLASS net/minecraft/class_8636 net/minecraft/entity/effect/RegenerationStatusEffect diff --git a/mappings/net/minecraft/entity/effect/SaturationStatusEffect.mapping b/mappings/net/minecraft/entity/effect/SaturationStatusEffect.mapping new file mode 100644 index 0000000000..fa0625df19 --- /dev/null +++ b/mappings/net/minecraft/entity/effect/SaturationStatusEffect.mapping @@ -0,0 +1 @@ +CLASS net/minecraft/class_8637 net/minecraft/entity/effect/SaturationStatusEffect diff --git a/mappings/net/minecraft/entity/effect/StatusEffect.mapping b/mappings/net/minecraft/entity/effect/StatusEffect.mapping index d5dbd74330..27668e3c6a 100644 --- a/mappings/net/minecraft/entity/effect/StatusEffect.mapping +++ b/mappings/net/minecraft/entity/effect/StatusEffect.mapping @@ -1,34 +1,33 @@ CLASS net/minecraft/class_1291 net/minecraft/entity/effect/StatusEffect FIELD field_18270 category Lnet/minecraft/class_4081; FIELD field_38083 factorCalculationDataSupplier Ljava/util/function/Supplier; + FIELD field_45729 registryEntry Lnet/minecraft/class_6880$class_6883; FIELD field_5883 translationKey Ljava/lang/String; FIELD field_5885 attributeModifiers Ljava/util/Map; FIELD field_5886 color I METHOD (Lnet/minecraft/class_4081;I)V + ARG 1 category ARG 2 color METHOD method_18792 getCategory ()Lnet/minecraft/class_4081; METHOD method_42126 setFactorCalculationDataSupplier (Ljava/util/function/Supplier;)Lnet/minecraft/class_1291; + ARG 1 factorCalculationDataSupplier METHOD method_42127 getFactorCalculationDataSupplier ()Ljava/util/Optional; + METHOD method_52520 onApplied (Lnet/minecraft/class_1309;I)V + ARG 1 entity + ARG 2 amplifier + METHOD method_53123 getRegistryEntry ()Lnet/minecraft/class_6880$class_6883; METHOD method_5552 canApplyUpdateEffect (II)Z ARG 1 duration ARG 2 amplifier - METHOD method_5554 getRawId (Lnet/minecraft/class_1291;)I - ARG 0 type - METHOD method_5555 onApplied (Lnet/minecraft/class_1309;Lnet/minecraft/class_5131;I)V - ARG 1 entity - ARG 2 attributes - ARG 3 amplifier + METHOD method_5555 onApplied (Lnet/minecraft/class_5131;I)V + ARG 1 attributeContainer + ARG 2 amplifier METHOD method_5556 getColor ()I METHOD method_5559 loadTranslationKey ()Ljava/lang/String; METHOD method_5560 getName ()Lnet/minecraft/class_2561; METHOD method_5561 isInstant ()Z - METHOD method_5562 onRemoved (Lnet/minecraft/class_1309;Lnet/minecraft/class_5131;I)V - ARG 1 entity - ARG 2 attributes - ARG 3 amplifier - METHOD method_5563 adjustModifierAmount (ILnet/minecraft/class_1322;)D - ARG 1 amplifier - ARG 2 modifier + METHOD method_5562 onRemoved (Lnet/minecraft/class_5131;)V + ARG 1 attributeContainer METHOD method_5564 applyInstantEffect (Lnet/minecraft/class_1297;Lnet/minecraft/class_1297;Lnet/minecraft/class_1309;ID)V ARG 1 source ARG 2 attacker @@ -42,9 +41,15 @@ CLASS net/minecraft/class_1291 net/minecraft/entity/effect/StatusEffect ARG 3 amount ARG 5 operation METHOD method_5567 getTranslationKey ()Ljava/lang/String; - METHOD method_5569 byRawId (I)Lnet/minecraft/class_1291; - ARG 0 rawId METHOD method_5572 applyUpdateEffect (Lnet/minecraft/class_1309;I)V ARG 1 entity ARG 2 amplifier METHOD method_5573 isBeneficial ()Z + CLASS class_8634 EffectAttributeModifierCreator + FIELD field_45105 uuid Ljava/util/UUID; + FIELD field_45106 baseValue D + FIELD field_45107 operation Lnet/minecraft/class_1322$class_1323; + METHOD (Lnet/minecraft/class_1291;Ljava/util/UUID;DLnet/minecraft/class_1322$class_1323;)V + ARG 2 uuid + ARG 3 baseValue + ARG 5 operation diff --git a/mappings/net/minecraft/entity/effect/StatusEffectInstance.mapping b/mappings/net/minecraft/entity/effect/StatusEffectInstance.mapping index 1404a75ddc..a6b1f7a584 100644 --- a/mappings/net/minecraft/entity/effect/StatusEffectInstance.mapping +++ b/mappings/net/minecraft/entity/effect/StatusEffectInstance.mapping @@ -6,9 +6,17 @@ CLASS net/minecraft/class_1293 net/minecraft/entity/effect/StatusEffectInstance COMMENT

This exists so that long-duration low-amplifier effects reappears COMMENT after short-duration high-amplifier effects run out. FIELD field_38084 factorCalculationData Ljava/util/Optional; + FIELD field_42106 INFINITE I + FIELD field_45730 ID_NBT_KEY Ljava/lang/String; + FIELD field_45731 AMBIENT_NBT_KEY Ljava/lang/String; + FIELD field_45732 HIDDEN_EFFECT_NBT_KEY Ljava/lang/String; + FIELD field_45733 AMPLIFIER_NBT_KEY Ljava/lang/String; + FIELD field_45734 DURATION_NBT_KEY Ljava/lang/String; + FIELD field_45735 SHOW_PARTICLES_NBT_KEY Ljava/lang/String; + FIELD field_45736 SHOW_ICON_NBT_KEY Ljava/lang/String; + FIELD field_45737 FACTOR_CALCULATION_DATA_NBT_KEY Ljava/lang/String; FIELD field_5889 showIcon Z FIELD field_5890 showParticles Z - FIELD field_5891 permanent Z FIELD field_5892 ambient Z FIELD field_5893 amplifier I FIELD field_5895 duration I @@ -59,18 +67,27 @@ CLASS net/minecraft/class_1293 net/minecraft/entity/effect/StatusEffectInstance METHOD method_24277 writeTypelessNbt (Lnet/minecraft/class_2487;)V ARG 1 nbt METHOD method_42129 getFactorCalculationData ()Ljava/util/Optional; - METHOD method_42130 (ILnet/minecraft/class_1293$class_7247;)V - ARG 2 factorCalculationData METHOD method_42131 (Lnet/minecraft/class_1293$class_7247;)V ARG 1 factorCalculationData METHOD method_42132 (Lnet/minecraft/class_2487;Lnet/minecraft/class_1293$class_7247;)V ARG 1 factorCalculationData METHOD method_42133 (Lnet/minecraft/class_2487;Lnet/minecraft/class_2520;)V ARG 1 factorCalculationDataNbt + METHOD method_48557 isDurationBelow (I)Z + ARG 1 duration + METHOD method_48558 mapDuration (Lit/unimi/dsi/fastutil/ints/Int2IntFunction;)I + ARG 1 mapper + METHOD method_48559 isInfinite ()Z + METHOD method_48560 (I)I + ARG 0 duration + METHOD method_48561 lastsShorterThan (Lnet/minecraft/class_1293;)Z + ARG 1 effect + METHOD method_48562 isActive ()Z + METHOD method_48563 getDurationString ()Ljava/lang/String; + METHOD method_52523 onApplied (Lnet/minecraft/class_1309;)V + ARG 1 entity 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 writeNbt (Lnet/minecraft/class_2487;)Lnet/minecraft/class_2487; ARG 1 nbt @@ -82,22 +99,19 @@ CLASS net/minecraft/class_1293 net/minecraft/entity/effect/StatusEffectInstance ARG 2 overwriteCallback METHOD method_5586 getTranslationKey ()Ljava/lang/String; METHOD method_5588 updateDuration ()I - METHOD method_5589 applyUpdateEffect (Lnet/minecraft/class_1309;)V - ARG 1 entity METHOD method_5590 upgrade (Lnet/minecraft/class_1293;)Z ARG 1 that METHOD method_5591 isAmbient ()Z METHOD method_5592 shouldShowIcon ()Z - METHOD method_5593 isPermanent ()Z CLASS class_7247 FactorCalculationData FIELD field_38085 CODEC Lcom/mojang/serialization/Codec; FIELD field_38086 paddingDuration I FIELD field_38087 factorTarget F FIELD field_38088 factorCurrent F - FIELD field_38089 effectChangedTimestamp I FIELD field_38090 factorPreviousFrame F FIELD field_38091 hadEffectLastTick Z FIELD field_39111 factorStart F + FIELD field_42107 effectChangedTimestamp I METHOD (I)V ARG 1 paddingDuration METHOD (IFFFIFZ)V @@ -114,7 +128,7 @@ CLASS net/minecraft/class_1293 net/minecraft/entity/effect/StatusEffectInstance METHOD method_42135 (Lnet/minecraft/class_1293$class_7247;)Ljava/lang/Boolean; ARG 0 data METHOD method_42136 update (Lnet/minecraft/class_1293;)V - ARG 1 instance + ARG 1 effect METHOD method_42137 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; ARG 0 instance METHOD method_42138 (Lnet/minecraft/class_1293$class_7247;)Ljava/lang/Float; diff --git a/mappings/net/minecraft/entity/effect/StatusEffectUtil.mapping b/mappings/net/minecraft/entity/effect/StatusEffectUtil.mapping index c9defa8b5b..5180b60e8a 100644 --- a/mappings/net/minecraft/entity/effect/StatusEffectUtil.mapping +++ b/mappings/net/minecraft/entity/effect/StatusEffectUtil.mapping @@ -16,6 +16,6 @@ CLASS net/minecraft/class_1292 net/minecraft/entity/effect/StatusEffectUtil ARG 0 entity METHOD method_5576 hasHaste (Lnet/minecraft/class_1309;)Z ARG 0 entity - METHOD method_5577 durationToString (Lnet/minecraft/class_1293;F)Ljava/lang/String; + METHOD method_5577 getDurationText (Lnet/minecraft/class_1293;F)Lnet/minecraft/class_2561; ARG 0 effect ARG 1 multiplier diff --git a/mappings/net/minecraft/entity/effect/StatusEffects.mapping b/mappings/net/minecraft/entity/effect/StatusEffects.mapping index a2fc3db72f..0887324744 100644 --- a/mappings/net/minecraft/entity/effect/StatusEffects.mapping +++ b/mappings/net/minecraft/entity/effect/StatusEffects.mapping @@ -1,6 +1,5 @@ CLASS net/minecraft/class_1294 net/minecraft/entity/effect/StatusEffects FIELD field_38093 DARKNESS_PADDING_DURATION I - METHOD method_5594 register (ILjava/lang/String;Lnet/minecraft/class_1291;)Lnet/minecraft/class_1291; - ARG 0 rawId - ARG 1 id - ARG 2 entry + METHOD method_5594 register (Ljava/lang/String;Lnet/minecraft/class_1291;)Lnet/minecraft/class_1291; + ARG 0 id + ARG 1 statusEffect diff --git a/mappings/net/minecraft/entity/effect/WitherStatusEffect.mapping b/mappings/net/minecraft/entity/effect/WitherStatusEffect.mapping new file mode 100644 index 0000000000..cc821e34e1 --- /dev/null +++ b/mappings/net/minecraft/entity/effect/WitherStatusEffect.mapping @@ -0,0 +1 @@ +CLASS net/minecraft/class_8638 net/minecraft/entity/effect/WitherStatusEffect diff --git a/mappings/net/minecraft/entity/mob/AbstractPiglinEntity.mapping b/mappings/net/minecraft/entity/mob/AbstractPiglinEntity.mapping index 9440d67659..996f7759b8 100644 --- a/mappings/net/minecraft/entity/mob/AbstractPiglinEntity.mapping +++ b/mappings/net/minecraft/entity/mob/AbstractPiglinEntity.mapping @@ -2,6 +2,7 @@ CLASS net/minecraft/class_5418 net/minecraft/entity/mob/AbstractPiglinEntity FIELD field_25758 IMMUNE_TO_ZOMBIFICATION Lnet/minecraft/class_2940; FIELD field_25759 timeInOverworld I FIELD field_30547 TIME_TO_ZOMBIFY I + FIELD field_41030 EYE_HEIGHT F METHOD method_24694 zombify (Lnet/minecraft/class_3218;)V ARG 1 world METHOD method_24705 getActivity ()Lnet/minecraft/class_4837; diff --git a/mappings/net/minecraft/entity/mob/CreeperEntity.mapping b/mappings/net/minecraft/entity/mob/CreeperEntity.mapping index 2c228f39bb..91b4a3a1f6 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_20256 (Lnet/minecraft/class_1268;Lnet/minecraft/class_1657;)V - ARG 1 player + ARG 1 playerx METHOD method_26908 createCreeperAttributes ()Lnet/minecraft/class_5132$class_5133; METHOD method_7000 isIgnited ()Z METHOD method_7001 spawnEffectsCloud ()V diff --git a/mappings/net/minecraft/entity/mob/EndermanEntity.mapping b/mappings/net/minecraft/entity/mob/EndermanEntity.mapping index 8776e88006..6e82316b57 100644 --- a/mappings/net/minecraft/entity/mob/EndermanEntity.mapping +++ b/mappings/net/minecraft/entity/mob/EndermanEntity.mapping @@ -44,6 +44,7 @@ CLASS net/minecraft/class_1560 net/minecraft/entity/mob/EndermanEntity CLASS class_1562 TeleportTowardsPlayerGoal FIELD field_18127 staringPlayerPredicate Lnet/minecraft/class_4051; FIELD field_18876 validTargetPredicate Lnet/minecraft/class_4051; + FIELD field_40735 angerPredicate Ljava/util/function/Predicate; FIELD field_7259 targetPlayer Lnet/minecraft/class_1657; FIELD field_7260 enderman Lnet/minecraft/class_1560; FIELD field_7261 ticksSinceUnseenTeleport I diff --git a/mappings/net/minecraft/entity/mob/EvokerFangsEntity.mapping b/mappings/net/minecraft/entity/mob/EvokerFangsEntity.mapping index 31e7dc6c78..8d5d18cb63 100644 --- a/mappings/net/minecraft/entity/mob/EvokerFangsEntity.mapping +++ b/mappings/net/minecraft/entity/mob/EvokerFangsEntity.mapping @@ -13,7 +13,6 @@ CLASS net/minecraft/class_1669 net/minecraft/entity/mob/EvokerFangsEntity ARG 8 yaw ARG 9 warmup ARG 10 owner - METHOD method_7470 getOwner ()Lnet/minecraft/class_1309; METHOD method_7471 damage (Lnet/minecraft/class_1309;)V ARG 1 target METHOD method_7472 getAnimationProgress (F)F diff --git a/mappings/net/minecraft/entity/mob/GuardianEntity.mapping b/mappings/net/minecraft/entity/mob/GuardianEntity.mapping index e15be9e704..0ca792b57d 100644 --- a/mappings/net/minecraft/entity/mob/GuardianEntity.mapping +++ b/mappings/net/minecraft/entity/mob/GuardianEntity.mapping @@ -18,6 +18,7 @@ CLASS net/minecraft/class_1577 net/minecraft/entity/mob/GuardianEntity ARG 3 pos ARG 4 random METHOD method_26915 createGuardianAttributes ()Lnet/minecraft/class_5132$class_5133; + METHOD method_48161 getBeamTicks ()F METHOD method_7052 getBeamTarget ()Lnet/minecraft/class_1309; METHOD method_7053 getSpikesExtension (F)F ARG 1 tickDelta diff --git a/mappings/net/minecraft/entity/mob/HoglinBrain.mapping b/mappings/net/minecraft/entity/mob/HoglinBrain.mapping index 35b36aa624..a4187fed99 100644 --- a/mappings/net/minecraft/entity/mob/HoglinBrain.mapping +++ b/mappings/net/minecraft/entity/mob/HoglinBrain.mapping @@ -1,9 +1,12 @@ CLASS net/minecraft/class_4835 net/minecraft/entity/mob/HoglinBrain FIELD field_22369 AVOID_MEMORY_DURATION Lnet/minecraft/class_6019; FIELD field_25383 WALK_TOWARD_CLOSEST_ADULT_RANGE Lnet/minecraft/class_6019; + FIELD field_30538 ADULT_MELEE_ATTACK_COOLDOWN I + FIELD field_30539 BABY_MELEE_ATTACK_COOLDOWN I + FIELD field_30542 AVOID_TARGET_SPEED F METHOD method_24662 makeRandomWalkTask ()Lnet/minecraft/class_4118; METHOD method_24663 (Lnet/minecraft/class_1309;Lnet/minecraft/class_4760;)V - ARG 1 hoglin + ARG 1 hoglinx METHOD method_24664 refreshActivities (Lnet/minecraft/class_4760;)V ARG 0 hoglin METHOD method_24665 onAttacking (Lnet/minecraft/class_4760;Lnet/minecraft/class_1309;)V @@ -17,7 +20,7 @@ CLASS net/minecraft/class_4835 net/minecraft/entity/mob/HoglinBrain ARG 0 hoglin ARG 1 pos METHOD method_24670 (Lnet/minecraft/class_1309;Lnet/minecraft/class_4760;)V - ARG 1 hoglin + ARG 1 hoglinx METHOD method_24672 onAttacked (Lnet/minecraft/class_4760;Lnet/minecraft/class_1309;)V ARG 0 hoglin ARG 1 attacker diff --git a/mappings/net/minecraft/entity/mob/IllusionerEntity.mapping b/mappings/net/minecraft/entity/mob/IllusionerEntity.mapping index 20e8e60411..054d5430fb 100644 --- a/mappings/net/minecraft/entity/mob/IllusionerEntity.mapping +++ b/mappings/net/minecraft/entity/mob/IllusionerEntity.mapping @@ -1,5 +1,9 @@ CLASS net/minecraft/class_1581 net/minecraft/entity/mob/IllusionerEntity + FIELD field_7296 mirrorSpellTimer I + FIELD field_7297 mirrorCopyOffsets [[Lnet/minecraft/class_243; METHOD method_26916 createIllusionerAttributes ()Lnet/minecraft/class_5132$class_5133; + METHOD method_7065 getMirrorCopyOffsets (F)[Lnet/minecraft/class_243; + ARG 1 tickDelta CLASS class_1582 BlindTargetGoal FIELD field_7298 targetId I CLASS class_1583 GiveInvisibilityGoal diff --git a/mappings/net/minecraft/entity/mob/MobEntity.mapping b/mappings/net/minecraft/entity/mob/MobEntity.mapping index 1e4f9cf377..fef7d7c0eb 100644 --- a/mappings/net/minecraft/entity/mob/MobEntity.mapping +++ b/mappings/net/minecraft/entity/mob/MobEntity.mapping @@ -28,6 +28,7 @@ CLASS net/minecraft/class_1308 net/minecraft/entity/mob/MobEntity COMMENT @see MobEntity#initEquipment FIELD field_34043 DEFAULT_DROP_CHANCE F FIELD field_38386 ITEM_PICK_UP_RANGE_EXPANDER Lnet/minecraft/class_2382; + FIELD field_45969 ATTACK_RANGE D FIELD field_6184 lootTableSeed J FIELD field_6185 targetSelector Lnet/minecraft/class_1355; COMMENT Contains goals used to select this entity's target. @@ -96,8 +97,8 @@ CLASS net/minecraft/class_1308 net/minecraft/entity/mob/MobEntity ARG 3 playerStack METHOD method_24522 (Lnet/minecraft/class_1657;Lnet/minecraft/class_1308;)V ARG 2 entity - METHOD method_24523 tryEquip (Lnet/minecraft/class_1799;)Z - ARG 1 equipment + METHOD method_24523 tryEquip (Lnet/minecraft/class_1799;)Lnet/minecraft/class_1799; + ARG 1 stack METHOD method_24834 equipLootStack (Lnet/minecraft/class_1304;Lnet/minecraft/class_1799;)V ARG 1 slot ARG 2 stack @@ -124,10 +125,6 @@ CLASS net/minecraft/class_1308 net/minecraft/entity/mob/MobEntity COMMENT the entity type to convert to ARG 2 keepEquipment COMMENT whether the equipment of this entity should be kept - METHOD method_29244 canJumpToNextPathNode (Lnet/minecraft/class_7;)Z - COMMENT {@return if this entity can jump to the next node in path given the type of - COMMENT the node} - ARG 1 type METHOD method_29506 interactWithItem (Lnet/minecraft/class_1657;Lnet/minecraft/class_1268;)Lnet/minecraft/class_1269; ARG 1 player ARG 2 hand @@ -138,8 +135,6 @@ CLASS net/minecraft/class_1308 net/minecraft/entity/mob/MobEntity METHOD method_30759 enchantMainHandItem (Lnet/minecraft/class_5819;F)V ARG 1 random ARG 2 power - METHOD method_33191 squaredAttackRange (Lnet/minecraft/class_1309;)D - ARG 1 target METHOD method_35055 clearPositionTarget ()V METHOD method_35056 clearGoalsAndTasks ()V METHOD method_37341 (Lnet/minecraft/class_1799;)V @@ -147,13 +142,16 @@ CLASS net/minecraft/class_1308 net/minecraft/entity/mob/MobEntity METHOD method_42150 isInAttackRange (Lnet/minecraft/class_1309;)Z ARG 1 entity METHOD method_42646 getItemPickUpRangeExpander ()Lnet/minecraft/class_2382; - METHOD method_44330 getPotentialEscapePositions ()Ljava/lang/Iterable; - COMMENT {@return the list of positions that the entity should try to pathfind to when escaping} + METHOD method_47824 (Lnet/minecraft/class_1352;)Z + ARG 0 goal + METHOD method_47825 clearGoals (Ljava/util/function/Predicate;)V + ARG 1 predicate + METHOD method_51503 onFinishPathfinding ()V + METHOD method_51504 onStartPathfinding ()V + METHOD method_53511 getAttackBox ()Lnet/minecraft/class_238; + COMMENT Gets the area in which this mob can attack entities whose hitbox intersects it. COMMENT - COMMENT @implNote This is used when the current position's {@linkplain #getPathfindingPenalty - COMMENT pathfinding penalty} is negative (i.e. dangerous). Note that currently - COMMENT {@link net.minecraft.entity.ai.pathing.BirdPathNodeMaker} is the only node maker - COMMENT utilizing this method. + COMMENT @see LivingEntity#getHitbox METHOD method_5929 getDropChance (Lnet/minecraft/class_1304;)F ARG 1 slot METHOD method_5930 setForwardSpeed (F)V @@ -228,7 +226,6 @@ CLASS net/minecraft/class_1308 net/minecraft/entity/mob/MobEntity METHOD method_5965 createNavigation (Lnet/minecraft/class_1937;)Lnet/minecraft/class_1408; ARG 1 world METHOD method_5966 playAmbientSound ()V - METHOD method_5968 getTarget ()Lnet/minecraft/class_1309; METHOD method_5969 spawnsTooManyForEachTry (I)Z ARG 1 count METHOD method_5970 getMinAmbientSoundDelay ()I diff --git a/mappings/net/minecraft/entity/mob/PathAwareEntity.mapping b/mappings/net/minecraft/entity/mob/PathAwareEntity.mapping index cbc0e527e0..b3cfc40c64 100644 --- a/mappings/net/minecraft/entity/mob/PathAwareEntity.mapping +++ b/mappings/net/minecraft/entity/mob/PathAwareEntity.mapping @@ -1,6 +1,9 @@ CLASS net/minecraft/class_1314 net/minecraft/entity/mob/PathAwareEntity FIELD field_35670 DEFAULT_PATHFINDING_FAVOR F METHOD method_43689 shouldFollowLeash ()Z + METHOD method_52545 (Lnet/minecraft/class_4135;)Z + ARG 0 goal + METHOD method_52546 isPanicking ()Z METHOD method_6142 updateForLeashLength (F)V ARG 1 leashLength METHOD method_6144 getPathfindingFavor (Lnet/minecraft/class_2338;Lnet/minecraft/class_4538;)F diff --git a/mappings/net/minecraft/entity/mob/PhantomEntity.mapping b/mappings/net/minecraft/entity/mob/PhantomEntity.mapping index 9533e14019..3258235f63 100644 --- a/mappings/net/minecraft/entity/mob/PhantomEntity.mapping +++ b/mappings/net/minecraft/entity/mob/PhantomEntity.mapping @@ -1,8 +1,10 @@ CLASS net/minecraft/class_1593 net/minecraft/entity/mob/PhantomEntity + FIELD field_28641 WING_FLAP_TICKS I FIELD field_7312 circlingCenter Lnet/minecraft/class_2338; FIELD field_7313 SIZE Lnet/minecraft/class_2940; FIELD field_7314 targetPosition Lnet/minecraft/class_243; FIELD field_7315 movementType Lnet/minecraft/class_1593$class_1594; + METHOD method_33588 getWingFlapTickOffset ()I METHOD method_7084 getPhantomSize ()I METHOD method_7091 setPhantomSize (I)V ARG 1 size diff --git a/mappings/net/minecraft/entity/mob/PiglinBrain.mapping b/mappings/net/minecraft/entity/mob/PiglinBrain.mapping index 62c50c1c38..6191cef6fd 100644 --- a/mappings/net/minecraft/entity/mob/PiglinBrain.mapping +++ b/mappings/net/minecraft/entity/mob/PiglinBrain.mapping @@ -6,6 +6,10 @@ CLASS net/minecraft/class_4838 net/minecraft/entity/mob/PiglinBrain FIELD field_23826 BARTERING_ITEM Lnet/minecraft/class_1792; FIELD field_25384 GO_TO_ZOMBIFIED_MEMORY_DURATION Lnet/minecraft/class_6019; FIELD field_25698 GO_TO_NEMESIS_MEMORY_DURATION Lnet/minecraft/class_6019; + FIELD field_30560 START_RIDING_SPEED F + FIELD field_30574 AVOID_TARGET_EXPIRY I + FIELD field_30575 ADMIRING_DISABLED_EXPIRY I + FIELD field_30584 CROSSBOW_ATTACK_FORWARD_MOVEMENT F METHOD method_24714 hasBeenHitByPlayer (Lnet/minecraft/class_4836;)Z ARG 0 piglin METHOD method_24717 makeRandomFollowTask ()Lnet/minecraft/class_4118; @@ -15,7 +19,7 @@ CLASS net/minecraft/class_4838 net/minecraft/entity/mob/PiglinBrain METHOD method_24720 (Lnet/minecraft/class_1309;Lnet/minecraft/class_1309;)Z ARG 1 preferredTarget METHOD method_24721 (Lnet/minecraft/class_1309;Lnet/minecraft/class_5418;)V - ARG 1 piglin + ARG 1 piglinx METHOD method_24722 tickActivities (Lnet/minecraft/class_4836;)V ARG 0 piglin METHOD method_24723 canRide (Lnet/minecraft/class_4836;Lnet/minecraft/class_1297;)Z @@ -57,8 +61,8 @@ CLASS net/minecraft/class_4838 net/minecraft/entity/mob/PiglinBrain METHOD method_24736 setHuntedRecently (Lnet/minecraft/class_4836;Lnet/minecraft/class_5819;)V ARG 0 piglin ARG 1 random - METHOD method_24737 makeRememberRideableHoglinTask ()Lnet/minecraft/class_4821; - METHOD method_24738 makeGoToSoulFireTask ()Lnet/minecraft/class_4121; + METHOD method_24737 makeRememberRideableHoglinTask ()Lnet/minecraft/class_7893; + METHOD method_24738 makeGoToSoulFireTask ()Lnet/minecraft/class_7893; METHOD method_24739 isGoldHoldingPlayer (Lnet/minecraft/class_1309;)Z ARG 0 target METHOD method_24740 (Lnet/minecraft/class_1309;Lnet/minecraft/class_5418;)V @@ -75,7 +79,7 @@ CLASS net/minecraft/class_4838 net/minecraft/entity/mob/PiglinBrain ARG 2 piglin METHOD method_24746 acceptsForBarter (Lnet/minecraft/class_1799;)Z ARG 0 stack - METHOD method_24747 makeGoToZombifiedPiglinTask ()Lnet/minecraft/class_4809; + METHOD method_24747 makeFleeFromZombifiedPiglinTask ()Lnet/minecraft/class_7893; METHOD method_24748 isHoldingCrossbow (Lnet/minecraft/class_1309;)Z ARG 0 piglin METHOD method_24750 becomeAngryWith (Lnet/minecraft/class_5418;Lnet/minecraft/class_1309;)V @@ -88,15 +92,11 @@ CLASS net/minecraft/class_4838 net/minecraft/entity/mob/PiglinBrain ARG 0 stack METHOD method_24753 setAdmiringItem (Lnet/minecraft/class_1309;)V ARG 0 entity - METHOD method_24754 haveHuntedHoglinsRecently (Lnet/minecraft/class_4836;)Z - ARG 0 piglin METHOD method_24755 isPreferredAttackTarget (Lnet/minecraft/class_4836;Lnet/minecraft/class_1309;)Z ARG 0 piglin ARG 1 target METHOD method_24756 addCelebrateActivities (Lnet/minecraft/class_4095;)V ARG 0 brain - 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 @@ -178,6 +178,8 @@ CLASS net/minecraft/class_4838 net/minecraft/entity/mob/PiglinBrain METHOD method_27086 isWillingToTrade (Lnet/minecraft/class_4836;Lnet/minecraft/class_1799;)Z ARG 0 piglin ARG 1 nearbyItems + METHOD method_29275 (Lnet/minecraft/class_4836;)Z + ARG 0 piglin METHOD method_29276 isHuntingTarget (Lnet/minecraft/class_1309;Lnet/minecraft/class_1309;)Z ARG 0 piglin ARG 1 target @@ -212,10 +214,11 @@ CLASS net/minecraft/class_4838 net/minecraft/entity/mob/PiglinBrain METHOD method_30089 swapItemWithOffHand (Lnet/minecraft/class_4836;Lnet/minecraft/class_1799;)V ARG 0 piglin ARG 1 stack - METHOD method_30090 goToNemesisTask ()Lnet/minecraft/class_4809; + METHOD method_30090 goToNemesisTask ()Lnet/minecraft/class_7893; METHOD method_30091 getCurrentActivitySound (Lnet/minecraft/class_4836;)Ljava/util/Optional; ARG 0 piglin METHOD method_30241 (Lnet/minecraft/class_5418;)Z ARG 0 nearbyVisiblePiglin - METHOD method_35197 hasNearestPlayerHoldingWantedItem (Lnet/minecraft/class_4836;)Z - ARG 0 piglin + METHOD method_47272 makeFollowTasks ()Lcom/google/common/collect/ImmutableList; + METHOD method_47273 (Lnet/minecraft/class_7895$class_7896;Lnet/minecraft/class_1309;)Z + ARG 1 entity diff --git a/mappings/net/minecraft/entity/mob/PiglinBruteBrain.mapping b/mappings/net/minecraft/entity/mob/PiglinBruteBrain.mapping index e390c6477f..44109c7c77 100644 --- a/mappings/net/minecraft/entity/mob/PiglinBruteBrain.mapping +++ b/mappings/net/minecraft/entity/mob/PiglinBruteBrain.mapping @@ -1,4 +1,6 @@ CLASS net/minecraft/class_5420 net/minecraft/entity/mob/PiglinBruteBrain + FIELD field_30589 ANGRY_AT_EXPIRY I + FIELD field_30590 MELEE_ATTACK_COOLDOWN I FIELD field_30594 TARGET_RANGE D METHOD method_30244 getFollowTasks ()Lnet/minecraft/class_4118; METHOD method_30246 (Lnet/minecraft/class_1309;Lnet/minecraft/class_1309;)Z diff --git a/mappings/net/minecraft/entity/mob/PillagerEntity.mapping b/mappings/net/minecraft/entity/mob/PillagerEntity.mapping index 60f61ef67e..a5cf650a87 100644 --- a/mappings/net/minecraft/entity/mob/PillagerEntity.mapping +++ b/mappings/net/minecraft/entity/mob/PillagerEntity.mapping @@ -1,4 +1,5 @@ CLASS net/minecraft/class_1604 net/minecraft/entity/mob/PillagerEntity + FIELD field_30477 CROSSBOW_SHOT_SPEED F FIELD field_7334 CHARGING Lnet/minecraft/class_2940; FIELD field_7335 inventory Lnet/minecraft/class_1277; METHOD method_26919 createPillagerAttributes ()Lnet/minecraft/class_5132$class_5133; diff --git a/mappings/net/minecraft/entity/mob/RavagerEntity.mapping b/mappings/net/minecraft/entity/mob/RavagerEntity.mapping index 6d92141716..4c13d605d4 100644 --- a/mappings/net/minecraft/entity/mob/RavagerEntity.mapping +++ b/mappings/net/minecraft/entity/mob/RavagerEntity.mapping @@ -1,4 +1,7 @@ CLASS net/minecraft/class_1584 net/minecraft/entity/mob/RavagerEntity + FIELD field_30483 STUNNED_PARTICLE_Z_VELOCITY D + FIELD field_30484 STUNNED_PARTICLE_Y_VELOCITY D + FIELD field_30485 STUNNED_PARTICLE_X_VELOCITY D FIELD field_7301 IS_NOT_RAVAGER Ljava/util/function/Predicate; FIELD field_7302 stunTick I FIELD field_7303 attackTick I @@ -6,8 +9,6 @@ CLASS net/minecraft/class_1584 net/minecraft/entity/mob/RavagerEntity METHOD method_26920 createRavagerAttributes ()Lnet/minecraft/class_5132$class_5133; METHOD method_39955 (Lnet/minecraft/class_1309;)Z ARG 0 entity - METHOD method_42168 canBecomePrimaryPassenger (Lnet/minecraft/class_1297;)Z - ARG 1 entity METHOD method_7068 knockBack (Lnet/minecraft/class_1297;)V ARG 1 entity METHOD method_7069 (Lnet/minecraft/class_1297;)Z @@ -17,6 +18,3 @@ CLASS net/minecraft/class_1584 net/minecraft/entity/mob/RavagerEntity METHOD method_7072 getRoarTick ()I METHOD method_7073 spawnStunnedParticles ()V METHOD method_7074 getStunTick ()I - CLASS class_1585 AttackGoal - CLASS class_1586 Navigation - CLASS class_1587 PathNodeMaker diff --git a/mappings/net/minecraft/entity/mob/ShulkerEntity.mapping b/mappings/net/minecraft/entity/mob/ShulkerEntity.mapping index a45cf13a36..6e7587210f 100644 --- a/mappings/net/minecraft/entity/mob/ShulkerEntity.mapping +++ b/mappings/net/minecraft/entity/mob/ShulkerEntity.mapping @@ -1,5 +1,5 @@ CLASS net/minecraft/class_1606 net/minecraft/entity/mob/ShulkerEntity - FIELD field_33765 SOUTH_VECTOR Lnet/minecraft/class_1160; + FIELD field_33765 SOUTH_VECTOR Lorg/joml/Vector3f; FIELD field_7337 openProgress F FIELD field_7339 prevOpenProgress F FIELD field_7340 teleportLerpTimer I @@ -15,8 +15,6 @@ CLASS net/minecraft/class_1606 net/minecraft/entity/mob/ShulkerEntity 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; - METHOD method_31546 setColor (Lnet/minecraft/class_1767;)V - ARG 1 color METHOD method_31547 spawnNewShulker ()V METHOD method_33342 getExtraLength (F)F ARG 0 openProgress @@ -32,8 +30,12 @@ CLASS net/minecraft/class_1606 net/minecraft/entity/mob/ShulkerEntity METHOD method_33350 moveEntities ()V METHOD method_33351 isInvalidPosition (Lnet/minecraft/class_2338;)Z ARG 1 pos + METHOD method_33352 getRenderPositionOffset (F)Ljava/util/Optional; + ARG 1 tickDelta METHOD method_35192 setAttachedFace (Lnet/minecraft/class_2350;)V ARG 1 face + METHOD method_47879 (Lnet/minecraft/class_1767;)Ljava/lang/Byte; + ARG 0 color METHOD method_7115 getPeekAmount ()I METHOD method_7116 getOpenProgress (F)F ARG 1 delta diff --git a/mappings/net/minecraft/entity/mob/SkeletonEntity.mapping b/mappings/net/minecraft/entity/mob/SkeletonEntity.mapping index e9a385b2f5..f4a2ab06fe 100644 --- a/mappings/net/minecraft/entity/mob/SkeletonEntity.mapping +++ b/mappings/net/minecraft/entity/mob/SkeletonEntity.mapping @@ -3,6 +3,7 @@ CLASS net/minecraft/class_1613 net/minecraft/entity/mob/SkeletonEntity FIELD field_28643 inPowderSnowTime I FIELD field_28644 conversionTime I FIELD field_30495 STRAY_CONVERSION_TIME_KEY Ljava/lang/String; + FIELD field_41714 TOTAL_CONVERSION_TIME I METHOD method_33589 setConversionTime (I)V ARG 1 time METHOD method_33590 isConverting ()Z diff --git a/mappings/net/minecraft/entity/mob/SpellcastingIllagerEntity.mapping b/mappings/net/minecraft/entity/mob/SpellcastingIllagerEntity.mapping index 559164f910..84f5b3f2a4 100644 --- a/mappings/net/minecraft/entity/mob/SpellcastingIllagerEntity.mapping +++ b/mappings/net/minecraft/entity/mob/SpellcastingIllagerEntity.mapping @@ -9,6 +9,7 @@ CLASS net/minecraft/class_1617 net/minecraft/entity/mob/SpellcastingIllagerEntit METHOD method_7140 getSpell ()Lnet/minecraft/class_1617$class_1618; METHOD method_7142 getCastSpellSound ()Lnet/minecraft/class_3414; CLASS class_1618 Spell + FIELD field_41674 BY_ID Ljava/util/function/IntFunction; FIELD field_7374 particleVelocity [D FIELD field_7375 id I METHOD (Ljava/lang/String;IIDDD)V @@ -16,6 +17,8 @@ CLASS net/minecraft/class_1617 net/minecraft/entity/mob/SpellcastingIllagerEntit ARG 4 particleVelocityX ARG 6 particleVelocityY ARG 8 particleVelocityZ + METHOD method_47929 (Lnet/minecraft/class_1617$class_1618;)I + ARG 0 spell METHOD method_7144 byId (I)Lnet/minecraft/class_1617$class_1618; ARG 0 id CLASS class_1619 LookAtTargetGoal diff --git a/mappings/net/minecraft/entity/mob/VexEntity.mapping b/mappings/net/minecraft/entity/mob/VexEntity.mapping index d1a908fda0..f941e2302c 100644 --- a/mappings/net/minecraft/entity/mob/VexEntity.mapping +++ b/mappings/net/minecraft/entity/mob/VexEntity.mapping @@ -13,7 +13,6 @@ CLASS net/minecraft/class_1634 net/minecraft/entity/mob/VexEntity ARG 1 owner METHOD method_7181 setLifeTicks (I)V ARG 1 lifeTicks - METHOD method_7182 getOwner ()Lnet/minecraft/class_1308; METHOD method_7184 areFlagsSet (I)Z ARG 1 mask METHOD method_7186 getBounds ()Lnet/minecraft/class_2338; diff --git a/mappings/net/minecraft/entity/mob/VindicatorEntity.mapping b/mappings/net/minecraft/entity/mob/VindicatorEntity.mapping index e78fe19a53..96f18871df 100644 --- a/mappings/net/minecraft/entity/mob/VindicatorEntity.mapping +++ b/mappings/net/minecraft/entity/mob/VindicatorEntity.mapping @@ -9,6 +9,3 @@ CLASS net/minecraft/class_1632 net/minecraft/entity/mob/VindicatorEntity METHOD (Lnet/minecraft/class_1632;)V ARG 1 vindicator CLASS class_3761 BreakDoorGoal - CLASS class_4293 AttackGoal - METHOD (Lnet/minecraft/class_1632;Lnet/minecraft/class_1632;)V - ARG 2 vindicator diff --git a/mappings/net/minecraft/entity/mob/WardenBrain.mapping b/mappings/net/minecraft/entity/mob/WardenBrain.mapping index 6d1108b11b..f23c7aaf2f 100644 --- a/mappings/net/minecraft/entity/mob/WardenBrain.mapping +++ b/mappings/net/minecraft/entity/mob/WardenBrain.mapping @@ -8,7 +8,7 @@ CLASS net/minecraft/class_7261 net/minecraft/entity/mob/WardenBrain FIELD field_38178 MELEE_ATTACK_INTERVAL I FIELD field_38179 DIG_DURATION I FIELD field_38180 SNIFF_DURATION I - FIELD field_38182 RESET_DIG_COOLDOWN_TASK Lnet/minecraft/class_4097; + FIELD field_38182 RESET_DIG_COOLDOWN_TASK Lnet/minecraft/class_7893; FIELD field_38416 SENSORS Ljava/util/List; FIELD field_38417 MEMORY_MODULES Ljava/util/List; METHOD method_42225 resetDigCooldown (Lnet/minecraft/class_1309;)V @@ -22,11 +22,12 @@ CLASS net/minecraft/class_7261 net/minecraft/entity/mob/WardenBrain ARG 1 entity METHOD method_42230 create (Lnet/minecraft/class_7260;Lcom/mojang/serialization/Dynamic;)Lnet/minecraft/class_4095; ARG 0 warden + ARG 1 dynamic METHOD method_42231 lookAtDisturbance (Lnet/minecraft/class_7260;Lnet/minecraft/class_2338;)V ARG 0 warden ARG 1 pos METHOD method_42232 (Lnet/minecraft/class_1309;Lnet/minecraft/class_1309;)Z - ARG 1 entity + ARG 1 entityx METHOD method_42233 addEmergeActivities (Lnet/minecraft/class_4095;)V ARG 0 brain METHOD method_42235 removeDeadSuspect (Lnet/minecraft/class_7260;Lnet/minecraft/class_1309;)V @@ -49,3 +50,11 @@ CLASS net/minecraft/class_7261 net/minecraft/entity/mob/WardenBrain ARG 0 brain METHOD method_42245 addRoarActivities (Lnet/minecraft/class_4095;)V ARG 0 brain + METHOD method_47302 (Lnet/minecraft/class_7898$class_7900;)Lcom/mojang/datafixers/kinds/App; + ARG 0 context + METHOD method_47303 (Lnet/minecraft/class_7898$class_7900;Lnet/minecraft/class_7906;)Lnet/minecraft/class_7911; + ARG 1 digCooldown + METHOD method_47304 (Lnet/minecraft/class_7898$class_7900;Lnet/minecraft/class_7906;Lnet/minecraft/class_3218;Lnet/minecraft/class_7260;J)Z + ARG 2 world + ARG 3 entity + ARG 4 time diff --git a/mappings/net/minecraft/entity/mob/WardenEntity.mapping b/mappings/net/minecraft/entity/mob/WardenEntity.mapping index 355029bbd2..9f94a7fa91 100644 --- a/mappings/net/minecraft/entity/mob/WardenEntity.mapping +++ b/mappings/net/minecraft/entity/mob/WardenEntity.mapping @@ -10,6 +10,8 @@ CLASS net/minecraft/class_7260 net/minecraft/entity/mob/WardenEntity FIELD field_38146 ATTACK_KNOCKBACK F FIELD field_38147 ATTACK_DAMAGE I FIELD field_38148 ANGER Lnet/minecraft/class_2940; + FIELD field_38150 DARKNESS_EFFECT_DURATION I + FIELD field_38155 ANGRINESS_AMOUNT I FIELD field_38162 tendrilPitch I FIELD field_38163 lastTendrilPitch I FIELD field_38164 heartbeatCooldown I @@ -18,6 +20,8 @@ CLASS net/minecraft/class_7260 net/minecraft/entity/mob/WardenEntity FIELD field_38168 roaringAnimationState Lnet/minecraft/class_7094; FIELD field_38169 sniffingAnimationState Lnet/minecraft/class_7094; FIELD field_38859 chargingSonicBoomAnimationState Lnet/minecraft/class_7094; + FIELD field_44598 vibrationCallback Lnet/minecraft/class_8514$class_5719; + FIELD field_44599 vibrationListenerData Lnet/minecraft/class_8514$class_8515; METHOD method_42202 getHeartPitch (F)F ARG 1 tickDelta METHOD method_42204 addDarknessToClosePlayers (Lnet/minecraft/class_3218;Lnet/minecraft/class_243;Lnet/minecraft/class_1297;I)V @@ -51,7 +55,14 @@ CLASS net/minecraft/class_7260 net/minecraft/entity/mob/WardenEntity METHOD method_42222 getAnger ()I METHOD method_42223 getTendrilPitch (F)F ARG 1 tickDelta + METHOD method_42669 (Lnet/minecraft/class_2487;Lnet/minecraft/class_2520;)V + ARG 1 listenerData METHOD method_43113 isDiggingOrEmerging ()Z METHOD method_43274 updateAttackTarget (Lnet/minecraft/class_1309;)V ARG 1 target METHOD method_43999 getAngerAtTarget ()I + METHOD method_51303 (Lnet/minecraft/class_8514$class_8515;)V + ARG 1 listenerData + CLASS class_8507 VibrationCallback + FIELD field_44601 RANGE I + FIELD field_44602 positionSource Lnet/minecraft/class_5716; diff --git a/mappings/net/minecraft/entity/mob/ZoglinEntity.mapping b/mappings/net/minecraft/entity/mob/ZoglinEntity.mapping index 0064b077b1..1f569a4d65 100644 --- a/mappings/net/minecraft/entity/mob/ZoglinEntity.mapping +++ b/mappings/net/minecraft/entity/mob/ZoglinEntity.mapping @@ -3,7 +3,13 @@ CLASS net/minecraft/class_5136 net/minecraft/entity/mob/ZoglinEntity FIELD field_23732 movementCooldownTicks I FIELD field_23733 USED_MEMORY_MODULES Lcom/google/common/collect/ImmutableList; FIELD field_23734 BABY Lnet/minecraft/class_2940; + FIELD field_30506 DEFAULT_KNOCKBACK_RESISTANCE F + FIELD field_30507 DEFAULT_ATTACK_DAMAGE I + FIELD field_30508 BABY_ATTACK_DAMAGE F + FIELD field_30509 ADULT_MELEE_ATTACK_COOLDOWN I + FIELD field_30510 BABY_MELEE_ATTACK_COOLDOWN I FIELD field_30511 ATTACK_TARGET_DURATION I + FIELD field_30512 DEFAULT_MOVEMENT_SPEED F METHOD method_26928 addCoreTasks (Lnet/minecraft/class_4095;)V ARG 0 brain METHOD method_26929 addIdleTasks (Lnet/minecraft/class_4095;)V diff --git a/mappings/net/minecraft/entity/mob/ZombieVillagerEntity.mapping b/mappings/net/minecraft/entity/mob/ZombieVillagerEntity.mapping index f6d41edb82..3957e219a0 100644 --- a/mappings/net/minecraft/entity/mob/ZombieVillagerEntity.mapping +++ b/mappings/net/minecraft/entity/mob/ZombieVillagerEntity.mapping @@ -2,6 +2,8 @@ CLASS net/minecraft/class_1641 net/minecraft/entity/mob/ZombieVillagerEntity FIELD field_17047 offerData Lnet/minecraft/class_2487; FIELD field_18877 xp I FIELD field_20299 gossipData Lnet/minecraft/class_2520; + FIELD field_30523 BASE_CONVERSION_DELAY I + FIELD field_36334 LOGGER Lorg/slf4j/Logger; FIELD field_7420 VILLAGER_DATA Lnet/minecraft/class_2940; FIELD field_7421 converter Ljava/util/UUID; FIELD field_7422 conversionTimer I @@ -13,6 +15,8 @@ CLASS net/minecraft/class_1641 net/minecraft/entity/mob/ZombieVillagerEntity METHOD method_21649 setGossipData (Lnet/minecraft/class_2520;)V ARG 1 gossipData METHOD method_35194 getXp ()I + METHOD method_40125 (Lnet/minecraft/class_6880$class_6883;)V + ARG 1 profession METHOD method_7194 getConversionRate ()I METHOD method_7197 finishConversion (Lnet/minecraft/class_3218;)V ARG 1 world diff --git a/mappings/net/minecraft/entity/mob/ZombifiedPiglinEntity.mapping b/mappings/net/minecraft/entity/mob/ZombifiedPiglinEntity.mapping index 4e87c42e61..e2ecaf0361 100644 --- a/mappings/net/minecraft/entity/mob/ZombifiedPiglinEntity.mapping +++ b/mappings/net/minecraft/entity/mob/ZombifiedPiglinEntity.mapping @@ -5,6 +5,8 @@ CLASS net/minecraft/class_1590 net/minecraft/entity/mob/ZombifiedPiglinEntity FIELD field_25382 ANGRY_SOUND_DELAY_RANGE Lnet/minecraft/class_6019; FIELD field_25608 angerPassingCooldown I FIELD field_25609 ANGER_PASSING_COOLDOWN_RANGE Lnet/minecraft/class_6019; + FIELD field_41029 EYE_HEIGHT F + FIELD field_41598 BABY_EYE_HEIGHT_OFFSET F FIELD field_7307 ATTACKING_SPEED_BOOST Lnet/minecraft/class_1322; FIELD field_7308 angrySoundDelay I FIELD field_7311 ATTACKING_SPEED_BOOST_ID Ljava/util/UUID; diff --git a/mappings/net/minecraft/entity/passive/AbstractDonkeyEntity.mapping b/mappings/net/minecraft/entity/passive/AbstractDonkeyEntity.mapping index dcda10515b..ad7dc2e50e 100644 --- a/mappings/net/minecraft/entity/passive/AbstractDonkeyEntity.mapping +++ b/mappings/net/minecraft/entity/passive/AbstractDonkeyEntity.mapping @@ -1,6 +1,9 @@ CLASS net/minecraft/class_1492 net/minecraft/entity/passive/AbstractDonkeyEntity FIELD field_6943 CHEST Lnet/minecraft/class_2940; METHOD method_26898 createAbstractDonkeyAttributes ()Lnet/minecraft/class_5132$class_5133; + METHOD method_45374 addChest (Lnet/minecraft/class_1657;Lnet/minecraft/class_1799;)V + ARG 1 player + ARG 2 chest METHOD method_6702 getInventoryColumns ()I METHOD method_6703 hasChest ()Z METHOD method_6704 setHasChest (Z)V diff --git a/mappings/net/minecraft/entity/passive/AbstractHorseEntity.mapping b/mappings/net/minecraft/entity/passive/AbstractHorseEntity.mapping index e59cb0c747..59b74802e8 100644 --- a/mappings/net/minecraft/entity/passive/AbstractHorseEntity.mapping +++ b/mappings/net/minecraft/entity/passive/AbstractHorseEntity.mapping @@ -7,6 +7,13 @@ CLASS net/minecraft/class_1496 net/minecraft/entity/passive/AbstractHorseEntity FIELD field_30422 EATING_GRASS_FLAG I FIELD field_30423 ANGRY_FLAG I FIELD field_30424 EATING_FLAG I + FIELD field_42462 ownerUuid Ljava/util/UUID; + FIELD field_42641 MIN_MOVEMENT_SPEED_BONUS F + FIELD field_42642 MAX_MOVEMENT_SPEED_BONUS F + FIELD field_42643 MIN_JUMP_STRENGTH_BONUS F + FIELD field_42644 MAX_JUMP_STRENGTH_BONUS F + FIELD field_42645 MIN_HEALTH_BONUS F + FIELD field_42646 MAX_HEALTH_BONUS F FIELD field_6955 temper I FIELD field_6956 IS_BRED_HORSE Ljava/util/function/Predicate; FIELD field_6957 tailWagTicks I @@ -23,7 +30,6 @@ CLASS net/minecraft/class_1496 net/minecraft/entity/passive/AbstractHorseEntity FIELD field_6969 eatingGrassAnimationProgress F FIELD field_6970 angryTicks I FIELD field_6971 eatingGrassTicks I - FIELD field_6972 OWNER_UUID Lnet/minecraft/class_2940; FIELD field_6973 eatingTicks I FIELD field_6975 soundTicks I FIELD field_6976 jumpStrength F @@ -44,6 +50,38 @@ CLASS net/minecraft/class_1496 net/minecraft/entity/passive/AbstractHorseEntity ARG 0 stack METHOD method_33338 areInventoriesDifferent (Lnet/minecraft/class_1263;)Z ARG 1 inventory + METHOD method_45343 jump (FLnet/minecraft/class_243;)V + ARG 1 strength + ARG 2 movementInput + METHOD method_45349 shouldAmbientStand ()Z + METHOD method_45375 equipHorseArmor (Lnet/minecraft/class_1657;Lnet/minecraft/class_1799;)V + ARG 1 player + ARG 2 stack + METHOD method_45376 getAmbientStandSound ()Lnet/minecraft/class_3414; + METHOD method_45377 getMinAmbientStandDelay ()I + METHOD method_49123 calculateAttributeBaseValue (DDDDLnet/minecraft/class_5819;)D + ARG 0 parentBase + ARG 2 otherParentBase + ARG 4 min + ARG 6 max + ARG 8 random + METHOD method_49124 setChildAttribute (Lnet/minecraft/class_1296;Lnet/minecraft/class_1496;Lnet/minecraft/class_1320;DD)V + ARG 1 other + ARG 2 child + ARG 3 attribute + ARG 4 min + ARG 6 max + METHOD method_49129 (I)I + ARG 0 max + METHOD method_49130 (I)I + ARG 0 max + METHOD method_49489 getControlledRotation (Lnet/minecraft/class_1309;)Lnet/minecraft/class_241; + ARG 1 controllingPassenger + METHOD method_49996 isWooden (Lnet/minecraft/class_2498;)Z + ARG 1 soundGroup + METHOD method_52550 getPassengerAttachmentY (Lnet/minecraft/class_4048;F)F + ARG 1 dimensions + ARG 2 scaleFactor METHOD method_6001 initAttributes (Lnet/minecraft/class_5819;)V ARG 1 random METHOD method_6721 onChestedStatusChanged ()V @@ -54,14 +92,14 @@ CLASS net/minecraft/class_1496 net/minecraft/entity/passive/AbstractHorseEntity METHOD method_6726 putPlayerOnBack (Lnet/minecraft/class_1657;)V ARG 1 player METHOD method_6727 isTame ()Z - METHOD method_6728 getChildMovementSpeedBonus (Lnet/minecraft/class_5819;)D - ARG 1 random + METHOD method_6728 getChildMovementSpeedBonus (Ljava/util/function/DoubleSupplier;)D + ARG 0 randomDoubleGetter METHOD method_6729 getTemper ()I METHOD method_6730 getHorseFlag (I)Z ARG 1 bitmask METHOD method_6731 updateSaddle ()V METHOD method_6732 setOwnerUuid (Ljava/util/UUID;)V - ARG 1 uuid + ARG 1 ownerUuid METHOD method_6733 playEatingAnimation ()V METHOD method_6734 canBreed ()Z METHOD method_6735 hasArmorSlot ()Z @@ -88,7 +126,7 @@ CLASS net/minecraft/class_1496 net/minecraft/entity/passive/AbstractHorseEntity ARG 1 player ARG 2 item METHOD method_6743 setChildAttributes (Lnet/minecraft/class_1296;Lnet/minecraft/class_1496;)V - ARG 1 mate + ARG 1 other ARG 2 child METHOD method_6744 isBred ()Z METHOD method_6745 addTemper (I)I @@ -107,8 +145,8 @@ CLASS net/minecraft/class_1496 net/minecraft/entity/passive/AbstractHorseEntity COMMENT Whether this horse already has an item stack in its horse armor slot. COMMENT COMMENT @see #hasArmorSlot() - METHOD method_6754 getChildHealthBonus (Lnet/minecraft/class_5819;)F - ARG 1 random + METHOD method_6754 getChildHealthBonus (Ljava/util/function/IntUnaryOperator;)F + ARG 0 randomIntGetter METHOD method_6755 getMaxTemper ()I METHOD method_6757 playAngrySound ()V METHOD method_6758 setInAir (Z)V @@ -125,7 +163,6 @@ CLASS net/minecraft/class_1496 net/minecraft/entity/passive/AbstractHorseEntity ARG 1 tame METHOD method_6767 getAngryAnimationProgress (F)F ARG 1 tickDelta - METHOD method_6768 getOwnerUuid ()Ljava/util/UUID; METHOD method_6769 setHorseFlag (IZ)V ARG 1 bitmask ARG 2 flag @@ -137,5 +174,5 @@ CLASS net/minecraft/class_1496 net/minecraft/entity/passive/AbstractHorseEntity COMMENT COMMENT @see #hasArmorSlot() ARG 1 item - METHOD method_6774 getChildJumpStrengthBonus (Lnet/minecraft/class_5819;)D - ARG 1 random + METHOD method_6774 getChildJumpStrengthBonus (Ljava/util/function/DoubleSupplier;)D + ARG 0 randomDoubleGetter diff --git a/mappings/net/minecraft/entity/passive/AllayBrain.mapping b/mappings/net/minecraft/entity/passive/AllayBrain.mapping index 0a6824277b..0eb29c4507 100644 --- a/mappings/net/minecraft/entity/passive/AllayBrain.mapping +++ b/mappings/net/minecraft/entity/passive/AllayBrain.mapping @@ -1,4 +1,9 @@ CLASS net/minecraft/class_7299 net/minecraft/entity/passive/AllayBrain + FIELD field_38408 WALK_TO_ITEM_SPEED F + FIELD field_38413 LIKED_NOTEBLOCK_COOLDOWN_TICKS_EXPIRY I + FIELD field_38940 WALK_TO_ITEM_RADIUS I + FIELD field_39113 FLEE_SPEED F + FIELD field_40130 GIVE_INVENTORY_RUN_TIME I METHOD method_42657 getLookTarget (Lnet/minecraft/class_1309;)Ljava/util/Optional; ARG 0 allay METHOD method_42658 shouldGoTowardsNoteBlock (Lnet/minecraft/class_1309;Lnet/minecraft/class_4095;Lnet/minecraft/class_4208;)Z @@ -18,11 +23,11 @@ CLASS net/minecraft/class_7299 net/minecraft/entity/passive/AllayBrain ARG 0 brain METHOD method_42664 (Lnet/minecraft/class_7298;)Z ARG 0 allay - METHOD method_42665 (Lnet/minecraft/class_1309;)Z - ARG 0 allay METHOD method_42666 addIdleActivities (Lnet/minecraft/class_4095;)V ARG 0 brain METHOD method_43092 (Lnet/minecraft/class_3222;)Lnet/minecraft/class_4115; ARG 0 player METHOD method_43093 getLikedPlayer (Lnet/minecraft/class_1309;)Ljava/util/Optional; ARG 0 allay + METHOD method_49122 hasNearestVisibleWantedItem (Lnet/minecraft/class_1309;)Z + ARG 0 entity diff --git a/mappings/net/minecraft/entity/passive/AllayEntity.mapping b/mappings/net/minecraft/entity/passive/AllayEntity.mapping index f7bd7bbfe7..3c54ad6dc4 100644 --- a/mappings/net/minecraft/entity/passive/AllayEntity.mapping +++ b/mappings/net/minecraft/entity/passive/AllayEntity.mapping @@ -10,10 +10,12 @@ CLASS net/minecraft/class_7298 net/minecraft/entity/passive/AllayEntity FIELD field_39465 DUPLICATION_COOLDOWN I FIELD field_39466 DANCING Lnet/minecraft/class_2940; FIELD field_39467 CAN_DUPLICATE Lnet/minecraft/class_2940; - FIELD field_39468 listenerCallback Lnet/minecraft/class_5718$class_5719; + FIELD field_39468 vibrationCallback Lnet/minecraft/class_8514$class_5719; FIELD field_39469 jukeboxEventHandler Lnet/minecraft/class_5715; FIELD field_39470 jukeboxPos Lnet/minecraft/class_2338; FIELD field_39471 duplicationCooldown J + FIELD field_39472 danceTicks F + FIELD field_44596 vibrationListenerData Lnet/minecraft/class_8514$class_8515; METHOD method_42654 isItemPickupCoolingDown ()Z METHOD method_42655 createAllayAttributes ()Lnet/minecraft/class_5132$class_5133; METHOD method_43396 isHoldingItem ()Z @@ -24,6 +26,7 @@ CLASS net/minecraft/class_7298 net/minecraft/entity/passive/AllayEntity ARG 1 jukeboxPos ARG 2 playing METHOD method_44359 isDancing ()Z + METHOD method_44360 isSpinning ()Z METHOD method_44361 shouldStopDancing ()Z METHOD method_44362 tickDuplicationCooldown ()V METHOD method_44363 duplicate ()V @@ -34,7 +37,15 @@ CLASS net/minecraft/class_7298 net/minecraft/entity/passive/AllayEntity METHOD method_44367 setDancing (Z)V ARG 1 dancing METHOD method_44608 addHeartParticle ()V - CLASS class_7524 VibrationListenerCallback + METHOD method_45340 areItemsEqual (Lnet/minecraft/class_1799;Lnet/minecraft/class_1799;)Z + ARG 1 stack + ARG 2 stack2 + METHOD method_45341 areDifferentPotions (Lnet/minecraft/class_1799;Lnet/minecraft/class_1799;)Z + ARG 1 stack + ARG 2 stack2 + CLASS class_7524 VibrationCallback + FIELD field_43190 RANGE I + FIELD field_44597 positionSource Lnet/minecraft/class_5716; CLASS class_7525 JukeboxEventListener FIELD field_39478 positionSource Lnet/minecraft/class_5716; FIELD field_39479 range I diff --git a/mappings/net/minecraft/entity/passive/AnimalEntity.mapping b/mappings/net/minecraft/entity/passive/AnimalEntity.mapping index e5aa372b8f..12dd0c2c3b 100644 --- a/mappings/net/minecraft/entity/passive/AnimalEntity.mapping +++ b/mappings/net/minecraft/entity/passive/AnimalEntity.mapping @@ -15,6 +15,12 @@ CLASS net/minecraft/class_1429 net/minecraft/entity/passive/AnimalEntity METHOD method_39448 isLightLevelValidForNaturalSpawn (Lnet/minecraft/class_1920;Lnet/minecraft/class_2338;)Z ARG 0 world ARG 1 pos + METHOD method_49794 breed (Lnet/minecraft/class_3218;Lnet/minecraft/class_1429;Lnet/minecraft/class_1296;)V + ARG 1 world + ARG 2 other + ARG 3 baby + METHOD method_49795 (Lnet/minecraft/class_1429;Lnet/minecraft/class_1296;Lnet/minecraft/class_3222;)V + ARG 3 player METHOD method_6474 canBreedWith (Lnet/minecraft/class_1429;)Z ARG 1 other METHOD method_6475 eat (Lnet/minecraft/class_1657;Lnet/minecraft/class_1268;Lnet/minecraft/class_1799;)V diff --git a/mappings/net/minecraft/entity/passive/AxolotlBrain.mapping b/mappings/net/minecraft/entity/passive/AxolotlBrain.mapping index 1f2fe457b0..7912a41ec3 100644 --- a/mappings/net/minecraft/entity/passive/AxolotlBrain.mapping +++ b/mappings/net/minecraft/entity/passive/AxolotlBrain.mapping @@ -19,7 +19,7 @@ CLASS net/minecraft/class_5768 net/minecraft/entity/passive/AxolotlBrain COMMENT COMMENT {@link net.minecraft.entity.ai.brain.Activity#IDLE} COMMENT

    - COMMENT
  • {@link net.minecraft.entity.ai.brain.task.FollowMobTask FollowMobTask(PLAYER)} (time limited)
    • + COMMENT
  • {@link net.minecraft.entity.ai.brain.task.LookAtMobTask LookAtMobTask(PLAYER)} (time limited)
    • COMMENT
  • {@link net.minecraft.entity.ai.brain.task.BreedTask}
    • COMMENT
  • {@link net.minecraft.entity.ai.brain.task.TemptTask} (random)
    • COMMENT
  • {@link net.minecraft.entity.ai.brain.task.WalkTowardClosestAdultTask}
    • diff --git a/mappings/net/minecraft/entity/passive/AxolotlEntity.mapping b/mappings/net/minecraft/entity/passive/AxolotlEntity.mapping index 8a5dbd5b57..17dbc08dd8 100644 --- a/mappings/net/minecraft/entity/passive/AxolotlEntity.mapping +++ b/mappings/net/minecraft/entity/passive/AxolotlEntity.mapping @@ -26,9 +26,6 @@ CLASS net/minecraft/class_5762 net/minecraft/entity/passive/AxolotlEntity COMMENT Renderer{@link net.minecraft.client.render.entity.AxolotlEntityRenderer} COMMENT COMMENT - COMMENT Swim Navigation{@link AxolotlSwimNavigation} - COMMENT - COMMENT COMMENT Variants{@link Variant} COMMENT COMMENT @@ -53,7 +50,6 @@ CLASS net/minecraft/class_5762 net/minecraft/entity/passive/AxolotlEntity ARG 0 random METHOD method_33223 buffPlayer (Lnet/minecraft/class_1657;)V ARG 1 player - METHOD method_33225 getVariant ()Lnet/minecraft/class_5762$class_5767; METHOD method_33226 isPlayingDead ()Z METHOD method_33227 createAxolotlAttributes ()Lnet/minecraft/class_5132$class_5133; METHOD method_33230 tickAir (I)V @@ -62,6 +58,7 @@ CLASS net/minecraft/class_5762 net/minecraft/entity/passive/AxolotlEntity ARG 1 playingDead METHOD method_35175 appreciatePlayer (Lnet/minecraft/class_5762;Lnet/minecraft/class_1309;)V ARG 0 axolotl + ARG 1 entity METHOD method_36282 hydrateFromPotion ()V METHOD method_38987 canSpawn (Lnet/minecraft/class_1299;Lnet/minecraft/class_5425;Lnet/minecraft/class_3730;Lnet/minecraft/class_2338;Lnet/minecraft/class_5819;)Z ARG 0 type @@ -84,10 +81,11 @@ CLASS net/minecraft/class_5762 net/minecraft/entity/passive/AxolotlEntity METHOD (Lnet/minecraft/class_5762;)V ARG 1 axolotl CLASS class_5767 Variant - FIELD field_28346 VARIANTS [Lnet/minecraft/class_5762$class_5767; + FIELD field_28346 BY_ID Ljava/util/function/IntFunction; FIELD field_28347 id I FIELD field_28348 name Ljava/lang/String; FIELD field_28349 natural Z + FIELD field_41585 CODEC Lcom/mojang/serialization/Codec; METHOD (Ljava/lang/String;IILjava/lang/String;Z)V ARG 3 id ARG 4 name @@ -103,3 +101,5 @@ CLASS net/minecraft/class_5762 net/minecraft/entity/passive/AxolotlEntity METHOD method_33238 getName ()Ljava/lang/String; METHOD method_33240 getRandomUnnatural (Lnet/minecraft/class_5819;)Lnet/minecraft/class_5762$class_5767; ARG 0 random + METHOD method_47928 byId (I)Lnet/minecraft/class_5762$class_5767; + ARG 0 id diff --git a/mappings/net/minecraft/entity/passive/AxolotlSwimNavigation.mapping b/mappings/net/minecraft/entity/passive/AxolotlSwimNavigation.mapping deleted file mode 100644 index 9f1e426964..0000000000 --- a/mappings/net/minecraft/entity/passive/AxolotlSwimNavigation.mapping +++ /dev/null @@ -1,3 +0,0 @@ -CLASS net/minecraft/class_5766 net/minecraft/entity/passive/AxolotlSwimNavigation - METHOD (Lnet/minecraft/class_1308;Lnet/minecraft/class_1937;)V - ARG 2 world diff --git a/mappings/net/minecraft/entity/passive/CamelBrain.mapping b/mappings/net/minecraft/entity/passive/CamelBrain.mapping new file mode 100644 index 0000000000..c6618108c4 --- /dev/null +++ b/mappings/net/minecraft/entity/passive/CamelBrain.mapping @@ -0,0 +1,28 @@ +CLASS net/minecraft/class_7691 net/minecraft/entity/passive/CamelBrain + FIELD field_40152 WALK_SPEED F + FIELD field_40156 BREED_SPEED F + FIELD field_40157 WALK_TOWARD_ADULT_RANGE Lnet/minecraft/class_6019; + FIELD field_40158 SENSORS Lcom/google/common/collect/ImmutableList; + FIELD field_40159 MEMORY_MODULES Lcom/google/common/collect/ImmutableList; + METHOD method_45363 createProfile ()Lnet/minecraft/class_4095$class_5303; + METHOD method_45364 (Lnet/minecraft/class_1309;)Ljava/lang/Float; + ARG 0 entity + METHOD method_45365 create (Lnet/minecraft/class_4095;)Lnet/minecraft/class_4095; + ARG 0 brain + METHOD method_45366 updateActivities (Lnet/minecraft/class_7689;)V + ARG 0 camel + METHOD method_45367 initialize (Lnet/minecraft/class_7689;Lnet/minecraft/class_5819;)V + ARG 0 camel + ARG 1 random + METHOD method_45368 getTemptItems ()Lnet/minecraft/class_1856; + METHOD method_45369 addCoreActivities (Lnet/minecraft/class_4095;)V + ARG 0 brain + METHOD method_45370 addIdleActivities (Lnet/minecraft/class_4095;)V + ARG 0 brain + METHOD method_52549 (Lnet/minecraft/class_1309;)Ljava/lang/Double; + ARG 0 entity + CLASS class_7692 CamelWalkTask + CLASS class_7693 SitOrStandTask + FIELD field_40160 lastPoseTickDelta I + METHOD (I)V + ARG 1 lastPoseSecondsDelta diff --git a/mappings/net/minecraft/entity/passive/CamelEntity.mapping b/mappings/net/minecraft/entity/passive/CamelEntity.mapping new file mode 100644 index 0000000000..b34273bf14 --- /dev/null +++ b/mappings/net/minecraft/entity/passive/CamelEntity.mapping @@ -0,0 +1,38 @@ +CLASS net/minecraft/class_7689 net/minecraft/entity/passive/CamelEntity + FIELD field_40131 BREEDING_INGREDIENT Lnet/minecraft/class_1856; + FIELD field_40136 SITTING_DIMENSIONS Lnet/minecraft/class_4048; + FIELD field_40137 dashCooldown I + FIELD field_40138 idleAnimationCooldown I + FIELD field_40139 DASHING Lnet/minecraft/class_2940; + FIELD field_40140 LAST_POSE_TICK Lnet/minecraft/class_2940; + FIELD field_40142 sittingTransitionAnimationState Lnet/minecraft/class_7094; + FIELD field_40143 standingTransitionAnimationState Lnet/minecraft/class_7094; + FIELD field_40144 idlingAnimationState Lnet/minecraft/class_7094; + FIELD field_40145 dashingAnimationState Lnet/minecraft/class_7094; + FIELD field_40734 sittingAnimationState Lnet/minecraft/class_7094; + METHOD method_45344 setLastPoseTick (J)V + ARG 1 lastPoseTick + METHOD method_45350 isSitting ()Z + METHOD method_45351 isChangingPose ()Z + METHOD method_45352 startSitting ()V + METHOD method_45353 startStanding ()V + METHOD method_45354 setStanding ()V + METHOD method_45355 getLastPoseTickDelta ()J + METHOD method_45356 updateAnimations ()V + METHOD method_45357 isStationary ()Z + METHOD method_45360 createCamelAttributes ()Lnet/minecraft/class_5132$class_5133; + METHOD method_45361 isDashing ()Z + METHOD method_45362 setDashing (Z)V + ARG 1 dashing + METHOD method_46398 shouldPlaySittingTransitionAnimation ()Z + METHOD method_48159 clampHeadYaw (Lnet/minecraft/class_1297;F)V + ARG 1 entity + ARG 2 range + METHOD method_48160 initLastPoseTick (J)V + ARG 1 time + METHOD method_48573 shouldUpdateSittingAnimations ()Z + METHOD method_52548 canChangePose ()Z + CLASS class_7690 CamelBodyControl + METHOD (Lnet/minecraft/class_7689;Lnet/minecraft/class_7689;)V + ARG 2 camel + CLASS class_8196 CamelMoveControl diff --git a/mappings/net/minecraft/entity/passive/CatEntity.mapping b/mappings/net/minecraft/entity/passive/CatEntity.mapping index 5319817cdf..063528f821 100644 --- a/mappings/net/minecraft/entity/passive/CatEntity.mapping +++ b/mappings/net/minecraft/entity/passive/CatEntity.mapping @@ -45,9 +45,6 @@ CLASS net/minecraft/class_1451 net/minecraft/entity/passive/CatEntity ARG 1 variant METHOD method_43089 (Lnet/minecraft/class_5425;Lnet/minecraft/class_6885$class_6888;)Ljava/util/Optional; ARG 1 list - METHOD method_6571 getVariant ()Lnet/minecraft/class_7375; - METHOD method_6572 setVariant (Lnet/minecraft/class_7375;)V - ARG 1 variant CLASS class_3698 CatFleeGoal FIELD field_16293 cat Lnet/minecraft/class_1451; METHOD (Lnet/minecraft/class_1451;Ljava/lang/Class;FDD)V diff --git a/mappings/net/minecraft/entity/passive/CatVariant.mapping b/mappings/net/minecraft/entity/passive/CatVariant.mapping index 0496904db7..9a6ea4aca4 100644 --- a/mappings/net/minecraft/entity/passive/CatVariant.mapping +++ b/mappings/net/minecraft/entity/passive/CatVariant.mapping @@ -1,4 +1,9 @@ CLASS net/minecraft/class_7375 net/minecraft/entity/passive/CatVariant - METHOD method_43090 register (Ljava/lang/String;Ljava/lang/String;)Lnet/minecraft/class_7375; + METHOD method_43090 register (Lnet/minecraft/class_2378;Lnet/minecraft/class_5321;Ljava/lang/String;)Lnet/minecraft/class_7375; + ARG 0 registry + ARG 1 key + ARG 2 textureId + METHOD method_46646 registerAndGetDefault (Lnet/minecraft/class_2378;)Lnet/minecraft/class_7375; + ARG 0 registry + METHOD method_46647 of (Ljava/lang/String;)Lnet/minecraft/class_5321; ARG 0 id - ARG 1 textureId diff --git a/mappings/net/minecraft/entity/passive/FoxEntity.mapping b/mappings/net/minecraft/entity/passive/FoxEntity.mapping index adc6f25978..878e50ae2a 100644 --- a/mappings/net/minecraft/entity/passive/FoxEntity.mapping +++ b/mappings/net/minecraft/entity/passive/FoxEntity.mapping @@ -27,8 +27,6 @@ CLASS net/minecraft/class_4019 net/minecraft/entity/passive/FoxEntity ARG 0 entity METHOD method_18254 (Lnet/minecraft/class_1309;)Z ARG 0 entity - METHOD method_18255 setType (Lnet/minecraft/class_4019$class_4039;)V - ARG 1 type METHOD method_18257 canJumpChase (Lnet/minecraft/class_4019;Lnet/minecraft/class_1309;)Z ARG 0 fox ARG 1 chasedEntity @@ -45,7 +43,6 @@ CLASS net/minecraft/class_4019 net/minecraft/entity/passive/FoxEntity METHOD method_18269 setFoxFlag (IZ)V ARG 1 mask ARG 2 value - METHOD method_18271 getFoxType ()Lnet/minecraft/class_4019$class_4039; METHOD method_18272 isSitting ()Z METHOD method_18273 isWalking ()Z METHOD method_18274 isChasing ()Z @@ -171,17 +168,17 @@ CLASS net/minecraft/class_4019 net/minecraft/entity/passive/FoxEntity METHOD method_18432 canNotCalmDown ()Z CLASS class_4038 MoveToHuntGoal CLASS class_4039 Type - FIELD field_17998 TYPES [Lnet/minecraft/class_4019$class_4039; - FIELD field_17999 NAME_TYPE_MAP Ljava/util/Map; + FIELD field_17998 BY_ID Ljava/util/function/IntFunction; FIELD field_18000 id I FIELD field_18001 key Ljava/lang/String; + FIELD field_41548 CODEC Lnet/minecraft/class_3542$class_7292; METHOD (Ljava/lang/String;IILjava/lang/String;)V ARG 3 id ARG 4 key - METHOD method_18310 getKey ()Ljava/lang/String; METHOD method_18311 fromId (I)Lnet/minecraft/class_4019$class_4039; ARG 0 id METHOD method_18313 fromBiome (Lnet/minecraft/class_6880;)Lnet/minecraft/class_4019$class_4039; + ARG 0 biome METHOD method_18314 byName (Ljava/lang/String;)Lnet/minecraft/class_4019$class_4039; ARG 0 name METHOD method_18317 getId ()I diff --git a/mappings/net/minecraft/entity/passive/FrogBrain.mapping b/mappings/net/minecraft/entity/passive/FrogBrain.mapping index cde912afab..176edee1c4 100644 --- a/mappings/net/minecraft/entity/passive/FrogBrain.mapping +++ b/mappings/net/minecraft/entity/passive/FrogBrain.mapping @@ -1,5 +1,7 @@ CLASS net/minecraft/class_7107 net/minecraft/entity/passive/FrogBrain + FIELD field_37469 FLEE_SPEED F FIELD field_37474 longJumpCooldownRange Lnet/minecraft/class_6019; + FIELD field_37478 TEMPT_SPEED F METHOD method_41366 getTemptItems ()Lnet/minecraft/class_1856; METHOD method_41367 (Lnet/minecraft/class_1309;)Ljava/lang/Float; ARG 0 frog @@ -8,8 +10,6 @@ CLASS net/minecraft/class_7107 net/minecraft/entity/passive/FrogBrain METHOD method_41369 coolDownLongJump (Lnet/minecraft/class_7102;Lnet/minecraft/class_5819;)V ARG 0 frog ARG 1 random - METHOD method_41370 (Lnet/minecraft/class_2680;)Z - ARG 0 state METHOD method_41371 (Lnet/minecraft/class_1309;)Ljava/lang/Float; ARG 0 frog METHOD method_41372 addCoreActivities (Lnet/minecraft/class_4095;)V @@ -36,3 +36,6 @@ CLASS net/minecraft/class_7107 net/minecraft/entity/passive/FrogBrain ARG 0 brain METHOD method_41383 (Lnet/minecraft/class_7102;)Ljava/util/Optional; ARG 0 frog + METHOD method_45373 shouldJumpTo (Lnet/minecraft/class_1308;Lnet/minecraft/class_2338;)Z + ARG 0 frog + ARG 1 pos diff --git a/mappings/net/minecraft/entity/passive/FrogEntity.mapping b/mappings/net/minecraft/entity/passive/FrogEntity.mapping index 221b049c59..d5e451442b 100644 --- a/mappings/net/minecraft/entity/passive/FrogEntity.mapping +++ b/mappings/net/minecraft/entity/passive/FrogEntity.mapping @@ -5,8 +5,6 @@ CLASS net/minecraft/class_7102 net/minecraft/entity/passive/FrogEntity FIELD field_37451 longJumpingAnimationState Lnet/minecraft/class_7094; FIELD field_37452 croakingAnimationState Lnet/minecraft/class_7094; FIELD field_37453 usingTongueAnimationState Lnet/minecraft/class_7094; - FIELD field_37454 walkingAnimationState Lnet/minecraft/class_7094; - FIELD field_37455 swimmingAnimationState Lnet/minecraft/class_7094; FIELD field_37456 idlingInWaterAnimationState Lnet/minecraft/class_7094; FIELD field_37457 VARIANT Lnet/minecraft/class_2940; FIELD field_37458 TARGET Lnet/minecraft/class_2940; @@ -15,10 +13,7 @@ CLASS net/minecraft/class_7102 net/minecraft/entity/passive/FrogEntity ARG 1 entity METHOD method_41353 setVariant (Lnet/minecraft/class_7106;)V ARG 1 variant - METHOD method_41354 getVariant ()Lnet/minecraft/class_7106; METHOD method_41355 createFrogAttributes ()Lnet/minecraft/class_5132$class_5133; - METHOD method_41356 shouldWalk ()Z - METHOD method_41357 shouldSwim ()Z METHOD method_41358 isValidFrogFood (Lnet/minecraft/class_1309;)Z ARG 0 entity METHOD method_41359 clearFrogTarget ()V diff --git a/mappings/net/minecraft/entity/passive/HorseColor.mapping b/mappings/net/minecraft/entity/passive/HorseColor.mapping index 4d796fd976..ce236e4c44 100644 --- a/mappings/net/minecraft/entity/passive/HorseColor.mapping +++ b/mappings/net/minecraft/entity/passive/HorseColor.mapping @@ -1,8 +1,11 @@ CLASS net/minecraft/class_5149 net/minecraft/entity/passive/HorseColor - FIELD field_23823 VALUES [Lnet/minecraft/class_5149; - FIELD field_23824 index I - METHOD (Ljava/lang/String;II)V - ARG 3 index - METHOD method_27082 getIndex ()I - METHOD method_27083 byIndex (I)Lnet/minecraft/class_5149; - ARG 0 index + FIELD field_23823 BY_ID Ljava/util/function/IntFunction; + FIELD field_23824 id I + FIELD field_41595 CODEC Lcom/mojang/serialization/Codec; + FIELD field_41596 name Ljava/lang/String; + METHOD (Ljava/lang/String;IILjava/lang/String;)V + ARG 3 id + ARG 4 name + METHOD method_27082 getId ()I + METHOD method_27083 byId (I)Lnet/minecraft/class_5149; + ARG 0 id diff --git a/mappings/net/minecraft/entity/passive/HorseEntity.mapping b/mappings/net/minecraft/entity/passive/HorseEntity.mapping index e3bdc9a7bc..f99a07250d 100644 --- a/mappings/net/minecraft/entity/passive/HorseEntity.mapping +++ b/mappings/net/minecraft/entity/passive/HorseEntity.mapping @@ -3,15 +3,14 @@ CLASS net/minecraft/class_1498 net/minecraft/entity/passive/HorseEntity FIELD field_6990 VARIANT Lnet/minecraft/class_2940; METHOD method_18445 equipArmor (Lnet/minecraft/class_1799;)V ARG 1 stack - METHOD method_27076 setVariant (Lnet/minecraft/class_5149;Lnet/minecraft/class_5148;)V + METHOD method_27076 setHorseVariant (Lnet/minecraft/class_5149;Lnet/minecraft/class_5148;)V ARG 1 color ARG 2 marking - METHOD method_27077 getColor ()Lnet/minecraft/class_5149; METHOD method_27078 getMarking ()Lnet/minecraft/class_5148; - METHOD method_6783 setVariant (I)V + METHOD method_6783 setHorseVariant (I)V ARG 1 variant METHOD method_6786 getArmorType ()Lnet/minecraft/class_1799; - METHOD method_6788 getVariant ()I + METHOD method_6788 getHorseVariant ()I METHOD method_6790 setArmorTypeFromStack (Lnet/minecraft/class_1799;)V ARG 1 stack CLASS class_1499 HorseData diff --git a/mappings/net/minecraft/entity/passive/HorseMarking.mapping b/mappings/net/minecraft/entity/passive/HorseMarking.mapping index 1b98a02546..6ec66ae6e1 100644 --- a/mappings/net/minecraft/entity/passive/HorseMarking.mapping +++ b/mappings/net/minecraft/entity/passive/HorseMarking.mapping @@ -1,8 +1,8 @@ CLASS net/minecraft/class_5148 net/minecraft/entity/passive/HorseMarking - FIELD field_23813 VALUES [Lnet/minecraft/class_5148; - FIELD field_23814 index I + FIELD field_23813 BY_ID Ljava/util/function/IntFunction; + FIELD field_23814 id I METHOD (Ljava/lang/String;II)V - ARG 3 index - METHOD method_27079 getIndex ()I + ARG 3 id + METHOD method_27079 getId ()I METHOD method_27080 byIndex (I)Lnet/minecraft/class_5148; ARG 0 index diff --git a/mappings/net/minecraft/entity/passive/LlamaEntity.mapping b/mappings/net/minecraft/entity/passive/LlamaEntity.mapping index ed7acfe42b..77c0105310 100644 --- a/mappings/net/minecraft/entity/passive/LlamaEntity.mapping +++ b/mappings/net/minecraft/entity/passive/LlamaEntity.mapping @@ -1,7 +1,6 @@ CLASS net/minecraft/class_1501 net/minecraft/entity/passive/LlamaEntity FIELD field_25375 TAMING_INGREDIENT Lnet/minecraft/class_1856; FIELD field_30425 MAX_STRENGTH I - FIELD field_30426 VARIANTS I FIELD field_6995 CARPET_COLOR Lnet/minecraft/class_2940; FIELD field_6996 VARIANT Lnet/minecraft/class_2940; FIELD field_6997 follower Lnet/minecraft/class_1501; @@ -20,8 +19,6 @@ CLASS net/minecraft/class_1501 net/minecraft/entity/passive/LlamaEntity METHOD method_6796 initializeStrength (Lnet/minecraft/class_5819;)V ARG 1 random METHOD method_6797 stopFollowing ()V - METHOD method_6798 setVariant (I)V - ARG 1 variant METHOD method_6799 setCarpetColor (Lnet/minecraft/class_1767;)V ARG 1 color METHOD method_6800 getCarpetColor ()Lnet/minecraft/class_1767; @@ -33,16 +30,26 @@ CLASS net/minecraft/class_1501 net/minecraft/entity/passive/LlamaEntity METHOD method_6807 isTrader ()Z METHOD method_6808 setSpit (Z)V ARG 1 spit - METHOD method_6809 getVariant ()I CLASS class_1502 ChaseWolvesGoal METHOD (Lnet/minecraft/class_1501;)V ARG 1 llama METHOD method_18446 (Lnet/minecraft/class_1309;)Z ARG 0 wolf CLASS class_1503 LlamaData - FIELD field_7001 variant I - METHOD (I)V + FIELD field_7001 variant Lnet/minecraft/class_1501$class_7993; + METHOD (Lnet/minecraft/class_1501$class_7993;)V ARG 1 variant CLASS class_1504 SpitRevengeGoal METHOD (Lnet/minecraft/class_1501;)V ARG 1 llama + CLASS class_7993 Variant + FIELD field_41590 CODEC Lcom/mojang/serialization/Codec; + FIELD field_41591 BY_ID Ljava/util/function/IntFunction; + FIELD field_41592 id I + FIELD field_41593 name Ljava/lang/String; + METHOD (Ljava/lang/String;IILjava/lang/String;)V + ARG 3 id + ARG 4 name + METHOD method_47875 getIndex ()I + METHOD method_47876 byId (I)Lnet/minecraft/class_1501$class_7993; + ARG 0 id diff --git a/mappings/net/minecraft/entity/passive/MooshroomEntity.mapping b/mappings/net/minecraft/entity/passive/MooshroomEntity.mapping index 64d72a6f6d..10699b1b20 100644 --- a/mappings/net/minecraft/entity/passive/MooshroomEntity.mapping +++ b/mappings/net/minecraft/entity/passive/MooshroomEntity.mapping @@ -1,27 +1,27 @@ CLASS net/minecraft/class_1438 net/minecraft/entity/passive/MooshroomEntity FIELD field_18105 TYPE Lnet/minecraft/class_2940; - FIELD field_18106 stewEffect Lnet/minecraft/class_1291; - FIELD field_18107 stewEffectDuration I FIELD field_18108 lightningId Ljava/util/UUID; FIELD field_30339 MUTATION_CHANCE I - METHOD method_18433 setType (Lnet/minecraft/class_1438$class_4053;)V - ARG 1 type + FIELD field_45751 STEW_EFFECTS_NBT_KEY Ljava/lang/String; + FIELD field_45752 stewEffects Ljava/util/List; METHOD method_18434 chooseBabyType (Lnet/minecraft/class_1438;)Lnet/minecraft/class_1438$class_4053; ARG 1 mooshroom - METHOD method_18435 getMooshroomType ()Lnet/minecraft/class_1438$class_4053; METHOD method_18436 getStewEffectFrom (Lnet/minecraft/class_1799;)Ljava/util/Optional; ARG 1 flower METHOD method_20253 (Lnet/minecraft/class_1268;Lnet/minecraft/class_1657;)V - ARG 1 player + ARG 1 playerx METHOD method_20665 canSpawn (Lnet/minecraft/class_1299;Lnet/minecraft/class_1936;Lnet/minecraft/class_3730;Lnet/minecraft/class_2338;Lnet/minecraft/class_5819;)Z ARG 0 type ARG 1 world ARG 2 spawnReason ARG 3 pos ARG 4 random + METHOD method_53155 (Ljava/util/List;)V + ARG 1 stewEffects CLASS class_4053 Type FIELD field_18111 name Ljava/lang/String; FIELD field_18112 mushroom Lnet/minecraft/class_2680; + FIELD field_41549 CODEC Lnet/minecraft/class_3542$class_7292; METHOD (Ljava/lang/String;ILjava/lang/String;Lnet/minecraft/class_2680;)V ARG 3 name ARG 4 mushroom diff --git a/mappings/net/minecraft/entity/passive/PandaEntity.mapping b/mappings/net/minecraft/entity/passive/PandaEntity.mapping index 6e9c694226..e4e039dda8 100644 --- a/mappings/net/minecraft/entity/passive/PandaEntity.mapping +++ b/mappings/net/minecraft/entity/passive/PandaEntity.mapping @@ -108,8 +108,9 @@ CLASS net/minecraft/class_1440 net/minecraft/entity/passive/PandaEntity ARG 2 chance METHOD method_6561 isBambooClose ()Z CLASS class_1443 Gene + FIELD field_41673 CODEC Lnet/minecraft/class_3542$class_7292; FIELD field_6785 id I - FIELD field_6786 VALUES [Lnet/minecraft/class_1440$class_1443; + FIELD field_6786 BY_ID Ljava/util/function/IntFunction; FIELD field_6790 recessive Z FIELD field_6797 name Ljava/lang/String; METHOD (Ljava/lang/String;IILjava/lang/String;Z)V @@ -119,7 +120,6 @@ CLASS net/minecraft/class_1440 net/minecraft/entity/passive/PandaEntity METHOD method_17688 createRandom (Lnet/minecraft/class_5819;)Lnet/minecraft/class_1440$class_1443; ARG 0 random METHOD method_6564 getId ()I - METHOD method_6565 getName ()Ljava/lang/String; METHOD method_6566 byId (I)Lnet/minecraft/class_1440$class_1443; ARG 0 id METHOD method_6567 byName (Ljava/lang/String;)Lnet/minecraft/class_1440$class_1443; diff --git a/mappings/net/minecraft/entity/passive/ParrotEntity.mapping b/mappings/net/minecraft/entity/passive/ParrotEntity.mapping index da1007871e..6ef2ff9745 100644 --- a/mappings/net/minecraft/entity/passive/ParrotEntity.mapping +++ b/mappings/net/minecraft/entity/passive/ParrotEntity.mapping @@ -22,13 +22,11 @@ CLASS net/minecraft/class_1453 net/minecraft/entity/passive/ParrotEntity METHOD method_6579 (Ljava/util/HashMap;)V ARG 0 map METHOD method_6580 getSoundPitch (Lnet/minecraft/class_5819;)F + ARG 0 random METHOD method_6582 isSongPlaying ()Z METHOD method_6583 getRandomSound (Lnet/minecraft/class_1937;Lnet/minecraft/class_5819;)Lnet/minecraft/class_3414; ARG 0 world ARG 1 random - METHOD method_6584 getVariant ()I - METHOD method_6585 setVariant (I)V - ARG 1 variant METHOD method_6586 getSound (Lnet/minecraft/class_1299;)Lnet/minecraft/class_3414; ARG 0 imitate METHOD method_6587 imitateNearbyMob (Lnet/minecraft/class_1937;Lnet/minecraft/class_1297;)Z @@ -39,3 +37,14 @@ CLASS net/minecraft/class_1453 net/minecraft/entity/passive/ParrotEntity ARG 1 entity CLASS class_6537 FlyOntoTreeGoal METHOD method_38066 locateTree ()Lnet/minecraft/class_243; + CLASS class_7989 Variant + FIELD field_41555 CODEC Lcom/mojang/serialization/Codec; + FIELD field_41556 BY_ID Ljava/util/function/IntFunction; + FIELD field_41557 id I + FIELD field_41558 name Ljava/lang/String; + METHOD (Ljava/lang/String;IILjava/lang/String;)V + ARG 3 id + ARG 4 name + METHOD method_47849 getId ()I + METHOD method_47850 byIndex (I)Lnet/minecraft/class_1453$class_7989; + ARG 0 index diff --git a/mappings/net/minecraft/entity/passive/PigEntity.mapping b/mappings/net/minecraft/entity/passive/PigEntity.mapping index fd30ad0422..6c2ef729b6 100644 --- a/mappings/net/minecraft/entity/passive/PigEntity.mapping +++ b/mappings/net/minecraft/entity/passive/PigEntity.mapping @@ -4,4 +4,3 @@ CLASS net/minecraft/class_1452 net/minecraft/entity/passive/PigEntity FIELD field_6816 SADDLED Lnet/minecraft/class_2940; FIELD field_6817 BREEDING_INGREDIENT Lnet/minecraft/class_1856; METHOD method_26890 createPigAttributes ()Lnet/minecraft/class_5132$class_5133; - METHOD method_5956 canBeControlledByRider (Lnet/minecraft/class_1297;)Z diff --git a/mappings/net/minecraft/entity/passive/RabbitEntity.mapping b/mappings/net/minecraft/entity/passive/RabbitEntity.mapping index 95d7021462..67b1e75854 100644 --- a/mappings/net/minecraft/entity/passive/RabbitEntity.mapping +++ b/mappings/net/minecraft/entity/passive/RabbitEntity.mapping @@ -1,12 +1,6 @@ CLASS net/minecraft/class_1463 net/minecraft/entity/passive/RabbitEntity - FIELD field_30359 ESCAPE_SPEED D - FIELD field_30361 BROWN_TYPE I - FIELD field_30362 WHITE_TYPE I - FIELD field_30363 BLACK_TYPE I - FIELD field_30364 WHITE_SPOTTED_TYPE I - FIELD field_30365 GOLD_TYPE I - FIELD field_30366 SALT_TYPE I - FIELD field_30367 KILLER_BUNNY_TYPE I + FIELD field_30359 ESCAPE_DANGER_SPEED D + FIELD field_30360 MELEE_ATTACK_SPEED D FIELD field_6846 KILLER_BUNNY Lnet/minecraft/class_2960; FIELD field_6847 moreCarrotTicks I FIELD field_6848 ticksUntilJump I @@ -21,13 +15,15 @@ CLASS net/minecraft/class_1463 net/minecraft/entity/passive/RabbitEntity ARG 3 pos ARG 4 random METHOD method_26892 createRabbitAttributes ()Lnet/minecraft/class_5132$class_5133; + METHOD method_47854 getTypeFromPos (Lnet/minecraft/class_1936;Lnet/minecraft/class_2338;)Lnet/minecraft/class_1463$class_7990; + ARG 0 world + ARG 1 pos METHOD method_6605 getJumpProgress (F)F ARG 1 delta METHOD method_6606 setSpeed (D)V ARG 1 speed METHOD method_6607 wantsCarrots ()Z METHOD method_6608 doScheduleJump ()V - METHOD method_6610 getRabbitType ()I METHOD method_6611 enableJump ()V METHOD method_6614 isTempting (Lnet/minecraft/class_1799;)Z ARG 0 stack @@ -35,16 +31,9 @@ CLASS net/minecraft/class_1463 net/minecraft/entity/passive/RabbitEntity METHOD method_6616 lookTowards (DD)V ARG 1 x ARG 3 z - METHOD method_6617 setRabbitType (I)V - ARG 1 rabbitType METHOD method_6618 startJump ()V METHOD method_6619 scheduleJump ()V METHOD method_6621 disableJump ()V - METHOD method_6622 chooseType (Lnet/minecraft/class_1936;)I - ARG 1 world - CLASS class_1464 RabbitAttackGoal - METHOD (Lnet/minecraft/class_1463;)V - ARG 1 rabbit CLASS class_1465 FleeGoal FIELD field_6853 rabbit Lnet/minecraft/class_1463; METHOD (Lnet/minecraft/class_1463;Ljava/lang/Class;FDD)V @@ -54,8 +43,8 @@ CLASS net/minecraft/class_1463 net/minecraft/entity/passive/RabbitEntity ARG 4 slowSpeed ARG 6 fastSpeed CLASS class_1466 RabbitData - FIELD field_6854 type I - METHOD (I)V + FIELD field_41560 type Lnet/minecraft/class_1463$class_7990; + METHOD (Lnet/minecraft/class_1463$class_7990;)V ARG 1 type CLASS class_1468 RabbitMoveControl FIELD field_6858 rabbitSpeed D @@ -82,3 +71,14 @@ CLASS net/minecraft/class_1463 net/minecraft/entity/passive/RabbitEntity ARG 1 canJump METHOD method_27312 isActive ()Z METHOD method_27313 canJump ()Z + CLASS class_7990 RabbitType + FIELD field_41568 CODEC Lcom/mojang/serialization/Codec; + FIELD field_41569 BY_ID Ljava/util/function/IntFunction; + FIELD field_41570 id I + FIELD field_41571 name Ljava/lang/String; + METHOD (Ljava/lang/String;IILjava/lang/String;)V + ARG 3 id + ARG 4 name + METHOD method_47856 getId ()I + METHOD method_47857 byId (I)Lnet/minecraft/class_1463$class_7990; + ARG 0 id diff --git a/mappings/net/minecraft/entity/passive/SchoolingFishEntity.mapping b/mappings/net/minecraft/entity/passive/SchoolingFishEntity.mapping index 6301b93870..05e583563a 100644 --- a/mappings/net/minecraft/entity/passive/SchoolingFishEntity.mapping +++ b/mappings/net/minecraft/entity/passive/SchoolingFishEntity.mapping @@ -2,10 +2,10 @@ CLASS net/minecraft/class_1425 net/minecraft/entity/passive/SchoolingFishEntity FIELD field_6733 groupSize I FIELD field_6734 leader Lnet/minecraft/class_1425; METHOD method_6458 (Lnet/minecraft/class_1425;)V - ARG 1 fish + ARG 1 fishx METHOD method_6459 decreaseGroupSize ()V METHOD method_6460 (Lnet/minecraft/class_1425;)Z - ARG 1 fish + ARG 1 fishx METHOD method_6461 joinGroupOf (Lnet/minecraft/class_1425;)Lnet/minecraft/class_1425; ARG 1 groupLeader METHOD method_6462 increaseGroupSize ()V diff --git a/mappings/net/minecraft/entity/passive/SheepEntity.mapping b/mappings/net/minecraft/entity/passive/SheepEntity.mapping index ad1089247e..0caa5f9998 100644 --- a/mappings/net/minecraft/entity/passive/SheepEntity.mapping +++ b/mappings/net/minecraft/entity/passive/SheepEntity.mapping @@ -5,13 +5,11 @@ CLASS net/minecraft/class_1472 net/minecraft/entity/passive/SheepEntity FIELD field_6868 DROPS Ljava/util/Map; FIELD field_6869 eatGrassGoal Lnet/minecraft/class_1345; FIELD field_6870 COLOR Lnet/minecraft/class_2940; - METHOD method_17689 (Lnet/minecraft/class_1715;Lnet/minecraft/class_3955;)Lnet/minecraft/class_1799; - ARG 1 recipe - METHOD method_17690 createDyeMixingCraftingInventory (Lnet/minecraft/class_1767;Lnet/minecraft/class_1767;)Lnet/minecraft/class_1715; + METHOD method_17690 createDyeMixingCraftingInventory (Lnet/minecraft/class_1767;Lnet/minecraft/class_1767;)Lnet/minecraft/class_8566; ARG 0 firstColor ARG 1 secondColor METHOD method_20254 (Lnet/minecraft/class_1268;Lnet/minecraft/class_1657;)V - ARG 1 player + ARG 1 playerx METHOD method_26893 createSheepAttributes ()Lnet/minecraft/class_5132$class_5133; METHOD method_6628 getNeckAngle (F)F ARG 1 delta @@ -29,6 +27,8 @@ CLASS net/minecraft/class_1472 net/minecraft/entity/passive/SheepEntity ARG 1 sheared METHOD method_6637 (Ljava/util/EnumMap;)V ARG 0 map + METHOD method_6638 (Lnet/minecraft/class_1767;)Lnet/minecraft/class_1767; + ARG 0 color METHOD method_6639 getChildColor (Lnet/minecraft/class_1429;Lnet/minecraft/class_1429;)Lnet/minecraft/class_1767; ARG 1 firstParent ARG 2 secondParent diff --git a/mappings/net/minecraft/entity/passive/SnifferBrain.mapping b/mappings/net/minecraft/entity/passive/SnifferBrain.mapping new file mode 100644 index 0000000000..3f361c1103 --- /dev/null +++ b/mappings/net/minecraft/entity/passive/SnifferBrain.mapping @@ -0,0 +1,47 @@ +CLASS net/minecraft/class_8155 net/minecraft/entity/passive/SnifferBrain + FIELD field_42673 SENSORS Ljava/util/List; + FIELD field_42674 MEMORY_MODULES Ljava/util/List; + FIELD field_42675 LOGGER Lorg/slf4j/Logger; + FIELD field_42677 SNIFF_COOLDOWN_EXPIRY I + FIELD field_42679 FLEE_SPEED F + METHOD method_49152 create (Lnet/minecraft/class_4095;)Lnet/minecraft/class_4095; + ARG 0 brain + METHOD method_49153 updateActivities (Lnet/minecraft/class_8153;)V + ARG 0 sniffer + METHOD method_49154 addCoreActivities (Lnet/minecraft/class_4095;)V + ARG 0 brain + METHOD method_49155 addSniffActivities (Lnet/minecraft/class_4095;)V + ARG 0 brain + METHOD method_49156 addDigActivities (Lnet/minecraft/class_4095;)V + ARG 0 brain + METHOD method_49157 addIdleActivities (Lnet/minecraft/class_4095;)V + ARG 0 brain + METHOD method_51159 getTemptItems ()Lnet/minecraft/class_1856; + METHOD method_51160 (Lnet/minecraft/class_1309;)Ljava/lang/Float; + ARG 0 sniffer + METHOD method_51161 stopDiggingOrSniffing (Lnet/minecraft/class_8153;)Lnet/minecraft/class_8153; + ARG 0 sniffer + METHOD method_52174 (Lnet/minecraft/class_1309;)Ljava/lang/Double; + ARG 0 sniffer + CLASS class_8156 DiggingTask + METHOD (II)V + ARG 1 minRunTime + ARG 2 maxRunTime + CLASS class_8157 FeelHappyTask + METHOD (II)V + ARG 1 minRunTime + ARG 2 maxRunTime + CLASS class_8158 FinishDiggingTask + METHOD (I)V + ARG 1 runTime + CLASS class_8159 ScentingTask + METHOD (II)V + ARG 1 minRunTime + ARG 2 maxRunTime + CLASS class_8160 SearchingTask + CLASS class_8161 SniffingTask + METHOD (II)V + ARG 1 minRunTime + ARG 2 maxRunTime + METHOD method_49178 (Lnet/minecraft/class_8153;Lnet/minecraft/class_2338;)V + ARG 1 pos diff --git a/mappings/net/minecraft/entity/passive/SnifferEntity.mapping b/mappings/net/minecraft/entity/passive/SnifferEntity.mapping new file mode 100644 index 0000000000..7947c772cf --- /dev/null +++ b/mappings/net/minecraft/entity/passive/SnifferEntity.mapping @@ -0,0 +1,39 @@ +CLASS net/minecraft/class_8153 net/minecraft/entity/passive/SnifferEntity + FIELD field_42650 feelingHappyAnimationState Lnet/minecraft/class_7094; + FIELD field_42651 scentingAnimationState Lnet/minecraft/class_7094; + FIELD field_42652 sniffingAnimationState Lnet/minecraft/class_7094; + FIELD field_42654 diggingAnimationState Lnet/minecraft/class_7094; + FIELD field_42655 risingAnimationState Lnet/minecraft/class_7094; + FIELD field_42662 STATE Lnet/minecraft/class_2940; + FIELD field_42663 FINISH_DIG_TIME Lnet/minecraft/class_2940; + METHOD method_49131 spawnDiggingParticles (Lnet/minecraft/class_7094;)Lnet/minecraft/class_8153; + ARG 1 diggingAnimationState + METHOD method_49132 startState (Lnet/minecraft/class_8153$class_8154;)Lnet/minecraft/class_8153; + ARG 1 state + METHOD method_49133 setState (Lnet/minecraft/class_8153$class_8154;)Lnet/minecraft/class_8153; + ARG 1 state + METHOD method_49134 findSniffingTargetPos ()Ljava/util/Optional; + METHOD method_49135 canDig ()Z + METHOD method_49137 getDigLocation ()Lnet/minecraft/class_243; + METHOD method_49138 getState ()Lnet/minecraft/class_8153$class_8154; + METHOD method_49139 stopAnimations ()V + METHOD method_49140 isDiggable (Lnet/minecraft/class_2338;)Z + ARG 1 pos + METHOD method_49141 setDigging ()Lnet/minecraft/class_8153; + METHOD method_49142 dropSeeds ()V + METHOD method_49143 getExploredPositions ()Ljava/util/stream/Stream; + METHOD method_49144 playSearchingSound ()V + METHOD method_49145 addExploredPosition (Lnet/minecraft/class_2338;)Lnet/minecraft/class_8153; + ARG 1 pos + METHOD method_49146 createSnifferAttributes ()Lnet/minecraft/class_5132$class_5133; + METHOD method_49149 finishDigging (Z)Lnet/minecraft/class_8153; + ARG 1 explored + METHOD method_49150 isDiggingOrSearching ()Z + METHOD method_51155 canTryToDig ()Z + METHOD method_51156 playScentingSound ()Lnet/minecraft/class_8153; + METHOD method_51157 (Lnet/minecraft/class_2338;)Z + ARG 1 pos + METHOD method_51158 isTempted ()Z + METHOD method_51301 isSearching ()Z + METHOD method_51508 getDigPos ()Lnet/minecraft/class_2338; + CLASS class_8154 State diff --git a/mappings/net/minecraft/entity/passive/SnowGolemEntity.mapping b/mappings/net/minecraft/entity/passive/SnowGolemEntity.mapping index e7decda1b0..7a48047738 100644 --- a/mappings/net/minecraft/entity/passive/SnowGolemEntity.mapping +++ b/mappings/net/minecraft/entity/passive/SnowGolemEntity.mapping @@ -5,7 +5,7 @@ CLASS net/minecraft/class_1473 net/minecraft/entity/passive/SnowGolemEntity METHOD method_18443 (Lnet/minecraft/class_1309;)Z ARG 0 entity METHOD method_20255 (Lnet/minecraft/class_1268;Lnet/minecraft/class_1657;)V - ARG 1 player + ARG 1 playerx METHOD method_26894 createSnowGolemAttributes ()Lnet/minecraft/class_5132$class_5133; METHOD method_6642 setHasPumpkin (Z)V ARG 1 hasPumpkin diff --git a/mappings/net/minecraft/entity/passive/StriderEntity.mapping b/mappings/net/minecraft/entity/passive/StriderEntity.mapping index 0b2612c163..38eea37dd1 100644 --- a/mappings/net/minecraft/entity/passive/StriderEntity.mapping +++ b/mappings/net/minecraft/entity/passive/StriderEntity.mapping @@ -1,36 +1,32 @@ CLASS net/minecraft/class_4985 net/minecraft/entity/passive/StriderEntity FIELD field_23240 saddledComponent Lnet/minecraft/class_4980; FIELD field_23241 temptGoal Lnet/minecraft/class_1391; - FIELD field_23242 escapeDangerGoal Lnet/minecraft/class_1374; FIELD field_23243 BREEDING_INGREDIENT Lnet/minecraft/class_1856; FIELD field_23244 ATTRACTING_INGREDIENT Lnet/minecraft/class_1856; FIELD field_23245 BOOST_TIME Lnet/minecraft/class_2940; FIELD field_23246 COLD Lnet/minecraft/class_2940; FIELD field_23247 SADDLED Lnet/minecraft/class_2940; FIELD field_30499 COLD_SADDLED_SPEED F - FIELD field_30500 COLD_SPEED F FIELD field_30501 DEFAULT_SADDLED_SPEED F + FIELD field_42981 SUFFOCATING_MODIFIER_ID Ljava/util/UUID; + FIELD field_42982 SUFFOCATING_MODIFIER Lnet/minecraft/class_1322; METHOD method_26344 canSpawn (Lnet/minecraft/class_1299;Lnet/minecraft/class_1936;Lnet/minecraft/class_3730;Lnet/minecraft/class_2338;Lnet/minecraft/class_5819;)Z ARG 0 type ARG 1 world ARG 2 spawnReason ARG 3 pos ARG 4 random - METHOD method_26345 getSpeed ()F METHOD method_26347 updateFloating ()V METHOD method_26348 isCold ()Z METHOD method_26349 setCold (Z)V ARG 1 cold METHOD method_26924 createStriderAttributes ()Lnet/minecraft/class_5132$class_5133; - METHOD method_30078 isEscapingDanger ()Z METHOD method_30079 isBeingTempted ()Z METHOD method_30336 initializeRider (Lnet/minecraft/class_5425;Lnet/minecraft/class_1266;Lnet/minecraft/class_1308;Lnet/minecraft/class_1315;)Lnet/minecraft/class_1315; ARG 1 world ARG 2 difficulty ARG 3 rider ARG 4 entityData - METHOD method_42169 canEntityControl (Lnet/minecraft/class_1297;)Z - ARG 1 entity CLASS class_4988 Navigation METHOD (Lnet/minecraft/class_4985;Lnet/minecraft/class_1937;)V ARG 1 entity diff --git a/mappings/net/minecraft/entity/passive/TadpoleBrain.mapping b/mappings/net/minecraft/entity/passive/TadpoleBrain.mapping index af0dc41fb8..e19bc73081 100644 --- a/mappings/net/minecraft/entity/passive/TadpoleBrain.mapping +++ b/mappings/net/minecraft/entity/passive/TadpoleBrain.mapping @@ -1,4 +1,6 @@ CLASS net/minecraft/class_7111 net/minecraft/entity/passive/TadpoleBrain + FIELD field_37500 FLEE_SPEED F + FIELD field_39409 TEMPT_SPEED F METHOD method_41400 create (Lnet/minecraft/class_4095;)Lnet/minecraft/class_4095; ARG 0 brain METHOD method_41401 updateActivities (Lnet/minecraft/class_7110;)V diff --git a/mappings/net/minecraft/entity/passive/TropicalFishEntity.mapping b/mappings/net/minecraft/entity/passive/TropicalFishEntity.mapping index 7bbfbebf27..8c3ef36e21 100644 --- a/mappings/net/minecraft/entity/passive/TropicalFishEntity.mapping +++ b/mappings/net/minecraft/entity/passive/TropicalFishEntity.mapping @@ -1,66 +1,57 @@ CLASS net/minecraft/class_1474 net/minecraft/entity/passive/TropicalFishEntity FIELD field_30378 BUCKET_VARIANT_TAG_KEY Ljava/lang/String; + FIELD field_41573 COMMON_VARIANTS Ljava/util/List; FIELD field_6874 VARIANT Lnet/minecraft/class_2940; - FIELD field_6875 SHAPE_IDS [Lnet/minecraft/class_2960; - FIELD field_6876 LARGE_FISH_VARIETY_IDS [Lnet/minecraft/class_2960; FIELD field_6877 commonSpawn Z - FIELD field_6878 SMALL_FISH_VARIETY_IDS [Lnet/minecraft/class_2960; - FIELD field_6879 COMMON_VARIANTS [I METHOD method_38985 canTropicalFishSpawn (Lnet/minecraft/class_1299;Lnet/minecraft/class_1936;Lnet/minecraft/class_3730;Lnet/minecraft/class_2338;Lnet/minecraft/class_5819;)Z ARG 0 type ARG 1 world ARG 2 reason ARG 3 pos ARG 4 random - METHOD method_6644 getVariant ()I - METHOD method_6645 getPattern (I)I - ARG 0 variant - METHOD method_6646 getVarietyId ()Lnet/minecraft/class_2960; - METHOD method_6647 toVariant (Lnet/minecraft/class_1474$class_1475;Lnet/minecraft/class_1767;Lnet/minecraft/class_1767;)I + METHOD method_47861 getVariantId (Lnet/minecraft/class_1474$class_1475;Lnet/minecraft/class_1767;Lnet/minecraft/class_1767;)I ARG 0 variety ARG 1 baseColor ARG 2 patternColor - METHOD method_6648 getPatternDyeColorIndex (I)I + METHOD method_47863 getTropicalFishVariant ()I + METHOD method_47864 getVariety (I)Lnet/minecraft/class_1474$class_1475; ARG 0 variant + METHOD method_47865 setTropicalFishVariant (I)V + ARG 1 variant METHOD method_6649 getToolTipForVariant (I)Ljava/lang/String; ARG 0 variant - METHOD method_6650 getShapeId ()Lnet/minecraft/class_2960; METHOD method_6651 getPatternDyeColor (I)Lnet/minecraft/class_1767; ARG 0 variant METHOD method_6652 getBaseDyeColor (I)Lnet/minecraft/class_1767; ARG 0 variant - METHOD method_6653 getBaseDyeColorIndex (I)I - ARG 0 variant - METHOD method_6654 getShape ()I - METHOD method_6655 getPatternColorComponents ()[F - METHOD method_6656 getShape (I)I - ARG 0 variant - METHOD method_6657 getTranslationKey (I)Ljava/lang/String; - ARG 0 variant - METHOD method_6658 getBaseColorComponents ()[F - METHOD method_6659 setVariant (I)V - ARG 1 variant + METHOD method_6655 getPatternColorComponents ()Lnet/minecraft/class_1767; + METHOD method_6658 getBaseColorComponents ()Lnet/minecraft/class_1767; CLASS class_1475 Variety - FIELD field_6885 VALUES [Lnet/minecraft/class_1474$class_1475; - FIELD field_6894 pattern I - FIELD field_6895 shape I - METHOD (Ljava/lang/String;III)V - ARG 3 shape - ARG 4 pattern - METHOD method_6660 getTranslateKey (II)Ljava/lang/String; - ARG 0 shape - ARG 1 pattern - METHOD method_6661 getTranslationKey ()Ljava/lang/String; - METHOD method_6662 getShape ()I - METHOD method_6663 getPattern ()I + FIELD field_41578 CODEC Lcom/mojang/serialization/Codec; + FIELD field_41579 BY_ID Ljava/util/function/IntFunction; + FIELD field_41580 name Ljava/lang/String; + FIELD field_41581 text Lnet/minecraft/class_2561; + FIELD field_41582 size Lnet/minecraft/class_1474$class_7991; + FIELD field_41583 id I + METHOD (Ljava/lang/String;ILjava/lang/String;Lnet/minecraft/class_1474$class_7991;I)V + ARG 3 name + ARG 4 size + ARG 5 id + METHOD method_47867 getSize ()Lnet/minecraft/class_1474$class_7991; + METHOD method_47868 fromId (I)Lnet/minecraft/class_1474$class_1475; + ARG 0 id + METHOD method_47870 getId ()I + METHOD method_47871 getText ()Lnet/minecraft/class_2561; CLASS class_1476 TropicalFishData - FIELD field_6896 patternColor I - FIELD field_6897 baseColor I - FIELD field_6898 pattern I - FIELD field_6899 shape I - METHOD (Lnet/minecraft/class_1474;IIII)V + FIELD field_41584 variant Lnet/minecraft/class_1474$class_7992; + METHOD (Lnet/minecraft/class_1474;Lnet/minecraft/class_1474$class_7992;)V ARG 1 leader - ARG 2 shape - ARG 3 pattern - ARG 4 baseColor - ARG 5 patternColor + ARG 2 variant + CLASS class_7991 Size + FIELD field_41576 id I + METHOD (Ljava/lang/String;II)V + ARG 3 id + CLASS class_7992 Variant + FIELD comp_1177 variety Lnet/minecraft/class_1474$class_1475; + METHOD comp_1177 variety ()Lnet/minecraft/class_1474$class_1475; + METHOD method_47872 getId ()I diff --git a/mappings/net/minecraft/entity/passive/VillagerEntity.mapping b/mappings/net/minecraft/entity/passive/VillagerEntity.mapping index 013a38cebb..943ab7cd1d 100644 --- a/mappings/net/minecraft/entity/passive/VillagerEntity.mapping +++ b/mappings/net/minecraft/entity/passive/VillagerEntity.mapping @@ -30,12 +30,13 @@ CLASS net/minecraft/class_1646 net/minecraft/entity/passive/VillagerEntity METHOD method_19174 initBrain (Lnet/minecraft/class_4095;)V ARG 1 brain METHOD method_19176 releaseTicketFor (Lnet/minecraft/class_4140;)V + ARG 1 pos METHOD method_19177 talkWithVillager (Lnet/minecraft/class_3218;Lnet/minecraft/class_1646;J)V ARG 1 world ARG 2 villager ARG 3 time METHOD method_19178 (Lnet/minecraft/server/MinecraftServer;Lnet/minecraft/class_4140;Lnet/minecraft/class_4208;)V - ARG 3 pos + ARG 3 posx METHOD method_19179 reinitializeBrain (Lnet/minecraft/class_3218;)V ARG 1 world METHOD method_19182 restock ()V @@ -78,6 +79,8 @@ CLASS net/minecraft/class_1646 net/minecraft/entity/passive/VillagerEntity METHOD method_20696 decayGossip ()V METHOD method_20697 eatForBreeding ()V METHOD method_20698 lacksFood ()Z + METHOD method_20699 (Lnet/minecraft/class_3218;Lnet/minecraft/class_1297;Lnet/minecraft/class_1309;)V + ARG 2 observer METHOD method_20741 hasRecentlySlept (J)Z ARG 1 worldTime METHOD method_20821 clearDailyRestockCount ()V @@ -98,5 +101,8 @@ CLASS net/minecraft/class_1646 net/minecraft/entity/passive/VillagerEntity ARG 0 villager METHOD method_29279 isNatural ()Z METHOD method_30958 releaseAllTickets ()V + METHOD method_49695 sendOffersToCustomer ()V + METHOD method_51304 (Lnet/minecraft/class_1799;)Z + ARG 0 stack METHOD method_7234 wantsToStartBreeding ()Z METHOD method_7239 canBreed ()Z diff --git a/mappings/net/minecraft/entity/passive/WanderingTraderEntity.mapping b/mappings/net/minecraft/entity/passive/WanderingTraderEntity.mapping index e773bd6a55..a4d259df88 100644 --- a/mappings/net/minecraft/entity/passive/WanderingTraderEntity.mapping +++ b/mappings/net/minecraft/entity/passive/WanderingTraderEntity.mapping @@ -12,6 +12,7 @@ CLASS net/minecraft/class_3989 net/minecraft/entity/passive/WanderingTraderEntit METHOD method_18069 setWanderTarget (Lnet/minecraft/class_2338;)V ARG 1 wanderTarget METHOD method_20508 tickDespawnDelay ()V + METHOD method_52557 fillRebalancedRecipes ()V CLASS class_3994 WanderToTargetGoal FIELD field_17759 trader Lnet/minecraft/class_3989; FIELD field_17760 proximityDistance D diff --git a/mappings/net/minecraft/entity/player/PlayerEntity.mapping b/mappings/net/minecraft/entity/player/PlayerEntity.mapping index 412a2b37f8..f95aea376e 100644 --- a/mappings/net/minecraft/entity/player/PlayerEntity.mapping +++ b/mappings/net/minecraft/entity/player/PlayerEntity.mapping @@ -2,9 +2,10 @@ CLASS net/minecraft/class_1657 net/minecraft/entity/player/PlayerEntity FIELD field_18134 POSE_DIMENSIONS Ljava/util/Map; FIELD field_18135 STANDING_DIMENSIONS Lnet/minecraft/class_4048; FIELD field_19428 shoulderEntityAddedTime J - FIELD field_38198 sculkShriekerWarningManager Lnet/minecraft/class_7262; - FIELD field_39118 publicKey Lnet/minecraft/class_7428; + FIELD field_30651 DEFAULT_EYE_HEIGHT F + FIELD field_38197 LOGGER Lorg/slf4j/Logger; FIELD field_39445 lastDeathPos Ljava/util/Optional; + FIELD field_41765 damageTiltYaw F FIELD field_7483 strideDistance F FIELD field_7484 itemCooldownManager Lnet/minecraft/class_1796; FIELD field_7486 enderChestInventory Lnet/minecraft/class_1730; @@ -39,12 +40,14 @@ CLASS net/minecraft/class_1657 net/minecraft/entity/player/PlayerEntity FIELD field_7523 reducedDebugInfo Z FIELD field_7524 prevCapeX D FIELD field_7525 selectedItem Lnet/minecraft/class_1799; - METHOD (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;FLcom/mojang/authlib/GameProfile;Lnet/minecraft/class_7428;)V + METHOD (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;FLcom/mojang/authlib/GameProfile;)V ARG 1 world ARG 2 pos ARG 3 yaw ARG 4 gameProfile - ARG 5 publicKey + METHOD method_14247 onHandledScreenClosed ()V + COMMENT Runs closing tasks for the current screen handler and + COMMENT sets it to the {@link #playerScreenHandler}. METHOD method_16354 openJigsawScreen (Lnet/minecraft/class_3751;)V ARG 1 jigsaw METHOD method_16475 spawnParticles (Lnet/minecraft/class_2394;)V @@ -111,14 +114,18 @@ CLASS net/minecraft/class_1657 net/minecraft/entity/player/PlayerEntity COMMENT the item stack in the clicked slot ARG 3 clickType COMMENT the click type (mouse button used) + METHOD method_33793 shouldFilterText ()Z METHOD method_40126 useRiptide (I)V ARG 1 riptideTicks - METHOD method_42272 getSculkShriekerWarningManager ()Lnet/minecraft/class_7262; + METHOD method_42272 getSculkShriekerWarningManager ()Ljava/util/Optional; METHOD method_43120 setLastDeathPos (Ljava/util/Optional;)V ARG 1 lastDeathPos METHOD method_43122 getLastDeathPos ()Ljava/util/Optional; - METHOD method_43696 getPublicKey ()Lnet/minecraft/class_7428; METHOD method_45015 shouldCloseHandledScreenOnRespawn ()Z + METHOD method_51283 onRecipeCrafted (Lnet/minecraft/class_8786;Ljava/util/List;)V + ARG 2 ingredients + METHOD method_52558 canChangeIntoPose (Lnet/minecraft/class_4050;)Z + ARG 1 pose METHOD method_7254 unlockRecipes (Ljava/util/Collection;)I ARG 1 recipes METHOD method_7255 addExperience (I)V @@ -211,8 +218,9 @@ CLASS net/minecraft/class_1657 net/minecraft/entity/player/PlayerEntity COMMENT @see net.minecraft.item.Item#isSuitableFor(BlockState) ARG 1 state METHOD method_7308 getShoulderEntityRight ()Lnet/minecraft/class_2487; - METHOD method_7311 openEditSignScreen (Lnet/minecraft/class_2625;)V + METHOD method_7311 openEditSignScreen (Lnet/minecraft/class_2625;Z)V ARG 1 sign + ARG 2 front METHOD method_7313 updateCapeAngles ()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 @@ -286,6 +294,11 @@ CLASS net/minecraft/class_1657 net/minecraft/entity/player/PlayerEntity METHOD method_7345 setShoulderEntityRight (Lnet/minecraft/class_2487;)V ARG 1 entityNbt METHOD method_7346 closeHandledScreen ()V + COMMENT Closes the currently open {@linkplain net.minecraft.client.gui.screen.ingame.HandledScreen + COMMENT handled screen}. + COMMENT + COMMENT

    This method can be called on either logical side, and it will synchronize + COMMENT the closing automatically to the other. METHOD method_7348 isPartVisible (Lnet/minecraft/class_1664;)Z ARG 1 modelPart METHOD method_7349 getNextLevelExperience ()I diff --git a/mappings/net/minecraft/entity/projectile/AbstractFireballEntity.mapping b/mappings/net/minecraft/entity/projectile/AbstractFireballEntity.mapping index 6305ccee8f..3ff3173a9a 100644 --- a/mappings/net/minecraft/entity/projectile/AbstractFireballEntity.mapping +++ b/mappings/net/minecraft/entity/projectile/AbstractFireballEntity.mapping @@ -2,6 +2,4 @@ CLASS net/minecraft/class_3855 net/minecraft/entity/projectile/AbstractFireballE FIELD field_17081 ITEM Lnet/minecraft/class_2940; METHOD method_16936 setItem (Lnet/minecraft/class_1799;)V ARG 1 stack - METHOD method_16937 (Lnet/minecraft/class_1799;)V - ARG 0 stack METHOD method_16938 getItem ()Lnet/minecraft/class_1799; diff --git a/mappings/net/minecraft/entity/projectile/FishingBobberEntity.mapping b/mappings/net/minecraft/entity/projectile/FishingBobberEntity.mapping index 49436d8c3a..7f5d1b44ee 100644 --- a/mappings/net/minecraft/entity/projectile/FishingBobberEntity.mapping +++ b/mappings/net/minecraft/entity/projectile/FishingBobberEntity.mapping @@ -4,6 +4,7 @@ CLASS net/minecraft/class_1536 net/minecraft/entity/projectile/FishingBobberEnti FIELD field_23232 caughtFish Z FIELD field_23233 outOfOpenWaterTicks I FIELD field_23234 CAUGHT_FISH Lnet/minecraft/class_2940; + FIELD field_36336 LOGGER Lorg/slf4j/Logger; FIELD field_7165 hookedEntity Lnet/minecraft/class_1297; FIELD field_7167 removalTimer I FIELD field_7168 lureLevel I diff --git a/mappings/net/minecraft/entity/projectile/ProjectileEntity.mapping b/mappings/net/minecraft/entity/projectile/ProjectileEntity.mapping index 2d5ba8ad87..1cd15ba149 100644 --- a/mappings/net/minecraft/entity/projectile/ProjectileEntity.mapping +++ b/mappings/net/minecraft/entity/projectile/ProjectileEntity.mapping @@ -22,7 +22,6 @@ CLASS net/minecraft/class_1676 net/minecraft/entity/projectile/ProjectileEntity COMMENT values METHOD method_24920 onBlockHit (Lnet/minecraft/class_3965;)V ARG 1 blockHitResult - METHOD method_24921 getOwner ()Lnet/minecraft/class_1297; METHOD method_26958 canHit (Lnet/minecraft/class_1297;)Z ARG 1 entity METHOD method_26959 (Lnet/minecraft/class_1297;)Z diff --git a/mappings/net/minecraft/entity/projectile/ProjectileUtil.mapping b/mappings/net/minecraft/entity/projectile/ProjectileUtil.mapping index 41bc4ec01e..ff98e1a5c7 100644 --- a/mappings/net/minecraft/entity/projectile/ProjectileUtil.mapping +++ b/mappings/net/minecraft/entity/projectile/ProjectileUtil.mapping @@ -1,7 +1,10 @@ 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 - ARG 1 predicate + METHOD method_18074 getCollision (Lnet/minecraft/class_243;Lnet/minecraft/class_1297;Ljava/util/function/Predicate;Lnet/minecraft/class_243;Lnet/minecraft/class_1937;)Lnet/minecraft/class_239; + ARG 0 pos + ARG 1 entity + ARG 2 predicate + ARG 3 velocity + ARG 4 world 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 ARG 1 min @@ -29,6 +32,14 @@ CLASS net/minecraft/class_1675 net/minecraft/entity/projectile/ProjectileUtil ARG 3 max ARG 4 box ARG 5 predicate + ARG 6 margin + METHOD method_49997 getCollision (Lnet/minecraft/class_1297;Ljava/util/function/Predicate;)Lnet/minecraft/class_239; + ARG 0 entity + ARG 1 predicate + METHOD method_49998 getCollision (Lnet/minecraft/class_1297;Ljava/util/function/Predicate;D)Lnet/minecraft/class_239; + ARG 0 entity + ARG 1 predicate + ARG 2 range METHOD method_7484 setRotationFromVelocity (Lnet/minecraft/class_1297;F)V ARG 0 entity ARG 1 delta diff --git a/mappings/net/minecraft/entity/projectile/ShulkerBulletEntity.mapping b/mappings/net/minecraft/entity/projectile/ShulkerBulletEntity.mapping index bb959dddae..43db852f37 100644 --- a/mappings/net/minecraft/entity/projectile/ShulkerBulletEntity.mapping +++ b/mappings/net/minecraft/entity/projectile/ShulkerBulletEntity.mapping @@ -12,6 +12,7 @@ CLASS net/minecraft/class_1678 net/minecraft/entity/projectile/ShulkerBulletEnti ARG 3 target ARG 4 axis METHOD method_35208 getDirection ()Lnet/minecraft/class_2350; + METHOD method_49723 destroy ()V METHOD method_7486 changeTargetDirection (Lnet/minecraft/class_2350$class_2351;)V ARG 1 axis METHOD method_7487 setDirection (Lnet/minecraft/class_2350;)V diff --git a/mappings/net/minecraft/entity/projectile/thrown/PotionEntity.mapping b/mappings/net/minecraft/entity/projectile/thrown/PotionEntity.mapping index 364413db4e..2ab0e162e3 100644 --- a/mappings/net/minecraft/entity/projectile/thrown/PotionEntity.mapping +++ b/mappings/net/minecraft/entity/projectile/thrown/PotionEntity.mapping @@ -1,5 +1,5 @@ CLASS net/minecraft/class_1686 net/minecraft/entity/projectile/thrown/PotionEntity - FIELD field_7653 WATER_HURTS Ljava/util/function/Predicate; + FIELD field_40737 AFFECTED_BY_WATER Ljava/util/function/Predicate; METHOD (Lnet/minecraft/class_1937;DDD)V ARG 1 world ARG 2 x @@ -8,6 +8,8 @@ CLASS net/minecraft/class_1686 net/minecraft/entity/projectile/thrown/PotionEnti METHOD (Lnet/minecraft/class_1937;Lnet/minecraft/class_1309;)V ARG 1 world ARG 2 owner + METHOD method_46401 (Lnet/minecraft/class_1309;)Z + ARG 0 entity METHOD method_7497 applyLingeringPotion (Lnet/minecraft/class_1799;Lnet/minecraft/class_1842;)V ARG 1 stack ARG 2 potion diff --git a/mappings/net/minecraft/entity/projectile/thrown/ThrownItemEntity.mapping b/mappings/net/minecraft/entity/projectile/thrown/ThrownItemEntity.mapping index 6697600c0c..d06ec04772 100644 --- a/mappings/net/minecraft/entity/projectile/thrown/ThrownItemEntity.mapping +++ b/mappings/net/minecraft/entity/projectile/thrown/ThrownItemEntity.mapping @@ -2,7 +2,5 @@ CLASS net/minecraft/class_3857 net/minecraft/entity/projectile/thrown/ThrownItem FIELD field_17082 ITEM Lnet/minecraft/class_2940; METHOD method_16940 setItem (Lnet/minecraft/class_1799;)V ARG 1 item - METHOD method_16941 (Lnet/minecraft/class_1799;)V - ARG 0 stack METHOD method_16942 getDefaultItem ()Lnet/minecraft/class_1792; METHOD method_16943 getItem ()Lnet/minecraft/class_1799; diff --git a/mappings/net/minecraft/entity/vehicle/AbstractMinecartEntity.mapping b/mappings/net/minecraft/entity/vehicle/AbstractMinecartEntity.mapping index e56223afac..ecc4802748 100644 --- a/mappings/net/minecraft/entity/vehicle/AbstractMinecartEntity.mapping +++ b/mappings/net/minecraft/entity/vehicle/AbstractMinecartEntity.mapping @@ -1,21 +1,20 @@ CLASS net/minecraft/class_1688 net/minecraft/entity/vehicle/AbstractMinecartEntity FIELD field_24464 DISMOUNT_FREE_Y_SPACES_NEEDED Lcom/google/common/collect/ImmutableMap; FIELD field_30694 VELOCITY_SLOWDOWN_MULTIPLIER F - FIELD field_7655 clientYVelocity D - FIELD field_7656 clientZVelocity D - FIELD field_7657 clientPitch D - FIELD field_7658 clientXVelocity D - FIELD field_7659 clientYaw D + FIELD field_44917 onRail Z + FIELD field_45135 clientInterpolationSteps I + FIELD field_45136 clientX D + FIELD field_45137 clientY D + FIELD field_45138 clientZ D + FIELD field_45139 clientYaw D + FIELD field_45140 clientPitch D + FIELD field_45141 clientVelocity Lnet/minecraft/class_243; FIELD field_7660 yawFlipped Z FIELD field_7661 CUSTOM_BLOCK_OFFSET Lnet/minecraft/class_2940; - FIELD field_7662 clientZ D FIELD field_7663 DAMAGE_WOBBLE_TICKS Lnet/minecraft/class_2940; FIELD field_7664 ADJACENT_RAIL_POSITIONS_BY_SHAPE Ljava/util/Map; - FIELD field_7665 clientX D - FIELD field_7666 clientY D FIELD field_7667 DAMAGE_WOBBLE_STRENGTH Lnet/minecraft/class_2940; FIELD field_7668 DAMAGE_WOBBLE_SIDE Lnet/minecraft/class_2940; - FIELD field_7669 clientInterpolationSteps I FIELD field_7670 CUSTOM_BLOCK_PRESENT Lnet/minecraft/class_2940; FIELD field_7671 CUSTOM_BLOCK_ID Lnet/minecraft/class_2940; METHOD (Lnet/minecraft/class_1299;Lnet/minecraft/class_1937;DDD)V diff --git a/mappings/net/minecraft/entity/vehicle/BoatEntity.mapping b/mappings/net/minecraft/entity/vehicle/BoatEntity.mapping index 2c6c88dedc..d6f62588f9 100644 --- a/mappings/net/minecraft/entity/vehicle/BoatEntity.mapping +++ b/mappings/net/minecraft/entity/vehicle/BoatEntity.mapping @@ -46,6 +46,8 @@ CLASS net/minecraft/class_1690 net/minecraft/entity/vehicle/BoatEntity ARG 1 source METHOD method_42280 getPassengerHorizontalOffset ()F METHOD method_42281 getMaxPassengers ()I + METHOD method_49182 isSmallerThanBoat (Lnet/minecraft/class_1297;)Z + ARG 1 entity METHOD method_7531 setBubbleWobbleTicks (I)V ARG 1 wobbleTicks METHOD method_7532 getUnderWaterLocation ()Lnet/minecraft/class_1690$class_1691; @@ -56,7 +58,6 @@ CLASS net/minecraft/class_1690 net/minecraft/entity/vehicle/BoatEntity ARG 2 pressingRight ARG 3 pressingForward ARG 4 pressingBack - METHOD method_7536 getBoatType ()Lnet/minecraft/class_1690$class_1692; METHOD method_7537 getPaddleSoundEvent ()Lnet/minecraft/class_3414; METHOD method_7538 setPaddleMovings (ZZ)V ARG 1 leftMoving @@ -64,15 +65,13 @@ CLASS net/minecraft/class_1690 net/minecraft/entity/vehicle/BoatEntity METHOD method_7539 getBubbleWobbleTicks ()I METHOD method_7540 setDamageWobbleSide (I)V ARG 1 side - METHOD method_7541 setBoatType (Lnet/minecraft/class_1690$class_1692;)V - ARG 1 type METHOD method_7542 setDamageWobbleStrength (F)V ARG 1 wobbleStrength METHOD method_7543 getDamageWobbleSide ()I METHOD method_7544 getWaterHeightBelow ()F METHOD method_7545 checkBoatInWater ()Z - METHOD method_7546 copyEntityData (Lnet/minecraft/class_1297;)V - ARG 1 entity + METHOD method_7546 clampPassengerYaw (Lnet/minecraft/class_1297;)V + ARG 1 passenger METHOD method_7547 interpolateBubbleWobble (F)F ARG 1 tickDelta METHOD method_7548 getNearbySlipperiness ()F @@ -91,6 +90,8 @@ CLASS net/minecraft/class_1690 net/minecraft/entity/vehicle/BoatEntity METHOD method_7557 asItem ()Lnet/minecraft/class_1792; CLASS class_1691 Location CLASS class_1692 Type + FIELD field_41599 CODEC Lnet/minecraft/class_3542$class_7292; + FIELD field_41675 BY_ID Ljava/util/function/IntFunction; FIELD field_7726 name Ljava/lang/String; FIELD field_7731 baseBlock Lnet/minecraft/class_2248; METHOD (Ljava/lang/String;ILnet/minecraft/class_2248;Ljava/lang/String;)V diff --git a/mappings/net/minecraft/entity/vehicle/HopperMinecartEntity.mapping b/mappings/net/minecraft/entity/vehicle/HopperMinecartEntity.mapping index 91fa4bc1dd..a874dd6af1 100644 --- a/mappings/net/minecraft/entity/vehicle/HopperMinecartEntity.mapping +++ b/mappings/net/minecraft/entity/vehicle/HopperMinecartEntity.mapping @@ -1,8 +1,5 @@ CLASS net/minecraft/class_1700 net/minecraft/entity/vehicle/HopperMinecartEntity - FIELD field_30702 MAX_TRANSFER_COOLDOWN I - FIELD field_7748 transferCooldown I FIELD field_7749 enabled Z - FIELD field_7750 currentBlockPos Lnet/minecraft/class_2338; METHOD (Lnet/minecraft/class_1937;DDD)V ARG 1 world ARG 2 x @@ -10,8 +7,5 @@ CLASS net/minecraft/class_1700 net/minecraft/entity/vehicle/HopperMinecartEntity ARG 6 z METHOD method_7570 setEnabled (Z)V ARG 1 enabled - METHOD method_7571 setTransferCooldown (I)V - ARG 1 transferCooldown METHOD method_7572 isEnabled ()Z - METHOD method_7573 isCoolingDown ()Z METHOD method_7574 canOperate ()Z diff --git a/mappings/net/minecraft/entity/vehicle/TntMinecartEntity.mapping b/mappings/net/minecraft/entity/vehicle/TntMinecartEntity.mapping index 70eb3f46f8..9c1b23653f 100644 --- a/mappings/net/minecraft/entity/vehicle/TntMinecartEntity.mapping +++ b/mappings/net/minecraft/entity/vehicle/TntMinecartEntity.mapping @@ -6,8 +6,11 @@ CLASS net/minecraft/class_1701 net/minecraft/entity/vehicle/TntMinecartEntity ARG 2 x ARG 4 y ARG 6 z + METHOD method_47305 explode (D)V + ARG 1 power METHOD method_7575 prime ()V - METHOD method_7576 explode (D)V - ARG 1 velocity + METHOD method_7576 explode (Lnet/minecraft/class_1282;D)V + ARG 1 damageSource + ARG 2 power METHOD method_7577 getFuseTicks ()I METHOD method_7578 isPrimed ()Z diff --git a/mappings/net/minecraft/entity/vehicle/VehicleInventory.mapping b/mappings/net/minecraft/entity/vehicle/VehicleInventory.mapping index de9895c6fb..725afe354d 100644 --- a/mappings/net/minecraft/entity/vehicle/VehicleInventory.mapping +++ b/mappings/net/minecraft/entity/vehicle/VehicleInventory.mapping @@ -14,9 +14,8 @@ CLASS net/minecraft/class_7265 net/minecraft/entity/vehicle/VehicleInventory ARG 1 source ARG 2 world ARG 3 vehicle - METHOD method_42284 open (Ljava/util/function/BiConsumer;Lnet/minecraft/class_1657;)Lnet/minecraft/class_1269; - ARG 1 gameEventEmitter - ARG 2 player + METHOD method_42284 open (Lnet/minecraft/class_1657;)Lnet/minecraft/class_1269; + ARG 1 player METHOD method_42285 readInventoryFromNbt (Lnet/minecraft/class_2487;)V ARG 1 nbt METHOD method_42286 removeInventoryStack (II)Lnet/minecraft/class_1799; diff --git a/mappings/net/minecraft/fluid/FlowableFluid.mapping b/mappings/net/minecraft/fluid/FlowableFluid.mapping index 447b740d21..6d2f322f2d 100644 --- a/mappings/net/minecraft/fluid/FlowableFluid.mapping +++ b/mappings/net/minecraft/fluid/FlowableFluid.mapping @@ -3,15 +3,15 @@ CLASS net/minecraft/class_3609 net/minecraft/fluid/FlowableFluid FIELD field_15900 LEVEL Lnet/minecraft/class_2758; FIELD field_15902 FALLING Lnet/minecraft/class_2746; FIELD field_17587 shapeCache Ljava/util/Map; - METHOD method_15725 tryFlow (Lnet/minecraft/class_1936;Lnet/minecraft/class_2338;Lnet/minecraft/class_3610;)V + METHOD method_15725 tryFlow (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_3610;)V ARG 1 world ARG 2 fluidPos ARG 3 state - METHOD method_15726 getSpread (Lnet/minecraft/class_4538;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;)Ljava/util/Map; + METHOD method_15726 getSpread (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;)Ljava/util/Map; ARG 1 world ARG 2 pos ARG 3 state - METHOD method_15727 getUpdatedState (Lnet/minecraft/class_4538;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;)Lnet/minecraft/class_3610; + METHOD method_15727 getUpdatedState (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;)Lnet/minecraft/class_3610; ARG 1 world ARG 2 pos ARG 3 state @@ -33,14 +33,15 @@ CLASS net/minecraft/class_3609 net/minecraft/fluid/FlowableFluid ARG 6 fromState METHOD method_15733 getFlowSpeed (Lnet/minecraft/class_4538;)I ARG 1 world - METHOD method_15736 (Lnet/minecraft/class_1922;Lnet/minecraft/class_3611;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;)Z + METHOD method_15736 canFlowDownTo (Lnet/minecraft/class_1922;Lnet/minecraft/class_3611;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;)Z ARG 1 world ARG 2 fluid ARG 3 pos ARG 4 state ARG 5 fromPos ARG 6 fromState - METHOD method_15737 isInfinite ()Z + METHOD method_15737 isInfinite (Lnet/minecraft/class_1937;)Z + ARG 1 world METHOD method_15738 canFlow (Lnet/minecraft/class_1922;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;Lnet/minecraft/class_2350;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;Lnet/minecraft/class_3610;Lnet/minecraft/class_3611;)Z ARG 1 world ARG 2 fluidPos @@ -52,14 +53,20 @@ CLASS net/minecraft/class_3609 net/minecraft/fluid/FlowableFluid 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 + METHOD method_15740 countNeighboringSources (Lnet/minecraft/class_4538;Lnet/minecraft/class_2338;)I ARG 1 world ARG 2 pos 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 + METHOD method_15742 getFlowSpeedBetween (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 - METHOD method_15744 (Lnet/minecraft/class_1936;Lnet/minecraft/class_2338;Lnet/minecraft/class_3610;Lnet/minecraft/class_2680;)V + ARG 2 pos + ARG 4 direction + ARG 5 state + ARG 6 fromPos + ARG 7 stateCache + ARG 8 flowDownCache + METHOD method_15744 flowToSides (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_3610;Lnet/minecraft/class_2680;)V ARG 1 world ARG 2 pos ARG 3 fluidState @@ -79,11 +86,15 @@ CLASS net/minecraft/class_3609 net/minecraft/fluid/FlowableFluid ARG 6 fromPos ARG 7 fromState ARG 8 fluidState + METHOD method_15747 packXZOffset (Lnet/minecraft/class_2338;Lnet/minecraft/class_2338;)S + ARG 0 from + ARG 1 to METHOD method_15748 isEmptyOrThis (Lnet/minecraft/class_3610;)Z ARG 1 state - METHOD method_15749 (Lnet/minecraft/class_1922;Lnet/minecraft/class_2338;Lnet/minecraft/class_2350;)Z + METHOD method_15749 isFlowBlocked (Lnet/minecraft/class_1922;Lnet/minecraft/class_2338;Lnet/minecraft/class_2350;)Z ARG 1 world ARG 2 pos + ARG 3 direction METHOD method_15750 getFlowing ()Lnet/minecraft/class_3611; METHOD method_15751 getStill ()Lnet/minecraft/class_3611; METHOD method_15752 isMatchingAndStill (Lnet/minecraft/class_3610;)Z @@ -98,6 +109,8 @@ CLASS net/minecraft/class_3609 net/minecraft/fluid/FlowableFluid ARG 2 pos ARG 3 state ARG 4 fluid + METHOD method_17773 (Lnet/minecraft/class_1922;Lnet/minecraft/class_2338;Lnet/minecraft/class_3610;)Lnet/minecraft/class_265; + ARG 2 state2 METHOD method_17774 isFluidAboveEqual (Lnet/minecraft/class_3610;Lnet/minecraft/class_1922;Lnet/minecraft/class_2338;)Z ARG 0 state ARG 1 world diff --git a/mappings/net/minecraft/fluid/FluidState.mapping b/mappings/net/minecraft/fluid/FluidState.mapping index 3a44052f97..dadc674625 100644 --- a/mappings/net/minecraft/fluid/FluidState.mapping +++ b/mappings/net/minecraft/fluid/FluidState.mapping @@ -4,7 +4,7 @@ CLASS net/minecraft/class_3610 net/minecraft/fluid/FluidState ARG 1 fluid ARG 2 propertiesMap ARG 3 codec - METHOD method_15756 (Lnet/minecraft/class_1922;Lnet/minecraft/class_2338;)Z + METHOD method_15756 canFlowTo (Lnet/minecraft/class_1922;Lnet/minecraft/class_2338;)Z ARG 1 world ARG 2 pos METHOD method_15757 onRandomTick (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_5819;)V diff --git a/mappings/net/minecraft/fluid/LavaFluid.mapping b/mappings/net/minecraft/fluid/LavaFluid.mapping index e7b6b96f25..186c6b9e96 100644 --- a/mappings/net/minecraft/fluid/LavaFluid.mapping +++ b/mappings/net/minecraft/fluid/LavaFluid.mapping @@ -1,4 +1,5 @@ CLASS net/minecraft/class_3616 net/minecraft/fluid/LavaFluid + FIELD field_31729 MIN_HEIGHT_TO_REPLACE F METHOD method_15817 hasBurnableBlock (Lnet/minecraft/class_4538;Lnet/minecraft/class_2338;)Z ARG 1 world ARG 2 pos diff --git a/mappings/net/minecraft/inventory/CraftingInventory.mapping b/mappings/net/minecraft/inventory/CraftingInventory.mapping index 451b2d3ac0..ab2a67eaad 100644 --- a/mappings/net/minecraft/inventory/CraftingInventory.mapping +++ b/mappings/net/minecraft/inventory/CraftingInventory.mapping @@ -1,4 +1,5 @@ CLASS net/minecraft/class_1715 net/minecraft/inventory/CraftingInventory + COMMENT Represents an inventory for crafting inputs. FIELD field_7802 handler Lnet/minecraft/class_1703; FIELD field_7803 height I FIELD field_7804 width I @@ -7,5 +8,8 @@ CLASS net/minecraft/class_1715 net/minecraft/inventory/CraftingInventory ARG 1 handler ARG 2 width ARG 3 height - METHOD method_17397 getHeight ()I - METHOD method_17398 getWidth ()I + METHOD (Lnet/minecraft/class_1703;IILnet/minecraft/class_2371;)V + ARG 1 handler + ARG 2 width + ARG 3 height + ARG 4 stacks diff --git a/mappings/net/minecraft/inventory/CraftingResultInventory.mapping b/mappings/net/minecraft/inventory/CraftingResultInventory.mapping index 12c701d35d..273421a59f 100644 --- a/mappings/net/minecraft/inventory/CraftingResultInventory.mapping +++ b/mappings/net/minecraft/inventory/CraftingResultInventory.mapping @@ -1,3 +1,4 @@ CLASS net/minecraft/class_1731 net/minecraft/inventory/CraftingResultInventory - FIELD field_7865 lastRecipe Lnet/minecraft/class_1860; + COMMENT Represents an inventory for the crafting output slot. + FIELD field_7865 lastRecipe Lnet/minecraft/class_8786; FIELD field_7866 stacks Lnet/minecraft/class_2371; diff --git a/mappings/net/minecraft/inventory/DoubleInventory.mapping b/mappings/net/minecraft/inventory/DoubleInventory.mapping index 852729af72..7da339cb2d 100644 --- a/mappings/net/minecraft/inventory/DoubleInventory.mapping +++ b/mappings/net/minecraft/inventory/DoubleInventory.mapping @@ -1,8 +1,14 @@ CLASS net/minecraft/class_1258 net/minecraft/inventory/DoubleInventory + COMMENT Represents a combined inventory that is backed by two inventories. + COMMENT This is used by double chests. + COMMENT + COMMENT

    It is possible to nest this inventory to create triple or quadruple + COMMENT inventories. FIELD field_5769 first Lnet/minecraft/class_1263; FIELD field_5771 second Lnet/minecraft/class_1263; METHOD (Lnet/minecraft/class_1263;Lnet/minecraft/class_1263;)V ARG 1 first ARG 2 second METHOD method_5405 isPart (Lnet/minecraft/class_1263;)Z + COMMENT {@return whether {@code inventory} is part of the combined inventory} ARG 1 inventory diff --git a/mappings/net/minecraft/inventory/EnderChestInventory.mapping b/mappings/net/minecraft/inventory/EnderChestInventory.mapping index 97ecaa2b48..38236c6fee 100644 --- a/mappings/net/minecraft/inventory/EnderChestInventory.mapping +++ b/mappings/net/minecraft/inventory/EnderChestInventory.mapping @@ -1,6 +1,12 @@ CLASS net/minecraft/class_1730 net/minecraft/inventory/EnderChestInventory + COMMENT Represents an inventory used for ender chests. + COMMENT A new instance is created for each player. FIELD field_7864 activeBlockEntity Lnet/minecraft/class_2611; METHOD method_31556 isActiveBlockEntity (Lnet/minecraft/class_2611;)Z + COMMENT {@return whether this inventory is being accessed from {@code blockEntity}} ARG 1 blockEntity METHOD method_7661 setActiveBlockEntity (Lnet/minecraft/class_2611;)V + COMMENT Sets the block entity the player is using to access the inventory to {@code + COMMENT blockEntity}. The block entity is used to delegate {@link #canPlayerUse}, + COMMENT {@link #onOpen}, and {@link #onClose}. ARG 1 blockEntity diff --git a/mappings/net/minecraft/inventory/Inventories.mapping b/mappings/net/minecraft/inventory/Inventories.mapping index 3f96df7d2c..31025d0f84 100644 --- a/mappings/net/minecraft/inventory/Inventories.mapping +++ b/mappings/net/minecraft/inventory/Inventories.mapping @@ -1,4 +1,6 @@ CLASS net/minecraft/class_1262 net/minecraft/inventory/Inventories + COMMENT Contains utility methods used by {@link Inventory} implementations or for working + COMMENT with inventories. METHOD method_29234 remove (Lnet/minecraft/class_1263;Ljava/util/function/Predicate;IZ)I COMMENT Removes a number, not exceeding {@code maxCount}, of items from an inventory based on a predicate and returns that number. COMMENT @return the number of items removed @@ -16,19 +18,65 @@ CLASS net/minecraft/class_1262 net/minecraft/inventory/Inventories ARG 3 dryRun COMMENT whether to return the number of items which would have been removed without actually removing them METHOD method_5426 writeNbt (Lnet/minecraft/class_2487;Lnet/minecraft/class_2371;)Lnet/minecraft/class_2487; + COMMENT Writes the inventory to {@code nbt}. This method will always write to the NBT, + COMMENT even if {@code stacks} only contains empty stacks. + COMMENT + COMMENT

    See {@link #writeNbt(NbtCompound, DefaultedList, boolean)} for the serialization + COMMENT format. + COMMENT + COMMENT @see #readNbt(NbtCompound, DefaultedList) + COMMENT @see #writeNbt(NbtCompound, DefaultedList, boolean) + COMMENT @return the passed {@code nbt} ARG 0 nbt ARG 1 stacks METHOD method_5427 writeNbt (Lnet/minecraft/class_2487;Lnet/minecraft/class_2371;Z)Lnet/minecraft/class_2487; + COMMENT Writes the inventory to {@code nbt}. + COMMENT + COMMENT

    The inventory is serialized as a list of non-empty {@linkplain ItemStack#writeNbt + COMMENT item stacks}. In addition, each compound has a byte entry with the key {@code Slot}, + COMMENT indicating the slot. The list is then written to {@code nbt} under the key {@code + COMMENT Items}. + COMMENT + COMMENT

    If {@code setIfEmpty} is {@code false} and each stack in {@code stacks} is empty, + COMMENT then {@code nbt} will not be modified at all. Otherwise, the {@code Items} entry + COMMENT will always be present. + COMMENT + COMMENT @see #readNbt(NbtCompound, DefaultedList) + COMMENT @return the passed {@code nbt} ARG 0 nbt ARG 1 stacks ARG 2 setIfEmpty METHOD method_5428 removeStack (Ljava/util/List;I)Lnet/minecraft/class_1799; + COMMENT Sets the stack at {@code slot} to {@link ItemStack#EMPTY} and returns the old stack. + COMMENT + COMMENT

    This returns {@link ItemStack#EMPTY} when {@code slot} is out of bounds. + COMMENT + COMMENT @apiNote This is used to implement {@link Inventory#removeStack(int)}. + COMMENT This should not otherwise be used directly. + COMMENT + COMMENT @returns the stack previously at {@code slot} ARG 0 stacks ARG 1 slot METHOD method_5429 readNbt (Lnet/minecraft/class_2487;Lnet/minecraft/class_2371;)V + COMMENT Reads {@code nbt} and sets the elements of {@code stacks} accordingly. + COMMENT + COMMENT

    See {@link #writeNbt(NbtCompound, DefaultedList, boolean)} for the serialization + COMMENT format. If the slot is out of bounds, it is ignored. + COMMENT + COMMENT @see #writeNbt(NbtCompound, DefaultedList) + COMMENT @see #writeNbt(NbtCompound, DefaultedList, boolean) ARG 0 nbt ARG 1 stacks METHOD method_5430 splitStack (Ljava/util/List;II)Lnet/minecraft/class_1799; + COMMENT {@return the copy of the stack split from the stack at {@code slot}} + COMMENT + COMMENT

    This returns {@link ItemStack#EMPTY} when {@code slot} is out of bounds, + COMMENT the stack at the slot is empty, or when {@code amount <= 0}. + COMMENT + COMMENT @apiNote This is used to implement {@link Inventory#removeStack(int, int)}. + COMMENT This should not otherwise be used directly. + COMMENT + COMMENT @see ItemStack#split(int) ARG 0 stacks ARG 1 slot ARG 2 amount diff --git a/mappings/net/minecraft/inventory/Inventory.mapping b/mappings/net/minecraft/inventory/Inventory.mapping index 63220a207d..b03d091ddc 100644 --- a/mappings/net/minecraft/inventory/Inventory.mapping +++ b/mappings/net/minecraft/inventory/Inventory.mapping @@ -1,49 +1,168 @@ CLASS net/minecraft/class_1263 net/minecraft/inventory/Inventory + COMMENT A container of {@link ItemStack}s. In general, when a player stores an item stack + COMMENT and can retrieve the same item stack back, that stack is stored in an + COMMENT inventory. The inventory can be persistent, like chests or donkeys, or it can + COMMENT be created without backing storage, like the slots in crafting tables. + COMMENT It is the responsibility of the user to sync or save the contents of the + COMMENT inventory. + COMMENT + COMMENT

    Entities and block entities that can hold item stacks generally + COMMENT implement this interface themselves, allowing hopper interactions. Call {@link + COMMENT net.minecraft.entity.player.PlayerEntity#getInventory} to get the player's + COMMENT inventory (including armors and offhand). + COMMENT + COMMENT

    An inventory has a fixed size, and each element in the inventory is identified + COMMENT by the slot number, which is between zero and {@code size() - 1} like arrays. + COMMENT When a slot of the inventory is empty, it should be filled with {@link + COMMENT ItemStack#EMPTY}. + COMMENT + COMMENT

    An implementation of this interface should have a field of {@link + COMMENT net.minecraft.util.collection.DefaultedList#ofSize(int, Object)} with the second + COMMENT argument as {@link ItemStack#EMPTY}, and implement methods by delegating to the + COMMENT list. The list itself should not be modified directly, and the list's size + COMMENT should remain constant throughout the lifetime of the inventory. + COMMENT Implementations must call {@link #markDirty} when the inventory is modified. + COMMENT + COMMENT @apiNote If an inventory is needed for temporary storage, use {@link + COMMENT SimpleInventory}. For persistent storage in entities or block entities, + COMMENT use {@link net.minecraft.entity.vehicle.VehicleInventory} or + COMMENT {@link net.minecraft.block.entity.LockableContainerBlockEntity}. + COMMENT + COMMENT @see net.minecraft.entity.vehicle.VehicleInventory + COMMENT @see net.minecraft.block.entity.LockableContainerBlockEntity FIELD field_29952 MAX_COUNT_PER_STACK I METHOD method_18861 count (Lnet/minecraft/class_1792;)I - COMMENT Returns the number of times the specified item occurs in this inventory across all stored stacks. + COMMENT {@return the number of times {@code item} occurs in this inventory + COMMENT across all stored stacks} ARG 1 item METHOD method_18862 containsAny (Ljava/util/Set;)Z - COMMENT Determines whether this inventory contains any of the given candidate items. + COMMENT {@return whether this inventory contains any of {@code items}} + COMMENT + COMMENT @see #containsAny(Predicate) ARG 1 items METHOD method_43255 (Ljava/util/Set;Lnet/minecraft/class_1799;)Z ARG 1 stack METHOD method_43256 containsAny (Ljava/util/function/Predicate;)Z + COMMENT {@return whether this inventory contains any of the stacks matching {@code + COMMENT predicate}} + COMMENT + COMMENT @see #containsAny(Set) ARG 1 predicate + METHOD method_49104 canTransferTo (Lnet/minecraft/class_1263;ILnet/minecraft/class_1799;)Z + COMMENT {@return whether a hopper can transfer {@code stack} from {@code slot} to + COMMENT the hopper} + COMMENT + COMMENT

    This returns {@code true} by default. + ARG 1 hopperInventory + ARG 2 slot + ARG 3 stack + METHOD method_49105 canPlayerUse (Lnet/minecraft/class_2586;Lnet/minecraft/class_1657;)Z + COMMENT {@return whether {@code player} can use this {@code blockEntity}} + COMMENT + COMMENT @apiNote This is used by block entities to implement {@link + COMMENT #canPlayerUse(PlayerEntity)}. + COMMENT + COMMENT @implNote This method checks whether the given block entity exists and whether + COMMENT the player is within 8 blocks of the block entity. + COMMENT + COMMENT @see #canPlayerUse(BlockEntity, PlayerEntity, int) + ARG 0 blockEntity + ARG 1 player + METHOD method_49106 canPlayerUse (Lnet/minecraft/class_2586;Lnet/minecraft/class_1657;I)Z + COMMENT {@return whether {@code player} can use this {@code blockEntity}} + COMMENT + COMMENT @apiNote This is used by block entities to implement {@link + COMMENT #canPlayerUse(PlayerEntity)}. + COMMENT + COMMENT @implNote This method checks whether the given block entity exists and whether + COMMENT the player is within {@code range} blocks of the block entity. + COMMENT + COMMENT @see #canPlayerUse(BlockEntity, PlayerEntity) + ARG 0 blockEntity + ARG 1 player + ARG 2 range METHOD method_5431 markDirty ()V + COMMENT Marks the inventory as modified. Implementations should call this method + COMMENT every time the inventory is changed in any way. + COMMENT + COMMENT @apiNote Implementations should mark the inventory for synchronization or + COMMENT saving in this method. Since this is called frequently, it is not recommended to + COMMENT synchronize or save the inventory directly in this method. If this inventory is + COMMENT implemented in a block entity, then it should always call + COMMENT {@code super.markDirty();} to ensure the block entity gets saved. + COMMENT + COMMENT @see net.minecraft.block.entiy.BlockEntity#markDirty METHOD method_5432 onClose (Lnet/minecraft/class_1657;)V + COMMENT Called when the inventory is closed. Specifically, this is called inside + COMMENT {@link net.minecraft.screen.ScreenHandler#onClosed}. This does nothing + COMMENT by default. + COMMENT + COMMENT

    The method is called in both the client and the server. However, because + COMMENT clientside screen handler is created with a {@link SimpleInventory}, + COMMENT other implementations can (and the vanilla code does) assume that the method is called + COMMENT in the server. ARG 1 player METHOD method_5434 removeStack (II)Lnet/minecraft/class_1799; - COMMENT Removes a specific number of items from the given slot. + COMMENT Removes a specific number of items from {@code slot}. COMMENT COMMENT @return the removed items as a stack ARG 1 slot ARG 2 amount METHOD method_5435 onOpen (Lnet/minecraft/class_1657;)V + COMMENT Called when the inventory is opened. Specifically, this is called inside the + COMMENT {@link net.minecraft.screen.ScreenHandler} constructor. This does nothing + COMMENT by default. + COMMENT + COMMENT

    The method is called in both the client and the server. However, because + COMMENT clientside screen handler is created with a {@link SimpleInventory}, + COMMENT other implementations can (and the vanilla code does) assume that the method is called + COMMENT in the server. ARG 1 player METHOD method_5437 isValid (ILnet/minecraft/class_1799;)Z - COMMENT Returns whether the given stack is a valid for the indicated slot position. + COMMENT {@return whether {@code stack} is valid for the {@code slot}} + COMMENT + COMMENT

    Implementations can, for example, use this to check whether the item + COMMENT is in a specific tag. This returns {@code true} by default. ARG 1 slot ARG 2 stack METHOD method_5438 getStack (I)Lnet/minecraft/class_1799; - COMMENT Fetches the stack currently stored at the given slot. If the slot is empty, - COMMENT or is outside the bounds of this inventory, returns see {@link ItemStack#EMPTY}. + COMMENT {@return the stack currently stored at {@code slot}} + COMMENT + COMMENT

    If the slot is empty, or is outside the bounds of this inventory, + COMMENT this returns {@link ItemStack#EMPTY}. ARG 1 slot METHOD method_5439 size ()I + COMMENT {@return the size of the inventory} + COMMENT + COMMENT

    The inventory should support the slot ID from {@code 0} to {@code size() - 1}. + COMMENT This should remain constant throughout the inventory's lifetime. METHOD method_5441 removeStack (I)Lnet/minecraft/class_1799; - COMMENT Removes the stack currently stored at the indicated slot. + COMMENT Removes the stack currently stored at {@code slot}. COMMENT - COMMENT @return the stack previously stored at the indicated slot. + COMMENT @return the stack previously stored at the indicated slot ARG 1 slot METHOD method_5442 isEmpty ()Z + COMMENT {@return whether the inventory consists entirely of {@linkplain ItemStack#isEmpty + COMMENT empty item stacks}} METHOD method_5443 canPlayerUse (Lnet/minecraft/class_1657;)Z + COMMENT {@return whether {@code player} can use this inventory} + COMMENT + COMMENT

    This is called by {@link net.minecraft.screen.ScreenHandler#canUse}. + COMMENT + COMMENT @apiNote Implementations should check the distance between the inventory + COMMENT holder and {@code player}. For convenience, this interface offers two methods + COMMENT used by block entities to implement this check. + COMMENT + COMMENT @see #canPlayerUse(BlockEntity, PlayerEntity) + COMMENT @see #canPlayerUse(BlockEntity, PlayerEntity, int) ARG 1 player METHOD method_5444 getMaxCountPerStack ()I - COMMENT Returns the maximum number of items a stack can contain when placed inside this inventory. - COMMENT No slots may have more than this number of items. It is effectively the - COMMENT stacking limit for this inventory's slots. + COMMENT {@return the maximum {@linkplain ItemStack#getCount number of items} a stack + COMMENT can contain when placed inside this inventory} COMMENT - COMMENT @return the max {@link ItemStack#getCount() count} of item stacks in this inventory + COMMENT

    No slots may have more than this number of items. It is effectively the + COMMENT stacking limit for this inventory's slots. METHOD method_5447 setStack (ILnet/minecraft/class_1799;)V + COMMENT Sets the stack stored at {@code slot} to {@code stack}. ARG 1 slot ARG 2 stack diff --git a/mappings/net/minecraft/inventory/InventoryChangedListener.mapping b/mappings/net/minecraft/inventory/InventoryChangedListener.mapping index 51632601a2..e760aaadd4 100644 --- a/mappings/net/minecraft/inventory/InventoryChangedListener.mapping +++ b/mappings/net/minecraft/inventory/InventoryChangedListener.mapping @@ -1,3 +1,7 @@ CLASS net/minecraft/class_1265 net/minecraft/inventory/InventoryChangedListener + COMMENT A functional interface used in {@link SimpleInventory#addListener}. + COMMENT + COMMENT

    Other inventories can listen for inventory changes by overriding + COMMENT {@link Inventory#markDirty}. METHOD method_5453 onInventoryChanged (Lnet/minecraft/class_1263;)V ARG 1 sender diff --git a/mappings/net/minecraft/inventory/RecipeInputInventory.mapping b/mappings/net/minecraft/inventory/RecipeInputInventory.mapping new file mode 100644 index 0000000000..c70a621ac9 --- /dev/null +++ b/mappings/net/minecraft/inventory/RecipeInputInventory.mapping @@ -0,0 +1,9 @@ +CLASS net/minecraft/class_8566 net/minecraft/inventory/RecipeInputInventory + COMMENT Represents an inventory that is an input for a recipe, such as + COMMENT crafting table inputs. + METHOD method_17397 getHeight ()I + COMMENT {@return the height of the recipe grid} + METHOD method_17398 getWidth ()I + COMMENT {@return the width of the recipe grid} + METHOD method_51305 getInputStacks ()Ljava/util/List; + COMMENT {@return the stacks held by the inventory} diff --git a/mappings/net/minecraft/inventory/SidedInventory.mapping b/mappings/net/minecraft/inventory/SidedInventory.mapping index 5ff00d0d75..70a4536c24 100644 --- a/mappings/net/minecraft/inventory/SidedInventory.mapping +++ b/mappings/net/minecraft/inventory/SidedInventory.mapping @@ -1,15 +1,17 @@ CLASS net/minecraft/class_1278 net/minecraft/inventory/SidedInventory COMMENT A special inventory interface for inventories that expose different slots for different sides, such as furnaces. METHOD method_5492 canInsert (ILnet/minecraft/class_1799;Lnet/minecraft/class_2350;)Z - COMMENT Determines whether the given stack can be inserted into this inventory at the specified slot position from the given direction. + COMMENT {@return whether the given stack can be inserted into this inventory + COMMENT at the specified slot position from the given direction} ARG 1 slot ARG 2 stack ARG 3 dir METHOD method_5493 canExtract (ILnet/minecraft/class_1799;Lnet/minecraft/class_2350;)Z - COMMENT Determines whether the given stack can be removed from this inventory at the specified slot position from the given direction. + COMMENT {@return whether the given stack can be removed from this inventory at the + COMMENT specified slot position from the given direction} ARG 1 slot ARG 2 stack ARG 3 dir METHOD method_5494 getAvailableSlots (Lnet/minecraft/class_2350;)[I - COMMENT Gets the available slot positions that are reachable from a given side. + COMMENT {@return the available slot positions that are reachable from a given side} ARG 1 side diff --git a/mappings/net/minecraft/inventory/SimpleInventory.mapping b/mappings/net/minecraft/inventory/SimpleInventory.mapping index 527ad856e6..6bf298927c 100644 --- a/mappings/net/minecraft/inventory/SimpleInventory.mapping +++ b/mappings/net/minecraft/inventory/SimpleInventory.mapping @@ -1,4 +1,21 @@ CLASS net/minecraft/class_1277 net/minecraft/inventory/SimpleInventory + COMMENT A generic implementation of {@link Inventory}. This is used in a number of + COMMENT places, mostly: + COMMENT + COMMENT

      + COMMENT
    • To store the input of a {@link net.minecraft.screen.ScreenHandler} while + COMMENT it is open. The inventory is stored as a field, and the screen handler will have + COMMENT a slot backed by that inventory.
      • + COMMENT
    • When defining the clientside constructor for a {@link + COMMENT net.minecraft.screen.ScreenHandler} subclass. The contents of the inventory will + COMMENT then be automatically synced from the serverside screen handler, which queries + COMMENT the original inventory.
      • + COMMENT
    • For entities and block entities which do not interact with hoppers and therefore + COMMENT do not need to implement {@link Inventory} themselves. + COMMENT
    + COMMENT + COMMENT

    Changes to the inventory can be listened to either by subclassing this and + COMMENT overriding {@link #markDirty}, or by using {@link #addListener}. FIELD field_5828 stacks Lnet/minecraft/class_2371; FIELD field_5829 listeners Ljava/util/List; FIELD field_5831 size I @@ -24,15 +41,37 @@ CLASS net/minecraft/class_1277 net/minecraft/inventory/SimpleInventory METHOD method_24513 (Lnet/minecraft/class_1799;)Z ARG 0 stack METHOD method_24514 clearToList ()Ljava/util/List; - COMMENT Clears this inventory and return all the non-empty stacks in a list. + COMMENT Clears this inventory and returns all the non-empty stacks in a list. + COMMENT + COMMENT @return the non-empty stacks previously in the inventory METHOD method_27070 canInsert (Lnet/minecraft/class_1799;)Z + COMMENT {@return whether {@code stack} can be inserted into this inventory} ARG 1 stack METHOD method_5488 removeListener (Lnet/minecraft/class_1265;)V + COMMENT Removes a {@code listener} previously added by {@code #addListener}. + COMMENT Does nothing when the listener was not found. ARG 1 listener METHOD method_5489 addListener (Lnet/minecraft/class_1265;)V + COMMENT Adds a {@code listener} for inventory modifications. If a listener is + COMMENT added multiple times, it will also be triggered multiple times. ARG 1 listener METHOD method_5491 addStack (Lnet/minecraft/class_1799;)Lnet/minecraft/class_1799; + COMMENT Adds {@code stack} to this inventory as much as possible. It is possible + COMMENT that the item stack gets inserted into a non-empty slot or spread across + COMMENT several slots, if it can combine with other stack(s) in this inventory. + COMMENT + COMMENT @return the leftover part of the stack, or {@code ItemStack#EMPTY} if the entire + COMMENT stack fit inside the inventory ARG 1 stack METHOD method_7659 readNbtList (Lnet/minecraft/class_2499;)V + COMMENT Reads the item stacks from {@code nbtList}. + COMMENT + COMMENT @see #toNbtList ARG 1 nbtList METHOD method_7660 toNbtList ()Lnet/minecraft/class_2499; + COMMENT {@return an NBT list of non-empty {@linkplain ItemStack#writeNbt item stacks}} + COMMENT + COMMENT

    Unlike {@link Inventories#writeNbt(NbtCompound, DefaultedList, boolean)}, + COMMENT this does not serialize the slots. + COMMENT + COMMENT @see #readNbtList diff --git a/mappings/net/minecraft/inventory/SingleStackInventory.mapping b/mappings/net/minecraft/inventory/SingleStackInventory.mapping new file mode 100644 index 0000000000..e6dc38eb12 --- /dev/null +++ b/mappings/net/minecraft/inventory/SingleStackInventory.mapping @@ -0,0 +1,11 @@ +CLASS net/minecraft/class_8181 net/minecraft/inventory/SingleStackInventory + COMMENT An inventory that holds exactly one {@link ItemStack}, at slot {@code 0}. + METHOD method_49274 getStack ()Lnet/minecraft/class_1799; + COMMENT {@return the stack held by the inventory} + METHOD method_49275 setStack (Lnet/minecraft/class_1799;)V + COMMENT Sets the stack held by the inventory to {@code stack}. + ARG 1 stack + METHOD method_49276 removeStack ()Lnet/minecraft/class_1799; + COMMENT Removes the stack held by the inventory. + COMMENT + COMMENT @return the removed stack diff --git a/mappings/net/minecraft/item/ArmorItem.mapping b/mappings/net/minecraft/item/ArmorItem.mapping index 55e6e10a14..7fddbcc0a1 100644 --- a/mappings/net/minecraft/item/ArmorItem.mapping +++ b/mappings/net/minecraft/item/ArmorItem.mapping @@ -1,20 +1,30 @@ CLASS net/minecraft/class_1738 net/minecraft/item/ArmorItem FIELD field_21976 knockbackResistance F FIELD field_23741 attributeModifiers Lcom/google/common/collect/Multimap; - FIELD field_7876 MODIFIERS [Ljava/util/UUID; + FIELD field_41933 type Lnet/minecraft/class_1738$class_8051; + FIELD field_7876 MODIFIERS Ljava/util/EnumMap; FIELD field_7877 toughness F FIELD field_7878 protection I FIELD field_7879 DISPENSER_BEHAVIOR Lnet/minecraft/class_2357; - FIELD field_7880 slot Lnet/minecraft/class_1304; - FIELD field_7881 type Lnet/minecraft/class_1741; - METHOD (Lnet/minecraft/class_1741;Lnet/minecraft/class_1304;Lnet/minecraft/class_1792$class_1793;)V + FIELD field_7881 material Lnet/minecraft/class_1741; + METHOD (Lnet/minecraft/class_1741;Lnet/minecraft/class_1738$class_8051;Lnet/minecraft/class_1792$class_1793;)V ARG 1 material - ARG 2 slot + ARG 2 type ARG 3 settings METHOD method_26353 getToughness ()F + METHOD method_48397 (Ljava/util/EnumMap;)V + ARG 0 uuidMap + METHOD method_48398 getType ()Lnet/minecraft/class_1738$class_8051; METHOD method_7684 dispenseArmor (Lnet/minecraft/class_2342;Lnet/minecraft/class_1799;)Z ARG 0 pointer ARG 1 armor - METHOD method_7685 getSlotType ()Lnet/minecraft/class_1304; METHOD method_7686 getMaterial ()Lnet/minecraft/class_1741; METHOD method_7687 getProtection ()I + CLASS class_8051 Type + FIELD field_41938 equipmentSlot Lnet/minecraft/class_1304; + FIELD field_41939 name Ljava/lang/String; + METHOD (Ljava/lang/String;ILnet/minecraft/class_1304;Ljava/lang/String;)V + ARG 3 equipmentSlot + ARG 4 name + METHOD method_48399 getEquipmentSlot ()Lnet/minecraft/class_1304; + METHOD method_48400 getName ()Ljava/lang/String; diff --git a/mappings/net/minecraft/item/ArmorMaterial.mapping b/mappings/net/minecraft/item/ArmorMaterial.mapping index d1d02d0e44..8d8f6cdf77 100644 --- a/mappings/net/minecraft/item/ArmorMaterial.mapping +++ b/mappings/net/minecraft/item/ArmorMaterial.mapping @@ -9,6 +9,28 @@ CLASS net/minecraft/class_1741 net/minecraft/item/ArmorMaterial COMMENT

    COMMENT {@link ArmorItem} will cover the value returned here into the {@link net.minecraft.entity.attribute.EntityAttributes#GENERIC_KNOCKBACK_RESISTANCE} COMMENT statistic with the {@link net.minecraft.entity.attribute.EntityAttributeModifier.Operation#ADDITION} modifier type. + METHOD method_48402 getDurability (Lnet/minecraft/class_1738$class_8051;)I + COMMENT Returns the total amount of durability points an {@link ArmorItem} using this {@link ArmorMaterial} has. + COMMENT + COMMENT

    + COMMENT The value returned here will set the {@link Item.Settings} max durability option when passed + COMMENT into {@link ArmorItem#ArmorItem(net.minecraft.item.ArmorMaterial, EquipmentSlot, Item.Settings)} + COMMENT if the value was not already specified. + COMMENT + COMMENT @return the total durability an {@link ArmorItem} with this {@link ArmorMaterial} has + ARG 1 type + COMMENT the {@link EquipmentSlot} containing the {@link Item} with this {@link ArmorMaterial} + METHOD method_48403 getProtection (Lnet/minecraft/class_1738$class_8051;)I + COMMENT Returns the amount of armor protection points offered by an {@link ArmorItem} + COMMENT using this {@link ArmorMaterial} while it is worn by a player. + COMMENT + COMMENT

    + COMMENT The protection value returned here is applied as an {@link net.minecraft.entity.attribute.EntityAttributeModifier} + COMMENT to a player wearing the {@link ArmorItem} piece via the {@link net.minecraft.entity.attribute.EntityAttributeModifier.Operation#ADDITION} modifier. + COMMENT + COMMENT @return the amount of armor protection points offered by an {@link ArmorItem} with this {@link ArmorMaterial} + ARG 1 type + COMMENT the {@link EquipmentSlot} containing the {@link Item} with this {@link ArmorMaterial} METHOD method_7694 getName ()Ljava/lang/String; COMMENT Returns the {@code name} of this {@link ArmorMaterial}, which is used for locating armor texture files. COMMENT @@ -31,28 +53,6 @@ CLASS net/minecraft/class_1741 net/minecraft/item/ArmorMaterial COMMENT back to this method. COMMENT COMMENT @return the {@link Ingredient} required to repair items with this {@link ArmorMaterial} - METHOD method_7696 getDurability (Lnet/minecraft/class_1304;)I - COMMENT Returns the total amount of durability points an {@link ArmorItem} using this {@link ArmorMaterial} has. - COMMENT - COMMENT

    - COMMENT The value returned here will set the {@link Item.Settings} max durability option when passed - COMMENT into {@link ArmorItem#ArmorItem(net.minecraft.item.ArmorMaterial, EquipmentSlot, Item.Settings)} - COMMENT if the value was not already specified. - COMMENT - COMMENT @return the total durability an {@link ArmorItem} with this {@link ArmorMaterial} has - ARG 1 slot - COMMENT the {@link EquipmentSlot} containing the {@link Item} with this {@link ArmorMaterial} - METHOD method_7697 getProtectionAmount (Lnet/minecraft/class_1304;)I - COMMENT Returns the amount of armor protection points offered by an {@link ArmorItem} - COMMENT using this {@link ArmorMaterial} while it is worn by a player. - COMMENT - COMMENT

    - COMMENT The protection value returned here is applied as an {@link net.minecraft.entity.attribute.EntityAttributeModifier} - COMMENT to a player wearing the {@link ArmorItem} piece via the {@link net.minecraft.entity.attribute.EntityAttributeModifier.Operation#ADDITION} modifier. - COMMENT - COMMENT @return the amount of armor protection points offered by an {@link ArmorItem} with this {@link ArmorMaterial} - ARG 1 slot - COMMENT the {@link EquipmentSlot} containing the {@link Item} with this {@link ArmorMaterial} METHOD method_7698 getEquipSound ()Lnet/minecraft/class_3414; COMMENT @return the {@link SoundEvent} played when a {@link net.minecraft.entity.LivingEntity} equips an {@link ArmorItem} using this {@link ArmorMaterial} METHOD method_7699 getEnchantability ()I diff --git a/mappings/net/minecraft/item/ArmorMaterials.mapping b/mappings/net/minecraft/item/ArmorMaterials.mapping index 11ce37273e..e68e18b10f 100644 --- a/mappings/net/minecraft/item/ArmorMaterials.mapping +++ b/mappings/net/minecraft/item/ArmorMaterials.mapping @@ -1,15 +1,16 @@ CLASS net/minecraft/class_1740 net/minecraft/item/ArmorMaterials FIELD field_21978 knockbackResistance F + FIELD field_41941 CODEC Lnet/minecraft/class_3542$class_7292; + FIELD field_41942 BASE_DURABILITY Ljava/util/EnumMap; + FIELD field_41943 protectionAmounts Ljava/util/EnumMap; FIELD field_7883 durabilityMultiplier I FIELD field_7884 name Ljava/lang/String; FIELD field_7885 repairIngredientSupplier Lnet/minecraft/class_3528; FIELD field_7886 equipSound Lnet/minecraft/class_3414; FIELD field_7887 CHAIN Lnet/minecraft/class_1740; - FIELD field_7891 BASE_DURABILITY [I - FIELD field_7893 protectionAmounts [I FIELD field_7894 toughness F FIELD field_7896 enchantability I - METHOD (Ljava/lang/String;ILjava/lang/String;I[IILnet/minecraft/class_3414;FFLjava/util/function/Supplier;)V + METHOD (Ljava/lang/String;ILjava/lang/String;ILjava/util/EnumMap;ILnet/minecraft/class_3414;FFLjava/util/function/Supplier;)V ARG 3 name ARG 4 durabilityMultiplier ARG 5 protectionAmounts @@ -18,3 +19,19 @@ CLASS net/minecraft/class_1740 net/minecraft/item/ArmorMaterials ARG 8 toughness ARG 9 knockbackResistance ARG 10 repairIngredientSupplier + METHOD method_48405 (Ljava/util/EnumMap;)V + ARG 0 map + METHOD method_48406 (Ljava/util/EnumMap;)V + ARG 0 map + METHOD method_48407 (Ljava/util/EnumMap;)V + ARG 0 map + METHOD method_48408 (Ljava/util/EnumMap;)V + ARG 0 map + METHOD method_48409 (Ljava/util/EnumMap;)V + ARG 0 map + METHOD method_48410 (Ljava/util/EnumMap;)V + ARG 0 map + METHOD method_48411 (Ljava/util/EnumMap;)V + ARG 0 map + METHOD method_48412 (Ljava/util/EnumMap;)V + ARG 0 map diff --git a/mappings/net/minecraft/item/ArmorStandItem.mapping b/mappings/net/minecraft/item/ArmorStandItem.mapping index 7a5597b9c7..61cf838849 100644 --- a/mappings/net/minecraft/item/ArmorStandItem.mapping +++ b/mappings/net/minecraft/item/ArmorStandItem.mapping @@ -1,4 +1 @@ CLASS net/minecraft/class_1742 net/minecraft/item/ArmorStandItem - METHOD method_7701 setRotations (Lnet/minecraft/class_1531;Lnet/minecraft/class_5819;)V - ARG 1 stand - ARG 2 random diff --git a/mappings/net/minecraft/item/BannerItem.mapping b/mappings/net/minecraft/item/BannerItem.mapping index 7745300eb2..4bbca4e5ca 100644 --- a/mappings/net/minecraft/item/BannerItem.mapping +++ b/mappings/net/minecraft/item/BannerItem.mapping @@ -1,5 +1,9 @@ CLASS net/minecraft/class_1746 net/minecraft/item/BannerItem FIELD field_30848 TRANSLATION_KEY_PREFIX Ljava/lang/String; + METHOD (Lnet/minecraft/class_2248;Lnet/minecraft/class_2248;Lnet/minecraft/class_1792$class_1793;)V + ARG 1 bannerBlock + ARG 2 wallBannerBlock + ARG 3 settings METHOD method_43707 (Ljava/util/List;Lnet/minecraft/class_1767;Ljava/lang/String;)V ARG 2 translationKey METHOD method_43708 (Lnet/minecraft/class_5321;)Ljava/lang/String; diff --git a/mappings/net/minecraft/item/BowItem.mapping b/mappings/net/minecraft/item/BowItem.mapping index 3a9ce29a76..d1cbdb6777 100644 --- a/mappings/net/minecraft/item/BowItem.mapping +++ b/mappings/net/minecraft/item/BowItem.mapping @@ -1,4 +1,5 @@ CLASS net/minecraft/class_1753 net/minecraft/item/BowItem + FIELD field_30855 TICKS_PER_SECOND I FIELD field_30856 RANGE I METHOD method_20270 (Lnet/minecraft/class_1657;Lnet/minecraft/class_1657;)V ARG 1 p diff --git a/mappings/net/minecraft/item/BrushItem.mapping b/mappings/net/minecraft/item/BrushItem.mapping new file mode 100644 index 0000000000..3298cff96d --- /dev/null +++ b/mappings/net/minecraft/item/BrushItem.mapping @@ -0,0 +1,19 @@ +CLASS net/minecraft/class_8162 net/minecraft/item/BrushItem + FIELD field_42683 MAX_BRUSH_TIME I + FIELD field_44603 MAX_BRUSH_DISTANCE D + METHOD method_49184 addDustParticles (Lnet/minecraft/class_1937;Lnet/minecraft/class_3965;Lnet/minecraft/class_2680;Lnet/minecraft/class_243;Lnet/minecraft/class_1306;)V + ARG 1 world + ARG 2 hitResult + ARG 3 state + ARG 4 userRotation + ARG 5 arm + METHOD method_49999 getHitResult (Lnet/minecraft/class_1309;)Lnet/minecraft/class_239; + ARG 1 user + METHOD method_51163 (Lnet/minecraft/class_1304;Lnet/minecraft/class_1309;)V + ARG 1 userx + METHOD method_51309 (Lnet/minecraft/class_1297;)Z + ARG 0 entity + CLASS class_8163 DustParticlesOffset + METHOD method_49185 fromSide (Lnet/minecraft/class_243;Lnet/minecraft/class_2350;)Lnet/minecraft/class_8162$class_8163; + ARG 0 userRotation + ARG 1 side diff --git a/mappings/net/minecraft/item/BundleItem.mapping b/mappings/net/minecraft/item/BundleItem.mapping index df89820c48..4c090d6cd0 100644 --- a/mappings/net/minecraft/item/BundleItem.mapping +++ b/mappings/net/minecraft/item/BundleItem.mapping @@ -2,6 +2,7 @@ CLASS net/minecraft/class_5537 net/minecraft/item/BundleItem FIELD field_27016 ITEM_BAR_COLOR I FIELD field_30857 MAX_STORAGE I FIELD field_30858 ITEMS_KEY Ljava/lang/String; + FIELD field_30859 BUNDLE_ITEM_OCCUPANCY I METHOD method_31558 (Lnet/minecraft/class_1799;Lnet/minecraft/class_2487;)Z ARG 1 item METHOD method_31560 addToBundle (Lnet/minecraft/class_1799;Lnet/minecraft/class_1799;)I diff --git a/mappings/net/minecraft/item/CommandBlockItem.mapping b/mappings/net/minecraft/item/CommandBlockItem.mapping deleted file mode 100644 index ce0d8b5b12..0000000000 --- a/mappings/net/minecraft/item/CommandBlockItem.mapping +++ /dev/null @@ -1 +0,0 @@ -CLASS net/minecraft/class_1788 net/minecraft/item/CommandBlockItem diff --git a/mappings/net/minecraft/item/CrossbowItem.mapping b/mappings/net/minecraft/item/CrossbowItem.mapping index c2758acc4f..f43d5ea0a6 100644 --- a/mappings/net/minecraft/item/CrossbowItem.mapping +++ b/mappings/net/minecraft/item/CrossbowItem.mapping @@ -2,6 +2,9 @@ CLASS net/minecraft/class_1764 net/minecraft/item/CrossbowItem FIELD field_30863 RANGE I FIELD field_30864 CHARGED_KEY Ljava/lang/String; FIELD field_30865 CHARGED_PROJECTILES_KEY Ljava/lang/String; + FIELD field_30866 DEFAULT_PULL_TIME I + FIELD field_30869 DEFAULT_SPEED F + FIELD field_30870 FIREWORK_ROCKET_SPEED F FIELD field_7936 loaded Z FIELD field_7937 charged Z METHOD method_18814 createArrow (Lnet/minecraft/class_1937;Lnet/minecraft/class_1309;Lnet/minecraft/class_1799;Lnet/minecraft/class_1799;)Lnet/minecraft/class_1665; @@ -34,7 +37,7 @@ CLASS net/minecraft/class_1764 net/minecraft/item/CrossbowItem ARG 0 crossbow METHOD method_7767 loadProjectiles (Lnet/minecraft/class_1309;Lnet/minecraft/class_1799;)Z ARG 0 shooter - ARG 1 projectile + ARG 1 crossbow METHOD method_7768 (Lnet/minecraft/class_1792;Lnet/minecraft/class_1799;)Z ARG 1 s METHOD method_7769 postShoot (Lnet/minecraft/class_1937;Lnet/minecraft/class_1309;Lnet/minecraft/class_1799;)V diff --git a/mappings/net/minecraft/item/DecorationItem.mapping b/mappings/net/minecraft/item/DecorationItem.mapping index eda1874f1a..5d80c7f8e6 100644 --- a/mappings/net/minecraft/item/DecorationItem.mapping +++ b/mappings/net/minecraft/item/DecorationItem.mapping @@ -1,8 +1,13 @@ CLASS net/minecraft/class_1790 net/minecraft/item/DecorationItem + FIELD field_42467 RANDOM_TEXT Lnet/minecraft/class_2561; FIELD field_7999 entityType Lnet/minecraft/class_1299; METHOD (Lnet/minecraft/class_1299;Lnet/minecraft/class_1792$class_1793;)V ARG 1 type ARG 2 settings + METHOD method_48959 (Ljava/util/List;Lnet/minecraft/class_5321;)V + ARG 1 key + METHOD method_48960 (Ljava/util/List;Lnet/minecraft/class_6880;)V + ARG 1 variant METHOD method_7834 canPlaceOn (Lnet/minecraft/class_1657;Lnet/minecraft/class_2350;Lnet/minecraft/class_1799;Lnet/minecraft/class_2338;)Z ARG 1 player ARG 2 side diff --git a/mappings/net/minecraft/item/DyeItem.mapping b/mappings/net/minecraft/item/DyeItem.mapping index e9f2362cd2..2c6d43cc05 100644 --- a/mappings/net/minecraft/item/DyeItem.mapping +++ b/mappings/net/minecraft/item/DyeItem.mapping @@ -4,6 +4,8 @@ CLASS net/minecraft/class_1769 net/minecraft/item/DyeItem METHOD (Lnet/minecraft/class_1767;Lnet/minecraft/class_1792$class_1793;)V ARG 1 color ARG 2 settings + METHOD method_49799 (Lnet/minecraft/class_8242;)Lnet/minecraft/class_8242; + ARG 1 text METHOD method_7802 getColor ()Lnet/minecraft/class_1767; METHOD method_7803 byColor (Lnet/minecraft/class_1767;)Lnet/minecraft/class_1769; ARG 0 color diff --git a/mappings/net/minecraft/item/Equipment.mapping b/mappings/net/minecraft/item/Equipment.mapping new file mode 100644 index 0000000000..0f4fc4d6b4 --- /dev/null +++ b/mappings/net/minecraft/item/Equipment.mapping @@ -0,0 +1,13 @@ +CLASS net/minecraft/class_5151 net/minecraft/item/Equipment + COMMENT Represents a type of item that is wearable in an armor equipment slot, or a shield. + COMMENT + COMMENT

    This type of item can be targeted by the {@code minecraft:binding_curse} enchantment. + METHOD method_31570 getEquipSound ()Lnet/minecraft/class_3414; + METHOD method_48576 equipAndSwap (Lnet/minecraft/class_1792;Lnet/minecraft/class_1937;Lnet/minecraft/class_1657;Lnet/minecraft/class_1268;)Lnet/minecraft/class_1271; + ARG 1 item + ARG 2 world + ARG 3 user + ARG 4 hand + METHOD method_48957 fromStack (Lnet/minecraft/class_1799;)Lnet/minecraft/class_5151; + ARG 0 stack + METHOD method_7685 getSlotType ()Lnet/minecraft/class_1304; diff --git a/mappings/net/minecraft/item/FilledMapItem.mapping b/mappings/net/minecraft/item/FilledMapItem.mapping index 348c979b5b..e0c8fc67ca 100644 --- a/mappings/net/minecraft/item/FilledMapItem.mapping +++ b/mappings/net/minecraft/item/FilledMapItem.mapping @@ -1,6 +1,8 @@ CLASS net/minecraft/class_1806 net/minecraft/item/FilledMapItem FIELD field_30909 DEFAULT_MAP_COLOR I FIELD field_30910 MAP_KEY Ljava/lang/String; + FIELD field_41067 MAP_SCALE_DIRECTION_KEY Ljava/lang/String; + FIELD field_41068 MAP_TO_LOCK_KEY Ljava/lang/String; METHOD method_17440 getMapName (I)Ljava/lang/String; ARG 0 mapId METHOD method_17442 copyMap (Lnet/minecraft/class_1937;Lnet/minecraft/class_1799;)V @@ -47,7 +49,7 @@ CLASS net/minecraft/class_1806 net/minecraft/item/FilledMapItem ARG 5 showIcons ARG 6 unlimitedTracking ARG 7 dimension - METHOD method_8001 getOrCreateMapState (Lnet/minecraft/class_1799;Lnet/minecraft/class_1937;)Lnet/minecraft/class_22; + METHOD method_8001 getMapState (Lnet/minecraft/class_1799;Lnet/minecraft/class_1937;)Lnet/minecraft/class_22; ARG 0 map ARG 1 world METHOD method_8002 fillExplorationMap (Lnet/minecraft/class_3218;Lnet/minecraft/class_1799;)V diff --git a/mappings/net/minecraft/item/FireworkRocketItem.mapping b/mappings/net/minecraft/item/FireworkRocketItem.mapping index c3cc9e57ba..d2e234ab57 100644 --- a/mappings/net/minecraft/item/FireworkRocketItem.mapping +++ b/mappings/net/minecraft/item/FireworkRocketItem.mapping @@ -8,16 +8,19 @@ CLASS net/minecraft/class_1781 net/minecraft/item/FireworkRocketItem FIELD field_30881 FLICKER_KEY Ljava/lang/String; FIELD field_30882 COLORS_KEY Ljava/lang/String; FIELD field_30883 FADE_COLORS_KEY Ljava/lang/String; + FIELD field_30884 OFFSET_POS_MULTIPLIER D + FIELD field_41064 FLIGHT_VALUES [B + METHOD method_47368 setFlight (Lnet/minecraft/class_1799;B)V + ARG 0 stack + ARG 1 flight CLASS class_1782 Type FIELD field_7971 name Ljava/lang/String; FIELD field_7972 id I - FIELD field_7975 TYPES [Lnet/minecraft/class_1781$class_1782; + FIELD field_7975 BY_ID Ljava/util/function/IntFunction; METHOD (Ljava/lang/String;IILjava/lang/String;)V ARG 3 id ARG 4 name METHOD method_7812 getName ()Ljava/lang/String; METHOD method_7813 byId (I)Lnet/minecraft/class_1781$class_1782; ARG 0 id - METHOD method_7814 (Lnet/minecraft/class_1781$class_1782;)I - ARG 0 type METHOD method_7816 getId ()I diff --git a/mappings/net/minecraft/item/GlowInkSacItem.mapping b/mappings/net/minecraft/item/GlowInkSacItem.mapping new file mode 100644 index 0000000000..53f1eaab56 --- /dev/null +++ b/mappings/net/minecraft/item/GlowInkSacItem.mapping @@ -0,0 +1,3 @@ +CLASS net/minecraft/class_8232 net/minecraft/item/GlowInkSacItem + METHOD method_49800 (Lnet/minecraft/class_8242;)Lnet/minecraft/class_8242; + ARG 0 text diff --git a/mappings/net/minecraft/item/GoatHornItem.mapping b/mappings/net/minecraft/item/GoatHornItem.mapping index 66dc4f1141..35abfac97a 100644 --- a/mappings/net/minecraft/item/GoatHornItem.mapping +++ b/mappings/net/minecraft/item/GoatHornItem.mapping @@ -22,3 +22,7 @@ CLASS net/minecraft/class_7430 net/minecraft/item/GoatHornItem ARG 1 entryList METHOD method_43711 getInstrument (Lnet/minecraft/class_1799;)Ljava/util/Optional; ARG 1 stack + METHOD method_45432 (Lnet/minecraft/class_6880;)Ljava/lang/Integer; + ARG 0 instrument + METHOD method_45433 (Lnet/minecraft/class_1799;Lnet/minecraft/class_6880;)V + ARG 1 instrument diff --git a/mappings/net/minecraft/item/HangingSignItem.mapping b/mappings/net/minecraft/item/HangingSignItem.mapping new file mode 100644 index 0000000000..f3d84b4cf2 --- /dev/null +++ b/mappings/net/minecraft/item/HangingSignItem.mapping @@ -0,0 +1,5 @@ +CLASS net/minecraft/class_7707 net/minecraft/item/HangingSignItem + METHOD (Lnet/minecraft/class_2248;Lnet/minecraft/class_2248;Lnet/minecraft/class_1792$class_1793;)V + ARG 1 hangingSign + ARG 2 wallHangingSign + ARG 3 settings diff --git a/mappings/net/minecraft/item/InkSacItem.mapping b/mappings/net/minecraft/item/InkSacItem.mapping new file mode 100644 index 0000000000..8814dbb65b --- /dev/null +++ b/mappings/net/minecraft/item/InkSacItem.mapping @@ -0,0 +1,3 @@ +CLASS net/minecraft/class_8233 net/minecraft/item/InkSacItem + METHOD method_49802 (Lnet/minecraft/class_8242;)Lnet/minecraft/class_8242; + ARG 0 text diff --git a/mappings/net/minecraft/item/Instrument.mapping b/mappings/net/minecraft/item/Instrument.mapping index 35561d5f10..af649b87cc 100644 --- a/mappings/net/minecraft/item/Instrument.mapping +++ b/mappings/net/minecraft/item/Instrument.mapping @@ -1,2 +1,4 @@ CLASS net/minecraft/class_7444 net/minecraft/item/Instrument FIELD field_39122 CODEC Lcom/mojang/serialization/Codec; + METHOD method_43709 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 0 instance diff --git a/mappings/net/minecraft/item/Item.mapping b/mappings/net/minecraft/item/Item.mapping index cd99c07a5b..1c1935371d 100644 --- a/mappings/net/minecraft/item/Item.mapping +++ b/mappings/net/minecraft/item/Item.mapping @@ -6,12 +6,11 @@ CLASS net/minecraft/class_1792 net/minecraft/item/Item COMMENT is held by an {@link ItemStack} which represents a stack of specific item. Therefore, COMMENT there is one - and only one - instance of Item for one item (like apples, oak planks, etc), COMMENT while there can be infinite amounts of {@link ItemStack} instances. This also means that - COMMENT items themselves cannot hold NBT data. To append item stacks with NBT data to the - COMMENT creative inventory, override {@link #appendStacks}. + COMMENT items themselves cannot hold NBT data. COMMENT COMMENT

    Items with no custom behavior, like diamonds, can call the constructor of Item COMMENT directly. If a custom behavior is needed, this should be subclassed. Items also have - COMMENT to be registered in the {@link net.minecraft.util.registry.Registry#ITEM} registry. + COMMENT to be registered in the {@link net.minecraft.registry.Registries#ITEM} registry. COMMENT COMMENT

    Many methods of this class are called on both the logical client and logical server, COMMENT so take caution when using those methods. The logical side can be checked using @@ -27,10 +26,12 @@ CLASS net/minecraft/class_1792 net/minecraft/item/Item FIELD field_21979 fireproof Z FIELD field_27017 LOGGER Lorg/slf4j/Logger; FIELD field_30887 DEFAULT_MAX_COUNT I + FIELD field_30888 DEFAULT_MAX_USE_TIME I + FIELD field_30889 ITEM_BAR_STEPS I FIELD field_36401 registryEntry Lnet/minecraft/class_6880$class_6883; + FIELD field_40209 requiredFeatures Lnet/minecraft/class_7699; FIELD field_8001 ATTACK_SPEED_MODIFIER_ID Ljava/util/UUID; FIELD field_8003 BLOCK_ITEMS Ljava/util/Map; - FIELD field_8004 group Lnet/minecraft/class_1761; FIELD field_8006 ATTACK_DAMAGE_MODIFIER_ID Ljava/util/UUID; FIELD field_8008 recipeRemainder Lnet/minecraft/class_1792; FIELD field_8009 rarity Lnet/minecraft/class_1814; @@ -119,8 +120,6 @@ CLASS net/minecraft/class_1792 net/minecraft/item/Item COMMENT

    When overriding this, {@link #isItemBarVisible} and {@link #getItemBarColor} should COMMENT also be overridden. ARG 1 stack - METHOD method_31570 getEquipSound ()Lnet/minecraft/class_3414; - COMMENT {@return the sound for equipping the item, or {@code null} if no sound is played} METHOD method_31571 getItemBarColor (Lnet/minecraft/class_1799;)I COMMENT {@return the RGB color of the item bar, usually used for durability display} COMMENT @@ -212,15 +211,6 @@ CLASS net/minecraft/class_1792 net/minecraft/item/Item ARG 3 entity ARG 4 hand METHOD method_7848 getName ()Lnet/minecraft/class_2561; - METHOD method_7850 appendStacks (Lnet/minecraft/class_1761;Lnet/minecraft/class_2371;)V - COMMENT Appends the stacks of this item shown in the item group to the list. - COMMENT - COMMENT

    This can be overridden to append item stacks with custom NBT data to the - COMMENT creative inventory. - COMMENT - COMMENT @see #isIn(ItemGroup) - ARG 1 group - ARG 2 stacks METHOD method_7851 appendTooltip (Lnet/minecraft/class_1799;Lnet/minecraft/class_1937;Ljava/util/List;Lnet/minecraft/class_1836;)V COMMENT Called by the client to append tooltips to an item. Subclasses can override COMMENT this and add custom tooltips to {@code tooltip} list. @@ -263,7 +253,6 @@ CLASS net/minecraft/class_1792 net/minecraft/item/Item 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 postProcessNbt (Lnet/minecraft/class_2487;)V COMMENT Processes the NBT applied to an item stack of this item. COMMENT @@ -337,11 +326,6 @@ CLASS net/minecraft/class_1792 net/minecraft/item/Item ARG 0 id METHOD method_7876 getTranslationKey ()Ljava/lang/String; COMMENT Gets the translation key of this item. - METHOD method_7877 isIn (Lnet/minecraft/class_1761;)Z - COMMENT Checks whether this item should appear in a specified item group. - COMMENT - COMMENT @return true if the item is in the specified item group or the item group is {@link net.minecraft.item.ItemGroup#SEARCH}. - ARG 1 group METHOD method_7878 canRepair (Lnet/minecraft/class_1799;Lnet/minecraft/class_1799;)Z COMMENT {@return whether {@code stack} can be repaired using {@code ingredient}} COMMENT @@ -416,12 +400,12 @@ CLASS net/minecraft/class_1792 net/minecraft/item/Item COMMENT whether the item is in the selected hotbar slot CLASS class_1793 Settings COMMENT Item settings configure behaviors common to all items, such as the stack's max - COMMENT count and the item group. An instance of this must be passed to the constructor + COMMENT count. An instance of this must be passed to the constructor COMMENT of {@link Item} (or most of its subclasses). FIELD field_18673 foodComponent Lnet/minecraft/class_4174; FIELD field_21980 fireproof Z + FIELD field_40210 requiredFeatures Lnet/minecraft/class_7699; FIELD field_8016 rarity Lnet/minecraft/class_1814; - FIELD field_8017 group Lnet/minecraft/class_1761; FIELD field_8018 recipeRemainder Lnet/minecraft/class_1792; FIELD field_8019 maxDamage I FIELD field_8020 maxCount I @@ -435,6 +419,8 @@ CLASS net/minecraft/class_1792 net/minecraft/item/Item COMMENT If called, any item with this Settings instance is immune to fire and lava damage. COMMENT COMMENT @return this instance + METHOD method_45434 requires ([Lnet/minecraft/class_7696;)Lnet/minecraft/class_1792$class_1793; + ARG 1 features METHOD method_7889 maxCount (I)Lnet/minecraft/class_1792$class_1793; COMMENT Sets the maximum stack count of any ItemStack with an Item using this Settings instance. COMMENT @@ -446,12 +432,6 @@ CLASS net/minecraft/class_1792 net/minecraft/item/Item COMMENT @return this instance ARG 1 maxCount COMMENT maximum stack count of any ItemStack with an item using this Settings instance - METHOD method_7892 group (Lnet/minecraft/class_1761;)Lnet/minecraft/class_1792$class_1793; - COMMENT Sets the ItemGroup of any item using this Settings instance. ItemGroups represent tabs in the creative inventory. - COMMENT - COMMENT @return this instance - ARG 1 group - COMMENT {@link ItemGroup itemGroup} to use METHOD method_7894 rarity (Lnet/minecraft/class_1814;)Lnet/minecraft/class_1792$class_1793; COMMENT Sets the {@link Rarity} of any item configured with this Settings instance, which changes the color of its name. COMMENT diff --git a/mappings/net/minecraft/item/ItemGroup.mapping b/mappings/net/minecraft/item/ItemGroup.mapping index c0736268c9..c9b36da955 100644 --- a/mappings/net/minecraft/item/ItemGroup.mapping +++ b/mappings/net/minecraft/item/ItemGroup.mapping @@ -1,60 +1,121 @@ CLASS net/minecraft/class_1761 net/minecraft/item/ItemGroup COMMENT A group of items that the items belong to. This is used by the creative inventory. - COMMENT Use {@link Item.Settings#group(ItemGroup)} to assign an item group to an item. - COMMENT - COMMENT @see Item#appendStacks - COMMENT @see Item#isIn(ItemGroup) FIELD field_26391 displayName Lnet/minecraft/class_2561; - FIELD field_7914 REDSTONE Lnet/minecraft/class_1761; - FIELD field_7915 SEARCH Lnet/minecraft/class_1761; - FIELD field_7916 COMBAT Lnet/minecraft/class_1761; + FIELD field_40859 displayStacks Ljava/util/Collection; + FIELD field_40860 searchTabStacks Ljava/util/Set; + FIELD field_41031 special Z + FIELD field_41032 row Lnet/minecraft/class_1761$class_7915; + FIELD field_41033 column I + FIELD field_41034 type Lnet/minecraft/class_1761$class_7916; + FIELD field_41035 searchProviderReloader Ljava/util/function/Consumer; + FIELD field_41036 iconSupplier Ljava/util/function/Supplier; + FIELD field_41037 entryCollector Lnet/minecraft/class_1761$class_7914; FIELD field_7917 renderName Z - FIELD field_7918 INVENTORY Lnet/minecraft/class_1761; FIELD field_7919 texture Ljava/lang/String; FIELD field_7920 scrollbar Z - FIELD field_7921 GROUPS [Lnet/minecraft/class_1761; - FIELD field_7922 FOOD Lnet/minecraft/class_1761; - FIELD field_7923 TRANSPORTATION Lnet/minecraft/class_1761; - FIELD field_7924 BREWING Lnet/minecraft/class_1761; - FIELD field_7925 HOTBAR Lnet/minecraft/class_1761; - FIELD field_7926 name Ljava/lang/String; - FIELD field_7927 enchantments [Lnet/minecraft/class_1886; - FIELD field_7928 DECORATIONS Lnet/minecraft/class_1761; - FIELD field_7929 MATERIALS Lnet/minecraft/class_1761; - FIELD field_7930 TOOLS Lnet/minecraft/class_1761; - FIELD field_7931 BUILDING_BLOCKS Lnet/minecraft/class_1761; - FIELD field_7932 MISC Lnet/minecraft/class_1761; - FIELD field_7933 index I FIELD field_7934 icon Lnet/minecraft/class_1799; - FIELD field_7935 id Ljava/lang/String; - METHOD (ILjava/lang/String;)V - ARG 1 index - ARG 2 id + METHOD (Lnet/minecraft/class_1761$class_7915;ILnet/minecraft/class_1761$class_7916;Lnet/minecraft/class_2561;Ljava/util/function/Supplier;Lnet/minecraft/class_1761$class_7914;)V + ARG 1 row + ARG 2 column + ARG 3 type + ARG 4 displayName + ARG 5 iconSupplier + ARG 6 entryCollector + METHOD method_45412 contains (Lnet/minecraft/class_1799;)Z + ARG 1 stack + METHOD method_45414 getSearchTabStacks ()Ljava/util/Collection; + METHOD method_47306 updateEntries (Lnet/minecraft/class_1761$class_8128;)V + ARG 1 displayContext + METHOD method_47307 create (Lnet/minecraft/class_1761$class_7915;I)Lnet/minecraft/class_1761$class_7913; + ARG 0 location + ARG 1 column + METHOD method_47308 setSearchProviderReloader (Ljava/util/function/Consumer;)V + ARG 1 searchProviderReloader + METHOD method_47309 getRow ()Lnet/minecraft/class_1761$class_7915; + METHOD method_47310 hasStacks ()Z + METHOD method_47311 shouldDisplay ()Z + METHOD method_47312 getType ()Lnet/minecraft/class_1761$class_7916; + METHOD method_47313 getDisplayStacks ()Ljava/util/Collection; + METHOD method_47314 reloadSearchProvider ()V METHOD method_7737 getDisplayName ()Lnet/minecraft/class_2561; - METHOD method_7738 appendStacks (Lnet/minecraft/class_2371;)V - ARG 1 stacks - METHOD method_7739 setName (Ljava/lang/String;)Lnet/minecraft/class_1761; - ARG 1 name - METHOD method_7740 containsEnchantments (Lnet/minecraft/class_1886;)Z - ARG 1 target - METHOD method_7741 getIndex ()I METHOD method_7742 getTexture ()Ljava/lang/String; METHOD method_7743 getColumn ()I - METHOD method_7744 getEnchantments ()[Lnet/minecraft/class_1886; - METHOD method_7745 setEnchantments ([Lnet/minecraft/class_1886;)Lnet/minecraft/class_1761; - ARG 1 targets METHOD method_7747 getIcon ()Lnet/minecraft/class_1799; - METHOD method_7748 hideName ()Lnet/minecraft/class_1761; - COMMENT Specifies that when this item group is selected, the name of the item group should not be rendered. - METHOD method_7749 setNoScrollbar ()Lnet/minecraft/class_1761; - METHOD method_7750 createIcon ()Lnet/minecraft/class_1799; - METHOD method_7751 getName ()Ljava/lang/String; METHOD method_7752 isSpecial ()Z - METHOD method_7753 setTexture (Ljava/lang/String;)Lnet/minecraft/class_1761; - ARG 1 texture METHOD method_7754 shouldRenderName ()Z COMMENT Checks if this item group should render its name. COMMENT COMMENT

    The name is rendered below the top row of item groups and above the inventory. - METHOD method_7755 isTopRow ()Z METHOD method_7756 hasScrollbar ()Z + CLASS class_7703 EntriesImpl + FIELD field_40187 parentTabStacks Ljava/util/Collection; + FIELD field_40188 searchTabStacks Ljava/util/Set; + FIELD field_40189 group Lnet/minecraft/class_1761; + FIELD field_40190 enabledFeatures Lnet/minecraft/class_7699; + METHOD (Lnet/minecraft/class_1761;Lnet/minecraft/class_7699;)V + ARG 1 group + ARG 2 enabledFeatures + CLASS class_7704 Entries + METHOD method_45417 add (Lnet/minecraft/class_1799;Lnet/minecraft/class_1761$class_7705;)V + ARG 1 stack + ARG 2 visibility + METHOD method_45419 (Lnet/minecraft/class_1761$class_7705;Lnet/minecraft/class_1799;)V + ARG 2 stack + METHOD method_45420 add (Lnet/minecraft/class_1799;)V + ARG 1 stack + METHOD method_45421 add (Lnet/minecraft/class_1935;)V + ARG 1 item + METHOD method_45422 add (Lnet/minecraft/class_1935;Lnet/minecraft/class_1761$class_7705;)V + ARG 1 item + ARG 2 visibility + METHOD method_45423 addAll (Ljava/util/Collection;)V + ARG 1 stacks + METHOD method_45424 addAll (Ljava/util/Collection;Lnet/minecraft/class_1761$class_7705;)V + ARG 1 stacks + ARG 2 visibility + CLASS class_7705 StackVisibility + CLASS class_7913 Builder + FIELD field_41038 EMPTY_ENTRIES Lnet/minecraft/class_1761$class_7914; + FIELD field_41039 row Lnet/minecraft/class_1761$class_7915; + FIELD field_41040 column I + FIELD field_41041 displayName Lnet/minecraft/class_2561; + FIELD field_41042 iconSupplier Ljava/util/function/Supplier; + FIELD field_41043 entryCollector Lnet/minecraft/class_1761$class_7914; + FIELD field_41044 scrollbar Z + FIELD field_41045 renderName Z + FIELD field_41046 special Z + FIELD field_41047 type Lnet/minecraft/class_1761$class_7916; + FIELD field_41048 texture Ljava/lang/String; + METHOD (Lnet/minecraft/class_1761$class_7915;I)V + ARG 1 row + ARG 2 column + METHOD method_47315 special ()Lnet/minecraft/class_1761$class_7913; + METHOD method_47316 (Lnet/minecraft/class_1761$class_8128;Lnet/minecraft/class_1761$class_7704;)V + ARG 0 displayContext + ARG 1 entries + METHOD method_47317 entries (Lnet/minecraft/class_1761$class_7914;)Lnet/minecraft/class_1761$class_7913; + ARG 1 entryCollector + METHOD method_47318 type (Lnet/minecraft/class_1761$class_7916;)Lnet/minecraft/class_1761$class_7913; + ARG 1 type + METHOD method_47319 texture (Ljava/lang/String;)Lnet/minecraft/class_1761$class_7913; + ARG 1 texture + METHOD method_47320 icon (Ljava/util/function/Supplier;)Lnet/minecraft/class_1761$class_7913; + ARG 1 iconSupplier + METHOD method_47321 displayName (Lnet/minecraft/class_2561;)Lnet/minecraft/class_1761$class_7913; + ARG 1 displayName + METHOD method_47322 noRenderedName ()Lnet/minecraft/class_1761$class_7913; + METHOD method_47323 noScrollbar ()Lnet/minecraft/class_1761$class_7913; + METHOD method_47324 build ()Lnet/minecraft/class_1761; + CLASS class_7914 EntryCollector + METHOD accept (Lnet/minecraft/class_1761$class_8128;Lnet/minecraft/class_1761$class_7704;)V + ARG 1 displayContext + ARG 2 entries + CLASS class_7915 Row + CLASS class_7916 Type + CLASS class_8128 DisplayContext + FIELD comp_1253 lookup Lnet/minecraft/class_7225$class_7874; + METHOD comp_1253 lookup ()Lnet/minecraft/class_7225$class_7874; + METHOD method_48932 doesNotMatch (Lnet/minecraft/class_7699;ZLnet/minecraft/class_7225$class_7874;)Z + ARG 1 enabledFeatures + ARG 2 hasPermissions + ARG 3 lookup diff --git a/mappings/net/minecraft/item/ItemGroups.mapping b/mappings/net/minecraft/item/ItemGroups.mapping new file mode 100644 index 0000000000..84b5ef558f --- /dev/null +++ b/mappings/net/minecraft/item/ItemGroups.mapping @@ -0,0 +1,155 @@ +CLASS net/minecraft/class_7706 net/minecraft/item/ItemGroups + FIELD field_40195 BUILDING_BLOCKS Lnet/minecraft/class_5321; + FIELD field_40197 FUNCTIONAL Lnet/minecraft/class_5321; + FIELD field_40198 REDSTONE Lnet/minecraft/class_5321; + FIELD field_40199 HOTBAR Lnet/minecraft/class_5321; + FIELD field_40200 SEARCH Lnet/minecraft/class_5321; + FIELD field_40202 COMBAT Lnet/minecraft/class_5321; + FIELD field_40205 SPAWN_EGGS Lnet/minecraft/class_5321; + FIELD field_40206 INVENTORY Lnet/minecraft/class_5321; + FIELD field_40743 NATURAL Lnet/minecraft/class_5321; + FIELD field_41059 COLORED_BLOCKS Lnet/minecraft/class_5321; + FIELD field_41060 TOOLS Lnet/minecraft/class_5321; + FIELD field_41061 FOOD_AND_DRINK Lnet/minecraft/class_5321; + FIELD field_41062 INGREDIENTS Lnet/minecraft/class_5321; + FIELD field_41063 OPERATOR Lnet/minecraft/class_5321; + FIELD field_42465 PAINTING_VARIANT_COMPARATOR Ljava/util/Comparator; + FIELD field_42466 displayContext Lnet/minecraft/class_1761$class_8128; + METHOD method_45426 addInstruments (Lnet/minecraft/class_1761$class_7704;Lnet/minecraft/class_7225;Lnet/minecraft/class_1792;Lnet/minecraft/class_6862;Lnet/minecraft/class_1761$class_7705;)V + ARG 0 entries + ARG 1 registryWrapper + ARG 2 item + ARG 3 instrumentTag + ARG 4 visibility + METHOD method_45427 addPotions (Lnet/minecraft/class_1761$class_7704;Lnet/minecraft/class_7225;Lnet/minecraft/class_1792;Lnet/minecraft/class_1761$class_7705;)V + ARG 0 entries + ARG 1 registryWrapper + ARG 2 item + ARG 3 visibility + METHOD method_45428 addMaxLevelEnchantedBooks (Lnet/minecraft/class_1761$class_7704;Lnet/minecraft/class_7225;Ljava/util/Set;Lnet/minecraft/class_1761$class_7705;)V + ARG 0 entries + ARG 1 registryWrapper + ARG 2 enchantmentTargets + ARG 3 visibility + METHOD method_45430 addAllLevelEnchantedBooks (Lnet/minecraft/class_1761$class_7704;Lnet/minecraft/class_7225;Ljava/util/Set;Lnet/minecraft/class_1761$class_7705;)V + ARG 0 entries + ARG 1 registryWrapper + ARG 2 enchantmentTargets + ARG 3 visibility + METHOD method_47328 getDefaultTab ()Lnet/minecraft/class_1761; + METHOD method_47330 updateDisplayContext (Lnet/minecraft/class_7699;ZLnet/minecraft/class_7225$class_7874;)Z + ARG 0 enabledFeatures + ARG 1 operatorEnabled + ARG 2 lookup + METHOD method_47331 (Lnet/minecraft/class_1761$class_8128;Lnet/minecraft/class_1761;)V + ARG 1 group + METHOD method_47332 addSuspiciousStews (Lnet/minecraft/class_1761$class_7704;Lnet/minecraft/class_1761$class_7705;)V + ARG 0 entries + ARG 1 visibility + METHOD method_47333 (Lnet/minecraft/class_1761;)Z + ARG 0 group + METHOD method_47334 collect ()V + METHOD method_47335 getGroupsToDisplay ()Ljava/util/List; + METHOD method_47337 updateEntries (Lnet/minecraft/class_1761$class_8128;)V + ARG 0 displayContext + METHOD method_47338 (Lnet/minecraft/class_1761$class_8128;Lnet/minecraft/class_1761;)V + ARG 1 group + METHOD method_47339 addFireworkRockets (Lnet/minecraft/class_1761$class_7704;Lnet/minecraft/class_1761$class_7705;)V + ARG 0 entries + ARG 1 visibility + METHOD method_47340 (Lnet/minecraft/class_1761;)Z + ARG 0 group + METHOD method_47341 getGroups ()Ljava/util/List; + METHOD method_47344 getSearchGroup ()Lnet/minecraft/class_1761; + METHOD method_48933 (Lnet/minecraft/class_1535;)I + ARG 0 paintingVariant + METHOD method_48934 (Lnet/minecraft/class_1761$class_7704;Lnet/minecraft/class_1761$class_7705;Lnet/minecraft/class_1799;)V + ARG 2 stack + METHOD method_48935 (Lnet/minecraft/class_1761$class_7704;Lnet/minecraft/class_1761$class_7705;Lnet/minecraft/class_6880$class_6883;)V + ARG 2 variant + METHOD method_48937 addPaintings (Lnet/minecraft/class_1761$class_7704;Lnet/minecraft/class_7225$class_7226;Ljava/util/function/Predicate;Lnet/minecraft/class_1761$class_7705;)V + ARG 0 entries + ARG 1 registryWrapper + ARG 2 predicate + ARG 3 visibility + METHOD method_48939 (Lnet/minecraft/class_1792;Lnet/minecraft/class_1761$class_7704;Lnet/minecraft/class_1761$class_7705;Lnet/minecraft/class_6885$class_6888;)V + ARG 3 entryList + METHOD method_48940 (Lnet/minecraft/class_1792;Lnet/minecraft/class_6880$class_6883;)Lnet/minecraft/class_1799; + ARG 1 entry + METHOD method_48941 (Lnet/minecraft/class_1792;Lnet/minecraft/class_6880;)Lnet/minecraft/class_1799; + ARG 1 instrument + METHOD method_48942 (Lnet/minecraft/class_1887;)Ljava/util/stream/Stream; + ARG 0 enchantment + METHOD method_48943 (Lnet/minecraft/class_1887;I)Lnet/minecraft/class_1799; + ARG 1 level + METHOD method_48944 (Lnet/minecraft/class_6880$class_6883;)Z + ARG 0 entry + METHOD method_48946 (Ljava/util/Set;Lnet/minecraft/class_1887;)Z + ARG 1 enchantment + METHOD method_48947 (Lnet/minecraft/class_1761$class_7704;Lnet/minecraft/class_1761$class_7705;Lnet/minecraft/class_1799;)V + ARG 2 stack + METHOD method_48949 (Lnet/minecraft/class_1887;)Lnet/minecraft/class_1799; + ARG 0 enchantment + METHOD method_48951 (Ljava/util/Set;Lnet/minecraft/class_1887;)Z + ARG 1 enchantment + METHOD method_48952 (Lnet/minecraft/class_1761$class_7704;Lnet/minecraft/class_1761$class_7705;Lnet/minecraft/class_1799;)V + ARG 2 stack + METHOD method_48954 (Lnet/minecraft/class_1761$class_7704;Lnet/minecraft/class_1761$class_7705;Lnet/minecraft/class_1799;)V + ARG 2 stack + METHOD method_51311 (Lnet/minecraft/class_1761$class_8128;Lnet/minecraft/class_1761$class_7704;)V + ARG 0 displayContext + ARG 1 entries + METHOD method_51312 (Lnet/minecraft/class_1761$class_7704;Lnet/minecraft/class_7225$class_7226;)V + ARG 1 wrapper + METHOD method_51313 (Lnet/minecraft/class_1761$class_7704;Ljava/util/Set;Lnet/minecraft/class_7225$class_7226;)V + ARG 2 wrapper + METHOD method_51314 (Lnet/minecraft/class_6880;)Z + ARG 0 registryEntry + METHOD method_51315 registerAndGetDefault (Lnet/minecraft/class_2378;)Lnet/minecraft/class_1761; + ARG 0 registry + METHOD method_51316 (Lnet/minecraft/class_2378;Lnet/minecraft/class_1761$class_8128;Lnet/minecraft/class_1761$class_7704;)V + ARG 1 displayContext + ARG 2 entries + METHOD method_51317 register (Ljava/lang/String;)Lnet/minecraft/class_5321; + ARG 0 id + METHOD method_51318 (Lnet/minecraft/class_1761$class_8128;Lnet/minecraft/class_1761$class_7704;)V + ARG 0 displayContext + ARG 1 entries + METHOD method_51319 (Lnet/minecraft/class_1761$class_7704;Lnet/minecraft/class_7225$class_7226;)V + ARG 1 wrapper + METHOD method_51320 (Lnet/minecraft/class_6880;)Z + ARG 0 registryEntry + METHOD method_51321 (Lnet/minecraft/class_1761$class_8128;Lnet/minecraft/class_1761$class_7704;)V + ARG 0 displayContext + ARG 1 entries + METHOD method_51322 (Lnet/minecraft/class_1761$class_7704;Lnet/minecraft/class_7225$class_7226;)V + ARG 1 wrapper + METHOD method_51323 (Lnet/minecraft/class_1761$class_8128;Lnet/minecraft/class_1761$class_7704;)V + ARG 0 displayContext + ARG 1 entries + METHOD method_51324 (Lnet/minecraft/class_1761$class_7704;Lnet/minecraft/class_7225$class_7226;)V + ARG 1 wrapper + METHOD method_51325 (Lnet/minecraft/class_1761$class_8128;Lnet/minecraft/class_1761$class_7704;)V + ARG 0 displayContext + ARG 1 entries + METHOD method_51326 (Lnet/minecraft/class_1761$class_7704;Lnet/minecraft/class_7225$class_7226;)V + ARG 1 wrapper + METHOD method_51327 stream ()Ljava/util/stream/Stream; + METHOD method_51328 (Lnet/minecraft/class_1761$class_8128;Lnet/minecraft/class_1761$class_7704;)V + ARG 0 displayContext + ARG 1 entries + METHOD method_51330 (Lnet/minecraft/class_1761$class_8128;Lnet/minecraft/class_1761$class_7704;)V + ARG 0 displayContext + ARG 1 entries + METHOD method_51332 (Lnet/minecraft/class_1761$class_8128;Lnet/minecraft/class_1761$class_7704;)V + ARG 0 displayContext + ARG 1 entries + METHOD method_51334 (Lnet/minecraft/class_1761$class_8128;Lnet/minecraft/class_1761$class_7704;)V + ARG 0 displayContext + ARG 1 entries + METHOD method_51336 (Lnet/minecraft/class_1761$class_8128;Lnet/minecraft/class_1761$class_7704;)V + ARG 0 displayContext + ARG 1 entries + METHOD method_51338 (Lnet/minecraft/class_1761$class_8128;Lnet/minecraft/class_1761$class_7704;)V + ARG 0 displayContext + ARG 1 entries diff --git a/mappings/net/minecraft/item/ItemStack.mapping b/mappings/net/minecraft/item/ItemStack.mapping index a6424cfbc2..d6c188484a 100644 --- a/mappings/net/minecraft/item/ItemStack.mapping +++ b/mappings/net/minecraft/item/ItemStack.mapping @@ -104,11 +104,11 @@ CLASS net/minecraft/class_1799 net/minecraft/item/ItemStack FIELD field_30902 HIDE_FLAGS_KEY Ljava/lang/String; FIELD field_34453 destroyChecker Lnet/minecraft/class_6538; FIELD field_34454 placeChecker Lnet/minecraft/class_6538; + FIELD field_40211 DISABLED_TEXT Lnet/minecraft/class_2561; FIELD field_8029 MODIFIER_FORMAT Ljava/text/DecimalFormat; FIELD field_8030 bobbingAnimationTime I FIELD field_8031 count I FIELD field_8033 LOGGER Lorg/slf4j/Logger; - FIELD field_8036 empty Z FIELD field_8037 EMPTY Lnet/minecraft/class_1799; COMMENT The empty item stack that holds no item. COMMENT @@ -168,10 +168,6 @@ CLASS net/minecraft/class_1799 net/minecraft/item/ItemStack ARG 0 instance METHOD method_28377 (Lnet/minecraft/class_1799;)Ljava/util/Optional; ARG 0 stack - METHOD method_28378 (Lnet/minecraft/class_1799;)Ljava/lang/Integer; - ARG 0 stack - METHOD method_28379 (Lnet/minecraft/class_1799;)Lnet/minecraft/class_1792; - ARG 0 stack METHOD method_30266 getHideFlags ()I 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. @@ -179,7 +175,6 @@ CLASS net/minecraft/class_1799 net/minecraft/item/ItemStack ARG 1 tooltipSection METHOD method_30268 addHideFlag (Lnet/minecraft/class_1799$class_5422;)V ARG 1 tooltipSection - METHOD method_31572 getEquipSound ()Lnet/minecraft/class_3414; METHOD method_31573 isIn (Lnet/minecraft/class_6862;)Z COMMENT {@return whether the item is in {@code tag}} ARG 1 tag @@ -232,6 +227,13 @@ CLASS net/minecraft/class_1799 net/minecraft/item/ItemStack COMMENT @see #isOf(Item) ARG 1 predicate METHOD method_41409 getRegistryEntry ()Lnet/minecraft/class_6880; + METHOD method_45435 isItemEnabled (Lnet/minecraft/class_7699;)Z + ARG 1 enabledFeatures + METHOD method_46651 copyWithCount (I)Lnet/minecraft/class_1799; + ARG 1 count + METHOD method_51164 copyAndEmpty ()Lnet/minecraft/class_1799; + METHOD method_53187 itemMatches (Lnet/minecraft/class_6885;)Z + ARG 1 registryEntryList METHOD method_7909 getItem ()Lnet/minecraft/class_1792; COMMENT {@return the item of this stack} COMMENT @@ -328,9 +330,6 @@ CLASS net/minecraft/class_1799 net/minecraft/item/ItemStack COMMENT {@return the stack's repair cost used in anvils} COMMENT COMMENT

    This is the the value of the {@value #REPAIR_COST_KEY} key in NBT. - METHOD method_7929 isItemEqual (Lnet/minecraft/class_1799;)Z - COMMENT {@return whether this stack and {@code stack} hold the same item} - ARG 1 stack METHOD method_7930 onStoppedUsing (Lnet/minecraft/class_1937;Lnet/minecraft/class_1309;I)V ARG 1 world ARG 2 user @@ -450,7 +449,6 @@ CLASS net/minecraft/class_1799 net/minecraft/item/ItemStack ARG 3 breakCallback COMMENT the callback that takes the entity holding the stack and is executed COMMENT when the item breaks - METHOD method_7957 updateEmptyState ()V METHOD method_7958 hasGlint ()Z METHOD method_7959 setSubNbt (Ljava/lang/String;Lnet/minecraft/class_2520;)V COMMENT Sets the given NBT element in the item stack's custom NBT at the specified key. @@ -468,8 +466,6 @@ CLASS net/minecraft/class_1799 net/minecraft/item/ItemStack COMMENT @see #setHolder COMMENT @see #getFrame COMMENT @see #getHolder - METHOD method_7962 isItemEqualIgnoreDamage (Lnet/minecraft/class_1799;)Z - ARG 1 stack METHOD method_7963 isDamageable ()Z COMMENT {@return whether the item can be damaged (lose durability)} COMMENT @@ -485,9 +481,6 @@ CLASS net/minecraft/class_1799 net/minecraft/item/ItemStack METHOD method_7966 (Lnet/minecraft/class_2583;)Lnet/minecraft/class_2583; ARG 1 style METHOD method_7967 isUsedOnRelease ()Z - METHOD method_7968 isEqual (Lnet/minecraft/class_1799;)Z - COMMENT {@return whether this stack and {@code stack} are equal, including the item count and NBT} - ARG 1 stack METHOD method_7969 getNbt ()Lnet/minecraft/class_2487; COMMENT {@return the custom NBT of this item stack, may be {@code null}} COMMENT @@ -549,10 +542,6 @@ CLASS net/minecraft/class_1799 net/minecraft/item/ItemStack COMMENT @see #damage(int, Random, ServerPlayerEntity) COMMENT @see #damage(int, LivingEntity, Consumer) ARG 1 damage - METHOD method_7975 areNbtEqual (Lnet/minecraft/class_1799;Lnet/minecraft/class_1799;)Z - COMMENT {@return whether the given item stacks have equivalent NBT data} - ARG 0 left - ARG 1 right METHOD method_7976 getUseAction ()Lnet/minecraft/class_1839; METHOD method_7977 setCustomName (Lnet/minecraft/class_2561;)Lnet/minecraft/class_1799; COMMENT Sets the custom name of this item stack to {@code name}. If {@code null} is @@ -593,7 +582,7 @@ CLASS net/minecraft/class_1799 net/minecraft/item/ItemStack COMMENT COMMENT @see Item Stack NBT Operations ARG 1 key - METHOD method_7984 areItemsEqualIgnoreDamage (Lnet/minecraft/class_1799;Lnet/minecraft/class_1799;)Z + METHOD method_7984 areItemsEqual (Lnet/minecraft/class_1799;Lnet/minecraft/class_1799;)Z ARG 0 left ARG 1 right METHOD method_7985 hasNbt ()Z @@ -605,13 +594,6 @@ CLASS net/minecraft/class_1799 net/minecraft/item/ItemStack COMMENT COMMENT @see #isDamageable COMMENT @see #getDamage - METHOD method_7987 areItemsEqual (Lnet/minecraft/class_1799;Lnet/minecraft/class_1799;)Z - COMMENT {@return whether the given item stacks' items are equal} - COMMENT - COMMENT @see #areEqual - COMMENT @see #canCombine - ARG 0 left - ARG 1 right CLASS class_5422 TooltipSection FIELD field_25775 flag I METHOD method_30269 getFlag ()I diff --git a/mappings/net/minecraft/item/ItemStackSet.mapping b/mappings/net/minecraft/item/ItemStackSet.mapping new file mode 100644 index 0000000000..cfb08f19a3 --- /dev/null +++ b/mappings/net/minecraft/item/ItemStackSet.mapping @@ -0,0 +1,11 @@ +CLASS net/minecraft/class_7708 net/minecraft/item/ItemStackSet + FIELD field_40212 HASH_STRATEGY Lit/unimi/dsi/fastutil/Hash$Strategy; + METHOD method_47572 create ()Ljava/util/Set; + METHOD method_47573 getHashCode (Lnet/minecraft/class_1799;)I + ARG 0 stack + CLASS 1 + METHOD equals (Ljava/lang/Object;Ljava/lang/Object;)Z + ARG 1 first + ARG 2 second + METHOD hashCode (Ljava/lang/Object;)I + ARG 1 stack diff --git a/mappings/net/minecraft/item/ItemUsageContext.mapping b/mappings/net/minecraft/item/ItemUsageContext.mapping index fa107a20dd..ec2eeab428 100644 --- a/mappings/net/minecraft/item/ItemUsageContext.mapping +++ b/mappings/net/minecraft/item/ItemUsageContext.mapping @@ -22,7 +22,11 @@ CLASS net/minecraft/class_1838 net/minecraft/item/ItemUsageContext METHOD method_8037 getBlockPos ()Lnet/minecraft/class_2338; METHOD method_8038 getSide ()Lnet/minecraft/class_2350; METHOD method_8041 getStack ()Lnet/minecraft/class_1799; - METHOD method_8042 getPlayerFacing ()Lnet/minecraft/class_2350; + METHOD method_8042 getHorizontalPlayerFacing ()Lnet/minecraft/class_2350; + COMMENT {@return the {@linkplain PlayerEntity#getHorizontalFacing horizontal facing + COMMENT direction} of the player} + COMMENT + COMMENT @implSpec If the player is {@code null}, returns {@link Direction#NORTH}. METHOD method_8044 getPlayerYaw ()F METHOD method_8045 getWorld ()Lnet/minecraft/class_1937; METHOD method_8046 shouldCancelInteraction ()Z diff --git a/mappings/net/minecraft/item/Items.mapping b/mappings/net/minecraft/item/Items.mapping index 69e8e2bb3d..3c91fc1428 100644 --- a/mappings/net/minecraft/item/Items.mapping +++ b/mappings/net/minecraft/item/Items.mapping @@ -322,6 +322,45 @@ CLASS net/minecraft/class_1802 net/minecraft/item/Items FIELD field_37541 PEARLESCENT_FROGLIGHT Lnet/minecraft/class_1792; FIELD field_37542 FROGSPAWN Lnet/minecraft/class_1792; FIELD field_38418 REINFORCED_DEEPSLATE Lnet/minecraft/class_1792; + FIELD field_40213 BAMBOO_PLANKS Lnet/minecraft/class_1792; + FIELD field_40214 BAMBOO_MOSAIC Lnet/minecraft/class_1792; + FIELD field_40215 CHISELED_BOOKSHELF Lnet/minecraft/class_1792; + FIELD field_40216 BAMBOO_SLAB Lnet/minecraft/class_1792; + FIELD field_40217 BAMBOO_MOSAIC_SLAB Lnet/minecraft/class_1792; + FIELD field_40218 BAMBOO_FENCE Lnet/minecraft/class_1792; + FIELD field_40219 BAMBOO_STAIRS Lnet/minecraft/class_1792; + FIELD field_40220 BAMBOO_MOSAIC_STAIRS Lnet/minecraft/class_1792; + FIELD field_40221 BAMBOO_PRESSURE_PLATE Lnet/minecraft/class_1792; + FIELD field_40222 BAMBOO_DOOR Lnet/minecraft/class_1792; + FIELD field_40223 BAMBOO_BUTTON Lnet/minecraft/class_1792; + FIELD field_40226 BAMBOO_TRAPDOOR Lnet/minecraft/class_1792; + FIELD field_40227 BAMBOO_FENCE_GATE Lnet/minecraft/class_1792; + FIELD field_41065 STRIPPED_BAMBOO_BLOCK Lnet/minecraft/class_1792; + FIELD field_41066 BAMBOO_BLOCK Lnet/minecraft/class_1792; + FIELD field_41304 PIGLIN_HEAD Lnet/minecraft/class_1792; + FIELD field_42687 CHERRY_PLANKS Lnet/minecraft/class_1792; + FIELD field_42688 CHERRY_SAPLING Lnet/minecraft/class_1792; + FIELD field_42689 SUSPICIOUS_SAND Lnet/minecraft/class_1792; + FIELD field_42690 STRIPPED_CHERRY_WOOD Lnet/minecraft/class_1792; + FIELD field_42691 CHERRY_WOOD Lnet/minecraft/class_1792; + FIELD field_42692 CHERRY_LOG Lnet/minecraft/class_1792; + FIELD field_42693 STRIPPED_CHERRY_LOG Lnet/minecraft/class_1792; + FIELD field_42694 CHERRY_LEAVES Lnet/minecraft/class_1792; + FIELD field_42695 TORCHFLOWER Lnet/minecraft/class_1792; + FIELD field_42696 PINK_PETALS Lnet/minecraft/class_1792; + FIELD field_42697 CHERRY_SLAB Lnet/minecraft/class_1792; + FIELD field_42698 CHERRY_FENCE Lnet/minecraft/class_1792; + FIELD field_42699 DECORATED_POT Lnet/minecraft/class_1792; + FIELD field_42700 CHERRY_STAIRS Lnet/minecraft/class_1792; + FIELD field_42701 CHERRY_BUTTON Lnet/minecraft/class_1792; + FIELD field_42702 CHERRY_TRAPDOOR Lnet/minecraft/class_1792; + FIELD field_42703 CHERRY_FENCE_GATE Lnet/minecraft/class_1792; + FIELD field_42704 CHERRY_PRESSURE_PLATE Lnet/minecraft/class_1792; + FIELD field_42705 CHERRY_DOOR Lnet/minecraft/class_1792; + FIELD field_43191 SUSPICIOUS_GRAVEL Lnet/minecraft/class_1792; + FIELD field_43192 PITCHER_PLANT Lnet/minecraft/class_1792; + FIELD field_43193 SNIFFER_EGG Lnet/minecraft/class_1792; + FIELD field_43194 CALIBRATED_SCULK_SENSOR Lnet/minecraft/class_1792; FIELD field_8043 ORANGE_TERRACOTTA Lnet/minecraft/class_1792; FIELD field_8047 JUNGLE_PRESSURE_PLATE Lnet/minecraft/class_1792; FIELD field_8048 SPRUCE_BUTTON Lnet/minecraft/class_1792; @@ -776,20 +815,12 @@ CLASS net/minecraft/class_1802 net/minecraft/item/Items FIELD field_8889 YELLOW_GLAZED_TERRACOTTA Lnet/minecraft/class_1792; FIELD field_8890 MOSSY_STONE_BRICK_STAIRS Lnet/minecraft/class_1792; FIELD field_8893 BLUE_BED Lnet/minecraft/class_1792; - METHOD method_35220 register (Lnet/minecraft/class_2248;Lnet/minecraft/class_1761;[Lnet/minecraft/class_2248;)Lnet/minecraft/class_1792; + METHOD method_35220 register (Lnet/minecraft/class_2248;[Lnet/minecraft/class_2248;)Lnet/minecraft/class_1792; ARG 0 block - ARG 1 group - ARG 2 blocks - METHOD method_36679 register (Lnet/minecraft/class_2248;Ljava/util/Optional;)Lnet/minecraft/class_1792; - ARG 0 block - ARG 1 group - METHOD method_36680 createEmptyOptional (Ljava/lang/Object;)Ljava/util/Optional; - ARG 0 of - METHOD method_36682 (Lnet/minecraft/class_2248;Lnet/minecraft/class_1761;)Lnet/minecraft/class_1792; - ARG 1 group - METHOD method_7988 register (Lnet/minecraft/class_2248;Lnet/minecraft/class_1761;)Lnet/minecraft/class_1792; - ARG 0 block - ARG 1 group + ARG 1 blocks + METHOD method_51348 register (Lnet/minecraft/class_5321;Lnet/minecraft/class_1792;)Lnet/minecraft/class_1792; + ARG 0 key + ARG 1 item METHOD method_7989 register (Lnet/minecraft/class_2248;)Lnet/minecraft/class_1792; ARG 0 block METHOD method_7990 register (Lnet/minecraft/class_2960;Lnet/minecraft/class_1792;)Lnet/minecraft/class_1792; diff --git a/mappings/net/minecraft/item/OperatorOnlyBlockItem.mapping b/mappings/net/minecraft/item/OperatorOnlyBlockItem.mapping new file mode 100644 index 0000000000..8f017bfc70 --- /dev/null +++ b/mappings/net/minecraft/item/OperatorOnlyBlockItem.mapping @@ -0,0 +1 @@ +CLASS net/minecraft/class_1788 net/minecraft/item/OperatorOnlyBlockItem diff --git a/mappings/net/minecraft/item/ShieldItem.mapping b/mappings/net/minecraft/item/ShieldItem.mapping index 128eab6058..d18c9b5a9c 100644 --- a/mappings/net/minecraft/item/ShieldItem.mapping +++ b/mappings/net/minecraft/item/ShieldItem.mapping @@ -1,4 +1,5 @@ CLASS net/minecraft/class_1819 net/minecraft/item/ShieldItem + FIELD field_30919 MIN_DAMAGE_AMOUNT_TO_BREAK F FIELD field_30920 BASE_KEY Ljava/lang/String; METHOD method_8013 getColor (Lnet/minecraft/class_1799;)Lnet/minecraft/class_1767; ARG 0 stack diff --git a/mappings/net/minecraft/item/SignChangingItem.mapping b/mappings/net/minecraft/item/SignChangingItem.mapping new file mode 100644 index 0000000000..304722da23 --- /dev/null +++ b/mappings/net/minecraft/item/SignChangingItem.mapping @@ -0,0 +1,9 @@ +CLASS net/minecraft/class_8234 net/minecraft/item/SignChangingItem + METHOD method_49798 useOnSign (Lnet/minecraft/class_1937;Lnet/minecraft/class_2625;ZLnet/minecraft/class_1657;)Z + ARG 1 world + ARG 2 signBlockEntity + ARG 3 front + ARG 4 player + METHOD method_49801 canUseOnSignText (Lnet/minecraft/class_8242;Lnet/minecraft/class_1657;)Z + ARG 1 signText + ARG 2 player diff --git a/mappings/net/minecraft/item/SignItem.mapping b/mappings/net/minecraft/item/SignItem.mapping index cca1289ef8..dd827c114c 100644 --- a/mappings/net/minecraft/item/SignItem.mapping +++ b/mappings/net/minecraft/item/SignItem.mapping @@ -3,3 +3,8 @@ CLASS net/minecraft/class_1822 net/minecraft/item/SignItem ARG 1 settings ARG 2 standingBlock ARG 3 wallBlock + METHOD (Lnet/minecraft/class_1792$class_1793;Lnet/minecraft/class_2248;Lnet/minecraft/class_2248;Lnet/minecraft/class_2350;)V + ARG 1 settings + ARG 2 standingBlock + ARG 3 wallBlock + ARG 4 verticalAttachmentDirection diff --git a/mappings/net/minecraft/item/SkullItem.mapping b/mappings/net/minecraft/item/SkullItem.mapping index ed88e0a7d3..72774a78cc 100644 --- a/mappings/net/minecraft/item/SkullItem.mapping +++ b/mappings/net/minecraft/item/SkullItem.mapping @@ -1,4 +1,6 @@ CLASS net/minecraft/class_1809 net/minecraft/item/SkullItem FIELD field_30916 SKULL_OWNER_KEY Ljava/lang/String; - METHOD method_37231 (Lnet/minecraft/class_2487;Lcom/mojang/authlib/GameProfile;)V - ARG 1 profile + METHOD (Lnet/minecraft/class_2248;Lnet/minecraft/class_2248;Lnet/minecraft/class_1792$class_1793;)V + ARG 1 block + ARG 2 wallBlock + ARG 3 settings diff --git a/mappings/net/minecraft/item/SmithingTemplateItem.mapping b/mappings/net/minecraft/item/SmithingTemplateItem.mapping new file mode 100644 index 0000000000..080beae689 --- /dev/null +++ b/mappings/net/minecraft/item/SmithingTemplateItem.mapping @@ -0,0 +1,58 @@ +CLASS net/minecraft/class_8052 net/minecraft/item/SmithingTemplateItem + FIELD field_41958 EMPTY_SLOT_SWORD_TEXTURE Lnet/minecraft/class_2960; + FIELD field_41959 EMPTY_SLOT_SHOVEL_TEXTURE Lnet/minecraft/class_2960; + FIELD field_41960 EMPTY_SLOT_PICKAXE_TEXTURE Lnet/minecraft/class_2960; + FIELD field_41961 EMPTY_SLOT_INGOT_TEXTURE Lnet/minecraft/class_2960; + FIELD field_41962 EMPTY_SLOT_REDSTONE_DUST_TEXTURE Lnet/minecraft/class_2960; + FIELD field_41963 EMPTY_SLOT_QUARTZ_TEXTURE Lnet/minecraft/class_2960; + FIELD field_41964 EMPTY_SLOT_EMERALD_TEXTURE Lnet/minecraft/class_2960; + FIELD field_41965 EMPTY_SLOT_DIAMOND_TEXTURE Lnet/minecraft/class_2960; + FIELD field_41966 EMPTY_SLOT_LAPIS_LAZULI_TEXTURE Lnet/minecraft/class_2960; + FIELD field_41967 appliesToText Lnet/minecraft/class_2561; + FIELD field_41968 ingredientsText Lnet/minecraft/class_2561; + FIELD field_41969 titleText Lnet/minecraft/class_2561; + FIELD field_41970 baseSlotDescriptionText Lnet/minecraft/class_2561; + FIELD field_41971 additionsSlotDescriptionText Lnet/minecraft/class_2561; + FIELD field_41972 emptyBaseSlotTextures Ljava/util/List; + FIELD field_41973 emptyAdditionsSlotTextures Ljava/util/List; + FIELD field_41974 TITLE_FORMATTING Lnet/minecraft/class_124; + FIELD field_41975 DESCRIPTION_FORMATTING Lnet/minecraft/class_124; + FIELD field_41977 INGREDIENTS_TEXT Lnet/minecraft/class_2561; + FIELD field_41978 APPLIES_TO_TEXT Lnet/minecraft/class_2561; + FIELD field_41979 NETHERITE_UPGRADE_TEXT Lnet/minecraft/class_2561; + FIELD field_41980 ARMOR_TRIM_APPLIES_TO_TEXT Lnet/minecraft/class_2561; + FIELD field_41981 ARMOR_TRIM_INGREDIENTS_TEXT Lnet/minecraft/class_2561; + FIELD field_41982 ARMOR_TRIM_BASE_SLOT_DESCRIPTION_TEXT Lnet/minecraft/class_2561; + FIELD field_41983 ARMOR_TRIM_ADDITIONS_SLOT_DESCRIPTION_TEXT Lnet/minecraft/class_2561; + FIELD field_41984 NETHERITE_UPGRADE_APPLIES_TO_TEXT Lnet/minecraft/class_2561; + FIELD field_41985 NETHERITE_UPGRADE_INGREDIENTS_TEXT Lnet/minecraft/class_2561; + FIELD field_41986 NETHERITE_UPGRADE_BASE_SLOT_DESCRIPTION_TEXT Lnet/minecraft/class_2561; + FIELD field_41987 NETHERITE_UPGRADE_ADDITIONS_SLOT_DESCRIPTION_TEXT Lnet/minecraft/class_2561; + FIELD field_41988 EMPTY_ARMOR_SLOT_HELMET_TEXTURE Lnet/minecraft/class_2960; + FIELD field_41989 EMPTY_ARMOR_SLOT_CHESTPLATE_TEXTURE Lnet/minecraft/class_2960; + FIELD field_41990 EMPTY_ARMOR_SLOT_LEGGINGS_TEXTURE Lnet/minecraft/class_2960; + FIELD field_41991 EMPTY_ARMOR_SLOT_BOOTS_TEXTURE Lnet/minecraft/class_2960; + FIELD field_41992 EMPTY_SLOT_HOE_TEXTURE Lnet/minecraft/class_2960; + FIELD field_41993 EMPTY_SLOT_AXE_TEXTURE Lnet/minecraft/class_2960; + FIELD field_42472 EMPTY_SLOT_AMETHYST_SHARD_TEXTURE Lnet/minecraft/class_2960; + METHOD (Lnet/minecraft/class_2561;Lnet/minecraft/class_2561;Lnet/minecraft/class_2561;Lnet/minecraft/class_2561;Lnet/minecraft/class_2561;Ljava/util/List;Ljava/util/List;)V + ARG 1 appliesToText + ARG 2 ingredientsText + ARG 3 titleText + ARG 4 baseSlotDescriptionText + ARG 5 additionsSlotDescriptionText + ARG 6 emptyBaseSlotTextures + ARG 7 emptyAdditionsSlotTextures + METHOD method_48413 getEmptyAdditionsSlotTextures ()Ljava/util/List; + METHOD method_48414 getArmorTrimEmptyBaseSlotTextures ()Ljava/util/List; + METHOD method_48415 getArmorTrimEmptyAdditionsSlotTextures ()Ljava/util/List; + METHOD method_48416 getNetheriteUpgradeEmptyBaseSlotTextures ()Ljava/util/List; + METHOD method_48417 getNetheriteUpgradeEmptyAdditionsSlotTextures ()Ljava/util/List; + METHOD method_48418 of (Lnet/minecraft/class_5321;)Lnet/minecraft/class_8052; + ARG 0 trimPattern + METHOD method_48419 of (Lnet/minecraft/class_2960;)Lnet/minecraft/class_8052; + ARG 0 trimPatternIn + METHOD method_48420 createNetheriteUpgrade ()Lnet/minecraft/class_8052; + METHOD method_48421 getBaseSlotDescription ()Lnet/minecraft/class_2561; + METHOD method_48422 getAdditionsSlotDescription ()Lnet/minecraft/class_2561; + METHOD method_48423 getEmptyBaseSlotTextures ()Ljava/util/List; diff --git a/mappings/net/minecraft/item/SuspiciousStewItem.mapping b/mappings/net/minecraft/item/SuspiciousStewItem.mapping index c3778126bf..d01f5ec084 100644 --- a/mappings/net/minecraft/item/SuspiciousStewItem.mapping +++ b/mappings/net/minecraft/item/SuspiciousStewItem.mapping @@ -1,8 +1,16 @@ CLASS net/minecraft/class_1830 net/minecraft/item/SuspiciousStewItem FIELD field_30923 EFFECTS_KEY Ljava/lang/String; - FIELD field_30924 EFFECT_ID_KEY Ljava/lang/String; - FIELD field_30925 EFFECT_DURATION_KEY Ljava/lang/String; - METHOD method_8021 addEffectToStew (Lnet/minecraft/class_1799;Lnet/minecraft/class_1291;I)V + FIELD field_41069 DEFAULT_DURATION I + METHOD method_47369 forEachEffect (Lnet/minecraft/class_1799;Ljava/util/function/Consumer;)V ARG 0 stew + ARG 1 effectConsumer + METHOD method_53205 (Lnet/minecraft/class_1309;Lnet/minecraft/class_7917$class_8751;)V ARG 1 effect - ARG 2 duration + METHOD method_53206 (Ljava/util/List;Lnet/minecraft/class_7917$class_8751;)V + ARG 1 effect + METHOD method_53209 addEffectsToStew (Lnet/minecraft/class_1799;Ljava/util/List;)V + ARG 0 stew + ARG 1 stewEffects + METHOD method_8021 writeEffectsToStew (Lnet/minecraft/class_1799;Ljava/util/List;)V + ARG 0 stew + ARG 1 stewEffects diff --git a/mappings/net/minecraft/item/TridentItem.mapping b/mappings/net/minecraft/item/TridentItem.mapping index 565e725362..29ca0398a6 100644 --- a/mappings/net/minecraft/item/TridentItem.mapping +++ b/mappings/net/minecraft/item/TridentItem.mapping @@ -1,5 +1,6 @@ CLASS net/minecraft/class_1835 net/minecraft/item/TridentItem FIELD field_23746 attributeModifiers Lcom/google/common/collect/Multimap; + FIELD field_30927 ATTACK_DAMAGE F METHOD method_20284 (Lnet/minecraft/class_1309;)V ARG 0 e METHOD method_20285 (Lnet/minecraft/class_1309;Lnet/minecraft/class_1657;)V diff --git a/mappings/net/minecraft/item/VerticallyAttachableBlockItem.mapping b/mappings/net/minecraft/item/VerticallyAttachableBlockItem.mapping new file mode 100644 index 0000000000..8acd9d77e2 --- /dev/null +++ b/mappings/net/minecraft/item/VerticallyAttachableBlockItem.mapping @@ -0,0 +1,17 @@ +CLASS net/minecraft/class_1827 net/minecraft/item/VerticallyAttachableBlockItem + COMMENT An item for a block that can be vertically attached as well as horizontally. + COMMENT This is usually a block that is either standing or attached to a wall; however, + COMMENT some blocks are instead hung from the ceiling. + FIELD field_40240 verticalAttachmentDirection Lnet/minecraft/class_2350; + FIELD field_8918 wallBlock Lnet/minecraft/class_2248; + METHOD (Lnet/minecraft/class_2248;Lnet/minecraft/class_2248;Lnet/minecraft/class_1792$class_1793;Lnet/minecraft/class_2350;)V + ARG 1 standingBlock + ARG 2 wallBlock + ARG 3 settings + ARG 4 verticalAttachmentDirection + COMMENT the direction of the item's vertical attachment, {@link Direction#UP} for hanging blocks + COMMENT and {@link Direction#DOWN} for standing blocks + METHOD method_45431 canPlaceAt (Lnet/minecraft/class_4538;Lnet/minecraft/class_2680;Lnet/minecraft/class_2338;)Z + ARG 1 world + ARG 2 state + ARG 3 pos diff --git a/mappings/net/minecraft/item/WallStandingBlockItem.mapping b/mappings/net/minecraft/item/WallStandingBlockItem.mapping deleted file mode 100644 index 0efe207bc2..0000000000 --- a/mappings/net/minecraft/item/WallStandingBlockItem.mapping +++ /dev/null @@ -1,6 +0,0 @@ -CLASS net/minecraft/class_1827 net/minecraft/item/WallStandingBlockItem - FIELD field_8918 wallBlock Lnet/minecraft/class_2248; - METHOD (Lnet/minecraft/class_2248;Lnet/minecraft/class_2248;Lnet/minecraft/class_1792$class_1793;)V - ARG 1 standingBlock - ARG 2 wallBlock - ARG 3 settings diff --git a/mappings/net/minecraft/item/Wearable.mapping b/mappings/net/minecraft/item/Wearable.mapping deleted file mode 100644 index 2921ee4e8f..0000000000 --- a/mappings/net/minecraft/item/Wearable.mapping +++ /dev/null @@ -1,4 +0,0 @@ -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. diff --git a/mappings/net/minecraft/item/WrittenBookItem.mapping b/mappings/net/minecraft/item/WrittenBookItem.mapping index 08db64d1f1..ef95e8f2bb 100644 --- a/mappings/net/minecraft/item/WrittenBookItem.mapping +++ b/mappings/net/minecraft/item/WrittenBookItem.mapping @@ -1,5 +1,9 @@ CLASS net/minecraft/class_1843 net/minecraft/item/WrittenBookItem - FIELD field_30930 MAX_TITLE_LENGTH I + FIELD field_30929 MAX_TITLE_EDIT_LENGTH I + FIELD field_30930 MAX_TITLE_VIEW_LENGTH I + FIELD field_30931 MAX_PAGE_EDIT_LENGTH I + FIELD field_30932 MAX_PAGE_VIEW_LENGTH I + FIELD field_30933 MAX_PAGES I FIELD field_30935 TITLE_KEY Ljava/lang/String; FIELD field_30936 FILTERED_TITLE_KEY Ljava/lang/String; FIELD field_30937 AUTHOR_KEY Ljava/lang/String; diff --git a/mappings/net/minecraft/item/map/MapIcon.mapping b/mappings/net/minecraft/item/map/MapIcon.mapping index 4cdb7c6807..c9b716bd54 100644 --- a/mappings/net/minecraft/item/map/MapIcon.mapping +++ b/mappings/net/minecraft/item/map/MapIcon.mapping @@ -1,36 +1,40 @@ CLASS net/minecraft/class_20 net/minecraft/item/map/MapIcon - FIELD field_76 x B - FIELD field_77 type Lnet/minecraft/class_20$class_21; - FIELD field_78 text Lnet/minecraft/class_2561; - FIELD field_79 rotation B - FIELD field_80 z B + FIELD comp_1842 type Lnet/minecraft/class_20$class_21; + FIELD comp_1843 x B + FIELD comp_1844 z B + FIELD comp_1845 rotation B + FIELD comp_1846 text Lnet/minecraft/class_2561; METHOD (Lnet/minecraft/class_20$class_21;BBBLnet/minecraft/class_2561;)V ARG 1 type ARG 2 x ARG 3 z ARG 4 rotation ARG 5 text + METHOD comp_1842 type ()Lnet/minecraft/class_20$class_21; + METHOD comp_1843 x ()B + METHOD comp_1844 z ()B + METHOD comp_1845 rotation ()B + METHOD comp_1846 text ()Lnet/minecraft/class_2561; METHOD equals (Ljava/lang/Object;)Z ARG 1 o - METHOD method_88 getText ()Lnet/minecraft/class_2561; - METHOD method_89 getRotation ()B - METHOD method_90 getX ()B - METHOD method_91 getZ ()B METHOD method_92 getTypeId ()B - METHOD method_93 getType ()Lnet/minecraft/class_20$class_21; METHOD method_94 isAlwaysRendered ()Z CLASS class_21 Type FIELD field_111 alwaysRender Z FIELD field_33990 useIconCountLimit Z + FIELD field_45788 CODEC Lcom/mojang/serialization/Codec; + FIELD field_45789 name Ljava/lang/String; FIELD field_81 id B FIELD field_82 tintColor I - METHOD (Ljava/lang/String;IZIZ)V - ARG 3 alwaysRender - ARG 4 tintColor + METHOD (Ljava/lang/String;ILjava/lang/String;ZIZ)V + ARG 3 name + ARG 4 alwaysRender + ARG 5 tintColor + ARG 6 useIconCountLimit + METHOD (Ljava/lang/String;ILjava/lang/String;ZZ)V + ARG 3 name + ARG 4 alwaysRender ARG 5 useIconCountLimit - METHOD (Ljava/lang/String;IZZ)V - ARG 3 alwaysRender - ARG 4 useIconCountLimit METHOD method_37342 shouldUseIconCountLimit ()Z METHOD method_95 isAlwaysRendered ()Z METHOD method_96 getTintColor ()I diff --git a/mappings/net/minecraft/item/map/MapState.mapping b/mappings/net/minecraft/item/map/MapState.mapping index 48420a3051..85145e5dcf 100644 --- a/mappings/net/minecraft/item/map/MapState.mapping +++ b/mappings/net/minecraft/item/map/MapState.mapping @@ -21,6 +21,8 @@ CLASS net/minecraft/class_22 net/minecraft/item/map/MapState COMMENT

    COMMENT Empty for the client. FIELD field_17403 locked Z + FIELD field_25019 LOGGER Lorg/slf4j/Logger; + FIELD field_31831 MAX_SCALE I FIELD field_33991 MAX_ICONS I FIELD field_33992 iconCount I METHOD (IIBZZZLnet/minecraft/class_5321;)V @@ -71,7 +73,7 @@ CLASS net/minecraft/class_22 net/minecraft/item/map/MapState COMMENT

    COMMENT The client is not aware of the coordinates of the map state so its center coordinates will always be {@code (0, 0)}. ARG 0 scale - ARG 1 showIcons + ARG 1 locked ARG 2 dimension METHOD method_32363 of (DDBZZLnet/minecraft/class_5321;)Lnet/minecraft/class_22; COMMENT Creates a new map state instance. @@ -114,6 +116,7 @@ CLASS net/minecraft/class_22 net/minecraft/item/map/MapState METHOD method_35503 getBanners ()Ljava/util/Collection; METHOD method_37343 iconCountNotLessThan (I)Z ARG 1 iconCount + METHOD method_52611 getPersistentStateType ()Lnet/minecraft/class_18$class_8645; CLASS class_23 PlayerUpdateTracker FIELD field_124 emptyPacketsRequested I FIELD field_125 player Lnet/minecraft/class_1657; diff --git a/mappings/net/minecraft/item/trim/ArmorTrim.mapping b/mappings/net/minecraft/item/trim/ArmorTrim.mapping new file mode 100644 index 0000000000..d27a58bcbd --- /dev/null +++ b/mappings/net/minecraft/item/trim/ArmorTrim.mapping @@ -0,0 +1,49 @@ +CLASS net/minecraft/class_8053 net/minecraft/item/trim/ArmorTrim + FIELD field_41994 CODEC Lcom/mojang/serialization/Codec; + FIELD field_41995 NBT_KEY Ljava/lang/String; + FIELD field_41996 LOGGER Lorg/slf4j/Logger; + FIELD field_41997 UPGRADE_TEXT Lnet/minecraft/class_2561; + FIELD field_41998 material Lnet/minecraft/class_6880; + FIELD field_41999 pattern Lnet/minecraft/class_6880; + FIELD field_42000 leggingsModelIdGetter Ljava/util/function/Function; + FIELD field_42001 genericModelIdGetter Ljava/util/function/Function; + METHOD (Lnet/minecraft/class_6880;Lnet/minecraft/class_6880;)V + ARG 1 material + ARG 2 pattern + METHOD equals (Ljava/lang/Object;)Z + ARG 1 o + METHOD method_48424 getPattern ()Lnet/minecraft/class_6880; + METHOD method_48425 appendTooltip (Lnet/minecraft/class_1799;Lnet/minecraft/class_5455;Ljava/util/List;)V + ARG 0 stack + ARG 1 registryManager + ARG 2 tooltip + METHOD method_48426 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 0 instance + METHOD method_48427 equals (Lnet/minecraft/class_6880;Lnet/minecraft/class_6880;)Z + ARG 1 pattern + ARG 2 material + METHOD method_48428 getTrim (Lnet/minecraft/class_5455;Lnet/minecraft/class_1799;Z)Ljava/util/Optional; + ARG 0 registryManager + ARG 1 stack + ARG 2 suppressError + METHOD method_48429 apply (Lnet/minecraft/class_5455;Lnet/minecraft/class_1799;Lnet/minecraft/class_8053;)Z + ARG 0 registryManager + ARG 1 stack + ARG 2 trim + METHOD method_48430 (Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String; + ARG 1 path + METHOD method_48431 getMaterial ()Lnet/minecraft/class_6880; + METHOD method_48432 (Lnet/minecraft/class_6880;Lnet/minecraft/class_1741;)Lnet/minecraft/class_2960; + ARG 2 armorMaterial + METHOD method_48433 (Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String; + ARG 1 path + METHOD method_48434 getLeggingsModelId (Lnet/minecraft/class_1741;)Lnet/minecraft/class_2960; + ARG 1 armorMaterial + METHOD method_48435 (Lnet/minecraft/class_6880;Lnet/minecraft/class_1741;)Lnet/minecraft/class_2960; + ARG 2 armorMaterial + METHOD method_48436 getGenericModelId (Lnet/minecraft/class_1741;)Lnet/minecraft/class_2960; + ARG 1 armorMaterial + METHOD method_48577 getMaterialAssetNameFor (Lnet/minecraft/class_1741;)Ljava/lang/String; + ARG 1 armorMaterial + METHOD method_52565 (ZLjava/lang/String;)V + ARG 1 error diff --git a/mappings/net/minecraft/item/trim/ArmorTrimMaterial.mapping b/mappings/net/minecraft/item/trim/ArmorTrimMaterial.mapping new file mode 100644 index 0000000000..993078e5d5 --- /dev/null +++ b/mappings/net/minecraft/item/trim/ArmorTrimMaterial.mapping @@ -0,0 +1,11 @@ +CLASS net/minecraft/class_8054 net/minecraft/item/trim/ArmorTrimMaterial + FIELD field_42002 CODEC Lcom/mojang/serialization/Codec; + FIELD field_42003 ENTRY_CODEC Lcom/mojang/serialization/Codec; + METHOD method_48437 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 0 instance + METHOD method_48438 of (Ljava/lang/String;Lnet/minecraft/class_1792;FLnet/minecraft/class_2561;Ljava/util/Map;)Lnet/minecraft/class_8054; + ARG 0 assetName + ARG 1 ingredient + ARG 2 itemModelIndex + ARG 3 description + ARG 4 overrideArmorMaterials diff --git a/mappings/net/minecraft/item/trim/ArmorTrimMaterials.mapping b/mappings/net/minecraft/item/trim/ArmorTrimMaterials.mapping new file mode 100644 index 0000000000..00dad8832a --- /dev/null +++ b/mappings/net/minecraft/item/trim/ArmorTrimMaterials.mapping @@ -0,0 +1,23 @@ +CLASS net/minecraft/class_8055 net/minecraft/item/trim/ArmorTrimMaterials + METHOD method_48439 (Lnet/minecraft/class_1799;Lnet/minecraft/class_6880$class_6883;)Z + ARG 1 recipe + METHOD method_48440 get (Lnet/minecraft/class_5455;Lnet/minecraft/class_1799;)Ljava/util/Optional; + ARG 0 registryManager + ARG 1 stack + METHOD method_48441 of (Ljava/lang/String;)Lnet/minecraft/class_5321; + ARG 0 id + METHOD method_48442 bootstrap (Lnet/minecraft/class_7891;)V + ARG 0 registry + METHOD method_48443 register (Lnet/minecraft/class_7891;Lnet/minecraft/class_5321;Lnet/minecraft/class_1792;Lnet/minecraft/class_2583;FLjava/util/Map;)V + ARG 0 registry + ARG 1 key + ARG 2 ingredient + ARG 3 style + ARG 4 itemModelIndex + ARG 5 overrideArmorMaterials + METHOD method_48578 register (Lnet/minecraft/class_7891;Lnet/minecraft/class_5321;Lnet/minecraft/class_1792;Lnet/minecraft/class_2583;F)V + ARG 0 registry + ARG 1 key + ARG 2 ingredient + ARG 3 style + ARG 4 itemModelIndex diff --git a/mappings/net/minecraft/item/trim/ArmorTrimPattern.mapping b/mappings/net/minecraft/item/trim/ArmorTrimPattern.mapping new file mode 100644 index 0000000000..8f64dc72d9 --- /dev/null +++ b/mappings/net/minecraft/item/trim/ArmorTrimPattern.mapping @@ -0,0 +1,7 @@ +CLASS net/minecraft/class_8056 net/minecraft/item/trim/ArmorTrimPattern + FIELD field_42014 CODEC Lcom/mojang/serialization/Codec; + FIELD field_42015 ENTRY_CODEC Lcom/mojang/serialization/Codec; + METHOD method_48445 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 0 instance + METHOD method_48446 getDescription (Lnet/minecraft/class_6880;)Lnet/minecraft/class_2561; + ARG 1 material diff --git a/mappings/net/minecraft/item/trim/ArmorTrimPatterns.mapping b/mappings/net/minecraft/item/trim/ArmorTrimPatterns.mapping new file mode 100644 index 0000000000..baaf7265f3 --- /dev/null +++ b/mappings/net/minecraft/item/trim/ArmorTrimPatterns.mapping @@ -0,0 +1,14 @@ +CLASS net/minecraft/class_8057 net/minecraft/item/trim/ArmorTrimPatterns + METHOD method_48447 (Lnet/minecraft/class_1799;Lnet/minecraft/class_6880$class_6883;)Z + ARG 1 pattern + METHOD method_48448 get (Lnet/minecraft/class_5455;Lnet/minecraft/class_1799;)Ljava/util/Optional; + ARG 0 registryManager + ARG 1 stack + METHOD method_48449 of (Ljava/lang/String;)Lnet/minecraft/class_5321; + ARG 0 id + METHOD method_48450 bootstrap (Lnet/minecraft/class_7891;)V + ARG 0 registry + METHOD method_48451 register (Lnet/minecraft/class_7891;Lnet/minecraft/class_1792;Lnet/minecraft/class_5321;)V + ARG 0 registry + ARG 1 template + ARG 2 key diff --git a/mappings/net/minecraft/loot/AndFunction.mapping b/mappings/net/minecraft/loot/AndFunction.mapping new file mode 100644 index 0000000000..31056664c1 --- /dev/null +++ b/mappings/net/minecraft/loot/AndFunction.mapping @@ -0,0 +1,11 @@ +CLASS net/minecraft/class_5641 net/minecraft/loot/AndFunction + FIELD field_27904 terms Ljava/util/List; + FIELD field_27905 applier Ljava/util/function/BiFunction; + FIELD field_45834 CODEC Lcom/mojang/serialization/Codec; + METHOD (Ljava/util/List;)V + ARG 1 terms + METHOD apply (Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object; + ARG 1 stack + ARG 2 context + METHOD method_53353 create (Ljava/util/List;)Lnet/minecraft/class_5641; + ARG 0 terms diff --git a/mappings/net/minecraft/loot/LootDataKey.mapping b/mappings/net/minecraft/loot/LootDataKey.mapping new file mode 100644 index 0000000000..bfe2568d3b --- /dev/null +++ b/mappings/net/minecraft/loot/LootDataKey.mapping @@ -0,0 +1,3 @@ +CLASS net/minecraft/class_8488 net/minecraft/loot/LootDataKey + FIELD comp_1475 id Lnet/minecraft/class_2960; + METHOD comp_1475 id ()Lnet/minecraft/class_2960; diff --git a/mappings/net/minecraft/loot/LootDataLookup.mapping b/mappings/net/minecraft/loot/LootDataLookup.mapping new file mode 100644 index 0000000000..ced3cfa437 --- /dev/null +++ b/mappings/net/minecraft/loot/LootDataLookup.mapping @@ -0,0 +1,13 @@ +CLASS net/minecraft/class_8489 net/minecraft/loot/LootDataLookup + METHOD getElement (Lnet/minecraft/class_8488;)Ljava/lang/Object; + ARG 1 key + METHOD getElement (Lnet/minecraft/class_8490;Lnet/minecraft/class_2960;)Ljava/lang/Object; + ARG 1 type + ARG 2 id + METHOD getElementOptional (Lnet/minecraft/class_8488;)Ljava/util/Optional; + ARG 1 key + METHOD getElementOptional (Lnet/minecraft/class_8490;Lnet/minecraft/class_2960;)Ljava/util/Optional; + ARG 1 type + ARG 2 id + METHOD getLootTable (Lnet/minecraft/class_2960;)Lnet/minecraft/class_52; + ARG 1 id diff --git a/mappings/net/minecraft/loot/LootDataType.mapping b/mappings/net/minecraft/loot/LootDataType.mapping new file mode 100644 index 0000000000..e168a64908 --- /dev/null +++ b/mappings/net/minecraft/loot/LootDataType.mapping @@ -0,0 +1,33 @@ +CLASS net/minecraft/class_8490 net/minecraft/loot/LootDataType + FIELD field_44499 LOGGER Lorg/slf4j/Logger; + FIELD field_44502 id Ljava/lang/String; + FIELD field_44503 validator Lnet/minecraft/class_8490$class_8491; + FIELD field_45794 codec Lcom/mojang/serialization/Codec; + METHOD (Lcom/mojang/serialization/Codec;Ljava/lang/String;Lnet/minecraft/class_8490$class_8491;)V + ARG 1 codec + ARG 2 id + ARG 3 validator + METHOD method_51204 parse (Lnet/minecraft/class_2960;Lcom/google/gson/JsonElement;)Ljava/util/Optional; + ARG 1 id + ARG 2 json + METHOD method_51207 (Lnet/minecraft/class_58;Lnet/minecraft/class_8488;Lnet/minecraft/class_46;)V + ARG 0 reporter + ARG 1 key + ARG 2 value + METHOD method_51208 (Lnet/minecraft/class_58;Lnet/minecraft/class_8488;Lnet/minecraft/class_52;)V + ARG 0 reporter + ARG 1 key + ARG 2 value + METHOD method_51209 validate (Lnet/minecraft/class_58;Lnet/minecraft/class_8488;Ljava/lang/Object;)V + ARG 1 reporter + ARG 2 key + ARG 3 value + METHOD method_51214 getId ()Ljava/lang/String; + METHOD method_51215 stream ()Ljava/util/stream/Stream; + METHOD method_51216 validator ()Lnet/minecraft/class_8490$class_8491; + METHOD method_51217 tableValidator ()Lnet/minecraft/class_8490$class_8491; + CLASS class_8491 Validator + METHOD run (Lnet/minecraft/class_58;Lnet/minecraft/class_8488;Ljava/lang/Object;)V + ARG 1 reporter + ARG 2 key + ARG 3 value diff --git a/mappings/net/minecraft/loot/LootGsons.mapping b/mappings/net/minecraft/loot/LootGsons.mapping deleted file mode 100644 index 1a41cabb8f..0000000000 --- a/mappings/net/minecraft/loot/LootGsons.mapping +++ /dev/null @@ -1,4 +0,0 @@ -CLASS net/minecraft/class_5270 net/minecraft/loot/LootGsons - METHOD method_27860 getConditionGsonBuilder ()Lcom/google/gson/GsonBuilder; - METHOD method_27861 getFunctionGsonBuilder ()Lcom/google/gson/GsonBuilder; - METHOD method_27862 getTableGsonBuilder ()Lcom/google/gson/GsonBuilder; diff --git a/mappings/net/minecraft/loot/LootManager.mapping b/mappings/net/minecraft/loot/LootManager.mapping index 25cab6c2ec..26bdb39ddf 100644 --- a/mappings/net/minecraft/loot/LootManager.mapping +++ b/mappings/net/minecraft/loot/LootManager.mapping @@ -1,25 +1,40 @@ CLASS net/minecraft/class_60 net/minecraft/loot/LootManager - FIELD field_20752 conditionManager Lnet/minecraft/class_4567; - FIELD field_970 tables Ljava/util/Map; - FIELD field_974 GSON Lcom/google/gson/Gson; + FIELD field_44491 EMPTY_LOOT_TABLE Lnet/minecraft/class_8488; + FIELD field_44492 keyToValue Ljava/util/Map; + FIELD field_44493 typeToIds Lcom/google/common/collect/Multimap; + FIELD field_45793 GSON Lcom/google/gson/Gson; FIELD field_975 LOGGER Lorg/slf4j/Logger; - METHOD (Lnet/minecraft/class_4567;)V - ARG 1 conditionManager - METHOD method_20711 (Lcom/google/common/collect/ImmutableMap$Builder;Lnet/minecraft/class_2960;Lcom/google/gson/JsonElement;)V - ARG 1 id - ARG 2 json - METHOD method_367 getTable (Lnet/minecraft/class_2960;)Lnet/minecraft/class_52; - ARG 1 id - METHOD method_368 (Ljava/lang/String;Ljava/lang/String;)V - ARG 0 key - ARG 1 value - METHOD method_369 validate (Lnet/minecraft/class_58;Lnet/minecraft/class_2960;Lnet/minecraft/class_52;)V + METHOD method_20712 validate (Ljava/util/Map;)V + ARG 1 lootData + METHOD method_51190 (Lnet/minecraft/class_3300;Ljava/util/concurrent/Executor;Ljava/util/Map;Lnet/minecraft/class_8490;)Ljava/util/concurrent/CompletableFuture; + ARG 3 type + METHOD method_51191 (Lcom/google/common/collect/ImmutableMap$Builder;Lcom/google/common/collect/ImmutableMultimap$Builder;Lnet/minecraft/class_8490;Ljava/util/Map;)V + ARG 2 type + ARG 3 idToValue + METHOD method_51192 (Lcom/google/common/collect/ImmutableMap$Builder;Lnet/minecraft/class_8490;Lcom/google/common/collect/ImmutableMultimap$Builder;Lnet/minecraft/class_2960;Ljava/lang/Object;)V + ARG 3 id + ARG 4 value + METHOD method_51193 getIds (Lnet/minecraft/class_8490;)Ljava/util/Collection; + ARG 1 type + METHOD method_51194 load (Lnet/minecraft/class_8490;Lnet/minecraft/class_3300;Ljava/util/concurrent/Executor;Ljava/util/Map;)Ljava/util/concurrent/CompletableFuture; + ARG 0 type + ARG 1 resourceManager + ARG 2 executor + ARG 3 results + METHOD method_51195 (Lnet/minecraft/class_8490;Ljava/util/Map;Lnet/minecraft/class_2960;Lcom/google/gson/JsonElement;)V + ARG 2 id + ARG 3 json + METHOD method_51196 validate (Lnet/minecraft/class_58;Lnet/minecraft/class_8488;Ljava/lang/Object;)V ARG 0 reporter - ARG 1 id - ARG 2 table - METHOD method_370 getTableIds ()Ljava/util/Set; - METHOD method_372 toJson (Lnet/minecraft/class_52;)Lcom/google/gson/JsonElement; - ARG 0 table - METHOD method_373 (Lnet/minecraft/class_58;Lnet/minecraft/class_2960;Lnet/minecraft/class_52;)V - ARG 1 id - ARG 2 lootTable + ARG 1 key + ARG 2 value + METHOD method_51197 (Ljava/lang/String;Ljava/lang/String;)V + ARG 0 name + ARG 1 message + METHOD method_51198 (Ljava/util/Map;Lnet/minecraft/class_2960;Ljava/lang/Object;)V + ARG 2 value + METHOD method_51199 (Ljava/util/Map;Ljava/lang/Void;)V + ARG 2 v + METHOD method_51202 (Lnet/minecraft/class_58;Lnet/minecraft/class_8488;Ljava/lang/Object;)V + ARG 1 key + ARG 2 value diff --git a/mappings/net/minecraft/loot/LootPool.mapping b/mappings/net/minecraft/loot/LootPool.mapping index c0c563ce1a..0ad664bc13 100644 --- a/mappings/net/minecraft/loot/LootPool.mapping +++ b/mappings/net/minecraft/loot/LootPool.mapping @@ -1,12 +1,13 @@ CLASS net/minecraft/class_55 net/minecraft/loot/LootPool + FIELD field_45795 CODEC Lcom/mojang/serialization/Codec; FIELD field_952 javaFunctions Ljava/util/function/BiFunction; - FIELD field_953 entries [Lnet/minecraft/class_79; - FIELD field_954 conditions [Lnet/minecraft/class_5341; + FIELD field_953 entries Ljava/util/List; + FIELD field_954 conditions Ljava/util/List; FIELD field_955 predicate Ljava/util/function/Predicate; - FIELD field_956 functions [Lnet/minecraft/class_117; + FIELD field_956 functions Ljava/util/List; FIELD field_957 rolls Lnet/minecraft/class_5658; FIELD field_958 bonusRolls Lnet/minecraft/class_5658; - METHOD ([Lnet/minecraft/class_79;[Lnet/minecraft/class_5341;[Lnet/minecraft/class_117;Lnet/minecraft/class_5658;Lnet/minecraft/class_5658;)V + METHOD (Ljava/util/List;Ljava/util/List;Ljava/util/List;Lnet/minecraft/class_5658;Lnet/minecraft/class_5658;)V ARG 1 entries ARG 2 conditions ARG 3 functions @@ -25,10 +26,10 @@ CLASS net/minecraft/class_55 net/minecraft/loot/LootPool ARG 1 reporter CLASS class_56 Builder FIELD field_959 rolls Lnet/minecraft/class_5658; - FIELD field_960 entries Ljava/util/List; - FIELD field_961 functions Ljava/util/List; + FIELD field_960 entries Lcom/google/common/collect/ImmutableList$Builder; + FIELD field_961 functions Lcom/google/common/collect/ImmutableList$Builder; FIELD field_962 bonusRollsRange Lnet/minecraft/class_5658; - FIELD field_963 conditions Ljava/util/List; + FIELD field_963 conditions Lcom/google/common/collect/ImmutableList$Builder; METHOD method_351 with (Lnet/minecraft/class_79$class_80;)Lnet/minecraft/class_55$class_56; ARG 1 entry METHOD method_352 rolls (Lnet/minecraft/class_5658;)Lnet/minecraft/class_55$class_56; @@ -36,12 +37,3 @@ CLASS net/minecraft/class_55 net/minecraft/loot/LootPool METHOD method_355 build ()Lnet/minecraft/class_55; METHOD method_35509 bonusRolls (Lnet/minecraft/class_5658;)Lnet/minecraft/class_55$class_56; ARG 1 bonusRolls - CLASS class_57 Serializer - METHOD deserialize (Lcom/google/gson/JsonElement;Ljava/lang/reflect/Type;Lcom/google/gson/JsonDeserializationContext;)Ljava/lang/Object; - ARG 1 json - ARG 2 unused - ARG 3 context - METHOD serialize (Ljava/lang/Object;Ljava/lang/reflect/Type;Lcom/google/gson/JsonSerializationContext;)Lcom/google/gson/JsonElement; - ARG 1 entry - ARG 2 unused - ARG 3 context diff --git a/mappings/net/minecraft/loot/LootTable.mapping b/mappings/net/minecraft/loot/LootTable.mapping index d8c4b5fffb..bc245e9965 100644 --- a/mappings/net/minecraft/loot/LootTable.mapping +++ b/mappings/net/minecraft/loot/LootTable.mapping @@ -1,15 +1,18 @@ CLASS net/minecraft/class_52 net/minecraft/loot/LootTable + FIELD field_44892 randomSequenceId Ljava/util/Optional; + FIELD field_45796 CODEC Lcom/mojang/serialization/Codec; FIELD field_942 type Lnet/minecraft/class_176; - FIELD field_943 pools [Lnet/minecraft/class_55; - FIELD field_944 functions [Lnet/minecraft/class_117; + FIELD field_943 pools Ljava/util/List; + FIELD field_944 functions Ljava/util/List; FIELD field_945 combinedFunction Ljava/util/function/BiFunction; FIELD field_946 LOGGER Lorg/slf4j/Logger; FIELD field_947 GENERIC Lnet/minecraft/class_176; FIELD field_948 EMPTY Lnet/minecraft/class_52; - METHOD (Lnet/minecraft/class_176;[Lnet/minecraft/class_55;[Lnet/minecraft/class_117;)V + METHOD (Lnet/minecraft/class_176;Ljava/util/Optional;Ljava/util/List;Ljava/util/List;)V ARG 1 type - ARG 2 pools - ARG 3 functions + ARG 2 randomSequenceId + ARG 3 pools + ARG 4 functions METHOD method_319 generateLoot (Lnet/minecraft/class_47;)Lit/unimi/dsi/fastutil/objects/ObjectArrayList; ARG 1 context METHOD method_320 generateLoot (Lnet/minecraft/class_47;Ljava/util/function/Consumer;)V @@ -23,34 +26,45 @@ CLASS net/minecraft/class_52 net/minecraft/loot/LootTable METHOD method_328 generateUnprocessedLoot (Lnet/minecraft/class_47;Ljava/util/function/Consumer;)V ARG 1 context ARG 2 lootConsumer - METHOD method_329 supplyInventory (Lnet/minecraft/class_1263;Lnet/minecraft/class_47;)V + METHOD method_329 supplyInventory (Lnet/minecraft/class_1263;Lnet/minecraft/class_8567;J)V ARG 1 inventory - ARG 2 context + ARG 2 parameters + ARG 3 seed METHOD method_330 validate (Lnet/minecraft/class_58;)V ARG 1 reporter - METHOD method_331 (Ljava/util/function/Consumer;Lnet/minecraft/class_1799;)V - ARG 1 stack - METHOD method_332 processStacks (Ljava/util/function/Consumer;)Ljava/util/function/Consumer; - ARG 0 lootConsumer + METHOD method_331 (Lnet/minecraft/class_3218;Ljava/util/function/Consumer;Lnet/minecraft/class_1799;)V + ARG 2 stack + METHOD method_332 processStacks (Lnet/minecraft/class_3218;Ljava/util/function/Consumer;)Ljava/util/function/Consumer; + ARG 0 world + ARG 1 consumer METHOD method_333 shuffle (Lit/unimi/dsi/fastutil/objects/ObjectArrayList;ILnet/minecraft/class_5819;)V ARG 1 drops ARG 2 freeSlots ARG 3 random + METHOD method_51878 generateLoot (Lnet/minecraft/class_8567;)Lit/unimi/dsi/fastutil/objects/ObjectArrayList; + ARG 1 parameters + METHOD method_51879 generateLoot (Lnet/minecraft/class_8567;J)Lit/unimi/dsi/fastutil/objects/ObjectArrayList; + ARG 1 parameters + ARG 2 seed + METHOD method_51880 generateLoot (Lnet/minecraft/class_8567;JLjava/util/function/Consumer;)V + ARG 1 parameters + ARG 2 seed + ARG 4 lootConsumer + METHOD method_51881 generateUnprocessedLoot (Lnet/minecraft/class_8567;Ljava/util/function/Consumer;)V + ARG 1 parameters + ARG 2 lootConsumer + METHOD method_51882 generateLoot (Lnet/minecraft/class_8567;Ljava/util/function/Consumer;)V + ARG 1 parameters + ARG 2 lootConsumer CLASS class_53 Builder - FIELD field_949 pools Ljava/util/List; + FIELD field_44893 randomSequenceId Ljava/util/Optional; + FIELD field_949 pools Lcom/google/common/collect/ImmutableList$Builder; FIELD field_950 type Lnet/minecraft/class_176; - FIELD field_951 functions Ljava/util/List; + FIELD field_951 functions Lcom/google/common/collect/ImmutableList$Builder; METHOD method_334 type (Lnet/minecraft/class_176;)Lnet/minecraft/class_52$class_53; ARG 1 context METHOD method_336 pool (Lnet/minecraft/class_55$class_56;)Lnet/minecraft/class_52$class_53; ARG 1 poolBuilder METHOD method_338 build ()Lnet/minecraft/class_52; - CLASS class_54 Serializer - METHOD deserialize (Lcom/google/gson/JsonElement;Ljava/lang/reflect/Type;Lcom/google/gson/JsonDeserializationContext;)Ljava/lang/Object; - ARG 1 json - ARG 2 unused - ARG 3 context - METHOD serialize (Ljava/lang/Object;Ljava/lang/reflect/Type;Lcom/google/gson/JsonSerializationContext;)Lcom/google/gson/JsonElement; - ARG 1 supplier - ARG 2 unused - ARG 3 context + METHOD method_51883 randomSequenceId (Lnet/minecraft/class_2960;)Lnet/minecraft/class_52$class_53; + ARG 1 randomSequenceId diff --git a/mappings/net/minecraft/loot/LootTableReporter.mapping b/mappings/net/minecraft/loot/LootTableReporter.mapping index 3ff3a0b391..175e9cc191 100644 --- a/mappings/net/minecraft/loot/LootTableReporter.mapping +++ b/mappings/net/minecraft/loot/LootTableReporter.mapping @@ -1,45 +1,32 @@ CLASS net/minecraft/class_58 net/minecraft/loot/LootTableReporter FIELD field_20756 contextType Lnet/minecraft/class_176; - FIELD field_20757 conditionGetter Ljava/util/function/Function; - FIELD field_20758 conditions Ljava/util/Set; - FIELD field_20759 tableGetter Ljava/util/function/Function; - FIELD field_20760 tables Ljava/util/Set; + FIELD field_44504 dataLookup Lnet/minecraft/class_8489; + FIELD field_44505 referenceStack Ljava/util/Set; FIELD field_964 name Ljava/lang/String; FIELD field_965 messages Lcom/google/common/collect/Multimap; FIELD field_966 nameFactory Ljava/util/function/Supplier; - METHOD (Lcom/google/common/collect/Multimap;Ljava/util/function/Supplier;Lnet/minecraft/class_176;Ljava/util/function/Function;Ljava/util/Set;Ljava/util/function/Function;Ljava/util/Set;)V + METHOD (Lcom/google/common/collect/Multimap;Ljava/util/function/Supplier;Lnet/minecraft/class_176;Lnet/minecraft/class_8489;Ljava/util/Set;)V ARG 1 messages ARG 2 nameFactory ARG 3 contextType - ARG 4 conditionGetter - ARG 5 conditions - ARG 6 tableGetter - ARG 7 tables - METHOD (Lnet/minecraft/class_176;Ljava/util/function/Function;Ljava/util/function/Function;)V + ARG 4 dataLookup + ARG 5 referenceStack + METHOD (Lnet/minecraft/class_176;Lnet/minecraft/class_8489;)V ARG 1 contextType - ARG 2 conditionGetter - ARG 3 tableFactory + ARG 2 dataLookup METHOD method_22567 validateContext (Lnet/minecraft/class_46;)V ARG 1 contextAware METHOD method_22568 withContextType (Lnet/minecraft/class_176;)Lnet/minecraft/class_58; ARG 1 contextType - METHOD method_22569 withTable (Ljava/lang/String;Lnet/minecraft/class_2960;)Lnet/minecraft/class_58; - ARG 1 name - ARG 2 id - METHOD method_22570 hasTable (Lnet/minecraft/class_2960;)Z - ARG 1 id - METHOD method_22571 withCondition (Ljava/lang/String;Lnet/minecraft/class_2960;)Lnet/minecraft/class_58; - ARG 1 name - ARG 2 id - METHOD method_22572 hasCondition (Lnet/minecraft/class_2960;)Z - ARG 1 id - METHOD method_22574 getTable (Lnet/minecraft/class_2960;)Lnet/minecraft/class_52; - ARG 1 id - METHOD method_22576 getCondition (Lnet/minecraft/class_2960;)Lnet/minecraft/class_5341; - ARG 1 id METHOD method_359 getName ()Ljava/lang/String; METHOD method_360 report (Ljava/lang/String;)V ARG 1 message METHOD method_361 getMessages ()Lcom/google/common/collect/Multimap; METHOD method_364 makeChild (Ljava/lang/String;)Lnet/minecraft/class_58; ARG 1 name + METHOD method_51218 isInStack (Lnet/minecraft/class_8488;)Z + ARG 1 key + METHOD method_51219 makeChild (Ljava/lang/String;Lnet/minecraft/class_8488;)Lnet/minecraft/class_58; + ARG 1 name + ARG 2 currentKey + METHOD method_51220 getDataLookup ()Lnet/minecraft/class_8489; diff --git a/mappings/net/minecraft/loot/condition/AllOfLootCondition.mapping b/mappings/net/minecraft/loot/condition/AllOfLootCondition.mapping new file mode 100644 index 0000000000..ccf3f498b4 --- /dev/null +++ b/mappings/net/minecraft/loot/condition/AllOfLootCondition.mapping @@ -0,0 +1,9 @@ +CLASS net/minecraft/class_8548 net/minecraft/loot/condition/AllOfLootCondition + FIELD field_45857 CODEC Lcom/mojang/serialization/Codec; + METHOD (Ljava/util/List;)V + ARG 1 terms + METHOD method_51723 builder ([Lnet/minecraft/class_5341$class_210;)Lnet/minecraft/class_8548$class_8549; + ARG 0 terms + METHOD method_53404 create (Ljava/util/List;)Lnet/minecraft/class_8548; + ARG 0 terms + CLASS class_8549 Builder diff --git a/mappings/net/minecraft/loot/condition/AlternativeLootCondition.mapping b/mappings/net/minecraft/loot/condition/AlternativeLootCondition.mapping index 880168266d..3dfd534408 100644 --- a/mappings/net/minecraft/loot/condition/AlternativeLootCondition.mapping +++ b/mappings/net/minecraft/loot/condition/AlternativeLootCondition.mapping @@ -1,14 +1,24 @@ CLASS net/minecraft/class_186 net/minecraft/loot/condition/AlternativeLootCondition - FIELD field_1246 terms [Lnet/minecraft/class_5341; + FIELD field_1246 terms Ljava/util/List; FIELD field_1247 predicate Ljava/util/function/Predicate; - METHOD ([Lnet/minecraft/class_5341;)V + METHOD (Ljava/util/List;Ljava/util/function/Predicate;)V ARG 1 terms - METHOD method_826 builder ([Lnet/minecraft/class_5341$class_210;)Lnet/minecraft/class_186$class_187; - ARG 0 terms + ARG 2 predicate + METHOD method_53406 (Lnet/minecraft/class_186;)Ljava/util/List; + ARG 0 condition + METHOD method_53407 createCodec (Ljava/util/function/Function;)Lcom/mojang/serialization/Codec; + ARG 0 termsToCondition + METHOD method_53409 (Lnet/minecraft/class_186;)Ljava/util/List; + ARG 0 condition + METHOD method_53410 (Ljava/util/function/Function;)Lcom/mojang/serialization/Codec; + ARG 0 termsToCondition METHOD test (Ljava/lang/Object;)Z ARG 1 context CLASS class_187 Builder - FIELD field_1248 terms Ljava/util/List; + FIELD field_1248 terms Lcom/google/common/collect/ImmutableList$Builder; METHOD ([Lnet/minecraft/class_5341$class_210;)V ARG 1 terms - CLASS class_188 Serializer + METHOD method_51724 build (Ljava/util/List;)Lnet/minecraft/class_5341; + ARG 1 terms + METHOD method_51730 add (Lnet/minecraft/class_5341$class_210;)V + ARG 1 builder diff --git a/mappings/net/minecraft/loot/condition/AnyOfLootCondition.mapping b/mappings/net/minecraft/loot/condition/AnyOfLootCondition.mapping new file mode 100644 index 0000000000..338d0fd4eb --- /dev/null +++ b/mappings/net/minecraft/loot/condition/AnyOfLootCondition.mapping @@ -0,0 +1,7 @@ +CLASS net/minecraft/class_8551 net/minecraft/loot/condition/AnyOfLootCondition + FIELD field_45859 CODEC Lcom/mojang/serialization/Codec; + METHOD (Ljava/util/List;)V + ARG 1 terms + METHOD method_51727 builder ([Lnet/minecraft/class_5341$class_210;)Lnet/minecraft/class_8551$class_8552; + ARG 0 terms + CLASS class_8552 Builder diff --git a/mappings/net/minecraft/loot/condition/BlockStatePropertyLootCondition.mapping b/mappings/net/minecraft/loot/condition/BlockStatePropertyLootCondition.mapping index 4f883d674e..b9eb8d8604 100644 --- a/mappings/net/minecraft/loot/condition/BlockStatePropertyLootCondition.mapping +++ b/mappings/net/minecraft/loot/condition/BlockStatePropertyLootCondition.mapping @@ -1,20 +1,23 @@ CLASS net/minecraft/class_212 net/minecraft/loot/condition/BlockStatePropertyLootCondition - FIELD field_1286 block Lnet/minecraft/class_2248; - FIELD field_1288 properties Lnet/minecraft/class_4559; - METHOD (Lnet/minecraft/class_2248;Lnet/minecraft/class_4559;)V - ARG 1 block - ARG 2 properties + FIELD comp_1876 block Lnet/minecraft/class_6880; + FIELD comp_1877 properties Ljava/util/Optional; + FIELD field_45868 CODEC Lcom/mojang/serialization/Codec; + METHOD comp_1876 block ()Lnet/minecraft/class_6880; + METHOD comp_1877 properties ()Ljava/util/Optional; + METHOD method_53418 validateHasProperties (Lnet/minecraft/class_212;)Lcom/mojang/serialization/DataResult; + ARG 0 condition + METHOD method_53419 (Lnet/minecraft/class_212;Lnet/minecraft/class_4559;)Ljava/util/Optional; + ARG 1 predicate + METHOD method_53420 (Lnet/minecraft/class_212;Ljava/lang/String;)Lcom/mojang/serialization/DataResult; + ARG 1 property METHOD method_900 builder (Lnet/minecraft/class_2248;)Lnet/minecraft/class_212$class_213; ARG 0 block METHOD test (Ljava/lang/Object;)Z ARG 1 context CLASS class_213 Builder - FIELD field_1290 block Lnet/minecraft/class_2248; - FIELD field_1291 propertyValues Lnet/minecraft/class_4559; + FIELD field_1290 block Lnet/minecraft/class_6880; + FIELD field_1291 propertyValues Ljava/util/Optional; METHOD (Lnet/minecraft/class_2248;)V ARG 1 block METHOD method_22584 properties (Lnet/minecraft/class_4559$class_4560;)Lnet/minecraft/class_212$class_213; ARG 1 builder - CLASS class_214 Serializer - METHOD method_22585 (Lnet/minecraft/class_2248;Ljava/lang/String;)V - ARG 1 propertyName diff --git a/mappings/net/minecraft/loot/condition/DamageSourcePropertiesLootCondition.mapping b/mappings/net/minecraft/loot/condition/DamageSourcePropertiesLootCondition.mapping index 66e358a787..f3ff703450 100644 --- a/mappings/net/minecraft/loot/condition/DamageSourcePropertiesLootCondition.mapping +++ b/mappings/net/minecraft/loot/condition/DamageSourcePropertiesLootCondition.mapping @@ -1,9 +1,8 @@ CLASS net/minecraft/class_190 net/minecraft/loot/condition/DamageSourcePropertiesLootCondition - FIELD field_1256 predicate Lnet/minecraft/class_2022; - METHOD (Lnet/minecraft/class_2022;)V - ARG 1 predicate + FIELD comp_1870 predicate Ljava/util/Optional; + FIELD field_45862 CODEC Lcom/mojang/serialization/Codec; + METHOD comp_1870 predicate ()Ljava/util/Optional; METHOD method_837 builder (Lnet/minecraft/class_2022$class_2023;)Lnet/minecraft/class_5341$class_210; ARG 0 builder METHOD test (Ljava/lang/Object;)Z ARG 1 context - CLASS class_191 Serializer diff --git a/mappings/net/minecraft/loot/condition/EntityPropertiesLootCondition.mapping b/mappings/net/minecraft/loot/condition/EntityPropertiesLootCondition.mapping index 87399e788e..aa6f5d5874 100644 --- a/mappings/net/minecraft/loot/condition/EntityPropertiesLootCondition.mapping +++ b/mappings/net/minecraft/loot/condition/EntityPropertiesLootCondition.mapping @@ -1,9 +1,11 @@ CLASS net/minecraft/class_215 net/minecraft/loot/condition/EntityPropertiesLootCondition - FIELD field_1292 entity Lnet/minecraft/class_47$class_50; - FIELD field_1293 predicate Lnet/minecraft/class_2048; - METHOD (Lnet/minecraft/class_2048;Lnet/minecraft/class_47$class_50;)V - ARG 1 predicate + FIELD comp_1879 predicate Ljava/util/Optional; + FIELD comp_1880 entity Lnet/minecraft/class_47$class_50; + FIELD field_45871 CODEC Lcom/mojang/serialization/Codec; + METHOD (Ljava/util/Optional;Lnet/minecraft/class_47$class_50;)V ARG 2 entity + METHOD comp_1879 predicate ()Ljava/util/Optional; + METHOD comp_1880 entity ()Lnet/minecraft/class_47$class_50; METHOD method_15972 create (Lnet/minecraft/class_47$class_50;)Lnet/minecraft/class_5341$class_210; ARG 0 entity METHOD method_27865 builder (Lnet/minecraft/class_47$class_50;Lnet/minecraft/class_2048;)Lnet/minecraft/class_5341$class_210; @@ -14,4 +16,3 @@ CLASS net/minecraft/class_215 net/minecraft/loot/condition/EntityPropertiesLootC ARG 1 predicateBuilder METHOD test (Ljava/lang/Object;)Z ARG 1 context - CLASS class_216 Serializer diff --git a/mappings/net/minecraft/loot/condition/EntityScoresLootCondition.mapping b/mappings/net/minecraft/loot/condition/EntityScoresLootCondition.mapping index 90b7a57196..65f5653f43 100644 --- a/mappings/net/minecraft/loot/condition/EntityScoresLootCondition.mapping +++ b/mappings/net/minecraft/loot/condition/EntityScoresLootCondition.mapping @@ -1,9 +1,12 @@ CLASS net/minecraft/class_199 net/minecraft/loot/condition/EntityScoresLootCondition - FIELD field_1278 target Lnet/minecraft/class_47$class_50; - FIELD field_1279 scores Ljava/util/Map; + FIELD comp_1871 scores Ljava/util/Map; + FIELD comp_1872 target Lnet/minecraft/class_47$class_50; + FIELD field_45863 CODEC Lcom/mojang/serialization/Codec; METHOD (Ljava/util/Map;Lnet/minecraft/class_47$class_50;)V ARG 1 scores ARG 2 target + METHOD comp_1871 scores ()Ljava/util/Map; + METHOD comp_1872 target ()Lnet/minecraft/class_47$class_50; METHOD method_35557 create (Lnet/minecraft/class_47$class_50;)Lnet/minecraft/class_199$class_6163; ARG 0 target METHOD method_865 entityScoreIsInRange (Lnet/minecraft/class_47;Lnet/minecraft/class_1297;Lnet/minecraft/class_269;Ljava/lang/String;Lnet/minecraft/class_42;)Z @@ -14,9 +17,8 @@ CLASS net/minecraft/class_199 net/minecraft/loot/condition/EntityScoresLootCondi ARG 5 range METHOD test (Ljava/lang/Object;)Z ARG 1 context - CLASS class_200 Serializer CLASS class_6163 Builder - FIELD field_31869 scores Ljava/util/Map; + FIELD field_31869 scores Lcom/google/common/collect/ImmutableMap$Builder; FIELD field_31870 target Lnet/minecraft/class_47$class_50; METHOD (Lnet/minecraft/class_47$class_50;)V ARG 1 target diff --git a/mappings/net/minecraft/loot/condition/InvertedLootCondition.mapping b/mappings/net/minecraft/loot/condition/InvertedLootCondition.mapping index ffa6ea7f5e..cba66e38b0 100644 --- a/mappings/net/minecraft/loot/condition/InvertedLootCondition.mapping +++ b/mappings/net/minecraft/loot/condition/InvertedLootCondition.mapping @@ -1,9 +1,10 @@ CLASS net/minecraft/class_207 net/minecraft/loot/condition/InvertedLootCondition - FIELD field_1283 term Lnet/minecraft/class_5341; + FIELD comp_1873 term Lnet/minecraft/class_5341; + FIELD field_45865 CODEC Lcom/mojang/serialization/Codec; METHOD (Lnet/minecraft/class_5341;)V ARG 1 term + METHOD comp_1873 term ()Lnet/minecraft/class_5341; METHOD method_889 builder (Lnet/minecraft/class_5341$class_210;)Lnet/minecraft/class_5341$class_210; ARG 0 term METHOD test (Ljava/lang/Object;)Z ARG 1 context - CLASS class_208 Serializer diff --git a/mappings/net/minecraft/loot/condition/KilledByPlayerLootCondition.mapping b/mappings/net/minecraft/loot/condition/KilledByPlayerLootCondition.mapping index 389e220139..ea0d9d101f 100644 --- a/mappings/net/minecraft/loot/condition/KilledByPlayerLootCondition.mapping +++ b/mappings/net/minecraft/loot/condition/KilledByPlayerLootCondition.mapping @@ -1,6 +1,6 @@ CLASS net/minecraft/class_221 net/minecraft/loot/condition/KilledByPlayerLootCondition FIELD field_1297 INSTANCE Lnet/minecraft/class_221; + FIELD field_45872 CODEC Lcom/mojang/serialization/Codec; METHOD method_939 builder ()Lnet/minecraft/class_5341$class_210; METHOD test (Ljava/lang/Object;)Z ARG 1 context - CLASS class_222 Serializer diff --git a/mappings/net/minecraft/loot/condition/LocationCheckLootCondition.mapping b/mappings/net/minecraft/loot/condition/LocationCheckLootCondition.mapping index b48130c653..76e049e151 100644 --- a/mappings/net/minecraft/loot/condition/LocationCheckLootCondition.mapping +++ b/mappings/net/minecraft/loot/condition/LocationCheckLootCondition.mapping @@ -1,9 +1,12 @@ CLASS net/minecraft/class_205 net/minecraft/loot/condition/LocationCheckLootCondition - FIELD field_1282 predicate Lnet/minecraft/class_2090; - FIELD field_20765 offset Lnet/minecraft/class_2338; - METHOD (Lnet/minecraft/class_2090;Lnet/minecraft/class_2338;)V - ARG 1 predicate + FIELD comp_1874 predicate Ljava/util/Optional; + FIELD comp_1875 offset Lnet/minecraft/class_2338; + FIELD field_45866 CODEC Lcom/mojang/serialization/Codec; + FIELD field_45867 BLOCK_POS_CODEC Lcom/mojang/serialization/MapCodec; + METHOD (Ljava/util/Optional;Lnet/minecraft/class_2338;)V ARG 2 offset + METHOD comp_1874 predicate ()Ljava/util/Optional; + METHOD comp_1875 offset ()Lnet/minecraft/class_2338; METHOD method_30151 builder (Lnet/minecraft/class_2090$class_2091;Lnet/minecraft/class_2338;)Lnet/minecraft/class_5341$class_210; ARG 0 predicateBuilder ARG 1 pos @@ -11,4 +14,3 @@ CLASS net/minecraft/class_205 net/minecraft/loot/condition/LocationCheckLootCond ARG 0 predicateBuilder METHOD test (Ljava/lang/Object;)Z ARG 1 context - CLASS class_206 Serializer diff --git a/mappings/net/minecraft/loot/condition/LootCondition.mapping b/mappings/net/minecraft/loot/condition/LootCondition.mapping index bda1634eb3..44bf9484e9 100644 --- a/mappings/net/minecraft/loot/condition/LootCondition.mapping +++ b/mappings/net/minecraft/loot/condition/LootCondition.mapping @@ -1,6 +1,11 @@ CLASS net/minecraft/class_5341 net/minecraft/loot/condition/LootCondition + COMMENT Loot conditions, officially {@index predicate}s, are JSON-based conditions to test + COMMENT against in world. It's used in loot tables, advancements, and commands, and can be + COMMENT defined by data packs. METHOD method_29325 getType ()Lnet/minecraft/class_5342; CLASS class_210 Builder + METHOD and (Lnet/minecraft/class_5341$class_210;)Lnet/minecraft/class_8548$class_8549; + ARG 1 condition METHOD method_16780 invert ()Lnet/minecraft/class_5341$class_210; - METHOD method_893 or (Lnet/minecraft/class_5341$class_210;)Lnet/minecraft/class_186$class_187; + METHOD method_893 or (Lnet/minecraft/class_5341$class_210;)Lnet/minecraft/class_8551$class_8552; ARG 1 condition diff --git a/mappings/net/minecraft/loot/condition/LootConditionManager.mapping b/mappings/net/minecraft/loot/condition/LootConditionManager.mapping deleted file mode 100644 index e7d4516c0f..0000000000 --- a/mappings/net/minecraft/loot/condition/LootConditionManager.mapping +++ /dev/null @@ -1,25 +0,0 @@ -CLASS net/minecraft/class_4567 net/minecraft/loot/condition/LootConditionManager - FIELD field_20753 LOGGER Lorg/slf4j/Logger; - FIELD field_20754 GSON Lcom/google/gson/Gson; - FIELD field_20755 conditions Ljava/util/Map; - METHOD method_22559 getIds ()Ljava/util/Set; - METHOD method_22560 (Lcom/google/common/collect/ImmutableMap$Builder;Lnet/minecraft/class_2960;Lcom/google/gson/JsonElement;)V - ARG 1 id - ARG 2 json - METHOD method_22561 (Lnet/minecraft/class_58;Lnet/minecraft/class_2960;Lnet/minecraft/class_5341;)V - ARG 1 id - ARG 2 condition - METHOD method_22562 (Ljava/lang/String;Ljava/lang/String;)V - ARG 0 name - ARG 1 message - METHOD method_22564 get (Lnet/minecraft/class_2960;)Lnet/minecraft/class_5341; - ARG 1 id - METHOD method_22566 (Lnet/minecraft/class_2960;)Lnet/minecraft/class_52; - ARG 0 id - CLASS class_5334 AndCondition - FIELD field_25202 terms [Lnet/minecraft/class_5341; - FIELD field_25203 predicate Ljava/util/function/Predicate; - METHOD ([Lnet/minecraft/class_5341;)V - ARG 1 terms - METHOD test (Ljava/lang/Object;)Z - ARG 1 context diff --git a/mappings/net/minecraft/loot/condition/LootConditionTypes.mapping b/mappings/net/minecraft/loot/condition/LootConditionTypes.mapping index 31621f0538..e0319baeae 100644 --- a/mappings/net/minecraft/loot/condition/LootConditionTypes.mapping +++ b/mappings/net/minecraft/loot/condition/LootConditionTypes.mapping @@ -1,17 +1,21 @@ CLASS net/minecraft/class_217 net/minecraft/loot/condition/LootConditionTypes - METHOD method_29326 createGsonSerializer ()Ljava/lang/Object; - METHOD method_29327 register (Ljava/lang/String;Lnet/minecraft/class_5335;)Lnet/minecraft/class_5342; + FIELD field_45869 CODEC Lcom/mojang/serialization/Codec; + FIELD field_45870 BASE_CODEC Lcom/mojang/serialization/Codec; + METHOD method_29327 register (Ljava/lang/String;Lcom/mojang/serialization/Codec;)Lnet/minecraft/class_5342; ARG 0 id - ARG 1 serializer + ARG 1 codec METHOD method_921 (Ljava/lang/Object;)Z + ARG 0 predicatesx + METHOD method_924 matchingAll (Ljava/util/List;)Ljava/util/function/Predicate; + COMMENT Returns a predicate that returns true only if all its element predicates + COMMENT return true, as if applied by logical and. ARG 0 predicates - METHOD method_924 joinAnd ([Ljava/util/function/Predicate;)Ljava/util/function/Predicate; - ARG 0 predicates - METHOD method_925 joinOr ([Ljava/util/function/Predicate;)Ljava/util/function/Predicate; - ARG 0 predicates - METHOD method_927 ([Ljava/util/function/Predicate;Ljava/lang/Object;)Z + METHOD method_925 matchingAny (Ljava/util/List;)Ljava/util/function/Predicate; + COMMENT Returns a predicate that returns true if any its element predicates + COMMENT return true, as if applied by logical or. + METHOD method_927 (Ljava/util/List;Ljava/lang/Object;)Z ARG 1 operand METHOD method_928 (Ljava/lang/Object;)Z - ARG 0 predicates - METHOD method_929 ([Ljava/util/function/Predicate;Ljava/lang/Object;)Z + ARG 0 predicatesx + METHOD method_929 (Ljava/util/List;Ljava/lang/Object;)Z ARG 1 operand diff --git a/mappings/net/minecraft/loot/condition/MatchToolLootCondition.mapping b/mappings/net/minecraft/loot/condition/MatchToolLootCondition.mapping index bd3a932ba6..e398dc7629 100644 --- a/mappings/net/minecraft/loot/condition/MatchToolLootCondition.mapping +++ b/mappings/net/minecraft/loot/condition/MatchToolLootCondition.mapping @@ -1,9 +1,8 @@ CLASS net/minecraft/class_223 net/minecraft/loot/condition/MatchToolLootCondition - FIELD field_1298 predicate Lnet/minecraft/class_2073; - METHOD (Lnet/minecraft/class_2073;)V - ARG 1 predicate + FIELD comp_1884 predicate Ljava/util/Optional; + FIELD field_45875 CODEC Lcom/mojang/serialization/Codec; + METHOD comp_1884 predicate ()Ljava/util/Optional; METHOD method_945 builder (Lnet/minecraft/class_2073$class_2074;)Lnet/minecraft/class_5341$class_210; ARG 0 predicate METHOD test (Ljava/lang/Object;)Z ARG 1 context - CLASS class_224 Serializer diff --git a/mappings/net/minecraft/loot/condition/RandomChanceLootCondition.mapping b/mappings/net/minecraft/loot/condition/RandomChanceLootCondition.mapping index d4cfd6c2be..c0030632c6 100644 --- a/mappings/net/minecraft/loot/condition/RandomChanceLootCondition.mapping +++ b/mappings/net/minecraft/loot/condition/RandomChanceLootCondition.mapping @@ -1,9 +1,10 @@ CLASS net/minecraft/class_219 net/minecraft/loot/condition/RandomChanceLootCondition - FIELD field_1296 chance F + FIELD comp_1881 chance F + FIELD field_45873 CODEC Lcom/mojang/serialization/Codec; METHOD (F)V ARG 1 chance + METHOD comp_1881 chance ()F METHOD method_932 builder (F)Lnet/minecraft/class_5341$class_210; ARG 0 chance METHOD test (Ljava/lang/Object;)Z ARG 1 context - CLASS class_220 Serializer diff --git a/mappings/net/minecraft/loot/condition/RandomChanceWithLootingLootCondition.mapping b/mappings/net/minecraft/loot/condition/RandomChanceWithLootingLootCondition.mapping index db2a6faa8a..37ec1b2889 100644 --- a/mappings/net/minecraft/loot/condition/RandomChanceWithLootingLootCondition.mapping +++ b/mappings/net/minecraft/loot/condition/RandomChanceWithLootingLootCondition.mapping @@ -1,12 +1,14 @@ CLASS net/minecraft/class_225 net/minecraft/loot/condition/RandomChanceWithLootingLootCondition - FIELD field_1299 lootingMultiplier F - FIELD field_1300 chance F + FIELD comp_1882 chance F + FIELD comp_1883 lootingMultiplier F + FIELD field_45874 CODEC Lcom/mojang/serialization/Codec; METHOD (FF)V ARG 1 chance ARG 2 lootingMultiplier + METHOD comp_1882 chance ()F + METHOD comp_1883 lootingMultiplier ()F METHOD method_953 builder (FF)Lnet/minecraft/class_5341$class_210; ARG 0 chance ARG 1 lootingMultiplier METHOD test (Ljava/lang/Object;)Z ARG 1 context - CLASS class_226 Serializer diff --git a/mappings/net/minecraft/loot/condition/ReferenceLootCondition.mapping b/mappings/net/minecraft/loot/condition/ReferenceLootCondition.mapping index 3d3bfbf9cb..7ac1f52ec2 100644 --- a/mappings/net/minecraft/loot/condition/ReferenceLootCondition.mapping +++ b/mappings/net/minecraft/loot/condition/ReferenceLootCondition.mapping @@ -1,10 +1,13 @@ CLASS net/minecraft/class_4568 net/minecraft/loot/condition/ReferenceLootCondition + FIELD comp_1869 id Lnet/minecraft/class_2960; FIELD field_20763 LOGGER Lorg/slf4j/Logger; - FIELD field_20764 id Lnet/minecraft/class_2960; + FIELD field_45861 CODEC Lcom/mojang/serialization/Codec; METHOD (Lnet/minecraft/class_2960;)V ARG 1 id + METHOD comp_1869 id ()Lnet/minecraft/class_2960; METHOD method_35555 builder (Lnet/minecraft/class_2960;)Lnet/minecraft/class_5341$class_210; ARG 0 id + METHOD method_51230 (Lnet/minecraft/class_58;Lnet/minecraft/class_8488;Lnet/minecraft/class_5341;)V + ARG 3 predicate METHOD test (Ljava/lang/Object;)Z ARG 1 context - CLASS class_4569 Serializer diff --git a/mappings/net/minecraft/loot/condition/SurvivesExplosionLootCondition.mapping b/mappings/net/minecraft/loot/condition/SurvivesExplosionLootCondition.mapping index e5e7ed4b72..5942e1cc2f 100644 --- a/mappings/net/minecraft/loot/condition/SurvivesExplosionLootCondition.mapping +++ b/mappings/net/minecraft/loot/condition/SurvivesExplosionLootCondition.mapping @@ -1,6 +1,6 @@ CLASS net/minecraft/class_201 net/minecraft/loot/condition/SurvivesExplosionLootCondition FIELD field_1280 INSTANCE Lnet/minecraft/class_201; + FIELD field_45864 CODEC Lcom/mojang/serialization/Codec; METHOD method_871 builder ()Lnet/minecraft/class_5341$class_210; METHOD test (Ljava/lang/Object;)Z ARG 1 context - CLASS class_202 Serializer diff --git a/mappings/net/minecraft/loot/condition/TableBonusLootCondition.mapping b/mappings/net/minecraft/loot/condition/TableBonusLootCondition.mapping index 6441cd5471..2b9b9cacaf 100644 --- a/mappings/net/minecraft/loot/condition/TableBonusLootCondition.mapping +++ b/mappings/net/minecraft/loot/condition/TableBonusLootCondition.mapping @@ -1,12 +1,11 @@ CLASS net/minecraft/class_182 net/minecraft/loot/condition/TableBonusLootCondition - FIELD field_1234 enchantment Lnet/minecraft/class_1887; - FIELD field_1235 chances [F - METHOD (Lnet/minecraft/class_1887;[F)V - ARG 1 enchantment - ARG 2 chances + FIELD comp_1867 enchantment Lnet/minecraft/class_6880; + FIELD comp_1868 chances Ljava/util/List; + FIELD field_45860 CODEC Lcom/mojang/serialization/Codec; + METHOD comp_1867 enchantment ()Lnet/minecraft/class_6880; + METHOD comp_1868 chances ()Ljava/util/List; METHOD method_800 builder (Lnet/minecraft/class_1887;[F)Lnet/minecraft/class_5341$class_210; ARG 0 enchantment ARG 1 chances METHOD test (Ljava/lang/Object;)Z ARG 1 context - CLASS class_183 Serializer diff --git a/mappings/net/minecraft/loot/condition/TimeCheckLootCondition.mapping b/mappings/net/minecraft/loot/condition/TimeCheckLootCondition.mapping index 2a37a236b2..9f8057ebad 100644 --- a/mappings/net/minecraft/loot/condition/TimeCheckLootCondition.mapping +++ b/mappings/net/minecraft/loot/condition/TimeCheckLootCondition.mapping @@ -1,16 +1,17 @@ CLASS net/minecraft/class_4571 net/minecraft/loot/condition/TimeCheckLootCondition - FIELD field_20767 period Ljava/lang/Long; - FIELD field_20768 value Lnet/minecraft/class_42; - METHOD (Ljava/lang/Long;Lnet/minecraft/class_42;)V - ARG 1 period + FIELD comp_1885 period Ljava/util/Optional; + FIELD comp_1886 value Lnet/minecraft/class_42; + FIELD field_45876 CODEC Lcom/mojang/serialization/Codec; + METHOD (Ljava/util/Optional;Lnet/minecraft/class_42;)V ARG 2 value + METHOD comp_1885 period ()Ljava/util/Optional; + METHOD comp_1886 value ()Lnet/minecraft/class_42; METHOD method_35559 create (Lnet/minecraft/class_42;)Lnet/minecraft/class_4571$class_6164; ARG 0 value METHOD test (Ljava/lang/Object;)Z ARG 1 context - CLASS class_4572 Serializer CLASS class_6164 Builder - FIELD field_31871 period Ljava/lang/Long; + FIELD field_31871 period Ljava/util/Optional; FIELD field_31872 value Lnet/minecraft/class_42; METHOD (Lnet/minecraft/class_42;)V ARG 1 value diff --git a/mappings/net/minecraft/loot/condition/ValueCheckLootCondition.mapping b/mappings/net/minecraft/loot/condition/ValueCheckLootCondition.mapping index 7ab32c357b..de89aa94af 100644 --- a/mappings/net/minecraft/loot/condition/ValueCheckLootCondition.mapping +++ b/mappings/net/minecraft/loot/condition/ValueCheckLootCondition.mapping @@ -1,12 +1,14 @@ CLASS net/minecraft/class_5644 net/minecraft/loot/condition/ValueCheckLootCondition - FIELD field_27912 value Lnet/minecraft/class_5658; - FIELD field_27913 range Lnet/minecraft/class_42; + FIELD comp_1887 value Lnet/minecraft/class_5658; + FIELD comp_1888 range Lnet/minecraft/class_42; + FIELD field_45877 CODEC Lcom/mojang/serialization/Codec; METHOD (Lnet/minecraft/class_5658;Lnet/minecraft/class_42;)V ARG 1 value ARG 2 range + METHOD comp_1887 value ()Lnet/minecraft/class_5658; + METHOD comp_1888 range ()Lnet/minecraft/class_42; METHOD method_35562 builder (Lnet/minecraft/class_5658;Lnet/minecraft/class_42;)Lnet/minecraft/class_5341$class_210; ARG 0 value ARG 1 range METHOD test (Ljava/lang/Object;)Z ARG 1 context - CLASS class_5645 Serializer diff --git a/mappings/net/minecraft/loot/condition/WeatherCheckLootCondition.mapping b/mappings/net/minecraft/loot/condition/WeatherCheckLootCondition.mapping index 2142e97f4a..0cdb2a9257 100644 --- a/mappings/net/minecraft/loot/condition/WeatherCheckLootCondition.mapping +++ b/mappings/net/minecraft/loot/condition/WeatherCheckLootCondition.mapping @@ -1,17 +1,16 @@ CLASS net/minecraft/class_227 net/minecraft/loot/condition/WeatherCheckLootCondition - FIELD field_1301 thundering Ljava/lang/Boolean; - FIELD field_1302 raining Ljava/lang/Boolean; - METHOD (Ljava/lang/Boolean;Ljava/lang/Boolean;)V - ARG 1 raining - ARG 2 thundering + FIELD comp_1889 raining Ljava/util/Optional; + FIELD comp_1890 thundering Ljava/util/Optional; + FIELD field_45878 CODEC Lcom/mojang/serialization/Codec; + METHOD comp_1889 raining ()Ljava/util/Optional; + METHOD comp_1890 thundering ()Ljava/util/Optional; METHOD method_35564 create ()Lnet/minecraft/class_227$class_6165; METHOD test (Ljava/lang/Object;)Z ARG 1 context - CLASS class_228 Serializer CLASS class_6165 Builder - FIELD field_31873 raining Ljava/lang/Boolean; - FIELD field_31874 thundering Ljava/lang/Boolean; - METHOD method_35565 raining (Ljava/lang/Boolean;)Lnet/minecraft/class_227$class_6165; + FIELD field_31873 raining Ljava/util/Optional; + FIELD field_31874 thundering Ljava/util/Optional; + METHOD method_35565 raining (Z)Lnet/minecraft/class_227$class_6165; ARG 1 raining - METHOD method_35567 thundering (Ljava/lang/Boolean;)Lnet/minecraft/class_227$class_6165; + METHOD method_35567 thundering (Z)Lnet/minecraft/class_227$class_6165; ARG 1 thundering diff --git a/mappings/net/minecraft/loot/context/LootContext.mapping b/mappings/net/minecraft/loot/context/LootContext.mapping index 1fcd470fcc..3c439017b5 100644 --- a/mappings/net/minecraft/loot/context/LootContext.mapping +++ b/mappings/net/minecraft/loot/context/LootContext.mapping @@ -1,83 +1,49 @@ CLASS net/minecraft/class_47 net/minecraft/loot/context/LootContext - FIELD field_20750 conditionGetter Ljava/util/function/Function; - FIELD field_20751 conditions Ljava/util/Set; + FIELD field_44490 dataLookup Lnet/minecraft/class_8489; + FIELD field_44881 parameters Lnet/minecraft/class_8567; FIELD field_923 random Lnet/minecraft/class_5819; - FIELD field_924 tableGetter Ljava/util/function/Function; - FIELD field_925 parameters Ljava/util/Map; - FIELD field_926 luck F - FIELD field_927 activeTables Ljava/util/Set; - FIELD field_928 world Lnet/minecraft/class_3218; - FIELD field_929 drops Ljava/util/Map; - METHOD (Lnet/minecraft/class_5819;FLnet/minecraft/class_3218;Ljava/util/function/Function;Ljava/util/function/Function;Ljava/util/Map;Ljava/util/Map;)V - ARG 1 random - ARG 2 luck - ARG 3 world - ARG 4 tableGetter - ARG 5 conditionGetter - ARG 6 parameters - ARG 7 drops - METHOD method_22555 addCondition (Lnet/minecraft/class_5341;)Z - ARG 1 condition - METHOD method_22556 getTable (Lnet/minecraft/class_2960;)Lnet/minecraft/class_52; - ARG 1 id - METHOD method_22557 removeCondition (Lnet/minecraft/class_5341;)V - ARG 1 condition - METHOD method_22558 getCondition (Lnet/minecraft/class_2960;)Lnet/minecraft/class_5341; - ARG 1 id + FIELD field_927 activeEntries Ljava/util/Set; + METHOD (Lnet/minecraft/class_8567;Lnet/minecraft/class_5819;Lnet/minecraft/class_8489;)V + ARG 1 parameters + ARG 2 random + ARG 3 dataLookup METHOD method_294 getRandom ()Lnet/minecraft/class_5819; - METHOD method_295 markInactive (Lnet/minecraft/class_52;)V - ARG 1 table + METHOD method_295 markInactive (Lnet/minecraft/class_47$class_8487;)V + ARG 1 entry METHOD method_296 get (Lnet/minecraft/class_169;)Ljava/lang/Object; ARG 1 parameter METHOD method_297 drop (Lnet/minecraft/class_2960;Ljava/util/function/Consumer;)V ARG 1 id ARG 2 lootConsumer - METHOD method_298 markActive (Lnet/minecraft/class_52;)Z - ARG 1 table + METHOD method_298 markActive (Lnet/minecraft/class_47$class_8487;)Z + ARG 1 entry METHOD method_299 getWorld ()Lnet/minecraft/class_3218; METHOD method_300 hasParameter (Lnet/minecraft/class_169;)Z ARG 1 parameter METHOD method_302 getLuck ()F METHOD method_35508 requireParameter (Lnet/minecraft/class_169;)Ljava/lang/Object; ARG 1 parameter + METHOD method_51183 getDataLookup ()Lnet/minecraft/class_8489; + METHOD method_51184 isActive (Lnet/minecraft/class_47$class_8487;)Z + ARG 1 entry + METHOD method_51185 table (Lnet/minecraft/class_52;)Lnet/minecraft/class_47$class_8487; + ARG 0 table + METHOD method_51186 itemModifier (Lnet/minecraft/class_117;)Lnet/minecraft/class_47$class_8487; + ARG 0 itemModifier + METHOD method_51187 predicate (Lnet/minecraft/class_5341;)Lnet/minecraft/class_47$class_8487; + ARG 0 predicate CLASS class_48 Builder - FIELD field_930 world Lnet/minecraft/class_3218; - FIELD field_931 luck F - FIELD field_932 parameters Ljava/util/Map; - FIELD field_933 drops Ljava/util/Map; + FIELD field_44882 parameters Lnet/minecraft/class_8567; FIELD field_934 random Lnet/minecraft/class_5819; - METHOD (Lnet/minecraft/class_3218;)V - ARG 1 world - METHOD method_303 luck (F)Lnet/minecraft/class_47$class_48; - ARG 1 luck + METHOD (Lnet/minecraft/class_8567;)V + ARG 1 parameters METHOD method_304 random (J)Lnet/minecraft/class_47$class_48; ARG 1 seed - METHOD method_305 getNullable (Lnet/minecraft/class_169;)Ljava/lang/Object; - ARG 1 parameter - METHOD method_306 optionalParameter (Lnet/minecraft/class_169;Ljava/lang/Object;)Lnet/minecraft/class_47$class_48; - ARG 1 key - ARG 2 value - METHOD method_307 putDrop (Lnet/minecraft/class_2960;Lnet/minecraft/class_47$class_49;)Lnet/minecraft/class_47$class_48; - ARG 1 id - ARG 2 value - METHOD method_308 get (Lnet/minecraft/class_169;)Ljava/lang/Object; - ARG 1 parameter - METHOD method_309 build (Lnet/minecraft/class_176;)Lnet/minecraft/class_47; - ARG 1 type - METHOD method_310 random (JLnet/minecraft/class_5819;)Lnet/minecraft/class_47$class_48; - ARG 1 seed - ARG 3 random - METHOD method_311 random (Lnet/minecraft/class_5819;)Lnet/minecraft/class_47$class_48; - ARG 1 random - METHOD method_312 parameter (Lnet/minecraft/class_169;Ljava/lang/Object;)Lnet/minecraft/class_47$class_48; - ARG 1 key - ARG 2 value + METHOD method_309 build (Ljava/util/Optional;)Lnet/minecraft/class_47; + ARG 1 randomId METHOD method_313 getWorld ()Lnet/minecraft/class_3218; - CLASS class_49 Dropper - METHOD add (Lnet/minecraft/class_47;Ljava/util/function/Consumer;)V - ARG 1 context - ARG 2 consumer CLASS class_50 EntityTarget + FIELD field_45792 CODEC Lnet/minecraft/class_3542$class_7292; FIELD field_938 parameter Lnet/minecraft/class_169; FIELD field_941 type Ljava/lang/String; METHOD (Ljava/lang/String;ILjava/lang/String;Lnet/minecraft/class_169;)V @@ -86,9 +52,4 @@ CLASS net/minecraft/class_47 net/minecraft/loot/context/LootContext METHOD method_314 fromString (Ljava/lang/String;)Lnet/minecraft/class_47$class_50; ARG 0 type METHOD method_315 getParameter ()Lnet/minecraft/class_169; - CLASS class_51 Serializer - METHOD read (Lcom/google/gson/stream/JsonReader;)Ljava/lang/Object; - ARG 1 reader - METHOD write (Lcom/google/gson/stream/JsonWriter;Ljava/lang/Object;)V - ARG 1 writer - ARG 2 entity + CLASS class_8487 Entry diff --git a/mappings/net/minecraft/loot/context/LootContextParameterSet.mapping b/mappings/net/minecraft/loot/context/LootContextParameterSet.mapping new file mode 100644 index 0000000000..352a89a338 --- /dev/null +++ b/mappings/net/minecraft/loot/context/LootContextParameterSet.mapping @@ -0,0 +1,51 @@ +CLASS net/minecraft/class_8567 net/minecraft/loot/context/LootContextParameterSet + FIELD field_44883 world Lnet/minecraft/class_3218; + FIELD field_44884 parameters Ljava/util/Map; + FIELD field_44885 dynamicDrops Ljava/util/Map; + FIELD field_44886 luck F + METHOD (Lnet/minecraft/class_3218;Ljava/util/Map;Ljava/util/Map;F)V + ARG 1 world + ARG 2 parameters + ARG 3 dynamicDrops + ARG 4 luck + METHOD method_51863 getWorld ()Lnet/minecraft/class_3218; + METHOD method_51864 addDynamicDrops (Lnet/minecraft/class_2960;Ljava/util/function/Consumer;)V + ARG 1 id + ARG 2 lootConsumer + METHOD method_51865 contains (Lnet/minecraft/class_169;)Z + ARG 1 parameter + METHOD method_51866 getLuck ()F + METHOD method_51867 get (Lnet/minecraft/class_169;)Ljava/lang/Object; + ARG 1 parameter + METHOD method_51868 (Lnet/minecraft/class_169;)Ljava/lang/Object; + ARG 1 parameter + METHOD method_51869 getOptional (Lnet/minecraft/class_169;)Ljava/lang/Object; + ARG 1 parameter + CLASS class_49 DynamicDrop + METHOD add (Ljava/util/function/Consumer;)V + ARG 1 lootConsumer + CLASS class_8568 Builder + FIELD field_44887 world Lnet/minecraft/class_3218; + FIELD field_44888 parameters Ljava/util/Map; + FIELD field_44889 dynamicDrops Ljava/util/Map; + FIELD field_44890 luck F + METHOD (Lnet/minecraft/class_3218;)V + ARG 1 world + METHOD method_51870 getWorld ()Lnet/minecraft/class_3218; + METHOD method_51871 luck (F)Lnet/minecraft/class_8567$class_8568; + ARG 1 luck + METHOD method_51872 addDynamicDrop (Lnet/minecraft/class_2960;Lnet/minecraft/class_8567$class_49;)Lnet/minecraft/class_8567$class_8568; + ARG 1 id + ARG 2 dynamicDrop + METHOD method_51873 get (Lnet/minecraft/class_169;)Ljava/lang/Object; + ARG 1 parameter + METHOD method_51874 add (Lnet/minecraft/class_169;Ljava/lang/Object;)Lnet/minecraft/class_8567$class_8568; + ARG 1 parameter + ARG 2 value + METHOD method_51875 build (Lnet/minecraft/class_176;)Lnet/minecraft/class_8567; + ARG 1 contextType + METHOD method_51876 getOptional (Lnet/minecraft/class_169;)Ljava/lang/Object; + ARG 1 parameter + METHOD method_51877 addOptional (Lnet/minecraft/class_169;Ljava/lang/Object;)Lnet/minecraft/class_8567$class_8568; + ARG 1 parameter + ARG 2 value diff --git a/mappings/net/minecraft/loot/context/LootContextTypes.mapping b/mappings/net/minecraft/loot/context/LootContextTypes.mapping index 01ea810b46..1aa614471e 100644 --- a/mappings/net/minecraft/loot/context/LootContextTypes.mapping +++ b/mappings/net/minecraft/loot/context/LootContextTypes.mapping @@ -1,9 +1,8 @@ CLASS net/minecraft/class_173 net/minecraft/loot/context/LootContextTypes FIELD field_1178 MAP Lcom/google/common/collect/BiMap; + FIELD field_45856 CODEC Lcom/mojang/serialization/Codec; METHOD method_15970 (Lnet/minecraft/class_176$class_177;)V ARG 0 builder - METHOD method_15971 (Lnet/minecraft/class_176$class_177;)V - ARG 0 builder METHOD method_22577 (Lnet/minecraft/class_176$class_177;)V ARG 0 builder METHOD method_22578 (Lnet/minecraft/class_176$class_177;)V @@ -12,12 +11,16 @@ CLASS net/minecraft/class_173 net/minecraft/loot/context/LootContextTypes ARG 0 builder METHOD method_27863 (Lnet/minecraft/class_176$class_177;)V ARG 0 builder + METHOD method_49269 (Lnet/minecraft/class_176$class_177;)V + ARG 0 builder + METHOD method_49270 (Lnet/minecraft/class_176$class_177;)V + ARG 0 builder + METHOD method_51722 (Lnet/minecraft/class_176$class_177;)V + ARG 0 builder METHOD method_755 (Lnet/minecraft/class_176$class_177;)V ARG 0 builder METHOD method_756 (Lnet/minecraft/class_176$class_177;)V ARG 0 builder - METHOD method_757 get (Lnet/minecraft/class_2960;)Lnet/minecraft/class_176; - ARG 0 id METHOD method_758 (Lnet/minecraft/class_176$class_177;)V ARG 0 builder METHOD method_759 register (Ljava/lang/String;Ljava/util/function/Consumer;)Lnet/minecraft/class_176; @@ -25,8 +28,6 @@ CLASS net/minecraft/class_173 net/minecraft/loot/context/LootContextTypes ARG 1 type METHOD method_760 (Lnet/minecraft/class_176$class_177;)V ARG 0 builder - METHOD method_762 getId (Lnet/minecraft/class_176;)Lnet/minecraft/class_2960; - ARG 0 type METHOD method_763 (Lnet/minecraft/class_176$class_177;)V ARG 0 builder METHOD method_764 (Lnet/minecraft/class_176$class_177;)V diff --git a/mappings/net/minecraft/loot/entry/AlternativeEntry.mapping b/mappings/net/minecraft/loot/entry/AlternativeEntry.mapping index 08a2a7b1ff..1d8278ccce 100644 --- a/mappings/net/minecraft/loot/entry/AlternativeEntry.mapping +++ b/mappings/net/minecraft/loot/entry/AlternativeEntry.mapping @@ -1,13 +1,14 @@ CLASS net/minecraft/class_65 net/minecraft/loot/entry/AlternativeEntry + FIELD field_45797 CODEC Lcom/mojang/serialization/Codec; METHOD method_386 builder ([Lnet/minecraft/class_79$class_80;)Lnet/minecraft/class_65$class_66; ARG 0 children - METHOD method_387 ([Lnet/minecraft/class_64;Lnet/minecraft/class_47;Ljava/util/function/Consumer;)Z + METHOD method_387 (Ljava/util/List;Lnet/minecraft/class_47;Ljava/util/function/Consumer;)Z ARG 1 context ARG 2 lootChoiceExpander METHOD method_43734 builder (Ljava/util/Collection;Ljava/util/function/Function;)Lnet/minecraft/class_65$class_66; ARG 0 children ARG 1 toBuilderFunction CLASS class_66 Builder - FIELD field_979 children Ljava/util/List; + FIELD field_979 children Lcom/google/common/collect/ImmutableList$Builder; METHOD ([Lnet/minecraft/class_79$class_80;)V ARG 1 children diff --git a/mappings/net/minecraft/loot/entry/CombinedEntry.mapping b/mappings/net/minecraft/loot/entry/CombinedEntry.mapping index 1d775c911e..b16919db69 100644 --- a/mappings/net/minecraft/loot/entry/CombinedEntry.mapping +++ b/mappings/net/minecraft/loot/entry/CombinedEntry.mapping @@ -1,14 +1,10 @@ CLASS net/minecraft/class_69 net/minecraft/loot/entry/CombinedEntry - FIELD field_982 children [Lnet/minecraft/class_79; + FIELD field_982 children Ljava/util/List; FIELD field_983 predicate Lnet/minecraft/class_64; - METHOD ([Lnet/minecraft/class_79;[Lnet/minecraft/class_5341;)V - ARG 1 children + METHOD (Ljava/util/List;Ljava/util/List;)V + ARG 1 terms ARG 2 conditions - 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; + METHOD method_394 combine (Ljava/util/List;)Lnet/minecraft/class_64; + METHOD method_53279 createCodec (Lnet/minecraft/class_69$class_70;)Lcom/mojang/serialization/Codec; ARG 0 factory CLASS class_70 Factory - METHOD create ([Lnet/minecraft/class_79;[Lnet/minecraft/class_5341;)Lnet/minecraft/class_69; - ARG 1 children - ARG 2 conditions diff --git a/mappings/net/minecraft/loot/entry/DynamicEntry.mapping b/mappings/net/minecraft/loot/entry/DynamicEntry.mapping index 83aff06090..4b247f8a3b 100644 --- a/mappings/net/minecraft/loot/entry/DynamicEntry.mapping +++ b/mappings/net/minecraft/loot/entry/DynamicEntry.mapping @@ -1,6 +1,7 @@ CLASS net/minecraft/class_67 net/minecraft/loot/entry/DynamicEntry + FIELD field_45798 CODEC Lcom/mojang/serialization/Codec; FIELD field_980 name Lnet/minecraft/class_2960; - METHOD (Lnet/minecraft/class_2960;II[Lnet/minecraft/class_5341;[Lnet/minecraft/class_117;)V + METHOD (Lnet/minecraft/class_2960;IILjava/util/List;Ljava/util/List;)V ARG 1 name ARG 2 weight ARG 3 quality @@ -8,9 +9,8 @@ CLASS net/minecraft/class_67 net/minecraft/loot/entry/DynamicEntry ARG 5 functions METHOD method_390 builder (Lnet/minecraft/class_2960;)Lnet/minecraft/class_85$class_86; ARG 0 name - METHOD method_391 (Lnet/minecraft/class_2960;II[Lnet/minecraft/class_5341;[Lnet/minecraft/class_117;)Lnet/minecraft/class_85; + METHOD method_391 (Lnet/minecraft/class_2960;IILjava/util/List;Ljava/util/List;)Lnet/minecraft/class_85; ARG 1 weight ARG 2 quality ARG 3 conditions ARG 4 functions - CLASS class_68 Serializer diff --git a/mappings/net/minecraft/loot/entry/EmptyEntry.mapping b/mappings/net/minecraft/loot/entry/EmptyEntry.mapping index f9ec325108..e8c637f302 100644 --- a/mappings/net/minecraft/loot/entry/EmptyEntry.mapping +++ b/mappings/net/minecraft/loot/entry/EmptyEntry.mapping @@ -1,3 +1,8 @@ CLASS net/minecraft/class_73 net/minecraft/loot/entry/EmptyEntry + FIELD field_45799 CODEC Lcom/mojang/serialization/Codec; + METHOD (IILjava/util/List;Ljava/util/List;)V + ARG 1 weight + ARG 2 quality + ARG 3 conditions + ARG 4 functions METHOD method_401 builder ()Lnet/minecraft/class_85$class_86; - CLASS class_74 Serializer diff --git a/mappings/net/minecraft/loot/entry/GroupEntry.mapping b/mappings/net/minecraft/loot/entry/GroupEntry.mapping index 0caa4a8d60..a28ff828f8 100644 --- a/mappings/net/minecraft/loot/entry/GroupEntry.mapping +++ b/mappings/net/minecraft/loot/entry/GroupEntry.mapping @@ -1,13 +1,14 @@ CLASS net/minecraft/class_93 net/minecraft/loot/entry/GroupEntry + FIELD field_45800 CODEC Lcom/mojang/serialization/Codec; METHOD method_29315 (Lnet/minecraft/class_64;Lnet/minecraft/class_64;Lnet/minecraft/class_47;Ljava/util/function/Consumer;)Z ARG 2 context ARG 3 choiceConsumer METHOD method_35511 create ([Lnet/minecraft/class_79$class_80;)Lnet/minecraft/class_93$class_6152; ARG 0 entries - METHOD method_452 ([Lnet/minecraft/class_64;Lnet/minecraft/class_47;Ljava/util/function/Consumer;)Z + METHOD method_452 (Ljava/util/List;Lnet/minecraft/class_47;Ljava/util/function/Consumer;)Z ARG 1 context ARG 2 lootChoiceExpander CLASS class_6152 Builder - FIELD field_31846 entries Ljava/util/List; + FIELD field_31846 entries Lcom/google/common/collect/ImmutableList$Builder; METHOD ([Lnet/minecraft/class_79$class_80;)V ARG 1 entries diff --git a/mappings/net/minecraft/loot/entry/ItemEntry.mapping b/mappings/net/minecraft/loot/entry/ItemEntry.mapping index 3648cdb1be..f014b60236 100644 --- a/mappings/net/minecraft/loot/entry/ItemEntry.mapping +++ b/mappings/net/minecraft/loot/entry/ItemEntry.mapping @@ -1,16 +1,16 @@ CLASS net/minecraft/class_77 net/minecraft/loot/entry/ItemEntry - FIELD field_987 item Lnet/minecraft/class_1792; - METHOD (Lnet/minecraft/class_1792;II[Lnet/minecraft/class_5341;[Lnet/minecraft/class_117;)V + FIELD field_45801 CODEC Lcom/mojang/serialization/Codec; + FIELD field_987 item Lnet/minecraft/class_6880; + METHOD (Lnet/minecraft/class_6880;IILjava/util/List;Ljava/util/List;)V ARG 1 item ARG 2 weight ARG 3 quality ARG 4 conditions ARG 5 functions - METHOD method_409 (Lnet/minecraft/class_1935;II[Lnet/minecraft/class_5341;[Lnet/minecraft/class_117;)Lnet/minecraft/class_85; + METHOD method_409 (Lnet/minecraft/class_1935;IILjava/util/List;Ljava/util/List;)Lnet/minecraft/class_85; ARG 1 weight ARG 2 quality ARG 3 conditions ARG 4 functions METHOD method_411 builder (Lnet/minecraft/class_1935;)Lnet/minecraft/class_85$class_86; ARG 0 drop - CLASS class_78 Serializer diff --git a/mappings/net/minecraft/loot/entry/LeafEntry.mapping b/mappings/net/minecraft/loot/entry/LeafEntry.mapping index a40eef2769..eef751f03d 100644 --- a/mappings/net/minecraft/loot/entry/LeafEntry.mapping +++ b/mappings/net/minecraft/loot/entry/LeafEntry.mapping @@ -1,10 +1,10 @@ CLASS net/minecraft/class_85 net/minecraft/loot/entry/LeafEntry FIELD field_994 quality I FIELD field_995 weight I - FIELD field_996 functions [Lnet/minecraft/class_117; + FIELD field_996 functions Ljava/util/List; FIELD field_997 compiledFunctions Ljava/util/function/BiFunction; FIELD field_998 choice Lnet/minecraft/class_82; - METHOD (II[Lnet/minecraft/class_5341;[Lnet/minecraft/class_117;)V + METHOD (IILjava/util/List;Ljava/util/List;)V ARG 1 weight ARG 2 quality ARG 3 conditions @@ -17,28 +17,20 @@ CLASS net/minecraft/class_85 net/minecraft/loot/entry/LeafEntry CLASS class_86 Builder FIELD field_1000 quality I FIELD field_1001 weight I - FIELD field_999 functions Ljava/util/List; + FIELD field_999 functions Lcom/google/common/collect/ImmutableList$Builder; METHOD method_436 quality (I)Lnet/minecraft/class_85$class_86; ARG 1 quality METHOD method_437 weight (I)Lnet/minecraft/class_85$class_86; ARG 1 weight - METHOD method_439 getFunctions ()[Lnet/minecraft/class_117; + METHOD method_439 getFunctions ()Ljava/util/List; CLASS class_87 BasicBuilder FIELD field_1003 factory Lnet/minecraft/class_85$class_89; METHOD (Lnet/minecraft/class_85$class_89;)V ARG 1 factory CLASS class_88 Choice CLASS class_89 Factory - METHOD build (II[Lnet/minecraft/class_5341;[Lnet/minecraft/class_117;)Lnet/minecraft/class_85; + METHOD build (IILjava/util/List;Ljava/util/List;)Lnet/minecraft/class_85; ARG 1 weight ARG 2 quality ARG 3 conditions ARG 4 functions - CLASS class_90 Serializer - METHOD method_443 fromJson (Lcom/google/gson/JsonObject;Lcom/google/gson/JsonDeserializationContext;II[Lnet/minecraft/class_5341;[Lnet/minecraft/class_117;)Lnet/minecraft/class_85; - ARG 1 entryJson - ARG 2 context - ARG 3 weight - ARG 4 quality - ARG 5 conditions - ARG 6 functions diff --git a/mappings/net/minecraft/loot/entry/LootPoolEntry.mapping b/mappings/net/minecraft/loot/entry/LootPoolEntry.mapping index 82d70d75c9..c97ab3606e 100644 --- a/mappings/net/minecraft/loot/entry/LootPoolEntry.mapping +++ b/mappings/net/minecraft/loot/entry/LootPoolEntry.mapping @@ -1,7 +1,7 @@ CLASS net/minecraft/class_79 net/minecraft/loot/entry/LootPoolEntry - FIELD field_988 conditions [Lnet/minecraft/class_5341; + FIELD field_988 conditions Ljava/util/List; FIELD field_989 conditionPredicate Ljava/util/function/Predicate; - METHOD ([Lnet/minecraft/class_5341;)V + METHOD (Ljava/util/List;)V ARG 1 conditions METHOD method_29318 getType ()Lnet/minecraft/class_5338; METHOD method_414 test (Lnet/minecraft/class_47;)Z @@ -9,7 +9,7 @@ CLASS net/minecraft/class_79 net/minecraft/loot/entry/LootPoolEntry METHOD method_415 validate (Lnet/minecraft/class_58;)V ARG 1 reporter CLASS class_80 Builder - FIELD field_990 conditions Ljava/util/List; + FIELD field_990 conditions Lcom/google/common/collect/ImmutableList$Builder; METHOD method_35513 sequenceEntry (Lnet/minecraft/class_79$class_80;)Lnet/minecraft/class_93$class_6152; ARG 1 entry METHOD method_35514 groupEntry (Lnet/minecraft/class_79$class_80;)Lnet/minecraft/class_72$class_6153; @@ -18,13 +18,4 @@ CLASS net/minecraft/class_79 net/minecraft/loot/entry/LootPoolEntry ARG 1 builder METHOD method_418 getThisBuilder ()Lnet/minecraft/class_79$class_80; METHOD method_419 build ()Lnet/minecraft/class_79; - METHOD method_420 getConditions ()[Lnet/minecraft/class_5341; - CLASS class_5337 Serializer - METHOD method_422 addEntryFields (Lcom/google/gson/JsonObject;Lnet/minecraft/class_79;Lcom/google/gson/JsonSerializationContext;)V - ARG 1 json - ARG 2 entry - ARG 3 context - METHOD method_424 fromJson (Lcom/google/gson/JsonObject;Lcom/google/gson/JsonDeserializationContext;[Lnet/minecraft/class_5341;)Lnet/minecraft/class_79; - ARG 1 json - ARG 2 context - ARG 3 conditions + METHOD method_420 getConditions ()Ljava/util/List; diff --git a/mappings/net/minecraft/loot/entry/LootPoolEntryTypes.mapping b/mappings/net/minecraft/loot/entry/LootPoolEntryTypes.mapping index 29bbbb5a42..6dfa43255e 100644 --- a/mappings/net/minecraft/loot/entry/LootPoolEntryTypes.mapping +++ b/mappings/net/minecraft/loot/entry/LootPoolEntryTypes.mapping @@ -1,5 +1,5 @@ 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; + FIELD field_45802 CODEC Lcom/mojang/serialization/Codec; + METHOD method_29317 register (Ljava/lang/String;Lcom/mojang/serialization/Codec;)Lnet/minecraft/class_5338; ARG 0 id - ARG 1 jsonSerializer + ARG 1 codec diff --git a/mappings/net/minecraft/loot/entry/LootTableEntry.mapping b/mappings/net/minecraft/loot/entry/LootTableEntry.mapping index 4758d4a337..e0d1270b2e 100644 --- a/mappings/net/minecraft/loot/entry/LootTableEntry.mapping +++ b/mappings/net/minecraft/loot/entry/LootTableEntry.mapping @@ -1,6 +1,7 @@ CLASS net/minecraft/class_83 net/minecraft/loot/entry/LootTableEntry + FIELD field_45803 CODEC Lcom/mojang/serialization/Codec; FIELD field_993 id Lnet/minecraft/class_2960; - METHOD (Lnet/minecraft/class_2960;II[Lnet/minecraft/class_5341;[Lnet/minecraft/class_117;)V + METHOD (Lnet/minecraft/class_2960;IILjava/util/List;Ljava/util/List;)V ARG 1 id ARG 2 weight ARG 3 quality @@ -8,9 +9,10 @@ CLASS net/minecraft/class_83 net/minecraft/loot/entry/LootTableEntry ARG 5 functions METHOD method_428 builder (Lnet/minecraft/class_2960;)Lnet/minecraft/class_85$class_86; ARG 0 id - METHOD method_430 (Lnet/minecraft/class_2960;II[Lnet/minecraft/class_5341;[Lnet/minecraft/class_117;)Lnet/minecraft/class_85; + METHOD method_430 (Lnet/minecraft/class_2960;IILjava/util/List;Ljava/util/List;)Lnet/minecraft/class_85; ARG 1 weight ARG 2 quality ARG 3 conditions ARG 4 functions - CLASS class_84 Serializer + METHOD method_51222 (Lnet/minecraft/class_58;Lnet/minecraft/class_8488;Lnet/minecraft/class_52;)V + ARG 3 table diff --git a/mappings/net/minecraft/loot/entry/SequenceEntry.mapping b/mappings/net/minecraft/loot/entry/SequenceEntry.mapping index 5f608c7a1a..641ae6b721 100644 --- a/mappings/net/minecraft/loot/entry/SequenceEntry.mapping +++ b/mappings/net/minecraft/loot/entry/SequenceEntry.mapping @@ -1,10 +1,11 @@ CLASS net/minecraft/class_72 net/minecraft/loot/entry/SequenceEntry + FIELD field_45804 CODEC Lcom/mojang/serialization/Codec; METHOD method_35515 create ([Lnet/minecraft/class_79$class_80;)Lnet/minecraft/class_72$class_6153; ARG 0 entries - METHOD method_400 ([Lnet/minecraft/class_64;Lnet/minecraft/class_47;Ljava/util/function/Consumer;)Z + METHOD method_400 (Ljava/util/List;Lnet/minecraft/class_47;Ljava/util/function/Consumer;)Z ARG 1 context ARG 2 lootChoiceExpander CLASS class_6153 Builder - FIELD field_31849 entries Ljava/util/List; + FIELD field_31849 entries Lcom/google/common/collect/ImmutableList$Builder; METHOD ([Lnet/minecraft/class_79$class_80;)V ARG 1 entries diff --git a/mappings/net/minecraft/loot/entry/TagEntry.mapping b/mappings/net/minecraft/loot/entry/TagEntry.mapping index f96d781059..e9673aa733 100644 --- a/mappings/net/minecraft/loot/entry/TagEntry.mapping +++ b/mappings/net/minecraft/loot/entry/TagEntry.mapping @@ -1,7 +1,8 @@ CLASS net/minecraft/class_91 net/minecraft/loot/entry/TagEntry FIELD field_1005 name Lnet/minecraft/class_6862; FIELD field_1006 expand Z - METHOD (Lnet/minecraft/class_6862;ZII[Lnet/minecraft/class_5341;[Lnet/minecraft/class_117;)V + FIELD field_45805 CODEC Lcom/mojang/serialization/Codec; + METHOD (Lnet/minecraft/class_6862;ZIILjava/util/List;Ljava/util/List;)V ARG 1 name ARG 2 expand ARG 3 weight @@ -10,12 +11,12 @@ CLASS net/minecraft/class_91 net/minecraft/loot/entry/TagEntry ARG 6 functions METHOD method_35517 builder (Lnet/minecraft/class_6862;)Lnet/minecraft/class_85$class_86; ARG 0 name - METHOD method_35518 (Lnet/minecraft/class_6862;II[Lnet/minecraft/class_5341;[Lnet/minecraft/class_117;)Lnet/minecraft/class_85; + METHOD method_35518 (Lnet/minecraft/class_6862;IILjava/util/List;Ljava/util/List;)Lnet/minecraft/class_85; ARG 1 weight ARG 2 quality ARG 3 conditions ARG 4 functions - METHOD method_444 (Lnet/minecraft/class_6862;II[Lnet/minecraft/class_5341;[Lnet/minecraft/class_117;)Lnet/minecraft/class_85; + METHOD method_444 (Lnet/minecraft/class_6862;IILjava/util/List;Ljava/util/List;)Lnet/minecraft/class_85; ARG 1 weight ARG 2 quality ARG 3 conditions @@ -27,4 +28,3 @@ CLASS net/minecraft/class_91 net/minecraft/loot/entry/TagEntry ARG 2 lootChoiceExpander METHOD method_449 (Ljava/util/function/Consumer;Lnet/minecraft/class_6880;)V ARG 1 entry - CLASS class_92 Serializer diff --git a/mappings/net/minecraft/loot/function/ApplyBonusLootFunction.mapping b/mappings/net/minecraft/loot/function/ApplyBonusLootFunction.mapping index 0d3b0f71d8..335b363916 100644 --- a/mappings/net/minecraft/loot/function/ApplyBonusLootFunction.mapping +++ b/mappings/net/minecraft/loot/function/ApplyBonusLootFunction.mapping @@ -1,64 +1,55 @@ CLASS net/minecraft/class_94 net/minecraft/loot/function/ApplyBonusLootFunction FIELD field_1009 formula Lnet/minecraft/class_94$class_96; FIELD field_1010 FACTORIES Ljava/util/Map; - FIELD field_1011 enchantment Lnet/minecraft/class_1887; - METHOD ([Lnet/minecraft/class_5341;Lnet/minecraft/class_1887;Lnet/minecraft/class_94$class_96;)V + FIELD field_1011 enchantment Lnet/minecraft/class_6880; + FIELD field_45806 CODEC Lcom/mojang/serialization/Codec; + METHOD (Ljava/util/List;Lnet/minecraft/class_6880;Lnet/minecraft/class_94$class_96;)V ARG 1 conditions ARG 2 enchantment ARG 3 formula - METHOD method_453 (Lnet/minecraft/class_1887;[Lnet/minecraft/class_5341;)Lnet/minecraft/class_117; + METHOD method_453 (Lnet/minecraft/class_1887;Ljava/util/List;)Lnet/minecraft/class_117; ARG 1 conditions METHOD method_455 oreDrops (Lnet/minecraft/class_1887;)Lnet/minecraft/class_120$class_121; ARG 0 enchantment METHOD method_456 uniformBonusCount (Lnet/minecraft/class_1887;)Lnet/minecraft/class_120$class_121; ARG 0 enchantment - METHOD method_457 (Lnet/minecraft/class_1887;[Lnet/minecraft/class_5341;)Lnet/minecraft/class_117; + METHOD method_457 (Lnet/minecraft/class_1887;Ljava/util/List;)Lnet/minecraft/class_117; ARG 1 conditions - METHOD method_459 (Lnet/minecraft/class_1887;IF[Lnet/minecraft/class_5341;)Lnet/minecraft/class_117; + METHOD method_459 (Lnet/minecraft/class_1887;IFLjava/util/List;)Lnet/minecraft/class_117; ARG 3 conditions METHOD method_461 uniformBonusCount (Lnet/minecraft/class_1887;I)Lnet/minecraft/class_120$class_121; ARG 0 enchantment ARG 1 bonusMultiplier - METHOD method_462 (Lnet/minecraft/class_1887;I[Lnet/minecraft/class_5341;)Lnet/minecraft/class_117; + METHOD method_462 (Lnet/minecraft/class_1887;ILjava/util/List;)Lnet/minecraft/class_117; ARG 2 conditions METHOD method_463 binomialWithBonusCount (Lnet/minecraft/class_1887;FI)Lnet/minecraft/class_120$class_121; ARG 0 enchantment ARG 1 probability ARG 2 extra CLASS class_95 BinomialWithBonusCount - FIELD field_1012 probability F - FIELD field_1013 ID Lnet/minecraft/class_2960; - FIELD field_1014 extra I + FIELD comp_1848 extra I + FIELD comp_1849 probability F + FIELD field_1013 TYPE Lnet/minecraft/class_94$class_8752; + FIELD field_45811 CODEC Lcom/mojang/serialization/Codec; METHOD (IF)V ARG 1 extra ARG 2 probability - METHOD method_464 fromJson (Lcom/google/gson/JsonObject;Lcom/google/gson/JsonDeserializationContext;)Lnet/minecraft/class_94$class_96; - ARG 0 json - ARG 1 context + METHOD comp_1848 extra ()I + METHOD comp_1849 probability ()F CLASS class_96 Formula - METHOD method_465 toJson (Lcom/google/gson/JsonObject;Lcom/google/gson/JsonSerializationContext;)V - ARG 1 json - ARG 2 context - METHOD method_466 getId ()Lnet/minecraft/class_2960; + METHOD method_466 getType ()Lnet/minecraft/class_94$class_8752; METHOD method_467 getValue (Lnet/minecraft/class_5819;II)I ARG 1 random ARG 2 initialCount ARG 3 enchantmentLevel - CLASS class_97 FormulaFactory - METHOD deserialize (Lcom/google/gson/JsonObject;Lcom/google/gson/JsonDeserializationContext;)Lnet/minecraft/class_94$class_96; - ARG 1 functionJson - ARG 2 context CLASS class_98 OreDrops - FIELD field_1015 ID Lnet/minecraft/class_2960; - METHOD method_468 fromJson (Lcom/google/gson/JsonObject;Lcom/google/gson/JsonDeserializationContext;)Lnet/minecraft/class_94$class_96; - ARG 0 json - ARG 1 context - CLASS class_99 Serializer + FIELD field_1015 TYPE Lnet/minecraft/class_94$class_8752; + FIELD field_45812 CODEC Lcom/mojang/serialization/Codec; CLASS class_100 UniformBonusCount - FIELD field_1016 ID Lnet/minecraft/class_2960; - FIELD field_1017 bonusMultiplier I + FIELD comp_1852 bonusMultiplier I + FIELD field_45813 CODEC Lcom/mojang/serialization/Codec; + FIELD field_45814 TYPE Lnet/minecraft/class_94$class_8752; METHOD (I)V ARG 1 bonusMultiplier - METHOD method_471 fromJson (Lcom/google/gson/JsonObject;Lcom/google/gson/JsonDeserializationContext;)Lnet/minecraft/class_94$class_96; - ARG 0 json - ARG 1 context + METHOD comp_1852 bonusMultiplier ()I + CLASS class_8752 Type diff --git a/mappings/net/minecraft/loot/function/ConditionalLootFunction.mapping b/mappings/net/minecraft/loot/function/ConditionalLootFunction.mapping index 8526a8a458..8091ffc215 100644 --- a/mappings/net/minecraft/loot/function/ConditionalLootFunction.mapping +++ b/mappings/net/minecraft/loot/function/ConditionalLootFunction.mapping @@ -1,7 +1,7 @@ CLASS net/minecraft/class_120 net/minecraft/loot/function/ConditionalLootFunction - FIELD field_1047 conditions [Lnet/minecraft/class_5341; + FIELD field_1047 conditions Ljava/util/List; FIELD field_1048 predicate Ljava/util/function/Predicate; - METHOD ([Lnet/minecraft/class_5341;)V + METHOD (Ljava/util/List;)V ARG 1 conditions METHOD apply (Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object; ARG 1 itemStack @@ -12,15 +12,10 @@ CLASS net/minecraft/class_120 net/minecraft/loot/function/ConditionalLootFunctio ARG 1 stack ARG 2 context CLASS class_121 Builder - FIELD field_1049 conditionList Ljava/util/List; + FIELD field_1049 conditionList Lcom/google/common/collect/ImmutableList$Builder; METHOD method_523 getThisBuilder ()Lnet/minecraft/class_120$class_121; - METHOD method_526 getConditions ()[Lnet/minecraft/class_5341; + METHOD method_526 getConditions ()Ljava/util/List; CLASS class_122 Joiner FIELD field_1050 joiner Ljava/util/function/Function; METHOD (Ljava/util/function/Function;)V ARG 1 joiner - CLASS class_123 Serializer - METHOD method_530 fromJson (Lcom/google/gson/JsonObject;Lcom/google/gson/JsonDeserializationContext;[Lnet/minecraft/class_5341;)Lnet/minecraft/class_120; - ARG 1 json - ARG 2 context - ARG 3 conditions diff --git a/mappings/net/minecraft/loot/function/CopyNameLootFunction.mapping b/mappings/net/minecraft/loot/function/CopyNameLootFunction.mapping index eae07affb6..e7edcccb0b 100644 --- a/mappings/net/minecraft/loot/function/CopyNameLootFunction.mapping +++ b/mappings/net/minecraft/loot/function/CopyNameLootFunction.mapping @@ -1,18 +1,15 @@ CLASS net/minecraft/class_101 net/minecraft/loot/function/CopyNameLootFunction FIELD field_1018 source Lnet/minecraft/class_101$class_102; - METHOD ([Lnet/minecraft/class_5341;Lnet/minecraft/class_101$class_102;)V + FIELD field_45817 CODEC Lcom/mojang/serialization/Codec; + METHOD (Ljava/util/List;Lnet/minecraft/class_101$class_102;)V ARG 1 conditions ARG 2 source METHOD method_473 builder (Lnet/minecraft/class_101$class_102;)Lnet/minecraft/class_120$class_121; ARG 0 source - METHOD method_474 (Lnet/minecraft/class_101$class_102;[Lnet/minecraft/class_5341;)Lnet/minecraft/class_117; - ARG 1 conditions CLASS class_102 Source FIELD field_1024 parameter Lnet/minecraft/class_169; FIELD field_1025 name Ljava/lang/String; + FIELD field_45818 CODEC Lcom/mojang/serialization/Codec; METHOD (Ljava/lang/String;ILjava/lang/String;Lnet/minecraft/class_169;)V ARG 3 name ARG 4 parameter - METHOD method_475 get (Ljava/lang/String;)Lnet/minecraft/class_101$class_102; - ARG 0 name - CLASS class_103 Serializer diff --git a/mappings/net/minecraft/loot/function/CopyNbtLootFunction.mapping b/mappings/net/minecraft/loot/function/CopyNbtLootFunction.mapping index 9f1e1649d9..08bce41df6 100644 --- a/mappings/net/minecraft/loot/function/CopyNbtLootFunction.mapping +++ b/mappings/net/minecraft/loot/function/CopyNbtLootFunction.mapping @@ -1,7 +1,8 @@ CLASS net/minecraft/class_3837 net/minecraft/loot/function/CopyNbtLootFunction FIELD field_17013 source Lnet/minecraft/class_5651; FIELD field_17014 operations Ljava/util/List; - METHOD ([Lnet/minecraft/class_5341;Lnet/minecraft/class_5651;Ljava/util/List;)V + FIELD field_45819 CODEC Lcom/mojang/serialization/Codec; + METHOD (Ljava/util/List;Lnet/minecraft/class_5651;Ljava/util/List;)V ARG 1 conditions ARG 2 source ARG 3 operations @@ -9,8 +10,6 @@ CLASS net/minecraft/class_3837 net/minecraft/loot/function/CopyNbtLootFunction ARG 2 operation METHOD method_16848 builder (Lnet/minecraft/class_5651;)Lnet/minecraft/class_3837$class_3838; ARG 0 source - METHOD method_16853 parseNbtPath (Ljava/lang/String;)Lnet/minecraft/class_2203$class_2209; - ARG 0 nbtPath METHOD method_35519 builder (Lnet/minecraft/class_47$class_50;)Lnet/minecraft/class_3837$class_3838; ARG 0 target CLASS class_3838 Builder @@ -26,31 +25,27 @@ CLASS net/minecraft/class_3837 net/minecraft/loot/function/CopyNbtLootFunction ARG 2 target ARG 3 operator CLASS class_3839 Operation - FIELD field_17019 sourcePath Ljava/lang/String; - FIELD field_17020 parsedSourcePath Lnet/minecraft/class_2203$class_2209; - FIELD field_17021 targetPath Ljava/lang/String; - FIELD field_17022 parsedTargetPath Lnet/minecraft/class_2203$class_2209; - FIELD field_17023 operator Lnet/minecraft/class_3837$class_3841; - METHOD (Ljava/lang/String;Ljava/lang/String;Lnet/minecraft/class_3837$class_3841;)V - ARG 1 sourcePath - ARG 2 targetPath + FIELD comp_1853 parsedSourcePath Lnet/minecraft/class_3837$class_8753; + FIELD comp_1854 parsedTargetPath Lnet/minecraft/class_3837$class_8753; + FIELD comp_1855 operator Lnet/minecraft/class_3837$class_3841; + FIELD field_45820 CODEC Lcom/mojang/serialization/Codec; + METHOD (Lnet/minecraft/class_3837$class_8753;Lnet/minecraft/class_3837$class_8753;Lnet/minecraft/class_3837$class_3841;)V ARG 3 operator - METHOD method_16858 toJson ()Lcom/google/gson/JsonObject; - METHOD method_16859 fromJson (Lcom/google/gson/JsonObject;)Lnet/minecraft/class_3837$class_3839; - ARG 0 json + METHOD comp_1853 parsedSourcePath ()Lnet/minecraft/class_3837$class_8753; + METHOD comp_1854 parsedTargetPath ()Lnet/minecraft/class_3837$class_8753; + METHOD comp_1855 operator ()Lnet/minecraft/class_3837$class_3841; METHOD method_16860 execute (Ljava/util/function/Supplier;Lnet/minecraft/class_2520;)V ARG 1 itemNbtGetter ARG 2 sourceEntityNbt CLASS class_3841 Operator FIELD field_17035 name Ljava/lang/String; + FIELD field_45821 CODEC Lcom/mojang/serialization/Codec; METHOD (Ljava/lang/String;ILjava/lang/String;)V ARG 3 name METHOD method_16864 merge (Lnet/minecraft/class_2520;Lnet/minecraft/class_2203$class_2209;Ljava/util/List;)V ARG 1 itemNbt ARG 2 targetPath ARG 3 sourceNbts - METHOD method_16865 get (Ljava/lang/String;)Lnet/minecraft/class_3837$class_3841; - ARG 0 name CLASS 2 METHOD method_16866 (Lnet/minecraft/class_2520;Lnet/minecraft/class_2520;)V ARG 1 sourceNbt @@ -61,4 +56,6 @@ CLASS net/minecraft/class_3837 net/minecraft/loot/function/CopyNbtLootFunction ARG 1 sourceNbt METHOD method_16869 (Ljava/util/List;Lnet/minecraft/class_2520;)V ARG 1 foundNbt - CLASS class_3842 Serializer + CLASS class_8753 Path + FIELD field_45822 CODEC Lcom/mojang/serialization/Codec; + METHOD method_53319 parse (Ljava/lang/String;)Lnet/minecraft/class_3837$class_8753; diff --git a/mappings/net/minecraft/loot/function/CopyStateFunction.mapping b/mappings/net/minecraft/loot/function/CopyStateFunction.mapping index bb3dbcbaf0..d9062963df 100644 --- a/mappings/net/minecraft/loot/function/CopyStateFunction.mapping +++ b/mappings/net/minecraft/loot/function/CopyStateFunction.mapping @@ -1,7 +1,12 @@ CLASS net/minecraft/class_4488 net/minecraft/loot/function/CopyStateFunction - FIELD field_20449 block Lnet/minecraft/class_2248; + FIELD field_20449 block Lnet/minecraft/class_6880; FIELD field_20450 properties Ljava/util/Set; - METHOD ([Lnet/minecraft/class_5341;Lnet/minecraft/class_2248;Ljava/util/Set;)V + FIELD field_45816 CODEC Lcom/mojang/serialization/Codec; + METHOD (Ljava/util/List;Lnet/minecraft/class_6880;Ljava/util/List;)V + ARG 1 conditions + ARG 2 block + ARG 3 properties + METHOD (Ljava/util/List;Lnet/minecraft/class_6880;Ljava/util/Set;)V ARG 1 conditions ARG 2 block ARG 3 properties @@ -10,17 +15,10 @@ CLASS net/minecraft/class_4488 net/minecraft/loot/function/CopyStateFunction METHOD method_21893 getPropertyName (Lnet/minecraft/class_2680;Lnet/minecraft/class_2769;)Ljava/lang/String; ARG 0 state ARG 1 property - METHOD method_21895 (Lnet/minecraft/class_2487;Lnet/minecraft/class_2680;Lnet/minecraft/class_2769;)V - ARG 2 property CLASS class_4489 Builder - FIELD field_20451 block Lnet/minecraft/class_2248; - FIELD field_20452 properties Ljava/util/Set; + FIELD field_20451 block Lnet/minecraft/class_6880; + FIELD field_20452 properties Lcom/google/common/collect/ImmutableSet$Builder; METHOD (Lnet/minecraft/class_2248;)V ARG 1 block METHOD method_21898 addProperty (Lnet/minecraft/class_2769;)Lnet/minecraft/class_4488$class_4489; ARG 1 property - CLASS class_4490 Serializer - METHOD method_21899 (Lcom/google/gson/JsonArray;Lnet/minecraft/class_2769;)V - ARG 1 property - METHOD method_21902 (Ljava/util/Set;Lnet/minecraft/class_2689;Lcom/google/gson/JsonElement;)V - ARG 2 property diff --git a/mappings/net/minecraft/loot/function/EnchantRandomlyLootFunction.mapping b/mappings/net/minecraft/loot/function/EnchantRandomlyLootFunction.mapping index 4c9060c64d..f4a48b3f2d 100644 --- a/mappings/net/minecraft/loot/function/EnchantRandomlyLootFunction.mapping +++ b/mappings/net/minecraft/loot/function/EnchantRandomlyLootFunction.mapping @@ -1,21 +1,21 @@ CLASS net/minecraft/class_109 net/minecraft/loot/function/EnchantRandomlyLootFunction - FIELD field_1030 enchantments Ljava/util/List; + FIELD field_1030 enchantments Ljava/util/Optional; FIELD field_1031 LOGGER Lorg/slf4j/Logger; - METHOD ([Lnet/minecraft/class_5341;Ljava/util/Collection;)V + FIELD field_45823 CODEC Lcom/mojang/serialization/Codec; + METHOD (Ljava/util/List;Ljava/util/Optional;)V ARG 1 conditions ARG 2 enchantments METHOD method_26266 addEnchantmentToStack (Lnet/minecraft/class_1799;Lnet/minecraft/class_1887;Lnet/minecraft/class_5819;)Lnet/minecraft/class_1799; ARG 0 stack ARG 1 enchantment ARG 2 random - METHOD method_26267 (ZLnet/minecraft/class_1799;Lnet/minecraft/class_1887;)Z - ARG 2 enchantment METHOD method_35520 create ()Lnet/minecraft/class_109$class_4954; - METHOD method_488 ([Lnet/minecraft/class_5341;)Lnet/minecraft/class_117; + METHOD method_488 (Ljava/util/List;)Lnet/minecraft/class_117; ARG 0 conditions METHOD method_489 builder ()Lnet/minecraft/class_120$class_121; - CLASS class_110 Serializer + METHOD method_53327 (ZLnet/minecraft/class_1799;Lnet/minecraft/class_6880$class_6883;)Z + ARG 2 enchantment CLASS class_4954 Builder - FIELD field_23090 enchantments Ljava/util/Set; + FIELD field_23090 enchantments Ljava/util/List; METHOD method_25992 add (Lnet/minecraft/class_1887;)Lnet/minecraft/class_109$class_4954; ARG 1 enchantment diff --git a/mappings/net/minecraft/loot/function/EnchantWithLevelsLootFunction.mapping b/mappings/net/minecraft/loot/function/EnchantWithLevelsLootFunction.mapping index 21624ad466..1d3aa30963 100644 --- a/mappings/net/minecraft/loot/function/EnchantWithLevelsLootFunction.mapping +++ b/mappings/net/minecraft/loot/function/EnchantWithLevelsLootFunction.mapping @@ -1,7 +1,8 @@ CLASS net/minecraft/class_106 net/minecraft/loot/function/EnchantWithLevelsLootFunction FIELD field_1026 range Lnet/minecraft/class_5658; FIELD field_1027 treasureEnchantmentsAllowed Z - METHOD ([Lnet/minecraft/class_5341;Lnet/minecraft/class_5658;Z)V + FIELD field_45825 CODEC Lcom/mojang/serialization/Codec; + METHOD (Ljava/util/List;Lnet/minecraft/class_5658;Z)V ARG 1 conditions ARG 2 range ARG 3 treasureEnchantmentsAllowed @@ -13,4 +14,3 @@ CLASS net/minecraft/class_106 net/minecraft/loot/function/EnchantWithLevelsLootF METHOD (Lnet/minecraft/class_5658;)V ARG 1 range METHOD method_484 allowTreasureEnchantments ()Lnet/minecraft/class_106$class_107; - CLASS class_108 Serializer diff --git a/mappings/net/minecraft/loot/function/ExplorationMapLootFunction.mapping b/mappings/net/minecraft/loot/function/ExplorationMapLootFunction.mapping index 8eb026c308..8be451819f 100644 --- a/mappings/net/minecraft/loot/function/ExplorationMapLootFunction.mapping +++ b/mappings/net/minecraft/loot/function/ExplorationMapLootFunction.mapping @@ -5,10 +5,9 @@ CLASS net/minecraft/class_111 net/minecraft/loot/function/ExplorationMapLootFunc FIELD field_1035 destination Lnet/minecraft/class_6862; FIELD field_1036 decoration Lnet/minecraft/class_20$class_21; FIELD field_1037 zoom B - FIELD field_1038 LOGGER Lorg/slf4j/Logger; FIELD field_25032 DEFAULT_DESTINATION Lnet/minecraft/class_6862; - FIELD field_31850 MANSION Ljava/lang/String; - METHOD ([Lnet/minecraft/class_5341;Lnet/minecraft/class_6862;Lnet/minecraft/class_20$class_21;BIZ)V + FIELD field_45826 CODEC Lcom/mojang/serialization/Codec; + METHOD (Ljava/util/List;Lnet/minecraft/class_6862;Lnet/minecraft/class_20$class_21;BIZ)V ARG 1 conditions ARG 2 destination ARG 3 decoration @@ -32,6 +31,3 @@ CLASS net/minecraft/class_111 net/minecraft/loot/function/ExplorationMapLootFunc ARG 1 destination METHOD method_503 withSkipExistingChunks (Z)Lnet/minecraft/class_111$class_112; ARG 1 skipExistingChunks - CLASS class_113 Serializer - METHOD method_29039 getDestination (Lcom/google/gson/JsonObject;)Lnet/minecraft/class_6862; - ARG 0 json diff --git a/mappings/net/minecraft/loot/function/ExplosionDecayLootFunction.mapping b/mappings/net/minecraft/loot/function/ExplosionDecayLootFunction.mapping index f16bac5453..e4ce04ef73 100644 --- a/mappings/net/minecraft/loot/function/ExplosionDecayLootFunction.mapping +++ b/mappings/net/minecraft/loot/function/ExplosionDecayLootFunction.mapping @@ -1,3 +1,5 @@ CLASS net/minecraft/class_104 net/minecraft/loot/function/ExplosionDecayLootFunction + FIELD field_45815 CODEC Lcom/mojang/serialization/Codec; + METHOD (Ljava/util/List;)V + ARG 1 conditions METHOD method_478 builder ()Lnet/minecraft/class_120$class_121; - CLASS class_105 Serializer diff --git a/mappings/net/minecraft/loot/function/FillPlayerHeadLootFunction.mapping b/mappings/net/minecraft/loot/function/FillPlayerHeadLootFunction.mapping index b5d302b06c..e0f4b659de 100644 --- a/mappings/net/minecraft/loot/function/FillPlayerHeadLootFunction.mapping +++ b/mappings/net/minecraft/loot/function/FillPlayerHeadLootFunction.mapping @@ -1,10 +1,8 @@ CLASS net/minecraft/class_3668 net/minecraft/loot/function/FillPlayerHeadLootFunction FIELD field_16227 entity Lnet/minecraft/class_47$class_50; - METHOD ([Lnet/minecraft/class_5341;Lnet/minecraft/class_47$class_50;)V + FIELD field_45827 CODEC Lcom/mojang/serialization/Codec; + METHOD (Ljava/util/List;Lnet/minecraft/class_47$class_50;)V ARG 1 conditions ARG 2 entity METHOD method_35522 builder (Lnet/minecraft/class_47$class_50;)Lnet/minecraft/class_120$class_121; ARG 0 target - METHOD method_35523 (Lnet/minecraft/class_47$class_50;[Lnet/minecraft/class_5341;)Lnet/minecraft/class_117; - ARG 1 conditions - CLASS class_3669 Serializer diff --git a/mappings/net/minecraft/loot/function/FurnaceSmeltLootFunction.mapping b/mappings/net/minecraft/loot/function/FurnaceSmeltLootFunction.mapping index 3e02f71aad..0a6048ce4e 100644 --- a/mappings/net/minecraft/loot/function/FurnaceSmeltLootFunction.mapping +++ b/mappings/net/minecraft/loot/function/FurnaceSmeltLootFunction.mapping @@ -1,4 +1,6 @@ CLASS net/minecraft/class_165 net/minecraft/loot/function/FurnaceSmeltLootFunction FIELD field_1159 LOGGER Lorg/slf4j/Logger; + FIELD field_45855 CODEC Lcom/mojang/serialization/Codec; + METHOD (Ljava/util/List;)V + ARG 1 conditions METHOD method_724 builder ()Lnet/minecraft/class_120$class_121; - CLASS class_5340 Serializer diff --git a/mappings/net/minecraft/loot/function/LimitCountLootFunction.mapping b/mappings/net/minecraft/loot/function/LimitCountLootFunction.mapping index 11f89ac32a..2cff8bd5fd 100644 --- a/mappings/net/minecraft/loot/function/LimitCountLootFunction.mapping +++ b/mappings/net/minecraft/loot/function/LimitCountLootFunction.mapping @@ -1,10 +1,10 @@ CLASS net/minecraft/class_114 net/minecraft/loot/function/LimitCountLootFunction FIELD field_1044 limit Lnet/minecraft/class_42; - METHOD ([Lnet/minecraft/class_5341;Lnet/minecraft/class_42;)V + FIELD field_45829 CODEC Lcom/mojang/serialization/Codec; + METHOD (Ljava/util/List;Lnet/minecraft/class_42;)V ARG 1 conditions ARG 2 limit METHOD method_506 builder (Lnet/minecraft/class_42;)Lnet/minecraft/class_120$class_121; ARG 0 limit - METHOD method_508 (Lnet/minecraft/class_42;[Lnet/minecraft/class_5341;)Lnet/minecraft/class_117; + METHOD method_508 (Lnet/minecraft/class_42;Ljava/util/List;)Lnet/minecraft/class_117; ARG 1 conditions - CLASS class_115 Serializer diff --git a/mappings/net/minecraft/loot/function/LootFunctionManager.mapping b/mappings/net/minecraft/loot/function/LootFunctionManager.mapping deleted file mode 100644 index 688deea929..0000000000 --- a/mappings/net/minecraft/loot/function/LootFunctionManager.mapping +++ /dev/null @@ -1,32 +0,0 @@ -CLASS net/minecraft/class_5640 net/minecraft/loot/function/LootFunctionManager - FIELD field_27899 LOGGER Lorg/slf4j/Logger; - FIELD field_27900 GSON Lcom/google/gson/Gson; - FIELD field_27901 lootConditionManager Lnet/minecraft/class_4567; - FIELD field_27902 lootManager Lnet/minecraft/class_60; - FIELD field_27903 functions Ljava/util/Map; - METHOD (Lnet/minecraft/class_4567;Lnet/minecraft/class_60;)V - ARG 1 lootConditionManager - ARG 2 lootManager - METHOD method_32399 getFunctionIds ()Ljava/util/Set; - METHOD method_32400 (Lcom/google/common/collect/ImmutableMap$Builder;Lnet/minecraft/class_2960;Lcom/google/gson/JsonElement;)V - ARG 1 id - ARG 2 json - METHOD method_32401 (Lnet/minecraft/class_58;Lnet/minecraft/class_2960;Lnet/minecraft/class_117;)V - ARG 1 id - ARG 2 function - METHOD method_32402 (Ljava/lang/String;Ljava/lang/String;)V - ARG 0 name - ARG 1 message - METHOD method_32404 get (Lnet/minecraft/class_2960;)Lnet/minecraft/class_117; - ARG 1 id - METHOD method_35507 getOrDefault (Lnet/minecraft/class_2960;Lnet/minecraft/class_117;)Lnet/minecraft/class_117; - ARG 1 id - ARG 2 fallback - CLASS class_5641 AndFunction - FIELD field_27904 functions [Lnet/minecraft/class_117; - FIELD field_27905 applier Ljava/util/function/BiFunction; - METHOD ([Lnet/minecraft/class_117;)V - ARG 1 functions - METHOD apply (Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object; - ARG 1 stack - ARG 2 context diff --git a/mappings/net/minecraft/loot/function/LootFunctionTypes.mapping b/mappings/net/minecraft/loot/function/LootFunctionTypes.mapping index 3a4e5da8fa..d662e3e920 100644 --- a/mappings/net/minecraft/loot/function/LootFunctionTypes.mapping +++ b/mappings/net/minecraft/loot/function/LootFunctionTypes.mapping @@ -1,17 +1,14 @@ CLASS net/minecraft/class_131 net/minecraft/loot/function/LootFunctionTypes FIELD field_1102 NOOP Ljava/util/function/BiFunction; - METHOD method_29322 createGsonSerializer ()Ljava/lang/Object; - METHOD method_29323 register (Ljava/lang/String;Lnet/minecraft/class_5335;)Lnet/minecraft/class_5339; + FIELD field_45831 BASE_CODEC Lcom/mojang/serialization/Codec; + FIELD field_45832 CODEC Lcom/mojang/serialization/Codec; + METHOD method_29323 register (Ljava/lang/String;Lcom/mojang/serialization/Codec;)Lnet/minecraft/class_5339; ARG 0 id - ARG 1 jsonSerializer + ARG 1 codec 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 METHOD method_592 (Lnet/minecraft/class_1799;Lnet/minecraft/class_47;)Lnet/minecraft/class_1799; ARG 0 stack ARG 1 context - METHOD method_594 join ([Ljava/util/function/BiFunction;)Ljava/util/function/BiFunction; - ARG 0 lootFunctions - METHOD method_595 ([Ljava/util/function/BiFunction;Lnet/minecraft/class_1799;Lnet/minecraft/class_47;)Lnet/minecraft/class_1799; - ARG 1 stack - ARG 2 context + METHOD method_594 join (Ljava/util/List;)Ljava/util/function/BiFunction; diff --git a/mappings/net/minecraft/loot/function/LootingEnchantLootFunction.mapping b/mappings/net/minecraft/loot/function/LootingEnchantLootFunction.mapping index c99923d132..00a932f765 100644 --- a/mappings/net/minecraft/loot/function/LootingEnchantLootFunction.mapping +++ b/mappings/net/minecraft/loot/function/LootingEnchantLootFunction.mapping @@ -1,7 +1,8 @@ CLASS net/minecraft/class_125 net/minecraft/loot/function/LootingEnchantLootFunction FIELD field_1082 countRange Lnet/minecraft/class_5658; FIELD field_1083 limit I - METHOD ([Lnet/minecraft/class_5341;Lnet/minecraft/class_5658;I)V + FIELD field_45833 CODEC Lcom/mojang/serialization/Codec; + METHOD (Ljava/util/List;Lnet/minecraft/class_5658;I)V ARG 1 conditions ARG 2 countRange ARG 3 limit @@ -15,4 +16,3 @@ CLASS net/minecraft/class_125 net/minecraft/loot/function/LootingEnchantLootFunc ARG 1 countRange METHOD method_551 withLimit (I)Lnet/minecraft/class_125$class_126; ARG 1 limit - CLASS class_127 Serializer diff --git a/mappings/net/minecraft/loot/function/ReferenceLootFunction.mapping b/mappings/net/minecraft/loot/function/ReferenceLootFunction.mapping new file mode 100644 index 0000000000..8fd7fefa95 --- /dev/null +++ b/mappings/net/minecraft/loot/function/ReferenceLootFunction.mapping @@ -0,0 +1,13 @@ +CLASS net/minecraft/class_8492 net/minecraft/loot/function/ReferenceLootFunction + FIELD field_44506 LOGGER Lorg/slf4j/Logger; + FIELD field_44507 name Lnet/minecraft/class_2960; + FIELD field_45828 CODEC Lcom/mojang/serialization/Codec; + METHOD (Ljava/util/List;Lnet/minecraft/class_2960;)V + ARG 1 conditions + ARG 2 name + METHOD method_51224 builder (Lnet/minecraft/class_2960;)Lnet/minecraft/class_120$class_121; + ARG 0 name + METHOD method_51225 (Lnet/minecraft/class_2960;Ljava/util/List;)Lnet/minecraft/class_117; + ARG 1 conditions + METHOD method_51226 (Lnet/minecraft/class_58;Lnet/minecraft/class_8488;Lnet/minecraft/class_117;)V + ARG 3 itemModifier diff --git a/mappings/net/minecraft/loot/function/SetAttributesLootFunction.mapping b/mappings/net/minecraft/loot/function/SetAttributesLootFunction.mapping index 3b3445057e..ac71673d3b 100644 --- a/mappings/net/minecraft/loot/function/SetAttributesLootFunction.mapping +++ b/mappings/net/minecraft/loot/function/SetAttributesLootFunction.mapping @@ -1,52 +1,48 @@ CLASS net/minecraft/class_137 net/minecraft/loot/function/SetAttributesLootFunction FIELD field_1105 attributes Ljava/util/List; - METHOD ([Lnet/minecraft/class_5341;Ljava/util/List;)V + FIELD field_45836 CODEC Lcom/mojang/serialization/Codec; + METHOD (Ljava/util/List;Ljava/util/List;)V ARG 1 conditions ARG 2 attributes METHOD method_32406 (Lnet/minecraft/class_137$class_138;)Ljava/util/stream/Stream; ARG 0 attribute - METHOD method_35524 attributeBuilder (Ljava/lang/String;Lnet/minecraft/class_1320;Lnet/minecraft/class_1322$class_1323;Lnet/minecraft/class_5658;)Lnet/minecraft/class_137$class_6156; + METHOD method_35524 attributeBuilder (Ljava/lang/String;Lnet/minecraft/class_6880;Lnet/minecraft/class_1322$class_1323;Lnet/minecraft/class_5658;)Lnet/minecraft/class_137$class_6156; ARG 0 name ARG 1 attribute ARG 2 operation ARG 3 amountRange METHOD method_35525 builder ()Lnet/minecraft/class_137$class_6155; CLASS class_138 Attribute - FIELD field_1107 name Ljava/lang/String; - FIELD field_1108 amount Lnet/minecraft/class_5658; - FIELD field_1109 operation Lnet/minecraft/class_1322$class_1323; - FIELD field_1110 attribute Lnet/minecraft/class_1320; - FIELD field_1111 id Ljava/util/UUID; - FIELD field_1112 slots [Lnet/minecraft/class_1304; - METHOD (Ljava/lang/String;Lnet/minecraft/class_1320;Lnet/minecraft/class_1322$class_1323;Lnet/minecraft/class_5658;[Lnet/minecraft/class_1304;Ljava/util/UUID;)V + FIELD comp_1859 name Ljava/lang/String; + FIELD comp_1860 attribute Lnet/minecraft/class_6880; + FIELD comp_1861 operation Lnet/minecraft/class_1322$class_1323; + FIELD comp_1862 amount Lnet/minecraft/class_5658; + FIELD comp_1863 slots Ljava/util/List; + FIELD comp_1864 id Ljava/util/Optional; + FIELD field_45837 CODEC Lcom/mojang/serialization/Codec; + FIELD field_45838 EQUIPMENT_SLOT_LIST_CODEC Lcom/mojang/serialization/Codec; + METHOD (Ljava/lang/String;Lnet/minecraft/class_6880;Lnet/minecraft/class_1322$class_1323;Lnet/minecraft/class_5658;Ljava/util/List;Ljava/util/Optional;)V ARG 1 name - ARG 2 attribute ARG 3 operation ARG 4 amount - ARG 5 slots - ARG 6 id - METHOD method_609 fromName (Ljava/lang/String;)Lnet/minecraft/class_1322$class_1323; - ARG 0 name - METHOD method_612 getName (Lnet/minecraft/class_1322$class_1323;)Ljava/lang/String; - ARG 0 operation - METHOD method_614 deserialize (Lcom/google/gson/JsonObject;Lcom/google/gson/JsonDeserializationContext;)Lnet/minecraft/class_137$class_138; - ARG 0 json - ARG 1 context - METHOD method_615 serialize (Lcom/google/gson/JsonSerializationContext;)Lcom/google/gson/JsonObject; - ARG 1 context - CLASS class_139 Serializer + METHOD comp_1859 name ()Ljava/lang/String; + METHOD comp_1860 attribute ()Lnet/minecraft/class_6880; + METHOD comp_1861 operation ()Lnet/minecraft/class_1322$class_1323; + METHOD comp_1862 amount ()Lnet/minecraft/class_5658; + METHOD comp_1863 slots ()Ljava/util/List; + METHOD comp_1864 id ()Ljava/util/Optional; CLASS class_6155 Builder FIELD field_31855 attributes Ljava/util/List; METHOD method_35527 attribute (Lnet/minecraft/class_137$class_6156;)Lnet/minecraft/class_137$class_6155; ARG 1 attribute CLASS class_6156 AttributeBuilder FIELD field_31856 name Ljava/lang/String; - FIELD field_31857 attribute Lnet/minecraft/class_1320; + FIELD field_31857 attribute Lnet/minecraft/class_6880; FIELD field_31858 operation Lnet/minecraft/class_1322$class_1323; FIELD field_31859 amount Lnet/minecraft/class_5658; - FIELD field_31860 uuid Ljava/util/UUID; + FIELD field_31860 uuid Ljava/util/Optional; FIELD field_31861 slots Ljava/util/Set; - METHOD (Ljava/lang/String;Lnet/minecraft/class_1320;Lnet/minecraft/class_1322$class_1323;Lnet/minecraft/class_5658;)V + METHOD (Ljava/lang/String;Lnet/minecraft/class_6880;Lnet/minecraft/class_1322$class_1323;Lnet/minecraft/class_5658;)V ARG 1 name ARG 2 attribute ARG 3 operation diff --git a/mappings/net/minecraft/loot/function/SetBannerPatternFunction.mapping b/mappings/net/minecraft/loot/function/SetBannerPatternFunction.mapping index 295af0a284..cf88f80595 100644 --- a/mappings/net/minecraft/loot/function/SetBannerPatternFunction.mapping +++ b/mappings/net/minecraft/loot/function/SetBannerPatternFunction.mapping @@ -1,15 +1,14 @@ CLASS net/minecraft/class_5592 net/minecraft/loot/function/SetBannerPatternFunction FIELD field_27343 patterns Ljava/util/List; FIELD field_27344 append Z - METHOD ([Lnet/minecraft/class_5341;Ljava/util/List;Z)V + FIELD field_45839 CODEC Lcom/mojang/serialization/Codec; + FIELD field_45840 BANNER_PATTERN_AND_COLOR_CODEC Lcom/mojang/serialization/Codec; + METHOD (Ljava/util/List;Ljava/util/List;Z)V ARG 1 conditions ARG 2 patterns ARG 3 append METHOD method_35531 builder (Z)Lnet/minecraft/class_5592$class_6157; ARG 0 append - CLASS class_5593 Serializer - METHOD method_31935 (Lcom/google/gson/JsonArray;Lcom/mojang/datafixers/util/Pair;)V - ARG 1 pair CLASS class_6157 Builder FIELD field_31862 patterns Lcom/google/common/collect/ImmutableList$Builder; FIELD field_31863 append Z diff --git a/mappings/net/minecraft/loot/function/SetContentsLootFunction.mapping b/mappings/net/minecraft/loot/function/SetContentsLootFunction.mapping index c4dba3845d..e0f8b48901 100644 --- a/mappings/net/minecraft/loot/function/SetContentsLootFunction.mapping +++ b/mappings/net/minecraft/loot/function/SetContentsLootFunction.mapping @@ -1,21 +1,21 @@ CLASS net/minecraft/class_134 net/minecraft/loot/function/SetContentsLootFunction FIELD field_1103 entries Ljava/util/List; - FIELD field_34771 type Lnet/minecraft/class_2591; - METHOD ([Lnet/minecraft/class_5341;Lnet/minecraft/class_2591;Ljava/util/List;)V + FIELD field_34771 type Lnet/minecraft/class_6880; + FIELD field_45841 CODEC Lcom/mojang/serialization/Codec; + METHOD (Ljava/util/List;Lnet/minecraft/class_6880;Ljava/util/List;)V ARG 1 conditions - ARG 2 type + ARG 2 blockEntityType ARG 3 entries METHOD method_599 (Lnet/minecraft/class_47;Lnet/minecraft/class_2371;Lnet/minecraft/class_79;)V ARG 2 entry - METHOD method_600 (Lnet/minecraft/class_2371;Lnet/minecraft/class_47;Lnet/minecraft/class_82;)V + METHOD method_600 (Lnet/minecraft/class_47;Lnet/minecraft/class_2371;Lnet/minecraft/class_82;)V ARG 2 choice METHOD method_601 builder (Lnet/minecraft/class_2591;)Lnet/minecraft/class_134$class_135; ARG 0 type CLASS class_135 Builder - FIELD field_1104 entries Ljava/util/List; + FIELD field_1104 entries Lcom/google/common/collect/ImmutableList$Builder; FIELD field_34772 type Lnet/minecraft/class_2591; METHOD (Lnet/minecraft/class_2591;)V ARG 1 type METHOD method_602 withEntry (Lnet/minecraft/class_79$class_80;)Lnet/minecraft/class_134$class_135; ARG 1 entryBuilder - CLASS class_136 Serializer diff --git a/mappings/net/minecraft/loot/function/SetCountLootFunction.mapping b/mappings/net/minecraft/loot/function/SetCountLootFunction.mapping index 1925b9b112..9fcf8836de 100644 --- a/mappings/net/minecraft/loot/function/SetCountLootFunction.mapping +++ b/mappings/net/minecraft/loot/function/SetCountLootFunction.mapping @@ -1,17 +1,13 @@ CLASS net/minecraft/class_141 net/minecraft/loot/function/SetCountLootFunction FIELD field_1114 countRange Lnet/minecraft/class_5658; FIELD field_27909 add Z - METHOD ([Lnet/minecraft/class_5341;Lnet/minecraft/class_5658;Z)V + FIELD field_45845 CODEC Lcom/mojang/serialization/Codec; + METHOD (Ljava/util/List;Lnet/minecraft/class_5658;Z)V ARG 1 conditions ARG 2 countRange ARG 3 add METHOD method_35540 builder (Lnet/minecraft/class_5658;Z)Lnet/minecraft/class_120$class_121; ARG 0 countRange ARG 1 add - METHOD method_35541 (Lnet/minecraft/class_5658;Z[Lnet/minecraft/class_5341;)Lnet/minecraft/class_117; - ARG 2 conditions - METHOD method_620 (Lnet/minecraft/class_5658;[Lnet/minecraft/class_5341;)Lnet/minecraft/class_117; - ARG 1 conditions METHOD method_621 builder (Lnet/minecraft/class_5658;)Lnet/minecraft/class_120$class_121; ARG 0 countRange - CLASS class_142 Serializer diff --git a/mappings/net/minecraft/loot/function/SetDamageLootFunction.mapping b/mappings/net/minecraft/loot/function/SetDamageLootFunction.mapping index 41296e933a..44491163cd 100644 --- a/mappings/net/minecraft/loot/function/SetDamageLootFunction.mapping +++ b/mappings/net/minecraft/loot/function/SetDamageLootFunction.mapping @@ -2,17 +2,17 @@ CLASS net/minecraft/class_149 net/minecraft/loot/function/SetDamageLootFunction FIELD field_1120 durabilityRange Lnet/minecraft/class_5658; FIELD field_1121 LOGGER Lorg/slf4j/Logger; FIELD field_27910 add Z - METHOD ([Lnet/minecraft/class_5341;Lnet/minecraft/class_5658;Z)V + FIELD field_45846 CODEC Lcom/mojang/serialization/Codec; + METHOD (Ljava/util/List;Lnet/minecraft/class_5658;Z)V ARG 1 conditions ARG 2 durabilityRange ARG 3 add METHOD method_35542 builder (Lnet/minecraft/class_5658;Z)Lnet/minecraft/class_120$class_121; ARG 0 durabilityRange ARG 1 add - METHOD method_35543 (Lnet/minecraft/class_5658;Z[Lnet/minecraft/class_5341;)Lnet/minecraft/class_117; + METHOD method_35543 (Lnet/minecraft/class_5658;ZLjava/util/List;)Lnet/minecraft/class_117; ARG 2 conditions METHOD method_633 builder (Lnet/minecraft/class_5658;)Lnet/minecraft/class_120$class_121; ARG 0 durabilityRange - METHOD method_634 (Lnet/minecraft/class_5658;[Lnet/minecraft/class_5341;)Lnet/minecraft/class_117; + METHOD method_634 (Lnet/minecraft/class_5658;Ljava/util/List;)Lnet/minecraft/class_117; ARG 1 conditions - CLASS class_150 Serializer diff --git a/mappings/net/minecraft/loot/function/SetEnchantmentsLootFunction.mapping b/mappings/net/minecraft/loot/function/SetEnchantmentsLootFunction.mapping index a68fa7e3e1..fafb4a8340 100644 --- a/mappings/net/minecraft/loot/function/SetEnchantmentsLootFunction.mapping +++ b/mappings/net/minecraft/loot/function/SetEnchantmentsLootFunction.mapping @@ -1,7 +1,8 @@ CLASS net/minecraft/class_5642 net/minecraft/loot/function/SetEnchantmentsLootFunction FIELD field_27907 enchantments Ljava/util/Map; FIELD field_27908 add Z - METHOD ([Lnet/minecraft/class_5341;Ljava/util/Map;Z)V + FIELD field_45843 CODEC Lcom/mojang/serialization/Codec; + METHOD (Ljava/util/List;Ljava/util/Map;Z)V ARG 1 conditions ARG 2 enchantments ARG 3 add @@ -10,7 +11,7 @@ CLASS net/minecraft/class_5642 net/minecraft/loot/function/SetEnchantmentsLootFu ARG 2 level METHOD method_32409 (Lnet/minecraft/class_5658;)Ljava/util/stream/Stream; ARG 0 numberProvider - METHOD method_32410 (Lit/unimi/dsi/fastutil/objects/Object2IntMap;Lnet/minecraft/class_47;Lnet/minecraft/class_1887;Lnet/minecraft/class_5658;)V + METHOD method_32410 (Lit/unimi/dsi/fastutil/objects/Object2IntMap;Lnet/minecraft/class_47;Lnet/minecraft/class_6880;Lnet/minecraft/class_5658;)V ARG 2 enchantment ARG 3 numberProvider METHOD method_32411 addEnchantmentToMap (Ljava/util/Map;Lnet/minecraft/class_1887;I)V @@ -23,12 +24,8 @@ CLASS net/minecraft/class_5642 net/minecraft/loot/function/SetEnchantmentsLootFu METHOD method_32414 (Ljava/util/Map;Lnet/minecraft/class_1887;Ljava/lang/Integer;)V ARG 1 enchantment ARG 2 level - CLASS class_5643 Serializer - METHOD method_32416 (Lcom/google/gson/JsonObject;Lcom/google/gson/JsonSerializationContext;Lnet/minecraft/class_1887;Lnet/minecraft/class_5658;)V - ARG 2 enchantment - ARG 3 numberProvider CLASS class_6158 Builder - FIELD field_31864 enchantments Ljava/util/Map; + FIELD field_31864 enchantments Lcom/google/common/collect/ImmutableMap$Builder; FIELD field_31865 add Z METHOD (Z)V ARG 1 add diff --git a/mappings/net/minecraft/loot/function/SetGoatHornSoundLootFunction.mapping b/mappings/net/minecraft/loot/function/SetGoatHornSoundLootFunction.mapping deleted file mode 100644 index e55eb06394..0000000000 --- a/mappings/net/minecraft/loot/function/SetGoatHornSoundLootFunction.mapping +++ /dev/null @@ -1,10 +0,0 @@ -CLASS net/minecraft/class_7431 net/minecraft/loot/function/SetGoatHornSoundLootFunction - FIELD field_39184 options Lnet/minecraft/class_6862; - METHOD ([Lnet/minecraft/class_5341;Lnet/minecraft/class_6862;)V - ARG 1 conditions - ARG 2 options - METHOD method_43571 builder (Lnet/minecraft/class_6862;)Lnet/minecraft/class_120$class_121; - ARG 0 options - METHOD method_43743 (Lnet/minecraft/class_6862;[Lnet/minecraft/class_5341;)Lnet/minecraft/class_117; - ARG 1 conditions - CLASS class_7432 Serializer diff --git a/mappings/net/minecraft/loot/function/SetInstrumentLootFunction.mapping b/mappings/net/minecraft/loot/function/SetInstrumentLootFunction.mapping new file mode 100644 index 0000000000..c087f5d61c --- /dev/null +++ b/mappings/net/minecraft/loot/function/SetInstrumentLootFunction.mapping @@ -0,0 +1,10 @@ +CLASS net/minecraft/class_7431 net/minecraft/loot/function/SetInstrumentLootFunction + FIELD field_39184 options Lnet/minecraft/class_6862; + FIELD field_45844 CODEC Lcom/mojang/serialization/Codec; + METHOD (Ljava/util/List;Lnet/minecraft/class_6862;)V + ARG 1 conditions + ARG 2 options + METHOD method_43571 builder (Lnet/minecraft/class_6862;)Lnet/minecraft/class_120$class_121; + ARG 0 options + METHOD method_43743 (Lnet/minecraft/class_6862;Ljava/util/List;)Lnet/minecraft/class_117; + ARG 1 conditions diff --git a/mappings/net/minecraft/loot/function/SetLootTableLootFunction.mapping b/mappings/net/minecraft/loot/function/SetLootTableLootFunction.mapping index 386b41b997..2dc9a762da 100644 --- a/mappings/net/minecraft/loot/function/SetLootTableLootFunction.mapping +++ b/mappings/net/minecraft/loot/function/SetLootTableLootFunction.mapping @@ -1,12 +1,13 @@ CLASS net/minecraft/class_144 net/minecraft/loot/function/SetLootTableLootFunction FIELD field_1116 id Lnet/minecraft/class_2960; FIELD field_1117 seed J - FIELD field_34773 type Lnet/minecraft/class_2591; - METHOD ([Lnet/minecraft/class_5341;Lnet/minecraft/class_2960;JLnet/minecraft/class_2591;)V + FIELD field_34773 type Lnet/minecraft/class_6880; + FIELD field_45842 CODEC Lcom/mojang/serialization/Codec; + METHOD (Ljava/util/List;Lnet/minecraft/class_2960;JLnet/minecraft/class_6880;)V ARG 1 conditions ARG 2 id ARG 3 seed - ARG 5 type + ARG 5 blockEntityType METHOD method_35534 builder (Lnet/minecraft/class_2591;Lnet/minecraft/class_2960;)Lnet/minecraft/class_120$class_121; ARG 0 type ARG 1 id @@ -14,8 +15,7 @@ CLASS net/minecraft/class_144 net/minecraft/loot/function/SetLootTableLootFuncti ARG 0 type ARG 1 id ARG 2 seed - METHOD method_35536 (Lnet/minecraft/class_2960;JLnet/minecraft/class_2591;[Lnet/minecraft/class_5341;)Lnet/minecraft/class_117; + METHOD method_35536 (Lnet/minecraft/class_2960;JLnet/minecraft/class_2591;Ljava/util/List;)Lnet/minecraft/class_117; ARG 4 conditions - METHOD method_35537 (Lnet/minecraft/class_2960;Lnet/minecraft/class_2591;[Lnet/minecraft/class_5341;)Lnet/minecraft/class_117; + METHOD method_35537 (Lnet/minecraft/class_2960;Lnet/minecraft/class_2591;Ljava/util/List;)Lnet/minecraft/class_117; ARG 2 conditions - CLASS class_145 Serializer diff --git a/mappings/net/minecraft/loot/function/SetLoreLootFunction.mapping b/mappings/net/minecraft/loot/function/SetLoreLootFunction.mapping index 2409280335..ca97bacedb 100644 --- a/mappings/net/minecraft/loot/function/SetLoreLootFunction.mapping +++ b/mappings/net/minecraft/loot/function/SetLoreLootFunction.mapping @@ -1,8 +1,9 @@ CLASS net/minecraft/class_3671 net/minecraft/loot/function/SetLoreLootFunction FIELD field_16231 lore Ljava/util/List; FIELD field_16232 replace Z - FIELD field_16233 entity Lnet/minecraft/class_47$class_50; - METHOD ([Lnet/minecraft/class_5341;ZLjava/util/List;Lnet/minecraft/class_47$class_50;)V + FIELD field_16233 entity Ljava/util/Optional; + FIELD field_45847 CODEC Lcom/mojang/serialization/Codec; + METHOD (Ljava/util/List;ZLjava/util/List;Ljava/util/Optional;)V ARG 1 conditions ARG 2 replace ARG 3 lore @@ -11,11 +12,10 @@ CLASS net/minecraft/class_3671 net/minecraft/loot/function/SetLoreLootFunction ARG 1 stack ARG 2 otherLoreExists METHOD method_35544 builder ()Lnet/minecraft/class_3671$class_6159; - CLASS class_3672 Serializer CLASS class_6159 Builder FIELD field_31866 replace Z - FIELD field_31867 target Lnet/minecraft/class_47$class_50; - FIELD field_31868 lore Ljava/util/List; + FIELD field_31867 target Ljava/util/Optional; + FIELD field_31868 lore Lcom/google/common/collect/ImmutableList$Builder; METHOD method_35546 target (Lnet/minecraft/class_47$class_50;)Lnet/minecraft/class_3671$class_6159; ARG 1 target METHOD method_35547 lore (Lnet/minecraft/class_2561;)Lnet/minecraft/class_3671$class_6159; diff --git a/mappings/net/minecraft/loot/function/SetNameLootFunction.mapping b/mappings/net/minecraft/loot/function/SetNameLootFunction.mapping index 53488862c5..088fabe82b 100644 --- a/mappings/net/minecraft/loot/function/SetNameLootFunction.mapping +++ b/mappings/net/minecraft/loot/function/SetNameLootFunction.mapping @@ -1,8 +1,9 @@ CLASS net/minecraft/class_3670 net/minecraft/loot/function/SetNameLootFunction - FIELD field_16228 name Lnet/minecraft/class_2561; - FIELD field_16229 entity Lnet/minecraft/class_47$class_50; + FIELD field_16228 name Ljava/util/Optional; + FIELD field_16229 entity Ljava/util/Optional; FIELD field_16230 LOGGER Lorg/slf4j/Logger; - METHOD ([Lnet/minecraft/class_5341;Lnet/minecraft/class_2561;Lnet/minecraft/class_47$class_50;)V + FIELD field_45848 CODEC Lcom/mojang/serialization/Codec; + METHOD (Ljava/util/List;Ljava/util/Optional;Ljava/util/Optional;)V ARG 1 conditions ARG 2 name ARG 3 entity @@ -18,8 +19,7 @@ CLASS net/minecraft/class_3670 net/minecraft/loot/function/SetNameLootFunction METHOD method_35550 builder (Lnet/minecraft/class_2561;Lnet/minecraft/class_47$class_50;)Lnet/minecraft/class_120$class_121; ARG 0 name ARG 1 target - METHOD method_35551 (Lnet/minecraft/class_2561;Lnet/minecraft/class_47$class_50;[Lnet/minecraft/class_5341;)Lnet/minecraft/class_117; + METHOD method_35551 (Lnet/minecraft/class_2561;Lnet/minecraft/class_47$class_50;Ljava/util/List;)Lnet/minecraft/class_117; ARG 2 conditions - METHOD method_35552 (Lnet/minecraft/class_2561;[Lnet/minecraft/class_5341;)Lnet/minecraft/class_117; + METHOD method_35552 (Lnet/minecraft/class_2561;Ljava/util/List;)Lnet/minecraft/class_117; ARG 1 conditions - CLASS class_147 Serializer diff --git a/mappings/net/minecraft/loot/function/SetNbtLootFunction.mapping b/mappings/net/minecraft/loot/function/SetNbtLootFunction.mapping index ad324e1c02..4b48961219 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 nbt Lnet/minecraft/class_2487; - METHOD ([Lnet/minecraft/class_5341;Lnet/minecraft/class_2487;)V + FIELD field_45849 CODEC Lcom/mojang/serialization/Codec; + METHOD (Ljava/util/List;Lnet/minecraft/class_2487;)V ARG 1 conditions ARG 2 nbt - METHOD method_675 (Lnet/minecraft/class_2487;[Lnet/minecraft/class_5341;)Lnet/minecraft/class_117; + METHOD method_675 (Lnet/minecraft/class_2487;Ljava/util/List;)Lnet/minecraft/class_117; ARG 1 conditions METHOD method_677 builder (Lnet/minecraft/class_2487;)Lnet/minecraft/class_120$class_121; ARG 0 nbt - CLASS class_160 Serializer diff --git a/mappings/net/minecraft/loot/function/SetPotionLootFunction.mapping b/mappings/net/minecraft/loot/function/SetPotionLootFunction.mapping index a43020ef60..ab8ea7d2ee 100644 --- a/mappings/net/minecraft/loot/function/SetPotionLootFunction.mapping +++ b/mappings/net/minecraft/loot/function/SetPotionLootFunction.mapping @@ -1,10 +1,10 @@ CLASS net/minecraft/class_6662 net/minecraft/loot/function/SetPotionLootFunction - FIELD field_35080 potion Lnet/minecraft/class_1842; - METHOD ([Lnet/minecraft/class_5341;Lnet/minecraft/class_1842;)V + FIELD field_35080 potion Lnet/minecraft/class_6880; + FIELD field_45850 CODEC Lcom/mojang/serialization/Codec; + METHOD (Ljava/util/List;Lnet/minecraft/class_6880;)V ARG 1 conditions ARG 2 potion METHOD method_38927 builder (Lnet/minecraft/class_1842;)Lnet/minecraft/class_120$class_121; ARG 0 potion - METHOD method_38928 (Lnet/minecraft/class_1842;[Lnet/minecraft/class_5341;)Lnet/minecraft/class_117; + METHOD method_38928 (Lnet/minecraft/class_1842;Ljava/util/List;)Lnet/minecraft/class_117; ARG 1 conditions - CLASS class_6663 Serializer diff --git a/mappings/net/minecraft/loot/function/SetStewEffectLootFunction.mapping b/mappings/net/minecraft/loot/function/SetStewEffectLootFunction.mapping index 3b0b9f146c..bfdb5ff63f 100644 --- a/mappings/net/minecraft/loot/function/SetStewEffectLootFunction.mapping +++ b/mappings/net/minecraft/loot/function/SetStewEffectLootFunction.mapping @@ -1,14 +1,19 @@ CLASS net/minecraft/class_152 net/minecraft/loot/function/SetStewEffectLootFunction - FIELD field_1122 effects Ljava/util/Map; - METHOD ([Lnet/minecraft/class_5341;Ljava/util/Map;)V + FIELD field_45851 CODEC Lcom/mojang/serialization/Codec; + FIELD field_45852 STEW_EFFECT_LIST_CODEC Lcom/mojang/serialization/Codec; + FIELD field_45853 stewEffects Ljava/util/List; + METHOD (Ljava/util/List;Ljava/util/List;)V ARG 1 conditions - ARG 2 effects - METHOD method_32421 (Lnet/minecraft/class_5658;)Ljava/util/stream/Stream; - ARG 0 numberProvider + ARG 2 stewEffects + METHOD method_32421 (Lnet/minecraft/class_152$class_8754;)Ljava/util/stream/Stream; + ARG 0 stewEffect + METHOD method_53396 (Ljava/util/List;)Lcom/mojang/serialization/DataResult; + ARG 0 stewEffects METHOD method_637 builder ()Lnet/minecraft/class_152$class_153; CLASS class_153 Builder - FIELD field_1123 map Ljava/util/Map; + FIELD field_1123 map Lcom/google/common/collect/ImmutableList$Builder; METHOD method_640 withEffect (Lnet/minecraft/class_1291;Lnet/minecraft/class_5658;)Lnet/minecraft/class_152$class_153; ARG 1 effect ARG 2 durationRange - CLASS class_154 Serializer + CLASS class_8754 StewEffect + FIELD field_45854 CODEC Lcom/mojang/serialization/Codec; diff --git a/mappings/net/minecraft/loot/operator/BoundedIntUnaryOperator.mapping b/mappings/net/minecraft/loot/operator/BoundedIntUnaryOperator.mapping index f7b04aa1cd..5708c0c98d 100644 --- a/mappings/net/minecraft/loot/operator/BoundedIntUnaryOperator.mapping +++ b/mappings/net/minecraft/loot/operator/BoundedIntUnaryOperator.mapping @@ -1,8 +1,12 @@ CLASS net/minecraft/class_42 net/minecraft/loot/operator/BoundedIntUnaryOperator FIELD field_27897 applier Lnet/minecraft/class_42$class_5639; FIELD field_27898 tester Lnet/minecraft/class_42$class_5638; + FIELD field_45790 CODEC Lcom/mojang/serialization/Codec; FIELD field_920 max Lnet/minecraft/class_5658; FIELD field_921 min Lnet/minecraft/class_5658; + METHOD (Ljava/util/Optional;Ljava/util/Optional;)V + ARG 1 min + ARG 2 max METHOD (Lnet/minecraft/class_5658;Lnet/minecraft/class_5658;)V ARG 1 min ARG 2 max @@ -46,15 +50,6 @@ CLASS net/minecraft/class_42 net/minecraft/loot/operator/BoundedIntUnaryOperator METHOD method_32398 (Lnet/minecraft/class_5658;Lnet/minecraft/class_47;I)I ARG 1 context ARG 2 value - CLASS class_62 Serializer - METHOD deserialize (Lcom/google/gson/JsonElement;Ljava/lang/reflect/Type;Lcom/google/gson/JsonDeserializationContext;)Ljava/lang/Object; - ARG 1 json - ARG 2 unused - ARG 3 context - METHOD serialize (Ljava/lang/Object;Ljava/lang/reflect/Type;Lcom/google/gson/JsonSerializationContext;)Lcom/google/gson/JsonElement; - ARG 1 entry - ARG 2 unused - ARG 3 context CLASS class_5638 Tester METHOD test (Lnet/minecraft/class_47;I)Z ARG 1 context diff --git a/mappings/net/minecraft/loot/provider/nbt/ContextLootNbtProvider.mapping b/mappings/net/minecraft/loot/provider/nbt/ContextLootNbtProvider.mapping index 848a081b27..d2280dcccd 100644 --- a/mappings/net/minecraft/loot/provider/nbt/ContextLootNbtProvider.mapping +++ b/mappings/net/minecraft/loot/provider/nbt/ContextLootNbtProvider.mapping @@ -3,18 +3,15 @@ CLASS net/minecraft/class_5646 net/minecraft/loot/provider/nbt/ContextLootNbtPro FIELD field_27915 BLOCK_ENTITY_TARGET Lnet/minecraft/class_5646$class_5648; FIELD field_27916 target Lnet/minecraft/class_5646$class_5648; FIELD field_31875 BLOCK_ENTITY_TARGET_NAME Ljava/lang/String; + FIELD field_45879 CODEC Lcom/mojang/serialization/Codec; METHOD (Lnet/minecraft/class_5646$class_5648;)V ARG 1 target METHOD method_32430 getTarget (Lnet/minecraft/class_47$class_50;)Lnet/minecraft/class_5646$class_5648; ARG 0 entityTarget - METHOD method_32431 fromTarget (Ljava/lang/String;)Lnet/minecraft/class_5646; - ARG 0 target METHOD method_35568 fromTarget (Lnet/minecraft/class_47$class_50;)Lnet/minecraft/class_5651; ARG 0 target - CLASS class_5647 CustomSerializer CLASS class_5648 Target METHOD method_32434 getName ()Ljava/lang/String; METHOD method_32435 getNbt (Lnet/minecraft/class_47;)Lnet/minecraft/class_2520; ARG 1 context METHOD method_32436 getRequiredParameters ()Ljava/util/Set; - CLASS class_5649 Serializer diff --git a/mappings/net/minecraft/loot/provider/nbt/LootNbtProviderTypes.mapping b/mappings/net/minecraft/loot/provider/nbt/LootNbtProviderTypes.mapping index 8cf81dcf87..b918198158 100644 --- a/mappings/net/minecraft/loot/provider/nbt/LootNbtProviderTypes.mapping +++ b/mappings/net/minecraft/loot/provider/nbt/LootNbtProviderTypes.mapping @@ -1,5 +1,6 @@ CLASS net/minecraft/class_5652 net/minecraft/loot/provider/nbt/LootNbtProviderTypes - METHOD method_32442 createGsonSerializer ()Ljava/lang/Object; - METHOD method_32443 register (Ljava/lang/String;Lnet/minecraft/class_5335;)Lnet/minecraft/class_5650; + FIELD field_45882 CODEC Lcom/mojang/serialization/Codec; + FIELD field_45883 BASE_CODEC Lcom/mojang/serialization/Codec; + METHOD method_32443 register (Ljava/lang/String;Lcom/mojang/serialization/Codec;)Lnet/minecraft/class_5650; ARG 0 id - ARG 1 jsonSerializer + ARG 1 codec diff --git a/mappings/net/minecraft/loot/provider/nbt/StorageLootNbtProvider.mapping b/mappings/net/minecraft/loot/provider/nbt/StorageLootNbtProvider.mapping index ec8575c959..c966016263 100644 --- a/mappings/net/minecraft/loot/provider/nbt/StorageLootNbtProvider.mapping +++ b/mappings/net/minecraft/loot/provider/nbt/StorageLootNbtProvider.mapping @@ -1,5 +1,6 @@ CLASS net/minecraft/class_5653 net/minecraft/loot/provider/nbt/StorageLootNbtProvider - FIELD field_27920 source Lnet/minecraft/class_2960; + FIELD comp_1892 source Lnet/minecraft/class_2960; + FIELD field_45884 CODEC Lcom/mojang/serialization/Codec; METHOD (Lnet/minecraft/class_2960;)V ARG 1 source - CLASS class_5654 Serializer + METHOD comp_1892 source ()Lnet/minecraft/class_2960; diff --git a/mappings/net/minecraft/loot/provider/number/BinomialLootNumberProvider.mapping b/mappings/net/minecraft/loot/provider/number/BinomialLootNumberProvider.mapping index 0969c7171f..9b3e4fcc56 100644 --- a/mappings/net/minecraft/loot/provider/number/BinomialLootNumberProvider.mapping +++ b/mappings/net/minecraft/loot/provider/number/BinomialLootNumberProvider.mapping @@ -1,10 +1,12 @@ CLASS net/minecraft/class_40 net/minecraft/loot/provider/number/BinomialLootNumberProvider - FIELD field_917 p Lnet/minecraft/class_5658; - FIELD field_918 n Lnet/minecraft/class_5658; + FIELD comp_1893 n Lnet/minecraft/class_5658; + FIELD comp_1894 p Lnet/minecraft/class_5658; + FIELD field_45885 CODEC Lcom/mojang/serialization/Codec; METHOD (Lnet/minecraft/class_5658;Lnet/minecraft/class_5658;)V ARG 1 n ARG 2 p + METHOD comp_1893 n ()Lnet/minecraft/class_5658; + METHOD comp_1894 p ()Lnet/minecraft/class_5658; METHOD method_273 create (IF)Lnet/minecraft/class_40; ARG 0 n ARG 1 p - CLASS class_41 Serializer diff --git a/mappings/net/minecraft/loot/provider/number/ConstantLootNumberProvider.mapping b/mappings/net/minecraft/loot/provider/number/ConstantLootNumberProvider.mapping index 88399f603f..801387275a 100644 --- a/mappings/net/minecraft/loot/provider/number/ConstantLootNumberProvider.mapping +++ b/mappings/net/minecraft/loot/provider/number/ConstantLootNumberProvider.mapping @@ -1,10 +1,10 @@ CLASS net/minecraft/class_44 net/minecraft/loot/provider/number/ConstantLootNumberProvider - FIELD field_922 value F + FIELD comp_1895 value F + FIELD field_45886 CODEC Lcom/mojang/serialization/Codec; METHOD (F)V ARG 1 value + METHOD comp_1895 value ()F METHOD equals (Ljava/lang/Object;)Z ARG 1 o METHOD method_32448 create (F)Lnet/minecraft/class_44; ARG 0 value - CLASS class_5655 CustomSerializer - CLASS class_5656 Serializer diff --git a/mappings/net/minecraft/loot/provider/number/LootNumberProviderTypes.mapping b/mappings/net/minecraft/loot/provider/number/LootNumberProviderTypes.mapping index 6e50770a4c..3cb4ee832a 100644 --- a/mappings/net/minecraft/loot/provider/number/LootNumberProviderTypes.mapping +++ b/mappings/net/minecraft/loot/provider/number/LootNumberProviderTypes.mapping @@ -1,5 +1,6 @@ CLASS net/minecraft/class_5659 net/minecraft/loot/provider/number/LootNumberProviderTypes - METHOD method_32455 createGsonSerializer ()Ljava/lang/Object; - METHOD method_32456 register (Ljava/lang/String;Lnet/minecraft/class_5335;)Lnet/minecraft/class_5657; + FIELD field_45888 CODEC Lcom/mojang/serialization/Codec; + FIELD field_45889 BASE_CODEC Lcom/mojang/serialization/Codec; + METHOD method_32456 register (Ljava/lang/String;Lcom/mojang/serialization/Codec;)Lnet/minecraft/class_5657; ARG 0 id - ARG 1 jsonSerializer + ARG 1 codec diff --git a/mappings/net/minecraft/loot/provider/number/ScoreLootNumberProvider.mapping b/mappings/net/minecraft/loot/provider/number/ScoreLootNumberProvider.mapping index faac42bac6..49c54fa0db 100644 --- a/mappings/net/minecraft/loot/provider/number/ScoreLootNumberProvider.mapping +++ b/mappings/net/minecraft/loot/provider/number/ScoreLootNumberProvider.mapping @@ -1,11 +1,15 @@ CLASS net/minecraft/class_5660 net/minecraft/loot/provider/number/ScoreLootNumberProvider - FIELD field_27925 target Lnet/minecraft/class_5670; - FIELD field_27926 score Ljava/lang/String; - FIELD field_27927 scale F + FIELD comp_1897 target Lnet/minecraft/class_5670; + FIELD comp_1898 score Ljava/lang/String; + FIELD comp_1899 scale F + FIELD field_45890 CODEC Lcom/mojang/serialization/Codec; METHOD (Lnet/minecraft/class_5670;Ljava/lang/String;F)V ARG 1 target ARG 2 score ARG 3 scale + METHOD comp_1897 target ()Lnet/minecraft/class_5670; + METHOD comp_1898 score ()Ljava/lang/String; + METHOD comp_1899 scale ()F METHOD method_35569 create (Lnet/minecraft/class_47$class_50;Ljava/lang/String;)Lnet/minecraft/class_5660; ARG 0 target ARG 1 score @@ -13,4 +17,3 @@ CLASS net/minecraft/class_5660 net/minecraft/loot/provider/number/ScoreLootNumbe ARG 0 target ARG 1 score ARG 2 scale - CLASS class_5661 Serializer diff --git a/mappings/net/minecraft/loot/provider/number/UniformLootNumberProvider.mapping b/mappings/net/minecraft/loot/provider/number/UniformLootNumberProvider.mapping index 8c42daf341..5211670f44 100644 --- a/mappings/net/minecraft/loot/provider/number/UniformLootNumberProvider.mapping +++ b/mappings/net/minecraft/loot/provider/number/UniformLootNumberProvider.mapping @@ -1,10 +1,12 @@ CLASS net/minecraft/class_5662 net/minecraft/loot/provider/number/UniformLootNumberProvider - FIELD field_27928 min Lnet/minecraft/class_5658; - FIELD field_27929 max Lnet/minecraft/class_5658; + FIELD comp_1900 min Lnet/minecraft/class_5658; + FIELD comp_1901 max Lnet/minecraft/class_5658; + FIELD field_45891 CODEC Lcom/mojang/serialization/Codec; METHOD (Lnet/minecraft/class_5658;Lnet/minecraft/class_5658;)V ARG 1 min ARG 2 max + METHOD comp_1900 min ()Lnet/minecraft/class_5658; + METHOD comp_1901 max ()Lnet/minecraft/class_5658; METHOD method_32462 create (FF)Lnet/minecraft/class_5662; ARG 0 min ARG 1 max - CLASS class_5663 Serializer diff --git a/mappings/net/minecraft/loot/provider/score/ContextLootScoreProvider.mapping b/mappings/net/minecraft/loot/provider/score/ContextLootScoreProvider.mapping index 93a7653295..dd0797fd28 100644 --- a/mappings/net/minecraft/loot/provider/score/ContextLootScoreProvider.mapping +++ b/mappings/net/minecraft/loot/provider/score/ContextLootScoreProvider.mapping @@ -1,8 +1,8 @@ CLASS net/minecraft/class_5664 net/minecraft/loot/provider/score/ContextLootScoreProvider - FIELD field_27930 target Lnet/minecraft/class_47$class_50; + FIELD comp_1902 target Lnet/minecraft/class_47$class_50; + FIELD field_45892 CODEC Lcom/mojang/serialization/Codec; METHOD (Lnet/minecraft/class_47$class_50;)V ARG 1 target + METHOD comp_1902 target ()Lnet/minecraft/class_47$class_50; METHOD method_35571 create (Lnet/minecraft/class_47$class_50;)Lnet/minecraft/class_5670; ARG 0 target - CLASS class_5665 CustomSerializer - CLASS class_5666 Serializer diff --git a/mappings/net/minecraft/loot/provider/score/FixedLootScoreProvider.mapping b/mappings/net/minecraft/loot/provider/score/FixedLootScoreProvider.mapping index 2a9b43e5e1..1d9c053b67 100644 --- a/mappings/net/minecraft/loot/provider/score/FixedLootScoreProvider.mapping +++ b/mappings/net/minecraft/loot/provider/score/FixedLootScoreProvider.mapping @@ -1,8 +1,8 @@ CLASS net/minecraft/class_5667 net/minecraft/loot/provider/score/FixedLootScoreProvider - FIELD field_27931 name Ljava/lang/String; + FIELD comp_1903 name Ljava/lang/String; + FIELD field_45894 CODEC Lcom/mojang/serialization/Codec; METHOD (Ljava/lang/String;)V ARG 1 name + METHOD comp_1903 name ()Ljava/lang/String; METHOD method_35572 create (Ljava/lang/String;)Lnet/minecraft/class_5670; ARG 0 name - METHOD method_35573 getName ()Ljava/lang/String; - CLASS class_5668 Serializer diff --git a/mappings/net/minecraft/loot/provider/score/LootScoreProviderTypes.mapping b/mappings/net/minecraft/loot/provider/score/LootScoreProviderTypes.mapping index fe837be4c7..52de9d2ca2 100644 --- a/mappings/net/minecraft/loot/provider/score/LootScoreProviderTypes.mapping +++ b/mappings/net/minecraft/loot/provider/score/LootScoreProviderTypes.mapping @@ -1,5 +1,6 @@ CLASS net/minecraft/class_5671 net/minecraft/loot/provider/score/LootScoreProviderTypes - METHOD method_32478 createGsonSerializer ()Ljava/lang/Object; - METHOD method_32479 register (Ljava/lang/String;Lnet/minecraft/class_5335;)Lnet/minecraft/class_5669; + FIELD field_45895 CODEC Lcom/mojang/serialization/Codec; + FIELD field_45896 BASE_CODEC Lcom/mojang/serialization/Codec; + METHOD method_32479 register (Ljava/lang/String;Lcom/mojang/serialization/Codec;)Lnet/minecraft/class_5669; ARG 0 id - ARG 1 jsonSerializer + ARG 1 codec diff --git a/mappings/net/minecraft/nbt/NbtByte.mapping b/mappings/net/minecraft/nbt/NbtByte.mapping index 007a14713a..bf05b4f471 100644 --- a/mappings/net/minecraft/nbt/NbtByte.mapping +++ b/mappings/net/minecraft/nbt/NbtByte.mapping @@ -11,7 +11,7 @@ CLASS net/minecraft/class_2481 net/minecraft/nbt/NbtByte COMMENT The NBT byte representing {@code 1}. COMMENT COMMENT @apiNote This is often used to indicate a true boolean value. - FIELD field_33189 SIZE I + FIELD field_41717 SIZE I METHOD (B)V ARG 1 value METHOD equals (Ljava/lang/Object;)Z diff --git a/mappings/net/minecraft/nbt/NbtByteArray.mapping b/mappings/net/minecraft/nbt/NbtByteArray.mapping index 8ec33732a2..4f65d169ad 100644 --- a/mappings/net/minecraft/nbt/NbtByteArray.mapping +++ b/mappings/net/minecraft/nbt/NbtByteArray.mapping @@ -5,7 +5,7 @@ CLASS net/minecraft/class_2479 net/minecraft/nbt/NbtByteArray COMMENT The backing array can be obtained via {@link #getByteArray()}. FIELD field_11493 value [B FIELD field_21024 TYPE Lnet/minecraft/class_4614; - FIELD field_33188 SIZE I + FIELD field_41716 SIZE I METHOD (Ljava/util/List;)V ARG 1 value METHOD ([B)V diff --git a/mappings/net/minecraft/nbt/NbtCompound.mapping b/mappings/net/minecraft/nbt/NbtCompound.mapping index 877b3562aa..9571263814 100644 --- a/mappings/net/minecraft/nbt/NbtCompound.mapping +++ b/mappings/net/minecraft/nbt/NbtCompound.mapping @@ -17,7 +17,7 @@ CLASS net/minecraft/class_2487 net/minecraft/nbt/NbtCompound FIELD field_11515 entries Ljava/util/Map; FIELD field_21029 TYPE Lnet/minecraft/class_4614; FIELD field_25128 CODEC Lcom/mojang/serialization/Codec; - FIELD field_33190 SIZE I + FIELD field_41718 SIZE I METHOD (Ljava/util/Map;)V ARG 1 entries METHOD equals (Ljava/lang/Object;)Z diff --git a/mappings/net/minecraft/nbt/NbtDouble.mapping b/mappings/net/minecraft/nbt/NbtDouble.mapping index fa2fa8c7d7..144674296e 100644 --- a/mappings/net/minecraft/nbt/NbtDouble.mapping +++ b/mappings/net/minecraft/nbt/NbtDouble.mapping @@ -5,7 +5,7 @@ CLASS net/minecraft/class_2489 net/minecraft/nbt/NbtDouble FIELD field_21030 ZERO Lnet/minecraft/class_2489; COMMENT The NBT double representing {@code 0.0}. FIELD field_21031 TYPE Lnet/minecraft/class_4614; - FIELD field_33192 SIZE I + FIELD field_41720 SIZE I METHOD (D)V ARG 1 value METHOD equals (Ljava/lang/Object;)Z diff --git a/mappings/net/minecraft/nbt/NbtElement.mapping b/mappings/net/minecraft/nbt/NbtElement.mapping index e3655c7db7..5e38816c3e 100644 --- a/mappings/net/minecraft/nbt/NbtElement.mapping +++ b/mappings/net/minecraft/nbt/NbtElement.mapping @@ -83,3 +83,4 @@ CLASS net/minecraft/class_2520 net/minecraft/nbt/NbtElement ARG 1 visitor METHOD method_39876 accept (Lnet/minecraft/class_6836;)V ARG 1 visitor + METHOD method_47988 getSizeInBytes ()I diff --git a/mappings/net/minecraft/nbt/NbtEnd.mapping b/mappings/net/minecraft/nbt/NbtEnd.mapping index 470571e92d..ad801d80b6 100644 --- a/mappings/net/minecraft/nbt/NbtEnd.mapping +++ b/mappings/net/minecraft/nbt/NbtEnd.mapping @@ -6,4 +6,4 @@ CLASS net/minecraft/class_2491 net/minecraft/nbt/NbtEnd FIELD field_21033 INSTANCE Lnet/minecraft/class_2491; COMMENT A dummy instance of the NBT end. It will never appear nested in any parsed NBT COMMENT structure and should never be used as NBT compound values or list elements. - FIELD field_33193 SIZE I + FIELD field_41721 SIZE I diff --git a/mappings/net/minecraft/nbt/NbtFloat.mapping b/mappings/net/minecraft/nbt/NbtFloat.mapping index 7a5e9c4883..989da69b69 100644 --- a/mappings/net/minecraft/nbt/NbtFloat.mapping +++ b/mappings/net/minecraft/nbt/NbtFloat.mapping @@ -5,7 +5,7 @@ CLASS net/minecraft/class_2494 net/minecraft/nbt/NbtFloat FIELD field_21034 ZERO Lnet/minecraft/class_2494; COMMENT The NBT float representing {@code 0.0f}. FIELD field_21035 TYPE Lnet/minecraft/class_4614; - FIELD field_33194 SIZE I + FIELD field_41722 SIZE I 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 595d214486..eadbe59b1d 100644 --- a/mappings/net/minecraft/nbt/NbtHelper.mapping +++ b/mappings/net/minecraft/nbt/NbtHelper.mapping @@ -10,14 +10,15 @@ CLASS net/minecraft/class_2512 net/minecraft/nbt/NbtHelper FIELD field_33226 RIGHT_CURLY_BRACKET C FIELD field_33227 COMMA Ljava/lang/String; FIELD field_33228 COLON C - METHOD method_10681 toBlockState (Lnet/minecraft/class_2487;)Lnet/minecraft/class_2680; + METHOD method_10681 toBlockState (Lnet/minecraft/class_7871;Lnet/minecraft/class_2487;)Lnet/minecraft/class_2680; COMMENT {@return the block state from the {@code nbt}} COMMENT COMMENT

    This returns the default state for {@link net.minecraft.block.Blocks#AIR} COMMENT if the block name is not present. COMMENT COMMENT @see #fromBlockState(BlockState) - ARG 0 nbt + ARG 0 blockLookup + ARG 1 nbt 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 @@ -42,7 +43,7 @@ CLASS net/minecraft/class_2512 net/minecraft/nbt/NbtHelper METHOD method_10686 fromBlockState (Lnet/minecraft/class_2680;)Lnet/minecraft/class_2487; COMMENT {@return the serialized block state} COMMENT - COMMENT @see #toBlockState(NbtCompound) + COMMENT @see #toBlockState(RegistryEntryLookup, NbtCompound) ARG 0 state METHOD method_10687 matches (Lnet/minecraft/class_2520;Lnet/minecraft/class_2520;Z)Z COMMENT {@return whether {@code standard} is a subset of {@code subject}} @@ -70,16 +71,6 @@ CLASS net/minecraft/class_2512 net/minecraft/nbt/NbtHelper COMMENT the element to test ARG 2 ignoreListOrder COMMENT whether to ignore ordering for {@link NbtList} - 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 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 compound - COMMENT the NBT compound object to fix - ARG 3 oldVersion - COMMENT the data version of the NBT compound object METHOD method_10691 toBlockPos (Lnet/minecraft/class_2487;)Lnet/minecraft/class_2338; COMMENT {@return the block position from the {@code nbt}} COMMENT @@ -90,18 +81,6 @@ CLASS net/minecraft/class_2512 net/minecraft/nbt/NbtHelper COMMENT COMMENT @see #toBlockPos(NbtCompound) 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 an NBT compound object. - ARG 0 fixer - COMMENT the data fixer - ARG 1 fixTypes - COMMENT the fix types - ARG 2 compound - COMMENT the NBT compound object to fix - ARG 3 oldVersion - COMMENT the data version of the NBT compound object - ARG 4 targetVersion - 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 @@ -206,3 +185,11 @@ CLASS net/minecraft/class_2512 net/minecraft/nbt/NbtHelper COMMENT COMMENT @see #toFormattedString(NbtElement, boolean) ARG 0 nbt + METHOD method_48308 putDataVersion (Lnet/minecraft/class_2487;I)Lnet/minecraft/class_2487; + ARG 0 nbt + ARG 1 dataVersion + METHOD method_48309 getDataVersion (Lnet/minecraft/class_2487;I)I + ARG 0 nbt + ARG 1 fallback + METHOD method_48310 putDataVersion (Lnet/minecraft/class_2487;)Lnet/minecraft/class_2487; + ARG 0 nbt diff --git a/mappings/net/minecraft/nbt/NbtInt.mapping b/mappings/net/minecraft/nbt/NbtInt.mapping index bc1fd32377..4f8d6bef79 100644 --- a/mappings/net/minecraft/nbt/NbtInt.mapping +++ b/mappings/net/minecraft/nbt/NbtInt.mapping @@ -3,7 +3,7 @@ CLASS net/minecraft/class_2497 net/minecraft/nbt/NbtInt COMMENT Instances are immutable. FIELD field_11525 value I FIELD field_21037 TYPE Lnet/minecraft/class_4614; - FIELD field_33196 SIZE I + FIELD field_41724 SIZE I METHOD (I)V ARG 1 value METHOD equals (Ljava/lang/Object;)Z diff --git a/mappings/net/minecraft/nbt/NbtIntArray.mapping b/mappings/net/minecraft/nbt/NbtIntArray.mapping index 4d18a3690b..c05095ca2a 100644 --- a/mappings/net/minecraft/nbt/NbtIntArray.mapping +++ b/mappings/net/minecraft/nbt/NbtIntArray.mapping @@ -5,7 +5,7 @@ CLASS net/minecraft/class_2495 net/minecraft/nbt/NbtIntArray COMMENT The backing array can be obtained via {@link #getIntArray()}. FIELD field_11524 value [I FIELD field_21036 TYPE Lnet/minecraft/class_4614; - FIELD field_33195 SIZE I + FIELD field_41723 SIZE I 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 e21c5e515a..81844d6af3 100644 --- a/mappings/net/minecraft/nbt/NbtIo.mapping +++ b/mappings/net/minecraft/nbt/NbtIo.mapping @@ -1,6 +1,6 @@ CLASS net/minecraft/class_2507 net/minecraft/nbt/NbtIo COMMENT A set of utility functions for reading, writing, and scanning NBT files. - METHOD method_10625 read (Ljava/io/DataInput;Lnet/minecraft/class_2505;)Lnet/minecraft/class_2487; + METHOD method_10625 readCompound (Ljava/io/DataInput;Lnet/minecraft/class_2505;)Lnet/minecraft/class_2487; COMMENT Reads an NBT compound from {@code input}. COMMENT COMMENT @return the NBT compound from the input @@ -12,15 +12,15 @@ CLASS net/minecraft/class_2507 net/minecraft/nbt/NbtIo ARG 0 input ARG 1 depth ARG 2 tracker - METHOD method_10627 read (Ljava/io/DataInput;)Lnet/minecraft/class_2487; + METHOD method_10627 readCompound (Ljava/io/DataInput;)Lnet/minecraft/class_2487; COMMENT Reads an NBT compound from {@code input}. COMMENT COMMENT @return the NBT compound from the input COMMENT @throws IOException if the IO operation fails or if the root NBT element is COMMENT not a compound ARG 0 input - METHOD method_10628 write (Lnet/minecraft/class_2487;Ljava/io/DataOutput;)V - COMMENT Writes the {@code nbt} to {@code file}. + METHOD method_10628 writeCompound (Lnet/minecraft/class_2487;Ljava/io/DataOutput;)V + COMMENT Writes the {@code nbt} to {@code output}. COMMENT COMMENT @throws IOException if the IO operation fails COMMENT @see #write(NbtCompound, File) @@ -42,6 +42,13 @@ CLASS net/minecraft/class_2507 net/minecraft/nbt/NbtIo ARG 0 nbt ARG 1 file METHOD method_10631 write (Lnet/minecraft/class_2520;Ljava/io/DataOutput;)V + COMMENT Writes the {@code nbt} to {@code output}. The output is the byte indicating + COMMENT the element type, followed by {@linkplain DataOutput#writeUTF an empty string} + COMMENT and the NBT data. + COMMENT + COMMENT @throws IOException if the IO operation fails + COMMENT @see #read(DataInput, NbtTagSizeTracker) + COMMENT @see #writeForPacket(NbtElement, DataOutput) ARG 0 nbt ARG 1 output METHOD method_10633 read (Ljava/io/File;)Lnet/minecraft/class_2487; @@ -108,3 +115,27 @@ CLASS net/minecraft/class_2507 net/minecraft/nbt/NbtIo METHOD method_40059 decompress (Ljava/io/InputStream;)Ljava/io/DataInputStream; COMMENT {@return a new input stream that decompresses the input {@code stream}} ARG 0 stream + METHOD method_52892 read (Ljava/io/DataInput;ILnet/minecraft/class_2505;B)Lnet/minecraft/class_2520; + ARG 0 input + ARG 1 depth + ARG 2 tracker + ARG 3 type + METHOD method_52893 writeForPacket (Lnet/minecraft/class_2520;Ljava/io/DataOutput;)V + COMMENT Writes the {@code nbt} to {@code output}. The output is the byte indicating + COMMENT the element type, followed by the NBT data. + COMMENT + COMMENT @apiNote In vanilla, this is used exclusively in networking. + COMMENT @throws IOException if the IO operation fails + COMMENT @see #read(DataInput, NbtTagSizeTracker) + COMMENT @see #write(NbtElement, DataOutput) + ARG 0 nbt + ARG 1 output + METHOD method_52894 read (Ljava/io/DataInput;Lnet/minecraft/class_2505;)Lnet/minecraft/class_2520; + COMMENT Reads an NBT element from {@code input}. Unlike {@link + COMMENT #readCompound(DataInput, NbtTagSizeTracker)}, the element does not have to + COMMENT be a compound. + COMMENT + COMMENT @return the NBT element from the input + COMMENT @throws IOException if the IO operation fails + ARG 0 input + ARG 1 tracker diff --git a/mappings/net/minecraft/nbt/NbtList.mapping b/mappings/net/minecraft/nbt/NbtList.mapping index 56ee658584..c863f63be2 100644 --- a/mappings/net/minecraft/nbt/NbtList.mapping +++ b/mappings/net/minecraft/nbt/NbtList.mapping @@ -17,7 +17,7 @@ CLASS net/minecraft/class_2499 net/minecraft/nbt/NbtList FIELD field_11550 value Ljava/util/List; FIELD field_11551 type B FIELD field_21039 TYPE Lnet/minecraft/class_4614; - FIELD field_33199 SIZE I + FIELD field_41725 SIZE I METHOD (Ljava/util/List;B)V ARG 1 list ARG 2 type diff --git a/mappings/net/minecraft/nbt/NbtLong.mapping b/mappings/net/minecraft/nbt/NbtLong.mapping index 23e31d3ca4..1b2676d8a2 100644 --- a/mappings/net/minecraft/nbt/NbtLong.mapping +++ b/mappings/net/minecraft/nbt/NbtLong.mapping @@ -3,7 +3,7 @@ CLASS net/minecraft/class_2503 net/minecraft/nbt/NbtLong COMMENT Instances are immutable. FIELD field_11553 value J FIELD field_21041 TYPE Lnet/minecraft/class_4614; - FIELD field_33201 SIZE I + FIELD field_41727 SIZE I METHOD (J)V ARG 1 value METHOD equals (Ljava/lang/Object;)Z diff --git a/mappings/net/minecraft/nbt/NbtLongArray.mapping b/mappings/net/minecraft/nbt/NbtLongArray.mapping index 5c87425cdd..80e83389f2 100644 --- a/mappings/net/minecraft/nbt/NbtLongArray.mapping +++ b/mappings/net/minecraft/nbt/NbtLongArray.mapping @@ -5,7 +5,7 @@ CLASS net/minecraft/class_2501 net/minecraft/nbt/NbtLongArray COMMENT The backing array can be obtained via {@link #getLongArray()}. FIELD field_11552 value [J FIELD field_21040 TYPE Lnet/minecraft/class_4614; - FIELD field_33200 SIZE I + FIELD field_41726 SIZE I METHOD (Lit/unimi/dsi/fastutil/longs/LongSet;)V ARG 1 value METHOD (Ljava/util/List;)V diff --git a/mappings/net/minecraft/nbt/NbtOps.mapping b/mappings/net/minecraft/nbt/NbtOps.mapping index d9c1ca6399..14a0d3e583 100644 --- a/mappings/net/minecraft/nbt/NbtOps.mapping +++ b/mappings/net/minecraft/nbt/NbtOps.mapping @@ -18,7 +18,9 @@ CLASS net/minecraft/class_2509 net/minecraft/nbt/NbtOps 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. + FIELD field_40667 MARKER_KEY Ljava/lang/String; METHOD convertTo (Lcom/mojang/serialization/DynamicOps;Ljava/lang/Object;)Ljava/lang/Object; + ARG 1 ops ARG 2 element METHOD createBoolean (Z)Ljava/lang/Object; ARG 1 value @@ -83,51 +85,39 @@ CLASS net/minecraft/class_2509 net/minecraft/nbt/NbtOps ARG 3 value METHOD method_10638 (Lnet/minecraft/class_2487;Ljava/lang/String;)Lcom/mojang/datafixers/util/Pair; ARG 2 key - METHOD method_10649 (Lnet/minecraft/class_2520;)Ljava/lang/Long; - ARG 0 nbt - METHOD method_10658 (Lnet/minecraft/class_2520;)Ljava/lang/Integer; - ARG 0 nbt - METHOD method_10659 (Lnet/minecraft/class_2520;)Ljava/lang/Byte; - ARG 0 nbt METHOD method_10666 (Ljava/lang/String;Ljava/lang/String;)Z ARG 1 k METHOD method_10667 (Lnet/minecraft/class_2520;)Lnet/minecraft/class_2520; ARG 0 nbt METHOD method_10670 (Lnet/minecraft/class_2487;Lnet/minecraft/class_2487;Ljava/lang/String;)V ARG 2 k - METHOD method_29144 createList (BB)Lnet/minecraft/class_2483; - ARG 0 knownType - ARG 1 valueType - METHOD method_29145 isTypeEqual (BBB)Z - ARG 0 knownType - ARG 1 valueType - ARG 2 expectedType METHOD method_29147 (Ljava/util/List;Lnet/minecraft/class_2487;Lcom/mojang/datafixers/util/Pair;)V ARG 0 entry + ARG 2 pair METHOD method_29148 (Ljava/util/function/BiConsumer;Lnet/minecraft/class_2487;Ljava/lang/String;)V ARG 3 key - METHOD method_29149 (Lnet/minecraft/class_2483;Lnet/minecraft/class_2520;)V - ARG 1 nbt - METHOD method_29150 addAll (Lnet/minecraft/class_2483;Lnet/minecraft/class_2520;Ljava/util/List;)V - ARG 0 destination - ARG 1 source - ARG 2 additionalValues - METHOD method_29151 addAll (Lnet/minecraft/class_2483;Lnet/minecraft/class_2520;Lnet/minecraft/class_2520;)V - ARG 0 destination - ARG 1 source - ARG 2 additionalValue METHOD method_29152 (Lnet/minecraft/class_2487;Lcom/mojang/datafixers/util/Pair;)V ARG 1 entry METHOD method_29153 (Lnet/minecraft/class_2487;Ljava/util/function/BiConsumer;)V ARG 2 entryConsumer - METHOD method_29158 (Lnet/minecraft/class_2483;Lnet/minecraft/class_2520;)V - ARG 1 nbt METHOD method_29159 (Lnet/minecraft/class_2487;Lnet/minecraft/class_2487;Ljava/lang/String;)V - ARG 0 key - METHOD method_29160 (Lnet/minecraft/class_2483;Lnet/minecraft/class_2520;)V - ARG 1 nbt + ARG 2 key METHOD method_29161 (Lnet/minecraft/class_2487;Lnet/minecraft/class_2487;Ljava/lang/String;)V ARG 2 key + METHOD method_46230 (Ljava/util/List;Lnet/minecraft/class_2509$class_7813;)Lcom/mojang/serialization/DataResult; + ARG 1 merger + METHOD method_46231 (Ljava/util/function/Consumer;Lnet/minecraft/class_2520;)V + ARG 1 nbt + METHOD method_46232 unpackMarker (Lnet/minecraft/class_2487;)Lnet/minecraft/class_2520; + ARG 0 nbt + METHOD method_46233 (Lnet/minecraft/class_2499;Ljava/util/function/Consumer;)V + ARG 1 consumer + METHOD method_46234 (Lnet/minecraft/class_2520;Lnet/minecraft/class_2509$class_7813;)Lcom/mojang/serialization/DataResult; + ARG 1 merger + METHOD method_46235 createMerger (Lnet/minecraft/class_2520;)Ljava/util/Optional; + ARG 0 nbt + METHOD method_46236 (Lnet/minecraft/class_2520;)Lnet/minecraft/class_2520; + ARG 0 nbt METHOD remove (Ljava/lang/Object;Ljava/lang/String;)Ljava/lang/Object; ARG 1 element ARG 2 key @@ -146,3 +136,59 @@ CLASS net/minecraft/class_2509 net/minecraft/nbt/NbtOps METHOD build (Ljava/lang/Object;Ljava/lang/Object;)Lcom/mojang/serialization/DataResult; ARG 1 nbt ARG 2 mergedValue + CLASS class_7808 ByteArrayMerger + FIELD field_40668 list Lit/unimi/dsi/fastutil/bytes/ByteArrayList; + METHOD (B)V + ARG 1 value + METHOD ([B)V + ARG 1 values + CLASS class_7809 CompoundListMerger + FIELD field_40669 list Lnet/minecraft/class_2499; + METHOD (Lit/unimi/dsi/fastutil/bytes/ByteArrayList;)V + ARG 1 list + METHOD (Lit/unimi/dsi/fastutil/ints/IntArrayList;)V + ARG 1 list + METHOD (Lit/unimi/dsi/fastutil/longs/LongArrayList;)V + ARG 1 list + METHOD (Ljava/util/Collection;)V + ARG 1 nbts + METHOD method_46241 (B)V + ARG 1 value + METHOD method_46242 (I)V + ARG 1 value + METHOD method_46243 (J)V + ARG 1 value + METHOD method_46244 isMarker (Lnet/minecraft/class_2487;)Z + ARG 0 nbt + METHOD method_46245 makeMarker (Lnet/minecraft/class_2520;)Lnet/minecraft/class_2520; + ARG 0 value + METHOD method_46246 createMarkerNbt (Lnet/minecraft/class_2520;)Lnet/minecraft/class_2487; + ARG 0 value + CLASS class_7810 ListMerger + FIELD field_40670 list Lnet/minecraft/class_2499; + METHOD (Lnet/minecraft/class_2499;)V + ARG 1 nbt + METHOD (Lnet/minecraft/class_2520;)V + ARG 1 nbt + CLASS class_7811 BasicMerger + FIELD field_40671 EMPTY Lnet/minecraft/class_2509$class_7811; + CLASS class_7812 IntArrayMerger + FIELD field_40672 list Lit/unimi/dsi/fastutil/ints/IntArrayList; + METHOD (I)V + ARG 1 value + METHOD ([I)V + ARG 1 values + CLASS class_7813 Merger + METHOD method_46239 getResult ()Lnet/minecraft/class_2520; + METHOD method_46240 merge (Lnet/minecraft/class_2520;)Lnet/minecraft/class_2509$class_7813; + ARG 1 nbt + METHOD method_46247 merge (Ljava/lang/Iterable;)Lnet/minecraft/class_2509$class_7813; + ARG 1 nbts + METHOD method_46248 merge (Ljava/util/stream/Stream;)Lnet/minecraft/class_2509$class_7813; + ARG 1 nbts + CLASS class_7814 LongArrayMerger + FIELD field_40673 list Lit/unimi/dsi/fastutil/longs/LongArrayList; + METHOD (J)V + ARG 1 value + METHOD ([J)V + ARG 1 values diff --git a/mappings/net/minecraft/nbt/NbtShort.mapping b/mappings/net/minecraft/nbt/NbtShort.mapping index a24343549e..44c6bba7f1 100644 --- a/mappings/net/minecraft/nbt/NbtShort.mapping +++ b/mappings/net/minecraft/nbt/NbtShort.mapping @@ -3,7 +3,7 @@ CLASS net/minecraft/class_2516 net/minecraft/nbt/NbtShort COMMENT Instances are immutable. FIELD field_11588 value S FIELD field_21043 TYPE Lnet/minecraft/class_4614; - FIELD field_33231 SIZE I + FIELD field_41728 SIZE I METHOD (S)V ARG 1 value METHOD equals (Ljava/lang/Object;)Z diff --git a/mappings/net/minecraft/nbt/NbtString.mapping b/mappings/net/minecraft/nbt/NbtString.mapping index 5e57b126c7..8fbcfb9f6e 100644 --- a/mappings/net/minecraft/nbt/NbtString.mapping +++ b/mappings/net/minecraft/nbt/NbtString.mapping @@ -4,11 +4,11 @@ CLASS net/minecraft/class_2519 net/minecraft/nbt/NbtString FIELD field_11590 value Ljava/lang/String; FIELD field_21045 TYPE Lnet/minecraft/class_4614; FIELD field_21046 EMPTY Lnet/minecraft/class_2519; - FIELD field_33241 SIZE I FIELD field_33242 DOUBLE_QUOTE C FIELD field_33243 SINGLE_QUOTE C FIELD field_33244 BACKSLASH C FIELD field_33245 NULL C + FIELD field_41729 SIZE I METHOD (Ljava/lang/String;)V ARG 1 value METHOD equals (Ljava/lang/Object;)Z diff --git a/mappings/net/minecraft/nbt/NbtTagSizeTracker.mapping b/mappings/net/minecraft/nbt/NbtTagSizeTracker.mapping index 73f335ebf5..439a1ed6fc 100644 --- a/mappings/net/minecraft/nbt/NbtTagSizeTracker.mapping +++ b/mappings/net/minecraft/nbt/NbtTagSizeTracker.mapping @@ -6,5 +6,6 @@ CLASS net/minecraft/class_2505 net/minecraft/nbt/NbtTagSizeTracker FIELD field_11557 maxBytes J METHOD (J)V ARG 1 maxBytes - METHOD method_10623 add (J)V - ARG 1 bits + METHOD method_47987 getAllocatedBytes ()J + METHOD method_48004 add (J)V + ARG 1 bytes diff --git a/mappings/net/minecraft/nbt/StringNbtReader.mapping b/mappings/net/minecraft/nbt/StringNbtReader.mapping index 6233c07b5e..93ea018594 100644 --- a/mappings/net/minecraft/nbt/StringNbtReader.mapping +++ b/mappings/net/minecraft/nbt/StringNbtReader.mapping @@ -23,6 +23,7 @@ CLASS net/minecraft/class_2522 net/minecraft/nbt/StringNbtReader FIELD field_33268 SQUARE_CLOSE_BRACKET C FIELD field_33269 RIGHT_CURLY_BRACKET C FIELD field_33270 LEFT_CURLY_BRACKET C + FIELD field_45952 STRINGIFIED_CODEC Lcom/mojang/serialization/Codec; METHOD (Lcom/mojang/brigadier/StringReader;)V ARG 1 reader METHOD method_10716 readComma ()Z @@ -61,3 +62,5 @@ CLASS net/minecraft/class_2522 net/minecraft/nbt/StringNbtReader ARG 1 expectedType METHOD method_10731 parsePrimitive (Ljava/lang/String;)Lnet/minecraft/class_2520; ARG 1 input + METHOD method_53502 (Ljava/lang/String;)Lcom/mojang/serialization/DataResult; + ARG 0 nbt diff --git a/mappings/net/minecraft/network/ClientConnection.mapping b/mappings/net/minecraft/network/ClientConnection.mapping index a653fb393e..c376336caa 100644 --- a/mappings/net/minecraft/network/ClientConnection.mapping +++ b/mappings/net/minecraft/network/ClientConnection.mapping @@ -7,22 +7,18 @@ CLASS net/minecraft/class_2535 net/minecraft/network/ClientConnection FIELD field_11642 LOGGER Lorg/slf4j/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 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_11649 LOCAL_CLIENT_IO_GROUP Ljava/util/function/Supplier; + FIELD field_11650 CLIENT_IO_GROUP Ljava/util/function/Supplier; FIELD field_11651 channel Lio/netty/channel/Channel; FIELD field_11652 packetListener Lnet/minecraft/class_2547; FIELD field_11653 averagePacketsSent F FIELD field_11654 averagePacketsReceived F FIELD field_11655 ticks I FIELD field_11656 packetsSentCounter I - FIELD field_11657 EPOLL_CLIENT_IO_GROUP Lnet/minecraft/class_3528; + FIELD field_11657 EPOLL_CLIENT_IO_GROUP Ljava/util/function/Supplier; FIELD field_11658 packetsReceivedCounter I FIELD field_11660 disconnectReason Lnet/minecraft/class_2561; FIELD field_33280 CURRENT_PACKET_COUNTER_WEIGHT F @@ -34,6 +30,12 @@ CLASS net/minecraft/class_2535 net/minecraft/network/ClientConnection COMMENT {@code averagePacketsSent}. FIELD field_36379 PACKET_RECEIVED_MARKER Lorg/slf4j/Marker; FIELD field_36380 PACKET_SENT_MARKER Lorg/slf4j/Marker; + FIELD field_44972 pendingDisconnectionReason Lnet/minecraft/class_2561; + FIELD field_45666 SERVERBOUND_PROTOCOL_KEY Lio/netty/util/AttributeKey; + FIELD field_45667 CLIENTBOUND_PROTOCOL_KEY Lio/netty/util/AttributeKey; + FIELD field_45668 queuedTasks Ljava/util/Queue; + FIELD field_45669 prePlayStateListener Lnet/minecraft/class_2547; + FIELD field_45955 packetSizeLogger Lnet/minecraft/class_8762; METHOD (Lnet/minecraft/class_2598;)V ARG 1 side METHOD channelActive (Lio/netty/channel/ChannelHandlerContext;)V @@ -56,19 +58,18 @@ CLASS net/minecraft/class_2535 net/minecraft/network/ClientConnection METHOD method_10747 disconnect (Lnet/minecraft/class_2561;)V ARG 1 disconnectReason METHOD method_10748 getDisconnectReason ()Lnet/minecraft/class_2561; - METHOD method_10750 setState (Lnet/minecraft/class_2539;)V - ARG 1 state - METHOD method_10751 sendQueuedPackets ()V + METHOD method_10751 handleQueuedTasks ()V METHOD method_10752 send (Lnet/minecraft/class_2596;Lnet/minecraft/class_7648;)V ARG 1 packet ARG 2 callbacks - METHOD method_10753 connect (Ljava/net/InetSocketAddress;Z)Lnet/minecraft/class_2535; + METHOD method_10753 connect (Ljava/net/InetSocketAddress;ZLnet/minecraft/class_8743;)Lnet/minecraft/class_2535; ARG 0 address ARG 1 useEpoll + ARG 2 packetSizeLog METHOD method_10754 tick ()V METHOD method_10755 getAddress ()Ljava/net/SocketAddress; METHOD method_10756 isLocal ()Z - METHOD method_10757 disableAutoRead ()V + METHOD method_10757 tryDisableAutoRead ()V METHOD method_10758 isOpen ()Z METHOD method_10759 handlePacket (Lnet/minecraft/class_2596;Lnet/minecraft/class_2547;)V ARG 0 packet @@ -93,29 +94,27 @@ CLASS net/minecraft/class_2535 net/minecraft/network/ClientConnection 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;Lnet/minecraft/class_7648;)V + ARG 1 packetListener + METHOD method_10764 sendImmediately (Lnet/minecraft/class_2596;Lnet/minecraft/class_7648;Z)V ARG 1 packet ARG 2 callbacks + ARG 3 flush METHOD method_10768 handleDisconnection ()V METHOD method_10769 connectLocal (Ljava/net/SocketAddress;)Lnet/minecraft/class_2535; ARG 0 address METHOD method_10771 isEncrypted ()Z - METHOD method_10772 hasChannel ()Z + METHOD method_10772 isChannelAbsent ()Z METHOD method_30615 updateStats ()V - METHOD method_32306 getState ()Lnet/minecraft/class_2539; - COMMENT Returns the current network state of this connection. METHOD method_36121 getSide ()Lnet/minecraft/class_2598; COMMENT Returns the side of this connection, or the direction of the packets received COMMENT by this connection. METHOD method_36122 getOppositeSide ()Lnet/minecraft/class_2598; COMMENT Returns the opposite side of this connection, or the direction of the packets COMMENT sent by this connection. - METHOD method_36942 sendInternal (Lnet/minecraft/class_2596;Lnet/minecraft/class_7648;Lnet/minecraft/class_2539;Lnet/minecraft/class_2539;)V + METHOD method_36942 sendInternal (Lnet/minecraft/class_2596;Lnet/minecraft/class_7648;Z)V ARG 1 packet ARG 2 callbacks - ARG 3 packetState - ARG 4 currentState + ARG 3 flush METHOD method_40062 (Lorg/slf4j/Marker;)V ARG 0 marker METHOD method_40063 (Lorg/slf4j/Marker;)V @@ -124,15 +123,66 @@ CLASS net/minecraft/class_2535 net/minecraft/network/ClientConnection ARG 0 marker METHOD method_45082 (Lnet/minecraft/class_7648;Lio/netty/util/concurrent/Future;)V ARG 2 future + METHOD method_48311 addHandlers (Lio/netty/channel/ChannelPipeline;Lnet/minecraft/class_2598;Lnet/minecraft/class_8762;)V + ARG 0 pipeline + ARG 1 side + ARG 2 packetSizeLogger + METHOD method_52271 connect (Ljava/net/InetSocketAddress;ZLnet/minecraft/class_2535;)Lio/netty/channel/ChannelFuture; + ARG 0 address + ARG 1 useEpoll + ARG 2 connection + METHOD method_52898 disableAutoRead ()V + METHOD method_52899 setS2CPacketHandler (Lnet/minecraft/class_8592;)V + ARG 1 intent + METHOD method_52900 (Lnet/minecraft/class_8592;Lnet/minecraft/class_2547;Ljava/lang/String;ILnet/minecraft/class_2535;)V + ARG 5 connection + METHOD method_52901 setHandlers (Lio/netty/channel/Channel;)V + ARG 0 channel + METHOD method_52902 connect (Ljava/lang/String;ILnet/minecraft/class_2896;)V + ARG 1 address + ARG 2 port + ARG 3 listener + METHOD method_52903 connect (Ljava/lang/String;ILnet/minecraft/class_2921;)V + ARG 1 address + ARG 2 port + ARG 3 listener + METHOD method_52904 connect (Ljava/lang/String;ILnet/minecraft/class_2547;Lnet/minecraft/class_8592;)V + ARG 1 address + ARG 2 port + ARG 3 listener + ARG 4 intent + METHOD method_52905 submit (Ljava/util/function/Consumer;)V + ARG 1 task + METHOD method_52906 send (Lnet/minecraft/class_2596;Lnet/minecraft/class_7648;Z)V + ARG 1 packet + ARG 2 callbacks + ARG 3 flush + METHOD method_52907 (Lnet/minecraft/class_2596;Lnet/minecraft/class_7648;ZLnet/minecraft/class_2535;)V + ARG 3 connection + METHOD method_52908 getProtocolAttributeKey (Lnet/minecraft/class_2598;)Lio/netty/util/AttributeKey; + ARG 0 side + METHOD method_52909 getAddressAsString (Z)Ljava/lang/String; + ARG 1 logIps + METHOD method_52910 enableAutoRead ()V + METHOD method_52911 addValidator (Lio/netty/channel/ChannelPipeline;Lnet/minecraft/class_2598;)V + ARG 0 pipeline + ARG 1 side + METHOD method_52912 setInitialPacketListener (Lnet/minecraft/class_2547;)V + COMMENT Sets the initial packet listener. + COMMENT + COMMENT @throws IllegalStateException if the listener was already set + COMMENT @see #setPacketListener + ARG 1 packetListener + METHOD method_52915 flush ()V + METHOD method_52916 addValidatorInternal (Lio/netty/channel/ChannelPipeline;Lnet/minecraft/class_2598;)V + ARG 0 pipeline + ARG 1 side + METHOD method_52918 flushInternal ()V + METHOD method_53505 resetPacketSizeLog (Lnet/minecraft/class_8743;)V + ARG 1 log CLASS 1 METHOD initChannel (Lio/netty/channel/Channel;)V ARG 1 channel CLASS 2 METHOD initChannel (Lio/netty/channel/Channel;)V ARG 1 channel - CLASS class_2536 QueuedPacket - FIELD field_11661 packet Lnet/minecraft/class_2596; - FIELD field_11662 callbacks Lnet/minecraft/class_7648; - METHOD (Lnet/minecraft/class_2596;Lnet/minecraft/class_7648;)V - ARG 1 packet - ARG 2 callbacks diff --git a/mappings/net/minecraft/network/DecoderHandler.mapping b/mappings/net/minecraft/network/DecoderHandler.mapping deleted file mode 100644 index 06316d9957..0000000000 --- a/mappings/net/minecraft/network/DecoderHandler.mapping +++ /dev/null @@ -1,9 +0,0 @@ -CLASS net/minecraft/class_2543 net/minecraft/network/DecoderHandler - FIELD field_11714 side Lnet/minecraft/class_2598; - FIELD field_11715 LOGGER Lorg/slf4j/Logger; - METHOD (Lnet/minecraft/class_2598;)V - ARG 1 side - METHOD decode (Lio/netty/channel/ChannelHandlerContext;Lio/netty/buffer/ByteBuf;Ljava/util/List;)V - ARG 1 ctx - ARG 2 buf - ARG 3 objects diff --git a/mappings/net/minecraft/network/LegacyQueryHandler.mapping b/mappings/net/minecraft/network/LegacyQueryHandler.mapping deleted file mode 100644 index 4779a60ec3..0000000000 --- a/mappings/net/minecraft/network/LegacyQueryHandler.mapping +++ /dev/null @@ -1,13 +0,0 @@ -CLASS net/minecraft/class_3238 net/minecraft/network/LegacyQueryHandler - FIELD field_14101 LOGGER Lorg/slf4j/Logger; - FIELD field_14102 networkIo Lnet/minecraft/class_3242; - METHOD (Lnet/minecraft/class_3242;)V - ARG 1 networkIo - METHOD channelRead (Lio/netty/channel/ChannelHandlerContext;Ljava/lang/Object;)V - ARG 1 ctx - ARG 2 msg - METHOD method_14344 reply (Lio/netty/channel/ChannelHandlerContext;Lio/netty/buffer/ByteBuf;)V - ARG 1 ctx - ARG 2 buf - METHOD method_14345 toBuffer (Ljava/lang/String;)Lio/netty/buffer/ByteBuf; - ARG 1 s diff --git a/mappings/net/minecraft/network/NetworkState.mapping b/mappings/net/minecraft/network/NetworkState.mapping index 8448f27a5c..0a18225109 100644 --- a/mappings/net/minecraft/network/NetworkState.mapping +++ b/mappings/net/minecraft/network/NetworkState.mapping @@ -1,53 +1,65 @@ CLASS net/minecraft/class_2539 net/minecraft/network/NetworkState - FIELD field_11687 HANDLER_STATE_MAP Ljava/util/Map; - FIELD field_11693 STATES [Lnet/minecraft/class_2539; - FIELD field_20594 stateId I + FIELD field_20594 stateId Ljava/lang/String; FIELD field_20595 packetHandlers Ljava/util/Map; - FIELD field_33281 NULL_PACKET_ID_OR_MIN_STATE_ID I - FIELD field_33282 MAX_STATE_ID I - METHOD (Ljava/lang/String;IILnet/minecraft/class_2539$class_4533;)V - ARG 3 id + FIELD field_41866 UNKNOWN_PACKET_ID I + METHOD (Ljava/lang/String;ILjava/lang/String;Lnet/minecraft/class_2539$class_4533;)V + ARG 3 stateId ARG 4 initializer - METHOD method_10781 getPacketId (Lnet/minecraft/class_2598;Lnet/minecraft/class_2596;)Ljava/lang/Integer; - ARG 1 side - ARG 2 packet - METHOD method_10782 byId (I)Lnet/minecraft/class_2539; - ARG 0 id - METHOD method_10783 getPacketHandler (Lnet/minecraft/class_2598;ILnet/minecraft/class_2540;)Lnet/minecraft/class_2596; - ARG 1 side - ARG 2 packetId - ARG 3 buf - METHOD method_10785 getId ()I - METHOD method_10786 getPacketHandlerState (Lnet/minecraft/class_2596;)Lnet/minecraft/class_2539; - ARG 0 handler - METHOD method_22306 (Lnet/minecraft/class_2539;Ljava/lang/Class;)V - ARG 1 packetClass - METHOD method_22307 (Lnet/minecraft/class_2539;Lnet/minecraft/class_2598;Lnet/minecraft/class_2539$class_4532;)V - ARG 1 side - ARG 2 handler + METHOD method_10785 getId ()Ljava/lang/String; METHOD method_22308 createPacketHandlerInitializer ()Lnet/minecraft/class_2539$class_4533; - METHOD method_39497 (Lit/unimi/dsi/fastutil/ints/Int2ObjectMap;Ljava/lang/Class;Ljava/lang/Integer;)V - ARG 0 clazz - ARG 1 packetId METHOD method_39498 getPacketIdToPacketMap (Lnet/minecraft/class_2598;)Lit/unimi/dsi/fastutil/ints/Int2ObjectMap; ARG 1 side - CLASS class_4532 PacketHandler + METHOD method_52921 getHandler (Lnet/minecraft/class_2598;)Lnet/minecraft/class_2539$class_8698; + ARG 1 side + CLASS class_4532 InternalPacketHandler FIELD field_20596 packetIds Lit/unimi/dsi/fastutil/objects/Object2IntMap; FIELD field_20597 packetFactories Ljava/util/List; FIELD field_36381 LOGGER Lorg/slf4j/Logger; - METHOD method_22309 getPacketTypes ()Ljava/lang/Iterable; + FIELD field_41867 bundler Lnet/minecraft/class_8039; + FIELD field_41868 bundlePacketTypes Ljava/util/Set; METHOD method_22310 createPacket (ILnet/minecraft/class_2540;)Lnet/minecraft/class_2596; ARG 1 id ARG 2 buf METHOD method_22311 (Lit/unimi/dsi/fastutil/objects/Object2IntOpenHashMap;)V ARG 0 map - METHOD method_22312 getId (Ljava/lang/Class;)Ljava/lang/Integer; + METHOD method_22312 getId (Ljava/lang/Class;)I ARG 1 packet METHOD method_22313 register (Ljava/lang/Class;Ljava/util/function/Function;)Lnet/minecraft/class_2539$class_4532; ARG 1 type ARG 2 packetFactory + METHOD method_48313 getBundler ()Lnet/minecraft/class_8039; + METHOD method_48315 (Lnet/minecraft/class_8037;Lnet/minecraft/class_2540;)Lnet/minecraft/class_8037; + ARG 1 buf + METHOD method_48317 registerBundlePacket (Ljava/lang/Class;Ljava/util/function/Function;)Lnet/minecraft/class_2539$class_4532; + ARG 1 bundlePacketType + ARG 2 bundleFunction + METHOD method_52929 canHandle (Ljava/lang/Class;)Z + ARG 1 clazz CLASS class_4533 PacketHandlerInitializer FIELD field_20598 packetHandlers Ljava/util/Map; METHOD method_22315 setup (Lnet/minecraft/class_2598;Lnet/minecraft/class_2539$class_4532;)Lnet/minecraft/class_2539$class_4533; ARG 1 side ARG 2 handler + METHOD method_52930 createSideToHandlerMap (Lnet/minecraft/class_2539;)Ljava/util/Map; + ARG 1 state + CLASS class_8698 PacketHandler + FIELD field_45672 state Lnet/minecraft/class_2539; + FIELD field_45673 side Lnet/minecraft/class_2598; + FIELD field_45674 backingHandler Lnet/minecraft/class_2539$class_4532; + METHOD (Lnet/minecraft/class_2539;Lnet/minecraft/class_2598;Lnet/minecraft/class_2539$class_4532;)V + ARG 1 state + ARG 2 side + ARG 3 backingHandler + METHOD method_52922 getState ()Lnet/minecraft/class_2539; + METHOD method_52923 createPacket (ILnet/minecraft/class_2540;)Lnet/minecraft/class_2596; + ARG 1 id + ARG 2 buf + METHOD method_52924 (Lit/unimi/dsi/fastutil/ints/Int2ObjectMap;Ljava/lang/Class;Ljava/lang/Integer;)V + ARG 1 packet + ARG 2 id + METHOD method_52925 getId (Lnet/minecraft/class_2596;)I + ARG 1 packet + METHOD method_52926 getSide ()Lnet/minecraft/class_2598; + METHOD method_52927 canHandle (Lnet/minecraft/class_2596;)Z + ARG 1 packet + METHOD method_52928 getPacketIdToPacketMap ()Lit/unimi/dsi/fastutil/ints/Int2ObjectMap; diff --git a/mappings/net/minecraft/network/Packet.mapping b/mappings/net/minecraft/network/Packet.mapping deleted file mode 100644 index c251440a08..0000000000 --- a/mappings/net/minecraft/network/Packet.mapping +++ /dev/null @@ -1,8 +0,0 @@ -CLASS net/minecraft/class_2596 net/minecraft/network/Packet - METHOD method_11051 isWritingErrorSkippable ()Z - COMMENT Returns whether a throwable in writing of this packet allows the - COMMENT connection to simply skip the packet's sending than disconnecting. - METHOD method_11052 write (Lnet/minecraft/class_2540;)V - ARG 1 buf - METHOD method_11054 apply (Lnet/minecraft/class_2547;)V - ARG 1 listener diff --git a/mappings/net/minecraft/network/PacketByteBuf.mapping b/mappings/net/minecraft/network/PacketByteBuf.mapping index ee8da67aa6..4e4ab9ddb1 100644 --- a/mappings/net/minecraft/network/PacketByteBuf.mapping +++ b/mappings/net/minecraft/network/PacketByteBuf.mapping @@ -9,10 +9,16 @@ CLASS net/minecraft/class_2540 net/minecraft/network/PacketByteBuf COMMENT Object Type read method write method COMMENT COMMENT - COMMENT Codec-based{@link #decode(Codec)}{@link #encode(Codec, Object)} + COMMENT Codec-based (NBT){@link #decode(DynamicOps, Codec, NbtTagSizeTracker)}{@link #encode(DynamicOps, Codec, Object)} COMMENT COMMENT - COMMENT {@link net.minecraft.util.registry.Registry} value{@link #readRegistryValue(IndexedIterable)}{@link #writeRegistryValue(IndexedIterable, Object)} + COMMENT Codec-based (JSON){@link #decodeAsJson(Codec)}{@link #encodeAsJson(Codec, Object)} + COMMENT + COMMENT + COMMENT {@link net.minecraft.registry.Registry} value{@link #readRegistryValue(IndexedIterable)}{@link #writeRegistryValue(IndexedIterable, Object)} + COMMENT + COMMENT + COMMENT Integer-identified value{@link #decode(IntFunction)}{@link #encode(ToIntFunction, Object)} COMMENT COMMENT COMMENT {@link Collection}{@link #readCollection(IntFunction, PacketByteBuf.PacketReader)}{@link #writeCollection(Collection, PacketByteBuf.PacketWriter)} @@ -24,6 +30,9 @@ CLASS net/minecraft/class_2540 net/minecraft/network/PacketByteBuf COMMENT {@link Map}{@link #readMap(IntFunction, PacketByteBuf.PacketReader, PacketByteBuf.PacketReader)}{@link #writeMap(Map, PacketByteBuf.PacketWriter, PacketByteBuf.PacketWriter)} COMMENT COMMENT + COMMENT {@link EnumSet}{@link #readEnumSet(Class)}{@link #writeEnumSet(EnumSet, Class)} + COMMENT + COMMENT COMMENT {@code byte[]}{@link #readByteArray()}{@link #writeByteArray(byte[])} COMMENT COMMENT @@ -45,6 +54,15 @@ CLASS net/minecraft/class_2540 net/minecraft/network/PacketByteBuf COMMENT {@link GlobalPos}{@link #readGlobalPos()}{@link #writeGlobalPos(GlobalPos)} COMMENT COMMENT + COMMENT {@link Vector3f}{@link #readVector3f()}{@link #writeVector3f(Vector3f)} + COMMENT + COMMENT + COMMENT {@link Vec3d}{@link #readVec3d()}{@link #writeVec3d(Vec3d)} + COMMENT + COMMENT + COMMENT {@link Quaternionf}{@link #readQuaternionf()}{@link #writeQuaternionf(Quaternionf)} + COMMENT + COMMENT COMMENT {@link Text}{@link #readText()}{@link #writeText(Text)} COMMENT COMMENT @@ -66,6 +84,9 @@ CLASS net/minecraft/class_2540 net/minecraft/network/PacketByteBuf COMMENT {@index Property}{@link #readProperty()}{@link #writeProperty(Property)} COMMENT COMMENT + COMMENT {@index PropertyMap}{@link #readPropertyMap()}{@link #writePropertyMap(PropertyMap)} + COMMENT + COMMENT COMMENT {@link NbtCompound}{@link #readNbt()}{@link #writeNbt(NbtCompound)} COMMENT COMMENT @@ -81,6 +102,9 @@ CLASS net/minecraft/class_2540 net/minecraft/network/PacketByteBuf COMMENT {@link RegistryKey}{@link #readRegistryKey(RegistryKey)}{@link #writeRegistryKey(RegistryKey)} COMMENT COMMENT + COMMENT {@link RegistryKey} of a registry{@link #readRegistryRefKey()}{@link #writeRegistryKey(RegistryKey)} + COMMENT + COMMENT COMMENT {@link Date}{@link #readDate()}{@link #writeDate(Date)} COMMENT COMMENT @@ -118,21 +142,10 @@ CLASS net/minecraft/class_2540 net/minecraft/network/PacketByteBuf FIELD field_33284 MAX_TEXT_LENGTH I COMMENT The maximum size, in terms of JSON string length, allowed of the text read by COMMENT {@link #readText()} or written by {@link #writeText(Text)}. - FIELD field_33285 MAX_VAR_INT_LENGTH I - COMMENT The max number of bytes an encoded var int value may use. - COMMENT - COMMENT

    Its value is {@value}. A regular int value always use 4 bytes in contrast. - COMMENT - COMMENT @see #getVarIntLength(int) - FIELD field_33286 MAX_VAR_LONG_LENGTH I - COMMENT The max number of bytes an encoded var long value may use. - COMMENT - COMMENT

    Its value is {@value}. A regular long value always use 8 bytes in contrast. - COMMENT - COMMENT @see #getVarLongLength(long) FIELD field_33287 MAX_READ_NBT_SIZE I COMMENT The maximum size, in number of bytes, allowed of the NBT compound read by COMMENT {@link #readNbt()}. + FIELD field_42966 GSON Lcom/google/gson/Gson; METHOD (Lio/netty/buffer/ByteBuf;)V COMMENT Creates a packet byte buf that delegates its operations to the {@code COMMENT parent} buf. @@ -286,8 +299,6 @@ CLASS net/minecraft/class_2540 net/minecraft/network/PacketByteBuf 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; @@ -313,7 +324,7 @@ CLASS net/minecraft/class_2540 net/minecraft/network/PacketByteBuf COMMENT COMMENT @return this buf, for chaining COMMENT @see #readVarLong() - COMMENT @see #getVarLongLength(long) + COMMENT @see net.minecraft.network.encoding.VarLongs ARG 1 value COMMENT the value to write METHOD method_10792 readVarLong ()J @@ -331,19 +342,17 @@ CLASS net/minecraft/class_2540 net/minecraft/network/PacketByteBuf 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 + METHOD method_10794 writeNbt (Lnet/minecraft/class_2520;)Lnet/minecraft/class_2540; + COMMENT Writes an NBT element to this buf. The binary representation of NBT is + COMMENT handled by {@link net.minecraft.nbt.NbtIo}. If {@code nbt} 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 + ARG 1 nbt 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 @@ -374,11 +383,13 @@ CLASS net/minecraft/class_2540 net/minecraft/network/PacketByteBuf COMMENT this method returns {@code null}. The compound can have a maximum size of COMMENT {@value #MAX_READ_NBT_SIZE} bytes. COMMENT + COMMENT

    Note that unlike {@link #readNbt(NbtTagSizeTracker)}, this can only + COMMENT read compounds. + 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) COMMENT @see #MAX_READ_NBT_SIZE METHOD method_10799 readIntArray (I)[I @@ -450,7 +461,7 @@ CLASS net/minecraft/class_2540 net/minecraft/network/PacketByteBuf COMMENT COMMENT @return this buf, for chaining COMMENT @see #readVarInt() - COMMENT @see #getVarIntLength(int) + COMMENT @see net.minecraft.network.encoding.VarInts ARG 1 value COMMENT the value to write METHOD method_10805 writeText (Lnet/minecraft/class_2561;)Lnet/minecraft/class_2540; @@ -560,14 +571,6 @@ CLASS net/minecraft/class_2540 net/minecraft/network/PacketByteBuf 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 {@value #MAX_VAR_INT_LENGTH}. - 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 @@ -629,53 +632,39 @@ CLASS net/minecraft/class_2540 net/minecraft/network/PacketByteBuf COMMENT @see #readString(int) COMMENT @see #writeString(String) COMMENT @see #writeString(String, int) - METHOD method_29171 decode (Lcom/mojang/serialization/Codec;)Ljava/lang/Object; + METHOD method_29171 decode (Lcom/mojang/serialization/DynamicOps;Lcom/mojang/serialization/Codec;Lnet/minecraft/class_2505;)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 @see #encode(DynamicOps, Codec, Object) + ARG 1 ops + ARG 2 codec + ARG 3 sizeTracker + METHOD method_29172 encode (Lcom/mojang/serialization/DynamicOps;Lcom/mojang/serialization/Codec;Ljava/lang/Object;)Lnet/minecraft/class_2540; 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 @see #decode(DynamicOps, Codec, NbtTagSizeTracker) + ARG 1 ops + ARG 2 codec + ARG 3 value + METHOD method_30616 readNbt (Lnet/minecraft/class_2505;)Lnet/minecraft/class_2520; + COMMENT Reads an NBT element 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 this method returns {@code null}. The element can have a maximum size COMMENT controlled by the {@code sizeTracker}. COMMENT - COMMENT @return the read compound, may be {@code null} + COMMENT @return the read element, 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 @throws RuntimeException if the element exceeds the allowed maximum size + COMMENT @see #writeNbt(NbtElement) 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) METHOD method_33134 readLongArray ()[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 @@ -718,8 +707,8 @@ CLASS net/minecraft/class_2540 net/minecraft/network/PacketByteBuf COMMENT @see #writeIntArray(int[]) ARG 1 list COMMENT the list to write - METHOD method_34061 (Ljava/lang/Object;Lcom/mojang/serialization/DataResult$PartialResult;)V - ARG 1 partial + METHOD method_34061 (Ljava/lang/Object;Ljava/lang/String;)Lio/netty/handler/codec/EncoderException; + ARG 1 error METHOD method_34062 writeCollection (Ljava/util/Collection;Lnet/minecraft/class_2540$class_7462;)V COMMENT Writes a collection to this buf. The collection is stored as a leading COMMENT {@linkplain #readVarInt() var int} size followed by the entries @@ -797,16 +786,8 @@ CLASS net/minecraft/class_2540 net/minecraft/network/PacketByteBuf COMMENT a factory that creates a map with a given size ARG 2 keyReader ARG 3 valueReader - METHOD method_34070 (Lnet/minecraft/class_2487;Lcom/mojang/serialization/DataResult$PartialResult;)V - ARG 1 partial - METHOD method_36129 getVarLongLength (J)I - COMMENT Returns the number of bytes needed to encode {@code value} as a - COMMENT {@linkplain #writeVarLong(int) var long}. Guaranteed to be between {@code - COMMENT 1} and {@value #MAX_VAR_LONG_LENGTH}. - COMMENT - COMMENT @return the number of bytes a var long {@code value} uses - ARG 0 value - COMMENT the value to encode + METHOD method_34070 (Lnet/minecraft/class_2520;Ljava/lang/String;)Lio/netty/handler/codec/DecoderException; + ARG 1 error METHOD method_36130 writeChunkPos (Lnet/minecraft/class_1923;)Lnet/minecraft/class_2540; COMMENT Writes a chunk position to this buf. A chunk position is represented by COMMENT a regular long. @@ -823,9 +804,6 @@ CLASS net/minecraft/class_2540 net/minecraft/network/PacketByteBuf COMMENT @see #readChunkSectionPos() ARG 1 pos COMMENT the section position to write - METHOD method_36132 getWrittenBytes ()[B - COMMENT Returns an array of bytes of contents in this buf between index {@code 0} and - COMMENT the {@link #writerIndex()}. METHOD method_36133 readChunkPos ()Lnet/minecraft/class_1923; COMMENT Reads a chunk position from this buf. A chunk position is represented by COMMENT a regular long. @@ -891,9 +869,6 @@ CLASS net/minecraft/class_2540 net/minecraft/network/PacketByteBuf COMMENT exists if signed). COMMENT COMMENT @see #readProperty() - ARG 1 property - METHOD method_43618 (Lcom/mojang/authlib/properties/PropertyMap;Lnet/minecraft/class_2540;)V - ARG 2 buf METHOD method_43619 writeEither (Lcom/mojang/datafixers/util/Either;Lnet/minecraft/class_2540$class_7462;Lnet/minecraft/class_2540$class_7462;)V COMMENT Writes an {@code Either} to this buf. An either is represented by COMMENT a boolean indicating if the left side or the right side of the either, @@ -1001,8 +976,149 @@ CLASS net/minecraft/class_2540 net/minecraft/network/PacketByteBuf COMMENT @return the read public key COMMENT @throws io.netty.handler.codec.DecoderException if the public key is malformed COMMENT @see #writePublicKey(PublicKey) - METHOD method_44302 toEncodedStringLength (I)I - ARG 0 decodedLength + METHOD method_46249 writePropertyMap (Lcom/mojang/authlib/properties/PropertyMap;)V + COMMENT Writes an authlib property map to this buf. A property map is represented as a + COMMENT collection of properties. + COMMENT + COMMENT @see #readPropertyMap + ARG 1 propertyMap + METHOD method_46250 (Lcom/mojang/authlib/properties/PropertyMap;Lnet/minecraft/class_2540;)V + ARG 2 buf + METHOD method_46251 readEnumSet (Ljava/lang/Class;)Ljava/util/EnumSet; + COMMENT Reads an enum set from this buf. An enum set is represented by a bit set that indicates + COMMENT whether each element is in the set. + COMMENT + COMMENT @see #writeEnumSet + ARG 1 type + COMMENT the type of the enum + METHOD method_46252 writeBitSet (Ljava/util/BitSet;I)V + COMMENT Writes a bit set to this buf. A bit set is represented using its byte array representation. + COMMENT + COMMENT @throws io.netty.handler.codec.EncoderException if the bit set's length is above {@code size} + COMMENT + COMMENT @see BitSet#toByteArray + COMMENT @see #readBitSet + ARG 1 bitSet + ARG 2 size + COMMENT the maximum size of the bit set + METHOD method_46253 writeEnumSet (Ljava/util/EnumSet;Ljava/lang/Class;)V + COMMENT Writes an enum set to this buf. An enum set is represented by a bit set that indicates + COMMENT whether each element is in the set. + COMMENT + COMMENT @see #readEnumSet + ARG 1 enumSet + ARG 2 type + COMMENT the type of the enum + METHOD method_46254 readBitSet (I)Ljava/util/BitSet; + COMMENT Reads a bit set from this buf. A bit set is represented using its byte array representation. + COMMENT + COMMENT @see BitSet#valueOf + COMMENT @see #writeBitSet + ARG 1 size + COMMENT the maximum size of the bit set + METHOD method_46255 readPropertyMap ()Lcom/mojang/authlib/properties/PropertyMap; + COMMENT Reads an authlib property map from this buf. A property map is represented as a + COMMENT collection of properties. + COMMENT + COMMENT @see #writePropertyMap + METHOD method_47989 writeRegistryEntry (Lnet/minecraft/class_2359;Lnet/minecraft/class_6880;Lnet/minecraft/class_2540$class_7462;)V + ARG 1 registryEntries + ARG 2 entry + ARG 3 writer + METHOD method_47990 readRegistryEntry (Lnet/minecraft/class_2359;Lnet/minecraft/class_2540$class_7461;)Lnet/minecraft/class_6880; + ARG 1 registryEntries + ARG 2 reader + METHOD method_49067 writeQuaternionf (Lorg/joml/Quaternionf;)V + COMMENT Writes a {@link Quaternionf} to this buf. A {@link Quaternionf} is represented + COMMENT by four {@code float}s. + COMMENT + COMMENT @see #readQuaternionf() + ARG 1 quaternionf + METHOD method_49068 writeVector3f (Lorg/joml/Vector3f;)V + COMMENT Writes a {@link Vector3f} to this buf. A {@link Vector3f} is represented by + COMMENT three {@code float}s. + COMMENT + COMMENT @see #readVector3f() + ARG 1 vector3f + METHOD method_49069 readVector3f ()Lorg/joml/Vector3f; + COMMENT Reads a {@link Vector3f} from this buf. A {@link Vector3f} is represented by + COMMENT three {@code float}s. + COMMENT + COMMENT @see #writeVector3f(Vector3f) + METHOD method_49070 readQuaternionf ()Lorg/joml/Quaternionf; + COMMENT Reads a {@link Quaternionf} from this buf. A {@link Quaternionf} is represented + COMMENT by four {@code float}s. + COMMENT + COMMENT @see #writeQuaternionf(Quaternionf) + METHOD method_49394 decodeAsJson (Lcom/mojang/serialization/Codec;)Ljava/lang/Object; + COMMENT Reads an object from this buf as a JSON element 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 JSON element + COMMENT @see #encodeAsJson(Codec, Object) + ARG 1 codec + METHOD method_49395 encodeAsJson (Lcom/mojang/serialization/Codec;Ljava/lang/Object;)V + COMMENT Writes an object to this buf as a JSON element 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 JSON element + COMMENT @see #decodeAsJson(Codec) + ARG 1 codec + ARG 2 value + METHOD method_49396 (Ljava/lang/Object;Ljava/lang/String;)Lio/netty/handler/codec/EncoderException; + ARG 1 error + METHOD method_49397 (Ljava/lang/String;)Lio/netty/handler/codec/DecoderException; + ARG 0 error + METHOD method_52954 decode (Lcom/mojang/serialization/DynamicOps;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(DynamicOps, Codec, Object) + ARG 1 ops + ARG 2 codec + METHOD method_52955 writeVec3d (Lnet/minecraft/class_243;)V + COMMENT Writes a {@link Vec3d} to this buf. A {@link Vec3d} is represented + COMMENT by four {@code double}s. + COMMENT + COMMENT @see #readVec3d() + ARG 1 vec + METHOD method_52962 decode (Ljava/util/function/IntFunction;)Ljava/lang/Object; + COMMENT Reads a {@linkplain #readVarInt var int} representing an ID, then + COMMENT returns the value converted by {@code idToValue}. + COMMENT + COMMENT @see #encode(ToIntFunction, Object) + ARG 1 idToValue + COMMENT a function that gets the value from the integer ID + METHOD method_52963 encode (Ljava/util/function/ToIntFunction;Ljava/lang/Object;)Lnet/minecraft/class_2540; + COMMENT Converts {@code value} to an integer representing its ID, then + COMMENT writes a {@linkplain #readVarInt var int} representation of such ID. + COMMENT + COMMENT @see #decode(IntFunction) + ARG 1 valueToId + COMMENT a function that gets the value's integer ID + ARG 2 value + METHOD method_52996 readVec3d ()Lnet/minecraft/class_243; + COMMENT Reads a {@link Vec3d} from this buf. A {@link Vec3d} is represented + COMMENT by four {@code double}s. + COMMENT + COMMENT @see #writeVec3d(Vec3d) + METHOD method_53006 readRegistryRefKey ()Lnet/minecraft/class_5321; + COMMENT Reads a registry key referencing another registry key from this buf. + COMMENT Such key is represented by its {@linkplain #readIdentifier value as an identifier}. + COMMENT + COMMENT

    This is the same as {@code readRegistryKey(Registries.ROOT)}. + COMMENT To read a registry key of a registered object (such as biomes), + COMMENT use {@link #readRegistryKey(RegistryKey)}. + COMMENT + COMMENT @return the read registry key + COMMENT @see #readRegistryKey(RegistryKey) + COMMENT @see #writeRegistryKey(RegistryKey) METHOD nioBuffer (II)Ljava/nio/ByteBuffer; ARG 1 index ARG 2 length @@ -1051,6 +1167,8 @@ CLASS net/minecraft/class_2540 net/minecraft/network/PacketByteBuf ARG 1 index METHOD release (I)Z ARG 1 decrement + METHOD retain (I)Lio/netty/buffer/ByteBuf; + ARG 1 increment METHOD retain (I)Lio/netty/util/ReferenceCounted; ARG 1 increment METHOD retainedSlice (II)Lio/netty/buffer/ByteBuf; diff --git a/mappings/net/minecraft/network/PacketEncoder.mapping b/mappings/net/minecraft/network/PacketEncoder.mapping deleted file mode 100644 index 611a4877f9..0000000000 --- a/mappings/net/minecraft/network/PacketEncoder.mapping +++ /dev/null @@ -1,9 +0,0 @@ -CLASS net/minecraft/class_2545 net/minecraft/network/PacketEncoder - FIELD field_11720 side Lnet/minecraft/class_2598; - FIELD field_11721 LOGGER Lorg/slf4j/Logger; - METHOD (Lnet/minecraft/class_2598;)V - ARG 1 side - METHOD encode (Lio/netty/channel/ChannelHandlerContext;Ljava/lang/Object;Lio/netty/buffer/ByteBuf;)V - ARG 1 ctx - ARG 2 packet - ARG 3 out diff --git a/mappings/net/minecraft/network/PacketEncoderException.mapping b/mappings/net/minecraft/network/PacketEncoderException.mapping deleted file mode 100644 index 4647e292b8..0000000000 --- a/mappings/net/minecraft/network/PacketEncoderException.mapping +++ /dev/null @@ -1,3 +0,0 @@ -CLASS net/minecraft/class_2548 net/minecraft/network/PacketEncoderException - METHOD (Ljava/lang/Throwable;)V - ARG 1 cause diff --git a/mappings/net/minecraft/network/QueryableServer.mapping b/mappings/net/minecraft/network/QueryableServer.mapping new file mode 100644 index 0000000000..ff7accfafe --- /dev/null +++ b/mappings/net/minecraft/network/QueryableServer.mapping @@ -0,0 +1,5 @@ +CLASS net/minecraft/class_8599 net/minecraft/network/QueryableServer + METHOD method_3788 getCurrentPlayerCount ()I + METHOD method_3802 getMaxPlayerCount ()I + METHOD method_3818 getServerMotd ()Ljava/lang/String; + METHOD method_3827 getVersion ()Ljava/lang/String; diff --git a/mappings/net/minecraft/network/SplitterHandler.mapping b/mappings/net/minecraft/network/SplitterHandler.mapping deleted file mode 100644 index 95bbd55cd3..0000000000 --- a/mappings/net/minecraft/network/SplitterHandler.mapping +++ /dev/null @@ -1,5 +0,0 @@ -CLASS net/minecraft/class_2550 net/minecraft/network/SplitterHandler - METHOD decode (Lio/netty/channel/ChannelHandlerContext;Lio/netty/buffer/ByteBuf;Ljava/util/List;)V - ARG 1 ctx - ARG 2 buf - ARG 3 objects diff --git a/mappings/net/minecraft/network/encoding/StringEncoding.mapping b/mappings/net/minecraft/network/encoding/StringEncoding.mapping new file mode 100644 index 0000000000..ac356c2865 --- /dev/null +++ b/mappings/net/minecraft/network/encoding/StringEncoding.mapping @@ -0,0 +1,8 @@ +CLASS net/minecraft/class_8702 net/minecraft/network/encoding/StringEncoding + METHOD method_53012 decode (Lio/netty/buffer/ByteBuf;I)Ljava/lang/String; + ARG 0 buf + ARG 1 length + METHOD method_53013 encode (Lio/netty/buffer/ByteBuf;Ljava/lang/CharSequence;I)V + ARG 0 buf + ARG 1 string + ARG 2 length diff --git a/mappings/net/minecraft/network/encoding/VarInts.mapping b/mappings/net/minecraft/network/encoding/VarInts.mapping new file mode 100644 index 0000000000..c8fcc6e539 --- /dev/null +++ b/mappings/net/minecraft/network/encoding/VarInts.mapping @@ -0,0 +1,14 @@ +CLASS net/minecraft/class_8703 net/minecraft/network/encoding/VarInts + FIELD field_45682 MAX_BYTES I + FIELD field_45683 DATA_BITS_MASK I + FIELD field_45684 MORE_BITS_MASK I + FIELD field_45685 DATA_BITS_PER_BYTE I + METHOD method_53014 shouldContinueRead (B)Z + ARG 0 b + METHOD method_53015 getSizeInBytes (I)I + ARG 0 i + METHOD method_53016 read (Lio/netty/buffer/ByteBuf;)I + ARG 0 buf + METHOD method_53017 write (Lio/netty/buffer/ByteBuf;I)Lio/netty/buffer/ByteBuf; + ARG 0 buf + ARG 1 i diff --git a/mappings/net/minecraft/network/encoding/VarLongs.mapping b/mappings/net/minecraft/network/encoding/VarLongs.mapping new file mode 100644 index 0000000000..6ed9cc070e --- /dev/null +++ b/mappings/net/minecraft/network/encoding/VarLongs.mapping @@ -0,0 +1,14 @@ +CLASS net/minecraft/class_8704 net/minecraft/network/encoding/VarLongs + FIELD field_45686 MAX_BYTES I + FIELD field_45687 DATA_BITS_MASK I + FIELD field_45688 MORE_BITS_MASK I + FIELD field_45689 DATA_BITS_PER_BYTE I + METHOD method_53018 shouldContinueRead (B)Z + ARG 0 b + METHOD method_53019 getSizeInBytes (J)I + ARG 0 l + METHOD method_53020 read (Lio/netty/buffer/ByteBuf;)J + ARG 0 buf + METHOD method_53021 write (Lio/netty/buffer/ByteBuf;J)Lio/netty/buffer/ByteBuf; + ARG 0 buf + ARG 1 l diff --git a/mappings/net/minecraft/network/encryption/ClientPlayerSession.mapping b/mappings/net/minecraft/network/encryption/ClientPlayerSession.mapping new file mode 100644 index 0000000000..36956bdce8 --- /dev/null +++ b/mappings/net/minecraft/network/encryption/ClientPlayerSession.mapping @@ -0,0 +1,6 @@ +CLASS net/minecraft/class_7818 net/minecraft/network/encryption/ClientPlayerSession + METHOD method_46273 create (Lnet/minecraft/class_7427;)Lnet/minecraft/class_7818; + ARG 0 keyPair + METHOD method_46274 createPacker (Ljava/util/UUID;)Lnet/minecraft/class_7610$class_7612; + ARG 1 sender + METHOD method_46275 toPublicSession ()Lnet/minecraft/class_7822; diff --git a/mappings/net/minecraft/network/encryption/NetworkEncryptionUtils.mapping b/mappings/net/minecraft/network/encryption/NetworkEncryptionUtils.mapping index 22e60228dc..acd759810f 100644 --- a/mappings/net/minecraft/network/encryption/NetworkEncryptionUtils.mapping +++ b/mappings/net/minecraft/network/encryption/NetworkEncryptionUtils.mapping @@ -31,6 +31,7 @@ CLASS net/minecraft/class_3515 net/minecraft/network/encryption/NetworkEncryptio FIELD field_39039 RSA_PUBLIC_KEY_SUFFIX Ljava/lang/String; FIELD field_39109 SHA256_WITH_RSA Ljava/lang/String; FIELD field_39272 BASE64_ENCODER Ljava/util/Base64$Encoder; + FIELD field_40111 SHA256_BITS I METHOD method_15234 decryptSecretKey (Ljava/security/PrivateKey;[B)Ljavax/crypto/SecretKey; COMMENT Decrypts RSA-encrypted AES secret key. COMMENT diff --git a/mappings/net/minecraft/network/encryption/PlayerPublicKey.mapping b/mappings/net/minecraft/network/encryption/PlayerPublicKey.mapping index f241f4d8cf..ba57ac1718 100644 --- a/mappings/net/minecraft/network/encryption/PlayerPublicKey.mapping +++ b/mappings/net/minecraft/network/encryption/PlayerPublicKey.mapping @@ -7,11 +7,10 @@ CLASS net/minecraft/class_7428 net/minecraft/network/encryption/PlayerPublicKey COMMENT @see net.minecraft.client.util.ProfileKeys COMMENT @see PlayerKeyPair FIELD field_39050 CODEC Lcom/mojang/serialization/Codec; - FIELD field_39953 MISSING_PUBLIC_KEY_TEXT Lnet/minecraft/class_2561; FIELD field_39954 EXPIRED_PUBLIC_KEY_TEXT Lnet/minecraft/class_2561; FIELD field_39955 EXPIRATION_GRACE_PERIOD Ljava/time/Duration; FIELD field_39956 INVALID_PUBLIC_KEY_SIGNATURE_TEXT Lnet/minecraft/class_2561; - METHOD method_43550 verifyAndDecode (Lnet/minecraft/class_7500;Ljava/util/UUID;Lnet/minecraft/class_7428$class_7443;Ljava/time/Duration;)Lnet/minecraft/class_7428; + METHOD method_43550 verifyAndDecode (Lnet/minecraft/class_7500;Ljava/util/UUID;Lnet/minecraft/class_7428$class_7443;)Lnet/minecraft/class_7428; COMMENT Verifies the public key and decodes it. COMMENT COMMENT

    The checks whether the public key is present, signed with the Mojang's private key, @@ -21,13 +20,14 @@ CLASS net/minecraft/class_7428 net/minecraft/network/encryption/PlayerPublicKey ARG 0 servicesSignatureVerifier ARG 1 playerUuid ARG 2 publicKeyData - ARG 3 gracePeriod METHOD method_43697 createSignatureInstance ()Lnet/minecraft/class_7500; CLASS class_7443 PublicKeyData FIELD field_39119 CODEC Lcom/mojang/serialization/Codec; FIELD field_39309 KEY_SIGNATURE_MAX_SIZE I METHOD (Lnet/minecraft/class_2540;)V ARG 1 buf + METHOD equals (Ljava/lang/Object;)Z + ARG 1 o METHOD method_43701 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; ARG 0 instance METHOD method_43702 toSerializedString (Ljava/util/UUID;)[B diff --git a/mappings/net/minecraft/network/encryption/PublicPlayerSession.mapping b/mappings/net/minecraft/network/encryption/PublicPlayerSession.mapping new file mode 100644 index 0000000000..672a559d9d --- /dev/null +++ b/mappings/net/minecraft/network/encryption/PublicPlayerSession.mapping @@ -0,0 +1,20 @@ +CLASS net/minecraft/class_7822 net/minecraft/network/encryption/PublicPlayerSession + FIELD comp_1086 publicKeyData Lnet/minecraft/class_7428; + METHOD comp_1086 publicKeyData ()Lnet/minecraft/class_7428; + METHOD method_46296 createVerifier (Ljava/time/Duration;)Lnet/minecraft/class_7615; + ARG 1 gracePeriod + METHOD method_46297 createUnpacker (Ljava/util/UUID;)Lnet/minecraft/class_7610$class_7611; + ARG 1 sender + METHOD method_46298 toSerialized ()Lnet/minecraft/class_7822$class_7823; + METHOD method_51466 isKeyExpired ()Z + CLASS class_7823 Serialized + FIELD comp_1088 publicKeyData Lnet/minecraft/class_7428$class_7443; + METHOD comp_1088 publicKeyData ()Lnet/minecraft/class_7428$class_7443; + METHOD method_46300 toSession (Lcom/mojang/authlib/GameProfile;Lnet/minecraft/class_7500;)Lnet/minecraft/class_7822; + ARG 1 gameProfile + ARG 2 servicesSignatureVerifier + METHOD method_46301 fromBuf (Lnet/minecraft/class_2540;)Lnet/minecraft/class_7822$class_7823; + ARG 0 buf + METHOD method_46303 write (Lnet/minecraft/class_2540;Lnet/minecraft/class_7822$class_7823;)V + ARG 0 buf + ARG 1 serialized diff --git a/mappings/net/minecraft/network/encryption/SignatureVerifier.mapping b/mappings/net/minecraft/network/encryption/SignatureVerifier.mapping index ef7ebf33cf..f21ecc8fbd 100644 --- a/mappings/net/minecraft/network/encryption/SignatureVerifier.mapping +++ b/mappings/net/minecraft/network/encryption/SignatureVerifier.mapping @@ -8,8 +8,11 @@ CLASS net/minecraft/class_7500 net/minecraft/network/encryption/SignatureVerifie ARG 0 updatable ARG 1 signatureData ARG 2 signature - METHOD method_44172 create (Lcom/mojang/authlib/yggdrasil/ServicesKeyInfo;)Lnet/minecraft/class_7500; - ARG 0 servicesKeyInfo + METHOD method_44172 create (Lcom/mojang/authlib/yggdrasil/ServicesKeySet;Lcom/mojang/authlib/yggdrasil/ServicesKeyType;)Lnet/minecraft/class_7500; + ARG 0 servicesKeySet + ARG 1 servicesKeyType + METHOD method_44173 (Lnet/minecraft/class_7498;[BLcom/mojang/authlib/yggdrasil/ServicesKeyInfo;)Z + ARG 2 keyInfo METHOD method_44174 (Ljava/lang/String;Ljava/security/PublicKey;Lnet/minecraft/class_7498;[B)Z ARG 2 updatable ARG 3 signatureData @@ -21,6 +24,9 @@ CLASS net/minecraft/class_7500 net/minecraft/network/encryption/SignatureVerifie METHOD method_44177 validate ([B[B)Z ARG 1 signedData ARG 2 signatureData + METHOD method_51496 (Ljava/util/Collection;Lnet/minecraft/class_7498;[B)Z + ARG 1 updatable + ARG 2 signatureData METHOD validate (Lnet/minecraft/class_7498;[B)Z ARG 1 updatable ARG 2 signatureData diff --git a/mappings/net/minecraft/network/handler/DecoderHandler.mapping b/mappings/net/minecraft/network/handler/DecoderHandler.mapping new file mode 100644 index 0000000000..6cabf884f7 --- /dev/null +++ b/mappings/net/minecraft/network/handler/DecoderHandler.mapping @@ -0,0 +1,9 @@ +CLASS net/minecraft/class_2543 net/minecraft/network/handler/DecoderHandler + FIELD field_11715 LOGGER Lorg/slf4j/Logger; + FIELD field_45677 protocolKey Lio/netty/util/AttributeKey; + METHOD (Lio/netty/util/AttributeKey;)V + ARG 1 protocolKey + METHOD decode (Lio/netty/channel/ChannelHandlerContext;Lio/netty/buffer/ByteBuf;Ljava/util/List;)V + ARG 1 ctx + ARG 2 buf + ARG 3 objects diff --git a/mappings/net/minecraft/network/handler/LegacyQueries.mapping b/mappings/net/minecraft/network/handler/LegacyQueries.mapping new file mode 100644 index 0000000000..6de35fc02e --- /dev/null +++ b/mappings/net/minecraft/network/handler/LegacyQueries.mapping @@ -0,0 +1,11 @@ +CLASS net/minecraft/class_8607 net/minecraft/network/handler/LegacyQueries + FIELD field_44992 HEADER I + FIELD field_44993 PING_HOST Ljava/lang/String; + FIELD field_44994 QUERY_PACKET_ID I + FIELD field_44996 BUFFER_SIZE I + FIELD field_44997 PROTOCOL_VERSION I + METHOD method_52377 read (Lio/netty/buffer/ByteBuf;)Ljava/lang/String; + ARG 0 buf + METHOD method_52378 write (Lio/netty/buffer/ByteBuf;Ljava/lang/String;)V + ARG 0 buf + ARG 1 string diff --git a/mappings/net/minecraft/network/handler/LegacyQueryHandler.mapping b/mappings/net/minecraft/network/handler/LegacyQueryHandler.mapping new file mode 100644 index 0000000000..cd1efb3a3a --- /dev/null +++ b/mappings/net/minecraft/network/handler/LegacyQueryHandler.mapping @@ -0,0 +1,20 @@ +CLASS net/minecraft/class_3238 net/minecraft/network/handler/LegacyQueryHandler + FIELD field_14101 LOGGER Lorg/slf4j/Logger; + FIELD field_44998 server Lnet/minecraft/class_8599; + METHOD (Lnet/minecraft/class_8599;)V + ARG 1 server + METHOD channelRead (Lio/netty/channel/ChannelHandlerContext;Ljava/lang/Object;)V + ARG 1 ctx + ARG 2 msg + METHOD method_14344 reply (Lio/netty/channel/ChannelHandlerContext;Lio/netty/buffer/ByteBuf;)V + ARG 0 context + ARG 1 buf + METHOD method_52379 getResponseFor1_2 (Lnet/minecraft/class_8599;)Ljava/lang/String; + ARG 0 server + METHOD method_52380 isLegacyQuery (Lio/netty/buffer/ByteBuf;)Z + ARG 0 buf + METHOD method_52381 createBuf (Lio/netty/buffer/ByteBufAllocator;Ljava/lang/String;)Lio/netty/buffer/ByteBuf; + ARG 0 allocator + ARG 1 string + METHOD method_52382 getResponse (Lnet/minecraft/class_8599;)Ljava/lang/String; + ARG 0 server diff --git a/mappings/net/minecraft/network/handler/NetworkStateTransitionHandler.mapping b/mappings/net/minecraft/network/handler/NetworkStateTransitionHandler.mapping new file mode 100644 index 0000000000..b641e1c39f --- /dev/null +++ b/mappings/net/minecraft/network/handler/NetworkStateTransitionHandler.mapping @@ -0,0 +1,4 @@ +CLASS net/minecraft/class_8700 net/minecraft/network/handler/NetworkStateTransitionHandler + METHOD method_53011 handle (Lio/netty/util/Attribute;Lnet/minecraft/class_2596;)V + ARG 0 protocolAttribute + ARG 1 packet diff --git a/mappings/net/minecraft/network/handler/PacketBundleHandler.mapping b/mappings/net/minecraft/network/handler/PacketBundleHandler.mapping new file mode 100644 index 0000000000..71eebde4fd --- /dev/null +++ b/mappings/net/minecraft/network/handler/PacketBundleHandler.mapping @@ -0,0 +1,20 @@ +CLASS net/minecraft/class_8039 net/minecraft/network/handler/PacketBundleHandler + FIELD field_41878 MAX_PACKETS I + FIELD field_41879 NOOP Lnet/minecraft/class_8039; + METHOD method_48325 create (Ljava/lang/Class;Ljava/util/function/Function;Lnet/minecraft/class_8037;)Lnet/minecraft/class_8039; + ARG 0 bundlePacketType + ARG 1 bundleFunction + ARG 2 splitter + METHOD method_48326 createBundler (Lnet/minecraft/class_2596;)Lnet/minecraft/class_8039$class_8040; + ARG 1 splitter + METHOD method_48327 forEachPacket (Lnet/minecraft/class_2596;Ljava/util/function/Consumer;)V + ARG 1 packet + ARG 2 consumer + CLASS 2 + CLASS 1 + FIELD field_41884 packets Ljava/util/List; + CLASS class_8040 Bundler + METHOD method_48328 add (Lnet/minecraft/class_2596;)Lnet/minecraft/class_2596; + ARG 1 packet + CLASS class_8041 BundlerGetter + METHOD method_48312 getBundler ()Lnet/minecraft/class_8039; diff --git a/mappings/net/minecraft/network/handler/PacketBundler.mapping b/mappings/net/minecraft/network/handler/PacketBundler.mapping new file mode 100644 index 0000000000..4a54df5844 --- /dev/null +++ b/mappings/net/minecraft/network/handler/PacketBundler.mapping @@ -0,0 +1,10 @@ +CLASS net/minecraft/class_8035 net/minecraft/network/handler/PacketBundler + FIELD field_41869 currentBundler Lnet/minecraft/class_8039$class_8040; + FIELD field_41870 bundleHandler Lnet/minecraft/class_8039; + FIELD field_45675 protocolKey Lio/netty/util/AttributeKey; + METHOD (Lio/netty/util/AttributeKey;)V + ARG 1 protocolKey + METHOD decode (Lio/netty/channel/ChannelHandlerContext;Ljava/lang/Object;Ljava/util/List;)V + ARG 1 context + ARG 2 packet + ARG 3 packets diff --git a/mappings/net/minecraft/network/PacketDeflater.mapping b/mappings/net/minecraft/network/handler/PacketDeflater.mapping similarity index 85% rename from mappings/net/minecraft/network/PacketDeflater.mapping rename to mappings/net/minecraft/network/handler/PacketDeflater.mapping index 6b7ef3c26f..42ed3df8c1 100644 --- a/mappings/net/minecraft/network/PacketDeflater.mapping +++ b/mappings/net/minecraft/network/handler/PacketDeflater.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_2534 net/minecraft/network/PacketDeflater +CLASS net/minecraft/class_2534 net/minecraft/network/handler/PacketDeflater FIELD field_11636 compressionThreshold I FIELD field_11637 deflateBuffer [B FIELD field_11638 deflater Ljava/util/zip/Deflater; diff --git a/mappings/net/minecraft/network/handler/PacketEncoder.mapping b/mappings/net/minecraft/network/handler/PacketEncoder.mapping new file mode 100644 index 0000000000..9c85828551 --- /dev/null +++ b/mappings/net/minecraft/network/handler/PacketEncoder.mapping @@ -0,0 +1,9 @@ +CLASS net/minecraft/class_2545 net/minecraft/network/handler/PacketEncoder + FIELD field_11721 LOGGER Lorg/slf4j/Logger; + FIELD field_45678 protocolKey Lio/netty/util/AttributeKey; + METHOD (Lio/netty/util/AttributeKey;)V + ARG 1 protocolKey + METHOD encode (Lio/netty/channel/ChannelHandlerContext;Ljava/lang/Object;Lio/netty/buffer/ByteBuf;)V + ARG 1 ctx + ARG 2 packet + ARG 3 out diff --git a/mappings/net/minecraft/network/handler/PacketEncoderException.mapping b/mappings/net/minecraft/network/handler/PacketEncoderException.mapping new file mode 100644 index 0000000000..0374eb1282 --- /dev/null +++ b/mappings/net/minecraft/network/handler/PacketEncoderException.mapping @@ -0,0 +1,3 @@ +CLASS net/minecraft/class_2548 net/minecraft/network/handler/PacketEncoderException + METHOD (Ljava/lang/Throwable;)V + ARG 1 cause diff --git a/mappings/net/minecraft/network/PacketInflater.mapping b/mappings/net/minecraft/network/handler/PacketInflater.mapping similarity index 66% rename from mappings/net/minecraft/network/PacketInflater.mapping rename to mappings/net/minecraft/network/handler/PacketInflater.mapping index a448ac630f..7f1bf9938e 100644 --- a/mappings/net/minecraft/network/PacketInflater.mapping +++ b/mappings/net/minecraft/network/handler/PacketInflater.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_2532 net/minecraft/network/PacketInflater +CLASS net/minecraft/class_2532 net/minecraft/network/handler/PacketInflater FIELD field_11622 inflater Ljava/util/zip/Inflater; FIELD field_11623 compressionThreshold I FIELD field_33279 MAXIMUM_PACKET_SIZE I @@ -14,3 +14,8 @@ CLASS net/minecraft/class_2532 net/minecraft/network/PacketInflater METHOD method_10739 setCompressionThreshold (IZ)V ARG 1 compressionThreshold ARG 2 rejectsBadPackets + METHOD method_52896 setInputBuf (Lio/netty/buffer/ByteBuf;)V + ARG 1 buf + METHOD method_52897 inflate (Lio/netty/channel/ChannelHandlerContext;I)Lio/netty/buffer/ByteBuf; + ARG 1 context + ARG 2 expectedSize diff --git a/mappings/net/minecraft/network/handler/PacketSizeLogger.mapping b/mappings/net/minecraft/network/handler/PacketSizeLogger.mapping new file mode 100644 index 0000000000..54b4b18f82 --- /dev/null +++ b/mappings/net/minecraft/network/handler/PacketSizeLogger.mapping @@ -0,0 +1,8 @@ +CLASS net/minecraft/class_8762 net/minecraft/network/handler/PacketSizeLogger + FIELD field_45953 packetSizeInBytes Ljava/util/concurrent/atomic/AtomicInteger; + FIELD field_45954 log Lnet/minecraft/class_8743; + METHOD (Lnet/minecraft/class_8743;)V + ARG 1 log + METHOD method_53503 push ()V + METHOD method_53504 increment (I)V + ARG 1 bytes diff --git a/mappings/net/minecraft/network/handler/PacketUnbundler.mapping b/mappings/net/minecraft/network/handler/PacketUnbundler.mapping new file mode 100644 index 0000000000..c751c302eb --- /dev/null +++ b/mappings/net/minecraft/network/handler/PacketUnbundler.mapping @@ -0,0 +1,8 @@ +CLASS net/minecraft/class_8036 net/minecraft/network/handler/PacketUnbundler + FIELD field_45676 protocolKey Lio/netty/util/AttributeKey; + METHOD (Lio/netty/util/AttributeKey;)V + ARG 1 protocolKey + METHOD encode (Lio/netty/channel/ChannelHandlerContext;Ljava/lang/Object;Ljava/util/List;)V + ARG 1 context + ARG 2 packet + ARG 3 packets diff --git a/mappings/net/minecraft/network/handler/PacketValidator.mapping b/mappings/net/minecraft/network/handler/PacketValidator.mapping new file mode 100644 index 0000000000..adfeeec61b --- /dev/null +++ b/mappings/net/minecraft/network/handler/PacketValidator.mapping @@ -0,0 +1,20 @@ +CLASS net/minecraft/class_8699 net/minecraft/network/handler/PacketValidator + FIELD field_45679 LOGGER Lorg/slf4j/Logger; + FIELD field_45680 receivingSideKey Lio/netty/util/AttributeKey; + FIELD field_45681 sendingSideKey Lio/netty/util/AttributeKey; + METHOD (Lio/netty/util/AttributeKey;Lio/netty/util/AttributeKey;)V + ARG 1 receivingSideKey + ARG 2 sendingSideKey + METHOD decode (Lio/netty/channel/ChannelHandlerContext;Ljava/lang/Object;Ljava/util/List;)V + ARG 1 context + ARG 2 packet + ARG 3 packets + METHOD encode (Lio/netty/channel/ChannelHandlerContext;Ljava/lang/Object;Ljava/util/List;)V + ARG 1 context + ARG 2 packet + ARG 3 packets + METHOD method_53009 handle (Lio/netty/channel/ChannelHandlerContext;Lnet/minecraft/class_2596;Ljava/util/List;Lio/netty/util/AttributeKey;)V + ARG 0 context + ARG 1 packet + ARG 2 packets + ARG 3 key diff --git a/mappings/net/minecraft/network/SizePrepender.mapping b/mappings/net/minecraft/network/handler/SizePrepender.mapping similarity index 80% rename from mappings/net/minecraft/network/SizePrepender.mapping rename to mappings/net/minecraft/network/handler/SizePrepender.mapping index 8bf838c9d8..9539ed60fc 100644 --- a/mappings/net/minecraft/network/SizePrepender.mapping +++ b/mappings/net/minecraft/network/handler/SizePrepender.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_2552 net/minecraft/network/SizePrepender +CLASS net/minecraft/class_2552 net/minecraft/network/handler/SizePrepender FIELD field_33288 MAX_PREPEND_LENGTH I COMMENT The max length, in number of bytes, of the prepending size var int permitted. COMMENT Has value {@value}. diff --git a/mappings/net/minecraft/network/handler/SplitterHandler.mapping b/mappings/net/minecraft/network/handler/SplitterHandler.mapping new file mode 100644 index 0000000000..ee4f0270c3 --- /dev/null +++ b/mappings/net/minecraft/network/handler/SplitterHandler.mapping @@ -0,0 +1,15 @@ +CLASS net/minecraft/class_2550 net/minecraft/network/handler/SplitterHandler + FIELD field_45690 LENGTH_BYTES I + FIELD field_45691 reusableBuf Lio/netty/buffer/ByteBuf; + FIELD field_45956 packetSizeLogger Lnet/minecraft/class_8762; + METHOD (Lnet/minecraft/class_8762;)V + ARG 1 packetSizeLogger + METHOD decode (Lio/netty/channel/ChannelHandlerContext;Lio/netty/buffer/ByteBuf;Ljava/util/List;)V + ARG 1 ctx + ARG 2 buf + ARG 3 bytes + METHOD handlerRemoved0 (Lio/netty/channel/ChannelHandlerContext;)V + ARG 1 context + METHOD method_53022 shouldSplit (Lio/netty/buffer/ByteBuf;Lio/netty/buffer/ByteBuf;)Z + ARG 0 source + ARG 1 sizeBuf diff --git a/mappings/net/minecraft/network/listener/ClientCommonPacketListener.mapping b/mappings/net/minecraft/network/listener/ClientCommonPacketListener.mapping new file mode 100644 index 0000000000..5e06768666 --- /dev/null +++ b/mappings/net/minecraft/network/listener/ClientCommonPacketListener.mapping @@ -0,0 +1,13 @@ +CLASS net/minecraft/class_8705 net/minecraft/network/listener/ClientCommonPacketListener + METHOD method_11126 onSynchronizeTags (Lnet/minecraft/class_2790;)V + ARG 1 packet + METHOD method_52780 onCustomPayload (Lnet/minecraft/class_2658;)V + ARG 1 packet + METHOD method_52781 onDisconnect (Lnet/minecraft/class_2661;)V + ARG 1 packet + METHOD method_52782 onKeepAlive (Lnet/minecraft/class_2670;)V + ARG 1 packet + METHOD method_52783 onPing (Lnet/minecraft/class_6373;)V + ARG 1 packet + METHOD method_52784 onResourcePackSend (Lnet/minecraft/class_2720;)V + ARG 1 packet diff --git a/mappings/net/minecraft/network/listener/ClientConfigurationPacketListener.mapping b/mappings/net/minecraft/network/listener/ClientConfigurationPacketListener.mapping new file mode 100644 index 0000000000..0af1dcb3f7 --- /dev/null +++ b/mappings/net/minecraft/network/listener/ClientConfigurationPacketListener.mapping @@ -0,0 +1,7 @@ +CLASS net/minecraft/class_8732 net/minecraft/network/listener/ClientConfigurationPacketListener + METHOD method_52794 onReady (Lnet/minecraft/class_8733;)V + ARG 1 packet + METHOD method_52795 onDynamicRegistries (Lnet/minecraft/class_8734;)V + ARG 1 packet + METHOD method_52796 onFeatures (Lnet/minecraft/class_7832;)V + ARG 1 packet diff --git a/mappings/net/minecraft/network/listener/ClientPacketListener.mapping b/mappings/net/minecraft/network/listener/ClientPacketListener.mapping new file mode 100644 index 0000000000..d6fad45bba --- /dev/null +++ b/mappings/net/minecraft/network/listener/ClientPacketListener.mapping @@ -0,0 +1 @@ +CLASS net/minecraft/class_8697 net/minecraft/network/listener/ClientPacketListener diff --git a/mappings/net/minecraft/network/listener/ClientPingResultPacketListener.mapping b/mappings/net/minecraft/network/listener/ClientPingResultPacketListener.mapping new file mode 100644 index 0000000000..900ca2af03 --- /dev/null +++ b/mappings/net/minecraft/network/listener/ClientPingResultPacketListener.mapping @@ -0,0 +1,6 @@ +CLASS net/minecraft/class_8763 net/minecraft/network/listener/ClientPingResultPacketListener + METHOD method_12666 onPingResult (Lnet/minecraft/class_2923;)V + COMMENT Handles a packet from the server that includes the "ping" (connection latency). + COMMENT This is different from {@link net.minecraft.network.packet.c2s.common.CommonPongC2SPacket}, + COMMENT which is sent by the client to acknowledgment a ping packet from the server. + ARG 1 packet diff --git a/mappings/net/minecraft/network/listener/ClientPlayPacketListener.mapping b/mappings/net/minecraft/network/listener/ClientPlayPacketListener.mapping index f5a12e3703..2c569946ca 100644 --- a/mappings/net/minecraft/network/listener/ClientPlayPacketListener.mapping +++ b/mappings/net/minecraft/network/listener/ClientPlayPacketListener.mapping @@ -12,8 +12,6 @@ CLASS net/minecraft/class_2602 net/minecraft/network/listener/ClientPlayPacketLi ARG 1 packet METHOD method_11082 onStopSound (Lnet/minecraft/class_2770;)V ARG 1 packet - METHOD method_11083 onDisconnect (Lnet/minecraft/class_2661;)V - ARG 1 packet METHOD method_11084 onEntityStatusEffect (Lnet/minecraft/class_2783;)V ARG 1 packet METHOD method_11085 onGameStateChange (Lnet/minecraft/class_2668;)V @@ -50,8 +48,6 @@ CLASS net/minecraft/class_2602 net/minecraft/network/listener/ClientPlayPacketLi ARG 1 packet METHOD method_11102 onCloseScreen (Lnet/minecraft/class_2645;)V ARG 1 packet - METHOD method_11104 onPlaySoundId (Lnet/minecraft/class_2660;)V - ARG 1 packet METHOD method_11105 onPlayerListHeader (Lnet/minecraft/class_2772;)V ARG 1 packet METHOD method_11106 onSynchronizeRecipes (Lnet/minecraft/class_2788;)V @@ -89,8 +85,6 @@ CLASS net/minecraft/class_2602 net/minecraft/network/listener/ClientPlayPacketLi ARG 1 packet METHOD method_11125 onPlaySoundFromEntity (Lnet/minecraft/class_2765;)V ARG 1 packet - METHOD method_11126 onSynchronizeTags (Lnet/minecraft/class_2790;)V - ARG 1 packet METHOD method_11127 onNbtQueryResponse (Lnet/minecraft/class_2774;)V ARG 1 packet METHOD method_11128 onChunkData (Lnet/minecraft/class_2672;)V @@ -113,8 +107,6 @@ CLASS net/minecraft/class_2602 net/minecraft/network/listener/ClientPlayPacketLi ARG 1 packet METHOD method_11140 onDifficulty (Lnet/minecraft/class_2632;)V ARG 1 packet - METHOD method_11141 onResourcePackSend (Lnet/minecraft/class_2720;)V - ARG 1 packet METHOD method_11142 onPlayerSpawnPosition (Lnet/minecraft/class_2759;)V ARG 1 packet METHOD method_11143 onLightUpdate (Lnet/minecraft/class_2676;)V @@ -125,8 +117,6 @@ CLASS net/minecraft/class_2602 net/minecraft/network/listener/ClientPlayPacketLi ARG 1 packet METHOD method_11146 onPlaySound (Lnet/minecraft/class_2767;)V ARG 1 packet - METHOD method_11147 onKeepAlive (Lnet/minecraft/class_2670;)V - ARG 1 packet METHOD method_11148 onEntityStatus (Lnet/minecraft/class_2663;)V ARG 1 packet METHOD method_11149 onEntityAttributes (Lnet/minecraft/class_2781;)V @@ -135,8 +125,6 @@ CLASS net/minecraft/class_2602 net/minecraft/network/listener/ClientPlayPacketLi ARG 1 packet METHOD method_11151 onEntityEquipmentUpdate (Lnet/minecraft/class_2744;)V ARG 1 packet - METHOD method_11152 onCustomPayload (Lnet/minecraft/class_2658;)V - ARG 1 packet METHOD method_11153 onInventory (Lnet/minecraft/class_2649;)V ARG 1 packet METHOD method_11154 onPlayerAbilities (Lnet/minecraft/class_2696;)V @@ -193,23 +181,33 @@ CLASS net/minecraft/class_2602 net/minecraft/network/listener/ClientPlayPacketLi ARG 1 packet METHOD method_34084 onTitleFade (Lnet/minecraft/class_5905;)V ARG 1 packet - METHOD method_36895 onPing (Lnet/minecraft/class_6373;)V - ARG 1 packet METHOD method_39025 onSimulationDistance (Lnet/minecraft/class_6682;)V ARG 1 packet METHOD method_43595 onChatMessage (Lnet/minecraft/class_7438;)V ARG 1 packet METHOD method_43596 onGameMessage (Lnet/minecraft/class_7439;)V ARG 1 packet - METHOD method_44074 onChatPreview (Lnet/minecraft/class_7494;)V - ARG 1 packet METHOD method_44075 onServerMetadata (Lnet/minecraft/class_7495;)V ARG 1 packet - METHOD method_44286 onChatPreviewStateChange (Lnet/minecraft/class_7519;)V - ARG 1 packet METHOD method_44763 onChatSuggestions (Lnet/minecraft/class_7597;)V ARG 1 packet - METHOD method_44814 onHideMessage (Lnet/minecraft/class_7617;)V + METHOD method_44814 onRemoveMessage (Lnet/minecraft/class_7617;)V + ARG 1 packet + METHOD method_45724 onProfilelessChatMessage (Lnet/minecraft/class_7827;)V + ARG 1 packet + METHOD method_45725 onPlayerRemove (Lnet/minecraft/class_7828;)V + ARG 1 packet + METHOD method_48294 onBundle (Lnet/minecraft/class_8042;)V + ARG 1 packet + METHOD method_48295 onDamageTilt (Lnet/minecraft/class_8043;)V + ARG 1 packet + METHOD method_49034 onEntityDamage (Lnet/minecraft/class_8143;)V + ARG 1 packet + METHOD method_49631 onChunkBiomeData (Lnet/minecraft/class_8212;)V + ARG 1 packet + METHOD method_52798 onEnterReconfiguration (Lnet/minecraft/class_8588;)V + ARG 1 packet + METHOD method_52799 onChunkSent (Lnet/minecraft/class_8738;)V ARG 1 packet - METHOD method_44815 onMessageHeader (Lnet/minecraft/class_7618;)V + METHOD method_52800 onStartChunkSend (Lnet/minecraft/class_8739;)V ARG 1 packet diff --git a/mappings/net/minecraft/network/listener/ClientQueryPacketListener.mapping b/mappings/net/minecraft/network/listener/ClientQueryPacketListener.mapping index dba61f832f..1dff90f79e 100644 --- a/mappings/net/minecraft/network/listener/ClientQueryPacketListener.mapping +++ b/mappings/net/minecraft/network/listener/ClientQueryPacketListener.mapping @@ -1,5 +1,3 @@ CLASS net/minecraft/class_2921 net/minecraft/network/listener/ClientQueryPacketListener - METHOD method_12666 onPong (Lnet/minecraft/class_2923;)V - ARG 1 packet METHOD method_12667 onResponse (Lnet/minecraft/class_2924;)V ARG 1 packet diff --git a/mappings/net/minecraft/network/listener/PacketListener.mapping b/mappings/net/minecraft/network/listener/PacketListener.mapping index c8295c9606..e1e1f2c8ba 100644 --- a/mappings/net/minecraft/network/listener/PacketListener.mapping +++ b/mappings/net/minecraft/network/listener/PacketListener.mapping @@ -1,6 +1,6 @@ CLASS net/minecraft/class_2547 net/minecraft/network/listener/PacketListener - COMMENT A packet listener listens to packets on a {@linkplain ClientConnection - COMMENT connection}. + COMMENT A packet listener listens to packets on a {@linkplain + COMMENT net.minecraft.network.ClientConnection connection}. COMMENT COMMENT

    Its listener methods will be called on the netty event loop than the COMMENT client or server game engine threads. @@ -9,13 +9,6 @@ CLASS net/minecraft/class_2547 net/minecraft/network/listener/PacketListener 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() METHOD method_40065 shouldCrashOnException ()Z COMMENT {@return whether uncaught exceptions in main thread should crash the game COMMENT instead of logging and ignoring them} @@ -28,3 +21,8 @@ CLASS net/minecraft/class_2547 net/minecraft/network/listener/PacketListener COMMENT code will be unaffected, and always gets logged without crashing. COMMENT COMMENT @see ServerPacketListener + METHOD method_48106 isConnectionOpen ()Z + METHOD method_52280 getState ()Lnet/minecraft/class_2539; + METHOD method_52413 accepts (Lnet/minecraft/class_2596;)Z + ARG 1 packet + METHOD method_52895 getSide ()Lnet/minecraft/class_2598; diff --git a/mappings/net/minecraft/network/listener/ServerCommonPacketListener.mapping b/mappings/net/minecraft/network/listener/ServerCommonPacketListener.mapping new file mode 100644 index 0000000000..60a28fc960 --- /dev/null +++ b/mappings/net/minecraft/network/listener/ServerCommonPacketListener.mapping @@ -0,0 +1,9 @@ +CLASS net/minecraft/class_8706 net/minecraft/network/listener/ServerCommonPacketListener + METHOD method_52392 onCustomPayload (Lnet/minecraft/class_2817;)V + ARG 1 packet + METHOD method_52393 onKeepAlive (Lnet/minecraft/class_2827;)V + ARG 1 packet + METHOD method_52394 onPong (Lnet/minecraft/class_6374;)V + ARG 1 packet + METHOD method_52395 onResourcePackStatus (Lnet/minecraft/class_2856;)V + ARG 1 packet diff --git a/mappings/net/minecraft/network/listener/ServerConfigurationPacketListener.mapping b/mappings/net/minecraft/network/listener/ServerConfigurationPacketListener.mapping new file mode 100644 index 0000000000..155c956103 --- /dev/null +++ b/mappings/net/minecraft/network/listener/ServerConfigurationPacketListener.mapping @@ -0,0 +1,3 @@ +CLASS net/minecraft/class_8735 net/minecraft/network/listener/ServerConfigurationPacketListener + METHOD method_52408 onReady (Lnet/minecraft/class_8736;)V + ARG 1 packet diff --git a/mappings/net/minecraft/network/listener/ServerCrashSafePacketListener.mapping b/mappings/net/minecraft/network/listener/ServerCrashSafePacketListener.mapping new file mode 100644 index 0000000000..23e93b4905 --- /dev/null +++ b/mappings/net/minecraft/network/listener/ServerCrashSafePacketListener.mapping @@ -0,0 +1,5 @@ +CLASS net/minecraft/class_6857 net/minecraft/network/listener/ServerCrashSafePacketListener + COMMENT The interface for serverbound packet listeners. + COMMENT + COMMENT @implNote Serverbound packet listeners log any uncaught exceptions + COMMENT without crashing. diff --git a/mappings/net/minecraft/network/listener/ServerLoginPacketListener.mapping b/mappings/net/minecraft/network/listener/ServerLoginPacketListener.mapping index 811e13c7f2..8de2eaaec9 100644 --- a/mappings/net/minecraft/network/listener/ServerLoginPacketListener.mapping +++ b/mappings/net/minecraft/network/listener/ServerLoginPacketListener.mapping @@ -5,3 +5,5 @@ CLASS net/minecraft/class_2911 net/minecraft/network/listener/ServerLoginPacketL ARG 1 packet METHOD method_12642 onKey (Lnet/minecraft/class_2917;)V ARG 1 packet + METHOD method_52289 onEnterConfiguration (Lnet/minecraft/class_8593;)V + ARG 1 packet diff --git a/mappings/net/minecraft/network/listener/ServerPacketListener.mapping b/mappings/net/minecraft/network/listener/ServerPacketListener.mapping index 247c026cd6..7a1dac3577 100644 --- a/mappings/net/minecraft/network/listener/ServerPacketListener.mapping +++ b/mappings/net/minecraft/network/listener/ServerPacketListener.mapping @@ -1,5 +1 @@ -CLASS net/minecraft/class_6857 net/minecraft/network/listener/ServerPacketListener - COMMENT The base interface for serverbound packet listeners. - COMMENT - COMMENT @implNote Serverbound packet listeners log any uncaught exceptions - COMMENT without crashing. +CLASS net/minecraft/class_8701 net/minecraft/network/listener/ServerPacketListener diff --git a/mappings/net/minecraft/network/listener/ServerPlayPacketListener.mapping b/mappings/net/minecraft/network/listener/ServerPlayPacketListener.mapping index 60d1815bbc..71458e4064 100644 --- a/mappings/net/minecraft/network/listener/ServerPlayPacketListener.mapping +++ b/mappings/net/minecraft/network/listener/ServerPlayPacketListener.mapping @@ -60,8 +60,6 @@ CLASS net/minecraft/class_2792 net/minecraft/network/listener/ServerPlayPacketLi ARG 1 packet METHOD method_12074 onQueryEntityNbt (Lnet/minecraft/class_2822;)V ARG 1 packet - METHOD method_12075 onCustomPayload (Lnet/minecraft/class_2817;)V - ARG 1 packet METHOD method_12076 onClickSlot (Lnet/minecraft/class_2813;)V ARG 1 packet METHOD method_12077 onUpdateCommandBlock (Lnet/minecraft/class_2870;)V @@ -70,10 +68,6 @@ CLASS net/minecraft/class_2792 net/minecraft/network/listener/ServerPlayPacketLi ARG 1 packet METHOD method_12080 onSelectMerchantTrade (Lnet/minecraft/class_2863;)V ARG 1 packet - METHOD method_12081 onResourcePackStatus (Lnet/minecraft/class_2856;)V - ARG 1 packet - METHOD method_12082 onKeepAlive (Lnet/minecraft/class_2827;)V - ARG 1 packet METHOD method_12083 onUpdatePlayerAbilities (Lnet/minecraft/class_2842;)V ARG 1 packet METHOD method_12084 onPickFromInventory (Lnet/minecraft/class_2838;)V @@ -88,11 +82,13 @@ CLASS net/minecraft/class_2792 net/minecraft/network/listener/ServerPlayPacketLi ARG 1 packet METHOD method_30303 onRecipeCategoryOptions (Lnet/minecraft/class_5427;)V ARG 1 packet - METHOD method_36580 onPong (Lnet/minecraft/class_6374;)V - ARG 1 packet METHOD method_43667 onCommandExecution (Lnet/minecraft/class_7472;)V ARG 1 packet - METHOD method_43931 onRequestChatPreview (Lnet/minecraft/class_7496;)V - ARG 1 packet METHOD method_44898 onMessageAcknowledgment (Lnet/minecraft/class_7640;)V ARG 1 packet + METHOD method_46367 onPlayerSession (Lnet/minecraft/class_7861;)V + ARG 1 packet + METHOD method_52278 onAcknowledgeChunks (Lnet/minecraft/class_8590;)V + ARG 1 packet + METHOD method_52279 onAcknowledgeReconfiguration (Lnet/minecraft/class_8591;)V + ARG 1 packet diff --git a/mappings/net/minecraft/network/listener/ServerQueryPacketListener.mapping b/mappings/net/minecraft/network/listener/ServerQueryPacketListener.mapping index c506f4ff0f..2d80316cf5 100644 --- a/mappings/net/minecraft/network/listener/ServerQueryPacketListener.mapping +++ b/mappings/net/minecraft/network/listener/ServerQueryPacketListener.mapping @@ -1,5 +1,3 @@ CLASS net/minecraft/class_2933 net/minecraft/network/listener/ServerQueryPacketListener - METHOD method_12697 onPing (Lnet/minecraft/class_2935;)V - ARG 1 packet METHOD method_12698 onRequest (Lnet/minecraft/class_2937;)V ARG 1 packet diff --git a/mappings/net/minecraft/network/listener/ServerQueryPingPacketListener.mapping b/mappings/net/minecraft/network/listener/ServerQueryPingPacketListener.mapping new file mode 100644 index 0000000000..1b32d7e1bf --- /dev/null +++ b/mappings/net/minecraft/network/listener/ServerQueryPingPacketListener.mapping @@ -0,0 +1,6 @@ +CLASS net/minecraft/class_8740 net/minecraft/network/listener/ServerQueryPingPacketListener + METHOD method_12697 onQueryPing (Lnet/minecraft/class_2935;)V + COMMENT Handles a packet from client to query the "ping" (connection latency). + COMMENT This is different from {@link net.minecraft.network.packet.s2c.common.CommonPingS2CPacket}, + COMMENT which can be sent by the server to request acknowledgment. + ARG 1 packet diff --git a/mappings/net/minecraft/network/listener/TickablePacketListener.mapping b/mappings/net/minecraft/network/listener/TickablePacketListener.mapping index f48774880f..ed5deb088e 100644 --- a/mappings/net/minecraft/network/listener/TickablePacketListener.mapping +++ b/mappings/net/minecraft/network/listener/TickablePacketListener.mapping @@ -1,2 +1,4 @@ CLASS net/minecraft/class_7633 net/minecraft/network/listener/TickablePacketListener METHOD method_18784 tick ()V + COMMENT Ticks this packet listener on the game engine thread. The listener is responsible + COMMENT for synchronizing between the game engine and netty event loop threads. diff --git a/mappings/net/minecraft/network/message/AcknowledgedMessage.mapping b/mappings/net/minecraft/network/message/AcknowledgedMessage.mapping new file mode 100644 index 0000000000..8e11495e9d --- /dev/null +++ b/mappings/net/minecraft/network/message/AcknowledgedMessage.mapping @@ -0,0 +1,5 @@ +CLASS net/minecraft/class_7817 net/minecraft/network/message/AcknowledgedMessage + COMMENT A message that is acknowledged. If {@link #pending} is {@code true}, the acknowledgment + COMMENT is not sent to the server yet. + METHOD method_46271 unmarkAsPending ()Lnet/minecraft/class_7817; + COMMENT {@return a new acknowledged message with {@link #pending} set to {@code false}} diff --git a/mappings/net/minecraft/network/message/AcknowledgmentValidator.mapping b/mappings/net/minecraft/network/message/AcknowledgmentValidator.mapping index 3bbde0d78e..882e5da1ae 100644 --- a/mappings/net/minecraft/network/message/AcknowledgmentValidator.mapping +++ b/mappings/net/minecraft/network/message/AcknowledgmentValidator.mapping @@ -6,37 +6,15 @@ CLASS net/minecraft/class_7638 net/minecraft/network/message/AcknowledgmentValid COMMENT waiting for message acknowledgments (more than {@value COMMENT net.minecraft.server.network.ServerPlayNetworkHandler#MAX_PENDING_ACKNOWLEDGMENTS}), COMMENT or if the acknowledgment is incorrect, the client will be disconnected. - FIELD field_39888 UNKNOWN I - FIELD field_39889 prevValidated Lnet/minecraft/class_7635; - FIELD field_39890 pending Lit/unimi/dsi/fastutil/objects/ObjectList; - METHOD method_44987 getPendingCount ()I - METHOD method_44988 order (Ljava/util/List;[ILnet/minecraft/class_7635$class_7609;)I - COMMENT Orders {@code lastSeen}. {@code result} should be an array with the same size - COMMENT as {@code lastSeen}, and it will hold the order of each entry, where a larger - COMMENT integer corresponds to more recent message. If the integer is {@value #UNKNOWN}, - COMMENT then the message is unknown (neither previously acknowledged nor is newly sent), - COMMENT which causes validation failure. - COMMENT - COMMENT @return the order of the last received message; if any messages have higher order - COMMENT than this, it is a validation failure. - ARG 1 lastSeen - ARG 2 result - ARG 3 lastReceived - METHOD method_44989 addPending (Lnet/minecraft/class_7635$class_7609;)V - ARG 1 entry - METHOD method_44990 validate (Lnet/minecraft/class_7635$class_7636;)Ljava/util/Set; - COMMENT Validates {@code acknowledgment}. - COMMENT - COMMENT @return reasons for acknowledgment validation failure, or an empty set if - COMMENT validation is successful + FIELD field_40680 size I + FIELD field_40681 messages Lit/unimi/dsi/fastutil/objects/ObjectList; + FIELD field_40682 lastSignature Lnet/minecraft/class_7469; + METHOD (I)V + ARG 1 size + METHOD method_44989 addPending (Lnet/minecraft/class_7469;)V + ARG 1 signature + METHOD method_46268 getMessageCount ()I + METHOD method_46269 removeUntil (I)Z + ARG 1 index + METHOD method_46270 validate (Lnet/minecraft/class_7635$class_7636;)Ljava/util/Optional; ARG 1 acknowledgment - METHOD method_44991 hasDuplicateProfiles (Lnet/minecraft/class_7635;)Z - COMMENT {@return whether {@code messages} have multiple entries with the same profile ID} - COMMENT - COMMENT

    If {@code true}, validation fails. - ARG 1 messages - CLASS class_7639 FailureReason - FIELD field_39895 description Ljava/lang/String; - METHOD (Ljava/lang/String;ILjava/lang/String;)V - ARG 3 description - METHOD method_44992 getDescription ()Ljava/lang/String; diff --git a/mappings/net/minecraft/network/message/ArgumentSignatureDataMap.mapping b/mappings/net/minecraft/network/message/ArgumentSignatureDataMap.mapping index 8824ad9d00..610ee811a3 100644 --- a/mappings/net/minecraft/network/message/ArgumentSignatureDataMap.mapping +++ b/mappings/net/minecraft/network/message/ArgumentSignatureDataMap.mapping @@ -7,9 +7,6 @@ CLASS net/minecraft/class_7450 net/minecraft/network/message/ArgumentSignatureDa FIELD field_39807 EMPTY Lnet/minecraft/class_7450; METHOD (Lnet/minecraft/class_2540;)V ARG 1 buf - METHOD method_43747 resultToString (Lnet/minecraft/class_7451;Lcom/mojang/brigadier/context/ParsedArgument;)Ljava/lang/String; - ARG 0 type - ARG 1 argument METHOD method_43748 get (Ljava/lang/String;)Lnet/minecraft/class_7469; COMMENT {@return the signature data for {@code argumentName}, or {@code null} if the COMMENT argument name is not present in this signatures} @@ -21,19 +18,11 @@ CLASS net/minecraft/class_7450 net/minecraft/network/message/ArgumentSignatureDa COMMENT {@code signer}} ARG 0 arguments ARG 1 signer - METHOD method_44798 (Lnet/minecraft/class_7450$class_7600;Lcom/mojang/datafixers/util/Pair;)Lnet/minecraft/class_7450$class_7599; - ARG 1 entry METHOD method_44799 (Lnet/minecraft/class_2540;Lnet/minecraft/class_7450$class_7599;)V ARG 0 buf2 ARG 1 entry - METHOD method_44910 hasSignedArgument (Lnet/minecraft/class_7644;)Z - COMMENT {@return whether the parsed arguments include {@link SignedArgumentType}} - ARG 0 arguments - METHOD method_45019 (Lnet/minecraft/class_7644$class_7645;)Z - ARG 0 argument - METHOD method_45020 toNameValuePairs (Lnet/minecraft/class_7644;)Ljava/util/List; - COMMENT {@return {@code arguments} converted to a list of signed name/value pairs} - ARG 0 arguments + METHOD method_45561 (Lnet/minecraft/class_7450$class_7600;Lnet/minecraft/class_7644$class_7645;)Lnet/minecraft/class_7450$class_7599; + ARG 1 argument CLASS class_7599 Entry COMMENT An entry of the signatures map, consisting of the argument's name and signature data. METHOD (Lnet/minecraft/class_2540;)V @@ -42,6 +31,5 @@ CLASS net/minecraft/class_7450 net/minecraft/network/message/ArgumentSignatureDa ARG 1 buf CLASS class_7600 ArgumentSigner COMMENT A functional interface that signs an argument of a command. - METHOD sign (Ljava/lang/String;Ljava/lang/String;)Lnet/minecraft/class_7469; - ARG 1 argumentName - ARG 2 value + METHOD sign (Ljava/lang/String;)Lnet/minecraft/class_7469; + ARG 1 value diff --git a/mappings/net/minecraft/network/message/CachedDecoratorResult.mapping b/mappings/net/minecraft/network/message/CachedDecoratorResult.mapping deleted file mode 100644 index 14b116ed9e..0000000000 --- a/mappings/net/minecraft/network/message/CachedDecoratorResult.mapping +++ /dev/null @@ -1,27 +0,0 @@ -CLASS net/minecraft/class_7642 net/minecraft/network/message/CachedDecoratorResult - COMMENT The cached result of {@link MessageDecorator}'s decorated message. - COMMENT - COMMENT

    The result is cached per player, and is consumed when the message is actually - COMMENT sent. Caching allows the decorator's result to be not pure (e.g. uses externally - COMMENT controlled variables), as decorators that produce different results on the second - COMMENT execution at submission time do not affect the verification. - FIELD field_39909 cachedResult Lnet/minecraft/class_7642$class_7643; - METHOD method_45035 tryConsume (Ljava/lang/String;)Lnet/minecraft/class_2561; - COMMENT Consumes the cached result if possible. - COMMENT - COMMENT

    The result can only be consumed if it exists and the cached query equals - COMMENT {@code query}. After consuming, the cached result is set to {@code null}. - COMMENT - COMMENT @return the cached result, or {@code null} if it cannot be consumed - ARG 1 query - METHOD method_45036 setCachedResult (Ljava/lang/String;Lnet/minecraft/class_2561;)V - COMMENT Sets the cached result to {@code preview} for {@code query}. - COMMENT - COMMENT @see CachedDecoratorResult.Cache - ARG 1 query - ARG 2 preview - CLASS class_7643 Cache - COMMENT The cached result. - METHOD method_45037 queryEquals (Ljava/lang/String;)Z - COMMENT {@return whether the cached query equals {@code query}} - ARG 1 query diff --git a/mappings/net/minecraft/network/message/DecoratedContents.mapping b/mappings/net/minecraft/network/message/DecoratedContents.mapping deleted file mode 100644 index 9595f962c1..0000000000 --- a/mappings/net/minecraft/network/message/DecoratedContents.mapping +++ /dev/null @@ -1,13 +0,0 @@ -CLASS net/minecraft/class_7634 net/minecraft/network/message/DecoratedContents - COMMENT A pair of the decorated message content and its undecorated ("plain") message content. - COMMENT Note that the two contents can be equal if no decoration is applied. - METHOD (Ljava/lang/String;)V - ARG 1 content - METHOD (Ljava/lang/String;Lnet/minecraft/class_2561;)V - ARG 2 decorated - METHOD method_44973 isDecorated ()Z - METHOD method_44977 read (Lnet/minecraft/class_2540;)Lnet/minecraft/class_7634; - ARG 0 buf - METHOD method_44978 write (Lnet/minecraft/class_2540;Lnet/minecraft/class_7634;)V - ARG 0 buf - ARG 1 contents diff --git a/mappings/net/minecraft/network/message/FilterMask.mapping b/mappings/net/minecraft/network/message/FilterMask.mapping index bdb0ec6d1d..0a84f2ffec 100644 --- a/mappings/net/minecraft/network/message/FilterMask.mapping +++ b/mappings/net/minecraft/network/message/FilterMask.mapping @@ -4,11 +4,20 @@ CLASS net/minecraft/class_7649 net/minecraft/network/message/FilterMask FIELD field_39943 FILTERED C FIELD field_39944 mask Ljava/util/BitSet; FIELD field_39945 status Lnet/minecraft/class_7649$class_7650; + FIELD field_40674 FILTERED_STYLE Lnet/minecraft/class_2583; + FIELD field_40837 CODEC Lcom/mojang/serialization/Codec; + FIELD field_40838 PASS_THROUGH_CODEC Lcom/mojang/serialization/Codec; + FIELD field_40839 FULLY_FILTERED_CODEC Lcom/mojang/serialization/Codec; + FIELD field_40840 PARTIALLY_FILTERED_CODEC Lcom/mojang/serialization/Codec; METHOD (I)V ARG 1 length + METHOD (Ljava/util/BitSet;)V + ARG 1 mask METHOD (Ljava/util/BitSet;Lnet/minecraft/class_7649$class_7650;)V ARG 1 mask ARG 2 status + METHOD equals (Ljava/lang/Object;)Z + ARG 1 o METHOD method_45087 isPassThrough ()Z METHOD method_45088 markFiltered (I)V ARG 1 index @@ -19,7 +28,15 @@ CLASS net/minecraft/class_7649 net/minecraft/network/message/FilterMask METHOD method_45091 writeMask (Lnet/minecraft/class_2540;Lnet/minecraft/class_7649;)V ARG 0 buf ARG 1 mask - METHOD method_45092 filter (Lnet/minecraft/class_7634;)Lnet/minecraft/class_2561; - ARG 1 contents METHOD method_45093 isFullyFiltered ()Z + METHOD method_46256 getFilteredText (Ljava/lang/String;)Lnet/minecraft/class_2561; + ARG 1 message + METHOD method_46600 getStatus ()Lnet/minecraft/class_7649$class_7650; + METHOD method_46601 getMask ()Ljava/util/BitSet; CLASS class_7650 FilterStatus + FIELD field_40841 id Ljava/lang/String; + FIELD field_40842 codecSupplier Ljava/util/function/Supplier; + METHOD (Ljava/lang/String;ILjava/lang/String;Ljava/util/function/Supplier;)V + ARG 3 id + ARG 4 codecSupplier + METHOD method_46602 getCodec ()Lcom/mojang/serialization/Codec; diff --git a/mappings/net/minecraft/network/message/LastSeenMessageList.mapping b/mappings/net/minecraft/network/message/LastSeenMessageList.mapping index 12574897f8..b6004c0aad 100644 --- a/mappings/net/minecraft/network/message/LastSeenMessageList.mapping +++ b/mappings/net/minecraft/network/message/LastSeenMessageList.mapping @@ -2,22 +2,13 @@ CLASS net/minecraft/class_7635 net/minecraft/network/message/LastSeenMessageList COMMENT A list of messages a client has seen. FIELD field_39883 EMPTY Lnet/minecraft/class_7635; FIELD field_39884 MAX_ENTRIES I - METHOD (Lnet/minecraft/class_2540;)V - ARG 1 buf - METHOD method_44980 write (Ljava/io/DataOutput;)V - ARG 1 output - METHOD method_44981 write (Lnet/minecraft/class_2540;)V - ARG 1 buf - METHOD method_44982 (Lnet/minecraft/class_2540;Lnet/minecraft/class_7635$class_7609;)V - ARG 0 buf2 - ARG 1 entries - CLASS class_7609 Entry - COMMENT A pair of a player's UUID and the signature of the last message they saw, - COMMENT used as an entry of {@link LastSeenMessageList}. - METHOD (Lnet/minecraft/class_2540;)V - ARG 1 buf - METHOD method_44873 write (Lnet/minecraft/class_2540;)V - ARG 1 buf + FIELD field_40843 CODEC Lcom/mojang/serialization/Codec; + METHOD method_46257 updateSignatures (Lnet/minecraft/class_7498$class_7499;)V + ARG 1 updater + METHOD method_46258 pack (Lnet/minecraft/class_7561;)Lnet/minecraft/class_7635$class_7815; + ARG 1 storage + METHOD method_46259 (Lnet/minecraft/class_7561;Lnet/minecraft/class_7469;)Lnet/minecraft/class_7469$class_7819; + ARG 1 signature CLASS class_7636 Acknowledgment COMMENT A record of messages acknowledged by a client. COMMENT @@ -27,6 +18,13 @@ CLASS net/minecraft/class_7635 net/minecraft/network/message/LastSeenMessageList ARG 1 buf METHOD method_44983 write (Lnet/minecraft/class_2540;)V ARG 1 buf - METHOD method_44984 (Lnet/minecraft/class_2540;Lnet/minecraft/class_7635$class_7609;)V - ARG 0 buf2 - ARG 1 lastReceived + CLASS class_7815 Indexed + FIELD comp_1070 buf Ljava/util/List; + FIELD field_40675 EMPTY Lnet/minecraft/class_7635$class_7815; + METHOD (Lnet/minecraft/class_2540;)V + ARG 1 buf + METHOD comp_1070 buf ()Ljava/util/List; + METHOD method_46260 write (Lnet/minecraft/class_2540;)V + ARG 1 buf + METHOD method_46261 unpack (Lnet/minecraft/class_7561;)Ljava/util/Optional; + ARG 1 storage diff --git a/mappings/net/minecraft/network/message/LastSeenMessagesCollector.mapping b/mappings/net/minecraft/network/message/LastSeenMessagesCollector.mapping index 35f980dfe0..d722373869 100644 --- a/mappings/net/minecraft/network/message/LastSeenMessagesCollector.mapping +++ b/mappings/net/minecraft/network/message/LastSeenMessagesCollector.mapping @@ -6,18 +6,27 @@ CLASS net/minecraft/class_7637 net/minecraft/network/message/LastSeenMessagesCol COMMENT when the client has enough messages received or when they send a message. COMMENT COMMENT @implNote The maximum amount of message entries are specified in the constructor. - COMMENT The vanilla clients collect 5 entries. Calling {@link #add} adds the message to - COMMENT the beginning of the entries list, and evicts the oldest message. If there are - COMMENT entries with the same sender profile ID, the older entry will be replaced with + COMMENT The vanilla clients collect 5 entries. Calling {@link #add(MessageSignatureData, boolean)} + COMMENT adds the message to the beginning of the entries list, and evicts the oldest message. + COMMENT If there are entries with the same sender profile ID, the older entry will be replaced with COMMENT {@code null} instead of filling the hole. COMMENT COMMENT @see AcknowledgmentValidator COMMENT @see LastSeenMessageList - FIELD field_39885 entries [Lnet/minecraft/class_7635$class_7609; - FIELD field_39886 size I - FIELD field_39887 lastSeenMessages Lnet/minecraft/class_7635; + FIELD field_40676 acknowledgedMessages [Lnet/minecraft/class_7817; + FIELD field_40677 nextIndex I + FIELD field_40678 messageCount I + FIELD field_40679 lastAdded Lnet/minecraft/class_7469; METHOD (I)V ARG 1 size - METHOD method_44985 getLastSeenMessages ()Lnet/minecraft/class_7635; - METHOD method_44986 add (Lnet/minecraft/class_7635$class_7609;)V - ARG 1 entry + METHOD method_46262 resetMessageCount ()I + METHOD method_46263 add (Lnet/minecraft/class_7817;)V + ARG 1 message + METHOD method_46264 remove (Lnet/minecraft/class_7469;)V + ARG 1 signature + METHOD method_46265 add (Lnet/minecraft/class_7469;Z)Z + ARG 1 signature + ARG 2 displayed + METHOD method_46266 collect ()Lnet/minecraft/class_7637$class_7816; + METHOD method_46267 getMessageCount ()I + CLASS class_7816 LastSeenMessages diff --git a/mappings/net/minecraft/network/message/MessageBody.mapping b/mappings/net/minecraft/network/message/MessageBody.mapping index 28ad5f5eb2..213821e2cc 100644 --- a/mappings/net/minecraft/network/message/MessageBody.mapping +++ b/mappings/net/minecraft/network/message/MessageBody.mapping @@ -1,22 +1,31 @@ CLASS net/minecraft/class_7608 net/minecraft/network/message/MessageBody COMMENT A body of a message, including the content, timestamp, salt used for the digest - COMMENT (the hashed body), and the list of players' "last seen messages". Unlike {@link - COMMENT MessageHeader}, clients do not receive this if the message is censored; they receive - COMMENT the digest only. + COMMENT (the hashed body), and the list of players' "last seen messages". + COMMENT Other bits of information, such as sender, are included directly in the packet. FIELD comp_930 timestamp Ljava/time/Instant; FIELD comp_932 lastSeenMessages Lnet/minecraft/class_7635; - FIELD field_39817 LAST_SEEN_SEPARATOR B - METHOD (Lnet/minecraft/class_2540;)V - ARG 1 buf + FIELD field_40847 CODEC Lcom/mojang/serialization/MapCodec; METHOD comp_930 timestamp ()Ljava/time/Instant; METHOD comp_932 lastSeenMessages ()Lnet/minecraft/class_7635; - METHOD method_44867 digest ()Lcom/google/common/hash/HashCode; - COMMENT {@return the digest of this body} + METHOD method_46304 update (Lnet/minecraft/class_7498$class_7499;)V + ARG 1 updater + METHOD method_46305 ofUnsigned (Ljava/lang/String;)Lnet/minecraft/class_7608; + ARG 0 content + METHOD method_46306 toSerialized (Lnet/minecraft/class_7561;)Lnet/minecraft/class_7608$class_7824; + ARG 1 storage + METHOD method_46612 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 0 instance + CLASS class_7824 Serialized + COMMENT The serialized version of {@code MessageBody} used in networking. COMMENT - COMMENT @implNote This is a SHA-256 hash of the salt, the timestamp represented as the seconds - COMMENT since the Unix epoch, the content, and the list of each player's last seen message. - METHOD method_44869 write (Lnet/minecraft/class_2540;)V - ARG 1 buf - METHOD method_45047 withContent (Lnet/minecraft/class_7634;)Lnet/minecraft/class_7608; - COMMENT {@return a new message body with its content replaced with {@code content}} - ARG 1 content + COMMENT @see MessageBody#toSerialized + FIELD comp_1091 timestamp Ljava/time/Instant; + METHOD (Lnet/minecraft/class_2540;)V + ARG 1 buf + METHOD comp_1091 timestamp ()Ljava/time/Instant; + METHOD method_46307 write (Lnet/minecraft/class_2540;)V + ARG 1 buf + METHOD method_46308 (Lnet/minecraft/class_7635;)Lnet/minecraft/class_7608; + ARG 1 lastSeenMessages + METHOD method_46309 toBody (Lnet/minecraft/class_7561;)Ljava/util/Optional; + ARG 1 storage diff --git a/mappings/net/minecraft/network/message/MessageChain.mapping b/mappings/net/minecraft/network/message/MessageChain.mapping index 4f86bb88cc..e7377e545c 100644 --- a/mappings/net/minecraft/network/message/MessageChain.mapping +++ b/mappings/net/minecraft/network/message/MessageChain.mapping @@ -1,69 +1,65 @@ CLASS net/minecraft/class_7610 net/minecraft/network/message/MessageChain COMMENT A class for handling the "message chain". COMMENT - COMMENT

    {@link MessageHeader} includes the signature of the last message the client has seen. - COMMENT This can be used to verify the legitimacy of a chain of messages, since if the chain - COMMENT is valid, the last message's "previous signature" should be able to verify the preceding - COMMENT message. + COMMENT

    A message chain (since 1.19.3) is implemented using an integer that is incremented + COMMENT for each message, called "index". {@link MessageLink} represents the link that a + COMMENT particular message has. COMMENT - COMMENT

    Clients signing a message with its preceding message's signature is called + COMMENT

    Clients signing a message with its preceding message's index is called COMMENT "packing", and the server creating a signed message with its preceding message's - COMMENT signature is called "unpacking". Unpacked messages can then be verified to check the + COMMENT index is called "unpacking". Unpacked messages can then be verified to check the COMMENT chain's legitimacy. - FIELD field_39818 precedingSignature Lnet/minecraft/class_7469; - METHOD method_44874 getUnpacker ()Lnet/minecraft/class_7610$class_7611; - METHOD method_44875 pack (Lnet/minecraft/class_7501;Lnet/minecraft/class_7470;Lnet/minecraft/class_7634;Lnet/minecraft/class_7635;)Lnet/minecraft/class_7610$class_7613; + COMMENT + COMMENT @see MessageLink + FIELD field_40691 LOGGER Lorg/slf4j/Logger; + FIELD field_40692 link Lnet/minecraft/class_7826; + METHOD (Ljava/util/UUID;Ljava/util/UUID;)V + ARG 1 sender + ARG 2 sessionId + METHOD method_44874 getUnpacker (Lnet/minecraft/class_7428;)Lnet/minecraft/class_7610$class_7611; + ARG 1 playerPublicKey + METHOD method_44880 getPacker (Lnet/minecraft/class_7501;)Lnet/minecraft/class_7610$class_7612; ARG 1 signer - ARG 2 metadata - ARG 3 contents - ARG 4 lastSeenMessages - METHOD method_44876 sign (Lnet/minecraft/class_7501;Lnet/minecraft/class_7470;Lnet/minecraft/class_7469;Lnet/minecraft/class_7634;Lnet/minecraft/class_7635;)Lnet/minecraft/class_7469; - ARG 0 signer - ARG 1 metadata - ARG 2 precedingSignature - ARG 3 contents - ARG 4 lastSeenMessages - METHOD method_44877 createMessage (Lnet/minecraft/class_7610$class_7613;Lnet/minecraft/class_7469;Lnet/minecraft/class_7470;Lnet/minecraft/class_7634;Lnet/minecraft/class_7635;)Lnet/minecraft/class_7471; - ARG 0 signature - ARG 1 precedingSignature - ARG 2 metadata - ARG 3 contents - ARG 4 lastSeenMessage - METHOD method_44878 unpack (Lnet/minecraft/class_7610$class_7613;Lnet/minecraft/class_7470;Lnet/minecraft/class_7634;Lnet/minecraft/class_7635;)Lnet/minecraft/class_7471; - ARG 1 signature - ARG 2 metadata - ARG 3 contents - ARG 4 lastSeenMessages - METHOD method_44879 (Lnet/minecraft/class_7614;[BLnet/minecraft/class_7498$class_7499;)V + METHOD method_46310 nextLink ()Lnet/minecraft/class_7826; + METHOD method_46311 (Lnet/minecraft/class_7501;Lnet/minecraft/class_7608;)Lnet/minecraft/class_7469; + ARG 2 body + METHOD method_46312 (Lnet/minecraft/class_7428;Lnet/minecraft/class_7500;Lnet/minecraft/class_7469;Lnet/minecraft/class_7608;)Lnet/minecraft/class_7471; + ARG 3 signature + ARG 4 body + METHOD method_46313 (Lnet/minecraft/class_7826;Lnet/minecraft/class_7608;Lnet/minecraft/class_7498$class_7499;)V ARG 2 updatable - METHOD method_44880 getPacker ()Lnet/minecraft/class_7610$class_7612; CLASS class_7611 Unpacker COMMENT Unpacker creates a signed message on the server with the server's preceding message - COMMENT signature when they receive a message. Unpacked messages can then be verified to check + COMMENT index when they receive a message. Unpacked messages can then be verified to check COMMENT the message chain's legitimacy. COMMENT - COMMENT

    Messages must be unpacked in the order of the message's reception, as it affects - COMMENT the resulting signed message. - COMMENT COMMENT @see MessageChain#getUnpacker - FIELD field_39951 UNSIGNED Lnet/minecraft/class_7610$class_7611; - METHOD method_45101 (Lnet/minecraft/class_7610$class_7613;Lnet/minecraft/class_7470;Lnet/minecraft/class_7634;Lnet/minecraft/class_7635;)Lnet/minecraft/class_7471; + FIELD field_40848 NOT_INITIALIZED Lnet/minecraft/class_7610$class_7611; + COMMENT An unpacker used when the session is not initialized yet and the secure profile + COMMENT is enforced. This always throws the missing profile key exception. + METHOD method_46315 (Ljava/util/UUID;Lnet/minecraft/class_7469;Lnet/minecraft/class_7608;)Lnet/minecraft/class_7471; + ARG 1 signature + ARG 2 body + METHOD method_46613 (Lnet/minecraft/class_7469;Lnet/minecraft/class_7608;)Lnet/minecraft/class_7471; ARG 0 signature - ARG 1 metadata - ARG 2 content - ARG 3 lastSeenMessages - METHOD unpack (Lnet/minecraft/class_7610$class_7613;Lnet/minecraft/class_7470;Lnet/minecraft/class_7634;Lnet/minecraft/class_7635;)Lnet/minecraft/class_7471; + ARG 1 body + METHOD unpack (Lnet/minecraft/class_7469;Lnet/minecraft/class_7608;)Lnet/minecraft/class_7471; ARG 1 signature - ARG 2 metadata - ARG 3 content - ARG 4 lastSeenMessages + ARG 2 body + METHOD unsigned (Ljava/util/UUID;)Lnet/minecraft/class_7610$class_7611; + ARG 0 uuid CLASS class_7612 Packer - COMMENT Packers sign a message on the client with its preceding message's signature. + COMMENT Packers sign a message on the client with its preceding message's index. COMMENT COMMENT @see MessageChain#getPacker - METHOD pack (Lnet/minecraft/class_7501;Lnet/minecraft/class_7470;Lnet/minecraft/class_7634;Lnet/minecraft/class_7635;)Lnet/minecraft/class_7610$class_7613; - ARG 1 signer - ARG 2 metadata - ARG 3 contents - ARG 4 lastSeenMessages - CLASS class_7613 Signature + FIELD field_40694 NONE Lnet/minecraft/class_7610$class_7612; + METHOD method_46316 (Lnet/minecraft/class_7608;)Lnet/minecraft/class_7469; + ARG 0 body + METHOD pack (Lnet/minecraft/class_7608;)Lnet/minecraft/class_7469; + ARG 1 body + CLASS class_7825 MessageChainException + FIELD field_40693 shouldDisconnect Z + METHOD (Lnet/minecraft/class_2561;Z)V + ARG 1 message + ARG 2 shouldDisconnect + METHOD method_46314 shouldDisconnect ()Z diff --git a/mappings/net/minecraft/network/message/MessageChainTaskQueue.mapping b/mappings/net/minecraft/network/message/MessageChainTaskQueue.mapping index 9fb94fd29e..20703e8a53 100644 --- a/mappings/net/minecraft/network/message/MessageChainTaskQueue.mapping +++ b/mappings/net/minecraft/network/message/MessageChainTaskQueue.mapping @@ -1,10 +1,14 @@ CLASS net/minecraft/class_7619 net/minecraft/network/message/MessageChainTaskQueue COMMENT Queues a future that handles received messages on the server thread. + FIELD field_39828 LOGGER Lorg/slf4j/Logger; FIELD field_39829 current Ljava/util/concurrent/CompletableFuture; FIELD field_39830 executor Ljava/util/concurrent/Executor; + FIELD field_40112 closed Z METHOD (Ljava/util/concurrent/Executor;)V ARG 1 executor METHOD method_44903 (Lnet/minecraft/class_7620$class_7621;Ljava/lang/Object;)Ljava/util/concurrent/CompletionStage; - ARG 1 void_ + ARG 2 object METHOD method_44904 (Ljava/lang/Throwable;)Ljava/lang/Object; ARG 0 throwable + METHOD method_45308 (Ljava/util/concurrent/Executor;Ljava/lang/Runnable;)V + ARG 2 runnable diff --git a/mappings/net/minecraft/network/message/MessageDecorator.mapping b/mappings/net/minecraft/network/message/MessageDecorator.mapping index d184dec4b6..19a7219a06 100644 --- a/mappings/net/minecraft/network/message/MessageDecorator.mapping +++ b/mappings/net/minecraft/network/message/MessageDecorator.mapping @@ -4,31 +4,15 @@ CLASS net/minecraft/class_7492 net/minecraft/network/message/MessageDecorator COMMENT that is currently used can be obtained by COMMENT {@link net.minecraft.server.MinecraftServer#getMessageDecorator}. COMMENT - COMMENT

    For the message decorator to produce a signed message, both the server - COMMENT and the sender's client need to have chat previews enabled, Otherwise, the decorated - COMMENT content is considered unsigned, and if the clients require chat messages to be signed - COMMENT via the {@linkplain net.minecraft.client.option.GameOptions#getOnlyShowSecureChat - COMMENT "Only Show Secure Chat" option}, they will see the undecorated message. Therefore, - COMMENT message decorator is not recommended for censoring messages. - COMMENT - COMMENT

    Message decorator results are {@linkplain CachedDecoratorResult cached}, allowing - COMMENT non-pure decorators (i.e. ones affected by externally controlled variables) without - COMMENT affecting the signature verification process. Note that the decorator can still - COMMENT run during message submission to decorate filtered parts of the message. + COMMENT

    Messages decorated using message decorator are still marked as verifiable + COMMENT if there is no change in its text or used fonts. If they change, the message cannot + COMMENT be verified. Before 1.19.2, chat previews allowed signing of such message; however + COMMENT that feature was removed in 1.19.3. FIELD field_39384 NOOP Lnet/minecraft/class_7492; COMMENT An empty message decorator that returns the original message. - METHOD attachIfNotDecorated (Lnet/minecraft/class_7471;Lnet/minecraft/class_2561;)Lnet/minecraft/class_7471; - ARG 0 message - ARG 1 attached - METHOD decorate (Lnet/minecraft/class_3222;Lnet/minecraft/class_2561;)Ljava/util/concurrent/CompletableFuture; - COMMENT {@return the decorated {@code message}} - ARG 1 sender - COMMENT the player who sent the message, or {@code null} if {@code message} was not - COMMENT sent by a player - ARG 2 message - METHOD decorate (Lnet/minecraft/class_3222;Lnet/minecraft/class_7471;)Ljava/util/concurrent/CompletableFuture; + METHOD decorate (Lnet/minecraft/class_3222;Lnet/minecraft/class_2561;)Lnet/minecraft/class_2561; ARG 1 sender ARG 2 message - METHOD method_44303 (Lnet/minecraft/class_3222;Lnet/minecraft/class_2561;)Ljava/util/concurrent/CompletableFuture; + METHOD method_44303 (Lnet/minecraft/class_3222;Lnet/minecraft/class_2561;)Lnet/minecraft/class_2561; ARG 0 sender ARG 1 message diff --git a/mappings/net/minecraft/network/message/MessageHeader.mapping b/mappings/net/minecraft/network/message/MessageHeader.mapping deleted file mode 100644 index d7c77dbf72..0000000000 --- a/mappings/net/minecraft/network/message/MessageHeader.mapping +++ /dev/null @@ -1,16 +0,0 @@ -CLASS net/minecraft/class_7614 net/minecraft/network/message/MessageHeader - COMMENT The header of a message, which contains the preceding message's signature and the - COMMENT sender's UUID. Unlike {@link MessageBody}, clients receive this even if the message - COMMENT is censored. - FIELD comp_936 precedingSignature Lnet/minecraft/class_7469; - METHOD (Lnet/minecraft/class_2540;)V - ARG 1 buf - METHOD comp_936 precedingSignature ()Lnet/minecraft/class_7469; - METHOD method_44882 update (Lnet/minecraft/class_7498$class_7499;[B)V - ARG 1 updater - ARG 2 bodyDigest - METHOD method_44883 write (Lnet/minecraft/class_2540;)V - ARG 1 buf - METHOD method_44884 (Lnet/minecraft/class_2540;Lnet/minecraft/class_7469;)V - ARG 0 buf2 - ARG 1 precedingSignature diff --git a/mappings/net/minecraft/network/message/MessageLink.mapping b/mappings/net/minecraft/network/message/MessageLink.mapping new file mode 100644 index 0000000000..111e778e32 --- /dev/null +++ b/mappings/net/minecraft/network/message/MessageLink.mapping @@ -0,0 +1,23 @@ +CLASS net/minecraft/class_7826 net/minecraft/network/message/MessageLink + COMMENT Represents a link to the preceding message that a particular message has. + FIELD field_40849 CODEC Lcom/mojang/serialization/Codec; + METHOD method_46317 next ()Lnet/minecraft/class_7826; + COMMENT {@return the next link used by the message's succeeding message} + COMMENT + COMMENT

    This can return {@code null} in an extremely rare case, where the index is about + COMMENT to overflow. + METHOD method_46318 update (Lnet/minecraft/class_7498$class_7499;)V + ARG 1 updater + METHOD method_46319 of (Ljava/util/UUID;)Lnet/minecraft/class_7826; + ARG 0 sender + METHOD method_46320 of (Ljava/util/UUID;Ljava/util/UUID;)Lnet/minecraft/class_7826; + ARG 0 sender + ARG 1 sessionId + METHOD method_46321 linksTo (Lnet/minecraft/class_7826;)Z + COMMENT {@return whether this link links to the {@code preceding} link} + COMMENT + COMMENT

    For the link to be considered valid, the two must have the same sender and session ID, + COMMENT and the newer link's index must be above the preceding link's index. + ARG 1 preceding + METHOD method_46614 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 0 instance diff --git a/mappings/net/minecraft/network/message/MessageMetadata.mapping b/mappings/net/minecraft/network/message/MessageMetadata.mapping deleted file mode 100644 index 5ea502a275..0000000000 --- a/mappings/net/minecraft/network/message/MessageMetadata.mapping +++ /dev/null @@ -1,17 +0,0 @@ -CLASS net/minecraft/class_7470 net/minecraft/network/message/MessageMetadata - COMMENT A metadata for messages. - FIELD comp_801 sender Ljava/util/UUID; - FIELD comp_802 timestamp Ljava/time/Instant; - METHOD (Lnet/minecraft/class_2540;)V - ARG 1 buf - METHOD comp_801 sender ()Ljava/util/UUID; - METHOD comp_802 timestamp ()Ljava/time/Instant; - METHOD method_43866 of (Ljava/util/UUID;)Lnet/minecraft/class_7470; - COMMENT {@return a new metadata with the given sender, current timestamp, and random salt} - ARG 0 sender - METHOD method_44849 of ()Lnet/minecraft/class_7470; - COMMENT {@return a new metadata without sender} - METHOD method_44850 write (Lnet/minecraft/class_2540;)V - ARG 1 buf - METHOD method_44851 lacksSender ()Z - COMMENT {@return {@code true} if the metadata does not have a sender's UUID} diff --git a/mappings/net/minecraft/network/message/MessageSignatureData.mapping b/mappings/net/minecraft/network/message/MessageSignatureData.mapping index 81d92d1ce9..89ebbe4dd8 100644 --- a/mappings/net/minecraft/network/message/MessageSignatureData.mapping +++ b/mappings/net/minecraft/network/message/MessageSignatureData.mapping @@ -1,32 +1,35 @@ CLASS net/minecraft/class_7469 net/minecraft/network/message/MessageSignatureData - COMMENT A message signature data that can be verified when given the header. + COMMENT A message signature data that can be verified. FIELD comp_925 data [B - FIELD field_39811 EMPTY Lnet/minecraft/class_7469; - METHOD (Lnet/minecraft/class_2540;)V - ARG 1 buf + FIELD field_40683 SIZE I + FIELD field_40844 CODEC Lcom/mojang/serialization/Codec; METHOD comp_925 data ()[B METHOD equals (Ljava/lang/Object;)Z ARG 1 o - METHOD method_44842 isEmpty ()Z - METHOD method_44843 verify (Lnet/minecraft/class_7500;Lnet/minecraft/class_7614;Lnet/minecraft/class_7608;)Z + METHOD method_44843 verify (Lnet/minecraft/class_7500;Lnet/minecraft/class_7498;)Z COMMENT {@return whether the signature data is verified} ARG 1 verifier COMMENT the verifier that is created with the sender's public key - ARG 2 header - ARG 3 body - METHOD method_44844 verify (Lnet/minecraft/class_7500;Lnet/minecraft/class_7614;[B)Z - COMMENT {@return whether the signature data is verified} - ARG 1 verifier - COMMENT the verifier that is created with the sender's public key - ARG 2 header - ARG 3 bodyDigest - COMMENT the {@linkplain MessageBody#digest digest of the message body} - METHOD method_44845 write (Lnet/minecraft/class_2540;)V - ARG 1 buf - METHOD method_44846 (Lnet/minecraft/class_7614;[BLnet/minecraft/class_7498$class_7499;)V - ARG 2 updatable - METHOD method_44848 (Lnet/minecraft/class_7614;[BLnet/minecraft/class_7498$class_7499;)V ARG 2 updatable + METHOD method_44845 write (Lnet/minecraft/class_2540;Lnet/minecraft/class_7469;)V + ARG 0 buf + ARG 1 signature METHOD method_44994 toByteBuffer ()Ljava/nio/ByteBuffer; - COMMENT {@return the byte buffer containing the signature data, or {@code null} if this - COMMENT signature data is empty} + COMMENT {@return the byte buffer containing the signature data} + METHOD method_46276 fromBuf (Lnet/minecraft/class_2540;)Lnet/minecraft/class_7469; + ARG 0 buf + METHOD method_46277 pack (Lnet/minecraft/class_7561;)Lnet/minecraft/class_7469$class_7819; + ARG 1 storage + CLASS class_7819 Indexed + FIELD field_40684 MISSING_ID I + METHOD (I)V + ARG 1 id + METHOD (Lnet/minecraft/class_7469;)V + ARG 1 signature + METHOD method_46278 fromBuf (Lnet/minecraft/class_2540;)Lnet/minecraft/class_7469$class_7819; + ARG 0 buf + METHOD method_46279 write (Lnet/minecraft/class_2540;Lnet/minecraft/class_7469$class_7819;)V + ARG 0 buf + ARG 1 indexed + METHOD method_46280 getSignature (Lnet/minecraft/class_7561;)Ljava/util/Optional; + ARG 1 storage diff --git a/mappings/net/minecraft/network/message/MessageSignatureStorage.mapping b/mappings/net/minecraft/network/message/MessageSignatureStorage.mapping new file mode 100644 index 0000000000..a57adbe6e3 --- /dev/null +++ b/mappings/net/minecraft/network/message/MessageSignatureStorage.mapping @@ -0,0 +1,18 @@ +CLASS net/minecraft/class_7561 net/minecraft/network/message/MessageSignatureStorage + COMMENT Collects message signatures on the server to make a message chain. + FIELD field_40686 MAX_ENTRIES I + FIELD field_40687 signatures [Lnet/minecraft/class_7469; + FIELD field_40845 MISSING I + METHOD (I)V + ARG 1 maxEntries + METHOD method_46281 create ()Lnet/minecraft/class_7561; + METHOD method_46283 addFrom (Ljava/util/ArrayDeque;)V + ARG 1 deque + METHOD method_46284 addFrom (Ljava/util/List;)V + ARG 1 signatures + METHOD method_46286 add (Lnet/minecraft/class_7471;)V + ARG 1 message + METHOD method_46606 get (I)Lnet/minecraft/class_7469; + ARG 1 index + METHOD method_46607 indexOf (Lnet/minecraft/class_7469;)I + ARG 1 signature diff --git a/mappings/net/minecraft/network/message/MessageSourceProfile.mapping b/mappings/net/minecraft/network/message/MessageSourceProfile.mapping deleted file mode 100644 index 9c6eede815..0000000000 --- a/mappings/net/minecraft/network/message/MessageSourceProfile.mapping +++ /dev/null @@ -1,11 +0,0 @@ -CLASS net/minecraft/class_7436 net/minecraft/network/message/MessageSourceProfile - COMMENT A pair of the profile ID and public key of the message's source. - COMMENT - COMMENT

    An instance can be obtained via {@link net.minecraft.entity.Entity#getMessageSourceProfile}. - FIELD comp_918 playerPublicKey Lnet/minecraft/class_7428; - FIELD field_39810 NONE Lnet/minecraft/class_7436; - METHOD comp_918 playerPublicKey ()Lnet/minecraft/class_7428; - METHOD method_44831 lacksProfileId ()Z - COMMENT {@return {@code true} if this source profile does not have the profile ID set} - COMMENT - COMMENT

    Commands executed from server console or command block use such source profile. diff --git a/mappings/net/minecraft/network/message/MessageType.mapping b/mappings/net/minecraft/network/message/MessageType.mapping index 583d5f24fd..c512ee47b6 100644 --- a/mappings/net/minecraft/network/message/MessageType.mapping +++ b/mappings/net/minecraft/network/message/MessageType.mapping @@ -1,7 +1,6 @@ CLASS net/minecraft/class_2556 net/minecraft/network/message/MessageType COMMENT A message type (also known as "chat type") controls how to display or narrate - COMMENT the chat messages sent to the clients. Message types are registered at - COMMENT {@link net.minecraft.util.registry.BuiltinRegistries#MESSAGE_TYPE}. When + COMMENT the chat messages sent to the clients. Message types are registered using data packs. When COMMENT sending a chat message, the registry key of the message type can be passed to indicate COMMENT which message type should be used. COMMENT @@ -66,8 +65,8 @@ CLASS net/minecraft/class_2556 net/minecraft/network/message/MessageType COMMENT

    An outgoing message is a message that the team message's sender sees in the chat. METHOD method_43843 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; ARG 0 instance - METHOD method_43844 initialize (Lnet/minecraft/class_2378;)Lnet/minecraft/class_6880; - ARG 0 registry + METHOD method_43844 bootstrap (Lnet/minecraft/class_7891;)V + ARG 0 messageTypeRegisterable METHOD method_43845 register (Ljava/lang/String;)Lnet/minecraft/class_5321; ARG 0 id METHOD method_44832 params (Lnet/minecraft/class_5321;Lnet/minecraft/class_1297;)Lnet/minecraft/class_2556$class_7602; diff --git a/mappings/net/minecraft/network/message/MessageVerifier.mapping b/mappings/net/minecraft/network/message/MessageVerifier.mapping index bc41c29446..d6c22dc869 100644 --- a/mappings/net/minecraft/network/message/MessageVerifier.mapping +++ b/mappings/net/minecraft/network/message/MessageVerifier.mapping @@ -3,51 +3,24 @@ CLASS net/minecraft/class_7615 net/minecraft/network/message/MessageVerifier COMMENT COMMENT

    Methods in this interface must be called in the order of the message's reception, COMMENT as it affects the verification result. - METHOD method_44885 create (Lnet/minecraft/class_7428;Z)Lnet/minecraft/class_7615; - ARG 0 publicKey - ARG 1 secureChatEnforced - METHOD method_44886 verify (Lnet/minecraft/class_7471;)Lnet/minecraft/class_7615$class_7646; - COMMENT {@return the status of verifying the message} + FIELD field_40695 NO_SIGNATURE Lnet/minecraft/class_7615; + FIELD field_40696 UNVERIFIED Lnet/minecraft/class_7615; + FIELD field_45957 LOGGER Lorg/slf4j/Logger; + METHOD method_45048 isVerified (Lnet/minecraft/class_7471;)Z ARG 1 message - METHOD method_44887 verify (Lnet/minecraft/class_7614;Lnet/minecraft/class_7469;[B)Lnet/minecraft/class_7615$class_7646; - COMMENT {@return the status of verifying the header} - COMMENT - COMMENT

    Clients can receive only the message header instead of the whole message. This - COMMENT allows the verification of such messages. - ARG 1 header - ARG 2 signature - ARG 3 bodyDigest + METHOD method_53507 (Lnet/minecraft/class_7471;)Z + ARG 0 message + METHOD method_53508 (Lnet/minecraft/class_7471;)Z + ARG 0 message CLASS class_7616 Impl FIELD field_39821 lastMessageVerified Z FIELD field_39822 signatureVerifier Lnet/minecraft/class_7500; - FIELD field_39823 precedingSignature Lnet/minecraft/class_7469; - METHOD (Lnet/minecraft/class_7500;)V + FIELD field_40697 lastVerifiedMessage Lnet/minecraft/class_7471; + FIELD field_45958 expirationChecker Ljava/util/function/BooleanSupplier; + METHOD (Lnet/minecraft/class_7500;Ljava/util/function/BooleanSupplier;)V ARG 1 signatureVerifier - METHOD method_44996 verifyPrecedingSignature (Lnet/minecraft/class_7614;Lnet/minecraft/class_7469;Z)Z - ARG 1 header - ARG 2 signature - ARG 3 fullMessage - METHOD method_44997 verifyInternal (Lnet/minecraft/class_7614;Lnet/minecraft/class_7469;[BZ)Z - ARG 1 header - ARG 2 signature - ARG 3 bodyDigest - ARG 4 fullMessage - METHOD method_45048 getStatus (Lnet/minecraft/class_7614;Lnet/minecraft/class_7469;[BZ)Lnet/minecraft/class_7615$class_7646; - ARG 1 header - ARG 2 signature - ARG 3 bodyDigest - ARG 4 fullMessage - CLASS class_7646 Status - COMMENT The verification status of a message. - FIELD field_39910 Lnet/minecraft/class_7615$class_7646; - COMMENT The message is verified. - FIELD field_39911 Lnet/minecraft/class_7615$class_7646; - COMMENT The message cannot be verified. - FIELD field_39912 Lnet/minecraft/class_7615$class_7646; - COMMENT The message cannot be verified due to the last message not being verified. - CLASS class_7651 Unsigned - FIELD field_39952 secureChatEnforced Z - METHOD (Z)V - ARG 1 secureChatEnforced - METHOD method_45102 getStatus (Lnet/minecraft/class_7469;)Lnet/minecraft/class_7615$class_7646; - ARG 1 signature + ARG 2 expirationChecker + METHOD method_44996 verifyPrecedingSignature (Lnet/minecraft/class_7471;)Z + ARG 1 message + METHOD method_53509 verify (Lnet/minecraft/class_7471;)Z + ARG 1 message diff --git a/mappings/net/minecraft/network/message/SentMessage.mapping b/mappings/net/minecraft/network/message/SentMessage.mapping index 9b05a063d2..8c2429d5a7 100644 --- a/mappings/net/minecraft/network/message/SentMessage.mapping +++ b/mappings/net/minecraft/network/message/SentMessage.mapping @@ -1,33 +1,20 @@ CLASS net/minecraft/class_7604 net/minecraft/network/message/SentMessage COMMENT A class wrapping {@link SignedMessage} on the server to allow custom behavior for COMMENT sending messages. - METHOD method_44856 afterPacketsSent (Lnet/minecraft/class_3324;)V - COMMENT Called after sending the message to applicable clients. - COMMENT - COMMENT @apiNote This is used to send the message header to clients that didn't receive - COMMENT the message due to text filtering. - COMMENT - COMMENT @see PlayerManager#sendMessageHeader - ARG 1 playerManager METHOD method_44857 of (Lnet/minecraft/class_7471;)Lnet/minecraft/class_7604; COMMENT {@return the wrapped {@code message}} ARG 0 message - METHOD method_45039 getContent ()Lnet/minecraft/class_2561; METHOD method_45095 send (Lnet/minecraft/class_3222;ZLnet/minecraft/class_2556$class_7602;)V ARG 1 sender ARG 2 filterMaskEnabled ARG 3 params CLASS class_7606 Profileless COMMENT The wrapper used for messages without associated source profile. - FIELD field_39814 message Lnet/minecraft/class_7471; - METHOD (Lnet/minecraft/class_7471;)V - ARG 1 message CLASS class_7607 Chat COMMENT The wrapper used for normal chat messages. COMMENT COMMENT

    Text filtering can cause some players to not receive this kind of message. - COMMENT Message header is sent separately to those players. - FIELD field_39815 message Lnet/minecraft/class_7471; - FIELD field_39816 recipients Ljava/util/Set; + FIELD comp_1082 message Lnet/minecraft/class_7471; METHOD (Lnet/minecraft/class_7471;)V ARG 1 message + METHOD comp_1082 message ()Lnet/minecraft/class_7471; diff --git a/mappings/net/minecraft/network/message/SignedMessage.mapping b/mappings/net/minecraft/network/message/SignedMessage.mapping index e0df5f9cb2..9a26769bf0 100644 --- a/mappings/net/minecraft/network/message/SignedMessage.mapping +++ b/mappings/net/minecraft/network/message/SignedMessage.mapping @@ -1,24 +1,13 @@ CLASS net/minecraft/class_7471 net/minecraft/network/message/SignedMessage COMMENT A signed message, consisting of the signature, the signed content, - COMMENT and the optional unsigned content supplied when the chat decorator produced - COMMENT unsigned message due to the chat preview being disabled on either side. + COMMENT the message body, the link to its preceding message, and the optional + COMMENT unsigned content supplied when the message decorator modified the message. COMMENT COMMENT

    Note that the signature itself might not be valid. FIELD field_39786 SERVERBOUND_TIME_TO_LIVE Ljava/time/Duration; FIELD field_39787 CLIENTBOUND_TIME_TO_LIVE Ljava/time/Duration; - METHOD (Lnet/minecraft/class_2540;)V - ARG 1 buf - METHOD method_43867 verify (Lnet/minecraft/class_7428;)Z - COMMENT {@return whether the message can be verified using the public key} - ARG 1 key - METHOD method_44125 getContent ()Lnet/minecraft/class_2561; - COMMENT {@return the content of the message} - COMMENT - COMMENT

    This returns the unsigned content if present, and fallbacks to the signed content. - METHOD method_44310 verify (Lnet/minecraft/class_7436;)Z - COMMENT {@return whether the message can be verified using the public key or if the - COMMENT player does not have the key} - ARG 1 profile + FIELD field_40688 NIL_UUID Ljava/util/UUID; + FIELD field_40846 CODEC Lcom/mojang/serialization/MapCodec; METHOD method_44607 withoutUnsigned ()Lnet/minecraft/class_7471; COMMENT {@return the signed chat message with {@link #unsignedContent} removed if it exists} COMMENT @@ -29,15 +18,11 @@ CLASS net/minecraft/class_7471 net/minecraft/network/message/SignedMessage ARG 1 currentTime METHOD method_44858 verify (Lnet/minecraft/class_7500;)Z ARG 1 verifier - METHOD method_44859 write (Lnet/minecraft/class_2540;)V - ARG 1 buf - METHOD method_44862 getSignedContent ()Lnet/minecraft/class_7634; + METHOD method_44862 getSignedContent ()Ljava/lang/String; METHOD method_44863 withUnsignedContent (Lnet/minecraft/class_2561;)Lnet/minecraft/class_7471; ARG 1 unsignedContent METHOD method_44864 getTimestamp ()Ljava/time/Instant; METHOD method_44865 getSalt ()J - METHOD method_44866 createMetadata ()Lnet/minecraft/class_7470; - METHOD method_44995 toLastSeenMessageEntry ()Lnet/minecraft/class_7635$class_7609; METHOD method_45040 canVerifyFrom (Ljava/util/UUID;)Z COMMENT {@return whether the message can be verified as from {@code sender}} COMMENT @@ -45,18 +30,40 @@ CLASS net/minecraft/class_7471 net/minecraft/network/message/SignedMessage COMMENT Rather, this returns whether it's possible to verify that {@code sender} sent this COMMENT message. ARG 1 sender - METHOD method_45041 ofUnsigned (Lnet/minecraft/class_7634;)Lnet/minecraft/class_7471; + METHOD method_45041 ofUnsigned (Ljava/lang/String;)Lnet/minecraft/class_7471; COMMENT {@return a new signed message with empty signature} ARG 0 content METHOD method_45097 withFilterMask (Lnet/minecraft/class_7649;)Lnet/minecraft/class_7471; COMMENT {@return the signed chat message with {@code filterMask} added} ARG 1 filterMask - METHOD method_45098 ofUnsigned (Lnet/minecraft/class_7470;Lnet/minecraft/class_7634;)Lnet/minecraft/class_7471; - COMMENT {@return a new signed message with given metadata and empty signature} - ARG 0 metadata + METHOD method_45098 ofUnsigned (Ljava/util/UUID;Ljava/lang/String;)Lnet/minecraft/class_7471; + COMMENT {@return a new signed message with given sender UUID and empty signature} + ARG 0 sender ARG 1 content METHOD method_45099 withFilterMaskEnabled (Z)Lnet/minecraft/class_7471; COMMENT {@return this signed chat message if {@code enabled} is {@code true}, COMMENT otherwise a new signed chat message without filtered parts} ARG 1 enabled METHOD method_45100 isFullyFiltered ()Z + METHOD method_46289 (Lnet/minecraft/class_7498$class_7499;)V + ARG 1 updater + METHOD method_46290 update (Lnet/minecraft/class_7498$class_7499;Lnet/minecraft/class_7826;Lnet/minecraft/class_7608;)V + ARG 0 updater + ARG 1 link + ARG 2 body + METHOD method_46291 getContent ()Lnet/minecraft/class_2561; + METHOD method_46292 getSender ()Ljava/util/UUID; + METHOD method_46293 isSenderMissing ()Z + METHOD method_46294 hasSignature ()Z + METHOD method_46608 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 0 instance + METHOD method_46609 (Lnet/minecraft/class_7471;)Ljava/util/Optional; + ARG 0 message + METHOD method_46610 (Lnet/minecraft/class_7826;Ljava/util/Optional;Lnet/minecraft/class_7608;Ljava/util/Optional;Lnet/minecraft/class_7649;)Lnet/minecraft/class_7471; + ARG 0 link + ARG 1 signature + ARG 2 signedBody + ARG 3 unsignedContent + ARG 4 filterMask + METHOD method_46611 (Lnet/minecraft/class_7471;)Ljava/util/Optional; + ARG 0 message diff --git a/mappings/net/minecraft/network/packet/BrandCustomPayload.mapping b/mappings/net/minecraft/network/packet/BrandCustomPayload.mapping new file mode 100644 index 0000000000..aa686fa783 --- /dev/null +++ b/mappings/net/minecraft/network/packet/BrandCustomPayload.mapping @@ -0,0 +1,4 @@ +CLASS net/minecraft/class_8709 net/minecraft/network/packet/BrandCustomPayload + FIELD field_45697 ID Lnet/minecraft/class_2960; + METHOD (Lnet/minecraft/class_2540;)V + ARG 1 buf diff --git a/mappings/net/minecraft/network/packet/BundlePacket.mapping b/mappings/net/minecraft/network/packet/BundlePacket.mapping new file mode 100644 index 0000000000..858a984309 --- /dev/null +++ b/mappings/net/minecraft/network/packet/BundlePacket.mapping @@ -0,0 +1,5 @@ +CLASS net/minecraft/class_8038 net/minecraft/network/packet/BundlePacket + FIELD field_41876 packets Ljava/lang/Iterable; + METHOD (Ljava/lang/Iterable;)V + ARG 1 packets + METHOD method_48324 getPackets ()Ljava/lang/Iterable; diff --git a/mappings/net/minecraft/network/packet/BundleSplitterPacket.mapping b/mappings/net/minecraft/network/packet/BundleSplitterPacket.mapping new file mode 100644 index 0000000000..3c36da7d9a --- /dev/null +++ b/mappings/net/minecraft/network/packet/BundleSplitterPacket.mapping @@ -0,0 +1 @@ +CLASS net/minecraft/class_8037 net/minecraft/network/packet/BundleSplitterPacket diff --git a/mappings/net/minecraft/network/packet/CustomPayload.mapping b/mappings/net/minecraft/network/packet/CustomPayload.mapping new file mode 100644 index 0000000000..180f7749a7 --- /dev/null +++ b/mappings/net/minecraft/network/packet/CustomPayload.mapping @@ -0,0 +1,3 @@ +CLASS net/minecraft/class_8710 net/minecraft/network/packet/CustomPayload + METHOD method_53028 write (Lnet/minecraft/class_2540;)V + ARG 1 buf diff --git a/mappings/net/minecraft/network/packet/Packet.mapping b/mappings/net/minecraft/network/packet/Packet.mapping new file mode 100644 index 0000000000..b8e76d2dea --- /dev/null +++ b/mappings/net/minecraft/network/packet/Packet.mapping @@ -0,0 +1,15 @@ +CLASS net/minecraft/class_2596 net/minecraft/network/packet/Packet + METHOD method_11051 isWritingErrorSkippable ()Z + COMMENT {@return whether a throwable in writing of this packet allows the + COMMENT connection to simply skip the packet's sending than disconnecting} + METHOD method_11052 write (Lnet/minecraft/class_2540;)V + ARG 1 buf + METHOD method_11054 apply (Lnet/minecraft/class_2547;)V + ARG 1 listener + METHOD method_52273 getNewNetworkState ()Lnet/minecraft/class_2539; + COMMENT {@return a new network state to transition to, or {@code null} + COMMENT to indicate no state change} + COMMENT

    + COMMENT The state transition is done on both the sender and receiver sides, but it + COMMENT is only in one direction (out of C2S and S2C). Another packet must be processed + COMMENT in the reverse direction to ensure the state in both directions are updated. diff --git a/mappings/net/minecraft/network/packet/UnknownCustomPayload.mapping b/mappings/net/minecraft/network/packet/UnknownCustomPayload.mapping new file mode 100644 index 0000000000..edb3c3b31d --- /dev/null +++ b/mappings/net/minecraft/network/packet/UnknownCustomPayload.mapping @@ -0,0 +1 @@ +CLASS net/minecraft/class_8711 net/minecraft/network/packet/UnknownCustomPayload diff --git a/mappings/net/minecraft/network/packet/c2s/play/PlayPongC2SPacket.mapping b/mappings/net/minecraft/network/packet/c2s/common/CommonPongC2SPacket.mapping similarity index 73% rename from mappings/net/minecraft/network/packet/c2s/play/PlayPongC2SPacket.mapping rename to mappings/net/minecraft/network/packet/c2s/common/CommonPongC2SPacket.mapping index 93d05dc730..6d8fc78918 100644 --- a/mappings/net/minecraft/network/packet/c2s/play/PlayPongC2SPacket.mapping +++ b/mappings/net/minecraft/network/packet/c2s/common/CommonPongC2SPacket.mapping @@ -1,10 +1,10 @@ -CLASS net/minecraft/class_6374 net/minecraft/network/packet/c2s/play/PlayPongC2SPacket +CLASS net/minecraft/class_6374 net/minecraft/network/packet/c2s/common/CommonPongC2SPacket COMMENT This is a packet that is sent by the client during tick after receiving a COMMENT play ping packet from the server, passing the {@link #parameter} back to the COMMENT server. COMMENT - COMMENT @see net.minecraft.network.packet.s2c.play.PlayPingS2CPacket - COMMENT @see net.minecraft.network.packet.c2s.play.KeepAliveC2SPacket + COMMENT @see net.minecraft.network.packet.s2c.common.CommonPingS2CPacket + COMMENT @see net.minecraft.network.packet.c2s.common.KeepAliveC2SPacket COMMENT @see net.minecraft.network.packet.c2s.query.QueryPingC2SPacket FIELD field_33752 parameter I METHOD (I)V diff --git a/mappings/net/minecraft/network/packet/c2s/common/CustomPayloadC2SPacket.mapping b/mappings/net/minecraft/network/packet/c2s/common/CustomPayloadC2SPacket.mapping new file mode 100644 index 0000000000..96c09a5e93 --- /dev/null +++ b/mappings/net/minecraft/network/packet/c2s/common/CustomPayloadC2SPacket.mapping @@ -0,0 +1,11 @@ +CLASS net/minecraft/class_2817 net/minecraft/network/packet/c2s/common/CustomPayloadC2SPacket + FIELD field_33361 MAX_PAYLOAD_SIZE I + FIELD field_45694 ID_TO_READER Ljava/util/Map; + METHOD (Lnet/minecraft/class_2540;)V + ARG 1 buf + METHOD method_53026 readPayload (Lnet/minecraft/class_2960;Lnet/minecraft/class_2540;)Lnet/minecraft/class_8710; + ARG 0 id + ARG 1 buf + METHOD method_53027 readUnknownPayload (Lnet/minecraft/class_2960;Lnet/minecraft/class_2540;)Lnet/minecraft/class_8711; + ARG 0 id + ARG 1 buf diff --git a/mappings/net/minecraft/network/packet/c2s/play/KeepAliveC2SPacket.mapping b/mappings/net/minecraft/network/packet/c2s/common/KeepAliveC2SPacket.mapping similarity index 88% rename from mappings/net/minecraft/network/packet/c2s/play/KeepAliveC2SPacket.mapping rename to mappings/net/minecraft/network/packet/c2s/common/KeepAliveC2SPacket.mapping index bcdc0fbe64..5d7069c9f1 100644 --- a/mappings/net/minecraft/network/packet/c2s/play/KeepAliveC2SPacket.mapping +++ b/mappings/net/minecraft/network/packet/c2s/common/KeepAliveC2SPacket.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_2827 net/minecraft/network/packet/c2s/play/KeepAliveC2SPacket +CLASS net/minecraft/class_2827 net/minecraft/network/packet/c2s/common/KeepAliveC2SPacket FIELD field_12883 id J METHOD (J)V ARG 1 id diff --git a/mappings/net/minecraft/network/packet/c2s/play/ResourcePackStatusC2SPacket.mapping b/mappings/net/minecraft/network/packet/c2s/common/ResourcePackStatusC2SPacket.mapping similarity index 90% rename from mappings/net/minecraft/network/packet/c2s/play/ResourcePackStatusC2SPacket.mapping rename to mappings/net/minecraft/network/packet/c2s/common/ResourcePackStatusC2SPacket.mapping index cca9ccc976..b8a43158b4 100644 --- a/mappings/net/minecraft/network/packet/c2s/play/ResourcePackStatusC2SPacket.mapping +++ b/mappings/net/minecraft/network/packet/c2s/common/ResourcePackStatusC2SPacket.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_2856 net/minecraft/network/packet/c2s/play/ResourcePackStatusC2SPacket +CLASS net/minecraft/class_2856 net/minecraft/network/packet/c2s/common/ResourcePackStatusC2SPacket FIELD field_13014 status Lnet/minecraft/class_2856$class_2857; METHOD (Lnet/minecraft/class_2540;)V ARG 1 buf diff --git a/mappings/net/minecraft/network/packet/c2s/config/ReadyC2SPacket.mapping b/mappings/net/minecraft/network/packet/c2s/config/ReadyC2SPacket.mapping new file mode 100644 index 0000000000..a64cacd9ad --- /dev/null +++ b/mappings/net/minecraft/network/packet/c2s/config/ReadyC2SPacket.mapping @@ -0,0 +1,3 @@ +CLASS net/minecraft/class_8736 net/minecraft/network/packet/c2s/config/ReadyC2SPacket + METHOD (Lnet/minecraft/class_2540;)V + ARG 1 buf diff --git a/mappings/net/minecraft/network/packet/c2s/handshake/ConnectionIntent.mapping b/mappings/net/minecraft/network/packet/c2s/handshake/ConnectionIntent.mapping new file mode 100644 index 0000000000..fd40468685 --- /dev/null +++ b/mappings/net/minecraft/network/packet/c2s/handshake/ConnectionIntent.mapping @@ -0,0 +1,7 @@ +CLASS net/minecraft/class_8592 net/minecraft/network/packet/c2s/handshake/ConnectionIntent + FIELD field_44976 STATUS_ID I + FIELD field_44977 LOGIN_ID I + METHOD method_52283 getId ()I + METHOD method_52284 byId (I)Lnet/minecraft/class_8592; + ARG 0 id + METHOD method_52285 getState ()Lnet/minecraft/class_2539; diff --git a/mappings/net/minecraft/network/packet/c2s/handshake/HandshakeC2SPacket.mapping b/mappings/net/minecraft/network/packet/c2s/handshake/HandshakeC2SPacket.mapping index 6f28c7341a..93e9775508 100644 --- a/mappings/net/minecraft/network/packet/c2s/handshake/HandshakeC2SPacket.mapping +++ b/mappings/net/minecraft/network/packet/c2s/handshake/HandshakeC2SPacket.mapping @@ -1,16 +1,12 @@ CLASS net/minecraft/class_2889 net/minecraft/network/packet/c2s/handshake/HandshakeC2SPacket - FIELD field_13156 intendedState Lnet/minecraft/class_2539; - FIELD field_13157 port I - FIELD field_13158 protocolVersion I - FIELD field_13159 address Ljava/lang/String; + FIELD comp_1563 protocolVersion I + FIELD comp_1564 address Ljava/lang/String; + FIELD comp_1565 port I + FIELD comp_1566 intendedState Lnet/minecraft/class_8592; FIELD field_33372 MAX_ADDRESS_LENGTH I - METHOD (Ljava/lang/String;ILnet/minecraft/class_2539;)V - ARG 1 address - ARG 2 port - ARG 3 intendedState METHOD (Lnet/minecraft/class_2540;)V ARG 1 buf - METHOD method_12573 getIntendedState ()Lnet/minecraft/class_2539; - METHOD method_12574 getProtocolVersion ()I - METHOD method_36174 getAddress ()Ljava/lang/String; - METHOD method_36175 getPort ()I + METHOD comp_1563 protocolVersion ()I + METHOD comp_1564 address ()Ljava/lang/String; + METHOD comp_1565 port ()I + METHOD comp_1566 intendedState ()Lnet/minecraft/class_8592; diff --git a/mappings/net/minecraft/network/packet/c2s/login/EnterConfigurationC2SPacket.mapping b/mappings/net/minecraft/network/packet/c2s/login/EnterConfigurationC2SPacket.mapping new file mode 100644 index 0000000000..5e609a8d40 --- /dev/null +++ b/mappings/net/minecraft/network/packet/c2s/login/EnterConfigurationC2SPacket.mapping @@ -0,0 +1,3 @@ +CLASS net/minecraft/class_8593 net/minecraft/network/packet/c2s/login/EnterConfigurationC2SPacket + METHOD (Lnet/minecraft/class_2540;)V + ARG 1 buf diff --git a/mappings/net/minecraft/network/packet/c2s/login/LoginHelloC2SPacket.mapping b/mappings/net/minecraft/network/packet/c2s/login/LoginHelloC2SPacket.mapping index 8a5d5d64ba..3071366e53 100644 --- a/mappings/net/minecraft/network/packet/c2s/login/LoginHelloC2SPacket.mapping +++ b/mappings/net/minecraft/network/packet/c2s/login/LoginHelloC2SPacket.mapping @@ -1,6 +1,3 @@ CLASS net/minecraft/class_2915 net/minecraft/network/packet/c2s/login/LoginHelloC2SPacket METHOD (Lnet/minecraft/class_2540;)V ARG 1 buf - METHOD method_43638 (Lnet/minecraft/class_2540;Lnet/minecraft/class_2540;Lnet/minecraft/class_7428$class_7443;)V - ARG 1 buf2 - ARG 2 publicKey diff --git a/mappings/net/minecraft/network/packet/c2s/login/LoginKeyC2SPacket.mapping b/mappings/net/minecraft/network/packet/c2s/login/LoginKeyC2SPacket.mapping index 22c25e3b33..baa1bdfec2 100644 --- a/mappings/net/minecraft/network/packet/c2s/login/LoginKeyC2SPacket.mapping +++ b/mappings/net/minecraft/network/packet/c2s/login/LoginKeyC2SPacket.mapping @@ -1,6 +1,6 @@ CLASS net/minecraft/class_2917 net/minecraft/network/packet/c2s/login/LoginKeyC2SPacket FIELD field_13274 encryptedSecretKey [B - FIELD field_39089 nonce Lcom/mojang/datafixers/util/Either; + FIELD field_39089 nonce [B COMMENT The nonce value. COMMENT COMMENT @implNote This value is either encrypted (the left side of {@code Either}) or signed @@ -8,11 +8,6 @@ CLASS net/minecraft/class_2917 net/minecraft/network/packet/c2s/login/LoginKeyC2 COMMENT and the server verifies it by decrypting and comparing nonces. If signed, then it must COMMENT be done so using the user's private key provided from Mojang's server, and the server COMMENT verifies by checking if the reconstructed data can be verified using the public key. - METHOD (Ljavax/crypto/SecretKey;Ljava/security/PublicKey;J[B)V - ARG 1 secretKey - ARG 2 publicKey - ARG 3 seed - ARG 5 signature METHOD (Ljavax/crypto/SecretKey;Ljava/security/PublicKey;[B)V ARG 1 secretKey ARG 2 publicKey @@ -21,15 +16,6 @@ CLASS net/minecraft/class_2917 net/minecraft/network/packet/c2s/login/LoginKeyC2 ARG 1 buf METHOD method_12654 decryptSecretKey (Ljava/security/PrivateKey;)Ljavax/crypto/SecretKey; ARG 1 privateKey - METHOD method_43640 (Lnet/minecraft/class_7428;[BLnet/minecraft/class_3515$class_7425;)Ljava/lang/Boolean; - ARG 2 signature - METHOD method_43642 ([B)Ljava/lang/Boolean; - ARG 0 encrypted - METHOD method_43643 verifySignedNonce ([BLnet/minecraft/class_7428;)Z - ARG 1 nonce - ARG 2 publicKeyInfo - METHOD method_43644 verifyEncryptedNonce ([BLjava/security/PrivateKey;)Z + METHOD method_43643 verifySignedNonce ([BLjava/security/PrivateKey;)Z ARG 1 nonce ARG 2 privateKey - METHOD method_44316 ([BLnet/minecraft/class_3515$class_7425;Lnet/minecraft/class_7498$class_7499;)V - ARG 2 updater diff --git a/mappings/net/minecraft/network/packet/c2s/login/LoginQueryResponseC2SPacket.mapping b/mappings/net/minecraft/network/packet/c2s/login/LoginQueryResponseC2SPacket.mapping index 93f4b20fb8..ffe36093de 100644 --- a/mappings/net/minecraft/network/packet/c2s/login/LoginQueryResponseC2SPacket.mapping +++ b/mappings/net/minecraft/network/packet/c2s/login/LoginQueryResponseC2SPacket.mapping @@ -1,16 +1,21 @@ CLASS net/minecraft/class_2913 net/minecraft/network/packet/c2s/login/LoginQueryResponseC2SPacket - FIELD field_13258 response Lnet/minecraft/class_2540; - FIELD field_13259 queryId I + FIELD comp_1569 queryId I + FIELD comp_1570 response Lnet/minecraft/class_8594; FIELD field_33374 MAX_PAYLOAD_SIZE I - METHOD (ILnet/minecraft/class_2540;)V - ARG 1 queryId - ARG 2 response - METHOD (Lnet/minecraft/class_2540;)V + METHOD comp_1569 queryId ()I + METHOD comp_1570 response ()Lnet/minecraft/class_8594; + METHOD method_52290 readPayload (ILnet/minecraft/class_2540;)Lnet/minecraft/class_8594; + COMMENT {@return the response payload read from {@code buf}} + COMMENT + COMMENT @implNote This delegates the logic to {@link #getVanillaPayload}, + COMMENT which simply validates the size of the buffer and returns {@link + COMMENT UnknownLoginQueryResponsePayload#INSTANCE}. + ARG 0 queryId ARG 1 buf - METHOD method_36178 getQueryId ()I - METHOD method_36179 getResponse ()Lnet/minecraft/class_2540; - METHOD method_43900 (Lnet/minecraft/class_2540;Lnet/minecraft/class_2540;)V - ARG 0 buf2 + METHOD method_52291 (Lnet/minecraft/class_2540;Lnet/minecraft/class_8594;)V + ARG 0 buf ARG 1 response - METHOD method_43901 (Lnet/minecraft/class_2540;)Lnet/minecraft/class_2540; - ARG 0 buf2 + METHOD method_52292 read (Lnet/minecraft/class_2540;)Lnet/minecraft/class_2913; + ARG 0 buf + METHOD method_52293 getVanillaPayload (Lnet/minecraft/class_2540;)Lnet/minecraft/class_8594; + ARG 0 buf diff --git a/mappings/net/minecraft/network/packet/c2s/login/LoginQueryResponsePayload.mapping b/mappings/net/minecraft/network/packet/c2s/login/LoginQueryResponsePayload.mapping new file mode 100644 index 0000000000..2e3394f947 --- /dev/null +++ b/mappings/net/minecraft/network/packet/c2s/login/LoginQueryResponsePayload.mapping @@ -0,0 +1,3 @@ +CLASS net/minecraft/class_8594 net/minecraft/network/packet/c2s/login/LoginQueryResponsePayload + METHOD method_52295 write (Lnet/minecraft/class_2540;)V + ARG 1 buf diff --git a/mappings/net/minecraft/network/packet/c2s/login/UnknownLoginQueryResponsePayload.mapping b/mappings/net/minecraft/network/packet/c2s/login/UnknownLoginQueryResponsePayload.mapping new file mode 100644 index 0000000000..896d628e98 --- /dev/null +++ b/mappings/net/minecraft/network/packet/c2s/login/UnknownLoginQueryResponsePayload.mapping @@ -0,0 +1,2 @@ +CLASS net/minecraft/class_8596 net/minecraft/network/packet/c2s/login/UnknownLoginQueryResponsePayload + FIELD field_44980 INSTANCE Lnet/minecraft/class_8596; diff --git a/mappings/net/minecraft/network/packet/c2s/play/AcknowledgeChunksC2SPacket.mapping b/mappings/net/minecraft/network/packet/c2s/play/AcknowledgeChunksC2SPacket.mapping new file mode 100644 index 0000000000..66223a8be6 --- /dev/null +++ b/mappings/net/minecraft/network/packet/c2s/play/AcknowledgeChunksC2SPacket.mapping @@ -0,0 +1,3 @@ +CLASS net/minecraft/class_8590 net/minecraft/network/packet/c2s/play/AcknowledgeChunksC2SPacket + METHOD (Lnet/minecraft/class_2540;)V + ARG 1 buf diff --git a/mappings/net/minecraft/network/packet/c2s/play/AcknowledgeReconfigurationC2SPacket.mapping b/mappings/net/minecraft/network/packet/c2s/play/AcknowledgeReconfigurationC2SPacket.mapping new file mode 100644 index 0000000000..2eb305fe0e --- /dev/null +++ b/mappings/net/minecraft/network/packet/c2s/play/AcknowledgeReconfigurationC2SPacket.mapping @@ -0,0 +1,3 @@ +CLASS net/minecraft/class_8591 net/minecraft/network/packet/c2s/play/AcknowledgeReconfigurationC2SPacket + METHOD (Lnet/minecraft/class_2540;)V + ARG 1 buf diff --git a/mappings/net/minecraft/network/packet/c2s/play/AdvancementTabC2SPacket.mapping b/mappings/net/minecraft/network/packet/c2s/play/AdvancementTabC2SPacket.mapping index cbb0182abe..a447f45c1a 100644 --- a/mappings/net/minecraft/network/packet/c2s/play/AdvancementTabC2SPacket.mapping +++ b/mappings/net/minecraft/network/packet/c2s/play/AdvancementTabC2SPacket.mapping @@ -9,6 +9,6 @@ CLASS net/minecraft/class_2859 net/minecraft/network/packet/c2s/play/Advancement METHOD method_12414 close ()Lnet/minecraft/class_2859; METHOD method_12415 getAction ()Lnet/minecraft/class_2859$class_2860; METHOD method_12416 getTabToOpen ()Lnet/minecraft/class_2960; - METHOD method_12418 open (Lnet/minecraft/class_161;)Lnet/minecraft/class_2859; + METHOD method_12418 open (Lnet/minecraft/class_8779;)Lnet/minecraft/class_2859; ARG 0 advancement CLASS class_2860 Action diff --git a/mappings/net/minecraft/network/packet/c2s/play/ChatMessageC2SPacket.mapping b/mappings/net/minecraft/network/packet/c2s/play/ChatMessageC2SPacket.mapping index ebd0f57f31..24420c7b43 100644 --- a/mappings/net/minecraft/network/packet/c2s/play/ChatMessageC2SPacket.mapping +++ b/mappings/net/minecraft/network/packet/c2s/play/ChatMessageC2SPacket.mapping @@ -19,21 +19,17 @@ CLASS net/minecraft/class_2797 net/minecraft/network/packet/c2s/play/ChatMessage COMMENT message is not considered secure anymore by the clients, and may be discarded COMMENT depending on the clients' options. COMMENT - COMMENT @see net.minecraft.client.network.ClientPlayerEntity#sendChatMessage + COMMENT @see net.minecraft.client.network.ClientPlayNetworkHandler#sendChatMessage COMMENT @see net.minecraft.server.network.ServerPlayNetworkHandler#onChatMessage FIELD comp_945 chatMessage Ljava/lang/String; FIELD comp_946 timestamp Ljava/time/Instant; FIELD comp_970 acknowledgment Lnet/minecraft/class_7635$class_7636; - METHOD (Ljava/lang/String;Ljava/time/Instant;JLnet/minecraft/class_7469;ZLnet/minecraft/class_7635$class_7636;)V + METHOD (Ljava/lang/String;Ljava/time/Instant;JLnet/minecraft/class_7469;Lnet/minecraft/class_7635$class_7636;)V ARG 2 timestamp ARG 3 salt ARG 5 signature - ARG 6 signedPreview - ARG 7 acknowledgment METHOD (Lnet/minecraft/class_2540;)V ARG 1 buf METHOD comp_945 chatMessage ()Ljava/lang/String; METHOD comp_946 timestamp ()Ljava/time/Instant; METHOD comp_970 acknowledgment ()Lnet/minecraft/class_7635$class_7636; - METHOD method_44892 getMetadata (Lnet/minecraft/class_3222;)Lnet/minecraft/class_7470; - ARG 1 sender diff --git a/mappings/net/minecraft/network/packet/c2s/play/ClickSlotC2SPacket.mapping b/mappings/net/minecraft/network/packet/c2s/play/ClickSlotC2SPacket.mapping index 1b6679188f..bf4c7e781f 100644 --- a/mappings/net/minecraft/network/packet/c2s/play/ClickSlotC2SPacket.mapping +++ b/mappings/net/minecraft/network/packet/c2s/play/ClickSlotC2SPacket.mapping @@ -23,6 +23,6 @@ CLASS net/minecraft/class_2813 net/minecraft/network/packet/c2s/play/ClickSlotC2 METHOD method_12194 getSyncId ()I METHOD method_12195 getActionType ()Lnet/minecraft/class_1713; METHOD method_34677 (Lnet/minecraft/class_2540;)Ljava/lang/Integer; - ARG 0 buf + ARG 0 bufx METHOD method_34678 getModifiedStacks ()Lit/unimi/dsi/fastutil/ints/Int2ObjectMap; METHOD method_37440 getRevision ()I diff --git a/mappings/net/minecraft/network/packet/c2s/play/CommandExecutionC2SPacket.mapping b/mappings/net/minecraft/network/packet/c2s/play/CommandExecutionC2SPacket.mapping index 649b95f632..d56838efbd 100644 --- a/mappings/net/minecraft/network/packet/c2s/play/CommandExecutionC2SPacket.mapping +++ b/mappings/net/minecraft/network/packet/c2s/play/CommandExecutionC2SPacket.mapping @@ -19,17 +19,14 @@ CLASS net/minecraft/class_7472 net/minecraft/network/packet/c2s/play/CommandExec COMMENT is not considered secure anymore by the clients, and may be discarded depending COMMENT on the clients' options. COMMENT - COMMENT @see net.minecraft.client.network.ClientPlayerEntity#sendCommand + COMMENT @see net.minecraft.client.network.ClientPlayNetworkHandler#sendCommand(String) COMMENT @see net.minecraft.server.network.ServerPlayNetworkHandler#onCommandExecution FIELD comp_809 timestamp Ljava/time/Instant; FIELD comp_969 acknowledgment Lnet/minecraft/class_7635$class_7636; - METHOD (Ljava/lang/String;Ljava/time/Instant;JLnet/minecraft/class_7450;ZLnet/minecraft/class_7635$class_7636;)V - ARG 1 command + METHOD (Ljava/lang/String;Ljava/time/Instant;JLnet/minecraft/class_7450;Lnet/minecraft/class_7635$class_7636;)V ARG 2 timestamp ARG 3 salt ARG 5 argumentSignatures - ARG 6 signedPreview - ARG 7 acknowledgment METHOD (Lnet/minecraft/class_2540;)V ARG 1 buf METHOD comp_809 timestamp ()Ljava/time/Instant; diff --git a/mappings/net/minecraft/network/packet/c2s/play/CraftRequestC2SPacket.mapping b/mappings/net/minecraft/network/packet/c2s/play/CraftRequestC2SPacket.mapping index a0b3995abd..7f8195dc8a 100644 --- a/mappings/net/minecraft/network/packet/c2s/play/CraftRequestC2SPacket.mapping +++ b/mappings/net/minecraft/network/packet/c2s/play/CraftRequestC2SPacket.mapping @@ -2,9 +2,8 @@ CLASS net/minecraft/class_2840 net/minecraft/network/packet/c2s/play/CraftReques FIELD field_12931 recipe Lnet/minecraft/class_2960; FIELD field_12932 craftAll Z FIELD field_12933 syncId I - METHOD (ILnet/minecraft/class_1860;Z)V + METHOD (ILnet/minecraft/class_8786;Z)V ARG 1 syncId - ARG 2 recipe ARG 3 craftAll METHOD (Lnet/minecraft/class_2540;)V ARG 1 buf diff --git a/mappings/net/minecraft/network/packet/c2s/play/CreativeInventoryActionC2SPacket.mapping b/mappings/net/minecraft/network/packet/c2s/play/CreativeInventoryActionC2SPacket.mapping index ab601e0482..41d8119f38 100644 --- a/mappings/net/minecraft/network/packet/c2s/play/CreativeInventoryActionC2SPacket.mapping +++ b/mappings/net/minecraft/network/packet/c2s/play/CreativeInventoryActionC2SPacket.mapping @@ -6,5 +6,5 @@ CLASS net/minecraft/class_2873 net/minecraft/network/packet/c2s/play/CreativeInv ARG 2 stack METHOD (Lnet/minecraft/class_2540;)V ARG 1 buf - METHOD method_12479 getItemStack ()Lnet/minecraft/class_1799; + METHOD method_12479 getStack ()Lnet/minecraft/class_1799; METHOD method_12481 getSlot ()I diff --git a/mappings/net/minecraft/network/packet/c2s/play/CustomPayloadC2SPacket.mapping b/mappings/net/minecraft/network/packet/c2s/play/CustomPayloadC2SPacket.mapping deleted file mode 100644 index 6a6e6c195b..0000000000 --- a/mappings/net/minecraft/network/packet/c2s/play/CustomPayloadC2SPacket.mapping +++ /dev/null @@ -1,12 +0,0 @@ -CLASS net/minecraft/class_2817 net/minecraft/network/packet/c2s/play/CustomPayloadC2SPacket - FIELD field_12830 channel Lnet/minecraft/class_2960; - FIELD field_12831 BRAND Lnet/minecraft/class_2960; - FIELD field_12832 data Lnet/minecraft/class_2540; - FIELD field_33361 MAX_PAYLOAD_SIZE I - METHOD (Lnet/minecraft/class_2540;)V - ARG 1 buf - METHOD (Lnet/minecraft/class_2960;Lnet/minecraft/class_2540;)V - ARG 1 channel - ARG 2 data - METHOD method_36169 getChannel ()Lnet/minecraft/class_2960; - METHOD method_36170 getData ()Lnet/minecraft/class_2540; diff --git a/mappings/net/minecraft/network/packet/c2s/play/MessageAcknowledgmentC2SPacket.mapping b/mappings/net/minecraft/network/packet/c2s/play/MessageAcknowledgmentC2SPacket.mapping index d8753849f2..196e624fce 100644 --- a/mappings/net/minecraft/network/packet/c2s/play/MessageAcknowledgmentC2SPacket.mapping +++ b/mappings/net/minecraft/network/packet/c2s/play/MessageAcknowledgmentC2SPacket.mapping @@ -1,5 +1,3 @@ CLASS net/minecraft/class_7640 net/minecraft/network/packet/c2s/play/MessageAcknowledgmentC2SPacket - FIELD comp_968 acknowledgment Lnet/minecraft/class_7635$class_7636; METHOD (Lnet/minecraft/class_2540;)V ARG 1 buf - METHOD comp_968 acknowledgment ()Lnet/minecraft/class_7635$class_7636; diff --git a/mappings/net/minecraft/network/packet/c2s/play/PlayerInteractEntityC2SPacket.mapping b/mappings/net/minecraft/network/packet/c2s/play/PlayerInteractEntityC2SPacket.mapping index 38677c993b..67f019e798 100644 --- a/mappings/net/minecraft/network/packet/c2s/play/PlayerInteractEntityC2SPacket.mapping +++ b/mappings/net/minecraft/network/packet/c2s/play/PlayerInteractEntityC2SPacket.mapping @@ -36,6 +36,8 @@ CLASS net/minecraft/class_2824 net/minecraft/network/packet/c2s/play/PlayerInter FIELD field_29174 handlerGetter Ljava/util/function/Function; METHOD (Ljava/lang/String;ILjava/util/function/Function;)V ARG 3 handlerGetter + METHOD method_34216 (Lnet/minecraft/class_2540;)Lnet/minecraft/class_2824$class_5906; + ARG 0 buf CLASS class_5908 Handler METHOD method_34218 attack ()V METHOD method_34219 interact (Lnet/minecraft/class_1268;)V diff --git a/mappings/net/minecraft/network/packet/c2s/play/PlayerSessionC2SPacket.mapping b/mappings/net/minecraft/network/packet/c2s/play/PlayerSessionC2SPacket.mapping new file mode 100644 index 0000000000..9f22bc5972 --- /dev/null +++ b/mappings/net/minecraft/network/packet/c2s/play/PlayerSessionC2SPacket.mapping @@ -0,0 +1,3 @@ +CLASS net/minecraft/class_7861 net/minecraft/network/packet/c2s/play/PlayerSessionC2SPacket + METHOD (Lnet/minecraft/class_2540;)V + ARG 1 buf diff --git a/mappings/net/minecraft/network/packet/c2s/play/RecipeBookDataC2SPacket.mapping b/mappings/net/minecraft/network/packet/c2s/play/RecipeBookDataC2SPacket.mapping index 5fac5f581f..5660e64363 100644 --- a/mappings/net/minecraft/network/packet/c2s/play/RecipeBookDataC2SPacket.mapping +++ b/mappings/net/minecraft/network/packet/c2s/play/RecipeBookDataC2SPacket.mapping @@ -1,7 +1,5 @@ CLASS net/minecraft/class_2853 net/minecraft/network/packet/c2s/play/RecipeBookDataC2SPacket FIELD field_13004 recipeId Lnet/minecraft/class_2960; - METHOD (Lnet/minecraft/class_1860;)V - ARG 1 recipe METHOD (Lnet/minecraft/class_2540;)V ARG 1 buf METHOD method_12406 getRecipeId ()Lnet/minecraft/class_2960; diff --git a/mappings/net/minecraft/network/packet/c2s/play/RequestChatPreviewC2SPacket.mapping b/mappings/net/minecraft/network/packet/c2s/play/RequestChatPreviewC2SPacket.mapping deleted file mode 100644 index 362db60bf0..0000000000 --- a/mappings/net/minecraft/network/packet/c2s/play/RequestChatPreviewC2SPacket.mapping +++ /dev/null @@ -1,3 +0,0 @@ -CLASS net/minecraft/class_7496 net/minecraft/network/packet/c2s/play/RequestChatPreviewC2SPacket - METHOD (Lnet/minecraft/class_2540;)V - ARG 1 buf diff --git a/mappings/net/minecraft/network/packet/c2s/play/UpdateBeaconC2SPacket.mapping b/mappings/net/minecraft/network/packet/c2s/play/UpdateBeaconC2SPacket.mapping index 8b9278cd0f..286249aa8f 100644 --- a/mappings/net/minecraft/network/packet/c2s/play/UpdateBeaconC2SPacket.mapping +++ b/mappings/net/minecraft/network/packet/c2s/play/UpdateBeaconC2SPacket.mapping @@ -1,7 +1,20 @@ CLASS net/minecraft/class_2866 net/minecraft/network/packet/c2s/play/UpdateBeaconC2SPacket FIELD field_13049 secondaryEffectId Ljava/util/Optional; FIELD field_13050 primaryEffectId Ljava/util/Optional; + METHOD (Ljava/util/Optional;Ljava/util/Optional;)V + ARG 1 primaryEffectId + ARG 2 secondaryEffectId METHOD (Lnet/minecraft/class_2540;)V ARG 1 buf METHOD method_12435 getSecondaryEffectId ()Ljava/util/Optional; METHOD method_12436 getPrimaryEffectId ()Ljava/util/Optional; + METHOD method_43364 (Lnet/minecraft/class_2540;Lnet/minecraft/class_1291;)V + ARG 0 buf2 + ARG 1 secondaryEffectId + METHOD method_43365 (Lnet/minecraft/class_2540;)Lnet/minecraft/class_1291; + ARG 0 buf2 + METHOD method_43366 (Lnet/minecraft/class_2540;Lnet/minecraft/class_1291;)V + ARG 0 buf2 + ARG 1 primaryEffectId + METHOD method_43367 (Lnet/minecraft/class_2540;)Lnet/minecraft/class_1291; + ARG 0 buf2 diff --git a/mappings/net/minecraft/network/packet/c2s/play/UpdateCommandBlockC2SPacket.mapping b/mappings/net/minecraft/network/packet/c2s/play/UpdateCommandBlockC2SPacket.mapping index 21769564ed..2e039a7a6b 100644 --- a/mappings/net/minecraft/network/packet/c2s/play/UpdateCommandBlockC2SPacket.mapping +++ b/mappings/net/minecraft/network/packet/c2s/play/UpdateCommandBlockC2SPacket.mapping @@ -21,5 +21,5 @@ CLASS net/minecraft/class_2870 net/minecraft/network/packet/c2s/play/UpdateComma METHOD method_12470 getCommand ()Ljava/lang/String; METHOD method_12471 isConditional ()Z METHOD method_12472 shouldTrackOutput ()Z - METHOD method_12473 getBlockPos ()Lnet/minecraft/class_2338; + METHOD method_12473 getPos ()Lnet/minecraft/class_2338; METHOD method_12474 isAlwaysActive ()Z diff --git a/mappings/net/minecraft/network/packet/c2s/play/UpdateSignC2SPacket.mapping b/mappings/net/minecraft/network/packet/c2s/play/UpdateSignC2SPacket.mapping index 9d05860596..f002854b55 100644 --- a/mappings/net/minecraft/network/packet/c2s/play/UpdateSignC2SPacket.mapping +++ b/mappings/net/minecraft/network/packet/c2s/play/UpdateSignC2SPacket.mapping @@ -2,13 +2,16 @@ CLASS net/minecraft/class_2877 net/minecraft/network/packet/c2s/play/UpdateSignC FIELD field_13100 text [Ljava/lang/String; FIELD field_13101 pos Lnet/minecraft/class_2338; FIELD field_33371 MAX_LINE_LENGTH I - METHOD (Lnet/minecraft/class_2338;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V + FIELD field_43153 front Z + METHOD (Lnet/minecraft/class_2338;ZLjava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V ARG 1 pos - ARG 2 line1 - ARG 3 line2 - ARG 4 line3 - ARG 5 line4 + ARG 2 front + ARG 3 line1 + ARG 4 line2 + ARG 5 line3 + ARG 6 line4 METHOD (Lnet/minecraft/class_2540;)V ARG 1 buf METHOD method_12508 getText ()[Ljava/lang/String; METHOD method_12510 getPos ()Lnet/minecraft/class_2338; + METHOD method_49751 isFront ()Z diff --git a/mappings/net/minecraft/network/packet/s2c/play/PlayPingS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/common/CommonPingS2CPacket.mapping similarity index 76% rename from mappings/net/minecraft/network/packet/s2c/play/PlayPingS2CPacket.mapping rename to mappings/net/minecraft/network/packet/s2c/common/CommonPingS2CPacket.mapping index 6c258890df..a869ccf7ed 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/PlayPingS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/common/CommonPingS2CPacket.mapping @@ -1,10 +1,9 @@ -CLASS net/minecraft/class_6373 net/minecraft/network/packet/s2c/play/PlayPingS2CPacket +CLASS net/minecraft/class_6373 net/minecraft/network/packet/s2c/common/CommonPingS2CPacket COMMENT A packet sent by the server; the client will reply with a pong packet on the COMMENT first tick after it receives this packet, with the same {@link #parameter}. COMMENT - COMMENT @see net.minecraft.network.packet.c2s.play.PlayPongC2SPacket - COMMENT @see net.minecraft.network.packet.s2c.play.KeepAliveS2CPacket - COMMENT @see net.minecraft.network.packet.s2c.query.QueryPongS2CPacket + COMMENT @see net.minecraft.network.packet.c2s.common.CommonPongC2SPacket + COMMENT @see net.minecraft.network.packet.s2c.common.KeepAliveS2CPacket FIELD field_33751 parameter I COMMENT The parameter of this ping packet. COMMENT diff --git a/mappings/net/minecraft/network/packet/s2c/common/CustomPayloadS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/common/CustomPayloadS2CPacket.mapping new file mode 100644 index 0000000000..d60c11ff52 --- /dev/null +++ b/mappings/net/minecraft/network/packet/s2c/common/CustomPayloadS2CPacket.mapping @@ -0,0 +1,11 @@ +CLASS net/minecraft/class_2658 net/minecraft/network/packet/s2c/common/CustomPayloadS2CPacket + FIELD field_33326 MAX_PAYLOAD_SIZE I + FIELD field_45693 ID_TO_READER Ljava/util/Map; + METHOD (Lnet/minecraft/class_2540;)V + ARG 1 buf + METHOD method_53023 readPayload (Lnet/minecraft/class_2960;Lnet/minecraft/class_2540;)Lnet/minecraft/class_8710; + ARG 0 id + ARG 1 buf + METHOD method_53025 readUnknownPayload (Lnet/minecraft/class_2960;Lnet/minecraft/class_2540;)Lnet/minecraft/class_8711; + ARG 0 id + ARG 1 buf diff --git a/mappings/net/minecraft/network/packet/s2c/play/DisconnectS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/common/DisconnectS2CPacket.mapping similarity index 91% rename from mappings/net/minecraft/network/packet/s2c/play/DisconnectS2CPacket.mapping rename to mappings/net/minecraft/network/packet/s2c/common/DisconnectS2CPacket.mapping index d9d0ba947b..2af67f3a4e 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/DisconnectS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/common/DisconnectS2CPacket.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_2661 net/minecraft/network/packet/s2c/play/DisconnectS2CPacket +CLASS net/minecraft/class_2661 net/minecraft/network/packet/s2c/common/DisconnectS2CPacket FIELD field_12173 reason Lnet/minecraft/class_2561; METHOD (Lnet/minecraft/class_2540;)V ARG 1 buf diff --git a/mappings/net/minecraft/network/packet/s2c/play/KeepAliveS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/common/KeepAliveS2CPacket.mapping similarity index 88% rename from mappings/net/minecraft/network/packet/s2c/play/KeepAliveS2CPacket.mapping rename to mappings/net/minecraft/network/packet/s2c/common/KeepAliveS2CPacket.mapping index a0da6f7e70..8b3fcbc8cf 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/KeepAliveS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/common/KeepAliveS2CPacket.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_2670 net/minecraft/network/packet/s2c/play/KeepAliveS2CPacket +CLASS net/minecraft/class_2670 net/minecraft/network/packet/s2c/common/KeepAliveS2CPacket FIELD field_12211 id J METHOD (J)V ARG 1 id diff --git a/mappings/net/minecraft/network/packet/s2c/play/ResourcePackSendS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/common/ResourcePackSendS2CPacket.mapping similarity index 80% rename from mappings/net/minecraft/network/packet/s2c/play/ResourcePackSendS2CPacket.mapping rename to mappings/net/minecraft/network/packet/s2c/common/ResourcePackSendS2CPacket.mapping index db4f1ec7cf..bb9e0d6f7c 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/ResourcePackSendS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/common/ResourcePackSendS2CPacket.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_2720 net/minecraft/network/packet/s2c/play/ResourcePackSendS2CPacket +CLASS net/minecraft/class_2720 net/minecraft/network/packet/s2c/common/ResourcePackSendS2CPacket FIELD field_12427 url Ljava/lang/String; FIELD field_12428 hash Ljava/lang/String; FIELD field_27844 required Z @@ -11,7 +11,7 @@ CLASS net/minecraft/class_2720 net/minecraft/network/packet/s2c/play/ResourcePac ARG 4 prompt METHOD (Lnet/minecraft/class_2540;)V ARG 1 buf - METHOD method_11772 getURL ()Ljava/lang/String; - METHOD method_11773 getSHA1 ()Ljava/lang/String; + METHOD method_11772 getUrl ()Ljava/lang/String; + METHOD method_11773 getHash ()Ljava/lang/String; METHOD method_32307 isRequired ()Z METHOD method_36340 getPrompt ()Lnet/minecraft/class_2561; diff --git a/mappings/net/minecraft/network/packet/s2c/play/SynchronizeTagsS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/common/SynchronizeTagsS2CPacket.mapping similarity index 60% rename from mappings/net/minecraft/network/packet/s2c/play/SynchronizeTagsS2CPacket.mapping rename to mappings/net/minecraft/network/packet/s2c/common/SynchronizeTagsS2CPacket.mapping index b0e864964f..c89d25ca77 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/SynchronizeTagsS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/common/SynchronizeTagsS2CPacket.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_2790 net/minecraft/network/packet/s2c/play/SynchronizeTagsS2CPacket +CLASS net/minecraft/class_2790 net/minecraft/network/packet/s2c/common/SynchronizeTagsS2CPacket FIELD field_12757 groups Ljava/util/Map; METHOD (Ljava/util/Map;)V ARG 1 groups @@ -6,10 +6,5 @@ CLASS net/minecraft/class_2790 net/minecraft/network/packet/s2c/play/Synchronize ARG 1 buf METHOD method_12000 getGroups ()Ljava/util/Map; METHOD method_34203 (Lnet/minecraft/class_2540;Lnet/minecraft/class_6864$class_5748;)V - ARG 0 buf + ARG 0 bufx ARG 1 serializedGroup - METHOD method_34204 (Lnet/minecraft/class_2540;Lnet/minecraft/class_5321;)V - ARG 0 buf - ARG 1 registryKey - METHOD method_34205 (Lnet/minecraft/class_2540;)Lnet/minecraft/class_5321; - ARG 0 buf diff --git a/mappings/net/minecraft/network/packet/s2c/config/DynamicRegistriesS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/config/DynamicRegistriesS2CPacket.mapping new file mode 100644 index 0000000000..c944afdd9c --- /dev/null +++ b/mappings/net/minecraft/network/packet/s2c/config/DynamicRegistriesS2CPacket.mapping @@ -0,0 +1,6 @@ +CLASS net/minecraft/class_8734 net/minecraft/network/packet/s2c/config/DynamicRegistriesS2CPacket + FIELD comp_1724 registryManager Lnet/minecraft/class_5455$class_6890; + FIELD field_45713 VANILLA_REGISTRY_OPS Lnet/minecraft/class_6903; + METHOD (Lnet/minecraft/class_2540;)V + ARG 1 buf + METHOD comp_1724 registryManager ()Lnet/minecraft/class_5455$class_6890; diff --git a/mappings/net/minecraft/network/packet/s2c/config/FeaturesS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/config/FeaturesS2CPacket.mapping new file mode 100644 index 0000000000..03233b3c43 --- /dev/null +++ b/mappings/net/minecraft/network/packet/s2c/config/FeaturesS2CPacket.mapping @@ -0,0 +1,3 @@ +CLASS net/minecraft/class_7832 net/minecraft/network/packet/s2c/config/FeaturesS2CPacket + METHOD (Lnet/minecraft/class_2540;)V + ARG 1 buf diff --git a/mappings/net/minecraft/network/packet/s2c/config/ReadyS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/config/ReadyS2CPacket.mapping new file mode 100644 index 0000000000..427059ef96 --- /dev/null +++ b/mappings/net/minecraft/network/packet/s2c/config/ReadyS2CPacket.mapping @@ -0,0 +1,3 @@ +CLASS net/minecraft/class_8733 net/minecraft/network/packet/s2c/config/ReadyS2CPacket + METHOD (Lnet/minecraft/class_2540;)V + ARG 1 buf diff --git a/mappings/net/minecraft/network/packet/s2c/custom/DebugBeeCustomPayload.mapping b/mappings/net/minecraft/network/packet/s2c/custom/DebugBeeCustomPayload.mapping new file mode 100644 index 0000000000..d9f36b5667 --- /dev/null +++ b/mappings/net/minecraft/network/packet/s2c/custom/DebugBeeCustomPayload.mapping @@ -0,0 +1,26 @@ +CLASS net/minecraft/class_8707 net/minecraft/network/packet/s2c/custom/DebugBeeCustomPayload + FIELD field_45695 ID Lnet/minecraft/class_2960; + METHOD (Lnet/minecraft/class_2540;)V + ARG 1 buf + CLASS class_5243 Bee + FIELD comp_1650 entityId I + FIELD comp_1657 disallowedHives Ljava/util/List; + METHOD (Ljava/util/UUID;ILnet/minecraft/class_243;Lnet/minecraft/class_11;Lnet/minecraft/class_2338;Lnet/minecraft/class_2338;ILjava/util/Set;Ljava/util/List;)V + ARG 1 uuid + ARG 2 entityId + ARG 4 path + ARG 5 hive + ARG 6 flower + ARG 7 travelTicks + METHOD (Lnet/minecraft/class_2540;)V + ARG 1 buf + METHOD comp_1650 entityId ()I + METHOD comp_1657 disallowedHives ()Ljava/util/List; + METHOD method_27649 isHiveAt (Lnet/minecraft/class_2338;)Z + ARG 1 pos + METHOD method_53029 getName ()Ljava/lang/String; + METHOD method_53030 write (Lnet/minecraft/class_2540;)V + ARG 1 buf + METHOD method_53031 (Lnet/minecraft/class_2540;Lnet/minecraft/class_11;)V + ARG 0 buf + ARG 1 path diff --git a/mappings/net/minecraft/network/packet/s2c/custom/DebugBrainCustomPayload.mapping b/mappings/net/minecraft/network/packet/s2c/custom/DebugBrainCustomPayload.mapping new file mode 100644 index 0000000000..ea3a089a6a --- /dev/null +++ b/mappings/net/minecraft/network/packet/s2c/custom/DebugBrainCustomPayload.mapping @@ -0,0 +1,32 @@ +CLASS net/minecraft/class_8708 net/minecraft/network/packet/s2c/custom/DebugBrainCustomPayload + FIELD field_45696 ID Lnet/minecraft/class_2960; + METHOD (Lnet/minecraft/class_2540;)V + ARG 1 buf + CLASS class_4232 Brain + FIELD comp_1660 entityId I + FIELD comp_1671 possibleActivities Ljava/util/List; + FIELD comp_1672 runningTasks Ljava/util/List; + METHOD (Ljava/util/UUID;ILjava/lang/String;Ljava/lang/String;IFFLnet/minecraft/class_243;Ljava/lang/String;Lnet/minecraft/class_11;ZILjava/util/List;Ljava/util/List;Ljava/util/List;Ljava/util/List;Ljava/util/Set;Ljava/util/Set;)V + ARG 1 uuid + ARG 2 entityId + ARG 3 name + ARG 4 profession + ARG 5 xp + ARG 6 health + ARG 7 maxHealth + ARG 11 wantsGolem + ARG 12 angerLevel + METHOD (Lnet/minecraft/class_2540;)V + ARG 1 buf + METHOD comp_1660 entityId ()I + METHOD comp_1671 possibleActivities ()Ljava/util/List; + METHOD comp_1672 runningTasks ()Ljava/util/List; + METHOD method_23151 isPointOfInterest (Lnet/minecraft/class_2338;)Z + ARG 1 pos + METHOD method_29388 isPotentialJobSite (Lnet/minecraft/class_2338;)Z + ARG 1 pos + METHOD method_53032 write (Lnet/minecraft/class_2540;)V + ARG 1 buf + METHOD method_53033 (Lnet/minecraft/class_2540;Lnet/minecraft/class_11;)V + ARG 0 buf + ARG 1 path diff --git a/mappings/net/minecraft/network/packet/s2c/custom/DebugGameEventCustomPayload.mapping b/mappings/net/minecraft/network/packet/s2c/custom/DebugGameEventCustomPayload.mapping new file mode 100644 index 0000000000..ed249a6dd9 --- /dev/null +++ b/mappings/net/minecraft/network/packet/s2c/custom/DebugGameEventCustomPayload.mapping @@ -0,0 +1,4 @@ +CLASS net/minecraft/class_8712 net/minecraft/network/packet/s2c/custom/DebugGameEventCustomPayload + FIELD field_45698 ID Lnet/minecraft/class_2960; + METHOD (Lnet/minecraft/class_2540;)V + ARG 1 buf diff --git a/mappings/net/minecraft/network/packet/s2c/custom/DebugGameEventListenersCustomPayload.mapping b/mappings/net/minecraft/network/packet/s2c/custom/DebugGameEventListenersCustomPayload.mapping new file mode 100644 index 0000000000..951ab3ecaf --- /dev/null +++ b/mappings/net/minecraft/network/packet/s2c/custom/DebugGameEventListenersCustomPayload.mapping @@ -0,0 +1,4 @@ +CLASS net/minecraft/class_8713 net/minecraft/network/packet/s2c/custom/DebugGameEventListenersCustomPayload + FIELD field_45699 ID Lnet/minecraft/class_2960; + METHOD (Lnet/minecraft/class_2540;)V + ARG 1 buf diff --git a/mappings/net/minecraft/network/packet/s2c/custom/DebugGameTestAddMarkerCustomPayload.mapping b/mappings/net/minecraft/network/packet/s2c/custom/DebugGameTestAddMarkerCustomPayload.mapping new file mode 100644 index 0000000000..ff17c9e971 --- /dev/null +++ b/mappings/net/minecraft/network/packet/s2c/custom/DebugGameTestAddMarkerCustomPayload.mapping @@ -0,0 +1,4 @@ +CLASS net/minecraft/class_8714 net/minecraft/network/packet/s2c/custom/DebugGameTestAddMarkerCustomPayload + FIELD field_45700 ID Lnet/minecraft/class_2960; + METHOD (Lnet/minecraft/class_2540;)V + ARG 1 buf diff --git a/mappings/net/minecraft/network/packet/s2c/custom/DebugGameTestClearCustomPayload.mapping b/mappings/net/minecraft/network/packet/s2c/custom/DebugGameTestClearCustomPayload.mapping new file mode 100644 index 0000000000..7e54a9b8b4 --- /dev/null +++ b/mappings/net/minecraft/network/packet/s2c/custom/DebugGameTestClearCustomPayload.mapping @@ -0,0 +1,4 @@ +CLASS net/minecraft/class_8715 net/minecraft/network/packet/s2c/custom/DebugGameTestClearCustomPayload + FIELD field_45701 ID Lnet/minecraft/class_2960; + METHOD (Lnet/minecraft/class_2540;)V + ARG 1 buf diff --git a/mappings/net/minecraft/network/packet/s2c/custom/DebugGoalSelectorCustomPayload.mapping b/mappings/net/minecraft/network/packet/s2c/custom/DebugGoalSelectorCustomPayload.mapping new file mode 100644 index 0000000000..4835d2152d --- /dev/null +++ b/mappings/net/minecraft/network/packet/s2c/custom/DebugGoalSelectorCustomPayload.mapping @@ -0,0 +1,12 @@ +CLASS net/minecraft/class_8716 net/minecraft/network/packet/s2c/custom/DebugGoalSelectorCustomPayload + FIELD field_45702 ID Lnet/minecraft/class_2960; + METHOD (Lnet/minecraft/class_2540;)V + ARG 1 buf + METHOD method_53034 (Lnet/minecraft/class_2540;Lnet/minecraft/class_8716$class_8717;)V + ARG 0 buf + ARG 1 goal + CLASS class_8717 Goal + METHOD (Lnet/minecraft/class_2540;)V + ARG 1 buf + METHOD method_53035 write (Lnet/minecraft/class_2540;)V + ARG 1 buf diff --git a/mappings/net/minecraft/network/packet/s2c/custom/DebugHiveCustomPayload.mapping b/mappings/net/minecraft/network/packet/s2c/custom/DebugHiveCustomPayload.mapping new file mode 100644 index 0000000000..c71b4933b8 --- /dev/null +++ b/mappings/net/minecraft/network/packet/s2c/custom/DebugHiveCustomPayload.mapping @@ -0,0 +1,9 @@ +CLASS net/minecraft/class_8718 net/minecraft/network/packet/s2c/custom/DebugHiveCustomPayload + FIELD field_45703 ID Lnet/minecraft/class_2960; + METHOD (Lnet/minecraft/class_2540;)V + ARG 1 buf + CLASS class_8719 HiveInfo + METHOD (Lnet/minecraft/class_2540;)V + ARG 1 buf + METHOD method_53036 write (Lnet/minecraft/class_2540;)V + ARG 1 buf diff --git a/mappings/net/minecraft/network/packet/s2c/custom/DebugNeighborsUpdateCustomPayload.mapping b/mappings/net/minecraft/network/packet/s2c/custom/DebugNeighborsUpdateCustomPayload.mapping new file mode 100644 index 0000000000..1641bb46b7 --- /dev/null +++ b/mappings/net/minecraft/network/packet/s2c/custom/DebugNeighborsUpdateCustomPayload.mapping @@ -0,0 +1,4 @@ +CLASS net/minecraft/class_8720 net/minecraft/network/packet/s2c/custom/DebugNeighborsUpdateCustomPayload + FIELD field_45704 ID Lnet/minecraft/class_2960; + METHOD (Lnet/minecraft/class_2540;)V + ARG 1 buf diff --git a/mappings/net/minecraft/network/packet/s2c/custom/DebugPathCustomPayload.mapping b/mappings/net/minecraft/network/packet/s2c/custom/DebugPathCustomPayload.mapping new file mode 100644 index 0000000000..3d7b6b8e1c --- /dev/null +++ b/mappings/net/minecraft/network/packet/s2c/custom/DebugPathCustomPayload.mapping @@ -0,0 +1,4 @@ +CLASS net/minecraft/class_8721 net/minecraft/network/packet/s2c/custom/DebugPathCustomPayload + FIELD field_45705 ID Lnet/minecraft/class_2960; + METHOD (Lnet/minecraft/class_2540;)V + ARG 1 buf diff --git a/mappings/net/minecraft/network/packet/s2c/custom/DebugPoiAddedCustomPayload.mapping b/mappings/net/minecraft/network/packet/s2c/custom/DebugPoiAddedCustomPayload.mapping new file mode 100644 index 0000000000..4c865a0c6b --- /dev/null +++ b/mappings/net/minecraft/network/packet/s2c/custom/DebugPoiAddedCustomPayload.mapping @@ -0,0 +1,4 @@ +CLASS net/minecraft/class_8722 net/minecraft/network/packet/s2c/custom/DebugPoiAddedCustomPayload + FIELD field_45706 ID Lnet/minecraft/class_2960; + METHOD (Lnet/minecraft/class_2540;)V + ARG 1 buf diff --git a/mappings/net/minecraft/network/packet/s2c/custom/DebugPoiRemovedCustomPayload.mapping b/mappings/net/minecraft/network/packet/s2c/custom/DebugPoiRemovedCustomPayload.mapping new file mode 100644 index 0000000000..97c4133e8e --- /dev/null +++ b/mappings/net/minecraft/network/packet/s2c/custom/DebugPoiRemovedCustomPayload.mapping @@ -0,0 +1,4 @@ +CLASS net/minecraft/class_8723 net/minecraft/network/packet/s2c/custom/DebugPoiRemovedCustomPayload + FIELD field_45707 ID Lnet/minecraft/class_2960; + METHOD (Lnet/minecraft/class_2540;)V + ARG 1 buf diff --git a/mappings/net/minecraft/network/packet/s2c/custom/DebugPoiTicketCountCustomPayload.mapping b/mappings/net/minecraft/network/packet/s2c/custom/DebugPoiTicketCountCustomPayload.mapping new file mode 100644 index 0000000000..702bb93bca --- /dev/null +++ b/mappings/net/minecraft/network/packet/s2c/custom/DebugPoiTicketCountCustomPayload.mapping @@ -0,0 +1,4 @@ +CLASS net/minecraft/class_8724 net/minecraft/network/packet/s2c/custom/DebugPoiTicketCountCustomPayload + FIELD field_45708 ID Lnet/minecraft/class_2960; + METHOD (Lnet/minecraft/class_2540;)V + ARG 1 buf diff --git a/mappings/net/minecraft/network/packet/s2c/custom/DebugRaidsCustomPayload.mapping b/mappings/net/minecraft/network/packet/s2c/custom/DebugRaidsCustomPayload.mapping new file mode 100644 index 0000000000..cb1283553d --- /dev/null +++ b/mappings/net/minecraft/network/packet/s2c/custom/DebugRaidsCustomPayload.mapping @@ -0,0 +1,4 @@ +CLASS net/minecraft/class_8725 net/minecraft/network/packet/s2c/custom/DebugRaidsCustomPayload + FIELD field_45709 ID Lnet/minecraft/class_2960; + METHOD (Lnet/minecraft/class_2540;)V + ARG 1 buf diff --git a/mappings/net/minecraft/network/packet/s2c/custom/DebugStructuresCustomPayload.mapping b/mappings/net/minecraft/network/packet/s2c/custom/DebugStructuresCustomPayload.mapping new file mode 100644 index 0000000000..c60d1854a5 --- /dev/null +++ b/mappings/net/minecraft/network/packet/s2c/custom/DebugStructuresCustomPayload.mapping @@ -0,0 +1,17 @@ +CLASS net/minecraft/class_8726 net/minecraft/network/packet/s2c/custom/DebugStructuresCustomPayload + FIELD field_45710 ID Lnet/minecraft/class_2960; + METHOD (Lnet/minecraft/class_2540;)V + ARG 1 buf + METHOD method_53037 writeBox (Lnet/minecraft/class_2540;Lnet/minecraft/class_3341;)V + ARG 0 buf + ARG 1 box + METHOD method_53038 (Lnet/minecraft/class_2540;Lnet/minecraft/class_2540;Lnet/minecraft/class_8726$class_8727;)V + ARG 1 buf2 + ARG 2 piece + METHOD method_53039 readBox (Lnet/minecraft/class_2540;)Lnet/minecraft/class_3341; + ARG 0 buf + CLASS class_8727 Piece + METHOD (Lnet/minecraft/class_2540;)V + ARG 1 buf + METHOD method_53040 write (Lnet/minecraft/class_2540;)V + ARG 1 buf diff --git a/mappings/net/minecraft/network/packet/s2c/custom/DebugVillageSectionsCustomPayload.mapping b/mappings/net/minecraft/network/packet/s2c/custom/DebugVillageSectionsCustomPayload.mapping new file mode 100644 index 0000000000..b99f1e3317 --- /dev/null +++ b/mappings/net/minecraft/network/packet/s2c/custom/DebugVillageSectionsCustomPayload.mapping @@ -0,0 +1,4 @@ +CLASS net/minecraft/class_8728 net/minecraft/network/packet/s2c/custom/DebugVillageSectionsCustomPayload + FIELD field_45711 ID Lnet/minecraft/class_2960; + METHOD (Lnet/minecraft/class_2540;)V + ARG 1 buf diff --git a/mappings/net/minecraft/network/packet/s2c/custom/DebugWorldgenAttemptCustomPayload.mapping b/mappings/net/minecraft/network/packet/s2c/custom/DebugWorldgenAttemptCustomPayload.mapping new file mode 100644 index 0000000000..5d9ea278d7 --- /dev/null +++ b/mappings/net/minecraft/network/packet/s2c/custom/DebugWorldgenAttemptCustomPayload.mapping @@ -0,0 +1,4 @@ +CLASS net/minecraft/class_8729 net/minecraft/network/packet/s2c/custom/DebugWorldgenAttemptCustomPayload + FIELD field_45712 ID Lnet/minecraft/class_2960; + METHOD (Lnet/minecraft/class_2540;)V + ARG 1 buf diff --git a/mappings/net/minecraft/network/packet/s2c/login/LoginQueryRequestPayload.mapping b/mappings/net/minecraft/network/packet/s2c/login/LoginQueryRequestPayload.mapping new file mode 100644 index 0000000000..770d75594e --- /dev/null +++ b/mappings/net/minecraft/network/packet/s2c/login/LoginQueryRequestPayload.mapping @@ -0,0 +1,3 @@ +CLASS net/minecraft/class_8595 net/minecraft/network/packet/s2c/login/LoginQueryRequestPayload + METHOD method_52296 write (Lnet/minecraft/class_2540;)V + ARG 1 buf diff --git a/mappings/net/minecraft/network/packet/s2c/login/LoginQueryRequestS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/login/LoginQueryRequestS2CPacket.mapping index 680f899092..dafbf0b80e 100644 --- a/mappings/net/minecraft/network/packet/s2c/login/LoginQueryRequestS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/login/LoginQueryRequestS2CPacket.mapping @@ -1,14 +1,14 @@ CLASS net/minecraft/class_2899 net/minecraft/network/packet/s2c/login/LoginQueryRequestS2CPacket - FIELD field_13187 channel Lnet/minecraft/class_2960; - FIELD field_13188 queryId I - FIELD field_13189 payload Lnet/minecraft/class_2540; + FIELD comp_1567 queryId I FIELD field_33373 MAX_PAYLOAD_SIZE I - METHOD (ILnet/minecraft/class_2960;Lnet/minecraft/class_2540;)V + METHOD (ILnet/minecraft/class_8595;)V ARG 1 queryId - ARG 2 channel - ARG 3 payload METHOD (Lnet/minecraft/class_2540;)V ARG 1 buf - METHOD method_12592 getQueryId ()I - METHOD method_36176 getChannel ()Lnet/minecraft/class_2960; - METHOD method_36177 getPayload ()Lnet/minecraft/class_2540; + METHOD comp_1567 queryId ()I + METHOD method_52287 readPayload (Lnet/minecraft/class_2960;Lnet/minecraft/class_2540;)Lnet/minecraft/class_8595; + ARG 0 id + ARG 1 buf + METHOD method_52288 readUnknownPayload (Lnet/minecraft/class_2960;Lnet/minecraft/class_2540;)Lnet/minecraft/class_8597; + ARG 0 id + ARG 1 buf diff --git a/mappings/net/minecraft/network/packet/s2c/login/UnknownLoginQueryRequestPayload.mapping b/mappings/net/minecraft/network/packet/s2c/login/UnknownLoginQueryRequestPayload.mapping new file mode 100644 index 0000000000..9e371dded3 --- /dev/null +++ b/mappings/net/minecraft/network/packet/s2c/login/UnknownLoginQueryRequestPayload.mapping @@ -0,0 +1 @@ +CLASS net/minecraft/class_8597 net/minecraft/network/packet/s2c/login/UnknownLoginQueryRequestPayload diff --git a/mappings/net/minecraft/network/packet/s2c/play/AdvancementUpdateS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/AdvancementUpdateS2CPacket.mapping index cfc1a88f4c..5da6370ee1 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/AdvancementUpdateS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/AdvancementUpdateS2CPacket.mapping @@ -1,22 +1,21 @@ CLASS net/minecraft/class_2779 net/minecraft/network/packet/s2c/play/AdvancementUpdateS2CPacket FIELD field_12715 toRemove Ljava/util/Set; FIELD field_12716 toSetProgress Ljava/util/Map; - FIELD field_12717 toEarn Ljava/util/Map; + FIELD field_12717 toEarn Ljava/util/List; FIELD field_12718 clearCurrent Z METHOD (Lnet/minecraft/class_2540;)V ARG 1 buf METHOD (ZLjava/util/Collection;Ljava/util/Set;Ljava/util/Map;)V ARG 1 clearCurrent - ARG 2 toEarn ARG 3 toRemove ARG 4 toSetProgress METHOD method_11924 shouldClearCurrent ()Z METHOD method_11926 getAdvancementIdsToRemove ()Ljava/util/Set; METHOD method_11927 getAdvancementsToProgress ()Ljava/util/Map; - METHOD method_11928 getAdvancementsToEarn ()Ljava/util/Map; + METHOD method_11928 getAdvancementsToEarn ()Ljava/util/List; METHOD method_34197 (Lnet/minecraft/class_2540;Lnet/minecraft/class_167;)V ARG 0 buf2 ARG 1 progress - METHOD method_34198 (Lnet/minecraft/class_2540;Lnet/minecraft/class_161$class_162;)V + METHOD method_34198 (Lnet/minecraft/class_2540;Lnet/minecraft/class_8779;)V ARG 0 buf2 ARG 1 task diff --git a/mappings/net/minecraft/network/packet/s2c/play/BundleS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/BundleS2CPacket.mapping new file mode 100644 index 0000000000..f3d2a98c73 --- /dev/null +++ b/mappings/net/minecraft/network/packet/s2c/play/BundleS2CPacket.mapping @@ -0,0 +1 @@ +CLASS net/minecraft/class_8042 net/minecraft/network/packet/s2c/play/BundleS2CPacket diff --git a/mappings/net/minecraft/network/packet/s2c/play/ChatMessageS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/ChatMessageS2CPacket.mapping index 484ddfbc38..3a3b1c6135 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/ChatMessageS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/ChatMessageS2CPacket.mapping @@ -11,7 +11,8 @@ CLASS net/minecraft/class_7438 net/minecraft/network/packet/s2c/play/ChatMessage COMMENT from the one sent by the client, or because the passed signature is invalid) the client COMMENT will show a warning and can discard it depending on the options. COMMENT - COMMENT

    If the message takes more than {@link SignedMessage#CLIENTBOUND_TIME_TO_LIVE} + COMMENT

    If the message takes more than {@link + COMMENT net.minecraft.network.message.SignedMessage#CLIENTBOUND_TIME_TO_LIVE} COMMENT to reach the clients (including the time it originally took to reach the server), COMMENT the message is not considered secure anymore by the clients, and may be discarded COMMENT depending on the clients' options. @@ -22,5 +23,3 @@ CLASS net/minecraft/class_7438 net/minecraft/network/packet/s2c/play/ChatMessage METHOD (Lnet/minecraft/class_2540;)V ARG 1 buf METHOD comp_943 serializedParameters ()Lnet/minecraft/class_2556$class_7603; - METHOD method_44891 getParameters (Lnet/minecraft/class_5455;)Ljava/util/Optional; - ARG 1 dynamicRegistryManager diff --git a/mappings/net/minecraft/network/packet/s2c/play/ChatPreviewS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/ChatPreviewS2CPacket.mapping deleted file mode 100644 index d595b61edd..0000000000 --- a/mappings/net/minecraft/network/packet/s2c/play/ChatPreviewS2CPacket.mapping +++ /dev/null @@ -1,3 +0,0 @@ -CLASS net/minecraft/class_7494 net/minecraft/network/packet/s2c/play/ChatPreviewS2CPacket - METHOD (Lnet/minecraft/class_2540;)V - ARG 1 buf diff --git a/mappings/net/minecraft/network/packet/s2c/play/ChatPreviewStateChangeS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/ChatPreviewStateChangeS2CPacket.mapping deleted file mode 100644 index 8afffa73f9..0000000000 --- a/mappings/net/minecraft/network/packet/s2c/play/ChatPreviewStateChangeS2CPacket.mapping +++ /dev/null @@ -1,3 +0,0 @@ -CLASS net/minecraft/class_7519 net/minecraft/network/packet/s2c/play/ChatPreviewStateChangeS2CPacket - METHOD (Lnet/minecraft/class_2540;)V - ARG 1 buf diff --git a/mappings/net/minecraft/network/packet/s2c/play/ChunkBiomeDataS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/ChunkBiomeDataS2CPacket.mapping new file mode 100644 index 0000000000..fa22e521fb --- /dev/null +++ b/mappings/net/minecraft/network/packet/s2c/play/ChunkBiomeDataS2CPacket.mapping @@ -0,0 +1,23 @@ +CLASS net/minecraft/class_8212 net/minecraft/network/packet/s2c/play/ChunkBiomeDataS2CPacket + FIELD field_43094 MAX_SIZE I + METHOD (Lnet/minecraft/class_2540;)V + ARG 1 buf + METHOD method_49685 create (Ljava/util/List;)Lnet/minecraft/class_8212; + ARG 0 chunks + METHOD method_49686 (Lnet/minecraft/class_2540;Lnet/minecraft/class_8212$class_8213;)V + ARG 0 bufx + ARG 1 data + CLASS class_8213 Serialized + METHOD (Lnet/minecraft/class_2540;)V + ARG 1 buf + METHOD (Lnet/minecraft/class_2818;)V + ARG 1 chunk + METHOD method_49688 toReadingBuf ()Lnet/minecraft/class_2540; + METHOD method_49689 getTotalPacketSize (Lnet/minecraft/class_2818;)I + ARG 0 chunk + METHOD method_49690 write (Lnet/minecraft/class_2540;)V + ARG 1 buf + METHOD method_49691 write (Lnet/minecraft/class_2540;Lnet/minecraft/class_2818;)V + ARG 0 buf + ARG 1 chunk + METHOD method_49692 toWritingBuf ()Lio/netty/buffer/ByteBuf; diff --git a/mappings/net/minecraft/network/packet/s2c/play/ChunkDataS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/ChunkDataS2CPacket.mapping index f0beb92bb2..700d76b509 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/ChunkDataS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/ChunkDataS2CPacket.mapping @@ -5,13 +5,12 @@ CLASS net/minecraft/class_2672 net/minecraft/network/packet/s2c/play/ChunkDataS2 FIELD field_34871 lightData Lnet/minecraft/class_6606; METHOD (Lnet/minecraft/class_2540;)V ARG 1 buf - METHOD (Lnet/minecraft/class_2818;Lnet/minecraft/class_3568;Ljava/util/BitSet;Ljava/util/BitSet;Z)V + METHOD (Lnet/minecraft/class_2818;Lnet/minecraft/class_3568;Ljava/util/BitSet;Ljava/util/BitSet;)V ARG 1 chunk ARG 2 lightProvider ARG 3 skyBits ARG 4 blockBits - ARG 5 nonEdge - METHOD method_11523 getX ()I - METHOD method_11524 getZ ()I + METHOD method_11523 getChunkX ()I + METHOD method_11524 getChunkZ ()I METHOD method_38598 getChunkData ()Lnet/minecraft/class_6603; METHOD method_38599 getLightData ()Lnet/minecraft/class_6606; diff --git a/mappings/net/minecraft/network/packet/s2c/play/ChunkDeltaUpdateS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/ChunkDeltaUpdateS2CPacket.mapping index bad5f418d7..591271562f 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/ChunkDeltaUpdateS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/ChunkDeltaUpdateS2CPacket.mapping @@ -5,15 +5,13 @@ CLASS net/minecraft/class_2637 net/minecraft/network/packet/s2c/play/ChunkDeltaU COMMENT COMMENT @see ChunkSectionPos#packLocal(BlockPos) FIELD field_26347 blockStates [Lnet/minecraft/class_2680; - FIELD field_26749 noLightingUpdates Z METHOD (Lnet/minecraft/class_2540;)V ARG 1 buf - METHOD (Lnet/minecraft/class_4076;Lit/unimi/dsi/fastutil/shorts/ShortSet;Lnet/minecraft/class_2826;Z)V + METHOD (Lnet/minecraft/class_4076;Lit/unimi/dsi/fastutil/shorts/ShortSet;Lnet/minecraft/class_2826;)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_30621 visitUpdates (Ljava/util/function/BiConsumer;)V COMMENT Calls the given consumer for each pair of block position and block state contained in this packet. - METHOD method_31179 shouldSkipLightingUpdates ()Z + ARG 1 visitor diff --git a/mappings/net/minecraft/network/packet/s2c/play/ChunkSentS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/ChunkSentS2CPacket.mapping new file mode 100644 index 0000000000..b912dc071d --- /dev/null +++ b/mappings/net/minecraft/network/packet/s2c/play/ChunkSentS2CPacket.mapping @@ -0,0 +1,3 @@ +CLASS net/minecraft/class_8738 net/minecraft/network/packet/s2c/play/ChunkSentS2CPacket + METHOD (Lnet/minecraft/class_2540;)V + ARG 1 buf diff --git a/mappings/net/minecraft/network/packet/s2c/play/CommonPlayerSpawnInfo.mapping b/mappings/net/minecraft/network/packet/s2c/play/CommonPlayerSpawnInfo.mapping new file mode 100644 index 0000000000..4e10504a59 --- /dev/null +++ b/mappings/net/minecraft/network/packet/s2c/play/CommonPlayerSpawnInfo.mapping @@ -0,0 +1,9 @@ +CLASS net/minecraft/class_8589 net/minecraft/network/packet/s2c/play/CommonPlayerSpawnInfo + FIELD comp_1556 gameMode Lnet/minecraft/class_1934; + FIELD comp_1557 prevGameMode Lnet/minecraft/class_1934; + METHOD (Lnet/minecraft/class_2540;)V + ARG 1 buf + METHOD comp_1556 gameMode ()Lnet/minecraft/class_1934; + METHOD comp_1557 prevGameMode ()Lnet/minecraft/class_1934; + METHOD method_52274 write (Lnet/minecraft/class_2540;)V + ARG 1 buf diff --git a/mappings/net/minecraft/network/packet/s2c/play/CraftFailedResponseS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/CraftFailedResponseS2CPacket.mapping index 0320c04de1..b04926ded7 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/CraftFailedResponseS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/CraftFailedResponseS2CPacket.mapping @@ -1,9 +1,8 @@ CLASS net/minecraft/class_2695 net/minecraft/network/packet/s2c/play/CraftFailedResponseS2CPacket FIELD field_12332 recipeId Lnet/minecraft/class_2960; FIELD field_12333 syncId I - METHOD (ILnet/minecraft/class_1860;)V + METHOD (ILnet/minecraft/class_8786;)V ARG 1 syncId - ARG 2 recipe METHOD (Lnet/minecraft/class_2540;)V ARG 1 buf METHOD method_11684 getRecipeId ()Lnet/minecraft/class_2960; diff --git a/mappings/net/minecraft/network/packet/s2c/play/CustomPayloadS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/CustomPayloadS2CPacket.mapping deleted file mode 100644 index 0999603089..0000000000 --- a/mappings/net/minecraft/network/packet/s2c/play/CustomPayloadS2CPacket.mapping +++ /dev/null @@ -1,29 +0,0 @@ -CLASS net/minecraft/class_2658 net/minecraft/network/packet/s2c/play/CustomPayloadS2CPacket - FIELD field_12157 DEBUG_NEIGHBORS_UPDATE Lnet/minecraft/class_2960; - FIELD field_12158 BRAND Lnet/minecraft/class_2960; - FIELD field_12161 DEBUG_PATH Lnet/minecraft/class_2960; - FIELD field_12162 data Lnet/minecraft/class_2540; - FIELD field_12163 DEBUG_STRUCTURES Lnet/minecraft/class_2960; - FIELD field_12164 DEBUG_WORLDGEN_ATTEMPT Lnet/minecraft/class_2960; - FIELD field_12165 channel Lnet/minecraft/class_2960; - FIELD field_18799 DEBUG_GOAL_SELECTOR Lnet/minecraft/class_2960; - FIELD field_18800 DEBUG_BRAIN Lnet/minecraft/class_2960; - FIELD field_18957 DEBUG_POI_TICKET_COUNT Lnet/minecraft/class_2960; - FIELD field_18958 DEBUG_POI_ADDED Lnet/minecraft/class_2960; - FIELD field_18959 DEBUG_POI_REMOVED Lnet/minecraft/class_2960; - FIELD field_18960 DEBUG_VILLAGE_SECTIONS Lnet/minecraft/class_2960; - FIELD field_19331 DEBUG_RAIDS Lnet/minecraft/class_2960; - FIELD field_20599 DEBUG_GAME_TEST_ADD_MARKER Lnet/minecraft/class_2960; - FIELD field_20600 DEBUG_GAME_TEST_CLEAR Lnet/minecraft/class_2960; - FIELD field_21559 DEBUG_BEE Lnet/minecraft/class_2960; - FIELD field_21560 DEBUG_HIVE Lnet/minecraft/class_2960; - FIELD field_28284 DEBUG_GAME_EVENT Lnet/minecraft/class_2960; - FIELD field_28285 DEBUG_GAME_EVENT_LISTENERS Lnet/minecraft/class_2960; - FIELD field_33326 MAX_PAYLOAD_SIZE I - METHOD (Lnet/minecraft/class_2540;)V - ARG 1 buf - METHOD (Lnet/minecraft/class_2960;Lnet/minecraft/class_2540;)V - ARG 1 channel - ARG 2 data - METHOD method_11456 getChannel ()Lnet/minecraft/class_2960; - METHOD method_11458 getData ()Lnet/minecraft/class_2540; diff --git a/mappings/net/minecraft/network/packet/s2c/play/DamageTiltS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/DamageTiltS2CPacket.mapping new file mode 100644 index 0000000000..4bffd300c0 --- /dev/null +++ b/mappings/net/minecraft/network/packet/s2c/play/DamageTiltS2CPacket.mapping @@ -0,0 +1,5 @@ +CLASS net/minecraft/class_8043 net/minecraft/network/packet/s2c/play/DamageTiltS2CPacket + METHOD (Lnet/minecraft/class_1309;)V + ARG 1 entity + METHOD (Lnet/minecraft/class_2540;)V + ARG 1 buf diff --git a/mappings/net/minecraft/network/packet/s2c/play/DeathMessageS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/DeathMessageS2CPacket.mapping index a32411162a..d2ef187d84 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/DeathMessageS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/DeathMessageS2CPacket.mapping @@ -1,16 +1,10 @@ CLASS net/minecraft/class_5892 net/minecraft/network/packet/s2c/play/DeathMessageS2CPacket FIELD field_29133 entityId I - FIELD field_29134 killerId I FIELD field_29135 message Lnet/minecraft/class_2561; - METHOD (IILnet/minecraft/class_2561;)V + METHOD (ILnet/minecraft/class_2561;)V ARG 1 entityId - ARG 2 killerId - ARG 3 message - METHOD (Lnet/minecraft/class_1283;Lnet/minecraft/class_2561;)V - ARG 1 damageTracker ARG 2 message METHOD (Lnet/minecraft/class_2540;)V ARG 1 buf METHOD method_34144 getEntityId ()I METHOD method_34145 getMessage ()Lnet/minecraft/class_2561; - METHOD method_36153 getKillerId ()I diff --git a/mappings/net/minecraft/network/packet/s2c/play/EndCombatS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/EndCombatS2CPacket.mapping index 40b00d8139..3aacfc93b6 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/EndCombatS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/EndCombatS2CPacket.mapping @@ -1,9 +1,7 @@ CLASS net/minecraft/class_5890 net/minecraft/network/packet/s2c/play/EndCombatS2CPacket - FIELD field_29131 attackerId I FIELD field_29132 timeSinceLastAttack I - METHOD (II)V - ARG 1 attackerId - ARG 2 timeSinceLastAttack + METHOD (I)V + ARG 1 timeSinceLastAttack METHOD (Lnet/minecraft/class_1283;)V ARG 1 damageTracker METHOD (Lnet/minecraft/class_2540;)V diff --git a/mappings/net/minecraft/network/packet/s2c/play/EnterReconfigurationS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/EnterReconfigurationS2CPacket.mapping new file mode 100644 index 0000000000..c5b6e8f947 --- /dev/null +++ b/mappings/net/minecraft/network/packet/s2c/play/EnterReconfigurationS2CPacket.mapping @@ -0,0 +1,3 @@ +CLASS net/minecraft/class_8588 net/minecraft/network/packet/s2c/play/EnterReconfigurationS2CPacket + METHOD (Lnet/minecraft/class_2540;)V + ARG 1 buf diff --git a/mappings/net/minecraft/network/packet/s2c/play/EntityAnimationS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/EntityAnimationS2CPacket.mapping index d4647b6220..2349a31a40 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/EntityAnimationS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/EntityAnimationS2CPacket.mapping @@ -2,7 +2,6 @@ CLASS net/minecraft/class_2616 net/minecraft/network/packet/s2c/play/EntityAnima FIELD field_12028 animationId I FIELD field_12029 id I FIELD field_33295 SWING_MAIN_HAND I - FIELD field_33296 DAMAGE I FIELD field_33297 WAKE_UP I FIELD field_33298 SWING_OFF_HAND I FIELD field_33299 CRIT I diff --git a/mappings/net/minecraft/network/packet/s2c/play/EntityAttachS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/EntityAttachS2CPacket.mapping index 6bbc546ad7..4ad2c93714 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/EntityAttachS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/EntityAttachS2CPacket.mapping @@ -1,6 +1,6 @@ CLASS net/minecraft/class_2740 net/minecraft/network/packet/s2c/play/EntityAttachS2CPacket - FIELD field_12478 holdingId I - FIELD field_12479 attachedId I + FIELD field_12478 holdingEntityId I + FIELD field_12479 attachedEntityId I METHOD (Lnet/minecraft/class_1297;Lnet/minecraft/class_1297;)V ARG 1 attachedEntity ARG 2 holdingEntity diff --git a/mappings/net/minecraft/network/packet/s2c/play/EntityAttributesS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/EntityAttributesS2CPacket.mapping index 33ca378356..68359fc5ab 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/EntityAttributesS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/EntityAttributesS2CPacket.mapping @@ -27,5 +27,5 @@ CLASS net/minecraft/class_2781 net/minecraft/network/packet/s2c/play/EntityAttri ARG 2 baseValue ARG 4 modifiers METHOD method_11939 getModifiers ()Ljava/util/Collection; - METHOD method_11940 getId ()Lnet/minecraft/class_1320; + METHOD method_11940 getAttribute ()Lnet/minecraft/class_1320; METHOD method_11941 getBaseValue ()D diff --git a/mappings/net/minecraft/network/packet/s2c/play/EntityDamageS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/EntityDamageS2CPacket.mapping new file mode 100644 index 0000000000..e5c56643e1 --- /dev/null +++ b/mappings/net/minecraft/network/packet/s2c/play/EntityDamageS2CPacket.mapping @@ -0,0 +1,18 @@ +CLASS net/minecraft/class_8143 net/minecraft/network/packet/s2c/play/EntityDamageS2CPacket + METHOD (Lnet/minecraft/class_1297;Lnet/minecraft/class_1282;)V + ARG 1 entity + ARG 2 damageSource + METHOD (Lnet/minecraft/class_2540;)V + ARG 1 buf + METHOD method_49071 createDamageSource (Lnet/minecraft/class_1937;)Lnet/minecraft/class_1282; + ARG 1 world + METHOD method_49072 writeOffsetVarInt (Lnet/minecraft/class_2540;I)V + ARG 0 buf + ARG 1 value + METHOD method_49073 (Lnet/minecraft/class_2540;Lnet/minecraft/class_243;)V + ARG 0 bufx + ARG 1 pos + METHOD method_49075 readOffsetVarInt (Lnet/minecraft/class_2540;)I + ARG 0 buf + METHOD method_49076 (Lnet/minecraft/class_2540;)Lnet/minecraft/class_243; + ARG 0 pos diff --git a/mappings/net/minecraft/network/packet/s2c/play/EntitySpawnS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/EntitySpawnS2CPacket.mapping index 0703d4d255..bb9c550e0b 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/EntitySpawnS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/EntitySpawnS2CPacket.mapping @@ -8,7 +8,7 @@ CLASS net/minecraft/class_2604 net/minecraft/network/packet/s2c/play/EntitySpawn FIELD field_11952 uuid Ljava/util/UUID; FIELD field_11953 id I FIELD field_11954 entityData I - FIELD field_11955 entityTypeId Lnet/minecraft/class_1299; + FIELD field_11955 entityType Lnet/minecraft/class_1299; FIELD field_11956 z D FIELD field_11957 yaw B FIELD field_33293 VELOCITY_SCALE D @@ -24,7 +24,7 @@ CLASS net/minecraft/class_2604 net/minecraft/network/packet/s2c/play/EntitySpawn ARG 7 z ARG 9 pitch ARG 10 yaw - ARG 11 entityTypeId + ARG 11 entityType ARG 12 entityData ARG 13 velocity ARG 14 headYaw @@ -35,20 +35,15 @@ CLASS net/minecraft/class_2604 net/minecraft/network/packet/s2c/play/EntitySpawn ARG 2 entityData METHOD (Lnet/minecraft/class_1297;ILnet/minecraft/class_2338;)V ARG 1 entity - ARG 2 entityTypeId + ARG 2 entityData ARG 3 pos - METHOD (Lnet/minecraft/class_1309;)V - ARG 1 entity - METHOD (Lnet/minecraft/class_1309;I)V - ARG 1 entity - ARG 2 entityTypeId METHOD (Lnet/minecraft/class_2540;)V ARG 1 buf METHOD method_11164 getUuid ()Ljava/util/UUID; METHOD method_11166 getEntityData ()I METHOD method_11167 getId ()I METHOD method_11168 getYaw ()F - METHOD method_11169 getEntityTypeId ()Lnet/minecraft/class_1299; + METHOD method_11169 getEntityType ()Lnet/minecraft/class_1299; METHOD method_11170 getVelocityX ()D METHOD method_11171 getPitch ()F METHOD method_11172 getVelocityY ()D diff --git a/mappings/net/minecraft/network/packet/s2c/play/EntityStatusEffectS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/EntityStatusEffectS2CPacket.mapping index 053e3361fa..3155f481de 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/EntityStatusEffectS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/EntityStatusEffectS2CPacket.mapping @@ -18,7 +18,6 @@ CLASS net/minecraft/class_2783 net/minecraft/network/packet/s2c/play/EntityStatu METHOD method_11944 getDuration ()I METHOD method_11945 getAmplifier ()B METHOD method_11946 getEffectId ()Lnet/minecraft/class_1291; - METHOD method_11947 isPermanent ()Z METHOD method_11949 shouldShowParticles ()Z METHOD method_11950 isAmbient ()Z METHOD method_42625 getFactorCalculationData ()Lnet/minecraft/class_1293$class_7247; diff --git a/mappings/net/minecraft/network/packet/s2c/play/EntityTrackerUpdateS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/EntityTrackerUpdateS2CPacket.mapping index 25e0560595..054f41216a 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/EntityTrackerUpdateS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/EntityTrackerUpdateS2CPacket.mapping @@ -1,11 +1,15 @@ CLASS net/minecraft/class_2739 net/minecraft/network/packet/s2c/play/EntityTrackerUpdateS2CPacket - FIELD field_12476 id I - FIELD field_12477 trackedValues Ljava/util/List; - METHOD (ILnet/minecraft/class_2945;Z)V + FIELD comp_1127 id I + FIELD comp_1128 trackedValues Ljava/util/List; + FIELD field_40850 MARKER_ID I + METHOD (ILjava/util/List;)V ARG 1 id - ARG 2 tracker - ARG 3 forceUpdateAll METHOD (Lnet/minecraft/class_2540;)V ARG 1 buf - METHOD method_11807 id ()I - METHOD method_11809 getTrackedValues ()Ljava/util/List; + METHOD comp_1127 id ()I + METHOD comp_1128 trackedValues ()Ljava/util/List; + METHOD method_46615 write (Ljava/util/List;Lnet/minecraft/class_2540;)V + ARG 0 trackedValues + ARG 1 buf + METHOD method_46616 read (Lnet/minecraft/class_2540;)Ljava/util/List; + ARG 0 buf diff --git a/mappings/net/minecraft/network/packet/s2c/play/GameJoinS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/GameJoinS2CPacket.mapping index 0548d08b24..fd33399acd 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/GameJoinS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/GameJoinS2CPacket.mapping @@ -1,38 +1,19 @@ CLASS net/minecraft/class_2678 net/minecraft/network/packet/s2c/play/GameJoinS2CPacket FIELD comp_100 showDeathScreen Z - FIELD comp_101 debugWorld Z - FIELD comp_102 flatWorld Z FIELD comp_88 playerEntityId I FIELD comp_89 hardcore Z - FIELD comp_90 gameMode Lnet/minecraft/class_1934; - FIELD comp_91 previousGameMode Lnet/minecraft/class_1934; FIELD comp_92 dimensionIds Ljava/util/Set; - FIELD comp_93 registryManager Lnet/minecraft/class_5455$class_6890; - FIELD comp_94 dimensionType Lnet/minecraft/class_5321; - FIELD comp_95 dimensionId Lnet/minecraft/class_5321; - FIELD comp_96 sha256Seed J FIELD comp_97 maxPlayers I FIELD comp_98 viewDistance I FIELD comp_99 reducedDebugInfo Z - METHOD (IZLnet/minecraft/class_1934;Lnet/minecraft/class_1934;Ljava/util/Set;Lnet/minecraft/class_5455$class_6890;Lnet/minecraft/class_5321;Lnet/minecraft/class_5321;JIIIZZZZLjava/util/Optional;)V + METHOD (IZLjava/util/Set;IIIZZLnet/minecraft/class_8589;)V ARG 1 playerEntityId - ARG 3 previousGameMode - ARG 11 maxPlayers - ARG 12 chunkLoadDistance METHOD (Lnet/minecraft/class_2540;)V ARG 1 buf METHOD comp_100 showDeathScreen ()Z - METHOD comp_101 debugWorld ()Z - METHOD comp_102 flatWorld ()Z METHOD comp_88 playerEntityId ()I METHOD comp_89 hardcore ()Z - METHOD comp_90 gameMode ()Lnet/minecraft/class_1934; - METHOD comp_91 previousGameMode ()Lnet/minecraft/class_1934; METHOD comp_92 dimensionIds ()Ljava/util/Set; - METHOD comp_93 registryManager ()Lnet/minecraft/class_5455$class_6890; - METHOD comp_94 dimensionType ()Lnet/minecraft/class_5321; - METHOD comp_95 dimensionId ()Lnet/minecraft/class_5321; - METHOD comp_96 sha256Seed ()J METHOD comp_97 maxPlayers ()I METHOD comp_98 viewDistance ()I METHOD comp_99 reducedDebugInfo ()Z diff --git a/mappings/net/minecraft/network/packet/s2c/play/LightData.mapping b/mappings/net/minecraft/network/packet/s2c/play/LightData.mapping index 94a4bdb129..d7d73f33b6 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/LightData.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/LightData.mapping @@ -5,13 +5,11 @@ CLASS net/minecraft/class_6606 net/minecraft/network/packet/s2c/play/LightData FIELD field_34876 uninitedBlock Ljava/util/BitSet; FIELD field_34877 skyNibbles Ljava/util/List; FIELD field_34878 blockNibbles Ljava/util/List; - FIELD field_34879 nonEdge Z - METHOD (Lnet/minecraft/class_1923;Lnet/minecraft/class_3568;Ljava/util/BitSet;Ljava/util/BitSet;Z)V + METHOD (Lnet/minecraft/class_1923;Lnet/minecraft/class_3568;Ljava/util/BitSet;Ljava/util/BitSet;)V ARG 1 pos ARG 2 lightProvider ARG 3 skyBits ARG 4 blockBits - ARG 5 nonEdge METHOD (Lnet/minecraft/class_2540;II)V ARG 1 buf ARG 2 x @@ -36,4 +34,3 @@ CLASS net/minecraft/class_6606 net/minecraft/network/packet/s2c/play/LightData METHOD method_38608 getInitedBlock ()Ljava/util/BitSet; METHOD method_38609 getUninitedBlock ()Ljava/util/BitSet; METHOD method_38610 getBlockNibbles ()Ljava/util/List; - METHOD method_38611 isNonEdge ()Z diff --git a/mappings/net/minecraft/network/packet/s2c/play/LightUpdateS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/LightUpdateS2CPacket.mapping index bf7eefbe3e..c4b1ab1402 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/LightUpdateS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/LightUpdateS2CPacket.mapping @@ -2,12 +2,11 @@ CLASS net/minecraft/class_2676 net/minecraft/network/packet/s2c/play/LightUpdate FIELD field_12264 chunkZ I FIELD field_12265 chunkX I FIELD field_34872 data Lnet/minecraft/class_6606; - METHOD (Lnet/minecraft/class_1923;Lnet/minecraft/class_3568;Ljava/util/BitSet;Ljava/util/BitSet;Z)V + METHOD (Lnet/minecraft/class_1923;Lnet/minecraft/class_3568;Ljava/util/BitSet;Ljava/util/BitSet;)V ARG 1 chunkPos ARG 2 lightProvider ARG 3 skyBits ARG 4 blockBits - ARG 5 nonEdge METHOD (Lnet/minecraft/class_2540;)V ARG 1 buf METHOD method_11554 getChunkZ ()I diff --git a/mappings/net/minecraft/network/packet/s2c/play/MapUpdateS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/MapUpdateS2CPacket.mapping index 2fd028af8a..2f11232710 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/MapUpdateS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/MapUpdateS2CPacket.mapping @@ -7,7 +7,7 @@ CLASS net/minecraft/class_2683 net/minecraft/network/packet/s2c/play/MapUpdateS2 METHOD (IBZLjava/util/Collection;Lnet/minecraft/class_22$class_5637;)V ARG 1 id ARG 2 scale - ARG 3 showIcons + ARG 3 locked ARG 4 icons ARG 5 updateData METHOD (Lnet/minecraft/class_2540;)V diff --git a/mappings/net/minecraft/network/packet/s2c/play/MessageHeaderS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/MessageHeaderS2CPacket.mapping deleted file mode 100644 index caeee93a3a..0000000000 --- a/mappings/net/minecraft/network/packet/s2c/play/MessageHeaderS2CPacket.mapping +++ /dev/null @@ -1,5 +0,0 @@ -CLASS net/minecraft/class_7618 net/minecraft/network/packet/s2c/play/MessageHeaderS2CPacket - METHOD (Lnet/minecraft/class_2540;)V - ARG 1 buf - METHOD (Lnet/minecraft/class_7471;)V - ARG 1 message diff --git a/mappings/net/minecraft/network/packet/s2c/play/PlaySoundFromEntityS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/PlaySoundFromEntityS2CPacket.mapping index b04e156b1e..5bcd5d75d2 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/PlaySoundFromEntityS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/PlaySoundFromEntityS2CPacket.mapping @@ -3,11 +3,11 @@ CLASS net/minecraft/class_2765 net/minecraft/network/packet/s2c/play/PlaySoundFr FIELD field_12639 volume F FIELD field_12640 entityId I FIELD field_12641 category Lnet/minecraft/class_3419; - FIELD field_12642 sound Lnet/minecraft/class_3414; + FIELD field_12642 sound Lnet/minecraft/class_6880; FIELD field_38819 seed J METHOD (Lnet/minecraft/class_2540;)V ARG 1 buf - METHOD (Lnet/minecraft/class_3414;Lnet/minecraft/class_3419;Lnet/minecraft/class_1297;FFJ)V + METHOD (Lnet/minecraft/class_6880;Lnet/minecraft/class_3419;Lnet/minecraft/class_1297;FFJ)V ARG 1 sound ARG 2 category ARG 3 entity @@ -16,7 +16,7 @@ CLASS net/minecraft/class_2765 net/minecraft/network/packet/s2c/play/PlaySoundFr ARG 6 seed METHOD method_11880 getPitch ()F METHOD method_11881 getCategory ()Lnet/minecraft/class_3419; - METHOD method_11882 getSound ()Lnet/minecraft/class_3414; + METHOD method_11882 getSound ()Lnet/minecraft/class_6880; METHOD method_11883 getEntityId ()I METHOD method_11885 getVolume ()F METHOD method_43235 getSeed ()J diff --git a/mappings/net/minecraft/network/packet/s2c/play/PlaySoundIdS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/PlaySoundIdS2CPacket.mapping deleted file mode 100644 index 8c1d4067ce..0000000000 --- a/mappings/net/minecraft/network/packet/s2c/play/PlaySoundIdS2CPacket.mapping +++ /dev/null @@ -1,27 +0,0 @@ -CLASS net/minecraft/class_2660 net/minecraft/network/packet/s2c/play/PlaySoundIdS2CPacket - FIELD field_12166 volume F - FIELD field_12167 fixedZ I - FIELD field_12168 fixedY I - FIELD field_12169 fixedX I - FIELD field_12170 id Lnet/minecraft/class_2960; - FIELD field_12171 category Lnet/minecraft/class_3419; - FIELD field_12172 pitch F - FIELD field_33327 COORDINATE_SCALE F - FIELD field_38818 seed J - METHOD (Lnet/minecraft/class_2540;)V - ARG 1 buf - METHOD (Lnet/minecraft/class_2960;Lnet/minecraft/class_3419;Lnet/minecraft/class_243;FFJ)V - ARG 1 sound - ARG 2 category - ARG 3 pos - ARG 4 volume - ARG 5 pitch - ARG 6 seed - METHOD method_11459 getCategory ()Lnet/minecraft/class_3419; - METHOD method_11460 getSoundId ()Lnet/minecraft/class_2960; - METHOD method_11461 getY ()D - METHOD method_11462 getX ()D - METHOD method_11463 getVolume ()F - METHOD method_11464 getPitch ()F - METHOD method_11465 getZ ()D - METHOD method_43234 getSeed ()J diff --git a/mappings/net/minecraft/network/packet/s2c/play/PlaySoundS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/PlaySoundS2CPacket.mapping index 80d66fd422..91fe732cd8 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/PlaySoundS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/PlaySoundS2CPacket.mapping @@ -4,13 +4,13 @@ CLASS net/minecraft/class_2767 net/minecraft/network/packet/s2c/play/PlaySoundS2 FIELD field_12658 fixedY I FIELD field_12659 fixedX I FIELD field_12660 category Lnet/minecraft/class_3419; - FIELD field_12661 sound Lnet/minecraft/class_3414; + FIELD field_12661 sound Lnet/minecraft/class_6880; FIELD field_12662 pitch F FIELD field_33353 COORDINATE_SCALE F FIELD field_38820 seed J METHOD (Lnet/minecraft/class_2540;)V ARG 1 buf - METHOD (Lnet/minecraft/class_3414;Lnet/minecraft/class_3419;DDDFFJ)V + METHOD (Lnet/minecraft/class_6880;Lnet/minecraft/class_3419;DDDFFJ)V ARG 1 sound ARG 2 category ARG 3 x @@ -25,5 +25,5 @@ CLASS net/minecraft/class_2767 net/minecraft/network/packet/s2c/play/PlaySoundS2 METHOD method_11891 getVolume ()F METHOD method_11892 getPitch ()F METHOD method_11893 getZ ()D - METHOD method_11894 getSound ()Lnet/minecraft/class_3414; + METHOD method_11894 getSound ()Lnet/minecraft/class_6880; METHOD method_43236 getSeed ()J diff --git a/mappings/net/minecraft/network/packet/s2c/play/PlayerListS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/PlayerListS2CPacket.mapping index ee33804eac..fb6cf9e061 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/PlayerListS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/PlayerListS2CPacket.mapping @@ -1,42 +1,93 @@ CLASS net/minecraft/class_2703 net/minecraft/network/packet/s2c/play/PlayerListS2CPacket - FIELD field_12368 action Lnet/minecraft/class_2703$class_5893; FIELD field_12369 entries Ljava/util/List; + FIELD field_40698 actions Ljava/util/EnumSet; + METHOD (Ljava/util/EnumSet;Ljava/util/Collection;)V + ARG 1 actions + ARG 2 players METHOD (Lnet/minecraft/class_2540;)V ARG 1 buf - METHOD (Lnet/minecraft/class_2703$class_5893;Ljava/util/Collection;)V - ARG 1 action - ARG 2 players - METHOD (Lnet/minecraft/class_2703$class_5893;[Lnet/minecraft/class_3222;)V + METHOD (Lnet/minecraft/class_2703$class_5893;Lnet/minecraft/class_3222;)V ARG 1 action - ARG 2 players - METHOD method_11722 getEntries ()Ljava/util/List; - METHOD method_11723 getAction ()Lnet/minecraft/class_2703$class_5893; - METHOD method_43886 entryFromPlayer (Lnet/minecraft/class_3222;)Lnet/minecraft/class_2703$class_2705; - ARG 0 player + ARG 2 player + METHOD method_43886 entryFromPlayer (Ljava/util/Collection;)Lnet/minecraft/class_2703; + ARG 0 players + METHOD method_46326 (Lnet/minecraft/class_2540;Lnet/minecraft/class_2703$class_2705;)V + ARG 1 buf2 + ARG 2 entry + METHOD method_46327 getActions ()Ljava/util/EnumSet; + METHOD method_46328 (Lnet/minecraft/class_2540;)Lnet/minecraft/class_2703$class_2705; + ARG 1 buf2 + METHOD method_46329 getEntries ()Ljava/util/List; + METHOD method_46330 getPlayerAdditionEntries ()Ljava/util/List; CLASS class_2705 Entry - FIELD field_12377 displayName Lnet/minecraft/class_2561; - FIELD field_12378 latency I - FIELD field_12379 gameMode Lnet/minecraft/class_1934; - FIELD field_12380 profile Lcom/mojang/authlib/GameProfile; - FIELD field_39243 publicKeyData Lnet/minecraft/class_7428$class_7443; - METHOD (Lcom/mojang/authlib/GameProfile;ILnet/minecraft/class_1934;Lnet/minecraft/class_2561;Lnet/minecraft/class_7428$class_7443;)V - ARG 1 profile - ARG 2 latency - ARG 3 gameMode - ARG 4 displayName - ARG 5 publicKeyData - METHOD method_11724 getDisplayName ()Lnet/minecraft/class_2561; - METHOD method_11725 getGameMode ()Lnet/minecraft/class_1934; - METHOD method_11726 getProfile ()Lcom/mojang/authlib/GameProfile; - METHOD method_11727 getLatency ()I - METHOD method_43889 getPublicKeyData ()Lnet/minecraft/class_7428$class_7443; + FIELD comp_1107 profile Lcom/mojang/authlib/GameProfile; + FIELD comp_1109 latency I + FIELD comp_1110 gameMode Lnet/minecraft/class_1934; + FIELD comp_1111 displayName Lnet/minecraft/class_2561; + METHOD (Lnet/minecraft/class_3222;)V + ARG 1 player + METHOD comp_1107 profile ()Lcom/mojang/authlib/GameProfile; + METHOD comp_1109 latency ()I + METHOD comp_1110 gameMode ()Lnet/minecraft/class_1934; + METHOD comp_1111 displayName ()Lnet/minecraft/class_2561; CLASS class_5893 Action - METHOD method_34150 read (Lnet/minecraft/class_2540;)Lnet/minecraft/class_2703$class_2705; + FIELD field_40701 reader Lnet/minecraft/class_2703$class_5893$class_7829; + FIELD field_40702 writer Lnet/minecraft/class_2703$class_5893$class_7830; + METHOD (Ljava/lang/String;ILnet/minecraft/class_2703$class_5893$class_7829;Lnet/minecraft/class_2703$class_5893$class_7830;)V + ARG 3 reader + ARG 4 writer + METHOD method_46331 (Lnet/minecraft/class_2540;Lnet/minecraft/class_2703$class_2705;)V + ARG 0 buf + ARG 1 entry + METHOD method_46332 (Lnet/minecraft/class_2703$class_7831;Lnet/minecraft/class_2540;)V + ARG 0 serialized + ARG 1 buf + METHOD method_46333 (Lnet/minecraft/class_2540;Lnet/minecraft/class_2703$class_2705;)V + ARG 0 buf + ARG 1 entry + METHOD method_46334 (Lnet/minecraft/class_2703$class_7831;Lnet/minecraft/class_2540;)V + ARG 0 serialized + ARG 1 buf + METHOD method_46335 (Lnet/minecraft/class_2540;Lnet/minecraft/class_2703$class_2705;)V + ARG 0 buf + ARG 1 entry + METHOD method_46336 (Lnet/minecraft/class_2703$class_7831;Lnet/minecraft/class_2540;)V + ARG 0 serialized + ARG 1 buf + METHOD method_46337 (Lnet/minecraft/class_2540;Lnet/minecraft/class_2703$class_2705;)V + ARG 0 buf + ARG 1 entry + METHOD method_46338 (Lnet/minecraft/class_2703$class_7831;Lnet/minecraft/class_2540;)V + ARG 0 serialized + ARG 1 buf + METHOD method_46339 (Lnet/minecraft/class_2540;Lnet/minecraft/class_2703$class_2705;)V + ARG 0 buf + ARG 1 entry + METHOD method_46340 (Lnet/minecraft/class_2703$class_7831;Lnet/minecraft/class_2540;)V + ARG 0 serialized ARG 1 buf - METHOD method_34151 write (Lnet/minecraft/class_2540;Lnet/minecraft/class_2703$class_2705;)V + METHOD method_46341 (Lnet/minecraft/class_2540;Lnet/minecraft/class_2703$class_2705;)V + ARG 0 buf + ARG 1 entry + METHOD method_46342 (Lnet/minecraft/class_2703$class_7831;Lnet/minecraft/class_2540;)V + ARG 0 serialized ARG 1 buf - ARG 2 entry - CLASS 1 - METHOD method_43887 (Lnet/minecraft/class_2540;Lnet/minecraft/class_7428$class_7443;)V - ARG 0 buf2 - ARG 1 publicKeyData + CLASS class_7829 Reader + METHOD read (Lnet/minecraft/class_2703$class_7831;Lnet/minecraft/class_2540;)V + ARG 1 serialized + ARG 2 buf + CLASS class_7830 Writer + METHOD write (Lnet/minecraft/class_2540;Lnet/minecraft/class_2703$class_2705;)V + ARG 1 buf + ARG 2 entry + CLASS class_7831 Serialized + FIELD field_40703 profileId Ljava/util/UUID; + FIELD field_40704 gameProfile Lcom/mojang/authlib/GameProfile; + FIELD field_40705 listed Z + FIELD field_40706 latency I + FIELD field_40707 gameMode Lnet/minecraft/class_1934; + FIELD field_40708 displayName Lnet/minecraft/class_2561; + FIELD field_40709 session Lnet/minecraft/class_7822$class_7823; + METHOD (Ljava/util/UUID;)V + ARG 1 profileId + METHOD method_46343 toEntry ()Lnet/minecraft/class_2703$class_2705; diff --git a/mappings/net/minecraft/network/packet/s2c/play/PlayerPositionLookS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/PlayerPositionLookS2CPacket.mapping index 7a1547c009..c0d02fb80b 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/PlayerPositionLookS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/PlayerPositionLookS2CPacket.mapping @@ -6,8 +6,7 @@ CLASS net/minecraft/class_2708 net/minecraft/network/packet/s2c/play/PlayerPosit FIELD field_12394 teleportId I FIELD field_12395 x D FIELD field_12396 flags Ljava/util/Set; - FIELD field_28805 shouldDismount Z - METHOD (DDDFFLjava/util/Set;IZ)V + METHOD (DDDFFLjava/util/Set;I)V ARG 1 x ARG 3 y ARG 5 z @@ -15,7 +14,6 @@ CLASS net/minecraft/class_2708 net/minecraft/network/packet/s2c/play/PlayerPosit ARG 8 pitch ARG 9 flags ARG 10 teleportId - ARG 11 shouldDismount METHOD (Lnet/minecraft/class_2540;)V ARG 1 buf METHOD method_11733 getFlags ()Ljava/util/Set; @@ -25,15 +23,3 @@ CLASS net/minecraft/class_2708 net/minecraft/network/packet/s2c/play/PlayerPosit METHOD method_11737 getTeleportId ()I METHOD method_11738 getZ ()D METHOD method_11739 getPitch ()F - METHOD method_33718 shouldDismount ()Z - CLASS class_2709 Flag - FIELD field_12399 shift I - METHOD (Ljava/lang/String;II)V - ARG 3 shift - METHOD method_11741 getBitfield (Ljava/util/Set;)I - ARG 0 flags - METHOD method_11742 getMask ()I - METHOD method_11743 isSet (I)Z - ARG 1 mask - METHOD method_11744 getFlags (I)Ljava/util/Set; - ARG 0 mask diff --git a/mappings/net/minecraft/network/packet/s2c/play/PlayerRemoveS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/PlayerRemoveS2CPacket.mapping new file mode 100644 index 0000000000..896ad94019 --- /dev/null +++ b/mappings/net/minecraft/network/packet/s2c/play/PlayerRemoveS2CPacket.mapping @@ -0,0 +1,3 @@ +CLASS net/minecraft/class_7828 net/minecraft/network/packet/s2c/play/PlayerRemoveS2CPacket + METHOD (Lnet/minecraft/class_2540;)V + ARG 1 buf diff --git a/mappings/net/minecraft/network/packet/s2c/play/PlayerRespawnS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/PlayerRespawnS2CPacket.mapping index e81c73d972..4bb2f23a42 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/PlayerRespawnS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/PlayerRespawnS2CPacket.mapping @@ -1,31 +1,10 @@ CLASS net/minecraft/class_2724 net/minecraft/network/packet/s2c/play/PlayerRespawnS2CPacket - FIELD field_12431 dimension Lnet/minecraft/class_5321; - FIELD field_12434 gameMode Lnet/minecraft/class_1934; - FIELD field_20667 sha256Seed J - FIELD field_24451 keepPlayerAttributes Z - FIELD field_24620 debugWorld Z - FIELD field_24621 flatWorld Z - FIELD field_25322 dimensionType Lnet/minecraft/class_5321; - FIELD field_25714 previousGameMode Lnet/minecraft/class_1934; - FIELD field_39447 lastDeathPos Ljava/util/Optional; + FIELD comp_1729 flag B + FIELD field_41730 KEEP_ATTRIBUTES B + FIELD field_41731 KEEP_TRACKED_DATA B + FIELD field_41732 KEEP_ALL B METHOD (Lnet/minecraft/class_2540;)V ARG 1 buf - METHOD (Lnet/minecraft/class_5321;Lnet/minecraft/class_5321;JLnet/minecraft/class_1934;Lnet/minecraft/class_1934;ZZZLjava/util/Optional;)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 - ARG 10 lastDeathPos - METHOD method_11779 getDimension ()Lnet/minecraft/class_5321; - METHOD method_11780 getGameMode ()Lnet/minecraft/class_1934; - METHOD method_22425 getSha256Seed ()J - METHOD method_27904 shouldKeepPlayerAttributes ()Z - METHOD method_28120 isDebugWorld ()Z - METHOD method_28121 isFlatWorld ()Z - METHOD method_29445 getDimensionType ()Lnet/minecraft/class_5321; - METHOD method_30117 getPreviousGameMode ()Lnet/minecraft/class_1934; - METHOD method_44326 getLastDeathPos ()Ljava/util/Optional; + METHOD comp_1729 flag ()B + METHOD method_48016 hasFlag (B)Z + ARG 1 flag diff --git a/mappings/net/minecraft/network/packet/s2c/play/PositionFlag.mapping b/mappings/net/minecraft/network/packet/s2c/play/PositionFlag.mapping new file mode 100644 index 0000000000..143a426f14 --- /dev/null +++ b/mappings/net/minecraft/network/packet/s2c/play/PositionFlag.mapping @@ -0,0 +1,13 @@ +CLASS net/minecraft/class_2709 net/minecraft/network/packet/s2c/play/PositionFlag + FIELD field_12399 shift I + FIELD field_40710 VALUES Ljava/util/Set; + FIELD field_40711 ROT Ljava/util/Set; + METHOD (Ljava/lang/String;II)V + ARG 3 shift + METHOD method_11741 getBitfield (Ljava/util/Set;)I + ARG 0 flags + METHOD method_11742 getMask ()I + METHOD method_11743 isSet (I)Z + ARG 1 mask + METHOD method_11744 getFlags (I)Ljava/util/Set; + ARG 0 mask diff --git a/mappings/net/minecraft/network/packet/s2c/play/ProfilelessChatMessageS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/ProfilelessChatMessageS2CPacket.mapping new file mode 100644 index 0000000000..173b5c2601 --- /dev/null +++ b/mappings/net/minecraft/network/packet/s2c/play/ProfilelessChatMessageS2CPacket.mapping @@ -0,0 +1,3 @@ +CLASS net/minecraft/class_7827 net/minecraft/network/packet/s2c/play/ProfilelessChatMessageS2CPacket + METHOD (Lnet/minecraft/class_2540;)V + ARG 1 buf diff --git a/mappings/net/minecraft/network/packet/s2c/play/HideMessageS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/RemoveMessageS2CPacket.mapping similarity index 81% rename from mappings/net/minecraft/network/packet/s2c/play/HideMessageS2CPacket.mapping rename to mappings/net/minecraft/network/packet/s2c/play/RemoveMessageS2CPacket.mapping index 0164007390..9b17f2dcec 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/HideMessageS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/RemoveMessageS2CPacket.mapping @@ -1,3 +1,3 @@ -CLASS net/minecraft/class_7617 net/minecraft/network/packet/s2c/play/HideMessageS2CPacket +CLASS net/minecraft/class_7617 net/minecraft/network/packet/s2c/play/RemoveMessageS2CPacket METHOD (Lnet/minecraft/class_2540;)V ARG 1 buf diff --git a/mappings/net/minecraft/network/packet/s2c/play/ScoreboardDisplayS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/ScoreboardDisplayS2CPacket.mapping index e6402a063d..60eb84195b 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/ScoreboardDisplayS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/ScoreboardDisplayS2CPacket.mapping @@ -1,10 +1,10 @@ CLASS net/minecraft/class_2736 net/minecraft/network/packet/s2c/play/ScoreboardDisplayS2CPacket - FIELD field_12464 slot I + FIELD field_12464 slot Lnet/minecraft/class_8646; FIELD field_12465 name Ljava/lang/String; - METHOD (ILnet/minecraft/class_266;)V - ARG 1 slot - ARG 2 objective METHOD (Lnet/minecraft/class_2540;)V ARG 1 buf + METHOD (Lnet/minecraft/class_8646;Lnet/minecraft/class_266;)V + ARG 1 slot + ARG 2 objective METHOD method_11804 getName ()Ljava/lang/String; - METHOD method_11806 getSlot ()I + METHOD method_11806 getSlot ()Lnet/minecraft/class_8646; diff --git a/mappings/net/minecraft/network/packet/s2c/play/ScoreboardPlayerUpdateS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/ScoreboardPlayerUpdateS2CPacket.mapping index 55f1a479bb..638d2c64d3 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/ScoreboardPlayerUpdateS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/ScoreboardPlayerUpdateS2CPacket.mapping @@ -1,12 +1,12 @@ CLASS net/minecraft/class_2757 net/minecraft/network/packet/s2c/play/ScoreboardPlayerUpdateS2CPacket FIELD field_12610 playerName Ljava/lang/String; FIELD field_12611 score I - FIELD field_12612 mode Lnet/minecraft/class_2995$class_2996; + FIELD field_12612 updateMode Lnet/minecraft/class_2995$class_2996; FIELD field_12613 objectiveName Ljava/lang/String; METHOD (Lnet/minecraft/class_2540;)V ARG 1 buf METHOD (Lnet/minecraft/class_2995$class_2996;Ljava/lang/String;Ljava/lang/String;I)V - ARG 1 mode + ARG 1 updateMode ARG 2 objectiveName ARG 3 playerName ARG 4 score diff --git a/mappings/net/minecraft/network/packet/s2c/play/ScreenHandlerSlotUpdateS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/ScreenHandlerSlotUpdateS2CPacket.mapping index c75ff0a07a..ce33b3408e 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/ScreenHandlerSlotUpdateS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/ScreenHandlerSlotUpdateS2CPacket.mapping @@ -12,7 +12,7 @@ CLASS net/minecraft/class_2653 net/minecraft/network/packet/s2c/play/ScreenHandl ARG 4 stack METHOD (Lnet/minecraft/class_2540;)V ARG 1 buf - METHOD method_11449 getItemStack ()Lnet/minecraft/class_1799; + METHOD method_11449 getStack ()Lnet/minecraft/class_1799; METHOD method_11450 getSlot ()I METHOD method_11452 getSyncId ()I METHOD method_37439 getRevision ()I diff --git a/mappings/net/minecraft/network/packet/s2c/play/ServerMetadataS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/ServerMetadataS2CPacket.mapping index dfe253f237..1a93ab06cc 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/ServerMetadataS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/ServerMetadataS2CPacket.mapping @@ -1,16 +1,13 @@ CLASS net/minecraft/class_7495 net/minecraft/network/packet/s2c/play/ServerMetadataS2CPacket - FIELD field_39387 description Ljava/util/Optional; - FIELD field_39388 favicon Ljava/util/Optional; - FIELD field_39389 previewsChat Z + FIELD field_39387 description Lnet/minecraft/class_2561; FIELD field_39920 secureChatEnforced Z + FIELD field_42967 favicon Ljava/util/Optional; METHOD (Lnet/minecraft/class_2540;)V ARG 1 buf - METHOD (Lnet/minecraft/class_2561;Ljava/lang/String;ZZ)V + METHOD (Lnet/minecraft/class_2561;Ljava/util/Optional;Z)V ARG 1 description ARG 2 favicon ARG 3 previewsChat - ARG 4 secureChatEnforced - METHOD method_44132 getDescription ()Ljava/util/Optional; - METHOD method_44133 getFavicon ()Ljava/util/Optional; - METHOD method_44134 shouldPreviewChat ()Z + METHOD method_44132 getDescription ()Lnet/minecraft/class_2561; METHOD method_45058 isSecureChatEnforced ()Z + METHOD method_49398 getFavicon ()Ljava/util/Optional; diff --git a/mappings/net/minecraft/network/packet/s2c/play/SetTradeOffersS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/SetTradeOffersS2CPacket.mapping index ec48f9ba4a..4bb3a8d1ab 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/SetTradeOffersS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/SetTradeOffersS2CPacket.mapping @@ -1,13 +1,13 @@ CLASS net/minecraft/class_3943 net/minecraft/network/packet/s2c/play/SetTradeOffersS2CPacket FIELD field_17434 syncId I - FIELD field_17435 recipes Lnet/minecraft/class_1916; + FIELD field_17435 offers Lnet/minecraft/class_1916; FIELD field_18801 levelProgress I FIELD field_18802 experience I FIELD field_18803 leveled Z FIELD field_19376 refreshable Z METHOD (ILnet/minecraft/class_1916;IIZZ)V ARG 1 syncId - ARG 2 recipes + ARG 2 offers ARG 3 levelProgress ARG 4 experience ARG 5 leveled diff --git a/mappings/net/minecraft/network/packet/s2c/play/SignEditorOpenS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/SignEditorOpenS2CPacket.mapping index 92d12ab5e1..94b400bdb5 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/SignEditorOpenS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/SignEditorOpenS2CPacket.mapping @@ -1,7 +1,10 @@ CLASS net/minecraft/class_2693 net/minecraft/network/packet/s2c/play/SignEditorOpenS2CPacket FIELD field_12325 pos Lnet/minecraft/class_2338; - METHOD (Lnet/minecraft/class_2338;)V + FIELD field_43387 front Z + METHOD (Lnet/minecraft/class_2338;Z)V ARG 1 pos + ARG 2 front METHOD (Lnet/minecraft/class_2540;)V ARG 1 buf METHOD method_11677 getPos ()Lnet/minecraft/class_2338; + METHOD method_49995 isFront ()Z diff --git a/mappings/net/minecraft/network/packet/s2c/play/StartChunkSendS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/StartChunkSendS2CPacket.mapping new file mode 100644 index 0000000000..c0db450c0e --- /dev/null +++ b/mappings/net/minecraft/network/packet/s2c/play/StartChunkSendS2CPacket.mapping @@ -0,0 +1,3 @@ +CLASS net/minecraft/class_8739 net/minecraft/network/packet/s2c/play/StartChunkSendS2CPacket + METHOD (Lnet/minecraft/class_2540;)V + ARG 1 buf diff --git a/mappings/net/minecraft/network/packet/s2c/play/StatisticsS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/StatisticsS2CPacket.mapping index e48368b901..929cdb6cc5 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/StatisticsS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/StatisticsS2CPacket.mapping @@ -4,12 +4,12 @@ CLASS net/minecraft/class_2617 net/minecraft/network/packet/s2c/play/StatisticsS ARG 1 stats METHOD (Lnet/minecraft/class_2540;)V ARG 1 buf - METHOD method_11273 getStatMap ()Ljava/util/Map; + METHOD method_11273 getStats ()Ljava/util/Map; METHOD method_34087 write (Lnet/minecraft/class_2540;Lnet/minecraft/class_3445;)V ARG 0 buf ARG 1 stat METHOD method_34088 (Lnet/minecraft/class_2540;Lnet/minecraft/class_2540;)Lnet/minecraft/class_3445; - ARG 1 buf + ARG 1 bufx METHOD method_42066 getOrCreateStat (Lnet/minecraft/class_2540;Lnet/minecraft/class_3448;)Lnet/minecraft/class_3445; ARG 0 buf ARG 1 statType diff --git a/mappings/net/minecraft/network/packet/s2c/play/SynchronizeRecipesS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/SynchronizeRecipesS2CPacket.mapping index 10d1b2f382..24fb690389 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/SynchronizeRecipesS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/SynchronizeRecipesS2CPacket.mapping @@ -5,8 +5,7 @@ CLASS net/minecraft/class_2788 net/minecraft/network/packet/s2c/play/Synchronize METHOD (Lnet/minecraft/class_2540;)V ARG 1 buf METHOD method_11998 getRecipes ()Ljava/util/List; - METHOD method_17816 writeRecipe (Lnet/minecraft/class_2540;Lnet/minecraft/class_1860;)V + METHOD method_17816 writeRecipe (Lnet/minecraft/class_2540;Lnet/minecraft/class_8786;)V ARG 0 buf - ARG 1 recipe - METHOD method_17817 readRecipe (Lnet/minecraft/class_2540;)Lnet/minecraft/class_1860; + METHOD method_17817 readRecipe (Lnet/minecraft/class_2540;)Lnet/minecraft/class_8786; ARG 0 buf diff --git a/mappings/net/minecraft/network/packet/s2c/play/UnloadChunkS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/UnloadChunkS2CPacket.mapping index 265b900a9a..9f578cd60e 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/UnloadChunkS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/UnloadChunkS2CPacket.mapping @@ -1,10 +1,3 @@ CLASS net/minecraft/class_2666 net/minecraft/network/packet/s2c/play/UnloadChunkS2CPacket - FIELD field_12194 z I - FIELD field_12195 x I - METHOD (II)V - ARG 1 x - ARG 2 z METHOD (Lnet/minecraft/class_2540;)V ARG 1 buf - METHOD method_11485 getZ ()I - METHOD method_11487 getX ()I diff --git a/mappings/net/minecraft/network/packet/s2c/play/UpdateSelectedSlotS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/UpdateSelectedSlotS2CPacket.mapping index 2db7c2040a..1285cb148d 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/UpdateSelectedSlotS2CPacket.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/UpdateSelectedSlotS2CPacket - FIELD field_12463 selectedSlot I + FIELD field_12463 slot I METHOD (I)V ARG 1 slot METHOD (Lnet/minecraft/class_2540;)V diff --git a/mappings/net/minecraft/network/packet/s2c/query/QueryPongS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/query/PingResultS2CPacket.mapping similarity index 89% rename from mappings/net/minecraft/network/packet/s2c/query/QueryPongS2CPacket.mapping rename to mappings/net/minecraft/network/packet/s2c/query/PingResultS2CPacket.mapping index 8ca18e495d..8087393363 100644 --- a/mappings/net/minecraft/network/packet/s2c/query/QueryPongS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/query/PingResultS2CPacket.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_2923 net/minecraft/network/packet/s2c/query/QueryPongS2CPacket +CLASS net/minecraft/class_2923 net/minecraft/network/packet/s2c/query/PingResultS2CPacket FIELD field_13280 startTime J METHOD (J)V ARG 1 startTime diff --git a/mappings/net/minecraft/network/packet/s2c/query/QueryResponseS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/query/QueryResponseS2CPacket.mapping index 28462ed2fa..7faf42c575 100644 --- a/mappings/net/minecraft/network/packet/s2c/query/QueryResponseS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/query/QueryResponseS2CPacket.mapping @@ -1,8 +1,7 @@ CLASS net/minecraft/class_2924 net/minecraft/network/packet/s2c/query/QueryResponseS2CPacket - FIELD field_13281 metadata Lnet/minecraft/class_2926; - FIELD field_13282 GSON Lcom/google/gson/Gson; + FIELD comp_1272 metadata Lnet/minecraft/class_2926; METHOD (Lnet/minecraft/class_2540;)V ARG 1 buf METHOD (Lnet/minecraft/class_2926;)V ARG 1 metadata - METHOD method_12672 getServerMetadata ()Lnet/minecraft/class_2926; + METHOD comp_1272 metadata ()Lnet/minecraft/class_2926; diff --git a/mappings/net/minecraft/obfuscate/DontObfuscate.mapping b/mappings/net/minecraft/obfuscate/DontObfuscate.mapping index b765f50f25..e6f16d8055 100644 --- a/mappings/net/minecraft/obfuscate/DontObfuscate.mapping +++ b/mappings/net/minecraft/obfuscate/DontObfuscate.mapping @@ -18,6 +18,3 @@ CLASS net/minecraft/obfuscate/DontObfuscate COMMENT COMMENT

    This annotation is not {@link java.lang.annotation.Documented}, and hence COMMENT will not appear in the generated javadoc for annotated elements. - COMMENT - COMMENT @see net.minecraft.util.CubicSampler.RgbFetcher - COMMENT @see net.minecraft.world.level.ColorResolver#getColor diff --git a/mappings/net/minecraft/particle/AbstractDustParticleEffect.mapping b/mappings/net/minecraft/particle/AbstractDustParticleEffect.mapping index 8774525a04..0753bd7f8f 100644 --- a/mappings/net/minecraft/particle/AbstractDustParticleEffect.mapping +++ b/mappings/net/minecraft/particle/AbstractDustParticleEffect.mapping @@ -1,14 +1,14 @@ CLASS net/minecraft/class_5744 net/minecraft/particle/AbstractDustParticleEffect - FIELD field_28273 color Lnet/minecraft/class_1160; + FIELD field_28273 color Lorg/joml/Vector3f; FIELD field_28274 scale F FIELD field_33114 MIN_SCALE F FIELD field_33115 MAX_SCALE F - METHOD (Lnet/minecraft/class_1160;F)V + METHOD (Lorg/joml/Vector3f;F)V ARG 1 color ARG 2 scale - METHOD method_33118 readColor (Lcom/mojang/brigadier/StringReader;)Lnet/minecraft/class_1160; + METHOD method_33118 readColor (Lcom/mojang/brigadier/StringReader;)Lorg/joml/Vector3f; ARG 0 reader - METHOD method_33119 getColor ()Lnet/minecraft/class_1160; + METHOD method_33119 getColor ()Lorg/joml/Vector3f; METHOD method_33120 getScale ()F - METHOD method_33466 readColor (Lnet/minecraft/class_2540;)Lnet/minecraft/class_1160; + METHOD method_33466 readColor (Lnet/minecraft/class_2540;)Lorg/joml/Vector3f; ARG 0 buf diff --git a/mappings/net/minecraft/particle/DustColorTransitionParticleEffect.mapping b/mappings/net/minecraft/particle/DustColorTransitionParticleEffect.mapping index 49cb988007..d2d467b40a 100644 --- a/mappings/net/minecraft/particle/DustColorTransitionParticleEffect.mapping +++ b/mappings/net/minecraft/particle/DustColorTransitionParticleEffect.mapping @@ -1,10 +1,10 @@ CLASS net/minecraft/class_5743 net/minecraft/particle/DustColorTransitionParticleEffect - FIELD field_28267 SCULK_BLUE Lnet/minecraft/class_1160; + FIELD field_28267 SCULK_BLUE Lorg/joml/Vector3f; FIELD field_28268 DEFAULT Lnet/minecraft/class_5743; FIELD field_28269 CODEC Lcom/mojang/serialization/Codec; FIELD field_28270 FACTORY Lnet/minecraft/class_2394$class_2395; - FIELD field_28271 toColor Lnet/minecraft/class_1160; - METHOD (Lnet/minecraft/class_1160;Lnet/minecraft/class_1160;F)V + FIELD field_28271 toColor Lorg/joml/Vector3f; + METHOD (Lorg/joml/Vector3f;Lorg/joml/Vector3f;F)V ARG 1 fromColor ARG 2 toColor ARG 3 scale @@ -12,9 +12,9 @@ CLASS net/minecraft/class_5743 net/minecraft/particle/DustColorTransitionParticl ARG 0 instance METHOD method_33108 (Lnet/minecraft/class_5743;)Ljava/lang/Float; ARG 0 effect - METHOD method_33109 (Lnet/minecraft/class_5743;)Lnet/minecraft/class_1160; + METHOD method_33109 (Lnet/minecraft/class_5743;)Lorg/joml/Vector3f; ARG 0 effect - METHOD method_33110 getFromColor ()Lnet/minecraft/class_1160; - METHOD method_33111 (Lnet/minecraft/class_5743;)Lnet/minecraft/class_1160; + METHOD method_33110 getFromColor ()Lorg/joml/Vector3f; + METHOD method_33111 (Lnet/minecraft/class_5743;)Lorg/joml/Vector3f; ARG 0 effect - METHOD method_33112 getToColor ()Lnet/minecraft/class_1160; + METHOD method_33112 getToColor ()Lorg/joml/Vector3f; diff --git a/mappings/net/minecraft/particle/DustParticleEffect.mapping b/mappings/net/minecraft/particle/DustParticleEffect.mapping index 92cd56a155..48767287c6 100644 --- a/mappings/net/minecraft/particle/DustParticleEffect.mapping +++ b/mappings/net/minecraft/particle/DustParticleEffect.mapping @@ -2,10 +2,10 @@ CLASS net/minecraft/class_2390 net/minecraft/particle/DustParticleEffect 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; - FIELD field_28272 RED Lnet/minecraft/class_1160; + FIELD field_28272 RED Lorg/joml/Vector3f; METHOD method_33115 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; ARG 0 instance METHOD method_33116 (Lnet/minecraft/class_2390;)Ljava/lang/Float; ARG 0 effect - METHOD method_33117 (Lnet/minecraft/class_2390;)Lnet/minecraft/class_1160; + METHOD method_33117 (Lnet/minecraft/class_2390;)Lorg/joml/Vector3f; ARG 0 effect diff --git a/mappings/net/minecraft/potion/Potion.mapping b/mappings/net/minecraft/potion/Potion.mapping index b175154e4c..f84eef3cd9 100644 --- a/mappings/net/minecraft/potion/Potion.mapping +++ b/mappings/net/minecraft/potion/Potion.mapping @@ -1,4 +1,5 @@ CLASS net/minecraft/class_1842 net/minecraft/potion/Potion + FIELD field_45767 registryEntry Lnet/minecraft/class_6880$class_6883; FIELD field_8954 baseName Ljava/lang/String; FIELD field_8955 effects Lcom/google/common/collect/ImmutableList; METHOD (Ljava/lang/String;[Lnet/minecraft/class_1293;)V @@ -6,6 +7,7 @@ CLASS net/minecraft/class_1842 net/minecraft/potion/Potion ARG 2 effects METHOD ([Lnet/minecraft/class_1293;)V ARG 1 effects + METHOD method_53211 getRegistryEntry ()Lnet/minecraft/class_6880$class_6883; METHOD method_8048 byId (Ljava/lang/String;)Lnet/minecraft/class_1842; ARG 0 id METHOD method_8049 getEffects ()Ljava/util/List; diff --git a/mappings/net/minecraft/potion/PotionUtil.mapping b/mappings/net/minecraft/potion/PotionUtil.mapping index 9c6ec811da..e72b9f18f3 100644 --- a/mappings/net/minecraft/potion/PotionUtil.mapping +++ b/mappings/net/minecraft/potion/PotionUtil.mapping @@ -4,6 +4,10 @@ CLASS net/minecraft/class_1844 net/minecraft/potion/PotionUtil FIELD field_30944 CUSTOM_POTION_COLOR_KEY Ljava/lang/String; FIELD field_30945 POTION_KEY Ljava/lang/String; FIELD field_30946 DEFAULT_COLOR I + METHOD method_47372 buildTooltip (Lnet/minecraft/class_1799;Ljava/util/List;F)V + ARG 0 stack + ARG 1 list + ARG 2 durationMultiplier METHOD method_8055 getColor (Ljava/util/Collection;)I ARG 0 effects METHOD method_8056 setCustomPotionEffects (Lnet/minecraft/class_1799;Ljava/util/Collection;)Lnet/minecraft/class_1799; @@ -28,8 +32,8 @@ CLASS net/minecraft/class_1844 net/minecraft/potion/PotionUtil ARG 0 stack METHOD method_8064 getColor (Lnet/minecraft/class_1799;)I ARG 0 stack - METHOD method_8065 buildTooltip (Lnet/minecraft/class_1799;Ljava/util/List;F)V - ARG 0 stack + METHOD method_8065 buildTooltip (Ljava/util/List;Ljava/util/List;F)V + ARG 0 statusEffects ARG 1 list ARG 2 durationMultiplier METHOD method_8066 getPotionEffects (Lnet/minecraft/class_2487;)Ljava/util/List; diff --git a/mappings/net/minecraft/potion/Potions.mapping b/mappings/net/minecraft/potion/Potions.mapping index 99a61e603b..c03dea78d9 100644 --- a/mappings/net/minecraft/potion/Potions.mapping +++ b/mappings/net/minecraft/potion/Potions.mapping @@ -1,4 +1,9 @@ CLASS net/minecraft/class_1847 net/minecraft/potion/Potions + FIELD field_42473 EMPTY_KEY Lnet/minecraft/class_5321; + FIELD field_8984 EMPTY Lnet/minecraft/class_1842; + METHOD method_48962 register (Lnet/minecraft/class_5321;Lnet/minecraft/class_1842;)Lnet/minecraft/class_1842; + ARG 0 key + ARG 1 potion METHOD method_8084 register (Ljava/lang/String;Lnet/minecraft/class_1842;)Lnet/minecraft/class_1842; ARG 0 name ARG 1 potion diff --git a/mappings/net/minecraft/predicate/BlockPredicate.mapping b/mappings/net/minecraft/predicate/BlockPredicate.mapping index 28ae921c01..d27a7963a4 100644 --- a/mappings/net/minecraft/predicate/BlockPredicate.mapping +++ b/mappings/net/minecraft/predicate/BlockPredicate.mapping @@ -1,36 +1,31 @@ CLASS net/minecraft/class_4550 net/minecraft/predicate/BlockPredicate - FIELD field_20692 ANY Lnet/minecraft/class_4550; - FIELD field_20693 tag Lnet/minecraft/class_6862; - FIELD field_20694 blocks Ljava/util/Set; - FIELD field_20695 state Lnet/minecraft/class_4559; - FIELD field_20696 nbt Lnet/minecraft/class_2105; - METHOD (Lnet/minecraft/class_6862;Ljava/util/Set;Lnet/minecraft/class_4559;Lnet/minecraft/class_2105;)V - ARG 1 tag - ARG 2 blocks - ARG 3 state - ARG 4 nbt - METHOD method_22452 toJson ()Lcom/google/gson/JsonElement; - METHOD method_22453 fromJson (Lcom/google/gson/JsonElement;)Lnet/minecraft/class_4550; - ARG 0 json + FIELD comp_1731 tag Ljava/util/Optional; + FIELD comp_1732 blocks Ljava/util/Optional; + FIELD comp_1733 state Ljava/util/Optional; + FIELD comp_1734 nbt Ljava/util/Optional; + FIELD field_45723 CODEC Lcom/mojang/serialization/Codec; + FIELD field_45724 BLOCK_ENTRY_LIST_CODEC Lcom/mojang/serialization/Codec; + METHOD comp_1731 tag ()Ljava/util/Optional; + METHOD comp_1732 blocks ()Ljava/util/Optional; + METHOD comp_1733 state ()Ljava/util/Optional; + METHOD comp_1734 nbt ()Ljava/util/Optional; METHOD method_22454 test (Lnet/minecraft/class_3218;Lnet/minecraft/class_2338;)Z ARG 1 world ARG 2 pos - METHOD method_33185 (Lnet/minecraft/class_2960;)Lcom/google/gson/JsonSyntaxException; - ARG 0 id CLASS class_4710 Builder - FIELD field_21572 blocks Ljava/util/Set; - FIELD field_21573 tag Lnet/minecraft/class_6862; - FIELD field_21574 state Lnet/minecraft/class_4559; - FIELD field_21575 nbt Lnet/minecraft/class_2105; + FIELD field_21572 blocks Ljava/util/Optional; + FIELD field_21573 tag Ljava/util/Optional; + FIELD field_21574 state Ljava/util/Optional; + FIELD field_21575 nbt Ljava/util/Optional; METHOD method_23880 create ()Lnet/minecraft/class_4550$class_4710; METHOD method_23882 build ()Lnet/minecraft/class_4550; METHOD method_27962 blocks ([Lnet/minecraft/class_2248;)Lnet/minecraft/class_4550$class_4710; ARG 1 blocks - METHOD method_27963 state (Lnet/minecraft/class_4559;)Lnet/minecraft/class_4550$class_4710; + METHOD method_27963 state (Lnet/minecraft/class_4559$class_4560;)Lnet/minecraft/class_4550$class_4710; ARG 1 state METHOD method_29233 tag (Lnet/minecraft/class_6862;)Lnet/minecraft/class_4550$class_4710; ARG 1 tag METHOD method_35042 nbt (Lnet/minecraft/class_2487;)Lnet/minecraft/class_4550$class_4710; ARG 1 nbt - METHOD method_37214 blocks (Ljava/lang/Iterable;)Lnet/minecraft/class_4550$class_4710; + METHOD method_37214 blocks (Ljava/util/Collection;)Lnet/minecraft/class_4550$class_4710; ARG 1 blocks diff --git a/mappings/net/minecraft/predicate/DamagePredicate.mapping b/mappings/net/minecraft/predicate/DamagePredicate.mapping index 6a4552121d..5afd3fd265 100644 --- a/mappings/net/minecraft/predicate/DamagePredicate.mapping +++ b/mappings/net/minecraft/predicate/DamagePredicate.mapping @@ -1,30 +1,31 @@ CLASS net/minecraft/class_2019 net/minecraft/predicate/DamagePredicate - FIELD field_9520 ANY Lnet/minecraft/class_2019; - FIELD field_9521 sourceEntity Lnet/minecraft/class_2048; - FIELD field_9522 blocked Ljava/lang/Boolean; - FIELD field_9523 dealt Lnet/minecraft/class_2096$class_2099; - FIELD field_9524 taken Lnet/minecraft/class_2096$class_2099; - FIELD field_9525 type Lnet/minecraft/class_2022; - METHOD (Lnet/minecraft/class_2096$class_2099;Lnet/minecraft/class_2096$class_2099;Lnet/minecraft/class_2048;Ljava/lang/Boolean;Lnet/minecraft/class_2022;)V + FIELD comp_1735 dealt Lnet/minecraft/class_2096$class_2099; + FIELD comp_1736 taken Lnet/minecraft/class_2096$class_2099; + FIELD comp_1737 sourceEntity Ljava/util/Optional; + FIELD comp_1738 blocked Ljava/util/Optional; + FIELD comp_1739 source Ljava/util/Optional; + METHOD (Lnet/minecraft/class_2096$class_2099;Lnet/minecraft/class_2096$class_2099;Ljava/util/Optional;Ljava/util/Optional;Ljava/util/Optional;)V ARG 1 dealt ARG 2 taken - ARG 3 sourceEntity - ARG 4 blocked - ARG 5 type + METHOD comp_1735 dealt ()Lnet/minecraft/class_2096$class_2099; + METHOD comp_1736 taken ()Lnet/minecraft/class_2096$class_2099; + METHOD comp_1737 sourceEntity ()Ljava/util/Optional; + METHOD comp_1738 blocked ()Ljava/util/Optional; + METHOD comp_1739 source ()Ljava/util/Optional; METHOD method_8838 test (Lnet/minecraft/class_3222;Lnet/minecraft/class_1282;FFZ)Z ARG 1 player ARG 2 source ARG 3 dealt ARG 4 taken ARG 5 blocked - METHOD method_8839 fromJson (Lcom/google/gson/JsonElement;)Lnet/minecraft/class_2019; + METHOD method_8839 fromJson (Lcom/google/gson/JsonElement;)Ljava/util/Optional; ARG 0 json METHOD method_8840 toJson ()Lcom/google/gson/JsonElement; CLASS class_2020 Builder - FIELD field_9526 blocked Ljava/lang/Boolean; + FIELD field_9526 blocked Ljava/util/Optional; FIELD field_9527 taken Lnet/minecraft/class_2096$class_2099; - FIELD field_9528 sourceEntity Lnet/minecraft/class_2048; - FIELD field_9529 type Lnet/minecraft/class_2022; + FIELD field_9528 sourceEntity Ljava/util/Optional; + FIELD field_9529 type Ljava/util/Optional; FIELD field_9530 dealt Lnet/minecraft/class_2096$class_2099; METHOD method_35116 type (Lnet/minecraft/class_2022;)Lnet/minecraft/class_2019$class_2020; ARG 1 type diff --git a/mappings/net/minecraft/predicate/FluidPredicate.mapping b/mappings/net/minecraft/predicate/FluidPredicate.mapping index 1044698515..f08362ca98 100644 --- a/mappings/net/minecraft/predicate/FluidPredicate.mapping +++ b/mappings/net/minecraft/predicate/FluidPredicate.mapping @@ -1,22 +1,18 @@ CLASS net/minecraft/class_4551 net/minecraft/predicate/FluidPredicate - FIELD field_20708 ANY Lnet/minecraft/class_4551; - FIELD field_20709 tag Lnet/minecraft/class_6862; - FIELD field_20710 fluid Lnet/minecraft/class_3611; - FIELD field_20711 state Lnet/minecraft/class_4559; - METHOD (Lnet/minecraft/class_6862;Lnet/minecraft/class_3611;Lnet/minecraft/class_4559;)V - ARG 1 tag - ARG 2 fluid - ARG 3 state - METHOD method_22473 toJson ()Lcom/google/gson/JsonElement; - METHOD method_22474 fromJson (Lcom/google/gson/JsonElement;)Lnet/minecraft/class_4551; - ARG 0 json + FIELD comp_1780 tag Ljava/util/Optional; + FIELD comp_1781 fluid Ljava/util/Optional; + FIELD comp_1782 state Ljava/util/Optional; + FIELD field_45753 CODEC Lcom/mojang/serialization/Codec; + METHOD comp_1780 tag ()Ljava/util/Optional; + METHOD comp_1781 fluid ()Ljava/util/Optional; + METHOD comp_1782 state ()Ljava/util/Optional; METHOD method_22475 test (Lnet/minecraft/class_3218;Lnet/minecraft/class_2338;)Z ARG 1 world ARG 2 pos CLASS class_6079 Builder - FIELD field_30912 fluid Lnet/minecraft/class_3611; - FIELD field_30913 tag Lnet/minecraft/class_6862; - FIELD field_30914 state Lnet/minecraft/class_4559; + FIELD field_30912 fluid Ljava/util/Optional; + FIELD field_30913 tag Ljava/util/Optional; + FIELD field_30914 state Ljava/util/Optional; METHOD method_35221 create ()Lnet/minecraft/class_4551$class_6079; METHOD method_35222 tag (Lnet/minecraft/class_6862;)Lnet/minecraft/class_4551$class_6079; ARG 1 tag diff --git a/mappings/net/minecraft/predicate/LightPredicate.mapping b/mappings/net/minecraft/predicate/LightPredicate.mapping index 6c1508c259..1f80f700a1 100644 --- a/mappings/net/minecraft/predicate/LightPredicate.mapping +++ b/mappings/net/minecraft/predicate/LightPredicate.mapping @@ -1,11 +1,9 @@ CLASS net/minecraft/class_4552 net/minecraft/predicate/LightPredicate - FIELD field_20712 ANY Lnet/minecraft/class_4552; - FIELD field_20713 range Lnet/minecraft/class_2096$class_2100; + FIELD comp_1791 range Lnet/minecraft/class_2096$class_2100; + FIELD field_45757 CODEC Lcom/mojang/serialization/Codec; METHOD (Lnet/minecraft/class_2096$class_2100;)V ARG 1 range - METHOD method_22481 toJson ()Lcom/google/gson/JsonElement; - METHOD method_22482 fromJson (Lcom/google/gson/JsonElement;)Lnet/minecraft/class_4552; - ARG 0 json + METHOD comp_1791 range ()Lnet/minecraft/class_2096$class_2100; METHOD method_22483 test (Lnet/minecraft/class_3218;Lnet/minecraft/class_2338;)Z ARG 1 world ARG 2 pos diff --git a/mappings/net/minecraft/predicate/NbtPredicate.mapping b/mappings/net/minecraft/predicate/NbtPredicate.mapping index 5ead80183f..b5d22ca12d 100644 --- a/mappings/net/minecraft/predicate/NbtPredicate.mapping +++ b/mappings/net/minecraft/predicate/NbtPredicate.mapping @@ -1,15 +1,13 @@ CLASS net/minecraft/class_2105 net/minecraft/predicate/NbtPredicate - FIELD field_9715 nbt Lnet/minecraft/class_2487; - FIELD field_9716 ANY Lnet/minecraft/class_2105; + FIELD comp_1816 nbt Lnet/minecraft/class_2487; + FIELD field_45768 CODEC Lcom/mojang/serialization/Codec; METHOD (Lnet/minecraft/class_2487;)V ARG 1 nbt + METHOD comp_1816 nbt ()Lnet/minecraft/class_2487; METHOD method_9072 test (Lnet/minecraft/class_1297;)Z ARG 1 entity - METHOD method_9073 fromJson (Lcom/google/gson/JsonElement;)Lnet/minecraft/class_2105; - ARG 0 json METHOD method_9074 test (Lnet/minecraft/class_1799;)Z ARG 1 stack - METHOD method_9075 toJson ()Lcom/google/gson/JsonElement; METHOD method_9076 entityToNbt (Lnet/minecraft/class_1297;)Lnet/minecraft/class_2487; ARG 0 entity METHOD method_9077 test (Lnet/minecraft/class_2520;)Z diff --git a/mappings/net/minecraft/predicate/NumberRange.mapping b/mappings/net/minecraft/predicate/NumberRange.mapping index 87cf0a9735..0c7044c361 100644 --- a/mappings/net/minecraft/predicate/NumberRange.mapping +++ b/mappings/net/minecraft/predicate/NumberRange.mapping @@ -1,29 +1,14 @@ CLASS net/minecraft/class_2096 net/minecraft/predicate/NumberRange - FIELD field_9699 max Ljava/lang/Number; FIELD field_9700 EXCEPTION_EMPTY Lcom/mojang/brigadier/exceptions/SimpleCommandExceptionType; FIELD field_9701 EXCEPTION_SWAPPED Lcom/mojang/brigadier/exceptions/SimpleCommandExceptionType; - FIELD field_9702 min Ljava/lang/Number; - METHOD (Ljava/lang/Number;Ljava/lang/Number;)V - ARG 1 min - ARG 2 max - METHOD method_9035 map (Ljava/lang/Object;Ljava/util/function/Function;)Ljava/lang/Object; - ARG 0 object - ARG 1 function - METHOD method_9036 toJson ()Lcom/google/gson/JsonElement; - METHOD method_9037 fromStringReader (Lcom/mojang/brigadier/StringReader;Ljava/util/function/Function;Ljava/util/function/Supplier;)Ljava/lang/Number; + METHOD method_53194 getConstantValue ()Ljava/util/Optional; + METHOD method_9037 fromStringReader (Lcom/mojang/brigadier/StringReader;Ljava/util/function/Function;Ljava/util/function/Supplier;)Ljava/util/Optional; ARG 0 reader ARG 1 converter ARG 2 exceptionTypeSupplier - METHOD method_9038 getMin ()Ljava/lang/Number; - METHOD method_9039 fromJson (Lcom/google/gson/JsonElement;Lnet/minecraft/class_2096;Ljava/util/function/BiFunction;Lnet/minecraft/class_2096$class_2097;)Lnet/minecraft/class_2096; - ARG 0 json - ARG 1 fallback - ARG 2 asNumber - ARG 3 factory METHOD method_9040 isNextCharValid (Lcom/mojang/brigadier/StringReader;)Z ARG 0 reader METHOD method_9041 isDummy ()Z - METHOD method_9042 getMax ()Ljava/lang/Number; METHOD method_9043 parse (Lcom/mojang/brigadier/StringReader;Lnet/minecraft/class_2096$class_2098;Ljava/util/function/Function;Ljava/util/function/Supplier;Ljava/util/function/Function;)Lnet/minecraft/class_2096; ARG 0 commandReader ARG 1 commandFactory @@ -31,21 +16,16 @@ CLASS net/minecraft/class_2096 net/minecraft/predicate/NumberRange ARG 3 exceptionTypeSupplier ARG 4 mapper CLASS class_2097 Factory - METHOD create (Ljava/lang/Number;Ljava/lang/Number;)Lnet/minecraft/class_2096; - ARG 1 min - ARG 2 max CLASS class_2098 CommandFactory - METHOD create (Lcom/mojang/brigadier/StringReader;Ljava/lang/Number;Ljava/lang/Number;)Lnet/minecraft/class_2096; + METHOD create (Lcom/mojang/brigadier/StringReader;Ljava/util/Optional;Ljava/util/Optional;)Lnet/minecraft/class_2096; ARG 1 reader - ARG 2 min - ARG 3 max - CLASS class_2099 FloatRange - FIELD field_9703 squaredMin Ljava/lang/Double; - FIELD field_9704 squaredMax Ljava/lang/Double; + CLASS class_2099 DoubleRange + FIELD comp_1807 squaredMin Ljava/util/Optional; + FIELD comp_1808 squaredMax Ljava/util/Optional; + FIELD field_45762 CODEC Lcom/mojang/serialization/Codec; FIELD field_9705 ANY Lnet/minecraft/class_2096$class_2099; - METHOD (Ljava/lang/Double;Ljava/lang/Double;)V - ARG 1 min - ARG 2 max + METHOD comp_1807 squaredMin ()Ljava/util/Optional; + METHOD comp_1808 squaredMax ()Ljava/util/Optional; METHOD method_35284 exactly (D)Lnet/minecraft/class_2096$class_2099; ARG 0 value METHOD method_35285 between (DD)Lnet/minecraft/class_2096$class_2099; @@ -53,14 +33,12 @@ CLASS net/minecraft/class_2096 net/minecraft/predicate/NumberRange ARG 2 max METHOD method_35286 atMost (D)Lnet/minecraft/class_2096$class_2099; ARG 0 value - METHOD method_9044 square (Ljava/lang/Double;)Ljava/lang/Double; - ARG 0 value + METHOD method_53196 toJson ()Lcom/google/gson/JsonElement; + METHOD method_9044 square (Ljava/util/Optional;)Ljava/util/Optional; METHOD method_9045 testSqrt (D)Z ARG 1 value - METHOD method_9046 create (Lcom/mojang/brigadier/StringReader;Ljava/lang/Double;Ljava/lang/Double;)Lnet/minecraft/class_2096$class_2099; + METHOD method_9046 create (Lcom/mojang/brigadier/StringReader;Ljava/util/Optional;Ljava/util/Optional;)Lnet/minecraft/class_2096$class_2099; ARG 0 reader - ARG 1 min - ARG 2 max METHOD method_9047 test (D)Z ARG 1 value METHOD method_9048 parse (Lcom/mojang/brigadier/StringReader;Ljava/util/function/Function;)Lnet/minecraft/class_2096$class_2099; @@ -75,12 +53,12 @@ CLASS net/minecraft/class_2096 net/minecraft/predicate/NumberRange METHOD method_9052 (Ljava/lang/Double;)Ljava/lang/Double; ARG 0 value CLASS class_2100 IntRange - FIELD field_9706 minSquared Ljava/lang/Long; - FIELD field_9707 maxSquared Ljava/lang/Long; + FIELD comp_1809 minSquared Ljava/util/Optional; + FIELD comp_1810 maxSquared Ljava/util/Optional; + FIELD field_45763 CODEC Lcom/mojang/serialization/Codec; FIELD field_9708 ANY Lnet/minecraft/class_2096$class_2100; - METHOD (Ljava/lang/Integer;Ljava/lang/Integer;)V - ARG 1 min - ARG 2 max + METHOD comp_1809 minSquared ()Ljava/util/Optional; + METHOD comp_1810 maxSquared ()Ljava/util/Optional; METHOD method_35287 between (II)Lnet/minecraft/class_2096$class_2100; ARG 0 min ARG 1 max @@ -88,14 +66,13 @@ CLASS net/minecraft/class_2096 net/minecraft/predicate/NumberRange ARG 1 value METHOD method_35289 atMost (I)Lnet/minecraft/class_2096$class_2100; ARG 0 value + METHOD method_53199 toJson ()Lcom/google/gson/JsonElement; METHOD method_9053 atLeast (I)Lnet/minecraft/class_2096$class_2100; ARG 0 value METHOD method_9054 test (I)Z ARG 1 value - METHOD method_9055 parse (Lcom/mojang/brigadier/StringReader;Ljava/lang/Integer;Ljava/lang/Integer;)Lnet/minecraft/class_2096$class_2100; + METHOD method_9055 parse (Lcom/mojang/brigadier/StringReader;Ljava/util/Optional;Ljava/util/Optional;)Lnet/minecraft/class_2096$class_2100; ARG 0 reader - ARG 1 min - ARG 2 max METHOD method_9056 fromJson (Lcom/google/gson/JsonElement;)Lnet/minecraft/class_2096$class_2100; ARG 0 element METHOD method_9057 fromStringReader (Lcom/mojang/brigadier/StringReader;Ljava/util/function/Function;)Lnet/minecraft/class_2096$class_2100; @@ -103,8 +80,7 @@ CLASS net/minecraft/class_2096 net/minecraft/predicate/NumberRange ARG 1 converter METHOD method_9058 exactly (I)Lnet/minecraft/class_2096$class_2100; ARG 0 value - METHOD method_9059 squared (Ljava/lang/Integer;)Ljava/lang/Long; - ARG 0 value + METHOD method_9059 squared (Ljava/util/Optional;)Ljava/util/Optional; METHOD method_9060 parse (Lcom/mojang/brigadier/StringReader;)Lnet/minecraft/class_2096$class_2100; ARG 0 reader METHOD method_9061 (Ljava/lang/Integer;)Ljava/lang/Integer; diff --git a/mappings/net/minecraft/predicate/StatePredicate.mapping b/mappings/net/minecraft/predicate/StatePredicate.mapping index b44598205a..48b1e5af23 100644 --- a/mappings/net/minecraft/predicate/StatePredicate.mapping +++ b/mappings/net/minecraft/predicate/StatePredicate.mapping @@ -1,8 +1,10 @@ CLASS net/minecraft/class_4559 net/minecraft/predicate/StatePredicate - FIELD field_20736 ANY Lnet/minecraft/class_4559; - FIELD field_20737 conditions Ljava/util/List; + FIELD comp_1830 conditions Ljava/util/List; + FIELD field_45777 CODEC Lcom/mojang/serialization/Codec; + FIELD field_45778 CONDITION_LIST_CODEC Lcom/mojang/serialization/Codec; METHOD (Ljava/util/List;)V ARG 1 conditions + METHOD comp_1830 conditions ()Ljava/util/List; METHOD method_22513 toJson ()Lcom/google/gson/JsonElement; METHOD method_22514 test (Lnet/minecraft/class_2680;)Z ARG 1 state @@ -16,17 +18,12 @@ CLASS net/minecraft/class_4559 net/minecraft/predicate/StatePredicate ARG 2 condition METHOD method_22518 test (Lnet/minecraft/class_3610;)Z ARG 1 state - METHOD method_22519 fromJson (Lcom/google/gson/JsonElement;)Lnet/minecraft/class_4559; - ARG 0 json - METHOD method_22520 (Lcom/google/gson/JsonObject;Lnet/minecraft/class_4559$class_4562;)V - ARG 1 condition - METHOD method_22521 createPredicate (Ljava/lang/String;Lcom/google/gson/JsonElement;)Lnet/minecraft/class_4559$class_4562; - ARG 0 key - ARG 1 json - METHOD method_22522 asNullableString (Lcom/google/gson/JsonElement;)Ljava/lang/String; + METHOD method_22519 fromJson (Lcom/google/gson/JsonElement;)Ljava/util/Optional; ARG 0 json + METHOD method_53235 findMissing (Lnet/minecraft/class_2689;)Ljava/util/Optional; + ARG 1 stateManager CLASS class_4560 Builder - FIELD field_20738 conditions Ljava/util/List; + FIELD field_20738 conditions Lcom/google/common/collect/ImmutableList$Builder; METHOD method_22523 create ()Lnet/minecraft/class_4559$class_4560; METHOD method_22524 exactMatch (Lnet/minecraft/class_2769;I)Lnet/minecraft/class_4559$class_4560; ARG 1 property @@ -40,31 +37,33 @@ CLASS net/minecraft/class_4559 net/minecraft/predicate/StatePredicate METHOD method_22527 exactMatch (Lnet/minecraft/class_2769;Z)Lnet/minecraft/class_4559$class_4560; ARG 1 property ARG 2 value - METHOD method_22528 build ()Lnet/minecraft/class_4559; - CLASS class_4561 ExactValueCondition - FIELD field_20739 value Ljava/lang/String; - METHOD (Ljava/lang/String;Ljava/lang/String;)V + METHOD method_22528 build ()Ljava/util/Optional; + CLASS class_4561 ExactValueMatcher + FIELD comp_1831 value Ljava/lang/String; + FIELD field_45779 CODEC Lcom/mojang/serialization/Codec; + METHOD (Ljava/lang/String;)V ARG 1 key - ARG 2 value + METHOD comp_1831 value ()Ljava/lang/String; CLASS class_4562 Condition - FIELD field_20740 key Ljava/lang/String; - METHOD (Ljava/lang/String;)V + FIELD comp_1832 key Ljava/lang/String; + METHOD (Ljava/lang/String;Lnet/minecraft/class_4559$class_8750;)V ARG 1 key - METHOD method_22529 toJson ()Lcom/google/gson/JsonElement; + METHOD comp_1832 key ()Ljava/lang/String; METHOD method_22530 test (Lnet/minecraft/class_2689;Lnet/minecraft/class_2688;)Z ARG 1 stateManager ARG 2 state - METHOD method_22531 reportMissing (Lnet/minecraft/class_2689;Ljava/util/function/Consumer;)V + METHOD method_22531 reportMissing (Lnet/minecraft/class_2689;)Ljava/util/Optional; ARG 1 factory - ARG 2 reporter + CLASS class_4563 RangedValueMatcher + FIELD comp_1834 min Ljava/util/Optional; + FIELD comp_1835 max Ljava/util/Optional; + FIELD field_45780 CODEC Lcom/mojang/serialization/Codec; + METHOD comp_1834 min ()Ljava/util/Optional; + METHOD comp_1835 max ()Ljava/util/Optional; + CLASS class_8750 ValueMatcher + FIELD field_45781 CODEC Lcom/mojang/serialization/Codec; METHOD method_22532 test (Lnet/minecraft/class_2688;Lnet/minecraft/class_2769;)Z ARG 1 state ARG 2 property - METHOD method_22533 getKey ()Ljava/lang/String; - CLASS class_4563 RangedValueCondition - FIELD field_20741 min Ljava/lang/String; - FIELD field_20742 max Ljava/lang/String; - METHOD (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V - ARG 1 key - ARG 2 min - ARG 3 max + METHOD method_53243 (Lnet/minecraft/class_4559$class_8750;)Lcom/mojang/datafixers/util/Either; + ARG 0 valueMatcher diff --git a/mappings/net/minecraft/predicate/TagPredicate.mapping b/mappings/net/minecraft/predicate/TagPredicate.mapping new file mode 100644 index 0000000000..2ed658897b --- /dev/null +++ b/mappings/net/minecraft/predicate/TagPredicate.mapping @@ -0,0 +1,16 @@ +CLASS net/minecraft/class_8129 net/minecraft/predicate/TagPredicate + FIELD comp_1836 tag Lnet/minecraft/class_6862; + FIELD comp_1837 expected Z + METHOD (Lnet/minecraft/class_6862;Z)V + ARG 1 tag + ARG 2 expected + METHOD comp_1836 tag ()Lnet/minecraft/class_6862; + METHOD comp_1837 expected ()Z + METHOD method_48965 expected (Lnet/minecraft/class_6862;)Lnet/minecraft/class_8129; + ARG 0 tag + METHOD method_48967 test (Lnet/minecraft/class_6880;)Z + ARG 1 registryEntry + METHOD method_48968 unexpected (Lnet/minecraft/class_6862;)Lnet/minecraft/class_8129; + ARG 0 tag + METHOD method_53245 createCodec (Lnet/minecraft/class_5321;)Lcom/mojang/serialization/Codec; + ARG 0 registryRef diff --git a/mappings/net/minecraft/predicate/entity/AdvancementEntityPredicateDeserializer.mapping b/mappings/net/minecraft/predicate/entity/AdvancementEntityPredicateDeserializer.mapping index 8f050d9c04..0b60bb3f7a 100644 --- a/mappings/net/minecraft/predicate/entity/AdvancementEntityPredicateDeserializer.mapping +++ b/mappings/net/minecraft/predicate/entity/AdvancementEntityPredicateDeserializer.mapping @@ -1,18 +1,15 @@ CLASS net/minecraft/class_5257 net/minecraft/predicate/entity/AdvancementEntityPredicateDeserializer FIELD field_24383 LOGGER Lorg/slf4j/Logger; FIELD field_24384 advancementId Lnet/minecraft/class_2960; - FIELD field_24385 conditionManager Lnet/minecraft/class_4567; - FIELD field_24386 gson Lcom/google/gson/Gson; - METHOD (Lnet/minecraft/class_2960;Lnet/minecraft/class_4567;)V + FIELD field_44474 lootManager Lnet/minecraft/class_60; + METHOD (Lnet/minecraft/class_2960;Lnet/minecraft/class_60;)V ARG 1 advancementId - ARG 2 conditionManager + ARG 2 lootManager METHOD method_27795 getAdvancementId ()Lnet/minecraft/class_2960; - METHOD method_27796 loadConditions (Lcom/google/gson/JsonArray;Ljava/lang/String;Lnet/minecraft/class_176;)[Lnet/minecraft/class_5341; + METHOD method_27796 loadConditions (Lcom/google/gson/JsonArray;Ljava/lang/String;Lnet/minecraft/class_176;)Ljava/util/List; ARG 1 array ARG 2 key ARG 3 contextType METHOD method_27797 (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V ARG 1 name ARG 2 message - METHOD method_27798 (Lnet/minecraft/class_2960;)Lnet/minecraft/class_52; - ARG 0 tableId diff --git a/mappings/net/minecraft/predicate/entity/AdvancementEntityPredicateSerializer.mapping b/mappings/net/minecraft/predicate/entity/AdvancementEntityPredicateSerializer.mapping deleted file mode 100644 index 6ab091f11c..0000000000 --- a/mappings/net/minecraft/predicate/entity/AdvancementEntityPredicateSerializer.mapping +++ /dev/null @@ -1,5 +0,0 @@ -CLASS net/minecraft/class_5267 net/minecraft/predicate/entity/AdvancementEntityPredicateSerializer - FIELD field_24420 INSTANCE Lnet/minecraft/class_5267; - FIELD field_24421 gson Lcom/google/gson/Gson; - METHOD method_27849 conditionsToJson ([Lnet/minecraft/class_5341;)Lcom/google/gson/JsonElement; - ARG 1 conditions diff --git a/mappings/net/minecraft/predicate/entity/DamageSourcePredicate.mapping b/mappings/net/minecraft/predicate/entity/DamageSourcePredicate.mapping index ff90039bf5..003c7c1640 100644 --- a/mappings/net/minecraft/predicate/entity/DamageSourcePredicate.mapping +++ b/mappings/net/minecraft/predicate/entity/DamageSourcePredicate.mapping @@ -1,77 +1,32 @@ CLASS net/minecraft/class_2022 net/minecraft/predicate/entity/DamageSourcePredicate - FIELD field_9531 bypassesInvulnerability Ljava/lang/Boolean; - FIELD field_9532 bypassesArmor Ljava/lang/Boolean; - FIELD field_9533 EMPTY Lnet/minecraft/class_2022; - FIELD field_9534 directEntity Lnet/minecraft/class_2048; - FIELD field_9535 isProjectile Ljava/lang/Boolean; - FIELD field_9536 isExplosion Ljava/lang/Boolean; - FIELD field_9537 bypassesMagic Ljava/lang/Boolean; - FIELD field_9538 isLightning Ljava/lang/Boolean; - FIELD field_9539 sourceEntity Lnet/minecraft/class_2048; - FIELD field_9540 isFire Ljava/lang/Boolean; - FIELD field_9541 isMagic Ljava/lang/Boolean; - METHOD (Ljava/lang/Boolean;Ljava/lang/Boolean;Ljava/lang/Boolean;Ljava/lang/Boolean;Ljava/lang/Boolean;Ljava/lang/Boolean;Ljava/lang/Boolean;Ljava/lang/Boolean;Lnet/minecraft/class_2048;Lnet/minecraft/class_2048;)V - ARG 1 isProjectile - ARG 2 isExplosion - ARG 3 bypassesArmor - ARG 4 bypassesInvulnerability - ARG 5 bypassesMagic - ARG 6 isFire - ARG 7 isMagic - ARG 8 isLightning - ARG 9 directEntity - ARG 10 sourceEntity + FIELD comp_1740 tagPredicates Ljava/util/List; + FIELD comp_1741 directEntity Ljava/util/Optional; + FIELD comp_1742 sourceEntity Ljava/util/Optional; + FIELD field_45727 CODEC Lcom/mojang/serialization/Codec; + METHOD (Ljava/util/List;Ljava/util/Optional;Ljava/util/Optional;)V + ARG 1 tagPredicates + METHOD comp_1740 tagPredicates ()Ljava/util/List; + METHOD comp_1741 directEntity ()Ljava/util/Optional; + METHOD comp_1742 sourceEntity ()Ljava/util/Optional; METHOD method_8845 test (Lnet/minecraft/class_3218;Lnet/minecraft/class_243;Lnet/minecraft/class_1282;)Z ARG 1 world ARG 2 pos ARG 3 damageSource - METHOD method_8846 fromJson (Lcom/google/gson/JsonElement;)Lnet/minecraft/class_2022; + METHOD method_8846 fromJson (Lcom/google/gson/JsonElement;)Ljava/util/Optional; ARG 0 json METHOD method_8847 test (Lnet/minecraft/class_3222;Lnet/minecraft/class_1282;)Z ARG 1 player ARG 2 damageSource METHOD method_8848 toJson ()Lcom/google/gson/JsonElement; - METHOD method_8849 getBoolean (Lcom/google/gson/JsonObject;Ljava/lang/String;)Ljava/lang/Boolean; - ARG 0 obj - ARG 1 name - METHOD method_8850 addProperty (Lcom/google/gson/JsonObject;Ljava/lang/String;Ljava/lang/Boolean;)V - ARG 1 json - ARG 2 key - ARG 3 value CLASS class_2023 Builder - FIELD field_9542 bypassesMagic Ljava/lang/Boolean; - FIELD field_9543 bypassesInvulnerability Ljava/lang/Boolean; - FIELD field_9544 directEntity Lnet/minecraft/class_2048; - FIELD field_9545 sourceEntity Lnet/minecraft/class_2048; - FIELD field_9546 isExplosion Ljava/lang/Boolean; - FIELD field_9547 isProjectile Ljava/lang/Boolean; - FIELD field_9548 bypassesArmor Ljava/lang/Boolean; - FIELD field_9549 isFire Ljava/lang/Boolean; - FIELD field_9550 isMagic Ljava/lang/Boolean; - FIELD field_9551 isLightning Ljava/lang/Boolean; - METHOD method_35130 directEntity (Lnet/minecraft/class_2048;)Lnet/minecraft/class_2022$class_2023; - ARG 1 entity + FIELD field_42273 tagPredicates Lcom/google/common/collect/ImmutableList$Builder; + FIELD field_9544 directEntity Ljava/util/Optional; + FIELD field_9545 sourceEntity Ljava/util/Optional; METHOD method_35131 sourceEntity (Lnet/minecraft/class_2048$class_2049;)Lnet/minecraft/class_2022$class_2023; ARG 1 entity - METHOD method_35132 sourceEntity (Lnet/minecraft/class_2048;)Lnet/minecraft/class_2022$class_2023; - ARG 1 entity - METHOD method_35133 explosion (Ljava/lang/Boolean;)Lnet/minecraft/class_2022$class_2023; - ARG 1 explosion - METHOD method_35134 bypassesArmor (Ljava/lang/Boolean;)Lnet/minecraft/class_2022$class_2023; - ARG 1 bypassesArmor - METHOD method_35135 bypassesInvulnerability (Ljava/lang/Boolean;)Lnet/minecraft/class_2022$class_2023; - ARG 1 bypassesInvulnerability - METHOD method_35136 bypassesMagic (Ljava/lang/Boolean;)Lnet/minecraft/class_2022$class_2023; - ARG 1 bypassesMagic - METHOD method_35137 fire (Ljava/lang/Boolean;)Lnet/minecraft/class_2022$class_2023; - ARG 1 fire - METHOD method_35138 magic (Ljava/lang/Boolean;)Lnet/minecraft/class_2022$class_2023; - ARG 1 magic + METHOD method_48785 tag (Lnet/minecraft/class_8129;)Lnet/minecraft/class_2022$class_2023; + ARG 1 tagPredicate METHOD method_8851 build ()Lnet/minecraft/class_2022; - METHOD method_8852 projectile (Ljava/lang/Boolean;)Lnet/minecraft/class_2022$class_2023; - ARG 1 projectile - METHOD method_8853 lightning (Ljava/lang/Boolean;)Lnet/minecraft/class_2022$class_2023; - ARG 1 lightning METHOD method_8854 directEntity (Lnet/minecraft/class_2048$class_2049;)Lnet/minecraft/class_2022$class_2023; ARG 1 entity METHOD method_8855 create ()Lnet/minecraft/class_2022$class_2023; diff --git a/mappings/net/minecraft/predicate/entity/DistancePredicate.mapping b/mappings/net/minecraft/predicate/entity/DistancePredicate.mapping index 1e60e9f191..5c6590f5a9 100644 --- a/mappings/net/minecraft/predicate/entity/DistancePredicate.mapping +++ b/mappings/net/minecraft/predicate/entity/DistancePredicate.mapping @@ -1,21 +1,26 @@ CLASS net/minecraft/class_2025 net/minecraft/predicate/entity/DistancePredicate - FIELD field_9552 z Lnet/minecraft/class_2096$class_2099; - FIELD field_9553 ANY Lnet/minecraft/class_2025; - FIELD field_9554 x Lnet/minecraft/class_2096$class_2099; - FIELD field_9555 y Lnet/minecraft/class_2096$class_2099; - FIELD field_9556 absolute Lnet/minecraft/class_2096$class_2099; - FIELD field_9557 horizontal Lnet/minecraft/class_2096$class_2099; + FIELD comp_1743 x Lnet/minecraft/class_2096$class_2099; + FIELD comp_1744 y Lnet/minecraft/class_2096$class_2099; + FIELD comp_1745 z Lnet/minecraft/class_2096$class_2099; + FIELD comp_1746 horizontal Lnet/minecraft/class_2096$class_2099; + FIELD comp_1747 absolute Lnet/minecraft/class_2096$class_2099; + FIELD field_45728 CODEC Lcom/mojang/serialization/Codec; METHOD (Lnet/minecraft/class_2096$class_2099;Lnet/minecraft/class_2096$class_2099;Lnet/minecraft/class_2096$class_2099;Lnet/minecraft/class_2096$class_2099;Lnet/minecraft/class_2096$class_2099;)V ARG 1 x ARG 2 y ARG 3 z ARG 4 horizontal ARG 5 absolute + METHOD comp_1743 x ()Lnet/minecraft/class_2096$class_2099; + METHOD comp_1744 y ()Lnet/minecraft/class_2096$class_2099; + METHOD comp_1745 z ()Lnet/minecraft/class_2096$class_2099; + METHOD comp_1746 horizontal ()Lnet/minecraft/class_2096$class_2099; + METHOD comp_1747 absolute ()Lnet/minecraft/class_2096$class_2099; METHOD method_37223 absolute (Lnet/minecraft/class_2096$class_2099;)Lnet/minecraft/class_2025; ARG 0 absolute METHOD method_8856 y (Lnet/minecraft/class_2096$class_2099;)Lnet/minecraft/class_2025; ARG 0 y - METHOD method_8857 fromJson (Lcom/google/gson/JsonElement;)Lnet/minecraft/class_2025; + METHOD method_8857 fromJson (Lcom/google/gson/JsonElement;)Ljava/util/Optional; ARG 0 json METHOD method_8858 toJson ()Lcom/google/gson/JsonElement; METHOD method_8859 test (DDDDDD)Z diff --git a/mappings/net/minecraft/predicate/entity/EntityEffectPredicate.mapping b/mappings/net/minecraft/predicate/entity/EntityEffectPredicate.mapping index 7d0ccf9dcb..86c1eabef5 100644 --- a/mappings/net/minecraft/predicate/entity/EntityEffectPredicate.mapping +++ b/mappings/net/minecraft/predicate/entity/EntityEffectPredicate.mapping @@ -1,35 +1,39 @@ CLASS net/minecraft/class_2102 net/minecraft/predicate/entity/EntityEffectPredicate - FIELD field_9709 EMPTY Lnet/minecraft/class_2102; - FIELD field_9710 effects Ljava/util/Map; + FIELD comp_1811 effects Ljava/util/Map; + FIELD field_45764 CODEC Lcom/mojang/serialization/Codec; METHOD (Ljava/util/Map;)V ARG 1 effects - METHOD method_35290 withEffect (Lnet/minecraft/class_1291;Lnet/minecraft/class_2102$class_2103;)Lnet/minecraft/class_2102; - ARG 1 statusEffect - ARG 2 data + METHOD comp_1811 effects ()Ljava/util/Map; METHOD method_9062 test (Lnet/minecraft/class_1297;)Z ARG 1 entity METHOD method_9063 test (Ljava/util/Map;)Z ARG 1 effects - METHOD method_9064 fromJson (Lcom/google/gson/JsonElement;)Lnet/minecraft/class_2102; + METHOD method_9064 fromJson (Lcom/google/gson/JsonElement;)Ljava/util/Optional; ARG 0 json - METHOD method_9065 withEffect (Lnet/minecraft/class_1291;)Lnet/minecraft/class_2102; - ARG 1 statusEffect - METHOD method_9066 create ()Lnet/minecraft/class_2102; METHOD method_9067 test (Lnet/minecraft/class_1309;)Z ARG 1 livingEntity METHOD method_9068 toJson ()Lcom/google/gson/JsonElement; CLASS class_2103 EffectData - FIELD field_9711 amplifier Lnet/minecraft/class_2096$class_2100; - FIELD field_9712 visible Ljava/lang/Boolean; - FIELD field_9713 duration Lnet/minecraft/class_2096$class_2100; - FIELD field_9714 ambient Ljava/lang/Boolean; - METHOD (Lnet/minecraft/class_2096$class_2100;Lnet/minecraft/class_2096$class_2100;Ljava/lang/Boolean;Ljava/lang/Boolean;)V + FIELD comp_1812 amplifier Lnet/minecraft/class_2096$class_2100; + FIELD comp_1813 duration Lnet/minecraft/class_2096$class_2100; + FIELD comp_1814 ambient Ljava/util/Optional; + FIELD comp_1815 visible Ljava/util/Optional; + FIELD field_45766 CODEC Lcom/mojang/serialization/Codec; + METHOD (Lnet/minecraft/class_2096$class_2100;Lnet/minecraft/class_2096$class_2100;Ljava/util/Optional;Ljava/util/Optional;)V ARG 1 amplifier ARG 2 duration - ARG 3 ambient - ARG 4 visible + METHOD comp_1812 amplifier ()Lnet/minecraft/class_2096$class_2100; + METHOD comp_1813 duration ()Lnet/minecraft/class_2096$class_2100; + METHOD comp_1814 ambient ()Ljava/util/Optional; + METHOD comp_1815 visible ()Ljava/util/Optional; METHOD method_9069 test (Lnet/minecraft/class_1293;)Z ARG 1 statusEffectInstance - METHOD method_9070 fromJson (Lcom/google/gson/JsonObject;)Lnet/minecraft/class_2102$class_2103; - ARG 0 json - METHOD method_9071 toJson ()Lcom/google/gson/JsonElement; + CLASS class_8748 Builder + FIELD field_45765 EFFECTS Lcom/google/common/collect/ImmutableMap$Builder; + METHOD method_53200 create ()Lnet/minecraft/class_2102$class_8748; + METHOD method_53201 addEffect (Lnet/minecraft/class_1291;)Lnet/minecraft/class_2102$class_8748; + ARG 1 effect + METHOD method_53202 addEffect (Lnet/minecraft/class_1291;Lnet/minecraft/class_2102$class_2103;)Lnet/minecraft/class_2102$class_8748; + ARG 1 effect + ARG 2 effectData + METHOD method_53203 build ()Ljava/util/Optional; diff --git a/mappings/net/minecraft/predicate/entity/EntityEquipmentPredicate.mapping b/mappings/net/minecraft/predicate/entity/EntityEquipmentPredicate.mapping index 528f4d9bba..f6ae2b6cef 100644 --- a/mappings/net/minecraft/predicate/entity/EntityEquipmentPredicate.mapping +++ b/mappings/net/minecraft/predicate/entity/EntityEquipmentPredicate.mapping @@ -1,42 +1,32 @@ CLASS net/minecraft/class_3735 net/minecraft/predicate/entity/EntityEquipmentPredicate - FIELD field_16483 head Lnet/minecraft/class_2073; - FIELD field_16484 offhand Lnet/minecraft/class_2073; - FIELD field_16485 ANY Lnet/minecraft/class_3735; - FIELD field_16486 mainhand Lnet/minecraft/class_2073; - FIELD field_16487 chest Lnet/minecraft/class_2073; - FIELD field_16488 legs Lnet/minecraft/class_2073; - FIELD field_16489 feet Lnet/minecraft/class_2073; + FIELD comp_1750 head Ljava/util/Optional; + FIELD comp_1751 chest Ljava/util/Optional; + FIELD comp_1752 legs Ljava/util/Optional; + FIELD comp_1753 feet Ljava/util/Optional; + FIELD comp_1754 mainhand Ljava/util/Optional; + FIELD comp_1755 offhand Ljava/util/Optional; FIELD field_19240 OMINOUS_BANNER_ON_HEAD Lnet/minecraft/class_3735; - METHOD (Lnet/minecraft/class_2073;Lnet/minecraft/class_2073;Lnet/minecraft/class_2073;Lnet/minecraft/class_2073;Lnet/minecraft/class_2073;Lnet/minecraft/class_2073;)V - ARG 1 head - ARG 2 chest - ARG 3 legs - ARG 4 feet - ARG 5 mainhand - ARG 6 offhand - METHOD method_16224 fromJson (Lcom/google/gson/JsonElement;)Lnet/minecraft/class_3735; - ARG 0 json - METHOD method_16225 toJson ()Lcom/google/gson/JsonElement; + FIELD field_45744 CODEC Lcom/mojang/serialization/Codec; + METHOD comp_1750 head ()Ljava/util/Optional; + METHOD comp_1751 chest ()Ljava/util/Optional; + METHOD comp_1752 legs ()Ljava/util/Optional; + METHOD comp_1753 feet ()Ljava/util/Optional; + METHOD comp_1754 mainhand ()Ljava/util/Optional; + METHOD comp_1755 offhand ()Ljava/util/Optional; METHOD method_16226 test (Lnet/minecraft/class_1297;)Z ARG 1 entity CLASS class_5278 Builder - FIELD field_24482 head Lnet/minecraft/class_2073; - FIELD field_24483 chest Lnet/minecraft/class_2073; - FIELD field_24484 legs Lnet/minecraft/class_2073; - FIELD field_24485 feet Lnet/minecraft/class_2073; - FIELD field_24486 mainhand Lnet/minecraft/class_2073; - FIELD field_24487 offhand Lnet/minecraft/class_2073; + FIELD field_24482 head Ljava/util/Optional; + FIELD field_24483 chest Ljava/util/Optional; + FIELD field_24484 legs Ljava/util/Optional; + FIELD field_24485 feet Ljava/util/Optional; + FIELD field_24486 mainhand Ljava/util/Optional; + FIELD field_24487 offhand Ljava/util/Optional; METHOD method_27965 create ()Lnet/minecraft/class_3735$class_5278; - METHOD method_27966 head (Lnet/minecraft/class_2073;)Lnet/minecraft/class_3735$class_5278; - ARG 1 head + METHOD method_27966 head (Lnet/minecraft/class_2073$class_2074;)Lnet/minecraft/class_3735$class_5278; METHOD method_27967 build ()Lnet/minecraft/class_3735; - METHOD method_27968 chest (Lnet/minecraft/class_2073;)Lnet/minecraft/class_3735$class_5278; - ARG 1 chest - METHOD method_27969 legs (Lnet/minecraft/class_2073;)Lnet/minecraft/class_3735$class_5278; - ARG 1 legs - METHOD method_27970 feet (Lnet/minecraft/class_2073;)Lnet/minecraft/class_3735$class_5278; - ARG 1 feet - METHOD method_35195 mainhand (Lnet/minecraft/class_2073;)Lnet/minecraft/class_3735$class_5278; - ARG 1 mainhand - METHOD method_35196 offhand (Lnet/minecraft/class_2073;)Lnet/minecraft/class_3735$class_5278; - ARG 1 offhand + METHOD method_27968 chest (Lnet/minecraft/class_2073$class_2074;)Lnet/minecraft/class_3735$class_5278; + METHOD method_27969 legs (Lnet/minecraft/class_2073$class_2074;)Lnet/minecraft/class_3735$class_5278; + METHOD method_27970 feet (Lnet/minecraft/class_2073$class_2074;)Lnet/minecraft/class_3735$class_5278; + METHOD method_35195 mainhand (Lnet/minecraft/class_2073$class_2074;)Lnet/minecraft/class_3735$class_5278; + METHOD method_35196 offhand (Lnet/minecraft/class_2073$class_2074;)Lnet/minecraft/class_3735$class_5278; diff --git a/mappings/net/minecraft/predicate/entity/EntityFlagsPredicate.mapping b/mappings/net/minecraft/predicate/entity/EntityFlagsPredicate.mapping index b1a3cffa56..54db3db6ea 100644 --- a/mappings/net/minecraft/predicate/entity/EntityFlagsPredicate.mapping +++ b/mappings/net/minecraft/predicate/entity/EntityFlagsPredicate.mapping @@ -1,34 +1,23 @@ CLASS net/minecraft/class_2040 net/minecraft/predicate/entity/EntityFlagsPredicate - FIELD field_9578 isSwimming Ljava/lang/Boolean; - FIELD field_9579 isSprinting Ljava/lang/Boolean; - FIELD field_9580 isOnFire Ljava/lang/Boolean; - FIELD field_9581 ANY Lnet/minecraft/class_2040; - FIELD field_9582 isSneaking Ljava/lang/Boolean; - FIELD field_9583 isBaby Ljava/lang/Boolean; - METHOD (Ljava/lang/Boolean;Ljava/lang/Boolean;Ljava/lang/Boolean;Ljava/lang/Boolean;Ljava/lang/Boolean;)V - ARG 1 isOnFire - ARG 2 isSneaking - ARG 3 isSprinting - ARG 4 isSwimming - ARG 5 isBaby + FIELD comp_1756 isOnFire Ljava/util/Optional; + FIELD comp_1757 isSneaking Ljava/util/Optional; + FIELD comp_1758 isSprinting Ljava/util/Optional; + FIELD comp_1759 isSwimming Ljava/util/Optional; + FIELD comp_1760 isBaby Ljava/util/Optional; + FIELD field_45745 CODEC Lcom/mojang/serialization/Codec; + METHOD comp_1756 isOnFire ()Ljava/util/Optional; + METHOD comp_1757 isSneaking ()Ljava/util/Optional; + METHOD comp_1758 isSprinting ()Ljava/util/Optional; + METHOD comp_1759 isSwimming ()Ljava/util/Optional; + METHOD comp_1760 isBaby ()Ljava/util/Optional; METHOD method_8892 test (Lnet/minecraft/class_1297;)Z ARG 1 entity - METHOD method_8893 fromJson (Lcom/google/gson/JsonElement;)Lnet/minecraft/class_2040; - ARG 0 json - METHOD method_8894 toJson ()Lcom/google/gson/JsonElement; - METHOD method_8895 nullableBooleanFromJson (Lcom/google/gson/JsonObject;Ljava/lang/String;)Ljava/lang/Boolean; - ARG 0 json - ARG 1 key - METHOD method_8896 nullableBooleanToJson (Lcom/google/gson/JsonObject;Ljava/lang/String;Ljava/lang/Boolean;)V - ARG 1 json - ARG 2 key - ARG 3 value CLASS class_2041 Builder - FIELD field_9584 isBaby Ljava/lang/Boolean; - FIELD field_9585 isSwimming Ljava/lang/Boolean; - FIELD field_9586 isSneaking Ljava/lang/Boolean; - FIELD field_9587 isOnFire Ljava/lang/Boolean; - FIELD field_9588 isSprinting Ljava/lang/Boolean; + FIELD field_9584 isBaby Ljava/util/Optional; + FIELD field_9585 isSwimming Ljava/util/Optional; + FIELD field_9586 isSneaking Ljava/util/Optional; + FIELD field_9587 isOnFire Ljava/util/Optional; + FIELD field_9588 isSprinting Ljava/util/Optional; METHOD method_29935 isBaby (Ljava/lang/Boolean;)Lnet/minecraft/class_2040$class_2041; ARG 1 isBaby METHOD method_35203 sneaking (Ljava/lang/Boolean;)Lnet/minecraft/class_2040$class_2041; diff --git a/mappings/net/minecraft/predicate/entity/EntityPredicate.mapping b/mappings/net/minecraft/predicate/entity/EntityPredicate.mapping index e6018036fd..e041fcc56e 100644 --- a/mappings/net/minecraft/predicate/entity/EntityPredicate.mapping +++ b/mappings/net/minecraft/predicate/entity/EntityPredicate.mapping @@ -1,138 +1,111 @@ CLASS net/minecraft/class_2048 net/minecraft/predicate/entity/EntityPredicate - FIELD field_16490 equipment Lnet/minecraft/class_3735; - FIELD field_20698 team Ljava/lang/String; - FIELD field_24488 vehicle Lnet/minecraft/class_2048; - FIELD field_24489 targetedEntity Lnet/minecraft/class_2048; - FIELD field_33912 steppingOn Lnet/minecraft/class_2090; - FIELD field_33914 passenger Lnet/minecraft/class_2048; - FIELD field_38721 typeSpecific Lnet/minecraft/class_7376; - FIELD field_9594 effects Lnet/minecraft/class_2102; - FIELD field_9595 type Lnet/minecraft/class_2050; - FIELD field_9596 location Lnet/minecraft/class_2090; - FIELD field_9597 flags Lnet/minecraft/class_2040; - FIELD field_9599 ANY Lnet/minecraft/class_2048; - FIELD field_9600 nbt Lnet/minecraft/class_2105; - FIELD field_9601 distance Lnet/minecraft/class_2025; - METHOD (Lnet/minecraft/class_2050;Lnet/minecraft/class_2025;Lnet/minecraft/class_2090;Lnet/minecraft/class_2090;Lnet/minecraft/class_2102;Lnet/minecraft/class_2105;Lnet/minecraft/class_2040;Lnet/minecraft/class_3735;Lnet/minecraft/class_7376;Ljava/lang/String;)V - ARG 1 type - ARG 2 distance - ARG 3 location - ARG 4 steppingOn - ARG 5 effects - ARG 6 nbt - ARG 7 flags - ARG 8 equipment - ARG 9 typeSpecific - ARG 10 team - METHOD (Lnet/minecraft/class_2050;Lnet/minecraft/class_2025;Lnet/minecraft/class_2090;Lnet/minecraft/class_2090;Lnet/minecraft/class_2102;Lnet/minecraft/class_2105;Lnet/minecraft/class_2040;Lnet/minecraft/class_3735;Lnet/minecraft/class_7376;Lnet/minecraft/class_2048;Lnet/minecraft/class_2048;Lnet/minecraft/class_2048;Ljava/lang/String;)V - ARG 1 type - ARG 2 distance - ARG 3 location - ARG 4 steppingOn - ARG 5 effects - ARG 6 nbt - ARG 7 flags - ARG 8 equipment - ARG 9 typeSpecific - ARG 10 vehicle - ARG 11 passenger - ARG 12 targetedEntity - ARG 13 team + FIELD comp_1761 type Ljava/util/Optional; + FIELD comp_1762 distance Ljava/util/Optional; + FIELD comp_1763 location Ljava/util/Optional; + FIELD comp_1764 steppingOn Ljava/util/Optional; + FIELD comp_1765 effects Ljava/util/Optional; + FIELD comp_1766 nbt Ljava/util/Optional; + FIELD comp_1767 flags Ljava/util/Optional; + FIELD comp_1768 equipment Ljava/util/Optional; + FIELD comp_1769 typeSpecific Ljava/util/Optional; + FIELD comp_1770 vehicle Ljava/util/Optional; + FIELD comp_1771 passenger Ljava/util/Optional; + FIELD comp_1772 targetedEntity Ljava/util/Optional; + FIELD comp_1773 team Ljava/util/Optional; + FIELD field_45746 CODEC Lcom/mojang/serialization/Codec; + METHOD comp_1761 type ()Ljava/util/Optional; + METHOD comp_1762 distance ()Ljava/util/Optional; + METHOD comp_1763 location ()Ljava/util/Optional; + METHOD comp_1764 steppingOn ()Ljava/util/Optional; + METHOD comp_1765 effects ()Ljava/util/Optional; + METHOD comp_1766 nbt ()Ljava/util/Optional; + METHOD comp_1767 flags ()Ljava/util/Optional; + METHOD comp_1768 equipment ()Ljava/util/Optional; + METHOD comp_1769 typeSpecific ()Ljava/util/Optional; + METHOD comp_1770 vehicle ()Ljava/util/Optional; + METHOD comp_1771 passenger ()Ljava/util/Optional; + METHOD comp_1772 targetedEntity ()Ljava/util/Optional; + METHOD comp_1773 team ()Ljava/util/Optional; METHOD method_27802 createAdvancementEntityLootContext (Lnet/minecraft/class_3222;Lnet/minecraft/class_1297;)Lnet/minecraft/class_47; ARG 0 player ARG 1 target METHOD method_37227 (Lnet/minecraft/class_3218;Lnet/minecraft/class_243;Lnet/minecraft/class_1297;)Z - ARG 3 entity + ARG 3 entityx + METHOD method_51704 asLootContextPredicate (Lnet/minecraft/class_2048;)Lnet/minecraft/class_5258; + ARG 0 predicate + METHOD method_51705 contextPredicateFromJson (Lcom/google/gson/JsonObject;Ljava/lang/String;Lnet/minecraft/class_5257;)Ljava/util/Optional; + ARG 0 json + ARG 1 key + ARG 2 predicateDeserializer + METHOD method_51706 contextPredicateFromJsonElement (Ljava/lang/String;Lnet/minecraft/class_5257;Lcom/google/gson/JsonElement;)Ljava/util/Optional; + ARG 0 key + ARG 1 predicateDeserializer + ARG 2 json + METHOD method_51707 contextPredicateArrayFromJson (Lcom/google/gson/JsonObject;Ljava/lang/String;Lnet/minecraft/class_5257;)Ljava/util/List; + ARG 0 json + ARG 1 key + ARG 2 predicateDeserializer + METHOD method_53134 contextPredicateFromEntityPredicate (Lnet/minecraft/class_2048$class_2049;)Lnet/minecraft/class_5258; + ARG 0 builder + METHOD method_53137 contextPredicateFromEntityPredicate (Ljava/util/Optional;)Ljava/util/Optional; + ARG 0 entityPredicate + METHOD method_53139 contextPredicateFromEntityPredicates ([Lnet/minecraft/class_2048$class_2049;)Ljava/util/List; + ARG 0 builders METHOD method_8909 test (Lnet/minecraft/class_3218;Lnet/minecraft/class_243;Lnet/minecraft/class_1297;)Z ARG 1 world ARG 2 pos ARG 3 entity METHOD method_8912 toJson ()Lcom/google/gson/JsonElement; - METHOD method_8913 fromJson (Lcom/google/gson/JsonElement;)Lnet/minecraft/class_2048; + METHOD method_8913 fromJson (Lcom/google/gson/JsonElement;)Ljava/util/Optional; ARG 0 json METHOD method_8914 test (Lnet/minecraft/class_3222;Lnet/minecraft/class_1297;)Z ARG 1 player ARG 2 entity CLASS class_2049 Builder - FIELD field_16491 equipment Lnet/minecraft/class_3735; - FIELD field_20700 team Ljava/lang/String; - FIELD field_24490 vehicle Lnet/minecraft/class_2048; - FIELD field_24491 targetedEntity Lnet/minecraft/class_2048; - FIELD field_33915 steppingOn Lnet/minecraft/class_2090; - FIELD field_33917 passenger Lnet/minecraft/class_2048; - FIELD field_38722 typeSpecific Lnet/minecraft/class_7376; - FIELD field_9602 distance Lnet/minecraft/class_2025; - FIELD field_9603 nbt Lnet/minecraft/class_2105; - FIELD field_9604 location Lnet/minecraft/class_2090; - FIELD field_9605 effects Lnet/minecraft/class_2102; - FIELD field_9606 flags Lnet/minecraft/class_2040; - FIELD field_9607 type Lnet/minecraft/class_2050; + FIELD field_16491 equipment Ljava/util/Optional; + FIELD field_20700 team Ljava/util/Optional; + FIELD field_24490 vehicle Ljava/util/Optional; + FIELD field_24491 targetedEntity Ljava/util/Optional; + FIELD field_33915 steppingOn Ljava/util/Optional; + FIELD field_33917 passenger Ljava/util/Optional; + FIELD field_38722 typeSpecific Ljava/util/Optional; + FIELD field_9602 distance Ljava/util/Optional; + FIELD field_9603 nbt Ljava/util/Optional; + FIELD field_9604 location Ljava/util/Optional; + FIELD field_9605 effects Ljava/util/Optional; + FIELD field_9606 flags Ljava/util/Optional; + FIELD field_9607 type Ljava/util/Optional; METHOD method_16227 equipment (Lnet/minecraft/class_3735;)Lnet/minecraft/class_2048$class_2049; ARG 1 equipment METHOD method_22470 team (Ljava/lang/String;)Lnet/minecraft/class_2048$class_2049; ARG 1 team - METHOD method_27971 vehicle (Lnet/minecraft/class_2048;)Lnet/minecraft/class_2048$class_2049; + METHOD method_27971 vehicle (Lnet/minecraft/class_2048$class_2049;)Lnet/minecraft/class_2048$class_2049; ARG 1 vehicle - METHOD method_27972 targetedEntity (Lnet/minecraft/class_2048;)Lnet/minecraft/class_2048$class_2049; + METHOD method_27972 targetedEntity (Lnet/minecraft/class_2048$class_2049;)Lnet/minecraft/class_2048$class_2049; ARG 1 targetedEntity - METHOD method_37229 passenger (Lnet/minecraft/class_2048;)Lnet/minecraft/class_2048$class_2049; + METHOD method_37229 passenger (Lnet/minecraft/class_2048$class_2049;)Lnet/minecraft/class_2048$class_2049; ARG 1 passenger - METHOD method_37230 steppingOn (Lnet/minecraft/class_2090;)Lnet/minecraft/class_2048$class_2049; - ARG 1 location + METHOD method_37230 steppingOn (Lnet/minecraft/class_2090$class_2091;)Lnet/minecraft/class_2048$class_2049; + ARG 1 steppingOn METHOD method_43094 typeSpecific (Lnet/minecraft/class_7376;)Lnet/minecraft/class_2048$class_2049; ARG 1 typeSpecific + METHOD method_53141 equipment (Lnet/minecraft/class_3735$class_5278;)Lnet/minecraft/class_2048$class_2049; + ARG 1 equipment METHOD method_8915 nbt (Lnet/minecraft/class_2105;)Lnet/minecraft/class_2048$class_2049; ARG 1 nbt METHOD method_8916 create ()Lnet/minecraft/class_2048$class_2049; METHOD method_8917 type (Lnet/minecraft/class_2050;)Lnet/minecraft/class_2048$class_2049; ARG 1 type - METHOD method_8918 location (Lnet/minecraft/class_2090;)Lnet/minecraft/class_2048$class_2049; + METHOD method_8918 location (Lnet/minecraft/class_2090$class_2091;)Lnet/minecraft/class_2048$class_2049; ARG 1 location - METHOD method_8919 flags (Lnet/minecraft/class_2040;)Lnet/minecraft/class_2048$class_2049; + METHOD method_8919 flags (Lnet/minecraft/class_2040$class_2041;)Lnet/minecraft/class_2048$class_2049; ARG 1 flags METHOD method_8920 build ()Lnet/minecraft/class_2048; METHOD method_8921 type (Lnet/minecraft/class_1299;)Lnet/minecraft/class_2048$class_2049; ARG 1 type METHOD method_8922 type (Lnet/minecraft/class_6862;)Lnet/minecraft/class_2048$class_2049; ARG 1 tag - METHOD method_8923 effects (Lnet/minecraft/class_2102;)Lnet/minecraft/class_2048$class_2049; + METHOD method_8923 effects (Lnet/minecraft/class_2102$class_8748;)Lnet/minecraft/class_2048$class_2049; ARG 1 effects METHOD method_8924 distance (Lnet/minecraft/class_2025;)Lnet/minecraft/class_2048$class_2049; ARG 1 distance - CLASS class_5258 Extended - FIELD field_24388 EMPTY Lnet/minecraft/class_2048$class_5258; - FIELD field_24389 conditions [Lnet/minecraft/class_5341; - FIELD field_24390 combinedCondition Ljava/util/function/Predicate; - METHOD ([Lnet/minecraft/class_5341;)V - ARG 1 conditions - METHOD method_27803 ofLegacy (Lnet/minecraft/class_2048;)Lnet/minecraft/class_2048$class_5258; - ARG 0 predicate - METHOD method_27804 toJson (Lnet/minecraft/class_5267;)Lcom/google/gson/JsonElement; - ARG 1 predicateSerializer - METHOD method_27805 getInJson (Lcom/google/gson/JsonObject;Ljava/lang/String;Lnet/minecraft/class_5257;)Lnet/minecraft/class_2048$class_5258; - COMMENT Parses an extended entity check in a sub-value in JSON, accepting objects - COMMENT as simple entity predicates or array as list of loot conditions. - COMMENT - COMMENT @see - COMMENT Mojang description - ARG 0 root - ARG 1 key - ARG 2 predicateDeserializer - METHOD method_27806 test (Lnet/minecraft/class_47;)Z - ARG 1 context - METHOD method_27807 fromJson (Ljava/lang/String;Lnet/minecraft/class_5257;Lcom/google/gson/JsonElement;)Lnet/minecraft/class_2048$class_5258; - ARG 0 key - ARG 1 predicateDeserializer - ARG 2 json - METHOD method_27808 toPredicatesJsonArray ([Lnet/minecraft/class_2048$class_5258;Lnet/minecraft/class_5267;)Lcom/google/gson/JsonElement; - ARG 0 predicates - ARG 1 predicateSerializer - METHOD method_27809 requireInJson (Lcom/google/gson/JsonObject;Ljava/lang/String;Lnet/minecraft/class_5257;)[Lnet/minecraft/class_2048$class_5258; - COMMENT Parses an extended entity check in a sub-value in JSON. The value must - COMMENT be absent, JSON null, or an array, or the parser will error. In other - COMMENT words, it does not accept object sub-values. - ARG 0 root - ARG 1 key - ARG 2 predicateDeserializer - METHOD method_27973 create ([Lnet/minecraft/class_5341;)Lnet/minecraft/class_2048$class_5258; - ARG 0 conditions diff --git a/mappings/net/minecraft/predicate/entity/EntityPredicates.mapping b/mappings/net/minecraft/predicate/entity/EntityPredicates.mapping index eef3c1cb48..294c6fee7c 100644 --- a/mappings/net/minecraft/predicate/entity/EntityPredicates.mapping +++ b/mappings/net/minecraft/predicate/entity/EntityPredicates.mapping @@ -57,7 +57,7 @@ CLASS net/minecraft/class_1301 net/minecraft/predicate/entity/EntityPredicates METHOD method_5914 (Lnet/minecraft/class_1297;)Z ARG 0 entity METHOD method_5915 (Lnet/minecraft/class_1297;Lnet/minecraft/class_270;Lnet/minecraft/class_270$class_271;Lnet/minecraft/class_1297;)Z - ARG 3 entity + ARG 3 entityx CLASS class_1302 Equipable FIELD field_6158 stack Lnet/minecraft/class_1799; METHOD (Lnet/minecraft/class_1799;)V diff --git a/mappings/net/minecraft/predicate/entity/EntityTypePredicate.mapping b/mappings/net/minecraft/predicate/entity/EntityTypePredicate.mapping index 3495cbe5a6..7adae7e860 100644 --- a/mappings/net/minecraft/predicate/entity/EntityTypePredicate.mapping +++ b/mappings/net/minecraft/predicate/entity/EntityTypePredicate.mapping @@ -1,20 +1,8 @@ CLASS net/minecraft/class_2050 net/minecraft/predicate/entity/EntityTypePredicate - FIELD field_9608 COMMA_JOINER Lcom/google/common/base/Joiner; - FIELD field_9609 ANY Lnet/minecraft/class_2050; + FIELD field_45749 CODEC Lcom/mojang/serialization/Codec; METHOD method_8925 matches (Lnet/minecraft/class_1299;)Z ARG 1 type METHOD method_8926 create (Lnet/minecraft/class_6862;)Lnet/minecraft/class_2050; ARG 0 tag - METHOD method_8927 toJson ()Lcom/google/gson/JsonElement; - METHOD method_8928 fromJson (Lcom/google/gson/JsonElement;)Lnet/minecraft/class_2050; - ARG 0 json METHOD method_8929 create (Lnet/minecraft/class_1299;)Lnet/minecraft/class_2050; ARG 0 type - CLASS class_2051 Tagged - FIELD field_9610 tag Lnet/minecraft/class_6862; - METHOD (Lnet/minecraft/class_6862;)V - ARG 1 tag - CLASS class_2052 Single - FIELD field_9611 type Lnet/minecraft/class_1299; - METHOD (Lnet/minecraft/class_1299;)V - ARG 1 type diff --git a/mappings/net/minecraft/predicate/entity/FishingHookPredicate.mapping b/mappings/net/minecraft/predicate/entity/FishingHookPredicate.mapping index 02d7c36928..5c9af052a2 100644 --- a/mappings/net/minecraft/predicate/entity/FishingHookPredicate.mapping +++ b/mappings/net/minecraft/predicate/entity/FishingHookPredicate.mapping @@ -1,10 +1,7 @@ CLASS net/minecraft/class_4965 net/minecraft/predicate/entity/FishingHookPredicate + FIELD comp_1779 inOpenWater Ljava/util/Optional; FIELD field_23137 ALL Lnet/minecraft/class_4965; - FIELD field_23138 inOpenWater Z - FIELD field_30854 IN_OPEN_WATER Ljava/lang/String; - METHOD (Z)V - ARG 1 inOpenWater - METHOD method_26094 fromJson (Lcom/google/gson/JsonObject;)Lnet/minecraft/class_4965; - ARG 0 json + FIELD field_45750 CODEC Lcom/mojang/serialization/MapCodec; + METHOD comp_1779 inOpenWater ()Ljava/util/Optional; METHOD method_26095 of (Z)Lnet/minecraft/class_4965; ARG 0 inOpenWater diff --git a/mappings/net/minecraft/predicate/entity/LightningBoltPredicate.mapping b/mappings/net/minecraft/predicate/entity/LightningBoltPredicate.mapping index 7fb23ab0db..79fafe7024 100644 --- a/mappings/net/minecraft/predicate/entity/LightningBoltPredicate.mapping +++ b/mappings/net/minecraft/predicate/entity/LightningBoltPredicate.mapping @@ -1,14 +1,12 @@ CLASS net/minecraft/class_6404 net/minecraft/predicate/entity/LightningBoltPredicate - FIELD field_33921 BLOCKS_SET_ON_FIRE_KEY Ljava/lang/String; - FIELD field_33922 ENTITY_STRUCK_KEY Ljava/lang/String; - FIELD field_33923 blocksSetOnFire Lnet/minecraft/class_2096$class_2100; - FIELD field_33924 entityStruck Lnet/minecraft/class_2048; - METHOD (Lnet/minecraft/class_2096$class_2100;Lnet/minecraft/class_2048;)V + FIELD comp_1792 blocksSetOnFire Lnet/minecraft/class_2096$class_2100; + FIELD comp_1793 entityStruck Ljava/util/Optional; + FIELD field_45759 CODEC Lcom/mojang/serialization/MapCodec; + METHOD (Lnet/minecraft/class_2096$class_2100;Ljava/util/Optional;)V ARG 1 blocksSetOnFire - ARG 2 entityStruck + METHOD comp_1792 blocksSetOnFire ()Lnet/minecraft/class_2096$class_2100; + METHOD comp_1793 entityStruck ()Ljava/util/Optional; METHOD method_37235 (Lnet/minecraft/class_3218;Lnet/minecraft/class_243;Lnet/minecraft/class_1297;)Z ARG 3 struckEntity METHOD method_37237 of (Lnet/minecraft/class_2096$class_2100;)Lnet/minecraft/class_6404; ARG 0 blocksSetOnFire - METHOD method_37238 fromJson (Lcom/google/gson/JsonObject;)Lnet/minecraft/class_6404; - ARG 0 json diff --git a/mappings/net/minecraft/predicate/entity/LocationPredicate.mapping b/mappings/net/minecraft/predicate/entity/LocationPredicate.mapping index d9e83c5aa4..3d70d77b08 100644 --- a/mappings/net/minecraft/predicate/entity/LocationPredicate.mapping +++ b/mappings/net/minecraft/predicate/entity/LocationPredicate.mapping @@ -1,75 +1,84 @@ CLASS net/minecraft/class_2090 net/minecraft/predicate/entity/LocationPredicate - FIELD field_20714 light Lnet/minecraft/class_4552; - FIELD field_20715 block Lnet/minecraft/class_4550; - FIELD field_20716 fluid Lnet/minecraft/class_4551; - FIELD field_24500 smokey Ljava/lang/Boolean; - FIELD field_24732 LOGGER Lorg/slf4j/Logger; - FIELD field_9681 z Lnet/minecraft/class_2096$class_2099; - FIELD field_9682 x Lnet/minecraft/class_2096$class_2099; - FIELD field_9683 biome Lnet/minecraft/class_5321; - FIELD field_9684 y Lnet/minecraft/class_2096$class_2099; - FIELD field_9685 ANY Lnet/minecraft/class_2090; - FIELD field_9686 dimension Lnet/minecraft/class_5321; - FIELD field_9687 feature Lnet/minecraft/class_5321; - METHOD (Lnet/minecraft/class_2096$class_2099;Lnet/minecraft/class_2096$class_2099;Lnet/minecraft/class_2096$class_2099;Lnet/minecraft/class_5321;Lnet/minecraft/class_5321;Lnet/minecraft/class_5321;Ljava/lang/Boolean;Lnet/minecraft/class_4552;Lnet/minecraft/class_4550;Lnet/minecraft/class_4551;)V - ARG 1 x - ARG 2 y - ARG 3 z - ARG 4 biome - ARG 5 feature - ARG 6 dimension - ARG 7 smokey - ARG 8 light - ARG 9 block - ARG 10 fluid - METHOD method_28480 (Lcom/google/gson/JsonObject;Lcom/google/gson/JsonElement;)V - ARG 1 json - METHOD method_38858 y (Lnet/minecraft/class_2096$class_2099;)Lnet/minecraft/class_2090; - ARG 0 y - METHOD method_9016 dimension (Lnet/minecraft/class_5321;)Lnet/minecraft/class_2090; - ARG 0 dimension - METHOD method_9017 feature (Lnet/minecraft/class_5321;)Lnet/minecraft/class_2090; - ARG 0 feature + FIELD comp_1795 biome Ljava/util/Optional; + FIELD comp_1796 structure Ljava/util/Optional; + FIELD comp_1797 dimension Ljava/util/Optional; + FIELD comp_1798 smokey Ljava/util/Optional; + FIELD comp_1799 light Ljava/util/Optional; + FIELD comp_1800 block Ljava/util/Optional; + FIELD comp_1801 fluid Ljava/util/Optional; + FIELD field_45760 CODEC Lcom/mojang/serialization/Codec; + METHOD comp_1795 biome ()Ljava/util/Optional; + METHOD comp_1796 structure ()Ljava/util/Optional; + METHOD comp_1797 dimension ()Ljava/util/Optional; + METHOD comp_1798 smokey ()Ljava/util/Optional; + METHOD comp_1799 light ()Ljava/util/Optional; + METHOD comp_1800 block ()Ljava/util/Optional; + METHOD comp_1801 fluid ()Ljava/util/Optional; + METHOD method_53179 create (Ljava/util/Optional;Ljava/util/Optional;Ljava/util/Optional;Ljava/util/Optional;Ljava/util/Optional;Ljava/util/Optional;Ljava/util/Optional;Ljava/util/Optional;)Ljava/util/Optional; + ARG 0 position + ARG 1 biome + ARG 2 structure + ARG 3 dimension + ARG 4 smokey + ARG 5 light + ARG 6 block + ARG 7 fluid METHOD method_9018 test (Lnet/minecraft/class_3218;DDD)Z ARG 1 world ARG 2 x ARG 4 y ARG 6 z METHOD method_9019 toJson ()Lcom/google/gson/JsonElement; - METHOD method_9021 fromJson (Lcom/google/gson/JsonElement;)Lnet/minecraft/class_2090; + METHOD method_9021 fromJson (Lcom/google/gson/JsonElement;)Ljava/util/Optional; 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; - FIELD field_20719 fluid Lnet/minecraft/class_4551; - FIELD field_24501 smokey Ljava/lang/Boolean; - FIELD field_9688 feature Lnet/minecraft/class_5321; + FIELD field_20717 light Ljava/util/Optional; + FIELD field_20718 block Ljava/util/Optional; + FIELD field_20719 fluid Ljava/util/Optional; + FIELD field_24501 smokey Ljava/util/Optional; + FIELD field_9688 feature Ljava/util/Optional; FIELD field_9689 y Lnet/minecraft/class_2096$class_2099; - FIELD field_9690 biome Lnet/minecraft/class_5321; - FIELD field_9691 dimension Lnet/minecraft/class_5321; + FIELD field_9690 biome Ljava/util/Optional; + FIELD field_9691 dimension Ljava/util/Optional; FIELD field_9692 z Lnet/minecraft/class_2096$class_2099; FIELD field_9693 x Lnet/minecraft/class_2096$class_2099; METHOD method_22484 create ()Lnet/minecraft/class_2090$class_2091; - METHOD method_27989 block (Lnet/minecraft/class_4550;)Lnet/minecraft/class_2090$class_2091; + METHOD method_27989 block (Lnet/minecraft/class_4550$class_4710;)Lnet/minecraft/class_2090$class_2091; ARG 1 block - METHOD method_27990 smokey (Ljava/lang/Boolean;)Lnet/minecraft/class_2090$class_2091; + METHOD method_27990 smokey (Z)Lnet/minecraft/class_2090$class_2091; ARG 1 smokey - METHOD method_35274 fluid (Lnet/minecraft/class_4551;)Lnet/minecraft/class_2090$class_2091; + METHOD method_35274 fluid (Lnet/minecraft/class_4551$class_6079;)Lnet/minecraft/class_2090$class_2091; ARG 1 fluid - METHOD method_35275 light (Lnet/minecraft/class_4552;)Lnet/minecraft/class_2090$class_2091; + METHOD method_35275 light (Lnet/minecraft/class_4552$class_6087;)Lnet/minecraft/class_2090$class_2091; ARG 1 light METHOD method_35276 x (Lnet/minecraft/class_2096$class_2099;)Lnet/minecraft/class_2090$class_2091; ARG 1 x - METHOD method_35277 feature (Lnet/minecraft/class_5321;)Lnet/minecraft/class_2090$class_2091; - ARG 1 feature + METHOD method_35277 structure (Lnet/minecraft/class_5321;)Lnet/minecraft/class_2090$class_2091; + ARG 1 structure METHOD method_35278 y (Lnet/minecraft/class_2096$class_2099;)Lnet/minecraft/class_2090$class_2091; ARG 1 y METHOD method_35279 dimension (Lnet/minecraft/class_5321;)Lnet/minecraft/class_2090$class_2091; ARG 1 dimension METHOD method_35280 z (Lnet/minecraft/class_2096$class_2099;)Lnet/minecraft/class_2090$class_2091; ARG 1 z + METHOD method_53180 createBiome (Lnet/minecraft/class_5321;)Lnet/minecraft/class_2090$class_2091; + ARG 0 biome + METHOD method_53181 createY (Lnet/minecraft/class_2096$class_2099;)Lnet/minecraft/class_2090$class_2091; + ARG 0 y + METHOD method_53182 createDimension (Lnet/minecraft/class_5321;)Lnet/minecraft/class_2090$class_2091; + ARG 0 dimension + METHOD method_53183 createStructure (Lnet/minecraft/class_5321;)Lnet/minecraft/class_2090$class_2091; + ARG 0 structure METHOD method_9023 build ()Lnet/minecraft/class_2090; METHOD method_9024 biome (Lnet/minecraft/class_5321;)Lnet/minecraft/class_2090$class_2091; ARG 1 biome + CLASS class_8747 PositionRange + FIELD field_45761 CODEC Lcom/mojang/serialization/Codec; + METHOD method_53184 test (DDD)Z + ARG 1 x + ARG 3 y + ARG 5 z + METHOD method_53185 create (Lnet/minecraft/class_2096$class_2099;Lnet/minecraft/class_2096$class_2099;Lnet/minecraft/class_2096$class_2099;)Ljava/util/Optional; + ARG 0 x + ARG 1 y + ARG 2 z diff --git a/mappings/net/minecraft/predicate/entity/LootContextPredicate.mapping b/mappings/net/minecraft/predicate/entity/LootContextPredicate.mapping new file mode 100644 index 0000000000..18bb40179e --- /dev/null +++ b/mappings/net/minecraft/predicate/entity/LootContextPredicate.mapping @@ -0,0 +1,18 @@ +CLASS net/minecraft/class_5258 net/minecraft/predicate/entity/LootContextPredicate + COMMENT A list of loot conditions applied to entities. All conditions must match for this + COMMENT unified conditions to {@linkplain #test match}. Mainly used by advancements. + FIELD field_24389 conditions Ljava/util/List; + FIELD field_24390 combinedCondition Ljava/util/function/Predicate; + METHOD (Ljava/util/List;)V + ARG 1 conditions + METHOD method_27804 toJson ()Lcom/google/gson/JsonElement; + METHOD method_27806 test (Lnet/minecraft/class_47;)Z + ARG 1 context + METHOD method_27807 fromJson (Ljava/lang/String;Lnet/minecraft/class_5257;Lcom/google/gson/JsonElement;Lnet/minecraft/class_176;)Ljava/util/Optional; + ARG 0 key + ARG 1 predicateDeserializer + ARG 2 json + ARG 3 contextType + METHOD method_27808 toPredicatesJsonArray (Ljava/util/List;)Lcom/google/gson/JsonElement; + METHOD method_27973 create ([Lnet/minecraft/class_5341;)Lnet/minecraft/class_5258; + ARG 0 conditions diff --git a/mappings/net/minecraft/predicate/entity/PlayerPredicate.mapping b/mappings/net/minecraft/predicate/entity/PlayerPredicate.mapping index 8df8a2d494..f10ad8346c 100644 --- a/mappings/net/minecraft/predicate/entity/PlayerPredicate.mapping +++ b/mappings/net/minecraft/predicate/entity/PlayerPredicate.mapping @@ -1,60 +1,57 @@ CLASS net/minecraft/class_4553 net/minecraft/predicate/entity/PlayerPredicate - FIELD field_20723 experienceLevel Lnet/minecraft/class_2096$class_2100; - 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; - FIELD field_33929 lookingAt Lnet/minecraft/class_2048; - METHOD (Lnet/minecraft/class_2096$class_2100;Lnet/minecraft/class_1934;Ljava/util/Map;Lit/unimi/dsi/fastutil/objects/Object2BooleanMap;Ljava/util/Map;Lnet/minecraft/class_2048;)V + FIELD comp_1817 experienceLevel Lnet/minecraft/class_2096$class_2100; + FIELD comp_1818 gameMode Ljava/util/Optional; + FIELD comp_1819 stats Ljava/util/List; + FIELD comp_1820 recipes Lit/unimi/dsi/fastutil/objects/Object2BooleanMap; + FIELD comp_1821 advancements Ljava/util/Map; + FIELD comp_1822 lookingAt Ljava/util/Optional; + FIELD field_33928 LOOKING_AT_DISTANCE I + FIELD field_45770 CODEC Lcom/mojang/serialization/MapCodec; + METHOD (Lnet/minecraft/class_2096$class_2100;Ljava/util/Optional;Ljava/util/List;Lit/unimi/dsi/fastutil/objects/Object2BooleanMap;Ljava/util/Map;Ljava/util/Optional;)V ARG 1 experienceLevel - ARG 2 gameMode - ARG 3 stats ARG 4 recipes ARG 5 advancements - ARG 6 lookingAt - METHOD method_22495 getStatId (Lnet/minecraft/class_3445;)Lnet/minecraft/class_2960; - ARG 0 stat - METHOD method_22496 getStat (Lnet/minecraft/class_3448;Lnet/minecraft/class_2960;)Lnet/minecraft/class_3445; - ARG 0 type - ARG 1 id + METHOD comp_1817 experienceLevel ()Lnet/minecraft/class_2096$class_2100; + METHOD comp_1818 gameMode ()Ljava/util/Optional; + METHOD comp_1819 stats ()Ljava/util/List; + METHOD comp_1820 recipes ()Lit/unimi/dsi/fastutil/objects/Object2BooleanMap; + METHOD comp_1821 advancements ()Ljava/util/Map; + METHOD comp_1822 lookingAt ()Ljava/util/Optional; METHOD method_22497 (Lnet/minecraft/class_1297;Lnet/minecraft/class_3218;Lnet/minecraft/class_243;)Z ARG 1 entity - METHOD method_22498 (Lcom/google/gson/JsonArray;Lnet/minecraft/class_3445;Lnet/minecraft/class_2096$class_2100;)V - ARG 1 stat - METHOD method_22499 fromJson (Lcom/google/gson/JsonObject;)Lnet/minecraft/class_4553; - ARG 0 json - METHOD method_22500 (Lcom/google/gson/JsonObject;Lnet/minecraft/class_2960;Ljava/lang/Boolean;)V - ARG 1 id - METHOD method_22501 (Lcom/google/gson/JsonObject;Lnet/minecraft/class_2960;Lnet/minecraft/class_4553$class_4556;)V - ARG 1 id - METHOD method_22503 criterionFromJson (Lcom/google/gson/JsonElement;)Lnet/minecraft/class_4553$class_4556; - ARG 0 json + METHOD method_37250 (Lnet/minecraft/class_1297;)Z + ARG 0 hitEntity CLASS class_4554 AdvancementCriteriaPredicate - FIELD field_20728 criteria Lit/unimi/dsi/fastutil/objects/Object2BooleanMap; + FIELD comp_1823 criteria Lit/unimi/dsi/fastutil/objects/Object2BooleanMap; + FIELD field_45771 CODEC Lcom/mojang/serialization/Codec; METHOD (Lit/unimi/dsi/fastutil/objects/Object2BooleanMap;)V ARG 1 criteria + METHOD comp_1823 criteria ()Lit/unimi/dsi/fastutil/objects/Object2BooleanMap; METHOD test (Ljava/lang/Object;)Z ARG 1 progress CLASS class_4555 CompletedAdvancementPredicate - FIELD field_20729 done Z + FIELD comp_1824 done Z + FIELD field_45772 CODEC Lcom/mojang/serialization/Codec; METHOD (Z)V ARG 1 done + METHOD comp_1824 done ()Z METHOD test (Ljava/lang/Object;)Z ARG 1 progress CLASS class_4556 AdvancementPredicate - METHOD method_22506 toJson ()Lcom/google/gson/JsonElement; + FIELD field_45773 CODEC Lcom/mojang/serialization/Codec; CLASS class_4557 Builder FIELD field_20730 experienceLevel Lnet/minecraft/class_2096$class_2100; - FIELD field_20731 gameMode Lnet/minecraft/class_1934; - FIELD field_20732 stats Ljava/util/Map; + FIELD field_20731 gameMode Ljava/util/Optional; + FIELD field_20732 stats Lcom/google/common/collect/ImmutableList$Builder; FIELD field_20733 recipes Lit/unimi/dsi/fastutil/objects/Object2BooleanMap; FIELD field_20734 advancements Ljava/util/Map; - FIELD field_33930 lookingAt Lnet/minecraft/class_2048; + FIELD field_33930 lookingAt Ljava/util/Optional; METHOD method_22507 build ()Lnet/minecraft/class_4553; METHOD method_35310 create ()Lnet/minecraft/class_4553$class_4557; - METHOD method_35311 stat (Lnet/minecraft/class_3445;Lnet/minecraft/class_2096$class_2100;)Lnet/minecraft/class_4553$class_4557; - ARG 1 stat + METHOD method_35311 stat (Lnet/minecraft/class_3448;Lnet/minecraft/class_6880$class_6883;Lnet/minecraft/class_2096$class_2100;)Lnet/minecraft/class_4553$class_4557; + ARG 1 statType ARG 2 value + ARG 3 range METHOD method_35312 gameMode (Lnet/minecraft/class_1934;)Lnet/minecraft/class_4553$class_4557; ARG 1 gameMode METHOD method_35313 experienceLevel (Lnet/minecraft/class_2096$class_2100;)Lnet/minecraft/class_4553$class_4557; @@ -68,5 +65,14 @@ CLASS net/minecraft/class_4553 net/minecraft/predicate/entity/PlayerPredicate METHOD method_35316 advancement (Lnet/minecraft/class_2960;Z)Lnet/minecraft/class_4553$class_4557; ARG 1 id ARG 2 done - METHOD method_37251 lookingAt (Lnet/minecraft/class_2048;)Lnet/minecraft/class_4553$class_4557; - ARG 1 lookingAt + METHOD method_37251 lookingAt (Lnet/minecraft/class_2048$class_2049;)Lnet/minecraft/class_4553$class_4557; + CLASS class_8749 StatMatcher + FIELD field_45774 CODEC Lcom/mojang/serialization/Codec; + METHOD (Lnet/minecraft/class_3448;Lnet/minecraft/class_6880;Lnet/minecraft/class_2096$class_2100;)V + ARG 1 type + ARG 2 value + ARG 3 range + METHOD method_53224 createCodec (Lnet/minecraft/class_3448;)Lcom/mojang/serialization/Codec; + ARG 0 type + METHOD method_53228 test (Lnet/minecraft/class_3469;)Z + ARG 1 statHandler diff --git a/mappings/net/minecraft/predicate/entity/SlimePredicate.mapping b/mappings/net/minecraft/predicate/entity/SlimePredicate.mapping index 6bf431bff2..e52735a57a 100644 --- a/mappings/net/minecraft/predicate/entity/SlimePredicate.mapping +++ b/mappings/net/minecraft/predicate/entity/SlimePredicate.mapping @@ -1,8 +1,8 @@ CLASS net/minecraft/class_7383 net/minecraft/predicate/entity/SlimePredicate - FIELD field_38759 size Lnet/minecraft/class_2096$class_2100; + FIELD comp_1829 size Lnet/minecraft/class_2096$class_2100; + FIELD field_45776 CODEC Lcom/mojang/serialization/MapCodec; METHOD (Lnet/minecraft/class_2096$class_2100;)V ARG 1 size + METHOD comp_1829 size ()Lnet/minecraft/class_2096$class_2100; METHOD method_43157 of (Lnet/minecraft/class_2096$class_2100;)Lnet/minecraft/class_7383; ARG 0 size - METHOD method_43158 fromJson (Lcom/google/gson/JsonObject;)Lnet/minecraft/class_7383; - ARG 0 json diff --git a/mappings/net/minecraft/predicate/entity/TypeSpecificPredicate.mapping b/mappings/net/minecraft/predicate/entity/TypeSpecificPredicate.mapping index c266e3db2e..7762610150 100644 --- a/mappings/net/minecraft/predicate/entity/TypeSpecificPredicate.mapping +++ b/mappings/net/minecraft/predicate/entity/TypeSpecificPredicate.mapping @@ -1,6 +1,5 @@ CLASS net/minecraft/class_7376 net/minecraft/predicate/entity/TypeSpecificPredicate - FIELD field_38723 ANY Lnet/minecraft/class_7376; - METHOD method_22494 typeSpecificToJson ()Lcom/google/gson/JsonObject; + FIELD field_45747 CODEC Lcom/mojang/serialization/Codec; METHOD method_22497 test (Lnet/minecraft/class_1297;Lnet/minecraft/class_3218;Lnet/minecraft/class_243;)Z ARG 1 entity ARG 2 world @@ -9,25 +8,51 @@ CLASS net/minecraft/class_7376 net/minecraft/predicate/entity/TypeSpecificPredic ARG 0 variant METHOD method_43096 frog (Lnet/minecraft/class_7106;)Lnet/minecraft/class_7376; ARG 0 variant - METHOD method_43097 fromJson (Lcom/google/gson/JsonElement;)Lnet/minecraft/class_7376; - ARG 0 json - METHOD method_43098 toJson ()Lcom/google/gson/JsonElement; - METHOD method_43099 getDeserializer ()Lnet/minecraft/class_7376$class_7377; - CLASS class_7377 Deserializer - METHOD deserialize (Lcom/google/gson/JsonObject;)Lnet/minecraft/class_7376; - ARG 1 json CLASS class_7378 Deserializers - FIELD field_38724 ANY Lnet/minecraft/class_7376$class_7377; - FIELD field_38725 LIGHTNING Lnet/minecraft/class_7376$class_7377; - FIELD field_38726 FISHING_HOOK Lnet/minecraft/class_7376$class_7377; - FIELD field_38727 PLAYER Lnet/minecraft/class_7376$class_7377; - FIELD field_38728 SLIME Lnet/minecraft/class_7376$class_7377; + FIELD field_38724 ANY Lnet/minecraft/class_7376$class_8745; + FIELD field_38725 LIGHTNING Lnet/minecraft/class_7376$class_8745; + FIELD field_38726 FISHING_HOOK Lnet/minecraft/class_7376$class_8745; + FIELD field_38727 PLAYER Lnet/minecraft/class_7376$class_8745; + FIELD field_38728 SLIME Lnet/minecraft/class_7376$class_8745; FIELD field_38729 CAT Lnet/minecraft/class_7380; FIELD field_38730 FROG Lnet/minecraft/class_7380; FIELD field_38731 TYPES Lcom/google/common/collect/BiMap; + FIELD field_41534 AXOLOTL Lnet/minecraft/class_7380; + FIELD field_41535 BOAT Lnet/minecraft/class_7380; + FIELD field_41536 FOX Lnet/minecraft/class_7380; + FIELD field_41537 MOOSHROOM Lnet/minecraft/class_7380; + FIELD field_41538 PAINTING Lnet/minecraft/class_7380; + FIELD field_41539 RABBIT Lnet/minecraft/class_7380; + FIELD field_41540 HORSE Lnet/minecraft/class_7380; + FIELD field_41541 LLAMA Lnet/minecraft/class_7380; + FIELD field_41542 VILLAGER Lnet/minecraft/class_7380; + FIELD field_41543 PARROT Lnet/minecraft/class_7380; + FIELD field_41544 TROPICAL_FISH Lnet/minecraft/class_7380; + FIELD field_45748 TYPE_CODEC Lcom/mojang/serialization/Codec; METHOD method_43100 (Lnet/minecraft/class_1297;)Ljava/util/Optional; ARG 0 entity - METHOD method_43101 (Lcom/google/gson/JsonObject;)Lnet/minecraft/class_7376; - ARG 0 json METHOD method_43102 (Lnet/minecraft/class_1297;)Ljava/util/Optional; ARG 0 entity + METHOD method_47829 (Lnet/minecraft/class_1297;)Ljava/util/Optional; + ARG 0 entity + METHOD method_47830 (Lnet/minecraft/class_1297;)Ljava/util/Optional; + ARG 0 entity + METHOD method_47831 (Lnet/minecraft/class_1297;)Ljava/util/Optional; + ARG 0 entity + METHOD method_47832 (Lnet/minecraft/class_1297;)Ljava/util/Optional; + ARG 0 entity + METHOD method_47833 (Lnet/minecraft/class_1297;)Ljava/util/Optional; + ARG 0 entity + METHOD method_47834 (Lnet/minecraft/class_1297;)Ljava/util/Optional; + ARG 0 entity + METHOD method_47835 (Lnet/minecraft/class_1297;)Ljava/util/Optional; + ARG 0 entity + METHOD method_47836 (Lnet/minecraft/class_1297;)Ljava/util/Optional; + ARG 0 entity + METHOD method_47837 (Lnet/minecraft/class_1297;)Ljava/util/Optional; + ARG 0 entity + METHOD method_47838 (Lnet/minecraft/class_1297;)Ljava/util/Optional; + ARG 0 entity + METHOD method_47839 (Lnet/minecraft/class_1297;)Ljava/util/Optional; + ARG 0 entity + CLASS class_8745 Type diff --git a/mappings/net/minecraft/predicate/entity/VariantPredicates.mapping b/mappings/net/minecraft/predicate/entity/VariantPredicates.mapping index fdc98ad63e..69a58afc2f 100644 --- a/mappings/net/minecraft/predicate/entity/VariantPredicates.mapping +++ b/mappings/net/minecraft/predicate/entity/VariantPredicates.mapping @@ -1,19 +1,16 @@ CLASS net/minecraft/class_7380 net/minecraft/predicate/entity/VariantPredicates - FIELD field_38739 VARIANT_KEY Ljava/lang/String; - FIELD field_38740 registry Lnet/minecraft/class_2378; FIELD field_38741 variantGetter Ljava/util/function/Function; - FIELD field_38742 deserializer Lnet/minecraft/class_7376$class_7377; - METHOD (Lnet/minecraft/class_2378;Ljava/util/function/Function;)V - ARG 1 registry + FIELD field_38742 deserializer Lnet/minecraft/class_7376$class_8745; + METHOD (Lcom/mojang/serialization/Codec;Ljava/util/function/Function;)V + ARG 1 codec ARG 2 variantGetter - METHOD method_43114 getDeserializer ()Lnet/minecraft/class_7376$class_7377; - METHOD method_43115 (Lnet/minecraft/class_2378;Lcom/google/gson/JsonObject;)Lnet/minecraft/class_7376; - ARG 2 json + METHOD method_43114 getDeserializer ()Lnet/minecraft/class_7376$class_8745; METHOD method_43116 create (Lnet/minecraft/class_2378;Ljava/util/function/Function;)Lnet/minecraft/class_7380; ARG 0 registry ARG 1 variantGetter - METHOD method_43117 createPredicate (Ljava/lang/Object;)Lnet/minecraft/class_7376; + METHOD method_43117 createPredicate (Ljava/lang/Object;)Lnet/minecraft/class_7380$class_8746; ARG 1 variant - CLASS 1 - METHOD method_43118 (Ljava/lang/Object;Ljava/lang/Object;)Z - ARG 1 variant + METHOD method_47840 create (Lcom/mojang/serialization/Codec;Ljava/util/function/Function;)Lnet/minecraft/class_7380; + ARG 0 codec + ARG 1 variantGetter + CLASS class_8746 Predicate diff --git a/mappings/net/minecraft/predicate/item/EnchantmentPredicate.mapping b/mappings/net/minecraft/predicate/item/EnchantmentPredicate.mapping index 5220866aa8..481f5790c5 100644 --- a/mappings/net/minecraft/predicate/item/EnchantmentPredicate.mapping +++ b/mappings/net/minecraft/predicate/item/EnchantmentPredicate.mapping @@ -1,15 +1,11 @@ CLASS net/minecraft/class_2035 net/minecraft/predicate/item/EnchantmentPredicate - FIELD field_20687 ARRAY_OF_ANY [Lnet/minecraft/class_2035; - FIELD field_9569 enchantment Lnet/minecraft/class_1887; - FIELD field_9570 levels Lnet/minecraft/class_2096$class_2100; - FIELD field_9571 ANY Lnet/minecraft/class_2035; + FIELD comp_1748 enchantment Ljava/util/Optional; + FIELD comp_1749 levels Lnet/minecraft/class_2096$class_2100; + FIELD field_45741 CODEC Lcom/mojang/serialization/Codec; METHOD (Lnet/minecraft/class_1887;Lnet/minecraft/class_2096$class_2100;)V ARG 1 enchantment ARG 2 levels - METHOD method_8879 deserializeAll (Lcom/google/gson/JsonElement;)[Lnet/minecraft/class_2035; - ARG 0 el + METHOD comp_1748 enchantment ()Ljava/util/Optional; + METHOD comp_1749 levels ()Lnet/minecraft/class_2096$class_2100; 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/predicate/item/ItemPredicate.mapping b/mappings/net/minecraft/predicate/item/ItemPredicate.mapping index fe4de0d75f..9acbcb987a 100644 --- a/mappings/net/minecraft/predicate/item/ItemPredicate.mapping +++ b/mappings/net/minecraft/predicate/item/ItemPredicate.mapping @@ -1,40 +1,43 @@ CLASS net/minecraft/class_2073 net/minecraft/predicate/item/ItemPredicate - FIELD field_20689 storedEnchantments [Lnet/minecraft/class_2035; - FIELD field_9640 ANY Lnet/minecraft/class_2073; - FIELD field_9641 count Lnet/minecraft/class_2096$class_2100; - FIELD field_9642 potion Lnet/minecraft/class_1842; - FIELD field_9643 tag Lnet/minecraft/class_6862; - FIELD field_9644 items Ljava/util/Set; - FIELD field_9645 nbt Lnet/minecraft/class_2105; - FIELD field_9646 durability Lnet/minecraft/class_2096$class_2100; - FIELD field_9647 enchantments [Lnet/minecraft/class_2035; - METHOD (Lnet/minecraft/class_6862;Ljava/util/Set;Lnet/minecraft/class_2096$class_2100;Lnet/minecraft/class_2096$class_2100;[Lnet/minecraft/class_2035;[Lnet/minecraft/class_2035;Lnet/minecraft/class_1842;Lnet/minecraft/class_2105;)V - ARG 1 tag - ARG 2 items + FIELD comp_1783 tag Ljava/util/Optional; + FIELD comp_1784 items Ljava/util/Optional; + FIELD comp_1785 count Lnet/minecraft/class_2096$class_2100; + FIELD comp_1786 durability Lnet/minecraft/class_2096$class_2100; + FIELD comp_1787 enchantments Ljava/util/List; + FIELD comp_1788 storedEnchantments Ljava/util/List; + FIELD comp_1789 potion Ljava/util/Optional; + FIELD comp_1790 nbt Ljava/util/Optional; + FIELD field_45754 CODEC Lcom/mojang/serialization/Codec; + FIELD field_45755 ITEM_ENTRY_LIST_CODEC Lcom/mojang/serialization/Codec; + METHOD (Ljava/util/Optional;Ljava/util/Optional;Lnet/minecraft/class_2096$class_2100;Lnet/minecraft/class_2096$class_2100;Ljava/util/List;Ljava/util/List;Ljava/util/Optional;Ljava/util/Optional;)V ARG 3 count ARG 4 durability - ARG 5 enchantments - ARG 6 storedEnchantments - ARG 7 potion - ARG 8 nbt - METHOD method_33267 (Lnet/minecraft/class_2960;)Lcom/google/gson/JsonSyntaxException; - ARG 0 id - METHOD method_8969 fromJson (Lcom/google/gson/JsonElement;)Lnet/minecraft/class_2073; + METHOD comp_1783 tag ()Ljava/util/Optional; + METHOD comp_1784 items ()Ljava/util/Optional; + METHOD comp_1785 count ()Lnet/minecraft/class_2096$class_2100; + METHOD comp_1786 durability ()Lnet/minecraft/class_2096$class_2100; + METHOD comp_1787 enchantments ()Ljava/util/List; + METHOD comp_1788 storedEnchantments ()Ljava/util/List; + METHOD comp_1789 potion ()Ljava/util/Optional; + METHOD comp_1790 nbt ()Ljava/util/Optional; + METHOD method_53164 toJson (Ljava/util/List;)Lcom/google/gson/JsonElement; + ARG 0 predicates + METHOD method_8969 fromJson (Lcom/google/gson/JsonElement;)Ljava/util/Optional; ARG 0 el METHOD method_8970 test (Lnet/minecraft/class_1799;)Z ARG 1 stack METHOD method_8971 toJson ()Lcom/google/gson/JsonElement; - METHOD method_8972 deserializeAll (Lcom/google/gson/JsonElement;)[Lnet/minecraft/class_2073; + METHOD method_8972 deserializeAll (Lcom/google/gson/JsonElement;)Ljava/util/List; ARG 0 el CLASS class_2074 Builder - FIELD field_20690 storedEnchantments Ljava/util/List; + FIELD field_20690 storedEnchantments Lcom/google/common/collect/ImmutableList$Builder; FIELD field_9648 count Lnet/minecraft/class_2096$class_2100; - FIELD field_9649 enchantments Ljava/util/List; - FIELD field_9650 item Ljava/util/Set; - FIELD field_9651 potion Lnet/minecraft/class_1842; - FIELD field_9652 tag Lnet/minecraft/class_6862; + FIELD field_9649 enchantments Lcom/google/common/collect/ImmutableList$Builder; + FIELD field_9650 item Ljava/util/Optional; + FIELD field_9651 potion Ljava/util/Optional; + FIELD field_9652 tag Ljava/util/Optional; FIELD field_9653 durability Lnet/minecraft/class_2096$class_2100; - FIELD field_9654 nbt Lnet/minecraft/class_2105; + FIELD field_9654 nbt Ljava/util/Optional; METHOD method_20399 nbt (Lnet/minecraft/class_2487;)Lnet/minecraft/class_2073$class_2074; ARG 1 nbt METHOD method_35232 potion (Lnet/minecraft/class_1842;)Lnet/minecraft/class_2073$class_2074; @@ -45,6 +48,8 @@ CLASS net/minecraft/class_2073 net/minecraft/predicate/item/ItemPredicate ARG 1 enchantment METHOD method_35235 durability (Lnet/minecraft/class_2096$class_2100;)Lnet/minecraft/class_2073$class_2074; ARG 1 durability + METHOD method_53166 (Lnet/minecraft/class_1935;)Lnet/minecraft/class_6880; + ARG 0 item METHOD method_8973 create ()Lnet/minecraft/class_2073$class_2074; METHOD method_8975 tag (Lnet/minecraft/class_6862;)Lnet/minecraft/class_2073$class_2074; ARG 1 tag diff --git a/mappings/net/minecraft/recipe/AbstractCookingRecipe.mapping b/mappings/net/minecraft/recipe/AbstractCookingRecipe.mapping index 2fbfd6129f..8579b1b9f3 100644 --- a/mappings/net/minecraft/recipe/AbstractCookingRecipe.mapping +++ b/mappings/net/minecraft/recipe/AbstractCookingRecipe.mapping @@ -1,18 +1,19 @@ CLASS net/minecraft/class_1874 net/minecraft/recipe/AbstractCookingRecipe FIELD field_17544 type Lnet/minecraft/class_3956; + FIELD field_40241 category Lnet/minecraft/class_7709; FIELD field_9057 experience F - FIELD field_9058 cookTime I - FIELD field_9059 output Lnet/minecraft/class_1799; - FIELD field_9060 id Lnet/minecraft/class_2960; - FIELD field_9061 input Lnet/minecraft/class_1856; + FIELD field_9058 cookingTime I + FIELD field_9059 result Lnet/minecraft/class_1799; + FIELD field_9061 ingredient Lnet/minecraft/class_1856; FIELD field_9062 group Ljava/lang/String; - METHOD (Lnet/minecraft/class_3956;Lnet/minecraft/class_2960;Ljava/lang/String;Lnet/minecraft/class_1856;Lnet/minecraft/class_1799;FI)V + METHOD (Lnet/minecraft/class_3956;Ljava/lang/String;Lnet/minecraft/class_7709;Lnet/minecraft/class_1856;Lnet/minecraft/class_1799;FI)V ARG 1 type - ARG 2 id - ARG 3 group - ARG 4 input - ARG 5 output + ARG 2 group + ARG 3 category + ARG 4 ingredient + ARG 5 result ARG 6 experience - ARG 7 cookTime - METHOD method_8167 getCookTime ()I + ARG 7 cookingTime + METHOD method_45438 getCategory ()Lnet/minecraft/class_7709; + METHOD method_8167 getCookingTime ()I METHOD method_8171 getExperience ()F diff --git a/mappings/net/minecraft/recipe/BlastingRecipe.mapping b/mappings/net/minecraft/recipe/BlastingRecipe.mapping index 8746d472d1..8a33e96a22 100644 --- a/mappings/net/minecraft/recipe/BlastingRecipe.mapping +++ b/mappings/net/minecraft/recipe/BlastingRecipe.mapping @@ -1,8 +1,8 @@ CLASS net/minecraft/class_3859 net/minecraft/recipe/BlastingRecipe - METHOD (Lnet/minecraft/class_2960;Ljava/lang/String;Lnet/minecraft/class_1856;Lnet/minecraft/class_1799;FI)V - ARG 1 id - ARG 2 group - ARG 3 input - ARG 4 output + METHOD (Ljava/lang/String;Lnet/minecraft/class_7709;Lnet/minecraft/class_1856;Lnet/minecraft/class_1799;FI)V + ARG 1 group + ARG 2 category + ARG 3 ingredient + ARG 4 result ARG 5 experience - ARG 6 cookTime + ARG 6 cookingTime diff --git a/mappings/net/minecraft/recipe/CampfireCookingRecipe.mapping b/mappings/net/minecraft/recipe/CampfireCookingRecipe.mapping index 885f637f94..133c697aab 100644 --- a/mappings/net/minecraft/recipe/CampfireCookingRecipe.mapping +++ b/mappings/net/minecraft/recipe/CampfireCookingRecipe.mapping @@ -1,8 +1,8 @@ CLASS net/minecraft/class_3920 net/minecraft/recipe/CampfireCookingRecipe - METHOD (Lnet/minecraft/class_2960;Ljava/lang/String;Lnet/minecraft/class_1856;Lnet/minecraft/class_1799;FI)V - ARG 1 id - ARG 2 group - ARG 3 input - ARG 4 output + METHOD (Ljava/lang/String;Lnet/minecraft/class_7709;Lnet/minecraft/class_1856;Lnet/minecraft/class_1799;FI)V + ARG 1 group + ARG 2 category + ARG 3 ingredient + ARG 4 result ARG 5 experience - ARG 6 cookTime + ARG 6 cookingTime diff --git a/mappings/net/minecraft/recipe/CookingRecipeSerializer.mapping b/mappings/net/minecraft/recipe/CookingRecipeSerializer.mapping index c7e4dcb35e..143915a04b 100644 --- a/mappings/net/minecraft/recipe/CookingRecipeSerializer.mapping +++ b/mappings/net/minecraft/recipe/CookingRecipeSerializer.mapping @@ -1,14 +1,14 @@ CLASS net/minecraft/class_3957 net/minecraft/recipe/CookingRecipeSerializer - FIELD field_17551 cookingTime I FIELD field_17552 recipeFactory Lnet/minecraft/class_3957$class_3958; + FIELD field_46105 codec Lcom/mojang/serialization/Codec; METHOD (Lnet/minecraft/class_3957$class_3958;I)V ARG 1 recipeFactory ARG 2 cookingTime CLASS class_3958 RecipeFactory - METHOD create (Lnet/minecraft/class_2960;Ljava/lang/String;Lnet/minecraft/class_1856;Lnet/minecraft/class_1799;FI)Lnet/minecraft/class_1874; - ARG 1 id - ARG 2 group - ARG 3 input - ARG 4 output + METHOD create (Ljava/lang/String;Lnet/minecraft/class_7709;Lnet/minecraft/class_1856;Lnet/minecraft/class_1799;FI)Lnet/minecraft/class_1874; + ARG 1 group + ARG 2 category + ARG 3 ingredient + ARG 4 result ARG 5 experience - ARG 6 cookTime + ARG 6 cookingTime diff --git a/mappings/net/minecraft/recipe/CraftingDecoratedPotRecipe.mapping b/mappings/net/minecraft/recipe/CraftingDecoratedPotRecipe.mapping new file mode 100644 index 0000000000..1aab230728 --- /dev/null +++ b/mappings/net/minecraft/recipe/CraftingDecoratedPotRecipe.mapping @@ -0,0 +1 @@ +CLASS net/minecraft/class_8164 net/minecraft/recipe/CraftingDecoratedPotRecipe diff --git a/mappings/net/minecraft/recipe/CraftingRecipe.mapping b/mappings/net/minecraft/recipe/CraftingRecipe.mapping index 6ccdc24750..1864550330 100644 --- a/mappings/net/minecraft/recipe/CraftingRecipe.mapping +++ b/mappings/net/minecraft/recipe/CraftingRecipe.mapping @@ -1 +1,2 @@ CLASS net/minecraft/class_3955 net/minecraft/recipe/CraftingRecipe + METHOD method_45441 getCategory ()Lnet/minecraft/class_7710; diff --git a/mappings/net/minecraft/recipe/CuttingRecipe.mapping b/mappings/net/minecraft/recipe/CuttingRecipe.mapping index 3325553f1a..ff45be53b0 100644 --- a/mappings/net/minecraft/recipe/CuttingRecipe.mapping +++ b/mappings/net/minecraft/recipe/CuttingRecipe.mapping @@ -1,26 +1,25 @@ CLASS net/minecraft/class_3972 net/minecraft/recipe/CuttingRecipe COMMENT A recipe that has only one input ingredient. It can be used by any type COMMENT of recipe as long as its subclass implements the proper interface. - FIELD field_17642 input Lnet/minecraft/class_1856; - FIELD field_17643 output Lnet/minecraft/class_1799; - FIELD field_17644 id Lnet/minecraft/class_2960; + FIELD field_17642 ingredient Lnet/minecraft/class_1856; + FIELD field_17643 result Lnet/minecraft/class_1799; FIELD field_17645 group Ljava/lang/String; FIELD field_17646 type Lnet/minecraft/class_3956; FIELD field_17647 serializer Lnet/minecraft/class_1865; - METHOD (Lnet/minecraft/class_3956;Lnet/minecraft/class_1865;Lnet/minecraft/class_2960;Ljava/lang/String;Lnet/minecraft/class_1856;Lnet/minecraft/class_1799;)V + METHOD (Lnet/minecraft/class_3956;Lnet/minecraft/class_1865;Ljava/lang/String;Lnet/minecraft/class_1856;Lnet/minecraft/class_1799;)V ARG 1 type ARG 2 serializer - ARG 3 id - ARG 4 group - ARG 5 input - ARG 6 output + ARG 3 group + ARG 4 ingredient + ARG 5 result CLASS class_3973 Serializer FIELD field_17648 recipeFactory Lnet/minecraft/class_3972$class_3973$class_3974; + FIELD field_46107 codec Lcom/mojang/serialization/Codec; METHOD (Lnet/minecraft/class_3972$class_3973$class_3974;)V ARG 1 recipeFactory CLASS class_3974 RecipeFactory - METHOD create (Lnet/minecraft/class_2960;Ljava/lang/String;Lnet/minecraft/class_1856;Lnet/minecraft/class_1799;)Lnet/minecraft/class_3972; - ARG 1 id - ARG 2 group - ARG 3 input - ARG 4 output + METHOD create (Ljava/lang/String;Lnet/minecraft/class_1856;Lnet/minecraft/class_1792;I)Lnet/minecraft/class_3972; + ARG 1 group + ARG 2 ingredient + ARG 3 result + ARG 4 count diff --git a/mappings/net/minecraft/recipe/Ingredient.mapping b/mappings/net/minecraft/recipe/Ingredient.mapping index c526df2915..52b3435de9 100644 --- a/mappings/net/minecraft/recipe/Ingredient.mapping +++ b/mappings/net/minecraft/recipe/Ingredient.mapping @@ -5,46 +5,42 @@ CLASS net/minecraft/class_1856 net/minecraft/recipe/Ingredient FIELD field_9019 entries [Lnet/minecraft/class_1856$class_1859; METHOD (Ljava/util/stream/Stream;)V ARG 1 entries + METHOD ([Lnet/minecraft/class_1856$class_1859;)V + ARG 1 entries METHOD method_26964 ofStacks (Ljava/util/stream/Stream;)Lnet/minecraft/class_1856; ARG 0 stacks METHOD method_26965 (Lnet/minecraft/class_1799;)Z ARG 0 stack METHOD method_35226 empty ()Lnet/minecraft/class_1856; + METHOD method_47374 (Lnet/minecraft/class_1856$class_1859;)Ljava/util/stream/Stream; + ARG 0 entry METHOD method_8086 fromPacket (Lnet/minecraft/class_2540;)Lnet/minecraft/class_1856; ARG 0 buf METHOD method_8088 write (Lnet/minecraft/class_2540;)V ARG 1 buf - METHOD method_8089 toJson ()Lcom/google/gson/JsonElement; - METHOD method_8090 (Lcom/google/gson/JsonElement;)Lnet/minecraft/class_1856$class_1859; - ARG 0 jsonElement + METHOD method_8089 toJson (Z)Lcom/google/gson/JsonElement; METHOD method_8091 ofItems ([Lnet/minecraft/class_1935;)Lnet/minecraft/class_1856; ARG 0 items METHOD method_8092 ofEntries (Ljava/util/stream/Stream;)Lnet/minecraft/class_1856; ARG 0 entries - METHOD method_8096 cacheMatchingStacks ()V 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; - ARG 0 json METHOD method_8103 isEmpty ()Z - METHOD method_8104 (Lnet/minecraft/class_1856$class_1859;)Ljava/util/stream/Stream; - ARG 0 entry METHOD method_8105 getMatchingStacks ()[Lnet/minecraft/class_1799; METHOD method_8106 fromTag (Lnet/minecraft/class_6862;)Lnet/minecraft/class_1856; ARG 0 tag - METHOD method_8107 entryFromJson (Lcom/google/gson/JsonObject;)Lnet/minecraft/class_1856$class_1859; - ARG 0 json METHOD test (Ljava/lang/Object;)Z ARG 1 stack CLASS class_1857 StackEntry - FIELD field_9021 stack Lnet/minecraft/class_1799; + FIELD comp_1930 stack Lnet/minecraft/class_1799; METHOD (Lnet/minecraft/class_1799;)V ARG 1 stack + METHOD comp_1930 stack ()Lnet/minecraft/class_1799; CLASS class_1858 TagEntry - FIELD field_9022 tag Lnet/minecraft/class_6862; + FIELD comp_1931 tag Lnet/minecraft/class_6862; METHOD (Lnet/minecraft/class_6862;)V ARG 1 tag + METHOD comp_1931 tag ()Lnet/minecraft/class_6862; CLASS class_1859 Entry METHOD method_8108 getStacks ()Ljava/util/Collection; - METHOD method_8109 toJson ()Lcom/google/gson/JsonObject; diff --git a/mappings/net/minecraft/recipe/InputSlotFiller.mapping b/mappings/net/minecraft/recipe/InputSlotFiller.mapping index 630a0226b9..80ecec1474 100644 --- a/mappings/net/minecraft/recipe/InputSlotFiller.mapping +++ b/mappings/net/minecraft/recipe/InputSlotFiller.mapping @@ -9,16 +9,14 @@ CLASS net/minecraft/class_2955 net/minecraft/recipe/InputSlotFiller ARG 1 craftAll ARG 2 limit ARG 3 recipeInCraftingSlots - METHOD method_12821 fillInputSlots (Lnet/minecraft/class_1860;Z)V - ARG 1 recipe + METHOD method_12821 fillInputSlots (Lnet/minecraft/class_8786;Z)V ARG 2 craftAll - METHOD method_12822 returnInputs (Z)V + 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 + METHOD method_12826 fillInputSlots (Lnet/minecraft/class_3222;Lnet/minecraft/class_8786;Z)V ARG 1 entity - ARG 2 recipe ARG 3 craftAll diff --git a/mappings/net/minecraft/recipe/MapExtendingRecipe.mapping b/mappings/net/minecraft/recipe/MapExtendingRecipe.mapping index 0b0acd532d..27f00e127a 100644 --- a/mappings/net/minecraft/recipe/MapExtendingRecipe.mapping +++ b/mappings/net/minecraft/recipe/MapExtendingRecipe.mapping @@ -1,3 +1,5 @@ CLASS net/minecraft/class_1861 net/minecraft/recipe/MapExtendingRecipe - METHOD (Lnet/minecraft/class_2960;)V - ARG 1 id + METHOD (Lnet/minecraft/class_7710;)V + ARG 1 category + METHOD method_51165 findFilledMap (Lnet/minecraft/class_8566;)Lnet/minecraft/class_1799; + ARG 0 inventory diff --git a/mappings/net/minecraft/recipe/Recipe.mapping b/mappings/net/minecraft/recipe/Recipe.mapping index 8da9632fb7..28a1843d02 100644 --- a/mappings/net/minecraft/recipe/Recipe.mapping +++ b/mappings/net/minecraft/recipe/Recipe.mapping @@ -11,7 +11,7 @@ CLASS net/minecraft/class_1860 net/minecraft/recipe/Recipe COMMENT or recipe books. Users can have stub implementations if they do not use COMMENT those functionalities. METHOD method_17447 createIcon ()Lnet/minecraft/class_1799; - COMMENT {@return an item rendered on the top left of the {@linkplain #getOutput() + COMMENT {@return an item rendered on the top left of the {@linkplain #getOutput(DynamicRegistryManager) COMMENT output preview} on the recipe toast when a new recipe is unlocked} This COMMENT can be interpreted as a catalyst for the recipe. METHOD method_17716 getType ()Lnet/minecraft/class_3956; @@ -24,11 +24,13 @@ CLASS net/minecraft/class_1860 net/minecraft/recipe/Recipe METHOD method_31584 isEmpty ()Z COMMENT {@return whether this recipe has no ingredient or has any empty ingredient} COMMENT The recipe book uses this to ignore recipes for display. - METHOD method_8110 getOutput ()Lnet/minecraft/class_1799; + METHOD method_49188 showNotification ()Z + METHOD method_8110 getResult (Lnet/minecraft/class_5455;)Lnet/minecraft/class_1799; COMMENT {@return a preview of the recipe's output} COMMENT COMMENT

    The returned stack should not be modified. To obtain the actual output, - COMMENT call {@link #craft(Inventory)}. + COMMENT call {@link #craft(Inventory, DynamicRegistryManager)}. + ARG 1 registryManager METHOD method_8111 getRemainder (Lnet/minecraft/class_1263;)Lnet/minecraft/class_2371; COMMENT {@return the remaining stacks to be left in the {@code inventory} after the recipe is used} COMMENT At each index, the remainder item stack in the list should correspond to the original @@ -56,8 +58,6 @@ CLASS net/minecraft/class_1860 net/minecraft/recipe/Recipe COMMENT the width of the input inventory ARG 2 height COMMENT the height of the input inventory - METHOD method_8114 getId ()Lnet/minecraft/class_2960; - COMMENT {@return the ID of this recipe} METHOD method_8115 matches (Lnet/minecraft/class_1263;Lnet/minecraft/class_1937;)Z COMMENT {@return whether this recipe matches the contents inside the COMMENT {@code inventory} in the given {@code world}} @@ -68,7 +68,7 @@ CLASS net/minecraft/class_1860 net/minecraft/recipe/Recipe COMMENT the input inventory ARG 2 world COMMENT the input world - METHOD method_8116 craft (Lnet/minecraft/class_1263;)Lnet/minecraft/class_1799; + METHOD method_8116 craft (Lnet/minecraft/class_1263;Lnet/minecraft/class_5455;)Lnet/minecraft/class_1799; COMMENT Crafts this recipe. COMMENT COMMENT

    This method does not perform side effects on the {@code inventory}. @@ -78,6 +78,7 @@ CLASS net/minecraft/class_1860 net/minecraft/recipe/Recipe COMMENT @return the resulting item stack ARG 1 inventory COMMENT the input inventory + ARG 2 registryManager METHOD method_8117 getIngredients ()Lnet/minecraft/class_2371; COMMENT {@return 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 diff --git a/mappings/net/minecraft/recipe/RecipeGridAligner.mapping b/mappings/net/minecraft/recipe/RecipeGridAligner.mapping index c9e73e37d8..b8f2d0914a 100644 --- a/mappings/net/minecraft/recipe/RecipeGridAligner.mapping +++ b/mappings/net/minecraft/recipe/RecipeGridAligner.mapping @@ -5,10 +5,9 @@ CLASS net/minecraft/class_2952 net/minecraft/recipe/RecipeGridAligner ARG 3 amount ARG 4 gridX ARG 5 gridY - METHOD method_12816 alignRecipeToGrid (IIILnet/minecraft/class_1860;Ljava/util/Iterator;I)V + METHOD method_12816 alignRecipeToGrid (IIILnet/minecraft/class_8786;Ljava/util/Iterator;I)V ARG 1 gridWidth ARG 2 gridHeight ARG 3 gridOutputSlot - ARG 4 recipe ARG 5 inputs ARG 6 amount diff --git a/mappings/net/minecraft/recipe/RecipeManager.mapping b/mappings/net/minecraft/recipe/RecipeManager.mapping index 6f0b0fa9e6..9a9c999d7f 100644 --- a/mappings/net/minecraft/recipe/RecipeManager.mapping +++ b/mappings/net/minecraft/recipe/RecipeManager.mapping @@ -11,7 +11,7 @@ CLASS net/minecraft/class_1863 net/minecraft/recipe/RecipeManager FIELD field_9027 LOGGER Lorg/slf4j/Logger; METHOD method_17717 getAllOfType (Lnet/minecraft/class_3956;)Ljava/util/Map; ARG 1 type - METHOD method_17720 deserialize (Lnet/minecraft/class_2960;Lcom/google/gson/JsonObject;)Lnet/minecraft/class_1860; + METHOD method_17720 deserialize (Lnet/minecraft/class_2960;Lcom/google/gson/JsonObject;)Lnet/minecraft/class_8786; COMMENT Reads a recipe from a JSON object. COMMENT COMMENT @implNote Even though a recipe's {@linkplain Recipe#getSerializer() serializer} @@ -30,8 +30,6 @@ CLASS net/minecraft/class_1863 net/minecraft/recipe/RecipeManager ARG 0 map METHOD method_17723 (Ljava/util/Map;)Ljava/util/stream/Stream; ARG 0 map - METHOD method_17876 (Lnet/minecraft/class_1860;)Ljava/lang/String; - ARG 0 recipe METHOD method_17877 getAllMatches (Lnet/minecraft/class_3956;Lnet/minecraft/class_1263;Lnet/minecraft/class_1937;)Ljava/util/List; COMMENT Creates a list of all recipes of the given {@code type} that match the COMMENT given {@code inventory} and {@code world}. The list is ordered by the @@ -54,8 +52,6 @@ CLASS net/minecraft/class_1863 net/minecraft/recipe/RecipeManager COMMENT the recipes to set METHOD method_20703 (Ljava/util/Map$Entry;)Ljava/util/Map; ARG 0 entry - METHOD method_20704 (Ljava/util/Map;Lcom/google/common/collect/ImmutableMap$Builder;Lnet/minecraft/class_1860;)V - ARG 2 recipe METHOD method_20706 (Lnet/minecraft/class_3956;)Ljava/util/Map; ARG 0 t METHOD method_20707 (Lnet/minecraft/class_3956;)Lcom/google/common/collect/ImmutableMap$Builder; @@ -73,8 +69,6 @@ CLASS net/minecraft/class_1863 net/minecraft/recipe/RecipeManager METHOD method_35227 isErrored ()Z COMMENT {@return the {@link #errored} field} This is unused in vanilla and will only COMMENT return {@code false} without mods. - METHOD method_42297 (Lnet/minecraft/class_1263;Lnet/minecraft/class_1937;Lnet/minecraft/class_1860;)Z - ARG 2 recipe METHOD method_42298 (Lnet/minecraft/class_1263;Lnet/minecraft/class_1937;Ljava/util/Map$Entry;)Z ARG 2 entry METHOD method_42299 getFirstMatch (Lnet/minecraft/class_3956;Lnet/minecraft/class_1263;Lnet/minecraft/class_1937;Lnet/minecraft/class_2960;)Ljava/util/Optional; @@ -84,8 +78,6 @@ CLASS net/minecraft/class_1863 net/minecraft/recipe/RecipeManager ARG 4 id METHOD method_42300 (Ljava/util/Map$Entry;)Lcom/mojang/datafixers/util/Pair; ARG 0 entry - METHOD method_42301 (Lnet/minecraft/class_1263;Lnet/minecraft/class_1937;Lnet/minecraft/class_1860;)Z - ARG 2 recipe METHOD method_42302 createCachedMatchGetter (Lnet/minecraft/class_3956;)Lnet/minecraft/class_1863$class_7266; COMMENT Creates a cached match getter. This is optimized for getting matches of the same COMMENT recipe repeatedly, such as furnaces. diff --git a/mappings/net/minecraft/recipe/RecipeMatcher.mapping b/mappings/net/minecraft/recipe/RecipeMatcher.mapping index bc1d2b0f24..f5e9ce7cdd 100644 --- a/mappings/net/minecraft/recipe/RecipeMatcher.mapping +++ b/mappings/net/minecraft/recipe/RecipeMatcher.mapping @@ -24,11 +24,9 @@ CLASS net/minecraft/class_1662 net/minecraft/recipe/RecipeMatcher 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 + METHOD method_7403 countCrafts (Lnet/minecraft/class_8786;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 @@ -48,11 +46,9 @@ CLASS net/minecraft/class_1662 net/minecraft/recipe/RecipeMatcher 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 + METHOD method_7407 countCrafts (Lnet/minecraft/class_8786;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 diff --git a/mappings/net/minecraft/recipe/RecipeSerializer.mapping b/mappings/net/minecraft/recipe/RecipeSerializer.mapping index aaa98f0dfe..5b39a28161 100644 --- a/mappings/net/minecraft/recipe/RecipeSerializer.mapping +++ b/mappings/net/minecraft/recipe/RecipeSerializer.mapping @@ -10,52 +10,37 @@ CLASS net/minecraft/class_1865 net/minecraft/recipe/RecipeSerializer COMMENT client, the client will disconnect upon receiving the recipe; if a COMMENT recipe JSON intended for an absent recipe serializer is read, it is COMMENT skipped. - FIELD field_17084 BLASTING Lnet/minecraft/class_3957; - FIELD field_17085 SMOKING Lnet/minecraft/class_3957; - FIELD field_17347 CAMPFIRE_COOKING Lnet/minecraft/class_3957; - FIELD field_19421 REPAIR_ITEM Lnet/minecraft/class_1866; - FIELD field_9028 ARMOR_DYE Lnet/minecraft/class_1866; - FIELD field_9029 BOOK_CLONING Lnet/minecraft/class_1866; - FIELD field_9030 SUSPICIOUS_STEW Lnet/minecraft/class_1866; + FIELD field_17084 BLASTING Lnet/minecraft/class_1865; + FIELD field_17085 SMOKING Lnet/minecraft/class_1865; + FIELD field_17347 CAMPFIRE_COOKING Lnet/minecraft/class_1865; + FIELD field_19421 REPAIR_ITEM Lnet/minecraft/class_1865; + FIELD field_9028 ARMOR_DYE Lnet/minecraft/class_1865; + FIELD field_9029 BOOK_CLONING Lnet/minecraft/class_1865; + FIELD field_9030 SUSPICIOUS_STEW Lnet/minecraft/class_1865; FIELD field_9031 SHAPELESS Lnet/minecraft/class_1865; - FIELD field_9034 FIREWORK_STAR_FADE Lnet/minecraft/class_1866; + FIELD field_9034 FIREWORK_STAR_FADE Lnet/minecraft/class_1865; FIELD field_9035 SHAPED Lnet/minecraft/class_1865; - FIELD field_9036 FIREWORK_STAR Lnet/minecraft/class_1866; - FIELD field_9037 TIPPED_ARROW Lnet/minecraft/class_1866; - FIELD field_9038 BANNER_DUPLICATE Lnet/minecraft/class_1866; - FIELD field_9039 MAP_EXTENDING Lnet/minecraft/class_1866; - FIELD field_9040 SHIELD_DECORATION Lnet/minecraft/class_1866; - FIELD field_9041 SHULKER_BOX Lnet/minecraft/class_1866; - FIELD field_9042 SMELTING Lnet/minecraft/class_3957; - FIELD field_9043 FIREWORK_ROCKET Lnet/minecraft/class_1866; - FIELD field_9044 MAP_CLONING Lnet/minecraft/class_1866; + FIELD field_9036 FIREWORK_STAR Lnet/minecraft/class_1865; + FIELD field_9037 TIPPED_ARROW Lnet/minecraft/class_1865; + FIELD field_9038 BANNER_DUPLICATE Lnet/minecraft/class_1865; + FIELD field_9039 MAP_EXTENDING Lnet/minecraft/class_1865; + FIELD field_9040 SHIELD_DECORATION Lnet/minecraft/class_1865; + FIELD field_9041 SHULKER_BOX Lnet/minecraft/class_1865; + FIELD field_9042 SMELTING Lnet/minecraft/class_1865; + FIELD field_9043 FIREWORK_ROCKET Lnet/minecraft/class_1865; + FIELD field_9044 MAP_CLONING Lnet/minecraft/class_1865; METHOD method_17724 register (Ljava/lang/String;Lnet/minecraft/class_1865;)Lnet/minecraft/class_1865; ARG 0 id ARG 1 serializer - METHOD method_8121 read (Lnet/minecraft/class_2960;Lcom/google/gson/JsonObject;)Lnet/minecraft/class_1860; - COMMENT Reads a recipe from a JSON object. - COMMENT - COMMENT @implNote If this throws any exception besides {@link com.google.gson.JsonParseException} - COMMENT and {@link IllegalArgumentException}, it will terminate and affect loading - COMMENT of all recipes from data packs beyond the current recipe. - COMMENT - COMMENT @throws com.google.gson.JsonParseException if the recipe JSON is incorrect - COMMENT @return the read recipe - ARG 1 id - COMMENT the recipe's ID - ARG 2 json - COMMENT the recipe JSON - METHOD method_8122 read (Lnet/minecraft/class_2960;Lnet/minecraft/class_2540;)Lnet/minecraft/class_1860; + METHOD method_53736 codec ()Lcom/mojang/serialization/Codec; + METHOD method_8122 read (Lnet/minecraft/class_2540;)Lnet/minecraft/class_1860; COMMENT Reads a recipe from a packet byte buf, usually on the client. COMMENT COMMENT

    This can throw whatever exception the packet byte buf throws. This may be COMMENT called in the netty event loop than the client game engine thread. COMMENT COMMENT @return the read recipe - ARG 1 id - COMMENT the recipe's ID - ARG 2 buf - COMMENT the recipe buf + ARG 1 buf METHOD method_8124 write (Lnet/minecraft/class_2540;Lnet/minecraft/class_1860;)V COMMENT Writes a recipe to a packet byte buf, usually on the server. COMMENT diff --git a/mappings/net/minecraft/recipe/RecipeUnlocker.mapping b/mappings/net/minecraft/recipe/RecipeUnlocker.mapping index e03041706e..af384e8751 100644 --- a/mappings/net/minecraft/recipe/RecipeUnlocker.mapping +++ b/mappings/net/minecraft/recipe/RecipeUnlocker.mapping @@ -1,10 +1,9 @@ CLASS net/minecraft/class_1732 net/minecraft/recipe/RecipeUnlocker - METHOD method_7662 setLastRecipe (Lnet/minecraft/class_1860;)V - ARG 1 recipe - METHOD method_7663 getLastRecipe ()Lnet/minecraft/class_1860; - METHOD method_7664 unlockLastRecipe (Lnet/minecraft/class_1657;)V + METHOD method_7662 setLastRecipe (Lnet/minecraft/class_8786;)V + METHOD method_7663 getLastRecipe ()Lnet/minecraft/class_8786; + METHOD method_7664 unlockLastRecipe (Lnet/minecraft/class_1657;Ljava/util/List;)V ARG 1 player - METHOD method_7665 shouldCraftRecipe (Lnet/minecraft/class_1937;Lnet/minecraft/class_3222;Lnet/minecraft/class_1860;)Z + ARG 2 ingredients + METHOD method_7665 shouldCraftRecipe (Lnet/minecraft/class_1937;Lnet/minecraft/class_3222;Lnet/minecraft/class_8786;)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 9287346a7a..91d4111e23 100644 --- a/mappings/net/minecraft/recipe/ShapedRecipe.mapping +++ b/mappings/net/minecraft/recipe/ShapedRecipe.mapping @@ -1,26 +1,31 @@ CLASS net/minecraft/class_1869 net/minecraft/recipe/ShapedRecipe - FIELD field_9051 id Lnet/minecraft/class_2960; - FIELD field_9052 input Lnet/minecraft/class_2371; - FIELD field_9053 output Lnet/minecraft/class_1799; + FIELD field_40256 category Lnet/minecraft/class_7710; + FIELD field_42719 showNotification Z + FIELD field_9052 ingredients Lnet/minecraft/class_2371; + FIELD field_9053 result Lnet/minecraft/class_1799; FIELD field_9054 height I FIELD field_9055 width I FIELD field_9056 group Ljava/lang/String; - METHOD (Lnet/minecraft/class_2960;Ljava/lang/String;IILnet/minecraft/class_2371;Lnet/minecraft/class_1799;)V - ARG 1 id - ARG 2 group + METHOD (Ljava/lang/String;Lnet/minecraft/class_7710;IILnet/minecraft/class_2371;Lnet/minecraft/class_1799;)V + ARG 1 group + ARG 2 category ARG 3 width ARG 4 height - ARG 5 input - ARG 6 output + ARG 5 ingredients + ARG 6 result + METHOD (Ljava/lang/String;Lnet/minecraft/class_7710;IILnet/minecraft/class_2371;Lnet/minecraft/class_1799;Z)V + ARG 1 group + ARG 2 category + ARG 3 width + ARG 4 height + ARG 5 ingredients + ARG 6 result + ARG 7 showNotification METHOD method_31585 (Lnet/minecraft/class_1856;)Z ARG 0 ingredient METHOD method_31586 (Lnet/minecraft/class_1856;)Z ARG 0 ingredient - METHOD method_35228 outputFromJson (Lcom/google/gson/JsonObject;)Lnet/minecraft/class_1799; - ARG 0 json - METHOD method_8145 getPattern (Lcom/google/gson/JsonArray;)[Ljava/lang/String; - ARG 0 json - METHOD method_8146 removePadding ([Ljava/lang/String;)[Ljava/lang/String; + METHOD method_8146 removePadding (Ljava/util/List;)[Ljava/lang/String; COMMENT Removes empty space from around the recipe pattern. COMMENT COMMENT

    Turns patterns such as:

    @@ -41,29 +46,16 @@ CLASS net/minecraft/class_1869 net/minecraft/recipe/ShapedRecipe COMMENT COMMENT @return a new recipe pattern with all leading and trailing empty rows/columns removed ARG 0 pattern - 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 findFirstSymbol (Ljava/lang/String;)I ARG 0 line METHOD method_8153 findLastSymbol (Ljava/lang/String;)I ARG 0 pattern - METHOD method_8155 getItem (Lcom/google/gson/JsonObject;)Lnet/minecraft/class_1792; - ARG 0 json - 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 matchesPattern (Lnet/minecraft/class_1715;IIZ)Z + METHOD method_8161 matchesPattern (Lnet/minecraft/class_8566;IIZ)Z ARG 1 inv ARG 2 offsetX ARG 3 offsetY ARG 4 flipped CLASS class_1870 Serializer + FIELD field_46102 CODEC Lcom/mojang/serialization/Codec; diff --git a/mappings/net/minecraft/recipe/ShapelessRecipe.mapping b/mappings/net/minecraft/recipe/ShapelessRecipe.mapping index e5671a1bc3..115d33fd48 100644 --- a/mappings/net/minecraft/recipe/ShapelessRecipe.mapping +++ b/mappings/net/minecraft/recipe/ShapelessRecipe.mapping @@ -1,13 +1,12 @@ CLASS net/minecraft/class_1867 net/minecraft/recipe/ShapelessRecipe - FIELD field_9047 input Lnet/minecraft/class_2371; - FIELD field_9048 id Lnet/minecraft/class_2960; + FIELD field_40257 category Lnet/minecraft/class_7710; + FIELD field_9047 ingredients Lnet/minecraft/class_2371; FIELD field_9049 group Ljava/lang/String; - FIELD field_9050 output Lnet/minecraft/class_1799; - METHOD (Lnet/minecraft/class_2960;Ljava/lang/String;Lnet/minecraft/class_1799;Lnet/minecraft/class_2371;)V - ARG 1 id - ARG 2 group - ARG 3 output - ARG 4 input + FIELD field_9050 result Lnet/minecraft/class_1799; + METHOD (Ljava/lang/String;Lnet/minecraft/class_7710;Lnet/minecraft/class_1799;Lnet/minecraft/class_2371;)V + ARG 1 group + ARG 2 category + ARG 3 result + ARG 4 ingredients CLASS class_1868 Serializer - METHOD method_8144 getIngredients (Lcom/google/gson/JsonArray;)Lnet/minecraft/class_2371; - ARG 0 json + FIELD field_46104 CODEC Lcom/mojang/serialization/Codec; diff --git a/mappings/net/minecraft/recipe/SmeltingRecipe.mapping b/mappings/net/minecraft/recipe/SmeltingRecipe.mapping index bb55f343bd..502682115a 100644 --- a/mappings/net/minecraft/recipe/SmeltingRecipe.mapping +++ b/mappings/net/minecraft/recipe/SmeltingRecipe.mapping @@ -1,8 +1,8 @@ CLASS net/minecraft/class_3861 net/minecraft/recipe/SmeltingRecipe - METHOD (Lnet/minecraft/class_2960;Ljava/lang/String;Lnet/minecraft/class_1856;Lnet/minecraft/class_1799;FI)V - ARG 1 id - ARG 2 group - ARG 3 input - ARG 4 output + METHOD (Ljava/lang/String;Lnet/minecraft/class_7709;Lnet/minecraft/class_1856;Lnet/minecraft/class_1799;FI)V + ARG 1 group + ARG 2 category + ARG 3 ingredient + ARG 4 result ARG 5 experience - ARG 6 cookTime + ARG 6 cookingTime diff --git a/mappings/net/minecraft/recipe/SmithingRecipe.mapping b/mappings/net/minecraft/recipe/SmithingRecipe.mapping index 0b483c667b..d7f4497c7a 100644 --- a/mappings/net/minecraft/recipe/SmithingRecipe.mapping +++ b/mappings/net/minecraft/recipe/SmithingRecipe.mapping @@ -1,15 +1,7 @@ -CLASS net/minecraft/class_5357 net/minecraft/recipe/SmithingRecipe - FIELD field_25389 base Lnet/minecraft/class_1856; - FIELD field_25390 addition Lnet/minecraft/class_1856; - FIELD field_25391 result Lnet/minecraft/class_1799; - FIELD field_25392 id Lnet/minecraft/class_2960; - METHOD (Lnet/minecraft/class_2960;Lnet/minecraft/class_1856;Lnet/minecraft/class_1856;Lnet/minecraft/class_1799;)V - ARG 1 id - ARG 2 base - ARG 3 addition - ARG 4 result +CLASS net/minecraft/class_8059 net/minecraft/recipe/SmithingRecipe METHOD method_30029 testAddition (Lnet/minecraft/class_1799;)Z ARG 1 stack - METHOD method_31587 (Lnet/minecraft/class_1856;)Z - ARG 0 ingredient - CLASS class_5358 Serializer + METHOD method_48453 testTemplate (Lnet/minecraft/class_1799;)Z + ARG 1 stack + METHOD method_48454 testBase (Lnet/minecraft/class_1799;)Z + ARG 1 stack diff --git a/mappings/net/minecraft/recipe/SmithingTransformRecipe.mapping b/mappings/net/minecraft/recipe/SmithingTransformRecipe.mapping new file mode 100644 index 0000000000..fc803ba159 --- /dev/null +++ b/mappings/net/minecraft/recipe/SmithingTransformRecipe.mapping @@ -0,0 +1,12 @@ +CLASS net/minecraft/class_8060 net/minecraft/recipe/SmithingTransformRecipe + FIELD field_42030 template Lnet/minecraft/class_1856; + FIELD field_42031 base Lnet/minecraft/class_1856; + FIELD field_42032 addition Lnet/minecraft/class_1856; + FIELD field_42033 result Lnet/minecraft/class_1799; + METHOD (Lnet/minecraft/class_1856;Lnet/minecraft/class_1856;Lnet/minecraft/class_1856;Lnet/minecraft/class_1799;)V + ARG 1 template + ARG 2 base + ARG 3 addition + ARG 4 result + CLASS class_8061 Serializer + FIELD field_46108 CODEC Lcom/mojang/serialization/Codec; diff --git a/mappings/net/minecraft/recipe/SmithingTrimRecipe.mapping b/mappings/net/minecraft/recipe/SmithingTrimRecipe.mapping new file mode 100644 index 0000000000..cfbe22e75d --- /dev/null +++ b/mappings/net/minecraft/recipe/SmithingTrimRecipe.mapping @@ -0,0 +1,10 @@ +CLASS net/minecraft/class_8062 net/minecraft/recipe/SmithingTrimRecipe + FIELD field_42035 template Lnet/minecraft/class_1856; + FIELD field_42036 base Lnet/minecraft/class_1856; + FIELD field_42037 addition Lnet/minecraft/class_1856; + METHOD (Lnet/minecraft/class_1856;Lnet/minecraft/class_1856;Lnet/minecraft/class_1856;)V + ARG 1 template + ARG 2 base + ARG 3 addition + CLASS class_8063 Serializer + FIELD field_46109 CODEC Lcom/mojang/serialization/Codec; diff --git a/mappings/net/minecraft/recipe/SmokingRecipe.mapping b/mappings/net/minecraft/recipe/SmokingRecipe.mapping index 413ef7c15d..88e3714bb4 100644 --- a/mappings/net/minecraft/recipe/SmokingRecipe.mapping +++ b/mappings/net/minecraft/recipe/SmokingRecipe.mapping @@ -1,8 +1,8 @@ CLASS net/minecraft/class_3862 net/minecraft/recipe/SmokingRecipe - METHOD (Lnet/minecraft/class_2960;Ljava/lang/String;Lnet/minecraft/class_1856;Lnet/minecraft/class_1799;FI)V - ARG 1 id - ARG 2 group - ARG 3 input - ARG 4 output + METHOD (Ljava/lang/String;Lnet/minecraft/class_7709;Lnet/minecraft/class_1856;Lnet/minecraft/class_1799;FI)V + ARG 1 group + ARG 2 category + ARG 3 ingredient + ARG 4 result ARG 5 experience - ARG 6 cookTime + ARG 6 cookingTime diff --git a/mappings/net/minecraft/recipe/SpecialCraftingRecipe.mapping b/mappings/net/minecraft/recipe/SpecialCraftingRecipe.mapping index 1e6f3ce48d..93ac385170 100644 --- a/mappings/net/minecraft/recipe/SpecialCraftingRecipe.mapping +++ b/mappings/net/minecraft/recipe/SpecialCraftingRecipe.mapping @@ -1,4 +1,4 @@ CLASS net/minecraft/class_1852 net/minecraft/recipe/SpecialCraftingRecipe - FIELD field_9009 id Lnet/minecraft/class_2960; - METHOD (Lnet/minecraft/class_2960;)V - ARG 1 id + FIELD field_40255 category Lnet/minecraft/class_7710; + METHOD (Lnet/minecraft/class_7710;)V + ARG 1 category diff --git a/mappings/net/minecraft/recipe/SpecialRecipeSerializer.mapping b/mappings/net/minecraft/recipe/SpecialRecipeSerializer.mapping index 2f1bb1380f..dc4cd956e9 100644 --- a/mappings/net/minecraft/recipe/SpecialRecipeSerializer.mapping +++ b/mappings/net/minecraft/recipe/SpecialRecipeSerializer.mapping @@ -6,6 +6,10 @@ CLASS net/minecraft/class_1866 net/minecraft/recipe/SpecialRecipeSerializer COMMENT

    The name "special" comes from the fact that in vanilla, recipes using this COMMENT serializer have IDs starting with {@code crafting_special_}. All of their logic and ingredients COMMENT are also defined in code, which distinguishes them from "non-special" recipes. - FIELD field_9046 factory Ljava/util/function/Function; - METHOD (Ljava/util/function/Function;)V + FIELD field_46106 codec Lcom/mojang/serialization/Codec; + FIELD field_9046 factory Lnet/minecraft/class_1866$class_7711; + METHOD (Lnet/minecraft/class_1866$class_7711;)V ARG 1 factory + CLASS class_7711 Factory + METHOD create (Lnet/minecraft/class_7710;)Lnet/minecraft/class_3955; + ARG 1 category diff --git a/mappings/net/minecraft/recipe/StonecuttingRecipe.mapping b/mappings/net/minecraft/recipe/StonecuttingRecipe.mapping index 0de7b87ad5..185e850520 100644 --- a/mappings/net/minecraft/recipe/StonecuttingRecipe.mapping +++ b/mappings/net/minecraft/recipe/StonecuttingRecipe.mapping @@ -1,6 +1,6 @@ CLASS net/minecraft/class_3975 net/minecraft/recipe/StonecuttingRecipe - METHOD (Lnet/minecraft/class_2960;Ljava/lang/String;Lnet/minecraft/class_1856;Lnet/minecraft/class_1799;)V - ARG 1 id - ARG 2 group - ARG 3 input - ARG 4 output + METHOD (Ljava/lang/String;Lnet/minecraft/class_1856;Lnet/minecraft/class_1792;I)V + ARG 1 group + ARG 2 ingredient + ARG 3 result + ARG 4 count diff --git a/mappings/net/minecraft/recipe/book/CookingRecipeCategory.mapping b/mappings/net/minecraft/recipe/book/CookingRecipeCategory.mapping new file mode 100644 index 0000000000..4b63922011 --- /dev/null +++ b/mappings/net/minecraft/recipe/book/CookingRecipeCategory.mapping @@ -0,0 +1,5 @@ +CLASS net/minecraft/class_7709 net/minecraft/recipe/book/CookingRecipeCategory + FIELD field_40245 CODEC Lnet/minecraft/class_3542$class_7292; + FIELD field_40246 id Ljava/lang/String; + METHOD (Ljava/lang/String;ILjava/lang/String;)V + ARG 3 id diff --git a/mappings/net/minecraft/recipe/book/CraftingRecipeCategory.mapping b/mappings/net/minecraft/recipe/book/CraftingRecipeCategory.mapping new file mode 100644 index 0000000000..045c52c8ea --- /dev/null +++ b/mappings/net/minecraft/recipe/book/CraftingRecipeCategory.mapping @@ -0,0 +1,5 @@ +CLASS net/minecraft/class_7710 net/minecraft/recipe/book/CraftingRecipeCategory + FIELD field_40252 CODEC Lnet/minecraft/class_3542$class_7292; + FIELD field_40253 id Ljava/lang/String; + METHOD (Ljava/lang/String;ILjava/lang/String;)V + ARG 3 id diff --git a/mappings/net/minecraft/recipe/book/RecipeBook.mapping b/mappings/net/minecraft/recipe/book/RecipeBook.mapping index e3fa511058..528b8b0726 100644 --- a/mappings/net/minecraft/recipe/book/RecipeBook.mapping +++ b/mappings/net/minecraft/recipe/book/RecipeBook.mapping @@ -4,31 +4,25 @@ CLASS net/minecraft/class_3439 net/minecraft/recipe/book/RecipeBook FIELD field_25734 options Lnet/minecraft/class_5411; METHOD method_14875 copyFrom (Lnet/minecraft/class_3439;)V ARG 1 book - METHOD method_14876 add (Lnet/minecraft/class_1860;)V - ARG 1 recipe + METHOD method_14876 add (Lnet/minecraft/class_8786;)V METHOD method_14877 display (Lnet/minecraft/class_2960;)V ARG 1 id - METHOD method_14878 contains (Lnet/minecraft/class_1860;)Z - ARG 1 recipe + METHOD method_14878 contains (Lnet/minecraft/class_8786;)Z METHOD method_14879 remove (Lnet/minecraft/class_2960;)V ARG 1 id METHOD method_14880 isFilteringCraftable (Lnet/minecraft/class_1729;)Z ARG 1 handler METHOD method_14881 add (Lnet/minecraft/class_2960;)V ARG 1 id - METHOD method_14883 shouldDisplay (Lnet/minecraft/class_1860;)Z - ARG 1 recipe + METHOD method_14883 shouldDisplay (Lnet/minecraft/class_8786;)Z METHOD method_14884 setGuiOpen (Lnet/minecraft/class_5421;Z)V ARG 1 category ARG 2 open - METHOD method_14885 display (Lnet/minecraft/class_1860;)V - ARG 1 recipe - METHOD method_14886 onRecipeDisplayed (Lnet/minecraft/class_1860;)V - ARG 1 recipe + METHOD method_14885 display (Lnet/minecraft/class_8786;)V + METHOD method_14886 onRecipeDisplayed (Lnet/minecraft/class_8786;)V METHOD method_14887 isGuiOpen (Lnet/minecraft/class_5421;)Z ARG 1 category - METHOD method_14893 remove (Lnet/minecraft/class_1860;)V - ARG 1 recipe + METHOD method_14893 remove (Lnet/minecraft/class_8786;)V METHOD method_22845 contains (Lnet/minecraft/class_2960;)Z ARG 1 id METHOD method_30173 getOptions ()Lnet/minecraft/class_5411; diff --git a/mappings/net/minecraft/recipe/book/RecipeCategory.mapping b/mappings/net/minecraft/recipe/book/RecipeCategory.mapping new file mode 100644 index 0000000000..36f0de6c31 --- /dev/null +++ b/mappings/net/minecraft/recipe/book/RecipeCategory.mapping @@ -0,0 +1,5 @@ +CLASS net/minecraft/class_7800 net/minecraft/recipe/book/RecipeCategory + FIELD field_40643 name Ljava/lang/String; + METHOD (Ljava/lang/String;ILjava/lang/String;)V + ARG 3 name + METHOD method_46203 getName ()Ljava/lang/String; diff --git a/mappings/net/minecraft/registry/BuiltinRegistries.mapping b/mappings/net/minecraft/registry/BuiltinRegistries.mapping new file mode 100644 index 0000000000..7a0d60dd65 --- /dev/null +++ b/mappings/net/minecraft/registry/BuiltinRegistries.mapping @@ -0,0 +1,18 @@ +CLASS net/minecraft/class_7887 net/minecraft/registry/BuiltinRegistries + FIELD field_40953 REGISTRY_BUILDER Lnet/minecraft/class_7877; + METHOD method_46817 createWrapperLookup ()Lnet/minecraft/class_7225$class_7874; + METHOD method_46818 hasBiomePlacementModifier (Lnet/minecraft/class_6796;)Z + ARG 0 placedFeature + METHOD method_46819 (Lnet/minecraft/class_6880$class_6883;Lnet/minecraft/class_6796;)V + ARG 1 value + METHOD method_46820 (Lnet/minecraft/class_7871;Lnet/minecraft/class_2960;Lnet/minecraft/class_5321;)V + ARG 2 key + METHOD method_46821 (Lnet/minecraft/class_7871;Lnet/minecraft/class_2960;Lnet/minecraft/class_6880$class_6883;Lnet/minecraft/class_6880;)V + ARG 3 placedFeature + METHOD method_46822 (Lnet/minecraft/class_7871;Lnet/minecraft/class_6880$class_6883;)V + ARG 1 biome + METHOD method_46823 validate (Lnet/minecraft/class_7225$class_7874;)V + ARG 0 wrapperLookup + METHOD method_49382 validate (Lnet/minecraft/class_7871;Lnet/minecraft/class_7225;)V + ARG 0 placedFeatureLookup + ARG 1 biomeLookup diff --git a/mappings/net/minecraft/registry/CombinedDynamicRegistries.mapping b/mappings/net/minecraft/registry/CombinedDynamicRegistries.mapping new file mode 100644 index 0000000000..78aa2c7bd1 --- /dev/null +++ b/mappings/net/minecraft/registry/CombinedDynamicRegistries.mapping @@ -0,0 +1,33 @@ +CLASS net/minecraft/class_7780 net/minecraft/registry/CombinedDynamicRegistries + FIELD field_40581 types Ljava/util/List; + FIELD field_40582 registryManagers Ljava/util/List; + FIELD field_40583 combinedRegistryManager Lnet/minecraft/class_5455$class_6890; + METHOD (Ljava/util/List;)V + ARG 1 types + METHOD (Ljava/util/List;Ljava/util/List;)V + ARG 1 types + ARG 2 registryManagers + METHOD method_45926 getCombinedRegistryManager ()Lnet/minecraft/class_5455$class_6890; + METHOD method_45927 subset (II)Lnet/minecraft/class_5455$class_6890; + ARG 1 startIndex + ARG 2 endIndex + METHOD method_45928 get (Ljava/lang/Object;)Lnet/minecraft/class_5455$class_6890; + ARG 1 index + METHOD method_45929 with (Ljava/lang/Object;Ljava/util/List;)Lnet/minecraft/class_7780; + ARG 1 type + ARG 2 registryManagers + METHOD method_45930 with (Ljava/lang/Object;[Lnet/minecraft/class_5455$class_6890;)Lnet/minecraft/class_7780; + ARG 1 type + ARG 2 registryManagers + METHOD method_45932 (Ljava/util/Map;Lnet/minecraft/class_5455$class_6892;)V + ARG 1 entry + METHOD method_45933 (Ljava/util/Map;Lnet/minecraft/class_5455;)V + ARG 1 registryManager + METHOD method_45934 toRegistryMap (Ljava/util/stream/Stream;)Ljava/util/Map; + ARG 0 registryManagers + METHOD method_45935 getPrecedingRegistryManagers (Ljava/lang/Object;)Lnet/minecraft/class_5455$class_6890; + ARG 1 type + METHOD method_45936 getSucceedingRegistryManagers (Ljava/lang/Object;)Lnet/minecraft/class_5455$class_6890; + ARG 1 type + METHOD method_45937 getIndex (Ljava/lang/Object;)I + ARG 1 type diff --git a/mappings/net/minecraft/registry/DefaultedRegistry.mapping b/mappings/net/minecraft/registry/DefaultedRegistry.mapping new file mode 100644 index 0000000000..40caceb2bf --- /dev/null +++ b/mappings/net/minecraft/registry/DefaultedRegistry.mapping @@ -0,0 +1,2 @@ +CLASS net/minecraft/class_7922 net/minecraft/registry/DefaultedRegistry + METHOD method_10137 getDefaultId ()Lnet/minecraft/class_2960; diff --git a/mappings/net/minecraft/registry/DynamicRegistryManager.mapping b/mappings/net/minecraft/registry/DynamicRegistryManager.mapping new file mode 100644 index 0000000000..5be71ffdf8 --- /dev/null +++ b/mappings/net/minecraft/registry/DynamicRegistryManager.mapping @@ -0,0 +1,47 @@ +CLASS net/minecraft/class_5455 net/minecraft/registry/DynamicRegistryManager + COMMENT A manager of dynamic registries. It allows users to access non-hardcoded + COMMENT registries reliably. + COMMENT + COMMENT

    The {@link DynamicRegistryManager.ImmutableImpl} + COMMENT class serves as an immutable implementation of any particular collection + COMMENT or configuration of dynamic registries. + FIELD field_25918 LOGGER Lorg/slf4j/Logger; + FIELD field_40585 EMPTY Lnet/minecraft/class_5455$class_6890; + METHOD method_30530 get (Lnet/minecraft/class_5321;)Lnet/minecraft/class_2378; + COMMENT Retrieves a registry from this manager, or throws an exception when the registry + COMMENT does not exist. + COMMENT + COMMENT @throws IllegalStateException if the registry does not exist + ARG 1 key + METHOD method_33310 getOptional (Lnet/minecraft/class_5321;)Ljava/util/Optional; + ARG 1 key + METHOD method_40302 of (Lnet/minecraft/class_2378;)Lnet/minecraft/class_5455$class_6890; + ARG 0 registries + METHOD method_40311 streamAllRegistries ()Ljava/util/stream/Stream; + METHOD method_40316 toImmutable ()Lnet/minecraft/class_5455$class_6890; + METHOD method_41200 (Lnet/minecraft/class_5455$class_6892;)Lcom/mojang/serialization/Lifecycle; + ARG 0 entry + METHOD method_41201 getRegistryLifecycle ()Lcom/mojang/serialization/Lifecycle; + CLASS class_6890 Immutable + CLASS class_6891 ImmutableImpl + FIELD field_36471 registries Ljava/util/Map; + METHOD (Ljava/util/List;)V + ARG 1 registries + METHOD (Ljava/util/Map;)V + ARG 1 registries + METHOD (Ljava/util/stream/Stream;)V + ARG 1 entryStream + METHOD method_45942 (Lnet/minecraft/class_2378;)Lnet/minecraft/class_2378; + ARG 0 registry + METHOD method_45943 (Lnet/minecraft/class_2378;)Lnet/minecraft/class_2378; + ARG 0 registry + CLASS class_6892 Entry + METHOD method_40330 of (Ljava/util/Map$Entry;)Lnet/minecraft/class_5455$class_6892; + ARG 0 entry + METHOD method_40331 of (Lnet/minecraft/class_5321;Lnet/minecraft/class_2378;)Lnet/minecraft/class_5455$class_6892; + ARG 0 key + ARG 1 value + METHOD method_40332 freeze ()Lnet/minecraft/class_5455$class_6892; + CLASS class_7781 Immutablized + METHOD (Lnet/minecraft/class_5455;Ljava/util/stream/Stream;)V + ARG 2 entryStream diff --git a/mappings/net/minecraft/registry/MutableRegistry.mapping b/mappings/net/minecraft/registry/MutableRegistry.mapping new file mode 100644 index 0000000000..061fae5b57 --- /dev/null +++ b/mappings/net/minecraft/registry/MutableRegistry.mapping @@ -0,0 +1,12 @@ +CLASS net/minecraft/class_2385 net/minecraft/registry/MutableRegistry + COMMENT A registry that allows adding or modifying values. + COMMENT Note that in vanilla, all registries are instances of this. + COMMENT + COMMENT @see Registry + METHOD method_10272 add (Lnet/minecraft/class_5321;Ljava/lang/Object;Lcom/mojang/serialization/Lifecycle;)Lnet/minecraft/class_6880$class_6883; + ARG 1 key + ARG 2 entry + ARG 3 lifecycle + METHOD method_35863 isEmpty ()Z + COMMENT {@return whether the registry is empty} + METHOD method_46769 createMutableEntryLookup ()Lnet/minecraft/class_7871; diff --git a/mappings/net/minecraft/registry/Registerable.mapping b/mappings/net/minecraft/registry/Registerable.mapping new file mode 100644 index 0000000000..11e2f8469f --- /dev/null +++ b/mappings/net/minecraft/registry/Registerable.mapping @@ -0,0 +1,10 @@ +CLASS net/minecraft/class_7891 net/minecraft/registry/Registerable + METHOD method_46799 getRegistryLookup (Lnet/minecraft/class_5321;)Lnet/minecraft/class_7871; + ARG 1 registryRef + METHOD method_46800 register (Lnet/minecraft/class_5321;Ljava/lang/Object;Lcom/mojang/serialization/Lifecycle;)Lnet/minecraft/class_6880$class_6883; + ARG 1 key + ARG 2 value + ARG 3 lifecycle + METHOD method_46838 register (Lnet/minecraft/class_5321;Ljava/lang/Object;)Lnet/minecraft/class_6880$class_6883; + ARG 1 key + ARG 2 value diff --git a/mappings/net/minecraft/registry/Registries.mapping b/mappings/net/minecraft/registry/Registries.mapping new file mode 100644 index 0000000000..75a786092b --- /dev/null +++ b/mappings/net/minecraft/registry/Registries.mapping @@ -0,0 +1,224 @@ +CLASS net/minecraft/class_7923 net/minecraft/registry/Registries + FIELD field_41128 POINT_OF_INTEREST_TYPE Lnet/minecraft/class_2378; + FIELD field_41129 MEMORY_MODULE_TYPE Lnet/minecraft/class_7922; + FIELD field_41130 SENSOR_TYPE Lnet/minecraft/class_7922; + FIELD field_41131 SCHEDULE Lnet/minecraft/class_2378; + FIELD field_41132 ACTIVITY Lnet/minecraft/class_2378; + FIELD field_41133 LOOT_POOL_ENTRY_TYPE Lnet/minecraft/class_2378; + FIELD field_41134 LOOT_FUNCTION_TYPE Lnet/minecraft/class_2378; + FIELD field_41135 LOOT_CONDITION_TYPE Lnet/minecraft/class_2378; + FIELD field_41136 LOOT_NUMBER_PROVIDER_TYPE Lnet/minecraft/class_2378; + FIELD field_41137 LOOT_NBT_PROVIDER_TYPE Lnet/minecraft/class_2378; + FIELD field_41138 LOOT_SCORE_PROVIDER_TYPE Lnet/minecraft/class_2378; + FIELD field_41139 FLOAT_PROVIDER_TYPE Lnet/minecraft/class_2378; + FIELD field_41140 INT_PROVIDER_TYPE Lnet/minecraft/class_2378; + FIELD field_41141 HEIGHT_PROVIDER_TYPE Lnet/minecraft/class_2378; + FIELD field_41142 BLOCK_PREDICATE_TYPE Lnet/minecraft/class_2378; + FIELD field_41143 CARVER Lnet/minecraft/class_2378; + FIELD field_41144 FEATURE Lnet/minecraft/class_2378; + FIELD field_41145 STRUCTURE_PLACEMENT Lnet/minecraft/class_2378; + FIELD field_41146 STRUCTURE_PIECE Lnet/minecraft/class_2378; + FIELD field_41147 STRUCTURE_TYPE Lnet/minecraft/class_2378; + FIELD field_41148 PLACEMENT_MODIFIER_TYPE Lnet/minecraft/class_2378; + FIELD field_41149 BLOCK_STATE_PROVIDER_TYPE Lnet/minecraft/class_2378; + FIELD field_41150 FOLIAGE_PLACER_TYPE Lnet/minecraft/class_2378; + FIELD field_41151 TRUNK_PLACER_TYPE Lnet/minecraft/class_2378; + FIELD field_41152 ROOT_PLACER_TYPE Lnet/minecraft/class_2378; + FIELD field_41153 TREE_DECORATOR_TYPE Lnet/minecraft/class_2378; + FIELD field_41154 ROOT_KEY Lnet/minecraft/class_2960; + FIELD field_41155 FEATURE_SIZE_TYPE Lnet/minecraft/class_2378; + FIELD field_41156 BIOME_SOURCE Lnet/minecraft/class_2378; + FIELD field_41157 CHUNK_GENERATOR Lnet/minecraft/class_2378; + FIELD field_41158 MATERIAL_CONDITION Lnet/minecraft/class_2378; + FIELD field_41159 MATERIAL_RULE Lnet/minecraft/class_2378; + FIELD field_41160 DENSITY_FUNCTION_TYPE Lnet/minecraft/class_2378; + FIELD field_41161 STRUCTURE_PROCESSOR Lnet/minecraft/class_2378; + FIELD field_41162 STRUCTURE_POOL_ELEMENT Lnet/minecraft/class_2378; + FIELD field_41163 CAT_VARIANT Lnet/minecraft/class_2378; + FIELD field_41164 FROG_VARIANT Lnet/minecraft/class_2378; + FIELD field_41165 BANNER_PATTERN Lnet/minecraft/class_2378; + FIELD field_41166 INSTRUMENT Lnet/minecraft/class_2378; + FIELD field_41167 REGISTRIES Lnet/minecraft/class_2378; + FIELD field_41168 LOGGER Lorg/slf4j/Logger; + FIELD field_41169 DEFAULT_ENTRIES Ljava/util/Map; + FIELD field_41170 ROOT Lnet/minecraft/class_2385; + FIELD field_41171 GAME_EVENT Lnet/minecraft/class_7922; + FIELD field_41172 SOUND_EVENT Lnet/minecraft/class_2378; + FIELD field_41173 FLUID Lnet/minecraft/class_7922; + FIELD field_41174 STATUS_EFFECT Lnet/minecraft/class_2378; + FIELD field_41175 BLOCK Lnet/minecraft/class_7922; + FIELD field_41176 ENCHANTMENT Lnet/minecraft/class_2378; + FIELD field_41177 ENTITY_TYPE Lnet/minecraft/class_7922; + FIELD field_41178 ITEM Lnet/minecraft/class_7922; + FIELD field_41179 POTION Lnet/minecraft/class_7922; + FIELD field_41180 PARTICLE_TYPE Lnet/minecraft/class_2378; + FIELD field_41181 BLOCK_ENTITY_TYPE Lnet/minecraft/class_2378; + FIELD field_41182 PAINTING_VARIANT Lnet/minecraft/class_7922; + FIELD field_41183 CUSTOM_STAT Lnet/minecraft/class_2378; + FIELD field_41184 CHUNK_STATUS Lnet/minecraft/class_7922; + FIELD field_41185 RULE_TEST Lnet/minecraft/class_2378; + FIELD field_41186 POS_RULE_TEST Lnet/minecraft/class_2378; + FIELD field_41187 SCREEN_HANDLER Lnet/minecraft/class_2378; + FIELD field_41188 RECIPE_TYPE Lnet/minecraft/class_2378; + FIELD field_41189 RECIPE_SERIALIZER Lnet/minecraft/class_2378; + FIELD field_41190 ATTRIBUTE Lnet/minecraft/class_2378; + FIELD field_41191 POSITION_SOURCE_TYPE Lnet/minecraft/class_2378; + FIELD field_41192 COMMAND_ARGUMENT_TYPE Lnet/minecraft/class_2378; + FIELD field_41193 STAT_TYPE Lnet/minecraft/class_2378; + FIELD field_41194 VILLAGER_TYPE Lnet/minecraft/class_7922; + FIELD field_41195 VILLAGER_PROFESSION Lnet/minecraft/class_7922; + FIELD field_42940 DECORATED_POT_PATTERN Lnet/minecraft/class_2378; + FIELD field_43381 RULE_BLOCK_ENTITY_MODIFIER Lnet/minecraft/class_2378; + FIELD field_44687 ITEM_GROUP Lnet/minecraft/class_2378; + METHOD method_47450 (Lnet/minecraft/class_2378;)Lnet/minecraft/class_4168; + ARG 0 registry + METHOD method_47451 (Lnet/minecraft/class_2378;)Lnet/minecraft/class_4170; + ARG 0 registry + METHOD method_47452 (Lnet/minecraft/class_2378;)Lnet/minecraft/class_4149; + ARG 0 registry + METHOD method_47453 (Lnet/minecraft/class_2378;)Lnet/minecraft/class_4140; + ARG 0 registry + METHOD method_47454 (Lnet/minecraft/class_2378;)Lnet/minecraft/class_3852; + ARG 0 registry + METHOD method_47455 (Lnet/minecraft/class_2378;)Lnet/minecraft/class_3854; + ARG 0 registry + METHOD method_47456 (Lnet/minecraft/class_2378;)Lnet/minecraft/class_3448; + ARG 0 registry + METHOD method_47457 (Lnet/minecraft/class_2378;)Lnet/minecraft/class_5717; + ARG 0 registry + METHOD method_47458 (Lnet/minecraft/class_2378;)Lnet/minecraft/class_1320; + ARG 0 registry + METHOD method_47459 (Lnet/minecraft/class_2378;)Lnet/minecraft/class_1865; + ARG 0 registry + METHOD method_47460 (Lnet/minecraft/class_2378;)Lnet/minecraft/class_3956; + ARG 0 registry + METHOD method_47461 (Lnet/minecraft/class_2378;)Lnet/minecraft/class_3917; + ARG 0 registry + METHOD method_47462 (Lnet/minecraft/class_2378;)Lnet/minecraft/class_4996; + ARG 0 registry + METHOD method_47463 (Lnet/minecraft/class_2378;)Lnet/minecraft/class_3827; + ARG 0 registry + METHOD method_47464 (Lnet/minecraft/class_2378;)Lnet/minecraft/class_2806; + ARG 0 registry + METHOD method_47465 (Lnet/minecraft/class_2378;)Lnet/minecraft/class_2960; + ARG 0 registry + METHOD method_47466 (Lnet/minecraft/class_2378;)Lnet/minecraft/class_2591; + ARG 0 registry + METHOD method_47467 (Lnet/minecraft/class_2378;)Lnet/minecraft/class_2396; + ARG 0 registry + METHOD method_47468 (Lnet/minecraft/class_2378;)Lnet/minecraft/class_1842; + ARG 0 registry + METHOD method_47469 (Lnet/minecraft/class_2378;)Lnet/minecraft/class_1792; + ARG 0 registry + METHOD method_47470 (Lnet/minecraft/class_2378;)Lnet/minecraft/class_1299; + ARG 0 registry + METHOD method_47471 (Lnet/minecraft/class_2378;)Lnet/minecraft/class_1887; + ARG 0 registry + METHOD method_47472 (Lnet/minecraft/class_2378;)Lnet/minecraft/class_2248; + ARG 0 registry + METHOD method_47473 (Lnet/minecraft/class_2378;)Lnet/minecraft/class_1291; + ARG 0 registry + METHOD method_47474 (Lnet/minecraft/class_2378;)Lnet/minecraft/class_3611; + ARG 0 registry + METHOD method_47475 (Lnet/minecraft/class_2378;)Lnet/minecraft/class_3414; + ARG 0 registry + METHOD method_47476 bootstrap ()V + METHOD method_47477 create (Lnet/minecraft/class_5321;Lcom/mojang/serialization/Lifecycle;Lnet/minecraft/class_7923$class_6889;)Lnet/minecraft/class_2378; + ARG 0 key + ARG 1 lifecycle + ARG 2 initializer + METHOD method_47478 create (Lnet/minecraft/class_5321;Lnet/minecraft/class_2385;Lnet/minecraft/class_7923$class_6889;Lcom/mojang/serialization/Lifecycle;)Lnet/minecraft/class_2385; + ARG 0 key + ARG 1 registry + ARG 2 initializer + ARG 3 lifecycle + METHOD method_47479 create (Lnet/minecraft/class_5321;Lnet/minecraft/class_7923$class_6889;)Lnet/minecraft/class_2378; + ARG 0 key + ARG 1 initializer + METHOD method_47480 create (Lnet/minecraft/class_5321;Ljava/lang/String;Lcom/mojang/serialization/Lifecycle;Lnet/minecraft/class_7923$class_6889;)Lnet/minecraft/class_7922; + ARG 0 key + ARG 1 defaultId + ARG 2 lifecycle + ARG 3 initializer + METHOD method_47481 create (Lnet/minecraft/class_5321;Ljava/lang/String;Lnet/minecraft/class_7923$class_6889;)Lnet/minecraft/class_7922; + ARG 0 key + ARG 1 defaultId + ARG 2 initializer + METHOD method_47482 (Lnet/minecraft/class_2960;Ljava/util/function/Supplier;)V + ARG 0 id + ARG 1 initializer + METHOD method_47483 validate (Lnet/minecraft/class_2378;)V + ARG 0 registries + METHOD method_47484 (Lnet/minecraft/class_2378;Lnet/minecraft/class_2378;)V + ARG 1 registry + METHOD method_47486 (Lnet/minecraft/class_2378;)Lnet/minecraft/class_5712; + ARG 0 registry + METHOD method_47487 init ()V + METHOD method_47488 createIntrusive (Lnet/minecraft/class_5321;Ljava/lang/String;Lcom/mojang/serialization/Lifecycle;Lnet/minecraft/class_7923$class_6889;)Lnet/minecraft/class_7922; + ARG 0 key + ARG 1 defaultId + ARG 2 lifecycle + ARG 3 initializer + METHOD method_47489 createIntrusive (Lnet/minecraft/class_5321;Ljava/lang/String;Lnet/minecraft/class_7923$class_6889;)Lnet/minecraft/class_7922; + ARG 0 key + ARG 1 defaultId + ARG 2 initializer + METHOD method_47490 (Lnet/minecraft/class_2378;)Lnet/minecraft/class_7106; + ARG 0 registry + METHOD method_47491 freezeRegistries ()V + METHOD method_47492 (Lnet/minecraft/class_2378;)Lnet/minecraft/class_3816; + ARG 0 registry + METHOD method_47493 (Lnet/minecraft/class_2378;)Lnet/minecraft/class_3828; + ARG 0 registry + METHOD method_47494 (Lnet/minecraft/class_2378;)Lnet/minecraft/class_5202; + ARG 0 registry + METHOD method_47495 (Lnet/minecraft/class_2378;)Lnet/minecraft/class_4663; + ARG 0 registry + METHOD method_47496 (Lnet/minecraft/class_2378;)Lnet/minecraft/class_7388; + ARG 0 registry + METHOD method_47497 (Lnet/minecraft/class_2378;)Lnet/minecraft/class_5142; + ARG 0 registry + METHOD method_47498 (Lnet/minecraft/class_2378;)Lnet/minecraft/class_4648; + ARG 0 registry + METHOD method_47499 (Lnet/minecraft/class_2378;)Lnet/minecraft/class_4652; + ARG 0 registry + METHOD method_47500 (Lnet/minecraft/class_2378;)Lnet/minecraft/class_6798; + ARG 0 registry + METHOD method_47501 (Lnet/minecraft/class_2378;)Lnet/minecraft/class_7151; + ARG 0 registry + METHOD method_47502 (Lnet/minecraft/class_2378;)Lnet/minecraft/class_3773; + ARG 0 registry + METHOD method_47503 (Lnet/minecraft/class_2378;)Lnet/minecraft/class_6875; + ARG 0 registry + METHOD method_47504 (Lnet/minecraft/class_2378;)Lnet/minecraft/class_3031; + ARG 0 registry + METHOD method_47505 (Lnet/minecraft/class_2378;)Lnet/minecraft/class_2939; + ARG 0 registry + METHOD method_47506 (Lnet/minecraft/class_2378;)Lnet/minecraft/class_6647; + ARG 0 registry + METHOD method_47507 (Lnet/minecraft/class_2378;)Lnet/minecraft/class_6123; + ARG 0 registry + METHOD method_47508 (Lnet/minecraft/class_2378;)Lnet/minecraft/class_6018; + ARG 0 registry + METHOD method_47509 (Lnet/minecraft/class_2378;)Lnet/minecraft/class_5864; + ARG 0 registry + METHOD method_47510 (Lnet/minecraft/class_2378;)Lnet/minecraft/class_5669; + ARG 0 registry + METHOD method_47511 (Lnet/minecraft/class_2378;)Lnet/minecraft/class_5650; + ARG 0 registry + METHOD method_47512 (Lnet/minecraft/class_2378;)Lnet/minecraft/class_5657; + ARG 0 registry + METHOD method_47513 (Lnet/minecraft/class_2378;)Lnet/minecraft/class_5342; + ARG 0 registry + METHOD method_47514 (Lnet/minecraft/class_2378;)Lnet/minecraft/class_5339; + ARG 0 registry + METHOD method_47515 (Lnet/minecraft/class_2378;)Lnet/minecraft/class_5338; + ARG 0 registry + METHOD method_49927 (Lnet/minecraft/class_2378;)Lnet/minecraft/class_8249; + ARG 0 registry + METHOD method_53495 createIntrusive (Lnet/minecraft/class_5321;Lnet/minecraft/class_7923$class_6889;)Lnet/minecraft/class_2378; + ARG 0 key + ARG 1 initializer + CLASS class_6889 Initializer + METHOD run (Lnet/minecraft/class_2378;)Ljava/lang/Object; + ARG 1 registry diff --git a/mappings/net/minecraft/registry/Registry.mapping b/mappings/net/minecraft/registry/Registry.mapping new file mode 100644 index 0000000000..dbb082f7d1 --- /dev/null +++ b/mappings/net/minecraft/registry/Registry.mapping @@ -0,0 +1,287 @@ +CLASS net/minecraft/class_2378 net/minecraft/registry/Registry + COMMENT A registry is used to register various in-game components. Almost all parts of the + COMMENT game - from blocks, items, and entity types, to cat types, goat horn instruments, + COMMENT and structure pools - are registered in registries. Registry system allows the game + COMMENT to enumerate all known types of something, and to assign a unique identifier to each + COMMENT of those. Therefore, registering an object in the registry plays a very important + COMMENT role, and failure to register new instances of registerable object usually results + COMMENT in a bug or even a crash. + COMMENT + COMMENT

    Terminologies

    + COMMENT

    A registry is an object that holds the mapping between three things: + COMMENT the string ID, the numeric ID, and the registered value. There are many registries + COMMENT for different types of registerable objects, and a registry's type parameter indicates + COMMENT the accepted type. For example, you register your {@link net.minecraft.block.Block} to {@code + COMMENT Registry}. It's important to note that registries themselves are registered + COMMENT in a "registry of registries", {@link Registries#ROOT}. + COMMENT + COMMENT

    The string ID, usually just called "ID", is a human-readable + COMMENT {@link Identifier} that uniquely identifies the registered value in a registry. + COMMENT This should stay the same between two game versions, and is usually used for disk + COMMENT storage. + COMMENT + COMMENT

    The numeric ID or raw ID is an integer + COMMENT assigned automatically by the registry to each registered value. This is not + COMMENT guaranteed to stay the same between two game versions, and is usually used for + COMMENT networking purposes. + COMMENT + COMMENT

    The registered value, often just called "value" in the code, + COMMENT is the value added to the registry. The registry's type parameter determines + COMMENT the type of the registered value. + COMMENT + COMMENT

    Each registered value can also be identified with a {@linkplain RegistryKey + COMMENT registry key}. A registry key is a combination of the registry's ID and + COMMENT the registered value's ID. Using a registry key makes the type of the ID's + COMMENT associated value clear, as the type parameter contains the type. + COMMENT + COMMENT

    A {@linkplain RegistryEntry registry entry} is an object + COMMENT holding a value that can be registered in a registry. In most cases, the + COMMENT value is already registered in a registry ("reference entry"), hence the name; + COMMENT however, it is possible to create a registry entry by direct reference + COMMENT ("direct entry"). This is useful for data packs, as they can define + COMMENT one-time use values directly without having to register them every time. + COMMENT + COMMENT

    A {@link RegistryEntryList registry entry list} is a list + COMMENT of registry entries. This, is either a direct reference to each item, or + COMMENT a reference to a tag. A tag is a way to dynamically + COMMENT define a list of registered values. Anything registered in a registry + COMMENT can be tagged, and each registry holds a list of tags it recognizes. + COMMENT + COMMENT

    Static and dynamic registries

    + COMMENT

    There are two kinds of registries: static and dynamic. + COMMENT + COMMENT

      + COMMENT
    • A static registry is a registry whose values are hard-coded + COMMENT in the game and cannot be added or modified through data packs. Most registries + COMMENT are static. Since they cannot be modified (without mods), it is a singleton, + COMMENT and exists in this class. During the game bootstrap, vanilla objects are + COMMENT registered, after which the registry gets frozen to prohibit further changes.
      • + COMMENT + COMMENT
    • A dynamic registry is a registry whose values can be + COMMENT added or replaced through data packs. A dynamic registry is bound to a server, + COMMENT and multiple registries for the same type of registerable object can exist during + COMMENT the lifetime of the game. When a player joins, the server sends the contents of + COMMENT the dynamic registry manager to the client, but only "network serializable" + COMMENT registries are sent. To access a dynamic registry, first get an instance of the + COMMENT dynamic registry manager, then call the {@link DynamicRegistryManager#get} method.
      • + COMMENT
    + COMMENT + COMMENT

    Using Registry

    + COMMENT

    Reading Registry

    + COMMENT

    A registry is also an {@link IndexedIterable}. Therefore, registries can be + COMMENT iterated using, e.g. {@code for (Block block : Registries.BLOCK)}. + COMMENT + COMMENT

    There are several other methods used for reading the contents of the registry: + COMMENT

      + COMMENT
    • {@link #entryOf} or {@link #getEntry(RegistryKey)} for getting the registry entry + COMMENT from the key.
      • + COMMENT
    • {@link #get(Identifier)} or {@link #get(RegistryKey)} for getting the registered + COMMENT value from the ID or the registry key.
      • + COMMENT
    • {@link #getId(Object)} for getting the ID of a registered value.
      • + COMMENT
    • {@link #getEntry(int)} for getting the registry entry from the raw ID.
      • + COMMENT
    • {@link #getEntryList} and {@link #iterateEntries} for getting the contents of a tag,
      • + COMMENT
    • {@link #streamTags} for streaming all tags of a registry.
      • + COMMENT
    + COMMENT + COMMENT

    Registering something to Registry

    + COMMENT

    The steps for registration are different, depending on whether the registry is static + COMMENT or dynamic. For dynamic registries, data packs can usually be used to register a new + COMMENT value or replace one. For static registries, the game's code must be modified. + COMMENT + COMMENT

    Static registries are defined in {@link Registries}, and unlike the dynamic registries, it + COMMENT cannot be changed after the game initialization. The game enforces this by "freezing" + COMMENT the registry. Attempting to register a value after freezing causes a crash, such as + COMMENT "Registry is already frozen". Modding APIs usually provide a way to bypass this restriction. + COMMENT + COMMENT

    Use {@link #register(Registry, Identifier, Object)} for registering a value to a registry. + COMMENT + COMMENT

    Intrusive holders

    + COMMENT

    For historical reasons, there are two types of reference registry entries. + COMMENT (This is different from the "direct" and "reference" registry entry types.) + COMMENT + COMMENT

      + COMMENT
    • Intrusive holders are registry entries tied to a specific + COMMENT registerable object at instantiation time. When instantiating those, it promises + COMMENT that the object is later registered - which, if broken, will result in a crash. + COMMENT This is used for {@link Registries#BLOCK}, {@link Registries#ITEM}, {@link Registries#FLUID}, + COMMENT {@link Registries#ENTITY_TYPE}, and {@link Registries#GAME_EVENT} registries.
      • + COMMENT
    • Standalone holders are registry entries that are not intrusive. + COMMENT There is no restriction on instantiation.
      • + COMMENT
    + COMMENT + COMMENT

    When a class whose instances are registered as intrusive holders, such as + COMMENT {@link net.minecraft.block.Block} or {@link net.minecraft.item.Item}, are instantiated + COMMENT without registering, the game crashes with "Some intrusive holders were not added to + COMMENT registry" error message. This includes conditional registration. + COMMENT For example, the code below can cause a crash: + COMMENT + COMMENT 

    {@code
+	COMMENT Item myItem = new Item(new Item.Settings());
+	COMMENT if (condition) {
+	COMMENT     Registry.register(Registries.ITEM, new Identifier("example", "bad"), myItem);
+	COMMENT }
+	COMMENT }
    + COMMENT + COMMENT

    The correct way is to make the instantiation conditional as well: + COMMENT + COMMENT 

    {@code
+	COMMENT if (condition) {
+	COMMENT     Item myItem = new Item(new Item.Settings());
+	COMMENT     Registry.register(Registries.ITEM, new Identifier("example", "bad"), myItem);
+	COMMENT }
+	COMMENT }
    + METHOD keys (Lcom/mojang/serialization/DynamicOps;)Ljava/util/stream/Stream; + ARG 1 ops + METHOD method_10220 stream ()Ljava/util/stream/Stream; + COMMENT {@return a stream of all values of this registry} + METHOD method_10221 getId (Ljava/lang/Object;)Lnet/minecraft/class_2960; + COMMENT {@return the ID assigned to {@code value}, or {@code null} if it is not registered} + ARG 1 value + METHOD method_10223 get (Lnet/minecraft/class_2960;)Ljava/lang/Object; + COMMENT {@return the value that is assigned {@code id}, or {@code null} if there is none} + ARG 1 id + METHOD method_10226 register (Lnet/minecraft/class_2378;Ljava/lang/String;Ljava/lang/Object;)Ljava/lang/Object; + ARG 0 registry + ARG 1 id + ARG 2 entry + METHOD method_10230 register (Lnet/minecraft/class_2378;Lnet/minecraft/class_2960;Ljava/lang/Object;)Ljava/lang/Object; + COMMENT Registers {@code entry} to {@code registry} under {@code id}. + COMMENT + COMMENT @return the passed {@code entry} + ARG 0 registry + ARG 1 id + ARG 2 entry + METHOD method_10235 getIds ()Ljava/util/Set; + COMMENT {@return the set of all IDs registered in a registry} + METHOD method_10240 getRandom (Lnet/minecraft/class_5819;)Ljava/util/Optional; + COMMENT {@return a random registry entry from this registry, or an empty optional if the + COMMENT registry is empty} + ARG 1 random + METHOD method_10250 containsId (Lnet/minecraft/class_2960;)Z + COMMENT {@return whether {@code id} is registered in this registry} + ARG 1 id + METHOD method_17966 getOrEmpty (Lnet/minecraft/class_2960;)Ljava/util/Optional; + COMMENT {@return the value that is assigned {@code id}, or an empty optional if there is none} + ARG 1 id + METHOD method_29107 get (Lnet/minecraft/class_5321;)Ljava/lang/Object; + COMMENT {@return the value that is assigned {@code key}, or {@code null} if there is none} + ARG 1 key + METHOD method_29113 getKey (Ljava/lang/Object;)Ljava/util/Optional; + COMMENT {@return the registry key of {@code value}, or an empty optional if it is not registered} + ARG 1 entry + METHOD method_29722 getEntrySet ()Ljava/util/Set; + COMMENT {@return the set containing {@link Map.Entry} of the registry keys and values registered + COMMENT in this registry} + METHOD method_30517 getKey ()Lnet/minecraft/class_5321; + COMMENT {@return the registry key that identifies this 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 {@return the value that is assigned {@code key}} + COMMENT + COMMENT @throws IllegalStateException if there is no value with {@code key} in the registry + ARG 1 key + METHOD method_31189 getOrEmpty (Lnet/minecraft/class_5321;)Ljava/util/Optional; + COMMENT {@return the value that is assigned {@code key}, or an empty optional if there is none} + ARG 1 key + METHOD method_34028 (Lcom/mojang/serialization/DynamicOps;Lnet/minecraft/class_2960;)Ljava/lang/Object; + ARG 1 id + METHOD method_35842 contains (Lnet/minecraft/class_5321;)Z + COMMENT {@return whether {@code key} is registered in this registry} + ARG 1 key + METHOD method_39197 register (Lnet/minecraft/class_2378;Lnet/minecraft/class_5321;Ljava/lang/Object;)Ljava/lang/Object; + COMMENT Registers {@code entry} to {@code registry} under {@code key}. + COMMENT + COMMENT @return the passed {@code entry} + ARG 0 registry + ARG 1 key + ARG 2 entry + METHOD method_39667 (Lnet/minecraft/class_2960;)Lcom/mojang/serialization/DataResult; + ARG 1 id + METHOD method_39670 (Ljava/lang/Object;)I + ARG 1 value + METHOD method_39671 (Ljava/lang/Object;)Lcom/mojang/serialization/DataResult; + ARG 1 value + METHOD method_39673 getCodec ()Lcom/mojang/serialization/Codec; + COMMENT {@return the codec for serializing {@code T}} + COMMENT + COMMENT @implNote This serializes a value using the ID or (if compressed) the raw ID. + METHOD method_40257 populateTags (Ljava/util/Map;)V + ARG 1 tagEntries + METHOD method_40260 getOrCreateEntryList (Lnet/minecraft/class_6862;)Lnet/minecraft/class_6885$class_6888; + ARG 1 tag + METHOD method_40264 getEntry (Lnet/minecraft/class_5321;)Ljava/util/Optional; + COMMENT {@return the reference registry entry for the value assigned {@code key}, or an + COMMENT empty optional if there is no such value} + COMMENT + COMMENT @see #entryOf + ARG 1 key + METHOD method_40265 getEntry (I)Ljava/util/Optional; + COMMENT {@return the reference registry entry for the value assigned {@code rawId}, or an + COMMENT empty optional if there is no such value} + ARG 1 rawId + METHOD method_40266 getEntryList (Lnet/minecraft/class_6862;)Ljava/util/Optional; + COMMENT {@return the registry entry list of values that are assigned {@code tag}, or an empty + COMMENT optional if the tag is not known to the registry} + ARG 1 tag + METHOD method_40269 createEntry (Ljava/lang/Object;)Lnet/minecraft/class_6880$class_6883; + ARG 1 value + METHOD method_40270 streamEntries ()Ljava/util/stream/Stream; + COMMENT {@return a stream of reference registry entries of this registry} + METHOD method_40272 streamTagsAndEntries ()Ljava/util/stream/Stream; + METHOD method_40273 streamTags ()Ljava/util/stream/Stream; + COMMENT {@return a stream of all tag keys known to this registry} + METHOD method_40276 freeze ()Lnet/minecraft/class_2378; + METHOD method_40278 clearTags ()V + METHOD method_40285 (Lnet/minecraft/class_6880;)Lcom/mojang/serialization/DataResult; + ARG 1 entry + METHOD method_40286 iterateEntries (Lnet/minecraft/class_6862;)Ljava/lang/Iterable; + COMMENT {@return an iterable of values that are assigned {@code tag}, or an empty iterable + COMMENT if the tag is not known to the registry} + ARG 1 tag + METHOD method_40290 entryOf (Lnet/minecraft/class_5321;)Lnet/minecraft/class_6880$class_6883; + COMMENT {@return the reference registry entry for the value assigned {@code key}} + COMMENT + COMMENT @throws IllegalStateException if there is no value that is assigned {@code key} + COMMENT + COMMENT @see #getEntry(RegistryKey) + ARG 1 key + METHOD method_40294 createEntryCodec ()Lcom/mojang/serialization/Codec; + COMMENT {@return the codec for serializing the registry entry of {@code T}} + COMMENT + COMMENT @implNote This serializes a registry entry using the ID. + METHOD method_40295 getIndexedEntries ()Lnet/minecraft/class_2359; + METHOD method_42021 getKeys ()Ljava/util/Set; + COMMENT {@return the set of all registry keys registered in a registry} + METHOD method_46770 getEntryOwner ()Lnet/minecraft/class_7876; + METHOD method_46771 getReadOnlyWrapper ()Lnet/minecraft/class_7225$class_7226; + COMMENT {@return a registry wrapper that does not mutate the backing registry under + COMMENT any circumstances} + COMMENT + COMMENT @see net.minecraft.command.CommandRegistryAccess.EntryListCreationPolicy#FAIL + METHOD method_46772 getTagCreatingWrapper ()Lnet/minecraft/class_7225$class_7226; + COMMENT {@return a registry wrapper that creates and stores a new registry entry list + COMMENT when handling an unknown tag key} + COMMENT + COMMENT @see net.minecraft.command.CommandRegistryAccess.EntryListCreationPolicy#CREATE_NEW + METHOD method_47441 (Lnet/minecraft/class_6880;)Lcom/mojang/serialization/Lifecycle; + ARG 1 entry + METHOD method_47442 (Lnet/minecraft/class_6880;)Lcom/mojang/serialization/Lifecycle; + ARG 1 entry + METHOD method_47443 (Lnet/minecraft/class_2960;)Lcom/mojang/serialization/DataResult; + ARG 1 id + METHOD method_47983 getEntry (Ljava/lang/Object;)Lnet/minecraft/class_6880; + ARG 1 value + METHOD method_47984 registerReference (Lnet/minecraft/class_2378;Lnet/minecraft/class_5321;Ljava/lang/Object;)Lnet/minecraft/class_6880$class_6883; + ARG 0 registry + ARG 1 key + ARG 2 entry + METHOD method_47985 registerReference (Lnet/minecraft/class_2378;Lnet/minecraft/class_2960;Ljava/lang/Object;)Lnet/minecraft/class_6880$class_6883; + ARG 0 registry + ARG 1 id + ARG 2 entry + CLASS 1 + METHOD method_46773 (Lnet/minecraft/class_6880$class_6883;)Lnet/minecraft/class_6880; + ARG 0 entry diff --git a/mappings/net/minecraft/registry/RegistryBuilder.mapping b/mappings/net/minecraft/registry/RegistryBuilder.mapping new file mode 100644 index 0000000000..aa9cecb792 --- /dev/null +++ b/mappings/net/minecraft/registry/RegistryBuilder.mapping @@ -0,0 +1,94 @@ +CLASS net/minecraft/class_7877 net/minecraft/registry/RegistryBuilder + FIELD field_40941 registries Ljava/util/List; + METHOD method_46776 addRegistry (Lnet/minecraft/class_5321;Lcom/mojang/serialization/Lifecycle;Lnet/minecraft/class_7877$class_7882;)Lnet/minecraft/class_7877; + ARG 1 registryRef + ARG 2 lifecycle + ARG 3 bootstrapFunction + METHOD method_46777 addRegistry (Lnet/minecraft/class_5321;Lnet/minecraft/class_7877$class_7882;)Lnet/minecraft/class_7877; + ARG 1 registryRef + ARG 2 bootstrapFunction + METHOD method_46778 toLookup (Lnet/minecraft/class_7225$class_7226;)Lnet/minecraft/class_7871; + ARG 0 wrapper + METHOD method_46779 (Lnet/minecraft/class_5455$class_6892;)Lnet/minecraft/class_7225$class_7226; + ARG 0 entry + METHOD method_46780 createWrapperLookup (Lnet/minecraft/class_5455;)Lnet/minecraft/class_7225$class_7874; + ARG 1 baseRegistryManager + METHOD method_46781 createWrapperLookup (Lnet/minecraft/class_5455;Lnet/minecraft/class_7225$class_7874;)Lnet/minecraft/class_7225$class_7874; + ARG 1 baseRegistryManager + ARG 2 wrapperLookup + METHOD method_46782 (Lnet/minecraft/class_7877$class_7878;Lnet/minecraft/class_7877$class_7884;)Lnet/minecraft/class_7877$class_7883; + ARG 1 info + METHOD method_46783 (Lnet/minecraft/class_5455$class_6892;)Lnet/minecraft/class_7225$class_7226; + ARG 0 entry + METHOD method_46784 createBootstrappedRegistries (Lnet/minecraft/class_5455;)Lnet/minecraft/class_7877$class_7878; + ARG 1 registryManager + METHOD method_46785 (Lnet/minecraft/class_7877$class_7878;Lnet/minecraft/class_7877$class_7884;)Lnet/minecraft/class_7225$class_7226; + ARG 1 info + METHOD method_46786 (Lnet/minecraft/class_7877$class_7878;Lnet/minecraft/class_7877$class_7884;)V + ARG 1 registry + METHOD method_49352 (Ljava/util/Map;Lnet/minecraft/class_7877$class_7883;)V + ARG 1 registry + METHOD method_49353 (Ljava/util/Map;Lnet/minecraft/class_7877$class_7883;)V + ARG 1 registry + CLASS class_7878 Registries + METHOD method_46787 createRegisterable ()Lnet/minecraft/class_7891; + METHOD method_46788 (Lnet/minecraft/class_5321;Lnet/minecraft/class_7225;)Ljava/util/Optional; + ARG 1 entryLookup + METHOD method_46789 (Lnet/minecraft/class_5321;Lnet/minecraft/class_7877$class_7881;)V + ARG 1 key + ARG 2 value + METHOD method_46790 (Lcom/google/common/collect/ImmutableMap$Builder;Lnet/minecraft/class_5455$class_6892;)V + ARG 1 entry + METHOD method_46791 (Lcom/google/common/collect/ImmutableMap$Builder;Lnet/minecraft/class_7877$class_7885;Lnet/minecraft/class_5321;)V + ARG 2 registryRef + METHOD method_46792 (Lnet/minecraft/class_6880$class_6883;Ljava/util/Iterator;Lnet/minecraft/class_6880$class_6883;)V + ARG 2 entry + METHOD method_46793 setReferenceEntryValues (Lnet/minecraft/class_7225$class_7874;)V + ARG 1 lookup + METHOD method_46794 (Lnet/minecraft/class_7225$class_7874;Lnet/minecraft/class_2960;)Ljava/util/Optional; + ARG 1 registryId + METHOD method_46795 addOwner (Lnet/minecraft/class_7876;)V + ARG 1 owner + METHOD method_46796 of (Lnet/minecraft/class_5455;Ljava/util/stream/Stream;)Lnet/minecraft/class_7877$class_7878; + ARG 0 dynamicRegistryManager + ARG 1 registryRefs + METHOD method_46797 validateReferences ()V + METHOD method_46798 throwErrors ()V + METHOD method_49354 (Lnet/minecraft/class_2960;)Lnet/minecraft/class_7877$class_7883; + ARG 0 registry + METHOD method_49355 streamRegistries ()Ljava/util/stream/Stream; + CLASS class_7879 AnyOwner + COMMENT An owner that owns multiple registries and holds the owner object for those. + COMMENT {@link #ownerEquals} returns {@code true} for all owners {@linkplain #addOwner previously + COMMENT added}. + FIELD field_40944 owners Ljava/util/Set; + METHOD method_46801 addOwner (Lnet/minecraft/class_7876;)V + ARG 1 owner + CLASS class_7880 EntryListCreatingLookup + FIELD field_40945 entryOwner Lnet/minecraft/class_7876; + METHOD (Lnet/minecraft/class_7876;)V + ARG 1 entryOwner + CLASS class_7881 RegisteredValue + CLASS class_7882 BootstrapFunction + METHOD run (Lnet/minecraft/class_7891;)V + ARG 1 registerable + CLASS class_7883 InitializedRegistry + METHOD method_46802 toWrapper ()Lnet/minecraft/class_7225$class_7226; + CLASS 1 + FIELD field_40947 keysToEntries Ljava/util/Map; + METHOD method_46803 (Ljava/util/Map$Entry;)Lnet/minecraft/class_6880$class_6883; + ARG 1 entry + CLASS class_7884 RegistryInfo + METHOD method_46805 init (Lnet/minecraft/class_7877$class_7878;)Lnet/minecraft/class_7877$class_7883; + ARG 1 registries + METHOD method_46806 runBootstrap (Lnet/minecraft/class_7877$class_7878;)V + ARG 1 registries + CLASS class_7885 StandAloneEntryCreatingLookup + FIELD field_40948 keysToEntries Ljava/util/Map; + METHOD method_46807 getOrCreate (Lnet/minecraft/class_5321;)Lnet/minecraft/class_6880$class_6883; + ARG 1 key + METHOD method_46808 (Lnet/minecraft/class_5321;)Lnet/minecraft/class_6880$class_6883; + ARG 1 key2 + CLASS class_7886 EntryAssociatedValue + FIELD comp_1148 entry Ljava/util/Optional; + METHOD comp_1148 entry ()Ljava/util/Optional; diff --git a/mappings/net/minecraft/util/registry/RegistryCodecs.mapping b/mappings/net/minecraft/registry/RegistryCodecs.mapping similarity index 52% rename from mappings/net/minecraft/util/registry/RegistryCodecs.mapping rename to mappings/net/minecraft/registry/RegistryCodecs.mapping index 035e570cf8..0fd59d682f 100644 --- a/mappings/net/minecraft/util/registry/RegistryCodecs.mapping +++ b/mappings/net/minecraft/registry/RegistryCodecs.mapping @@ -1,19 +1,10 @@ -CLASS net/minecraft/class_6895 net/minecraft/util/registry/RegistryCodecs - METHOD method_40338 (Lnet/minecraft/class_2378;)Ljava/util/Map; - ARG 0 registry - METHOD method_40339 (Lnet/minecraft/class_2385;Lcom/mojang/serialization/Lifecycle;Lnet/minecraft/class_5321;Ljava/lang/Object;)V - ARG 2 key - ARG 3 value +CLASS net/minecraft/class_6895 net/minecraft/registry/RegistryCodecs + COMMENT A utility class for serialization of registries using codecs. METHOD method_40340 entryList (Lnet/minecraft/class_5321;)Lcom/mojang/serialization/Codec; ARG 0 registryRef METHOD method_40341 entryList (Lnet/minecraft/class_5321;Lcom/mojang/serialization/Codec;)Lcom/mojang/serialization/Codec; ARG 0 registryRef ARG 1 elementCodec - METHOD method_40342 createRegistryDecoder (Lnet/minecraft/class_5321;Lcom/mojang/serialization/Codec;Lcom/mojang/serialization/Decoder;Lcom/mojang/serialization/Lifecycle;)Lcom/mojang/serialization/Decoder; - ARG 0 registryRef - ARG 1 codec - ARG 2 entryMapDecoder - ARG 3 lifecycle METHOD method_40343 entryList (Lnet/minecraft/class_5321;Lcom/mojang/serialization/Codec;Z)Lcom/mojang/serialization/Codec; ARG 0 registryRef ARG 1 elementCodec @@ -26,8 +17,6 @@ CLASS net/minecraft/class_6895 net/minecraft/util/registry/RegistryCodecs ARG 2 elementCodec METHOD method_40345 (Lnet/minecraft/class_5321;Lcom/mojang/serialization/Lifecycle;Ljava/util/List;)Lnet/minecraft/class_2378; ARG 2 entries - METHOD method_40346 (Lnet/minecraft/class_5321;Lcom/mojang/serialization/Lifecycle;Ljava/util/Map;)Lnet/minecraft/class_2385; - ARG 2 map METHOD method_40347 managerEntry (Lnet/minecraft/class_5321;Lcom/mojang/serialization/MapCodec;)Lcom/mojang/serialization/MapCodec; ARG 0 registryRef ARG 1 elementCodec @@ -40,31 +29,17 @@ CLASS net/minecraft/class_6895 net/minecraft/util/registry/RegistryCodecs COMMENT instead of serializing as one entry if the length is {@code 0} METHOD method_40350 (Lnet/minecraft/class_2378;)Ljava/util/List; ARG 0 registry - METHOD method_40351 registryMap (Lnet/minecraft/class_5321;Lcom/mojang/serialization/Codec;)Lcom/mojang/serialization/Codec; - ARG 0 registryRef - ARG 1 elementCodec - METHOD method_40352 dynamicRegistry (Lnet/minecraft/class_5321;Lcom/mojang/serialization/Lifecycle;Lcom/mojang/serialization/Codec;)Lcom/mojang/serialization/Codec; + METHOD method_45944 (Lnet/minecraft/class_5321;Lcom/mojang/serialization/Lifecycle;Ljava/util/Map;)Lnet/minecraft/class_2378; + ARG 2 entries + METHOD method_45945 (Lnet/minecraft/class_2378;)Ljava/util/Map; + ARG 0 registry + METHOD method_45946 (Lnet/minecraft/class_2385;Lcom/mojang/serialization/Lifecycle;Lnet/minecraft/class_5321;Ljava/lang/Object;)V + ARG 2 key + ARG 3 value + METHOD method_45947 createKeyedRegistryCodec (Lnet/minecraft/class_5321;Lcom/mojang/serialization/Lifecycle;Lcom/mojang/serialization/Codec;)Lcom/mojang/serialization/Codec; ARG 0 registryRef ARG 1 lifecycle ARG 2 elementCodec - CLASS 1 - METHOD decode (Lcom/mojang/serialization/DynamicOps;Ljava/lang/Object;)Lcom/mojang/serialization/DataResult; - ARG 1 ops - ARG 2 input - METHOD method_40354 (Lcom/mojang/datafixers/util/Pair;)Lcom/mojang/datafixers/util/Pair; - ARG 0 pair - METHOD method_40355 (Lcom/mojang/datafixers/util/Pair;Lnet/minecraft/class_2378;)Lcom/mojang/datafixers/util/Pair; - ARG 1 registry - METHOD method_40356 (Lcom/mojang/serialization/DataResult;Lnet/minecraft/class_6903;Lnet/minecraft/class_6900$class_6901;)Lcom/mojang/serialization/DataResult; - ARG 3 loaderAccess - METHOD method_40357 load (Lcom/mojang/serialization/DataResult;Lnet/minecraft/class_6903;Lnet/minecraft/class_6900;)Lcom/mojang/serialization/DataResult; - ARG 1 result - ARG 2 ops - ARG 3 loader - METHOD method_40358 (Lnet/minecraft/class_2385;)Lnet/minecraft/class_2378; - ARG 0 registry - METHOD method_40359 (Lnet/minecraft/class_6900;Lnet/minecraft/class_5321;Lcom/mojang/serialization/Codec;Lnet/minecraft/class_6903;Lcom/mojang/datafixers/util/Pair;)Lcom/mojang/serialization/DataResult; - ARG 4 pair CLASS class_5501 RegistryManagerEntry FIELD comp_290 key Lnet/minecraft/class_5321; FIELD comp_291 rawId I diff --git a/mappings/net/minecraft/registry/RegistryEntryLookup.mapping b/mappings/net/minecraft/registry/RegistryEntryLookup.mapping new file mode 100644 index 0000000000..fa1a044162 --- /dev/null +++ b/mappings/net/minecraft/registry/RegistryEntryLookup.mapping @@ -0,0 +1,14 @@ +CLASS net/minecraft/class_7871 net/minecraft/registry/RegistryEntryLookup + METHOD method_46733 getOptional (Lnet/minecraft/class_6862;)Ljava/util/Optional; + ARG 1 tag + METHOD method_46735 getOrThrow (Lnet/minecraft/class_6862;)Lnet/minecraft/class_6885$class_6888; + ARG 1 tag + METHOD method_46746 getOptional (Lnet/minecraft/class_5321;)Ljava/util/Optional; + ARG 1 key + METHOD method_46747 getOrThrow (Lnet/minecraft/class_5321;)Lnet/minecraft/class_6880$class_6883; + ARG 1 key + CLASS class_7872 RegistryLookup + METHOD method_46750 getOptional (Lnet/minecraft/class_5321;)Ljava/util/Optional; + ARG 1 registryRef + METHOD method_46751 getOrThrow (Lnet/minecraft/class_5321;)Lnet/minecraft/class_7871; + ARG 1 registryRef diff --git a/mappings/net/minecraft/util/registry/RegistryKey.mapping b/mappings/net/minecraft/registry/RegistryKey.mapping similarity index 87% rename from mappings/net/minecraft/util/registry/RegistryKey.mapping rename to mappings/net/minecraft/registry/RegistryKey.mapping index 015a860fb5..b1ec48ea58 100644 --- a/mappings/net/minecraft/util/registry/RegistryKey.mapping +++ b/mappings/net/minecraft/registry/RegistryKey.mapping @@ -1,10 +1,10 @@ -CLASS net/minecraft/class_5321 net/minecraft/util/registry/RegistryKey +CLASS net/minecraft/class_5321 net/minecraft/registry/RegistryKey COMMENT Represents a key for a value in a registry in a context where a COMMENT root registry is available. COMMENT COMMENT @param the type of the value - COMMENT @see Registry#ROOT - FIELD field_25136 INSTANCES Ljava/util/Map; + COMMENT @see Registries#ROOT + FIELD field_25136 INSTANCES Ljava/util/concurrent/ConcurrentMap; COMMENT A cache of all registry keys ever created. FIELD field_25137 registry Lnet/minecraft/class_2960; COMMENT The identifier of the registry in the root registry. @@ -40,8 +40,8 @@ CLASS net/minecraft/class_5321 net/minecraft/util/registry/RegistryKey METHOD method_29181 of (Lnet/minecraft/class_2960;Lnet/minecraft/class_2960;)Lnet/minecraft/class_5321; ARG 0 registry ARG 1 value - METHOD method_29182 (Lnet/minecraft/class_2960;Lnet/minecraft/class_2960;Ljava/lang/String;)Lnet/minecraft/class_5321; - ARG 2 id + METHOD method_29182 (Lnet/minecraft/class_5321$class_7892;)Lnet/minecraft/class_5321; + ARG 0 pair METHOD method_31163 isOf (Lnet/minecraft/class_5321;)Z COMMENT Returns whether this registry key belongs to the given registry (according to its type, not whether the registry actually contains this key). ARG 1 registry @@ -58,3 +58,6 @@ CLASS net/minecraft/class_5321 net/minecraft/util/registry/RegistryKey COMMENT by passing the registry {@code E}. ARG 1 registryRef METHOD method_41185 getRegistry ()Lnet/minecraft/class_2960; + CLASS class_7892 RegistryIdPair + FIELD comp_1150 id Lnet/minecraft/class_2960; + METHOD comp_1150 id ()Lnet/minecraft/class_2960; diff --git a/mappings/net/minecraft/registry/RegistryKeys.mapping b/mappings/net/minecraft/registry/RegistryKeys.mapping new file mode 100644 index 0000000000..0a81876ac3 --- /dev/null +++ b/mappings/net/minecraft/registry/RegistryKeys.mapping @@ -0,0 +1,47 @@ +CLASS net/minecraft/class_7924 net/minecraft/registry/RegistryKeys + FIELD field_41204 MATERIAL_CONDITION Lnet/minecraft/class_5321; + FIELD field_41205 MATERIAL_RULE Lnet/minecraft/class_5321; + FIELD field_41207 SCREEN_HANDLER Lnet/minecraft/class_5321; + FIELD field_41208 STATUS_EFFECT Lnet/minecraft/class_5321; + FIELD field_41211 PLACEMENT_MODIFIER_TYPE Lnet/minecraft/class_5321; + FIELD field_41218 ROOT_PLACER_TYPE Lnet/minecraft/class_5321; + FIELD field_41223 WORLD Lnet/minecraft/class_5321; + FIELD field_41224 DIMENSION Lnet/minecraft/class_5321; + FIELD field_41227 STRUCTURE_PIECE Lnet/minecraft/class_5321; + FIELD field_41228 STRUCTURE_PLACEMENT Lnet/minecraft/class_5321; + FIELD field_41229 STRUCTURE_POOL_ELEMENT Lnet/minecraft/class_5321; + FIELD field_41230 STRUCTURE_PROCESSOR Lnet/minecraft/class_5321; + FIELD field_41231 STRUCTURE_TYPE Lnet/minecraft/class_5321; + FIELD field_41232 TREE_DECORATOR_TYPE Lnet/minecraft/class_5321; + FIELD field_41233 TRUNK_PLACER_TYPE Lnet/minecraft/class_5321; + FIELD field_41236 BIOME Lnet/minecraft/class_5321; + FIELD field_41237 MESSAGE_TYPE Lnet/minecraft/class_5321; + FIELD field_41238 CONFIGURED_CARVER Lnet/minecraft/class_5321; + FIELD field_41239 CONFIGURED_FEATURE Lnet/minecraft/class_5321; + FIELD field_41240 DENSITY_FUNCTION Lnet/minecraft/class_5321; + FIELD field_41242 FLAT_LEVEL_GENERATOR_PRESET Lnet/minecraft/class_5321; + FIELD field_41243 CHUNK_GENERATOR_SETTINGS Lnet/minecraft/class_5321; + FIELD field_41244 NOISE_PARAMETERS Lnet/minecraft/class_5321; + FIELD field_41245 PLACED_FEATURE Lnet/minecraft/class_5321; + FIELD field_41246 STRUCTURE Lnet/minecraft/class_5321; + FIELD field_41247 PROCESSOR_LIST Lnet/minecraft/class_5321; + FIELD field_41248 STRUCTURE_SET Lnet/minecraft/class_5321; + FIELD field_41249 TEMPLATE_POOL Lnet/minecraft/class_5321; + FIELD field_41250 WORLD_PRESET Lnet/minecraft/class_5321; + FIELD field_41253 BIOME_SOURCE Lnet/minecraft/class_5321; + FIELD field_41257 BLOCK_STATE_PROVIDER_TYPE Lnet/minecraft/class_5321; + FIELD field_41258 CARVER Lnet/minecraft/class_5321; + FIELD field_41260 CHUNK_GENERATOR Lnet/minecraft/class_5321; + FIELD field_41264 DENSITY_FUNCTION_TYPE Lnet/minecraft/class_5321; + FIELD field_41267 FEATURE Lnet/minecraft/class_5321; + FIELD field_41268 FEATURE_SIZE_TYPE Lnet/minecraft/class_5321; + FIELD field_41271 FOLIAGE_PLACER_TYPE Lnet/minecraft/class_5321; + FIELD field_42941 DECORATED_POT_PATTERN Lnet/minecraft/class_5321; + FIELD field_43089 MULTI_NOISE_BIOME_SOURCE_PARAMETER_LIST Lnet/minecraft/class_5321; + FIELD field_44688 ITEM_GROUP Lnet/minecraft/class_5321; + METHOD method_47516 toWorldKey (Lnet/minecraft/class_5321;)Lnet/minecraft/class_5321; + ARG 0 key + METHOD method_47517 of (Ljava/lang/String;)Lnet/minecraft/class_5321; + ARG 0 id + METHOD method_47518 toDimensionKey (Lnet/minecraft/class_5321;)Lnet/minecraft/class_5321; + ARG 0 key diff --git a/mappings/net/minecraft/registry/RegistryLoader.mapping b/mappings/net/minecraft/registry/RegistryLoader.mapping new file mode 100644 index 0000000000..448ae27895 --- /dev/null +++ b/mappings/net/minecraft/registry/RegistryLoader.mapping @@ -0,0 +1,57 @@ +CLASS net/minecraft/class_7655 net/minecraft/registry/RegistryLoader + FIELD field_39968 DYNAMIC_REGISTRIES Ljava/util/List; + FIELD field_39969 DIMENSION_REGISTRIES Ljava/util/List; + FIELD field_39970 LOGGER Lorg/slf4j/Logger; + METHOD method_45119 getPath (Lnet/minecraft/class_2960;)Ljava/lang/String; + ARG 0 id + METHOD method_45120 (Lnet/minecraft/class_3300;Lnet/minecraft/class_6903$class_7863;Lcom/mojang/datafixers/util/Pair;)V + ARG 2 loader + METHOD method_45121 load (Lnet/minecraft/class_3300;Lnet/minecraft/class_5455;Ljava/util/List;)Lnet/minecraft/class_5455$class_6890; + ARG 0 resourceManager + ARG 1 baseRegistryManager + ARG 2 entries + METHOD method_45122 load (Lnet/minecraft/class_6903$class_7863;Lnet/minecraft/class_3300;Lnet/minecraft/class_5321;Lnet/minecraft/class_2385;Lcom/mojang/serialization/Decoder;Ljava/util/Map;)V + ARG 0 registryInfoGetter + ARG 1 resourceManager + ARG 2 registryRef + ARG 3 newRegistry + ARG 4 decoder + ARG 5 exceptions + METHOD method_45123 (Ljava/io/PrintWriter;Ljava/util/Map$Entry;)V + ARG 1 entry + METHOD method_45124 (Ljava/lang/String;)V + ARG 0 error + METHOD method_45125 (Ljava/util/Map$Entry;)Lnet/minecraft/class_2960; + ARG 0 entry + METHOD method_45126 writeLoadingError (Ljava/util/Map;)V + ARG 0 exceptions + METHOD method_45127 (Ljava/util/Map;Lnet/minecraft/class_7655$class_7657;)Lcom/mojang/datafixers/util/Pair; + ARG 1 entry + METHOD method_45128 (Ljava/util/Map;Lcom/mojang/datafixers/util/Pair;)V + ARG 1 loader + METHOD method_45129 (Ljava/io/PrintWriter;Ljava/util/Map$Entry;)V + ARG 1 elementEntry + METHOD method_45130 (Ljava/util/Map$Entry;)Lnet/minecraft/class_2960; + ARG 0 entry + METHOD method_46618 createInfo (Lnet/minecraft/class_2378;)Lnet/minecraft/class_6903$class_7862; + ARG 0 registry + METHOD method_46619 createInfoGetter (Lnet/minecraft/class_5455;Ljava/util/List;)Lnet/minecraft/class_6903$class_7863; + ARG 0 baseRegistryManager + ARG 1 additionalRegistries + METHOD method_46620 createInfo (Lnet/minecraft/class_2385;)Lnet/minecraft/class_6903$class_7862; + ARG 0 registry + METHOD method_46621 (Ljava/util/Map;Lcom/mojang/datafixers/util/Pair;)V + ARG 1 pair + METHOD method_46622 (Ljava/util/Map;Lnet/minecraft/class_5455$class_6892;)V + ARG 1 entry + CLASS class_7656 RegistryLoadable + METHOD load (Lnet/minecraft/class_3300;Lnet/minecraft/class_6903$class_7863;)V + ARG 1 resourceManager + ARG 2 registryInfoGetter + CLASS class_7657 Entry + METHOD method_45131 getLoader (Lcom/mojang/serialization/Lifecycle;Ljava/util/Map;)Lcom/mojang/datafixers/util/Pair; + ARG 1 lifecycle + ARG 2 exceptions + METHOD method_45132 (Lnet/minecraft/class_2385;Ljava/util/Map;Lnet/minecraft/class_3300;Lnet/minecraft/class_6903$class_7863;)V + ARG 3 resourceManager + ARG 4 registryInfoGetter diff --git a/mappings/net/minecraft/registry/RegistryOps.mapping b/mappings/net/minecraft/registry/RegistryOps.mapping new file mode 100644 index 0000000000..d658178f8d --- /dev/null +++ b/mappings/net/minecraft/registry/RegistryOps.mapping @@ -0,0 +1,44 @@ +CLASS net/minecraft/class_6903 net/minecraft/registry/RegistryOps + FIELD field_40852 registryInfoGetter Lnet/minecraft/class_6903$class_7863; + METHOD (Lcom/mojang/serialization/DynamicOps;Lnet/minecraft/class_6903$class_7863;)V + ARG 1 delegate + ARG 2 registryInfoGetter + METHOD method_40414 of (Lcom/mojang/serialization/DynamicOps;Lnet/minecraft/class_6903$class_7863;)Lnet/minecraft/class_6903; + ARG 0 delegate + ARG 1 registryInfoGetter + METHOD method_46626 (Lnet/minecraft/class_6903$class_7862;)Lcom/mojang/serialization/DataResult; + ARG 0 info + METHOD method_46627 caching (Lnet/minecraft/class_6903$class_7863;)Lnet/minecraft/class_6903$class_7863; + ARG 0 registryInfoGetter + METHOD method_46628 getOwner (Lnet/minecraft/class_5321;)Ljava/util/Optional; + ARG 1 registryRef + METHOD method_46629 (Lnet/minecraft/class_5321;Lnet/minecraft/class_6903$class_7862;)Ljava/util/Optional; + ARG 1 info + METHOD method_46630 (Lnet/minecraft/class_5321;Lnet/minecraft/class_5321;Lcom/mojang/serialization/DynamicOps;)Lcom/mojang/serialization/DataResult; + ARG 2 ops + METHOD method_46631 (Lnet/minecraft/class_5321;Lcom/mojang/serialization/DynamicOps;)Lcom/mojang/serialization/DataResult; + ARG 1 ops + METHOD method_46632 of (Lcom/mojang/serialization/DynamicOps;Lnet/minecraft/class_7225$class_7874;)Lnet/minecraft/class_6903; + ARG 0 delegate + ARG 1 wrapperLookup + METHOD method_46633 (Ljava/lang/Object;)Lnet/minecraft/class_6880$class_6883; + ARG 0 object + METHOD method_46634 getEntryLookup (Lnet/minecraft/class_5321;)Ljava/util/Optional; + ARG 1 registryRef + METHOD method_46635 (Ljava/lang/Object;)Lnet/minecraft/class_7871; + ARG 0 object + METHOD method_46636 getEntryLookupCodec (Lnet/minecraft/class_5321;)Lcom/mojang/serialization/codecs/RecordCodecBuilder; + ARG 0 registryRef + METHOD method_46637 getEntryCodec (Lnet/minecraft/class_5321;)Lcom/mojang/serialization/codecs/RecordCodecBuilder; + ARG 0 key + CLASS 1 + FIELD field_40854 registryRefToInfo Ljava/util/Map; + CLASS 2 + METHOD method_46640 (Lnet/minecraft/class_7225$class_7226;)Lnet/minecraft/class_6903$class_7862; + ARG 0 wrapper + CLASS class_7862 RegistryInfo + FIELD comp_1131 entryLookup Lnet/minecraft/class_7871; + METHOD comp_1131 entryLookup ()Lnet/minecraft/class_7871; + CLASS class_7863 RegistryInfoGetter + METHOD method_46623 getRegistryInfo (Lnet/minecraft/class_5321;)Ljava/util/Optional; + ARG 1 registryRef diff --git a/mappings/net/minecraft/registry/RegistryWrapper.mapping b/mappings/net/minecraft/registry/RegistryWrapper.mapping new file mode 100644 index 0000000000..ba5144dd58 --- /dev/null +++ b/mappings/net/minecraft/registry/RegistryWrapper.mapping @@ -0,0 +1,43 @@ +CLASS net/minecraft/class_7225 net/minecraft/registry/RegistryWrapper + COMMENT A read-only wrapper of a registry. + METHOD method_42017 streamEntries ()Ljava/util/stream/Stream; + COMMENT {@return a stream of registry keys defined in the wrapped registry} + COMMENT + COMMENT @see Registry#getKeys + METHOD method_42020 streamTags ()Ljava/util/stream/Stream; + COMMENT @see Registry#streamTags + METHOD method_46753 filter (Ljava/util/function/Predicate;)Lnet/minecraft/class_7225; + ARG 1 filter + METHOD method_46754 streamKeys ()Ljava/util/stream/Stream; + METHOD method_46755 streamTagKeys ()Ljava/util/stream/Stream; + CLASS 1 + METHOD method_46756 (Ljava/util/function/Predicate;Lnet/minecraft/class_6880$class_6883;)Z + ARG 1 entry + METHOD method_46757 (Ljava/util/function/Predicate;Lnet/minecraft/class_6880$class_6883;)Z + ARG 1 entry + CLASS class_7226 Impl + METHOD method_45919 withFeatureFilter (Lnet/minecraft/class_7699;)Lnet/minecraft/class_7225; + ARG 1 enabledFeatures + METHOD method_45920 (Lnet/minecraft/class_7699;Ljava/lang/Object;)Z + ARG 1 feature + METHOD method_46765 getRegistryKey ()Lnet/minecraft/class_5321; + METHOD method_46766 getLifecycle ()Lcom/mojang/serialization/Lifecycle; + CLASS class_7875 Delegating + METHOD method_46725 getBase ()Lnet/minecraft/class_7225$class_7226; + CLASS class_7873 Delegating + FIELD field_40933 baseWrapper Lnet/minecraft/class_7225; + METHOD (Lnet/minecraft/class_7225;)V + ARG 1 baseWrapper + CLASS class_7874 WrapperLookup + METHOD method_46758 createRegistryLookup ()Lnet/minecraft/class_7871$class_7872; + METHOD method_46759 getOptionalWrapper (Lnet/minecraft/class_5321;)Ljava/util/Optional; + ARG 1 registryRef + METHOD method_46760 (Lnet/minecraft/class_7225$class_7226;)Lnet/minecraft/class_7225$class_7226; + ARG 0 wrapper + METHOD method_46761 of (Ljava/util/stream/Stream;)Lnet/minecraft/class_7225$class_7874; + ARG 0 wrappers + METHOD method_46762 getWrapperOrThrow (Lnet/minecraft/class_5321;)Lnet/minecraft/class_7225$class_7226; + ARG 1 registryRef + CLASS 1 + METHOD method_46764 (Lnet/minecraft/class_7225$class_7226;)Lnet/minecraft/class_7871; + ARG 0 lookup diff --git a/mappings/net/minecraft/registry/SerializableRegistries.mapping b/mappings/net/minecraft/registry/SerializableRegistries.mapping new file mode 100644 index 0000000000..16b9345041 --- /dev/null +++ b/mappings/net/minecraft/registry/SerializableRegistries.mapping @@ -0,0 +1,35 @@ +CLASS net/minecraft/class_7782 net/minecraft/registry/SerializableRegistries + FIELD field_40587 CODEC Lcom/mojang/serialization/Codec; + FIELD field_40588 REGISTRIES Ljava/util/Map; + METHOD method_45948 createCodec ()Lcom/mojang/serialization/Codec; + METHOD method_45949 getNetworkCodec (Lnet/minecraft/class_5321;)Lcom/mojang/serialization/DataResult; + ARG 0 registryRef + METHOD method_45950 (Lnet/minecraft/class_5321;Lcom/mojang/serialization/Codec;)Lcom/mojang/serialization/Codec; + ARG 1 codec + METHOD method_45951 add (Lcom/google/common/collect/ImmutableMap$Builder;Lnet/minecraft/class_5321;Lcom/mojang/serialization/Codec;)V + ARG 0 builder + ARG 1 key + ARG 2 networkCodec + METHOD method_45952 createDynamicRegistryManagerCodec (Lcom/mojang/serialization/codecs/UnboundedMapCodec;)Lcom/mojang/serialization/Codec; + ARG 0 networkCodec + METHOD method_45953 streamRegistryManagerEntries (Lnet/minecraft/class_7780;)Ljava/util/stream/Stream; + ARG 0 combinedRegistries + METHOD method_45954 (Lnet/minecraft/class_2378;)Lcom/mojang/serialization/DataResult; + ARG 0 registry + METHOD method_45955 (Lnet/minecraft/class_5455$class_6892;)Lnet/minecraft/class_2378; + ARG 0 entry + METHOD method_45956 stream (Lnet/minecraft/class_5455;)Ljava/util/stream/Stream; + ARG 0 dynamicRegistryManager + METHOD method_45957 (Lnet/minecraft/class_7782$class_7783;)Lcom/mojang/serialization/Codec; + ARG 0 info + METHOD method_45959 (Lnet/minecraft/class_5321;)Lcom/mojang/serialization/DataResult; + ARG 0 registryRef + METHOD method_45960 (Lnet/minecraft/class_5455$class_6892;)Lnet/minecraft/class_5321; + ARG 0 entry + METHOD method_45961 (Lnet/minecraft/class_5455;)Ljava/util/Map; + ARG 0 registryManager + METHOD method_45963 (Lnet/minecraft/class_5455$class_6892;)Z + ARG 0 entry + METHOD method_47449 streamDynamicEntries (Lnet/minecraft/class_7780;)Ljava/util/stream/Stream; + ARG 0 combinedRegistries + CLASS class_7783 Info diff --git a/mappings/net/minecraft/registry/ServerDynamicRegistryType.mapping b/mappings/net/minecraft/registry/ServerDynamicRegistryType.mapping new file mode 100644 index 0000000000..dc72b573dd --- /dev/null +++ b/mappings/net/minecraft/registry/ServerDynamicRegistryType.mapping @@ -0,0 +1,4 @@ +CLASS net/minecraft/class_7659 net/minecraft/registry/ServerDynamicRegistryType + FIELD field_39975 VALUES Ljava/util/List; + FIELD field_39976 STATIC_REGISTRY_MANAGER Lnet/minecraft/class_5455$class_6890; + METHOD method_45139 createCombinedDynamicRegistries ()Lnet/minecraft/class_7780; diff --git a/mappings/net/minecraft/registry/SimpleDefaultedRegistry.mapping b/mappings/net/minecraft/registry/SimpleDefaultedRegistry.mapping new file mode 100644 index 0000000000..87ae346221 --- /dev/null +++ b/mappings/net/minecraft/registry/SimpleDefaultedRegistry.mapping @@ -0,0 +1,9 @@ +CLASS net/minecraft/class_2348 net/minecraft/registry/SimpleDefaultedRegistry + COMMENT An implementation of {@link Registry} with a default ID and value for unknown lookups. + FIELD field_11014 defaultId Lnet/minecraft/class_2960; + FIELD field_11015 defaultEntry Lnet/minecraft/class_6880$class_6883; + METHOD (Ljava/lang/String;Lnet/minecraft/class_5321;Lcom/mojang/serialization/Lifecycle;Z)V + ARG 1 defaultId + ARG 2 key + ARG 3 lifecycle + ARG 4 intrusive diff --git a/mappings/net/minecraft/util/registry/SimpleRegistry.mapping b/mappings/net/minecraft/registry/SimpleRegistry.mapping similarity index 64% rename from mappings/net/minecraft/util/registry/SimpleRegistry.mapping rename to mappings/net/minecraft/registry/SimpleRegistry.mapping index 1ca147bdfc..0cf447160b 100644 --- a/mappings/net/minecraft/util/registry/SimpleRegistry.mapping +++ b/mappings/net/minecraft/registry/SimpleRegistry.mapping @@ -1,4 +1,8 @@ -CLASS net/minecraft/class_2370 net/minecraft/util/registry/SimpleRegistry +CLASS net/minecraft/class_2370 net/minecraft/registry/SimpleRegistry + COMMENT An implementation of a mutable registry. All vanilla registries use this (or its + COMMENT subclass, {@link DefaultedRegistry}). + COMMENT + COMMENT @see Registry FIELD field_11107 idToEntry Ljava/util/Map; FIELD field_11109 nextId I FIELD field_25067 keyToEntry Ljava/util/Map; @@ -9,19 +13,20 @@ CLASS net/minecraft/class_2370 net/minecraft/util/registry/SimpleRegistry FIELD field_36461 valueToEntry Ljava/util/Map; FIELD field_36462 tagToEntryList Ljava/util/Map; FIELD field_36463 frozen Z - FIELD field_36464 valueToEntryFunction Ljava/util/function/Function; - FIELD field_36465 unfrozenValueToEntry Ljava/util/Map; FIELD field_36634 cachedEntries Ljava/util/List; - METHOD (Lnet/minecraft/class_5321;Lcom/mojang/serialization/Lifecycle;Ljava/util/function/Function;)V + FIELD field_36635 LOGGER Lorg/slf4j/Logger; + FIELD field_40584 intrusiveValueToEntry Ljava/util/Map; + FIELD field_41126 key Lnet/minecraft/class_5321; + FIELD field_41127 wrapper Lnet/minecraft/class_7225$class_7226; + METHOD (Lnet/minecraft/class_5321;Lcom/mojang/serialization/Lifecycle;)V ARG 1 key ARG 2 lifecycle - ARG 3 valueToEntryFunction - METHOD method_31051 set (ILnet/minecraft/class_5321;Ljava/lang/Object;Lcom/mojang/serialization/Lifecycle;Z)Lnet/minecraft/class_6880; - ARG 1 rawId - ARG 2 key - ARG 3 value - ARG 4 lifecycle - ARG 5 checkDuplicateKeys + METHOD (Lnet/minecraft/class_5321;Lcom/mojang/serialization/Lifecycle;Z)V + ARG 1 key + ARG 2 lifecycle + ARG 3 intrusive + METHOD method_39665 (Lit/unimi/dsi/fastutil/objects/Object2IntOpenCustomHashMap;)V + ARG 0 map METHOD method_40253 getValue (Lnet/minecraft/class_6880$class_6883;)Ljava/lang/Object; ARG 0 entry METHOD method_40255 (Lnet/minecraft/class_6885$class_6888;)V @@ -40,8 +45,6 @@ CLASS net/minecraft/class_2370 net/minecraft/util/registry/SimpleRegistry METHOD method_40263 (Ljava/util/Map;Lnet/minecraft/class_6862;Ljava/util/List;)V ARG 2 tag ARG 3 entries - METHOD method_40267 (Lnet/minecraft/class_6880$class_6883;)Z - ARG 0 entry METHOD method_40271 (Ljava/lang/Object;)Lnet/minecraft/class_6880$class_6883; ARG 1 valuex METHOD method_40274 assertNotFrozen (Lnet/minecraft/class_5321;)V @@ -53,5 +56,17 @@ CLASS net/minecraft/class_2370 net/minecraft/util/registry/SimpleRegistry ARG 1 tag METHOD method_40563 (Lnet/minecraft/class_6862;)Ljava/lang/String; ARG 0 tag + METHOD method_44298 getOrCreateEntry (Lnet/minecraft/class_5321;)Lnet/minecraft/class_6880$class_6883; + ARG 1 key METHOD method_44299 (Lnet/minecraft/class_5321;)Lnet/minecraft/class_6880$class_6883; + ARG 1 key2 + METHOD method_45938 (Ljava/lang/Object;Lnet/minecraft/class_6880$class_6883;)V + ARG 0 value ARG 1 entry + METHOD method_45939 assertNotFrozen ()V + METHOD method_46744 set (ILnet/minecraft/class_5321;Ljava/lang/Object;Lcom/mojang/serialization/Lifecycle;)Lnet/minecraft/class_6880$class_6883; + ARG 1 rawId + ARG 2 key + ARG 3 value + ARG 4 lifecycle + CLASS 1 diff --git a/mappings/net/minecraft/util/dynamic/RegistryElementCodec.mapping b/mappings/net/minecraft/registry/entry/RegistryElementCodec.mapping similarity index 83% rename from mappings/net/minecraft/util/dynamic/RegistryElementCodec.mapping rename to mappings/net/minecraft/registry/entry/RegistryElementCodec.mapping index b19d93b0d0..abe7742d88 100644 --- a/mappings/net/minecraft/util/dynamic/RegistryElementCodec.mapping +++ b/mappings/net/minecraft/registry/entry/RegistryElementCodec.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_5381 net/minecraft/util/dynamic/RegistryElementCodec +CLASS net/minecraft/class_5381 net/minecraft/registry/entry/RegistryElementCodec COMMENT A codec for registry elements. Will prefer to encode/decode objects as COMMENT identifiers if they exist in a registry and falls back to full encoding/ COMMENT decoding behavior if it cannot do so. @@ -7,7 +7,7 @@ CLASS net/minecraft/class_5381 net/minecraft/util/dynamic/RegistryElementCodec COMMENT loading from registry before a registry is fully loaded from a codec. COMMENT COMMENT @param the element type - COMMENT @see RegistryOps + COMMENT @see net.minecraft.registry.RegistryOps FIELD field_25507 registryRef Lnet/minecraft/class_5321; FIELD field_25508 elementCodec Lcom/mojang/serialization/Codec; FIELD field_26758 allowInlineDefinitions Z @@ -31,13 +31,9 @@ CLASS net/minecraft/class_5381 net/minecraft/util/dynamic/RegistryElementCodec ARG 0 registryRef ARG 1 elementCodec ARG 2 allowInlineDefinitions - METHOD method_40391 (Lcom/mojang/datafixers/util/Pair;Lnet/minecraft/class_6880;)Lcom/mojang/datafixers/util/Pair; - ARG 1 entry METHOD method_40392 (Lcom/mojang/serialization/DynamicOps;Ljava/lang/Object;Ljava/lang/Object;)Lcom/mojang/serialization/DataResult; ARG 3 value METHOD method_40393 (Lcom/mojang/serialization/DynamicOps;Ljava/lang/Object;Lnet/minecraft/class_5321;)Lcom/mojang/serialization/DataResult; ARG 2 key METHOD method_40394 (Lcom/mojang/datafixers/util/Pair;)Lcom/mojang/datafixers/util/Pair; ARG 0 pair - METHOD method_44140 (Lcom/mojang/datafixers/util/Pair;Lnet/minecraft/class_6880;)Lcom/mojang/datafixers/util/Pair; - ARG 1 entry diff --git a/mappings/net/minecraft/registry/entry/RegistryEntry.mapping b/mappings/net/minecraft/registry/entry/RegistryEntry.mapping new file mode 100644 index 0000000000..4ed407dc7f --- /dev/null +++ b/mappings/net/minecraft/registry/entry/RegistryEntry.mapping @@ -0,0 +1,150 @@ +CLASS net/minecraft/class_6880 net/minecraft/registry/entry/RegistryEntry + COMMENT An object holding a value that can be registered in a registry. In most cases, the + COMMENT value is already registered in a registry ("reference entry"), hence the name; + COMMENT however, it is possible to create a registry entry by direct reference + COMMENT ("direct entry"). This is useful for data packs, as they can define + COMMENT one-time use values directly without having to register them every time. + COMMENT + COMMENT

    Registry entries do not define {@code equals} method. Instead, compare the result + COMMENT of {@link #getKeyOrValue}. + COMMENT + COMMENT

    Reference registry entries also hold their {@linkplain TagKey tags}. For more + COMMENT information on type-specific behaviors, including "intrusive" and "stand-alone" + COMMENT reference registry entries, see the respective class documentations. + COMMENT + COMMENT

    A registry entry is sometimes referred to as a "holder" in error messages. + COMMENT + COMMENT @see RegistryEntry.Direct + COMMENT @see RegistryEntry.Reference + COMMENT @see net.minecraft.registry.Registry#entryOf + COMMENT @see net.minecraft.registry.Registry#getEntry + METHOD method_40220 isIn (Lnet/minecraft/class_6862;)Z + COMMENT {@return whether this entry is in {@code tag}} + COMMENT + COMMENT

    This always returns {@code false} for direct entries, since tags are managed by + COMMENT a registry. + ARG 1 tag + METHOD method_40223 of (Ljava/lang/Object;)Lnet/minecraft/class_6880; + COMMENT {@return a new direct registry entry of {@code value}} + ARG 0 value + METHOD method_40224 matches (Ljava/util/function/Predicate;)Z + COMMENT {@return whether this entry's key matches {@code predicate}} + COMMENT + COMMENT

    This always returns {@code false} for direct entries. + ARG 1 predicate + METHOD method_40225 matchesKey (Lnet/minecraft/class_5321;)Z + COMMENT {@return whether the registry key of this entry is {@code key}} + COMMENT + COMMENT

    This always returns {@code false} for direct entries. + ARG 1 key + METHOD method_40226 matchesId (Lnet/minecraft/class_2960;)Z + COMMENT {@return whether the ID of this entry is {@code id}} + COMMENT + COMMENT

    This always returns {@code false} for direct entries. + ARG 1 id + METHOD method_40227 hasKeyAndValue ()Z + METHOD method_40228 streamTags ()Ljava/util/stream/Stream; + COMMENT {@return a stream of the tags of this entry, or an empty stream if this is a direct entry} + METHOD method_40229 getKeyOrValue ()Lcom/mojang/datafixers/util/Either; + COMMENT {@return the object that identifies this registry key} + COMMENT + COMMENT

    For direct entries, this is the held value, and for reference entries, this is the + COMMENT key of the entry. + METHOD method_40230 getKey ()Ljava/util/Optional; + COMMENT {@return the registry key of this entry, or an empty optional if this is a direct entry} + METHOD method_40231 getType ()Lnet/minecraft/class_6880$class_6882; + COMMENT {@return the type (direct or reference) of this registry entry} + COMMENT + COMMENT

    This is different from the types of reference registry entries, i.e. + COMMENT stand-alone or intrusive. + METHOD method_46745 ownerEquals (Lnet/minecraft/class_7876;)Z + ARG 1 owner + CLASS class_6881 Direct + COMMENT A direct registry entry holds the value directly. The value does not have to be + COMMENT registered in a registry. Therefore, they receive no ID or registry key, and they + COMMENT cannot be tagged. + COMMENT + COMMENT

    This is most often used in data packs to inline one-time use values directly. + CLASS class_6882 Type + COMMENT The types of registry entries. + COMMENT + COMMENT @see RegistryEntry + CLASS class_6883 Reference + COMMENT A reference registry entry holds the value by reference. The value is previously + COMMENT registered in a registry, so they can be referred to by their registry keys. + COMMENT This object also holds the entry's tags. + COMMENT + COMMENT

    There are two types of reference registry entries. + COMMENT + COMMENT

      + COMMENT
    • Stand-alone registry entries are first instantiated by its key, + COMMENT and the value is set when registering the value. This is used by most of the registries.
      • + COMMENT
    • Intrusive registry entries are registry entries tied to a specific + COMMENT registerable object at instantiation time. When instantiating those, it promises + COMMENT that the object is later registered - which, if broken, will result in a crash. + COMMENT This is used for {@link net.minecraft.registry.Registries#BLOCK}, {@link + COMMENT net.minecraft.registry.Registries#ITEM}, {@link net.minecraft.registry.Registries#FLUID}, + COMMENT {@link net.minecraft.registry.Registries#ENTITY_TYPE}, and {@link + COMMENT net.minecraft.registry.Registries#GAME_EVENT} registries. This type + COMMENT exists for historical reasons and is deprecated.
      • + COMMENT
    + COMMENT + COMMENT

    Therefore, it is very important to construct any intrusive-entry type object + COMMENT and register at the same time. For example, a mod that conditionally registers an + COMMENT {@link net.minecraft.item.Item} has to create an instance only if the condition is met. + COMMENT (See {@link net.minecraft.registry.Registry} for a code example.) + COMMENT + COMMENT

    When a reference registry entry is first instantiated, it only has either the key + COMMENT or the value (depending on the type). They are later filled when registering the + COMMENT entry. Attempting to call methods before those fields are filled + COMMENT can cause a crash. Note that if you are just getting the entry from a registry, this + COMMENT should not be a problem. + COMMENT + COMMENT @see net.minecraft.registry.Registry#entryOf + COMMENT @see net.minecraft.registry.Registry#getEntry + FIELD field_36450 tags Ljava/util/Set; + FIELD field_36451 referenceType Lnet/minecraft/class_6880$class_6883$class_6884; + FIELD field_36452 registryKey Lnet/minecraft/class_5321; + FIELD field_36453 value Ljava/lang/Object; + FIELD field_40930 owner Lnet/minecraft/class_7876; + METHOD (Lnet/minecraft/class_6880$class_6883$class_6884;Lnet/minecraft/class_7876;Lnet/minecraft/class_5321;Ljava/lang/Object;)V + ARG 1 referenceType + ARG 2 owner + ARG 3 registryKey + ARG 4 value + METHOD method_40233 intrusive (Lnet/minecraft/class_7876;Ljava/lang/Object;)Lnet/minecraft/class_6880$class_6883; + COMMENT {@return a new intrusive registry entry} + COMMENT + COMMENT

    This should not be called manually. Call {@link net.minecraft.registry.Registry#entryOf} or + COMMENT {@link net.minecraft.registry.Registry#getEntry} instead. + COMMENT + COMMENT

    Callers are responsible for filling the key later by calling {@link + COMMENT #setRegistryKey}. + COMMENT + COMMENT @deprecated Intrusive holders exist for legacy reasons only. + ARG 0 owner + ARG 1 value + METHOD method_40234 standAlone (Lnet/minecraft/class_7876;Lnet/minecraft/class_5321;)Lnet/minecraft/class_6880$class_6883; + COMMENT {@return a new stand-alone registry entry} + COMMENT + COMMENT

    This should not be called manually. Call {@link net.minecraft.registry.Registry#entryOf} or + COMMENT {@link net.minecraft.registry.Registry#getEntry} instead. + COMMENT + COMMENT

    Callers are responsible for filling the value later by calling {@link + COMMENT #setValue}. + ARG 0 owner + ARG 1 registryKey + METHOD method_40235 setTags (Ljava/util/Collection;)V + ARG 1 tags + METHOD method_40237 registryKey ()Lnet/minecraft/class_5321; + COMMENT {@return the registry key of this entry} + COMMENT + COMMENT @throws IllegalStateException if this is an intrusive entry and it is not initialized yet + METHOD method_45917 setRegistryKey (Lnet/minecraft/class_5321;)V + ARG 1 registryKey + METHOD method_45918 setValue (Ljava/lang/Object;)V + ARG 1 value + CLASS class_6884 Type + COMMENT The types of reference registry entries. + COMMENT + COMMENT @see RegistryEntry.Reference diff --git a/mappings/net/minecraft/registry/entry/RegistryEntryList.mapping b/mappings/net/minecraft/registry/entry/RegistryEntryList.mapping new file mode 100644 index 0000000000..efd83152eb --- /dev/null +++ b/mappings/net/minecraft/registry/entry/RegistryEntryList.mapping @@ -0,0 +1,71 @@ +CLASS net/minecraft/class_6885 net/minecraft/registry/entry/RegistryEntryList + COMMENT A registry entry list is an immutable list of registry entries. This, is either a direct + COMMENT reference to each item, or a reference to a tag. A tag is a way + COMMENT to dynamically define a list of registered values. Anything registered in a registry + COMMENT can be tagged, and each registry holds a list of tags it recognizes. + COMMENT + COMMENT

    This can be iterated directly (i.e. {@code for (RegistryEntry entry : entries)}. + COMMENT Note that this does not implement {@link java.util.Collection}. + COMMENT + COMMENT @see net.minecraft.registry.Registry + COMMENT @see RegistryEntry + METHOD method_40239 stream ()Ljava/util/stream/Stream; + COMMENT {@return a stream of registry entries in this list} + METHOD method_40240 get (I)Lnet/minecraft/class_6880; + COMMENT {@return the registry entry at {@code index}} + COMMENT + COMMENT @throws IndexOutOfBoundsException if the index is out of bounds + ARG 1 index + METHOD method_40241 contains (Lnet/minecraft/class_6880;)Z + COMMENT {@return whether {@code entry} is in this list} + ARG 1 entry + METHOD method_40242 of (Ljava/util/List;)Lnet/minecraft/class_6885$class_6886; + COMMENT {@return a new direct list of {@code entries}} + ARG 0 entries + METHOD method_40243 getRandom (Lnet/minecraft/class_5819;)Ljava/util/Optional; + COMMENT {@return a random entry of the list, or an empty optional if this list is empty} + ARG 1 random + METHOD method_40244 of (Ljava/util/function/Function;Ljava/util/Collection;)Lnet/minecraft/class_6885$class_6886; + COMMENT {@return a new direct list of {@code values} converted to a registry entry with {@code mapper}} + ARG 0 mapper + ARG 1 values + METHOD method_40245 of (Ljava/util/function/Function;[Ljava/lang/Object;)Lnet/minecraft/class_6885$class_6886; + COMMENT {@return a new direct list of {@code values} converted to a registry entry with {@code mapper}} + ARG 0 mapper + ARG 1 values + METHOD method_40246 of ([Lnet/minecraft/class_6880;)Lnet/minecraft/class_6885$class_6886; + COMMENT {@return a new direct list of {@code entries}} + ARG 0 entries + METHOD method_40247 size ()I + COMMENT {@return the number of entries in this list} + METHOD method_40248 getStorage ()Lcom/mojang/datafixers/util/Either; + COMMENT {@return the object that identifies this registry entry list} + COMMENT + COMMENT

    This is the tag key for a reference list, and the backing list for a direct list. + METHOD method_45924 of (Lnet/minecraft/class_7876;Lnet/minecraft/class_6862;)Lnet/minecraft/class_6885$class_6888; + ARG 0 owner + ARG 1 tagKey + METHOD method_45925 getTagKey ()Ljava/util/Optional; + METHOD method_46768 ownerEquals (Lnet/minecraft/class_7876;)Z + ARG 1 owner + CLASS class_6886 Direct + COMMENT A direct registry entry list that holds the values directly, instead of using tags. + FIELD field_36457 entries Ljava/util/List; + FIELD field_36458 entrySet Ljava/util/Set; + METHOD (Ljava/util/List;)V + ARG 1 entries + CLASS class_6887 ListBacked + COMMENT An internal implementation of {@link RegistryEntryList}. + METHOD method_40249 getEntries ()Ljava/util/List; + CLASS class_6888 Named + COMMENT A registry entry list that references a tag from the registry. + FIELD field_36459 tag Lnet/minecraft/class_6862; + FIELD field_36460 entries Ljava/util/List; + FIELD field_40936 owner Lnet/minecraft/class_7876; + METHOD (Lnet/minecraft/class_7876;Lnet/minecraft/class_6862;)V + ARG 1 owner + ARG 2 tag + METHOD method_40250 copyOf (Ljava/util/List;)V + ARG 1 entries + METHOD method_40251 getTag ()Lnet/minecraft/class_6862; + COMMENT {@return the tag key that this list references} diff --git a/mappings/net/minecraft/util/registry/RegistryEntryListCodec.mapping b/mappings/net/minecraft/registry/entry/RegistryEntryListCodec.mapping similarity index 91% rename from mappings/net/minecraft/util/registry/RegistryEntryListCodec.mapping rename to mappings/net/minecraft/registry/entry/RegistryEntryListCodec.mapping index 84a441d1e7..34db86afab 100644 --- a/mappings/net/minecraft/util/registry/RegistryEntryListCodec.mapping +++ b/mappings/net/minecraft/registry/entry/RegistryEntryListCodec.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_6898 net/minecraft/util/registry/RegistryEntryListCodec +CLASS net/minecraft/class_6898 net/minecraft/registry/entry/RegistryEntryListCodec FIELD field_36480 registry Lnet/minecraft/class_5321; FIELD field_36481 entryCodec Lcom/mojang/serialization/Codec; FIELD field_36482 directEntryListCodec Lcom/mojang/serialization/Codec; @@ -28,9 +28,9 @@ CLASS net/minecraft/class_6898 net/minecraft/util/registry/RegistryEntryListCode METHOD method_40383 decodeDirect (Lcom/mojang/serialization/DynamicOps;Ljava/lang/Object;)Lcom/mojang/serialization/DataResult; ARG 1 ops ARG 2 input - METHOD method_40385 (Lnet/minecraft/class_2378;Lcom/mojang/datafixers/util/Either;)Lnet/minecraft/class_6885; + METHOD method_40385 (Lnet/minecraft/class_7871;Lcom/mojang/datafixers/util/Either;)Lnet/minecraft/class_6885; ARG 1 either - METHOD method_40386 (Lnet/minecraft/class_2378;Lcom/mojang/datafixers/util/Pair;)Lcom/mojang/datafixers/util/Pair; + METHOD method_40386 (Lnet/minecraft/class_7871;Lcom/mojang/datafixers/util/Pair;)Lcom/mojang/datafixers/util/Pair; ARG 1 pair METHOD method_40387 (Ljava/util/List;)Lcom/mojang/datafixers/util/Either; ARG 0 entries diff --git a/mappings/net/minecraft/registry/entry/RegistryEntryOwner.mapping b/mappings/net/minecraft/registry/entry/RegistryEntryOwner.mapping new file mode 100644 index 0000000000..31838f3529 --- /dev/null +++ b/mappings/net/minecraft/registry/entry/RegistryEntryOwner.mapping @@ -0,0 +1,6 @@ +CLASS net/minecraft/class_7876 net/minecraft/registry/entry/RegistryEntryOwner + COMMENT An owner of a {@link RegistryEntry} or {@link RegistryEntryList}. This is usually + COMMENT a registry, but it is possible that an object owns multiple entries from + COMMENT different registries. + METHOD method_46767 ownerEquals (Lnet/minecraft/class_7876;)Z + ARG 1 other diff --git a/mappings/net/minecraft/util/registry/RegistryFixedCodec.mapping b/mappings/net/minecraft/registry/entry/RegistryFixedCodec.mapping similarity index 81% rename from mappings/net/minecraft/util/registry/RegistryFixedCodec.mapping rename to mappings/net/minecraft/registry/entry/RegistryFixedCodec.mapping index 446293665c..f367b613a1 100644 --- a/mappings/net/minecraft/util/registry/RegistryFixedCodec.mapping +++ b/mappings/net/minecraft/registry/entry/RegistryFixedCodec.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_6899 net/minecraft/util/registry/RegistryFixedCodec +CLASS net/minecraft/class_6899 net/minecraft/registry/entry/RegistryFixedCodec FIELD field_36484 registry Lnet/minecraft/class_5321; METHOD (Lnet/minecraft/class_5321;)V ARG 1 registry @@ -15,7 +15,5 @@ CLASS net/minecraft/class_6899 net/minecraft/util/registry/RegistryFixedCodec ARG 1 value METHOD method_40400 of (Lnet/minecraft/class_5321;)Lnet/minecraft/class_6899; ARG 0 registry - METHOD method_44141 (Lcom/mojang/datafixers/util/Pair;Lnet/minecraft/class_6880;)Lcom/mojang/datafixers/util/Pair; - ARG 1 entry METHOD method_44142 (Ljava/util/Optional;Lcom/mojang/datafixers/util/Pair;)Lcom/mojang/serialization/DataResult; ARG 2 pair diff --git a/mappings/net/minecraft/tag/BannerPatternTags.mapping b/mappings/net/minecraft/registry/tag/BannerPatternTags.mapping similarity index 51% rename from mappings/net/minecraft/tag/BannerPatternTags.mapping rename to mappings/net/minecraft/registry/tag/BannerPatternTags.mapping index c7111f0da6..885ae7969c 100644 --- a/mappings/net/minecraft/tag/BannerPatternTags.mapping +++ b/mappings/net/minecraft/registry/tag/BannerPatternTags.mapping @@ -1,3 +1,3 @@ -CLASS net/minecraft/class_7440 net/minecraft/tag/BannerPatternTags +CLASS net/minecraft/class_7440 net/minecraft/registry/tag/BannerPatternTags METHOD method_43675 of (Ljava/lang/String;)Lnet/minecraft/class_6862; ARG 0 id diff --git a/mappings/net/minecraft/tag/BiomeTags.mapping b/mappings/net/minecraft/registry/tag/BiomeTags.mapping similarity index 54% rename from mappings/net/minecraft/tag/BiomeTags.mapping rename to mappings/net/minecraft/registry/tag/BiomeTags.mapping index bca4b5bbac..595cfbf779 100644 --- a/mappings/net/minecraft/tag/BiomeTags.mapping +++ b/mappings/net/minecraft/registry/tag/BiomeTags.mapping @@ -1,3 +1,3 @@ -CLASS net/minecraft/class_6908 net/minecraft/tag/BiomeTags +CLASS net/minecraft/class_6908 net/minecraft/registry/tag/BiomeTags METHOD method_40434 of (Ljava/lang/String;)Lnet/minecraft/class_6862; ARG 0 id diff --git a/mappings/net/minecraft/tag/BlockTags.mapping b/mappings/net/minecraft/registry/tag/BlockTags.mapping similarity index 54% rename from mappings/net/minecraft/tag/BlockTags.mapping rename to mappings/net/minecraft/registry/tag/BlockTags.mapping index 9d5c4d0ee8..c687727fe3 100644 --- a/mappings/net/minecraft/tag/BlockTags.mapping +++ b/mappings/net/minecraft/registry/tag/BlockTags.mapping @@ -1,3 +1,3 @@ -CLASS net/minecraft/class_3481 net/minecraft/tag/BlockTags +CLASS net/minecraft/class_3481 net/minecraft/registry/tag/BlockTags METHOD method_15069 of (Ljava/lang/String;)Lnet/minecraft/class_6862; ARG 0 id diff --git a/mappings/net/minecraft/tag/CatVariantTags.mapping b/mappings/net/minecraft/registry/tag/CatVariantTags.mapping similarity index 52% rename from mappings/net/minecraft/tag/CatVariantTags.mapping rename to mappings/net/minecraft/registry/tag/CatVariantTags.mapping index c6ed3a5d38..f8aa790bd7 100644 --- a/mappings/net/minecraft/tag/CatVariantTags.mapping +++ b/mappings/net/minecraft/registry/tag/CatVariantTags.mapping @@ -1,3 +1,3 @@ -CLASS net/minecraft/class_7369 net/minecraft/tag/CatVariantTags +CLASS net/minecraft/class_7369 net/minecraft/registry/tag/CatVariantTags METHOD method_43046 of (Ljava/lang/String;)Lnet/minecraft/class_6862; ARG 0 id diff --git a/mappings/net/minecraft/registry/tag/DamageTypeTags.mapping b/mappings/net/minecraft/registry/tag/DamageTypeTags.mapping new file mode 100644 index 0000000000..cd03e43e02 --- /dev/null +++ b/mappings/net/minecraft/registry/tag/DamageTypeTags.mapping @@ -0,0 +1,3 @@ +CLASS net/minecraft/class_8103 net/minecraft/registry/tag/DamageTypeTags + METHOD method_48762 of (Ljava/lang/String;)Lnet/minecraft/class_6862; + ARG 0 id diff --git a/mappings/net/minecraft/tag/EntityTypeTags.mapping b/mappings/net/minecraft/registry/tag/EntityTypeTags.mapping similarity index 52% rename from mappings/net/minecraft/tag/EntityTypeTags.mapping rename to mappings/net/minecraft/registry/tag/EntityTypeTags.mapping index 5207594609..c30ff0553b 100644 --- a/mappings/net/minecraft/tag/EntityTypeTags.mapping +++ b/mappings/net/minecraft/registry/tag/EntityTypeTags.mapping @@ -1,3 +1,3 @@ -CLASS net/minecraft/class_3483 net/minecraft/tag/EntityTypeTags +CLASS net/minecraft/class_3483 net/minecraft/registry/tag/EntityTypeTags METHOD method_15077 of (Ljava/lang/String;)Lnet/minecraft/class_6862; ARG 0 id diff --git a/mappings/net/minecraft/registry/tag/FlatLevelGeneratorPresetTags.mapping b/mappings/net/minecraft/registry/tag/FlatLevelGeneratorPresetTags.mapping new file mode 100644 index 0000000000..627cbf259e --- /dev/null +++ b/mappings/net/minecraft/registry/tag/FlatLevelGeneratorPresetTags.mapping @@ -0,0 +1,3 @@ +CLASS net/minecraft/class_7088 net/minecraft/registry/tag/FlatLevelGeneratorPresetTags + METHOD method_41292 of (Ljava/lang/String;)Lnet/minecraft/class_6862; + ARG 0 id diff --git a/mappings/net/minecraft/tag/FluidTags.mapping b/mappings/net/minecraft/registry/tag/FluidTags.mapping similarity index 54% rename from mappings/net/minecraft/tag/FluidTags.mapping rename to mappings/net/minecraft/registry/tag/FluidTags.mapping index aada6a5eb6..4720981ee7 100644 --- a/mappings/net/minecraft/tag/FluidTags.mapping +++ b/mappings/net/minecraft/registry/tag/FluidTags.mapping @@ -1,3 +1,3 @@ -CLASS net/minecraft/class_3486 net/minecraft/tag/FluidTags +CLASS net/minecraft/class_3486 net/minecraft/registry/tag/FluidTags METHOD method_15095 of (Ljava/lang/String;)Lnet/minecraft/class_6862; ARG 0 id diff --git a/mappings/net/minecraft/tag/GameEventTags.mapping b/mappings/net/minecraft/registry/tag/GameEventTags.mapping similarity index 53% rename from mappings/net/minecraft/tag/GameEventTags.mapping rename to mappings/net/minecraft/registry/tag/GameEventTags.mapping index 1219a7ce64..cede6a720e 100644 --- a/mappings/net/minecraft/tag/GameEventTags.mapping +++ b/mappings/net/minecraft/registry/tag/GameEventTags.mapping @@ -1,3 +1,3 @@ -CLASS net/minecraft/class_5698 net/minecraft/tag/GameEventTags +CLASS net/minecraft/class_5698 net/minecraft/registry/tag/GameEventTags METHOD method_32823 of (Ljava/lang/String;)Lnet/minecraft/class_6862; ARG 0 id diff --git a/mappings/net/minecraft/tag/InstrumentTags.mapping b/mappings/net/minecraft/registry/tag/InstrumentTags.mapping similarity index 52% rename from mappings/net/minecraft/tag/InstrumentTags.mapping rename to mappings/net/minecraft/registry/tag/InstrumentTags.mapping index da8d571c64..4b0615abf4 100644 --- a/mappings/net/minecraft/tag/InstrumentTags.mapping +++ b/mappings/net/minecraft/registry/tag/InstrumentTags.mapping @@ -1,3 +1,3 @@ -CLASS net/minecraft/class_7441 net/minecraft/tag/InstrumentTags +CLASS net/minecraft/class_7441 net/minecraft/registry/tag/InstrumentTags METHOD method_43676 of (Ljava/lang/String;)Lnet/minecraft/class_6862; ARG 0 id diff --git a/mappings/net/minecraft/tag/ItemTags.mapping b/mappings/net/minecraft/registry/tag/ItemTags.mapping similarity index 55% rename from mappings/net/minecraft/tag/ItemTags.mapping rename to mappings/net/minecraft/registry/tag/ItemTags.mapping index 82bfcfe87b..d42165973b 100644 --- a/mappings/net/minecraft/tag/ItemTags.mapping +++ b/mappings/net/minecraft/registry/tag/ItemTags.mapping @@ -1,3 +1,3 @@ -CLASS net/minecraft/class_3489 net/minecraft/tag/ItemTags +CLASS net/minecraft/class_3489 net/minecraft/registry/tag/ItemTags METHOD method_15102 of (Ljava/lang/String;)Lnet/minecraft/class_6862; ARG 0 id diff --git a/mappings/net/minecraft/tag/PaintingVariantTags.mapping b/mappings/net/minecraft/registry/tag/PaintingVariantTags.mapping similarity index 51% rename from mappings/net/minecraft/tag/PaintingVariantTags.mapping rename to mappings/net/minecraft/registry/tag/PaintingVariantTags.mapping index 3a5550956e..2b91047a20 100644 --- a/mappings/net/minecraft/tag/PaintingVariantTags.mapping +++ b/mappings/net/minecraft/registry/tag/PaintingVariantTags.mapping @@ -1,3 +1,3 @@ -CLASS net/minecraft/class_7406 net/minecraft/tag/PaintingVariantTags +CLASS net/minecraft/class_7406 net/minecraft/registry/tag/PaintingVariantTags METHOD method_43384 of (Ljava/lang/String;)Lnet/minecraft/class_6862; ARG 0 id diff --git a/mappings/net/minecraft/tag/PointOfInterestTypeTags.mapping b/mappings/net/minecraft/registry/tag/PointOfInterestTypeTags.mapping similarity index 50% rename from mappings/net/minecraft/tag/PointOfInterestTypeTags.mapping rename to mappings/net/minecraft/registry/tag/PointOfInterestTypeTags.mapping index 1b82edbc75..54f10aedd4 100644 --- a/mappings/net/minecraft/tag/PointOfInterestTypeTags.mapping +++ b/mappings/net/minecraft/registry/tag/PointOfInterestTypeTags.mapping @@ -1,3 +1,3 @@ -CLASS net/minecraft/class_7473 net/minecraft/tag/PointOfInterestTypeTags +CLASS net/minecraft/class_7473 net/minecraft/registry/tag/PointOfInterestTypeTags METHOD method_43935 of (Ljava/lang/String;)Lnet/minecraft/class_6862; ARG 0 id diff --git a/mappings/net/minecraft/tag/StructureTags.mapping b/mappings/net/minecraft/registry/tag/StructureTags.mapping similarity index 53% rename from mappings/net/minecraft/tag/StructureTags.mapping rename to mappings/net/minecraft/registry/tag/StructureTags.mapping index 5ef2206853..b4b5e192ef 100644 --- a/mappings/net/minecraft/tag/StructureTags.mapping +++ b/mappings/net/minecraft/registry/tag/StructureTags.mapping @@ -1,3 +1,3 @@ -CLASS net/minecraft/class_7045 net/minecraft/tag/StructureTags +CLASS net/minecraft/class_7045 net/minecraft/registry/tag/StructureTags METHOD method_41006 of (Ljava/lang/String;)Lnet/minecraft/class_6862; ARG 0 id diff --git a/mappings/net/minecraft/tag/TagBuilder.mapping b/mappings/net/minecraft/registry/tag/TagBuilder.mapping similarity index 91% rename from mappings/net/minecraft/tag/TagBuilder.mapping rename to mappings/net/minecraft/registry/tag/TagBuilder.mapping index b91011d63c..3a45078f3d 100644 --- a/mappings/net/minecraft/tag/TagBuilder.mapping +++ b/mappings/net/minecraft/registry/tag/TagBuilder.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_3495 net/minecraft/tag/TagBuilder +CLASS net/minecraft/class_3495 net/minecraft/registry/tag/TagBuilder COMMENT A builder class to ease the creation of tags. It can also be used as a COMMENT mutable form of a tag. FIELD field_23688 entries Ljava/util/List; diff --git a/mappings/net/minecraft/tag/TagEntry.mapping b/mappings/net/minecraft/registry/tag/TagEntry.mapping similarity index 96% rename from mappings/net/minecraft/tag/TagEntry.mapping rename to mappings/net/minecraft/registry/tag/TagEntry.mapping index 8376b13e6d..d47223630b 100644 --- a/mappings/net/minecraft/tag/TagEntry.mapping +++ b/mappings/net/minecraft/registry/tag/TagEntry.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_3497 net/minecraft/tag/TagEntry +CLASS net/minecraft/class_3497 net/minecraft/registry/tag/TagEntry FIELD field_15584 id Lnet/minecraft/class_2960; FIELD field_39265 CODEC Lcom/mojang/serialization/Codec; FIELD field_39266 ENTRY_CODEC Lcom/mojang/serialization/Codec; diff --git a/mappings/net/minecraft/tag/TagFile.mapping b/mappings/net/minecraft/registry/tag/TagFile.mapping similarity index 74% rename from mappings/net/minecraft/tag/TagFile.mapping rename to mappings/net/minecraft/registry/tag/TagFile.mapping index a389fb3ba4..3398acafca 100644 --- a/mappings/net/minecraft/tag/TagFile.mapping +++ b/mappings/net/minecraft/registry/tag/TagFile.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_7475 net/minecraft/tag/TagFile +CLASS net/minecraft/class_7475 net/minecraft/registry/tag/TagFile FIELD field_39269 CODEC Lcom/mojang/serialization/Codec; METHOD method_43950 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; ARG 0 instance diff --git a/mappings/net/minecraft/registry/tag/TagGroupLoader.mapping b/mappings/net/minecraft/registry/tag/TagGroupLoader.mapping new file mode 100644 index 0000000000..e5e013f141 --- /dev/null +++ b/mappings/net/minecraft/registry/tag/TagGroupLoader.mapping @@ -0,0 +1,42 @@ +CLASS net/minecraft/class_3503 net/minecraft/registry/tag/TagGroupLoader + FIELD field_15605 dataType Ljava/lang/String; + FIELD field_15607 LOGGER Lorg/slf4j/Logger; + FIELD field_15609 registryGetter Ljava/util/function/Function; + METHOD (Ljava/util/function/Function;Ljava/lang/String;)V + ARG 1 registryGetter + ARG 2 dataType + METHOD method_18242 buildGroup (Ljava/util/Map;)Ljava/util/Map; + ARG 1 tags + METHOD method_32840 (Ljava/util/Map;Lnet/minecraft/class_2960;Ljava/util/Collection;)V + ARG 2 resolvedEntries + METHOD method_33174 loadTags (Lnet/minecraft/class_3300;)Ljava/util/Map; + ARG 1 resourceManager + METHOD method_33175 (Lnet/minecraft/class_2960;Ljava/util/Collection;)V + ARG 1 missingReferences + METHOD method_33176 load (Lnet/minecraft/class_3300;)Ljava/util/Map; + ARG 1 manager + METHOD method_43951 (Lnet/minecraft/class_2960;)Ljava/util/List; + ARG 0 id + METHOD method_43952 resolveAll (Lnet/minecraft/class_3497$class_7474;Ljava/util/List;)Lcom/mojang/datafixers/util/Either; + ARG 1 valueGetter + ARG 2 entries + METHOD method_43954 (Ljava/util/List;Ljava/lang/String;Lnet/minecraft/class_3497;)V + ARG 2 entry + METHOD method_51476 (Lnet/minecraft/class_3497$class_7474;Ljava/util/Map;Lnet/minecraft/class_2960;Lnet/minecraft/class_3503$class_8522;)V + ARG 3 id + ARG 4 dependencies + METHOD method_51477 (Lnet/minecraft/class_8523;Lnet/minecraft/class_2960;Ljava/util/List;)V + ARG 1 id + ARG 2 entries + CLASS class_5145 TrackedEntry + FIELD comp_324 entry Lnet/minecraft/class_3497; + FIELD comp_325 source Ljava/lang/String; + METHOD (Lnet/minecraft/class_3497;Ljava/lang/String;)V + ARG 2 source + METHOD comp_324 entry ()Lnet/minecraft/class_3497; + METHOD comp_325 source ()Ljava/lang/String; + CLASS class_8522 TagDependencies + METHOD method_51479 (Ljava/util/function/Consumer;Lnet/minecraft/class_3503$class_5145;)V + ARG 1 entry + METHOD method_51481 (Ljava/util/function/Consumer;Lnet/minecraft/class_3503$class_5145;)V + ARG 1 entry diff --git a/mappings/net/minecraft/tag/TagKey.mapping b/mappings/net/minecraft/registry/tag/TagKey.mapping similarity index 94% rename from mappings/net/minecraft/tag/TagKey.mapping rename to mappings/net/minecraft/registry/tag/TagKey.mapping index 304fc37971..e29e283e81 100644 --- a/mappings/net/minecraft/tag/TagKey.mapping +++ b/mappings/net/minecraft/registry/tag/TagKey.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_6862 net/minecraft/tag/TagKey +CLASS net/minecraft/class_6862 net/minecraft/registry/tag/TagKey FIELD comp_327 id Lnet/minecraft/class_2960; FIELD field_36394 INTERNER Lcom/google/common/collect/Interner; METHOD comp_327 id ()Lnet/minecraft/class_2960; diff --git a/mappings/net/minecraft/tag/TagManagerLoader.mapping b/mappings/net/minecraft/registry/tag/TagManagerLoader.mapping similarity index 93% rename from mappings/net/minecraft/tag/TagManagerLoader.mapping rename to mappings/net/minecraft/registry/tag/TagManagerLoader.mapping index 14ce6d1f48..7566ec249a 100644 --- a/mappings/net/minecraft/tag/TagManagerLoader.mapping +++ b/mappings/net/minecraft/registry/tag/TagManagerLoader.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_3505 net/minecraft/tag/TagManagerLoader +CLASS net/minecraft/class_3505 net/minecraft/registry/tag/TagManagerLoader FIELD field_28312 registryManager Lnet/minecraft/class_5455; FIELD field_36395 DIRECTORIES Ljava/util/Map; FIELD field_36396 registryTags Ljava/util/List; diff --git a/mappings/net/minecraft/tag/TagPacketSerializer.mapping b/mappings/net/minecraft/registry/tag/TagPacketSerializer.mapping similarity index 87% rename from mappings/net/minecraft/tag/TagPacketSerializer.mapping rename to mappings/net/minecraft/registry/tag/TagPacketSerializer.mapping index f6f92871d5..e69730835d 100644 --- a/mappings/net/minecraft/tag/TagPacketSerializer.mapping +++ b/mappings/net/minecraft/registry/tag/TagPacketSerializer.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_6864 net/minecraft/tag/TagPacketSerializer +CLASS net/minecraft/class_6864 net/minecraft/registry/tag/TagPacketSerializer METHOD method_40101 (Lcom/mojang/datafixers/util/Pair;)Z ARG 0 pair METHOD method_40102 serializeTags (Lnet/minecraft/class_2378;)Lnet/minecraft/class_6864$class_5748; @@ -7,7 +7,7 @@ CLASS net/minecraft/class_6864 net/minecraft/tag/TagPacketSerializer ARG 2 pair METHOD method_40104 (Lnet/minecraft/class_5455$class_6892;)Lcom/mojang/datafixers/util/Pair; ARG 0 registry - METHOD method_40105 serializeTags (Lnet/minecraft/class_5455;)Ljava/util/Map; + METHOD method_40105 serializeTags (Lnet/minecraft/class_7780;)Ljava/util/Map; ARG 0 dynamicRegistryManager METHOD method_40106 loadTags (Lnet/minecraft/class_5321;Lnet/minecraft/class_2378;Lnet/minecraft/class_6864$class_5748;Lnet/minecraft/class_6864$class_6865;)V ARG 0 registryKey @@ -19,7 +19,7 @@ CLASS net/minecraft/class_6864 net/minecraft/tag/TagPacketSerializer ARG 4 rawIds CLASS class_5748 Serialized COMMENT A serialization-friendly POJO representation of a {@linkplain - COMMENT net.minecraft.util.registry.RegistryEntryList registry entry list} of tags. + COMMENT net.minecraft.registry.entry.RegistryEntryList registry entry list} of tags. COMMENT This allows easy transport of tags over Minecraft network protocol. COMMENT COMMENT

    This stores tag entries with raw integer IDs and requires a registry diff --git a/mappings/net/minecraft/tag/WorldPresetTags.mapping b/mappings/net/minecraft/registry/tag/WorldPresetTags.mapping similarity index 52% rename from mappings/net/minecraft/tag/WorldPresetTags.mapping rename to mappings/net/minecraft/registry/tag/WorldPresetTags.mapping index 9ec633ca5e..b881ff6e1a 100644 --- a/mappings/net/minecraft/tag/WorldPresetTags.mapping +++ b/mappings/net/minecraft/registry/tag/WorldPresetTags.mapping @@ -1,3 +1,3 @@ -CLASS net/minecraft/class_7089 net/minecraft/tag/WorldPresetTags +CLASS net/minecraft/class_7089 net/minecraft/registry/tag/WorldPresetTags METHOD method_41293 of (Ljava/lang/String;)Lnet/minecraft/class_6862; ARG 0 id diff --git a/mappings/net/minecraft/resource/AbstractFileResourcePack.mapping b/mappings/net/minecraft/resource/AbstractFileResourcePack.mapping index c0747350ce..45d85bf747 100644 --- a/mappings/net/minecraft/resource/AbstractFileResourcePack.mapping +++ b/mappings/net/minecraft/resource/AbstractFileResourcePack.mapping @@ -1,20 +1,10 @@ CLASS net/minecraft/class_3255 net/minecraft/resource/AbstractFileResourcePack - FIELD field_14181 base Ljava/io/File; FIELD field_14182 LOGGER Lorg/slf4j/Logger; - METHOD (Ljava/io/File;)V - ARG 1 base - METHOD method_14391 openFile (Ljava/lang/String;)Ljava/io/InputStream; + FIELD field_39993 name Ljava/lang/String; + FIELD field_40857 alwaysStable Z + METHOD (Ljava/lang/String;Z)V ARG 1 name + ARG 2 alwaysStable METHOD method_14392 parseMetadata (Lnet/minecraft/class_3270;Ljava/io/InputStream;)Ljava/lang/Object; ARG 0 metaReader ARG 1 inputStream - METHOD method_14393 containsFile (Ljava/lang/String;)Z - ARG 1 name - METHOD method_14394 warnNonLowerCaseNamespace (Ljava/lang/String;)V - ARG 1 namespace - METHOD method_14395 getFilename (Lnet/minecraft/class_3264;Lnet/minecraft/class_2960;)Ljava/lang/String; - ARG 0 type - ARG 1 id - METHOD method_14396 relativize (Ljava/io/File;Ljava/io/File;)Ljava/lang/String; - ARG 0 base - ARG 1 target diff --git a/mappings/net/minecraft/resource/DataConfiguration.mapping b/mappings/net/minecraft/resource/DataConfiguration.mapping new file mode 100644 index 0000000000..50e7a64417 --- /dev/null +++ b/mappings/net/minecraft/resource/DataConfiguration.mapping @@ -0,0 +1,8 @@ +CLASS net/minecraft/class_7712 net/minecraft/resource/DataConfiguration + FIELD field_40258 ENABLED_FEATURES_KEY Ljava/lang/String; + FIELD field_40259 CODEC Lcom/mojang/serialization/Codec; + FIELD field_40260 SAFE_MODE Lnet/minecraft/class_7712; + METHOD method_45449 withFeaturesAdded (Lnet/minecraft/class_7699;)Lnet/minecraft/class_7712; + ARG 1 features + METHOD method_45450 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 0 instance diff --git a/mappings/net/minecraft/resource/DefaultResourcePack.mapping b/mappings/net/minecraft/resource/DefaultResourcePack.mapping index 1a7dbf6bc8..991f397ce1 100644 --- a/mappings/net/minecraft/resource/DefaultResourcePack.mapping +++ b/mappings/net/minecraft/resource/DefaultResourcePack.mapping @@ -1,36 +1,37 @@ CLASS net/minecraft/class_3268 net/minecraft/resource/DefaultResourcePack FIELD field_14193 namespaces Ljava/util/Set; - FIELD field_14194 resourceClass Ljava/lang/Class; FIELD field_14195 LOGGER Lorg/slf4j/Logger; - FIELD field_14196 resourcePath Ljava/nio/file/Path; - FIELD field_17917 TYPE_TO_FILE_SYSTEM Ljava/util/Map; - FIELD field_26938 metadata Lnet/minecraft/class_3272; - METHOD (Lnet/minecraft/class_3272;[Ljava/lang/String;)V + FIELD field_26938 metadata Lnet/minecraft/class_7662; + FIELD field_40002 rootPaths Ljava/util/List; + FIELD field_40003 namespacePaths Ljava/util/Map; + METHOD (Lnet/minecraft/class_7662;Ljava/util/Set;Ljava/util/List;Ljava/util/Map;)V ARG 1 metadata ARG 2 namespaces - METHOD method_14416 findInputStream (Lnet/minecraft/class_3264;Lnet/minecraft/class_2960;)Ljava/io/InputStream; - ARG 1 type - ARG 2 id - METHOD method_14417 getInputStream (Ljava/lang/String;)Ljava/io/InputStream; - ARG 1 path - METHOD method_14418 collectIdentifiers (Ljava/util/Collection;Ljava/lang/String;Ljava/nio/file/Path;Ljava/lang/String;Ljava/util/function/Predicate;)V - ARG 0 results + ARG 3 rootPaths + ARG 4 namespacePaths + METHOD method_14418 collectIdentifiers (Lnet/minecraft/class_3262$class_7664;Ljava/lang/String;Ljava/nio/file/Path;Ljava/util/List;)V + ARG 0 consumer ARG 1 namespace ARG 2 root - ARG 3 prefix - ARG 4 allowedPathPredicate - METHOD method_20728 isValidUrl (Ljava/lang/String;Ljava/net/URL;)Z - ARG 0 fileName - ARG 1 url - METHOD method_20729 getPath (Lnet/minecraft/class_3264;Lnet/minecraft/class_2960;)Ljava/lang/String; - ARG 0 type - ARG 1 id - METHOD method_23857 (Ljava/nio/file/Path;Ljava/lang/String;Ljava/nio/file/Path;Ljava/util/function/Consumer;)V - ARG 2 path - METHOD method_23858 (Ljava/nio/file/Path;)Z - ARG 0 path - METHOD method_37454 getPath (Ljava/net/URI;)Ljava/nio/file/Path; - ARG 0 uri - METHOD method_43031 (Lnet/minecraft/class_2960;)Ljava/util/Optional; - ARG 1 id + ARG 3 prefixSegments METHOD method_43032 getFactory ()Lnet/minecraft/class_5912; + METHOD method_45188 (Lnet/minecraft/class_2960;)Ljava/util/Optional; + ARG 1 name + METHOD method_45189 (Lnet/minecraft/class_2960;Lnet/minecraft/class_3264;Ljava/util/List;)Lnet/minecraft/class_7367; + ARG 3 segments + METHOD method_45190 (Lnet/minecraft/class_2960;Lnet/minecraft/class_3264;Ljava/util/function/Consumer;Ljava/util/List;)V + ARG 4 segments + METHOD method_45191 (Lnet/minecraft/class_2960;Lcom/mojang/serialization/DataResult$PartialResult;)Lnet/minecraft/class_7367; + ARG 1 result + METHOD method_45192 forEachNamespacedPath (Lnet/minecraft/class_3264;Lnet/minecraft/class_2960;Ljava/util/function/Consumer;)V + ARG 1 type + ARG 2 path + ARG 3 consumer + METHOD method_45193 (Lnet/minecraft/class_3264;Lnet/minecraft/class_3262$class_7664;Ljava/lang/String;Ljava/util/List;)V + ARG 4 segments + METHOD method_45194 (Lnet/minecraft/class_7367;)Lnet/minecraft/class_3298; + ARG 1 stream + METHOD method_45195 (Ljava/lang/String;Lcom/mojang/serialization/DataResult$PartialResult;)V + ARG 1 result + METHOD method_45196 (Lnet/minecraft/class_2960;Lcom/mojang/serialization/DataResult$PartialResult;)V + ARG 1 result diff --git a/mappings/net/minecraft/resource/DefaultResourcePackBuilder.mapping b/mappings/net/minecraft/resource/DefaultResourcePackBuilder.mapping new file mode 100644 index 0000000000..4c157c6e44 --- /dev/null +++ b/mappings/net/minecraft/resource/DefaultResourcePackBuilder.mapping @@ -0,0 +1,41 @@ +CLASS net/minecraft/class_7665 net/minecraft/resource/DefaultResourcePackBuilder + FIELD field_40004 callback Ljava/util/function/Consumer; + FIELD field_40005 LOGGER Lorg/slf4j/Logger; + FIELD field_40006 RESOURCE_TYPE_TO_PATH Ljava/util/Map; + FIELD field_40007 rootPaths Ljava/util/Set; + FIELD field_40008 paths Ljava/util/Map; + FIELD field_40009 metadataMap Lnet/minecraft/class_7662; + FIELD field_40010 namespaces Ljava/util/Set; + METHOD method_45197 withDefaultPaths ()Lnet/minecraft/class_7665; + METHOD method_45198 withMetadataMap (Lnet/minecraft/class_7662;)Lnet/minecraft/class_7665; + ARG 1 metadataMap + METHOD method_45199 (Lnet/minecraft/class_3264;)Ljava/util/Set; + ARG 0 type2 + METHOD method_45200 withPaths (Lnet/minecraft/class_3264;Ljava/lang/Class;)Lnet/minecraft/class_7665; + ARG 1 type + ARG 2 clazz + METHOD method_45201 withPath (Lnet/minecraft/class_3264;Ljava/nio/file/Path;)Lnet/minecraft/class_7665; + ARG 1 type + ARG 2 path + METHOD method_45202 (Lnet/minecraft/class_7665;)V + ARG 0 builder + METHOD method_45203 toPath (Ljava/net/URI;)Ljava/nio/file/Path; + ARG 0 uri + METHOD method_45204 withRoot (Ljava/nio/file/Path;)Lnet/minecraft/class_7665; + ARG 1 root + METHOD method_45205 reverse (Ljava/util/Collection;)Ljava/util/List; + ARG 0 paths + METHOD method_45206 withNamespaces ([Ljava/lang/String;)Lnet/minecraft/class_7665; + ARG 1 namespaces + METHOD method_45207 runCallback ()Lnet/minecraft/class_7665; + METHOD method_45208 addPath (Lnet/minecraft/class_3264;Ljava/nio/file/Path;)V + ARG 1 type + ARG 2 path + METHOD method_45209 exists (Ljava/nio/file/Path;)Z + ARG 1 path + METHOD method_45210 build ()Lnet/minecraft/class_3268; + METHOD method_45211 (Lnet/minecraft/class_3264;Ljava/nio/file/Path;)V + ARG 1 type + ARG 2 path + METHOD method_45212 addRootPath (Ljava/nio/file/Path;)V + ARG 1 path diff --git a/mappings/net/minecraft/resource/DependencyTracker.mapping b/mappings/net/minecraft/resource/DependencyTracker.mapping new file mode 100644 index 0000000000..885830b50e --- /dev/null +++ b/mappings/net/minecraft/resource/DependencyTracker.mapping @@ -0,0 +1,41 @@ +CLASS net/minecraft/class_8523 net/minecraft/resource/DependencyTracker + FIELD field_44702 underlying Ljava/util/Map; + METHOD method_51482 (Lcom/google/common/collect/Multimap;Ljava/lang/Object;Lnet/minecraft/class_8523$class_8524;)V + ARG 1 key + ARG 2 value + METHOD method_51483 containsReverseDependency (Lcom/google/common/collect/Multimap;Ljava/lang/Object;Ljava/lang/Object;)Z + ARG 0 dependencies + ARG 1 key + ARG 2 dependency + METHOD method_51484 traverse (Lcom/google/common/collect/Multimap;Ljava/util/Set;Ljava/lang/Object;Ljava/util/function/BiConsumer;)V + ARG 1 parentChild + ARG 2 visited + ARG 3 rootKey + ARG 4 callback + METHOD method_51485 (Lcom/google/common/collect/Multimap;Ljava/util/Set;Ljava/util/function/BiConsumer;Ljava/lang/Object;)V + ARG 4 key + METHOD method_51486 add (Ljava/lang/Object;Lnet/minecraft/class_8523$class_8524;)Lnet/minecraft/class_8523; + ARG 1 key + ARG 2 value + METHOD method_51487 traverse (Ljava/util/function/BiConsumer;)V + ARG 1 callback + METHOD method_51488 (Lcom/google/common/collect/Multimap;Ljava/lang/Object;Lnet/minecraft/class_8523$class_8524;)V + ARG 1 key + ARG 2 value + METHOD method_51489 addDependency (Lcom/google/common/collect/Multimap;Ljava/lang/Object;Ljava/lang/Object;)V + ARG 0 dependencies + ARG 1 key + ARG 2 dependency + METHOD method_51490 (Lcom/google/common/collect/Multimap;Ljava/util/Set;Ljava/util/function/BiConsumer;Ljava/lang/Object;)V + ARG 4 child + METHOD method_51491 (Lcom/google/common/collect/Multimap;Ljava/lang/Object;Ljava/lang/Object;)V + ARG 2 dependency + METHOD method_51492 (Lcom/google/common/collect/Multimap;Ljava/lang/Object;Ljava/lang/Object;)V + ARG 2 dependency + METHOD method_51493 (Lcom/google/common/collect/Multimap;Ljava/lang/Object;Ljava/lang/Object;)Z + ARG 2 subdependency + CLASS class_8524 Dependencies + METHOD method_51478 forDependencies (Ljava/util/function/Consumer;)V + ARG 1 callback + METHOD method_51480 forOptionalDependencies (Ljava/util/function/Consumer;)V + ARG 1 callback diff --git a/mappings/net/minecraft/resource/DirectoryResourcePack.mapping b/mappings/net/minecraft/resource/DirectoryResourcePack.mapping index 4701d87bde..a1a8e8f857 100644 --- a/mappings/net/minecraft/resource/DirectoryResourcePack.mapping +++ b/mappings/net/minecraft/resource/DirectoryResourcePack.mapping @@ -1,15 +1,39 @@ CLASS net/minecraft/class_3259 net/minecraft/resource/DirectoryResourcePack - FIELD field_14185 BACKSLASH_MATCHER Lcom/google/common/base/CharMatcher; - FIELD field_14186 IS_WINDOWS Z FIELD field_14187 LOGGER Lorg/slf4j/Logger; - METHOD method_14400 findFiles (Ljava/io/File;Ljava/lang/String;Ljava/util/List;Ljava/lang/String;Ljava/util/function/Predicate;)V - ARG 1 file - ARG 2 namespace - ARG 3 foundIds - ARG 4 rootDirectory - ARG 5 allowedPathPredicate - METHOD method_14401 getFile (Ljava/lang/String;)Ljava/io/File; + FIELD field_40000 SEPARATOR_JOINER Lcom/google/common/base/Joiner; + FIELD field_40001 root Ljava/nio/file/Path; + METHOD (Ljava/lang/String;Ljava/nio/file/Path;Z)V ARG 1 name - METHOD method_14402 isValidPath (Ljava/io/File;Ljava/lang/String;)Z - ARG 0 file - ARG 1 filename + ARG 2 root + ARG 3 alwaysStable + METHOD method_14402 isValidPath (Ljava/nio/file/Path;)Z + ARG 0 path + METHOD method_45179 (Lnet/minecraft/class_2960;Lcom/mojang/serialization/DataResult$PartialResult;)Lnet/minecraft/class_7367; + ARG 1 result + METHOD method_45180 open (Lnet/minecraft/class_2960;Ljava/nio/file/Path;)Lnet/minecraft/class_7367; + ARG 0 id + ARG 1 path + METHOD method_45181 (Lnet/minecraft/class_3264;Ljava/lang/String;Lnet/minecraft/class_3262$class_7664;Ljava/util/List;)V + ARG 4 prefixSegments + METHOD method_45182 (Ljava/lang/String;Lcom/mojang/serialization/DataResult$PartialResult;)V + ARG 1 result + METHOD method_45183 findResources (Ljava/lang/String;Ljava/nio/file/Path;Ljava/util/List;Lnet/minecraft/class_3262$class_7664;)V + ARG 0 namespace + ARG 1 path + ARG 2 prefixSegments + ARG 3 consumer + METHOD method_45184 (Ljava/nio/file/Path;Ljava/lang/String;Lnet/minecraft/class_3262$class_7664;Ljava/nio/file/Path;)V + ARG 3 foundPath + METHOD method_45185 (Ljava/nio/file/Path;Ljava/nio/file/attribute/BasicFileAttributes;)Z + ARG 0 path2 + ARG 1 attributes + METHOD method_45186 (Ljava/nio/file/Path;Ljava/util/List;)Lnet/minecraft/class_7367; + ARG 1 segments + METHOD method_45187 open (Ljava/nio/file/Path;)Lnet/minecraft/class_7367; + ARG 0 path + CLASS class_8619 DirectoryBackedFactory + FIELD field_45049 path Ljava/nio/file/Path; + FIELD field_45050 alwaysStable Z + METHOD (Ljava/nio/file/Path;Z)V + ARG 1 path + ARG 2 alwaysStable diff --git a/mappings/net/minecraft/resource/FileResourcePackProvider.mapping b/mappings/net/minecraft/resource/FileResourcePackProvider.mapping index 3cf6516818..c3050244fc 100644 --- a/mappings/net/minecraft/resource/FileResourcePackProvider.mapping +++ b/mappings/net/minecraft/resource/FileResourcePackProvider.mapping @@ -1,11 +1,26 @@ CLASS net/minecraft/class_3279 net/minecraft/resource/FileResourcePackProvider - FIELD field_14217 POSSIBLE_PACK Ljava/io/FileFilter; - FIELD field_14218 packsFolder Ljava/io/File; + FIELD field_14218 packsDir Ljava/nio/file/Path; FIELD field_25345 source Lnet/minecraft/class_5352; - METHOD (Ljava/io/File;Lnet/minecraft/class_5352;)V - ARG 1 packsFolder - ARG 2 source - METHOD method_14431 (Ljava/io/File;)Z - ARG 0 file - METHOD method_14432 createResourcePack (Ljava/io/File;)Ljava/util/function/Supplier; - ARG 1 file + FIELD field_40044 LOGGER Lorg/slf4j/Logger; + FIELD field_40045 type Lnet/minecraft/class_3264; + FIELD field_45054 symlinkFinder Lnet/minecraft/class_8580; + METHOD (Ljava/nio/file/Path;Lnet/minecraft/class_3264;Lnet/minecraft/class_5352;Lnet/minecraft/class_8580;)V + ARG 1 packsDir + ARG 2 type + ARG 3 source + ARG 4 symlinkFinder + METHOD method_45271 forEachProfile (Ljava/nio/file/Path;Lnet/minecraft/class_8580;ZLjava/util/function/BiConsumer;)V + ARG 0 path + ARG 1 symlinkFinder + ARG 2 alwaysStable + ARG 3 consumer + METHOD method_45272 (Ljava/util/function/Consumer;Ljava/nio/file/Path;Lnet/minecraft/class_3288$class_7680;)V + ARG 2 path + ARG 3 packFactory + METHOD method_45273 getFileName (Ljava/nio/file/Path;)Ljava/lang/String; + ARG 0 path + CLASS class_8620 PackOpenerImpl + FIELD field_45055 alwaysStable Z + METHOD (Lnet/minecraft/class_8580;Z)V + ARG 1 symlinkFinder + ARG 2 alwaysStable diff --git a/mappings/net/minecraft/resource/InputSupplier.mapping b/mappings/net/minecraft/resource/InputSupplier.mapping new file mode 100644 index 0000000000..f6d4a78ae5 --- /dev/null +++ b/mappings/net/minecraft/resource/InputSupplier.mapping @@ -0,0 +1,6 @@ +CLASS net/minecraft/class_7367 net/minecraft/resource/InputSupplier + METHOD create (Ljava/nio/file/Path;)Lnet/minecraft/class_7367; + ARG 0 path + METHOD create (Ljava/util/zip/ZipFile;Ljava/util/zip/ZipEntry;)Lnet/minecraft/class_7367; + ARG 0 zipFile + ARG 1 zipEntry diff --git a/mappings/net/minecraft/resource/JsonDataLoader.mapping b/mappings/net/minecraft/resource/JsonDataLoader.mapping index 77824ceca1..3e12a1d6ad 100644 --- a/mappings/net/minecraft/resource/JsonDataLoader.mapping +++ b/mappings/net/minecraft/resource/JsonDataLoader.mapping @@ -2,12 +2,13 @@ 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/slf4j/Logger; - FIELD field_19378 FILE_SUFFIX_LENGTH I FIELD field_19379 gson Lcom/google/gson/Gson; FIELD field_19380 dataType Ljava/lang/String; - FIELD field_29783 FILE_SUFFIX Ljava/lang/String; METHOD (Lcom/google/gson/Gson;Ljava/lang/String;)V ARG 1 gson ARG 2 dataType - METHOD method_20730 (Lnet/minecraft/class_2960;)Z - ARG 0 id + METHOD method_51148 load (Lnet/minecraft/class_3300;Ljava/lang/String;Lcom/google/gson/Gson;Ljava/util/Map;)V + ARG 0 manager + ARG 1 dataType + ARG 2 gson + ARG 3 results diff --git a/mappings/net/minecraft/resource/LifecycledResourceManagerImpl.mapping b/mappings/net/minecraft/resource/LifecycledResourceManagerImpl.mapping index a05a8f78e7..ece38e9ba9 100644 --- a/mappings/net/minecraft/resource/LifecycledResourceManagerImpl.mapping +++ b/mappings/net/minecraft/resource/LifecycledResourceManagerImpl.mapping @@ -17,3 +17,8 @@ CLASS net/minecraft/class_6861 net/minecraft/resource/LifecycledResourceManagerI ARG 1 pack METHOD method_41276 (Lnet/minecraft/class_7084;Lnet/minecraft/class_2960;)Z ARG 1 id + METHOD method_45303 validateStartingPath (Ljava/lang/String;)V + COMMENT Validates the starting path to ensure that it does not end with a slash. + COMMENT + COMMENT @throws IllegalArgumentException if {@code startingPath} has a trailing slash + ARG 0 startingPath diff --git a/mappings/net/minecraft/resource/NamespaceResourceManager.mapping b/mappings/net/minecraft/resource/NamespaceResourceManager.mapping index 035732076e..0998ba103c 100644 --- a/mappings/net/minecraft/resource/NamespaceResourceManager.mapping +++ b/mappings/net/minecraft/resource/NamespaceResourceManager.mapping @@ -14,11 +14,6 @@ CLASS net/minecraft/class_3294 net/minecraft/resource/NamespaceResourceManager ARG 2 namespace METHOD method_14473 getMetadataPath (Lnet/minecraft/class_2960;)Lnet/minecraft/class_2960; ARG 0 id - METHOD method_14476 createOpener (Lnet/minecraft/class_2960;Lnet/minecraft/class_3262;)Lnet/minecraft/class_3298$class_7367; - ARG 1 id - ARG 2 pack - METHOD method_18221 isPathAbsolute (Lnet/minecraft/class_2960;)Z - ARG 1 id METHOD method_24233 addPack (Lnet/minecraft/class_3262;)V ARG 1 pack METHOD method_41256 addPack (Lnet/minecraft/class_3262;Ljava/util/function/Predicate;)V @@ -41,25 +36,49 @@ CLASS net/minecraft/class_3294 net/minecraft/resource/NamespaceResourceManager METHOD method_41261 addPack (Ljava/lang/String;Ljava/util/function/Predicate;)V ARG 1 name ARG 2 filter - METHOD method_41262 (Ljava/util/TreeMap;Lnet/minecraft/class_2960;Lnet/minecraft/class_3294$class_7081;)V - ARG 1 id - ARG 2 entryList - METHOD method_41264 (Lnet/minecraft/class_2960;Lnet/minecraft/class_2960;)Lnet/minecraft/class_3294$class_7081; - ARG 1 id - METHOD method_43035 createMetadataSupplier (Lnet/minecraft/class_2960;I)Lnet/minecraft/class_3298$class_7367; + METHOD method_43035 createMetadataSupplier (Lnet/minecraft/class_2960;I)Lnet/minecraft/class_7367; ARG 1 id ARG 2 index + METHOD method_45288 wrapForDebug (Lnet/minecraft/class_2960;Lnet/minecraft/class_3262;Lnet/minecraft/class_7367;)Lnet/minecraft/class_7367; + ARG 0 id + ARG 1 pack + ARG 2 supplier + METHOD method_45290 createResource (Lnet/minecraft/class_3262;Lnet/minecraft/class_2960;Lnet/minecraft/class_7367;Lnet/minecraft/class_7367;)Lnet/minecraft/class_3298; + ARG 0 pack + ARG 1 id + ARG 2 supplier + ARG 3 metadataSupplier + METHOD method_45291 getMetadataSupplier (Lnet/minecraft/class_7367;)Lnet/minecraft/class_7367; + ARG 0 supplier + METHOD method_45293 (Ljava/util/Map;Ljava/util/Map;Lnet/minecraft/class_2960;Lnet/minecraft/class_3294$class_7681;)V + ARG 2 id + ARG 3 result + METHOD method_45294 (Ljava/util/function/Predicate;Ljava/util/Map;Lnet/minecraft/class_3262;ILjava/util/Map;Lnet/minecraft/class_2960;Lnet/minecraft/class_7367;)V + ARG 5 id + ARG 6 supplier + METHOD method_45295 (Ljava/util/function/Predicate;Ljava/util/Map;Lnet/minecraft/class_3262;Lnet/minecraft/class_2960;Lnet/minecraft/class_7367;)V + ARG 3 id + ARG 4 supplier + METHOD method_45296 isMcmeta (Lnet/minecraft/class_2960;)Z + ARG 0 id + METHOD method_45297 loadMetadata (Lnet/minecraft/class_7367;)Lnet/minecraft/class_7368; + ARG 0 supplier + METHOD method_45298 getMetadataFileName (Lnet/minecraft/class_2960;)Lnet/minecraft/class_2960; + ARG 0 id CLASS class_3295 DebugInputStream FIELD field_14287 closed Z - FIELD field_14288 leakMessage Ljava/lang/String; + FIELD field_14288 leakMessage Ljava/util/function/Supplier; METHOD (Ljava/io/InputStream;Lnet/minecraft/class_2960;Ljava/lang/String;)V ARG 1 parent ARG 2 id ARG 3 packName CLASS class_7081 EntryList + FIELD comp_1005 id Lnet/minecraft/class_2960; FIELD comp_527 metadataId Lnet/minecraft/class_2960; + METHOD (Lnet/minecraft/class_2960;)V + ARG 1 id + METHOD comp_1005 id ()Lnet/minecraft/class_2960; METHOD comp_527 metadataId ()Lnet/minecraft/class_2960; - METHOD method_41266 toReferenceList ()Ljava/util/List; CLASS class_7082 FilterablePack FIELD comp_530 underlying Lnet/minecraft/class_3262; METHOD comp_530 underlying ()Lnet/minecraft/class_3262; @@ -67,14 +86,13 @@ CLASS net/minecraft/class_3294 net/minecraft/resource/NamespaceResourceManager ARG 1 ids METHOD method_41269 isFiltered (Lnet/minecraft/class_2960;)Z ARG 1 id - CLASS class_7083 Entry - FIELD field_37284 id Lnet/minecraft/class_2960; - FIELD field_37285 metadataId Lnet/minecraft/class_2960; - FIELD field_37286 pack Lnet/minecraft/class_3262; - FIELD field_37287 checksMetadata Z - METHOD (Lnet/minecraft/class_3294;Lnet/minecraft/class_2960;Lnet/minecraft/class_2960;Lnet/minecraft/class_3262;)V - ARG 2 id - ARG 3 metadataId - ARG 4 pack - METHOD method_41270 ignoreMetadata ()V - METHOD method_41272 toReference ()Lnet/minecraft/class_3298; + CLASS class_7681 Result + FIELD comp_1002 pack Lnet/minecraft/class_3262; + FIELD comp_1003 supplier Lnet/minecraft/class_7367; + METHOD comp_1002 pack ()Lnet/minecraft/class_3262; + METHOD comp_1003 supplier ()Lnet/minecraft/class_7367; + CLASS class_7682 FileSource + FIELD comp_1008 sourcePack Lnet/minecraft/class_3262; + FIELD comp_1009 supplier Lnet/minecraft/class_7367; + METHOD comp_1008 sourcePack ()Lnet/minecraft/class_3262; + METHOD comp_1009 supplier ()Lnet/minecraft/class_7367; diff --git a/mappings/net/minecraft/resource/OverlayResourcePack.mapping b/mappings/net/minecraft/resource/OverlayResourcePack.mapping new file mode 100644 index 0000000000..39b2b46b7b --- /dev/null +++ b/mappings/net/minecraft/resource/OverlayResourcePack.mapping @@ -0,0 +1,6 @@ +CLASS net/minecraft/class_8614 net/minecraft/resource/OverlayResourcePack + FIELD field_45036 base Lnet/minecraft/class_3262; + FIELD field_45037 overlaysAndBase Ljava/util/List; + METHOD (Lnet/minecraft/class_3262;Ljava/util/List;)V + ARG 1 base + ARG 2 overlays diff --git a/mappings/net/minecraft/resource/Resource.mapping b/mappings/net/minecraft/resource/Resource.mapping index 81236af442..38d380f637 100644 --- a/mappings/net/minecraft/resource/Resource.mapping +++ b/mappings/net/minecraft/resource/Resource.mapping @@ -5,15 +5,15 @@ CLASS net/minecraft/class_3298 net/minecraft/resource/Resource COMMENT COMMENT @see ResourceFactory#getResource(Identifier) COMMENT @see ResourceManager#getAllResources(Identifier) - FIELD field_38684 resourcePackName Ljava/lang/String; - FIELD field_38685 inputSupplier Lnet/minecraft/class_3298$class_7367; - FIELD field_38686 metadataSupplier Lnet/minecraft/class_3298$class_7367; + FIELD field_38685 inputSupplier Lnet/minecraft/class_7367; + FIELD field_38686 metadataSupplier Lnet/minecraft/class_7367; FIELD field_38687 metadata Lnet/minecraft/class_7368; - METHOD (Ljava/lang/String;Lnet/minecraft/class_3298$class_7367;)V - ARG 1 resourcePackName + FIELD field_40054 pack Lnet/minecraft/class_3262; + METHOD (Lnet/minecraft/class_3262;Lnet/minecraft/class_7367;)V + ARG 1 pack ARG 2 inputSupplier - METHOD (Ljava/lang/String;Lnet/minecraft/class_3298$class_7367;Lnet/minecraft/class_3298$class_7367;)V - ARG 1 resourcePackName + METHOD (Lnet/minecraft/class_3262;Lnet/minecraft/class_7367;Lnet/minecraft/class_7367;)V + ARG 1 pack ARG 2 inputSupplier ARG 3 metadataSupplier METHOD method_14480 getResourcePackName ()Ljava/lang/String; @@ -28,4 +28,5 @@ CLASS net/minecraft/class_3298 net/minecraft/resource/Resource COMMENT COMMENT

    This input stream is closed when this resource is closed. METHOD method_43039 getReader ()Ljava/io/BufferedReader; - CLASS class_7367 InputSupplier + METHOD method_45304 getPack ()Lnet/minecraft/class_3262; + METHOD method_45305 isAlwaysStable ()Z diff --git a/mappings/net/minecraft/resource/ResourceFactory.mapping b/mappings/net/minecraft/resource/ResourceFactory.mapping index 595d82aa86..7a23b9baf0 100644 --- a/mappings/net/minecraft/resource/ResourceFactory.mapping +++ b/mappings/net/minecraft/resource/ResourceFactory.mapping @@ -1,5 +1,7 @@ CLASS net/minecraft/class_5912 net/minecraft/resource/ResourceFactory COMMENT Provides resource access. + METHOD fromMap (Ljava/util/Map;)Lnet/minecraft/class_5912; + ARG 0 map METHOD getResourceOrThrow (Lnet/minecraft/class_2960;)Lnet/minecraft/class_3298; ARG 1 id METHOD method_14486 getResource (Lnet/minecraft/class_2960;)Ljava/util/Optional; @@ -11,6 +13,8 @@ CLASS net/minecraft/class_5912 net/minecraft/resource/ResourceFactory COMMENT

    The returned resource must be closed to avoid resource leaks. ARG 1 id COMMENT the resource identifier to search for + METHOD method_45307 (Ljava/util/Map;Lnet/minecraft/class_2960;)Ljava/util/Optional; + ARG 1 id METHOD open (Lnet/minecraft/class_2960;)Ljava/io/InputStream; ARG 1 id METHOD openAsReader (Lnet/minecraft/class_2960;)Ljava/io/BufferedReader; diff --git a/mappings/net/minecraft/resource/ResourceFinder.mapping b/mappings/net/minecraft/resource/ResourceFinder.mapping new file mode 100644 index 0000000000..3263e96675 --- /dev/null +++ b/mappings/net/minecraft/resource/ResourceFinder.mapping @@ -0,0 +1,22 @@ +CLASS net/minecraft/class_7654 net/minecraft/resource/ResourceFinder + FIELD field_39966 directoryName Ljava/lang/String; + FIELD field_39967 fileExtension Ljava/lang/String; + METHOD (Ljava/lang/String;Ljava/lang/String;)V + ARG 1 directoryName + ARG 2 fileExtension + METHOD method_45112 toResourcePath (Lnet/minecraft/class_2960;)Lnet/minecraft/class_2960; + COMMENT {@return an identifier that is used as a file path for locating the resource {@code id}} + ARG 1 id + METHOD method_45113 findResources (Lnet/minecraft/class_3300;)Ljava/util/Map; + ARG 1 resourceManager + METHOD method_45114 json (Ljava/lang/String;)Lnet/minecraft/class_7654; + ARG 0 directoryName + METHOD method_45115 toResourceId (Lnet/minecraft/class_2960;)Lnet/minecraft/class_2960; + COMMENT {@return an identifier of the resource located at the file path {@code path}} + ARG 1 path + METHOD method_45116 findAllResources (Lnet/minecraft/class_3300;)Ljava/util/Map; + ARG 1 resourceManager + METHOD method_45117 (Lnet/minecraft/class_2960;)Z + ARG 1 path + METHOD method_45118 (Lnet/minecraft/class_2960;)Z + ARG 1 path diff --git a/mappings/net/minecraft/resource/ResourceNotFoundException.mapping b/mappings/net/minecraft/resource/ResourceNotFoundException.mapping deleted file mode 100644 index 599bd4df59..0000000000 --- a/mappings/net/minecraft/resource/ResourceNotFoundException.mapping +++ /dev/null @@ -1,4 +0,0 @@ -CLASS net/minecraft/class_3266 net/minecraft/resource/ResourceNotFoundException - METHOD (Ljava/io/File;Ljava/lang/String;)V - ARG 1 packSource - ARG 2 resource diff --git a/mappings/net/minecraft/resource/ResourcePack.mapping b/mappings/net/minecraft/resource/ResourcePack.mapping index 9ab6dcf675..a46ecbcee5 100644 --- a/mappings/net/minecraft/resource/ResourcePack.mapping +++ b/mappings/net/minecraft/resource/ResourcePack.mapping @@ -7,21 +7,22 @@ CLASS net/minecraft/class_3262 net/minecraft/resource/ResourcePack COMMENT on demand. FIELD field_29780 METADATA_PATH_SUFFIX Ljava/lang/String; FIELD field_29781 PACK_METADATA_NAME Ljava/lang/String; - METHOD method_14405 open (Lnet/minecraft/class_3264;Lnet/minecraft/class_2960;)Ljava/io/InputStream; + METHOD method_14405 open (Lnet/minecraft/class_3264;Lnet/minecraft/class_2960;)Lnet/minecraft/class_7367; ARG 1 type ARG 2 id METHOD method_14406 getNamespaces (Lnet/minecraft/class_3264;)Ljava/util/Set; ARG 1 type METHOD method_14407 parseMetadata (Lnet/minecraft/class_3270;)Ljava/lang/Object; ARG 1 metaReader - METHOD method_14408 findResources (Lnet/minecraft/class_3264;Ljava/lang/String;Ljava/lang/String;Ljava/util/function/Predicate;)Ljava/util/Collection; + METHOD method_14408 findResources (Lnet/minecraft/class_3264;Ljava/lang/String;Ljava/lang/String;Lnet/minecraft/class_3262$class_7664;)V ARG 1 type ARG 2 namespace ARG 3 prefix - ARG 4 allowedPathPredicate + ARG 4 consumer METHOD method_14409 getName ()Ljava/lang/String; - METHOD method_14410 openRoot (Ljava/lang/String;)Ljava/io/InputStream; - ARG 1 fileName - METHOD method_14411 contains (Lnet/minecraft/class_3264;Lnet/minecraft/class_2960;)Z - ARG 1 type - ARG 2 id + METHOD method_14410 openRoot ([Ljava/lang/String;)Lnet/minecraft/class_7367; + ARG 1 segments + METHOD method_45178 isAlwaysStable ()Z + COMMENT {@return whether the dynamic registry entries from this pack are always + COMMENT "stable"/not experimental} + CLASS class_7664 ResultConsumer diff --git a/mappings/net/minecraft/resource/ResourcePackCompatibility.mapping b/mappings/net/minecraft/resource/ResourcePackCompatibility.mapping index a9c57eb17d..a0ec4f6813 100644 --- a/mappings/net/minecraft/resource/ResourcePackCompatibility.mapping +++ b/mappings/net/minecraft/resource/ResourcePackCompatibility.mapping @@ -3,12 +3,9 @@ CLASS net/minecraft/class_3281 net/minecraft/resource/ResourcePackCompatibility FIELD field_14222 confirmMessage Lnet/minecraft/class_2561; METHOD (Ljava/lang/String;ILjava/lang/String;)V ARG 3 translationSuffix - METHOD method_14436 from (ILnet/minecraft/class_3264;)Lnet/minecraft/class_3281; - ARG 0 packVersion - ARG 1 type + METHOD method_14436 from (Lnet/minecraft/class_6497;I)Lnet/minecraft/class_3281; + ARG 0 range + ARG 1 current METHOD method_14437 isCompatible ()Z METHOD method_14438 getConfirmMessage ()Lnet/minecraft/class_2561; METHOD method_14439 getNotification ()Lnet/minecraft/class_2561; - METHOD method_31439 from (Lnet/minecraft/class_3272;Lnet/minecraft/class_3264;)Lnet/minecraft/class_3281; - ARG 0 metadata - ARG 1 type diff --git a/mappings/net/minecraft/resource/ResourcePackManager.mapping b/mappings/net/minecraft/resource/ResourcePackManager.mapping index 9fa8878efe..69c508ff45 100644 --- a/mappings/net/minecraft/resource/ResourcePackManager.mapping +++ b/mappings/net/minecraft/resource/ResourcePackManager.mapping @@ -5,13 +5,8 @@ CLASS net/minecraft/class_3283 net/minecraft/resource/ResourcePackManager FIELD field_14225 enabled Ljava/util/List; FIELD field_14226 profiles Ljava/util/Map; FIELD field_14227 providers Ljava/util/Set; - FIELD field_14228 profileFactory Lnet/minecraft/class_3288$class_5351; - METHOD (Lnet/minecraft/class_3264;[Lnet/minecraft/class_3285;)V - ARG 1 type - ARG 2 providers - METHOD (Lnet/minecraft/class_3288$class_5351;[Lnet/minecraft/class_3285;)V - ARG 1 profileFactory - ARG 2 providers + METHOD ([Lnet/minecraft/class_3285;)V + ARG 1 providers METHOD method_14441 getProfiles ()Ljava/util/Collection; METHOD method_14444 getEnabledProfiles ()Ljava/util/Collection; METHOD method_14445 scanPacks ()V @@ -31,11 +26,8 @@ CLASS net/minecraft/class_3283 net/minecraft/resource/ResourcePackManager METHOD method_29212 providePackProfiles ()Ljava/util/Map; METHOD method_29484 (Ljava/util/Map;Lnet/minecraft/class_3288;)V ARG 1 profile - METHOD method_31440 (Lnet/minecraft/class_3264;Ljava/lang/String;Lnet/minecraft/class_2561;ZLjava/util/function/Supplier;Lnet/minecraft/class_3272;Lnet/minecraft/class_3288$class_3289;Lnet/minecraft/class_5352;)Lnet/minecraft/class_3288; - ARG 1 name - ARG 2 displayName - ARG 3 alwaysEnabled - ARG 4 packFactory - ARG 5 metadata - ARG 6 direction - ARG 7 source + METHOD method_45278 getRequestedFeatures ()Lnet/minecraft/class_7699; + METHOD method_49427 enable (Ljava/lang/String;)Z + ARG 1 profile + METHOD method_49428 disable (Ljava/lang/String;)Z + ARG 1 profile diff --git a/mappings/net/minecraft/resource/ResourcePackOpener.mapping b/mappings/net/minecraft/resource/ResourcePackOpener.mapping new file mode 100644 index 0000000000..6f578f1f42 --- /dev/null +++ b/mappings/net/minecraft/resource/ResourcePackOpener.mapping @@ -0,0 +1,11 @@ +CLASS net/minecraft/class_8621 net/minecraft/resource/ResourcePackOpener + FIELD field_45057 symlinkFinder Lnet/minecraft/class_8580; + METHOD (Lnet/minecraft/class_8580;)V + ARG 1 symlinkFinder + METHOD method_52438 openDirectory (Ljava/nio/file/Path;)Ljava/lang/Object; + ARG 1 path + METHOD method_52439 openZip (Ljava/nio/file/Path;)Ljava/lang/Object; + ARG 1 path + METHOD method_52441 open (Ljava/nio/file/Path;Ljava/util/List;)Ljava/lang/Object; + ARG 1 path + ARG 2 foundSymlinks diff --git a/mappings/net/minecraft/resource/ResourcePackProfile.mapping b/mappings/net/minecraft/resource/ResourcePackProfile.mapping index 6c2fa67ada..7afff65760 100644 --- a/mappings/net/minecraft/resource/ResourcePackProfile.mapping +++ b/mappings/net/minecraft/resource/ResourcePackProfile.mapping @@ -11,35 +11,24 @@ CLASS net/minecraft/class_3288 net/minecraft/resource/ResourcePackProfile FIELD field_14270 pinned Z FIELD field_14271 alwaysEnabled Z FIELD field_14272 name Ljava/lang/String; - FIELD field_14273 packFactory Ljava/util/function/Supplier; + FIELD field_14273 packFactory Lnet/minecraft/class_3288$class_7680; FIELD field_14274 displayName Lnet/minecraft/class_2561; - FIELD field_14275 description Lnet/minecraft/class_2561; FIELD field_14277 position Lnet/minecraft/class_3288$class_3289; - FIELD field_14278 compatibility Lnet/minecraft/class_3281; FIELD field_14279 LOGGER Lorg/slf4j/Logger; FIELD field_25346 source Lnet/minecraft/class_5352; - METHOD (Ljava/lang/String;Lnet/minecraft/class_2561;ZLjava/util/function/Supplier;Lnet/minecraft/class_3272;Lnet/minecraft/class_3264;Lnet/minecraft/class_3288$class_3289;Lnet/minecraft/class_5352;)V - ARG 1 name - ARG 2 displayName - ARG 3 alwaysEnabled - ARG 4 packFactory - ARG 5 metadata - ARG 6 type - ARG 7 direction - ARG 8 source - METHOD (Ljava/lang/String;ZLjava/util/function/Supplier;Lnet/minecraft/class_2561;Lnet/minecraft/class_2561;Lnet/minecraft/class_3281;Lnet/minecraft/class_3288$class_3289;ZLnet/minecraft/class_5352;)V + FIELD field_45056 metadata Lnet/minecraft/class_3288$class_7679; + METHOD (Ljava/lang/String;ZLnet/minecraft/class_3288$class_7680;Lnet/minecraft/class_2561;Lnet/minecraft/class_3288$class_7679;Lnet/minecraft/class_3288$class_3289;ZLnet/minecraft/class_5352;)V ARG 1 name ARG 2 alwaysEnabled ARG 3 packFactory ARG 4 displayName - ARG 5 description - ARG 6 compatibility - ARG 7 direction - ARG 8 pinned - ARG 9 source + ARG 5 metadata + ARG 6 position + ARG 7 pinned + ARG 8 source 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; + METHOD method_14456 of (Ljava/lang/String;Lnet/minecraft/class_2561;ZLnet/minecraft/class_3288$class_7680;Lnet/minecraft/class_3288$class_7679;Lnet/minecraft/class_3288$class_3289;ZLnet/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 @@ -49,11 +38,13 @@ CLASS net/minecraft/class_3288 net/minecraft/resource/ResourcePackProfile COMMENT COMMENT @return the created profile, or {@code null} if missing metadata ARG 0 name - ARG 1 alwaysEnabled - ARG 2 packFactory - ARG 3 profileFactory - ARG 4 insertionPosition - ARG 5 packSource + ARG 1 displayName + ARG 2 alwaysEnabled + ARG 3 packFactory + ARG 4 metadata + ARG 5 position + ARG 6 pinned + ARG 7 source METHOD method_14457 getDisplayName ()Lnet/minecraft/class_2561; METHOD method_14458 createResourcePack ()Lnet/minecraft/class_3262; METHOD method_14459 getDescription ()Lnet/minecraft/class_2561; @@ -67,6 +58,22 @@ CLASS net/minecraft/class_3288 net/minecraft/resource/ResourcePackProfile METHOD method_14465 isPinned ()Z METHOD method_14466 getInitialPosition ()Lnet/minecraft/class_3288$class_3289; METHOD method_29483 getSource ()Lnet/minecraft/class_5352; + METHOD method_45274 loadMetadata (Ljava/lang/String;Lnet/minecraft/class_3288$class_7680;I)Lnet/minecraft/class_3288$class_7679; + ARG 0 name + ARG 1 packFactory + ARG 2 currentPackFormat + METHOD method_45275 create (Ljava/lang/String;Lnet/minecraft/class_2561;ZLnet/minecraft/class_3288$class_7680;Lnet/minecraft/class_3264;Lnet/minecraft/class_3288$class_3289;Lnet/minecraft/class_5352;)Lnet/minecraft/class_3288; + ARG 0 name + ARG 1 displayName + ARG 2 alwaysEnabled + ARG 3 packFactory + ARG 4 type + ARG 5 position + ARG 6 source + METHOD method_45276 getRequestedFeatures ()Lnet/minecraft/class_7699; + METHOD method_52440 getSupportedFormats (Ljava/lang/String;Lnet/minecraft/class_3272;)Lnet/minecraft/class_6497; + ARG 0 packName + ARG 1 metadata CLASS class_3289 InsertionPosition METHOD method_14467 inverse ()Lnet/minecraft/class_3288$class_3289; METHOD method_14468 insert (Ljava/util/List;Ljava/lang/Object;Ljava/util/function/Function;Z)I @@ -74,19 +81,10 @@ CLASS net/minecraft/class_3288 net/minecraft/resource/ResourcePackProfile ARG 2 item ARG 3 profileGetter ARG 4 listInverted - CLASS class_5351 Factory - COMMENT A factory for resource pack profiles, somewhat resembling the constructor - COMMENT of {@link ResourcePackProfile} but allowing more customization. - METHOD create (Ljava/lang/String;Lnet/minecraft/class_2561;ZLjava/util/function/Supplier;Lnet/minecraft/class_3272;Lnet/minecraft/class_3288$class_3289;Lnet/minecraft/class_5352;)Lnet/minecraft/class_3288; - COMMENT Creates a proper resource pack profile from the given parameters. - COMMENT - COMMENT @apiNote Instead of calling this method, users usually call {@link - COMMENT ResourcePackProfile#of}, which fills some of the parameters for a call to this - COMMENT method. + CLASS class_7679 Metadata + CLASS class_7680 PackFactory + METHOD method_52424 open (Ljava/lang/String;)Lnet/minecraft/class_3262; + ARG 1 name + METHOD method_52425 openWithOverlays (Ljava/lang/String;Lnet/minecraft/class_3288$class_7679;)Lnet/minecraft/class_3262; ARG 1 name - ARG 2 displayName - ARG 3 alwaysEnabled - ARG 4 packFactory - ARG 5 metadata - ARG 6 initialPosition - ARG 7 source + ARG 2 metadata diff --git a/mappings/net/minecraft/resource/ResourcePackProvider.mapping b/mappings/net/minecraft/resource/ResourcePackProvider.mapping index 0b3293efcf..0e30669bb3 100644 --- a/mappings/net/minecraft/resource/ResourcePackProvider.mapping +++ b/mappings/net/minecraft/resource/ResourcePackProvider.mapping @@ -1,12 +1,10 @@ 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 + METHOD method_14453 register (Ljava/util/function/Consumer;)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/ResourcePackSource.mapping b/mappings/net/minecraft/resource/ResourcePackSource.mapping index 34d1547da5..a743d00cfe 100644 --- a/mappings/net/minecraft/resource/ResourcePackSource.mapping +++ b/mappings/net/minecraft/resource/ResourcePackSource.mapping @@ -1,11 +1,17 @@ CLASS net/minecraft/class_5352 net/minecraft/resource/ResourcePackSource - FIELD field_25347 PACK_SOURCE_NONE Lnet/minecraft/class_5352; - METHOD decorate (Lnet/minecraft/class_2561;)Lnet/minecraft/class_2561; + FIELD field_25347 NONE Lnet/minecraft/class_5352; + FIELD field_25348 BUILTIN Lnet/minecraft/class_5352; + FIELD field_25349 WORLD Lnet/minecraft/class_5352; + FIELD field_25350 SERVER Lnet/minecraft/class_5352; + FIELD field_40047 NONE_SOURCE_TEXT_SUPPLIER Ljava/util/function/UnaryOperator; + FIELD field_40048 FEATURE Lnet/minecraft/class_5352; + METHOD method_45279 canBeEnabledLater ()Z + METHOD method_45280 getSourceTextSupplier (Ljava/lang/String;)Ljava/util/function/UnaryOperator; + ARG 0 translationKey + METHOD method_45281 create (Ljava/util/function/UnaryOperator;Z)Lnet/minecraft/class_5352; + ARG 0 sourceTextSupplier + ARG 1 canBeEnabledLater + METHOD method_45282 decorate (Lnet/minecraft/class_2561;)Lnet/minecraft/class_2561; ARG 1 packName - METHOD method_29485 onlyName ()Lnet/minecraft/class_5352; - METHOD method_29486 nameAndSource (Ljava/lang/String;)Lnet/minecraft/class_5352; - ARG 0 source - METHOD method_29487 (Lnet/minecraft/class_2561;)Lnet/minecraft/class_2561; - ARG 0 name - METHOD method_29488 (Lnet/minecraft/class_2561;Lnet/minecraft/class_2561;)Lnet/minecraft/class_2561; + METHOD method_45283 (Lnet/minecraft/class_2561;Lnet/minecraft/class_2561;)Lnet/minecraft/class_2561; ARG 1 name diff --git a/mappings/net/minecraft/resource/ResourceType.mapping b/mappings/net/minecraft/resource/ResourceType.mapping index 75394bf66b..8ee9c05dae 100644 --- a/mappings/net/minecraft/resource/ResourceType.mapping +++ b/mappings/net/minecraft/resource/ResourceType.mapping @@ -1,9 +1,5 @@ CLASS net/minecraft/class_3264 net/minecraft/resource/ResourceType FIELD field_14189 directory Ljava/lang/String; - FIELD field_26937 packType Lcom/mojang/bridge/game/PackType; - METHOD (Ljava/lang/String;ILjava/lang/String;Lcom/mojang/bridge/game/PackType;)V + METHOD (Ljava/lang/String;ILjava/lang/String;)V ARG 3 name - ARG 4 packType METHOD method_14413 getDirectory ()Ljava/lang/String; - METHOD method_31438 getPackVersion (Lcom/mojang/bridge/game/GameVersion;)I - ARG 1 gameVersion diff --git a/mappings/net/minecraft/resource/SinglePreparationResourceReloader.mapping b/mappings/net/minecraft/resource/SinglePreparationResourceReloader.mapping index 57d5b32b09..f19f371f62 100644 --- a/mappings/net/minecraft/resource/SinglePreparationResourceReloader.mapping +++ b/mappings/net/minecraft/resource/SinglePreparationResourceReloader.mapping @@ -25,3 +25,5 @@ CLASS net/minecraft/class_4080 net/minecraft/resource/SinglePreparationResourceR COMMENT the resource manager ARG 2 profiler COMMENT the prepare profiler + METHOD method_18790 (Lnet/minecraft/class_3300;Lnet/minecraft/class_3695;Ljava/lang/Object;)V + ARG 3 prepared diff --git a/mappings/net/minecraft/resource/VanillaDataPackProvider.mapping b/mappings/net/minecraft/resource/VanillaDataPackProvider.mapping index a9da4b90ad..769862a3bc 100644 --- a/mappings/net/minecraft/resource/VanillaDataPackProvider.mapping +++ b/mappings/net/minecraft/resource/VanillaDataPackProvider.mapping @@ -1,4 +1,11 @@ CLASS net/minecraft/class_3286 net/minecraft/resource/VanillaDataPackProvider - FIELD field_14269 pack Lnet/minecraft/class_3268; - FIELD field_26939 DEFAULT_PACK_METADATA Lnet/minecraft/class_3272; - FIELD field_29782 NAME Ljava/lang/String; + FIELD field_26939 METADATA_MAP Lnet/minecraft/class_7662; + FIELD field_29782 NAME Lnet/minecraft/class_2561; + FIELD field_40051 METADATA Lnet/minecraft/class_3272; + FIELD field_40052 FEATURE_FLAGS Lnet/minecraft/class_7663; + FIELD field_40053 ID Lnet/minecraft/class_2960; + METHOD method_45285 createManager (Lnet/minecraft/class_32$class_5143;)Lnet/minecraft/class_3283; + ARG 0 session + METHOD method_45286 createManager (Ljava/nio/file/Path;Lnet/minecraft/class_8580;)Lnet/minecraft/class_3283; + ARG 0 dataPacksPath + METHOD method_45287 createDefaultPack ()Lnet/minecraft/class_3268; diff --git a/mappings/net/minecraft/resource/VanillaResourcePackProvider.mapping b/mappings/net/minecraft/resource/VanillaResourcePackProvider.mapping new file mode 100644 index 0000000000..8b90b61064 --- /dev/null +++ b/mappings/net/minecraft/resource/VanillaResourcePackProvider.mapping @@ -0,0 +1,42 @@ +CLASS net/minecraft/class_7678 net/minecraft/resource/VanillaResourcePackProvider + FIELD field_40039 VANILLA_KEY Ljava/lang/String; + FIELD field_40040 LOGGER Lorg/slf4j/Logger; + FIELD field_40041 type Lnet/minecraft/class_3264; + FIELD field_40042 resourcePack Lnet/minecraft/class_3268; + FIELD field_40043 id Lnet/minecraft/class_2960; + FIELD field_45052 symlinkFinder Lnet/minecraft/class_8580; + METHOD (Lnet/minecraft/class_3264;Lnet/minecraft/class_3268;Lnet/minecraft/class_2960;Lnet/minecraft/class_8580;)V + ARG 1 type + ARG 2 resourcePack + ARG 3 id + ARG 4 symlinkFinder + METHOD method_45256 getResourcePack ()Lnet/minecraft/class_3268; + METHOD method_45257 createDefault (Lnet/minecraft/class_3262;)Lnet/minecraft/class_3288; + ARG 1 pack + METHOD method_45258 (Lnet/minecraft/class_3288$class_7680;Ljava/lang/String;)Lnet/minecraft/class_3288; + ARG 2 name + METHOD method_45259 getProfileName (Ljava/lang/String;)Lnet/minecraft/class_2561; + ARG 1 id + METHOD method_45260 create (Ljava/lang/String;Lnet/minecraft/class_3288$class_7680;Lnet/minecraft/class_2561;)Lnet/minecraft/class_3288; + ARG 1 name + ARG 2 packFactory + ARG 3 displayName + METHOD method_45261 getFileName (Ljava/nio/file/Path;)Ljava/lang/String; + ARG 0 path + METHOD method_45262 forEachProfile (Ljava/nio/file/Path;Ljava/util/function/BiConsumer;)V + ARG 1 namespacedPath + ARG 2 consumer + METHOD method_45263 forEachProfile (Ljava/util/function/BiConsumer;)V + ARG 1 consumer + METHOD method_45264 (Ljava/util/function/BiConsumer;Ljava/nio/file/Path;)V + ARG 2 namespacedPath + METHOD method_45265 (Ljava/util/function/BiConsumer;Ljava/nio/file/Path;Lnet/minecraft/class_3288$class_7680;)V + ARG 2 profilePath + ARG 3 factory + METHOD method_45266 (Ljava/util/function/Consumer;Ljava/lang/String;Ljava/util/function/Function;)V + ARG 1 fileName + ARG 2 packFactory + METHOD method_45267 forEachProfile (Ljava/util/function/Consumer;)V + ARG 1 consumer + METHOD method_52435 createPackFactory (Lnet/minecraft/class_3262;)Lnet/minecraft/class_3288$class_7680; + ARG 0 pack diff --git a/mappings/net/minecraft/resource/ZipResourcePack.mapping b/mappings/net/minecraft/resource/ZipResourcePack.mapping index 0f245d022e..555368f94f 100644 --- a/mappings/net/minecraft/resource/ZipResourcePack.mapping +++ b/mappings/net/minecraft/resource/ZipResourcePack.mapping @@ -1,4 +1,35 @@ CLASS net/minecraft/class_3258 net/minecraft/resource/ZipResourcePack - FIELD field_14183 TYPE_NAMESPACE_SPLITTER Lcom/google/common/base/Splitter; - FIELD field_14184 file Ljava/util/zip/ZipFile; - METHOD method_14399 getZipFile ()Ljava/util/zip/ZipFile; + FIELD field_39096 LOGGER Lorg/slf4j/Logger; + FIELD field_45038 zipFile Lnet/minecraft/class_3258$class_8616; + FIELD field_45039 overlay Ljava/lang/String; + METHOD (Ljava/lang/String;Lnet/minecraft/class_3258$class_8616;ZLjava/lang/String;)V + ARG 1 name + ARG 2 zipFile + ARG 3 alwaysStable + ARG 4 overlay + METHOD method_14391 openFile (Ljava/lang/String;)Lnet/minecraft/class_7367; + ARG 1 path + METHOD method_45177 toPath (Lnet/minecraft/class_3264;Lnet/minecraft/class_2960;)Ljava/lang/String; + ARG 0 type + ARG 1 id + METHOD method_52422 appendOverlayPrefix (Ljava/lang/String;)Ljava/lang/String; + ARG 1 path + METHOD method_52423 getNamespace (Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String; + ARG 0 prefix + ARG 1 entryName + CLASS class_8615 ZipBackedFactory + FIELD field_45040 file Ljava/io/File; + FIELD field_45041 alwaysStable Z + METHOD (Ljava/io/File;Z)V + ARG 1 file + ARG 2 alwaysStable + METHOD (Ljava/nio/file/Path;Z)V + ARG 1 path + ARG 2 alwaysStable + CLASS class_8616 ZipFileWrapper + FIELD field_45042 file Ljava/io/File; + FIELD field_45043 zip Ljava/util/zip/ZipFile; + FIELD field_45044 closed Z + METHOD (Ljava/io/File;)V + ARG 1 file + METHOD method_52426 open ()Ljava/util/zip/ZipFile; diff --git a/mappings/net/minecraft/resource/featuretoggle/FeatureFlag.mapping b/mappings/net/minecraft/resource/featuretoggle/FeatureFlag.mapping new file mode 100644 index 0000000000..5bc8fbd9fe --- /dev/null +++ b/mappings/net/minecraft/resource/featuretoggle/FeatureFlag.mapping @@ -0,0 +1,6 @@ +CLASS net/minecraft/class_7696 net/minecraft/resource/featuretoggle/FeatureFlag + FIELD field_40163 universe Lnet/minecraft/class_7700; + FIELD field_40164 mask J + METHOD (Lnet/minecraft/class_7700;I)V + ARG 1 universe + ARG 2 id diff --git a/mappings/net/minecraft/resource/featuretoggle/FeatureFlags.mapping b/mappings/net/minecraft/resource/featuretoggle/FeatureFlags.mapping new file mode 100644 index 0000000000..fe0557e612 --- /dev/null +++ b/mappings/net/minecraft/resource/featuretoggle/FeatureFlags.mapping @@ -0,0 +1,19 @@ +CLASS net/minecraft/class_7701 net/minecraft/resource/featuretoggle/FeatureFlags + FIELD field_40177 VANILLA Lnet/minecraft/class_7696; + FIELD field_40178 BUNDLE Lnet/minecraft/class_7696; + FIELD field_40180 FEATURE_MANAGER Lnet/minecraft/class_7697; + FIELD field_40181 CODEC Lcom/mojang/serialization/Codec; + FIELD field_40182 VANILLA_FEATURES Lnet/minecraft/class_7699; + FIELD field_40183 DEFAULT_ENABLED_FEATURES Lnet/minecraft/class_7699; + FIELD field_45142 TRADE_REBALANCE Lnet/minecraft/class_7696; + METHOD method_45405 printMissingFlags (Lnet/minecraft/class_7697;Lnet/minecraft/class_7699;Lnet/minecraft/class_7699;)Ljava/lang/String; + ARG 0 featureManager + ARG 1 featuresToCheck + ARG 2 features + METHOD method_45406 isNotVanilla (Lnet/minecraft/class_7699;)Z + ARG 0 features + METHOD method_45407 printMissingFlags (Lnet/minecraft/class_7699;Lnet/minecraft/class_7699;)Ljava/lang/String; + ARG 0 featuresToCheck + ARG 1 features + METHOD method_45408 (Ljava/util/Set;Lnet/minecraft/class_2960;)Z + ARG 1 id diff --git a/mappings/net/minecraft/resource/featuretoggle/FeatureManager.mapping b/mappings/net/minecraft/resource/featuretoggle/FeatureManager.mapping new file mode 100644 index 0000000000..6965c148fe --- /dev/null +++ b/mappings/net/minecraft/resource/featuretoggle/FeatureManager.mapping @@ -0,0 +1,42 @@ +CLASS net/minecraft/class_7697 net/minecraft/resource/featuretoggle/FeatureManager + FIELD field_40165 LOGGER Lorg/slf4j/Logger; + FIELD field_40166 universe Lnet/minecraft/class_7700; + FIELD field_40167 featureFlags Ljava/util/Map; + FIELD field_40168 featureSet Lnet/minecraft/class_7699; + METHOD (Lnet/minecraft/class_7700;Lnet/minecraft/class_7699;Ljava/util/Map;)V + ARG 1 universe + ARG 2 featureSet + ARG 3 featureFlags + METHOD method_45383 getFeatureSet ()Lnet/minecraft/class_7699; + METHOD method_45384 (Lnet/minecraft/class_2960;)V + ARG 0 feature + METHOD method_45385 contains (Lnet/minecraft/class_7699;)Z + ARG 1 features + METHOD method_45386 (Lnet/minecraft/class_7699;Ljava/util/Set;Lnet/minecraft/class_2960;Lnet/minecraft/class_7696;)V + ARG 2 identifier + ARG 3 featureFlag + METHOD method_45387 featureSetOf (Ljava/lang/Iterable;)Lnet/minecraft/class_7699; + ARG 1 features + METHOD method_45388 featureSetOf (Ljava/lang/Iterable;Ljava/util/function/Consumer;)Lnet/minecraft/class_7699; + ARG 1 features + ARG 2 unknownFlagConsumer + METHOD method_45389 (Ljava/util/List;)Lcom/mojang/serialization/DataResult; + ARG 1 featureIds + METHOD method_45390 featureSetOf ([Lnet/minecraft/class_7696;)Lnet/minecraft/class_7699; + ARG 1 features + METHOD method_45391 getCodec ()Lcom/mojang/serialization/Codec; + METHOD method_45392 toId (Lnet/minecraft/class_7699;)Ljava/util/Set; + ARG 1 features + METHOD method_45393 (Lnet/minecraft/class_7699;)Ljava/util/List; + ARG 1 features + CLASS class_7698 Builder + FIELD field_40169 universe Lnet/minecraft/class_7700; + FIELD field_40170 id I + FIELD field_40171 featureFlags Ljava/util/Map; + METHOD (Ljava/lang/String;)V + ARG 1 universe + METHOD method_45394 build ()Lnet/minecraft/class_7697; + METHOD method_45395 addFlag (Lnet/minecraft/class_2960;)Lnet/minecraft/class_7696; + ARG 1 feature + METHOD method_45396 addVanillaFlag (Ljava/lang/String;)Lnet/minecraft/class_7696; + ARG 1 feature diff --git a/mappings/net/minecraft/resource/featuretoggle/FeatureSet.mapping b/mappings/net/minecraft/resource/featuretoggle/FeatureSet.mapping new file mode 100644 index 0000000000..1855ca5583 --- /dev/null +++ b/mappings/net/minecraft/resource/featuretoggle/FeatureSet.mapping @@ -0,0 +1,29 @@ +CLASS net/minecraft/class_7699 net/minecraft/resource/featuretoggle/FeatureSet + FIELD field_40172 MAX_FEATURE_FLAGS I + FIELD field_40173 EMPTY Lnet/minecraft/class_7699; + FIELD field_40174 universe Lnet/minecraft/class_7700; + FIELD field_40175 featuresMask J + METHOD (Lnet/minecraft/class_7700;J)V + ARG 1 universe + ARG 2 featuresMask + METHOD equals (Ljava/lang/Object;)Z + ARG 1 o + METHOD method_45397 empty ()Lnet/minecraft/class_7699; + METHOD method_45398 of (Lnet/minecraft/class_7696;)Lnet/minecraft/class_7699; + ARG 0 feature + METHOD method_45399 of (Lnet/minecraft/class_7696;[Lnet/minecraft/class_7696;)Lnet/minecraft/class_7699; + ARG 0 feature1 + ARG 1 features + METHOD method_45400 isSubsetOf (Lnet/minecraft/class_7699;)Z + ARG 1 features + METHOD method_45401 combineMask (Lnet/minecraft/class_7700;JLjava/lang/Iterable;)J + ARG 0 universe + ARG 1 featuresMask + ARG 3 newFeatures + METHOD method_45402 of (Lnet/minecraft/class_7700;Ljava/util/Collection;)Lnet/minecraft/class_7699; + ARG 0 universe + ARG 1 features + METHOD method_45403 contains (Lnet/minecraft/class_7696;)Z + ARG 1 feature + METHOD method_45404 combine (Lnet/minecraft/class_7699;)Lnet/minecraft/class_7699; + ARG 1 features diff --git a/mappings/net/minecraft/resource/featuretoggle/FeatureUniverse.mapping b/mappings/net/minecraft/resource/featuretoggle/FeatureUniverse.mapping new file mode 100644 index 0000000000..b181d64086 --- /dev/null +++ b/mappings/net/minecraft/resource/featuretoggle/FeatureUniverse.mapping @@ -0,0 +1,4 @@ +CLASS net/minecraft/class_7700 net/minecraft/resource/featuretoggle/FeatureUniverse + FIELD field_40176 name Ljava/lang/String; + METHOD (Ljava/lang/String;)V + ARG 1 name diff --git a/mappings/net/minecraft/resource/featuretoggle/ToggleableFeature.mapping b/mappings/net/minecraft/resource/featuretoggle/ToggleableFeature.mapping new file mode 100644 index 0000000000..60dd4056cb --- /dev/null +++ b/mappings/net/minecraft/resource/featuretoggle/ToggleableFeature.mapping @@ -0,0 +1,5 @@ +CLASS net/minecraft/class_7695 net/minecraft/resource/featuretoggle/ToggleableFeature + FIELD field_40162 FEATURE_ENABLED_REGISTRY_KEYS Ljava/util/Set; + METHOD method_45322 getRequiredFeatures ()Lnet/minecraft/class_7699; + METHOD method_45382 isEnabled (Lnet/minecraft/class_7699;)Z + ARG 1 enabledFeatures diff --git a/mappings/net/minecraft/resource/fs/ResourceFile.mapping b/mappings/net/minecraft/resource/fs/ResourceFile.mapping new file mode 100644 index 0000000000..5762d38d02 --- /dev/null +++ b/mappings/net/minecraft/resource/fs/ResourceFile.mapping @@ -0,0 +1,5 @@ +CLASS net/minecraft/class_7673 net/minecraft/resource/fs/ResourceFile + FIELD field_40035 EMPTY Lnet/minecraft/class_7673; + FIELD field_40036 RELATIVE Lnet/minecraft/class_7673; + CLASS class_7674 Directory + CLASS class_7675 File diff --git a/mappings/net/minecraft/resource/fs/ResourceFileAttributes.mapping b/mappings/net/minecraft/resource/fs/ResourceFileAttributes.mapping new file mode 100644 index 0000000000..d8d6ec19d8 --- /dev/null +++ b/mappings/net/minecraft/resource/fs/ResourceFileAttributes.mapping @@ -0,0 +1,2 @@ +CLASS net/minecraft/class_7666 net/minecraft/resource/fs/ResourceFileAttributes + FIELD field_40011 EPOCH Ljava/nio/file/attribute/FileTime; diff --git a/mappings/net/minecraft/resource/fs/ResourceFileStore.mapping b/mappings/net/minecraft/resource/fs/ResourceFileStore.mapping new file mode 100644 index 0000000000..ab10c10fe8 --- /dev/null +++ b/mappings/net/minecraft/resource/fs/ResourceFileStore.mapping @@ -0,0 +1,12 @@ +CLASS net/minecraft/class_7667 net/minecraft/resource/fs/ResourceFileStore + FIELD field_40012 name Ljava/lang/String; + METHOD (Ljava/lang/String;)V + ARG 1 name + METHOD getAttribute (Ljava/lang/String;)Ljava/lang/Object; + ARG 1 attribute + METHOD getFileStoreAttributeView (Ljava/lang/Class;)Ljava/nio/file/attribute/FileStoreAttributeView; + ARG 1 type + METHOD supportsFileAttributeView (Ljava/lang/Class;)Z + ARG 1 type + METHOD supportsFileAttributeView (Ljava/lang/String;)Z + ARG 1 name diff --git a/mappings/net/minecraft/resource/fs/ResourceFileSystem.mapping b/mappings/net/minecraft/resource/fs/ResourceFileSystem.mapping new file mode 100644 index 0000000000..063c5ade58 --- /dev/null +++ b/mappings/net/minecraft/resource/fs/ResourceFileSystem.mapping @@ -0,0 +1,43 @@ +CLASS net/minecraft/class_7670 net/minecraft/resource/fs/ResourceFileSystem + FIELD field_40028 SEPARATOR Ljava/lang/String; + FIELD field_40029 SUPPORTED_FILE_ATTRIBUTE_VIEWS Ljava/util/Set; + FIELD field_40030 SEPARATOR_SPLITTER Lcom/google/common/base/Splitter; + FIELD field_40031 store Ljava/nio/file/FileStore; + FIELD field_40032 fileSystemProvider Ljava/nio/file/spi/FileSystemProvider; + FIELD field_40033 root Lnet/minecraft/class_7668; + METHOD (Ljava/lang/String;Lnet/minecraft/class_7670$class_7672;)V + ARG 1 name + ARG 2 root + METHOD getPath (Ljava/lang/String;[Ljava/lang/String;)Ljava/nio/file/Path; + ARG 1 first + ARG 2 more + METHOD getPathMatcher (Ljava/lang/String;)Ljava/nio/file/PathMatcher; + ARG 1 syntaxAndPattern + METHOD method_45241 getStore ()Ljava/nio/file/FileStore; + METHOD method_45242 toResourcePath (Lnet/minecraft/class_7670$class_7672;Lnet/minecraft/class_7670;Ljava/lang/String;Lnet/minecraft/class_7668;)Lnet/minecraft/class_7668; + ARG 0 root + ARG 1 fileSystem + ARG 2 name + ARG 3 parent + METHOD method_45243 (Lit/unimi/dsi/fastutil/objects/Object2ObjectOpenHashMap;Lnet/minecraft/class_7670;Lnet/minecraft/class_7668;Ljava/lang/String;Lnet/minecraft/class_7670$class_7672;)V + ARG 3 directoryName + ARG 4 directory + METHOD method_45244 (Lit/unimi/dsi/fastutil/objects/Object2ObjectOpenHashMap;Lnet/minecraft/class_7670;Lnet/minecraft/class_7668;Ljava/lang/String;Ljava/nio/file/Path;)V + ARG 3 fileName + ARG 4 path + METHOD method_45245 getRoot ()Lnet/minecraft/class_7668; + METHOD method_45246 builder ()Lnet/minecraft/class_7670$class_7671; + CLASS class_7671 Builder + FIELD field_40034 root Lnet/minecraft/class_7670$class_7672; + METHOD method_45247 build (Ljava/lang/String;)Ljava/nio/file/FileSystem; + ARG 1 name + METHOD method_45248 withFile (Ljava/util/List;Ljava/lang/String;Ljava/nio/file/Path;)Lnet/minecraft/class_7670$class_7671; + ARG 1 directories + ARG 2 name + ARG 3 path + METHOD method_45249 withFile (Ljava/util/List;Ljava/nio/file/Path;)Lnet/minecraft/class_7670$class_7671; + ARG 1 directories + ARG 2 path + METHOD method_45250 (Ljava/lang/String;)Lnet/minecraft/class_7670$class_7672; + ARG 0 directory + CLASS class_7672 Directory diff --git a/mappings/net/minecraft/resource/fs/ResourceFileSystemProvider.mapping b/mappings/net/minecraft/resource/fs/ResourceFileSystemProvider.mapping new file mode 100644 index 0000000000..7d72cb4e20 --- /dev/null +++ b/mappings/net/minecraft/resource/fs/ResourceFileSystemProvider.mapping @@ -0,0 +1,63 @@ +CLASS net/minecraft/class_7669 net/minecraft/resource/fs/ResourceFileSystemProvider + FIELD field_40023 SCHEME Ljava/lang/String; + METHOD checkAccess (Ljava/nio/file/Path;[Ljava/nio/file/AccessMode;)V + ARG 1 path + ARG 2 modes + METHOD copy (Ljava/nio/file/Path;Ljava/nio/file/Path;[Ljava/nio/file/CopyOption;)V + ARG 1 source + ARG 2 target + ARG 3 options + METHOD createDirectory (Ljava/nio/file/Path;[Ljava/nio/file/attribute/FileAttribute;)V + ARG 1 dir + ARG 2 attrs + METHOD delete (Ljava/nio/file/Path;)V + ARG 1 path + METHOD getFileAttributeView (Ljava/nio/file/Path;Ljava/lang/Class;[Ljava/nio/file/LinkOption;)Ljava/nio/file/attribute/FileAttributeView; + ARG 1 path + ARG 2 type + ARG 3 options + METHOD getFileStore (Ljava/nio/file/Path;)Ljava/nio/file/FileStore; + ARG 1 path + METHOD getFileSystem (Ljava/net/URI;)Ljava/nio/file/FileSystem; + ARG 1 uri + METHOD getPath (Ljava/net/URI;)Ljava/nio/file/Path; + ARG 1 uri + METHOD isHidden (Ljava/nio/file/Path;)Z + ARG 1 path + METHOD isSameFile (Ljava/nio/file/Path;Ljava/nio/file/Path;)Z + ARG 1 path + ARG 2 path2 + METHOD method_45238 toResourcePath (Ljava/nio/file/Path;)Lnet/minecraft/class_7668; + ARG 0 path + METHOD move (Ljava/nio/file/Path;Ljava/nio/file/Path;[Ljava/nio/file/CopyOption;)V + ARG 1 source + ARG 2 target + ARG 3 options + METHOD newByteChannel (Ljava/nio/file/Path;Ljava/util/Set;[Ljava/nio/file/attribute/FileAttribute;)Ljava/nio/channels/SeekableByteChannel; + ARG 1 path + ARG 2 options + ARG 3 attrs + METHOD newDirectoryStream (Ljava/nio/file/Path;Ljava/nio/file/DirectoryStream$Filter;)Ljava/nio/file/DirectoryStream; + ARG 1 dir + ARG 2 filter + METHOD newFileSystem (Ljava/net/URI;Ljava/util/Map;)Ljava/nio/file/FileSystem; + ARG 1 uri + ARG 2 env + METHOD readAttributes (Ljava/nio/file/Path;Ljava/lang/Class;[Ljava/nio/file/LinkOption;)Ljava/nio/file/attribute/BasicFileAttributes; + ARG 1 path + ARG 2 type + ARG 3 options + METHOD readAttributes (Ljava/nio/file/Path;Ljava/lang/String;[Ljava/nio/file/LinkOption;)Ljava/util/Map; + ARG 1 path + ARG 2 attributes + ARG 3 options + METHOD setAttribute (Ljava/nio/file/Path;Ljava/lang/String;Ljava/lang/Object;[Ljava/nio/file/LinkOption;)V + ARG 1 path + ARG 2 attribute + ARG 3 value + ARG 4 options + CLASS 1 + METHOD method_45239 (Lnet/minecraft/class_7668;)Ljava/nio/file/Path; + ARG 0 child + METHOD method_45240 (Ljava/nio/file/DirectoryStream$Filter;Lnet/minecraft/class_7668;)Z + ARG 1 child diff --git a/mappings/net/minecraft/resource/fs/ResourcePath.mapping b/mappings/net/minecraft/resource/fs/ResourcePath.mapping new file mode 100644 index 0000000000..7df25374db --- /dev/null +++ b/mappings/net/minecraft/resource/fs/ResourcePath.mapping @@ -0,0 +1,62 @@ +CLASS net/minecraft/class_7668 net/minecraft/resource/fs/ResourcePath + FIELD field_40013 DIRECTORY_ATTRIBUTES Ljava/nio/file/attribute/BasicFileAttributes; + FIELD field_40014 FILE_ATTRIBUTES Ljava/nio/file/attribute/BasicFileAttributes; + FIELD field_40015 COMPARATOR Ljava/util/Comparator; + FIELD field_40016 name Ljava/lang/String; + FIELD field_40017 fileSystem Lnet/minecraft/class_7670; + FIELD field_40018 parent Lnet/minecraft/class_7668; + FIELD field_40019 names Ljava/util/List; + FIELD field_40020 pathString Ljava/lang/String; + FIELD field_40021 file Lnet/minecraft/class_7673; + METHOD (Lnet/minecraft/class_7670;Ljava/lang/String;Lnet/minecraft/class_7668;Lnet/minecraft/class_7673;)V + ARG 1 fileSystem + ARG 2 name + ARG 3 parent + ARG 4 file + METHOD compareTo (Ljava/lang/Object;)I + ARG 1 other + METHOD endsWith (Ljava/nio/file/Path;)Z + ARG 1 other + METHOD equals (Ljava/lang/Object;)Z + ARG 1 o + METHOD getName (I)Ljava/nio/file/Path; + ARG 1 index + METHOD method_45217 relativize (Lnet/minecraft/class_7668;Ljava/lang/String;)Lnet/minecraft/class_7668; + ARG 1 path + ARG 2 name + METHOD method_45218 isSpecial (Lnet/minecraft/class_7673;)Z + ARG 0 file + METHOD method_45219 get (Ljava/lang/String;)Lnet/minecraft/class_7668; + ARG 1 name + METHOD method_45221 get (Ljava/util/List;)Lnet/minecraft/class_7668; + ARG 1 paths + METHOD method_45226 toResourcePath (Ljava/nio/file/Path;)Lnet/minecraft/class_7668; + ARG 1 path + METHOD method_45230 isReadable ()Z + METHOD method_45231 toPath ()Ljava/nio/file/Path; + METHOD method_45232 toDirectory ()Lnet/minecraft/class_7673$class_7674; + METHOD method_45233 getAttributeView ()Ljava/nio/file/attribute/BasicFileAttributeView; + METHOD method_45234 getAttributes ()Ljava/nio/file/attribute/BasicFileAttributes; + METHOD method_45235 getNames ()Ljava/util/List; + METHOD method_45236 isNormal ()Z + METHOD method_45237 getPathString ()Ljava/lang/String; + METHOD register (Ljava/nio/file/WatchService;[Ljava/nio/file/WatchEvent$Kind;[Ljava/nio/file/WatchEvent$Modifier;)Ljava/nio/file/WatchKey; + ARG 1 watcher + ARG 2 events + ARG 3 modifiers + METHOD relativize (Ljava/nio/file/Path;)Ljava/nio/file/Path; + ARG 1 other + METHOD resolve (Ljava/nio/file/Path;)Ljava/nio/file/Path; + ARG 1 other + METHOD startsWith (Ljava/nio/file/Path;)Z + ARG 1 other + METHOD subpath (II)Ljava/nio/file/Path; + ARG 1 beginIndex + ARG 2 endIndex + METHOD toRealPath ([Ljava/nio/file/LinkOption;)Ljava/nio/file/Path; + ARG 1 options + CLASS 3 + METHOD setTimes (Ljava/nio/file/attribute/FileTime;Ljava/nio/file/attribute/FileTime;Ljava/nio/file/attribute/FileTime;)V + ARG 1 lastModifiedTime + ARG 2 lastAccessFile + ARG 3 createTime diff --git a/mappings/net/minecraft/resource/metadata/BlockEntry.mapping b/mappings/net/minecraft/resource/metadata/BlockEntry.mapping new file mode 100644 index 0000000000..ef8a61154b --- /dev/null +++ b/mappings/net/minecraft/resource/metadata/BlockEntry.mapping @@ -0,0 +1,25 @@ +CLASS net/minecraft/class_7085 net/minecraft/resource/metadata/BlockEntry + FIELD field_37293 CODEC Lcom/mojang/serialization/Codec; + FIELD field_37294 namespace Ljava/util/Optional; + FIELD field_37295 namespacePredicate Ljava/util/function/Predicate; + FIELD field_37296 path Ljava/util/Optional; + FIELD field_37297 pathPredicate Ljava/util/function/Predicate; + FIELD field_41286 identifierPredicate Ljava/util/function/Predicate; + METHOD (Ljava/util/Optional;Ljava/util/Optional;)V + ARG 1 namespace + ARG 2 path + METHOD method_41284 (Lnet/minecraft/class_7085;)Ljava/util/Optional; + ARG 0 entry + METHOD method_41285 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 0 instance + METHOD method_41286 (Ljava/lang/String;)Z + ARG 0 path_ + METHOD method_41288 (Lnet/minecraft/class_7085;)Ljava/util/Optional; + ARG 0 entry + METHOD method_41289 (Ljava/lang/String;)Z + ARG 0 namespace_ + METHOD method_47545 getNamespacePredicate ()Ljava/util/function/Predicate; + METHOD method_47546 (Lnet/minecraft/class_2960;)Z + ARG 1 id + METHOD method_47547 getPathPredicate ()Ljava/util/function/Predicate; + METHOD method_47548 getIdentifierPredicate ()Ljava/util/function/Predicate; diff --git a/mappings/net/minecraft/resource/metadata/PackFeatureSetMetadata.mapping b/mappings/net/minecraft/resource/metadata/PackFeatureSetMetadata.mapping new file mode 100644 index 0000000000..162a607d23 --- /dev/null +++ b/mappings/net/minecraft/resource/metadata/PackFeatureSetMetadata.mapping @@ -0,0 +1,5 @@ +CLASS net/minecraft/class_7663 net/minecraft/resource/metadata/PackFeatureSetMetadata + FIELD field_39996 SERIALIZER Lnet/minecraft/class_7677; + FIELD field_39997 CODEC Lcom/mojang/serialization/Codec; + METHOD method_45176 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 0 instance diff --git a/mappings/net/minecraft/resource/metadata/PackOverlaysMetadata.mapping b/mappings/net/minecraft/resource/metadata/PackOverlaysMetadata.mapping new file mode 100644 index 0000000000..612b12343c --- /dev/null +++ b/mappings/net/minecraft/resource/metadata/PackOverlaysMetadata.mapping @@ -0,0 +1,18 @@ +CLASS net/minecraft/class_8617 net/minecraft/resource/metadata/PackOverlaysMetadata + FIELD field_45045 SERIALIZER Lnet/minecraft/class_7677; + FIELD field_45046 DIRECTORY_NAME_PATTERN Ljava/util/regex/Pattern; + FIELD field_45047 CODEC Lcom/mojang/serialization/Codec; + METHOD method_52427 getAppliedOverlays (I)Ljava/util/List; + ARG 1 packFormat + METHOD method_52428 (ILnet/minecraft/class_8617$class_8618;)Z + ARG 1 overlay + METHOD method_52429 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 0 instance + METHOD method_52430 validate (Ljava/lang/String;)Lcom/mojang/serialization/DataResult; + ARG 0 directoryName + CLASS class_8618 Entry + FIELD field_45048 CODEC Lcom/mojang/serialization/Codec; + METHOD method_52432 isValid (I)Z + ARG 1 packFormat + METHOD method_52433 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 0 instance diff --git a/mappings/net/minecraft/resource/metadata/PackResourceMetadata.mapping b/mappings/net/minecraft/resource/metadata/PackResourceMetadata.mapping index 04c97a26ac..8eda65f93d 100644 --- a/mappings/net/minecraft/resource/metadata/PackResourceMetadata.mapping +++ b/mappings/net/minecraft/resource/metadata/PackResourceMetadata.mapping @@ -1,9 +1,8 @@ CLASS net/minecraft/class_3272 net/minecraft/resource/metadata/PackResourceMetadata - FIELD field_14201 packFormat I - FIELD field_14202 READER Lnet/minecraft/class_3274; - FIELD field_14203 description Lnet/minecraft/class_2561; - METHOD (Lnet/minecraft/class_2561;I)V + FIELD field_14202 SERIALIZER Lnet/minecraft/class_7677; + FIELD field_45051 CODEC Lcom/mojang/serialization/Codec; + METHOD (Lnet/minecraft/class_2561;ILjava/util/Optional;)V ARG 1 description ARG 2 format - METHOD method_14423 getDescription ()Lnet/minecraft/class_2561; - METHOD method_14424 getPackFormat ()I + METHOD method_52434 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 0 instance diff --git a/mappings/net/minecraft/resource/metadata/PackResourceMetadataReader.mapping b/mappings/net/minecraft/resource/metadata/PackResourceMetadataReader.mapping deleted file mode 100644 index 181d1a9b66..0000000000 --- a/mappings/net/minecraft/resource/metadata/PackResourceMetadataReader.mapping +++ /dev/null @@ -1 +0,0 @@ -CLASS net/minecraft/class_3274 net/minecraft/resource/metadata/PackResourceMetadataReader diff --git a/mappings/net/minecraft/resource/metadata/ResourceFilter.mapping b/mappings/net/minecraft/resource/metadata/ResourceFilter.mapping index d5e4415eeb..726d446806 100644 --- a/mappings/net/minecraft/resource/metadata/ResourceFilter.mapping +++ b/mappings/net/minecraft/resource/metadata/ResourceFilter.mapping @@ -1,9 +1,8 @@ CLASS net/minecraft/class_7084 net/minecraft/resource/metadata/ResourceFilter - FIELD field_37289 READER Lnet/minecraft/class_3270; - FIELD field_37290 LOGGER Lorg/slf4j/Logger; FIELD field_37291 CODEC Lcom/mojang/serialization/Codec; FIELD field_37292 blocks Ljava/util/List; COMMENT The list of block rules, named {@code block} in the JSON format. + FIELD field_40055 SERIALIZER Lnet/minecraft/class_7677; METHOD (Ljava/util/List;)V ARG 1 blocks METHOD method_41277 (Lnet/minecraft/class_7084;)Ljava/util/List; @@ -12,30 +11,9 @@ CLASS net/minecraft/class_7084 net/minecraft/resource/metadata/ResourceFilter ARG 0 instance METHOD method_41279 isNamespaceBlocked (Ljava/lang/String;)Z ARG 1 namespace - METHOD method_41280 (Ljava/lang/String;Lnet/minecraft/class_7084$class_7085;)Z + METHOD method_41280 (Ljava/lang/String;Lnet/minecraft/class_7085;)Z ARG 1 block METHOD method_41281 isPathBlocked (Ljava/lang/String;)Z ARG 1 namespace - METHOD method_41282 (Ljava/lang/String;Lnet/minecraft/class_7084$class_7085;)Z + METHOD method_41282 (Ljava/lang/String;Lnet/minecraft/class_7085;)Z ARG 1 block - CLASS class_7085 BlockEntry - FIELD field_37293 CODEC Lcom/mojang/serialization/Codec; - FIELD field_37294 namespace Ljava/util/Optional; - FIELD field_37295 namespacePredicate Ljava/util/function/Predicate; - FIELD field_37296 path Ljava/util/Optional; - FIELD field_37297 pathPredicate Ljava/util/function/Predicate; - METHOD (Ljava/util/Optional;Ljava/util/Optional;)V - ARG 1 namespace - ARG 2 path - METHOD method_41284 (Lnet/minecraft/class_7084$class_7085;)Ljava/util/Optional; - ARG 0 entry - METHOD method_41285 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; - ARG 0 instance - METHOD method_41286 (Ljava/lang/String;)Z - ARG 0 path_ - METHOD method_41288 (Lnet/minecraft/class_7084$class_7085;)Ljava/util/Optional; - ARG 0 entry - METHOD method_41289 (Ljava/lang/String;)Z - ARG 0 namespace_ - METHOD test (Ljava/lang/Object;)Z - ARG 1 id diff --git a/mappings/net/minecraft/resource/metadata/ResourceMetadata.mapping b/mappings/net/minecraft/resource/metadata/ResourceMetadata.mapping index ed06ce96e0..338ee46ff0 100644 --- a/mappings/net/minecraft/resource/metadata/ResourceMetadata.mapping +++ b/mappings/net/minecraft/resource/metadata/ResourceMetadata.mapping @@ -1,6 +1,20 @@ CLASS net/minecraft/class_7368 net/minecraft/resource/metadata/ResourceMetadata FIELD field_38688 NONE Lnet/minecraft/class_7368; + FIELD field_40056 NONE_SUPPLIER Lnet/minecraft/class_7367; METHOD method_43041 decode (Lnet/minecraft/class_3270;)Ljava/util/Optional; ARG 1 reader METHOD method_43042 create (Ljava/io/InputStream;)Lnet/minecraft/class_7368; ARG 0 stream + METHOD method_52444 decodeAndAdd (Lnet/minecraft/class_7368$class_8622;Lnet/minecraft/class_3270;)V + ARG 1 builder + ARG 2 reader + METHOD method_52445 (Lnet/minecraft/class_7368$class_8622;Lnet/minecraft/class_3270;Ljava/lang/Object;)V + ARG 2 value + METHOD method_52446 copy (Ljava/util/Collection;)Lnet/minecraft/class_7368; + ARG 1 readers + CLASS class_8622 Builder + FIELD field_45058 values Lcom/google/common/collect/ImmutableMap$Builder; + METHOD method_52447 build ()Lnet/minecraft/class_7368; + METHOD method_52448 add (Lnet/minecraft/class_3270;Ljava/lang/Object;)Lnet/minecraft/class_7368$class_8622; + ARG 1 reader + ARG 2 value diff --git a/mappings/net/minecraft/resource/metadata/ResourceMetadataMap.mapping b/mappings/net/minecraft/resource/metadata/ResourceMetadataMap.mapping new file mode 100644 index 0000000000..0a9f7f65a2 --- /dev/null +++ b/mappings/net/minecraft/resource/metadata/ResourceMetadataMap.mapping @@ -0,0 +1,16 @@ +CLASS net/minecraft/class_7662 net/minecraft/resource/metadata/ResourceMetadataMap + FIELD field_39994 EMPTY Lnet/minecraft/class_7662; + FIELD field_39995 values Ljava/util/Map; + METHOD (Ljava/util/Map;)V + ARG 1 values + METHOD method_45172 of ()Lnet/minecraft/class_7662; + METHOD method_45173 get (Lnet/minecraft/class_3270;)Ljava/lang/Object; + ARG 1 reader + METHOD method_45174 of (Lnet/minecraft/class_3270;Ljava/lang/Object;)Lnet/minecraft/class_7662; + ARG 0 reader + ARG 1 value + METHOD method_45175 of (Lnet/minecraft/class_3270;Ljava/lang/Object;Lnet/minecraft/class_3270;Ljava/lang/Object;)Lnet/minecraft/class_7662; + ARG 0 reader + ARG 1 value + ARG 2 reader2 + ARG 3 value2 diff --git a/mappings/net/minecraft/resource/metadata/ResourceMetadataSerializer.mapping b/mappings/net/minecraft/resource/metadata/ResourceMetadataSerializer.mapping new file mode 100644 index 0000000000..a1dde33434 --- /dev/null +++ b/mappings/net/minecraft/resource/metadata/ResourceMetadataSerializer.mapping @@ -0,0 +1,7 @@ +CLASS net/minecraft/class_7677 net/minecraft/resource/metadata/ResourceMetadataSerializer + METHOD method_45251 toJson (Ljava/lang/Object;)Lcom/google/gson/JsonObject; + ARG 1 metadata + METHOD method_45252 fromCodec (Ljava/lang/String;Lcom/mojang/serialization/Codec;)Lnet/minecraft/class_7677; + ARG 0 key + ARG 1 codec + CLASS 1 diff --git a/mappings/net/minecraft/scoreboard/Scoreboard.mapping b/mappings/net/minecraft/scoreboard/Scoreboard.mapping index 59cd3c949a..dbeee15c91 100644 --- a/mappings/net/minecraft/scoreboard/Scoreboard.mapping +++ b/mappings/net/minecraft/scoreboard/Scoreboard.mapping @@ -3,15 +3,8 @@ CLASS net/minecraft/class_269 net/minecraft/scoreboard/Scoreboard FIELD field_1427 teamsByPlayer Ljava/util/Map; FIELD field_1428 objectives Ljava/util/Map; FIELD field_1429 objectivesByCriterion Ljava/util/Map; - FIELD field_1430 displaySlotNames [Ljava/lang/String; FIELD field_1431 playerObjectives Ljava/util/Map; - FIELD field_1432 objectiveSlots [Lnet/minecraft/class_266; - FIELD field_31886 LIST_DISPLAY_SLOT_ID I - FIELD field_31887 SIDEBAR_DISPLAY_SLOT_ID I - FIELD field_31888 BELOW_NAME_DISPLAY_SLOT_ID I - FIELD field_31889 MIN_SIDEBAR_TEAM_DISPLAY_SLOT_ID I - FIELD field_31890 MAX_SIDEBAR_TEAM_DISPLAY_SLOT_ID I - FIELD field_31891 DISPLAY_SLOT_COUNT I + FIELD field_1432 objectiveSlots Ljava/util/Map; FIELD field_36309 LOGGER Lorg/slf4j/Logger; METHOD method_1150 resetEntityScore (Lnet/minecraft/class_1297;)V ARG 1 entity @@ -30,7 +23,7 @@ CLASS net/minecraft/class_269 net/minecraft/scoreboard/Scoreboard 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 + METHOD method_1158 setObjectiveSlot (Lnet/minecraft/class_8646;Lnet/minecraft/class_266;)V ARG 1 slot ARG 2 objective METHOD method_1159 getTeams ()Ljava/util/Collection; @@ -45,12 +38,8 @@ CLASS net/minecraft/class_269 net/minecraft/scoreboard/Scoreboard 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; ARG 1 playerName - METHOD method_1167 getDisplaySlotName (I)Ljava/lang/String; - ARG 0 slotId METHOD method_1168 addObjective (Ljava/lang/String;Lnet/minecraft/class_274;Lnet/minecraft/class_2561;Lnet/minecraft/class_274$class_275;)Lnet/minecraft/class_266; ARG 1 name ARG 2 criterion @@ -72,16 +61,12 @@ CLASS net/minecraft/class_269 net/minecraft/scoreboard/Scoreboard ARG 1 objective METHOD method_1176 updateScore (Lnet/minecraft/class_267;)V ARG 1 score - METHOD method_1177 (Lnet/minecraft/class_267;)Z - ARG 0 score METHOD method_1178 getKnownPlayers ()Ljava/util/Collection; METHOD method_1179 (Lnet/minecraft/class_274;)Ljava/util/List; - ARG 0 criterion + ARG 0 criterionx METHOD method_1180 getPlayerScore (Ljava/lang/String;Lnet/minecraft/class_266;)Lnet/minecraft/class_267; ARG 1 playerName ARG 2 objective - METHOD method_1181 containsObjective (Ljava/lang/String;)Z - ARG 1 name METHOD method_1182 (Ljava/util/function/Consumer;Ljava/lang/String;Lnet/minecraft/class_266;)V ARG 3 objective METHOD method_1183 playerHasObjective (Ljava/lang/String;Lnet/minecraft/class_266;)Z @@ -91,20 +76,17 @@ CLASS net/minecraft/class_269 net/minecraft/scoreboard/Scoreboard ARG 1 objective METHOD method_1185 updateObjective (Lnet/minecraft/class_266;)V ARG 1 objective - METHOD method_1186 getDisplaySlotNames ()[Ljava/lang/String; METHOD method_1187 (Ljava/lang/String;Lnet/minecraft/class_266;)Lnet/minecraft/class_267; - ARG 2 objective + ARG 2 objectivex METHOD method_1188 readNbt (Lnet/minecraft/class_2499;)V ARG 1 list - METHOD method_1189 getObjectiveForSlot (I)Lnet/minecraft/class_266; + METHOD method_1189 getObjectiveForSlot (Lnet/minecraft/class_8646;)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 diff --git a/mappings/net/minecraft/scoreboard/ScoreboardCriterion.mapping b/mappings/net/minecraft/scoreboard/ScoreboardCriterion.mapping index 3b15ce903f..99bcdbde0e 100644 --- a/mappings/net/minecraft/scoreboard/ScoreboardCriterion.mapping +++ b/mappings/net/minecraft/scoreboard/ScoreboardCriterion.mapping @@ -36,7 +36,7 @@ CLASS net/minecraft/class_274 net/minecraft/scoreboard/ScoreboardCriterion METHOD method_37271 getAllSimpleCriteria ()Ljava/util/Set; CLASS class_275 RenderType FIELD field_1469 name Ljava/lang/String; - FIELD field_1470 CRITERION_TYPES Ljava/util/Map; + FIELD field_41683 CODEC Lnet/minecraft/class_3542$class_7292; METHOD (Ljava/lang/String;ILjava/lang/String;)V ARG 3 name METHOD method_1228 getName ()Ljava/lang/String; diff --git a/mappings/net/minecraft/scoreboard/ScoreboardDisplaySlot.mapping b/mappings/net/minecraft/scoreboard/ScoreboardDisplaySlot.mapping new file mode 100644 index 0000000000..03f75aa22e --- /dev/null +++ b/mappings/net/minecraft/scoreboard/ScoreboardDisplaySlot.mapping @@ -0,0 +1,11 @@ +CLASS net/minecraft/class_8646 net/minecraft/scoreboard/ScoreboardDisplaySlot + FIELD field_45175 CODEC Lnet/minecraft/class_3542$class_7292; + FIELD field_45176 FROM_ID Ljava/util/function/IntFunction; + FIELD field_45177 id I + FIELD field_45178 name Ljava/lang/String; + METHOD (Ljava/lang/String;IILjava/lang/String;)V + ARG 3 id + ARG 4 name + METHOD method_52621 getId ()I + METHOD method_52622 fromFormatting (Lnet/minecraft/class_124;)Lnet/minecraft/class_8646; + ARG 0 formatting diff --git a/mappings/net/minecraft/scoreboard/ScoreboardState.mapping b/mappings/net/minecraft/scoreboard/ScoreboardState.mapping index 90ff19efca..7ef47d2b40 100644 --- a/mappings/net/minecraft/scoreboard/ScoreboardState.mapping +++ b/mappings/net/minecraft/scoreboard/ScoreboardState.mapping @@ -1,6 +1,7 @@ CLASS net/minecraft/class_273 net/minecraft/scoreboard/ScoreboardState FIELD field_27936 scoreboard Lnet/minecraft/class_269; FIELD field_31893 SCOREBOARD_KEY Ljava/lang/String; + FIELD field_45181 LOGGER Lorg/slf4j/Logger; METHOD (Lnet/minecraft/class_269;)V ARG 1 scoreboard METHOD method_1215 readTeamPlayersNbt (Lnet/minecraft/class_268;Lnet/minecraft/class_2499;)V @@ -16,7 +17,5 @@ CLASS net/minecraft/class_273 net/minecraft/scoreboard/ScoreboardState ARG 1 nbt METHOD method_1222 writeDisplaySlotsNbt (Lnet/minecraft/class_2487;)V ARG 1 nbt - METHOD method_17947 (Lnet/minecraft/class_2487;Lnet/minecraft/class_274;)V - ARG 2 criterion METHOD method_32481 readNbt (Lnet/minecraft/class_2487;)Lnet/minecraft/class_273; ARG 1 nbt diff --git a/mappings/net/minecraft/scoreboard/ServerScoreboard.mapping b/mappings/net/minecraft/scoreboard/ServerScoreboard.mapping index 36d74e972f..eebd98ab9a 100644 --- a/mappings/net/minecraft/scoreboard/ServerScoreboard.mapping +++ b/mappings/net/minecraft/scoreboard/ServerScoreboard.mapping @@ -20,4 +20,5 @@ CLASS net/minecraft/class_2995 net/minecraft/scoreboard/ServerScoreboard METHOD method_32704 stateFromNbt (Lnet/minecraft/class_2487;)Lnet/minecraft/class_273; ARG 1 nbt METHOD method_32705 createState ()Lnet/minecraft/class_273; + METHOD method_52297 getPersistentStateType ()Lnet/minecraft/class_18$class_8645; CLASS class_2996 UpdateMode diff --git a/mappings/net/minecraft/screen/AbstractFurnaceScreenHandler.mapping b/mappings/net/minecraft/screen/AbstractFurnaceScreenHandler.mapping index afd0267277..acf940f8d9 100644 --- a/mappings/net/minecraft/screen/AbstractFurnaceScreenHandler.mapping +++ b/mappings/net/minecraft/screen/AbstractFurnaceScreenHandler.mapping @@ -20,8 +20,8 @@ CLASS net/minecraft/class_1720 net/minecraft/screen/AbstractFurnaceScreenHandler ARG 7 propertyDelegate METHOD method_16945 isFuel (Lnet/minecraft/class_1799;)Z ARG 1 itemStack - METHOD method_17363 getCookProgress ()I - METHOD method_17364 getFuelProgress ()I + METHOD method_17363 getCookProgress ()F + METHOD method_17364 getFuelProgress ()F METHOD method_17365 isBurning ()Z METHOD method_7640 isSmeltable (Lnet/minecraft/class_1799;)Z ARG 1 itemStack diff --git a/mappings/net/minecraft/screen/AbstractRecipeScreenHandler.mapping b/mappings/net/minecraft/screen/AbstractRecipeScreenHandler.mapping index fe974f4dd6..765e0f1674 100644 --- a/mappings/net/minecraft/screen/AbstractRecipeScreenHandler.mapping +++ b/mappings/net/minecraft/screen/AbstractRecipeScreenHandler.mapping @@ -1,13 +1,11 @@ CLASS net/minecraft/class_1729 net/minecraft/screen/AbstractRecipeScreenHandler - METHOD method_17697 fillInputSlots (ZLnet/minecraft/class_1860;Lnet/minecraft/class_3222;)V + METHOD method_17697 fillInputSlots (ZLnet/minecraft/class_8786;Lnet/minecraft/class_3222;)V ARG 1 craftAll - ARG 2 recipe ARG 3 player METHOD method_30264 getCategory ()Lnet/minecraft/class_5421; METHOD method_32339 canInsertIntoSlot (I)Z ARG 1 index - METHOD method_7652 matches (Lnet/minecraft/class_1860;)Z - ARG 1 recipe + METHOD method_7652 matches (Lnet/minecraft/class_8786;)Z METHOD method_7653 getCraftingWidth ()I METHOD method_7654 populateRecipeFinder (Lnet/minecraft/class_1662;)V ARG 1 finder diff --git a/mappings/net/minecraft/screen/AnvilScreenHandler.mapping b/mappings/net/minecraft/screen/AnvilScreenHandler.mapping index 6c8a7fdfcb..afe3523b0f 100644 --- a/mappings/net/minecraft/screen/AnvilScreenHandler.mapping +++ b/mappings/net/minecraft/screen/AnvilScreenHandler.mapping @@ -1,4 +1,12 @@ CLASS net/minecraft/class_1706 net/minecraft/screen/AnvilScreenHandler + FIELD field_30751 MAX_NAME_LENGTH I + FIELD field_41894 INPUT_1_X I + FIELD field_41895 INPUT_2_X I + FIELD field_41896 OUTPUT_X I + FIELD field_41897 SLOT_Y I + FIELD field_41898 INPUT_1_ID I + FIELD field_41899 INPUT_2_ID I + FIELD field_41900 OUTPUT_ID I FIELD field_7770 levelCost Lnet/minecraft/class_3915; FIELD field_7771 LOGGER Lorg/slf4j/Logger; FIELD field_7774 newItemName Ljava/lang/String; @@ -16,5 +24,11 @@ CLASS net/minecraft/class_1706 net/minecraft/screen/AnvilScreenHandler METHOD method_24922 (Lnet/minecraft/class_1657;Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;)V ARG 1 world ARG 2 pos - METHOD method_7625 setNewItemName (Ljava/lang/String;)V + METHOD method_48350 (Lnet/minecraft/class_1799;)Z + ARG 0 stack + METHOD method_48351 (Lnet/minecraft/class_1799;)Z + ARG 0 stack + METHOD method_52176 sanitize (Ljava/lang/String;)Ljava/lang/String; + ARG 0 name + METHOD method_7625 setNewItemName (Ljava/lang/String;)Z ARG 1 newItemName diff --git a/mappings/net/minecraft/screen/BeaconScreenHandler.mapping b/mappings/net/minecraft/screen/BeaconScreenHandler.mapping index 212165142c..fe8260ff73 100644 --- a/mappings/net/minecraft/screen/BeaconScreenHandler.mapping +++ b/mappings/net/minecraft/screen/BeaconScreenHandler.mapping @@ -3,6 +3,13 @@ CLASS net/minecraft/class_1704 net/minecraft/screen/BeaconScreenHandler FIELD field_17288 paymentSlot Lnet/minecraft/class_1704$class_1705; FIELD field_17289 context Lnet/minecraft/class_3914; FIELD field_17290 propertyDelegate Lnet/minecraft/class_3913; + FIELD field_30756 PAYMENT_SLOT_ID I + FIELD field_30757 BEACON_INVENTORY_SIZE I + FIELD field_30758 PROPERTY_COUNT I + FIELD field_30759 INVENTORY_START I + FIELD field_30760 INVENTORY_END I + FIELD field_30761 HOTBAR_START I + FIELD field_30762 HOTBAR_END I METHOD (ILnet/minecraft/class_1263;)V ARG 1 syncId ARG 2 inventory @@ -18,6 +25,10 @@ CLASS net/minecraft/class_1704 net/minecraft/screen/BeaconScreenHandler METHOD method_17374 getPrimaryEffect ()Lnet/minecraft/class_1291; METHOD method_17375 getSecondaryEffect ()Lnet/minecraft/class_1291; METHOD method_17376 hasPayment ()Z + METHOD method_53173 getRawIdForStatusEffect (Lnet/minecraft/class_1291;)I + ARG 0 statusEffect + METHOD method_53174 getStatusEffectForRawId (I)Lnet/minecraft/class_1291; + ARG 0 id CLASS class_1705 PaymentSlot METHOD (Lnet/minecraft/class_1704;Lnet/minecraft/class_1263;III)V ARG 2 inventory diff --git a/mappings/net/minecraft/screen/BrewingStandScreenHandler.mapping b/mappings/net/minecraft/screen/BrewingStandScreenHandler.mapping index ca727e8b88..772e288dcd 100644 --- a/mappings/net/minecraft/screen/BrewingStandScreenHandler.mapping +++ b/mappings/net/minecraft/screen/BrewingStandScreenHandler.mapping @@ -1,5 +1,13 @@ CLASS net/minecraft/class_1708 net/minecraft/screen/BrewingStandScreenHandler FIELD field_17292 propertyDelegate Lnet/minecraft/class_3913; + FIELD field_30765 INGREDIENT_SLOT_ID I + FIELD field_30766 FUEL_SLOT_ID I + FIELD field_30767 BREWING_STAND_INVENTORY_SIZE I + FIELD field_30768 PROPERTY_COUNT I + FIELD field_30769 INVENTORY_START I + FIELD field_30770 INVENTORY_END I + FIELD field_30771 HOTBAR_START I + FIELD field_30772 HOTBAR_END I FIELD field_7787 ingredientSlot Lnet/minecraft/class_1735; FIELD field_7788 inventory Lnet/minecraft/class_1263; METHOD (ILnet/minecraft/class_1661;)V diff --git a/mappings/net/minecraft/screen/CartographyTableScreenHandler.mapping b/mappings/net/minecraft/screen/CartographyTableScreenHandler.mapping index b3e99e96fc..8175fa127b 100644 --- a/mappings/net/minecraft/screen/CartographyTableScreenHandler.mapping +++ b/mappings/net/minecraft/screen/CartographyTableScreenHandler.mapping @@ -6,6 +6,10 @@ CLASS net/minecraft/class_3910 net/minecraft/screen/CartographyTableScreenHandle FIELD field_30773 MAP_SLOT_INDEX I FIELD field_30774 MATERIAL_SLOT_INDEX I FIELD field_30775 RESULT_SLOT_INDEX I + FIELD field_30776 INVENTORY_START I + FIELD field_30777 INVENTORY_END I + FIELD field_30778 HOTBAR_START I + FIELD field_30779 HOTBAR_END I METHOD (ILnet/minecraft/class_1661;)V ARG 1 syncId ARG 2 inventory diff --git a/mappings/net/minecraft/screen/CraftingScreenHandler.mapping b/mappings/net/minecraft/screen/CraftingScreenHandler.mapping index 520886b1ab..234b428655 100644 --- a/mappings/net/minecraft/screen/CraftingScreenHandler.mapping +++ b/mappings/net/minecraft/screen/CraftingScreenHandler.mapping @@ -1,8 +1,15 @@ CLASS net/minecraft/class_1714 net/minecraft/screen/CraftingScreenHandler + FIELD field_30781 RESULT_ID I + FIELD field_30782 INPUT_START I + FIELD field_30783 INPUT_END I + FIELD field_30784 INVENTORY_START I + FIELD field_30785 INVENTORY_END I + FIELD field_30786 HOTBAR_START I + FIELD field_30787 HOTBAR_END I FIELD field_7797 player Lnet/minecraft/class_1657; FIELD field_7799 context Lnet/minecraft/class_3914; FIELD field_7800 result Lnet/minecraft/class_1731; - FIELD field_7801 input Lnet/minecraft/class_1715; + FIELD field_7801 input Lnet/minecraft/class_8566; METHOD (ILnet/minecraft/class_1661;)V ARG 1 syncId ARG 2 playerInventory @@ -10,7 +17,7 @@ CLASS net/minecraft/class_1714 net/minecraft/screen/CraftingScreenHandler ARG 1 syncId ARG 2 playerInventory ARG 3 context - METHOD method_17399 updateResult (Lnet/minecraft/class_1703;Lnet/minecraft/class_1937;Lnet/minecraft/class_1657;Lnet/minecraft/class_1715;Lnet/minecraft/class_1731;)V + METHOD method_17399 updateResult (Lnet/minecraft/class_1703;Lnet/minecraft/class_1937;Lnet/minecraft/class_1657;Lnet/minecraft/class_8566;Lnet/minecraft/class_1731;)V ARG 0 handler ARG 1 world ARG 2 player diff --git a/mappings/net/minecraft/screen/EnchantmentScreenHandler.mapping b/mappings/net/minecraft/screen/EnchantmentScreenHandler.mapping index 80968f0b13..a9c2a5b073 100644 --- a/mappings/net/minecraft/screen/EnchantmentScreenHandler.mapping +++ b/mappings/net/minecraft/screen/EnchantmentScreenHandler.mapping @@ -1,4 +1,5 @@ CLASS net/minecraft/class_1718 net/minecraft/screen/EnchantmentScreenHandler + FIELD field_45143 EMPTY_LAPIS_SLOT_TEXTURE Lnet/minecraft/class_2960; FIELD field_7808 enchantmentPower [I FIELD field_7809 inventory Lnet/minecraft/class_1263; FIELD field_7810 enchantmentLevel [I diff --git a/mappings/net/minecraft/screen/ForgingScreenHandler.mapping b/mappings/net/minecraft/screen/ForgingScreenHandler.mapping index f87cf48f65..8d6b85941b 100644 --- a/mappings/net/minecraft/screen/ForgingScreenHandler.mapping +++ b/mappings/net/minecraft/screen/ForgingScreenHandler.mapping @@ -3,11 +3,8 @@ CLASS net/minecraft/class_4861 net/minecraft/screen/ForgingScreenHandler FIELD field_22480 input Lnet/minecraft/class_1263; FIELD field_22481 context Lnet/minecraft/class_3914; FIELD field_22482 player Lnet/minecraft/class_1657; - FIELD field_30813 PLAYER_INVENTORY_START_INDEX I - FIELD field_30814 FIRST_INPUT_SLOT_INDEX I - FIELD field_30815 SECOND_INPUT_SLOT_INDEX I - FIELD field_30816 OUTPUT_SLOT_INDEX I - FIELD field_30819 PLAYER_INVENTORY_END_INDEX I + FIELD field_41903 inputSlotIndices Ljava/util/List; + FIELD field_41904 resultSlotIndex I METHOD (Lnet/minecraft/class_3917;ILnet/minecraft/class_1661;Lnet/minecraft/class_3914;)V ARG 1 type ARG 2 syncId @@ -28,5 +25,21 @@ CLASS net/minecraft/class_4861 net/minecraft/screen/ForgingScreenHandler ARG 1 player ARG 2 present METHOD method_24928 updateResult ()V - METHOD method_30025 isUsableAsAddition (Lnet/minecraft/class_1799;)Z + METHOD method_48352 getForgingSlotsManager ()Lnet/minecraft/class_8047; + METHOD method_48353 addPlayerInventorySlots (Lnet/minecraft/class_1661;)V + ARG 1 playerInventory + METHOD method_48354 addInputSlots (Lnet/minecraft/class_8047;)V + ARG 1 forgingSlotsManager + METHOD method_48355 addResultSlot (Lnet/minecraft/class_8047;)V + ARG 1 forgingSlotsManager + METHOD method_48356 isValidIngredient (Lnet/minecraft/class_1799;)Z ARG 1 stack + METHOD method_48357 getSlotFor (Lnet/minecraft/class_1799;)I + ARG 1 stack + METHOD method_48358 createInputInventory (I)Lnet/minecraft/class_1277; + ARG 1 size + METHOD method_48359 getPlayerInventoryStartIndex ()I + METHOD method_48360 getResultSlotIndex ()I + METHOD method_48361 getPlayerInventoryEndIndex ()I + METHOD method_48362 getPlayerHotbarStartIndex ()I + METHOD method_48363 getPlayerHotbarEndIndex ()I diff --git a/mappings/net/minecraft/screen/Generic3x3ContainerScreenHandler.mapping b/mappings/net/minecraft/screen/Generic3x3ContainerScreenHandler.mapping index 467016aaec..bb6bf3528f 100644 --- a/mappings/net/minecraft/screen/Generic3x3ContainerScreenHandler.mapping +++ b/mappings/net/minecraft/screen/Generic3x3ContainerScreenHandler.mapping @@ -1,4 +1,9 @@ CLASS net/minecraft/class_1716 net/minecraft/screen/Generic3x3ContainerScreenHandler + FIELD field_30788 CONTAINER_SIZE I + FIELD field_30789 INVENTORY_START I + FIELD field_30790 INVENTORY_END I + FIELD field_30791 HOTBAR_START I + FIELD field_30792 HOTBAR_END I FIELD field_7806 inventory Lnet/minecraft/class_1263; METHOD (ILnet/minecraft/class_1661;)V ARG 1 syncId diff --git a/mappings/net/minecraft/screen/GenericContainerScreenHandler.mapping b/mappings/net/minecraft/screen/GenericContainerScreenHandler.mapping index 6d0cb7485e..bd05e6e60f 100644 --- a/mappings/net/minecraft/screen/GenericContainerScreenHandler.mapping +++ b/mappings/net/minecraft/screen/GenericContainerScreenHandler.mapping @@ -1,6 +1,7 @@ CLASS net/minecraft/class_1707 net/minecraft/screen/GenericContainerScreenHandler FIELD field_17495 inventory Lnet/minecraft/class_1263; FIELD field_17496 rows I + FIELD field_30780 NUM_COLUMNS I METHOD (Lnet/minecraft/class_3917;ILnet/minecraft/class_1661;I)V ARG 1 type ARG 2 syncId diff --git a/mappings/net/minecraft/screen/GrindstoneScreenHandler.mapping b/mappings/net/minecraft/screen/GrindstoneScreenHandler.mapping index 87f13343ac..01e39c06ae 100644 --- a/mappings/net/minecraft/screen/GrindstoneScreenHandler.mapping +++ b/mappings/net/minecraft/screen/GrindstoneScreenHandler.mapping @@ -2,6 +2,13 @@ CLASS net/minecraft/class_3803 net/minecraft/screen/GrindstoneScreenHandler FIELD field_16772 input Lnet/minecraft/class_1263; FIELD field_16773 result Lnet/minecraft/class_1263; FIELD field_16775 context Lnet/minecraft/class_3914; + FIELD field_30794 INPUT_1_ID I + FIELD field_30795 INPUT_2_ID I + FIELD field_30796 OUTPUT_ID I + FIELD field_30797 INVENTORY_START I + FIELD field_30798 INVENTORY_END I + FIELD field_30799 HOTBAR_START I + FIELD field_30800 HOTBAR_END I METHOD (ILnet/minecraft/class_1661;)V ARG 1 syncId ARG 2 playerInventory diff --git a/mappings/net/minecraft/screen/LoomScreenHandler.mapping b/mappings/net/minecraft/screen/LoomScreenHandler.mapping index 060e0ef202..d99e8aa508 100644 --- a/mappings/net/minecraft/screen/LoomScreenHandler.mapping +++ b/mappings/net/minecraft/screen/LoomScreenHandler.mapping @@ -8,6 +8,11 @@ CLASS net/minecraft/class_1726 net/minecraft/screen/LoomScreenHandler FIELD field_17322 outputSlot Lnet/minecraft/class_1735; FIELD field_17323 output Lnet/minecraft/class_1263; FIELD field_20383 lastTakeResultTime J + FIELD field_30826 INVENTORY_START I + FIELD field_30827 INVENTORY_END I + FIELD field_30828 HOTBAR_START I + FIELD field_30829 HOTBAR_END I + FIELD field_39120 NO_PATTERN I FIELD field_39121 bannerPatterns Ljava/util/List; FIELD field_7850 input Lnet/minecraft/class_1263; METHOD (ILnet/minecraft/class_1661;)V diff --git a/mappings/net/minecraft/screen/MerchantScreenHandler.mapping b/mappings/net/minecraft/screen/MerchantScreenHandler.mapping index ca3c9fce52..046a251a02 100644 --- a/mappings/net/minecraft/screen/MerchantScreenHandler.mapping +++ b/mappings/net/minecraft/screen/MerchantScreenHandler.mapping @@ -2,6 +2,17 @@ CLASS net/minecraft/class_1728 net/minecraft/screen/MerchantScreenHandler FIELD field_18669 levelProgress I FIELD field_18670 leveled Z FIELD field_19358 canRefreshTrades Z + FIELD field_30830 INPUT_1_ID I + FIELD field_30831 INPUT_2_ID I + FIELD field_30832 OUTPUT_ID I + FIELD field_30833 INVENTORY_START I + FIELD field_30834 INVENTORY_END I + FIELD field_30835 HOTBAR_START I + FIELD field_30836 HOTBAR_END I + FIELD field_30837 INPUT_1_X I + FIELD field_30838 INPUT_2_X I + FIELD field_30839 OUTPUT_X I + FIELD field_30840 SLOT_Y I FIELD field_7861 merchantInventory Lnet/minecraft/class_1725; FIELD field_7863 merchant Lnet/minecraft/class_1915; METHOD (ILnet/minecraft/class_1661;)V diff --git a/mappings/net/minecraft/screen/PlayerScreenHandler.mapping b/mappings/net/minecraft/screen/PlayerScreenHandler.mapping index 3914ec865b..7436c4b925 100644 --- a/mappings/net/minecraft/screen/PlayerScreenHandler.mapping +++ b/mappings/net/minecraft/screen/PlayerScreenHandler.mapping @@ -5,16 +5,31 @@ CLASS net/minecraft/class_1723 net/minecraft/screen/PlayerScreenHandler FIELD field_21671 EMPTY_LEGGINGS_SLOT_TEXTURE Lnet/minecraft/class_2960; FIELD field_21672 EMPTY_BOOTS_SLOT_TEXTURE Lnet/minecraft/class_2960; FIELD field_21673 EMPTY_OFFHAND_ARMOR_SLOT Lnet/minecraft/class_2960; + FIELD field_30803 CRAFTING_RESULT_ID I + FIELD field_30804 CRAFTING_INPUT_START I + FIELD field_30805 CRAFTING_INPUT_END I + FIELD field_30806 EQUIPMENT_START I + FIELD field_30807 EQUIPMENT_END I + FIELD field_30808 INVENTORY_START I + FIELD field_30809 INVENTORY_END I + FIELD field_30810 HOTBAR_START I + FIELD field_30811 HOTBAR_END I + FIELD field_30812 OFFHAND_ID I FIELD field_7827 onServer Z FIELD field_7828 owner Lnet/minecraft/class_1657; FIELD field_7829 EMPTY_ARMOR_SLOT_TEXTURES [Lnet/minecraft/class_2960; FIELD field_7830 craftingResult Lnet/minecraft/class_1731; - FIELD field_7831 craftingInput Lnet/minecraft/class_1715; + FIELD field_7831 craftingInput Lnet/minecraft/class_8566; FIELD field_7832 EQUIPMENT_SLOT_ORDER [Lnet/minecraft/class_1304; METHOD (Lnet/minecraft/class_1661;ZLnet/minecraft/class_1657;)V ARG 1 inventory ARG 2 onServer ARG 3 owner - METHOD method_29281 getCraftingInput ()Lnet/minecraft/class_1715; + METHOD method_29281 getCraftingInput ()Lnet/minecraft/class_8566; METHOD method_36211 isInHotbar (I)Z ARG 0 slot + METHOD method_48930 onEquipStack (Lnet/minecraft/class_1657;Lnet/minecraft/class_1304;Lnet/minecraft/class_1799;Lnet/minecraft/class_1799;)V + ARG 0 player + ARG 1 slot + ARG 2 newStack + ARG 3 currentStack diff --git a/mappings/net/minecraft/screen/ScreenHandler.mapping b/mappings/net/minecraft/screen/ScreenHandler.mapping index d174cce1f9..91963a121f 100644 --- a/mappings/net/minecraft/screen/ScreenHandler.mapping +++ b/mappings/net/minecraft/screen/ScreenHandler.mapping @@ -68,7 +68,7 @@ CLASS net/minecraft/class_1703 net/minecraft/screen/ScreenHandler COMMENT

    The screen handler then has to be registered in a registry. Create a new instance of COMMENT {@link ScreenHandlerType} with the screen handler type factory (which can be a reference COMMENT to the client-side constructor; i.e. {@code MyScreenHandler::MyScreenHandler}) - COMMENT and register it to {@link net.minecraft.util.registry.Registry#SCREEN_HANDLER}. + COMMENT and register it to {@link net.minecraft.registry.Registries#SCREEN_HANDLER}. COMMENT COMMENT

    Opening

    COMMENT

    Most of the screen handlers are associated with a block and opened by using the block. @@ -90,7 +90,7 @@ CLASS net/minecraft/class_1703 net/minecraft/screen/ScreenHandler COMMENT

    Screen handler interaction mainly involves "slot clicks" and "button clicks". COMMENT A {@linkplain #onSlotClick slot click} is, as mentioned before, an action manipulating COMMENT the slots' held item stacks. Slot clicks are implemented in this class and - COMMENT {@link #transferSlot}. To manipulate the stacks, get the slot via {@link #getSlot} + COMMENT {@link #quickMove}. To manipulate the stacks, get the slot via {@link #getSlot} COMMENT and call methods of it. Screen handlers also provide methods for common operations, COMMENT such as {@link #insertItem} that inserts a stack to the screen handler's available slots. COMMENT @@ -106,14 +106,14 @@ CLASS net/minecraft/class_1703 net/minecraft/screen/ScreenHandler COMMENT with an integer. COMMENT COMMENT

    Subclasses must implement two methods: {@link #canUse(PlayerEntity)} and {@link - COMMENT #transferSlot}. See the documentation of each method for more details. + COMMENT #quickMove}. See the documentation of each method for more details. COMMENT COMMENT

    Closing

    COMMENT

    Since a screen handler handles the client's screen, the screen must be closed at the COMMENT same time. To close the screen handler and the screen, call {@link COMMENT PlayerEntity#closeHandledScreen} on the server. COMMENT - COMMENT

    Screen handlers should override {@link #close}. In there, it should {@linkplain + COMMENT

    Screen handlers should override {@link #onClosed}. In there, it should {@linkplain COMMENT #dropInventory drop contents} of all slots not backed by an inventory and call COMMENT {@link Inventory#onClose} on the backing inventory. See the documentation of COMMENT the method for more details. @@ -256,6 +256,12 @@ CLASS net/minecraft/class_1703 net/minecraft/screen/ScreenHandler COMMENT

    This returns {@code true} for all added slots, {@value #EMPTY_SPACE_SLOT_INDEX}, COMMENT and {@code -1}. ARG 1 slot + METHOD method_45409 handleSlotClick (Lnet/minecraft/class_1657;Lnet/minecraft/class_5536;Lnet/minecraft/class_1735;Lnet/minecraft/class_1799;Lnet/minecraft/class_1799;)Z + ARG 1 player + ARG 2 clickType + ARG 3 slot + ARG 4 stack + ARG 5 cursorStack METHOD method_7591 packQuickCraftData (II)I ARG 0 quickCraftStage ARG 1 buttonId @@ -272,8 +278,8 @@ CLASS net/minecraft/class_1703 net/minecraft/screen/ScreenHandler ARG 4 player METHOD method_7594 unpackQuickCraftStage (I)I ARG 0 quickCraftData - METHOD method_7595 close (Lnet/minecraft/class_1657;)V - COMMENT Closes this screen handler. + METHOD method_7595 onClosed (Lnet/minecraft/class_1657;)V + COMMENT Called when this screen handler is closed. COMMENT COMMENT

    To close a screen handler, call {@link PlayerEntity#closeHandledScreen} COMMENT on the server instead of this method. @@ -298,20 +304,27 @@ CLASS net/minecraft/class_1703 net/minecraft/screen/ScreenHandler METHOD method_7600 shouldQuickCraftContinue (ILnet/minecraft/class_1657;)Z ARG 0 stage ARG 1 player - METHOD method_7601 transferSlot (Lnet/minecraft/class_1657;I)Lnet/minecraft/class_1799; - COMMENT Transfers (or "quick-moves") the stack at slot {@code index} to other - COMMENT slots of the screen handler that belong to a different inventory. + METHOD method_7601 quickMove (Lnet/minecraft/class_1657;I)Lnet/minecraft/class_1799; + COMMENT Quick-moves the stack at {@code slot} to other + COMMENT slots of the screen handler that belong to a different inventory or + COMMENT another section of the same inventory. For example, items can be quick-moved + COMMENT between a chest's slots and the player inventory or between the main player inventory + COMMENT and the hotbar. COMMENT COMMENT

    Subclasses should call {@link #insertItem}, and if the insertion was successful, COMMENT clear the slot (if the stack is exhausted) or mark it as dirty. See the vanilla COMMENT subclasses for basic implementation. COMMENT + COMMENT

    Quick-moving is also known as "shift-clicking" since it's usually triggered + COMMENT using Shift+left click. + COMMENT COMMENT @return {@link ItemStack#EMPTY} when no stack can be transferred, otherwise COMMENT the original stack COMMENT COMMENT @see #insertItem ARG 1 player - ARG 2 index + ARG 2 slot + COMMENT the index of the slot to quick-move from METHOD method_7602 getStacks ()Lnet/minecraft/class_2371; COMMENT {@return a list of all stacks of the screen handler's slot} COMMENT @@ -384,11 +397,10 @@ CLASS net/minecraft/class_1703 net/minecraft/screen/ScreenHandler ARG 2 startIndex ARG 3 endIndex ARG 4 fromLast - METHOD method_7617 calculateStackSize (Ljava/util/Set;ILnet/minecraft/class_1799;I)V + METHOD method_7617 calculateStackSize (Ljava/util/Set;ILnet/minecraft/class_1799;)I ARG 0 slots ARG 1 mode ARG 2 stack - ARG 3 stackSize METHOD method_7618 calculateComparatorOutput (Lnet/minecraft/class_1263;)I ARG 0 inventory METHOD method_7619 setStackInSlot (IILnet/minecraft/class_1799;)V diff --git a/mappings/net/minecraft/screen/ScreenHandlerFactory.mapping b/mappings/net/minecraft/screen/ScreenHandlerFactory.mapping index 6b11bcdfb7..acafdfaba7 100644 --- a/mappings/net/minecraft/screen/ScreenHandlerFactory.mapping +++ b/mappings/net/minecraft/screen/ScreenHandlerFactory.mapping @@ -16,5 +16,5 @@ CLASS net/minecraft/class_1270 net/minecraft/screen/ScreenHandlerFactory COMMENT @see NamedScreenHandlerFactory METHOD createMenu (ILnet/minecraft/class_1661;Lnet/minecraft/class_1657;)Lnet/minecraft/class_1703; ARG 1 syncId - ARG 2 inv + ARG 2 playerInventory ARG 3 player diff --git a/mappings/net/minecraft/screen/ScreenHandlerType.mapping b/mappings/net/minecraft/screen/ScreenHandlerType.mapping index a389cce6ac..77e6849501 100644 --- a/mappings/net/minecraft/screen/ScreenHandlerType.mapping +++ b/mappings/net/minecraft/screen/ScreenHandlerType.mapping @@ -2,7 +2,7 @@ CLASS net/minecraft/class_3917 net/minecraft/screen/ScreenHandlerType COMMENT Screen handler type is used to create screen handlers on the client. COMMENT It is a holder object holding a factory (usually a reference to the constructor). COMMENT They are registered in the registry under {@link - COMMENT net.minecraft.util.registry.Registry#SCREEN_HANDLER}. + COMMENT net.minecraft.registry.Registries#SCREEN_HANDLER}. COMMENT COMMENT

    Technically speaking, screen handlers do not have to register screen handler COMMENT types. However, such screen handlers are practically useless as they cannot be @@ -13,8 +13,10 @@ CLASS net/minecraft/class_3917 net/minecraft/screen/ScreenHandlerType COMMENT COMMENT @see ScreenHandler FIELD field_17344 factory Lnet/minecraft/class_3917$class_3918; - METHOD (Lnet/minecraft/class_3917$class_3918;)V + FIELD field_41923 requiredFeatures Lnet/minecraft/class_7699; + METHOD (Lnet/minecraft/class_3917$class_3918;Lnet/minecraft/class_7699;)V ARG 1 factory + ARG 2 requiredFeatures METHOD method_17434 create (ILnet/minecraft/class_1661;)Lnet/minecraft/class_1703; ARG 1 syncId ARG 2 playerInventory @@ -24,6 +26,10 @@ CLASS net/minecraft/class_3917 net/minecraft/screen/ScreenHandlerType METHOD method_17436 (ILnet/minecraft/class_1661;)Lnet/minecraft/class_3916; ARG 0 syncId ARG 1 playerInventory + METHOD method_48387 register (Ljava/lang/String;Lnet/minecraft/class_3917$class_3918;[Lnet/minecraft/class_7696;)Lnet/minecraft/class_3917; + ARG 0 id + ARG 1 factory + ARG 2 requiredFeatures CLASS class_3918 Factory COMMENT A functional interface that creates a screen handler instance on the client. COMMENT diff --git a/mappings/net/minecraft/screen/ScreenTexts.mapping b/mappings/net/minecraft/screen/ScreenTexts.mapping index ca40ed8b0f..5733144f2d 100644 --- a/mappings/net/minecraft/screen/ScreenTexts.mapping +++ b/mappings/net/minecraft/screen/ScreenTexts.mapping @@ -13,6 +13,13 @@ CLASS net/minecraft/class_5244 net/minecraft/screen/ScreenTexts FIELD field_39003 EMPTY Lnet/minecraft/class_2561; FIELD field_39678 ELLIPSIS Lnet/minecraft/class_2561; FIELD field_39742 ACKNOWLEDGE Lnet/minecraft/class_2561; + FIELD field_41873 CONTINUE Lnet/minecraft/class_2561; + FIELD field_41874 SPACE Lnet/minecraft/class_2561; + FIELD field_43109 TO_TITLE Lnet/minecraft/class_2561; + FIELD field_44914 OK Lnet/minecraft/class_2561; + FIELD field_44968 OPEN_LINK Lnet/minecraft/class_2561; + FIELD field_44969 COPY_LINK_TO_CLIPBOARD Lnet/minecraft/class_2561; + FIELD field_45692 DISCONNECT Lnet/minecraft/class_2561; METHOD method_30619 composeToggleText (Lnet/minecraft/class_2561;Z)Lnet/minecraft/class_5250; ARG 0 text ARG 1 value @@ -25,12 +32,12 @@ CLASS net/minecraft/class_5244 net/minecraft/screen/ScreenTexts ARG 0 texts METHOD method_37110 joinLines ([Lnet/minecraft/class_2561;)Lnet/minecraft/class_2561; ARG 0 texts - METHOD method_37111 joinSentences (Lnet/minecraft/class_2561;Lnet/minecraft/class_2561;)Lnet/minecraft/class_5250; - ARG 0 first - ARG 1 second + METHOD method_37111 joinSentences ([Lnet/minecraft/class_2561;)Lnet/minecraft/class_5250; + ARG 0 sentences METHOD method_44682 days (J)Lnet/minecraft/class_5250; ARG 0 days METHOD method_44683 hours (J)Lnet/minecraft/class_5250; ARG 0 hours METHOD method_44684 minutes (J)Lnet/minecraft/class_5250; ARG 0 minutes + METHOD method_48320 space ()Lnet/minecraft/class_5250; diff --git a/mappings/net/minecraft/screen/SmithingScreenHandler.mapping b/mappings/net/minecraft/screen/SmithingScreenHandler.mapping index cdd1317367..8dfc797763 100644 --- a/mappings/net/minecraft/screen/SmithingScreenHandler.mapping +++ b/mappings/net/minecraft/screen/SmithingScreenHandler.mapping @@ -1,7 +1,16 @@ CLASS net/minecraft/class_4862 net/minecraft/screen/SmithingScreenHandler FIELD field_25385 world Lnet/minecraft/class_1937; - FIELD field_25386 currentRecipe Lnet/minecraft/class_5357; + FIELD field_25386 currentRecipe Lnet/minecraft/class_8786; FIELD field_25668 recipes Ljava/util/List; + FIELD field_41924 TEMPLATE_ID I + FIELD field_41925 EQUIPMENT_ID I + FIELD field_41926 MATERIAL_ID I + FIELD field_41927 OUTPUT_ID I + FIELD field_41928 TEMPLATE_X I + FIELD field_41929 EQUIPMENT_X I + FIELD field_41930 MATERIAL_X I + FIELD field_41931 SLOT_Y I + FIELD field_41932 OUTPUT_X I METHOD (ILnet/minecraft/class_1661;)V ARG 1 syncId ARG 2 playerInventory @@ -14,5 +23,17 @@ CLASS net/minecraft/class_4862 net/minecraft/screen/SmithingScreenHandler ARG 1 pos METHOD method_29539 decrementStack (I)V ARG 1 slot - METHOD method_30026 (Lnet/minecraft/class_1799;Lnet/minecraft/class_5357;)Z - ARG 1 recipe + METHOD method_48389 getQuickMoveSlot (Lnet/minecraft/class_8059;Lnet/minecraft/class_1799;)Ljava/util/OptionalInt; + ARG 0 recipe + ARG 1 stack + METHOD method_48393 (Lnet/minecraft/class_1799;)Z + ARG 1 stack + METHOD method_48395 (Lnet/minecraft/class_1799;)Z + ARG 1 stack + METHOD method_48396 (Lnet/minecraft/class_1799;)Z + ARG 1 stack + METHOD method_51307 getInputStacks ()Ljava/util/List; + METHOD method_52563 getQuickMoveSlot (Lnet/minecraft/class_1799;)Ljava/util/OptionalInt; + ARG 1 stack + METHOD method_52564 (I)Z + ARG 1 slot diff --git a/mappings/net/minecraft/screen/StonecutterScreenHandler.mapping b/mappings/net/minecraft/screen/StonecutterScreenHandler.mapping index 74f64b19c9..7e3e066b2f 100644 --- a/mappings/net/minecraft/screen/StonecutterScreenHandler.mapping +++ b/mappings/net/minecraft/screen/StonecutterScreenHandler.mapping @@ -10,6 +10,12 @@ CLASS net/minecraft/class_3971 net/minecraft/screen/StonecutterScreenHandler FIELD field_17635 lastTakeTime J FIELD field_17636 contentsChangedListener Ljava/lang/Runnable; FIELD field_19173 output Lnet/minecraft/class_1731; + FIELD field_30842 INPUT_ID I + FIELD field_30843 OUTPUT_ID I + FIELD field_30844 INVENTORY_START I + FIELD field_30845 INVENTORY_END I + FIELD field_30846 OUTPUT_START I + FIELD field_30847 OUTPUT_END I METHOD (ILnet/minecraft/class_1661;)V ARG 1 syncId ARG 2 playerInventory @@ -36,3 +42,4 @@ CLASS net/minecraft/class_3971 net/minecraft/screen/StonecutterScreenHandler METHOD method_17868 (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;)V ARG 1 world ARG 2 pos + METHOD method_51308 getInputStacks ()Ljava/util/List; diff --git a/mappings/net/minecraft/screen/slot/CraftingResultSlot.mapping b/mappings/net/minecraft/screen/slot/CraftingResultSlot.mapping index 3eec30ec24..1bbe316ffa 100644 --- a/mappings/net/minecraft/screen/slot/CraftingResultSlot.mapping +++ b/mappings/net/minecraft/screen/slot/CraftingResultSlot.mapping @@ -1,8 +1,8 @@ CLASS net/minecraft/class_1734 net/minecraft/screen/slot/CraftingResultSlot FIELD field_7868 player Lnet/minecraft/class_1657; FIELD field_7869 amount I - FIELD field_7870 input Lnet/minecraft/class_1715; - METHOD (Lnet/minecraft/class_1657;Lnet/minecraft/class_1715;Lnet/minecraft/class_1263;III)V + FIELD field_7870 input Lnet/minecraft/class_8566; + METHOD (Lnet/minecraft/class_1657;Lnet/minecraft/class_8566;Lnet/minecraft/class_1263;III)V ARG 1 player ARG 2 input ARG 3 inventory diff --git a/mappings/net/minecraft/screen/slot/ForgingSlotsManager.mapping b/mappings/net/minecraft/screen/slot/ForgingSlotsManager.mapping new file mode 100644 index 0000000000..23d85691ae --- /dev/null +++ b/mappings/net/minecraft/screen/slot/ForgingSlotsManager.mapping @@ -0,0 +1,37 @@ +CLASS net/minecraft/class_8047 net/minecraft/screen/slot/ForgingSlotsManager + FIELD field_41907 inputSlots Ljava/util/List; + FIELD field_41908 resultSlot Lnet/minecraft/class_8047$class_8049; + METHOD (Ljava/util/List;Lnet/minecraft/class_8047$class_8049;)V + ARG 1 inputSlots + ARG 2 resultSlot + METHOD method_48364 create ()Lnet/minecraft/class_8047$class_8048; + METHOD method_48365 hasSlotIndex (I)Z + ARG 1 index + METHOD method_48366 getResultSlot ()Lnet/minecraft/class_8047$class_8049; + METHOD method_48367 getInputSlot (I)Lnet/minecraft/class_8047$class_8049; + ARG 1 index + METHOD method_48368 getInputSlots ()Ljava/util/List; + METHOD method_48369 getInputSlotCount ()I + METHOD method_48370 getResultSlotIndex ()I + METHOD method_48371 getInputSlotIndices ()Ljava/util/List; + CLASS class_8048 Builder + FIELD field_41909 inputSlots Ljava/util/List; + FIELD field_41910 resultSlot Lnet/minecraft/class_8047$class_8049; + METHOD method_48372 build ()Lnet/minecraft/class_8047; + METHOD method_48373 output (III)Lnet/minecraft/class_8047$class_8048; + ARG 1 slotId + ARG 2 x + ARG 3 y + METHOD method_48374 input (IIILjava/util/function/Predicate;)Lnet/minecraft/class_8047$class_8048; + ARG 1 slotId + ARG 2 x + ARG 3 y + ARG 4 mayPlace + METHOD method_48375 (Lnet/minecraft/class_1799;)Z + ARG 0 stack + CLASS class_8049 ForgingSlot + FIELD comp_1204 slotId I + FIELD field_41911 DEFAULT Lnet/minecraft/class_8047$class_8049; + METHOD comp_1204 slotId ()I + METHOD method_48376 (Lnet/minecraft/class_1799;)Z + ARG 0 stack diff --git a/mappings/net/minecraft/screen/slot/Slot.mapping b/mappings/net/minecraft/screen/slot/Slot.mapping index cf8c6cd0d9..d254292ece 100644 --- a/mappings/net/minecraft/screen/slot/Slot.mapping +++ b/mappings/net/minecraft/screen/slot/Slot.mapping @@ -33,9 +33,13 @@ CLASS net/minecraft/class_1735 net/minecraft/screen/slot/Slot METHOD method_34265 (Lnet/minecraft/class_1657;Lnet/minecraft/class_1799;)V ARG 2 stack METHOD method_34266 getIndex ()I - METHOD method_44206 setStackNoCallbacks (Lnet/minecraft/class_1799;)V - COMMENT Sets the slot's stack to {@code stack} and marks the slot as dirty. Unlike - COMMENT {@link #setStack} subclasses may not override this method to perform additional operations. + METHOD method_48931 setStack (Lnet/minecraft/class_1799;Lnet/minecraft/class_1799;)V + COMMENT Sets the slot's stack to {@code stack} and marks the slot as dirty. Subclasses + COMMENT may override this method to perform additional operations. + ARG 1 stack + ARG 2 previousStack + METHOD method_51306 canBeHighlighted ()Z + METHOD method_53512 setStack (Lnet/minecraft/class_1799;)V ARG 1 stack METHOD method_7667 onTakeItem (Lnet/minecraft/class_1657;Lnet/minecraft/class_1799;)V ARG 1 player @@ -50,9 +54,7 @@ CLASS net/minecraft/class_1735 net/minecraft/screen/slot/Slot ARG 1 amount METHOD method_7672 onTake (I)V ARG 1 amount - METHOD method_7673 setStack (Lnet/minecraft/class_1799;)V - COMMENT Sets the slot's stack to {@code stack} and marks the slot as dirty. Subclasses - COMMENT may override this method to perform additional operations. + METHOD method_7673 setStackNoCallbacks (Lnet/minecraft/class_1799;)V ARG 1 stack METHOD method_7674 canTakeItems (Lnet/minecraft/class_1657;)Z ARG 1 playerEntity diff --git a/mappings/net/minecraft/server/DataPackContents.mapping b/mappings/net/minecraft/server/DataPackContents.mapping index 30eead910c..3b69cb2331 100644 --- a/mappings/net/minecraft/server/DataPackContents.mapping +++ b/mappings/net/minecraft/server/DataPackContents.mapping @@ -8,33 +8,32 @@ CLASS net/minecraft/class_5350 net/minecraft/server/DataPackContents FIELD field_25336 commandManager Lnet/minecraft/class_2170; FIELD field_25337 recipeManager Lnet/minecraft/class_1863; FIELD field_25338 registryTagManager Lnet/minecraft/class_3505; - FIELD field_25339 lootConditionManager Lnet/minecraft/class_4567; FIELD field_25340 lootManager Lnet/minecraft/class_60; FIELD field_25341 serverAdvancementLoader Lnet/minecraft/class_2989; FIELD field_25342 functionLoader Lnet/minecraft/class_5349; - FIELD field_28017 lootFunctionManager Lnet/minecraft/class_5640; FIELD field_36491 LOGGER Lorg/slf4j/Logger; - FIELD field_38051 commandRegistryAccess Lnet/minecraft/class_7157; - METHOD (Lnet/minecraft/class_5455$class_6890;Lnet/minecraft/class_2170$class_5364;I)V + FIELD field_38051 commandRegistryAccess Lnet/minecraft/class_7157$class_7870; + METHOD (Lnet/minecraft/class_5455$class_6890;Lnet/minecraft/class_7699;Lnet/minecraft/class_2170$class_5364;I)V ARG 1 dynamicRegistryManager - ARG 2 commandEnvironment - ARG 3 functionPermissionLevel + ARG 2 enabledFeatures + ARG 3 environment + ARG 4 functionPermissionLevel METHOD method_29465 getFunctionLoader ()Lnet/minecraft/class_5349; COMMENT {@return the function loader} COMMENT COMMENT

    Function loader loads the {@linkplain net.minecraft.server.function.CommandFunction COMMENT functions} in data packs. - METHOD method_29466 reload (Lnet/minecraft/class_3300;Lnet/minecraft/class_5455$class_6890;Lnet/minecraft/class_2170$class_5364;ILjava/util/concurrent/Executor;Ljava/util/concurrent/Executor;)Ljava/util/concurrent/CompletableFuture; + METHOD method_29466 reload (Lnet/minecraft/class_3300;Lnet/minecraft/class_5455$class_6890;Lnet/minecraft/class_7699;Lnet/minecraft/class_2170$class_5364;ILjava/util/concurrent/Executor;Ljava/util/concurrent/Executor;)Ljava/util/concurrent/CompletableFuture; COMMENT Reloads the data packs contents. COMMENT COMMENT @see MinecraftServer#reloadResources ARG 0 manager ARG 1 dynamicRegistryManager - ARG 2 commandEnvironment - ARG 3 functionPermissionLevel - ARG 4 prepareExecutor - ARG 5 applyExecutor - METHOD method_29468 getLootConditionManager ()Lnet/minecraft/class_4567; + ARG 2 enabledFeatures + ARG 3 environment + ARG 4 functionPermissionLevel + ARG 5 prepareExecutor + ARG 6 applyExecutor METHOD method_29469 getLootManager ()Lnet/minecraft/class_60; COMMENT @see MinecraftServer#getLootManager METHOD method_29471 getRecipeManager ()Lnet/minecraft/class_1863; @@ -43,7 +42,6 @@ CLASS net/minecraft/class_5350 net/minecraft/server/DataPackContents COMMENT @see MinecraftServer#getCommandManager METHOD method_29473 getServerAdvancementLoader ()Lnet/minecraft/class_2989; COMMENT @see MinecraftServer#getAdvancementLoader - METHOD method_32703 getLootFunctionManager ()Lnet/minecraft/class_5640; METHOD method_40421 refresh (Lnet/minecraft/class_5455;)V ARG 1 dynamicRegistryManager METHOD method_40422 repopulateTags (Lnet/minecraft/class_5455;Lnet/minecraft/class_3505$class_6863;)V diff --git a/mappings/net/minecraft/server/Main.mapping b/mappings/net/minecraft/server/Main.mapping index c5b99918ae..f7b288da03 100644 --- a/mappings/net/minecraft/server/Main.mapping +++ b/mappings/net/minecraft/server/Main.mapping @@ -2,16 +2,20 @@ CLASS net/minecraft/server/Main FIELD field_24625 LOGGER Lorg/slf4j/Logger; METHOD main ([Ljava/lang/String;)V ARG 0 args - METHOD method_29173 forceUpgradeWorld (Lnet/minecraft/class_32$class_5143;Lcom/mojang/datafixers/DataFixer;ZLjava/util/function/BooleanSupplier;Lnet/minecraft/class_5285;)V + METHOD method_29173 forceUpgradeWorld (Lnet/minecraft/class_32$class_5143;Lcom/mojang/datafixers/DataFixer;ZLjava/util/function/BooleanSupplier;Lnet/minecraft/class_2378;)V ARG 0 session ARG 1 dataFixer ARG 2 eraseCache ARG 3 continueCheck - ARG 4 generatorOptions - METHOD method_29734 (Lnet/minecraft/class_32$class_5143;Lnet/minecraft/class_3283;Lnet/minecraft/class_6904;Lnet/minecraft/class_3807;Lnet/minecraft/class_7497;Ljoptsimple/OptionSet;Ljoptsimple/OptionSpec;Ljoptsimple/OptionSpec;Ljoptsimple/OptionSpec;Ljoptsimple/OptionSpec;Ljoptsimple/OptionSpec;Ljoptsimple/OptionSpec;Ljava/lang/Thread;)Lnet/minecraft/class_3176; - ARG 12 thread + ARG 4 dimensionOptionsRegistry METHOD method_43612 (Lnet/minecraft/class_7237$class_6906;Lnet/minecraft/class_32$class_5143;Ljoptsimple/OptionSet;Ljoptsimple/OptionSpec;Lnet/minecraft/class_3807;Ljoptsimple/OptionSpec;Ljava/util/concurrent/Executor;)Ljava/util/concurrent/CompletableFuture; ARG 6 applyExecutor - METHOD method_43613 (Lnet/minecraft/class_32$class_5143;Ljoptsimple/OptionSet;Ljoptsimple/OptionSpec;Lnet/minecraft/class_3807;Ljoptsimple/OptionSpec;Lnet/minecraft/class_3300;Lnet/minecraft/class_5359;)Lcom/mojang/datafixers/util/Pair; - ARG 5 resourceManager - ARG 6 dataPackSettings + METHOD method_43613 (Lnet/minecraft/class_32$class_5143;Ljoptsimple/OptionSet;Ljoptsimple/OptionSpec;Lnet/minecraft/class_3807;Ljoptsimple/OptionSpec;Lnet/minecraft/class_7237$class_7660;)Lnet/minecraft/class_7237$class_7661; + ARG 5 context + METHOD method_46219 createServerConfig (Lnet/minecraft/class_3806;Lnet/minecraft/class_32$class_5143;ZLnet/minecraft/class_3283;)Lnet/minecraft/class_7237$class_6906; + ARG 0 serverPropertiesHandler + ARG 1 session + ARG 2 safeMode + ARG 3 dataPackManager + METHOD method_49066 writePidFile (Ljava/nio/file/Path;)V + ARG 0 path diff --git a/mappings/net/minecraft/server/MinecraftServer.mapping b/mappings/net/minecraft/server/MinecraftServer.mapping index 3192cc8f50..c02685a098 100644 --- a/mappings/net/minecraft/server/MinecraftServer.mapping +++ b/mappings/net/minecraft/server/MinecraftServer.mapping @@ -15,7 +15,6 @@ CLASS net/minecraft/server/MinecraftServer COMMENT COMMENT @see net.minecraft.server.dedicated.MinecraftDedicatedServer COMMENT @see net.minecraft.server.integrated.IntegratedServer - FIELD field_16205 metricsData Lnet/minecraft/class_3517; FIELD field_16257 serverThread Ljava/lang/Thread; FIELD field_16258 profiler Lnet/minecraft/class_3695; FIELD field_17200 workerExecutor Ljava/util/concurrent/Executor; @@ -30,7 +29,7 @@ CLASS net/minecraft/server/MinecraftServer FIELD field_24370 structureTemplateManager Lnet/minecraft/class_3485; FIELD field_24371 saveHandler Lnet/minecraft/class_29; FIELD field_24372 saveProperties Lnet/minecraft/class_5219; - FIELD field_25132 registryManager Lnet/minecraft/class_5455$class_6890; + FIELD field_25132 combinedDynamicRegistries Lnet/minecraft/class_7780; FIELD field_25318 resourceManagerHolder Lnet/minecraft/server/MinecraftServer$class_6897; FIELD field_33205 MILLISECONDS_PER_TICK J FIELD field_33210 START_TICKET_CHUNK_RADIUS I @@ -47,6 +46,7 @@ CLASS net/minecraft/server/MinecraftServer FIELD field_35641 ANONYMOUS_PLAYER_PROFILE Lcom/mojang/authlib/GameProfile; FIELD field_39214 hostProfile Lcom/mojang/authlib/GameProfile; FIELD field_39440 apiServices Lnet/minecraft/class_7497; + FIELD field_42958 favicon Lnet/minecraft/class_2926$class_8145; FIELD field_4543 onlineMode Z FIELD field_4544 running Z FIELD field_4546 LOGGER Lorg/slf4j/Logger; @@ -89,7 +89,6 @@ CLASS net/minecraft/server/MinecraftServer ARG 6 dataFixer ARG 7 apiServices ARG 8 worldGenerationProgressListenerFactory - METHOD method_15876 getMetricsData ()Lnet/minecraft/class_3517; METHOD method_16043 isStopping ()Z METHOD method_16044 getProfiler ()Lnet/minecraft/class_3695; METHOD method_16208 runTasksTillTickEnd ()V @@ -118,7 +117,6 @@ CLASS net/minecraft/server/MinecraftServer ARG 1 path METHOD method_21714 getFunctionPermissionLevel ()I METHOD method_22827 getDataCommandStorage ()Lnet/minecraft/class_4565; - METHOD method_22828 getPredicateManager ()Lnet/minecraft/class_4567; METHOD method_24307 getModStatus ()Lnet/minecraft/class_6683; METHOD method_24487 startTickMetrics ()V METHOD method_24488 isDebugRunning ()Z @@ -153,10 +151,11 @@ CLASS net/minecraft/server/MinecraftServer ARG 2 resourceManagerHolder METHOD method_29735 createDataPackSettings (Lnet/minecraft/class_3283;)Lnet/minecraft/class_5359; ARG 0 dataPackManager - METHOD method_29736 loadDataPacks (Lnet/minecraft/class_3283;Lnet/minecraft/class_5359;Z)Lnet/minecraft/class_5359; + METHOD method_29736 loadDataPacks (Lnet/minecraft/class_3283;Lnet/minecraft/class_5359;ZLnet/minecraft/class_7699;)Lnet/minecraft/class_7712; ARG 0 resourcePackManager ARG 1 dataPackSettings ARG 2 safeMode + ARG 3 enabledFeatures METHOD method_29738 (Ljava/util/Collection;Ljava/lang/String;)Z ARG 1 name METHOD method_29740 startServer (Ljava/util/function/Function;)Lnet/minecraft/server/MinecraftServer; @@ -169,7 +168,6 @@ CLASS net/minecraft/server/MinecraftServer ARG 1 player METHOD method_31400 generateKeyPair ()V METHOD method_32303 requireResourcePack ()Z - METHOD method_32699 getItemModifierManager ()Lnet/minecraft/class_5640; METHOD method_32816 getPlayerInteractionManager (Lnet/minecraft/class_3222;)Lnet/minecraft/class_3225; ARG 1 player METHOD method_34864 getResourceManager ()Lnet/minecraft/class_3300; @@ -246,8 +244,13 @@ CLASS net/minecraft/server/MinecraftServer METHOD method_3745 setFlightEnabled (Z)V ARG 1 flightEnabled METHOD method_3747 stop (Z)V - METHOD method_37475 (Lnet/minecraft/class_2926;Ljava/io/File;)V - ARG 1 file + COMMENT Stops this server. + COMMENT + COMMENT @apiNote Pass {@code true} to {@code waitForShutdown} to wait until the server shuts + COMMENT down. Note that this must be {@code false} if called from the server thread, + COMMENT otherwise it deadlocks. + ARG 1 waitForShutdown + COMMENT whether to wait for server shutdown, if called outside the server thread METHOD method_3748 tick (Ljava/util/function/BooleanSupplier;)V ARG 1 shouldKeepTicking METHOD method_3749 getMaxWorldBorderRadius ()I @@ -297,15 +300,11 @@ CLASS net/minecraft/server/MinecraftServer METHOD method_3786 createWorlds (Lnet/minecraft/class_3949;)V ARG 1 worldGenerationProgressListener METHOD method_3787 getNetworkIo ()Lnet/minecraft/class_3242; - METHOD method_3788 getCurrentPlayerCount ()I METHOD method_3790 getDefaultGameMode ()Lnet/minecraft/class_1934; - METHOD method_3791 setFavicon (Lnet/minecraft/class_2926;)V - ARG 1 metadata METHOD method_3793 getUserCache ()Lnet/minecraft/class_3312; METHOD method_3796 shouldSpawnAnimals ()Z METHOD method_3798 getOpPermissionLevel ()I METHOD method_3799 isDemo ()Z - METHOD method_3802 getMaxPlayerCount ()I METHOD method_3803 setPlayerIdleTimeout (I)V ARG 1 playerIdleTimeout METHOD method_3806 isRunning ()Z @@ -320,7 +319,6 @@ CLASS net/minecraft/server/MinecraftServer COMMENT COMMENT

    A dedicated server refers to a Minecraft server implementation which is detached from a parent Minecraft client process. COMMENT A dedicated Minecraft server only accepts remote connections. - METHOD method_3818 getServerMotd ()Ljava/lang/String; METHOD method_3819 getServerIp ()Ljava/lang/String; METHOD method_3820 isLoading ()Z METHOD method_3821 exit ()V @@ -330,7 +328,6 @@ CLASS net/minecraft/server/MinecraftServer COMMENT COMMENT @return true if the Minecraft server was successfully setup, false if the server failed to be setup. METHOD method_3826 getTimeReference ()J - METHOD method_3827 getVersion ()Ljava/lang/String; METHOD method_3828 isOnlineMode ()Z COMMENT {@return whether this Minecraft server authenticates players logging in with the COMMENT {@linkplain #getSessionService() Minecraft Session Service}} If this server is @@ -414,12 +411,33 @@ CLASS net/minecraft/server/MinecraftServer METHOD method_43824 getHostProfile ()Lcom/mojang/authlib/GameProfile; METHOD method_43825 setHostProfile (Lcom/mojang/authlib/GameProfile;)V ARG 1 hostProfile - METHOD method_43928 shouldPreviewChat ()Z METHOD method_43929 getMessageDecorator ()Lnet/minecraft/class_7492; COMMENT {@return the message decorator used by the server} COMMENT COMMENT @see MessageDecorator METHOD method_44301 getServicesSignatureVerifier ()Lnet/minecraft/class_7500; + METHOD method_46220 (Lnet/minecraft/class_3288;)Ljava/lang/String; + ARG 0 profile + METHOD method_46221 getCombinedDynamicRegistries ()Lnet/minecraft/class_7780; + METHOD method_46841 (Lnet/minecraft/class_3218;Lnet/minecraft/class_3215;Lnet/minecraft/class_5268;Lnet/minecraft/class_6880$class_6883;)V + ARG 3 feature + METHOD method_46842 (Lnet/minecraft/class_2378;)Ljava/util/Optional; + ARG 0 featureRegistry + METHOD method_49384 loadFavicon ()Ljava/util/Optional; + METHOD method_49385 createMetadata ()Lnet/minecraft/class_2926; + METHOD method_49386 createMetadataPlayers ()Lnet/minecraft/class_2926$class_2927; + METHOD method_49387 (Ljava/nio/file/Path;)Ljava/util/Optional; + ARG 0 path + METHOD method_49388 (Ljava/nio/file/Path;)Z + ARG 0 path + METHOD method_49389 (Ljava/nio/file/Path;)Z + ARG 0 path + METHOD method_49749 sendTimeUpdatePackets ()V + METHOD method_49750 sendTimeUpdatePackets (Lnet/minecraft/class_3218;)V + ARG 1 world + METHOD method_52344 shouldLogIps ()Z + METHOD method_53620 tickTickLog (J)V + ARG 1 nanos METHOD method_5387 isMainThread ()Z CLASS class_6414 DebugStart FIELD field_33980 time J diff --git a/mappings/net/minecraft/server/PlayerManager.mapping b/mappings/net/minecraft/server/PlayerManager.mapping index 7cde6b7ef1..b5cfb270df 100644 --- a/mappings/net/minecraft/server/PlayerManager.mapping +++ b/mappings/net/minecraft/server/PlayerManager.mapping @@ -20,11 +20,12 @@ CLASS net/minecraft/class_3324 net/minecraft/server/PlayerManager FIELD field_14361 whitelist Lnet/minecraft/class_3337; FIELD field_14362 statisticsMap Ljava/util/Map; FIELD field_14364 BANNED_IPS_FILE Ljava/io/File; - FIELD field_24626 registryManager Lnet/minecraft/class_5455$class_6890; + FIELD field_24626 registryManager Lnet/minecraft/class_7780; FIELD field_29790 LATENCY_UPDATE_INTERVAL I FIELD field_34895 simulationDistance I FIELD field_39921 FILTERED_FULL_TEXT Lnet/minecraft/class_2561; - METHOD (Lnet/minecraft/server/MinecraftServer;Lnet/minecraft/class_5455$class_6890;Lnet/minecraft/class_29;I)V + FIELD field_45061 DUPLICATE_LOGIN_TEXT Lnet/minecraft/class_2561; + METHOD (Lnet/minecraft/server/MinecraftServer;Lnet/minecraft/class_7780;Lnet/minecraft/class_29;I)V ARG 1 server ARG 2 registryManager ARG 3 saveHandler @@ -54,9 +55,10 @@ CLASS net/minecraft/class_3324 net/minecraft/server/PlayerManager METHOD method_14568 getViewDistance ()I METHOD method_14569 isOperator (Lcom/mojang/authlib/GameProfile;)Z ARG 1 profile - METHOD method_14570 onPlayerConnect (Lnet/minecraft/class_2535;Lnet/minecraft/class_3222;)V + METHOD method_14570 onPlayerConnect (Lnet/minecraft/class_2535;Lnet/minecraft/class_3222;I)V ARG 1 connection ARG 2 player + ARG 3 latency METHOD method_14571 getPlayerList ()Ljava/util/List; COMMENT Gets a list of all players on a Minecraft server. COMMENT This list should not be modified! @@ -127,9 +129,8 @@ CLASS net/minecraft/class_3324 net/minecraft/server/PlayerManager ARG 1 profile METHOD method_14611 remove (Lnet/minecraft/class_3222;)V ARG 1 player - METHOD method_14613 createPlayer (Lcom/mojang/authlib/GameProfile;Lnet/minecraft/class_7428;)Lnet/minecraft/class_3222; + METHOD method_14613 createPlayer (Lcom/mojang/authlib/GameProfile;)Lnet/minecraft/class_3222; ARG 1 profile - ARG 2 publicKey METHOD method_14614 isWhitelistEnabled ()Z METHOD method_14617 saveAllPlayerData ()V METHOD method_18241 (Lnet/minecraft/class_3218;Lnet/minecraft/class_1297;)Lnet/minecraft/class_1297; @@ -165,8 +166,6 @@ CLASS net/minecraft/class_3324 net/minecraft/server/PlayerManager COMMENT @see #broadcast(SignedMessage, ServerPlayerEntity, MessageType.Parameters) ARG 1 message ARG 2 overlay - METHOD method_43670 (Lnet/minecraft/class_3222;Lnet/minecraft/server/MinecraftServer$class_7460;)V - ARG 1 properties METHOD method_43673 broadcast (Lnet/minecraft/class_7471;Lnet/minecraft/class_3222;Lnet/minecraft/class_2556$class_7602;)V COMMENT Broadcasts a chat message to all players and the server console. COMMENT @@ -200,7 +199,7 @@ CLASS net/minecraft/class_3324 net/minecraft/server/PlayerManager ARG 1 message ARG 2 source ARG 3 params - METHOD method_44791 broadcast (Lnet/minecraft/class_7471;Ljava/util/function/Predicate;Lnet/minecraft/class_3222;Lnet/minecraft/class_7436;Lnet/minecraft/class_2556$class_7602;)V + METHOD method_44791 broadcast (Lnet/minecraft/class_7471;Ljava/util/function/Predicate;Lnet/minecraft/class_3222;Lnet/minecraft/class_2556$class_7602;)V COMMENT Broadcasts a chat message to all players and the server console. COMMENT COMMENT

    Chat messages have signatures. It is possible to use a bogus signature - such as @@ -217,20 +216,12 @@ CLASS net/minecraft/class_3324 net/minecraft/server/PlayerManager ARG 2 shouldSendFiltered COMMENT predicate that determines whether to send the filtered message for the given player ARG 3 sender - ARG 4 sourceProfile - ARG 5 params - METHOD method_44792 sendMessageHeader (Lnet/minecraft/class_7471;Ljava/util/Set;)V - COMMENT Sends {@code message}'s headers (only) to all players except {@code except}. - COMMENT - COMMENT

    This is used to keep the integrity of the "message chain" when a message is censored - COMMENT or when the message is originally sent without metadata due to it being originated from - COMMENT entities. - ARG 1 message - ARG 2 except - METHOD method_44793 verify (Lnet/minecraft/class_7471;Lnet/minecraft/class_7436;)Z + ARG 4 params + METHOD method_44793 verify (Lnet/minecraft/class_7471;)Z COMMENT {@return whether {@code message} is not expired and is verified} COMMENT COMMENT @implNote This only affects the server log. Unverified messages are still broadcast COMMENT to other clients. ARG 1 message - ARG 2 profile + METHOD method_52449 disconnectDuplicateLogins (Lcom/mojang/authlib/GameProfile;)Z + ARG 1 profile diff --git a/mappings/net/minecraft/server/SaveLoader.mapping b/mappings/net/minecraft/server/SaveLoader.mapping index 2d82a219b5..c9456e2f56 100644 --- a/mappings/net/minecraft/server/SaveLoader.mapping +++ b/mappings/net/minecraft/server/SaveLoader.mapping @@ -1,12 +1,7 @@ CLASS net/minecraft/class_6904 net/minecraft/server/SaveLoader FIELD comp_357 dataPackContents Lnet/minecraft/class_5350; - FIELD comp_358 dynamicRegistryManager Lnet/minecraft/class_5455$class_6890; + FIELD comp_358 combinedDynamicRegistries Lnet/minecraft/class_7780; FIELD comp_359 saveProperties Lnet/minecraft/class_5219; METHOD comp_357 dataPackContents ()Lnet/minecraft/class_5350; - METHOD comp_358 dynamicRegistryManager ()Lnet/minecraft/class_5455$class_6890; + METHOD comp_358 combinedDynamicRegistries ()Lnet/minecraft/class_7780; METHOD comp_359 saveProperties ()Lnet/minecraft/class_5219; - METHOD method_40431 load (Lnet/minecraft/class_7237$class_6906;Lnet/minecraft/class_7237$class_6907;Ljava/util/concurrent/Executor;Ljava/util/concurrent/Executor;)Ljava/util/concurrent/CompletableFuture; - ARG 0 serverConfig - ARG 1 savePropertiesSupplier - ARG 2 prepareExecutor - ARG 3 applyExecutor diff --git a/mappings/net/minecraft/server/SaveLoading.mapping b/mappings/net/minecraft/server/SaveLoading.mapping index 488855753b..77ce185b51 100644 --- a/mappings/net/minecraft/server/SaveLoading.mapping +++ b/mappings/net/minecraft/server/SaveLoading.mapping @@ -1,15 +1,26 @@ CLASS net/minecraft/class_7237 net/minecraft/server/SaveLoading + FIELD field_39979 LOGGER Lorg/slf4j/Logger; METHOD method_42096 (Lnet/minecraft/class_6860;Lnet/minecraft/class_5350;Ljava/lang/Throwable;)V ARG 1 dataPackContents ARG 2 throwable - METHOD method_42097 (Lnet/minecraft/class_5455$class_6890;Lnet/minecraft/class_7237$class_7239;Lnet/minecraft/class_6860;Ljava/lang/Object;Lnet/minecraft/class_5350;)Ljava/lang/Object; - ARG 4 dataPackContents + METHOD method_42097 (Lnet/minecraft/class_5455$class_6890;Lnet/minecraft/class_7237$class_7239;Lnet/minecraft/class_6860;Lnet/minecraft/class_7780;Lnet/minecraft/class_7237$class_7661;Lnet/minecraft/class_5350;)Ljava/lang/Object; + ARG 5 dataPackContents METHOD method_42098 load (Lnet/minecraft/class_7237$class_6906;Lnet/minecraft/class_7237$class_6907;Lnet/minecraft/class_7237$class_7239;Ljava/util/concurrent/Executor;Ljava/util/concurrent/Executor;)Ljava/util/concurrent/CompletableFuture; ARG 0 serverConfig ARG 1 loadContextSupplier ARG 2 saveApplierFactory ARG 3 prepareExecutor ARG 4 applyExecutor + METHOD method_45142 loadDynamicRegistryManager (Lnet/minecraft/class_3300;Lnet/minecraft/class_7780;Lnet/minecraft/class_7659;Ljava/util/List;)Lnet/minecraft/class_5455$class_6890; + ARG 0 resourceManager + ARG 1 combinedDynamicRegistries + ARG 2 type + ARG 3 entries + METHOD method_45143 withRegistriesLoaded (Lnet/minecraft/class_3300;Lnet/minecraft/class_7780;Lnet/minecraft/class_7659;Ljava/util/List;)Lnet/minecraft/class_7780; + ARG 0 resourceManager + ARG 1 combinedDynamicRegistries + ARG 2 type + ARG 3 entries CLASS class_6906 ServerConfig FIELD comp_361 commandEnvironment Lnet/minecraft/class_2170$class_5364; FIELD comp_362 functionPermissionLevel I @@ -18,18 +29,27 @@ CLASS net/minecraft/class_7237 net/minecraft/server/SaveLoading METHOD comp_362 functionPermissionLevel ()I METHOD comp_634 dataPacks ()Lnet/minecraft/class_7237$class_7238; CLASS class_6907 LoadContextSupplier - METHOD get (Lnet/minecraft/class_3300;Lnet/minecraft/class_5359;)Lcom/mojang/datafixers/util/Pair; - ARG 1 resourceManager - ARG 2 dataPackSettings + METHOD get (Lnet/minecraft/class_7237$class_7660;)Lnet/minecraft/class_7237$class_7661; + ARG 1 context CLASS class_7238 DataPacks FIELD comp_635 manager Lnet/minecraft/class_3283; - FIELD comp_636 settings Lnet/minecraft/class_5359; METHOD comp_635 manager ()Lnet/minecraft/class_3283; - METHOD comp_636 settings ()Lnet/minecraft/class_5359; METHOD method_42099 load ()Lcom/mojang/datafixers/util/Pair; CLASS class_7239 SaveApplierFactory - METHOD create (Lnet/minecraft/class_6860;Lnet/minecraft/class_5350;Lnet/minecraft/class_5455$class_6890;Ljava/lang/Object;)Ljava/lang/Object; + METHOD create (Lnet/minecraft/class_6860;Lnet/minecraft/class_5350;Lnet/minecraft/class_7780;Ljava/lang/Object;)Ljava/lang/Object; ARG 1 resourceManager ARG 2 dataPackContents - ARG 3 dynamicRegistryManager + ARG 3 combinedDynamicRegistries ARG 4 loadContext + CLASS class_7660 LoadContextSupplierContext + FIELD comp_987 resourceManager Lnet/minecraft/class_3300; + FIELD comp_989 worldGenRegistryManager Lnet/minecraft/class_5455$class_6890; + FIELD comp_990 dimensionsRegistryManager Lnet/minecraft/class_5455$class_6890; + METHOD comp_987 resourceManager ()Lnet/minecraft/class_3300; + METHOD comp_989 worldGenRegistryManager ()Lnet/minecraft/class_5455$class_6890; + METHOD comp_990 dimensionsRegistryManager ()Lnet/minecraft/class_5455$class_6890; + CLASS class_7661 LoadContext + FIELD comp_991 extraData Ljava/lang/Object; + FIELD comp_992 dimensionsRegistryManager Lnet/minecraft/class_5455$class_6890; + METHOD comp_991 extraData ()Ljava/lang/Object; + METHOD comp_992 dimensionsRegistryManager ()Lnet/minecraft/class_5455$class_6890; diff --git a/mappings/net/minecraft/server/ServerAdvancementLoader.mapping b/mappings/net/minecraft/server/ServerAdvancementLoader.mapping index 49d7a83909..fbbd9becc2 100644 --- a/mappings/net/minecraft/server/ServerAdvancementLoader.mapping +++ b/mappings/net/minecraft/server/ServerAdvancementLoader.mapping @@ -1,13 +1,13 @@ CLASS net/minecraft/class_2989 net/minecraft/server/ServerAdvancementLoader - FIELD field_13404 manager Lnet/minecraft/class_163; + FIELD field_13404 manager Ljava/util/Map; FIELD field_13405 GSON Lcom/google/gson/Gson; FIELD field_13406 LOGGER Lorg/slf4j/Logger; - FIELD field_24452 conditionManager Lnet/minecraft/class_4567; - METHOD (Lnet/minecraft/class_4567;)V + FIELD field_44468 conditionManager Lnet/minecraft/class_60; + METHOD (Lnet/minecraft/class_60;)V ARG 1 conditionManager METHOD method_12893 getAdvancements ()Ljava/util/Collection; - METHOD method_12896 get (Lnet/minecraft/class_2960;)Lnet/minecraft/class_161; + METHOD method_12896 get (Lnet/minecraft/class_2960;)Lnet/minecraft/class_8779; ARG 1 id - METHOD method_20723 (Ljava/util/Map;Lnet/minecraft/class_2960;Lcom/google/gson/JsonElement;)V + METHOD method_20723 (Lcom/google/common/collect/ImmutableMap$Builder;Lnet/minecraft/class_2960;Lcom/google/gson/JsonElement;)V ARG 2 id ARG 3 json diff --git a/mappings/net/minecraft/server/ServerConfigHandler.mapping b/mappings/net/minecraft/server/ServerConfigHandler.mapping index 2ae2bb2af1..cf77071298 100644 --- a/mappings/net/minecraft/server/ServerConfigHandler.mapping +++ b/mappings/net/minecraft/server/ServerConfigHandler.mapping @@ -41,26 +41,22 @@ CLASS net/minecraft/class_3321 net/minecraft/server/ServerConfigHandler METHOD method_14552 (Ljava/lang/String;)Z ARG 0 playerName CLASS 1 - METHOD onProfileLookupFailed (Lcom/mojang/authlib/GameProfile;Ljava/lang/Exception;)V - ARG 1 profile + METHOD onProfileLookupFailed (Ljava/lang/String;Ljava/lang/Exception;)V ARG 2 exception METHOD onProfileLookupSucceeded (Lcom/mojang/authlib/GameProfile;)V ARG 1 profile CLASS 2 - METHOD onProfileLookupFailed (Lcom/mojang/authlib/GameProfile;Ljava/lang/Exception;)V - ARG 1 profile + METHOD onProfileLookupFailed (Ljava/lang/String;Ljava/lang/Exception;)V ARG 2 exception METHOD onProfileLookupSucceeded (Lcom/mojang/authlib/GameProfile;)V ARG 1 profile CLASS 3 - METHOD onProfileLookupFailed (Lcom/mojang/authlib/GameProfile;Ljava/lang/Exception;)V - ARG 1 profile + METHOD onProfileLookupFailed (Ljava/lang/String;Ljava/lang/Exception;)V ARG 2 exception METHOD onProfileLookupSucceeded (Lcom/mojang/authlib/GameProfile;)V ARG 1 profile CLASS 4 - METHOD onProfileLookupFailed (Lcom/mojang/authlib/GameProfile;Ljava/lang/Exception;)V - ARG 1 profile + METHOD onProfileLookupFailed (Ljava/lang/String;Ljava/lang/Exception;)V ARG 2 exception METHOD onProfileLookupSucceeded (Lcom/mojang/authlib/GameProfile;)V ARG 1 profile @@ -69,13 +65,9 @@ CLASS net/minecraft/class_3321 net/minecraft/server/ServerConfigHandler ARG 1 playerDataFolder ARG 2 fileName ARG 3 uuid - METHOD method_14554 getPlayerFileName (Lcom/mojang/authlib/GameProfile;)Ljava/lang/String; - ARG 1 profile - METHOD onProfileLookupFailed (Lcom/mojang/authlib/GameProfile;Ljava/lang/Exception;)V - ARG 1 profile + METHOD method_14554 getPlayerFileName (Ljava/lang/String;)Ljava/lang/String; + METHOD onProfileLookupFailed (Ljava/lang/String;Ljava/lang/Exception;)V ARG 2 exception - METHOD onProfileLookupSucceeded (Lcom/mojang/authlib/GameProfile;)V - ARG 1 profile CLASS class_3322 ServerConfigException METHOD (Ljava/lang/String;)V ARG 1 message diff --git a/mappings/net/minecraft/server/ServerMetadata.mapping b/mappings/net/minecraft/server/ServerMetadata.mapping index 613f7b3273..84a51d9e7b 100644 --- a/mappings/net/minecraft/server/ServerMetadata.mapping +++ b/mappings/net/minecraft/server/ServerMetadata.mapping @@ -1,75 +1,42 @@ CLASS net/minecraft/class_2926 net/minecraft/server/ServerMetadata COMMENT Represents metadata sent to the client. This describes the server's message of the day, online players and the protocol version. - FIELD field_13283 favicon Ljava/lang/String; - FIELD field_13284 description Lnet/minecraft/class_2561; - FIELD field_13285 players Lnet/minecraft/class_2926$class_2927; - FIELD field_13286 version Lnet/minecraft/class_2926$class_2930; - FIELD field_33375 FAVICON_WIDTH I - FIELD field_33376 FAVICON_HEIGHT I - FIELD field_39391 previewsChat Z - FIELD field_39914 secureChatEnforced Z - METHOD method_12677 setFavicon (Ljava/lang/String;)V - ARG 1 favicon - METHOD method_12678 getFavicon ()Ljava/lang/String; - METHOD method_12679 setVersion (Lnet/minecraft/class_2926$class_2930;)V - ARG 1 version - METHOD method_12680 getDescription ()Lnet/minecraft/class_2561; - METHOD method_12681 setPlayers (Lnet/minecraft/class_2926$class_2927;)V - ARG 1 players - METHOD method_12682 getPlayers ()Lnet/minecraft/class_2926$class_2927; - METHOD method_12683 getVersion ()Lnet/minecraft/class_2926$class_2930; - METHOD method_12684 setDescription (Lnet/minecraft/class_2561;)V - ARG 1 description - METHOD method_44138 setPreviewsChat (Z)V - ARG 1 previewsChat - METHOD method_44139 shouldPreviewChat ()Z - METHOD method_45050 setSecureChatEnforced (Z)V - ARG 1 secureChatEnforced - METHOD method_45051 isSecureChatEnforced ()Z + FIELD comp_1277 secureChatEnforced Z + FIELD field_42535 CODEC Lcom/mojang/serialization/Codec; + METHOD comp_1277 secureChatEnforced ()Z + METHOD method_49092 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 0 instance CLASS class_2927 Players - FIELD field_13287 sample [Lcom/mojang/authlib/GameProfile; - FIELD field_13288 online I - FIELD field_13289 max I - METHOD (II)V + FIELD comp_1279 max I + FIELD comp_1280 online I + FIELD comp_1281 sample Ljava/util/List; + FIELD field_42540 CODEC Lcom/mojang/serialization/Codec; + FIELD field_42541 GAME_PROFILE_CODEC Lcom/mojang/serialization/Codec; + METHOD (IILjava/util/List;)V ARG 1 max ARG 2 online - METHOD method_12685 getSample ()[Lcom/mojang/authlib/GameProfile; - METHOD method_12686 setSample ([Lcom/mojang/authlib/GameProfile;)V - ARG 1 sample - METHOD method_12687 getPlayerLimit ()I - METHOD method_12688 getOnlinePlayerCount ()I - CLASS class_2928 Deserializer - METHOD deserialize (Lcom/google/gson/JsonElement;Ljava/lang/reflect/Type;Lcom/google/gson/JsonDeserializationContext;)Ljava/lang/Object; - ARG 1 json - ARG 2 type - ARG 3 context - METHOD serialize (Ljava/lang/Object;Ljava/lang/reflect/Type;Lcom/google/gson/JsonSerializationContext;)Lcom/google/gson/JsonElement; - ARG 1 entry - ARG 2 unused - ARG 3 context - CLASS class_2929 Deserializer - METHOD deserialize (Lcom/google/gson/JsonElement;Ljava/lang/reflect/Type;Lcom/google/gson/JsonDeserializationContext;)Ljava/lang/Object; - ARG 1 functionJson - ARG 2 unused - ARG 3 context - METHOD serialize (Ljava/lang/Object;Ljava/lang/reflect/Type;Lcom/google/gson/JsonSerializationContext;)Lcom/google/gson/JsonElement; - ARG 1 serverMetadata - ARG 2 type - ARG 3 context + METHOD comp_1279 max ()I + METHOD comp_1280 online ()I + METHOD comp_1281 sample ()Ljava/util/List; + METHOD method_49095 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 0 instance + METHOD method_49096 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 0 instance CLASS class_2930 Version - FIELD field_13290 gameVersion Ljava/lang/String; - FIELD field_13291 protocolVersion I + FIELD comp_1282 gameVersion Ljava/lang/String; + FIELD comp_1283 protocolVersion I + FIELD field_42542 CODEC Lcom/mojang/serialization/Codec; METHOD (Ljava/lang/String;I)V ARG 1 gameVersion ARG 2 protocolVersion - METHOD method_12693 getGameVersion ()Ljava/lang/String; - METHOD method_12694 getProtocolVersion ()I - CLASS class_2931 Serializer - METHOD deserialize (Lcom/google/gson/JsonElement;Ljava/lang/reflect/Type;Lcom/google/gson/JsonDeserializationContext;)Ljava/lang/Object; - ARG 1 json - ARG 2 type - ARG 3 context - METHOD serialize (Ljava/lang/Object;Ljava/lang/reflect/Type;Lcom/google/gson/JsonSerializationContext;)Lcom/google/gson/JsonElement; - ARG 1 entry - ARG 2 unused - ARG 3 context + METHOD comp_1282 gameVersion ()Ljava/lang/String; + METHOD comp_1283 protocolVersion ()I + METHOD method_49097 create ()Lnet/minecraft/class_2926$class_2930; + METHOD method_49098 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 0 instance + CLASS class_8145 Favicon + FIELD field_42538 CODEC Lcom/mojang/serialization/Codec; + FIELD field_42539 DATA_URI_PREFIX Ljava/lang/String; + METHOD method_49093 (Lnet/minecraft/class_2926$class_8145;)Ljava/lang/String; + ARG 0 iconBytes + METHOD method_49094 (Ljava/lang/String;)Lcom/mojang/serialization/DataResult; + ARG 0 uri diff --git a/mappings/net/minecraft/server/ServerNetworkIo.mapping b/mappings/net/minecraft/server/ServerNetworkIo.mapping index 57ee52c1ee..abdf3b4c73 100644 --- a/mappings/net/minecraft/server/ServerNetworkIo.mapping +++ b/mappings/net/minecraft/server/ServerNetworkIo.mapping @@ -1,11 +1,11 @@ CLASS net/minecraft/class_3242 net/minecraft/server/ServerNetworkIo - FIELD field_14105 EPOLL_CHANNEL Lnet/minecraft/class_3528; + FIELD field_14105 EPOLL_CHANNEL Ljava/util/function/Supplier; FIELD field_14106 channels Ljava/util/List; FIELD field_14107 connections Ljava/util/List; FIELD field_14108 active Z FIELD field_14109 server Lnet/minecraft/server/MinecraftServer; FIELD field_14110 LOGGER Lorg/slf4j/Logger; - FIELD field_14111 DEFAULT_CHANNEL Lnet/minecraft/class_3528; + FIELD field_14111 DEFAULT_CHANNEL Ljava/util/function/Supplier; METHOD (Lnet/minecraft/server/MinecraftServer;)V ARG 1 server METHOD method_14351 getServer ()Lnet/minecraft/server/MinecraftServer; diff --git a/mappings/net/minecraft/server/command/AdvancementCommand.mapping b/mappings/net/minecraft/server/command/AdvancementCommand.mapping index d7a3a6e9a3..30b4120b87 100644 --- a/mappings/net/minecraft/server/command/AdvancementCommand.mapping +++ b/mappings/net/minecraft/server/command/AdvancementCommand.mapping @@ -6,7 +6,7 @@ CLASS net/minecraft/class_3008 net/minecraft/server/command/AdvancementCommand ARG 0 context METHOD method_12980 register (Lcom/mojang/brigadier/CommandDispatcher;)V ARG 0 dispatcher - METHOD method_12981 executeCriterion (Lnet/minecraft/class_2168;Ljava/util/Collection;Lnet/minecraft/class_3008$class_3009;Lnet/minecraft/class_161;Ljava/lang/String;)I + METHOD method_12981 executeCriterion (Lnet/minecraft/class_2168;Ljava/util/Collection;Lnet/minecraft/class_3008$class_3009;Lnet/minecraft/class_8779;Ljava/lang/String;)I ARG 0 source ARG 1 targets ARG 2 operation @@ -32,7 +32,7 @@ CLASS net/minecraft/class_3008 net/minecraft/server/command/AdvancementCommand ARG 3 selection METHOD method_12989 (Lcom/mojang/brigadier/context/CommandContext;)I ARG 0 context - METHOD method_12990 addChildrenRecursivelyToList (Lnet/minecraft/class_161;Ljava/util/List;)V + METHOD method_12990 addChildrenRecursivelyToList (Lnet/minecraft/class_8781;Ljava/util/List;)V ARG 0 parent ARG 1 childList METHOD method_12991 (Lcom/mojang/brigadier/context/CommandContext;Lcom/mojang/brigadier/suggestion/SuggestionsBuilder;)Ljava/util/concurrent/CompletableFuture; @@ -47,9 +47,7 @@ CLASS net/minecraft/class_3008 net/minecraft/server/command/AdvancementCommand ARG 0 context METHOD method_12995 (Lcom/mojang/brigadier/context/CommandContext;)I ARG 0 context - METHOD method_12996 select (Lnet/minecraft/class_161;Lnet/minecraft/class_3008$class_3010;)Ljava/util/List; - ARG 0 advancement - ARG 1 selection + METHOD method_12996 select (Lcom/mojang/brigadier/context/CommandContext;Lnet/minecraft/class_8779;Lnet/minecraft/class_3008$class_3010;)Ljava/util/List; METHOD method_12997 (Lcom/mojang/brigadier/context/CommandContext;)I ARG 0 context METHOD method_12998 (Lcom/mojang/brigadier/context/CommandContext;)I @@ -61,12 +59,12 @@ CLASS net/minecraft/class_3008 net/minecraft/server/command/AdvancementCommand METHOD method_12999 processAll (Lnet/minecraft/class_3222;Ljava/lang/Iterable;)I ARG 1 player ARG 2 advancements - METHOD method_13000 processEachCriterion (Lnet/minecraft/class_3222;Lnet/minecraft/class_161;Ljava/lang/String;)Z + METHOD method_13000 processEachCriterion (Lnet/minecraft/class_3222;Lnet/minecraft/class_8779;Ljava/lang/String;)Z ARG 1 player ARG 2 advancement ARG 3 criterion METHOD method_13001 getCommandPrefix ()Ljava/lang/String; - METHOD method_13002 processEach (Lnet/minecraft/class_3222;Lnet/minecraft/class_161;)Z + METHOD method_13002 processEach (Lnet/minecraft/class_3222;Lnet/minecraft/class_8779;)Z ARG 1 player ARG 2 advancement CLASS class_3010 Selection diff --git a/mappings/net/minecraft/server/command/AttributeCommand.mapping b/mappings/net/minecraft/server/command/AttributeCommand.mapping index 65c4ca21f9..e73cdce76b 100644 --- a/mappings/net/minecraft/server/command/AttributeCommand.mapping +++ b/mappings/net/minecraft/server/command/AttributeCommand.mapping @@ -5,32 +5,33 @@ CLASS net/minecraft/class_5252 net/minecraft/server/command/AttributeCommand FIELD field_24379 MODIFIER_ALREADY_PRESENT_EXCEPTION Lcom/mojang/brigadier/exceptions/Dynamic3CommandExceptionType; METHOD method_27733 getLivingEntity (Lnet/minecraft/class_1297;)Lnet/minecraft/class_1309; ARG 0 entity - METHOD method_27734 getAttributeInstance (Lnet/minecraft/class_1297;Lnet/minecraft/class_1320;)Lnet/minecraft/class_1324; + METHOD method_27734 getAttributeInstance (Lnet/minecraft/class_1297;Lnet/minecraft/class_6880;)Lnet/minecraft/class_1324; ARG 0 entity ARG 1 attribute - METHOD method_27735 register (Lcom/mojang/brigadier/CommandDispatcher;)V + METHOD method_27735 register (Lcom/mojang/brigadier/CommandDispatcher;Lnet/minecraft/class_7157;)V ARG 0 dispatcher + ARG 1 registryAccess METHOD method_27736 (Lcom/mojang/brigadier/context/CommandContext;)I ARG 0 context METHOD method_27738 (Lnet/minecraft/class_2168;)Z ARG 0 source - METHOD method_27739 executeValueGet (Lnet/minecraft/class_2168;Lnet/minecraft/class_1297;Lnet/minecraft/class_1320;D)I + METHOD method_27739 executeValueGet (Lnet/minecraft/class_2168;Lnet/minecraft/class_1297;Lnet/minecraft/class_6880;D)I ARG 0 source ARG 1 target ARG 2 attribute ARG 3 multiplier - METHOD method_27740 executeModifierRemove (Lnet/minecraft/class_2168;Lnet/minecraft/class_1297;Lnet/minecraft/class_1320;Ljava/util/UUID;)I + METHOD method_27740 executeModifierRemove (Lnet/minecraft/class_2168;Lnet/minecraft/class_1297;Lnet/minecraft/class_6880;Ljava/util/UUID;)I ARG 0 source ARG 1 target ARG 2 attribute ARG 3 uuid - METHOD method_27741 executeModifierValueGet (Lnet/minecraft/class_2168;Lnet/minecraft/class_1297;Lnet/minecraft/class_1320;Ljava/util/UUID;D)I + METHOD method_27741 executeModifierValueGet (Lnet/minecraft/class_2168;Lnet/minecraft/class_1297;Lnet/minecraft/class_6880;Ljava/util/UUID;D)I ARG 0 source ARG 1 target ARG 2 attribute ARG 3 uuid ARG 4 multiplier - METHOD method_27742 executeModifierAdd (Lnet/minecraft/class_2168;Lnet/minecraft/class_1297;Lnet/minecraft/class_1320;Ljava/util/UUID;Ljava/lang/String;DLnet/minecraft/class_1322$class_1323;)I + METHOD method_27742 executeModifierAdd (Lnet/minecraft/class_2168;Lnet/minecraft/class_1297;Lnet/minecraft/class_6880;Ljava/util/UUID;Ljava/lang/String;DLnet/minecraft/class_1322$class_1323;)I ARG 0 source ARG 1 target ARG 2 attribute @@ -47,12 +48,12 @@ CLASS net/minecraft/class_5252 net/minecraft/server/command/AttributeCommand ARG 0 entityName ARG 1 attributeName ARG 2 uuid - METHOD method_27746 getLivingEntityWithAttribute (Lnet/minecraft/class_1297;Lnet/minecraft/class_1320;)Lnet/minecraft/class_1309; + METHOD method_27746 getLivingEntityWithAttribute (Lnet/minecraft/class_1297;Lnet/minecraft/class_6880;)Lnet/minecraft/class_1309; ARG 0 entity ARG 1 attribute METHOD method_27747 (Lcom/mojang/brigadier/context/CommandContext;)I ARG 0 context - METHOD method_27748 executeBaseValueGet (Lnet/minecraft/class_2168;Lnet/minecraft/class_1297;Lnet/minecraft/class_1320;D)I + METHOD method_27748 executeBaseValueGet (Lnet/minecraft/class_2168;Lnet/minecraft/class_1297;Lnet/minecraft/class_6880;D)I ARG 0 source ARG 1 target ARG 2 attribute @@ -63,7 +64,7 @@ CLASS net/minecraft/class_5252 net/minecraft/server/command/AttributeCommand ARG 2 uuid METHOD method_27750 (Lcom/mojang/brigadier/context/CommandContext;)I ARG 0 context - METHOD method_27751 executeBaseValueSet (Lnet/minecraft/class_2168;Lnet/minecraft/class_1297;Lnet/minecraft/class_1320;D)I + METHOD method_27751 executeBaseValueSet (Lnet/minecraft/class_2168;Lnet/minecraft/class_1297;Lnet/minecraft/class_6880;D)I ARG 0 source ARG 1 target ARG 2 attribute @@ -84,3 +85,5 @@ CLASS net/minecraft/class_5252 net/minecraft/server/command/AttributeCommand ARG 0 context METHOD method_27759 (Lcom/mojang/brigadier/context/CommandContext;)I ARG 0 context + METHOD method_45144 getName (Lnet/minecraft/class_6880;)Lnet/minecraft/class_2561; + ARG 0 attribute diff --git a/mappings/net/minecraft/server/command/ChaseCommand.mapping b/mappings/net/minecraft/server/command/ChaseCommand.mapping index 0de7f514e3..90217b86ff 100644 --- a/mappings/net/minecraft/server/command/ChaseCommand.mapping +++ b/mappings/net/minecraft/server/command/ChaseCommand.mapping @@ -6,6 +6,7 @@ CLASS net/minecraft/class_6634 net/minecraft/server/command/ChaseCommand FIELD field_35003 INTERVAL I FIELD field_35004 server Lnet/minecraft/class_6632; FIELD field_35005 client Lnet/minecraft/class_6630; + FIELD field_44981 LOGGER Lorg/slf4j/Logger; METHOD method_38770 register (Lcom/mojang/brigadier/CommandDispatcher;)V ARG 0 dispatcher METHOD method_38771 (Lcom/mojang/brigadier/context/CommandContext;)I diff --git a/mappings/net/minecraft/server/command/CloneCommand.mapping b/mappings/net/minecraft/server/command/CloneCommand.mapping index 56b15a24c9..b7ecf224df 100644 --- a/mappings/net/minecraft/server/command/CloneCommand.mapping +++ b/mappings/net/minecraft/server/command/CloneCommand.mapping @@ -3,60 +3,74 @@ CLASS net/minecraft/class_3023 net/minecraft/server/command/CloneCommand FIELD field_13491 TOO_BIG_EXCEPTION Lcom/mojang/brigadier/exceptions/Dynamic2CommandExceptionType; FIELD field_13492 FAILED_EXCEPTION Lcom/mojang/brigadier/exceptions/SimpleCommandExceptionType; FIELD field_13493 OVERLAP_EXCEPTION Lcom/mojang/brigadier/exceptions/SimpleCommandExceptionType; - FIELD field_33386 MAX_BLOCKS I - METHOD method_13086 (Lcom/mojang/brigadier/context/CommandContext;)I - ARG 0 context - METHOD method_13087 (Lcom/mojang/brigadier/context/CommandContext;)I - ARG 0 context - METHOD method_13088 (Lcom/mojang/brigadier/context/CommandContext;)I - ARG 0 context METHOD method_13089 register (Lcom/mojang/brigadier/CommandDispatcher;Lnet/minecraft/class_7157;)V ARG 0 dispatcher ARG 1 commandRegistryAccess - METHOD method_13090 execute (Lnet/minecraft/class_2168;Lnet/minecraft/class_2338;Lnet/minecraft/class_2338;Lnet/minecraft/class_2338;Ljava/util/function/Predicate;Lnet/minecraft/class_3023$class_3025;)I + METHOD method_13090 execute (Lnet/minecraft/class_2168;Lnet/minecraft/class_3023$class_8010;Lnet/minecraft/class_3023$class_8010;Lnet/minecraft/class_3023$class_8010;Ljava/util/function/Predicate;Lnet/minecraft/class_3023$class_3025;)I ARG 0 source ARG 1 begin ARG 2 end ARG 3 destination ARG 4 filter ARG 5 mode - METHOD method_13091 (Lcom/mojang/brigadier/context/CommandContext;)I - ARG 0 context - METHOD method_13092 (Lnet/minecraft/class_2694;)Z - ARG 0 pos - METHOD method_13093 (Lcom/mojang/brigadier/context/CommandContext;)I - ARG 0 context METHOD method_13094 (Lnet/minecraft/class_2168;)Z ARG 0 source - METHOD method_13095 (Lcom/mojang/brigadier/context/CommandContext;)I - ARG 0 context METHOD method_13096 (Lnet/minecraft/class_2694;)Z ARG 0 pos - METHOD method_13097 (Lcom/mojang/brigadier/context/CommandContext;)I - ARG 0 context - METHOD method_13098 (Lnet/minecraft/class_2694;)Z - ARG 0 pos METHOD method_13099 (Ljava/lang/Object;Ljava/lang/Object;)Lcom/mojang/brigadier/Message; ARG 0 maxCount ARG 1 count - METHOD method_13100 (Lcom/mojang/brigadier/context/CommandContext;)I + METHOD method_48035 createModeArgs (Lnet/minecraft/class_3023$class_8009;Lnet/minecraft/class_3023$class_8009;Lnet/minecraft/class_3023$class_8009;Lnet/minecraft/class_3023$class_8009;Lcom/mojang/brigadier/builder/ArgumentBuilder;)Lcom/mojang/brigadier/builder/ArgumentBuilder; + ARG 0 beginPosGetter + ARG 1 endPosGetter + ARG 2 destinationPosGetter + ARG 3 filterGetter + ARG 4 builder + METHOD method_48036 (Lnet/minecraft/class_3023$class_8009;Lnet/minecraft/class_3023$class_8009;Lnet/minecraft/class_3023$class_8009;Lnet/minecraft/class_3023$class_8009;Lcom/mojang/brigadier/context/CommandContext;)I + ARG 4 context + METHOD method_48037 (Lnet/minecraft/class_3023$class_8009;Lnet/minecraft/class_3023$class_8009;Lnet/minecraft/class_3023$class_8009;Lcom/mojang/brigadier/context/CommandContext;)I + ARG 3 context + METHOD method_48038 (Lnet/minecraft/class_3023$class_8009;Lcom/mojang/brigadier/context/CommandContext;)Lnet/minecraft/class_3023$class_8010; + ARG 1 context + METHOD method_48039 (Lcom/mojang/brigadier/context/CommandContext;)Ljava/util/function/Predicate; ARG 0 context - METHOD method_13101 (Lnet/minecraft/class_2694;)Z - ARG 0 pos - METHOD method_13102 (Lnet/minecraft/class_2694;)Z - ARG 0 pos - METHOD method_13103 (Lcom/mojang/brigadier/context/CommandContext;)I + METHOD method_48040 createDimensionalPos (Lcom/mojang/brigadier/context/CommandContext;Lnet/minecraft/class_3218;Ljava/lang/String;)Lnet/minecraft/class_3023$class_8010; ARG 0 context - METHOD method_13104 (Lcom/mojang/brigadier/context/CommandContext;)I + ARG 1 world + ARG 2 name + METHOD method_48042 createSourceArgs (Lnet/minecraft/class_7157;Lnet/minecraft/class_3023$class_8009;)Lcom/mojang/brigadier/builder/ArgumentBuilder; + ARG 0 commandRegistryAccess + ARG 1 worldGetter + METHOD method_48043 createDestinationArgs (Lnet/minecraft/class_7157;Lnet/minecraft/class_3023$class_8009;Lnet/minecraft/class_3023$class_8009;)Lcom/mojang/brigadier/builder/ArgumentBuilder; + ARG 0 commandRegistryAccess + ARG 1 sourceWorldGetter + ARG 2 targetWorldGetter + METHOD method_48044 (Lnet/minecraft/class_3023$class_8009;Lnet/minecraft/class_3023$class_8009;Lnet/minecraft/class_3023$class_8009;Lnet/minecraft/class_3023$class_8009;Lcom/mojang/brigadier/context/CommandContext;)I + ARG 4 context + METHOD method_48045 (Lnet/minecraft/class_3023$class_8009;Lnet/minecraft/class_3023$class_8009;Lnet/minecraft/class_3023$class_8009;Lcom/mojang/brigadier/context/CommandContext;)I + ARG 3 context + METHOD method_48046 (Lnet/minecraft/class_3023$class_8009;Lcom/mojang/brigadier/context/CommandContext;)Lnet/minecraft/class_3023$class_8010; + ARG 1 context + METHOD method_48047 (Lcom/mojang/brigadier/context/CommandContext;)Ljava/util/function/Predicate; ARG 0 context - METHOD method_13105 (Lcom/mojang/brigadier/context/CommandContext;)I + METHOD method_48049 (Lnet/minecraft/class_3023$class_8009;Lnet/minecraft/class_3023$class_8009;Lnet/minecraft/class_3023$class_8009;Lnet/minecraft/class_3023$class_8009;Lcom/mojang/brigadier/context/CommandContext;)I + ARG 4 context + METHOD method_48050 (Lnet/minecraft/class_3023$class_8009;Lnet/minecraft/class_3023$class_8009;Lnet/minecraft/class_3023$class_8009;Lcom/mojang/brigadier/context/CommandContext;)I + ARG 3 context + METHOD method_48051 (Lnet/minecraft/class_3023$class_8009;Lcom/mojang/brigadier/context/CommandContext;)Lnet/minecraft/class_3023$class_8010; + ARG 1 context + METHOD method_48052 (Lcom/mojang/brigadier/context/CommandContext;)Ljava/util/function/Predicate; ARG 0 context - METHOD method_13106 (Lcom/mojang/brigadier/context/CommandContext;)I + METHOD method_48054 (Lnet/minecraft/class_3023$class_8009;Lnet/minecraft/class_3023$class_8009;Lnet/minecraft/class_3023$class_8009;Lcom/mojang/brigadier/context/CommandContext;)I + ARG 3 context + METHOD method_48055 (Lcom/mojang/brigadier/context/CommandContext;)Lnet/minecraft/class_3218; ARG 0 context - METHOD method_13107 (Lcom/mojang/brigadier/context/CommandContext;)I + METHOD method_48056 (Lcom/mojang/brigadier/context/CommandContext;)Lnet/minecraft/class_3218; + ARG 0 context + METHOD method_48057 (Lcom/mojang/brigadier/context/CommandContext;)Lnet/minecraft/class_3218; + ARG 0 context + METHOD method_48058 (Lcom/mojang/brigadier/context/CommandContext;)Lnet/minecraft/class_3218; ARG 0 context - METHOD method_13108 (Lnet/minecraft/class_2694;)Z - ARG 0 pos CLASS class_3024 BlockInfo FIELD field_13494 blockEntityNbt Lnet/minecraft/class_2487; FIELD field_13495 state Lnet/minecraft/class_2680; @@ -70,3 +84,7 @@ CLASS net/minecraft/class_3023 net/minecraft/server/command/CloneCommand METHOD (Ljava/lang/String;IZ)V ARG 3 allowsOverlap METHOD method_13109 allowsOverlap ()Z + CLASS class_8009 ArgumentGetter + METHOD apply (Ljava/lang/Object;)Ljava/lang/Object; + ARG 1 value + CLASS class_8010 DimensionalPos diff --git a/mappings/net/minecraft/server/command/CommandManager.mapping b/mappings/net/minecraft/server/command/CommandManager.mapping index c84fcf6420..65d4575ab2 100644 --- a/mappings/net/minecraft/server/command/CommandManager.mapping +++ b/mappings/net/minecraft/server/command/CommandManager.mapping @@ -26,6 +26,8 @@ CLASS net/minecraft/class_2170 net/minecraft/server/command/CommandManager COMMENT command source} ARG 0 parseResults ARG 1 sourceMapper + METHOD method_46732 createRegistryAccess (Lnet/minecraft/class_7225$class_7874;)Lnet/minecraft/class_7157; + ARG 0 registryLookup METHOD method_9235 getDispatcher ()Lcom/mojang/brigadier/CommandDispatcher; METHOD method_9236 (Ljava/lang/String;Lnet/minecraft/class_2583;)Lnet/minecraft/class_2583; ARG 1 style @@ -46,7 +48,7 @@ CLASS net/minecraft/class_2170 net/minecraft/server/command/CommandManager ARG 0 name ARG 1 type METHOD method_9245 (Lnet/minecraft/class_2172;)Z - ARG 0 source + ARG 0 sourcex METHOD method_9246 (Lcom/mojang/brigadier/context/CommandContext;)I ARG 0 context METHOD method_9247 literal (Ljava/lang/String;)Lcom/mojang/brigadier/builder/LiteralArgumentBuilder; diff --git a/mappings/net/minecraft/server/command/DamageCommand.mapping b/mappings/net/minecraft/server/command/DamageCommand.mapping new file mode 100644 index 0000000000..c30a0e19bb --- /dev/null +++ b/mappings/net/minecraft/server/command/DamageCommand.mapping @@ -0,0 +1,22 @@ +CLASS net/minecraft/class_8102 net/minecraft/server/command/DamageCommand + FIELD field_42238 INVULNERABLE_EXCEPTION Lcom/mojang/brigadier/exceptions/SimpleCommandExceptionType; + METHOD method_48748 register (Lcom/mojang/brigadier/CommandDispatcher;Lnet/minecraft/class_7157;)V + ARG 0 dispatcher + ARG 1 registryAccess + METHOD method_48749 (Lcom/mojang/brigadier/context/CommandContext;)I + ARG 0 context + METHOD method_48750 (Lnet/minecraft/class_2168;)Z + ARG 0 source + METHOD method_48751 execute (Lnet/minecraft/class_2168;Lnet/minecraft/class_1297;FLnet/minecraft/class_1282;)I + ARG 0 source + ARG 1 target + ARG 2 amount + ARG 3 damageSource + METHOD method_48752 (Lcom/mojang/brigadier/context/CommandContext;)I + ARG 0 context + METHOD method_48753 (Lcom/mojang/brigadier/context/CommandContext;)I + ARG 0 context + METHOD method_48754 (Lcom/mojang/brigadier/context/CommandContext;)I + ARG 0 context + METHOD method_48755 (Lcom/mojang/brigadier/context/CommandContext;)I + ARG 0 context diff --git a/mappings/net/minecraft/server/command/DataCommand.mapping b/mappings/net/minecraft/server/command/DataCommand.mapping index 628875b7c0..beeecfb0a9 100644 --- a/mappings/net/minecraft/server/command/DataCommand.mapping +++ b/mappings/net/minecraft/server/command/DataCommand.mapping @@ -4,11 +4,11 @@ CLASS net/minecraft/class_3164 net/minecraft/server/command/DataCommand FIELD field_13792 SOURCE_OBJECT_TYPES Ljava/util/List; FIELD field_13793 GET_UNKNOWN_EXCEPTION Lcom/mojang/brigadier/exceptions/DynamicCommandExceptionType; FIELD field_13794 GET_MULTIPLE_EXCEPTION Lcom/mojang/brigadier/exceptions/SimpleCommandExceptionType; - FIELD field_13795 MODIFY_EXPECTED_LIST_EXCEPTION Lcom/mojang/brigadier/exceptions/DynamicCommandExceptionType; FIELD field_13796 MERGE_FAILED_EXCEPTION Lcom/mojang/brigadier/exceptions/SimpleCommandExceptionType; FIELD field_13797 MODIFY_EXPECTED_OBJECT_EXCEPTION Lcom/mojang/brigadier/exceptions/DynamicCommandExceptionType; FIELD field_13798 TARGET_OBJECT_TYPES Ljava/util/List; - FIELD field_17441 MODIFY_INVALID_INDEX_EXCEPTION Lcom/mojang/brigadier/exceptions/DynamicCommandExceptionType; + FIELD field_41747 MODIFY_EXPECTED_VALUE_EXCEPTION Lcom/mojang/brigadier/exceptions/DynamicCommandExceptionType; + FIELD field_44916 MODIFY_INVALID_SUBSTRING_EXCEPTION Lcom/mojang/brigadier/exceptions/Dynamic2CommandExceptionType; METHOD method_13885 executeRemove (Lnet/minecraft/class_2168;Lnet/minecraft/class_3162;Lnet/minecraft/class_2203$class_2209;)I ARG 0 source ARG 1 object @@ -33,23 +33,13 @@ CLASS net/minecraft/class_3164 net/minecraft/server/command/DataCommand ARG 3 elements METHOD method_13892 (Ljava/lang/Object;)Lcom/mojang/brigadier/Message; ARG 0 path - METHOD method_13893 (Lnet/minecraft/class_3164$class_3167;Lnet/minecraft/class_3164$class_3167;Lnet/minecraft/class_3164$class_3165;Lcom/mojang/brigadier/builder/ArgumentBuilder;)Lcom/mojang/brigadier/builder/ArgumentBuilder; - ARG 3 builder - METHOD method_13894 (Lcom/mojang/brigadier/context/CommandContext;Lnet/minecraft/class_2487;Lnet/minecraft/class_2203$class_2209;Ljava/util/List;)I - ARG 0 context - ARG 1 sourceNbt - ARG 2 path - ARG 3 elements + METHOD method_13893 (Lnet/minecraft/class_3164$class_3167;Lnet/minecraft/class_3164$class_3165;Lnet/minecraft/class_3164$class_3167;Lcom/mojang/brigadier/builder/ArgumentBuilder;)Lcom/mojang/brigadier/builder/ArgumentBuilder; + ARG 3 builderx METHOD method_13895 (Lcom/mojang/brigadier/builder/ArgumentBuilder;Lnet/minecraft/class_3164$class_3166;)V ARG 0 builder ARG 1 modifier METHOD method_13896 (Lnet/minecraft/class_3164$class_3167;Lcom/mojang/brigadier/builder/ArgumentBuilder;)Lcom/mojang/brigadier/builder/ArgumentBuilder; ARG 1 builder - METHOD method_13897 (Lcom/mojang/brigadier/context/CommandContext;Lnet/minecraft/class_2487;Lnet/minecraft/class_2203$class_2209;Ljava/util/List;)I - ARG 0 context - ARG 1 sourceNbt - ARG 2 path - ARG 3 elements METHOD method_13898 addModifyArgument (Ljava/util/function/BiConsumer;)Lcom/mojang/brigadier/builder/ArgumentBuilder; ARG 0 subArgumentAdder METHOD method_13899 (Lnet/minecraft/class_3164$class_3167;Lnet/minecraft/class_3164$class_3165;)Lcom/mojang/brigadier/builder/ArgumentBuilder; @@ -80,30 +70,14 @@ CLASS net/minecraft/class_3164 net/minecraft/server/command/DataCommand ARG 1 object METHOD method_13909 (Lnet/minecraft/class_3164$class_3167;Lcom/mojang/brigadier/context/CommandContext;)I ARG 1 context - METHOD method_13910 executeInsert (ILnet/minecraft/class_2487;Lnet/minecraft/class_2203$class_2209;Ljava/util/List;)I - ARG 0 integer - ARG 1 sourceNbt - ARG 2 path - ARG 3 elements METHOD method_13911 (Lnet/minecraft/class_3164$class_3167;Lnet/minecraft/class_3164$class_3167;Lnet/minecraft/class_3164$class_3165;)Lcom/mojang/brigadier/builder/ArgumentBuilder; - ARG 2 modifier + ARG 2 operation METHOD method_13912 (Lnet/minecraft/class_3164$class_3167;Lcom/mojang/brigadier/context/CommandContext;)I ARG 1 context - METHOD method_13913 (Lnet/minecraft/class_3164$class_3167;Lnet/minecraft/class_3164$class_3167;Lnet/minecraft/class_3164$class_3165;Lcom/mojang/brigadier/context/CommandContext;)I - ARG 3 context - METHOD method_13915 (Ljava/lang/Object;)Lcom/mojang/brigadier/Message; - ARG 0 nbt 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 ARG 2 path - METHOD method_13917 (Lnet/minecraft/class_3164$class_3167;Lnet/minecraft/class_3164$class_3167;Lnet/minecraft/class_3164$class_3165;Lcom/mojang/brigadier/context/CommandContext;)I - ARG 3 context - METHOD method_13918 (Lcom/mojang/brigadier/context/CommandContext;Lnet/minecraft/class_2487;Lnet/minecraft/class_2203$class_2209;Ljava/util/List;)I - ARG 0 context - ARG 1 sourceNbt - ARG 2 path - ARG 3 elements METHOD method_13919 (Ljava/util/function/Function;)Lnet/minecraft/class_3164$class_3167; ARG 0 factory METHOD method_13920 executeModify (Lcom/mojang/brigadier/context/CommandContext;Lnet/minecraft/class_3164$class_3167;Lnet/minecraft/class_3164$class_3165;Ljava/util/List;)I @@ -118,8 +92,75 @@ CLASS net/minecraft/class_3164 net/minecraft/server/command/DataCommand ARG 2 builder METHOD method_13923 (Lnet/minecraft/class_3164$class_3167;Lcom/mojang/brigadier/builder/ArgumentBuilder;)Lcom/mojang/brigadier/builder/ArgumentBuilder; ARG 1 builder - METHOD method_17603 (Ljava/lang/Object;)Lcom/mojang/brigadier/Message; + METHOD method_47952 (Lcom/mojang/brigadier/context/CommandContext;Lnet/minecraft/class_2487;Lnet/minecraft/class_2203$class_2209;Ljava/util/List;)I + ARG 0 context + ARG 1 element + ARG 2 path + ARG 3 elements + METHOD method_47953 (Lcom/mojang/brigadier/context/CommandContext;Lnet/minecraft/class_2487;Lnet/minecraft/class_2203$class_2209;Ljava/util/List;)I + ARG 0 context + ARG 1 sourceNbt + ARG 2 path + ARG 3 elements + METHOD method_47954 (Lcom/mojang/brigadier/context/CommandContext;Lnet/minecraft/class_2487;Lnet/minecraft/class_2203$class_2209;Ljava/util/List;)I + ARG 0 context + ARG 1 sourceNbt + ARG 2 path + ARG 3 elements + METHOD method_48088 (Lnet/minecraft/class_3164$class_3167;Lnet/minecraft/class_3164$class_3165;Lnet/minecraft/class_3164$class_3167;Lcom/mojang/brigadier/builder/ArgumentBuilder;)Lcom/mojang/brigadier/builder/ArgumentBuilder; + ARG 3 builderx + METHOD method_48089 (Lnet/minecraft/class_3164$class_3167;Lnet/minecraft/class_3164$class_3165;Lnet/minecraft/class_3164$class_3167;Lcom/mojang/brigadier/context/CommandContext;)I + ARG 3 context + METHOD method_48090 (Lnet/minecraft/class_3164$class_3167;Lnet/minecraft/class_3164$class_3167;Lnet/minecraft/class_3164$class_3165;)Lcom/mojang/brigadier/builder/ArgumentBuilder; + ARG 2 operation + METHOD method_48091 getValues (Lcom/mojang/brigadier/context/CommandContext;Lnet/minecraft/class_3164$class_3167;)Ljava/util/List; + ARG 0 context + ARG 1 objectType + METHOD method_48092 (Lcom/mojang/brigadier/context/CommandContext;Ljava/lang/String;)Ljava/lang/String; + ARG 1 value + METHOD method_48093 (Ljava/lang/Object;)Lcom/mojang/brigadier/Message; + ARG 0 nbt + METHOD method_48094 (Ljava/lang/String;)Ljava/lang/String; + ARG 0 value + METHOD method_48095 mapValues (Ljava/util/List;Lnet/minecraft/class_3164$class_8569;)Ljava/util/List; + ARG 0 list + ARG 1 processor + METHOD method_48096 asString (Lnet/minecraft/class_2520;)Ljava/lang/String; + ARG 0 nbt + METHOD method_48097 (Lnet/minecraft/class_3164$class_3167;Lnet/minecraft/class_3164$class_3165;Lnet/minecraft/class_3164$class_3167;Lcom/mojang/brigadier/context/CommandContext;)I + ARG 3 context + METHOD method_48098 getValuesByPath (Lcom/mojang/brigadier/context/CommandContext;Lnet/minecraft/class_3164$class_3167;)Ljava/util/List; + ARG 0 context + ARG 1 objectType + METHOD method_48099 (Lcom/mojang/brigadier/context/CommandContext;Ljava/lang/String;)Ljava/lang/String; + ARG 1 value + METHOD method_48100 (Ljava/lang/String;)Ljava/lang/String; + ARG 0 value + METHOD method_48101 (Lnet/minecraft/class_3164$class_3167;Lnet/minecraft/class_3164$class_3165;Lnet/minecraft/class_3164$class_3167;Lcom/mojang/brigadier/context/CommandContext;)I + ARG 3 context + METHOD method_48102 (Lnet/minecraft/class_3164$class_3167;Lnet/minecraft/class_3164$class_3165;Lnet/minecraft/class_3164$class_3167;Lcom/mojang/brigadier/context/CommandContext;)I + ARG 3 context + METHOD method_48103 (Lnet/minecraft/class_3164$class_3167;Lnet/minecraft/class_3164$class_3165;Lnet/minecraft/class_3164$class_3167;Lcom/mojang/brigadier/context/CommandContext;)I + ARG 3 context + METHOD method_48104 (Lnet/minecraft/class_3164$class_3167;Lnet/minecraft/class_3164$class_3165;Lnet/minecraft/class_3164$class_3167;Lcom/mojang/brigadier/context/CommandContext;)I + ARG 3 context + METHOD method_51824 getSubstringIndex (II)I ARG 0 index + ARG 1 length + METHOD method_51825 substring (Ljava/lang/String;I)Ljava/lang/String; + ARG 0 string + ARG 1 startIndex + METHOD method_51826 substring (Ljava/lang/String;II)Ljava/lang/String; + ARG 0 string + ARG 1 startIndex + ARG 2 endIndex + METHOD method_52164 (Ljava/lang/Object;Ljava/lang/Object;)Lcom/mojang/brigadier/Message; + ARG 0 startIndex + ARG 1 endIndex + METHOD method_52165 substringInternal (Ljava/lang/String;II)Ljava/lang/String; + ARG 0 string + ARG 1 startIndex + ARG 2 endIndex CLASS class_3165 ModifyOperation METHOD modify (Lcom/mojang/brigadier/context/CommandContext;Lnet/minecraft/class_2487;Lnet/minecraft/class_2203$class_2209;Ljava/util/List;)I ARG 1 context @@ -135,3 +176,6 @@ CLASS net/minecraft/class_3164 net/minecraft/server/command/DataCommand METHOD method_13925 addArgumentsToBuilder (Lcom/mojang/brigadier/builder/ArgumentBuilder;Ljava/util/function/Function;)Lcom/mojang/brigadier/builder/ArgumentBuilder; ARG 1 argument ARG 2 argumentAdder + CLASS class_8569 Processor + METHOD process (Ljava/lang/String;)Ljava/lang/String; + ARG 1 string diff --git a/mappings/net/minecraft/server/command/DatapackCommand.mapping b/mappings/net/minecraft/server/command/DatapackCommand.mapping index 79acadeaf7..625e037e5a 100644 --- a/mappings/net/minecraft/server/command/DatapackCommand.mapping +++ b/mappings/net/minecraft/server/command/DatapackCommand.mapping @@ -4,13 +4,14 @@ CLASS net/minecraft/class_3027 net/minecraft/server/command/DatapackCommand FIELD field_13504 ALREADY_ENABLED_EXCEPTION Lcom/mojang/brigadier/exceptions/DynamicCommandExceptionType; FIELD field_13505 ALREADY_DISABLED_EXCEPTION Lcom/mojang/brigadier/exceptions/DynamicCommandExceptionType; FIELD field_13506 ENABLED_CONTAINERS_SUGGESTION_PROVIDER Lcom/mojang/brigadier/suggestion/SuggestionProvider; + FIELD field_39980 NO_FLAGS_EXCEPTION Lcom/mojang/brigadier/exceptions/Dynamic2CommandExceptionType; METHOD method_13111 (Lcom/mojang/brigadier/context/CommandContext;)I ARG 0 context METHOD method_13112 (Lcom/mojang/brigadier/context/CommandContext;Ljava/util/List;Lnet/minecraft/class_3288;)V ARG 1 profiles ARG 2 profile METHOD method_13113 (Lnet/minecraft/class_3288;)Lnet/minecraft/class_3288; - ARG 0 profile + ARG 0 profilex METHOD method_13114 executeEnable (Lnet/minecraft/class_2168;Lnet/minecraft/class_3288;Lnet/minecraft/class_3027$class_3028;)I ARG 0 source ARG 1 container @@ -73,10 +74,15 @@ CLASS net/minecraft/class_3027 net/minecraft/server/command/DatapackCommand ARG 1 container METHOD method_13141 (Lcom/mojang/brigadier/context/CommandContext;)I ARG 0 context - METHOD method_29477 (Ljava/util/Collection;Lnet/minecraft/class_3288;)Z - ARG 1 profile + METHOD method_29477 (Ljava/util/Collection;Lnet/minecraft/class_7699;Lnet/minecraft/class_3288;)Z + ARG 2 profile METHOD method_29776 (Ljava/util/Collection;Ljava/lang/String;)Z ARG 1 name + METHOD method_45145 (Lnet/minecraft/class_7699;Lnet/minecraft/class_3288;)Z + ARG 1 profile + METHOD method_45146 (Ljava/lang/Object;Ljava/lang/Object;)Lcom/mojang/brigadier/Message; + ARG 0 name + ARG 1 flags CLASS class_3028 PackAdder METHOD apply (Ljava/util/List;Lnet/minecraft/class_3288;)V ARG 1 profiles diff --git a/mappings/net/minecraft/server/command/DebugConfigCommand.mapping b/mappings/net/minecraft/server/command/DebugConfigCommand.mapping new file mode 100644 index 0000000000..e9660753a0 --- /dev/null +++ b/mappings/net/minecraft/server/command/DebugConfigCommand.mapping @@ -0,0 +1,20 @@ +CLASS net/minecraft/class_8600 net/minecraft/server/command/DebugConfigCommand + METHOD method_52299 register (Lcom/mojang/brigadier/CommandDispatcher;)V + ARG 0 dispatcher + METHOD method_52300 (Lcom/mojang/brigadier/context/CommandContext;)I + ARG 0 context + METHOD method_52301 (Lcom/mojang/brigadier/context/CommandContext;Lcom/mojang/brigadier/suggestion/SuggestionsBuilder;)Ljava/util/concurrent/CompletableFuture; + ARG 0 context + ARG 1 suggestionsBuilder + METHOD method_52302 (Lnet/minecraft/class_2168;)Z + ARG 0 source + METHOD method_52303 executeConfig (Lnet/minecraft/class_2168;Lnet/minecraft/class_3222;)I + ARG 0 source + ARG 1 player + METHOD method_52304 executeUnconfig (Lnet/minecraft/class_2168;Ljava/util/UUID;)I + ARG 0 source + ARG 1 uuid + METHOD method_52305 collectConfiguringPlayers (Lnet/minecraft/server/MinecraftServer;)Ljava/lang/Iterable; + ARG 0 server + METHOD method_52306 (Lcom/mojang/brigadier/context/CommandContext;)I + ARG 0 context diff --git a/mappings/net/minecraft/server/command/DefaultGameModeCommand.mapping b/mappings/net/minecraft/server/command/DefaultGameModeCommand.mapping index 578ea8699f..f83daa0950 100644 --- a/mappings/net/minecraft/server/command/DefaultGameModeCommand.mapping +++ b/mappings/net/minecraft/server/command/DefaultGameModeCommand.mapping @@ -1,6 +1,4 @@ CLASS net/minecraft/class_3035 net/minecraft/server/command/DefaultGameModeCommand - METHOD method_13165 (Lnet/minecraft/class_1934;Lcom/mojang/brigadier/context/CommandContext;)I - ARG 1 context METHOD method_13166 register (Lcom/mojang/brigadier/CommandDispatcher;)V ARG 0 dispatcher METHOD method_13167 execute (Lnet/minecraft/class_2168;Lnet/minecraft/class_1934;)I diff --git a/mappings/net/minecraft/server/command/EffectCommand.mapping b/mappings/net/minecraft/server/command/EffectCommand.mapping index d5429b2c7b..446d8f55c2 100644 --- a/mappings/net/minecraft/server/command/EffectCommand.mapping +++ b/mappings/net/minecraft/server/command/EffectCommand.mapping @@ -6,24 +6,25 @@ CLASS net/minecraft/class_3043 net/minecraft/server/command/EffectCommand ARG 0 context METHOD method_13226 (Lcom/mojang/brigadier/context/CommandContext;)I ARG 0 context - METHOD method_13227 executeGive (Lnet/minecraft/class_2168;Ljava/util/Collection;Lnet/minecraft/class_1291;Ljava/lang/Integer;IZ)I + METHOD method_13227 executeGive (Lnet/minecraft/class_2168;Ljava/util/Collection;Lnet/minecraft/class_6880;Ljava/lang/Integer;IZ)I ARG 0 source ARG 1 targets - ARG 2 effect + ARG 2 statusEffect ARG 3 seconds ARG 4 amplifier ARG 5 showParticles METHOD method_13228 (Lcom/mojang/brigadier/context/CommandContext;)I ARG 0 context - METHOD method_13229 register (Lcom/mojang/brigadier/CommandDispatcher;)V + METHOD method_13229 register (Lcom/mojang/brigadier/CommandDispatcher;Lnet/minecraft/class_7157;)V ARG 0 dispatcher + ARG 1 registryAccess METHOD method_13230 executeClear (Lnet/minecraft/class_2168;Ljava/util/Collection;)I ARG 0 source ARG 1 targets - METHOD method_13231 executeClear (Lnet/minecraft/class_2168;Ljava/util/Collection;Lnet/minecraft/class_1291;)I + METHOD method_13231 executeClear (Lnet/minecraft/class_2168;Ljava/util/Collection;Lnet/minecraft/class_6880;)I ARG 0 source ARG 1 targets - ARG 2 effect + ARG 2 statusEffect METHOD method_13232 (Lcom/mojang/brigadier/context/CommandContext;)I ARG 0 context METHOD method_13233 (Lcom/mojang/brigadier/context/CommandContext;)I @@ -34,3 +35,9 @@ CLASS net/minecraft/class_3043 net/minecraft/server/command/EffectCommand ARG 0 source METHOD method_23650 (Lcom/mojang/brigadier/context/CommandContext;)I ARG 0 context + METHOD method_48545 (Lcom/mojang/brigadier/context/CommandContext;)I + ARG 0 context + METHOD method_48546 (Lcom/mojang/brigadier/context/CommandContext;)I + ARG 0 context + METHOD method_48547 (Lcom/mojang/brigadier/context/CommandContext;)I + ARG 0 context diff --git a/mappings/net/minecraft/server/command/EnchantCommand.mapping b/mappings/net/minecraft/server/command/EnchantCommand.mapping index 8650cfe693..4f0888ed23 100644 --- a/mappings/net/minecraft/server/command/EnchantCommand.mapping +++ b/mappings/net/minecraft/server/command/EnchantCommand.mapping @@ -6,15 +6,16 @@ CLASS net/minecraft/class_3048 net/minecraft/server/command/EnchantCommand FIELD field_13633 FAILED_INCOMPATIBLE_EXCEPTION Lcom/mojang/brigadier/exceptions/DynamicCommandExceptionType; METHOD method_13240 (Lcom/mojang/brigadier/context/CommandContext;)I ARG 0 context - METHOD method_13241 execute (Lnet/minecraft/class_2168;Ljava/util/Collection;Lnet/minecraft/class_1887;I)I + METHOD method_13241 execute (Lnet/minecraft/class_2168;Ljava/util/Collection;Lnet/minecraft/class_6880;I)I ARG 0 source ARG 1 targets ARG 2 enchantment ARG 3 level METHOD method_13242 (Ljava/lang/Object;)Lcom/mojang/brigadier/Message; ARG 0 entityName - METHOD method_13243 register (Lcom/mojang/brigadier/CommandDispatcher;)V + METHOD method_13243 register (Lcom/mojang/brigadier/CommandDispatcher;Lnet/minecraft/class_7157;)V ARG 0 dispatcher + ARG 1 registryAccess METHOD method_13244 (Ljava/lang/Object;)Lcom/mojang/brigadier/Message; ARG 0 itemName METHOD method_13245 (Lcom/mojang/brigadier/context/CommandContext;)I diff --git a/mappings/net/minecraft/server/command/ExecuteCommand.mapping b/mappings/net/minecraft/server/command/ExecuteCommand.mapping index fcf5f35924..ec01171b13 100644 --- a/mappings/net/minecraft/server/command/ExecuteCommand.mapping +++ b/mappings/net/minecraft/server/command/ExecuteCommand.mapping @@ -15,7 +15,7 @@ CLASS net/minecraft/class_3050 net/minecraft/server/command/ExecuteCommand METHOD method_13252 (Lcom/mojang/brigadier/context/CommandContext;)Lnet/minecraft/class_2168; ARG 0 context METHOD method_13253 (Lcom/mojang/brigadier/tree/LiteralCommandNode;Lnet/minecraft/class_3164$class_3167;ZLcom/mojang/brigadier/builder/ArgumentBuilder;)Lcom/mojang/brigadier/builder/ArgumentBuilder; - ARG 3 builder + ARG 3 builderx METHOD method_13254 (Lnet/minecraft/class_2168;)Z ARG 0 source METHOD method_13255 (Lnet/minecraft/class_2168;)Z @@ -214,6 +214,58 @@ CLASS net/minecraft/class_3050 net/minecraft/server/command/ExecuteCommand METHOD method_22831 (Lcom/mojang/brigadier/context/CommandContext;Lcom/mojang/brigadier/suggestion/SuggestionsBuilder;)Ljava/util/concurrent/CompletableFuture; ARG 0 context ARG 1 builder + METHOD method_47527 (Lcom/mojang/brigadier/context/CommandContext;)Z + ARG 0 context + METHOD method_48059 isLoaded (Lnet/minecraft/class_3218;Lnet/minecraft/class_2338;)Z + ARG 0 world + ARG 1 pos + METHOD method_48060 (Lnet/minecraft/class_1297;)Ljava/util/stream/Stream; + ARG 0 entity + METHOD method_48061 addOnArguments (Lcom/mojang/brigadier/tree/CommandNode;Lcom/mojang/brigadier/builder/LiteralArgumentBuilder;)Lcom/mojang/brigadier/builder/LiteralArgumentBuilder; + ARG 0 node + ARG 1 builder + METHOD method_48062 (Lnet/minecraft/class_2168;Lnet/minecraft/class_1297;)Ljava/util/List; + ARG 1 entity + METHOD method_48063 createEntityModifier (Ljava/util/function/Function;)Lcom/mojang/brigadier/RedirectModifier; + ARG 0 function + METHOD method_48064 (Ljava/util/function/Function;Lcom/mojang/brigadier/context/CommandContext;)Ljava/util/Collection; + ARG 1 context + METHOD method_48065 (Lnet/minecraft/class_1297;)Ljava/util/Optional; + ARG 0 entity + METHOD method_48066 createMultiEntityModifier (Ljava/util/function/Function;)Lcom/mojang/brigadier/RedirectModifier; + ARG 0 function + METHOD method_48067 (Ljava/util/function/Function;Lcom/mojang/brigadier/context/CommandContext;)Ljava/util/Collection; + ARG 1 context + METHOD method_48068 (Lnet/minecraft/class_1297;)Ljava/util/Optional; + ARG 0 entity + METHOD method_48069 (Lnet/minecraft/class_1297;)Ljava/util/Optional; + ARG 0 entity + METHOD method_48071 (Lnet/minecraft/class_1297;)Ljava/util/Optional; + ARG 0 entity + METHOD method_48072 (Lnet/minecraft/class_1297;)Ljava/util/Optional; + ARG 0 entity + METHOD method_48073 (Lnet/minecraft/class_1297;)Ljava/util/Optional; + ARG 0 entity + METHOD method_48074 (Lnet/minecraft/class_1297;)Z + ARG 0 entity + METHOD method_48075 (Lnet/minecraft/class_1297;)Z + ARG 0 entity + METHOD method_48076 (Lcom/mojang/brigadier/context/CommandContext;)Z + ARG 0 context + METHOD method_48332 (Lnet/minecraft/class_1297;)Ljava/util/Optional; + ARG 0 entity + METHOD method_48756 summon (Lnet/minecraft/class_2168;Lnet/minecraft/class_6880$class_6883;)Lnet/minecraft/class_2168; + ARG 0 source + ARG 1 entityType + METHOD method_48757 (Lcom/mojang/brigadier/context/CommandContext;)Lnet/minecraft/class_2168; + ARG 0 context + METHOD method_49419 (Lcom/mojang/brigadier/context/CommandContext;)Lnet/minecraft/class_2168; + ARG 0 context + METHOD method_52307 (Lcom/mojang/brigadier/context/CommandContext;)Z + ARG 0 context + METHOD method_52308 testFunction (Lnet/minecraft/class_2168;Ljava/util/Collection;)Z + ARG 0 source + ARG 1 functions CLASS class_3051 ExistsCondition METHOD test (Lcom/mojang/brigadier/context/CommandContext;)I ARG 1 context diff --git a/mappings/net/minecraft/server/command/FillBiomeCommand.mapping b/mappings/net/minecraft/server/command/FillBiomeCommand.mapping new file mode 100644 index 0000000000..4aad4836ad --- /dev/null +++ b/mappings/net/minecraft/server/command/FillBiomeCommand.mapping @@ -0,0 +1,36 @@ +CLASS net/minecraft/class_7926 net/minecraft/server/command/FillBiomeCommand + FIELD field_41279 UNLOADED_EXCEPTION Lcom/mojang/brigadier/exceptions/SimpleCommandExceptionType; + FIELD field_41281 TOO_BIG_EXCEPTION Lcom/mojang/brigadier/exceptions/Dynamic2CommandExceptionType; + METHOD method_47528 convertCoordinate (I)I + ARG 0 coordinate + METHOD method_47529 register (Lcom/mojang/brigadier/CommandDispatcher;Lnet/minecraft/class_7157;)V + ARG 0 dispatcher + ARG 1 commandRegistryAccess + METHOD method_47530 (Lcom/mojang/brigadier/context/CommandContext;)I + ARG 0 context + METHOD method_47531 createBiomeSupplier (Lorg/apache/commons/lang3/mutable/MutableInt;Lnet/minecraft/class_2791;Lnet/minecraft/class_3341;Lnet/minecraft/class_6880;Ljava/util/function/Predicate;)Lnet/minecraft/class_6780; + ARG 0 counter + ARG 1 chunk + ARG 2 box + ARG 3 biome + ARG 4 filter + METHOD method_47532 (Lnet/minecraft/class_2168;)Z + ARG 0 source + METHOD method_47533 execute (Lnet/minecraft/class_2168;Lnet/minecraft/class_2338;Lnet/minecraft/class_2338;Lnet/minecraft/class_6880$class_6883;Ljava/util/function/Predicate;)I + ARG 0 source + ARG 1 from + ARG 2 to + ARG 3 biome + ARG 4 filter + METHOD method_47534 (Lnet/minecraft/class_2791;Lnet/minecraft/class_3341;Ljava/util/function/Predicate;Lorg/apache/commons/lang3/mutable/MutableInt;Lnet/minecraft/class_6880;IIILnet/minecraft/class_6544$class_6552;)Lnet/minecraft/class_6880; + ARG 5 x + ARG 6 y + ARG 7 z + ARG 8 noise + METHOD method_47535 convertPos (Lnet/minecraft/class_2338;)Lnet/minecraft/class_2338; + ARG 0 pos + METHOD method_47536 (Ljava/lang/Object;Ljava/lang/Object;)Lcom/mojang/brigadier/Message; + ARG 0 maximum + ARG 1 specified + METHOD method_47818 (Lcom/mojang/brigadier/context/CommandContext;)I + ARG 0 context diff --git a/mappings/net/minecraft/server/command/FillCommand.mapping b/mappings/net/minecraft/server/command/FillCommand.mapping index 52256f4597..9e9c8be112 100644 --- a/mappings/net/minecraft/server/command/FillCommand.mapping +++ b/mappings/net/minecraft/server/command/FillCommand.mapping @@ -2,7 +2,6 @@ CLASS net/minecraft/class_3057 net/minecraft/server/command/FillCommand FIELD field_13648 AIR_BLOCK_ARGUMENT Lnet/minecraft/class_2247; FIELD field_13649 TOO_BIG_EXCEPTION Lcom/mojang/brigadier/exceptions/Dynamic2CommandExceptionType; FIELD field_13650 FAILED_EXCEPTION Lcom/mojang/brigadier/exceptions/SimpleCommandExceptionType; - FIELD field_33391 MAX_BLOCKS I METHOD method_13345 (Lcom/mojang/brigadier/context/CommandContext;)I ARG 0 context METHOD method_13346 (Lcom/mojang/brigadier/context/CommandContext;)I diff --git a/mappings/net/minecraft/server/command/FunctionCommand.mapping b/mappings/net/minecraft/server/command/FunctionCommand.mapping index 3879b8fffe..295340bfcb 100644 --- a/mappings/net/minecraft/server/command/FunctionCommand.mapping +++ b/mappings/net/minecraft/server/command/FunctionCommand.mapping @@ -1,10 +1,12 @@ CLASS net/minecraft/class_3062 net/minecraft/server/command/FunctionCommand FIELD field_13662 SUGGESTION_PROVIDER Lcom/mojang/brigadier/suggestion/SuggestionProvider; + FIELD field_44982 ARGUMENT_NOT_COMPOUND_EXCEPTION Lcom/mojang/brigadier/exceptions/DynamicCommandExceptionType; METHOD method_13380 register (Lcom/mojang/brigadier/CommandDispatcher;)V ARG 0 dispatcher - METHOD method_13381 execute (Lnet/minecraft/class_2168;Ljava/util/Collection;)I + METHOD method_13381 execute (Lnet/minecraft/class_2168;Ljava/util/Collection;Lnet/minecraft/class_2487;)I ARG 0 source ARG 1 functions + ARG 2 arguments METHOD method_13382 (Lcom/mojang/brigadier/context/CommandContext;Lcom/mojang/brigadier/suggestion/SuggestionsBuilder;)Ljava/util/concurrent/CompletableFuture; ARG 0 context ARG 1 builder @@ -12,3 +14,23 @@ CLASS net/minecraft/class_3062 net/minecraft/server/command/FunctionCommand ARG 0 context METHOD method_13384 (Lnet/minecraft/class_2168;)Z ARG 0 source + METHOD method_51276 (Lorg/apache/commons/lang3/mutable/MutableObject;I)V + ARG 1 value + METHOD method_52309 (Lnet/minecraft/class_3164$class_3167;Lcom/mojang/brigadier/builder/ArgumentBuilder;)Lcom/mojang/brigadier/builder/ArgumentBuilder; + ARG 1 builder + METHOD method_52310 (Lnet/minecraft/class_3164$class_3167;Lcom/mojang/brigadier/context/CommandContext;)I + ARG 1 context + METHOD method_52311 (Lcom/mojang/brigadier/context/CommandContext;)I + ARG 0 context + METHOD method_52312 execute (Lnet/minecraft/class_2168;Lnet/minecraft/class_2158;Lnet/minecraft/class_2487;)Lnet/minecraft/class_3062$class_8601; + ARG 0 source + ARG 1 function + ARG 2 arguments + METHOD method_52313 getArgument (Lnet/minecraft/class_2203$class_2209;Lnet/minecraft/class_3162;)Lnet/minecraft/class_2487; + ARG 0 path + ARG 1 object + METHOD method_52314 (Ljava/lang/Object;)Lcom/mojang/brigadier/Message; + ARG 0 argument + METHOD method_52315 (Lnet/minecraft/class_3164$class_3167;Lcom/mojang/brigadier/context/CommandContext;)I + ARG 1 context + CLASS class_8601 FunctionResult diff --git a/mappings/net/minecraft/server/command/GameModeCommand.mapping b/mappings/net/minecraft/server/command/GameModeCommand.mapping index 61f945845b..f905bb973e 100644 --- a/mappings/net/minecraft/server/command/GameModeCommand.mapping +++ b/mappings/net/minecraft/server/command/GameModeCommand.mapping @@ -1,7 +1,5 @@ CLASS net/minecraft/class_3064 net/minecraft/server/command/GameModeCommand FIELD field_33393 REQUIRED_PERMISSION_LEVEL I - METHOD method_13386 (Lnet/minecraft/class_1934;Lcom/mojang/brigadier/context/CommandContext;)I - ARG 1 context METHOD method_13387 execute (Lcom/mojang/brigadier/context/CommandContext;Ljava/util/Collection;Lnet/minecraft/class_1934;)I ARG 0 context ARG 1 targets @@ -14,5 +12,3 @@ CLASS net/minecraft/class_3064 net/minecraft/server/command/GameModeCommand ARG 0 source ARG 1 player ARG 2 gameMode - METHOD method_13391 (Lnet/minecraft/class_1934;Lcom/mojang/brigadier/context/CommandContext;)I - ARG 1 context diff --git a/mappings/net/minecraft/server/command/LocateCommand.mapping b/mappings/net/minecraft/server/command/LocateCommand.mapping index 44d4a62b76..349fd22e96 100644 --- a/mappings/net/minecraft/server/command/LocateCommand.mapping +++ b/mappings/net/minecraft/server/command/LocateCommand.mapping @@ -2,34 +2,43 @@ CLASS net/minecraft/class_3079 net/minecraft/server/command/LocateCommand FIELD field_39245 STRUCTURE_NOT_FOUND_EXCEPTION Lcom/mojang/brigadier/exceptions/DynamicCommandExceptionType; FIELD field_39246 STRUCTURE_INVALID_EXCEPTION Lcom/mojang/brigadier/exceptions/DynamicCommandExceptionType; FIELD field_39247 BIOME_NOT_FOUND_EXCEPTION Lcom/mojang/brigadier/exceptions/DynamicCommandExceptionType; - FIELD field_39248 BIOME_INVALID_EXCEPTION Lcom/mojang/brigadier/exceptions/DynamicCommandExceptionType; FIELD field_39249 POI_NOT_FOUND_EXCEPTION Lcom/mojang/brigadier/exceptions/DynamicCommandExceptionType; - FIELD field_39250 POI_INVALID_EXCEPTION Lcom/mojang/brigadier/exceptions/DynamicCommandExceptionType; + FIELD field_39251 LOCATE_STRUCTURE_RADIUS I + FIELD field_39252 LOCATE_BIOME_RADIUS I + FIELD field_39253 LOCATE_BIOME_HORIZONTAL_BLOCK_CHECK_INTERVAL I + FIELD field_39254 LOCATE_BIOME_VERTICAL_BLOCK_CHECK_INTERVAL I + FIELD field_39255 LOCATE_POI_RADIUS I + FIELD field_41660 LOGGER Lorg/slf4j/Logger; METHOD method_13439 getDistance (IIII)F ARG 0 x1 ARG 1 y1 ARG 2 x2 ARG 3 y2 - METHOD method_13443 register (Lcom/mojang/brigadier/CommandDispatcher;)V + METHOD method_13443 register (Lcom/mojang/brigadier/CommandDispatcher;Lnet/minecraft/class_7157;)V ARG 0 dispatcher + ARG 1 registryAccess + METHOD method_13447 (Lnet/minecraft/class_2338;Ljava/lang/String;Lnet/minecraft/class_2583;)Lnet/minecraft/class_2583; + ARG 2 style METHOD method_13448 (Lnet/minecraft/class_2168;)Z ARG 0 source - METHOD method_24499 sendCoordinates (Lnet/minecraft/class_2168;Lnet/minecraft/class_7066$class_7068;Lnet/minecraft/class_2338;Lcom/mojang/datafixers/util/Pair;Ljava/lang/String;Z)I + METHOD method_24499 sendCoordinates (Lnet/minecraft/class_2168;Lnet/minecraft/class_7066$class_7068;Lnet/minecraft/class_2338;Lcom/mojang/datafixers/util/Pair;Ljava/lang/String;ZLjava/time/Duration;)I ARG 0 source ARG 1 structure ARG 2 currentPos - ARG 3 structurePosAndEntry + ARG 3 result ARG 4 successMessage + ARG 5 includeY + ARG 6 timeTaken METHOD method_39985 (Ljava/lang/Object;)Lcom/mojang/brigadier/Message; ARG 0 id METHOD method_40998 (Lcom/mojang/datafixers/util/Pair;Lnet/minecraft/class_6862;)Ljava/lang/String; ARG 1 key METHOD method_41002 (Ljava/lang/Object;)Lcom/mojang/brigadier/Message; ARG 0 id - METHOD method_41003 (Lnet/minecraft/class_5321;)Ljava/lang/String; - ARG 0 key METHOD method_41004 (Lnet/minecraft/class_5321;)Ljava/lang/String; ARG 0 key + METHOD method_43904 (Lcom/mojang/brigadier/context/CommandContext;)I + ARG 0 context METHOD method_43905 executeLocateStructure (Lnet/minecraft/class_2168;Lnet/minecraft/class_7066$class_7068;)I ARG 0 source ARG 1 predicate @@ -40,17 +49,41 @@ CLASS net/minecraft/class_3079 net/minecraft/server/command/LocateCommand ARG 0 entry METHOD method_43909 (Lnet/minecraft/class_2378;Lnet/minecraft/class_5321;)Ljava/util/Optional; ARG 1 key - METHOD method_43910 (Ljava/lang/Object;)Lcom/mojang/brigadier/Message; - ARG 0 id - METHOD method_43912 executeLocateBiome (Lnet/minecraft/class_2168;Lnet/minecraft/class_7066$class_7068;)I + METHOD method_43911 (Lcom/mojang/brigadier/context/CommandContext;)I + ARG 0 context + METHOD method_43912 executeLocateBiome (Lnet/minecraft/class_2168;Lnet/minecraft/class_7737$class_7741;)I ARG 0 source ARG 1 predicate METHOD method_43913 (Ljava/lang/Object;)Lcom/mojang/brigadier/Message; ARG 0 id - METHOD method_43915 executeLocatePoi (Lnet/minecraft/class_2168;Lnet/minecraft/class_7066$class_7068;)I + METHOD method_43914 (Lcom/mojang/brigadier/context/CommandContext;)I + ARG 0 context + METHOD method_43915 executeLocatePoi (Lnet/minecraft/class_2168;Lnet/minecraft/class_7737$class_7741;)I ARG 0 source ARG 1 predicate - METHOD method_43916 (Ljava/lang/Object;)Lcom/mojang/brigadier/Message; - ARG 0 id METHOD method_43917 (Ljava/lang/Object;)Lcom/mojang/brigadier/Message; ARG 0 id + METHOD method_45147 getKeyString (Lcom/mojang/datafixers/util/Pair;)Ljava/lang/String; + ARG 0 result + METHOD method_45148 sendCoordinates (Lnet/minecraft/class_2168;Lnet/minecraft/class_7737$class_7741;Lnet/minecraft/class_2338;Lcom/mojang/datafixers/util/Pair;Ljava/lang/String;ZLjava/time/Duration;)I + ARG 0 source + ARG 1 predicate + ARG 2 currentPos + ARG 3 result + ARG 4 successMessage + ARG 5 includeY + ARG 6 timeTaken + METHOD method_45149 sendCoordinates (Lnet/minecraft/class_2168;Lnet/minecraft/class_2338;Lcom/mojang/datafixers/util/Pair;Ljava/lang/String;ZLjava/lang/String;Ljava/time/Duration;)I + ARG 0 source + ARG 1 currentPos + ARG 2 result + ARG 3 successMessage + ARG 4 includeY + ARG 5 entryString + ARG 6 timeTaken + METHOD method_45150 (Lnet/minecraft/class_7737$class_7741;Lcom/mojang/datafixers/util/Pair;Lnet/minecraft/class_6885$class_6888;)Ljava/lang/String; + ARG 2 tag + METHOD method_45151 (Lnet/minecraft/class_7737$class_7741;Lnet/minecraft/class_6880$class_6883;)Ljava/lang/String; + ARG 1 entry + METHOD method_45152 (Lnet/minecraft/class_5321;)Ljava/lang/String; + ARG 0 key diff --git a/mappings/net/minecraft/server/command/LootCommand.mapping b/mappings/net/minecraft/server/command/LootCommand.mapping index fdad15799b..69be55cd11 100644 --- a/mappings/net/minecraft/server/command/LootCommand.mapping +++ b/mappings/net/minecraft/server/command/LootCommand.mapping @@ -9,10 +9,10 @@ CLASS net/minecraft/class_3039 net/minecraft/server/command/LootCommand ARG 1 slot METHOD method_13179 (Lnet/minecraft/class_3218;Lnet/minecraft/class_243;Lnet/minecraft/class_1799;)V ARG 2 stack - METHOD method_13180 getFeedbackMessageSingle (Lcom/mojang/brigadier/context/CommandContext;Lnet/minecraft/class_2960;Lnet/minecraft/class_47;Lnet/minecraft/class_3039$class_3041;)I + METHOD method_13180 getFeedbackMessageSingle (Lcom/mojang/brigadier/context/CommandContext;Lnet/minecraft/class_2960;Lnet/minecraft/class_8567;Lnet/minecraft/class_3039$class_3041;)I ARG 0 context ARG 1 lootTable - ARG 2 lootContext + ARG 2 lootContextParameters ARG 3 constructor METHOD method_13181 (Lnet/minecraft/class_2168;)Z ARG 0 source diff --git a/mappings/net/minecraft/server/command/MeCommand.mapping b/mappings/net/minecraft/server/command/MeCommand.mapping index 53bf432044..e4f59ba7f4 100644 --- a/mappings/net/minecraft/server/command/MeCommand.mapping +++ b/mappings/net/minecraft/server/command/MeCommand.mapping @@ -3,5 +3,5 @@ CLASS net/minecraft/class_3045 net/minecraft/server/command/MeCommand ARG 0 dispatcher METHOD method_13238 (Lcom/mojang/brigadier/context/CommandContext;)I ARG 0 context - METHOD method_43645 (Lnet/minecraft/class_3324;Lnet/minecraft/class_2168;Lnet/minecraft/class_7471;)V - ARG 2 message + METHOD method_43645 (Lcom/mojang/brigadier/context/CommandContext;Lnet/minecraft/class_7471;)V + ARG 1 message diff --git a/mappings/net/minecraft/server/command/MessageCommand.mapping b/mappings/net/minecraft/server/command/MessageCommand.mapping index 5d333b36db..0e18a7ac47 100644 --- a/mappings/net/minecraft/server/command/MessageCommand.mapping +++ b/mappings/net/minecraft/server/command/MessageCommand.mapping @@ -1,11 +1,11 @@ CLASS net/minecraft/class_3082 net/minecraft/server/command/MessageCommand METHOD method_13461 register (Lcom/mojang/brigadier/CommandDispatcher;)V ARG 0 dispatcher - METHOD method_13462 execute (Lnet/minecraft/class_2168;Ljava/util/Collection;Lnet/minecraft/class_2196$class_7515;)I + METHOD method_13462 execute (Lnet/minecraft/class_2168;Ljava/util/Collection;Lnet/minecraft/class_7471;)V ARG 0 source ARG 1 targets - ARG 2 signedMessage + ARG 2 message METHOD method_13463 (Lcom/mojang/brigadier/context/CommandContext;)I ARG 0 context - METHOD method_44144 (Lnet/minecraft/class_2168;Ljava/util/Collection;Lnet/minecraft/class_2556$class_7602;Lnet/minecraft/class_7471;)V - ARG 3 message + METHOD method_45153 (Lcom/mojang/brigadier/context/CommandContext;Ljava/util/Collection;Lnet/minecraft/class_7471;)V + ARG 2 message diff --git a/mappings/net/minecraft/server/command/ParticleCommand.mapping b/mappings/net/minecraft/server/command/ParticleCommand.mapping index c9553542c4..caab0da51e 100644 --- a/mappings/net/minecraft/server/command/ParticleCommand.mapping +++ b/mappings/net/minecraft/server/command/ParticleCommand.mapping @@ -6,8 +6,9 @@ CLASS net/minecraft/class_3089 net/minecraft/server/command/ParticleCommand ARG 0 context METHOD method_13485 (Lcom/mojang/brigadier/context/CommandContext;)I ARG 0 context - METHOD method_13486 register (Lcom/mojang/brigadier/CommandDispatcher;)V + METHOD method_13486 register (Lcom/mojang/brigadier/CommandDispatcher;Lnet/minecraft/class_7157;)V ARG 0 dispatcher + ARG 1 registryAccess METHOD method_13487 (Lcom/mojang/brigadier/context/CommandContext;)I ARG 0 context METHOD method_13488 (Lcom/mojang/brigadier/context/CommandContext;)I diff --git a/mappings/net/minecraft/server/command/PlaceCommand.mapping b/mappings/net/minecraft/server/command/PlaceCommand.mapping index b3f4a4782a..dbf48919fa 100644 --- a/mappings/net/minecraft/server/command/PlaceCommand.mapping +++ b/mappings/net/minecraft/server/command/PlaceCommand.mapping @@ -11,14 +11,12 @@ CLASS net/minecraft/class_6852 net/minecraft/server/command/PlaceCommand ARG 0 context METHOD method_39988 (Lnet/minecraft/class_2168;)Z ARG 0 source - METHOD method_39989 executePlaceFeature (Lnet/minecraft/class_2168;Lnet/minecraft/class_6880;Lnet/minecraft/class_2338;)I + METHOD method_39989 executePlaceFeature (Lnet/minecraft/class_2168;Lnet/minecraft/class_6880$class_6883;Lnet/minecraft/class_2338;)I ARG 0 source ARG 1 feature ARG 2 pos METHOD method_39990 (Lcom/mojang/brigadier/context/CommandContext;)I ARG 0 context - METHOD method_41202 (Lnet/minecraft/class_5321;)Ljava/lang/String; - ARG 0 key METHOD method_43646 (Lnet/minecraft/class_3218;Lnet/minecraft/class_1923;)Z ARG 1 pos METHOD method_43647 throwOnUnloadedPos (Lnet/minecraft/class_3218;Lnet/minecraft/class_1923;Lnet/minecraft/class_1923;)V @@ -35,11 +33,11 @@ CLASS net/minecraft/class_6852 net/minecraft/server/command/PlaceCommand ARG 2 id ARG 3 maxDepth ARG 4 pos - METHOD method_43652 (Lnet/minecraft/class_5321;)Ljava/lang/String; - ARG 0 key + METHOD method_43651 (Lnet/minecraft/class_6880;)Z + ARG 0 biome METHOD method_43653 (Lcom/mojang/brigadier/context/CommandContext;)I ARG 0 context - METHOD method_43654 executePlaceStructure (Lnet/minecraft/class_2168;Lnet/minecraft/class_6880;Lnet/minecraft/class_2338;)I + METHOD method_43654 executePlaceStructure (Lnet/minecraft/class_2168;Lnet/minecraft/class_6880$class_6883;Lnet/minecraft/class_2338;)I ARG 0 source ARG 1 structure ARG 2 pos diff --git a/mappings/net/minecraft/server/command/PublishCommand.mapping b/mappings/net/minecraft/server/command/PublishCommand.mapping index 7850345d58..3a8ecc64e4 100644 --- a/mappings/net/minecraft/server/command/PublishCommand.mapping +++ b/mappings/net/minecraft/server/command/PublishCommand.mapping @@ -3,9 +3,11 @@ CLASS net/minecraft/class_3093 net/minecraft/server/command/PublishCommand FIELD field_13680 FAILED_EXCEPTION Lcom/mojang/brigadier/exceptions/SimpleCommandExceptionType; METHOD method_13508 (Lcom/mojang/brigadier/context/CommandContext;)I ARG 0 context - METHOD method_13509 execute (Lnet/minecraft/class_2168;I)I + METHOD method_13509 execute (Lnet/minecraft/class_2168;IZLnet/minecraft/class_1934;)I ARG 0 source ARG 1 port + ARG 2 allowCommands + ARG 3 gameMode METHOD method_13510 register (Lcom/mojang/brigadier/CommandDispatcher;)V ARG 0 dispatcher METHOD method_13511 (Ljava/lang/Object;)Lcom/mojang/brigadier/Message; @@ -14,3 +16,5 @@ CLASS net/minecraft/class_3093 net/minecraft/server/command/PublishCommand ARG 0 context METHOD method_13513 (Lnet/minecraft/class_2168;)Z ARG 0 source + METHOD method_46869 getStartedText (I)Lnet/minecraft/class_5250; + ARG 0 port diff --git a/mappings/net/minecraft/server/command/RandomCommand.mapping b/mappings/net/minecraft/server/command/RandomCommand.mapping new file mode 100644 index 0000000000..8274010263 --- /dev/null +++ b/mappings/net/minecraft/server/command/RandomCommand.mapping @@ -0,0 +1,59 @@ +CLASS net/minecraft/class_8602 net/minecraft/server/command/RandomCommand + FIELD field_44983 RANGE_TOO_LARGE_EXCEPTION Lcom/mojang/brigadier/exceptions/SimpleCommandExceptionType; + FIELD field_44984 RANGE_TOO_SMALL_EXCEPTION Lcom/mojang/brigadier/exceptions/SimpleCommandExceptionType; + METHOD method_52318 register (Lcom/mojang/brigadier/CommandDispatcher;)V + ARG 0 dispatcher + METHOD method_52319 (Lcom/mojang/brigadier/context/CommandContext;)I + ARG 0 context + METHOD method_52320 suggestSequences (Lcom/mojang/brigadier/context/CommandContext;Lcom/mojang/brigadier/suggestion/SuggestionsBuilder;)Ljava/util/concurrent/CompletableFuture; + ARG 0 context + ARG 1 suggestionsBuilder + METHOD method_52321 executeReset (Lnet/minecraft/class_2168;)I + ARG 0 source + METHOD method_52322 executeReset (Lnet/minecraft/class_2168;IZZ)I + ARG 0 source + ARG 1 salt + ARG 2 includeWorldSeed + ARG 3 includeSequenceId + METHOD method_52323 executeReset (Lnet/minecraft/class_2168;Lnet/minecraft/class_2960;)I + ARG 0 source + ARG 1 sequenceId + METHOD method_52324 executeReset (Lnet/minecraft/class_2168;Lnet/minecraft/class_2960;IZZ)I + ARG 0 source + ARG 1 sequenceId + ARG 2 salt + ARG 3 includeWorldSeed + ARG 4 includeSequenceId + METHOD method_52325 execute (Lnet/minecraft/class_2168;Lnet/minecraft/class_2096$class_2100;Lnet/minecraft/class_2960;Z)I + ARG 0 source + ARG 1 range + ARG 2 sequenceId + ARG 3 roll + METHOD method_52326 random (Ljava/lang/String;Z)Lcom/mojang/brigadier/builder/LiteralArgumentBuilder; + ARG 0 argumentName + ARG 1 roll + METHOD method_52327 (Ljava/util/List;Lnet/minecraft/class_2960;Lnet/minecraft/class_8564;)V + ARG 1 id + ARG 2 sequence + METHOD method_52328 (ZLcom/mojang/brigadier/context/CommandContext;)I + ARG 1 context + METHOD method_52331 (Lcom/mojang/brigadier/context/CommandContext;)I + ARG 0 context + METHOD method_52332 (Lnet/minecraft/class_2168;)Z + ARG 0 source + METHOD method_52333 (ZLcom/mojang/brigadier/context/CommandContext;)I + ARG 1 context + METHOD method_52335 (Lcom/mojang/brigadier/context/CommandContext;)I + ARG 0 context + METHOD method_52336 (Lnet/minecraft/class_2168;)Z + ARG 0 source + METHOD method_52337 (Lcom/mojang/brigadier/context/CommandContext;)I + ARG 0 context + METHOD method_52338 (Lcom/mojang/brigadier/context/CommandContext;)I + ARG 0 context + METHOD method_52339 (Lcom/mojang/brigadier/context/CommandContext;)I + ARG 0 context + METHOD method_52340 (Lcom/mojang/brigadier/context/CommandContext;)I + ARG 0 context + METHOD method_52341 (Lcom/mojang/brigadier/context/CommandContext;)I + ARG 0 context diff --git a/mappings/net/minecraft/server/command/ReturnCommand.mapping b/mappings/net/minecraft/server/command/ReturnCommand.mapping new file mode 100644 index 0000000000..30efeba5c5 --- /dev/null +++ b/mappings/net/minecraft/server/command/ReturnCommand.mapping @@ -0,0 +1,16 @@ +CLASS net/minecraft/class_8503 net/minecraft/server/command/ReturnCommand + METHOD method_51277 register (Lcom/mojang/brigadier/CommandDispatcher;)V + ARG 0 dispatcher + METHOD method_51278 (Lcom/mojang/brigadier/context/CommandContext;)I + ARG 0 context + METHOD method_51279 (Lnet/minecraft/class_2168;)Z + ARG 0 source + METHOD method_51280 execute (Lnet/minecraft/class_2168;I)I + ARG 0 source + ARG 1 value + METHOD method_52342 (Lcom/mojang/brigadier/context/CommandContext;)Lnet/minecraft/class_2168; + ARG 0 context + METHOD method_52343 executeRun (Lcom/mojang/brigadier/context/CommandContext;ZI)I + ARG 0 context + ARG 1 success + ARG 2 value diff --git a/mappings/net/minecraft/server/command/RideCommand.mapping b/mappings/net/minecraft/server/command/RideCommand.mapping new file mode 100644 index 0000000000..009e85fe71 --- /dev/null +++ b/mappings/net/minecraft/server/command/RideCommand.mapping @@ -0,0 +1,32 @@ +CLASS net/minecraft/class_8011 net/minecraft/server/command/RideCommand + FIELD field_41742 NOT_RIDING_EXCEPTION Lcom/mojang/brigadier/exceptions/DynamicCommandExceptionType; + FIELD field_41743 ALREADY_RIDING_EXCEPTION Lcom/mojang/brigadier/exceptions/Dynamic2CommandExceptionType; + FIELD field_41744 GENERIC_FAILURE_EXCEPTION Lcom/mojang/brigadier/exceptions/Dynamic2CommandExceptionType; + FIELD field_41745 CANT_RIDE_PLAYERS_EXCEPTION Lcom/mojang/brigadier/exceptions/SimpleCommandExceptionType; + FIELD field_41746 RIDE_LOOP_EXCEPTION Lcom/mojang/brigadier/exceptions/SimpleCommandExceptionType; + FIELD field_42239 WRONG_DIMENSION_EXCEPTION Lcom/mojang/brigadier/exceptions/SimpleCommandExceptionType; + METHOD method_48077 (Lnet/minecraft/class_1297;Lnet/minecraft/class_1297;)Z + ARG 1 passenger + METHOD method_48078 register (Lcom/mojang/brigadier/CommandDispatcher;)V + ARG 0 dispatcher + METHOD method_48079 (Lcom/mojang/brigadier/context/CommandContext;)I + ARG 0 context + METHOD method_48080 (Lnet/minecraft/class_2168;)Z + ARG 0 source + METHOD method_48081 executeDismount (Lnet/minecraft/class_2168;Lnet/minecraft/class_1297;)I + ARG 0 source + ARG 1 rider + METHOD method_48082 executeMount (Lnet/minecraft/class_2168;Lnet/minecraft/class_1297;Lnet/minecraft/class_1297;)I + ARG 0 source + ARG 1 rider + ARG 2 vehicle + METHOD method_48083 (Ljava/lang/Object;)Lcom/mojang/brigadier/Message; + ARG 0 entity + METHOD method_48084 (Ljava/lang/Object;Ljava/lang/Object;)Lcom/mojang/brigadier/Message; + ARG 0 rider + ARG 1 vehicle + METHOD method_48085 (Lcom/mojang/brigadier/context/CommandContext;)I + ARG 0 context + METHOD method_48086 (Ljava/lang/Object;Ljava/lang/Object;)Lcom/mojang/brigadier/Message; + ARG 0 rider + ARG 1 vehicle diff --git a/mappings/net/minecraft/server/command/SayCommand.mapping b/mappings/net/minecraft/server/command/SayCommand.mapping index c03211b0a6..55dc8e8755 100644 --- a/mappings/net/minecraft/server/command/SayCommand.mapping +++ b/mappings/net/minecraft/server/command/SayCommand.mapping @@ -5,5 +5,5 @@ CLASS net/minecraft/class_3110 net/minecraft/server/command/SayCommand ARG 0 context METHOD method_13564 (Lnet/minecraft/class_2168;)Z ARG 0 source - METHOD method_43657 (Lnet/minecraft/class_3324;Lnet/minecraft/class_2168;Lnet/minecraft/class_7471;)V - ARG 2 message + METHOD method_43657 (Lcom/mojang/brigadier/context/CommandContext;Lnet/minecraft/class_7471;)V + ARG 1 message diff --git a/mappings/net/minecraft/server/command/ScheduleCommand.mapping b/mappings/net/minecraft/server/command/ScheduleCommand.mapping index 1f148153e7..94a7a49956 100644 --- a/mappings/net/minecraft/server/command/ScheduleCommand.mapping +++ b/mappings/net/minecraft/server/command/ScheduleCommand.mapping @@ -13,8 +13,10 @@ CLASS net/minecraft/class_3112 net/minecraft/server/command/ScheduleCommand ARG 0 context METHOD method_13569 (Lnet/minecraft/class_2168;)Z ARG 0 source + METHOD method_13570 (Lnet/minecraft/class_2960;ZLnet/minecraft/class_236;JLnet/minecraft/class_2168;ILjava/util/Collection;)V + ARG 7 functions METHOD method_13571 (Lnet/minecraft/class_2960;ZLnet/minecraft/class_236;JLnet/minecraft/class_2168;ILnet/minecraft/class_2158;)V - ARG 7 function + ARG 7 function2 METHOD method_22833 clearEvent (Lnet/minecraft/class_2168;Ljava/lang/String;)I ARG 0 source ARG 1 eventName diff --git a/mappings/net/minecraft/server/command/ScoreboardCommand.mapping b/mappings/net/minecraft/server/command/ScoreboardCommand.mapping index 737b36de81..0fce6efdff 100644 --- a/mappings/net/minecraft/server/command/ScoreboardCommand.mapping +++ b/mappings/net/minecraft/server/command/ScoreboardCommand.mapping @@ -57,7 +57,7 @@ CLASS net/minecraft/class_3115 net/minecraft/server/command/ScoreboardCommand ARG 0 context METHOD method_13591 (Lcom/mojang/brigadier/context/CommandContext;)I ARG 0 context - METHOD method_13592 executeClearDisplay (Lnet/minecraft/class_2168;I)I + METHOD method_13592 executeClearDisplay (Lnet/minecraft/class_2168;Lnet/minecraft/class_8646;)I ARG 0 source ARG 1 slot METHOD method_13593 (Lcom/mojang/brigadier/context/CommandContext;)I @@ -66,7 +66,7 @@ CLASS net/minecraft/class_3115 net/minecraft/server/command/ScoreboardCommand ARG 0 context METHOD method_13595 register (Lcom/mojang/brigadier/CommandDispatcher;)V ARG 0 dispatcher - METHOD method_13596 executeSetDisplay (Lnet/minecraft/class_2168;ILnet/minecraft/class_266;)I + METHOD method_13596 executeSetDisplay (Lnet/minecraft/class_2168;Lnet/minecraft/class_8646;Lnet/minecraft/class_266;)I ARG 0 source ARG 1 slot ARG 2 objective diff --git a/mappings/net/minecraft/server/command/SeedCommand.mapping b/mappings/net/minecraft/server/command/SeedCommand.mapping index ce0b728420..750ddb5693 100644 --- a/mappings/net/minecraft/server/command/SeedCommand.mapping +++ b/mappings/net/minecraft/server/command/SeedCommand.mapping @@ -6,5 +6,3 @@ CLASS net/minecraft/class_3118 net/minecraft/server/command/SeedCommand ARG 0 context METHOD method_13618 (ZLnet/minecraft/class_2168;)Z ARG 1 source - METHOD method_13619 (JLnet/minecraft/class_2583;)Lnet/minecraft/class_2583; - ARG 2 style diff --git a/mappings/net/minecraft/server/command/ServerCommandSource.mapping b/mappings/net/minecraft/server/command/ServerCommandSource.mapping index 399ead66db..85a1b09a17 100644 --- a/mappings/net/minecraft/server/command/ServerCommandSource.mapping +++ b/mappings/net/minecraft/server/command/ServerCommandSource.mapping @@ -5,6 +5,7 @@ CLASS net/minecraft/class_2168 net/minecraft/server/command/ServerCommandSource COMMENT @see Entity#getCommandSource() FIELD field_39183 signedArguments Lnet/minecraft/class_7448; FIELD field_39834 messageChainTaskQueue Lnet/minecraft/class_7620; + FIELD field_44647 returnValueConsumer Ljava/util/function/IntConsumer; FIELD field_9815 level I FIELD field_9816 entityAnchor Lnet/minecraft/class_2183$class_2184; FIELD field_9817 position Lnet/minecraft/class_243; @@ -29,7 +30,7 @@ CLASS net/minecraft/class_2168 net/minecraft/server/command/ServerCommandSource ARG 7 displayName ARG 8 server ARG 9 entity - METHOD (Lnet/minecraft/class_2165;Lnet/minecraft/class_243;Lnet/minecraft/class_241;Lnet/minecraft/class_3218;ILjava/lang/String;Lnet/minecraft/class_2561;Lnet/minecraft/server/MinecraftServer;Lnet/minecraft/class_1297;ZLcom/mojang/brigadier/ResultConsumer;Lnet/minecraft/class_2183$class_2184;Lnet/minecraft/class_7448;Lnet/minecraft/class_7620;)V + METHOD (Lnet/minecraft/class_2165;Lnet/minecraft/class_243;Lnet/minecraft/class_241;Lnet/minecraft/class_3218;ILjava/lang/String;Lnet/minecraft/class_2561;Lnet/minecraft/server/MinecraftServer;Lnet/minecraft/class_1297;ZLcom/mojang/brigadier/ResultConsumer;Lnet/minecraft/class_2183$class_2184;Lnet/minecraft/class_7448;Lnet/minecraft/class_7620;Ljava/util/function/IntConsumer;)V ARG 1 output ARG 2 pos ARG 3 rot @@ -44,13 +45,13 @@ CLASS net/minecraft/class_2168 net/minecraft/server/command/ServerCommandSource ARG 12 entityAnchor ARG 13 signedArguments ARG 14 messageChainTaskQueue + ARG 15 returnValueConsumer METHOD method_36321 withOutput (Lnet/minecraft/class_2165;)Lnet/minecraft/class_2168; ARG 1 output METHOD method_41212 (Lnet/minecraft/class_2172$class_7078;Lcom/mojang/brigadier/suggestion/SuggestionsBuilder;Lnet/minecraft/class_2378;)Ljava/util/concurrent/CompletableFuture; ARG 3 registry METHOD method_43735 withSignedArguments (Lnet/minecraft/class_7448;)Lnet/minecraft/class_2168; ARG 1 signedArguments - METHOD method_43736 getMessageSourceProfile ()Lnet/minecraft/class_7436; METHOD method_43737 isExecutedByPlayer ()Z METHOD method_43738 getSignedArguments ()Lnet/minecraft/class_7448; METHOD method_44023 getPlayer ()Lnet/minecraft/class_3222; @@ -75,6 +76,9 @@ CLASS net/minecraft/class_2168 net/minecraft/server/command/ServerCommandSource COMMENT Sends {@code message} as the feedback to the command's executor, or to the server's log COMMENT if the command is not executed by a player. ARG 1 message + METHOD method_51411 withReturnValueConsumer (Ljava/util/function/IntConsumer;)Lnet/minecraft/class_2168; + ARG 1 returnValueConsumer + METHOD method_51413 getReturnValueConsumer ()Ljava/util/function/IntConsumer; METHOD method_9206 withLevel (I)Lnet/minecraft/class_2168; ARG 1 level METHOD method_9207 getPlayerOrThrow ()Lnet/minecraft/class_3222; @@ -115,8 +119,8 @@ CLASS net/minecraft/class_2168 net/minecraft/server/command/ServerCommandSource ARG 1 success ARG 2 result METHOD method_9225 getWorld ()Lnet/minecraft/class_3218; - METHOD method_9226 sendFeedback (Lnet/minecraft/class_2561;Z)V - ARG 1 message + METHOD method_9226 sendFeedback (Ljava/util/function/Supplier;Z)V + ARG 1 feedbackSupplier ARG 2 broadcastToOps METHOD method_9227 withWorld (Lnet/minecraft/class_3218;)Lnet/minecraft/class_2168; ARG 1 world diff --git a/mappings/net/minecraft/server/command/SpawnArmorTrimsCommand.mapping b/mappings/net/minecraft/server/command/SpawnArmorTrimsCommand.mapping new file mode 100644 index 0000000000..2563a347a6 --- /dev/null +++ b/mappings/net/minecraft/server/command/SpawnArmorTrimsCommand.mapping @@ -0,0 +1,25 @@ +CLASS net/minecraft/class_8044 net/minecraft/server/command/SpawnArmorTrimsCommand + FIELD field_41885 ARMOR_PIECES Ljava/util/Map; + FIELD field_41886 PATTERNS Ljava/util/List; + FIELD field_41887 MATERIALS Ljava/util/List; + FIELD field_41888 PATTERN_INDEX_GETTER Ljava/util/function/ToIntFunction; + FIELD field_41889 MATERIAL_INDEX_GETTER Ljava/util/function/ToIntFunction; + METHOD method_48333 register (Lcom/mojang/brigadier/CommandDispatcher;)V + ARG 0 dispatcher + METHOD method_48334 (Lcom/mojang/brigadier/context/CommandContext;)I + ARG 0 context + METHOD method_48335 (Lnet/minecraft/class_2168;)Z + ARG 0 source + METHOD method_48336 execute (Lnet/minecraft/class_2168;Lnet/minecraft/class_1657;)I + ARG 0 source + ARG 1 player + METHOD method_48337 (Lnet/minecraft/class_2371;Lnet/minecraft/class_2378;Lnet/minecraft/class_2378;Lnet/minecraft/class_8056;Lnet/minecraft/class_8054;)V + ARG 4 material + METHOD method_48338 (Lnet/minecraft/class_2378;Lnet/minecraft/class_8054;)Ljava/lang/Integer; + ARG 1 material + METHOD method_48339 (Lnet/minecraft/class_2378;Lnet/minecraft/class_8056;)Ljava/lang/Integer; + ARG 1 pattern + METHOD method_48340 (Lnet/minecraft/class_2378;Lnet/minecraft/class_2371;Lnet/minecraft/class_2378;Lnet/minecraft/class_8056;)V + ARG 3 pattern + METHOD method_48341 (Ljava/util/HashMap;)V + ARG 0 map diff --git a/mappings/net/minecraft/server/command/SummonCommand.mapping b/mappings/net/minecraft/server/command/SummonCommand.mapping index e9bc392d03..8bd3253203 100644 --- a/mappings/net/minecraft/server/command/SummonCommand.mapping +++ b/mappings/net/minecraft/server/command/SummonCommand.mapping @@ -4,19 +4,26 @@ CLASS net/minecraft/class_3138 net/minecraft/server/command/SummonCommand FIELD field_26629 FAILED_UUID_EXCEPTION Lcom/mojang/brigadier/exceptions/SimpleCommandExceptionType; METHOD method_13689 (Lcom/mojang/brigadier/context/CommandContext;)I ARG 0 context - METHOD method_13690 register (Lcom/mojang/brigadier/CommandDispatcher;)V + METHOD method_13690 register (Lcom/mojang/brigadier/CommandDispatcher;Lnet/minecraft/class_7157;)V ARG 0 dispatcher + ARG 1 registryAccess METHOD method_13691 (Lcom/mojang/brigadier/context/CommandContext;)I ARG 0 context METHOD method_13692 (Lcom/mojang/brigadier/context/CommandContext;)I ARG 0 context METHOD method_13693 (Lnet/minecraft/class_2168;)Z ARG 0 source - METHOD method_13694 execute (Lnet/minecraft/class_2168;Lnet/minecraft/class_2960;Lnet/minecraft/class_243;Lnet/minecraft/class_2487;Z)I + METHOD method_13694 execute (Lnet/minecraft/class_2168;Lnet/minecraft/class_6880$class_6883;Lnet/minecraft/class_243;Lnet/minecraft/class_2487;Z)I ARG 0 source - ARG 1 entity + ARG 1 entityType + ARG 2 pos + ARG 3 nbt + ARG 4 initialize + METHOD method_48758 summon (Lnet/minecraft/class_2168;Lnet/minecraft/class_6880$class_6883;Lnet/minecraft/class_243;Lnet/minecraft/class_2487;Z)Lnet/minecraft/class_1297; + ARG 0 source + ARG 1 entityType ARG 2 pos ARG 3 nbt ARG 4 initialize - METHOD method_18192 (Lnet/minecraft/class_243;Lnet/minecraft/class_1297;)Lnet/minecraft/class_1297; + METHOD method_48759 (Lnet/minecraft/class_243;Lnet/minecraft/class_1297;)Lnet/minecraft/class_1297; ARG 1 entity diff --git a/mappings/net/minecraft/server/command/TeamMsgCommand.mapping b/mappings/net/minecraft/server/command/TeamMsgCommand.mapping index d33b2a95e1..2b851329f6 100644 --- a/mappings/net/minecraft/server/command/TeamMsgCommand.mapping +++ b/mappings/net/minecraft/server/command/TeamMsgCommand.mapping @@ -1,14 +1,17 @@ CLASS net/minecraft/class_3945 net/minecraft/server/command/TeamMsgCommand FIELD field_17440 NO_TEAM_EXCEPTION Lcom/mojang/brigadier/exceptions/SimpleCommandExceptionType; FIELD field_24380 STYLE Lnet/minecraft/class_2583; - METHOD method_17599 execute (Lnet/minecraft/class_2168;Lnet/minecraft/class_2196$class_7515;)I + METHOD method_17599 execute (Lnet/minecraft/class_2168;Lnet/minecraft/class_1297;Lnet/minecraft/class_268;Ljava/util/List;Lnet/minecraft/class_7471;)V ARG 0 source - ARG 1 signedMessage + ARG 1 entity + ARG 2 team + ARG 3 recipients + ARG 4 message METHOD method_17600 register (Lcom/mojang/brigadier/CommandDispatcher;)V ARG 0 dispatcher METHOD method_17601 (Lcom/mojang/brigadier/context/CommandContext;)I ARG 0 context - METHOD method_44147 (Lnet/minecraft/class_1297;Lnet/minecraft/class_268;Lnet/minecraft/class_3222;)Z + METHOD method_45154 (Lnet/minecraft/class_1297;Lnet/minecraft/class_268;Lnet/minecraft/class_3222;)Z ARG 2 player - METHOD method_44148 (Ljava/util/List;Lnet/minecraft/class_1297;Lnet/minecraft/class_2556$class_7602;Lnet/minecraft/class_2556$class_7602;Lnet/minecraft/class_2168;Lnet/minecraft/class_7471;)V - ARG 5 message + METHOD method_45155 (Lnet/minecraft/class_2168;Lnet/minecraft/class_1297;Lnet/minecraft/class_268;Ljava/util/List;Lnet/minecraft/class_7471;)V + ARG 4 message diff --git a/mappings/net/minecraft/server/command/TestCommand.mapping b/mappings/net/minecraft/server/command/TestCommand.mapping index 0bb248ca40..0a0e6ff104 100644 --- a/mappings/net/minecraft/server/command/TestCommand.mapping +++ b/mappings/net/minecraft/server/command/TestCommand.mapping @@ -1,4 +1,5 @@ CLASS net/minecraft/class_4527 net/minecraft/server/command/TestCommand + FIELD field_45665 LOGGER Lorg/slf4j/Logger; METHOD method_22263 (Lnet/minecraft/class_124;Ljava/lang/String;Lnet/minecraft/class_3222;)V ARG 2 player METHOD method_22264 executePos (Lnet/minecraft/class_2168;Ljava/lang/String;)I @@ -120,6 +121,10 @@ CLASS net/minecraft/class_4527 net/minecraft/server/command/TestCommand ARG 0 context METHOD method_29423 (Lcom/mojang/brigadier/context/CommandContext;)I ARG 0 context + METHOD method_52890 executeExportThese (Lnet/minecraft/class_2168;)I + ARG 0 source + METHOD method_52891 (Lcom/mojang/brigadier/context/CommandContext;)I + ARG 0 context CLASS class_4528 Listener FIELD field_20581 world Lnet/minecraft/class_3218; FIELD field_20582 tests Lnet/minecraft/class_4524; diff --git a/mappings/net/minecraft/server/command/WardenSpawnTrackerCommand.mapping b/mappings/net/minecraft/server/command/WardenSpawnTrackerCommand.mapping index 22acdf4124..cde9f32667 100644 --- a/mappings/net/minecraft/server/command/WardenSpawnTrackerCommand.mapping +++ b/mappings/net/minecraft/server/command/WardenSpawnTrackerCommand.mapping @@ -14,3 +14,5 @@ CLASS net/minecraft/class_7240 net/minecraft/server/command/WardenSpawnTrackerCo ARG 2 warningCount METHOD method_42105 (Lcom/mojang/brigadier/context/CommandContext;)I ARG 0 context + METHOD method_45156 (ILnet/minecraft/class_7262;)V + ARG 1 warningManager diff --git a/mappings/net/minecraft/server/command/WeatherCommand.mapping b/mappings/net/minecraft/server/command/WeatherCommand.mapping index 7c1408f686..43a56ff735 100644 --- a/mappings/net/minecraft/server/command/WeatherCommand.mapping +++ b/mappings/net/minecraft/server/command/WeatherCommand.mapping @@ -25,3 +25,7 @@ CLASS net/minecraft/class_3155 net/minecraft/server/command/WeatherCommand METHOD method_13833 executeThunder (Lnet/minecraft/class_2168;I)I ARG 0 source ARG 1 duration + METHOD method_48087 processDuration (Lnet/minecraft/class_2168;ILnet/minecraft/class_6017;)I + ARG 0 source + ARG 1 duration + ARG 2 provider diff --git a/mappings/net/minecraft/server/dedicated/DedicatedPlayerManager.mapping b/mappings/net/minecraft/server/dedicated/DedicatedPlayerManager.mapping index b8e1e9810a..0f321569d3 100644 --- a/mappings/net/minecraft/server/dedicated/DedicatedPlayerManager.mapping +++ b/mappings/net/minecraft/server/dedicated/DedicatedPlayerManager.mapping @@ -1,6 +1,6 @@ CLASS net/minecraft/class_3174 net/minecraft/server/dedicated/DedicatedPlayerManager FIELD field_13804 LOGGER Lorg/slf4j/Logger; - METHOD (Lnet/minecraft/class_3176;Lnet/minecraft/class_5455$class_6890;Lnet/minecraft/class_29;)V + METHOD (Lnet/minecraft/class_3176;Lnet/minecraft/class_7780;Lnet/minecraft/class_29;)V ARG 1 server ARG 2 tracker ARG 3 saveHandler diff --git a/mappings/net/minecraft/server/dedicated/DedicatedServer.mapping b/mappings/net/minecraft/server/dedicated/DedicatedServer.mapping index f90ee45d70..3c354ec27c 100644 --- a/mappings/net/minecraft/server/dedicated/DedicatedServer.mapping +++ b/mappings/net/minecraft/server/dedicated/DedicatedServer.mapping @@ -6,8 +6,5 @@ CLASS net/minecraft/class_2994 net/minecraft/server/dedicated/DedicatedServer METHOD method_12934 executeRconCommand (Ljava/lang/String;)Ljava/lang/String; ARG 1 command METHOD method_16705 getProperties ()Lnet/minecraft/class_3806; - METHOD method_3788 getCurrentPlayerCount ()I - METHOD method_3802 getMaxPlayerCount ()I - METHOD method_3827 getVersion ()Ljava/lang/String; METHOD method_3858 getPlayerNames ()[Ljava/lang/String; METHOD method_3865 getLevelName ()Ljava/lang/String; diff --git a/mappings/net/minecraft/server/dedicated/DedicatedServerWatchdog.mapping b/mappings/net/minecraft/server/dedicated/DedicatedServerWatchdog.mapping index f11917cdeb..64234ed0e1 100644 --- a/mappings/net/minecraft/server/dedicated/DedicatedServerWatchdog.mapping +++ b/mappings/net/minecraft/server/dedicated/DedicatedServerWatchdog.mapping @@ -5,3 +5,5 @@ CLASS net/minecraft/class_3178 net/minecraft/server/dedicated/DedicatedServerWat METHOD (Lnet/minecraft/class_3176;)V ARG 1 server METHOD method_13954 shutdown ()V + METHOD method_31376 (Lnet/minecraft/class_3218;)Ljava/lang/String; + ARG 0 world diff --git a/mappings/net/minecraft/server/dedicated/ServerMBean.mapping b/mappings/net/minecraft/server/dedicated/ServerMBean.mapping index 6513a1674b..17015817f5 100644 --- a/mappings/net/minecraft/server/dedicated/ServerMBean.mapping +++ b/mappings/net/minecraft/server/dedicated/ServerMBean.mapping @@ -21,12 +21,16 @@ CLASS net/minecraft/class_5169 net/minecraft/server/dedicated/ServerMBean ARG 3 signature METHOD method_27177 getAverageTickTime ()F COMMENT Returns the server's current average tick time, in milliseconds. + METHOD method_27179 (Lnet/minecraft/class_5169$class_5170;)Ljavax/management/Attribute; + ARG 0 entry METHOD method_27181 register (Lnet/minecraft/server/MinecraftServer;)V COMMENT Registers a dynamic MBean for a Minecraft Server. ARG 0 server COMMENT the server to have the MBean METHOD method_27182 getTickTimes ()[J COMMENT Returns the server's historical tick times, in milliseconds. + METHOD method_27183 (Lnet/minecraft/class_5169$class_5170;)Ljava/lang/String; + ARG 0 entry METHOD setAttribute (Ljavax/management/Attribute;)V ARG 1 attribute METHOD setAttributes (Ljavax/management/AttributeList;)Ljavax/management/AttributeList; diff --git a/mappings/net/minecraft/server/dedicated/ServerPropertiesHandler.mapping b/mappings/net/minecraft/server/dedicated/ServerPropertiesHandler.mapping index d44d88ba90..3cb4cde030 100644 --- a/mappings/net/minecraft/server/dedicated/ServerPropertiesHandler.mapping +++ b/mappings/net/minecraft/server/dedicated/ServerPropertiesHandler.mapping @@ -45,20 +45,21 @@ CLASS net/minecraft/class_3806 net/minecraft/server/dedicated/ServerPropertiesHa FIELD field_26899 textFilteringConfig Ljava/lang/String; FIELD field_34883 simulationDistance I FIELD field_35564 hideOnlinePlayers Z - FIELD field_37039 worldGenProperties Lnet/minecraft/class_3806$class_7044; FIELD field_37275 maxChainedNeighborUpdates I + FIELD field_37276 LOGGER Lorg/slf4j/Logger; FIELD field_39018 enforceSecureProfile Z FIELD field_39093 serverResourcePackProperties Ljava/util/Optional; FIELD field_39094 SHA1_PATTERN Ljava/util/regex/Pattern; - FIELD field_39259 previewsChat Z + FIELD field_39981 dataPackSettings Lnet/minecraft/class_5359; + FIELD field_39982 COMMA_SPLITTER Lcom/google/common/base/Splitter; + FIELD field_39983 worldGenProperties Lnet/minecraft/class_3806$class_7044; + FIELD field_44985 logIps Z METHOD method_16714 load (Ljava/nio/file/Path;)Lnet/minecraft/class_3806; ARG 0 path METHOD method_16715 (Ljava/lang/Integer;)Ljava/lang/Integer; ARG 0 maxWorldSize METHOD method_27905 (Ljava/lang/Integer;)Ljava/lang/Integer; ARG 0 percentage - METHOD method_37371 getGeneratorOptions (Lnet/minecraft/class_5455;)Lnet/minecraft/class_5285; - ARG 1 dynamicRegistryManager METHOD method_41005 (Ljava/lang/String;)Ljava/lang/String; ARG 0 type METHOD method_41186 (Ljava/lang/String;)Lcom/google/gson/JsonObject; @@ -71,11 +72,19 @@ CLASS net/minecraft/class_3806 net/minecraft/server/dedicated/ServerPropertiesHa ARG 4 prompt METHOD method_43661 parseResourcePackPrompt (Ljava/lang/String;)Lnet/minecraft/class_2561; ARG 0 prompt + METHOD method_45157 createDimensionsRegistryHolder (Lnet/minecraft/class_5455;)Lnet/minecraft/class_7723; + ARG 1 dynamicRegistry + METHOD method_45158 (Ljava/lang/String;Ljava/util/function/Consumer;)V + ARG 0 id + ARG 1 consumer + METHOD method_45159 parseDataPackSettings (Ljava/lang/String;Ljava/lang/String;)Lnet/minecraft/class_5359; + ARG 0 enabled + ARG 1 disabled + METHOD method_45160 parseFeatureFlags (Ljava/lang/String;)Lnet/minecraft/class_7699; + ARG 0 featureFlags CLASS class_7044 WorldGenProperties FIELD field_37277 LEVEL_TYPE_TO_PRESET_KEY Ljava/util/Map; - METHOD method_41242 createGeneratorOptions (Lnet/minecraft/class_5455;)Lnet/minecraft/class_5285; + METHOD method_41242 createDimensionsRegistryHolder (Lnet/minecraft/class_5455;)Lnet/minecraft/class_7723; ARG 1 dynamicRegistryManager - METHOD method_41243 (Lnet/minecraft/class_5321;)Ljava/lang/String; - ARG 0 key METHOD method_41244 (Lnet/minecraft/class_2960;)Lnet/minecraft/class_5321; ARG 0 levelTypeId diff --git a/mappings/net/minecraft/server/dedicated/command/BanIpCommand.mapping b/mappings/net/minecraft/server/dedicated/command/BanIpCommand.mapping index b1c1f86642..8216400786 100644 --- a/mappings/net/minecraft/server/dedicated/command/BanIpCommand.mapping +++ b/mappings/net/minecraft/server/dedicated/command/BanIpCommand.mapping @@ -1,5 +1,4 @@ CLASS net/minecraft/class_3012 net/minecraft/server/dedicated/command/BanIpCommand - FIELD field_13466 PATTERN Ljava/util/regex/Pattern; FIELD field_13467 ALREADY_BANNED_EXCEPTION Lcom/mojang/brigadier/exceptions/SimpleCommandExceptionType; FIELD field_13468 INVALID_IP_EXCEPTION Lcom/mojang/brigadier/exceptions/SimpleCommandExceptionType; METHOD method_13006 (Lcom/mojang/brigadier/context/CommandContext;)I diff --git a/mappings/net/minecraft/server/function/CommandFunction.mapping b/mappings/net/minecraft/server/function/CommandFunction.mapping index 4116bedac2..972a1c95f7 100644 --- a/mappings/net/minecraft/server/function/CommandFunction.mapping +++ b/mappings/net/minecraft/server/function/CommandFunction.mapping @@ -4,6 +4,17 @@ CLASS net/minecraft/class_2158 net/minecraft/server/function/CommandFunction METHOD (Lnet/minecraft/class_2960;[Lnet/minecraft/class_2158$class_2161;)V ARG 1 id ARG 2 elements + METHOD method_52592 continuesToNextLine (Ljava/lang/CharSequence;)Z + ARG 0 string + METHOD method_52593 isValidMacroVariableName (Ljava/lang/String;)Z + ARG 0 name + METHOD method_52594 parseMacro (Ljava/lang/String;I)Lnet/minecraft/class_2158$class_8642; + ARG 0 macro + ARG 1 line + METHOD method_52595 withMacroReplaced (Lnet/minecraft/class_2487;Lcom/mojang/brigadier/CommandDispatcher;Lnet/minecraft/class_2168;)Lnet/minecraft/class_2158; + ARG 1 arguments + ARG 2 dispatcher + ARG 3 source 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; @@ -61,3 +72,24 @@ CLASS net/minecraft/class_2158 net/minecraft/server/function/CommandFunction ARG 1 function METHOD method_17914 (Lnet/minecraft/class_2991$class_6346;IILjava/util/Deque;Lnet/minecraft/class_2168;Lnet/minecraft/class_2158;)V ARG 5 f + CLASS class_8641 Macro + FIELD field_45149 variables Ljava/util/List; + FIELD field_45150 CACHE_SIZE I + FIELD field_45151 cache Lit/unimi/dsi/fastutil/objects/Object2ObjectLinkedOpenHashMap; + METHOD (Lnet/minecraft/class_2960;[Lnet/minecraft/class_2158$class_2161;Ljava/util/List;)V + ARG 1 id + ARG 2 elements + ARG 3 variables + METHOD method_52597 withMacroReplaced (Ljava/util/List;Lcom/mojang/brigadier/CommandDispatcher;Lnet/minecraft/class_2168;)Lnet/minecraft/class_2158; + ARG 1 arguments + ARG 2 dispatcher + ARG 3 source + CLASS class_8642 MacroElement + FIELD field_45152 parts Ljava/util/List; + FIELD field_45153 variables Ljava/util/List; + METHOD (Ljava/util/List;Ljava/util/List;)V + ARG 1 parts + ARG 2 variables + METHOD method_52598 getVariables ()Ljava/util/List; + METHOD method_52599 getCommand (Ljava/util/List;)Ljava/lang/String; + ARG 1 arguments diff --git a/mappings/net/minecraft/server/function/CommandFunctionManager.mapping b/mappings/net/minecraft/server/function/CommandFunctionManager.mapping index 9ddc8ac168..7f8ea652e3 100644 --- a/mappings/net/minecraft/server/function/CommandFunctionManager.mapping +++ b/mappings/net/minecraft/server/function/CommandFunctionManager.mapping @@ -36,10 +36,10 @@ CLASS net/minecraft/class_2991 net/minecraft/server/function/CommandFunctionMana COMMENT Executes a function. COMMENT COMMENT

    This is same as calling {@link #execute(CommandFunction, ServerCommandSource, - COMMENT Tracer) execute(function, source, null)}. + COMMENT Tracer, NbtCompound) execute(function, source, null, null)}. COMMENT COMMENT @return the command output value - COMMENT @see #execute(CommandFunction, ServerCommandSource, Tracer) + COMMENT @see #execute(CommandFunction, ServerCommandSource, Tracer, NbtCompound) ARG 1 function COMMENT the function ARG 2 source @@ -60,7 +60,7 @@ CLASS net/minecraft/class_2991 net/minecraft/server/function/CommandFunctionMana METHOD method_29464 getFunctionTags ()Ljava/lang/Iterable; METHOD method_29773 load (Lnet/minecraft/class_5349;)V ARG 1 loader - METHOD method_36341 execute (Lnet/minecraft/class_2158;Lnet/minecraft/class_2168;Lnet/minecraft/class_2991$class_6346;)I + METHOD method_36341 execute (Lnet/minecraft/class_2158;Lnet/minecraft/class_2168;Lnet/minecraft/class_2991$class_6346;Lnet/minecraft/class_2487;)I COMMENT Executes a function. This may have two cases: new or recursive. COMMENT COMMENT

    In a new execution, the {@link #execution execution == null}, and a custom @@ -80,6 +80,8 @@ CLASS net/minecraft/class_2991 net/minecraft/server/function/CommandFunctionMana COMMENT the command source to execute with ARG 3 tracer COMMENT a tracer for a non-recursive function execution + ARG 4 arguments + COMMENT arguments for macro substitution, if any CLASS class_2992 Entry FIELD field_13424 source Lnet/minecraft/class_2168; FIELD field_13425 element Lnet/minecraft/class_2158$class_2161; @@ -103,11 +105,12 @@ CLASS net/minecraft/class_2991 net/minecraft/server/function/CommandFunctionMana FIELD field_33546 tracer Lnet/minecraft/class_2991$class_6346; FIELD field_33547 queue Ljava/util/Deque; FIELD field_33548 waitlist Ljava/util/List; + FIELD field_44584 returned Z METHOD (Lnet/minecraft/class_2991;Lnet/minecraft/class_2991$class_6346;)V ARG 2 tracer METHOD method_36343 recursiveRun (Lnet/minecraft/class_2158;Lnet/minecraft/class_2168;)V COMMENT Handles a recursive case in {@link CommandFunctionManager#execute(CommandFunction, - COMMENT ServerCommandSource, CommandFunctionManager.Tracer)}. + COMMENT ServerCommandSource, CommandFunctionManager.Tracer, NbtCompound)}. COMMENT COMMENT

    This effectively swaps an entry with a command element with {@code /function} COMMENT command at the head of the deque with another entry with a function element @@ -120,13 +123,21 @@ CLASS net/minecraft/class_2991 net/minecraft/server/function/CommandFunctionMana ARG 1 message METHOD method_36346 run (Lnet/minecraft/class_2158;Lnet/minecraft/class_2168;)I COMMENT Handles a new case in {@link CommandFunctionManager#execute(CommandFunction, - COMMENT ServerCommandSource, CommandFunctionManager.Tracer)}. + COMMENT ServerCommandSource, CommandFunctionManager.Tracer, NbtCompound)}. COMMENT COMMENT @return a value for the command result ARG 1 function COMMENT the function ARG 2 source COMMENT the command source + METHOD method_51275 addReturnConsumer (Lnet/minecraft/class_2168;)Lnet/minecraft/class_2168; + ARG 1 source + CLASS class_8502 ReturnValueConsumer + FIELD field_44586 delegate Ljava/util/function/IntConsumer; + METHOD (Lnet/minecraft/class_2991$class_6345;Ljava/util/function/IntConsumer;)V + ARG 2 delegate + METHOD accept (I)V + ARG 1 value CLASS class_6346 Tracer COMMENT A tree-visitor-like tracer, useful for gaining insights on function execution. METHOD method_36349 traceCommandStart (ILjava/lang/String;)V diff --git a/mappings/net/minecraft/server/function/FunctionLoader.mapping b/mappings/net/minecraft/server/function/FunctionLoader.mapping index 750f711649..1293cac2f7 100644 --- a/mappings/net/minecraft/server/function/FunctionLoader.mapping +++ b/mappings/net/minecraft/server/function/FunctionLoader.mapping @@ -14,14 +14,12 @@ CLASS net/minecraft/class_5349 net/minecraft/server/function/FunctionLoader COMMENT COMMENT @see CommandFunctionManager FIELD field_25326 LOGGER Lorg/slf4j/Logger; - FIELD field_25327 PATH_PREFIX_LENGTH I - FIELD field_25328 EXTENSION_LENGTH I FIELD field_25329 functions Ljava/util/Map; FIELD field_25330 tagLoader Lnet/minecraft/class_3503; FIELD field_25331 level I FIELD field_25332 commandDispatcher Lcom/mojang/brigadier/CommandDispatcher; FIELD field_25801 tags Ljava/util/Map; - FIELD field_33385 EXTENSION Ljava/lang/String; + FIELD field_39978 FINDER Lnet/minecraft/class_7654; METHOD (ILcom/mojang/brigadier/CommandDispatcher;)V ARG 1 level ARG 2 commandDispatcher @@ -35,8 +33,6 @@ CLASS net/minecraft/class_5349 net/minecraft/server/function/FunctionLoader ARG 2 functionFuture METHOD method_29453 (Lcom/mojang/datafixers/util/Pair;)V ARG 1 intermediate - METHOD method_29454 (Lnet/minecraft/class_2960;)Z - ARG 0 id METHOD method_29455 (Ljava/util/Map;Ljava/lang/Void;Ljava/lang/Throwable;)Ljava/util/Map; ARG 1 unused ARG 2 ex diff --git a/mappings/net/minecraft/server/function/MacroException.mapping b/mappings/net/minecraft/server/function/MacroException.mapping new file mode 100644 index 0000000000..90b3992887 --- /dev/null +++ b/mappings/net/minecraft/server/function/MacroException.mapping @@ -0,0 +1,5 @@ +CLASS net/minecraft/class_8643 net/minecraft/server/function/MacroException + FIELD field_45154 message Lnet/minecraft/class_2561; + METHOD (Lnet/minecraft/class_2561;)V + ARG 1 message + METHOD method_52600 getMessage ()Lnet/minecraft/class_2561; diff --git a/mappings/net/minecraft/server/integrated/IntegratedPlayerManager.mapping b/mappings/net/minecraft/server/integrated/IntegratedPlayerManager.mapping index 34ddc28fe0..924b58feb9 100644 --- a/mappings/net/minecraft/server/integrated/IntegratedPlayerManager.mapping +++ b/mappings/net/minecraft/server/integrated/IntegratedPlayerManager.mapping @@ -1,6 +1,6 @@ CLASS net/minecraft/class_1130 net/minecraft/server/integrated/IntegratedPlayerManager FIELD field_5514 userData Lnet/minecraft/class_2487; - METHOD (Lnet/minecraft/class_1132;Lnet/minecraft/class_5455$class_6890;Lnet/minecraft/class_29;)V + METHOD (Lnet/minecraft/class_1132;Lnet/minecraft/class_7780;Lnet/minecraft/class_29;)V ARG 1 server ARG 2 registryManager ARG 3 saveHandler diff --git a/mappings/net/minecraft/server/integrated/IntegratedServer.mapping b/mappings/net/minecraft/server/integrated/IntegratedServer.mapping index 94a13525c3..d0630a78ff 100644 --- a/mappings/net/minecraft/server/integrated/IntegratedServer.mapping +++ b/mappings/net/minecraft/server/integrated/IntegratedServer.mapping @@ -16,5 +16,9 @@ CLASS net/minecraft/class_1132 net/minecraft/server/integrated/IntegratedServer ARG 6 apiServices ARG 7 worldGenerationProgressListenerFactory METHOD method_36439 incrementTotalWorldTimeStat ()V + METHOD method_48006 (Lnet/minecraft/class_7427;)V + ARG 1 keys + METHOD method_48007 (Ljava/util/Optional;)V + ARG 1 keyPair METHOD method_4817 setLocalPlayerUuid (Ljava/util/UUID;)V ARG 1 localPlayerUuid diff --git a/mappings/net/minecraft/server/integrated/IntegratedServerLoader.mapping b/mappings/net/minecraft/server/integrated/IntegratedServerLoader.mapping index 06565c1acc..06013d8678 100644 --- a/mappings/net/minecraft/server/integrated/IntegratedServerLoader.mapping +++ b/mappings/net/minecraft/server/integrated/IntegratedServerLoader.mapping @@ -5,18 +5,10 @@ CLASS net/minecraft/class_7196 net/minecraft/server/integrated/IntegratedServerL METHOD (Lnet/minecraft/class_310;Lnet/minecraft/class_32;)V ARG 1 client ARG 2 storage - METHOD method_41885 (Lnet/minecraft/class_1940;Lnet/minecraft/class_5285;Lnet/minecraft/class_5455;Lnet/minecraft/class_3300;Lnet/minecraft/class_5359;)Lcom/mojang/datafixers/util/Pair; - ARG 3 resourceManager - ARG 4 dataPackSettings - METHOD method_41886 createDataPackManager (Lnet/minecraft/class_32$class_5143;)Lnet/minecraft/class_3283; - ARG 0 session - METHOD method_41887 (Lnet/minecraft/class_32$class_5143;Lnet/minecraft/class_3300;Lnet/minecraft/class_5359;)Lcom/mojang/datafixers/util/Pair; - ARG 1 resourceManager - ARG 2 dataPackSettings METHOD method_41888 close (Lnet/minecraft/class_32$class_5143;Ljava/lang/String;)V ARG 0 session ARG 1 levelName - METHOD method_41889 start (Lnet/minecraft/class_32$class_5143;Lnet/minecraft/class_5350;Lnet/minecraft/class_5455$class_6890;Lnet/minecraft/class_5219;)V + METHOD method_41889 start (Lnet/minecraft/class_32$class_5143;Lnet/minecraft/class_5350;Lnet/minecraft/class_7780;Lnet/minecraft/class_5219;)V ARG 1 session ARG 2 dataPackContents ARG 3 dynamicRegistryManager @@ -28,21 +20,22 @@ CLASS net/minecraft/class_7196 net/minecraft/server/integrated/IntegratedServerL ARG 1 session ARG 2 safeMode ARG 3 dataPackManager - METHOD method_41892 tryLoad (Lnet/minecraft/class_310;Lnet/minecraft/class_525;Lcom/mojang/serialization/Lifecycle;Ljava/lang/Runnable;)V + METHOD method_41892 tryLoad (Lnet/minecraft/class_310;Lnet/minecraft/class_525;Lcom/mojang/serialization/Lifecycle;Ljava/lang/Runnable;Z)V ARG 0 client ARG 1 parent ARG 2 lifecycle ARG 3 loader + ARG 4 bypassWarnings METHOD method_41893 (Ljava/lang/Runnable;Lnet/minecraft/class_310;Lnet/minecraft/class_525;Z)V ARG 3 confirmed METHOD method_41894 start (Lnet/minecraft/class_437;Ljava/lang/String;)V ARG 1 parent ARG 2 levelName - METHOD method_41895 createAndStart (Ljava/lang/String;Lnet/minecraft/class_1940;Lnet/minecraft/class_5455;Lnet/minecraft/class_5285;)V + METHOD method_41895 createAndStart (Ljava/lang/String;Lnet/minecraft/class_1940;Lnet/minecraft/class_5285;Ljava/util/function/Function;)V ARG 1 levelName ARG 2 levelInfo ARG 3 dynamicRegistryManager - ARG 4 generatorOptions + ARG 4 dimensionsRegistrySupplier METHOD method_41896 (Ljava/lang/String;Ljava/lang/Runnable;ZZ)V ARG 3 backup ARG 4 eraseCache @@ -56,9 +49,6 @@ CLASS net/minecraft/class_7196 net/minecraft/server/integrated/IntegratedServerL ARG 2 levelName ARG 3 safeMode ARG 4 canShowBackupPrompt - METHOD method_41900 createSaveLoader (Lnet/minecraft/class_7237$class_7238;Lnet/minecraft/class_7237$class_6907;)Lnet/minecraft/class_6904; - ARG 1 dataPacks - ARG 2 savePropertiesSupplier METHOD method_41901 createSession (Ljava/lang/String;)Lnet/minecraft/class_32$class_5143; ARG 1 levelName METHOD method_43324 showPackLoadFailureScreen ()Ljava/util/concurrent/CompletableFuture; @@ -70,3 +60,29 @@ CLASS net/minecraft/class_7196 net/minecraft/server/integrated/IntegratedServerL ARG 0 void_ METHOD method_43330 (Ljava/lang/Throwable;)Ljava/util/concurrent/CompletionStage; ARG 1 throwable + METHOD method_45694 load (Lnet/minecraft/class_7237$class_7238;Lnet/minecraft/class_7237$class_6907;Lnet/minecraft/class_7237$class_7239;)Ljava/lang/Object; + ARG 1 dataPacks + ARG 2 loadContextSupplier + ARG 3 saveApplierFactory + METHOD method_45695 (Lnet/minecraft/class_6860;Lnet/minecraft/class_5350;Lnet/minecraft/class_7780;Lnet/minecraft/class_7196$class_7750;)Lcom/mojang/datafixers/util/Pair; + ARG 0 resourceManager + ARG 1 dataPackContents + ARG 2 combinedRegistryManager + ARG 3 currentSettings + METHOD method_45696 loadForRecreation (Lnet/minecraft/class_32$class_5143;)Lcom/mojang/datafixers/util/Pair; + ARG 1 session + METHOD method_45697 (Lnet/minecraft/class_32$class_5143;Lnet/minecraft/class_7237$class_7660;)Lnet/minecraft/class_7237$class_7661; + ARG 1 context + METHOD method_45698 (Ljava/util/function/Function;Lnet/minecraft/class_1940;Lnet/minecraft/class_5285;Lnet/minecraft/class_7237$class_7660;)Lnet/minecraft/class_7237$class_7661; + ARG 3 context + METHOD method_45699 (Lnet/minecraft/class_32$class_5143;Lnet/minecraft/class_7237$class_7660;)Lnet/minecraft/class_7237$class_7661; + ARG 1 context + METHOD method_45700 createDataPackConfig (Lnet/minecraft/class_32$class_5143;ZLnet/minecraft/class_3283;)Lnet/minecraft/class_7237$class_7238; + ARG 1 session + ARG 2 safeMode + ARG 3 dataPackManager + CLASS class_7750 CurrentSettings + FIELD comp_1031 levelInfo Lnet/minecraft/class_1940; + FIELD comp_1033 existingDimensionRegistry Lnet/minecraft/class_2378; + METHOD comp_1031 levelInfo ()Lnet/minecraft/class_1940; + METHOD comp_1033 existingDimensionRegistry ()Lnet/minecraft/class_2378; diff --git a/mappings/net/minecraft/server/network/ChunkDataSender.mapping b/mappings/net/minecraft/server/network/ChunkDataSender.mapping new file mode 100644 index 0000000000..65f14a12f2 --- /dev/null +++ b/mappings/net/minecraft/server/network/ChunkDataSender.mapping @@ -0,0 +1,30 @@ +CLASS net/minecraft/class_8608 net/minecraft/server/network/ChunkDataSender + FIELD field_45002 LOGGER Lorg/slf4j/Logger; + FIELD field_45005 chunks Lit/unimi/dsi/fastutil/longs/LongSet; + FIELD field_45006 local Z + FIELD field_45007 desiredBatchSize F + FIELD field_45008 pending F + FIELD field_45009 unacknowledgedBatches I + FIELD field_45010 maxUnacknowledgedBatches I + METHOD (Z)V + ARG 1 local + METHOD method_52383 onAcknowledgeChunks (F)V + ARG 1 desiredBatchSize + METHOD method_52384 isInNextBatch (J)Z + ARG 1 chunkPos + METHOD method_52385 makeBatch (Lnet/minecraft/class_3898;Lnet/minecraft/class_1923;)Ljava/util/List; + ARG 1 chunkStorage + ARG 2 playerPos + METHOD method_52386 sendChunkBatches (Lnet/minecraft/class_3222;)V + ARG 1 player + METHOD method_52387 unload (Lnet/minecraft/class_3222;Lnet/minecraft/class_1923;)V + ARG 1 player + ARG 2 pos + METHOD method_52388 sendChunkData (Lnet/minecraft/class_3244;Lnet/minecraft/class_3218;Lnet/minecraft/class_2818;)V + ARG 0 handler + ARG 1 world + ARG 2 chunk + METHOD method_52389 (Lnet/minecraft/class_1923;Lnet/minecraft/class_2818;)I + ARG 1 chunk + METHOD method_52390 add (Lnet/minecraft/class_2818;)V + ARG 1 chunk diff --git a/mappings/net/minecraft/server/network/ChunkFilter.mapping b/mappings/net/minecraft/server/network/ChunkFilter.mapping new file mode 100644 index 0000000000..b5e6dc1881 --- /dev/null +++ b/mappings/net/minecraft/server/network/ChunkFilter.mapping @@ -0,0 +1,44 @@ +CLASS net/minecraft/class_8603 net/minecraft/server/network/ChunkFilter + FIELD field_44986 IGNORE_ALL Lnet/minecraft/class_8603; + METHOD method_52356 isWithinDistance (II)Z + ARG 1 x + ARG 2 z + METHOD method_52357 isWithinDistanceExcludingEdge (IIIII)Z + ARG 0 centerX + ARG 1 centerZ + ARG 2 viewDistance + ARG 3 x + ARG 4 z + METHOD method_52358 isWithinDistance (IIIIIZ)Z + ARG 0 centerX + ARG 1 centerZ + ARG 2 viewDistance + ARG 3 x + ARG 4 z + ARG 5 includeEdge + METHOD method_52359 isWithinDistance (IIZ)Z + ARG 1 x + ARG 2 z + ARG 3 includeEdge + METHOD method_52360 forEachChangedChunk (Lnet/minecraft/class_8603;Lnet/minecraft/class_8603;Ljava/util/function/Consumer;Ljava/util/function/Consumer;)V + ARG 0 oldFilter + ARG 1 newFilter + ARG 2 newlyIncluded + ARG 3 justRemoved + METHOD method_52361 isWithinDistance (Lnet/minecraft/class_1923;)Z + ARG 1 pos + METHOD method_52362 cylindrical (Lnet/minecraft/class_1923;I)Lnet/minecraft/class_8603; + ARG 0 center + ARG 1 viewDistance + METHOD method_52363 forEach (Ljava/util/function/Consumer;)V + ARG 1 consumer + METHOD method_52364 isWithinDistanceExcludingEdge (II)Z + ARG 1 x + ARG 2 z + CLASS class_8604 Cylindrical + METHOD method_52365 overlaps (Lnet/minecraft/class_8603$class_8604;)Z + ARG 1 o + METHOD method_52366 getLeft ()I + METHOD method_52367 getBottom ()I + METHOD method_52368 getRight ()I + METHOD method_52369 getTop ()I diff --git a/mappings/net/minecraft/server/network/DebugInfoSender.mapping b/mappings/net/minecraft/server/network/DebugInfoSender.mapping index 113abf8445..c20a5cc549 100644 --- a/mappings/net/minecraft/server/network/DebugInfoSender.mapping +++ b/mappings/net/minecraft/server/network/DebugInfoSender.mapping @@ -40,10 +40,9 @@ CLASS net/minecraft/class_4209 net/minecraft/server/network/DebugInfoSender ARG 2 message ARG 3 color ARG 4 duration - METHOD method_22319 sendToAll (Lnet/minecraft/class_3218;Lnet/minecraft/class_2540;Lnet/minecraft/class_2960;)V + METHOD method_22319 sendToAll (Lnet/minecraft/class_3218;Lnet/minecraft/class_8710;)V ARG 0 world - ARG 1 buf - ARG 2 channel + ARG 1 payload METHOD method_23855 sendBeeDebugData (Lnet/minecraft/class_4466;)V ARG 0 bee METHOD method_23856 sendBeehiveDebugData (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;Lnet/minecraft/class_4482;)V @@ -70,24 +69,5 @@ CLASS net/minecraft/class_4209 net/minecraft/server/network/DebugInfoSender METHOD method_36157 listMemories (Lnet/minecraft/class_1309;J)Ljava/util/List; ARG 0 entity ARG 1 currentTime - METHOD method_36158 writeBrain (Lnet/minecraft/class_1309;Lnet/minecraft/class_2540;)V - ARG 0 entity - ARG 1 buf - METHOD method_36160 (Ljava/util/List;Ljava/lang/String;Lnet/minecraft/class_4139;Ljava/lang/Integer;)V - ARG 2 type - ARG 3 value - METHOD method_36161 (Ljava/util/List;Ljava/util/UUID;Lit/unimi/dsi/fastutil/objects/Object2IntMap;)V - ARG 1 uuid - ARG 2 gossips - METHOD method_36162 (Lnet/minecraft/class_2540;Lnet/minecraft/class_4135;)V - ARG 0 buf + METHOD method_36162 (Ljava/util/List;Lnet/minecraft/class_4135;)V ARG 1 goal - METHOD method_36163 (Lnet/minecraft/class_2540;Lnet/minecraft/class_3765;)V - ARG 0 buf - ARG 1 raid - METHOD method_36164 (Lnet/minecraft/class_2540;Lnet/minecraft/class_4168;)V - ARG 0 buf2 - ARG 1 activity - METHOD method_36165 (Lnet/minecraft/class_2540;Ljava/lang/String;)V - ARG 0 buf2 - ARG 1 memory diff --git a/mappings/net/minecraft/server/network/EntityTrackerEntry.mapping b/mappings/net/minecraft/server/network/EntityTrackerEntry.mapping index 949f6d7c04..88a5de0238 100644 --- a/mappings/net/minecraft/server/network/EntityTrackerEntry.mapping +++ b/mappings/net/minecraft/server/network/EntityTrackerEntry.mapping @@ -9,11 +9,13 @@ CLASS net/minecraft/class_3231 net/minecraft/server/network/EntityTrackerEntry FIELD field_14047 lastPitch I FIELD field_14049 entity Lnet/minecraft/class_1297; FIELD field_14051 hadVehicle Z - FIELD field_14059 lastHeadPitch I + FIELD field_14059 lastHeadYaw I FIELD field_14060 lastYaw I FIELD field_18258 world Lnet/minecraft/class_3218; FIELD field_18259 receiver Ljava/util/function/Consumer; FIELD field_18278 velocity Lnet/minecraft/class_243; + FIELD field_39019 trackedPos Lnet/minecraft/class_7422; + FIELD field_41697 changedEntries Ljava/util/List; METHOD (Lnet/minecraft/class_3218;Lnet/minecraft/class_1297;IZLjava/util/function/Consumer;)V ARG 1 world ARG 2 entity @@ -25,10 +27,18 @@ CLASS net/minecraft/class_3231 net/minecraft/server/network/EntityTrackerEntry METHOD method_14306 syncEntityData ()V COMMENT Synchronizes tracked data and attributes METHOD method_18756 tick ()V - METHOD method_18757 sendPackets (Ljava/util/function/Consumer;)V - ARG 1 sender + METHOD method_18757 sendPackets (Lnet/minecraft/class_3222;Ljava/util/function/Consumer;)V + ARG 1 player + ARG 2 sender METHOD method_18758 sendSyncPacket (Lnet/minecraft/class_2596;)V COMMENT Sends a packet for synchronization with watcher and tracked player (if applicable) ARG 1 packet METHOD method_18760 startTracking (Lnet/minecraft/class_3222;)V ARG 1 player + METHOD method_49426 (Lnet/minecraft/class_1297;)V + ARG 0 passenger + METHOD method_49752 (Ljava/util/List;Lnet/minecraft/class_1297;)Z + ARG 1 passenger + METHOD method_49753 streamChangedPassengers (Ljava/util/List;Ljava/util/List;)Ljava/util/stream/Stream; + ARG 0 passengers + ARG 1 lastPassengers diff --git a/mappings/net/minecraft/server/network/JoinWorldTask.mapping b/mappings/net/minecraft/server/network/JoinWorldTask.mapping new file mode 100644 index 0000000000..288bdf4b4f --- /dev/null +++ b/mappings/net/minecraft/server/network/JoinWorldTask.mapping @@ -0,0 +1,2 @@ +CLASS net/minecraft/class_8611 net/minecraft/server/network/JoinWorldTask + FIELD field_45033 KEY Lnet/minecraft/class_8605$class_8606; diff --git a/mappings/net/minecraft/server/network/PlayerAssociatedNetworkHandler.mapping b/mappings/net/minecraft/server/network/PlayerAssociatedNetworkHandler.mapping new file mode 100644 index 0000000000..0e9bc74a07 --- /dev/null +++ b/mappings/net/minecraft/server/network/PlayerAssociatedNetworkHandler.mapping @@ -0,0 +1,4 @@ +CLASS net/minecraft/class_5629 net/minecraft/server/network/PlayerAssociatedNetworkHandler + METHOD method_14364 sendPacket (Lnet/minecraft/class_2596;)V + ARG 1 packet + METHOD method_32311 getPlayer ()Lnet/minecraft/class_3222; diff --git a/mappings/net/minecraft/server/network/SendResourcePackTask.mapping b/mappings/net/minecraft/server/network/SendResourcePackTask.mapping new file mode 100644 index 0000000000..033d184ce6 --- /dev/null +++ b/mappings/net/minecraft/server/network/SendResourcePackTask.mapping @@ -0,0 +1,5 @@ +CLASS net/minecraft/class_8612 net/minecraft/server/network/SendResourcePackTask + FIELD field_45034 KEY Lnet/minecraft/class_8605$class_8606; + FIELD field_45035 packProperties Lnet/minecraft/server/MinecraftServer$class_7460; + METHOD (Lnet/minecraft/server/MinecraftServer$class_7460;)V + ARG 1 packProperties diff --git a/mappings/net/minecraft/server/network/ServerCommonNetworkHandler.mapping b/mappings/net/minecraft/server/network/ServerCommonNetworkHandler.mapping new file mode 100644 index 0000000000..fa1cc3806a --- /dev/null +++ b/mappings/net/minecraft/server/network/ServerCommonNetworkHandler.mapping @@ -0,0 +1,29 @@ +CLASS net/minecraft/class_8609 net/minecraft/server/network/ServerCommonNetworkHandler + FIELD field_45011 KEEP_ALIVE_INTERVAL I + FIELD field_45012 server Lnet/minecraft/server/MinecraftServer; + FIELD field_45013 connection Lnet/minecraft/class_2535; + FIELD field_45014 LOGGER Lorg/slf4j/Logger; + FIELD field_45015 TIMEOUT_TEXT Lnet/minecraft/class_2561; + FIELD field_45016 lastKeepAliveTime J + FIELD field_45017 waitingForKeepAlive Z + FIELD field_45018 keepAliveId J + FIELD field_45019 latency I + FIELD field_45715 flushDisabled Z + METHOD (Lnet/minecraft/server/MinecraftServer;Lnet/minecraft/class_2535;I)V + ARG 1 server + ARG 2 connection + ARG 3 keepAliveId + METHOD method_14364 sendPacket (Lnet/minecraft/class_2596;)V + ARG 1 packet + METHOD method_52391 send (Lnet/minecraft/class_2596;Lnet/minecraft/class_7648;)V + ARG 1 packet + ARG 2 callbacks + METHOD method_52396 disconnect (Lnet/minecraft/class_2561;)V + ARG 1 reason + METHOD method_52400 baseTick ()V + METHOD method_52402 isHost ()Z + METHOD method_52403 getProfile ()Lcom/mojang/authlib/GameProfile; + METHOD method_52404 getDebugProfile ()Lcom/mojang/authlib/GameProfile; + METHOD method_52405 getLatency ()I + METHOD method_53046 disableFlush ()V + METHOD method_53047 enableFlush ()V diff --git a/mappings/net/minecraft/server/network/ServerConfigurationNetworkHandler.mapping b/mappings/net/minecraft/server/network/ServerConfigurationNetworkHandler.mapping new file mode 100644 index 0000000000..2de5813176 --- /dev/null +++ b/mappings/net/minecraft/server/network/ServerConfigurationNetworkHandler.mapping @@ -0,0 +1,18 @@ +CLASS net/minecraft/class_8610 net/minecraft/server/network/ServerConfigurationNetworkHandler + FIELD field_45020 LOGGER Lorg/slf4j/Logger; + FIELD field_45021 INVALID_PLAYER_DATA_TEXT Lnet/minecraft/class_2561; + FIELD field_45022 profile Lcom/mojang/authlib/GameProfile; + FIELD field_45023 tasks Ljava/util/Queue; + FIELD field_45024 currentTask Lnet/minecraft/class_8605; + METHOD (Lnet/minecraft/server/MinecraftServer;Lnet/minecraft/class_2535;Lcom/mojang/authlib/GameProfile;)V + ARG 1 server + ARG 2 connection + ARG 3 profile + METHOD method_52406 onTaskFinished (Lnet/minecraft/class_8605$class_8606;)V + ARG 1 key + METHOD method_52407 (Lnet/minecraft/server/MinecraftServer$class_7460;)V + ARG 1 properties + METHOD method_52409 sendConfigurations ()V + METHOD method_52410 endConfiguration ()V + METHOD method_52411 queueSendResourcePackTask ()V + METHOD method_52412 pollTask ()V diff --git a/mappings/net/minecraft/server/network/ServerLoginNetworkHandler.mapping b/mappings/net/minecraft/server/network/ServerLoginNetworkHandler.mapping index 3a5c4ec4c9..f632aab258 100644 --- a/mappings/net/minecraft/server/network/ServerLoginNetworkHandler.mapping +++ b/mappings/net/minecraft/server/network/ServerLoginNetworkHandler.mapping @@ -15,47 +15,35 @@ CLASS net/minecraft/class_3248 net/minecraft/server/network/ServerLoginNetworkHa FIELD field_14156 loginTicks I FIELD field_14157 NEXT_AUTHENTICATOR_THREAD_ID Ljava/util/concurrent/atomic/AtomicInteger; FIELD field_14158 connection Lnet/minecraft/class_2535; - FIELD field_14160 profile Lcom/mojang/authlib/GameProfile; - 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 Lnet/minecraft/class_5819; FIELD field_14165 serverId Ljava/lang/String; FIELD field_14166 LOGGER Lorg/slf4j/Logger; FIELD field_14167 nonce [B FIELD field_29779 TIMEOUT_TICKS I - FIELD field_39743 publicKeyData Lnet/minecraft/class_7428$class_7443; + FIELD field_45027 UNEXPECTED_QUERY_RESPONSE_TEXT Lnet/minecraft/class_2561; + FIELD field_45028 profileName Ljava/lang/String; + FIELD field_45029 profile Lcom/mojang/authlib/GameProfile; METHOD (Lnet/minecraft/server/MinecraftServer;Lnet/minecraft/class_2535;)V ARG 1 server ARG 2 connection - METHOD method_14375 toOfflineProfile (Lcom/mojang/authlib/GameProfile;)Lcom/mojang/authlib/GameProfile; - ARG 1 profile METHOD method_14380 disconnect (Lnet/minecraft/class_2561;)V 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_33800 addToServer (Lnet/minecraft/class_3222;)V - ARG 1 player METHOD method_40084 (I)Z ARG 0 c METHOD method_40085 isValidName (Ljava/lang/String;)Z ARG 0 name - METHOD method_43510 getVerifiedPublicKey (Lnet/minecraft/class_7428$class_7443;Ljava/util/UUID;Lnet/minecraft/class_7500;Z)Lnet/minecraft/class_7428; - ARG 0 publicKeyData - ARG 1 playerUuid - ARG 2 servicesSignatureVerifier - ARG 3 shouldThrowOnMissingKey + METHOD method_52416 hasPlayerWithId (Lcom/mojang/authlib/GameProfile;)Z + ARG 1 profile + METHOD method_52417 startVerify (Lcom/mojang/authlib/GameProfile;)V + ARG 1 profile + METHOD method_52418 createOfflineProfile (Ljava/lang/String;)Lcom/mojang/authlib/GameProfile; + ARG 0 name + METHOD method_52419 tickVerify (Lcom/mojang/authlib/GameProfile;)V + ARG 1 profile + METHOD method_52420 sendSuccessPacket (Lcom/mojang/authlib/GameProfile;)V + ARG 1 profile 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 2f9c632c81..3175b4ef89 100644 --- a/mappings/net/minecraft/server/network/ServerPlayNetworkHandler.mapping +++ b/mappings/net/minecraft/server/network/ServerPlayNetworkHandler.mapping @@ -8,17 +8,13 @@ CLASS net/minecraft/class_3244 net/minecraft/server/network/ServerPlayNetworkHan FIELD field_14122 updatedRiddenX D FIELD field_14123 requestedTeleportId I FIELD field_14124 lastTickRiddenY D - FIELD field_14125 waitingForKeepAlive Z FIELD field_14126 updatedY D - FIELD field_14127 connection Lnet/minecraft/class_2535; FIELD field_14128 lastTickZ D FIELD field_14129 vehicleFloating Z FIELD field_14130 lastTickX D FIELD field_14131 floating Z FIELD field_14133 creativeItemDropThreshold I - FIELD field_14134 keepAliveId J FIELD field_14135 lastTickMovePacketsCount I - FIELD field_14136 lastKeepAliveTime J FIELD field_14137 vehicleFloatingTicks I FIELD field_14138 floatingTicks I FIELD field_14139 teleportRequestTick I @@ -30,22 +26,24 @@ CLASS net/minecraft/class_3244 net/minecraft/server/network/ServerPlayNetworkHan FIELD field_14145 updatedX D FIELD field_14146 lastTickY D FIELD field_14147 topmostRiddenEntity Lnet/minecraft/class_1297; - FIELD field_14148 server Lnet/minecraft/server/MinecraftServer; - FIELD field_29778 KEEP_ALIVE_INTERVAL I FIELD field_37280 MAX_BREAK_SQUARED_DISTANCE D FIELD field_37281 DEFAULT_SEQUENCE I FIELD field_37282 sequence I - FIELD field_39261 previewTaskRunner Lnet/minecraft/class_7493; FIELD field_39394 lastMessageTimestamp Ljava/util/concurrent/atomic/AtomicReference; FIELD field_39805 messageUnpacker Lnet/minecraft/class_7610$class_7611; FIELD field_39825 acknowledgmentValidator Lnet/minecraft/class_7638; FIELD field_39826 messageChainTaskQueue Lnet/minecraft/class_7619; - FIELD field_39827 MAX_PENDING_ACKNOWLEDGMENTS I - FIELD field_39899 cachedDecoratorResult Lnet/minecraft/class_7642; - METHOD (Lnet/minecraft/server/MinecraftServer;Lnet/minecraft/class_2535;Lnet/minecraft/class_3222;)V + FIELD field_39987 signatureStorage Lnet/minecraft/class_7561; + FIELD field_39989 MAX_PENDING_ACKNOWLEDGMENTS I + FIELD field_39990 CHAT_VALIDATION_FAILED_TEXT Lnet/minecraft/class_2561; + FIELD field_40720 session Lnet/minecraft/class_7822; + FIELD field_45025 requestedReconfiguration Z + FIELD field_45026 chunkDataSender Lnet/minecraft/class_8608; + METHOD (Lnet/minecraft/server/MinecraftServer;Lnet/minecraft/class_2535;Lnet/minecraft/class_3222;I)V ARG 1 server ARG 2 connection ARG 3 player + ARG 4 latency METHOD method_14360 requestTeleport (DDDFFLjava/util/Set;)V ARG 1 x ARG 3 y @@ -61,11 +59,6 @@ CLASS net/minecraft/class_3244 net/minecraft/server/network/ServerPlayNetworkHan ARG 8 pitch METHOD method_14365 (Lnet/minecraft/class_2805;Lcom/mojang/brigadier/suggestion/Suggestions;)V ARG 2 suggestions - METHOD method_14367 disconnect (Lnet/minecraft/class_2561;)V - ARG 1 reason - METHOD method_14369 sendPacket (Lnet/minecraft/class_2596;Lnet/minecraft/class_7648;)V - ARG 1 packet - ARG 2 callbacks METHOD method_14371 isMovementInvalid (DDDFF)Z COMMENT {@return whether this movement is invalid} COMMENT @@ -79,12 +72,12 @@ CLASS net/minecraft/class_3244 net/minecraft/server/network/ServerPlayNetworkHan ARG 6 yaw ARG 7 pitch METHOD method_14372 syncWithPlayerPosition ()V - METHOD method_17820 (Lnet/minecraft/class_2840;Lnet/minecraft/class_1860;)V - ARG 2 recipe - METHOD method_19507 isHost ()Z - METHOD method_20630 isPlayerNotCollidingWithBlocks (Lnet/minecraft/class_4538;Lnet/minecraft/class_238;)Z + METHOD method_20630 isPlayerNotCollidingWithBlocks (Lnet/minecraft/class_4538;Lnet/minecraft/class_238;DDD)Z ARG 1 world ARG 2 box + ARG 3 newX + ARG 5 newY + ARG 7 newZ 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 @@ -118,20 +111,6 @@ CLASS net/minecraft/class_3244 net/minecraft/server/network/ServerPlayNetworkHan ARG 1 filtered METHOD method_31285 (Lnet/minecraft/class_2877;Ljava/util/List;)V ARG 2 texts - METHOD method_33562 requestTeleportAndDismount (DDDFF)V - ARG 1 x - ARG 3 y - ARG 5 z - ARG 7 yaw - ARG 8 pitch - METHOD method_33563 requestTeleport (DDDFFLjava/util/Set;Z)V - ARG 1 x - ARG 3 y - ARG 5 z - ARG 7 yaw - ARG 8 pitch - ARG 9 flags - ARG 10 shouldDismount METHOD method_33796 setTextToBook (Ljava/util/List;Ljava/util/function/UnaryOperator;Lnet/minecraft/class_1799;)V ARG 1 messages ARG 2 postProcessor @@ -152,91 +131,60 @@ CLASS net/minecraft/class_3244 net/minecraft/server/network/ServerPlayNetworkHan COMMENT @see net.minecraft.SharedConstants#isValidChar(char) ARG 0 message METHOD method_43669 checkForSpam ()V - METHOD method_44154 (ILnet/minecraft/class_2561;)V - ARG 2 decorated METHOD method_44155 handleDecoratedMessage (Lnet/minecraft/class_7471;)V ARG 1 message - METHOD method_44156 decorateCommand (Lnet/minecraft/class_2168;Lnet/minecraft/class_7644;)Ljava/util/concurrent/CompletableFuture; - ARG 1 source - ARG 2 arguments - METHOD method_44158 (Lnet/minecraft/class_2561;Lnet/minecraft/class_2561;)Lnet/minecraft/class_2561; - ARG 1 decorated - METHOD method_44159 decorate (Ljava/lang/String;)Ljava/util/concurrent/CompletableFuture; - ARG 1 query METHOD method_44160 isInProperOrder (Ljava/time/Instant;)Z COMMENT {@return whether the message sent at {@code timestamp} is received in proper order} COMMENT COMMENT

    If {@code false}, the message will be discarded. ARG 1 timestamp - METHOD method_44161 decorateChat (Ljava/lang/String;)Ljava/util/concurrent/CompletableFuture; - ARG 1 query - METHOD method_44162 decorateCommand (Ljava/lang/String;)Ljava/util/concurrent/CompletableFuture; - ARG 1 query - METHOD method_44318 sendChatPreviewPacket (ILnet/minecraft/class_2561;)V - ARG 1 queryId - ARG 2 preview - METHOD method_44337 canAcceptMessage (Ljava/lang/String;Ljava/time/Instant;Lnet/minecraft/class_7635$class_7636;)Z - COMMENT {@return whether {@code message}, sent at {@code timestamp}, should be accepted} - COMMENT - COMMENT

    This returns {@code false} if the message arrives in {@linkplain - COMMENT #isInProperOrder improper order}, if chat is disabled, or if {@linkplain - COMMENT AcknowledgmentValidator#validate acknowledgment validation fails}. - COMMENT Note that the signatures are verified in {@link #canAcceptMessage(SignedMessage)}. + METHOD method_44337 validateMessage (Ljava/lang/String;Ljava/time/Instant;Lnet/minecraft/class_7635$class_7636;)Ljava/util/Optional; + COMMENT {@return the validated acknowledgment if the message is valid, or an empty optional + COMMENT if it is not} COMMENT - COMMENT @see #canAcceptMessage(SignedMessage) + COMMENT

    This disconnects the player if the message arrives in {@linkplain + COMMENT #isInProperOrder improper order} or if chat is disabled. ARG 1 message ARG 2 timestamp ARG 3 acknowledgment - METHOD method_44790 getMessageUnpacker ()Lnet/minecraft/class_7610$class_7611; - METHOD method_44895 handleAcknowledgmentFailure (Ljava/util/Set;)V - ARG 1 reasons METHOD method_44897 addPendingAcknowledgment (Lnet/minecraft/class_7471;)V ARG 1 message - METHOD method_44902 shouldPreviewChat ()Z - COMMENT {@return whether to handle chat preview requests} - COMMENT - COMMENT

    Dedicated servers can configure chat preview in {@code server.properties} file. - COMMENT Chat preview is always enabled for integrated servers. - COMMENT - COMMENT @see MinecraftServer#shouldPreviewChat METHOD method_45002 (Lnet/minecraft/class_7448;Lnet/minecraft/class_2168;)Lnet/minecraft/class_2168; ARG 1 source METHOD method_45003 parse (Ljava/lang/String;)Lcom/mojang/brigadier/ParseResults; COMMENT {@return the result of parsing {@code command}} ARG 1 command COMMENT the command to parse (without the leading slash) - METHOD method_45004 (Ljava/lang/String;Lnet/minecraft/class_2561;)V - ARG 2 decorated - METHOD method_45006 collectArgumentMessages (Lnet/minecraft/class_7472;Lnet/minecraft/class_7644;)Ljava/util/Map; + METHOD method_45006 collectArgumentMessages (Lnet/minecraft/class_7472;Lnet/minecraft/class_7644;Lnet/minecraft/class_7635;)Ljava/util/Map; COMMENT {@return a map of argument name and value as signed messages} ARG 1 packet ARG 2 arguments - METHOD method_45008 (Ljava/lang/String;Lnet/minecraft/class_2561;)V - ARG 2 decorated - METHOD method_45009 canAcceptMessage (Lnet/minecraft/class_7471;)Z - COMMENT {@return whether {@code message} can be accepted} - COMMENT - COMMENT

    This verifies the message's signature and disconnects the client if it cannot - COMMENT be verified. Additionally, this logs a warning (without disconnection or - COMMENT rejection of messages) for expired messages. - COMMENT - COMMENT @see #canAcceptMessage(String, Instant, LastSeenMessageList.Acknowledgment) - ARG 1 message - METHOD method_45010 handleCommandExecution (Lnet/minecraft/class_7472;)V - ARG 1 packet - METHOD method_45011 getSignedMessage (Lnet/minecraft/class_2797;)Lnet/minecraft/class_7471; + ARG 3 lastSeenMessages + METHOD method_45010 handleCommandExecution (Lnet/minecraft/class_7472;Lnet/minecraft/class_7635;)V ARG 1 packet - METHOD method_45013 getDecoratedContents (Lnet/minecraft/class_2797;)Lnet/minecraft/class_7634; - COMMENT {@return the decorated contents for {@code packet}} - COMMENT - COMMENT @implNote This returns the {@linkplain CachedDecoratorResult#tryConsume consumed - COMMENT cached result} if it exists, and otherwise returns a new {@link DecoratedContents} - COMMENT without message decorators applied. This method does not execute message decorators; - COMMENT they are executed in {@link #onRequestChatPreview} (for previewed messages) or {@link - COMMENT #onChatMessage} (for unpreviewed messages). + ARG 2 lastSeenMessages + METHOD method_45011 getSignedMessage (Lnet/minecraft/class_2797;Lnet/minecraft/class_7635;)Lnet/minecraft/class_7471; ARG 1 packet - METHOD method_45064 (Ljava/util/concurrent/CompletableFuture;Ljava/util/concurrent/CompletableFuture;Ljava/lang/Void;)V - ARG 3 void_ + ARG 2 lastSeenMessages + METHOD method_45167 (Ljava/util/concurrent/CompletableFuture;Lnet/minecraft/class_7471;Lnet/minecraft/class_2561;Ljava/util/concurrent/Executor;)Ljava/util/concurrent/CompletableFuture; + ARG 4 executor + METHOD method_45168 sendProfilelessChatMessage (Lnet/minecraft/class_2561;Lnet/minecraft/class_2556$class_7602;)V + ARG 1 message + ARG 2 params + METHOD method_45169 validateAcknowledgment (Lnet/minecraft/class_7635$class_7636;)Ljava/util/Optional; + ARG 1 acknowledgment + METHOD method_45170 sendChatMessage (Lnet/minecraft/class_7471;Lnet/minecraft/class_2556$class_7602;)V + ARG 1 message + ARG 2 params + METHOD method_45171 handleMessageChainException (Lnet/minecraft/class_7610$class_7825;)V + ARG 1 exception + METHOD method_46365 setSession (Lnet/minecraft/class_7822;)V + ARG 1 session + METHOD method_46366 (Lnet/minecraft/class_7822;Ljava/util/concurrent/Executor;)Ljava/util/concurrent/CompletableFuture; + ARG 2 executor + METHOD method_48107 getConnectionAddress ()Ljava/net/SocketAddress; + METHOD method_52414 reconfigure ()V + METHOD method_52415 cleanUp ()V CLASS 1 METHOD method_33897 processInteract (Lnet/minecraft/class_1268;Lnet/minecraft/class_3244$class_5860;)V ARG 1 hand @@ -244,7 +192,7 @@ CLASS net/minecraft/class_3244 net/minecraft/server/network/ServerPlayNetworkHan METHOD method_33898 (Lnet/minecraft/class_243;Lnet/minecraft/class_3222;Lnet/minecraft/class_1297;Lnet/minecraft/class_1268;)Lnet/minecraft/class_1269; ARG 1 player ARG 2 entity - ARG 3 hand + ARG 3 handx CLASS class_5860 Interaction METHOD run (Lnet/minecraft/class_3222;Lnet/minecraft/class_1297;Lnet/minecraft/class_1268;)Lnet/minecraft/class_1269; ARG 1 player diff --git a/mappings/net/minecraft/server/network/ServerPlayerConfigurationTask.mapping b/mappings/net/minecraft/server/network/ServerPlayerConfigurationTask.mapping new file mode 100644 index 0000000000..be1cfd6554 --- /dev/null +++ b/mappings/net/minecraft/server/network/ServerPlayerConfigurationTask.mapping @@ -0,0 +1,5 @@ +CLASS net/minecraft/class_8605 net/minecraft/server/network/ServerPlayerConfigurationTask + METHOD method_52375 getKey ()Lnet/minecraft/class_8605$class_8606; + METHOD method_52376 sendPacket (Ljava/util/function/Consumer;)V + ARG 1 sender + CLASS class_8606 Key diff --git a/mappings/net/minecraft/server/network/ServerPlayerEntity.mapping b/mappings/net/minecraft/server/network/ServerPlayerEntity.mapping index 4245158897..18f921158a 100644 --- a/mappings/net/minecraft/server/network/ServerPlayerEntity.mapping +++ b/mappings/net/minecraft/server/network/ServerPlayerEntity.mapping @@ -3,7 +3,6 @@ CLASS net/minecraft/class_3222 net/minecraft/server/network/ServerPlayerEntity FIELD field_13964 disconnected Z FIELD field_13965 lastLevelScore I FIELD field_13966 statHandler Lnet/minecraft/class_3442; - FIELD field_13967 pingMilliseconds I FIELD field_13968 lastAirScore I FIELD field_13969 seenCredits Z FIELD field_13970 advancementTracker Lnet/minecraft/class_2985; @@ -48,21 +47,23 @@ CLASS net/minecraft/class_3222 net/minecraft/server/network/ServerPlayerEntity FIELD field_35007 fallStartPos Lnet/minecraft/class_243; FIELD field_35008 vehicleInLavaRidingPos Lnet/minecraft/class_243; FIELD field_35566 allowServerListing Z - METHOD (Lnet/minecraft/server/MinecraftServer;Lnet/minecraft/class_3218;Lcom/mojang/authlib/GameProfile;Lnet/minecraft/class_7428;)V + FIELD field_39985 sculkShriekerWarningManager Lnet/minecraft/class_7262; + FIELD field_39986 session Lnet/minecraft/class_7822; + FIELD field_44990 viewDistance Ljava/util/OptionalInt; + FIELD field_44991 chunkFilter Lnet/minecraft/class_8603; + METHOD (Lnet/minecraft/server/MinecraftServer;Lnet/minecraft/class_3218;Lcom/mojang/authlib/GameProfile;)V ARG 1 server ARG 2 world ARG 3 profile - ARG 4 publicKey METHOD method_14203 copyFrom (Lnet/minecraft/class_3222;Z)V ARG 1 oldPlayer ARG 2 alive - METHOD method_14205 sendChunkPacket (Lnet/minecraft/class_1923;Lnet/minecraft/class_2596;)V - ARG 1 chunkPos - ARG 2 chunkDataPacket METHOD method_14206 getPlayerListName ()Lnet/minecraft/class_2561; - METHOD method_14207 handleFall (DZ)V - ARG 1 heightDifference - ARG 3 onGround + METHOD method_14207 handleFall (DDDZ)V + ARG 1 xDifference + ARG 3 yDifference + ARG 5 zDifference + ARG 7 onGround METHOD method_14208 isInTeleportationState ()Z METHOD method_14209 getIp ()Ljava/lang/String; METHOD method_14210 (Lnet/minecraft/class_2561;Lnet/minecraft/class_2583;)Lnet/minecraft/class_2583; @@ -118,14 +119,9 @@ CLASS net/minecraft/class_3222 net/minecraft/server/network/ServerPlayerEntity ARG 1 horizontalSpawnArea 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}. METHOD method_14248 getStatHandler ()Lnet/minecraft/class_3442; METHOD method_14250 (ILnet/minecraft/class_267;)V - ARG 1 score + ARG 1 innerScore METHOD method_14251 teleport (Lnet/minecraft/class_3218;DDDFF)V ARG 1 targetWorld ARG 2 x @@ -136,11 +132,6 @@ CLASS net/minecraft/class_3222 net/minecraft/server/network/ServerPlayerEntity METHOD method_14252 setExperienceLevel (I)V ARG 1 level METHOD method_14253 getRecipeBook ()Lnet/minecraft/class_3441; - METHOD method_14255 sendResourcePackUrl (Ljava/lang/String;Ljava/lang/String;ZLnet/minecraft/class_2561;)V - ARG 1 url - ARG 2 hash - ARG 3 required - ARG 4 resourcePackPrompt 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. @@ -156,6 +147,8 @@ CLASS net/minecraft/class_3222 net/minecraft/server/network/ServerPlayerEntity METHOD method_26280 getSpawnPointPosition ()Lnet/minecraft/class_2338; METHOD method_26281 getSpawnPointDimension ()Lnet/minecraft/class_5321; METHOD method_26282 isSpawnForced ()Z + METHOD method_26283 (Lnet/minecraft/class_1588;)Z + ARG 1 entity METHOD method_26284 setSpawnPoint (Lnet/minecraft/class_5321;Lnet/minecraft/class_2338;FZZ)V COMMENT Sets the player's spawn point. ARG 1 dimension @@ -175,6 +168,8 @@ CLASS net/minecraft/class_3222 net/minecraft/server/network/ServerPlayerEntity ARG 2 direction METHOD method_26287 isBedTooFarAway (Lnet/minecraft/class_2338;)Z ARG 1 pos + METHOD method_29205 (Lnet/minecraft/class_2487;Lnet/minecraft/class_2520;)V + ARG 1 encoded METHOD method_29777 (Lnet/minecraft/class_1308;)V ARG 1 entity METHOD method_29778 (Lnet/minecraft/class_1308;)Z @@ -196,13 +191,10 @@ CLASS net/minecraft/class_3222 net/minecraft/server/network/ServerPlayerEntity COMMENT COMMENT @see MinecraftServer#getForcedGameMode ARG 1 backupGameMode - METHOD method_32747 setWorld (Lnet/minecraft/class_3218;)V - ARG 1 world METHOD method_32748 setGameMode (Lnet/minecraft/class_2487;)V ARG 1 nbt METHOD method_32749 writeGameModeNbt (Lnet/minecraft/class_2487;)V ARG 1 nbt - METHOD method_33793 shouldFilterText ()Z METHOD method_33795 shouldFilterMessagesSentTo (Lnet/minecraft/class_3222;)Z ARG 1 player METHOD method_34225 onSpawn ()V @@ -236,15 +228,22 @@ CLASS net/minecraft/class_3222 net/minecraft/server/network/ServerPlayerEntity METHOD method_44706 acceptsChatMessage ()Z METHOD method_44707 acceptsMessage (Z)Z ARG 1 overlay - METHOD method_44786 sendMessageHeader (Lnet/minecraft/class_7614;Lnet/minecraft/class_7469;[B)V - COMMENT Sends a message's header and other data required for verification to this player. - COMMENT - COMMENT

    This is used to keep the integrity of the "message chain" when a message is censored - COMMENT or when the message is originally sent without metadata due to it being originated from - COMMENT entities. - ARG 1 header - ARG 2 headerSignature - ARG 3 bodyDigest + METHOD method_45163 getSession ()Lnet/minecraft/class_7822; + METHOD method_45164 (Lnet/minecraft/class_7262;)V + ARG 1 sculkShriekerWarningManager + METHOD method_45165 (Lnet/minecraft/class_2487;Lnet/minecraft/class_2520;)V + ARG 1 encoded + METHOD method_46364 setSession (Lnet/minecraft/class_7822;)V + ARG 1 session + METHOD method_51468 setServerWorld (Lnet/minecraft/class_3218;)V + ARG 1 world + METHOD method_51469 getServerWorld ()Lnet/minecraft/class_3218; + METHOD method_52371 getViewDistance ()Ljava/util/OptionalInt; + METHOD method_52372 getChunkFilter ()Lnet/minecraft/class_8603; + METHOD method_52373 setChunkFilter (Lnet/minecraft/class_8603;)V + ARG 1 chunkFilter + METHOD method_52374 createCommonPlayerSpawnInfo (Lnet/minecraft/class_3218;)Lnet/minecraft/class_8589; + ARG 1 world METHOD method_7336 changeGameMode (Lnet/minecraft/class_1934;)Z ARG 1 gameMode CLASS 1 diff --git a/mappings/net/minecraft/server/network/ServerQueryNetworkHandler.mapping b/mappings/net/minecraft/server/network/ServerQueryNetworkHandler.mapping index 073c0bd96c..9ecad4d5b5 100644 --- a/mappings/net/minecraft/server/network/ServerQueryNetworkHandler.mapping +++ b/mappings/net/minecraft/server/network/ServerQueryNetworkHandler.mapping @@ -2,7 +2,7 @@ CLASS net/minecraft/class_3251 net/minecraft/server/network/ServerQueryNetworkHa FIELD field_14177 responseSent Z FIELD field_14178 connection Lnet/minecraft/class_2535; FIELD field_14179 REQUEST_HANDLED Lnet/minecraft/class_2561; - FIELD field_14180 server Lnet/minecraft/server/MinecraftServer; - METHOD (Lnet/minecraft/server/MinecraftServer;Lnet/minecraft/class_2535;)V - ARG 1 server + FIELD field_42544 metadata Lnet/minecraft/class_2926; + METHOD (Lnet/minecraft/class_2926;Lnet/minecraft/class_2535;)V + ARG 1 metadata ARG 2 connection diff --git a/mappings/net/minecraft/server/rcon/QueryResponseHandler.mapping b/mappings/net/minecraft/server/rcon/QueryResponseHandler.mapping index bc791f9bc6..d0f4bd9e46 100644 --- a/mappings/net/minecraft/server/rcon/QueryResponseHandler.mapping +++ b/mappings/net/minecraft/server/rcon/QueryResponseHandler.mapping @@ -12,6 +12,7 @@ CLASS net/minecraft/class_3364 net/minecraft/server/rcon/QueryResponseHandler FIELD field_14454 hostname Ljava/lang/String; FIELD field_14456 maxPlayerCount I FIELD field_14457 port I + FIELD field_23963 LOGGER Lorg/slf4j/Logger; FIELD field_23964 server Lnet/minecraft/class_2994; FIELD field_29795 GAME_TYPE Ljava/lang/String; FIELD field_29796 GAME_ID Ljava/lang/String; diff --git a/mappings/net/minecraft/server/world/ChunkHolder.mapping b/mappings/net/minecraft/server/world/ChunkHolder.mapping index 5c4685ae07..2b4d888e89 100644 --- a/mappings/net/minecraft/server/world/ChunkHolder.mapping +++ b/mappings/net/minecraft/server/world/ChunkHolder.mapping @@ -6,7 +6,6 @@ CLASS net/minecraft/class_3193 net/minecraft/server/world/ChunkHolder FIELD field_13868 CHUNK_STATUSES Ljava/util/List; FIELD field_13870 skyLightUpdateBits Ljava/util/BitSet; FIELD field_13871 blockLightUpdateBits Ljava/util/BitSet; - FIELD field_13873 LEVEL_TYPES [Lnet/minecraft/class_3193$class_3194; FIELD field_16425 futuresByStatus Ljava/util/concurrent/atomic/AtomicReferenceArray; FIELD field_16426 UNLOADED_CHUNK Lcom/mojang/datafixers/util/Either; FIELD field_16427 UNLOADED_WORLD_CHUNK Lcom/mojang/datafixers/util/Either; @@ -27,23 +26,23 @@ CLASS net/minecraft/class_3193 net/minecraft/server/world/ChunkHolder COMMENT by {@link #markForBlockUpdate}, grouped by their vertical chunk section. COMMENT

    COMMENT Entries for a section are null if the section has no positions marked for update. - FIELD field_26744 noLightingUpdates Z FIELD field_26929 world Lnet/minecraft/class_5539; FIELD field_28806 actionStack Lnet/minecraft/class_5831; METHOD (Lnet/minecraft/class_1923;ILnet/minecraft/class_5539;Lnet/minecraft/class_3568;Lnet/minecraft/class_3193$class_3896;Lnet/minecraft/class_3193$class_3897;)V - ARG 1 pos ARG 2 level ARG 3 world ARG 4 lightingProvider ARG 5 levelUpdateListener ARG 6 playersWatchingChunkProvider - METHOD method_13992 sendPacketToPlayersWatching (Lnet/minecraft/class_2596;Z)V - ARG 1 packet - ARG 2 onlyOnWatchDistanceEdge + METHOD method_13992 sendPacketToPlayers (Ljava/util/List;Lnet/minecraft/class_2596;)V + ARG 1 players + ARG 2 packet METHOD method_13993 getChunkAt (Lnet/minecraft/class_2806;Lnet/minecraft/class_3898;)Ljava/util/concurrent/CompletableFuture; ARG 1 targetStatus ARG 2 chunkStorage METHOD method_13994 getPos ()Lnet/minecraft/class_1923; + METHOD method_13996 (Lnet/minecraft/class_2596;Lnet/minecraft/class_3222;)V + ARG 1 player METHOD method_14000 getSavingFuture ()Ljava/util/concurrent/CompletableFuture; METHOD method_14002 markForBlockUpdate (Lnet/minecraft/class_2338;)V ARG 1 pos @@ -51,16 +50,15 @@ CLASS net/minecraft/class_3193 net/minecraft/server/world/ChunkHolder METHOD method_14005 getLevel ()I METHOD method_14006 flushUpdates (Lnet/minecraft/class_2818;)V ARG 1 chunk - METHOD method_14007 tick (Lnet/minecraft/class_3898;Ljava/util/concurrent/Executor;)V + METHOD method_14007 updateFutures (Lnet/minecraft/class_3898;Ljava/util/concurrent/Executor;)V + COMMENT Updates {@code Futures} indicating the expected loading state of the underlying chunk of this {@code ChunkHolder}. + COMMENT Note that the method merely makes actual loading process possible, but do not perform these actions. ARG 1 chunkStorage - METHOD method_14008 getLevelType (I)Lnet/minecraft/class_3193$class_3194; - ARG 0 distance - METHOD method_14009 sendBlockEntityUpdatePacket (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;)V - ARG 1 world - ARG 2 pos + METHOD method_14009 sendBlockEntityUpdatePacket (Ljava/util/List;Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;)V + ARG 1 players + ARG 2 world + ARG 3 pos METHOD method_14010 getCurrentChunk ()Lnet/minecraft/class_2791; - METHOD method_14011 getTargetStatusForLevel (I)Lnet/minecraft/class_2806; - ARG 0 level METHOD method_14012 markForLightUpdate (Lnet/minecraft/class_1944;I)V ARG 1 lightType ARG 2 y @@ -85,21 +83,19 @@ CLASS net/minecraft/class_3193 net/minecraft/server/world/ChunkHolder 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 - METHOD method_30312 (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;)V - ARG 2 pos - ARG 3 state + METHOD method_23271 getLevelType ()Lnet/minecraft/class_3194; + METHOD method_30311 tryUpdateBlockEntityAt (Ljava/util/List;Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;)V + ARG 1 players + ARG 2 world + ARG 3 pos + ARG 4 state + METHOD method_30312 (Ljava/util/List;Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;)V + ARG 3 pos + ARG 4 state METHOD method_39967 combineSavingFuture (Ljava/lang/String;Ljava/util/concurrent/CompletableFuture;)V ARG 1 thenDesc ARG 2 then METHOD method_40066 collectFuturesByStatus ()Ljava/util/List; - CLASS class_3194 LevelType - METHOD method_14014 isAfter (Lnet/minecraft/class_3193$class_3194;)Z - ARG 1 levelType CLASS class_3724 Unloaded COMMENT Used to represent a chunk that has not been loaded yet. FIELD field_16433 INSTANCE Lnet/minecraft/class_3193$class_3724; diff --git a/mappings/net/minecraft/server/world/ChunkLevelType.mapping b/mappings/net/minecraft/server/world/ChunkLevelType.mapping new file mode 100644 index 0000000000..ba04ae535c --- /dev/null +++ b/mappings/net/minecraft/server/world/ChunkLevelType.mapping @@ -0,0 +1,3 @@ +CLASS net/minecraft/class_3194 net/minecraft/server/world/ChunkLevelType + METHOD method_14014 isAfter (Lnet/minecraft/class_3194;)Z + ARG 1 levelType diff --git a/mappings/net/minecraft/server/world/ChunkLevels.mapping b/mappings/net/minecraft/server/world/ChunkLevels.mapping new file mode 100644 index 0000000000..07ffece09b --- /dev/null +++ b/mappings/net/minecraft/server/world/ChunkLevels.mapping @@ -0,0 +1,19 @@ +CLASS net/minecraft/class_8563 net/minecraft/server/world/ChunkLevels + FIELD field_44849 INACCESSIBLE I + FIELD field_44850 FULL I + FIELD field_44851 BLOCK_TICKING I + FIELD field_44852 ENTITY_TICKING I + METHOD method_51827 getStatus (I)Lnet/minecraft/class_2806; + ARG 0 level + METHOD method_51828 getLevelFromType (Lnet/minecraft/class_3194;)I + ARG 0 type + METHOD method_51829 getLevelFromStatus (Lnet/minecraft/class_2806;)I + ARG 0 status + METHOD method_51830 getType (I)Lnet/minecraft/class_3194; + ARG 0 level + METHOD method_51831 shouldTickEntities (I)Z + ARG 0 level + METHOD method_51832 shouldTickBlocks (I)Z + ARG 0 level + METHOD method_51833 isAccessible (I)Z + ARG 0 level diff --git a/mappings/net/minecraft/server/world/ChunkTicketManager.mapping b/mappings/net/minecraft/server/world/ChunkTicketManager.mapping index 0ae7c30eae..49827b48ea 100644 --- a/mappings/net/minecraft/server/world/ChunkTicketManager.mapping +++ b/mappings/net/minecraft/server/world/ChunkTicketManager.mapping @@ -1,7 +1,7 @@ CLASS net/minecraft/class_3204 net/minecraft/server/world/ChunkTicketManager FIELD field_13894 age J FIELD field_13895 ticketsByPosition Lit/unimi/dsi/fastutil/longs/Long2ObjectOpenHashMap; - FIELD field_16210 chunkHolders Ljava/util/Set; + FIELD field_16210 chunkHoldersWithPendingUpdates Ljava/util/Set; FIELD field_16211 LOGGER Lorg/slf4j/Logger; FIELD field_17452 NEARBY_PLAYER_TICKET_LEVEL I FIELD field_17453 playersByChunkPos Lit/unimi/dsi/fastutil/longs/Long2ObjectMap; @@ -10,7 +10,7 @@ CLASS net/minecraft/class_3204 net/minecraft/server/world/ChunkTicketManager FIELD field_17456 levelUpdateListener Lnet/minecraft/class_3900; FIELD field_17457 playerTicketThrottler Lnet/minecraft/class_3906; FIELD field_17458 playerTicketThrottlerUnblocker Lnet/minecraft/class_3906; - FIELD field_17459 chunkPositions Lit/unimi/dsi/fastutil/longs/LongSet; + FIELD field_17459 freshPlayerTicketPositions Lit/unimi/dsi/fastutil/longs/LongSet; FIELD field_17460 mainThreadExecutor Ljava/util/concurrent/Executor; FIELD field_18252 distanceFromTicketTracker Lnet/minecraft/class_3204$class_4077; FIELD field_34886 simulationDistanceTracker Lnet/minecraft/class_6609; @@ -52,7 +52,13 @@ CLASS net/minecraft/class_3204 net/minecraft/server/world/ChunkTicketManager ARG 4 holder METHOD method_15891 (Lnet/minecraft/class_3898;Lnet/minecraft/class_3193;)V ARG 2 holder - METHOD method_15892 tick (Lnet/minecraft/class_3898;)Z + METHOD method_15892 update (Lnet/minecraft/class_3898;)Z + COMMENT Update the states related to chunk tickets and chunk loading levels, which mainly involves three kind of updates: + COMMENT

      + COMMENT
    • Add or remove PLAYER tickets when necessary.
      • + COMMENT
    • Update the expected loading states of chunks depending on their new levels.
      • + COMMENT
    • Special updates of chunks with PLAYER tickets added recently.
      • + COMMENT
    ARG 1 chunkStorage METHOD method_17290 addTicketWithLevel (Lnet/minecraft/class_3230;Lnet/minecraft/class_1923;ILjava/lang/Object;)V ARG 1 type @@ -128,5 +134,6 @@ CLASS net/minecraft/class_3204 net/minecraft/server/world/ChunkTicketManager METHOD method_17664 isWithinViewDistance (I)Z ARG 1 distance CLASS class_4077 TicketDistanceLevelPropagator + FIELD field_44854 UNLOADED I METHOD method_18746 update (I)I ARG 1 distance diff --git a/mappings/net/minecraft/server/world/ChunkTicketType.mapping b/mappings/net/minecraft/server/world/ChunkTicketType.mapping index 86450bc6ed..0b50a11c35 100644 --- a/mappings/net/minecraft/server/world/ChunkTicketType.mapping +++ b/mappings/net/minecraft/server/world/ChunkTicketType.mapping @@ -24,6 +24,12 @@ CLASS net/minecraft/class_3230 net/minecraft/server/world/ChunkTicketType ARG 0 name ARG 1 argumentComparator METHOD method_14292 getArgumentComparator ()Ljava/util/Comparator; + METHOD method_17315 (Lnet/minecraft/class_3902;Lnet/minecraft/class_3902;)I + ARG 0 a + ARG 1 b + METHOD method_17316 (Lnet/minecraft/class_3902;Lnet/minecraft/class_3902;)I + ARG 0 a + ARG 1 b METHOD method_20628 create (Ljava/lang/String;Ljava/util/Comparator;I)Lnet/minecraft/class_3230; COMMENT Create a new ticket type that expires after an amount of ticks. ARG 0 name diff --git a/mappings/net/minecraft/server/world/EntityTrackingListener.mapping b/mappings/net/minecraft/server/world/EntityTrackingListener.mapping deleted file mode 100644 index 93c40c1a39..0000000000 --- a/mappings/net/minecraft/server/world/EntityTrackingListener.mapping +++ /dev/null @@ -1,5 +0,0 @@ -CLASS net/minecraft/class_5629 net/minecraft/server/world/EntityTrackingListener - COMMENT A listener to entity tracking within threaded anvil chunk storage. - METHOD method_14364 sendPacket (Lnet/minecraft/class_2596;)V - ARG 1 packet - METHOD method_32311 getPlayer ()Lnet/minecraft/class_3222; diff --git a/mappings/net/minecraft/server/world/PlayerChunkWatchingManager.mapping b/mappings/net/minecraft/server/world/PlayerChunkWatchingManager.mapping index ab91c2b723..cffb039a0e 100644 --- a/mappings/net/minecraft/server/world/PlayerChunkWatchingManager.mapping +++ b/mappings/net/minecraft/server/world/PlayerChunkWatchingManager.mapping @@ -1,17 +1,13 @@ CLASS net/minecraft/class_3210 net/minecraft/server/world/PlayerChunkWatchingManager FIELD field_13910 watchingPlayers Lit/unimi/dsi/fastutil/objects/Object2BooleanMap; - 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/Set; - 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_14083 getPlayersWatchingChunk ()Ljava/util/Set; + METHOD method_14084 remove (Lnet/minecraft/class_3222;)V + ARG 1 player + METHOD method_14085 add (Lnet/minecraft/class_3222;Z)V + ARG 1 player + ARG 2 inactive METHOD method_14086 disableWatch (Lnet/minecraft/class_3222;)V ARG 1 player METHOD method_14087 enableWatch (Lnet/minecraft/class_3222;)V diff --git a/mappings/net/minecraft/server/world/ServerChunkManager.mapping b/mappings/net/minecraft/server/world/ServerChunkManager.mapping index 2d7ca3d488..2c5f4108c9 100644 --- a/mappings/net/minecraft/server/world/ServerChunkManager.mapping +++ b/mappings/net/minecraft/server/world/ServerChunkManager.mapping @@ -50,7 +50,8 @@ CLASS net/minecraft/class_3215 net/minecraft/server/world/ServerChunkManager METHOD method_14161 tickChunks ()V METHOD method_16150 (Lnet/minecraft/class_2791;)Lnet/minecraft/class_2791; ARG 0 chunk - METHOD method_16155 tick ()Z + METHOD method_16155 updateChunks ()Z + COMMENT Update expected chunk loading states by updating {@code PLAYER} tickets and {@code Future}s. METHOD method_16173 (ZLnet/minecraft/class_3193$class_3724;)Lnet/minecraft/class_2791; ARG 1 unloaded METHOD method_17297 addTicket (Lnet/minecraft/class_3230;Lnet/minecraft/class_1923;ILjava/lang/Object;)V @@ -114,6 +115,7 @@ CLASS net/minecraft/class_3215 net/minecraft/server/world/ServerChunkManager METHOD method_39777 getChunkIoWorker ()Lnet/minecraft/class_6830; METHOD method_39997 removePersistentTickets ()V METHOD method_41248 getNoiseConfig ()Lnet/minecraft/class_7138; + METHOD method_46642 getStructurePlacementCalculator ()Lnet/minecraft/class_7869; CLASS class_4212 MainThreadExecutor METHOD (Lnet/minecraft/class_3215;Lnet/minecraft/class_1937;)V ARG 2 world diff --git a/mappings/net/minecraft/server/world/ServerEntityManager.mapping b/mappings/net/minecraft/server/world/ServerEntityManager.mapping index 3b6a1b8316..25f220213b 100644 --- a/mappings/net/minecraft/server/world/ServerEntityManager.mapping +++ b/mappings/net/minecraft/server/world/ServerEntityManager.mapping @@ -36,7 +36,7 @@ CLASS net/minecraft/class_5579 net/minecraft/server/world/ServerEntityManager ARG 2 chunkPos METHOD method_31814 (Lnet/minecraft/class_4456;Lnet/minecraft/class_5579$class_5581;J)V ARG 3 sectionPos - METHOD method_31815 updateTrackingStatus (Lnet/minecraft/class_1923;Lnet/minecraft/class_3193$class_3194;)V + METHOD method_31815 updateTrackingStatus (Lnet/minecraft/class_1923;Lnet/minecraft/class_3194;)V COMMENT Updates the tracking status of tracking sections in a chunk at {@code COMMENT chunkPos} given the {@code levelType}. COMMENT diff --git a/mappings/net/minecraft/server/world/ServerLightingProvider.mapping b/mappings/net/minecraft/server/world/ServerLightingProvider.mapping index 78b9fc3323..a4a98b5d10 100644 --- a/mappings/net/minecraft/server/world/ServerLightingProvider.mapping +++ b/mappings/net/minecraft/server/world/ServerLightingProvider.mapping @@ -12,12 +12,10 @@ CLASS net/minecraft/class_3227 net/minecraft/server/world/ServerLightingProvider ARG 3 hasBlockLight ARG 4 processor ARG 5 executor - METHOD method_14275 (Lnet/minecraft/class_2791;Lnet/minecraft/class_2338;)V - ARG 2 pos METHOD method_14277 runTasks ()V METHOD method_17303 tick ()V - METHOD method_17304 setTaskBatchSize (I)V - ARG 1 taskBatchSize + METHOD method_17306 (Lnet/minecraft/class_1923;Ljava/lang/Runnable;)V + ARG 2 task METHOD method_17307 enqueue (IILjava/util/function/IntSupplier;Lnet/minecraft/class_3227$class_3901;Ljava/lang/Runnable;)V ARG 1 x ARG 2 z @@ -34,8 +32,8 @@ CLASS net/minecraft/class_3227 net/minecraft/server/world/ServerLightingProvider ARG 2 excludeBlocks METHOD method_20386 updateChunkStatus (Lnet/minecraft/class_1923;)V ARG 1 pos - METHOD method_41252 retainData (Lnet/minecraft/class_2791;)Ljava/util/concurrent/CompletableFuture; + METHOD method_51285 initializeLight (Lnet/minecraft/class_2791;Z)Ljava/util/concurrent/CompletableFuture; ARG 1 chunk - METHOD method_41254 (Lnet/minecraft/class_1923;Ljava/lang/Runnable;)V + METHOD method_51287 (Lnet/minecraft/class_1923;Ljava/lang/Runnable;)V ARG 2 task CLASS class_3901 Stage diff --git a/mappings/net/minecraft/server/world/ServerWorld.mapping b/mappings/net/minecraft/server/world/ServerWorld.mapping index c9259396ce..bb3f39ea72 100644 --- a/mappings/net/minecraft/server/world/ServerWorld.mapping +++ b/mappings/net/minecraft/server/world/ServerWorld.mapping @@ -29,8 +29,13 @@ CLASS net/minecraft/class_3218 net/minecraft/server/world/ServerWorld FIELD field_35565 blockEventQueue Ljava/util/List; FIELD field_36208 structureLocator Lnet/minecraft/class_6832; FIELD field_36317 duringListenerUpdate Z - FIELD field_39095 queuedEvents Ljava/util/List; - METHOD (Lnet/minecraft/server/MinecraftServer;Ljava/util/concurrent/Executor;Lnet/minecraft/class_32$class_5143;Lnet/minecraft/class_5268;Lnet/minecraft/class_5321;Lnet/minecraft/class_5363;Lnet/minecraft/class_3949;ZJLjava/util/List;Z)V + FIELD field_39984 gameEventDispatchManager Lnet/minecraft/class_7719; + FIELD field_41748 CLEAR_THUNDER_WEATHER_DURATION_PROVIDER Lnet/minecraft/class_6017; + FIELD field_41749 CLEAR_WEATHER_DURATION_PROVIDER Lnet/minecraft/class_6017; + FIELD field_41750 RAIN_WEATHER_DURATION_PROVIDER Lnet/minecraft/class_6017; + FIELD field_41751 THUNDER_WEATHER_DURATION_PROVIDER Lnet/minecraft/class_6017; + FIELD field_44857 randomSequences Lnet/minecraft/class_8565; + METHOD (Lnet/minecraft/server/MinecraftServer;Ljava/util/concurrent/Executor;Lnet/minecraft/class_32$class_5143;Lnet/minecraft/class_5268;Lnet/minecraft/class_5321;Lnet/minecraft/class_5363;Lnet/minecraft/class_3949;ZJLjava/util/List;ZLnet/minecraft/class_8565;)V ARG 1 server ARG 2 workerExecutor ARG 3 session @@ -42,6 +47,7 @@ CLASS net/minecraft/class_3218 net/minecraft/server/world/ServerWorld ARG 9 seed ARG 11 spawners ARG 12 shouldTickTime + ARG 13 randomSequencesState METHOD method_14166 spawnParticles (Lnet/minecraft/class_3222;Lnet/minecraft/class_2394;ZDDDIDDDD)Z COMMENT Spawns a particle visible to {@code viewer}, if the viewer is near the provided COMMENT coordinates. @@ -227,6 +233,10 @@ CLASS net/minecraft/class_3218 net/minecraft/server/world/ServerWorld METHOD method_19503 hasRaidAt (Lnet/minecraft/class_2338;)Z COMMENT {@return {@code true} if a raid exists within 96 block radius of {@code pos}} ARG 1 pos + METHOD method_19535 (Lnet/minecraft/class_2338;Lnet/minecraft/class_6880;)V + ARG 2 newPoiType + METHOD method_19536 (Lnet/minecraft/class_2338;Lnet/minecraft/class_6880;)V + ARG 2 oldPoiType METHOD method_20588 isNearOccupiedPointOfInterest (Lnet/minecraft/class_4076;)Z ARG 1 sectionPos METHOD method_21624 dumpEntities (Ljava/io/Writer;Ljava/lang/Iterable;)V @@ -302,8 +312,8 @@ CLASS net/minecraft/class_3218 net/minecraft/server/world/ServerWorld ARG 1 pos METHOD method_31420 (Lnet/minecraft/class_3695;Lnet/minecraft/class_1297;)V ARG 2 entity - METHOD method_31422 (Ljava/util/function/Predicate;Ljava/util/List;Lnet/minecraft/class_1297;)V - ARG 2 entity + METHOD method_31421 (Lnet/minecraft/class_6880;)Z + ARG 0 poiType METHOD method_31423 loadEntities (Ljava/util/stream/Stream;)V ARG 1 entities METHOD method_31424 getDragonPart (I)Lnet/minecraft/class_1297; @@ -312,17 +322,17 @@ CLASS net/minecraft/class_3218 net/minecraft/server/world/ServerWorld ARG 1 entities METHOD method_31430 shouldCancelSpawn (Lnet/minecraft/class_1297;)Z ARG 1 entity - METHOD method_32310 (Lnet/minecraft/class_2487;)Lnet/minecraft/class_3767; - ARG 1 nbt + METHOD method_31431 (Lnet/minecraft/class_1297;)Ljava/lang/String; + ARG 0 entity METHOD method_32819 getLogicalHeight ()I METHOD method_33143 sendSleepingStatus ()V COMMENT Sends sleeping status action bar messages to players in this world. METHOD method_33144 isSleepingEnabled ()Z COMMENT {@return whether sleeping can cause the night to skip} METHOD method_34679 (Lnet/minecraft/class_2338;)Lnet/minecraft/class_2338; - ARG 0 pos + ARG 0 innerPos METHOD method_34680 (Lnet/minecraft/class_2338;)Z - ARG 1 pos + ARG 1 innerPos METHOD method_37116 isChunkLoaded (J)Z COMMENT {@return {@code true} if the chunk {@code chunkPos} is loaded} ARG 1 chunkPos @@ -346,12 +356,33 @@ CLASS net/minecraft/class_3218 net/minecraft/server/world/ServerWorld ARG 3 radius ARG 4 horizontalBlockCheckInterval ARG 5 verticalBlockCheckInterval - METHOD method_43663 processEvents (Ljava/util/List;)V - ARG 1 events - METHOD method_43664 (Ljava/util/List;Lnet/minecraft/class_5712;Lnet/minecraft/class_243;Lnet/minecraft/class_5712$class_7397;Lnet/minecraft/class_5714;Lnet/minecraft/class_243;)V - ARG 5 listener - ARG 6 listenerPos - METHOD method_43665 processEventQueue ()V + METHOD method_47538 collectEntitiesByType (Lnet/minecraft/class_5575;Ljava/util/function/Predicate;Ljava/util/List;)V + ARG 1 filter + ARG 2 predicate + ARG 3 result + METHOD method_47539 collectEntitiesByType (Lnet/minecraft/class_5575;Ljava/util/function/Predicate;Ljava/util/List;I)V + COMMENT Collects entities of the given type, up to {@code limit}. Using this can improve + COMMENT performance, especially if {@code limit} is small. + COMMENT + COMMENT @see #getEntitiesByType + ARG 1 filter + ARG 2 predicate + ARG 3 result + ARG 4 limit + METHOD method_47540 getPlayers (Ljava/util/function/Predicate;I)Ljava/util/List; + COMMENT {@return the list of players filtered using {@code predicate}, up to {@code limit}} + ARG 1 predicate + ARG 2 limit + METHOD method_47541 (Ljava/util/function/Predicate;Ljava/util/List;ILnet/minecraft/class_1297;)Lnet/minecraft/class_7927$class_7928; + ARG 3 entity + METHOD method_51836 getOrCreateRandom (Lnet/minecraft/class_2960;)Lnet/minecraft/class_5819; + ARG 1 id + METHOD method_51837 setEnderDragonFight (Lnet/minecraft/class_2881;)V + ARG 1 enderDragonFight + METHOD method_52168 getRandomSequences ()Lnet/minecraft/class_8565; + METHOD method_52370 tickIceAndSnow (ZLnet/minecraft/class_2338;)V + ARG 1 raining + ARG 2 pos METHOD method_8448 updateSleepingPlayers ()V METHOD method_8487 locateStructure (Lnet/minecraft/class_6862;Lnet/minecraft/class_2338;IZ)Lnet/minecraft/class_2338; COMMENT Tries to find the closest structure of a given type near a given block. diff --git a/mappings/net/minecraft/server/world/ThreadedAnvilChunkStorage.mapping b/mappings/net/minecraft/server/world/ThreadedAnvilChunkStorage.mapping index cab8326313..4ddfff9f42 100644 --- a/mappings/net/minecraft/server/world/ThreadedAnvilChunkStorage.mapping +++ b/mappings/net/minecraft/server/world/ThreadedAnvilChunkStorage.mapping @@ -17,8 +17,6 @@ CLASS net/minecraft/class_3898 net/minecraft/server/world/ThreadedAnvilChunkStor FIELD field_17705 persistentStateManagerFactory Ljava/util/function/Supplier; FIELD field_17706 structureTemplateManager Lnet/minecraft/class_3485; FIELD field_17707 saveDir Ljava/lang/String; - FIELD field_18239 MAX_LEVEL I - COMMENT Specifies the maximum ticket level a chunk can be before a chunk's {@link net.minecraft.server.world.ChunkHolder.LevelType} is {@link net.minecraft.server.world.ChunkHolder.LevelType#BORDER}. FIELD field_18241 playerChunkWatchingManager Lnet/minecraft/class_3210; FIELD field_18242 entityTrackers Lit/unimi/dsi/fastutil/ints/Int2ObjectMap; FIELD field_18243 watchDistance I @@ -33,6 +31,7 @@ CLASS net/minecraft/class_3898 net/minecraft/server/world/ThreadedAnvilChunkStor FIELD field_29673 LEVEL_CHUNK B FIELD field_36383 chunkToNextSaveTimeMs Lit/unimi/dsi/fastutil/longs/Long2LongMap; FIELD field_37278 noiseConfig Lnet/minecraft/class_7138; + FIELD field_40856 structurePlacementCalculator Lnet/minecraft/class_7869; METHOD (Lnet/minecraft/class_3218;Lnet/minecraft/class_32$class_5143;Lcom/mojang/datafixers/DataFixer;Lnet/minecraft/class_3485;Ljava/util/concurrent/Executor;Lnet/minecraft/class_1255;Lnet/minecraft/class_2823;Lnet/minecraft/class_2794;Lnet/minecraft/class_3949;Lnet/minecraft/class_5567;Ljava/util/function/Supplier;IZ)V ARG 1 world ARG 2 session @@ -55,17 +54,15 @@ CLASS net/minecraft/class_3898 net/minecraft/server/world/ThreadedAnvilChunkStor METHOD method_17216 getChunkHolder (J)Lnet/minecraft/class_3193; ARG 1 pos METHOD method_17217 setLevel (JILnet/minecraft/class_3193;I)Lnet/minecraft/class_3193; + COMMENT Sets the loading level of {@code ChunkHolder}s. Nonexistent {@code ChunkHolder}s will be created automatically + COMMENT if their loading level is 45 or lower, and chunks whose loading levels are 46 or higher will be scheduled to be removed. ARG 1 pos ARG 3 level ARG 4 holder - METHOD method_17219 (Lnet/minecraft/class_1923;ILorg/apache/commons/lang3/mutable/MutableObject;Lnet/minecraft/class_3222;)V - ARG 4 player - METHOD method_17220 getRegion (Lnet/minecraft/class_1923;ILjava/util/function/IntFunction;)Ljava/util/concurrent/CompletableFuture; + METHOD method_17220 getRegion (Lnet/minecraft/class_3193;ILjava/util/function/IntFunction;)Ljava/util/concurrent/CompletableFuture; ARG 1 centerChunk ARG 2 margin ARG 3 distanceToStatus - METHOD method_17222 (Lcom/mojang/datafixers/util/Either;)Lcom/mojang/datafixers/util/Either; - ARG 1 either METHOD method_17224 (Lnet/minecraft/class_1923;Lnet/minecraft/class_3193;Lnet/minecraft/class_2806;Ljava/util/concurrent/Executor;Lcom/mojang/datafixers/util/Either;)Ljava/util/concurrent/CompletionStage; ARG 5 either METHOD method_17225 (Lnet/minecraft/class_1923;Lnet/minecraft/class_3193;Lnet/minecraft/class_2806;Ljava/util/concurrent/Executor;Ljava/util/List;)Ljava/util/concurrent/CompletableFuture; @@ -90,19 +87,15 @@ CLASS net/minecraft/class_3898 net/minecraft/server/world/ThreadedAnvilChunkStor METHOD method_17236 getChunk (Lnet/minecraft/class_3193;Lnet/minecraft/class_2806;)Ljava/util/concurrent/CompletableFuture; ARG 1 holder ARG 2 requiredStatus - METHOD method_17241 sendWatchPackets (Lnet/minecraft/class_3222;Lnet/minecraft/class_1923;Lorg/apache/commons/lang3/mutable/MutableObject;ZZ)V + METHOD method_17241 sendWatchPackets (Lnet/minecraft/class_3222;)V ARG 1 player - ARG 2 pos - ARG 3 packet - ARG 4 oldWithinViewDistance - ARG 5 newWithinViewDistance METHOD method_17242 save (Z)V ARG 1 flush - METHOD method_17243 (Lorg/apache/commons/lang3/mutable/MutableObject;Lnet/minecraft/class_2818;Lnet/minecraft/class_3222;)V - ARG 3 player METHOD method_17244 updateHolderMap ()Z - METHOD method_17247 makeChunkEntitiesTickable (Lnet/minecraft/class_1923;)Ljava/util/concurrent/CompletableFuture; - ARG 1 pos + METHOD method_17245 (I)Lnet/minecraft/class_2806; + ARG 0 distance + METHOD method_17247 makeChunkEntitiesTickable (Lnet/minecraft/class_3193;)Ljava/util/concurrent/CompletableFuture; + ARG 1 chunk METHOD method_17248 (Lnet/minecraft/class_2806;I)Lnet/minecraft/class_2806; ARG 2 distance METHOD method_17252 (Lnet/minecraft/class_3193;Ljava/lang/Runnable;)V @@ -119,10 +112,6 @@ CLASS net/minecraft/class_3898 net/minecraft/server/world/ThreadedAnvilChunkStor METHOD method_17264 entryIterator ()Ljava/lang/Iterable; METHOD method_17604 getCompletedLevelSupplier (J)Ljava/util/function/IntSupplier; ARG 1 pos - METHOD method_18193 (Lnet/minecraft/class_1923;Lnet/minecraft/class_2818;)V - ARG 2 chunk - METHOD method_18194 (Lnet/minecraft/class_1923;Lcom/mojang/datafixers/util/Either;)V - ARG 2 either METHOD method_18701 loadEntity (Lnet/minecraft/class_1297;)V ARG 1 entity METHOD method_18702 sendToOtherNearbyPlayers (Lnet/minecraft/class_1297;Lnet/minecraft/class_2596;)V @@ -131,8 +120,6 @@ 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_18711 (Lnet/minecraft/class_2818;)V - ARG 1 chunk 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. @@ -142,10 +129,6 @@ CLASS net/minecraft/class_3898 net/minecraft/server/world/ThreadedAnvilChunkStor METHOD method_18714 handlePlayerAddedOrRemoved (Lnet/minecraft/class_3222;Z)V ARG 1 player ARG 2 added - METHOD method_18715 sendChunkDataPackets (Lnet/minecraft/class_3222;Lorg/apache/commons/lang3/mutable/MutableObject;Lnet/minecraft/class_2818;)V - ARG 1 player - ARG 2 cachedDataPacket - ARG 3 chunk METHOD method_18716 unloadEntity (Lnet/minecraft/class_1297;)V ARG 1 entity METHOD method_18717 sendToNearbyPlayers (Lnet/minecraft/class_1297;Lnet/minecraft/class_2596;)V @@ -162,8 +145,6 @@ CLASS net/minecraft/class_3898 net/minecraft/server/world/ThreadedAnvilChunkStor COMMENT players. This ensures all possible updates are accounted for. METHOD method_18843 (Lnet/minecraft/class_3193;Ljava/util/concurrent/CompletableFuture;JLnet/minecraft/class_2791;)V ARG 5 chunk - METHOD method_19486 (Lnet/minecraft/class_3193;Ljava/lang/Runnable;)V - ARG 2 task METHOD method_19487 (Lnet/minecraft/class_3193;Ljava/lang/Runnable;)V ARG 2 task METHOD method_19488 getPointOfInterestStorage ()Lnet/minecraft/class_4153; @@ -180,6 +161,8 @@ CLASS net/minecraft/class_3898 net/minecraft/server/world/ThreadedAnvilChunkStor ARG 2 either METHOD method_20577 (Lcom/mojang/datafixers/util/Either;)Lcom/mojang/datafixers/util/Either; ARG 0 either + METHOD method_20578 (Lorg/apache/commons/lang3/mutable/MutableBoolean;Lnet/minecraft/class_2791;)V + ARG 1 chunk METHOD method_20579 (Lnet/minecraft/class_3193;Ljava/lang/Runnable;)V ARG 2 task METHOD method_20582 (Lnet/minecraft/class_2791;)Z @@ -194,9 +177,11 @@ CLASS net/minecraft/class_3898 net/minecraft/server/world/ThreadedAnvilChunkStor METHOD method_20617 upgradeChunk (Lnet/minecraft/class_3193;Lnet/minecraft/class_2806;)Ljava/util/concurrent/CompletableFuture; ARG 1 holder ARG 2 requiredStatus + METHOD method_20618 (Lnet/minecraft/class_3193;Lnet/minecraft/class_2791;)Ljava/util/concurrent/CompletableFuture; + ARG 2 chunk METHOD method_20619 loadChunk (Lnet/minecraft/class_1923;)Ljava/util/concurrent/CompletableFuture; ARG 1 pos - METHOD method_20726 updateWatchedSection (Lnet/minecraft/class_3222;)Lnet/minecraft/class_4076; + METHOD method_20726 updateWatchedSection (Lnet/minecraft/class_3222;)V COMMENT Updates the watched chunk section position for the {@code player}, and sends a COMMENT render distance update packet to the client. ARG 1 player @@ -204,6 +189,8 @@ CLASS net/minecraft/class_3898 net/minecraft/server/world/ThreadedAnvilChunkStor ARG 1 writer METHOD method_21620 (Lnet/minecraft/class_2791;)Ljava/util/Optional; ARG 0 chunk + METHOD method_21621 (Lnet/minecraft/class_2818;)Ljava/lang/Integer; + ARG 0 chunk METHOD method_21676 getFutureStatus (Ljava/util/concurrent/CompletableFuture;)Ljava/lang/String; ARG 0 future METHOD method_21677 (Lnet/minecraft/class_2818;)Ljava/lang/String; @@ -222,7 +209,7 @@ CLASS net/minecraft/class_3898 net/minecraft/server/world/ThreadedAnvilChunkStor METHOD method_31413 addEntitiesFromNbt (Lnet/minecraft/class_3218;Ljava/util/List;)V ARG 0 world ARG 1 nbt - METHOD method_31414 onChunkStatusChange (Lnet/minecraft/class_1923;Lnet/minecraft/class_3193$class_3194;)V + METHOD method_31414 onChunkStatusChange (Lnet/minecraft/class_1923;Lnet/minecraft/class_3194;)V ARG 1 chunkPos ARG 2 levelType METHOD method_31415 (Lnet/minecraft/class_2839;Lnet/minecraft/class_2818;)V @@ -251,20 +238,12 @@ CLASS net/minecraft/class_3898 net/minecraft/server/world/ThreadedAnvilChunkStor ARG 2 pos METHOD method_38783 shouldTick (Lnet/minecraft/class_1923;)Z ARG 1 pos + METHOD method_39220 (Lnet/minecraft/class_2818;)Ljava/lang/Integer; + ARG 0 chunk + METHOD method_39221 (Lnet/minecraft/class_2818;)Ljava/lang/Integer; + ARG 0 chunk METHOD method_39925 save (Lnet/minecraft/class_3193;)Z ARG 1 chunkHolder - METHOD method_39975 isWithinDistance (IIIII)Z - ARG 0 x1 - ARG 1 z1 - ARG 2 x2 - ARG 3 z2 - ARG 4 distance - METHOD method_39976 isOnDistanceEdge (IIIII)Z - ARG 0 x1 - ARG 1 z1 - ARG 2 x2 - ARG 3 z2 - ARG 4 distance METHOD method_39992 shouldDelayShutdown ()Z COMMENT {@return whether the server shutdown should be delayed to process some tasks} METHOD method_40067 crash (Ljava/lang/IllegalStateException;Ljava/lang/String;)Lnet/minecraft/class_148; @@ -274,6 +253,10 @@ CLASS net/minecraft/class_3898 net/minecraft/server/world/ThreadedAnvilChunkStor ARG 1 chunkHolder METHOD method_40069 (Ljava/lang/StringBuilder;Lnet/minecraft/class_3193;Lcom/mojang/datafixers/util/Pair;)V ARG 2 pair + METHOD method_41234 (Ljava/util/List;)Lnet/minecraft/class_2818; + ARG 0 cs + METHOD method_41235 (Lcom/mojang/datafixers/util/Either;)Lcom/mojang/datafixers/util/Either; + ARG 0 chunks METHOD method_41247 getNoiseConfig ()Lnet/minecraft/class_7138; METHOD method_43374 (Lnet/minecraft/class_1923;Ljava/lang/Throwable;)Lcom/mojang/datafixers/util/Either; ARG 2 throwable @@ -296,6 +279,45 @@ CLASS net/minecraft/class_3898 net/minecraft/server/world/ThreadedAnvilChunkStor ARG 1 chunkPos METHOD method_43383 getUpdatedChunkNbt (Lnet/minecraft/class_1923;)Ljava/util/concurrent/CompletableFuture; ARG 1 chunkPos + METHOD method_46641 getStructurePlacementCalculator ()Lnet/minecraft/class_7869; + METHOD method_49420 (Lnet/minecraft/class_3222;Ljava/util/List;)V + ARG 0 player + ARG 1 chunksx + METHOD method_49421 sendChunkBiomePackets (Ljava/util/List;)V + ARG 1 chunks + METHOD method_49422 (Lnet/minecraft/class_3222;)Ljava/util/List; + ARG 0 player + METHOD method_51282 (Lcom/mojang/datafixers/util/Either;)Lcom/mojang/datafixers/util/Either; + ARG 0 chunk + METHOD method_51834 (Lcom/mojang/datafixers/util/Either;Ljava/lang/Throwable;)Ljava/lang/Object; + ARG 1 chunk + ARG 2 throwable + METHOD method_52345 isTracked (Lnet/minecraft/class_3222;II)Z + ARG 1 player + ARG 2 chunkX + ARG 3 chunkZ + METHOD method_52346 sendWatchPackets (Lnet/minecraft/class_3222;Lnet/minecraft/class_8603;)V + ARG 1 player + ARG 2 chunkFilter + METHOD method_52347 track (Lnet/minecraft/class_3222;Lnet/minecraft/class_1923;)V + ARG 1 player + ARG 2 pos + METHOD method_52348 track (Lnet/minecraft/class_3222;Lnet/minecraft/class_2818;)V + ARG 0 player + ARG 1 chunk + METHOD method_52350 getViewDistance (Lnet/minecraft/class_3222;)I + ARG 1 player + METHOD method_52351 isOnTrackEdge (Lnet/minecraft/class_3222;II)Z + ARG 1 player + ARG 2 chunkX + ARG 3 chunkZ + METHOD method_52352 untrack (Lnet/minecraft/class_3222;Lnet/minecraft/class_1923;)V + ARG 0 player + ARG 1 pos + METHOD method_52354 (Lnet/minecraft/class_3222;Lnet/minecraft/class_1923;)V + ARG 1 chunkPos + METHOD method_52355 (Lnet/minecraft/class_3222;Lnet/minecraft/class_1923;)V + ARG 2 chunkPos CLASS class_3208 EntityTracker COMMENT An entity tracker governs which players' clients can see an entity. Each COMMENT tracker corresponds to one entity in a server world and is mapped from the diff --git a/mappings/net/minecraft/sound/BiomeAdditionsSound.mapping b/mappings/net/minecraft/sound/BiomeAdditionsSound.mapping index 363fead70c..6f17f8e9b7 100644 --- a/mappings/net/minecraft/sound/BiomeAdditionsSound.mapping +++ b/mappings/net/minecraft/sound/BiomeAdditionsSound.mapping @@ -1,13 +1,17 @@ CLASS net/minecraft/class_4967 net/minecraft/sound/BiomeAdditionsSound COMMENT Represents an "additions sound" for a biome. - FIELD field_23144 sound Lnet/minecraft/class_3414; + FIELD field_23144 sound Lnet/minecraft/class_6880; FIELD field_23145 chance D FIELD field_24673 CODEC Lcom/mojang/serialization/Codec; - METHOD (Lnet/minecraft/class_3414;D)V + METHOD (Lnet/minecraft/class_6880;D)V ARG 1 sound ARG 2 chance - METHOD method_26098 getSound ()Lnet/minecraft/class_3414; + METHOD method_26098 getSound ()Lnet/minecraft/class_6880; METHOD method_26099 getChance ()D COMMENT Returns the chance of this addition sound to play at any tick. + METHOD method_28390 (Lnet/minecraft/class_4967;)Ljava/lang/Double; + ARG 0 sound METHOD method_28391 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; ARG 0 instance + METHOD method_28392 (Lnet/minecraft/class_4967;)Lnet/minecraft/class_6880; + ARG 0 sound diff --git a/mappings/net/minecraft/sound/BiomeMoodSound.mapping b/mappings/net/minecraft/sound/BiomeMoodSound.mapping index 965a799d76..7398214aec 100644 --- a/mappings/net/minecraft/sound/BiomeMoodSound.mapping +++ b/mappings/net/minecraft/sound/BiomeMoodSound.mapping @@ -1,16 +1,16 @@ CLASS net/minecraft/class_4968 net/minecraft/sound/BiomeMoodSound FIELD field_23146 CAVE Lnet/minecraft/class_4968; - FIELD field_23147 sound Lnet/minecraft/class_3414; + FIELD field_23147 sound Lnet/minecraft/class_6880; FIELD field_23148 cultivationTicks I FIELD field_23149 spawnRange I FIELD field_23150 extraDistance D FIELD field_24674 CODEC Lcom/mojang/serialization/Codec; - METHOD (Lnet/minecraft/class_3414;IID)V + METHOD (Lnet/minecraft/class_6880;IID)V ARG 1 sound ARG 2 cultivationTicks ARG 3 spawnRange ARG 4 extraDistance - METHOD method_26100 getSound ()Lnet/minecraft/class_3414; + METHOD method_26100 getSound ()Lnet/minecraft/class_6880; METHOD method_26101 getCultivationTicks ()I COMMENT Returns the ticks it takes for entering the mood environment (a totally COMMENT dark cave) to playing the mood sound, or the inverse of the per-tick. @@ -25,5 +25,13 @@ CLASS net/minecraft/class_4968 net/minecraft/sound/BiomeMoodSound COMMENT three-dimensional vector from the player to the chosen mood position that COMMENT is this distance to the mood position and this distance farther from the COMMENT player. + METHOD method_28393 (Lnet/minecraft/class_4968;)Ljava/lang/Double; + ARG 0 sound METHOD method_28394 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; ARG 0 instance + METHOD method_28395 (Lnet/minecraft/class_4968;)Ljava/lang/Integer; + ARG 0 sound + METHOD method_28396 (Lnet/minecraft/class_4968;)Ljava/lang/Integer; + ARG 0 sound + METHOD method_28397 (Lnet/minecraft/class_4968;)Lnet/minecraft/class_6880; + ARG 0 sound diff --git a/mappings/net/minecraft/sound/BlockSoundGroup.mapping b/mappings/net/minecraft/sound/BlockSoundGroup.mapping index f1beb4fea1..a07d6c1cd9 100644 --- a/mappings/net/minecraft/sound/BlockSoundGroup.mapping +++ b/mappings/net/minecraft/sound/BlockSoundGroup.mapping @@ -93,6 +93,24 @@ CLASS net/minecraft/class_2498 net/minecraft/sound/BlockSoundGroup FIELD field_37644 SCULK Lnet/minecraft/class_2498; FIELD field_37645 SCULK_VEIN Lnet/minecraft/class_2498; FIELD field_37646 SCULK_SHRIEKER Lnet/minecraft/class_2498; + FIELD field_40313 HANGING_SIGN Lnet/minecraft/class_2498; + FIELD field_40314 BAMBOO_WOOD Lnet/minecraft/class_2498; + FIELD field_40315 NETHER_WOOD Lnet/minecraft/class_2498; + FIELD field_41083 NETHER_WOOD_HANGING_SIGN Lnet/minecraft/class_2498; + FIELD field_41084 BAMBOO_WOOD_HANGING_SIGN Lnet/minecraft/class_2498; + FIELD field_41085 CHISELED_BOOKSHELF Lnet/minecraft/class_2498; + FIELD field_42766 CHERRY_WOOD Lnet/minecraft/class_2498; + FIELD field_42767 CHERRY_SAPLING Lnet/minecraft/class_2498; + FIELD field_42768 CHERRY_LEAVES Lnet/minecraft/class_2498; + FIELD field_42769 CHERRY_WOOD_HANGING_SIGN Lnet/minecraft/class_2498; + FIELD field_42770 SUSPICIOUS_SAND Lnet/minecraft/class_2498; + FIELD field_42771 DECORATED_POT Lnet/minecraft/class_2498; + FIELD field_42772 PINK_PETALS Lnet/minecraft/class_2498; + FIELD field_43255 SUSPICIOUS_GRAVEL Lnet/minecraft/class_2498; + FIELD field_43256 DECORATED_POT_SHATTER Lnet/minecraft/class_2498; + FIELD field_44608 INTENTIONALLY_EMPTY Lnet/minecraft/class_2498; + FIELD field_45970 SPONGE Lnet/minecraft/class_2498; + FIELD field_45971 WET_SPONGE Lnet/minecraft/class_2498; METHOD (FFLnet/minecraft/class_3414;Lnet/minecraft/class_3414;Lnet/minecraft/class_3414;Lnet/minecraft/class_3414;Lnet/minecraft/class_3414;)V ARG 1 volume ARG 2 pitch diff --git a/mappings/net/minecraft/sound/MusicSound.mapping b/mappings/net/minecraft/sound/MusicSound.mapping index 084ccdb196..ab18403969 100644 --- a/mappings/net/minecraft/sound/MusicSound.mapping +++ b/mappings/net/minecraft/sound/MusicSound.mapping @@ -1,17 +1,25 @@ CLASS net/minecraft/class_5195 net/minecraft/sound/MusicSound - FIELD field_24057 sound Lnet/minecraft/class_3414; + FIELD field_24057 sound Lnet/minecraft/class_6880; FIELD field_24058 minDelay I FIELD field_24059 maxDelay I FIELD field_24060 replaceCurrentMusic Z FIELD field_24627 CODEC Lcom/mojang/serialization/Codec; - METHOD (Lnet/minecraft/class_3414;IIZ)V + METHOD (Lnet/minecraft/class_6880;IIZ)V ARG 1 sound ARG 2 minDelay ARG 3 maxDelay ARG 4 replaceCurrentMusic - METHOD method_27279 getSound ()Lnet/minecraft/class_3414; + METHOD method_27279 getSound ()Lnet/minecraft/class_6880; METHOD method_27280 getMinDelay ()I METHOD method_27281 getMaxDelay ()I METHOD method_27282 shouldReplaceCurrentMusic ()Z + METHOD method_28127 (Lnet/minecraft/class_5195;)Ljava/lang/Boolean; + ARG 0 sound METHOD method_28128 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; ARG 0 instance + METHOD method_28129 (Lnet/minecraft/class_5195;)Ljava/lang/Integer; + ARG 0 sound + METHOD method_28130 (Lnet/minecraft/class_5195;)Ljava/lang/Integer; + ARG 0 sound + METHOD method_28131 (Lnet/minecraft/class_5195;)Lnet/minecraft/class_6880; + ARG 0 sound diff --git a/mappings/net/minecraft/sound/SoundEvent.mapping b/mappings/net/minecraft/sound/SoundEvent.mapping index ba196a5ee6..386a488b0c 100644 --- a/mappings/net/minecraft/sound/SoundEvent.mapping +++ b/mappings/net/minecraft/sound/SoundEvent.mapping @@ -1,19 +1,27 @@ CLASS net/minecraft/class_3414 net/minecraft/sound/SoundEvent FIELD field_14533 id Lnet/minecraft/class_2960; - FIELD field_24628 CODEC Lcom/mojang/serialization/Codec; FIELD field_38690 distanceToTravel F FIELD field_38691 staticDistance Z - METHOD (Lnet/minecraft/class_2960;)V - ARG 1 id - METHOD (Lnet/minecraft/class_2960;F)V - ARG 1 id - ARG 2 distanceToTravel + FIELD field_41661 DEFAULT_DISTANCE_TO_TRAVEL F + FIELD field_41698 CODEC Lcom/mojang/serialization/Codec; + FIELD field_41699 ENTRY_CODEC Lcom/mojang/serialization/Codec; METHOD (Lnet/minecraft/class_2960;FZ)V ARG 1 id ARG 2 distanceToTravel ARG 3 useStaticDistance METHOD method_14833 getId ()Lnet/minecraft/class_2960; - METHOD method_28132 (Lnet/minecraft/class_3414;)Lnet/minecraft/class_2960; - ARG 0 soundEvent METHOD method_43044 getDistanceToTravel (F)F ARG 1 volume + METHOD method_47908 of (Lnet/minecraft/class_2960;)Lnet/minecraft/class_3414; + ARG 0 id + METHOD method_47909 of (Lnet/minecraft/class_2960;F)Lnet/minecraft/class_3414; + ARG 0 id + ARG 1 distanceToTravel + METHOD method_47956 of (Lnet/minecraft/class_2960;Ljava/util/Optional;)Lnet/minecraft/class_3414; + ARG 0 id + ARG 1 distanceToTravel + METHOD method_47958 writeBuf (Lnet/minecraft/class_2540;)V + ARG 1 buf + METHOD method_47959 getStaticDistanceToTravel ()Ljava/util/Optional; + METHOD method_47961 fromBuf (Lnet/minecraft/class_2540;)Lnet/minecraft/class_3414; + ARG 0 buf diff --git a/mappings/net/minecraft/sound/SoundEvents.mapping b/mappings/net/minecraft/sound/SoundEvents.mapping index 6f74cc8c22..5444803b0e 100644 --- a/mappings/net/minecraft/sound/SoundEvents.mapping +++ b/mappings/net/minecraft/sound/SoundEvents.mapping @@ -3,9 +3,22 @@ CLASS net/minecraft/class_3417 net/minecraft/sound/SoundEvents FIELD field_39028 GOAT_HORN_SOUNDS Lcom/google/common/collect/ImmutableList; METHOD method_14838 register (Ljava/lang/String;)Lnet/minecraft/class_3414; ARG 0 id - METHOD method_43045 register (Ljava/lang/String;F)Lnet/minecraft/class_3414; + METHOD method_43045 register (Lnet/minecraft/class_2960;Lnet/minecraft/class_2960;F)Lnet/minecraft/class_6880; ARG 0 id - ARG 1 distanceToTravel + ARG 1 soundId + ARG 2 distanceToTravel METHOD method_43516 registerGoatHornSounds ()Lcom/google/common/collect/ImmutableList; - METHOD method_43517 (I)Lnet/minecraft/class_3414; + METHOD method_43517 (I)Lnet/minecraft/class_6880$class_6883; ARG 0 variant + METHOD method_47962 register (Lnet/minecraft/class_2960;)Lnet/minecraft/class_3414; + ARG 0 id + METHOD method_47963 register (Lnet/minecraft/class_2960;Lnet/minecraft/class_2960;)Lnet/minecraft/class_3414; + ARG 0 id + ARG 1 soundId + METHOD method_47964 registerReference (Lnet/minecraft/class_2960;)Lnet/minecraft/class_6880$class_6883; + ARG 0 id + METHOD method_47965 registerReference (Lnet/minecraft/class_2960;Lnet/minecraft/class_2960;)Lnet/minecraft/class_6880$class_6883; + ARG 0 id + ARG 1 soundId + METHOD method_47966 registerReference (Ljava/lang/String;)Lnet/minecraft/class_6880$class_6883; + ARG 0 id diff --git a/mappings/net/minecraft/stat/StatType.mapping b/mappings/net/minecraft/stat/StatType.mapping index dd32b0577a..8b742f1ff7 100644 --- a/mappings/net/minecraft/stat/StatType.mapping +++ b/mappings/net/minecraft/stat/StatType.mapping @@ -2,14 +2,14 @@ CLASS net/minecraft/class_3448 net/minecraft/stat/StatType FIELD field_15323 registry Lnet/minecraft/class_2378; FIELD field_15324 stats Ljava/util/Map; FIELD field_26382 name Lnet/minecraft/class_2561; - METHOD (Lnet/minecraft/class_2378;)V + METHOD (Lnet/minecraft/class_2378;Lnet/minecraft/class_2561;)V ARG 1 registry + ARG 2 name METHOD method_14955 getOrCreateStat (Ljava/lang/Object;Lnet/minecraft/class_3446;)Lnet/minecraft/class_3445; ARG 1 key ARG 2 formatter METHOD method_14956 getOrCreateStat (Ljava/lang/Object;)Lnet/minecraft/class_3445; ARG 1 key - METHOD method_14957 getTranslationKey ()Ljava/lang/String; METHOD method_14958 hasStat (Ljava/lang/Object;)Z ARG 1 key METHOD method_14959 getRegistry ()Lnet/minecraft/class_2378; diff --git a/mappings/net/minecraft/state/State.mapping b/mappings/net/minecraft/state/State.mapping index dc15c069c9..5fe72d06bc 100644 --- a/mappings/net/minecraft/state/State.mapping +++ b/mappings/net/minecraft/state/State.mapping @@ -33,7 +33,12 @@ CLASS net/minecraft/class_2688 net/minecraft/state/State METHOD method_28500 getOrEmpty (Lnet/minecraft/class_2769;)Ljava/util/Optional; ARG 1 property METHOD method_28501 getProperties ()Ljava/util/Collection; + METHOD method_47968 withIfExists (Lnet/minecraft/class_2769;Ljava/lang/Comparable;)Ljava/lang/Object; + ARG 1 property + ARG 2 value CLASS 1 + METHOD apply (Ljava/lang/Object;)Ljava/lang/Object; + ARG 1 entry METHOD method_11575 nameValue (Lnet/minecraft/class_2769;Ljava/lang/Comparable;)Ljava/lang/String; ARG 1 property ARG 2 value diff --git a/mappings/net/minecraft/state/property/IntProperty.mapping b/mappings/net/minecraft/state/property/IntProperty.mapping index 1ab957b3c5..a4c8ae6958 100644 --- a/mappings/net/minecraft/state/property/IntProperty.mapping +++ b/mappings/net/minecraft/state/property/IntProperty.mapping @@ -4,6 +4,8 @@ CLASS net/minecraft/class_2758 net/minecraft/state/property/IntProperty COMMENT

    See {@link net.minecraft.state.property.Properties} for example COMMENT usages. FIELD field_12614 values Lcom/google/common/collect/ImmutableSet; + FIELD field_37655 min I + FIELD field_37656 max I METHOD (Ljava/lang/String;II)V ARG 1 name ARG 2 min diff --git a/mappings/net/minecraft/state/property/Properties.mapping b/mappings/net/minecraft/state/property/Properties.mapping index 9eacf69081..13b9b84580 100644 --- a/mappings/net/minecraft/state/property/Properties.mapping +++ b/mappings/net/minecraft/state/property/Properties.mapping @@ -129,6 +129,7 @@ CLASS net/minecraft/class_2741 net/minecraft/state/property/Properties COMMENT COMMENT

    This property is normally used for doors, trapdoors and fence gates but is also used by barrels. FIELD field_12538 LEVEL_15 Lnet/minecraft/class_2758; + COMMENT A property that specifies the level of a light block or a fluid block on a scale of 0 to 15. FIELD field_12539 UNSTABLE Lnet/minecraft/class_2746; COMMENT A property that specifies if TNT is unstable. COMMENT @@ -167,8 +168,8 @@ CLASS net/minecraft/class_2741 net/minecraft/state/property/Properties COMMENT A property that specifies if a tripwire has been disarmed. FIELD field_12554 HAS_BOTTLE_0 Lnet/minecraft/class_2746; COMMENT A property that specifies if a brewing stand has a bottle in slot 0. - FIELD field_12555 WALL_MOUNT_LOCATION Lnet/minecraft/class_2754; - COMMENT A property that specifies the type of wall a block is attached to. + FIELD field_12555 BLOCK_FACE Lnet/minecraft/class_2754; + COMMENT A property that specifies the block face a block is attached to. FIELD field_12556 AGE_2 Lnet/minecraft/class_2758; COMMENT A property that specifies the age of a block on a scale of 0 to 2. FIELD field_16503 DISTANCE_0_7 Lnet/minecraft/class_2758; @@ -197,7 +198,6 @@ CLASS net/minecraft/class_2741 net/minecraft/state/property/Properties COMMENT A property that specifies how a wall extends from the center post to the south. FIELD field_22177 WEST_WALL_SHAPE Lnet/minecraft/class_2754; COMMENT A property that specifies how a wall extends from the center post to the west. - FIELD field_23084 VINE_END Lnet/minecraft/class_2746; FIELD field_23187 CHARGES Lnet/minecraft/class_2758; COMMENT A property that specifies the amount of charges a respawn anchor has. FIELD field_23333 ORIENTATION Lnet/minecraft/class_2754; @@ -205,10 +205,17 @@ CLASS net/minecraft/class_2741 net/minecraft/state/property/Properties FIELD field_27220 CANDLES Lnet/minecraft/class_2758; COMMENT A property that specifies the amount of candles in a candle block. FIELD field_28062 VERTICAL_DIRECTION Lnet/minecraft/class_2753; + COMMENT A property that specifies the direction a pointed dripstone is facing. + COMMENT + COMMENT

    This property allows a block to face either down or up. FIELD field_28063 THICKNESS Lnet/minecraft/class_2754; + COMMENT A property that specifies the thickness of a pointed dripstone. FIELD field_28120 SCULK_SENSOR_PHASE Lnet/minecraft/class_2754; + COMMENT A property that specifies the current phase of a sculk sensor. FIELD field_28716 BERRIES Lnet/minecraft/class_2746; + COMMENT A property that specifies the amount of berries in a cave vines block. FIELD field_28717 TILT Lnet/minecraft/class_2754; + COMMENT A property that specifies how a big dripleaf is tilted down. FIELD field_31387 LEVEL_3_MIN I FIELD field_31388 LEVEL_1_8_MIN I FIELD field_31389 LEVEL_3_MAX I @@ -216,7 +223,6 @@ CLASS net/minecraft/class_2741 net/minecraft/state/property/Properties FIELD field_31391 DISTANCE_0_7_MAX I FIELD field_31392 CHARGES_MIN I FIELD field_31393 CHARGES_MAX I - FIELD field_31394 ROTATION_MAX I FIELD field_31395 AGE_1_MAX I FIELD field_31396 AGE_2_MAX I FIELD field_31397 AGE_3_MAX I @@ -227,10 +233,32 @@ CLASS net/minecraft/class_2741 net/minecraft/state/property/Properties FIELD field_31402 DISTANCE_1_7_MAX I FIELD field_33723 LEVEL_15_MAX I FIELD field_37651 BLOOM Lnet/minecraft/class_2746; + COMMENT A property that specifies if a sculk catalyst is blooming. FIELD field_37652 SHRIEKING Lnet/minecraft/class_2746; + COMMENT A property that specifies if a sculk shrieker is shrieking. FIELD field_37653 AGE_4_MAX I FIELD field_37654 AGE_4 Lnet/minecraft/class_2758; + COMMENT A property that specifies the age of a block on a scale of 0 to 4. FIELD field_38423 CAN_SUMMON Lnet/minecraft/class_2746; + COMMENT A property that specifies if a sculk shrieker can summon a warden. + FIELD field_41317 SLOT_0_OCCUPIED Lnet/minecraft/class_2746; + COMMENT A property that specifies if a chiseled bookshelf has a book in slot 0. + FIELD field_41318 SLOT_1_OCCUPIED Lnet/minecraft/class_2746; + COMMENT A property that specifies if a chiseled bookshelf has a book in slot 1. + FIELD field_41319 SLOT_2_OCCUPIED Lnet/minecraft/class_2746; + COMMENT A property that specifies if a chiseled bookshelf has a book in slot 2. + FIELD field_41320 SLOT_3_OCCUPIED Lnet/minecraft/class_2746; + COMMENT A property that specifies if a chiseled bookshelf has a book in slot 3. + FIELD field_41321 SLOT_4_OCCUPIED Lnet/minecraft/class_2746; + COMMENT A property that specifies if a chiseled bookshelf has a book in slot 4. + FIELD field_41322 SLOT_5_OCCUPIED Lnet/minecraft/class_2746; + COMMENT A property that specifies if a chiseled bookshelf has a book in slot 5. + FIELD field_42835 FLOWER_AMOUNT Lnet/minecraft/class_2758; + COMMENT A property that specifies the amount of flowers in a pink petals block. + FIELD field_42836 DUSTED Lnet/minecraft/class_2758; + COMMENT A property that specifies how much a brushable block is dusted on a scale of 0 to 3. + FIELD field_43307 CRACKED Lnet/minecraft/class_2746; + COMMENT A property that specifies if a decorated pot is cracked. METHOD method_11813 (Lnet/minecraft/class_2768;)Z ARG 0 shape METHOD method_11814 (Lnet/minecraft/class_2350;)Z diff --git a/mappings/net/minecraft/structure/AncientCityGenerator.mapping b/mappings/net/minecraft/structure/AncientCityGenerator.mapping index a2fe66b7d9..c8a3e0fbf1 100644 --- a/mappings/net/minecraft/structure/AncientCityGenerator.mapping +++ b/mappings/net/minecraft/structure/AncientCityGenerator.mapping @@ -1,3 +1,4 @@ CLASS net/minecraft/class_7312 net/minecraft/structure/AncientCityGenerator - FIELD field_38471 CITY_CENTER Lnet/minecraft/class_6880; - METHOD method_42755 init ()V + FIELD field_38471 CITY_CENTER Lnet/minecraft/class_5321; + METHOD method_42755 bootstrap (Lnet/minecraft/class_7891;)V + ARG 0 poolRegisterable diff --git a/mappings/net/minecraft/structure/AncientCityOutskirtsGenerator.mapping b/mappings/net/minecraft/structure/AncientCityOutskirtsGenerator.mapping index e37f30481a..db94cb5fd2 100644 --- a/mappings/net/minecraft/structure/AncientCityOutskirtsGenerator.mapping +++ b/mappings/net/minecraft/structure/AncientCityOutskirtsGenerator.mapping @@ -1,2 +1,3 @@ CLASS net/minecraft/class_7313 net/minecraft/structure/AncientCityOutskirtsGenerator - METHOD method_42756 init ()V + METHOD method_42756 bootstrap (Lnet/minecraft/class_7891;)V + ARG 0 poolRegisterable diff --git a/mappings/net/minecraft/structure/BastionBridgeData.mapping b/mappings/net/minecraft/structure/BastionBridgeData.mapping index f1f1439084..f7bb8a6481 100644 --- a/mappings/net/minecraft/structure/BastionBridgeData.mapping +++ b/mappings/net/minecraft/structure/BastionBridgeData.mapping @@ -1,2 +1,3 @@ CLASS net/minecraft/class_5174 net/minecraft/structure/BastionBridgeData - METHOD method_27198 init ()V + METHOD method_27198 bootstrap (Lnet/minecraft/class_7891;)V + ARG 0 poolRegisterable diff --git a/mappings/net/minecraft/structure/BastionData.mapping b/mappings/net/minecraft/structure/BastionData.mapping index 7ce8097aff..312d5b7e33 100644 --- a/mappings/net/minecraft/structure/BastionData.mapping +++ b/mappings/net/minecraft/structure/BastionData.mapping @@ -1,2 +1,3 @@ CLASS net/minecraft/class_5181 net/minecraft/structure/BastionData - METHOD method_27203 init ()V + METHOD method_27203 bootstrap (Lnet/minecraft/class_7891;)V + ARG 0 poolRegisterable diff --git a/mappings/net/minecraft/structure/BastionHoglinStableData.mapping b/mappings/net/minecraft/structure/BastionHoglinStableData.mapping new file mode 100644 index 0000000000..6b405e957c --- /dev/null +++ b/mappings/net/minecraft/structure/BastionHoglinStableData.mapping @@ -0,0 +1,3 @@ +CLASS net/minecraft/class_5177 net/minecraft/structure/BastionHoglinStableData + METHOD method_27199 bootstrap (Lnet/minecraft/class_7891;)V + ARG 0 poolRegisterable diff --git a/mappings/net/minecraft/structure/BastionRemnantGenerator.mapping b/mappings/net/minecraft/structure/BastionRemnantGenerator.mapping index 87fdbf9d82..eb475dcde6 100644 --- a/mappings/net/minecraft/structure/BastionRemnantGenerator.mapping +++ b/mappings/net/minecraft/structure/BastionRemnantGenerator.mapping @@ -1,3 +1,4 @@ CLASS net/minecraft/class_5179 net/minecraft/structure/BastionRemnantGenerator - FIELD field_25941 STRUCTURE_POOLS Lnet/minecraft/class_6880; - METHOD method_27201 init ()V + FIELD field_25941 STRUCTURE_POOLS Lnet/minecraft/class_5321; + METHOD method_27201 bootstrap (Lnet/minecraft/class_7891;)V + ARG 0 poolRegisterable diff --git a/mappings/net/minecraft/structure/BastionTreasureData.mapping b/mappings/net/minecraft/structure/BastionTreasureData.mapping index f2f06b8e41..6babc0da08 100644 --- a/mappings/net/minecraft/structure/BastionTreasureData.mapping +++ b/mappings/net/minecraft/structure/BastionTreasureData.mapping @@ -1,2 +1,3 @@ CLASS net/minecraft/class_5182 net/minecraft/structure/BastionTreasureData - METHOD method_27204 init ()V + METHOD method_27204 bootstrap (Lnet/minecraft/class_7891;)V + ARG 0 poolRegisterable diff --git a/mappings/net/minecraft/structure/BastionUnitsData.mapping b/mappings/net/minecraft/structure/BastionUnitsData.mapping index e6d0d4d909..52a8c12352 100644 --- a/mappings/net/minecraft/structure/BastionUnitsData.mapping +++ b/mappings/net/minecraft/structure/BastionUnitsData.mapping @@ -1,2 +1,3 @@ CLASS net/minecraft/class_5178 net/minecraft/structure/BastionUnitsData - METHOD method_27200 init ()V + METHOD method_27200 bootstrap (Lnet/minecraft/class_7891;)V + ARG 0 poolRegisterable diff --git a/mappings/net/minecraft/structure/DesertTempleGenerator.mapping b/mappings/net/minecraft/structure/DesertTempleGenerator.mapping index 345fbdcf6d..4805540ebb 100644 --- a/mappings/net/minecraft/structure/DesertTempleGenerator.mapping +++ b/mappings/net/minecraft/structure/DesertTempleGenerator.mapping @@ -2,9 +2,49 @@ CLASS net/minecraft/class_3346 net/minecraft/structure/DesertTempleGenerator FIELD field_14397 hasPlacedChest [Z FIELD field_34725 WIDTH I FIELD field_34726 DEPTH I + FIELD field_42856 potentialSuspiciousSandPositions Ljava/util/List; + FIELD field_44482 basementMarkerPos Lnet/minecraft/class_2338; METHOD (Lnet/minecraft/class_2487;)V ARG 1 nbt METHOD (Lnet/minecraft/class_5819;II)V ARG 1 random ARG 2 x ARG 3 z + METHOD method_49259 addPotentialSuspiciousSandPosition (III)V + ARG 1 x + ARG 2 y + ARG 3 z + METHOD method_49260 addSandOrSandstone (Lnet/minecraft/class_5281;IIILnet/minecraft/class_3341;)V + ARG 1 world + ARG 2 x + ARG 3 y + ARG 4 z + ARG 5 chunkBox + METHOD method_49261 generateBasement (Lnet/minecraft/class_5281;Lnet/minecraft/class_3341;)V + ARG 1 world + ARG 2 chunkBox + METHOD method_49262 generateBasementRoof (Lnet/minecraft/class_5281;Lnet/minecraft/class_3341;IIIII)V + ARG 1 world + ARG 2 chunkBox + ARG 3 startX + ARG 4 y + ARG 5 startZ + ARG 6 endX + ARG 7 endZ + METHOD method_49263 addPotentialSuspiciousSandArea (IIIIII)V + ARG 1 startX + ARG 2 startY + ARG 3 startZ + ARG 4 endX + ARG 5 endY + ARG 6 endZ + METHOD method_49264 generateBasementStairs (Lnet/minecraft/class_2338;Lnet/minecraft/class_5281;Lnet/minecraft/class_3341;)V + ARG 1 pos + ARG 2 world + ARG 3 chunkBox + METHOD method_49265 getPotentialSuspiciousSandPositions ()Ljava/util/List; + METHOD method_49266 generateSuspiciousSandRoom (Lnet/minecraft/class_2338;Lnet/minecraft/class_5281;Lnet/minecraft/class_3341;)V + ARG 1 pos + ARG 2 world + ARG 3 chunkBox + METHOD method_51180 getBasementMarkerPos ()Lnet/minecraft/class_2338; diff --git a/mappings/net/minecraft/structure/DesertVillageData.mapping b/mappings/net/minecraft/structure/DesertVillageData.mapping index b3729107a4..5ca46a9219 100644 --- a/mappings/net/minecraft/structure/DesertVillageData.mapping +++ b/mappings/net/minecraft/structure/DesertVillageData.mapping @@ -1,3 +1,6 @@ CLASS net/minecraft/class_3868 net/minecraft/structure/DesertVillageData - FIELD field_25948 STRUCTURE_POOLS Lnet/minecraft/class_6880; - METHOD method_17037 init ()V + FIELD field_25948 TOWN_CENTERS_KEY Lnet/minecraft/class_5321; + FIELD field_40958 TERMINATORS_KEY Lnet/minecraft/class_5321; + FIELD field_40959 ZOMBIE_TERMINATORS_KEY Lnet/minecraft/class_5321; + METHOD method_17037 bootstrap (Lnet/minecraft/class_7891;)V + ARG 0 poolRegisterable diff --git a/mappings/net/minecraft/structure/EndCityGenerator.mapping b/mappings/net/minecraft/structure/EndCityGenerator.mapping index 1c49e0afa7..c61488c195 100644 --- a/mappings/net/minecraft/structure/EndCityGenerator.mapping +++ b/mappings/net/minecraft/structure/EndCityGenerator.mapping @@ -44,6 +44,8 @@ CLASS net/minecraft/class_3342 net/minecraft/structure/EndCityGenerator ARG 2 nbt METHOD method_35425 getId (Ljava/lang/String;)Lnet/minecraft/class_2960; ARG 0 template + METHOD method_35426 (Lnet/minecraft/class_2487;Lnet/minecraft/class_2960;)Lnet/minecraft/class_3492; + ARG 1 id METHOD method_35427 createPlacementData (ZLnet/minecraft/class_2470;)Lnet/minecraft/class_3492; ARG 0 includeAir ARG 1 rotation diff --git a/mappings/net/minecraft/structure/HoglinStableData.mapping b/mappings/net/minecraft/structure/HoglinStableData.mapping deleted file mode 100644 index 27f5a1de79..0000000000 --- a/mappings/net/minecraft/structure/HoglinStableData.mapping +++ /dev/null @@ -1,2 +0,0 @@ -CLASS net/minecraft/class_5177 net/minecraft/structure/HoglinStableData - METHOD method_27199 init ()V diff --git a/mappings/net/minecraft/structure/MineshaftGenerator.mapping b/mappings/net/minecraft/structure/MineshaftGenerator.mapping index 2c2bea8024..28e06a2183 100644 --- a/mappings/net/minecraft/structure/MineshaftGenerator.mapping +++ b/mappings/net/minecraft/structure/MineshaftGenerator.mapping @@ -82,7 +82,7 @@ CLASS net/minecraft/class_3353 net/minecraft/structure/MineshaftGenerator ARG 4 y ARG 5 z ARG 6 box - METHOD method_36422 (Lnet/minecraft/class_5281;Lnet/minecraft/class_3341;IIII)Z + METHOD method_36422 hasSolidNeighborBlocks (Lnet/minecraft/class_5281;Lnet/minecraft/class_3341;IIII)Z ARG 1 world ARG 2 box ARG 3 x diff --git a/mappings/net/minecraft/structure/OceanMonumentGenerator.mapping b/mappings/net/minecraft/structure/OceanMonumentGenerator.mapping index e5df8e57da..1d0c73d79c 100644 --- a/mappings/net/minecraft/structure/OceanMonumentGenerator.mapping +++ b/mappings/net/minecraft/structure/OceanMonumentGenerator.mapping @@ -7,6 +7,9 @@ CLASS net/minecraft/class_3366 net/minecraft/structure/OceanMonumentGenerator CLASS class_3372 SimpleRoomFactory CLASS class_3373 SimpleRoomTopFactory CLASS class_3374 Base + FIELD field_14464 entryPieceSetting Lnet/minecraft/class_3366$class_3388; + FIELD field_14465 children Ljava/util/List; + FIELD field_14466 coreRoomPieceSetting Lnet/minecraft/class_3366$class_3388; METHOD (Lnet/minecraft/class_2487;)V ARG 1 nbt METHOD (Lnet/minecraft/class_5819;IILnet/minecraft/class_2350;)V @@ -136,7 +139,7 @@ CLASS net/minecraft/class_3366 net/minecraft/structure/OceanMonumentGenerator ARG 7 height ARG 8 depth ARG 9 state - METHOD method_14772 spawnElderGuardian (Lnet/minecraft/class_5281;Lnet/minecraft/class_3341;III)Z + METHOD method_14772 spawnElderGuardian (Lnet/minecraft/class_5281;Lnet/minecraft/class_3341;III)V ARG 1 world ARG 2 box ARG 3 x @@ -156,10 +159,12 @@ CLASS net/minecraft/class_3366 net/minecraft/structure/OceanMonumentGenerator ARG 2 box ARG 3 x ARG 4 z - METHOD method_14775 (Lnet/minecraft/class_3341;IIII)Z + METHOD method_14775 boxIntersects (Lnet/minecraft/class_3341;IIII)Z ARG 1 box - ARG 2 x - ARG 4 z + ARG 2 x1 + ARG 3 z1 + ARG 4 x2 + ARG 5 z2 METHOD method_35445 createBox (Lnet/minecraft/class_2350;Lnet/minecraft/class_3366$class_3388;III)Lnet/minecraft/class_3341; ARG 0 orientation ARG 1 setting diff --git a/mappings/net/minecraft/structure/OceanRuinGenerator.mapping b/mappings/net/minecraft/structure/OceanRuinGenerator.mapping index 7ee65124f4..5b19803208 100644 --- a/mappings/net/minecraft/structure/OceanRuinGenerator.mapping +++ b/mappings/net/minecraft/structure/OceanRuinGenerator.mapping @@ -7,24 +7,29 @@ CLASS net/minecraft/class_3409 net/minecraft/structure/OceanRuinGenerator FIELD field_14520 BIG_CRACKED_RUINS [Lnet/minecraft/class_2960; FIELD field_14521 WARM_RUINS [Lnet/minecraft/class_2960; FIELD field_14522 MOSSY_RUINS [Lnet/minecraft/class_2960; + FIELD field_43327 SUSPICIOUS_SAND_PROCESSOR Lnet/minecraft/class_3491; + FIELD field_43328 SUSPICIOUS_GRAVEL_PROCESSOR Lnet/minecraft/class_3491; METHOD method_14821 getRoomPositions (Lnet/minecraft/class_5819;Lnet/minecraft/class_2338;)Ljava/util/List; ARG 0 random ARG 1 pos - METHOD method_14822 (Lnet/minecraft/class_3485;Lnet/minecraft/class_2338;Lnet/minecraft/class_2470;Lnet/minecraft/class_6130;Lnet/minecraft/class_5819;Lnet/minecraft/class_3411;ZF)V + METHOD method_14822 addPieces (Lnet/minecraft/class_3485;Lnet/minecraft/class_2338;Lnet/minecraft/class_2470;Lnet/minecraft/class_6130;Lnet/minecraft/class_5819;Lnet/minecraft/class_3411;ZF)V ARG 0 manager ARG 1 pos ARG 2 rotation ARG 3 holder ARG 4 random + ARG 5 structure ARG 6 large ARG 7 integrity METHOD method_14824 getRandomWarmRuin (Lnet/minecraft/class_5819;)Lnet/minecraft/class_2960; ARG 0 random - METHOD method_14825 (Lnet/minecraft/class_3485;Lnet/minecraft/class_5819;Lnet/minecraft/class_2470;Lnet/minecraft/class_2338;Lnet/minecraft/class_3411;Lnet/minecraft/class_6130;)V + METHOD method_14825 addCluster (Lnet/minecraft/class_3485;Lnet/minecraft/class_5819;Lnet/minecraft/class_2470;Lnet/minecraft/class_2338;Lnet/minecraft/class_3411;Lnet/minecraft/class_6130;)V ARG 0 manager ARG 1 random ARG 2 rotation ARG 3 pos + ARG 4 structure + ARG 5 pieces METHOD method_14826 getRandomBigWarmRuin (Lnet/minecraft/class_5819;)Lnet/minecraft/class_2960; ARG 0 random METHOD method_14827 addPieces (Lnet/minecraft/class_3485;Lnet/minecraft/class_2338;Lnet/minecraft/class_2470;Lnet/minecraft/class_6130;Lnet/minecraft/class_5819;Lnet/minecraft/class_3411;)V @@ -33,13 +38,22 @@ CLASS net/minecraft/class_3409 net/minecraft/structure/OceanRuinGenerator ARG 2 rotation ARG 3 holder ARG 4 random + ARG 5 structure + METHOD method_49885 createArchaeologyStructureProcessor (Lnet/minecraft/class_2248;Lnet/minecraft/class_2248;Lnet/minecraft/class_2960;)Lnet/minecraft/class_3491; + ARG 0 baseBlock + ARG 1 suspiciousBlock + ARG 2 lootTableId CLASS class_3410 Piece FIELD field_14524 integrity F FIELD field_14525 large Z FIELD field_14527 biomeType Lnet/minecraft/class_3411$class_3413; - METHOD (Lnet/minecraft/class_3485;Lnet/minecraft/class_2487;)V + METHOD (Lnet/minecraft/class_3485;Lnet/minecraft/class_2487;Lnet/minecraft/class_2470;FLnet/minecraft/class_3411$class_3413;Z)V ARG 1 holder ARG 2 nbt + ARG 3 rotation + ARG 4 integrity + ARG 5 biomeType + ARG 6 large METHOD (Lnet/minecraft/class_3485;Lnet/minecraft/class_2960;Lnet/minecraft/class_2338;Lnet/minecraft/class_2470;FLnet/minecraft/class_3411$class_3413;Z)V ARG 1 structureTemplateManager ARG 2 template @@ -48,9 +62,14 @@ CLASS net/minecraft/class_3409 net/minecraft/structure/OceanRuinGenerator ARG 5 integrity ARG 6 biomeType ARG 7 large - METHOD method_14829 (Lnet/minecraft/class_2338;Lnet/minecraft/class_1922;Lnet/minecraft/class_2338;)I + METHOD method_14829 getGenerationY (Lnet/minecraft/class_2338;Lnet/minecraft/class_1922;Lnet/minecraft/class_2338;)I ARG 1 start ARG 2 world ARG 3 end - METHOD method_35446 createPlacementData (Lnet/minecraft/class_2470;)Lnet/minecraft/class_3492; + METHOD method_35446 createPlacementData (Lnet/minecraft/class_2470;FLnet/minecraft/class_3411$class_3413;)Lnet/minecraft/class_3492; ARG 0 rotation + ARG 1 integrity + ARG 2 temperature + METHOD method_49886 fromNbt (Lnet/minecraft/class_3485;Lnet/minecraft/class_2487;)Lnet/minecraft/class_3409$class_3410; + ARG 0 structureTemplateManager + ARG 1 nbt diff --git a/mappings/net/minecraft/structure/PillagerOutpostGenerator.mapping b/mappings/net/minecraft/structure/PillagerOutpostGenerator.mapping index dc1f55286d..dd02f545c6 100644 --- a/mappings/net/minecraft/structure/PillagerOutpostGenerator.mapping +++ b/mappings/net/minecraft/structure/PillagerOutpostGenerator.mapping @@ -1,3 +1,4 @@ CLASS net/minecraft/class_3791 net/minecraft/structure/PillagerOutpostGenerator - FIELD field_26252 STRUCTURE_POOLS Lnet/minecraft/class_6880; - METHOD method_27235 init ()V + FIELD field_26252 STRUCTURE_POOLS Lnet/minecraft/class_5321; + METHOD method_27235 bootstrap (Lnet/minecraft/class_7891;)V + ARG 0 poolRegisterable diff --git a/mappings/net/minecraft/structure/PlainsVillageData.mapping b/mappings/net/minecraft/structure/PlainsVillageData.mapping index 12e6f8195b..518b38ac5b 100644 --- a/mappings/net/minecraft/structure/PlainsVillageData.mapping +++ b/mappings/net/minecraft/structure/PlainsVillageData.mapping @@ -1,3 +1,5 @@ CLASS net/minecraft/class_3815 net/minecraft/structure/PlainsVillageData - FIELD field_26253 STRUCTURE_POOLS Lnet/minecraft/class_6880; - METHOD method_16754 init ()V + FIELD field_26253 TOWN_CENTERS_KEY Lnet/minecraft/class_5321; + FIELD field_40961 TERMINATORS_KEY Lnet/minecraft/class_5321; + METHOD method_16754 bootstrap (Lnet/minecraft/class_7891;)V + ARG 0 poolRegisterable diff --git a/mappings/net/minecraft/structure/RuinedPortalStructurePiece.mapping b/mappings/net/minecraft/structure/RuinedPortalStructurePiece.mapping index d8b6c7fab7..c9b996bcc6 100644 --- a/mappings/net/minecraft/structure/RuinedPortalStructurePiece.mapping +++ b/mappings/net/minecraft/structure/RuinedPortalStructurePiece.mapping @@ -1,6 +1,7 @@ CLASS net/minecraft/class_5189 net/minecraft/structure/RuinedPortalStructurePiece FIELD field_24021 verticalPlacement Lnet/minecraft/class_5189$class_5191; FIELD field_24022 properties Lnet/minecraft/class_5189$class_5190; + FIELD field_24992 LOGGER Lorg/slf4j/Logger; METHOD (Lnet/minecraft/class_3485;Lnet/minecraft/class_2338;Lnet/minecraft/class_5189$class_5191;Lnet/minecraft/class_5189$class_5190;Lnet/minecraft/class_2960;Lnet/minecraft/class_3499;Lnet/minecraft/class_2470;Lnet/minecraft/class_2415;Lnet/minecraft/class_2338;)V ARG 1 manager ARG 2 pos @@ -88,6 +89,7 @@ CLASS net/minecraft/class_5189 net/minecraft/structure/RuinedPortalStructurePiec ARG 0 instance CLASS class_5191 VerticalPlacement FIELD field_24036 id Ljava/lang/String; + FIELD field_37811 CODEC Lnet/minecraft/class_3542$class_7292; METHOD (Ljava/lang/String;ILjava/lang/String;)V ARG 3 id METHOD method_27252 getId ()Ljava/lang/String; diff --git a/mappings/net/minecraft/structure/SavannaVillageData.mapping b/mappings/net/minecraft/structure/SavannaVillageData.mapping index 70cd68e25d..ba48bd0b0a 100644 --- a/mappings/net/minecraft/structure/SavannaVillageData.mapping +++ b/mappings/net/minecraft/structure/SavannaVillageData.mapping @@ -1,3 +1,6 @@ CLASS net/minecraft/class_3834 net/minecraft/structure/SavannaVillageData - FIELD field_26285 STRUCTURE_POOLS Lnet/minecraft/class_6880; - METHOD method_16844 init ()V + FIELD field_26285 TOWN_CENTERS_KEY Lnet/minecraft/class_5321; + FIELD field_40962 TERMINATORS_KEY Lnet/minecraft/class_5321; + FIELD field_40963 ZOMBIE_TERMINATORS_KEY Lnet/minecraft/class_5321; + METHOD method_16844 bootstrap (Lnet/minecraft/class_7891;)V + ARG 0 poolRegisterable diff --git a/mappings/net/minecraft/structure/ShiftableStructurePiece.mapping b/mappings/net/minecraft/structure/ShiftableStructurePiece.mapping index 93fb1ded3e..11f3c8d9d9 100644 --- a/mappings/net/minecraft/structure/ShiftableStructurePiece.mapping +++ b/mappings/net/minecraft/structure/ShiftableStructurePiece.mapping @@ -18,3 +18,4 @@ CLASS net/minecraft/class_3418 net/minecraft/structure/ShiftableStructurePiece ARG 3 deltaY METHOD method_38462 adjustToMinHeight (Lnet/minecraft/class_1936;I)Z ARG 1 world + ARG 2 yOffset diff --git a/mappings/net/minecraft/structure/ShipwreckGenerator.mapping b/mappings/net/minecraft/structure/ShipwreckGenerator.mapping index 2cded86477..5c491d92bf 100644 --- a/mappings/net/minecraft/structure/ShipwreckGenerator.mapping +++ b/mappings/net/minecraft/structure/ShipwreckGenerator.mapping @@ -9,6 +9,7 @@ CLASS net/minecraft/class_3415 net/minecraft/structure/ShipwreckGenerator ARG 2 rotation ARG 3 holder ARG 4 random + ARG 5 beached CLASS class_3416 Piece FIELD field_14538 grounded Z METHOD (Lnet/minecraft/class_3485;Lnet/minecraft/class_2487;)V @@ -22,3 +23,5 @@ CLASS net/minecraft/class_3415 net/minecraft/structure/ShipwreckGenerator ARG 5 grounded METHOD method_35452 createPlacementData (Lnet/minecraft/class_2470;)Lnet/minecraft/class_3492; ARG 0 rotation + METHOD method_35453 (Lnet/minecraft/class_2487;Lnet/minecraft/class_2960;)Lnet/minecraft/class_3492; + ARG 1 id diff --git a/mappings/net/minecraft/structure/SimpleStructurePiece.mapping b/mappings/net/minecraft/structure/SimpleStructurePiece.mapping index e9fe0f7537..590d2a6650 100644 --- a/mappings/net/minecraft/structure/SimpleStructurePiece.mapping +++ b/mappings/net/minecraft/structure/SimpleStructurePiece.mapping @@ -25,3 +25,5 @@ CLASS net/minecraft/class_3470 net/minecraft/structure/SimpleStructurePiece ARG 5 boundingBox METHOD method_35470 getId ()Lnet/minecraft/class_2960; METHOD method_41624 getTemplate ()Lnet/minecraft/class_3499; + METHOD method_41625 getPos ()Lnet/minecraft/class_2338; + METHOD method_41626 getPlacementData ()Lnet/minecraft/class_3492; diff --git a/mappings/net/minecraft/structure/SnowyVillageData.mapping b/mappings/net/minecraft/structure/SnowyVillageData.mapping index 597d21cf92..579a5dfc7b 100644 --- a/mappings/net/minecraft/structure/SnowyVillageData.mapping +++ b/mappings/net/minecraft/structure/SnowyVillageData.mapping @@ -1,3 +1,5 @@ CLASS net/minecraft/class_3836 net/minecraft/structure/SnowyVillageData - FIELD field_26286 STRUCTURE_POOLS Lnet/minecraft/class_6880; - METHOD method_16845 init ()V + FIELD field_26286 TOWN_CENTERS_KEY Lnet/minecraft/class_5321; + FIELD field_40964 TERMINATORS_KEY Lnet/minecraft/class_5321; + METHOD method_16845 bootstrap (Lnet/minecraft/class_7891;)V + ARG 0 poolRegisterable diff --git a/mappings/net/minecraft/structure/StructurePlacementData.mapping b/mappings/net/minecraft/structure/StructurePlacementData.mapping index 9b7563cea0..5b7f8385a1 100644 --- a/mappings/net/minecraft/structure/StructurePlacementData.mapping +++ b/mappings/net/minecraft/structure/StructurePlacementData.mapping @@ -19,6 +19,7 @@ CLASS net/minecraft/class_3492 net/minecraft/structure/StructurePlacementData ARG 1 position METHOD method_15120 shouldPlaceFluids ()Z METHOD method_15121 getRandomBlockInfos (Ljava/util/List;Lnet/minecraft/class_2338;)Lnet/minecraft/class_3499$class_5162; + ARG 1 infoLists ARG 2 pos METHOD method_15123 setRotation (Lnet/minecraft/class_2470;)Lnet/minecraft/class_3492; ARG 1 rotation diff --git a/mappings/net/minecraft/structure/StructureSets.mapping b/mappings/net/minecraft/structure/StructureSets.mapping index 5fc7791a34..6923cfb73d 100644 --- a/mappings/net/minecraft/structure/StructureSets.mapping +++ b/mappings/net/minecraft/structure/StructureSets.mapping @@ -1,27 +1,3 @@ CLASS net/minecraft/class_7072 net/minecraft/structure/StructureSets - FIELD field_37233 VILLAGES Lnet/minecraft/class_6880; - FIELD field_37234 DESERT_PYRAMIDS Lnet/minecraft/class_6880; - FIELD field_37235 IGLOOS Lnet/minecraft/class_6880; - FIELD field_37236 JUNGLE_TEMPLES Lnet/minecraft/class_6880; - FIELD field_37237 SWAMP_HUTS Lnet/minecraft/class_6880; - FIELD field_37238 PILLAGER_OUTPOSTS Lnet/minecraft/class_6880; - FIELD field_37239 OCEAN_MONUMENTS Lnet/minecraft/class_6880; - FIELD field_37240 WOODLAND_MANSIONS Lnet/minecraft/class_6880; - FIELD field_37241 BURIED_TREASURES Lnet/minecraft/class_6880; - FIELD field_37242 MINESHAFTS Lnet/minecraft/class_6880; - FIELD field_37243 RUINED_PORTALS Lnet/minecraft/class_6880; - FIELD field_37244 SHIPWRECKS Lnet/minecraft/class_6880; - FIELD field_37245 OCEAN_RUINS Lnet/minecraft/class_6880; - FIELD field_37246 NETHER_COMPLEXES Lnet/minecraft/class_6880; - FIELD field_37247 NETHER_FOSSILS Lnet/minecraft/class_6880; - FIELD field_37248 END_CITIES Lnet/minecraft/class_6880; - FIELD field_37249 STRONGHOLDS Lnet/minecraft/class_6880; - FIELD field_38475 ANCIENT_CITIES Lnet/minecraft/class_6880; - METHOD method_41182 initAndGetDefault (Lnet/minecraft/class_2378;)Lnet/minecraft/class_6880; - METHOD method_41183 register (Lnet/minecraft/class_5321;Lnet/minecraft/class_7059;)Lnet/minecraft/class_6880; - ARG 0 key - ARG 1 structureSet - METHOD method_41184 register (Lnet/minecraft/class_5321;Lnet/minecraft/class_6880;Lnet/minecraft/class_6874;)Lnet/minecraft/class_6880; - ARG 0 key - ARG 1 structure - ARG 2 placement + METHOD method_41182 bootstrap (Lnet/minecraft/class_7891;)V + ARG 0 structureSetRegisterable diff --git a/mappings/net/minecraft/structure/StructureTemplate.mapping b/mappings/net/minecraft/structure/StructureTemplate.mapping index 246e1b0841..74501f0459 100644 --- a/mappings/net/minecraft/structure/StructureTemplate.mapping +++ b/mappings/net/minecraft/structure/StructureTemplate.mapping @@ -75,9 +75,10 @@ CLASS net/minecraft/class_3499 net/minecraft/structure/StructureTemplate ARG 1 mirror ARG 2 rotation ARG 3 pivot - METHOD method_15177 loadPalettedBlockInfo (Lnet/minecraft/class_2499;Lnet/minecraft/class_2499;)V - ARG 1 paletteNbt - ARG 2 blocksNbt + METHOD method_15177 loadPalettedBlockInfo (Lnet/minecraft/class_7871;Lnet/minecraft/class_2499;Lnet/minecraft/class_2499;)V + ARG 1 blockLookup + ARG 2 palette + ARG 3 blocks 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 @@ -92,8 +93,9 @@ CLASS net/minecraft/class_3499 net/minecraft/structure/StructureTemplate ARG 3 placementData2 ARG 4 pos2 METHOD method_15181 getAuthor ()Ljava/lang/String; - METHOD method_15183 readNbt (Lnet/minecraft/class_2487;)V - ARG 1 nbt + METHOD method_15183 readNbt (Lnet/minecraft/class_7871;Lnet/minecraft/class_2487;)V + ARG 1 blockLookup + ARG 2 nbt METHOD method_15184 createNbtDoubleList ([D)Lnet/minecraft/class_2499; ARG 1 doubles METHOD method_16185 (Lnet/minecraft/class_3499$class_3501;)I @@ -105,7 +107,7 @@ CLASS net/minecraft/class_3499 net/minecraft/structure/StructureTemplate ARG 1 pos ARG 2 placementData ARG 3 block - 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; + METHOD method_16446 process (Lnet/minecraft/class_5425;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 2 pivot @@ -180,9 +182,6 @@ CLASS net/minecraft/class_3499 net/minecraft/structure/StructureTemplate METHOD method_15187 getId (Lnet/minecraft/class_2680;)I ARG 1 state CLASS class_3501 StructureBlockInfo - FIELD field_15595 nbt Lnet/minecraft/class_2487; - FIELD field_15596 state Lnet/minecraft/class_2680; - FIELD field_15597 pos Lnet/minecraft/class_2338; METHOD (Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;Lnet/minecraft/class_2487;)V ARG 1 pos ARG 2 state diff --git a/mappings/net/minecraft/structure/StructureTemplateManager.mapping b/mappings/net/minecraft/structure/StructureTemplateManager.mapping index a46b92425e..72402794ed 100644 --- a/mappings/net/minecraft/structure/StructureTemplateManager.mapping +++ b/mappings/net/minecraft/structure/StructureTemplateManager.mapping @@ -9,10 +9,13 @@ CLASS net/minecraft/class_3485 net/minecraft/structure/StructureTemplateManager FIELD field_31686 SNBT_FILE_EXTENSION Ljava/lang/String; FIELD field_39416 GAME_TEST_STRUCTURES_DIRECTORY Ljava/lang/String; FIELD field_39417 providers Ljava/util/List; - METHOD (Lnet/minecraft/class_3300;Lnet/minecraft/class_32$class_5143;Lcom/mojang/datafixers/DataFixer;)V + FIELD field_40369 blockLookup Lnet/minecraft/class_7871; + FIELD field_40370 NBT_FINDER Lnet/minecraft/class_7654; + METHOD (Lnet/minecraft/class_3300;Lnet/minecraft/class_32$class_5143;Lcom/mojang/datafixers/DataFixer;Lnet/minecraft/class_7871;)V ARG 1 resourceManager ARG 2 session ARG 3 dataFixer + ARG 4 blockLookup METHOD method_15085 getTemplatePath (Ljava/nio/file/Path;Lnet/minecraft/class_2960;Ljava/lang/String;)Ljava/nio/file/Path; ARG 0 path ARG 1 id @@ -82,9 +85,5 @@ CLASS net/minecraft/class_3485 net/minecraft/structure/StructureTemplateManager ARG 1 id METHOD method_44246 loadTemplateFromGameTestFile (Lnet/minecraft/class_2960;)Ljava/util/Optional; ARG 1 id - METHOD method_44247 (Lnet/minecraft/class_2960;)Lnet/minecraft/class_2960; - ARG 0 id - METHOD method_44248 (Lnet/minecraft/class_2960;)Z - ARG 0 id CLASS class_7513 TemplateFileOpener CLASS class_7514 Provider diff --git a/mappings/net/minecraft/structure/TaigaVillageData.mapping b/mappings/net/minecraft/structure/TaigaVillageData.mapping index 9c616d60ce..8847695fda 100644 --- a/mappings/net/minecraft/structure/TaigaVillageData.mapping +++ b/mappings/net/minecraft/structure/TaigaVillageData.mapping @@ -1,3 +1,5 @@ CLASS net/minecraft/class_3870 net/minecraft/structure/TaigaVillageData - FIELD field_26341 STRUCTURE_POOLS Lnet/minecraft/class_6880; - METHOD method_17038 init ()V + FIELD field_26341 TOWN_CENTERS_KEY Lnet/minecraft/class_5321; + FIELD field_40965 TERMINATORS_KEY Lnet/minecraft/class_5321; + METHOD method_17038 bootstrap (Lnet/minecraft/class_7891;)V + ARG 0 poolRegisterable diff --git a/mappings/net/minecraft/structure/TrailRuinsGenerator.mapping b/mappings/net/minecraft/structure/TrailRuinsGenerator.mapping new file mode 100644 index 0000000000..3623a1ee90 --- /dev/null +++ b/mappings/net/minecraft/structure/TrailRuinsGenerator.mapping @@ -0,0 +1,4 @@ +CLASS net/minecraft/class_8256 net/minecraft/structure/TrailRuinsGenerator + FIELD field_43386 TOWER Lnet/minecraft/class_5321; + METHOD method_49993 bootstrap (Lnet/minecraft/class_7891;)V + ARG 0 poolRegisterable diff --git a/mappings/net/minecraft/structure/VillageGenerator.mapping b/mappings/net/minecraft/structure/VillageGenerator.mapping index b439554f16..a6debca10f 100644 --- a/mappings/net/minecraft/structure/VillageGenerator.mapping +++ b/mappings/net/minecraft/structure/VillageGenerator.mapping @@ -1,2 +1,3 @@ CLASS net/minecraft/class_3813 net/minecraft/structure/VillageGenerator - METHOD method_27221 init ()V + METHOD method_27221 bootstrap (Lnet/minecraft/class_7891;)V + ARG 0 poolRegisterable diff --git a/mappings/net/minecraft/structure/WoodlandMansionGenerator.mapping b/mappings/net/minecraft/structure/WoodlandMansionGenerator.mapping index d4a945049b..6c1acb27d6 100644 --- a/mappings/net/minecraft/structure/WoodlandMansionGenerator.mapping +++ b/mappings/net/minecraft/structure/WoodlandMansionGenerator.mapping @@ -10,8 +10,6 @@ CLASS net/minecraft/class_3471 net/minecraft/structure/WoodlandMansionGenerator ARG 2 rotation ARG 3 pieces ARG 4 random - METHOD method_35471 printRandomFloorLayouts ([Ljava/lang/String;)V - ARG 0 args CLASS class_3472 FirstFloorRoomPool COMMENT The {@link RoomPool} used for the first floor. CLASS class_3473 RoomPool @@ -119,11 +117,6 @@ CLASS net/minecraft/class_3471 net/minecraft/structure/WoodlandMansionGenerator ARG 1 i ARG 2 j METHOD method_15048 layoutThirdFloor ()V - METHOD method_35472 printFloorLayouts ()V - COMMENT Prints a string representation of {@link #baseLayout} and {@link - COMMENT #thirdFloorLayout}. Useful for debugging. - COMMENT - COMMENT @see WoodlandMansionGenerator#printRandomFloorLayouts CLASS class_3475 LayoutGenerator COMMENT Populates structure pieces based on the given {@link MansionParameters COMMENT parameters}. diff --git a/mappings/net/minecraft/structure/pool/SinglePoolElement.mapping b/mappings/net/minecraft/structure/pool/SinglePoolElement.mapping index c9892310a5..73adefd2cd 100644 --- a/mappings/net/minecraft/structure/pool/SinglePoolElement.mapping +++ b/mappings/net/minecraft/structure/pool/SinglePoolElement.mapping @@ -7,8 +7,6 @@ CLASS net/minecraft/class_3781 net/minecraft/structure/pool/SinglePoolElement ARG 1 location ARG 2 processors ARG 3 projection - METHOD (Lnet/minecraft/class_3499;)V - ARG 1 template METHOD method_16614 getDataStructureBlocks (Lnet/minecraft/class_3485;Lnet/minecraft/class_2338;Lnet/minecraft/class_2470;Z)Ljava/util/List; ARG 1 structureTemplateManager ARG 2 pos diff --git a/mappings/net/minecraft/structure/pool/StructurePool.mapping b/mappings/net/minecraft/structure/pool/StructurePool.mapping index cc7ff74b6e..22b53dd062 100644 --- a/mappings/net/minecraft/structure/pool/StructurePool.mapping +++ b/mappings/net/minecraft/structure/pool/StructurePool.mapping @@ -1,29 +1,24 @@ CLASS net/minecraft/class_3785 net/minecraft/structure/pool/StructurePool - FIELD field_16678 id Lnet/minecraft/class_2960; FIELD field_16680 elements Lit/unimi/dsi/fastutil/objects/ObjectArrayList; - FIELD field_16681 terminatorsId Lnet/minecraft/class_2960; FIELD field_16864 elementCounts Ljava/util/List; FIELD field_18707 highestY I FIELD field_24954 REGISTRY_CODEC Lcom/mojang/serialization/Codec; - FIELD field_24955 LOGGER Lorg/slf4j/Logger; FIELD field_25853 CODEC Lcom/mojang/serialization/Codec; FIELD field_31523 DEFAULT_Y I - METHOD (Lnet/minecraft/class_2960;Lnet/minecraft/class_2960;Ljava/util/List;)V - ARG 1 id - ARG 2 terminatorsId - ARG 3 elementCounts - METHOD (Lnet/minecraft/class_2960;Lnet/minecraft/class_2960;Ljava/util/List;Lnet/minecraft/class_3785$class_3786;)V - ARG 1 id - ARG 2 terminatorsId - ARG 3 elementCounts - ARG 4 projection - METHOD method_16629 getId ()Lnet/minecraft/class_2960; + FIELD field_40925 FALLBACK Lorg/apache/commons/lang3/mutable/MutableObject; + FIELD field_40926 fallback Lnet/minecraft/class_6880; + METHOD (Lnet/minecraft/class_6880;Ljava/util/List;)V + ARG 1 fallback + ARG 2 elementCounts + METHOD (Lnet/minecraft/class_6880;Ljava/util/List;Lnet/minecraft/class_3785$class_3786;)V + ARG 1 fallback + ARG 2 elementCountsByGetters + ARG 3 projection METHOD method_16631 getRandomElement (Lnet/minecraft/class_5819;)Lnet/minecraft/class_3784; ARG 1 random METHOD method_16632 getElementCount ()I METHOD method_16633 getElementIndicesInRandomOrder (Lnet/minecraft/class_5819;)Ljava/util/List; ARG 1 random - METHOD method_16634 getTerminatorsId ()Lnet/minecraft/class_2960; METHOD method_19309 getHighestY (Lnet/minecraft/class_3485;)I ARG 1 structureTemplateManager METHOD method_19310 (Lnet/minecraft/class_3485;Lnet/minecraft/class_3784;)I @@ -34,6 +29,7 @@ CLASS net/minecraft/class_3785 net/minecraft/structure/pool/StructurePool ARG 0 pool METHOD method_35372 (Lnet/minecraft/class_3784;)Z ARG 0 element + METHOD method_46736 getFallback ()Lnet/minecraft/class_6880; CLASS class_3786 Projection FIELD field_16682 id Ljava/lang/String; FIELD field_16685 processors Lcom/google/common/collect/ImmutableList; diff --git a/mappings/net/minecraft/structure/pool/StructurePoolBasedGenerator.mapping b/mappings/net/minecraft/structure/pool/StructurePoolBasedGenerator.mapping index 8fb549f17f..9770fe1e89 100644 --- a/mappings/net/minecraft/structure/pool/StructurePoolBasedGenerator.mapping +++ b/mappings/net/minecraft/structure/pool/StructurePoolBasedGenerator.mapping @@ -34,8 +34,13 @@ CLASS net/minecraft/class_3778 net/minecraft/structure/pool/StructurePoolBasedGe ARG 0 world ARG 1 structurePool ARG 2 id + ARG 3 size ARG 4 pos ARG 5 keepJigsaws + METHOD method_43730 (Lnet/minecraft/class_6880;)Z + ARG 0 biome + METHOD method_45548 (Lnet/minecraft/class_5321;)Ljava/lang/String; + ARG 0 key CLASS class_4181 ShapedPoolStructurePiece FIELD field_18696 piece Lnet/minecraft/class_3790; FIELD field_18697 pieceShape Lorg/apache/commons/lang3/mutable/MutableObject; @@ -59,6 +64,8 @@ CLASS net/minecraft/class_3778 net/minecraft/structure/pool/StructurePoolBasedGe ARG 4 structureTemplateManager ARG 5 children ARG 6 random + METHOD method_19305 (Lnet/minecraft/class_3341;Lnet/minecraft/class_3499$class_3501;)I + ARG 2 blockInfo METHOD method_19306 generatePiece (Lnet/minecraft/class_3790;Lorg/apache/commons/lang3/mutable/MutableObject;IZLnet/minecraft/class_5539;Lnet/minecraft/class_7138;)V ARG 1 piece ARG 2 pieceShape @@ -66,9 +73,13 @@ CLASS net/minecraft/class_3778 net/minecraft/structure/pool/StructurePoolBasedGe ARG 4 modifyBoundingBox ARG 5 world ARG 6 noiseConfig - METHOD method_31113 (Lnet/minecraft/class_3785;)Ljava/lang/Integer; - ARG 1 pool - METHOD method_31114 (Lnet/minecraft/class_3785;)Ljava/lang/Integer; - ARG 1 pool - METHOD method_31115 (Lnet/minecraft/class_3785;)Ljava/util/Optional; - ARG 1 pool + METHOD method_31113 (Lnet/minecraft/class_6880;)Ljava/lang/Integer; + ARG 1 entry + METHOD method_31114 (Lnet/minecraft/class_6880;)Ljava/lang/Integer; + ARG 1 entry + METHOD method_31115 (Lnet/minecraft/class_6880;)Lnet/minecraft/class_6880; + ARG 0 entry + METHOD method_46730 (Lnet/minecraft/class_5321;)Ljava/lang/String; + ARG 0 key + METHOD method_46731 getPoolKey (Lnet/minecraft/class_3499$class_3501;)Lnet/minecraft/class_5321; + ARG 0 blockInfo diff --git a/mappings/net/minecraft/structure/pool/StructurePoolElement.mapping b/mappings/net/minecraft/structure/pool/StructurePoolElement.mapping index 3b2b016a92..050b9c3940 100644 --- a/mappings/net/minecraft/structure/pool/StructurePoolElement.mapping +++ b/mappings/net/minecraft/structure/pool/StructurePoolElement.mapping @@ -1,6 +1,7 @@ CLASS net/minecraft/class_3784 net/minecraft/structure/pool/StructurePoolElement FIELD field_16862 projection Lnet/minecraft/class_3785$class_3786; FIELD field_24953 CODEC Lcom/mojang/serialization/Codec; + FIELD field_40924 EMPTY_PROCESSORS Lnet/minecraft/class_6880; METHOD (Lnet/minecraft/class_3785$class_3786;)V ARG 1 projection METHOD method_16601 getStart (Lnet/minecraft/class_3485;Lnet/minecraft/class_2470;)Lnet/minecraft/class_2382; diff --git a/mappings/net/minecraft/structure/pool/StructurePools.mapping b/mappings/net/minecraft/structure/pool/StructurePools.mapping index 213380cd15..57fea218b3 100644 --- a/mappings/net/minecraft/structure/pool/StructurePools.mapping +++ b/mappings/net/minecraft/structure/pool/StructurePools.mapping @@ -1,6 +1,10 @@ CLASS net/minecraft/class_5468 net/minecraft/structure/pool/StructurePools FIELD field_26254 EMPTY Lnet/minecraft/class_5321; - FIELD field_26255 INVALID Lnet/minecraft/class_6880; - METHOD method_30599 initDefaultPools (Lnet/minecraft/class_2378;)Lnet/minecraft/class_6880; - METHOD method_30600 register (Lnet/minecraft/class_3785;)Lnet/minecraft/class_6880; - ARG 0 templatePool + METHOD method_30599 bootstrap (Lnet/minecraft/class_7891;)V + ARG 0 structurePoolsRegisterable + METHOD method_30600 register (Lnet/minecraft/class_7891;Ljava/lang/String;Lnet/minecraft/class_3785;)V + ARG 0 structurePoolsRegisterable + ARG 1 id + ARG 2 pool + METHOD method_46844 of (Ljava/lang/String;)Lnet/minecraft/class_5321; + ARG 0 id diff --git a/mappings/net/minecraft/structure/processor/BlockRotStructureProcessor.mapping b/mappings/net/minecraft/structure/processor/BlockRotStructureProcessor.mapping index dd3cdc83ff..2b47b2b586 100644 --- a/mappings/net/minecraft/structure/processor/BlockRotStructureProcessor.mapping +++ b/mappings/net/minecraft/structure/processor/BlockRotStructureProcessor.mapping @@ -7,7 +7,7 @@ CLASS net/minecraft/class_3488 net/minecraft/structure/processor/BlockRotStructu METHOD (Ljava/util/Optional;F)V ARG 1 rottableBlocks ARG 2 integrity - METHOD (Lnet/minecraft/class_6862;F)V + METHOD (Lnet/minecraft/class_6885;F)V ARG 1 rottableBlocks ARG 2 integrity METHOD method_42711 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; diff --git a/mappings/net/minecraft/structure/processor/CappedStructureProcessor.mapping b/mappings/net/minecraft/structure/processor/CappedStructureProcessor.mapping new file mode 100644 index 0000000000..6fd7874c68 --- /dev/null +++ b/mappings/net/minecraft/structure/processor/CappedStructureProcessor.mapping @@ -0,0 +1,13 @@ +CLASS net/minecraft/class_8243 net/minecraft/structure/processor/CappedStructureProcessor + FIELD field_43329 CODEC Lcom/mojang/serialization/Codec; + FIELD field_43330 delegate Lnet/minecraft/class_3491; + FIELD field_43331 limit Lnet/minecraft/class_6017; + METHOD (Lnet/minecraft/class_3491;Lnet/minecraft/class_6017;)V + ARG 1 delegate + ARG 2 limit + METHOD method_49888 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 0 instance + METHOD method_49889 (Lnet/minecraft/class_8243;)Lnet/minecraft/class_6017; + ARG 0 processor + METHOD method_49890 (Lnet/minecraft/class_8243;)Lnet/minecraft/class_3491; + ARG 0 processor diff --git a/mappings/net/minecraft/structure/processor/StructureProcessor.mapping b/mappings/net/minecraft/structure/processor/StructureProcessor.mapping index 5497c3416e..904729c466 100644 --- a/mappings/net/minecraft/structure/processor/StructureProcessor.mapping +++ b/mappings/net/minecraft/structure/processor/StructureProcessor.mapping @@ -7,3 +7,10 @@ CLASS net/minecraft/class_3491 net/minecraft/structure/processor/StructureProces ARG 5 currentBlockInfo ARG 6 data METHOD method_16772 getType ()Lnet/minecraft/class_3828; + METHOD method_49887 reprocess (Lnet/minecraft/class_5425;Lnet/minecraft/class_2338;Lnet/minecraft/class_2338;Ljava/util/List;Ljava/util/List;Lnet/minecraft/class_3492;)Ljava/util/List; + ARG 1 world + ARG 2 pos + ARG 3 pivot + ARG 4 originalBlockInfos + ARG 5 currentBlockInfos + ARG 6 data diff --git a/mappings/net/minecraft/structure/processor/StructureProcessorLists.mapping b/mappings/net/minecraft/structure/processor/StructureProcessorLists.mapping index c08e349e5d..57d1a0bf60 100644 --- a/mappings/net/minecraft/structure/processor/StructureProcessorLists.mapping +++ b/mappings/net/minecraft/structure/processor/StructureProcessorLists.mapping @@ -1,6 +1,12 @@ CLASS net/minecraft/class_5469 net/minecraft/structure/processor/StructureProcessorLists - FIELD field_26621 BLACKSTONE_TO_GILDED_BLACKSTONE Lnet/minecraft/class_3821; - FIELD field_26622 GILDED_BLACKSTONE_TO_BLACKSTONE Lnet/minecraft/class_3821; - METHOD method_30601 register (Ljava/lang/String;Lcom/google/common/collect/ImmutableList;)Lnet/minecraft/class_6880; + METHOD method_30601 register (Lnet/minecraft/class_7891;Lnet/minecraft/class_5321;Ljava/util/List;)V + ARG 0 processorListRegisterable + ARG 1 key + ARG 2 processors + METHOD method_46845 of (Ljava/lang/String;)Lnet/minecraft/class_5321; ARG 0 id - ARG 1 processorList + METHOD method_46846 bootstrap (Lnet/minecraft/class_7891;)V + ARG 0 processorListRegisterable + METHOD method_51464 createTrailRuinsTowerTopProcessor (Lnet/minecraft/class_2960;I)Lnet/minecraft/class_8243; + ARG 0 lootTableId + ARG 1 limit diff --git a/mappings/net/minecraft/structure/processor/StructureProcessorRule.mapping b/mappings/net/minecraft/structure/processor/StructureProcessorRule.mapping index 26178da36f..9d2991d0c6 100644 --- a/mappings/net/minecraft/structure/processor/StructureProcessorRule.mapping +++ b/mappings/net/minecraft/structure/processor/StructureProcessorRule.mapping @@ -2,9 +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 outputNbt Lnet/minecraft/class_2487; FIELD field_23347 positionPredicate Lnet/minecraft/class_4995; FIELD field_25008 CODEC Lcom/mojang/serialization/Codec; + FIELD field_43333 DEFAULT_BLOCK_ENTITY_MODIFIER Lnet/minecraft/class_8247; + FIELD field_43334 blockEntityModifier Lnet/minecraft/class_8248; METHOD (Lnet/minecraft/class_3825;Lnet/minecraft/class_3825;Lnet/minecraft/class_2680;)V ARG 1 inputPredicate ARG 2 locationPredicate @@ -14,22 +15,26 @@ CLASS net/minecraft/class_3821 net/minecraft/structure/processor/StructureProces ARG 2 locationPredicate ARG 3 positionPredicate ARG 4 state - METHOD (Lnet/minecraft/class_3825;Lnet/minecraft/class_3825;Lnet/minecraft/class_4995;Lnet/minecraft/class_2680;Ljava/util/Optional;)V + METHOD (Lnet/minecraft/class_3825;Lnet/minecraft/class_3825;Lnet/minecraft/class_4995;Lnet/minecraft/class_2680;Lnet/minecraft/class_8248;)V ARG 1 inputPredicate ARG 2 locationPredicate ARG 3 positionPredicate ARG 4 outputState - ARG 5 nbt - METHOD method_16760 getOutputNbt ()Lnet/minecraft/class_2487; + ARG 5 blockEntityModifier + METHOD method_16760 getOutputNbt (Lnet/minecraft/class_5819;Lnet/minecraft/class_2487;)Lnet/minecraft/class_2487; + ARG 1 random + ARG 2 nbt METHOD method_16762 test (Lnet/minecraft/class_2680;Lnet/minecraft/class_2680;Lnet/minecraft/class_2338;Lnet/minecraft/class_2338;Lnet/minecraft/class_2338;Lnet/minecraft/class_5819;)Z ARG 1 input - ARG 2 location + ARG 2 currentState + ARG 3 originalPos + ARG 4 currentPos ARG 5 pivot ARG 6 random METHOD method_16763 getOutputState ()Lnet/minecraft/class_2680; METHOD method_28984 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; ARG 0 instance - METHOD method_28985 (Lnet/minecraft/class_3821;)Ljava/util/Optional; + METHOD method_28985 (Lnet/minecraft/class_3821;)Lnet/minecraft/class_8248; ARG 0 rule METHOD method_28986 (Lnet/minecraft/class_3821;)Lnet/minecraft/class_2680; ARG 0 rule diff --git a/mappings/net/minecraft/structure/rule/PosRuleTest.mapping b/mappings/net/minecraft/structure/rule/PosRuleTest.mapping index 45efe6c477..95d4979d7d 100644 --- a/mappings/net/minecraft/structure/rule/PosRuleTest.mapping +++ b/mappings/net/minecraft/structure/rule/PosRuleTest.mapping @@ -1,5 +1,8 @@ CLASS net/minecraft/class_4995 net/minecraft/structure/rule/PosRuleTest + FIELD field_25007 BASE_CODEC Lcom/mojang/serialization/Codec; METHOD method_26404 getType ()Lnet/minecraft/class_4996; METHOD method_26406 test (Lnet/minecraft/class_2338;Lnet/minecraft/class_2338;Lnet/minecraft/class_2338;Lnet/minecraft/class_5819;)Z + ARG 1 originalPos + ARG 2 currentPos ARG 3 pivot ARG 4 random diff --git a/mappings/net/minecraft/structure/rule/blockentity/AppendLootRuleBlockEntityModifier.mapping b/mappings/net/minecraft/structure/rule/blockentity/AppendLootRuleBlockEntityModifier.mapping new file mode 100644 index 0000000000..1cbb35bd22 --- /dev/null +++ b/mappings/net/minecraft/structure/rule/blockentity/AppendLootRuleBlockEntityModifier.mapping @@ -0,0 +1,12 @@ +CLASS net/minecraft/class_8244 net/minecraft/structure/rule/blockentity/AppendLootRuleBlockEntityModifier + FIELD field_43336 CODEC Lcom/mojang/serialization/Codec; + FIELD field_43337 LOGGER Lorg/slf4j/Logger; + FIELD field_43338 lootTable Lnet/minecraft/class_2960; + METHOD (Lnet/minecraft/class_2960;)V + ARG 1 lootTable + METHOD method_49893 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 0 instance + METHOD method_49894 (Lnet/minecraft/class_8244;)Lnet/minecraft/class_2960; + ARG 0 modifier + METHOD method_49895 (Lnet/minecraft/class_2487;Lnet/minecraft/class_2520;)V + ARG 1 nbtx diff --git a/mappings/net/minecraft/structure/rule/blockentity/AppendStaticRuleBlockEntityModifier.mapping b/mappings/net/minecraft/structure/rule/blockentity/AppendStaticRuleBlockEntityModifier.mapping new file mode 100644 index 0000000000..0170bf3f9e --- /dev/null +++ b/mappings/net/minecraft/structure/rule/blockentity/AppendStaticRuleBlockEntityModifier.mapping @@ -0,0 +1,9 @@ +CLASS net/minecraft/class_8245 net/minecraft/structure/rule/blockentity/AppendStaticRuleBlockEntityModifier + FIELD field_43339 CODEC Lcom/mojang/serialization/Codec; + FIELD field_43340 nbt Lnet/minecraft/class_2487; + METHOD (Lnet/minecraft/class_2487;)V + ARG 1 nbt + METHOD method_49896 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 0 instance + METHOD method_49897 (Lnet/minecraft/class_8245;)Lnet/minecraft/class_2487; + ARG 0 modifier diff --git a/mappings/net/minecraft/structure/rule/blockentity/ClearRuleBlockEntityModifier.mapping b/mappings/net/minecraft/structure/rule/blockentity/ClearRuleBlockEntityModifier.mapping new file mode 100644 index 0000000000..37effd5594 --- /dev/null +++ b/mappings/net/minecraft/structure/rule/blockentity/ClearRuleBlockEntityModifier.mapping @@ -0,0 +1,3 @@ +CLASS net/minecraft/class_8246 net/minecraft/structure/rule/blockentity/ClearRuleBlockEntityModifier + FIELD field_43341 CODEC Lcom/mojang/serialization/Codec; + FIELD field_43342 INSTANCE Lnet/minecraft/class_8246; diff --git a/mappings/net/minecraft/structure/rule/blockentity/PassthroughRuleBlockEntityModifier.mapping b/mappings/net/minecraft/structure/rule/blockentity/PassthroughRuleBlockEntityModifier.mapping new file mode 100644 index 0000000000..8168795c13 --- /dev/null +++ b/mappings/net/minecraft/structure/rule/blockentity/PassthroughRuleBlockEntityModifier.mapping @@ -0,0 +1,3 @@ +CLASS net/minecraft/class_8247 net/minecraft/structure/rule/blockentity/PassthroughRuleBlockEntityModifier + FIELD field_43343 INSTANCE Lnet/minecraft/class_8247; + FIELD field_43344 CODEC Lcom/mojang/serialization/Codec; diff --git a/mappings/net/minecraft/structure/rule/blockentity/RuleBlockEntityModifier.mapping b/mappings/net/minecraft/structure/rule/blockentity/RuleBlockEntityModifier.mapping new file mode 100644 index 0000000000..981ed05e35 --- /dev/null +++ b/mappings/net/minecraft/structure/rule/blockentity/RuleBlockEntityModifier.mapping @@ -0,0 +1,6 @@ +CLASS net/minecraft/class_8248 net/minecraft/structure/rule/blockentity/RuleBlockEntityModifier + FIELD field_43345 TYPE_CODEC Lcom/mojang/serialization/Codec; + METHOD method_49891 getType ()Lnet/minecraft/class_8249; + METHOD method_49892 modifyBlockEntityNbt (Lnet/minecraft/class_5819;Lnet/minecraft/class_2487;)Lnet/minecraft/class_2487; + ARG 1 random + ARG 2 nbt diff --git a/mappings/net/minecraft/structure/rule/blockentity/RuleBlockEntityModifierType.mapping b/mappings/net/minecraft/structure/rule/blockentity/RuleBlockEntityModifierType.mapping new file mode 100644 index 0000000000..463dad46ea --- /dev/null +++ b/mappings/net/minecraft/structure/rule/blockentity/RuleBlockEntityModifierType.mapping @@ -0,0 +1,4 @@ +CLASS net/minecraft/class_8249 net/minecraft/structure/rule/blockentity/RuleBlockEntityModifierType + METHOD method_49899 register (Ljava/lang/String;Lcom/mojang/serialization/Codec;)Lnet/minecraft/class_8249; + ARG 0 id + ARG 1 codec diff --git a/mappings/net/minecraft/tag/FlatLevelGeneratorPresetTags.mapping b/mappings/net/minecraft/tag/FlatLevelGeneratorPresetTags.mapping deleted file mode 100644 index a58cdeb82f..0000000000 --- a/mappings/net/minecraft/tag/FlatLevelGeneratorPresetTags.mapping +++ /dev/null @@ -1,3 +0,0 @@ -CLASS net/minecraft/class_7088 net/minecraft/tag/FlatLevelGeneratorPresetTags - METHOD method_41292 of (Ljava/lang/String;)Lnet/minecraft/class_6862; - ARG 0 id diff --git a/mappings/net/minecraft/tag/TagGroupLoader.mapping b/mappings/net/minecraft/tag/TagGroupLoader.mapping deleted file mode 100644 index 43cee38f8d..0000000000 --- a/mappings/net/minecraft/tag/TagGroupLoader.mapping +++ /dev/null @@ -1,72 +0,0 @@ -CLASS net/minecraft/class_3503 net/minecraft/tag/TagGroupLoader - FIELD field_15603 JSON_EXTENSION_LENGTH I - FIELD field_15605 dataType Ljava/lang/String; - FIELD field_15607 LOGGER Lorg/slf4j/Logger; - FIELD field_15609 registryGetter Ljava/util/function/Function; - FIELD field_29827 JSON_EXTENSION Ljava/lang/String; - METHOD (Ljava/util/function/Function;Ljava/lang/String;)V - ARG 1 registryGetter - ARG 2 dataType - METHOD method_15194 (Lnet/minecraft/class_2960;)Z - ARG 0 id - METHOD method_18242 buildGroup (Ljava/util/Map;)Ljava/util/Map; - ARG 1 tags - METHOD method_32835 (Lcom/google/common/collect/Multimap;Lnet/minecraft/class_2960;Ljava/util/List;)V - ARG 1 tagId - ARG 2 entries - METHOD method_32836 hasCircularDependency (Lcom/google/common/collect/Multimap;Lnet/minecraft/class_2960;Lnet/minecraft/class_2960;)Z - ARG 0 referencedTagIdsByTagId - ARG 1 tagId - ARG 2 referencedTagId - METHOD method_32837 (Ljava/util/Map;Lcom/google/common/collect/Multimap;Ljava/util/Set;Ljava/util/function/BiConsumer;Lnet/minecraft/class_2960;)V - ARG 4 resolvedTagId - METHOD method_32838 (Ljava/util/Map;Lcom/google/common/collect/Multimap;Ljava/util/Set;Lnet/minecraft/class_3497$class_7474;Ljava/util/Map;Lnet/minecraft/class_2960;)V - ARG 6 tagId - METHOD method_32839 resolveAll (Ljava/util/Map;Lcom/google/common/collect/Multimap;Ljava/util/Set;Lnet/minecraft/class_2960;Ljava/util/function/BiConsumer;)V - ARG 0 tags - ARG 1 referencedTagIdsByTagId - ARG 2 alreadyResolved - ARG 3 tagId - ARG 4 resolver - METHOD method_32840 (Ljava/util/Map;Lnet/minecraft/class_2960;Ljava/util/Collection;)V - ARG 2 resolvedEntries - METHOD method_32841 (Lnet/minecraft/class_3497$class_7474;Ljava/util/Map;Lnet/minecraft/class_2960;Ljava/util/List;)V - ARG 3 tagId2 - ARG 4 entries - METHOD method_32843 (Lcom/google/common/collect/Multimap;Lnet/minecraft/class_2960;Ljava/util/List;)V - ARG 1 tagId - ARG 2 entries - METHOD method_32844 addReference (Lcom/google/common/collect/Multimap;Lnet/minecraft/class_2960;Lnet/minecraft/class_2960;)V - ARG 0 referencedTagIdsByTagId - ARG 1 tagId - ARG 2 referencedTagId - METHOD method_32847 (Lcom/google/common/collect/Multimap;Lnet/minecraft/class_2960;Lnet/minecraft/class_2960;)Z - ARG 2 id - METHOD method_33174 loadTags (Lnet/minecraft/class_3300;)Ljava/util/Map; - ARG 1 manager - METHOD method_33175 (Lnet/minecraft/class_2960;Ljava/util/Collection;)V - ARG 1 missingReferences - METHOD method_33176 load (Lnet/minecraft/class_3300;)Ljava/util/Map; - ARG 1 manager - METHOD method_43951 (Lnet/minecraft/class_2960;)Ljava/util/List; - ARG 0 id - METHOD method_43952 resolveAll (Lnet/minecraft/class_3497$class_7474;Ljava/util/List;)Lcom/mojang/datafixers/util/Either; - ARG 1 valueGetter - ARG 2 entries - METHOD method_43953 (Lcom/google/common/collect/Multimap;Lnet/minecraft/class_2960;Lnet/minecraft/class_3503$class_5145;)V - ARG 2 entry - METHOD method_43954 (Ljava/util/List;Ljava/lang/String;Lnet/minecraft/class_3497;)V - ARG 2 entry - METHOD method_43955 (Lcom/google/common/collect/Multimap;Lnet/minecraft/class_2960;Lnet/minecraft/class_3503$class_5145;)V - ARG 2 entry - METHOD method_43956 (Lcom/google/common/collect/Multimap;Lnet/minecraft/class_2960;Lnet/minecraft/class_2960;)V - ARG 2 referencedTagId - METHOD method_43957 (Lcom/google/common/collect/Multimap;Lnet/minecraft/class_2960;Lnet/minecraft/class_2960;)V - ARG 2 referencedTagId - CLASS class_5145 TrackedEntry - FIELD comp_324 entry Lnet/minecraft/class_3497; - FIELD comp_325 source Ljava/lang/String; - METHOD (Lnet/minecraft/class_3497;Ljava/lang/String;)V - ARG 2 source - METHOD comp_324 entry ()Lnet/minecraft/class_3497; - METHOD comp_325 source ()Ljava/lang/String; diff --git a/mappings/net/minecraft/test/StructureTestUtil.mapping b/mappings/net/minecraft/test/StructureTestUtil.mapping index fe8b8d2b66..af223cb248 100644 --- a/mappings/net/minecraft/test/StructureTestUtil.mapping +++ b/mappings/net/minecraft/test/StructureTestUtil.mapping @@ -11,7 +11,7 @@ CLASS net/minecraft/class_4525 net/minecraft/test/StructureTestUtil ARG 1 radius ARG 2 world METHOD method_22245 (Lnet/minecraft/class_2338;Lnet/minecraft/class_2338;)I - ARG 1 pos + ARG 1 posx METHOD method_22246 clearArea (Lnet/minecraft/class_3341;ILnet/minecraft/class_3218;)V ARG 0 area ARG 1 altitude @@ -32,6 +32,7 @@ CLASS net/minecraft/class_4525 net/minecraft/test/StructureTestUtil ARG 1 pos ARG 2 rotation ARG 4 world + ARG 5 interactive METHOD method_22251 createTestArea (Ljava/lang/String;Lnet/minecraft/class_2338;Lnet/minecraft/class_2382;Lnet/minecraft/class_2470;Lnet/minecraft/class_3218;)V ARG 0 testName ARG 1 pos diff --git a/mappings/net/minecraft/test/TestContext.mapping b/mappings/net/minecraft/test/TestContext.mapping index a944108698..a7216c7f4f 100644 --- a/mappings/net/minecraft/test/TestContext.mapping +++ b/mappings/net/minecraft/test/TestContext.mapping @@ -33,8 +33,6 @@ CLASS net/minecraft/class_4516 net/minecraft/test/TestContext METHOD method_35951 runAtTick (JLjava/lang/Runnable;)V ARG 1 tick ARG 3 runnable - METHOD method_35952 (Lnet/minecraft/class_1297;)Z - ARG 0 entity METHOD method_35953 expectEntityAt (Lnet/minecraft/class_1297;III)V ARG 1 entity ARG 2 x @@ -113,8 +111,6 @@ CLASS net/minecraft/class_4516 net/minecraft/test/TestContext ARG 0 state METHOD method_35974 (Lnet/minecraft/class_2680;Lnet/minecraft/class_2248;Lnet/minecraft/class_2248;)Z ARG 2 block1 - METHOD method_35976 (Lnet/minecraft/class_2769;Ljava/lang/Comparable;Lnet/minecraft/class_2680;)Z - ARG 2 state METHOD method_35977 expectSameStates (Lnet/minecraft/class_3341;Lnet/minecraft/class_2338;)V ARG 1 checkedBlockBox ARG 2 correctStatePos @@ -181,7 +177,7 @@ CLASS net/minecraft/class_4516 net/minecraft/test/TestContext ARG 1 posConsumer METHOD method_35999 (Ljava/util/function/Predicate;Lnet/minecraft/class_2680;)Z ARG 1 state - METHOD method_36000 (Ljava/util/function/Predicate;Lnet/minecraft/class_2769;Lnet/minecraft/class_2680;)Z + METHOD method_36000 (Lnet/minecraft/class_2769;Ljava/util/function/Predicate;Lnet/minecraft/class_2680;)Z ARG 2 state METHOD method_36001 killAllEntities ()V METHOD method_36002 toggleLever (III)V @@ -239,7 +235,7 @@ CLASS net/minecraft/class_4516 net/minecraft/test/TestContext ARG 1 runnable METHOD method_36019 (Ljava/lang/Runnable;J)V ARG 2 tick - METHOD method_36021 createMockPlayer ()Lnet/minecraft/class_1657; + METHOD method_36021 createMockCreativePlayer ()Lnet/minecraft/class_1657; METHOD method_36022 expectEntityAt (Lnet/minecraft/class_1299;III)V ARG 1 type ARG 2 x @@ -269,8 +265,9 @@ CLASS net/minecraft/class_4516 net/minecraft/test/TestContext METHOD method_36032 dontExpectEntityAt (Lnet/minecraft/class_1299;Lnet/minecraft/class_2338;)V ARG 1 type ARG 2 pos - METHOD method_36034 useBlock (Lnet/minecraft/class_2338;)V + METHOD method_36034 useBlock (Lnet/minecraft/class_2338;Lnet/minecraft/class_1657;)V ARG 1 pos + ARG 2 player METHOD method_36035 runAtEveryTick (Ljava/lang/Runnable;)V ARG 1 task METHOD method_36036 complete ()V @@ -326,3 +323,58 @@ CLASS net/minecraft/class_4516 net/minecraft/test/TestContext ARG 2 pos ARG 3 amount ARG 4 radius + METHOD method_46224 expectEntityInside (Lnet/minecraft/class_1299;Lnet/minecraft/class_243;Lnet/minecraft/class_243;)V + ARG 1 type + ARG 2 pos1 + ARG 3 pos2 + METHOD method_46225 spawnItem (Lnet/minecraft/class_1792;Lnet/minecraft/class_2338;)Lnet/minecraft/class_1542; + ARG 1 item + ARG 2 pos + METHOD method_46226 assertTrue (ZLjava/lang/String;)V + ARG 1 condition + ARG 2 message + METHOD method_46227 getRelative (Lnet/minecraft/class_243;)Lnet/minecraft/class_243; + ARG 1 pos + METHOD method_46228 createMockSurvivalPlayer ()Lnet/minecraft/class_1657; + METHOD method_46229 useBlock (Lnet/minecraft/class_2338;)V + ARG 1 pos + METHOD method_47816 useStackOnBlock (Lnet/minecraft/class_1657;Lnet/minecraft/class_1799;Lnet/minecraft/class_2338;Lnet/minecraft/class_2350;)V + ARG 1 player + ARG 2 stack + ARG 3 pos + ARG 4 direction + METHOD method_47817 useBlock (Lnet/minecraft/class_2338;Lnet/minecraft/class_1657;Lnet/minecraft/class_3965;)V + ARG 1 pos + ARG 2 player + ARG 3 result + METHOD method_48000 (Lnet/minecraft/class_1792;Lnet/minecraft/class_1799;)Z + ARG 1 stack + METHOD method_48001 expectEntityHoldingItem (Lnet/minecraft/class_2338;Lnet/minecraft/class_1299;Lnet/minecraft/class_1792;)V + ARG 1 pos + ARG 2 entityType + ARG 3 item + METHOD method_48002 (Ljava/lang/Object;)Z + ARG 0 entity + METHOD method_48003 expectEntityWithItem (Lnet/minecraft/class_2338;Lnet/minecraft/class_1299;Lnet/minecraft/class_1792;)V + ARG 1 pos + ARG 2 entityType + ARG 3 item + METHOD method_49994 assertFalse (ZLjava/lang/String;)V + ARG 1 condition + ARG 2 message + METHOD method_51821 setHealthLow (Lnet/minecraft/class_1309;)Lnet/minecraft/class_1309; + ARG 1 entity + METHOD method_51891 createMockCreativeServerPlayerInWorld ()Lnet/minecraft/class_3222; + METHOD method_52206 (Lnet/minecraft/class_1297;)Z + ARG 0 entity + METHOD method_52207 killAllEntities (Ljava/lang/Class;)V + ARG 1 entityClass + METHOD method_52225 expectRedstonePower (Lnet/minecraft/class_2338;Lnet/minecraft/class_2350;Ljava/util/function/IntPredicate;Ljava/util/function/Supplier;)V + ARG 1 pos + ARG 2 direction + ARG 3 powerPredicate + ARG 4 errorMessage + METHOD method_52889 expectEntityHasEffect (Lnet/minecraft/class_1309;Lnet/minecraft/class_1291;I)V + ARG 1 entity + ARG 2 effect + ARG 3 amplifier diff --git a/mappings/net/minecraft/test/TestRunner.mapping b/mappings/net/minecraft/test/TestRunner.mapping index cf1941bdb3..0e90fe9f0a 100644 --- a/mappings/net/minecraft/test/TestRunner.mapping +++ b/mappings/net/minecraft/test/TestRunner.mapping @@ -7,6 +7,8 @@ CLASS net/minecraft/class_4515 net/minecraft/test/TestRunner FIELD field_20551 tests Ljava/util/List; FIELD field_20555 reusablePos Lnet/minecraft/class_2338$class_2339; FIELD field_20556 sizeZ I + FIELD field_46071 testCount I + FIELD field_46072 rowBoundingBox Lnet/minecraft/class_238; 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 diff --git a/mappings/net/minecraft/test/TestServer.mapping b/mappings/net/minecraft/test/TestServer.mapping index 19dce1e72b..6779647abd 100644 --- a/mappings/net/minecraft/test/TestServer.mapping +++ b/mappings/net/minecraft/test/TestServer.mapping @@ -4,7 +4,7 @@ CLASS net/minecraft/class_6306 net/minecraft/test/TestServer FIELD field_33158 batches Ljava/util/List; FIELD field_33159 pos Lnet/minecraft/class_2338; FIELD field_33160 GAME_RULES Lnet/minecraft/class_1928; - FIELD field_33161 TEST_LEVEL Lnet/minecraft/class_1940; + FIELD field_33161 TEST_LEVEL Lnet/minecraft/class_5285; FIELD field_33162 testSet Lnet/minecraft/class_4524; FIELD field_39441 NONE_API_SERVICES Lnet/minecraft/class_7497; METHOD (Ljava/lang/Thread;Lnet/minecraft/class_32$class_5143;Lnet/minecraft/class_3283;Lnet/minecraft/class_6904;Ljava/util/Collection;Lnet/minecraft/class_2338;)V @@ -23,14 +23,9 @@ CLASS net/minecraft/class_6306 net/minecraft/test/TestServer METHOD method_36097 (Lnet/minecraft/class_4517;)V ARG 0 test METHOD method_36098 isTesting ()Z - METHOD method_40377 (Lnet/minecraft/class_3300;Lnet/minecraft/class_5359;)Lcom/mojang/datafixers/util/Pair; - ARG 0 resourceManager - ARG 1 dataPackSettings METHOD method_40378 create (Ljava/lang/Thread;Lnet/minecraft/class_32$class_5143;Lnet/minecraft/class_3283;Ljava/util/Collection;Lnet/minecraft/class_2338;)Lnet/minecraft/class_6306; ARG 0 thread ARG 1 session ARG 2 resourcePackManager ARG 3 batches ARG 4 pos - METHOD method_43615 (Lnet/minecraft/class_7237$class_6906;Ljava/util/concurrent/Executor;)Ljava/util/concurrent/CompletableFuture; - ARG 1 applyExecutor diff --git a/mappings/net/minecraft/test/TestUtil.mapping b/mappings/net/minecraft/test/TestUtil.mapping index f476f408ba..8fd101049c 100644 --- a/mappings/net/minecraft/test/TestUtil.mapping +++ b/mappings/net/minecraft/test/TestUtil.mapping @@ -16,7 +16,7 @@ CLASS net/minecraft/class_4520 net/minecraft/test/TestUtil METHOD method_22213 clearDebugMarkers (Lnet/minecraft/class_3218;)V ARG 0 world METHOD method_22215 (Lnet/minecraft/class_3218;Lnet/minecraft/class_2338;)V - ARG 1 pos + ARG 1 posx METHOD method_22216 clearTests (Lnet/minecraft/class_3218;Lnet/minecraft/class_2338;Lnet/minecraft/class_4521;I)V ARG 0 world ARG 1 pos @@ -30,8 +30,8 @@ CLASS net/minecraft/class_4520 net/minecraft/test/TestUtil ARG 4 testManager ARG 5 sizeZ METHOD method_22223 (Lnet/minecraft/class_3218;Lnet/minecraft/class_2338;)Z - ARG 1 pos + ARG 1 posx METHOD method_23641 (Ljava/lang/String;Lorg/apache/commons/lang3/mutable/MutableInt;Ljava/util/function/Consumer;Ljava/util/function/Consumer;Ljava/util/List;)Lnet/minecraft/class_4514; - ARG 4 testFunctions + ARG 4 testFunctionsx METHOD method_33318 (Ljava/util/Map$Entry;)Ljava/util/stream/Stream; ARG 0 entry diff --git a/mappings/net/minecraft/text/Text.mapping b/mappings/net/minecraft/text/Text.mapping index dc2051dcbc..b481c98ead 100644 --- a/mappings/net/minecraft/text/Text.mapping +++ b/mappings/net/minecraft/text/Text.mapping @@ -62,6 +62,13 @@ CLASS net/minecraft/class_2561 net/minecraft/text/Text COMMENT {@return whether the text contains {@code text}, without considering styles} ARG 1 text METHOD method_44746 withoutStyle ()Ljava/util/List; + METHOD method_48321 translatableWithFallback (Ljava/lang/String;Ljava/lang/String;)Lnet/minecraft/class_5250; + ARG 0 key + ARG 1 fallback + METHOD method_48322 translatableWithFallback (Ljava/lang/String;Ljava/lang/String;[Ljava/lang/Object;)Lnet/minecraft/class_5250; + ARG 0 key + ARG 1 fallback + ARG 2 args CLASS class_2562 Serializer COMMENT A JSON serializer for {@link Text}. FIELD field_11752 JSON_READER_LINE_START Ljava/lang/reflect/Field; @@ -94,7 +101,7 @@ CLASS net/minecraft/class_2561 net/minecraft/text/Text METHOD method_36328 addSeparator (Lcom/google/gson/JsonSerializationContext;Lcom/google/gson/JsonObject;Ljava/util/Optional;)V ARG 1 context ARG 2 json - ARG 3 separator + ARG 3 optionalSeparator METHOD method_36329 getSeparator (Ljava/lang/reflect/Type;Lcom/google/gson/JsonDeserializationContext;Lcom/google/gson/JsonObject;)Ljava/util/Optional; ARG 1 type ARG 2 context diff --git a/mappings/net/minecraft/client/resource/language/TextReorderingProcessor.mapping b/mappings/net/minecraft/text/TextReorderingProcessor.mapping similarity index 91% rename from mappings/net/minecraft/client/resource/language/TextReorderingProcessor.mapping rename to mappings/net/minecraft/text/TextReorderingProcessor.mapping index 33300e781e..235945cd88 100644 --- a/mappings/net/minecraft/client/resource/language/TextReorderingProcessor.mapping +++ b/mappings/net/minecraft/text/TextReorderingProcessor.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_5492 net/minecraft/client/resource/language/TextReorderingProcessor +CLASS net/minecraft/class_5492 net/minecraft/text/TextReorderingProcessor FIELD field_26626 string Ljava/lang/String; FIELD field_26627 styles Ljava/util/List; FIELD field_26628 reverser Lit/unimi/dsi/fastutil/ints/Int2IntFunction; @@ -13,7 +13,7 @@ CLASS net/minecraft/class_5492 net/minecraft/client/resource/language/TextReorde ARG 3 reverse METHOD method_30941 (Ljava/lang/StringBuilder;Ljava/util/List;ILnet/minecraft/class_2583;I)Z ARG 2 charIndex - ARG 3 style + ARG 3 stylex ARG 4 codePoint METHOD method_30942 (Ljava/lang/StringBuilder;Ljava/util/List;Lnet/minecraft/class_2583;Ljava/lang/String;)Ljava/util/Optional; ARG 2 style diff --git a/mappings/net/minecraft/client/font/TextVisitFactory.mapping b/mappings/net/minecraft/text/TextVisitFactory.mapping similarity index 98% rename from mappings/net/minecraft/client/font/TextVisitFactory.mapping rename to mappings/net/minecraft/text/TextVisitFactory.mapping index 980f88207f..d4ec8f96fe 100644 --- a/mappings/net/minecraft/client/font/TextVisitFactory.mapping +++ b/mappings/net/minecraft/text/TextVisitFactory.mapping @@ -1,10 +1,10 @@ -CLASS net/minecraft/class_5223 net/minecraft/client/font/TextVisitFactory +CLASS net/minecraft/class_5223 net/minecraft/text/TextVisitFactory COMMENT A utility class for visiting the characters of strings, handling surrogate COMMENT code points and formatting codes. FIELD field_24215 VISIT_TERMINATED Ljava/util/Optional; FIELD field_29861 REPLACEMENT_CHARACTER C METHOD method_27470 (Lnet/minecraft/class_5224;Lnet/minecraft/class_2583;Ljava/lang/String;)Ljava/util/Optional; - ARG 1 style + ARG 1 stylex ARG 2 string METHOD method_27471 validateSurrogates (Ljava/lang/String;)Ljava/lang/String; COMMENT {@return a new string that has all surrogate characters within} diff --git a/mappings/net/minecraft/text/Texts.mapping b/mappings/net/minecraft/text/Texts.mapping index 5dc0929298..70038a9d2f 100644 --- a/mappings/net/minecraft/text/Texts.mapping +++ b/mappings/net/minecraft/text/Texts.mapping @@ -7,8 +7,6 @@ CLASS net/minecraft/class_2564 net/minecraft/text/Texts ARG 1 text ARG 2 sender ARG 3 depth - METHOD method_10882 toText (Lcom/mojang/authlib/GameProfile;)Lnet/minecraft/class_2561; - ARG 0 profile METHOD method_10883 toText (Lcom/mojang/brigadier/Message;)Lnet/minecraft/class_2561; ARG 0 message METHOD method_10884 join (Ljava/util/Collection;Ljava/util/function/Function;)Lnet/minecraft/class_2561; @@ -49,3 +47,7 @@ CLASS net/minecraft/class_2564 net/minecraft/text/Texts ARG 1 separator METHOD method_43476 hasTranslation (Lnet/minecraft/class_2561;)Z ARG 0 text + METHOD method_47523 bracketedCopyable (Ljava/lang/String;)Lnet/minecraft/class_5250; + ARG 0 string + METHOD method_47524 (Ljava/lang/String;Lnet/minecraft/class_2583;)Lnet/minecraft/class_2583; + ARG 1 style diff --git a/mappings/net/minecraft/text/TranslatableTextContent.mapping b/mappings/net/minecraft/text/TranslatableTextContent.mapping index 37e1802658..76a911c919 100644 --- a/mappings/net/minecraft/text/TranslatableTextContent.mapping +++ b/mappings/net/minecraft/text/TranslatableTextContent.mapping @@ -7,11 +7,11 @@ CLASS net/minecraft/class_2588 net/minecraft/text/TranslatableTextContent FIELD field_24368 LITERAL_PERCENT_SIGN Lnet/minecraft/class_5348; FIELD field_24369 NULL_ARGUMENT Lnet/minecraft/class_5348; FIELD field_25317 languageCache Lnet/minecraft/class_2477; - METHOD (Ljava/lang/String;)V + FIELD field_41875 fallback Ljava/lang/String; + METHOD (Ljava/lang/String;Ljava/lang/String;[Ljava/lang/Object;)V ARG 1 key - METHOD (Ljava/lang/String;[Ljava/lang/Object;)V - ARG 1 key - ARG 2 args + ARG 2 fallback + ARG 3 args METHOD equals (Ljava/lang/Object;)Z ARG 1 o METHOD method_11022 getKey ()Ljava/lang/String; @@ -22,3 +22,4 @@ CLASS net/minecraft/class_2588 net/minecraft/text/TranslatableTextContent METHOD method_11025 updateTranslations ()V METHOD method_29434 getArg (I)Lnet/minecraft/class_5348; ARG 1 index + METHOD method_48323 getFallback ()Ljava/lang/String; diff --git a/mappings/net/minecraft/unused/packageinfo/PackageInfo6204.mapping b/mappings/net/minecraft/unused/packageinfo/PackageInfo6204.mapping deleted file mode 100644 index b24685ab6e..0000000000 --- a/mappings/net/minecraft/unused/packageinfo/PackageInfo6204.mapping +++ /dev/null @@ -1 +0,0 @@ -CLASS net/minecraft/class_6204 net/minecraft/unused/packageinfo/PackageInfo6204 diff --git a/mappings/net/minecraft/unused/packageinfo/PackageInfo7676.mapping b/mappings/net/minecraft/unused/packageinfo/PackageInfo7676.mapping new file mode 100644 index 0000000000..c4d6bce898 --- /dev/null +++ b/mappings/net/minecraft/unused/packageinfo/PackageInfo7676.mapping @@ -0,0 +1 @@ +CLASS net/minecraft/class_7676 net/minecraft/unused/packageinfo/PackageInfo7676 diff --git a/mappings/net/minecraft/unused/packageinfo/PackageInfo7694.mapping b/mappings/net/minecraft/unused/packageinfo/PackageInfo7694.mapping new file mode 100644 index 0000000000..f2fc8bd328 --- /dev/null +++ b/mappings/net/minecraft/unused/packageinfo/PackageInfo7694.mapping @@ -0,0 +1 @@ +CLASS net/minecraft/class_7694 net/minecraft/unused/packageinfo/PackageInfo7694 diff --git a/mappings/net/minecraft/unused/packageinfo/PackageInfo7702.mapping b/mappings/net/minecraft/unused/packageinfo/PackageInfo7702.mapping new file mode 100644 index 0000000000..b04da59649 --- /dev/null +++ b/mappings/net/minecraft/unused/packageinfo/PackageInfo7702.mapping @@ -0,0 +1 @@ +CLASS net/minecraft/class_7702 net/minecraft/unused/packageinfo/PackageInfo7702 diff --git a/mappings/net/minecraft/unused/packageinfo/PackageInfo7727.mapping b/mappings/net/minecraft/unused/packageinfo/PackageInfo7727.mapping new file mode 100644 index 0000000000..62384b6620 --- /dev/null +++ b/mappings/net/minecraft/unused/packageinfo/PackageInfo7727.mapping @@ -0,0 +1 @@ +CLASS net/minecraft/class_7727 net/minecraft/unused/packageinfo/PackageInfo7727 diff --git a/mappings/net/minecraft/unused/packageinfo/PackageInfo7728.mapping b/mappings/net/minecraft/unused/packageinfo/PackageInfo7728.mapping new file mode 100644 index 0000000000..8c98ca0674 --- /dev/null +++ b/mappings/net/minecraft/unused/packageinfo/PackageInfo7728.mapping @@ -0,0 +1 @@ +CLASS net/minecraft/class_7728 net/minecraft/unused/packageinfo/PackageInfo7728 diff --git a/mappings/net/minecraft/unused/packageinfo/PackageInfo7787.mapping b/mappings/net/minecraft/unused/packageinfo/PackageInfo7787.mapping new file mode 100644 index 0000000000..179c1b2b75 --- /dev/null +++ b/mappings/net/minecraft/unused/packageinfo/PackageInfo7787.mapping @@ -0,0 +1 @@ +CLASS net/minecraft/class_7787 net/minecraft/unused/packageinfo/PackageInfo7787 diff --git a/mappings/net/minecraft/unused/packageinfo/PackageInfo7795.mapping b/mappings/net/minecraft/unused/packageinfo/PackageInfo7795.mapping new file mode 100644 index 0000000000..01ceb4f201 --- /dev/null +++ b/mappings/net/minecraft/unused/packageinfo/PackageInfo7795.mapping @@ -0,0 +1 @@ +CLASS net/minecraft/class_7795 net/minecraft/unused/packageinfo/PackageInfo7795 diff --git a/mappings/net/minecraft/unused/packageinfo/PackageInfo7797.mapping b/mappings/net/minecraft/unused/packageinfo/PackageInfo7797.mapping new file mode 100644 index 0000000000..489bec9a10 --- /dev/null +++ b/mappings/net/minecraft/unused/packageinfo/PackageInfo7797.mapping @@ -0,0 +1 @@ +CLASS net/minecraft/class_7797 net/minecraft/unused/packageinfo/PackageInfo7797 diff --git a/mappings/net/minecraft/unused/packageinfo/PackageInfo7804.mapping b/mappings/net/minecraft/unused/packageinfo/PackageInfo7804.mapping new file mode 100644 index 0000000000..8bb510cd16 --- /dev/null +++ b/mappings/net/minecraft/unused/packageinfo/PackageInfo7804.mapping @@ -0,0 +1 @@ +CLASS net/minecraft/class_7804 net/minecraft/unused/packageinfo/PackageInfo7804 diff --git a/mappings/net/minecraft/unused/packageinfo/PackageInfo7888.mapping b/mappings/net/minecraft/unused/packageinfo/PackageInfo7888.mapping new file mode 100644 index 0000000000..fcf4d37c0e --- /dev/null +++ b/mappings/net/minecraft/unused/packageinfo/PackageInfo7888.mapping @@ -0,0 +1 @@ +CLASS net/minecraft/class_7888 net/minecraft/unused/packageinfo/PackageInfo7888 diff --git a/mappings/net/minecraft/unused/packageinfo/PackageInfo7912.mapping b/mappings/net/minecraft/unused/packageinfo/PackageInfo7912.mapping new file mode 100644 index 0000000000..d97960d25d --- /dev/null +++ b/mappings/net/minecraft/unused/packageinfo/PackageInfo7912.mapping @@ -0,0 +1 @@ +CLASS net/minecraft/class_7912 net/minecraft/unused/packageinfo/PackageInfo7912 diff --git a/mappings/net/minecraft/unused/packageinfo/PackageInfo7925.mapping b/mappings/net/minecraft/unused/packageinfo/PackageInfo7925.mapping new file mode 100644 index 0000000000..1f5c30a19d --- /dev/null +++ b/mappings/net/minecraft/unused/packageinfo/PackageInfo7925.mapping @@ -0,0 +1 @@ +CLASS net/minecraft/class_7925 net/minecraft/unused/packageinfo/PackageInfo7925 diff --git a/mappings/net/minecraft/unused/packageinfo/PackageInfo7937.mapping b/mappings/net/minecraft/unused/packageinfo/PackageInfo7937.mapping new file mode 100644 index 0000000000..0a79491695 --- /dev/null +++ b/mappings/net/minecraft/unused/packageinfo/PackageInfo7937.mapping @@ -0,0 +1 @@ +CLASS net/minecraft/class_7937 net/minecraft/unused/packageinfo/PackageInfo7937 diff --git a/mappings/net/minecraft/unused/packageinfo/PackageInfo7945.mapping b/mappings/net/minecraft/unused/packageinfo/PackageInfo7945.mapping new file mode 100644 index 0000000000..c5cfff423e --- /dev/null +++ b/mappings/net/minecraft/unused/packageinfo/PackageInfo7945.mapping @@ -0,0 +1 @@ +CLASS net/minecraft/class_7945 net/minecraft/unused/packageinfo/PackageInfo7945 diff --git a/mappings/net/minecraft/unused/packageinfo/PackageInfo7953.mapping b/mappings/net/minecraft/unused/packageinfo/PackageInfo7953.mapping new file mode 100644 index 0000000000..50cc923ce1 --- /dev/null +++ b/mappings/net/minecraft/unused/packageinfo/PackageInfo7953.mapping @@ -0,0 +1 @@ +CLASS net/minecraft/class_7953 net/minecraft/unused/packageinfo/PackageInfo7953 diff --git a/mappings/net/minecraft/unused/packageinfo/PackageInfo7961.mapping b/mappings/net/minecraft/unused/packageinfo/PackageInfo7961.mapping new file mode 100644 index 0000000000..32dff2e0ac --- /dev/null +++ b/mappings/net/minecraft/unused/packageinfo/PackageInfo7961.mapping @@ -0,0 +1 @@ +CLASS net/minecraft/class_7961 net/minecraft/unused/packageinfo/PackageInfo7961 diff --git a/mappings/net/minecraft/unused/packageinfo/PackageInfo7983.mapping b/mappings/net/minecraft/unused/packageinfo/PackageInfo7983.mapping new file mode 100644 index 0000000000..64c8178f8a --- /dev/null +++ b/mappings/net/minecraft/unused/packageinfo/PackageInfo7983.mapping @@ -0,0 +1 @@ +CLASS net/minecraft/class_7983 net/minecraft/unused/packageinfo/PackageInfo7983 diff --git a/mappings/net/minecraft/unused/packageinfo/PackageInfo7984.mapping b/mappings/net/minecraft/unused/packageinfo/PackageInfo7984.mapping new file mode 100644 index 0000000000..958b43bdba --- /dev/null +++ b/mappings/net/minecraft/unused/packageinfo/PackageInfo7984.mapping @@ -0,0 +1 @@ +CLASS net/minecraft/class_7984 net/minecraft/unused/packageinfo/PackageInfo7984 diff --git a/mappings/net/minecraft/unused/packageinfo/PackageInfo8008.mapping b/mappings/net/minecraft/unused/packageinfo/PackageInfo8008.mapping new file mode 100644 index 0000000000..ce5c3c46f9 --- /dev/null +++ b/mappings/net/minecraft/unused/packageinfo/PackageInfo8008.mapping @@ -0,0 +1 @@ +CLASS net/minecraft/class_8008 net/minecraft/unused/packageinfo/PackageInfo8008 diff --git a/mappings/net/minecraft/unused/packageinfo/PackageInfo8022.mapping b/mappings/net/minecraft/unused/packageinfo/PackageInfo8022.mapping new file mode 100644 index 0000000000..249af87968 --- /dev/null +++ b/mappings/net/minecraft/unused/packageinfo/PackageInfo8022.mapping @@ -0,0 +1 @@ +CLASS net/minecraft/class_8022 net/minecraft/unused/packageinfo/PackageInfo8022 diff --git a/mappings/net/minecraft/unused/packageinfo/PackageInfo8031.mapping b/mappings/net/minecraft/unused/packageinfo/PackageInfo8031.mapping new file mode 100644 index 0000000000..6b81355ab7 --- /dev/null +++ b/mappings/net/minecraft/unused/packageinfo/PackageInfo8031.mapping @@ -0,0 +1 @@ +CLASS net/minecraft/class_8031 net/minecraft/unused/packageinfo/PackageInfo8031 diff --git a/mappings/net/minecraft/unused/packageinfo/PackageInfo8058.mapping b/mappings/net/minecraft/unused/packageinfo/PackageInfo8058.mapping new file mode 100644 index 0000000000..40f9b212c9 --- /dev/null +++ b/mappings/net/minecraft/unused/packageinfo/PackageInfo8058.mapping @@ -0,0 +1 @@ +CLASS net/minecraft/class_8058 net/minecraft/unused/packageinfo/PackageInfo8058 diff --git a/mappings/net/minecraft/unused/packageinfo/PackageInfo8091.mapping b/mappings/net/minecraft/unused/packageinfo/PackageInfo8091.mapping new file mode 100644 index 0000000000..f627f05937 --- /dev/null +++ b/mappings/net/minecraft/unused/packageinfo/PackageInfo8091.mapping @@ -0,0 +1 @@ +CLASS net/minecraft/class_8091 net/minecraft/unused/packageinfo/PackageInfo8091 diff --git a/mappings/net/minecraft/unused/packageinfo/PackageInfo8250.mapping b/mappings/net/minecraft/unused/packageinfo/PackageInfo8250.mapping new file mode 100644 index 0000000000..f622543385 --- /dev/null +++ b/mappings/net/minecraft/unused/packageinfo/PackageInfo8250.mapping @@ -0,0 +1 @@ +CLASS net/minecraft/class_8250 net/minecraft/unused/packageinfo/PackageInfo8250 diff --git a/mappings/net/minecraft/unused/packageinfo/PackageInfo8501.mapping b/mappings/net/minecraft/unused/packageinfo/PackageInfo8501.mapping new file mode 100644 index 0000000000..2bd3698b0b --- /dev/null +++ b/mappings/net/minecraft/unused/packageinfo/PackageInfo8501.mapping @@ -0,0 +1 @@ +CLASS net/minecraft/class_8501 net/minecraft/unused/packageinfo/PackageInfo8501 diff --git a/mappings/net/minecraft/unused/packageinfo/PackageInfo8585.mapping b/mappings/net/minecraft/unused/packageinfo/PackageInfo8585.mapping new file mode 100644 index 0000000000..89769008ef --- /dev/null +++ b/mappings/net/minecraft/unused/packageinfo/PackageInfo8585.mapping @@ -0,0 +1 @@ +CLASS net/minecraft/class_8585 net/minecraft/unused/packageinfo/PackageInfo8585 diff --git a/mappings/net/minecraft/unused/packageinfo/PackageInfo8598.mapping b/mappings/net/minecraft/unused/packageinfo/PackageInfo8598.mapping new file mode 100644 index 0000000000..4a5f046fd6 --- /dev/null +++ b/mappings/net/minecraft/unused/packageinfo/PackageInfo8598.mapping @@ -0,0 +1 @@ +CLASS net/minecraft/class_8598 net/minecraft/unused/packageinfo/PackageInfo8598 diff --git a/mappings/net/minecraft/unused/packageinfo/PackageInfo8613.mapping b/mappings/net/minecraft/unused/packageinfo/PackageInfo8613.mapping new file mode 100644 index 0000000000..e05398f9e1 --- /dev/null +++ b/mappings/net/minecraft/unused/packageinfo/PackageInfo8613.mapping @@ -0,0 +1 @@ +CLASS net/minecraft/class_8613 net/minecraft/unused/packageinfo/PackageInfo8613 diff --git a/mappings/net/minecraft/unused/packageinfo/PackageInfo8696.mapping b/mappings/net/minecraft/unused/packageinfo/PackageInfo8696.mapping new file mode 100644 index 0000000000..f68fc65e41 --- /dev/null +++ b/mappings/net/minecraft/unused/packageinfo/PackageInfo8696.mapping @@ -0,0 +1 @@ +CLASS net/minecraft/class_8696 net/minecraft/unused/packageinfo/PackageInfo8696 diff --git a/mappings/net/minecraft/unused/packageinfo/PackageInfo8730.mapping b/mappings/net/minecraft/unused/packageinfo/PackageInfo8730.mapping new file mode 100644 index 0000000000..37aa7a5030 --- /dev/null +++ b/mappings/net/minecraft/unused/packageinfo/PackageInfo8730.mapping @@ -0,0 +1 @@ +CLASS net/minecraft/class_8730 net/minecraft/unused/packageinfo/PackageInfo8730 diff --git a/mappings/net/minecraft/unused/packageinfo/PackageInfo8731.mapping b/mappings/net/minecraft/unused/packageinfo/PackageInfo8731.mapping new file mode 100644 index 0000000000..f4bf5dc634 --- /dev/null +++ b/mappings/net/minecraft/unused/packageinfo/PackageInfo8731.mapping @@ -0,0 +1 @@ +CLASS net/minecraft/class_8731 net/minecraft/unused/packageinfo/PackageInfo8731 diff --git a/mappings/net/minecraft/unused/packageinfo/PackageInfo8737.mapping b/mappings/net/minecraft/unused/packageinfo/PackageInfo8737.mapping new file mode 100644 index 0000000000..bb2c2546e8 --- /dev/null +++ b/mappings/net/minecraft/unused/packageinfo/PackageInfo8737.mapping @@ -0,0 +1 @@ +CLASS net/minecraft/class_8737 net/minecraft/unused/packageinfo/PackageInfo8737 diff --git a/mappings/net/minecraft/util/ApiServices.mapping b/mappings/net/minecraft/util/ApiServices.mapping index 78e476e38d..7188825d29 100644 --- a/mappings/net/minecraft/util/ApiServices.mapping +++ b/mappings/net/minecraft/util/ApiServices.mapping @@ -3,10 +3,8 @@ CLASS net/minecraft/class_7497 net/minecraft/util/ApiServices COMMENT COMMENT @apiNote Individual services can be accessed using the getters in COMMENT {@link net.minecraft.server.MinecraftServer}. - FIELD comp_838 serviceSignatureVerifier Lnet/minecraft/class_7500; FIELD comp_840 userCache Lnet/minecraft/class_3312; FIELD field_39392 USER_CACHE_FILE_NAME Ljava/lang/String; - METHOD comp_838 serviceSignatureVerifier ()Lnet/minecraft/class_7500; METHOD comp_840 userCache ()Lnet/minecraft/class_3312; METHOD method_44143 create (Lcom/mojang/authlib/yggdrasil/YggdrasilAuthenticationService;Ljava/io/File;)Lnet/minecraft/class_7497; COMMENT {@return a new API service instance} @@ -15,3 +13,4 @@ CLASS net/minecraft/class_7497 net/minecraft/util/ApiServices COMMENT net.minecraft.server.MinecraftServer} instead. ARG 0 authenticationService ARG 1 rootDirectory + METHOD method_51467 serviceSignatureVerifier ()Lnet/minecraft/class_7500; diff --git a/mappings/net/minecraft/util/Arm.mapping b/mappings/net/minecraft/util/Arm.mapping index 663dd6b521..58a2a63b15 100644 --- a/mappings/net/minecraft/util/Arm.mapping +++ b/mappings/net/minecraft/util/Arm.mapping @@ -3,9 +3,12 @@ CLASS net/minecraft/class_1306 net/minecraft/util/Arm COMMENT COMMENT @see Hand FIELD field_38385 id I - FIELD field_6181 translationKey Ljava/lang/String; - METHOD (Ljava/lang/String;IILjava/lang/String;)V + FIELD field_45121 CODEC Lcom/mojang/serialization/Codec; + FIELD field_45122 translationKey Ljava/lang/String; + FIELD field_6181 name Ljava/lang/String; + METHOD (Ljava/lang/String;IILjava/lang/String;Ljava/lang/String;)V ARG 3 id - ARG 4 translationKey + ARG 4 name + ARG 5 translationKey METHOD method_5928 getOpposite ()Lnet/minecraft/class_1306; COMMENT {@return the arm on the opposite side} diff --git a/mappings/net/minecraft/util/CachedMapper.mapping b/mappings/net/minecraft/util/CachedMapper.mapping new file mode 100644 index 0000000000..528f3a4837 --- /dev/null +++ b/mappings/net/minecraft/util/CachedMapper.mapping @@ -0,0 +1,13 @@ +CLASS net/minecraft/class_8105 net/minecraft/util/CachedMapper + COMMENT A mapper that caches the latest input-output pair, so that repeated calls with + COMMENT the same argument do not call the expensive mapper function. + COMMENT + COMMENT @see Util#cachedMapper + FIELD field_42269 mapper Ljava/util/function/Function; + FIELD field_42270 cachedInput Ljava/lang/Object; + FIELD field_42271 cachedOutput Ljava/lang/Object; + METHOD (Ljava/util/function/Function;)V + ARG 1 mapper + METHOD method_48782 map (Ljava/lang/Object;)Ljava/lang/Object; + COMMENT {@return the mapped {@code input}} + ARG 1 input diff --git a/mappings/net/minecraft/util/Colors.mapping b/mappings/net/minecraft/util/Colors.mapping new file mode 100644 index 0000000000..0bd2870428 --- /dev/null +++ b/mappings/net/minecraft/util/Colors.mapping @@ -0,0 +1,12 @@ +CLASS net/minecraft/class_8012 net/minecraft/util/Colors + COMMENT Contains constants for commonly used colors in {@code 0xAARRGGBB} format. + FIELD field_41758 RED I + COMMENT Represents the color red, {@code 0xFFFF0000}. + FIELD field_42973 WHITE I + COMMENT Represents the color white, {@code 0xFFFFFFFF}. + FIELD field_42974 BLACK I + COMMENT Represents the color black, {@code 0xFF000000}. + FIELD field_44941 GRAY I + COMMENT Represents the color gray, {@code 0xFF808080}. + FIELD field_45073 LIGHT_GRAY I + COMMENT Represents the color light gray, {@code 0xFFA0A0A0}. diff --git a/mappings/net/minecraft/util/CubicSampler.mapping b/mappings/net/minecraft/util/CubicSampler.mapping index 0f9c73df61..2f73b1c82d 100644 --- a/mappings/net/minecraft/util/CubicSampler.mapping +++ b/mappings/net/minecraft/util/CubicSampler.mapping @@ -1,5 +1,7 @@ CLASS net/minecraft/class_6491 net/minecraft/util/CubicSampler FIELD field_22449 DENSITY_CURVE [D + FIELD field_33222 FIRST_SEGMENT_OFFSET I + FIELD field_33223 NUM_SEGMENTS I METHOD method_24895 sampleColor (Lnet/minecraft/class_243;Lnet/minecraft/class_6491$class_4859;)Lnet/minecraft/class_243; ARG 0 pos ARG 1 rgbFetcher diff --git a/mappings/net/minecraft/util/DyeColor.mapping b/mappings/net/minecraft/util/DyeColor.mapping index 38902cd15c..2b3beb165f 100644 --- a/mappings/net/minecraft/util/DyeColor.mapping +++ b/mappings/net/minecraft/util/DyeColor.mapping @@ -1,11 +1,12 @@ CLASS net/minecraft/class_1767 net/minecraft/util/DyeColor COMMENT An enum representing 16 dye colors. FIELD field_16537 signColor I + FIELD field_41600 CODEC Lnet/minecraft/class_3542$class_7292; FIELD field_7943 colorComponents [F FIELD field_7948 name Ljava/lang/String; FIELD field_7950 BY_FIREWORK_COLOR Lit/unimi/dsi/fastutil/ints/Int2ObjectOpenHashMap; FIELD field_7956 mapColor Lnet/minecraft/class_3620; - FIELD field_7959 VALUES [Lnet/minecraft/class_1767; + FIELD field_7959 BY_ID Ljava/util/function/IntFunction; FIELD field_7960 fireworkColor I FIELD field_7965 id I METHOD (Ljava/lang/String;IILjava/lang/String;ILnet/minecraft/class_3620;II)V @@ -49,3 +50,7 @@ CLASS net/minecraft/class_1767 net/minecraft/util/DyeColor ARG 1 defaultColor METHOD method_7794 getMapColor ()Lnet/minecraft/class_3620; COMMENT {@return the corresponding map color} + METHOD method_7795 (Lnet/minecraft/class_1767;)Ljava/lang/Integer; + ARG 0 color + METHOD method_7797 (Lnet/minecraft/class_1767;)Lnet/minecraft/class_1767; + ARG 0 color diff --git a/mappings/net/minecraft/util/Identifier.mapping b/mappings/net/minecraft/util/Identifier.mapping index d05a6227a9..c291995e0a 100644 --- a/mappings/net/minecraft/util/Identifier.mapping +++ b/mappings/net/minecraft/util/Identifier.mapping @@ -70,7 +70,7 @@ CLASS net/minecraft/class_2960 net/minecraft/util/Identifier COMMENT COMMENT

    Using Identifier

    COMMENT

    Identifiers identify several objects in the game. {@link - COMMENT net.minecraft.util.registry.Registry} holds objects, such as blocks and items, that are + COMMENT net.minecraft.registry.Registry} holds objects, such as blocks and items, that are COMMENT identified by an identifier. Textures are also identified using an identifier; such COMMENT an identifier is represented as a file path with an extension, such as {@code COMMENT minecraft:textures/entity/pig/pig.png}. @@ -82,7 +82,7 @@ CLASS net/minecraft/class_2960 net/minecraft/util/Identifier COMMENT

    RegistryKey

    COMMENT

    Identifier is not type-aware; {@code minecraft:tnt} could refer to a TNT block, a TNT COMMENT item, or a TNT entity. To identify a registered object uniquely, {@link - COMMENT net.minecraft.util.registry.RegistryKey} can be used. A registry key is a combination + COMMENT net.minecraft.registry.RegistryKey} can be used. A registry key is a combination COMMENT of the registry's identifier and the object's identifier. FIELD field_13353 namespace Ljava/lang/String; FIELD field_13354 COMMAND_EXCEPTION Lcom/mojang/brigadier/exceptions/SimpleCommandExceptionType; @@ -92,14 +92,20 @@ CLASS net/minecraft/class_2960 net/minecraft/util/Identifier FIELD field_33381 DEFAULT_NAMESPACE Ljava/lang/String; FIELD field_33382 REALMS_NAMESPACE Ljava/lang/String; METHOD (Ljava/lang/String;)V - COMMENT

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

    Takes a string of the form {@code :} or {@code } which will use the default namespace, for example {@code minecraft:iron_ingot} or {@code 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

    If there is no colon in the given string argument, the namespace will be set to {@value #DEFAULT_NAMESPACE}, and the path will be the given argument. + COMMENT If the colon is the first character of the given string argument (i.e. the namespace is empty), the namespace will also be set to {@value #DEFAULT_NAMESPACE}, and the path will be the given argument without the initial colon. COMMENT @throws InvalidIdentifierException if the string cannot be parsed as an identifier. ARG 1 id METHOD (Ljava/lang/String;Ljava/lang/String;)V ARG 1 namespace ARG 2 path + METHOD (Ljava/lang/String;Ljava/lang/String;Lnet/minecraft/class_2960$class_7658;)V + ARG 1 namespace + ARG 2 path + ARG 3 extraData METHOD ([Ljava/lang/String;)V ARG 1 id METHOD compareTo (Ljava/lang/Object;)I @@ -112,6 +118,7 @@ CLASS net/minecraft/class_2960 net/minecraft/util/Identifier COMMENT @see #of ARG 0 id METHOD method_12830 split (Ljava/lang/String;C)[Ljava/lang/String; + COMMENT Splits the {@code id} into an array of two strings at the first occurrence of {@code delimiter}, excluding the delimiter character, or uses {@value #DEFAULT_NAMESPACE} for the first string in the resulting array when the deliminator does not exist or is the first character. ARG 0 id ARG 1 delimiter METHOD method_12831 isCharValid (C)Z @@ -162,6 +169,25 @@ CLASS net/minecraft/class_2960 net/minecraft/util/Identifier ARG 1 path METHOD method_43903 toShortTranslationKey ()Ljava/lang/String; COMMENT {@return the short translation key, with the default namespace omitted if present} + METHOD method_45134 withPath (Ljava/util/function/UnaryOperator;)Lnet/minecraft/class_2960; + ARG 1 pathFunction + METHOD method_45135 validateNamespace (Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String; + ARG 0 namespace + ARG 1 path + METHOD method_45136 withPath (Ljava/lang/String;)Lnet/minecraft/class_2960; + ARG 1 path + METHOD method_45137 validatePath (Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String; + ARG 0 namespace + ARG 1 path + METHOD method_45138 withPrefixedPath (Ljava/lang/String;)Lnet/minecraft/class_2960; + ARG 1 prefix + METHOD method_48331 withSuffixedPath (Ljava/lang/String;)Lnet/minecraft/class_2960; + ARG 1 suffix + METHOD method_48747 toTranslationKey (Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String; + COMMENT {@return the {@linkplain #toTranslationKey() long translation key} prefixed with + COMMENT {@code prefix} and a dot, and suffixed with a dot and {@code suffix}} + ARG 1 prefix + ARG 2 suffix CLASS class_2961 Serializer METHOD deserialize (Lcom/google/gson/JsonElement;Ljava/lang/reflect/Type;Lcom/google/gson/JsonDeserializationContext;)Ljava/lang/Object; ARG 1 json @@ -171,3 +197,6 @@ CLASS net/minecraft/class_2960 net/minecraft/util/Identifier ARG 1 id ARG 2 type ARG 3 context + CLASS class_7658 ExtraData + COMMENT A piece of extra data that a subclass may attach to an identifier. This is + COMMENT not used by {@link Identifier} itself. diff --git a/mappings/net/minecraft/util/InvalidHierarchicalFileException.mapping b/mappings/net/minecraft/util/InvalidHierarchicalFileException.mapping new file mode 100644 index 0000000000..a6e248f2c4 --- /dev/null +++ b/mappings/net/minecraft/util/InvalidHierarchicalFileException.mapping @@ -0,0 +1,23 @@ +CLASS net/minecraft/class_2973 net/minecraft/util/InvalidHierarchicalFileException + COMMENT An exception that tracks the names of the invalid files and the path to + COMMENT the invalid element in a hierarchical tree structure (such as JSON). + FIELD field_13371 invalidFiles Ljava/util/List; + FIELD field_13372 message Ljava/lang/String; + METHOD (Ljava/lang/String;)V + ARG 1 message + METHOD (Ljava/lang/String;Ljava/lang/Throwable;)V + ARG 1 message + ARG 2 cause + METHOD method_12854 addInvalidKey (Ljava/lang/String;)V + ARG 1 key + METHOD method_12855 addInvalidFile (Ljava/lang/String;)V + ARG 1 fileName + METHOD method_12856 wrap (Ljava/lang/Exception;)Lnet/minecraft/class_2973; + ARG 0 cause + CLASS class_2974 File + FIELD field_13373 name Ljava/lang/String; + FIELD field_13374 keys Ljava/util/List; + METHOD method_12857 joinKeys ()Ljava/lang/String; + METHOD method_12858 addKey (Ljava/lang/String;)V + ARG 1 key + METHOD method_36182 getName ()Ljava/lang/String; diff --git a/mappings/net/minecraft/util/JsonHelper.mapping b/mappings/net/minecraft/util/JsonHelper.mapping index df2934396d..1f998a8531 100644 --- a/mappings/net/minecraft/util/JsonHelper.mapping +++ b/mappings/net/minecraft/util/JsonHelper.mapping @@ -13,7 +13,7 @@ CLASS net/minecraft/class_3518 net/minecraft/util/JsonHelper ARG 1 element METHOD method_15255 deserialize (Ljava/io/Reader;)Lcom/google/gson/JsonObject; ARG 0 reader - METHOD method_15256 asItem (Lcom/google/gson/JsonElement;Ljava/lang/String;)Lnet/minecraft/class_1792; + METHOD method_15256 asItem (Lcom/google/gson/JsonElement;Ljava/lang/String;)Lnet/minecraft/class_6880; ARG 0 element ARG 1 name METHOD method_15257 asInt (Lcom/google/gson/JsonElement;Ljava/lang/String;)I @@ -84,7 +84,7 @@ CLASS net/minecraft/class_3518 net/minecraft/util/JsonHelper METHOD method_15276 deserialize (Lcom/google/gson/Gson;Ljava/io/Reader;Ljava/lang/Class;)Ljava/lang/Object; ARG 0 gson ARG 1 reader - ARG 2 clazz + ARG 2 type METHOD method_15277 getFloat (Lcom/google/gson/JsonObject;Ljava/lang/String;F)F ARG 0 object ARG 1 element @@ -95,7 +95,7 @@ CLASS net/minecraft/class_3518 net/minecraft/util/JsonHelper METHOD method_15279 deserialize (Lcom/google/gson/Gson;Ljava/lang/String;Ljava/lang/Class;Z)Ljava/lang/Object; ARG 0 gson ARG 1 content - ARG 2 clazz + ARG 2 type ARG 3 lenient METHOD method_15280 getLong (Lcom/google/gson/JsonObject;Ljava/lang/String;J)J ARG 0 object @@ -118,7 +118,7 @@ CLASS net/minecraft/class_3518 net/minecraft/util/JsonHelper METHOD method_15284 deserialize (Lcom/google/gson/Gson;Ljava/lang/String;Ljava/lang/Class;)Ljava/lang/Object; ARG 0 gson ARG 1 content - ARG 2 clazz + ARG 2 type METHOD method_15285 deserialize (Ljava/lang/String;)Lcom/google/gson/JsonObject; ARG 0 content METHOD method_15286 isString (Lcom/google/gson/JsonElement;)Z @@ -126,7 +126,7 @@ CLASS net/minecraft/class_3518 net/minecraft/util/JsonHelper METHOD method_15287 asString (Lcom/google/gson/JsonElement;Ljava/lang/String;)Ljava/lang/String; ARG 0 element ARG 1 name - METHOD method_15288 getItem (Lcom/google/gson/JsonObject;Ljava/lang/String;)Lnet/minecraft/class_1792; + METHOD method_15288 getItem (Lcom/google/gson/JsonObject;Ljava/lang/String;)Lnet/minecraft/class_6880; ARG 0 object ARG 1 key METHOD method_15289 hasString (Lcom/google/gson/JsonObject;Ljava/lang/String;)Z @@ -175,10 +175,10 @@ CLASS net/minecraft/class_3518 net/minecraft/util/JsonHelper ARG 0 object ARG 1 element ARG 2 defaultDouble - METHOD method_34916 getItem (Lcom/google/gson/JsonObject;Ljava/lang/String;Lnet/minecraft/class_1792;)Lnet/minecraft/class_1792; + METHOD method_34916 getItem (Lcom/google/gson/JsonObject;Ljava/lang/String;Lnet/minecraft/class_6880;)Lnet/minecraft/class_6880; ARG 0 object ARG 1 key - ARG 2 defaultItem + ARG 2 defaultValue METHOD method_34917 getBigDecimal (Lcom/google/gson/JsonObject;Ljava/lang/String;Ljava/math/BigDecimal;)Ljava/math/BigDecimal; ARG 0 object ARG 1 element @@ -245,3 +245,21 @@ CLASS net/minecraft/class_3518 net/minecraft/util/JsonHelper ARG 0 content METHOD method_43680 toSortedString (Lcom/google/gson/JsonElement;)Ljava/lang/String; ARG 0 json + METHOD method_47992 deserializeNullable (Lcom/google/gson/Gson;Ljava/io/Reader;Lcom/google/gson/reflect/TypeToken;Z)Ljava/lang/Object; + ARG 0 gson + ARG 1 reader + ARG 2 typeToken + ARG 3 lenient + METHOD method_47993 deserializeNullable (Lcom/google/gson/Gson;Ljava/io/Reader;Ljava/lang/Class;Z)Ljava/lang/Object; + ARG 0 gson + ARG 1 reader + ARG 2 type + ARG 3 lenient + METHOD method_47994 deserializeNullable (Lcom/google/gson/Gson;Ljava/lang/String;Ljava/lang/Class;Z)Ljava/lang/Object; + ARG 0 gson + ARG 1 content + ARG 2 type + ARG 3 lenient + METHOD method_52226 getElement (Lcom/google/gson/JsonObject;Ljava/lang/String;)Lcom/google/gson/JsonElement; + ARG 0 object + ARG 1 name diff --git a/mappings/net/minecraft/util/JsonSerializableType.mapping b/mappings/net/minecraft/util/JsonSerializableType.mapping deleted file mode 100644 index 6e9c514d1a..0000000000 --- a/mappings/net/minecraft/util/JsonSerializableType.mapping +++ /dev/null @@ -1,5 +0,0 @@ -CLASS net/minecraft/class_5336 net/minecraft/util/JsonSerializableType - FIELD field_25204 jsonSerializer Lnet/minecraft/class_5335; - METHOD (Lnet/minecraft/class_5335;)V - ARG 1 jsonSerializer - METHOD method_29312 getJsonSerializer ()Lnet/minecraft/class_5335; diff --git a/mappings/net/minecraft/util/JsonSerializer.mapping b/mappings/net/minecraft/util/JsonSerializer.mapping deleted file mode 100644 index a35b71a4f1..0000000000 --- a/mappings/net/minecraft/util/JsonSerializer.mapping +++ /dev/null @@ -1,8 +0,0 @@ -CLASS net/minecraft/class_5335 net/minecraft/util/JsonSerializer - METHOD method_516 toJson (Lcom/google/gson/JsonObject;Ljava/lang/Object;Lcom/google/gson/JsonSerializationContext;)V - ARG 1 json - ARG 2 object - ARG 3 context - METHOD method_517 fromJson (Lcom/google/gson/JsonObject;Lcom/google/gson/JsonDeserializationContext;)Ljava/lang/Object; - ARG 1 json - ARG 2 context diff --git a/mappings/net/minecraft/util/JsonSerializing.mapping b/mappings/net/minecraft/util/JsonSerializing.mapping deleted file mode 100644 index 2d430547a9..0000000000 --- a/mappings/net/minecraft/util/JsonSerializing.mapping +++ /dev/null @@ -1,72 +0,0 @@ -CLASS net/minecraft/class_5330 net/minecraft/util/JsonSerializing - METHOD method_29306 createSerializerBuilder (Lnet/minecraft/class_2378;Ljava/lang/String;Ljava/lang/String;Ljava/util/function/Function;)Lnet/minecraft/class_5330$class_5331; - ARG 0 registry - ARG 1 rootFieldName - ARG 2 idFieldName - ARG 3 typeGetter - CLASS class_5331 SerializerBuilder - COMMENT A builder for serializing types to JSON that can either obtain a type from - COMMENT a registry to handle JSON conversion or handle with a custom logic bound - COMMENT to a type. - COMMENT - COMMENT

    When the root element read is an object, the built serializer obtains the type - COMMENT from registry to handle reading; otherwise, it falls back to custom - COMMENT logic. - FIELD field_25192 registry Lnet/minecraft/class_2378; - FIELD field_25193 rootFieldName Ljava/lang/String; - FIELD field_25194 idFieldName Ljava/lang/String; - FIELD field_25195 typeGetter Ljava/util/function/Function; - FIELD field_25196 elementSerializer Lcom/mojang/datafixers/util/Pair; - FIELD field_28444 defaultType Lnet/minecraft/class_5336; - METHOD (Lnet/minecraft/class_2378;Ljava/lang/String;Ljava/lang/String;Ljava/util/function/Function;)V - ARG 1 registry - ARG 2 rootFieldName - ARG 3 idFieldName - ARG 4 typeIdentification - METHOD method_29307 build ()Ljava/lang/Object; - METHOD method_32385 elementSerializer (Lnet/minecraft/class_5336;Lnet/minecraft/class_5330$class_5332;)Lnet/minecraft/class_5330$class_5331; - COMMENT Sets the element serializer and its target type. It can serialize and - COMMENT deserialize instances of one type to non-{@link com.google.gson.JsonObject} - COMMENT elements. - COMMENT - COMMENT @apiNote There can only be one element serializer for this builder and - COMMENT the built serializer. Calling this method replaces any previous serializer. - ARG 1 type - COMMENT the target type of the element serializer - ARG 2 serializer - COMMENT the element serializer - METHOD method_33409 defaultType (Lnet/minecraft/class_5336;)Lnet/minecraft/class_5330$class_5331; - COMMENT Sets the default type that is used when there's no ID field. - COMMENT - COMMENT @return this instance - ARG 1 defaultType - COMMENT the default type - CLASS class_5332 ElementSerializer - METHOD method_29308 fromJson (Lcom/google/gson/JsonElement;Lcom/google/gson/JsonDeserializationContext;)Ljava/lang/Object; - ARG 1 json - ARG 2 context - METHOD method_29309 toJson (Ljava/lang/Object;Lcom/google/gson/JsonSerializationContext;)Lcom/google/gson/JsonElement; - ARG 1 object - ARG 2 context - CLASS class_5333 GsonSerializer - FIELD field_25197 registry Lnet/minecraft/class_2378; - FIELD field_25198 rootFieldName Ljava/lang/String; - FIELD field_25199 idFieldName Ljava/lang/String; - FIELD field_25200 typeGetter Ljava/util/function/Function; - FIELD field_25201 elementSerializer Lcom/mojang/datafixers/util/Pair; - FIELD field_28445 defaultType Lnet/minecraft/class_5336; - METHOD (Lnet/minecraft/class_2378;Ljava/lang/String;Ljava/lang/String;Ljava/util/function/Function;Lnet/minecraft/class_5336;Lcom/mojang/datafixers/util/Pair;)V - ARG 1 registry - ARG 2 rootFieldName - ARG 3 idFieldName - ARG 4 typeGetter - ARG 5 defaultType - ARG 6 elementSerializer - METHOD deserialize (Lcom/google/gson/JsonElement;Ljava/lang/reflect/Type;Lcom/google/gson/JsonDeserializationContext;)Ljava/lang/Object; - ARG 1 json - ARG 2 type - ARG 3 context - METHOD serialize (Ljava/lang/Object;Ljava/lang/reflect/Type;Lcom/google/gson/JsonSerializationContext;)Lcom/google/gson/JsonElement; - ARG 1 object - ARG 2 type - ARG 3 context diff --git a/mappings/net/minecraft/util/Language.mapping b/mappings/net/minecraft/util/Language.mapping index ad7f4150a5..d724957c06 100644 --- a/mappings/net/minecraft/util/Language.mapping +++ b/mappings/net/minecraft/util/Language.mapping @@ -18,8 +18,14 @@ CLASS net/minecraft/class_2477 net/minecraft/util/Language ARG 1 text METHOD method_4678 hasTranslation (Ljava/lang/String;)Z ARG 1 key - METHOD method_4679 get (Ljava/lang/String;)Ljava/lang/String; + METHOD method_4679 get (Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String; ARG 1 key + ARG 2 fallback + METHOD method_48307 get (Ljava/lang/String;)Ljava/lang/String; + ARG 1 key + METHOD method_51465 load (Ljava/util/function/BiConsumer;Ljava/lang/String;)V + ARG 0 entryConsumer + ARG 1 path CLASS 1 METHOD method_30935 (Lnet/minecraft/class_5224;Lnet/minecraft/class_2583;Ljava/lang/String;)Ljava/util/Optional; ARG 1 style diff --git a/mappings/net/minecraft/util/MetricsData.mapping b/mappings/net/minecraft/util/MetricsData.mapping deleted file mode 100644 index 5872a24909..0000000000 --- a/mappings/net/minecraft/util/MetricsData.mapping +++ /dev/null @@ -1,13 +0,0 @@ -CLASS net/minecraft/class_3517 net/minecraft/util/MetricsData - FIELD field_15653 samples [J - FIELD field_15654 writeIndex I - FIELD field_15655 sampleCount I - FIELD field_15656 startIndex I - FIELD field_29839 SIZE I - METHOD method_15246 getSamples ()[J - METHOD method_15247 pushSample (J)V - ARG 1 time - METHOD method_15249 getStartIndex ()I - METHOD method_15250 getCurrentIndex ()I - METHOD method_15251 wrapIndex (I)I - ARG 1 index diff --git a/mappings/net/minecraft/util/Nullables.mapping b/mappings/net/minecraft/util/Nullables.mapping new file mode 100644 index 0000000000..e9f9868caa --- /dev/null +++ b/mappings/net/minecraft/util/Nullables.mapping @@ -0,0 +1,65 @@ +CLASS net/minecraft/class_8144 net/minecraft/util/Nullables + COMMENT Contains utility methods that accept or return nullable values. + METHOD method_49077 map (Ljava/lang/Object;Ljava/util/function/Function;)Ljava/lang/Object; + COMMENT {@return the {@code value} with {@code mapper} applied if the value is not {@code null}, + COMMENT otherwise {@code null}} + COMMENT + COMMENT

    This is the nullable equivalent to {@link java.util.Optional#map}. + ARG 0 value + ARG 1 mapper + METHOD method_49078 mapOrElse (Ljava/lang/Object;Ljava/util/function/Function;Ljava/lang/Object;)Ljava/lang/Object; + COMMENT {@return the {@code value} with {@code mapper} applied if the value is not {@code null}, + COMMENT otherwise {@code other}} + COMMENT + COMMENT

    This is the nullable equivalent to {@link java.util.Optional#map} chained with + COMMENT {@link java.util.Optional#orElse}. + ARG 0 value + ARG 1 mapper + ARG 2 other + METHOD method_49079 mapOrElseGet (Ljava/lang/Object;Ljava/util/function/Function;Ljava/util/function/Supplier;)Ljava/lang/Object; + COMMENT {@return the {@code value} with {@code mapper} applied if the value is not {@code null}, + COMMENT otherwise {@code getter.get()}} + COMMENT + COMMENT

    This is the nullable equivalent to {@link java.util.Optional#map} chained with + COMMENT {@link java.util.Optional#orElseGet}. + ARG 0 value + ARG 1 mapper + ARG 2 getter + METHOD method_49080 getFirst (Ljava/util/Collection;)Ljava/lang/Object; + COMMENT {@return the first element of {@code collection}, or {@code null} if it is empty} + ARG 0 collection + METHOD method_49081 getFirstOrElse (Ljava/util/Collection;Ljava/lang/Object;)Ljava/lang/Object; + COMMENT {@return the first element of {@code collection}, or {@code defaultValue} if it is empty} + ARG 0 collection + ARG 1 defaultValue + METHOD method_49082 getFirstOrElseGet (Ljava/util/Collection;Ljava/util/function/Supplier;)Ljava/lang/Object; + COMMENT {@return the first element of {@code collection}, or {@code getter.get()} if it is empty} + ARG 0 collection + ARG 1 getter + METHOD method_49083 isEmpty ([B)Z + COMMENT {@return whether {@code array} is {@code null} or empty} + ARG 0 array + METHOD method_49084 isEmpty ([C)Z + COMMENT {@return whether {@code array} is {@code null} or empty} + ARG 0 array + METHOD method_49085 isEmpty ([D)Z + COMMENT {@return whether {@code array} is {@code null} or empty} + ARG 0 array + METHOD method_49086 isEmpty ([F)Z + COMMENT {@return whether {@code array} is {@code null} or empty} + ARG 0 array + METHOD method_49087 isEmpty ([I)Z + COMMENT {@return whether {@code array} is {@code null} or empty} + ARG 0 array + METHOD method_49088 isEmpty ([J)Z + COMMENT {@return whether {@code array} is {@code null} or empty} + ARG 0 array + METHOD method_49089 isEmpty ([Ljava/lang/Object;)Z + COMMENT {@return whether {@code array} is {@code null} or empty} + ARG 0 array + METHOD method_49090 isEmpty ([S)Z + COMMENT {@return whether {@code array} is {@code null} or empty} + ARG 0 array + METHOD method_49091 isEmpty ([Z)Z + COMMENT {@return whether {@code array} is {@code null} or empty} + ARG 0 array diff --git a/mappings/net/minecraft/util/FileNameUtil.mapping b/mappings/net/minecraft/util/PathUtil.mapping similarity index 55% rename from mappings/net/minecraft/util/FileNameUtil.mapping rename to mappings/net/minecraft/util/PathUtil.mapping index d1c69bb390..6eb5a6e2d8 100644 --- a/mappings/net/minecraft/util/FileNameUtil.mapping +++ b/mappings/net/minecraft/util/PathUtil.mapping @@ -1,8 +1,9 @@ -CLASS net/minecraft/class_4239 net/minecraft/util/FileNameUtil - COMMENT A class holding file name-related utility methods. +CLASS net/minecraft/class_4239 net/minecraft/util/PathUtil + COMMENT A class holding path-related utility methods. FIELD field_18955 RESERVED_WINDOWS_NAMES Ljava/util/regex/Pattern; FIELD field_18956 FILE_NAME_WITH_COUNT Ljava/util/regex/Pattern; FIELD field_33384 MAX_NAME_LENGTH I + FIELD field_40712 VALID_FILE_NAME Ljava/util/regex/Pattern; METHOD method_19773 getNextUniqueName (Ljava/nio/file/Path;Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String; COMMENT {@return a filename, prefixed with {@code name}, that does not currently COMMENT exist inside {@code path}} @@ -39,3 +40,30 @@ CLASS net/minecraft/class_4239 net/minecraft/util/FileNameUtil COMMENT {@return the normalized path of {@code path} with directory separator normalized COMMENT to {@code /}} ARG 0 path + METHOD method_46344 getPath (Ljava/nio/file/Path;Ljava/util/List;)Ljava/nio/file/Path; + COMMENT {@return {@code paths} resolved as a path from {@code root}} + COMMENT + COMMENT

    If {@code paths} is empty, this returns {@code root}. + ARG 0 root + ARG 1 paths + METHOD method_46345 validatePath ([Ljava/lang/String;)V + COMMENT Validates that {@code paths} is not empty and does not contain invalid segments + COMMENT (such as {@code .}, {@code ..}, or otherwise {@linkplain #isFileNameValid invalid names}). + COMMENT + COMMENT @throws IllegalArgumentException when the {@code paths} are invalid + ARG 0 paths + METHOD method_46346 split (Ljava/lang/String;)Lcom/mojang/serialization/DataResult; + COMMENT {@return {@code path} split by {@code /}, or an error result if the path is invalid} + COMMENT + COMMENT

    All path segments must be a {@linkplain #isFileNameValid valid file name}. Additionally, + COMMENT {@code .} and {@code ..} are forbidden. + ARG 0 path + METHOD method_46347 isFileNameValid (Ljava/lang/String;)Z + COMMENT {@return whether {@code name} is a valid file name} + COMMENT + COMMENT @apiNote A valid file name contains only ASCII lowercase alphabets, ASCII digits, + COMMENT a dot, or an underscore. Unlike {@link Identifier} paths, hyphens are not allowed. + ARG 0 name + METHOD method_47525 createDirectories (Ljava/nio/file/Path;)V + COMMENT A symbolic-link safe version of {@link java.nio.file.Files#createDirectories}. + ARG 0 path diff --git a/mappings/net/minecraft/util/PendingTaskRunner.mapping b/mappings/net/minecraft/util/PendingTaskRunner.mapping deleted file mode 100644 index bdfc6d9341..0000000000 --- a/mappings/net/minecraft/util/PendingTaskRunner.mapping +++ /dev/null @@ -1,22 +0,0 @@ -CLASS net/minecraft/class_7493 net/minecraft/util/PendingTaskRunner - COMMENT A runner for tasks that can hold only one pending task. It replaces the - COMMENT current pending task if a new one is queued, but does not halt already - COMMENT running tasks. - COMMENT - COMMENT

    The runner needs to be updated by {@link #tick}, which checks if - COMMENT the running task is done and polls the pending task. {@link #queue} - COMMENT sets the pending task for running. - FIELD field_39442 pending Ljava/util/concurrent/atomic/AtomicReference; - FIELD field_39443 running Ljava/util/concurrent/CompletableFuture; - METHOD method_44122 tick ()V - COMMENT Waits for the running task to finish and polls the pending task if there - COMMENT is no running task. - METHOD method_44306 queue (Lnet/minecraft/class_7493$class_7518;)V - COMMENT Queues a task for running, and replaces any existing pending task. - COMMENT - COMMENT @apiNote This method can be called asynchronously, such as from the - COMMENT netty event loop. - ARG 1 task - METHOD method_44307 poll ()V - CLASS class_7518 FutureRunnable - COMMENT A supplier of a running task. diff --git a/mappings/net/minecraft/util/StringIdentifiable.mapping b/mappings/net/minecraft/util/StringIdentifiable.mapping index 51cbab7539..08e0e01667 100644 --- a/mappings/net/minecraft/util/StringIdentifiable.mapping +++ b/mappings/net/minecraft/util/StringIdentifiable.mapping @@ -5,6 +5,7 @@ CLASS net/minecraft/class_3542 net/minecraft/util/StringIdentifiable COMMENT @apiNote To make an enum serializable with codecs, implement this on the enum class, COMMENT implement {@link #asString} to return a unique ID, and add a {@code static final} COMMENT field that holds {@linkplain #createCodec the codec for the enum}. + FIELD field_38377 CACHED_MAP_THRESHOLD I METHOD method_15434 asString ()Ljava/lang/String; COMMENT {@return the unique string representation of the enum, used for serialization} METHOD method_28140 createCodec (Ljava/util/function/Supplier;)Lnet/minecraft/class_3542$class_7292; @@ -14,18 +15,24 @@ CLASS net/minecraft/class_3542 net/minecraft/util/StringIdentifiable ARG 0 enumValues METHOD method_28142 toKeyable ([Lnet/minecraft/class_3542;)Lcom/mojang/serialization/Keyable; ARG 0 values - METHOD method_39516 (Ljava/lang/Object;)Ljava/lang/String; - ARG 0 identifiable - METHOD method_42628 (Ljava/lang/Enum;)Ljava/lang/Enum; - ARG 0 enum_ - METHOD method_42629 (Ljava/util/Map;Ljava/lang/String;)Ljava/lang/Enum; - ARG 1 id - METHOD method_42630 ([Ljava/lang/Enum;Ljava/lang/String;)Ljava/lang/Enum; + METHOD method_49451 (Ljava/lang/String;)Ljava/lang/String; + ARG 0 id + METHOD method_49452 (Ljava/util/Map;Ljava/lang/String;)Ljava/lang/Enum; ARG 1 id + METHOD method_49453 (Ljava/util/function/Function;Ljava/lang/Enum;)Ljava/lang/String; + ARG 1 enum_ + METHOD method_49454 createCodec (Ljava/util/function/Supplier;Ljava/util/function/Function;)Lnet/minecraft/class_3542$class_7292; + COMMENT Creates a codec that serializes an enum implementing this interface either + COMMENT using its ordinals (when compressed) or using its {@link #asString()} method + COMMENT and a given decode function. + ARG 0 enumValues + ARG 1 valueNameTransformer + METHOD method_49455 ([Ljava/lang/Enum;Ljava/util/function/Function;Ljava/lang/String;)Ljava/lang/Enum; + ARG 2 id CLASS 1 METHOD keys (Lcom/mojang/serialization/DynamicOps;)Ljava/util/stream/Stream; ARG 1 ops - CLASS class_7292 Codec + CLASS class_7292 EnumCodec FIELD field_38378 base Lcom/mojang/serialization/Codec; FIELD field_38379 idToIdentifiable Ljava/util/function/Function; METHOD ([Ljava/lang/Enum;Ljava/util/function/Function;)V @@ -46,3 +53,6 @@ CLASS net/minecraft/class_3542 net/minecraft/util/StringIdentifiable ARG 1 ordinal METHOD method_42635 (Ljava/lang/Object;)Ljava/lang/String; ARG 0 identifiable + METHOD method_47920 byId (Ljava/lang/String;Ljava/lang/Enum;)Ljava/lang/Enum; + ARG 1 id + ARG 2 fallback diff --git a/mappings/net/minecraft/util/Urls.mapping b/mappings/net/minecraft/util/Urls.mapping new file mode 100644 index 0000000000..2a9749c2c0 --- /dev/null +++ b/mappings/net/minecraft/util/Urls.mapping @@ -0,0 +1,28 @@ +CLASS net/minecraft/class_8216 net/minecraft/util/Urls + FIELD field_43117 GDPR Ljava/lang/String; + FIELD field_43118 EULA Ljava/lang/String; + FIELD field_43119 JAVA_ATTRIBUTION Ljava/lang/String; + FIELD field_43120 JAVA_LICENSES Ljava/lang/String; + FIELD field_43121 BUY_JAVA Ljava/lang/String; + FIELD field_43122 JAVA_ACCOUNT_SETTINGS Ljava/lang/String; + FIELD field_43123 SNAPSHOT_FEEDBACK Ljava/lang/String; + FIELD field_43124 JAVA_FEEDBACK Ljava/lang/String; + FIELD field_43125 SNAPSHOT_BUGS Ljava/lang/String; + FIELD field_43126 JAVA_ACCESSIBILITY Ljava/lang/String; + FIELD field_43127 ABOUT_JAVA_REPORTING Ljava/lang/String; + FIELD field_43128 JAVA_MODERATION Ljava/lang/String; + FIELD field_43129 JAVA_BLOCKING Ljava/lang/String; + FIELD field_43130 JAVA_REALMS_TRIAL Ljava/lang/String; + FIELD field_43131 BUY_JAVA_REALMS Ljava/lang/String; + FIELD field_43132 REALMS_TERMS Ljava/lang/String; + FIELD field_43133 REALMS_CONTENT_CREATOR Ljava/lang/String; + FIELD field_43134 UPDATE_MOJANG_ACCOUNT Ljava/lang/String; + FIELD field_44949 MINECRAFT_SYMLINKS Ljava/lang/String; + FIELD field_45074 PRIVACY_STATEMENT Ljava/lang/String; + METHOD method_49719 getExtendJavaRealmsUrl (Ljava/lang/String;Ljava/util/UUID;)Ljava/lang/String; + ARG 0 subscriptionId + ARG 1 uuid + METHOD method_49720 getExtendJavaRealmsUrl (Ljava/lang/String;Ljava/util/UUID;Z)Ljava/lang/String; + ARG 0 subscriptionId + ARG 1 uuid + ARG 2 trial diff --git a/mappings/net/minecraft/util/UserCache.mapping b/mappings/net/minecraft/util/UserCache.mapping index 5326671314..9af7bcbc8b 100644 --- a/mappings/net/minecraft/util/UserCache.mapping +++ b/mappings/net/minecraft/util/UserCache.mapping @@ -46,21 +46,13 @@ CLASS net/minecraft/class_3312 net/minecraft/util/UserCache METHOD method_37155 (Ljava/lang/String;Ljava/util/Optional;Ljava/lang/Throwable;)V ARG 2 profile ARG 3 throwable - METHOD method_37156 findByNameAsync (Ljava/lang/String;Ljava/util/function/Consumer;)V + METHOD method_37156 findByNameAsync (Ljava/lang/String;)Ljava/util/concurrent/CompletableFuture; ARG 1 username - ARG 2 consumer METHOD method_37157 setExecutor (Ljava/util/concurrent/Executor;)V ARG 1 executor - METHOD method_37158 (Ljava/util/function/Consumer;Ljava/util/Optional;Ljava/lang/Throwable;)V - ARG 1 profile - ARG 2 throwable - METHOD method_37160 (Ljava/util/function/Consumer;Ljava/util/Optional;Ljava/lang/Throwable;)V - ARG 1 profile - ARG 2 throwable METHOD method_39753 clearExecutor ()V CLASS 1 - METHOD onProfileLookupFailed (Lcom/mojang/authlib/GameProfile;Ljava/lang/Exception;)V - ARG 1 profile + METHOD onProfileLookupFailed (Ljava/lang/String;Ljava/lang/Exception;)V ARG 2 exception METHOD onProfileLookupSucceeded (Lcom/mojang/authlib/GameProfile;)V ARG 1 profile diff --git a/mappings/net/minecraft/util/Util.mapping b/mappings/net/minecraft/util/Util.mapping index e082aee279..c3f62fc82e 100644 --- a/mappings/net/minecraft/util/Util.mapping +++ b/mappings/net/minecraft/util/Util.mapping @@ -5,7 +5,6 @@ CLASS net/minecraft/class_156 net/minecraft/util/Util FIELD field_18034 NEXT_WORKER_ID Ljava/util/concurrent/atomic/AtomicInteger; FIELD field_18035 MAIN_WORKER_EXECUTOR Ljava/util/concurrent/ExecutorService; FIELD field_24477 IO_WORKER_EXECUTOR Ljava/util/concurrent/ExecutorService; - FIELD field_24622 BOOTSTRAP_EXECUTOR Ljava/util/concurrent/ExecutorService; FIELD field_25140 NIL_UUID Ljava/util/UUID; COMMENT The "nil UUID" that represents lack of a UUID. FIELD field_33859 JAR_FILE_SYSTEM_PROVIDER Ljava/nio/file/spi/FileSystemProvider; @@ -34,9 +33,6 @@ CLASS net/minecraft/class_156 net/minecraft/util/Util METHOD method_18839 debugRunnable (Ljava/lang/Runnable;Ljava/util/function/Supplier;)Ljava/lang/Runnable; ARG 0 runnable ARG 1 messageSupplier - METHOD method_19483 completeExceptionally (Ljava/lang/Throwable;)Ljava/util/concurrent/CompletableFuture; - COMMENT {@return a future that is already completed exceptionally with {@code throwable}} - ARG 0 throwable METHOD method_20793 getLast (Ljava/util/List;)Ljava/lang/Object; COMMENT {@return the last item of {@code list}} COMMENT @@ -86,10 +82,6 @@ CLASS net/minecraft/class_156 net/minecraft/util/Util ARG 0 name METHOD method_28123 (Ljava/lang/String;Ljava/util/concurrent/ForkJoinPool;)Ljava/util/concurrent/ForkJoinWorkerThread; ARG 1 forkJoinPool - METHOD method_28124 getBootstrapExecutor ()Ljava/util/concurrent/ExecutorService; - COMMENT {@return the executor for asynchronous bootstrapping} - COMMENT - COMMENT

    This is used by DataFixerUpper to build schemas. METHOD method_29187 getChoiceType (Lcom/mojang/datafixers/DSL$TypeReference;Ljava/lang/String;)Lcom/mojang/datafixers/types/Type; ARG 0 typeReference ARG 1 id @@ -104,7 +96,7 @@ CLASS net/minecraft/class_156 net/minecraft/util/Util ARG 1 consumer METHOD method_29189 (Ljava/util/function/Consumer;Ljava/lang/String;Ljava/lang/String;)V ARG 2 string - METHOD method_29190 toArray (Ljava/util/stream/IntStream;I)Lcom/mojang/serialization/DataResult; + METHOD method_29190 decodeFixedLengthArray (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; @@ -150,7 +142,7 @@ CLASS net/minecraft/class_156 net/minecraft/util/Util COMMENT @see #getRandomOrEmpty ARG 0 list ARG 1 random - METHOD method_33141 toArray (Ljava/util/List;I)Lcom/mojang/serialization/DataResult; + METHOD method_33141 decodeFixedLengthList (Ljava/util/List;I)Lcom/mojang/serialization/DataResult; ARG 0 list ARG 1 length METHOD method_33559 error (Ljava/lang/String;)V @@ -236,7 +228,7 @@ CLASS net/minecraft/class_156 net/minecraft/util/Util ARG 1 random METHOD method_43368 (Ljava/util/List;Ljava/lang/Void;)Ljava/util/List; ARG 1 void_ - METHOD method_43369 (Ljava/util/List;Ljava/util/concurrent/CompletableFuture;Ljava/lang/Throwable;)V + METHOD method_43369 (Ljava/util/concurrent/CompletableFuture;Ljava/util/List;Ljava/lang/Throwable;)V ARG 2 throwable METHOD method_43370 combine (Ljava/util/List;Ljava/util/function/Consumer;)Ljava/util/concurrent/CompletableFuture; ARG 0 futures @@ -285,22 +277,6 @@ CLASS net/minecraft/class_156 net/minecraft/util/Util COMMENT @implNote Unlike {@link java.util.List#lastIndexOf}, the returned function will COMMENT return {@code 0} when given values not in the passed list. ARG 0 values - METHOD method_43926 map (Ljava/lang/Object;Ljava/util/function/Function;)Ljava/lang/Object; - COMMENT {@return the {@code value} with {@code mapper} applied if the value is not {@code null}, - COMMENT otherwise {@code null}} - COMMENT - COMMENT

    This is the nullable equivalent to {@link Optional#map}. - ARG 0 value - ARG 1 mapper - METHOD method_43927 mapOrElse (Ljava/lang/Object;Ljava/util/function/Function;Ljava/lang/Object;)Ljava/lang/Object; - COMMENT {@return the {@code value} with {@code mapper} applied if the value is not {@code null}, - COMMENT otherwise {@code other}} - COMMENT - COMMENT

    This is the nullable equivalent to {@link Optional#map} chained with - COMMENT {@link Optional#orElse}. - ARG 0 value - ARG 1 mapper - ARG 2 other METHOD method_44146 lastIndexGetter (Ljava/util/List;Ljava/util/function/IntFunction;)Ljava/util/function/ToIntFunction; COMMENT {@return a function that, when given a value in {@code values}, returns the last COMMENT index of the value in the list} @@ -313,6 +289,25 @@ CLASS net/minecraft/class_156 net/minecraft/util/Util COMMENT returns a map for storing the indices of the values METHOD method_44893 getFormattedCurrentTime ()Ljava/lang/String; COMMENT {@return the current time formatted using {@link #DATE_TIME_FORMATTER}} + METHOD method_47526 getResult (Lcom/mojang/serialization/DataResult;Ljava/util/function/Function;)Ljava/lang/Object; + COMMENT {@return the result wrapped in {@code result}} + ARG 0 result + ARG 1 exceptionGetter + METHOD method_48746 cachedMapper (Ljava/util/function/Function;)Lnet/minecraft/class_8105; + ARG 0 mapper + METHOD method_51822 decodeFixedLengthArray (Ljava/util/stream/LongStream;I)Lcom/mojang/serialization/DataResult; + ARG 0 stream + ARG 1 length + METHOD method_51893 isWhitespace (I)Z + COMMENT {@return whether {@code c} represents a space character} + COMMENT + COMMENT @see Character#isWhitespace + COMMENT @see Character#isSpaceChar + ARG 0 c + METHOD method_51894 isBlank (Ljava/lang/String;)Z + COMMENT {@return whether {@code string} is {@code null}, empty, or composed entirely + COMMENT of {@linkplain #isWhitespace} spaces} + ARG 0 string METHOD method_645 previous (Ljava/lang/Iterable;Ljava/lang/Object;)Ljava/lang/Object; COMMENT {@return the item preceding {@code object} in {@code iterable}} COMMENT diff --git a/mappings/net/minecraft/util/dynamic/DynamicSerializableUuid.mapping b/mappings/net/minecraft/util/Uuids.mapping similarity index 53% rename from mappings/net/minecraft/util/dynamic/DynamicSerializableUuid.mapping rename to mappings/net/minecraft/util/Uuids.mapping index 799a8688d5..9785e24897 100644 --- a/mappings/net/minecraft/util/dynamic/DynamicSerializableUuid.mapping +++ b/mappings/net/minecraft/util/Uuids.mapping @@ -1,7 +1,9 @@ -CLASS net/minecraft/class_4844 net/minecraft/util/dynamic/DynamicSerializableUuid - FIELD field_25122 CODEC Lcom/mojang/serialization/Codec; +CLASS net/minecraft/class_4844 net/minecraft/util/Uuids + FIELD field_25122 INT_STREAM_CODEC Lcom/mojang/serialization/Codec; FIELD field_38907 OFFLINE_PLAYER_UUID_PREFIX Ljava/lang/String; FIELD field_39211 BYTE_ARRAY_SIZE I + FIELD field_40825 CODEC Lcom/mojang/serialization/Codec; + FIELD field_41525 STRING_CODEC Lcom/mojang/serialization/Codec; METHOD method_26274 toIntArray (JJ)[I ARG 0 uuidMost ARG 2 uuidLeast @@ -15,9 +17,17 @@ CLASS net/minecraft/class_4844 net/minecraft/util/dynamic/DynamicSerializableUui ARG 0 uuid METHOD method_35848 toUuid (Lcom/mojang/serialization/Dynamic;)Ljava/util/UUID; ARG 0 dynamic - METHOD method_43343 getUuidFromProfile (Lcom/mojang/authlib/GameProfile;)Ljava/util/UUID; - ARG 0 profile METHOD method_43344 getOfflinePlayerUuid (Ljava/lang/String;)Ljava/util/UUID; ARG 0 nickname METHOD method_44827 toByteArray (Ljava/util/UUID;)[B ARG 0 uuid + METHOD method_46559 (Lcom/mojang/datafixers/util/Either;)Ljava/util/UUID; + ARG 0 either + METHOD method_46560 (Ljava/lang/String;)Lcom/mojang/serialization/DataResult; + ARG 0 string + METHOD method_46561 (Ljava/util/UUID;)Ljava/util/UUID; + ARG 0 uuid + METHOD method_46562 (Ljava/util/UUID;)Ljava/util/UUID; + ARG 0 uuid + METHOD method_47804 (Ljava/lang/String;)Lcom/mojang/serialization/DataResult; + ARG 0 string diff --git a/mappings/net/minecraft/util/collection/ArrayListDeque.mapping b/mappings/net/minecraft/util/collection/ArrayListDeque.mapping new file mode 100644 index 0000000000..5509936bf6 --- /dev/null +++ b/mappings/net/minecraft/util/collection/ArrayListDeque.mapping @@ -0,0 +1,55 @@ +CLASS net/minecraft/class_8623 net/minecraft/util/collection/ArrayListDeque + FIELD field_45067 MISSING I + FIELD field_45068 array [Ljava/lang/Object; + FIELD field_45069 startIndex I + FIELD field_45070 size I + METHOD (I)V + ARG 1 size + METHOD add (ILjava/lang/Object;)V + ARG 1 index + ARG 2 value + METHOD addFirst (Ljava/lang/Object;)V + ARG 1 value + METHOD addLast (Ljava/lang/Object;)V + ARG 1 value + METHOD forEach (Ljava/util/function/Consumer;)V + ARG 1 consumer + METHOD get (I)Ljava/lang/Object; + ARG 1 index + METHOD method_52450 getArrayLength ()I + METHOD method_52451 wrap (I)I + ARG 1 index + METHOD method_52452 checkBounds (II)V + ARG 0 start + ARG 1 end + METHOD method_52453 copyTo ([Ljava/lang/Object;I)V + ARG 1 array + ARG 2 size + METHOD method_52454 enlarge ()V + METHOD method_52455 checkBounds (I)V + ARG 1 index + METHOD method_52456 getRaw (I)Ljava/lang/Object; + ARG 1 index + METHOD offer (Ljava/lang/Object;)Z + ARG 1 value + METHOD offerFirst (Ljava/lang/Object;)Z + ARG 1 value + METHOD offerLast (Ljava/lang/Object;)Z + ARG 1 value + METHOD push (Ljava/lang/Object;)V + ARG 1 value + METHOD remove (I)Ljava/lang/Object; + ARG 1 index + METHOD removeFirstOccurrence (Ljava/lang/Object;)Z + ARG 1 value + METHOD removeIf (Ljava/util/function/Predicate;)Z + ARG 1 predicate + METHOD removeLastOccurrence (Ljava/lang/Object;)Z + ARG 1 value + METHOD replaceAll (Ljava/util/function/UnaryOperator;)V + ARG 1 mapper + METHOD set (ILjava/lang/Object;)Ljava/lang/Object; + ARG 1 index + ARG 2 value + CLASS class_8624 IteratorImpl + FIELD field_45072 currentIndex I diff --git a/mappings/net/minecraft/util/collection/PaletteStorage.mapping b/mappings/net/minecraft/util/collection/PaletteStorage.mapping index 9de67182fc..8821c34c24 100644 --- a/mappings/net/minecraft/util/collection/PaletteStorage.mapping +++ b/mappings/net/minecraft/util/collection/PaletteStorage.mapping @@ -28,4 +28,6 @@ CLASS net/minecraft/class_6490 net/minecraft/util/collection/PaletteStorage ARG 1 action METHOD method_34896 getElementBits ()I COMMENT {@return the number of bits each element in this storage uses} + METHOD method_39892 writePaletteIndices ([I)V + ARG 1 out METHOD method_39939 copy ()Lnet/minecraft/class_6490; diff --git a/mappings/net/minecraft/util/collection/WeightedList.mapping b/mappings/net/minecraft/util/collection/WeightedList.mapping index 5dc020418f..4c1e082208 100644 --- a/mappings/net/minecraft/util/collection/WeightedList.mapping +++ b/mappings/net/minecraft/util/collection/WeightedList.mapping @@ -38,3 +38,5 @@ CLASS net/minecraft/class_6032 net/minecraft/util/collection/WeightedList ARG 3 data METHOD method_35105 (Lcom/mojang/serialization/Dynamic;Ljava/lang/Object;)Lnet/minecraft/class_6032$class_6033; ARG 1 data + METHOD method_35106 (Lcom/mojang/serialization/DynamicOps;Lnet/minecraft/class_6032$class_6033;)Lcom/mojang/datafixers/util/Pair; + ARG 1 entry diff --git a/mappings/net/minecraft/util/dynamic/Codecs.mapping b/mappings/net/minecraft/util/dynamic/Codecs.mapping index 18fb7b6a90..ba1de39825 100644 --- a/mappings/net/minecraft/util/dynamic/Codecs.mapping +++ b/mappings/net/minecraft/util/dynamic/Codecs.mapping @@ -8,12 +8,27 @@ CLASS net/minecraft/class_5699 net/minecraft/util/dynamic/Codecs FIELD field_33442 POSITIVE_INT Lcom/mojang/serialization/Codec; FIELD field_34387 POSITIVE_FLOAT Lcom/mojang/serialization/Codec; FIELD field_37408 REGULAR_EXPRESSION Lcom/mojang/serialization/Codec; - FIELD field_38081 UUID Lcom/mojang/serialization/Codec; FIELD field_39042 INSTANT Lcom/mojang/serialization/Codec; FIELD field_39273 BASE_64 Lcom/mojang/serialization/Codec; FIELD field_39274 TAG_ENTRY_ID Lcom/mojang/serialization/Codec; FIELD field_39395 OPTIONAL_OF_LONG_TO_OPTIONAL_LONG Ljava/util/function/Function; FIELD field_39396 OPTIONAL_LONG_TO_OPTIONAL_OF_LONG Ljava/util/function/Function; + FIELD field_40721 JSON_ELEMENT Lcom/mojang/serialization/Codec; + FIELD field_40722 TEXT Lcom/mojang/serialization/Codec; + FIELD field_40723 VECTOR_3F Lcom/mojang/serialization/Codec; + FIELD field_40724 BIT_SET Lcom/mojang/serialization/Codec; + FIELD field_40725 GAME_PROFILE_PROPERTY_MAP Lcom/mojang/serialization/Codec; + FIELD field_40726 GAME_PROFILE_WITH_PROPERTIES Lcom/mojang/serialization/Codec; + FIELD field_40727 GAME_PROFILE_PROPERTY Lcom/mojang/serialization/Codec; + FIELD field_41759 NON_EMPTY_STRING Lcom/mojang/serialization/Codec; + FIELD field_42265 QUATERNIONF Lcom/mojang/serialization/Codec; + FIELD field_42266 AXIS_ANGLE4F Lcom/mojang/serialization/Codec; + FIELD field_42267 ROTATION Lcom/mojang/serialization/Codec; + FIELD field_42268 MATRIX4F Lcom/mojang/serialization/Codec; + FIELD field_43173 STRINGIFIED_TEXT Lcom/mojang/serialization/Codec; + FIELD field_44703 CODEPOINT Lcom/mojang/serialization/Codec; + FIELD field_45075 IDENTIFIER_PATH Lcom/mojang/serialization/Codec; + FIELD field_45076 GAME_PROFILE Lcom/mojang/serialization/MapCodec; METHOD method_33817 xor (Lcom/mojang/serialization/Codec;Lcom/mojang/serialization/Codec;)Lcom/mojang/serialization/Codec; COMMENT Returns an exclusive-or codec for {@link Either} instances. COMMENT @@ -32,21 +47,12 @@ CLASS net/minecraft/class_5699 net/minecraft/util/dynamic/Codecs COMMENT the first codec ARG 1 second COMMENT the second codec - METHOD method_36240 createNonEmptyListChecker ()Ljava/util/function/Function; METHOD method_36241 rangedInt (IILjava/util/function/Function;)Lcom/mojang/serialization/Codec; ARG 0 min ARG 1 max ARG 2 messageFactory METHOD method_36242 (Ljava/lang/Integer;)Ljava/lang/String; ARG 0 v - METHOD method_36243 createIntRangeChecker (Ljava/lang/Number;Ljava/lang/Number;Ljava/util/function/Function;)Ljava/util/function/Function; - ARG 0 min - ARG 1 max - ARG 2 messageFactory - METHOD method_36244 (Ljava/lang/Number;Ljava/lang/Number;Ljava/util/function/Function;Ljava/lang/Number;)Lcom/mojang/serialization/DataResult; - ARG 3 value - METHOD method_36245 (Ljava/util/List;)Lcom/mojang/serialization/DataResult; - ARG 0 list METHOD method_36246 (Ljava/lang/Integer;)Ljava/lang/String; ARG 0 v METHOD method_36973 nonEmptyList (Lcom/mojang/serialization/Codec;)Lcom/mojang/serialization/Codec; @@ -55,8 +61,6 @@ CLASS net/minecraft/class_5699 net/minecraft/util/dynamic/Codecs ARG 0 min ARG 1 max ARG 2 messageFactory - METHOD method_37929 (Lcom/mojang/datafixers/util/Either;)Ljava/lang/Object; - ARG 0 either METHOD method_37930 (Lcom/mojang/serialization/Codec;Ljava/lang/String;Ljava/lang/String;Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; ARG 3 instance METHOD method_37931 createCodecForPairObject (Lcom/mojang/serialization/Codec;Ljava/lang/String;Ljava/lang/String;Ljava/util/function/BiFunction;Ljava/util/function/Function;Ljava/util/function/Function;)Lcom/mojang/serialization/Codec; @@ -68,10 +72,6 @@ CLASS net/minecraft/class_5699 net/minecraft/util/dynamic/Codecs ARG 5 rightFunction METHOD method_37932 (Ljava/lang/Float;)Ljava/lang/String; ARG 0 v - METHOD method_37933 (Ljava/lang/Number;Ljava/lang/Number;Ljava/util/function/Function;Ljava/lang/Number;)Lcom/mojang/serialization/DataResult; - ARG 3 value - METHOD method_37934 (Ljava/lang/Object;)Ljava/lang/Object; - ARG 0 object METHOD method_37935 (Ljava/util/function/BiFunction;Lcom/mojang/datafixers/util/Either;)Lcom/mojang/serialization/DataResult; ARG 1 either METHOD method_37936 (Ljava/util/function/BiFunction;Lcom/mojang/datafixers/util/Pair;)Lcom/mojang/serialization/DataResult; @@ -82,14 +82,8 @@ CLASS net/minecraft/class_5699 net/minecraft/util/dynamic/Codecs ARG 1 list METHOD method_37939 (Ljava/util/function/Function;Ljava/util/function/Function;Ljava/lang/Object;)Lcom/mojang/datafixers/util/Either; ARG 2 pair - METHOD method_37940 createFloatRangeChecker (Ljava/lang/Number;Ljava/lang/Number;Ljava/util/function/Function;)Ljava/util/function/Function; - ARG 0 min - ARG 1 max - ARG 2 messageFactory - METHOD method_37941 (Ljava/lang/Object;)Ljava/lang/Object; - ARG 0 object METHOD method_37942 (Ljava/util/function/BiFunction;Ljava/util/List;)Lcom/mojang/serialization/DataResult; - ARG 1 list + ARG 1 listx METHOD method_37943 (Ljava/util/function/Function;Ljava/util/function/Function;Ljava/lang/Object;)Lcom/mojang/datafixers/util/Pair; ARG 2 pair METHOD method_37944 (Ljava/util/function/Function;Ljava/util/function/Function;Ljava/lang/Object;)Ljava/util/List; @@ -120,13 +114,10 @@ CLASS net/minecraft/class_5699 net/minecraft/util/dynamic/Codecs METHOD method_39512 orCompressed (Lcom/mojang/serialization/Codec;Lcom/mojang/serialization/Codec;)Lcom/mojang/serialization/Codec; ARG 0 uncompressedCodec ARG 1 compressedCodec - METHOD method_40109 (Lnet/minecraft/class_6885;)Lcom/mojang/serialization/DataResult; - ARG 0 entries METHOD method_40110 createContextRetrievalCodec (Ljava/util/function/Function;)Lcom/mojang/serialization/MapCodec; ARG 0 retriever METHOD method_40111 (Ljava/util/function/Function;Ljava/util/Collection;)Lcom/mojang/serialization/DataResult; ARG 1 collection - METHOD method_40112 createNonEmptyEntryListChecker ()Ljava/util/function/Function; METHOD method_40113 nonEmptyEntryList (Lcom/mojang/serialization/Codec;)Lcom/mojang/serialization/Codec; ARG 0 originalCodec METHOD method_40114 createEqualTypeChecker (Ljava/util/function/Function;)Ljava/util/function/Function; @@ -135,10 +126,6 @@ CLASS net/minecraft/class_5699 net/minecraft/util/dynamic/Codecs ARG 0 pattern METHOD method_42114 exceptionCatching (Lcom/mojang/serialization/Codec;)Lcom/mojang/serialization/Codec; ARG 0 codec - METHOD method_43532 instant (Ljava/time/format/DateTimeFormatter;)Lcom/mojang/serialization/Codec; - ARG 0 formatter - METHOD method_43533 (Ljava/time/format/DateTimeFormatter;Ljava/lang/String;)Lcom/mojang/serialization/DataResult; - ARG 1 dateTimeString METHOD method_43958 (Lnet/minecraft/class_2960;)Lnet/minecraft/class_5699$class_7476; ARG 0 id METHOD method_43959 (Ljava/lang/String;)Lcom/mojang/serialization/DataResult; @@ -155,6 +142,124 @@ CLASS net/minecraft/class_5699 net/minecraft/util/dynamic/Codecs ARG 0 optional METHOD method_44169 (Ljava/util/OptionalLong;)Ljava/util/Optional; ARG 0 optionalLong + METHOD method_46370 (Lcom/mojang/authlib/GameProfile;Lcom/mojang/authlib/properties/PropertyMap;)Lcom/mojang/authlib/GameProfile; + ARG 0 profile + ARG 1 properties + METHOD method_46371 (Lcom/mojang/authlib/GameProfile;Ljava/lang/String;Lcom/mojang/authlib/properties/Property;)V + ARG 1 key + ARG 2 property + METHOD method_46372 (Lcom/mojang/authlib/properties/Property;)Ljava/util/Optional; + ARG 0 property + METHOD method_46373 (Lcom/mojang/authlib/properties/PropertyMap;)Lcom/mojang/datafixers/util/Either; + ARG 0 properties + METHOD method_46374 (Lcom/mojang/authlib/properties/PropertyMap;Ljava/lang/String;Ljava/util/List;)V + ARG 1 key + ARG 2 values + METHOD method_46375 (Lcom/mojang/authlib/properties/PropertyMap;Ljava/util/List;)V + ARG 1 properties + METHOD method_46376 (Lcom/mojang/authlib/properties/PropertyMap;Ljava/util/Map;)V + ARG 1 map + METHOD method_46377 (Lcom/mojang/datafixers/util/Either;)Lcom/mojang/authlib/properties/PropertyMap; + ARG 0 either + METHOD method_46379 (Lcom/mojang/serialization/Dynamic;)Lcom/google/gson/JsonElement; + ARG 0 dynamic + METHOD method_46381 (Ljava/lang/String;Ljava/lang/String;Ljava/util/Optional;)Lcom/mojang/authlib/properties/Property; + ARG 0 key + ARG 1 value + ARG 2 signature + METHOD method_46382 (Ljava/util/BitSet;)Ljava/util/stream/LongStream; + ARG 0 set + METHOD method_46384 (Ljava/util/stream/LongStream;)Ljava/util/BitSet; + ARG 0 stream + METHOD method_46385 (Lorg/joml/Vector3f;)Ljava/util/List; + ARG 0 vec3f + METHOD method_46387 (Lcom/google/gson/JsonElement;)Lcom/mojang/serialization/Dynamic; + ARG 0 element + METHOD method_46388 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 0 instance + METHOD method_46389 (Ljava/util/List;)Lcom/mojang/serialization/DataResult; + ARG 0 list + METHOD method_46391 (Ljava/util/List;)Lorg/joml/Vector3f; + ARG 0 listx + METHOD method_48108 (FFLjava/util/function/Function;Ljava/lang/Float;)Lcom/mojang/serialization/DataResult; + ARG 3 value + METHOD method_48109 string (II)Lcom/mojang/serialization/Codec; + ARG 0 minLength + ARG 1 maxLength + METHOD method_48110 (IILjava/lang/String;)Lcom/mojang/serialization/DataResult; + ARG 2 string + METHOD method_48111 (IILjava/util/function/Function;Ljava/lang/Integer;)Lcom/mojang/serialization/DataResult; + ARG 3 value + METHOD method_48112 validate (Lcom/mojang/serialization/Codec;Ljava/util/function/Function;)Lcom/mojang/serialization/Codec; + ARG 0 codec + ARG 1 validator + METHOD method_48113 (Lnet/minecraft/class_6885;)Lcom/mojang/serialization/DataResult; + ARG 0 entryList + METHOD method_48114 (Ljava/lang/String;)Lcom/mojang/serialization/DataResult; + ARG 0 string + METHOD method_48115 (Ljava/util/List;)Lcom/mojang/serialization/DataResult; + ARG 0 list + METHOD method_48766 rangedInt (II)Lcom/mojang/serialization/Codec; + ARG 0 min + ARG 1 max + METHOD method_48767 (IILjava/lang/Integer;)Ljava/lang/String; + ARG 2 value + METHOD method_48768 (Lorg/joml/AxisAngle4f;)Lorg/joml/Vector3f; + ARG 0 axisAngle + METHOD method_48769 (Lorg/joml/Matrix4f;)Ljava/util/List; + ARG 0 matrix4f + METHOD method_48771 (Ljava/util/List;)Lcom/mojang/serialization/DataResult; + ARG 0 list + METHOD method_48772 (Lorg/joml/AxisAngle4f;)Ljava/lang/Float; + ARG 0 axisAngle + METHOD method_48775 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 0 instance + METHOD method_48776 (Ljava/util/List;)Lorg/joml/Matrix4f; + ARG 0 listx + METHOD method_48777 (Lorg/joml/Quaternionf;)Ljava/util/List; + ARG 0 quaternion + METHOD method_48778 (Ljava/util/List;)Lcom/mojang/serialization/DataResult; + ARG 0 list + METHOD method_48779 (Ljava/util/List;)Lorg/joml/Quaternionf; + ARG 0 listx + METHOD method_49755 (Ljava/lang/String;)Lcom/mojang/serialization/DataResult; + ARG 0 json + METHOD method_51494 (Ljava/lang/String;)Lcom/mojang/serialization/DataResult; + ARG 0 string + METHOD method_51699 validate (Lcom/mojang/serialization/MapCodec;Ljava/util/function/Function;)Lcom/mojang/serialization/MapCodec; + ARG 0 codec + ARG 1 validator + METHOD method_52457 (Lcom/mojang/datafixers/util/Either;)Ljava/lang/Object; + ARG 0 either + METHOD method_52458 either (Lcom/mojang/serialization/Codec;Lcom/mojang/serialization/Codec;Ljava/util/function/Function;)Lcom/mojang/serialization/Codec; + ARG 0 serialized + ARG 1 alternative + ARG 2 alternativeMapper + METHOD method_52459 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 0 instance + METHOD method_52460 (Ljava/lang/String;)Lcom/mojang/serialization/DataResult; + ARG 0 path + METHOD method_52461 (Ljava/util/function/Function;Lcom/mojang/datafixers/util/Either;)Ljava/lang/Object; + ARG 1 either + METHOD method_52462 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 0 instance + METHOD method_52463 (Ljava/lang/Object;)Ljava/lang/Object; + ARG 0 o + METHOD method_52465 either (Lcom/mojang/serialization/Codec;Lcom/mojang/serialization/Codec;)Lcom/mojang/serialization/Codec; + ARG 0 a + ARG 1 b + METHOD method_52466 (Ljava/lang/Object;)Ljava/lang/Object; + ARG 0 o + METHOD method_52467 (Ljava/lang/Object;)Ljava/lang/Object; + ARG 0 o + METHOD method_53048 createStrictOptionalFieldCodec (Lcom/mojang/serialization/Codec;Ljava/lang/String;)Lcom/mojang/serialization/MapCodec; + ARG 0 codec + ARG 1 field + METHOD method_53049 createStrictOptionalFieldCodec (Lcom/mojang/serialization/Codec;Ljava/lang/String;Ljava/lang/Object;)Lcom/mojang/serialization/MapCodec; + ARG 0 codec + ARG 1 field + ARG 2 fallback + METHOD method_53052 createRecursive (Ljava/util/function/Function;)Lcom/mojang/serialization/Codec; CLASS 1 METHOD apply (Lcom/mojang/serialization/DynamicOps;Ljava/lang/Object;Lcom/mojang/serialization/DataResult;)Lcom/mojang/serialization/DataResult; ARG 1 ops @@ -193,11 +298,13 @@ CLASS net/minecraft/class_5699 net/minecraft/util/dynamic/Codecs COMMENT COMMENT @see Codecs#xor(Codec, Codec) COMMENT @see com.mojang.serialization.codecs.EitherCodec - FIELD field_28868 first Lcom/mojang/serialization/Codec; - FIELD field_28869 second Lcom/mojang/serialization/Codec; + FIELD comp_1928 first Lcom/mojang/serialization/Codec; + FIELD comp_1929 second Lcom/mojang/serialization/Codec; METHOD (Lcom/mojang/serialization/Codec;Lcom/mojang/serialization/Codec;)V ARG 1 first ARG 2 second + METHOD comp_1928 first ()Lcom/mojang/serialization/Codec; + METHOD comp_1929 second ()Lcom/mojang/serialization/Codec; METHOD decode (Lcom/mojang/serialization/DynamicOps;Ljava/lang/Object;)Lcom/mojang/serialization/DataResult; ARG 1 ops ARG 2 input @@ -241,15 +348,8 @@ CLASS net/minecraft/class_5699 net/minecraft/util/dynamic/Codecs ARG 0 pair METHOD method_37950 (Lcom/mojang/serialization/DynamicOps;Ljava/lang/Object;Ljava/lang/Object;)Lcom/mojang/serialization/DataResult; ARG 3 left - CLASS class_6739 Lazy - METHOD decode (Lcom/mojang/serialization/DynamicOps;Ljava/lang/Object;)Lcom/mojang/serialization/DataResult; - ARG 1 ops - ARG 2 input - METHOD encode (Ljava/lang/Object;Lcom/mojang/serialization/DynamicOps;Ljava/lang/Object;)Lcom/mojang/serialization/DataResult; - ARG 1 input - ARG 2 ops - ARG 3 prefix CLASS class_6866 ContextRetrievalCodec + FIELD field_36397 retriever Ljava/util/function/Function; METHOD (Ljava/util/function/Function;)V ARG 1 retriever METHOD decode (Lcom/mojang/serialization/DynamicOps;Lcom/mojang/serialization/MapLike;)Lcom/mojang/serialization/DataResult; @@ -263,3 +363,11 @@ CLASS net/minecraft/class_5699 net/minecraft/util/dynamic/Codecs ARG 1 ops CLASS class_7476 TagEntryId METHOD method_43963 asString ()Ljava/lang/String; + CLASS class_8741 Recursive + FIELD field_45716 supplier Ljava/util/function/Supplier; + CLASS class_8742 StrictOptionalField + FIELD field_45717 field Ljava/lang/String; + FIELD field_45718 codec Lcom/mojang/serialization/Codec; + METHOD (Ljava/lang/String;Lcom/mojang/serialization/Codec;)V + ARG 1 field + ARG 2 codec diff --git a/mappings/net/minecraft/util/dynamic/EntryLoader.mapping b/mappings/net/minecraft/util/dynamic/EntryLoader.mapping deleted file mode 100644 index f562fd55f6..0000000000 --- a/mappings/net/minecraft/util/dynamic/EntryLoader.mapping +++ /dev/null @@ -1,67 +0,0 @@ -CLASS net/minecraft/class_5506 net/minecraft/util/dynamic/EntryLoader - METHOD method_31154 resourceBacked (Lnet/minecraft/class_3300;)Lnet/minecraft/class_5506; - ARG 0 resourceManager - METHOD method_31156 getKnownEntryPaths (Lnet/minecraft/class_5321;)Ljava/util/Map; - COMMENT @return A collection of file Identifiers of all known entries of the given registry. - COMMENT Note that these are file Identifiers for use in a resource manager, not the logical names of the entries. - ARG 1 key - METHOD method_42083 createParseable (Lnet/minecraft/class_5321;)Ljava/util/Optional; - ARG 1 key - CLASS 1 - FIELD field_36186 JSON Ljava/lang/String; - METHOD method_31158 (Lnet/minecraft/class_2960;)Z - ARG 0 id - METHOD method_39745 (Ljava/lang/String;Lnet/minecraft/class_5321;Ljava/util/Map;Lnet/minecraft/class_2960;Lnet/minecraft/class_3298;)V - ARG 4 id - ARG 5 resourceRef - METHOD method_39746 createId (Lnet/minecraft/class_5321;)Lnet/minecraft/class_2960; - ARG 0 rootKey - METHOD method_39747 getPath (Lnet/minecraft/class_2960;)Ljava/lang/String; - ARG 0 id - METHOD method_42084 (Lnet/minecraft/class_3298;Lnet/minecraft/class_2960;Lcom/mojang/serialization/DynamicOps;Lcom/mojang/serialization/Decoder;)Lcom/mojang/serialization/DataResult; - ARG 3 jsonOps - ARG 4 decoder - METHOD method_42085 (Lnet/minecraft/class_3298;Lnet/minecraft/class_2960;Lcom/mojang/serialization/DynamicOps;Lcom/mojang/serialization/Decoder;)Lcom/mojang/serialization/DataResult; - ARG 3 jsonOps - ARG 4 decoder - METHOD method_42086 parse (Lcom/mojang/serialization/DynamicOps;Lcom/mojang/serialization/Decoder;Ljava/io/Reader;)Lcom/mojang/serialization/DataResult; - ARG 1 jsonOps - ARG 2 decoder - ARG 3 reader - METHOD method_43249 (Lnet/minecraft/class_2960;Lnet/minecraft/class_3298;)Lnet/minecraft/class_5506$class_7236; - ARG 2 resource - CLASS class_5507 Impl - FIELD field_26741 values Ljava/util/Map; - FIELD field_36187 LOGGER Lorg/slf4j/Logger; - METHOD method_31159 add (Lnet/minecraft/class_5455;Lnet/minecraft/class_5321;Lcom/mojang/serialization/Encoder;ILjava/lang/Object;Lcom/mojang/serialization/Lifecycle;)V - ARG 1 registryManager - ARG 2 key - ARG 3 encoder - ARG 4 rawId - ARG 5 entry - ARG 6 lifecycle - METHOD method_42087 (Lcom/mojang/serialization/DataResult;Lcom/mojang/serialization/DynamicOps;Lcom/mojang/serialization/Decoder;)Lcom/mojang/serialization/DataResult; - ARG 1 jsonOps - ARG 2 decoder - METHOD method_42088 (Ljava/util/Map$Entry;)Lnet/minecraft/class_5506$class_7236; - ARG 0 entry - METHOD method_42089 (Lnet/minecraft/class_5321;Ljava/util/Map$Entry;)Z - ARG 1 entry - METHOD method_42090 (Ljava/util/Map$Entry;)Lnet/minecraft/class_5321; - ARG 0 entry - CLASS class_6821 Element - METHOD method_42091 parse (Lcom/mojang/serialization/DynamicOps;Lcom/mojang/serialization/Decoder;)Lcom/mojang/serialization/DataResult; - ARG 1 jsonOps - ARG 2 decoder - METHOD method_42092 (Ljava/lang/Object;)Lnet/minecraft/class_5506$class_6822; - ARG 1 value - CLASS class_6822 Entry - METHOD method_39750 of (Ljava/lang/Object;)Lnet/minecraft/class_5506$class_6822; - ARG 0 value - METHOD method_39751 of (Ljava/lang/Object;I)Lnet/minecraft/class_5506$class_6822; - ARG 0 value - ARG 1 id - CLASS class_7236 Parseable - METHOD parseElement (Lcom/mojang/serialization/DynamicOps;Lcom/mojang/serialization/Decoder;)Lcom/mojang/serialization/DataResult; - ARG 1 jsonOps - ARG 2 decoder diff --git a/mappings/net/minecraft/util/dynamic/Range.mapping b/mappings/net/minecraft/util/dynamic/Range.mapping index 7a6d7e5159..7142aea2f1 100644 --- a/mappings/net/minecraft/util/dynamic/Range.mapping +++ b/mappings/net/minecraft/util/dynamic/Range.mapping @@ -2,6 +2,8 @@ CLASS net/minecraft/class_6497 net/minecraft/util/dynamic/Range FIELD comp_1 minInclusive Ljava/lang/Comparable; FIELD comp_2 maxInclusive Ljava/lang/Comparable; FIELD field_34390 CODEC Lcom/mojang/serialization/Codec; + METHOD (Ljava/lang/Comparable;)V + ARG 1 value METHOD (Ljava/lang/Comparable;Ljava/lang/Comparable;)V ARG 1 minInclusive ARG 2 maxInclusive diff --git a/mappings/net/minecraft/util/dynamic/RegistryLoader.mapping b/mappings/net/minecraft/util/dynamic/RegistryLoader.mapping deleted file mode 100644 index 98d6f2f3e7..0000000000 --- a/mappings/net/minecraft/util/dynamic/RegistryLoader.mapping +++ /dev/null @@ -1,49 +0,0 @@ -CLASS net/minecraft/class_6900 net/minecraft/util/dynamic/RegistryLoader - FIELD field_36485 entryLoader Lnet/minecraft/class_5506; - FIELD field_36486 valueHolders Ljava/util/Map; - METHOD (Lnet/minecraft/class_5506;)V - ARG 1 entryLoader - METHOD method_40401 (Lnet/minecraft/class_6880;Lnet/minecraft/class_5506$class_6822;)Lnet/minecraft/class_6880; - ARG 1 entry - METHOD method_40402 createAccess (Lnet/minecraft/class_5455$class_6893;)Lnet/minecraft/class_6900$class_6901; - ARG 1 dynamicRegistryManager - METHOD method_40403 (Lnet/minecraft/class_2385;Lnet/minecraft/class_6880;)Lnet/minecraft/class_2385; - ARG 1 entry - METHOD method_40404 load (Lnet/minecraft/class_2385;Lnet/minecraft/class_5321;Lcom/mojang/serialization/Codec;Lcom/mojang/serialization/DynamicOps;)Lcom/mojang/serialization/DataResult; - ARG 1 registry - ARG 2 registryRef - ARG 3 codec - ARG 4 ops - METHOD method_40405 load (Lnet/minecraft/class_2385;Lnet/minecraft/class_5321;Lcom/mojang/serialization/Codec;Lnet/minecraft/class_5321;Lcom/mojang/serialization/DynamicOps;)Lcom/mojang/serialization/DataResult; - ARG 1 registry - ARG 2 registryRef - ARG 3 codec - ARG 4 entryKey - ARG 5 ops - METHOD method_40406 getOrCreateValueHolder (Lnet/minecraft/class_5321;)Lnet/minecraft/class_6900$class_6902; - ARG 1 registryRef - METHOD method_40407 (Lnet/minecraft/class_5321;Lcom/mojang/serialization/Codec;Ljava/util/Map$Entry;Lcom/mojang/serialization/DynamicOps;Lnet/minecraft/class_2385;)Lcom/mojang/serialization/DataResult; - ARG 5 reg - METHOD method_40408 (Lnet/minecraft/class_5321;)Lnet/minecraft/class_6900$class_6902; - ARG 0 ref - METHOD method_42082 load (Lnet/minecraft/class_2385;Lnet/minecraft/class_5321;Lcom/mojang/serialization/Codec;Lnet/minecraft/class_5321;Ljava/util/Optional;Lcom/mojang/serialization/DynamicOps;)Lcom/mojang/serialization/DataResult; - ARG 1 registry - ARG 2 registryRef - ARG 3 codec - ARG 4 entryKey - ARG 5 parseable - ARG 6 ops - CLASS class_6901 LoaderAccess - FIELD comp_354 dynamicRegistryManager Lnet/minecraft/class_5455$class_6893; - METHOD comp_354 dynamicRegistryManager ()Lnet/minecraft/class_5455$class_6893; - METHOD method_40409 load (Lnet/minecraft/class_5321;Lcom/mojang/serialization/Codec;Lcom/mojang/serialization/DynamicOps;)Lcom/mojang/serialization/DataResult; - ARG 1 registryRef - ARG 2 codec - ARG 3 ops - METHOD method_40410 load (Lnet/minecraft/class_5321;Lcom/mojang/serialization/Codec;Lnet/minecraft/class_5321;Lcom/mojang/serialization/DynamicOps;)Lcom/mojang/serialization/DataResult; - ARG 1 registryRef - ARG 2 codec - ARG 3 entryKey - ARG 4 ops - CLASS class_6902 ValueHolder - FIELD field_36487 values Ljava/util/Map; diff --git a/mappings/net/minecraft/util/dynamic/RegistryOps.mapping b/mappings/net/minecraft/util/dynamic/RegistryOps.mapping deleted file mode 100644 index d385cea00c..0000000000 --- a/mappings/net/minecraft/util/dynamic/RegistryOps.mapping +++ /dev/null @@ -1,29 +0,0 @@ -CLASS net/minecraft/class_6903 net/minecraft/util/dynamic/RegistryOps - FIELD field_36488 loaderAccess Ljava/util/Optional; - FIELD field_36489 registryManager Lnet/minecraft/class_5455; - FIELD field_36490 entryOps Lcom/mojang/serialization/DynamicOps; - METHOD (Lcom/mojang/serialization/DynamicOps;Lnet/minecraft/class_5455;Ljava/util/Optional;)V - ARG 1 delegate - ARG 2 dynamicRegistryManager - ARG 3 loaderAccess - METHOD method_40411 getLoaderAccess ()Ljava/util/Optional; - METHOD method_40412 ofLoaded (Lcom/mojang/serialization/DynamicOps;Lnet/minecraft/class_5455$class_6893;Lnet/minecraft/class_3300;)Lnet/minecraft/class_6903; - ARG 0 ops - ARG 1 registryManager - ARG 2 resourceManager - METHOD method_40413 ofLoaded (Lcom/mojang/serialization/DynamicOps;Lnet/minecraft/class_5455$class_6893;Lnet/minecraft/class_5506;)Lnet/minecraft/class_6903; - ARG 0 ops - ARG 1 registryManager - ARG 2 entryLoader - METHOD method_40414 of (Lcom/mojang/serialization/DynamicOps;Lnet/minecraft/class_5455;)Lnet/minecraft/class_6903; - ARG 0 delegate - ARG 1 registryManager - METHOD method_40415 (Lnet/minecraft/class_2378;)Lcom/mojang/serialization/DataResult; - ARG 0 registry - METHOD method_40416 getRegistry (Lnet/minecraft/class_5321;)Ljava/util/Optional; - ARG 1 key - METHOD method_40417 (Lnet/minecraft/class_5321;Lcom/mojang/serialization/DynamicOps;)Lcom/mojang/serialization/DataResult; - ARG 1 ops - METHOD method_40418 getEntryOps ()Lcom/mojang/serialization/DynamicOps; - METHOD method_40419 createRegistryCodec (Lnet/minecraft/class_5321;)Lcom/mojang/serialization/MapCodec; - ARG 0 registryRef diff --git a/mappings/net/minecraft/util/function/LazyIterationConsumer.mapping b/mappings/net/minecraft/util/function/LazyIterationConsumer.mapping new file mode 100644 index 0000000000..4ac21c1be1 --- /dev/null +++ b/mappings/net/minecraft/util/function/LazyIterationConsumer.mapping @@ -0,0 +1,11 @@ +CLASS net/minecraft/class_7927 net/minecraft/util/function/LazyIterationConsumer + COMMENT A consumer used in an iteration that can be aborted early. + METHOD accept (Ljava/lang/Object;)Lnet/minecraft/class_7927$class_7928; + ARG 1 value + METHOD forConsumer (Ljava/util/function/Consumer;)Lnet/minecraft/class_7927; + ARG 0 consumer + METHOD method_47542 (Ljava/util/function/Consumer;Ljava/lang/Object;)Lnet/minecraft/class_7927$class_7928; + ARG 1 value + CLASS class_7928 NextIteration + COMMENT Indicates whether to perform the next iteration. + METHOD method_47543 shouldAbort ()Z diff --git a/mappings/net/minecraft/util/function/MaterialPredicate.mapping b/mappings/net/minecraft/util/function/MaterialPredicate.mapping deleted file mode 100644 index bcfda4d01d..0000000000 --- a/mappings/net/minecraft/util/function/MaterialPredicate.mapping +++ /dev/null @@ -1,9 +0,0 @@ -CLASS net/minecraft/class_2710 net/minecraft/util/function/MaterialPredicate - FIELD field_12404 IS_AIR Lnet/minecraft/class_2710; - FIELD field_12405 material Lnet/minecraft/class_3614; - METHOD (Lnet/minecraft/class_3614;)V - ARG 1 material - METHOD method_11746 create (Lnet/minecraft/class_3614;)Lnet/minecraft/class_2710; - ARG 0 material - METHOD test (Ljava/lang/Object;)Z - ARG 1 state diff --git a/mappings/net/minecraft/util/function/ValueLists.mapping b/mappings/net/minecraft/util/function/ValueLists.mapping new file mode 100644 index 0000000000..00ef0af568 --- /dev/null +++ b/mappings/net/minecraft/util/function/ValueLists.mapping @@ -0,0 +1,24 @@ +CLASS net/minecraft/class_7995 net/minecraft/util/function/ValueLists + METHOD method_47911 (I[Ljava/lang/Object;Ljava/lang/Object;I)Ljava/lang/Object; + ARG 3 index + METHOD method_47912 (Ljava/util/function/IntFunction;Ljava/lang/Object;I)Ljava/lang/Object; + ARG 2 index + METHOD method_47913 createIdToValueFunction (Ljava/util/function/ToIntFunction;[Ljava/lang/Object;)Ljava/util/function/IntFunction; + ARG 0 valueToIdFunction + ARG 1 values + METHOD method_47914 createIdToValueFunction (Ljava/util/function/ToIntFunction;[Ljava/lang/Object;Lnet/minecraft/class_7995$class_7996;)Ljava/util/function/IntFunction; + ARG 0 valueToIdFunction + ARG 1 values + ARG 2 outOfBoundsHandling + METHOD method_47915 createIdToValueFunction (Ljava/util/function/ToIntFunction;[Ljava/lang/Object;Ljava/lang/Object;)Ljava/util/function/IntFunction; + ARG 0 valueToIdFunction + ARG 1 values + ARG 2 fallback + METHOD method_47916 ([Ljava/lang/Object;II)Ljava/lang/Object; + ARG 2 index + METHOD method_47917 validate (Ljava/util/function/ToIntFunction;[Ljava/lang/Object;)[Ljava/lang/Object; + ARG 0 valueToIndexFunction + ARG 1 values + METHOD method_47918 ([Ljava/lang/Object;II)Ljava/lang/Object; + ARG 2 index + CLASS class_7996 OutOfBoundsHandling diff --git a/mappings/net/minecraft/util/logging/DebugLoggerPrintStream.mapping b/mappings/net/minecraft/util/logging/DebugLoggerPrintStream.mapping index 54337493ec..1f6cb511ce 100644 --- a/mappings/net/minecraft/util/logging/DebugLoggerPrintStream.mapping +++ b/mappings/net/minecraft/util/logging/DebugLoggerPrintStream.mapping @@ -1 +1,2 @@ CLASS net/minecraft/class_2980 net/minecraft/util/logging/DebugLoggerPrintStream + FIELD field_36382 LOGGER Lorg/slf4j/Logger; diff --git a/mappings/net/minecraft/util/logging/LogFileCompressor.mapping b/mappings/net/minecraft/util/logging/LogFileCompressor.mapping new file mode 100644 index 0000000000..02cbf397b4 --- /dev/null +++ b/mappings/net/minecraft/util/logging/LogFileCompressor.mapping @@ -0,0 +1,47 @@ +CLASS net/minecraft/class_7929 net/minecraft/util/logging/LogFileCompressor + FIELD field_41288 LOGGER Lorg/slf4j/Logger; + FIELD field_41289 COMPRESSION_BUFFER_SIZE I + FIELD field_41290 GZ_EXTENSION Ljava/lang/String; + FIELD field_41291 directory Ljava/nio/file/Path; + FIELD field_41292 extension Ljava/lang/String; + METHOD (Ljava/nio/file/Path;Ljava/lang/String;)V + ARG 1 directory + ARG 2 extension + METHOD method_47549 getAll ()Lnet/minecraft/class_7929$class_7933; + METHOD method_47550 compress (Ljava/nio/channels/ReadableByteChannel;Ljava/nio/file/Path;)V + ARG 0 source + ARG 1 outputPath + METHOD method_47551 get (Ljava/nio/file/Path;)Lnet/minecraft/class_7929$class_7931; + ARG 1 path + METHOD method_47552 create (Ljava/nio/file/Path;Ljava/lang/String;)Lnet/minecraft/class_7929; + ARG 0 directory + ARG 1 extension + METHOD method_47553 compress (Ljava/nio/file/Path;Ljava/nio/file/Path;)V + ARG 0 from + ARG 1 to + METHOD method_47554 createLogFile (Ljava/time/LocalDate;)Lnet/minecraft/class_7929$class_7934; + ARG 1 date + CLASS class_7930 Compressed + CLASS class_7931 LogFile + METHOD method_47556 getReader ()Ljava/io/Reader; + METHOD method_47557 compress ()Lnet/minecraft/class_7929$class_7930; + CLASS class_7932 LogId + FIELD field_41293 DATE_TIME_FORMATTER Ljava/time/format/DateTimeFormatter; + METHOD method_47558 fromFileName (Ljava/lang/String;)Lnet/minecraft/class_7929$class_7932; + ARG 0 fileName + METHOD method_47559 getFileName (Ljava/lang/String;)Ljava/lang/String; + ARG 1 extension + CLASS class_7933 LogFileIterable + FIELD field_41294 logs Ljava/util/List; + METHOD (Ljava/util/List;)V + ARG 1 logs + METHOD method_47560 compressAll ()Lnet/minecraft/class_7929$class_7933; + METHOD method_47561 (ILjava/time/LocalDate;Lnet/minecraft/class_7929$class_7931;)Z + ARG 2 log + METHOD method_47562 removeExpired (Ljava/time/LocalDate;I)Lnet/minecraft/class_7929$class_7933; + ARG 1 currentDate + ARG 2 retentionDays + METHOD method_47563 stream ()Ljava/util/stream/Stream; + METHOD method_47564 toIdSet ()Ljava/util/Set; + CLASS class_7934 Uncompressed + METHOD method_47565 open ()Ljava/nio/channels/FileChannel; diff --git a/mappings/net/minecraft/util/logging/LogReader.mapping b/mappings/net/minecraft/util/logging/LogReader.mapping new file mode 100644 index 0000000000..e14f04ef54 --- /dev/null +++ b/mappings/net/minecraft/util/logging/LogReader.mapping @@ -0,0 +1,5 @@ +CLASS net/minecraft/class_7936 net/minecraft/util/logging/LogReader + METHOD method_47570 read ()Ljava/lang/Object; + METHOD method_47571 create (Lcom/mojang/serialization/Codec;Ljava/io/Reader;)Lnet/minecraft/class_7936; + ARG 0 codec + ARG 1 reader diff --git a/mappings/net/minecraft/util/logging/LogWriter.mapping b/mappings/net/minecraft/util/logging/LogWriter.mapping new file mode 100644 index 0000000000..1dde3a517d --- /dev/null +++ b/mappings/net/minecraft/util/logging/LogWriter.mapping @@ -0,0 +1,17 @@ +CLASS net/minecraft/class_7935 net/minecraft/util/logging/LogWriter + FIELD field_41295 GSON Lcom/google/gson/Gson; + FIELD field_41296 codec Lcom/mojang/serialization/Codec; + FIELD field_41297 channel Ljava/nio/channels/FileChannel; + FIELD field_41298 refCount Ljava/util/concurrent/atomic/AtomicInteger; + METHOD (Lcom/mojang/serialization/Codec;Ljava/nio/channels/FileChannel;)V + ARG 1 codec + ARG 2 channel + METHOD method_47566 getReader ()Lnet/minecraft/class_7936; + METHOD method_47567 create (Lcom/mojang/serialization/Codec;Ljava/nio/file/Path;)Lnet/minecraft/class_7935; + ARG 0 codec + ARG 1 path + METHOD method_47568 write (Ljava/lang/Object;)V + ARG 1 object + METHOD method_47569 closeIfNotReferenced ()V + CLASS 1 + FIELD field_41301 pos J diff --git a/mappings/net/minecraft/util/math/AffineTransformation.mapping b/mappings/net/minecraft/util/math/AffineTransformation.mapping index 77d0c08c03..3031214a5c 100644 --- a/mappings/net/minecraft/util/math/AffineTransformation.mapping +++ b/mappings/net/minecraft/util/math/AffineTransformation.mapping @@ -1,41 +1,52 @@ 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 a {@linkplain #leftRotation left rotation} quaternion, a {@linkplain #scale scale} + COMMENT 3-vector, a second {@linkplain #rightRotation right 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_20900 matrix Lorg/joml/Matrix4f; FIELD field_20901 initialized Z - FIELD field_20902 translation Lnet/minecraft/class_1160; - FIELD field_20903 rotation2 Lnet/minecraft/class_1158; - FIELD field_20904 scale Lnet/minecraft/class_1160; - FIELD field_20905 rotation1 Lnet/minecraft/class_1158; + FIELD field_20902 translation Lorg/joml/Vector3f; + FIELD field_20903 leftRotation Lorg/joml/Quaternionf; + FIELD field_20904 scale Lorg/joml/Vector3f; + FIELD field_20905 rightRotation Lorg/joml/Quaternionf; FIELD field_20906 IDENTITY Lnet/minecraft/class_4590; - METHOD (Lnet/minecraft/class_1159;)V + FIELD field_42532 CODEC Lcom/mojang/serialization/Codec; + FIELD field_42533 ANY_CODEC Lcom/mojang/serialization/Codec; + METHOD (Lorg/joml/Matrix4f;)V ARG 1 matrix - METHOD (Lnet/minecraft/class_1160;Lnet/minecraft/class_1158;Lnet/minecraft/class_1160;Lnet/minecraft/class_1158;)V + METHOD (Lorg/joml/Vector3f;Lorg/joml/Quaternionf;Lorg/joml/Vector3f;Lorg/joml/Quaternionf;)V ARG 1 translation - ARG 2 rotation2 + ARG 2 leftRotation ARG 3 scale - ARG 4 rotation1 + ARG 4 rightRotation METHOD equals (Ljava/lang/Object;)Z ARG 1 o METHOD method_22931 identity ()Lnet/minecraft/class_4590; - METHOD method_22932 getLinearTransformationAndTranslationFromAffine (Lnet/minecraft/class_1159;)Lcom/mojang/datafixers/util/Pair; - ARG 0 affineTransform METHOD method_22933 multiply (Lnet/minecraft/class_4590;)Lnet/minecraft/class_4590; ARG 1 other - METHOD method_22934 setup (Lnet/minecraft/class_1160;Lnet/minecraft/class_1158;Lnet/minecraft/class_1160;Lnet/minecraft/class_1158;)Lnet/minecraft/class_1159; + METHOD method_22934 setup (Lorg/joml/Vector3f;Lorg/joml/Quaternionf;Lorg/joml/Vector3f;Lorg/joml/Quaternionf;)Lorg/joml/Matrix4f; ARG 0 translation - ARG 1 rotation2 + ARG 1 leftRotation ARG 2 scale - ARG 3 rotation1 + ARG 3 rightRotation METHOD method_22935 invert ()Lnet/minecraft/class_4590; - METHOD method_22936 getMatrix ()Lnet/minecraft/class_1159; - METHOD method_22937 getRotation2 ()Lnet/minecraft/class_1158; + METHOD method_22936 getMatrix ()Lorg/joml/Matrix4f; + METHOD method_22937 getLeftRotation ()Lorg/joml/Quaternionf; METHOD method_22938 init ()V - METHOD method_35865 getTranslation ()Lnet/minecraft/class_1160; - METHOD method_35866 getScale ()Lnet/minecraft/class_1160; - METHOD method_35867 getRotation1 ()Lnet/minecraft/class_1158; + METHOD method_35864 interpolate (Lnet/minecraft/class_4590;F)Lnet/minecraft/class_4590; + ARG 1 target + ARG 2 factor + METHOD method_35865 getTranslation ()Lorg/joml/Vector3f; + METHOD method_35866 getScale ()Lorg/joml/Vector3f; + METHOD method_35867 getRightRotation ()Lorg/joml/Quaternionf; + METHOD method_49059 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 0 instance + METHOD method_49062 (Lnet/minecraft/class_4590;)Lorg/joml/Quaternionf; + ARG 0 affineTransformation + METHOD method_49063 (Lnet/minecraft/class_4590;)Lorg/joml/Vector3f; + ARG 0 affineTransformation + METHOD method_49064 (Lnet/minecraft/class_4590;)Lorg/joml/Quaternionf; + ARG 0 affineTransformation diff --git a/mappings/net/minecraft/util/math/AffineTransformations.mapping b/mappings/net/minecraft/util/math/AffineTransformations.mapping index ef07cd4295..092c70fd70 100644 --- a/mappings/net/minecraft/util/math/AffineTransformations.mapping +++ b/mappings/net/minecraft/util/math/AffineTransformations.mapping @@ -3,4 +3,14 @@ CLASS net/minecraft/class_4609 net/minecraft/util/math/AffineTransformations FIELD field_21022 INVERTED_DIRECTION_ROTATIONS Ljava/util/Map; FIELD field_21023 LOGGER Lorg/slf4j/Logger; METHOD method_23220 setupUvLock (Lnet/minecraft/class_4590;)Lnet/minecraft/class_4590; + ARG 0 transformation METHOD method_23221 uvLock (Lnet/minecraft/class_4590;Lnet/minecraft/class_2350;Ljava/util/function/Supplier;)Lnet/minecraft/class_4590; + ARG 0 transformation + ARG 1 dir + ARG 2 warning + METHOD method_23222 (Ljava/util/EnumMap;)V + ARG 0 map + METHOD method_23223 (Ljava/util/EnumMap;)V + ARG 0 map + METHOD method_35829 (Lnet/minecraft/class_4590;)Lnet/minecraft/class_4590; + ARG 0 transformation diff --git a/mappings/net/minecraft/util/math/AxisTransformation.mapping b/mappings/net/minecraft/util/math/AxisTransformation.mapping index 8549b5ac20..674ba2a26a 100644 --- a/mappings/net/minecraft/util/math/AxisTransformation.mapping +++ b/mappings/net/minecraft/util/math/AxisTransformation.mapping @@ -1,12 +1,13 @@ CLASS net/minecraft/class_4998 net/minecraft/util/math/AxisTransformation FIELD field_23368 mappings [I - FIELD field_23369 matrix Lnet/minecraft/class_4581; + FIELD field_23369 matrix Lorg/joml/Matrix3f; FIELD field_23370 COMBINATIONS [[Lnet/minecraft/class_4998; + FIELD field_33113 NUM_AXES I METHOD (Ljava/lang/String;IIII)V ARG 3 xMapping ARG 4 yMapping ARG 5 zMapping - METHOD method_26416 getMatrix ()Lnet/minecraft/class_4581; + METHOD method_26416 getMatrix ()Lorg/joml/Matrix3f; METHOD method_26417 map (I)I ARG 1 oldAxis METHOD method_26418 prepend (Lnet/minecraft/class_4998;)Lnet/minecraft/class_4998; diff --git a/mappings/net/minecraft/util/math/BlockBox.mapping b/mappings/net/minecraft/util/math/BlockBox.mapping index a3aba61e37..bbd284daac 100644 --- a/mappings/net/minecraft/util/math/BlockBox.mapping +++ b/mappings/net/minecraft/util/math/BlockBox.mapping @@ -31,18 +31,27 @@ CLASS net/minecraft/class_3341 net/minecraft/util/math/BlockBox METHOD equals (Ljava/lang/Object;)Z ARG 1 o METHOD method_14657 intersects (Lnet/minecraft/class_3341;)Z + COMMENT {@return whether {@code other} intersects with this box} ARG 1 other METHOD method_14659 getDimensions ()Lnet/minecraft/class_2382; + COMMENT {@return the dimensions (the size) of this box} METHOD method_14660 getBlockCountY ()I + COMMENT {@return the number of blocks on the Y axis} + COMMENT + COMMENT

    This is equal to {@code maxY - minY + 1}. METHOD method_14661 move (III)Lnet/minecraft/class_3341; ARG 1 dx ARG 2 dy ARG 3 dz METHOD method_14662 contains (Lnet/minecraft/class_2382;)Z - ARG 1 vec + COMMENT {@return whether this box contains {@code pos}} + ARG 1 pos METHOD method_14663 getBlockCountZ ()I + COMMENT {@return the number of blocks on the Z axis} + COMMENT + COMMENT

    This is equal to {@code maxZ - minZ + 1}. METHOD method_14665 infinite ()Lnet/minecraft/class_3341; - COMMENT Creates an all-encompassing, infinite box. + COMMENT {@return a new all-encompassing, infinite box} METHOD method_14667 rotated (IIIIIIIIILnet/minecraft/class_2350;)Lnet/minecraft/class_3341; ARG 0 x ARG 1 y @@ -55,21 +64,23 @@ CLASS net/minecraft/class_3341 net/minecraft/util/math/BlockBox ARG 8 sizeZ ARG 9 facing METHOD method_14669 intersectsXZ (IIII)Z + COMMENT {@return whether the rectangle from the given coordinates intersects with this box's XZ plane} ARG 1 minX ARG 2 minZ 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 {@return 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 METHOD method_22874 getCenter ()Lnet/minecraft/class_2338; - COMMENT @implNote Biased toward the minimum bound corner of the box. + COMMENT {@return the center of this box} + COMMENT + COMMENT @apiNote This is biased toward the minimum bound corner of the box. METHOD method_29299 move (Lnet/minecraft/class_2382;)Lnet/minecraft/class_3341; ARG 1 vec METHOD method_34389 encompass (Lnet/minecraft/class_2338;)Lnet/minecraft/class_3341; @@ -79,9 +90,11 @@ CLASS net/minecraft/class_3341 net/minecraft/util/math/BlockBox ARG 1 pos COMMENT the pos to encompass METHOD method_34390 create (Lnet/minecraft/class_2382;Lnet/minecraft/class_2382;)Lnet/minecraft/class_3341; + COMMENT {@return a new box from two corners, {@code first} and {@code second}} ARG 0 first ARG 1 second METHOD method_34391 forEachVertex (Ljava/util/function/Consumer;)V + COMMENT Calls {@code consumer} for each vertex (corner) of this box. ARG 1 consumer METHOD method_34392 (Ljava/util/stream/IntStream;)Lcom/mojang/serialization/DataResult; ARG 0 values @@ -90,17 +103,29 @@ CLASS net/minecraft/class_3341 net/minecraft/util/math/BlockBox METHOD method_34394 (Lnet/minecraft/class_3341;)Ljava/util/stream/IntStream; ARG 0 box METHOD method_35410 expand (I)Lnet/minecraft/class_3341; + COMMENT {@return a new box that is expanded on each direction by {@code offset}} ARG 1 offset METHOD method_35411 encompassPositions (Ljava/lang/Iterable;)Ljava/util/Optional; + COMMENT {@return the minimum box encompassing all of the given {@code positions}, + COMMENT or an empty optional if {@code positions} is empty} ARG 0 positions METHOD method_35412 encompass (Lnet/minecraft/class_3341;)Lnet/minecraft/class_3341; ARG 1 box METHOD method_35413 encompass (Ljava/lang/Iterable;)Ljava/util/Optional; + COMMENT {@return the minimum box encompassing all of the given {@code boxes}, + COMMENT or an empty optional if {@code boxes} is empty} ARG 0 boxes METHOD method_35414 getBlockCountX ()I + COMMENT {@return the number of blocks on the X axis} + COMMENT + COMMENT

    This is equal to {@code maxX - minX + 1}. METHOD method_35415 getMinX ()I METHOD method_35416 getMinY ()I METHOD method_35417 getMinZ ()I METHOD method_35418 getMaxX ()I METHOD method_35419 getMaxY ()I METHOD method_35420 getMaxZ ()I + METHOD method_47593 contains (III)Z + ARG 1 x + ARG 2 y + ARG 3 z diff --git a/mappings/net/minecraft/util/math/BlockPos.mapping b/mappings/net/minecraft/util/math/BlockPos.mapping index 67264f46eb..d2c4359401 100644 --- a/mappings/net/minecraft/util/math/BlockPos.mapping +++ b/mappings/net/minecraft/util/math/BlockPos.mapping @@ -18,12 +18,8 @@ CLASS net/minecraft/class_2338 net/minecraft/util/math/BlockPos FIELD field_10983 BIT_SHIFT_Z I FIELD field_18789 LOGGER Lorg/slf4j/Logger; FIELD field_25064 CODEC Lcom/mojang/serialization/Codec; - METHOD (Lnet/minecraft/class_2374;)V - ARG 1 pos METHOD (Lnet/minecraft/class_2382;)V ARG 1 pos - METHOD (Lnet/minecraft/class_243;)V - ARG 1 pos METHOD method_10060 offset (JLnet/minecraft/class_2350;)J ARG 0 value ARG 2 direction @@ -188,6 +184,36 @@ CLASS net/minecraft/class_2338 net/minecraft/util/math/BlockPos COMMENT the {@link BlockPos} to iterate around ARG 3 range COMMENT the maximum distance from the given pos in any axis + METHOD method_46558 toCenterPos ()Lnet/minecraft/class_243; + COMMENT {@return the center of this block position} + COMMENT + COMMENT @see Vec3d#ofCenter + METHOD method_49637 ofFloored (DDD)Lnet/minecraft/class_2338; + ARG 0 x + ARG 2 y + ARG 4 z + METHOD method_49638 ofFloored (Lnet/minecraft/class_2374;)Lnet/minecraft/class_2338; + ARG 0 pos + METHOD method_49925 iterateRecursively (Lnet/minecraft/class_2338;IILjava/util/function/BiConsumer;Ljava/util/function/Predicate;)I + COMMENT Iterates from {@code pos} recursively, like in a fill tool in a raster image editor. + COMMENT {@code callback} is called once (and only once) for each position it finds. When this + COMMENT returns {@code true} and the depth/iteration limit is not reached yet, {@code nextQueuer} + COMMENT queues the next (usually neighboring) positions to iterate, with the depth incremented by one. + COMMENT + COMMENT @return the total number of iterations + ARG 0 pos + COMMENT the starting position + ARG 1 maxDepth + COMMENT the maximum depth of iteration + ARG 2 maxIterations + COMMENT the maximum number of total iterations + ARG 3 nextQueuer + COMMENT a function that enqueues the next positions + ARG 4 callback + METHOD method_49926 (Ljava/util/Queue;ILnet/minecraft/class_2338;)V + ARG 2 queuedPos + METHOD method_51686 streamSouthEastSquare (Lnet/minecraft/class_2338;)Ljava/util/stream/Stream; + ARG 0 pos CLASS 1 FIELD field_23945 pos Lnet/minecraft/class_2338$class_2339; FIELD field_23946 remaining I @@ -223,6 +249,10 @@ CLASS net/minecraft/class_2338 net/minecraft/util/math/BlockPos FIELD field_25910 currentY I FIELD field_25911 currentZ I CLASS class_2339 Mutable + METHOD (DDD)V + ARG 1 x + ARG 3 y + ARG 5 z METHOD method_10098 move (Lnet/minecraft/class_2350;)Lnet/minecraft/class_2338$class_2339; COMMENT Moves this mutable block position by 1 block in the given direction. ARG 1 direction diff --git a/mappings/net/minecraft/util/math/Box.mapping b/mappings/net/minecraft/util/math/Box.mapping index 20b6dce1c9..170ccde8b4 100644 --- a/mappings/net/minecraft/util/math/Box.mapping +++ b/mappings/net/minecraft/util/math/Box.mapping @@ -35,6 +35,7 @@ CLASS net/minecraft/class_238 net/minecraft/util/math/Box METHOD equals (Ljava/lang/Object;)Z ARG 1 o METHOD method_1001 getMin (Lnet/minecraft/class_2350$class_2351;)D + COMMENT {@return the minimum coordinate for the given {@code axis} of this box} ARG 1 axis METHOD method_1002 shrink (DDD)Lnet/minecraft/class_238; ARG 1 x @@ -83,8 +84,8 @@ CLASS net/minecraft/class_238 net/minecraft/util/math/Box 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 + METHOD method_1013 isNaN ()Z + COMMENT Checks if any of the coordinates of this box are {@linkplain COMMENT Double#isNaN(double) not a number}. METHOD method_1014 expand (D)Lnet/minecraft/class_238; COMMENT @see #contract(double) @@ -104,34 +105,36 @@ CLASS net/minecraft/class_238 net/minecraft/util/math/Box ARG 3 dy ARG 5 dz METHOD method_35574 withMinX (D)Lnet/minecraft/class_238; - COMMENT Creates a box with the minimum X provided and all other coordinates - COMMENT of this box. + COMMENT {@return a new box with the minimum X provided and all other coordinates + COMMENT of this box} ARG 1 minX METHOD method_35575 withMinY (D)Lnet/minecraft/class_238; - COMMENT Creates a box with the minimum Y provided and all other coordinates - COMMENT of this box. + COMMENT {@return a new box with the minimum Y provided and all other coordinates + COMMENT of this box} ARG 1 minY METHOD method_35576 withMinZ (D)Lnet/minecraft/class_238; - COMMENT Creates a box with the minimum Z provided and all other coordinates - COMMENT of this box. + COMMENT {@return a new box with the minimum Z provided and all other coordinates + COMMENT of this box} ARG 1 minZ METHOD method_35577 withMaxX (D)Lnet/minecraft/class_238; - COMMENT Creates a box with the maximum X provided and all other coordinates - COMMENT of this box. + COMMENT {@return a new box with the maximum X provided and all other coordinates + COMMENT of this box} ARG 1 maxX METHOD method_35578 withMaxY (D)Lnet/minecraft/class_238; - COMMENT Creates a box with the maximum Y provided and all other coordinates - COMMENT of this box. + COMMENT {@return a new box with the maximum Y provided and all other coordinates + COMMENT of this box} ARG 1 maxY METHOD method_35579 withMaxZ (D)Lnet/minecraft/class_238; - COMMENT Creates a box with the maximum Z provided and all other coordinates - COMMENT of this box. + COMMENT {@return a new box with the maximum Z provided and all other coordinates + COMMENT of this box} ARG 1 maxZ METHOD method_35580 contract (DDD)Lnet/minecraft/class_238; COMMENT @see #expand(double, double, double) ARG 1 x ARG 3 y ARG 5 z + METHOD method_49271 squaredMagnitude (Lnet/minecraft/class_243;)D + ARG 1 pos 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. @@ -139,6 +142,7 @@ CLASS net/minecraft/class_238 net/minecraft/util/math/Box ARG 3 y ARG 5 z METHOD method_990 getMax (Lnet/minecraft/class_2350$class_2351;)D + COMMENT {@return the maximum coordinate for the given {@code axis} of this box} 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. diff --git a/mappings/net/minecraft/util/math/ChunkPos.mapping b/mappings/net/minecraft/util/math/ChunkPos.mapping index 3cfdc3145d..d1445cb2b5 100644 --- a/mappings/net/minecraft/util/math/ChunkPos.mapping +++ b/mappings/net/minecraft/util/math/ChunkPos.mapping @@ -1,6 +1,12 @@ CLASS net/minecraft/class_1923 net/minecraft/util/math/ChunkPos + COMMENT An immutable pair of two integers representing the X and Z coordinates of a chunk. + COMMENT + COMMENT

    Chunk positions are usually serialized as a {@code long}. FIELD field_17348 MARKER J + COMMENT A {@code long}-serialized chunk position {@code 1875066, 1875066}. This is a + COMMENT special value used as a marker. FIELD field_35107 ORIGIN Lnet/minecraft/class_1923; + COMMENT The origin of the chunk position, {@code 0, 0}. FIELD field_9180 z I FIELD field_9181 x I METHOD (II)V @@ -37,6 +43,9 @@ CLASS net/minecraft/class_1923 net/minecraft/util/math/ChunkPos ARG 2 y ARG 3 offsetZ METHOD method_37232 toLong (Lnet/minecraft/class_2338;)J + COMMENT {@return the chunk position of the given {@code pos} serialized as {@code long}} + COMMENT + COMMENT @see #toLong(int, int) ARG 0 pos METHOD method_42305 fromRegion (II)Lnet/minecraft/class_1923; ARG 0 x @@ -47,8 +56,18 @@ CLASS net/minecraft/class_1923 net/minecraft/util/math/ChunkPos METHOD method_42307 hashCode (II)I ARG 0 x ARG 1 z + METHOD method_52566 getSquaredDistance (Lnet/minecraft/class_1923;)I + ARG 1 pos + METHOD method_52567 getSquaredDistance (J)I + ARG 1 pos + METHOD method_52568 getSquaredDistance (II)I + ARG 1 x + ARG 2 z METHOD method_8323 getStartPos ()Lnet/minecraft/class_2338; METHOD method_8324 toLong ()J + COMMENT {@return the chunk position serialized as {@code long}} + COMMENT + COMMENT @see #toLong(int, int) METHOD method_8325 getPackedX (J)I ARG 0 pos METHOD method_8326 getStartX ()I @@ -56,6 +75,11 @@ CLASS net/minecraft/class_1923 net/minecraft/util/math/ChunkPos METHOD method_8328 getStartZ ()I METHOD method_8329 getEndZ ()I METHOD method_8331 toLong (II)J + COMMENT {@return the chunk position serialized as {@code long}} + COMMENT + COMMENT

    This returns {@code chunkX | (chunkZ << 32)}. + COMMENT + COMMENT @see #toLong() ARG 0 chunkX ARG 1 chunkZ METHOD method_8332 getPackedZ (J)I diff --git a/mappings/net/minecraft/util/math/ChunkSectionPos.mapping b/mappings/net/minecraft/util/math/ChunkSectionPos.mapping index 7970e3f7e5..8b56503703 100644 --- a/mappings/net/minecraft/util/math/ChunkSectionPos.mapping +++ b/mappings/net/minecraft/util/math/ChunkSectionPos.mapping @@ -154,6 +154,9 @@ CLASS net/minecraft/class_4076 net/minecraft/util/math/ChunkSectionPos ARG 0 entity METHOD method_42615 getSectionCoordFloored (D)I ARG 0 coord + METHOD method_51687 withZeroY (II)J + ARG 0 x + ARG 1 z CLASS 1 FIELD field_19263 iterator Lnet/minecraft/class_3980; METHOD tryAdvance (Ljava/util/function/Consumer;)Z diff --git a/mappings/net/minecraft/util/math/ColorHelper.mapping b/mappings/net/minecraft/util/math/ColorHelper.mapping index dd0af6fbcd..bf1e5c1ece 100644 --- a/mappings/net/minecraft/util/math/ColorHelper.mapping +++ b/mappings/net/minecraft/util/math/ColorHelper.mapping @@ -1,18 +1,59 @@ CLASS net/minecraft/class_5253 net/minecraft/util/math/ColorHelper + COMMENT Contains color-related helper methods. CLASS class_5254 Argb + COMMENT Contains color-related helper methods that use ARGB colors represented + COMMENT as {@code 0xAARRGGBB}. METHOD method_27762 getAlpha (I)I + COMMENT {@return the alpha value of {@code argb}} + COMMENT + COMMENT

    The returned value is between {@code 0} and {@code 255} (both inclusive). ARG 0 argb METHOD method_27763 mixColor (II)I ARG 0 first ARG 1 second METHOD method_27764 getArgb (IIII)I + COMMENT {@return the ARGB color value from its components} ARG 0 alpha ARG 1 red ARG 2 green ARG 3 blue METHOD method_27765 getRed (I)I + COMMENT {@return the red value of {@code argb}} + COMMENT + COMMENT

    The returned value is between {@code 0} and {@code 255} (both inclusive). ARG 0 argb METHOD method_27766 getGreen (I)I + COMMENT {@return the green value of {@code argb}} + COMMENT + COMMENT

    The returned value is between {@code 0} and {@code 255} (both inclusive). ARG 0 argb METHOD method_27767 getBlue (I)I + COMMENT {@return the blue value of {@code argb}} + COMMENT + COMMENT

    The returned value is between {@code 0} and {@code 255} (both inclusive). ARG 0 argb + METHOD method_48780 lerp (FII)I + ARG 0 delta + ARG 1 start + ARG 2 end + CLASS class_8045 Abgr + METHOD method_48342 getAlpha (I)I + ARG 0 abgr + METHOD method_48343 withAlpha (II)I + ARG 0 alpha + ARG 1 bgr + METHOD method_48344 getAbgr (IIII)I + ARG 0 a + ARG 1 b + ARG 2 g + ARG 3 r + METHOD method_48345 getRed (I)I + ARG 0 abgr + METHOD method_48346 getGreen (I)I + ARG 0 abgr + METHOD method_48347 getBlue (I)I + ARG 0 abgr + METHOD method_48348 getBgr (I)I + ARG 0 abgr + METHOD method_48548 toOpaque (I)I + ARG 0 abgr diff --git a/mappings/net/minecraft/util/math/Direction.mapping b/mappings/net/minecraft/util/math/Direction.mapping index 25b47b958c..8705e62756 100644 --- a/mappings/net/minecraft/util/math/Direction.mapping +++ b/mappings/net/minecraft/util/math/Direction.mapping @@ -1,4 +1,9 @@ CLASS net/minecraft/class_2350 net/minecraft/util/math/Direction + COMMENT An enum representing 6 cardinal directions in Minecraft. + COMMENT + COMMENT

    In Minecraft, the X axis determines the east-west direction, the Y axis determines + COMMENT the up-down direction, and the Z axis determines the south-north direction (note + COMMENT that positive-Z direction is south, not north). FIELD field_11030 idHorizontal I FIELD field_11031 idOpposite I FIELD field_11032 id I @@ -9,7 +14,6 @@ CLASS net/minecraft/class_2350 net/minecraft/util/math/Direction FIELD field_11044 direction Lnet/minecraft/class_2350$class_2352; FIELD field_11046 name Ljava/lang/String; FIELD field_11047 axis Lnet/minecraft/class_2350$class_2351; - FIELD field_16542 VECTOR_TO_DIRECTION Lit/unimi/dsi/fastutil/longs/Long2ObjectMap; FIELD field_29502 CODEC Lnet/minecraft/class_3542$class_7292; FIELD field_35088 VERTICAL_CODEC Lcom/mojang/serialization/Codec; METHOD (Ljava/lang/String;IIIILjava/lang/String;Lnet/minecraft/class_2350$class_2352;Lnet/minecraft/class_2350$class_2351;Lnet/minecraft/class_2382;)V @@ -64,26 +68,19 @@ CLASS net/minecraft/class_2350 net/minecraft/util/math/Direction METHOD method_10165 getOffsetZ ()I METHOD method_10166 getAxis ()Lnet/minecraft/class_2350$class_2351; METHOD method_10168 byName (Ljava/lang/String;)Lnet/minecraft/class_2350; + COMMENT {@return a direction with the given {@code name}, or {@code null} if there is + COMMENT no such direction} ARG 0 name METHOD method_10169 from (Lnet/minecraft/class_2350$class_2351;Lnet/minecraft/class_2350$class_2352;)Lnet/minecraft/class_2350; ARG 0 axis ARG 1 direction METHOD method_10170 rotateYClockwise ()Lnet/minecraft/class_2350; METHOD method_10171 getDirection ()Lnet/minecraft/class_2350$class_2352; - METHOD method_16364 (Lnet/minecraft/class_2350;Lnet/minecraft/class_2350;)Lnet/minecraft/class_2350; - ARG 0 direction1 - ARG 1 direction2 - METHOD method_16365 fromVector (III)Lnet/minecraft/class_2350; - ARG 0 x - ARG 1 y - ARG 2 z - METHOD method_16366 (Lnet/minecraft/class_2350;)Ljava/lang/Long; - ARG 0 direction - METHOD method_23224 getRotationQuaternion ()Lnet/minecraft/class_1158; - METHOD method_23225 transform (Lnet/minecraft/class_1159;Lnet/minecraft/class_2350;)Lnet/minecraft/class_2350; + METHOD method_23224 getRotationQuaternion ()Lorg/joml/Quaternionf; + METHOD method_23225 transform (Lorg/joml/Matrix4f;Lnet/minecraft/class_2350;)Lnet/minecraft/class_2350; ARG 0 matrix ARG 1 direction - METHOD method_23955 getUnitVector ()Lnet/minecraft/class_1160; + METHOD method_23955 getUnitVector ()Lorg/joml/Vector3f; METHOD method_30928 pointsTo (F)Z COMMENT {@return whether the given yaw points to the direction} COMMENT @@ -94,8 +91,6 @@ CLASS net/minecraft/class_2350 net/minecraft/util/math/Direction METHOD method_32801 getLookDirectionForAxis (Lnet/minecraft/class_1297;Lnet/minecraft/class_2350$class_2351;)Lnet/minecraft/class_2350; ARG 0 entity ARG 1 axis - METHOD method_35832 fromVector (Lnet/minecraft/class_2338;)Lnet/minecraft/class_2350; - ARG 0 pos METHOD method_35833 rotateClockwise (Lnet/minecraft/class_2350$class_2351;)Lnet/minecraft/class_2350; ARG 1 axis METHOD method_35834 rotateCounterclockwise (Lnet/minecraft/class_2350$class_2351;)Lnet/minecraft/class_2350; @@ -108,7 +103,12 @@ CLASS net/minecraft/class_2350 net/minecraft/util/math/Direction ARG 0 direction METHOD method_42013 stream ()Ljava/util/stream/Stream; METHOD method_42014 shuffle (Lnet/minecraft/class_5819;)Ljava/util/Collection; + COMMENT {@return a shuffled collection of all directions} ARG 0 random + METHOD method_50026 fromVector (III)Lnet/minecraft/class_2350; + ARG 0 x + ARG 1 y + ARG 2 z CLASS class_2351 Axis FIELD field_11053 name Ljava/lang/String; FIELD field_23780 VALUES [Lnet/minecraft/class_2350$class_2351; diff --git a/mappings/net/minecraft/util/math/DirectionTransformation.mapping b/mappings/net/minecraft/util/math/DirectionTransformation.mapping index 1cf61ef6b9..4de959dd1e 100644 --- a/mappings/net/minecraft/util/math/DirectionTransformation.mapping +++ b/mappings/net/minecraft/util/math/DirectionTransformation.mapping @@ -1,5 +1,5 @@ CLASS net/minecraft/class_4990 net/minecraft/util/math/DirectionTransformation - FIELD field_23288 matrix Lnet/minecraft/class_4581; + FIELD field_23288 matrix Lorg/joml/Matrix3f; FIELD field_23289 name Ljava/lang/String; FIELD field_23290 mappings Ljava/util/Map; FIELD field_23291 flipX Z @@ -24,4 +24,4 @@ CLASS net/minecraft/class_4990 net/minecraft/util/math/DirectionTransformation ARG 1 orientation METHOD method_26391 getAxisFlips ()Lit/unimi/dsi/fastutil/booleans/BooleanList; METHOD method_35813 inverse ()Lnet/minecraft/class_4990; - METHOD method_35814 getMatrix ()Lnet/minecraft/class_4581; + METHOD method_35814 getMatrix ()Lorg/joml/Matrix3f; diff --git a/mappings/net/minecraft/util/math/Divider.mapping b/mappings/net/minecraft/util/math/Divider.mapping new file mode 100644 index 0000000000..254dcd86bd --- /dev/null +++ b/mappings/net/minecraft/util/math/Divider.mapping @@ -0,0 +1,16 @@ +CLASS net/minecraft/class_7836 net/minecraft/util/math/Divider + COMMENT A class for dividing an integer into {@link #divisor} number of integers + COMMENT such that the difference between any integers is {@code 0} or {@code 1}. + COMMENT The resulting integers sum to the {@code dividend}. + COMMENT For example, {@code new Divider(13, 5)} will produce {@code 2, 3, 2, 3, 3}. + FIELD field_40738 divisor I + FIELD field_40739 quotient I + FIELD field_40740 mod I + FIELD field_40741 returnedCount I + FIELD field_40742 remainder I + METHOD (II)V + ARG 1 dividend + ARG 2 divisor + METHOD method_46402 asIterable (II)Ljava/lang/Iterable; + ARG 0 dividend + ARG 1 divisor diff --git a/mappings/net/minecraft/util/math/GivensPair.mapping b/mappings/net/minecraft/util/math/GivensPair.mapping new file mode 100644 index 0000000000..f947edc7b1 --- /dev/null +++ b/mappings/net/minecraft/util/math/GivensPair.mapping @@ -0,0 +1,16 @@ +CLASS net/minecraft/class_8218 net/minecraft/util/math/GivensPair + COMMENT A pair of {@code sin(θ)} and {@code cos(θ)} used in Givens quaternion. + METHOD method_49725 negateSin ()Lnet/minecraft/class_8218; + METHOD method_49726 fromAngle (F)Lnet/minecraft/class_8218; + ARG 0 radians + METHOD method_49727 normalize (FF)Lnet/minecraft/class_8218; + ARG 0 a + ARG 1 b + METHOD method_49728 setRotationX (Lorg/joml/Matrix3f;)Lorg/joml/Matrix3f; + METHOD method_49729 setXRotation (Lorg/joml/Quaternionf;)Lorg/joml/Quaternionf; + METHOD method_49730 cosDouble ()F + METHOD method_49731 setRotationY (Lorg/joml/Matrix3f;)Lorg/joml/Matrix3f; + METHOD method_49732 setYRotation (Lorg/joml/Quaternionf;)Lorg/joml/Quaternionf; + METHOD method_49733 sinDouble ()F + METHOD method_49734 setRotationZ (Lorg/joml/Matrix3f;)Lorg/joml/Matrix3f; + METHOD method_49735 setZRotation (Lorg/joml/Quaternionf;)Lorg/joml/Quaternionf; diff --git a/mappings/net/minecraft/util/math/MathHelper.mapping b/mappings/net/minecraft/util/math/MathHelper.mapping index ff2d8fffce..49d192488f 100644 --- a/mappings/net/minecraft/util/math/MathHelper.mapping +++ b/mappings/net/minecraft/util/math/MathHelper.mapping @@ -1,11 +1,35 @@ CLASS net/minecraft/class_3532 net/minecraft/util/math/MathHelper - FIELD field_15722 COSINE_TABLE [D + COMMENT Contains math-related helper methods. This includes {@code float}-specific extensions + COMMENT to {@link Math}, linear interpolation (lerp), and color-related methods. + COMMENT + COMMENT

    Trigonometric functions defined in this class use the "sine table", a pre-calculated + COMMENT table of {@code sin(N)} ({@code 0 <= N < pi * 2}). + FIELD field_15722 COSINE_OF_ARCSINE_TABLE [D + COMMENT Holds values of cos(arcsin(x)): {@code COSINE_OF_ARCSINE_TABLE[i]} is equal to + COMMENT {@code Math.cos(Math.arcsin(i / 256.0))}. + COMMENT + COMMENT

    This is used by {@link MathHelper#atan2} to approximate the inverse + COMMENT tangent function. FIELD field_15723 MULTIPLY_DE_BRUIJN_BIT_POSITION [I FIELD field_15724 SQUARE_ROOT_OF_TWO F FIELD field_15725 SINE_TABLE [F FIELD field_15726 RANDOM Lnet/minecraft/class_5819; FIELD field_15727 ARCSINE_TABLE [D - FIELD field_15728 SMALLEST_FRACTION_FREE_DOUBLE D + COMMENT Holds values of arcsin(x): {@code ARCSINE_TABLE[i]} is equal to + COMMENT {@code Math.arcsin(i / 256.0)}. + COMMENT + COMMENT

    This is used by {@link MathHelper#atan2} to approximate the inverse + COMMENT tangent function. + FIELD field_15728 ROUNDER_256THS D + COMMENT A constant for rounding a double to the nearest multiple of 1/256. + COMMENT + COMMENT

    When this constant is added to a double that is not too large, then the + COMMENT bits of the result's mantissa reflect the original number times 256. + COMMENT Consequently, adding this constant and then subtracting it rounds such + COMMENT doubles to the nearest multiple of 1/256. + COMMENT + COMMENT

    This is used by {@link MathHelper#atan2} to produce an index into + COMMENT {@link MathHelper#ARCSINE_TABLE} and {@link MathHelper#COSINE_OF_ARCSINE_TABLE}. FIELD field_29844 PI F FIELD field_29845 HALF_PI F FIELD field_29846 TAU F @@ -15,6 +39,15 @@ CLASS net/minecraft/class_3532 net/minecraft/util/math/MathHelper FIELD field_29849 EPSILON F FIELD field_29853 HALF_PI_RADIANS_SINE_TABLE_INDEX J FIELD field_29856 DEGREES_TO_SINE_TABLE_INDEX F + FIELD field_29857 ARCSINE_MACLAURIN_3 D + COMMENT Used for the third-order Maclaurin series approximation of the arcsin function, + COMMENT x + x^3/6. + FIELD field_29859 ARCSINE_TABLE_LENGTH I + COMMENT The total number of entries in {@link MathHelper#ARCSINE_TABLE} and + COMMENT {@link MathHelper#COSINE_OF_ARCSINE_TABLE}. + COMMENT + COMMENT

    These tables have 257 elements because they store values for multiples of + COMMENT 1/256 from 0 to 1, inclusive. METHOD method_15338 wrapDegrees (D)D COMMENT Wraps an angle in degrees to the interval {@code [-180, 180)}. ARG 0 degrees @@ -45,9 +78,6 @@ CLASS net/minecraft/class_3532 net/minecraft/util/math/MathHelper METHOD method_15345 fastInverseSqrt (D)D COMMENT {@return an approximation of {@code 1 / Math.sqrt(x)}} 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 @@ -57,6 +87,18 @@ CLASS net/minecraft/class_3532 net/minecraft/util/math/MathHelper ARG 1 to ARG 2 step METHOD method_15349 atan2 (DD)D + COMMENT {@return an approximation of {@code Math.atan2(y, x)}} + COMMENT + COMMENT @implNote This implementation transforms the arguments such that they + COMMENT lie in the first quadrant. If {@code y > x}, then {@code x} and {@code y} + COMMENT are swapped to minimize the error of the initial approximation. + COMMENT {@code x} and {@code y} are normalized, and an initial approximation + COMMENT of the result and the sine of the deviation from the true value are + COMMENT obtained using the {@link MathHelper#ARCSINE_TABLE} and + COMMENT {@link MathHelper#COSINE_OF_ARCSINE_TABLE} lookup tables. The error + COMMENT itself is approximated using the third-order Maclaurin series polynomial + COMMENT for arcsin. Finally, the implementation undoes any transformations that + COMMENT were performed initially. ARG 0 y ARG 2 x METHOD method_15350 clamp (DDD)D @@ -115,8 +157,6 @@ CLASS net/minecraft/class_3532 net/minecraft/util/math/MathHelper ARG 0 value ARG 1 min ARG 2 max - METHOD method_15365 fastFloor (D)I - ARG 0 value METHOD method_15366 nextDouble (Lnet/minecraft/class_5819;DD)D ARG 0 random ARG 1 min @@ -144,8 +184,6 @@ CLASS net/minecraft/class_3532 net/minecraft/util/math/MathHelper 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 @@ -161,10 +199,6 @@ CLASS net/minecraft/class_3532 net/minecraft/util/math/MathHelper 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 @@ -274,25 +308,9 @@ CLASS net/minecraft/class_3532 net/minecraft/util/math/MathHelper ARG 2 b METHOD method_22450 fractionalPart (F)F ARG 0 value - METHOD method_22858 fastInverseSqrt (F)F - COMMENT {@return an approximation of {@code 1 / Math.sqrt(x)}} - COMMENT - COMMENT @see - COMMENT Fast inverse square root - Wikipedia - ARG 0 x - METHOD method_22859 lerpAngle (FFF)F - ARG 0 start - ARG 1 end - ARG 2 delta - METHOD method_22860 fwrapDegrees (D)F - ARG 0 degrees METHOD method_23278 fastInverseCbrt (F)F COMMENT {@return an approximation of {@code 1 / Math.cbrt(x)}} ARG 0 x - METHOD method_24156 clamp (JJJ)J - ARG 0 value - ARG 2 min - ARG 4 max METHOD method_24504 wrap (FF)F ARG 0 value ARG 1 maxDeviation @@ -362,45 +380,10 @@ CLASS net/minecraft/class_3532 net/minecraft/util/math/MathHelper ARG 0 a ARG 2 b ARG 4 c - METHOD method_34939 clamp (BBB)B - ARG 0 value - ARG 1 min - ARG 2 max - METHOD method_34943 multiplyColors (IFFF)I - ARG 0 color - ARG 1 r - ARG 2 g - ARG 3 b - METHOD method_34944 murmurHash (J)J - ARG 0 value - METHOD method_34947 parseDouble (Ljava/lang/String;D)D - ARG 0 string - ARG 1 fallback - METHOD method_34948 parseDouble (Ljava/lang/String;DD)D - COMMENT {@return the parsed double; {@code fallback} if {@code string} is not an - COMMENT double; or {@code min} if the parsed double is too small} - ARG 0 string - COMMENT the string to parse - ARG 1 fallback - COMMENT the fallback for unparsable {@code string} - ARG 3 min - COMMENT the minimum if the parsed value is too small - METHOD method_34949 parseInt (Ljava/lang/String;II)I - COMMENT {@return the parsed integer; {@code fallback} if {@code string} is not an - COMMENT integer; or {@code min} if the parsed integer is too small} - ARG 0 string - COMMENT the string to parse - ARG 1 fallback - COMMENT the fallback for unparsable {@code string} - ARG 2 min - COMMENT the minimum if the parsed value is too small - METHOD method_34951 getCumulativeDistribution ([D)[D - ARG 0 values - METHOD method_34952 multiplyColors (II)I - ARG 0 a - ARG 1 b - METHOD method_34953 absFloor (D)I - ARG 0 value + METHOD method_34945 (Lnet/minecraft/class_243;Lnet/minecraft/class_243;Lnet/minecraft/class_238;)Z + ARG 0 origin + ARG 1 direction + ARG 2 box METHOD method_34954 square (I)I ARG 0 n METHOD method_34956 perlinFadeDerivative (D)D @@ -498,5 +481,40 @@ CLASS net/minecraft/class_3532 net/minecraft/util/math/MathHelper ARG 0 seed ARG 1 lowerBound ARG 2 upperBound - METHOD method_42626 magnitude (F)F - ARG 0 n + METHOD method_48116 floorDiv (II)I + ARG 0 dividend + ARG 1 divisor + METHOD method_48117 isMultipleOf (II)Z + ARG 0 a + ARG 1 b + METHOD method_48118 inverseSqrt (D)D + ARG 0 x + METHOD method_48119 inverseSqrt (F)F + ARG 0 x + METHOD method_48781 lerp (FII)I + ARG 0 delta + ARG 1 start + ARG 2 end + METHOD method_52468 lerpAngleDegrees (DDD)D + ARG 0 delta + ARG 2 start + ARG 4 end + METHOD method_53062 clamp (JJJ)J + ARG 0 value + ARG 2 min + ARG 4 max + METHOD method_53063 lerpPositive (FII)I + COMMENT {@return linear interpolation of {@code delta} between {@code start} and {@code end}, + COMMENT except that for any positive {@code delta} the value is positive} + COMMENT + COMMENT

    Like {@link #lerp(float, int, int)}, {@code lerpPositive(0, 0, 10)} returns {@code 0}. + COMMENT However, if the delta is {@code 0.01f}, the {@code lerp} method would return {@code 0} + COMMENT since {@code 0.01 * 10} floored is {@code 0}. This method returns {@code 1} in this + COMMENT situation. + COMMENT + COMMENT @apiNote This is used to calculate redstone comparator output and boss bar percentage. + COMMENT + COMMENT @see #lerp(float, int, int) + ARG 0 delta + ARG 1 start + ARG 2 end diff --git a/mappings/net/minecraft/util/math/Matrix3f.mapping b/mappings/net/minecraft/util/math/Matrix3f.mapping deleted file mode 100644 index d3c77ad1ba..0000000000 --- a/mappings/net/minecraft/util/math/Matrix3f.mapping +++ /dev/null @@ -1,107 +0,0 @@ -CLASS net/minecraft/class_4581 net/minecraft/util/math/Matrix3f - FIELD field_20860 THREE_PLUS_TWO_SQRT_TWO F - FIELD field_20861 COS_PI_OVER_EIGHT F - FIELD field_20862 SIN_PI_OVER_EIGHT F - FIELD field_20863 SQRT_HALF F - FIELD field_21633 a00 F - FIELD field_21634 a01 F - FIELD field_21635 a02 F - FIELD field_21636 a10 F - FIELD field_21637 a11 F - FIELD field_21638 a12 F - FIELD field_21639 a20 F - FIELD field_21640 a21 F - FIELD field_21641 a22 F - FIELD field_31077 ORDER I - COMMENT The number of rows and columns ({@value}) this matrix has. - METHOD (Lnet/minecraft/class_1158;)V - ARG 1 quaternion - METHOD (Lnet/minecraft/class_1159;)V - ARG 1 matrix - METHOD (Lnet/minecraft/class_4581;)V - ARG 1 source - METHOD equals (Ljava/lang/Object;)Z - ARG 1 o - METHOD method_22847 transpose ()V - METHOD method_22849 getSinAndCosOfRotation (FFF)Lcom/mojang/datafixers/util/Pair; - ARG 0 upperLeft - ARG 1 diagonalAverage - ARG 2 lowerRight - METHOD method_22852 load (Lnet/minecraft/class_4581;)V - ARG 1 source - METHOD method_22853 decomposeLinearTransformation ()Lorg/apache/commons/lang3/tuple/Triple; - METHOD method_22855 multiply (Lnet/minecraft/class_4581;)V - ARG 1 other - METHOD method_22856 loadIdentity ()V - METHOD method_22857 (Lnet/minecraft/class_4581;)Lnet/minecraft/class_1158; - ARG 0 matrix - 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 - METHOD method_23731 determinantAndAdjugate ()F - METHOD method_23732 invert ()Z - METHOD method_23963 scale (FFF)Lnet/minecraft/class_4581; - ARG 0 x - ARG 1 y - ARG 2 z - METHOD method_26288 set (IIF)V - ARG 1 x - ARG 2 y - ARG 3 value - METHOD method_35259 pack (II)I - ARG 0 x - ARG 1 y - METHOD method_35260 (Lnet/minecraft/class_4581;Lnet/minecraft/class_1158;)V - ARG 0 matrix - ARG 1 quaternion - METHOD method_35261 readColumnMajor (Ljava/nio/FloatBuffer;)V - COMMENT Reads a matrix from the buffer in column-major order. - COMMENT - COMMENT @see #readRowMajor(FloatBuffer) - COMMENT @see #read(FloatBuffer, boolean) - ARG 1 buf - METHOD method_35262 read (Ljava/nio/FloatBuffer;Z)V - COMMENT Reads a matrix from the buffer. - COMMENT - COMMENT @see #readRowMajor(FloatBuffer) - COMMENT @see #readColumnMajor(FloatBuffer) - ARG 1 buf - ARG 2 rowMajor - COMMENT {@code true} to read in row-major order; {@code false} to read in - COMMENT column-major order - METHOD method_35263 readRowMajor (Ljava/nio/FloatBuffer;)V - COMMENT Reads a matrix from the buffer in row-major order. - COMMENT - COMMENT @see #readColumnMajor(FloatBuffer) - COMMENT @see #read(FloatBuffer, boolean) - ARG 1 buf - METHOD method_35264 write (Ljava/nio/FloatBuffer;Z)V - COMMENT Writes this matrix to the buffer. - COMMENT - COMMENT @see #writeRowMajor(FloatBuffer) - COMMENT @see #writeColumnMajor(FloatBuffer) - ARG 1 buf - ARG 2 rowMajor - COMMENT {@code true} to write in row-major order; {@code false} to write in - COMMENT column-major order - METHOD method_35265 add (Lnet/minecraft/class_4581;)V - ARG 1 matrix - METHOD method_35266 writeColumnMajor (Ljava/nio/FloatBuffer;)V - COMMENT Writes this matrix to the buffer in column-major order. - COMMENT - COMMENT @see #writeRowMajor(FloatBuffer) - COMMENT @see #write(FloatBuffer, boolean) - ARG 1 buf - METHOD method_35267 subtract (Lnet/minecraft/class_4581;)V - ARG 1 matrix - METHOD method_35268 writeRowMajor (Ljava/nio/FloatBuffer;)V - COMMENT Writes this matrix to the buffer in row-major order. - COMMENT - COMMENT @see #writeColumnMajor(FloatBuffer) - COMMENT @see #write(FloatBuffer, boolean) - ARG 1 buf - METHOD method_35269 determinant ()F - METHOD method_35270 trace ()F - COMMENT Returns the sum of the elements on the main diagonal. diff --git a/mappings/net/minecraft/util/math/Matrix4f.mapping b/mappings/net/minecraft/util/math/Matrix4f.mapping deleted file mode 100644 index b820293c15..0000000000 --- a/mappings/net/minecraft/util/math/Matrix4f.mapping +++ /dev/null @@ -1,126 +0,0 @@ -CLASS net/minecraft/class_1159 net/minecraft/util/math/Matrix4f - FIELD field_21652 a00 F - FIELD field_21653 a01 F - FIELD field_21654 a02 F - FIELD field_21655 a03 F - FIELD field_21656 a10 F - FIELD field_21657 a11 F - FIELD field_21658 a12 F - FIELD field_21659 a13 F - FIELD field_21660 a20 F - FIELD field_21661 a21 F - FIELD field_21662 a22 F - FIELD field_21663 a23 F - FIELD field_21664 a30 F - FIELD field_21665 a31 F - FIELD field_21666 a32 F - FIELD field_21667 a33 F - FIELD field_31601 ORDER I - COMMENT The number of rows and columns ({@value}) this matrix has. - METHOD (Lnet/minecraft/class_1158;)V - ARG 1 quaternion - METHOD (Lnet/minecraft/class_1159;)V - ARG 1 matrix - METHOD equals (Ljava/lang/Object;)Z - ARG 1 o - METHOD method_22668 loadIdentity ()V - METHOD method_22670 multiply (Lnet/minecraft/class_1158;)V - ARG 1 quaternion - METHOD method_22671 addToLastColumn (Lnet/minecraft/class_1160;)V - ARG 1 vector - METHOD method_22672 multiply (Lnet/minecraft/class_1159;)V - ARG 1 matrix - METHOD method_22673 copy ()Lnet/minecraft/class_1159; - METHOD method_22866 multiply (F)V - ARG 1 scalar - METHOD method_22868 determinantAndAdjugate ()F - METHOD method_22870 invert ()Z - METHOD method_22871 transpose ()V - METHOD method_24019 scale (FFF)Lnet/minecraft/class_1159; - ARG 0 x - ARG 1 y - ARG 2 z - METHOD method_24020 pack (II)I - ARG 0 x - ARG 1 y - METHOD method_24021 translate (FFF)Lnet/minecraft/class_1159; - ARG 0 x - ARG 1 y - ARG 2 z - METHOD method_31544 multiplyByTranslation (FFF)V - COMMENT Multiplies the matrix by the translation matrix consisting of {@code x}, {@code y} and {@code z}. - COMMENT - COMMENT

    {@code multiplyByTranslation(x, y, z)} is equivalent to {@code multiply(Matrix4f.translate(x, y, z))}. - ARG 1 x - ARG 2 y - ARG 3 z - METHOD method_34239 projectionMatrix (FFFFFF)Lnet/minecraft/class_1159; - ARG 0 left - ARG 1 right - ARG 2 bottom - ARG 3 top - ARG 4 nearPlane - ARG 5 farPlane - METHOD method_35434 load (Lnet/minecraft/class_1159;)V - ARG 1 source - METHOD method_35435 readColumnMajor (Ljava/nio/FloatBuffer;)V - COMMENT Reads a matrix from the buffer in column-major order. - COMMENT - COMMENT @see #readRowMajor(FloatBuffer) - COMMENT @see #read(FloatBuffer, boolean) - ARG 1 buf - METHOD method_35436 read (Ljava/nio/FloatBuffer;Z)V - COMMENT Reads a matrix from the buffer. - COMMENT - COMMENT @see #readRowMajor(FloatBuffer) - COMMENT @see #readColumnMajor(FloatBuffer) - ARG 1 buf - ARG 2 rowMajor - COMMENT {@code true} to read in row-major order; {@code false} to read in - COMMENT column-major order - METHOD method_35437 isInteger (F)Z - ARG 0 value - METHOD method_35438 readRowMajor (Ljava/nio/FloatBuffer;)V - COMMENT Reads a matrix from the buffer in row-major order. - COMMENT - COMMENT @see #readColumnMajor(FloatBuffer) - COMMENT @see #read(FloatBuffer, boolean) - ARG 1 buf - METHOD method_35439 write (Ljava/nio/FloatBuffer;Z)V - COMMENT Writes this matrix to the buffer. - COMMENT - COMMENT @see #writeRowMajor(FloatBuffer) - COMMENT @see #writeColumnMajor(FloatBuffer) - ARG 1 buf - ARG 2 rowMajor - COMMENT {@code true} to write in row-major order; {@code false} to write in - COMMENT column-major order - METHOD method_35440 add (Lnet/minecraft/class_1159;)V - ARG 1 matrix - METHOD method_35441 determinant ()F - METHOD method_35442 subtract (Lnet/minecraft/class_1159;)V - ARG 1 matrix - METHOD method_35443 writeRowMajor (Ljava/nio/FloatBuffer;)V - COMMENT Writes this matrix to the buffer in row-major order. - COMMENT - COMMENT @see #writeColumnMajor(FloatBuffer) - COMMENT @see #write(FloatBuffer, boolean) - ARG 1 buf - METHOD method_35444 trace ()F - COMMENT Returns the sum of the elements on the main diagonal. - METHOD method_4929 viewboxMatrix (DFFF)Lnet/minecraft/class_1159; - ARG 0 fov - ARG 2 aspectRatio - ARG 3 cameraDepth - ARG 4 viewDistance - METHOD method_4932 writeColumnMajor (Ljava/nio/FloatBuffer;)V - COMMENT Writes this matrix to the buffer in column-major order. - COMMENT - COMMENT @see #writeRowMajor(FloatBuffer) - COMMENT @see #write(FloatBuffer, boolean) - ARG 1 buf - METHOD method_4933 projectionMatrix (FFFF)Lnet/minecraft/class_1159; - ARG 0 width - ARG 1 height - ARG 2 nearPlane - ARG 3 farPlane diff --git a/mappings/net/minecraft/util/math/MatrixUtil.mapping b/mappings/net/minecraft/util/math/MatrixUtil.mapping new file mode 100644 index 0000000000..e7a8d852b7 --- /dev/null +++ b/mappings/net/minecraft/util/math/MatrixUtil.mapping @@ -0,0 +1,36 @@ +CLASS net/minecraft/class_7837 net/minecraft/util/math/MatrixUtil + FIELD field_40746 COT_PI_OVER_8 F + FIELD field_43146 SIN_COS_PI_OVER_8 Lnet/minecraft/class_8218; + METHOD method_46410 qrGivensQuaternion (FF)Lnet/minecraft/class_8218; + COMMENT Computes the Givens quaternion for a QR factorization. + COMMENT See Algorithm 4 of + COMMENT https://pages.cs.wisc.edu/~sifakis/papers/SVD_TR1690.pdf. + ARG 0 a1 + ARG 1 a2 + METHOD method_46411 approximateGivensQuaternion (FFF)Lnet/minecraft/class_8218; + COMMENT Computes the approximate Givens rotation factors {@code (c, s) = (cos(phi), sin(phi))} for a 2×2 matrix. + COMMENT See Algorithm 4 of + COMMENT https://pages.cs.wisc.edu/~sifakis/papers/SVD_TR1690.pdf. + ARG 0 a11 + COMMENT the top-left element of the matrix + ARG 1 a12 + COMMENT the average of the two elements on the minor diagonal + ARG 2 a22 + COMMENT the bottom-right element of the matrix + METHOD method_46412 svdDecompose (Lorg/joml/Matrix3f;)Lorg/apache/commons/lang3/tuple/Triple; + COMMENT Performs an approximate singular value decomposition on a 3×3 matrix. + COMMENT See Algorithm 4 of + COMMENT https://pages.cs.wisc.edu/~sifakis/papers/SVD_TR1690.pdf. + ARG 0 A + METHOD method_46414 scale (Lorg/joml/Matrix4f;F)Lorg/joml/Matrix4f; + ARG 0 matrix + ARG 1 scalar + METHOD method_46415 applyJacobiIteration (Lorg/joml/Matrix3f;Lorg/joml/Matrix3f;Lorg/joml/Quaternionf;Lorg/joml/Quaternionf;)V + ARG 0 AtA + METHOD method_49741 applyJacobiIterations (Lorg/joml/Matrix3f;I)Lorg/joml/Quaternionf; + ARG 0 AtA + ARG 1 numJacobiIterations + METHOD method_49742 conjugate (Lorg/joml/Matrix3f;Lorg/joml/Matrix3f;)V + COMMENT Stores A′XA into X, clobbering A. + ARG 0 X + ARG 1 A diff --git a/mappings/net/minecraft/util/math/Quaternion.mapping b/mappings/net/minecraft/util/math/Quaternion.mapping deleted file mode 100644 index 1decee2ad0..0000000000 --- a/mappings/net/minecraft/util/math/Quaternion.mapping +++ /dev/null @@ -1,60 +0,0 @@ -CLASS net/minecraft/class_1158 net/minecraft/util/math/Quaternion - FIELD field_21493 IDENTITY Lnet/minecraft/class_1158; - FIELD field_21582 x F - FIELD field_21583 y F - FIELD field_21584 z F - FIELD field_21585 w F - METHOD (FFFF)V - ARG 1 x - ARG 2 y - ARG 3 z - ARG 4 w - METHOD (FFFZ)V - ARG 1 x - ARG 2 y - ARG 3 z - ARG 4 degrees - METHOD (Lnet/minecraft/class_1158;)V - ARG 1 other - METHOD (Lnet/minecraft/class_1160;FZ)V - ARG 1 axis - ARG 2 rotationAngle - ARG 3 degrees - METHOD equals (Ljava/lang/Object;)Z - ARG 1 o - METHOD method_16002 sin (F)F - ARG 0 value - METHOD method_16003 cos (F)F - ARG 0 value - METHOD method_22872 scale (F)V - ARG 1 scale - METHOD method_22873 normalize ()V - METHOD method_23695 copy ()Lnet/minecraft/class_1158; - METHOD method_23758 set (FFFF)V - ARG 1 x - ARG 2 y - ARG 3 z - ARG 4 w - METHOD method_35820 toEulerYxz ()Lnet/minecraft/class_1160; - METHOD method_35821 fromEulerYxz (FFF)Lnet/minecraft/class_1158; - ARG 0 x - ARG 1 y - ARG 2 z - METHOD method_35823 fromEulerXyzDegrees (Lnet/minecraft/class_1160;)Lnet/minecraft/class_1158; - ARG 0 vector - METHOD method_35824 toEulerYxzDegrees ()Lnet/minecraft/class_1160; - METHOD method_35825 fromEulerXyz (FFF)Lnet/minecraft/class_1158; - ARG 0 x - ARG 1 y - ARG 2 z - METHOD method_35826 fromEulerXyz (Lnet/minecraft/class_1160;)Lnet/minecraft/class_1158; - ARG 0 vector - METHOD method_35827 toEulerXyz ()Lnet/minecraft/class_1160; - METHOD method_35828 toEulerXyzDegrees ()Lnet/minecraft/class_1160; - METHOD method_4921 getX ()F - METHOD method_4922 getY ()F - METHOD method_4923 getZ ()F - METHOD method_4924 getW ()F - METHOD method_4925 hamiltonProduct (Lnet/minecraft/class_1158;)V - ARG 1 other - METHOD method_4926 conjugate ()V diff --git a/mappings/net/minecraft/util/math/RotationAxis.mapping b/mappings/net/minecraft/util/math/RotationAxis.mapping new file mode 100644 index 0000000000..5c2b96c6de --- /dev/null +++ b/mappings/net/minecraft/util/math/RotationAxis.mapping @@ -0,0 +1,27 @@ +CLASS net/minecraft/class_7833 net/minecraft/util/math/RotationAxis + FIELD field_40713 NEGATIVE_X Lnet/minecraft/class_7833; + FIELD field_40714 POSITIVE_X Lnet/minecraft/class_7833; + FIELD field_40715 NEGATIVE_Y Lnet/minecraft/class_7833; + FIELD field_40716 POSITIVE_Y Lnet/minecraft/class_7833; + FIELD field_40717 NEGATIVE_Z Lnet/minecraft/class_7833; + FIELD field_40718 POSITIVE_Z Lnet/minecraft/class_7833; + METHOD method_46349 (F)Lorg/joml/Quaternionf; + ARG 0 rad + METHOD method_46350 (Lorg/joml/Vector3f;F)Lorg/joml/Quaternionf; + ARG 1 rad + METHOD method_46351 (F)Lorg/joml/Quaternionf; + ARG 0 rad + METHOD method_46352 (F)Lorg/joml/Quaternionf; + ARG 0 rad + METHOD method_46353 (F)Lorg/joml/Quaternionf; + ARG 0 rad + METHOD method_46354 (F)Lorg/joml/Quaternionf; + ARG 0 rad + METHOD method_46355 (F)Lorg/joml/Quaternionf; + ARG 0 rad + METHOD method_46356 of (Lorg/joml/Vector3f;)Lnet/minecraft/class_7833; + ARG 0 axis + METHOD rotation (F)Lorg/joml/Quaternionf; + ARG 1 rad + METHOD rotationDegrees (F)Lorg/joml/Quaternionf; + ARG 1 deg diff --git a/mappings/net/minecraft/util/math/RotationCalculator.mapping b/mappings/net/minecraft/util/math/RotationCalculator.mapping new file mode 100644 index 0000000000..0c54cfc61c --- /dev/null +++ b/mappings/net/minecraft/util/math/RotationCalculator.mapping @@ -0,0 +1,23 @@ +CLASS net/minecraft/class_8013 net/minecraft/util/math/RotationCalculator + FIELD field_41760 max I + FIELD field_41761 precision I + FIELD field_41762 rotationPerDegrees F + FIELD field_41763 degreesPerRotation F + METHOD (I)V + ARG 1 precision + METHOD method_48120 getMax ()I + METHOD method_48121 toRotation (F)I + ARG 1 degrees + METHOD method_48122 toDegrees (I)F + ARG 1 rotation + METHOD method_48123 areRotationsParallel (II)Z + ARG 1 alpha + ARG 2 beta + METHOD method_48124 toRotation (Lnet/minecraft/class_2350;)I + ARG 1 direction + METHOD method_48125 toClampedRotation (F)I + ARG 1 degrees + METHOD method_48126 toWrappedDegrees (I)F + ARG 1 rotation + METHOD method_48127 clamp (I)I + ARG 1 rotationBits diff --git a/mappings/net/minecraft/util/math/RotationPropertyHelper.mapping b/mappings/net/minecraft/util/math/RotationPropertyHelper.mapping new file mode 100644 index 0000000000..f16cbe9a40 --- /dev/null +++ b/mappings/net/minecraft/util/math/RotationPropertyHelper.mapping @@ -0,0 +1,16 @@ +CLASS net/minecraft/class_7718 net/minecraft/util/math/RotationPropertyHelper + FIELD field_40345 MAX I + FIELD field_40346 NORTH I + FIELD field_40347 EAST I + FIELD field_40348 SOUTH I + FIELD field_40349 WEST I + FIELD field_41768 CALCULATOR Lnet/minecraft/class_8013; + METHOD method_45478 getMax ()I + METHOD method_45479 fromYaw (F)I + ARG 0 yaw + METHOD method_45480 toDirection (I)Ljava/util/Optional; + ARG 0 rotation + METHOD method_45481 fromDirection (Lnet/minecraft/class_2350;)I + ARG 0 direction + METHOD method_45482 toDegrees (I)F + ARG 0 rotation diff --git a/mappings/net/minecraft/util/math/Spline.mapping b/mappings/net/minecraft/util/math/Spline.mapping index 65c33862be..3da7cdad74 100644 --- a/mappings/net/minecraft/util/math/Spline.mapping +++ b/mappings/net/minecraft/util/math/Spline.mapping @@ -77,11 +77,24 @@ CLASS net/minecraft/class_6492 net/minecraft/util/math/Spline ARG 1 index METHOD method_41188 (Lnet/minecraft/class_6492$class_7073;Lnet/minecraft/class_6492;)Lnet/minecraft/class_6492; ARG 1 value + METHOD method_41297 sampleOutsideRange (F[FF[FI)F + ARG 0 point + ARG 1 locations + ARG 2 value + ARG 3 derivatives + ARG 4 i METHOD method_41299 build (Lnet/minecraft/class_6501;[FLjava/util/List;[F)Lnet/minecraft/class_6492$class_6738; ARG 0 locationFunction ARG 1 locations ARG 2 values ARG 3 derivatives + METHOD method_41300 findRangeForLocation ([FF)I + ARG 0 locations + ARG 1 x + METHOD method_41301 assertParametersValid ([FLjava/util/List;[F)V + ARG 0 locations + ARG 1 values + ARG 2 derivatives CLASS class_7073 Visitor METHOD visit (Ljava/lang/Object;)Ljava/lang/Object; ARG 1 value diff --git a/mappings/net/minecraft/util/math/Vec3d.mapping b/mappings/net/minecraft/util/math/Vec3d.mapping index 9879565f46..ab11f2a32b 100644 --- a/mappings/net/minecraft/util/math/Vec3d.mapping +++ b/mappings/net/minecraft/util/math/Vec3d.mapping @@ -8,7 +8,7 @@ CLASS net/minecraft/class_243 net/minecraft/util/math/Vec3d COMMENT implementations and can be used as a map key. COMMENT COMMENT @see Vec3i - COMMENT @see Vec3f + COMMENT @see org.joml.Vector3f FIELD field_1350 z D COMMENT The Z coordinate of this vector. FIELD field_1351 y D @@ -23,7 +23,7 @@ CLASS net/minecraft/class_243 net/minecraft/util/math/Vec3d ARG 1 x ARG 3 y ARG 5 z - METHOD (Lnet/minecraft/class_1160;)V + METHOD (Lorg/joml/Vector3f;)V COMMENT Copies the given vector. ARG 1 vec METHOD equals (Ljava/lang/Object;)Z @@ -224,6 +224,25 @@ CLASS net/minecraft/class_243 net/minecraft/util/math/Vec3d METHOD method_38499 withAxis (Lnet/minecraft/class_2350$class_2351;D)Lnet/minecraft/class_243; ARG 1 axis ARG 2 value - METHOD method_43206 withBias (Lnet/minecraft/class_2350;D)Lnet/minecraft/class_243; + METHOD method_42394 (Ljava/util/List;)Lcom/mojang/serialization/DataResult; + ARG 0 coordinates + METHOD method_42395 (Ljava/util/List;)Lnet/minecraft/class_243; + ARG 0 coords + METHOD method_42396 (Lnet/minecraft/class_243;)Ljava/util/List; + ARG 0 vec + METHOD method_43206 offset (Lnet/minecraft/class_2350;D)Lnet/minecraft/class_243; ARG 1 direction ARG 2 value + METHOD method_46409 toVector3f ()Lorg/joml/Vector3f; + COMMENT {@return a JOML {@link org.joml.Vector3f} representing this vector} + METHOD method_49272 addRandom (Lnet/minecraft/class_5819;F)Lnet/minecraft/class_243; + COMMENT {@return a vector with each value added by {@code random.nextFloat() - 0.5f) * multiplier}} + ARG 1 random + ARG 2 multiplier + METHOD method_49273 add (Lnet/minecraft/class_2382;DDD)Lnet/minecraft/class_243; + COMMENT {@return a new vector from {@code vec} with {@code deltaX}, {@code deltaY}, and + COMMENT {@code deltaZ} added to X, Y, Z values, respectively} + ARG 0 vec + ARG 1 deltaX + ARG 3 deltaY + ARG 5 deltaZ diff --git a/mappings/net/minecraft/util/math/Vec3f.mapping b/mappings/net/minecraft/util/math/Vec3f.mapping deleted file mode 100644 index a066bc92f9..0000000000 --- a/mappings/net/minecraft/util/math/Vec3f.mapping +++ /dev/null @@ -1,77 +0,0 @@ -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; - FIELD field_20705 POSITIVE_Y Lnet/minecraft/class_1160; - FIELD field_20706 NEGATIVE_Z Lnet/minecraft/class_1160; - FIELD field_20707 POSITIVE_Z Lnet/minecraft/class_1160; - FIELD field_21483 x F - FIELD field_21484 y F - FIELD field_21485 z F - FIELD field_28477 CODEC Lcom/mojang/serialization/Codec; - FIELD field_29501 ZERO Lnet/minecraft/class_1160; - METHOD (FFF)V - ARG 1 x - ARG 2 y - ARG 3 z - METHOD (Lnet/minecraft/class_1162;)V - ARG 1 vec - METHOD (Lnet/minecraft/class_243;)V - ARG 1 other - METHOD equals (Ljava/lang/Object;)Z - ARG 1 o - METHOD method_19262 rotate (Lnet/minecraft/class_1158;)V - ARG 1 rotation - 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 - ARG 1 vector - METHOD method_23847 lerp (Lnet/minecraft/class_1160;F)V - ARG 1 vector - ARG 2 delta - METHOD method_23848 modify (Lit/unimi/dsi/fastutil/floats/Float2FloatFunction;)V - ARG 1 function - METHOD method_23849 multiplyComponentwise (FFF)V - ARG 1 x - ARG 2 y - ARG 3 z - METHOD method_23850 copy ()Lnet/minecraft/class_1160; - METHOD method_33462 (Lnet/minecraft/class_1160;)Ljava/util/List; - ARG 0 vec - METHOD method_33463 (Ljava/util/List;)Lcom/mojang/serialization/DataResult; - ARG 0 vec - METHOD method_33464 (Ljava/util/List;)Lnet/minecraft/class_1160; - ARG 0 vec - METHOD method_35920 set (Lnet/minecraft/class_1160;)V - ARG 1 vec - METHOD method_35921 clamp (Lnet/minecraft/class_1160;Lnet/minecraft/class_1160;)V - ARG 1 min - ARG 2 max - METHOD method_4942 scale (F)V - ARG 1 scale - METHOD method_4943 getX ()F - METHOD method_4944 subtract (Lnet/minecraft/class_1160;)V - ARG 1 other - METHOD method_4945 getY ()F - METHOD method_4946 clamp (FF)V - ARG 1 min - ARG 2 max - METHOD method_4947 getZ ()F - METHOD method_4948 add (FFF)V - ARG 1 x - ARG 2 y - ARG 3 z - METHOD method_4949 set (FFF)V - ARG 1 x - ARG 2 y - ARG 3 z - METHOD method_4950 dot (Lnet/minecraft/class_1160;)F - ARG 1 other - METHOD method_4951 cross (Lnet/minecraft/class_1160;)V - ARG 1 vector - METHOD method_4952 normalize ()Z diff --git a/mappings/net/minecraft/util/math/Vec3i.mapping b/mappings/net/minecraft/util/math/Vec3i.mapping index 0f94756abc..42497b38c7 100644 --- a/mappings/net/minecraft/util/math/Vec3i.mapping +++ b/mappings/net/minecraft/util/math/Vec3i.mapping @@ -3,15 +3,14 @@ CLASS net/minecraft/class_2382 net/minecraft/util/math/Vec3i COMMENT COMMENT

    This class is very often used to hold the coordinates. To hold a block position COMMENT specifically, use {@link BlockPos} instead, which extends {@code Vec3i}. To hold - COMMENT positions for entities and other non-voxels, consider using {@link Vec3f} (that holds - COMMENT values using {@code float}) or {@link Vec3d} (that holds values using {@code double}) - COMMENT instead. + COMMENT positions for entities and other non-voxels, consider using {@link Vec3d} that + COMMENT holds values using {@code double} instead. COMMENT COMMENT

    {@code Vec3i} is read-only, but subclasses like {@link BlockPos.Mutable} COMMENT may be mutable. Make sure to sanitize inputs of {@code Vec3i} if needed, COMMENT such as calling {@link BlockPos#toImmutable()} or making new copies. COMMENT - COMMENT @see Vec3f + COMMENT @see org.joml.Vector3f COMMENT @see Vec3d COMMENT @see BlockPos FIELD field_11173 z I @@ -19,10 +18,6 @@ CLASS net/minecraft/class_2382 net/minecraft/util/math/Vec3i FIELD field_11175 x I FIELD field_11176 ZERO Lnet/minecraft/class_2382; FIELD field_25123 CODEC Lcom/mojang/serialization/Codec; - METHOD (DDD)V - ARG 1 x - ARG 3 y - ARG 5 z METHOD (III)V ARG 1 x ARG 2 y @@ -89,6 +84,12 @@ CLASS net/minecraft/class_2382 net/minecraft/util/math/Vec3i COMMENT {@return a vector which is offset by {@code 1} in the downward direction} METHOD method_23854 toShortString ()Ljava/lang/String; COMMENT {@return the coordinates joined with a colon and a space} + METHOD method_29124 (Lnet/minecraft/class_2382;)Ljava/util/stream/IntStream; + ARG 0 vec + METHOD method_29125 (Ljava/util/stream/IntStream;)Lcom/mojang/serialization/DataResult; + ARG 0 stream + METHOD method_29126 ([I)Lnet/minecraft/class_2382; + ARG 0 coordinates METHOD method_30558 getComponentAlongAxis (Lnet/minecraft/class_2350$class_2351;)I COMMENT {@return the component on the {@code axis} axis} ARG 1 axis @@ -107,14 +108,6 @@ CLASS net/minecraft/class_2382 net/minecraft/util/math/Vec3i ARG 1 x ARG 2 y ARG 3 z - METHOD method_35849 add (DDD)Lnet/minecraft/class_2382; - COMMENT {@return another Vec3i whose coordinates have the parameter x, y, and z - COMMENT added to the coordinates of this vector} - COMMENT - COMMENT

    This method always returns an immutable object. - ARG 1 x - ARG 3 y - ARG 5 z METHOD method_35850 offset (Lnet/minecraft/class_2350$class_2351;I)Lnet/minecraft/class_2382; COMMENT {@return a vector which is offset by {@code distance} on {@code axis} axis} COMMENT @@ -169,10 +162,6 @@ CLASS net/minecraft/class_2382 net/minecraft/util/math/Vec3i COMMENT COMMENT @implNote This can return the same vector if {@code scale} equals {@code 1}. ARG 1 scale - METHOD method_39675 createRangeValidator (I)Ljava/util/function/Function; - ARG 0 maxAbsValue - METHOD method_39676 (ILnet/minecraft/class_2382;)Lcom/mojang/serialization/DataResult; - ARG 1 vec METHOD method_39677 createOffsetCodec (I)Lcom/mojang/serialization/Codec; ARG 0 maxAbsValue METHOD method_40081 getSquaredDistance (DDD)D @@ -181,3 +170,5 @@ CLASS net/minecraft/class_2382 net/minecraft/util/math/Vec3i ARG 1 x ARG 3 y ARG 5 z + METHOD method_48305 (ILnet/minecraft/class_2382;)Lcom/mojang/serialization/DataResult; + ARG 1 vec diff --git a/mappings/net/minecraft/util/math/Vector4f.mapping b/mappings/net/minecraft/util/math/Vector4f.mapping deleted file mode 100644 index 3fc4b23e7e..0000000000 --- a/mappings/net/minecraft/util/math/Vector4f.mapping +++ /dev/null @@ -1,45 +0,0 @@ -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 - FIELD field_21489 w F - METHOD (FFFF)V - ARG 1 x - ARG 2 y - ARG 3 z - ARG 4 w - METHOD (Lnet/minecraft/class_1160;)V - ARG 1 vector - METHOD equals (Ljava/lang/Object;)Z - ARG 1 o - METHOD method_22674 transform (Lnet/minecraft/class_1159;)V - ARG 1 matrix - METHOD method_23217 dotProduct (Lnet/minecraft/class_1162;)F - ARG 1 other - METHOD method_23218 normalize ()Z - METHOD method_23219 normalizeProjectiveCoordinates ()V - METHOD method_23851 set (FFFF)V - ARG 1 x - ARG 2 y - ARG 3 z - ARG 4 w - METHOD method_23852 rotate (Lnet/minecraft/class_1158;)V - ARG 1 rotation - METHOD method_23853 getW ()F - METHOD method_35927 multiply (F)V - ARG 1 value - METHOD method_35928 lerp (Lnet/minecraft/class_1162;F)V - ARG 1 to - ARG 2 delta - METHOD method_35929 add (FFFF)V - ARG 1 x - ARG 2 y - ARG 3 z - ARG 4 w - METHOD method_4953 getX ()F - METHOD method_4954 multiplyComponentwise (Lnet/minecraft/class_1160;)V - ARG 1 vector - METHOD method_4956 getY ()F - METHOD method_4957 getZ ()F diff --git a/mappings/net/minecraft/util/math/floatprovider/ConstantFloatProvider.mapping b/mappings/net/minecraft/util/math/floatprovider/ConstantFloatProvider.mapping index 3ef663be8f..fd950193c8 100644 --- a/mappings/net/minecraft/util/math/floatprovider/ConstantFloatProvider.mapping +++ b/mappings/net/minecraft/util/math/floatprovider/ConstantFloatProvider.mapping @@ -6,14 +6,4 @@ CLASS net/minecraft/class_5862 net/minecraft/util/math/floatprovider/ConstantFlo ARG 1 value METHOD method_33908 create (F)Lnet/minecraft/class_5862; ARG 0 value - METHOD method_33909 (Lnet/minecraft/class_5862;)Lcom/mojang/datafixers/util/Either; - ARG 0 provider - METHOD method_33910 (Lcom/mojang/datafixers/util/Either;)Lnet/minecraft/class_5862; - ARG 0 either - METHOD method_33911 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; - ARG 0 instance - METHOD method_33912 (Lnet/minecraft/class_5862;)Lnet/minecraft/class_5862; - ARG 0 provider - METHOD method_33913 (Lnet/minecraft/class_5862;)Ljava/lang/Float; - ARG 0 provider METHOD method_33914 getValue ()F diff --git a/mappings/net/minecraft/util/math/intprovider/ConstantIntProvider.mapping b/mappings/net/minecraft/util/math/intprovider/ConstantIntProvider.mapping index 5d46468cff..89c50fb6f3 100644 --- a/mappings/net/minecraft/util/math/intprovider/ConstantIntProvider.mapping +++ b/mappings/net/minecraft/util/math/intprovider/ConstantIntProvider.mapping @@ -7,13 +7,3 @@ CLASS net/minecraft/class_6016 net/minecraft/util/math/intprovider/ConstantIntPr METHOD method_34997 getValue ()I METHOD method_34998 create (I)Lnet/minecraft/class_6016; ARG 0 value - METHOD method_34999 (Lnet/minecraft/class_6016;)Lcom/mojang/datafixers/util/Either; - ARG 0 provider - METHOD method_35000 (Lcom/mojang/datafixers/util/Either;)Lnet/minecraft/class_6016; - ARG 0 either - METHOD method_35001 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; - ARG 0 instance - METHOD method_35002 (Lnet/minecraft/class_6016;)Lnet/minecraft/class_6016; - ARG 0 provider - METHOD method_35003 (Lnet/minecraft/class_6016;)Ljava/lang/Integer; - ARG 0 provider diff --git a/mappings/net/minecraft/util/math/intprovider/IntProvider.mapping b/mappings/net/minecraft/util/math/intprovider/IntProvider.mapping index 5d70507031..67f491041f 100644 --- a/mappings/net/minecraft/util/math/intprovider/IntProvider.mapping +++ b/mappings/net/minecraft/util/math/intprovider/IntProvider.mapping @@ -19,3 +19,7 @@ CLASS net/minecraft/class_6017 net/minecraft/util/math/intprovider/IntProvider ARG 0 provider METHOD method_35011 getMax ()I METHOD method_35012 getType ()Lnet/minecraft/class_6018; + METHOD method_49103 createValidatingCodec (IILcom/mojang/serialization/Codec;)Lcom/mojang/serialization/Codec; + ARG 0 min + ARG 1 max + ARG 2 providerCodec diff --git a/mappings/net/minecraft/util/math/noise/DoublePerlinNoiseSampler.mapping b/mappings/net/minecraft/util/math/noise/DoublePerlinNoiseSampler.mapping index e4689ef10b..51c955176c 100644 --- a/mappings/net/minecraft/util/math/noise/DoublePerlinNoiseSampler.mapping +++ b/mappings/net/minecraft/util/math/noise/DoublePerlinNoiseSampler.mapping @@ -3,8 +3,12 @@ CLASS net/minecraft/class_5216 net/minecraft/util/math/noise/DoublePerlinNoiseSa FIELD field_24176 firstSampler Lnet/minecraft/class_3537; FIELD field_24177 secondSampler Lnet/minecraft/class_3537; FIELD field_31702 DOMAIN_SCALE D + FIELD field_36631 maxValue D + FIELD field_37207 parameters Lnet/minecraft/class_5216$class_5487; METHOD (Lnet/minecraft/class_5819;Lnet/minecraft/class_5216$class_5487;Z)V ARG 1 random + ARG 2 parameters + ARG 3 modern METHOD method_27406 sample (DDD)D ARG 1 x ARG 3 y @@ -24,6 +28,7 @@ CLASS net/minecraft/class_5216 net/minecraft/util/math/noise/DoublePerlinNoiseSa METHOD method_39186 createLegacy (Lnet/minecraft/class_5819;Lnet/minecraft/class_5216$class_5487;)Lnet/minecraft/class_5216; ARG 0 random ARG 1 parameters + METHOD method_40554 getMaxValue ()D CLASS class_5487 NoiseParameters FIELD comp_516 firstOctave I FIELD comp_517 amplitudes Lit/unimi/dsi/fastutil/doubles/DoubleList; diff --git a/mappings/net/minecraft/util/math/noise/InterpolatedNoiseSampler.mapping b/mappings/net/minecraft/util/math/noise/InterpolatedNoiseSampler.mapping index 5b109f2730..8d2a2d2659 100644 --- a/mappings/net/minecraft/util/math/noise/InterpolatedNoiseSampler.mapping +++ b/mappings/net/minecraft/util/math/noise/InterpolatedNoiseSampler.mapping @@ -7,6 +7,9 @@ CLASS net/minecraft/class_5822 net/minecraft/util/math/noise/InterpolatedNoiseSa FIELD field_36630 maxValue D FIELD field_37206 CODEC Lnet/minecraft/class_7243; FIELD field_38269 SCALE_AND_FACTOR_RANGE Lcom/mojang/serialization/Codec; + FIELD field_38270 MAP_CODEC Lcom/mojang/serialization/MapCodec; + FIELD field_38271 scaledXzScale D + FIELD field_38272 scaledYScale D FIELD field_38273 xzFactor D FIELD field_38274 yFactor D FIELD field_38275 smearScaleMultiplier D diff --git a/mappings/net/minecraft/util/math/noise/OctavePerlinNoiseSampler.mapping b/mappings/net/minecraft/util/math/noise/OctavePerlinNoiseSampler.mapping index e9f92d4cd1..2ce8eb79d1 100644 --- a/mappings/net/minecraft/util/math/noise/OctavePerlinNoiseSampler.mapping +++ b/mappings/net/minecraft/util/math/noise/OctavePerlinNoiseSampler.mapping @@ -4,8 +4,10 @@ CLASS net/minecraft/class_3537 net/minecraft/util/math/noise/OctavePerlinNoiseSa FIELD field_20660 lacunarity D FIELD field_26445 amplitudes Lit/unimi/dsi/fastutil/doubles/DoubleList; FIELD field_34758 firstOctave I + FIELD field_36632 maxValue D METHOD (Lnet/minecraft/class_5819;Lcom/mojang/datafixers/util/Pair;Z)V ARG 1 random + ARG 2 firstOctaveAndAmplitudes ARG 3 xoroshiro METHOD method_15416 sample (DDD)D ARG 1 x @@ -43,9 +45,17 @@ CLASS net/minecraft/class_3537 net/minecraft/util/math/noise/OctavePerlinNoiseSa ARG 2 amplitudes METHOD method_39127 create (Lnet/minecraft/class_5819;Ljava/util/List;)Lnet/minecraft/class_3537; ARG 0 random + ARG 1 octaves METHOD method_39128 create (Lnet/minecraft/class_5819;Ljava/util/stream/IntStream;)Lnet/minecraft/class_3537; ARG 0 random + ARG 1 octaves METHOD method_39130 addDebugInfo (Ljava/lang/StringBuilder;)V ARG 1 info + METHOD method_39131 (Ljava/lang/Double;)Z + ARG 0 amplitude METHOD method_39187 createLegacy (Lnet/minecraft/class_5819;Ljava/util/stream/IntStream;)Lnet/minecraft/class_3537; ARG 0 random + ARG 1 octaves + METHOD method_40555 getMaxValue ()D + METHOD method_40557 getTotalAmplitude (D)D + ARG 1 scale diff --git a/mappings/net/minecraft/util/math/random/RandomSeed.mapping b/mappings/net/minecraft/util/math/random/RandomSeed.mapping index 516bb7b56f..fad2a16378 100644 --- a/mappings/net/minecraft/util/math/random/RandomSeed.mapping +++ b/mappings/net/minecraft/util/math/random/RandomSeed.mapping @@ -2,6 +2,7 @@ CLASS net/minecraft/class_6673 net/minecraft/util/math/random/RandomSeed FIELD field_35133 GOLDEN_RATIO_64 J FIELD field_35134 SILVER_RATIO_64 J FIELD field_35135 SEED_UNIQUIFIER Ljava/util/concurrent/atomic/AtomicLong; + FIELD field_44918 MD5_HASH Lcom/google/common/hash/HashFunction; METHOD method_39001 getSeed ()J COMMENT {@return the seed calculated using {@link SEED_UNIQUIFIER} and the system time} METHOD method_39002 mixStafford13 (J)J @@ -10,4 +11,14 @@ CLASS net/minecraft/class_6673 net/minecraft/util/math/random/RandomSeed ARG 0 seed METHOD method_39004 (J)J ARG 0 seedUniquifier + METHOD method_52180 createXoroshiroSeed (Ljava/lang/String;)Lnet/minecraft/class_6673$class_6674; + ARG 0 seed + METHOD method_52211 createUnmixedXoroshiroSeed (J)Lnet/minecraft/class_6673$class_6674; + ARG 0 seed CLASS class_6674 XoroshiroSeed + METHOD method_52181 split (JJ)Lnet/minecraft/class_6673$class_6674; + ARG 1 seedLo + ARG 3 seedHi + METHOD method_52182 split (Lnet/minecraft/class_6673$class_6674;)Lnet/minecraft/class_6673$class_6674; + ARG 1 seed + METHOD method_52212 mix ()Lnet/minecraft/class_6673$class_6674; diff --git a/mappings/net/minecraft/util/math/random/RandomSequence.mapping b/mappings/net/minecraft/util/math/random/RandomSequence.mapping new file mode 100644 index 0000000000..b4f59b79ea --- /dev/null +++ b/mappings/net/minecraft/util/math/random/RandomSequence.mapping @@ -0,0 +1,21 @@ +CLASS net/minecraft/class_8564 net/minecraft/util/math/random/RandomSequence + FIELD field_44859 CODEC Lcom/mojang/serialization/Codec; + FIELD field_44860 source Lnet/minecraft/class_6677; + METHOD (JLjava/util/Optional;)V + ARG 1 seed + ARG 3 id + METHOD (JLnet/minecraft/class_2960;)V + ARG 1 seed + ARG 3 id + METHOD (Lnet/minecraft/class_6677;)V + ARG 1 source + METHOD method_51839 getSource ()Lnet/minecraft/class_5819; + METHOD method_51840 (Lnet/minecraft/class_8564;)Lnet/minecraft/class_6677; + ARG 0 sequence + METHOD method_51841 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 0 instance + METHOD method_52171 createSeed (Lnet/minecraft/class_2960;)Lnet/minecraft/class_6673$class_6674; + ARG 0 id + METHOD method_52189 createSource (JLjava/util/Optional;)Lnet/minecraft/class_6677; + ARG 0 seed + ARG 2 id diff --git a/mappings/net/minecraft/util/math/random/RandomSequencesState.mapping b/mappings/net/minecraft/util/math/random/RandomSequencesState.mapping new file mode 100644 index 0000000000..16782e1faa --- /dev/null +++ b/mappings/net/minecraft/util/math/random/RandomSequencesState.mapping @@ -0,0 +1,52 @@ +CLASS net/minecraft/class_8565 net/minecraft/util/math/random/RandomSequencesState + FIELD field_44861 LOGGER Lorg/slf4j/Logger; + FIELD field_44862 seed J + FIELD field_44863 sequences Ljava/util/Map; + FIELD field_45100 salt I + FIELD field_45101 includeWorldSeed Z + FIELD field_45102 includeSequenceId Z + METHOD (J)V + ARG 1 seed + METHOD method_51842 fromNbt (JLnet/minecraft/class_2487;)Lnet/minecraft/class_8565; + ARG 0 seed + ARG 2 nbt + METHOD method_51843 getOrCreate (Lnet/minecraft/class_2960;)Lnet/minecraft/class_5819; + ARG 1 id + METHOD method_51844 (Lnet/minecraft/class_2487;Lnet/minecraft/class_2960;Lnet/minecraft/class_8564;)V + ARG 1 id + ARG 2 sequence + METHOD method_52509 resetAll ()I + METHOD method_52510 setDefaultParameters (IZZ)V + ARG 1 salt + ARG 2 includeWorldSeed + ARG 3 includeSequenceId + METHOD method_52511 getPersistentStateType (J)Lnet/minecraft/class_18$class_8645; + ARG 0 seed + METHOD method_52512 reset (Lnet/minecraft/class_2960;IZZ)V + ARG 1 id + ARG 2 salt + ARG 3 includeWorldSeed + ARG 4 includeSequenceId + METHOD method_52513 forEachSequence (Ljava/util/function/BiConsumer;)V + ARG 1 consumer + METHOD method_52514 getBooleanFromNbtOrFallback (Lnet/minecraft/class_2487;Ljava/lang/String;Z)Z + ARG 0 nbt + ARG 1 key + ARG 2 fallback + METHOD method_52516 (JLnet/minecraft/class_2487;)Lnet/minecraft/class_8565; + ARG 2 nbt + METHOD method_52517 reset (Lnet/minecraft/class_2960;)V + ARG 1 id + METHOD method_52518 createSequence (Lnet/minecraft/class_2960;IZZ)Lnet/minecraft/class_8564; + ARG 1 id + ARG 2 salt + ARG 3 includeWorldSeed + ARG 4 includeSequenceId + METHOD method_52519 createSequence (Lnet/minecraft/class_2960;)Lnet/minecraft/class_8564; + ARG 1 id + CLASS class_8629 WrappedRandom + FIELD field_44864 random Lnet/minecraft/class_5819; + METHOD (Lnet/minecraft/class_8565;Lnet/minecraft/class_5819;)V + ARG 2 random + METHOD equals (Ljava/lang/Object;)Z + ARG 1 o diff --git a/mappings/net/minecraft/util/math/random/Xoroshiro128PlusPlusRandom.mapping b/mappings/net/minecraft/util/math/random/Xoroshiro128PlusPlusRandom.mapping index 2bbb5e1fd0..156e35e778 100644 --- a/mappings/net/minecraft/util/math/random/Xoroshiro128PlusPlusRandom.mapping +++ b/mappings/net/minecraft/util/math/random/Xoroshiro128PlusPlusRandom.mapping @@ -6,11 +6,16 @@ CLASS net/minecraft/class_6677 net/minecraft/util/math/random/Xoroshiro128PlusPl FIELD field_35149 DOUBLE_MULTIPLIER D FIELD field_35150 implementation Lnet/minecraft/class_6676; FIELD field_35151 gaussianGenerator Lnet/minecraft/class_6672; + FIELD field_44880 CODEC Lcom/mojang/serialization/Codec; METHOD (J)V ARG 1 seed METHOD (JJ)V ARG 1 seedLo ARG 3 seedHi + METHOD (Lnet/minecraft/class_6673$class_6674;)V + ARG 1 seed + METHOD (Lnet/minecraft/class_6676;)V + ARG 1 implementation METHOD method_39008 next (I)J COMMENT {@return {@code bits} upper bits of random value} COMMENT @@ -18,8 +23,11 @@ CLASS net/minecraft/class_6677 net/minecraft/util/math/random/Xoroshiro128PlusPl COMMENT to ensure proper randomness. For example, to obtain a double, the upper 53 COMMENT bits should be used instead of the lower 53 bits. ARG 1 bits + METHOD method_51860 (Lnet/minecraft/class_6676;)Lnet/minecraft/class_6677; + ARG 0 implementation + METHOD method_51861 (Lnet/minecraft/class_6677;)Lnet/minecraft/class_6676; + ARG 0 random CLASS class_6678 Splitter - FIELD field_35152 MD5_HASHER Lcom/google/common/hash/HashFunction; FIELD field_35153 seedLo J FIELD field_35154 seedHi J METHOD (JJ)V diff --git a/mappings/net/minecraft/util/math/random/Xoroshiro128PlusPlusRandomImpl.mapping b/mappings/net/minecraft/util/math/random/Xoroshiro128PlusPlusRandomImpl.mapping index 0674a2fc82..e15416b6dc 100644 --- a/mappings/net/minecraft/util/math/random/Xoroshiro128PlusPlusRandomImpl.mapping +++ b/mappings/net/minecraft/util/math/random/Xoroshiro128PlusPlusRandomImpl.mapping @@ -7,9 +7,16 @@ CLASS net/minecraft/class_6676 net/minecraft/util/math/random/Xoroshiro128PlusPl COMMENT implementation released under public domain FIELD field_35146 seedLo J FIELD field_35147 seedHi J + FIELD field_44879 CODEC Lcom/mojang/serialization/Codec; METHOD (JJ)V ARG 1 seedLo ARG 3 seedHi METHOD (Lnet/minecraft/class_6673$class_6674;)V ARG 1 seed METHOD method_39007 next ()J + METHOD method_51857 (Lnet/minecraft/class_6676;)Ljava/util/stream/LongStream; + ARG 0 random + METHOD method_51858 (Ljava/util/stream/LongStream;)Lcom/mojang/serialization/DataResult; + ARG 0 stream + METHOD method_51859 ([J)Lnet/minecraft/class_6676; + ARG 0 seeds diff --git a/mappings/net/minecraft/util/path/AllowedSymlinkPathMatcher.mapping b/mappings/net/minecraft/util/path/AllowedSymlinkPathMatcher.mapping new file mode 100644 index 0000000000..9f3938d610 --- /dev/null +++ b/mappings/net/minecraft/util/path/AllowedSymlinkPathMatcher.mapping @@ -0,0 +1,47 @@ +CLASS net/minecraft/class_8582 net/minecraft/util/path/AllowedSymlinkPathMatcher + FIELD field_44958 LOGGER Lorg/slf4j/Logger; + FIELD field_44959 COMMENT_LINE_PREFIX Ljava/lang/String; + FIELD field_44960 allowedEntries Ljava/util/List; + FIELD field_44961 matcherCache Ljava/util/Map; + METHOD (Ljava/util/List;)V + ARG 1 allowedEntries + METHOD matches (Ljava/nio/file/Path;)Z + ARG 1 path + METHOD method_52247 fromReader (Ljava/io/BufferedReader;)Lnet/minecraft/class_8582; + ARG 0 reader + METHOD method_52248 (Ljava/lang/String;)Ljava/util/stream/Stream; + ARG 0 line + METHOD method_52249 get (Ljava/nio/file/FileSystem;)Ljava/nio/file/PathMatcher; + ARG 1 fileSystem + METHOD method_52250 (Ljava/nio/file/FileSystem;Lnet/minecraft/class_8582$class_8583;)Ljava/nio/file/PathMatcher; + ARG 1 entry + METHOD method_52251 (Ljava/nio/file/FileSystem;Ljava/lang/String;)Ljava/nio/file/PathMatcher; + ARG 2 scheme + METHOD method_52252 (Ljava/nio/file/Path;)Z + ARG 0 path + METHOD method_52253 (Ljava/util/List;Ljava/nio/file/Path;)Z + ARG 1 path + METHOD method_52254 (Ljava/nio/file/Path;)Z + ARG 0 path + CLASS class_8583 Entry + METHOD method_52255 readLine (Ljava/lang/String;)Ljava/util/Optional; + ARG 0 line + METHOD method_52256 compile (Ljava/nio/file/FileSystem;)Ljava/nio/file/PathMatcher; + ARG 1 fileSystem + METHOD method_52257 glob (Ljava/lang/String;)Lnet/minecraft/class_8582$class_8583; + ARG 0 pattern + METHOD method_52258 regex (Ljava/lang/String;)Lnet/minecraft/class_8582$class_8583; + ARG 0 pattern + METHOD method_52259 prefix (Ljava/lang/String;)Lnet/minecraft/class_8582$class_8583; + ARG 0 prefix + CLASS class_8584 EntryType + FIELD field_44962 DEFAULT Lnet/minecraft/class_8582$class_8584; + FIELD field_44963 PREFIX Lnet/minecraft/class_8582$class_8584; + METHOD compile (Ljava/nio/file/FileSystem;Ljava/lang/String;)Ljava/nio/file/PathMatcher; + ARG 1 fileSystem + ARG 2 pattern + METHOD method_52260 (Ljava/lang/String;Ljava/nio/file/Path;)Z + ARG 1 path + METHOD method_52261 (Ljava/nio/file/FileSystem;Ljava/lang/String;)Ljava/nio/file/PathMatcher; + ARG 0 fileSystem + ARG 1 prefix diff --git a/mappings/net/minecraft/util/path/SymlinkEntry.mapping b/mappings/net/minecraft/util/path/SymlinkEntry.mapping new file mode 100644 index 0000000000..4317f8512a --- /dev/null +++ b/mappings/net/minecraft/util/path/SymlinkEntry.mapping @@ -0,0 +1 @@ +CLASS net/minecraft/class_8581 net/minecraft/util/path/SymlinkEntry diff --git a/mappings/net/minecraft/util/path/SymlinkFinder.mapping b/mappings/net/minecraft/util/path/SymlinkFinder.mapping new file mode 100644 index 0000000000..a7d2103b46 --- /dev/null +++ b/mappings/net/minecraft/util/path/SymlinkFinder.mapping @@ -0,0 +1,25 @@ +CLASS net/minecraft/class_8580 net/minecraft/util/path/SymlinkFinder + FIELD field_44955 matcher Ljava/nio/file/PathMatcher; + METHOD (Ljava/nio/file/PathMatcher;)V + ARG 1 matcher + METHOD method_52242 validate (Ljava/nio/file/Path;Ljava/util/List;)V + ARG 1 path + ARG 2 results + METHOD method_52243 collect (Ljava/nio/file/Path;Z)Ljava/util/List; + ARG 1 path + ARG 2 resolveSymlink + METHOD method_52618 validate (Ljava/nio/file/Path;)Ljava/util/List; + ARG 1 path + METHOD method_52619 validateRecursively (Ljava/nio/file/Path;Ljava/util/List;)V + ARG 1 path + ARG 2 results + CLASS 1 + METHOD method_52246 validate (Ljava/nio/file/Path;Ljava/nio/file/attribute/BasicFileAttributes;)V + ARG 1 path + ARG 2 attributes + METHOD preVisitDirectory (Ljava/lang/Object;Ljava/nio/file/attribute/BasicFileAttributes;)Ljava/nio/file/FileVisitResult; + ARG 1 path + ARG 2 attributes + METHOD visitFile (Ljava/lang/Object;Ljava/nio/file/attribute/BasicFileAttributes;)Ljava/nio/file/FileVisitResult; + ARG 1 path + ARG 2 attributes diff --git a/mappings/net/minecraft/util/path/SymlinkValidationException.mapping b/mappings/net/minecraft/util/path/SymlinkValidationException.mapping new file mode 100644 index 0000000000..d83e44870f --- /dev/null +++ b/mappings/net/minecraft/util/path/SymlinkValidationException.mapping @@ -0,0 +1,11 @@ +CLASS net/minecraft/class_8579 net/minecraft/util/path/SymlinkValidationException + FIELD field_44953 path Ljava/nio/file/Path; + FIELD field_44954 symlinks Ljava/util/List; + METHOD (Ljava/nio/file/Path;Ljava/util/List;)V + ARG 1 path + ARG 2 symlinks + METHOD method_52240 (Lnet/minecraft/class_8581;)Ljava/lang/String; + ARG 0 symlink + METHOD method_52241 getMessage (Ljava/nio/file/Path;Ljava/util/List;)Ljava/lang/String; + ARG 0 path + ARG 1 symlinks diff --git a/mappings/net/minecraft/util/profiler/PerformanceLog.mapping b/mappings/net/minecraft/util/profiler/PerformanceLog.mapping new file mode 100644 index 0000000000..6f202db271 --- /dev/null +++ b/mappings/net/minecraft/util/profiler/PerformanceLog.mapping @@ -0,0 +1,14 @@ +CLASS net/minecraft/class_8743 net/minecraft/util/profiler/PerformanceLog + FIELD field_45719 SIZE I + FIELD field_45720 data [J + FIELD field_45721 currentIndex I + FIELD field_45722 maxIndex I + METHOD method_53064 size ()I + METHOD method_53065 get (I)J + ARG 1 index + METHOD method_53066 push (J)V + ARG 1 value + METHOD method_53067 getMaxIndex ()I + METHOD method_53068 wrap (I)I + ARG 1 index + METHOD method_53069 reset ()V diff --git a/mappings/net/minecraft/util/profiler/Profiler.mapping b/mappings/net/minecraft/util/profiler/Profiler.mapping index 1fc6618d27..c83361f66c 100644 --- a/mappings/net/minecraft/util/profiler/Profiler.mapping +++ b/mappings/net/minecraft/util/profiler/Profiler.mapping @@ -18,6 +18,7 @@ CLASS net/minecraft/class_3695 net/minecraft/util/profiler/Profiler COMMENT wise expensive methods. ARG 1 marker COMMENT a unique marker + ARG 2 num METHOD method_24271 visit (Ljava/util/function/Supplier;I)V COMMENT Increment the visit count for a marker. COMMENT @@ -28,6 +29,7 @@ CLASS net/minecraft/class_3695 net/minecraft/util/profiler/Profiler COMMENT supplier won't be called if the profiler is disabled. ARG 1 markerGetter COMMENT the getter for a unique marker + ARG 2 num METHOD method_24338 union (Lnet/minecraft/class_3695;Lnet/minecraft/class_3695;)Lnet/minecraft/class_3695; ARG 0 a ARG 1 b diff --git a/mappings/net/minecraft/util/profiler/ProfilerTiming.mapping b/mappings/net/minecraft/util/profiler/ProfilerTiming.mapping index dcd88b61d6..df6b9743dd 100644 --- a/mappings/net/minecraft/util/profiler/ProfilerTiming.mapping +++ b/mappings/net/minecraft/util/profiler/ProfilerTiming.mapping @@ -8,4 +8,6 @@ CLASS net/minecraft/class_3534 net/minecraft/util/profiler/ProfilerTiming ARG 2 parentUsagePercentage ARG 4 totalUsagePercentage ARG 6 visitCount + METHOD compareTo (Ljava/lang/Object;)I + ARG 1 other METHOD method_15409 getColor ()I diff --git a/mappings/net/minecraft/util/profiling/jfr/FlightProfiler.mapping b/mappings/net/minecraft/util/profiling/jfr/FlightProfiler.mapping index bfecb54bb7..0965e9538a 100644 --- a/mappings/net/minecraft/util/profiling/jfr/FlightProfiler.mapping +++ b/mappings/net/minecraft/util/profiling/jfr/FlightProfiler.mapping @@ -10,13 +10,13 @@ CLASS net/minecraft/class_6611 net/minecraft/util/profiling/jfr/FlightProfiler ARG 1 chunkPos ARG 2 world ARG 3 targetStatus - METHOD method_38656 onPacketReceived (IILjava/net/SocketAddress;I)V - ARG 1 protocolId + METHOD method_38656 onPacketReceived (Lnet/minecraft/class_2539;ILjava/net/SocketAddress;I)V + ARG 1 state ARG 2 packetId ARG 3 remoteAddress ARG 4 bytes - METHOD method_38657 onPacketSent (IILjava/net/SocketAddress;I)V - ARG 1 protocolId + METHOD method_38657 onPacketSent (Lnet/minecraft/class_2539;ILjava/net/SocketAddress;I)V + ARG 1 state ARG 2 packetId ARG 3 remoteAddress ARG 4 bytes diff --git a/mappings/net/minecraft/util/profiling/jfr/JfrJsonReport.mapping b/mappings/net/minecraft/util/profiling/jfr/JfrJsonReport.mapping index d7acb00c88..8ea132987f 100644 --- a/mappings/net/minecraft/util/profiling/jfr/JfrJsonReport.mapping +++ b/mappings/net/minecraft/util/profiling/jfr/JfrJsonReport.mapping @@ -36,7 +36,7 @@ CLASS net/minecraft/class_6519 net/minecraft/util/profiling/jfr/JfrJsonReport METHOD method_38023 collectChunkGenSection (Ljava/util/List;)Lcom/google/gson/JsonElement; ARG 1 statistics METHOD method_38024 (Ljava/util/List;Ljava/util/function/ToDoubleFunction;)Lcom/google/gson/JsonObject; - ARG 0 samples + ARG 0 samplesx ARG 1 valueGetter METHOD method_38025 collectFileIoSection (Lnet/minecraft/class_6517;)Lcom/google/gson/JsonElement; ARG 1 profile diff --git a/mappings/net/minecraft/util/profiling/jfr/event/PacketEvent.mapping b/mappings/net/minecraft/util/profiling/jfr/event/PacketEvent.mapping index b6a03447bd..6cc1b19d78 100644 --- a/mappings/net/minecraft/util/profiling/jfr/event/PacketEvent.mapping +++ b/mappings/net/minecraft/util/profiling/jfr/event/PacketEvent.mapping @@ -1,5 +1,5 @@ CLASS net/minecraft/class_6509 net/minecraft/util/profiling/jfr/event/PacketEvent - METHOD (IILjava/net/SocketAddress;I)V + METHOD (Ljava/lang/String;ILjava/net/SocketAddress;I)V ARG 1 protocolId ARG 2 packetId ARG 3 remoteAddress diff --git a/mappings/net/minecraft/util/profiling/jfr/sample/TimedSample.mapping b/mappings/net/minecraft/util/profiling/jfr/sample/TimedSample.mapping deleted file mode 100644 index 2718bde80d..0000000000 --- a/mappings/net/minecraft/util/profiling/jfr/sample/TimedSample.mapping +++ /dev/null @@ -1,2 +0,0 @@ -CLASS net/minecraft/class_6533 net/minecraft/util/profiling/jfr/sample/TimedSample - METHOD method_38045 getTime ()Ljava/time/Instant; diff --git a/mappings/net/minecraft/util/registry/BuiltinRegistries.mapping b/mappings/net/minecraft/util/registry/BuiltinRegistries.mapping deleted file mode 100644 index cf773011da..0000000000 --- a/mappings/net/minecraft/util/registry/BuiltinRegistries.mapping +++ /dev/null @@ -1,70 +0,0 @@ -CLASS net/minecraft/class_5458 net/minecraft/util/registry/BuiltinRegistries - COMMENT Stores a few hardcoded registries with builtin values for datapack-loadable registries, - COMMENT from which a registry tracker can create a new dynamic registry. - COMMENT - COMMENT

    Note that these registries do not contain the actual entries that the server has, - COMMENT for that you will need to access it from {@link net.minecraft.util.registry.DynamicRegistryManager}. - COMMENT - COMMENT @see net.minecraft.server.MinecraftServer#getRegistryManager() - COMMENT @see net.minecraft.client.network.ClientPlayNetworkHandler#getRegistryManager() - COMMENT @see net.minecraft.util.registry.DynamicRegistryManager#get(RegistryKey) - FIELD field_25925 LOGGER Lorg/slf4j/Logger; - FIELD field_25926 REGISTRIES Lnet/minecraft/class_2378; - FIELD field_25928 CONFIGURED_CARVER Lnet/minecraft/class_2378; - FIELD field_25929 CONFIGURED_FEATURE Lnet/minecraft/class_2378; - FIELD field_25930 STRUCTURE Lnet/minecraft/class_2378; - FIELD field_25931 STRUCTURE_PROCESSOR_LIST Lnet/minecraft/class_2378; - FIELD field_25932 STRUCTURE_POOL Lnet/minecraft/class_2378; - FIELD field_25933 BIOME Lnet/minecraft/class_2378; - FIELD field_25934 DEFAULT_VALUE_SUPPLIERS Ljava/util/Map; - FIELD field_25935 ROOT Lnet/minecraft/class_2385; - FIELD field_26375 CHUNK_GENERATOR_SETTINGS Lnet/minecraft/class_2378; - FIELD field_35435 NOISE_PARAMETERS Lnet/minecraft/class_2378; - FIELD field_35761 PLACED_FEATURE Lnet/minecraft/class_2378; - FIELD field_36476 DYNAMIC_REGISTRY_MANAGER Lnet/minecraft/class_5455; - FIELD field_37231 STRUCTURE_SET Lnet/minecraft/class_2378; - FIELD field_37232 DENSITY_FUNCTION Lnet/minecraft/class_2378; - FIELD field_38009 DIMENSION_TYPE Lnet/minecraft/class_2378; - FIELD field_38010 WORLD_PRESET Lnet/minecraft/class_2378; - FIELD field_38011 FLAT_LEVEL_GENERATOR_PRESET Lnet/minecraft/class_2378; - FIELD field_39364 MESSAGE_TYPE Lnet/minecraft/class_2378; - METHOD method_30559 init ()V - METHOD method_30561 add (Lnet/minecraft/class_2378;Ljava/lang/String;Ljava/lang/Object;)Lnet/minecraft/class_6880; - ARG 0 registry - ARG 1 id - ARG 2 object - METHOD method_30562 add (Lnet/minecraft/class_2378;Lnet/minecraft/class_2960;Ljava/lang/Object;)Lnet/minecraft/class_6880; - ARG 0 registry - ARG 1 id - ARG 2 object - METHOD method_30563 addRegistry (Lnet/minecraft/class_5321;Lcom/mojang/serialization/Lifecycle;Lnet/minecraft/class_5458$class_7488;)Lnet/minecraft/class_2378; - ARG 0 registryRef - ARG 1 lifecycle - ARG 2 initializer - METHOD method_30564 addRegistry (Lnet/minecraft/class_5321;Lnet/minecraft/class_2385;Lnet/minecraft/class_5458$class_7488;Lcom/mojang/serialization/Lifecycle;)Lnet/minecraft/class_2385; - ARG 0 registryRef - ARG 1 registry - ARG 2 initializer - ARG 3 lifecycle - METHOD method_30565 addRegistry (Lnet/minecraft/class_5321;Lnet/minecraft/class_5458$class_7488;)Lnet/minecraft/class_2378; - ARG 0 registryRef - ARG 1 initializer - METHOD method_30566 (Lnet/minecraft/class_2960;Ljava/util/function/Supplier;)V - ARG 0 id - ARG 1 supplier - METHOD method_30569 (Lnet/minecraft/class_2378;)Lnet/minecraft/class_6880; - ARG 0 registry - METHOD method_30572 (Lnet/minecraft/class_2378;)Lnet/minecraft/class_6880; - ARG 0 registry - METHOD method_39203 add (Lnet/minecraft/class_2378;Lnet/minecraft/class_5321;Ljava/lang/Object;)Lnet/minecraft/class_6880; - ARG 0 registry - ARG 1 key - ARG 2 object - METHOD method_40360 addCasted (Lnet/minecraft/class_2378;Ljava/lang/String;Ljava/lang/Object;)Lnet/minecraft/class_6880; - ARG 0 registry - ARG 1 id - ARG 2 value - CLASS class_7488 Initializer - COMMENT A functional interface that initializes the registry and returns the default value. - METHOD run (Lnet/minecraft/class_2378;)Lnet/minecraft/class_6880; - ARG 1 registry diff --git a/mappings/net/minecraft/util/registry/DefaultedRegistry.mapping b/mappings/net/minecraft/util/registry/DefaultedRegistry.mapping deleted file mode 100644 index 141fec6bc9..0000000000 --- a/mappings/net/minecraft/util/registry/DefaultedRegistry.mapping +++ /dev/null @@ -1,9 +0,0 @@ -CLASS net/minecraft/class_2348 net/minecraft/util/registry/DefaultedRegistry - FIELD field_11014 defaultId Lnet/minecraft/class_2960; - FIELD field_11015 defaultEntry Lnet/minecraft/class_6880; - METHOD (Ljava/lang/String;Lnet/minecraft/class_5321;Lcom/mojang/serialization/Lifecycle;Ljava/util/function/Function;)V - ARG 1 defaultId - ARG 2 key - ARG 3 lifecycle - ARG 4 valueToEntryFunction - 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 deleted file mode 100644 index 3ce86aab2e..0000000000 --- a/mappings/net/minecraft/util/registry/DynamicRegistryManager.mapping +++ /dev/null @@ -1,149 +0,0 @@ -CLASS net/minecraft/class_5455 net/minecraft/util/registry/DynamicRegistryManager - COMMENT A manager of dynamic registries. It allows users to access non-hardcoded - COMMENT registries reliably. - 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 - COMMENT

    The {@link DynamicRegistryManager.ImmutableImpl} - COMMENT class serves as an immutable implementation of any particular collection - COMMENT or configuration of dynamic registries. - FIELD field_25918 LOGGER Lorg/slf4j/Logger; - FIELD field_25919 INFOS Ljava/util/Map; - FIELD field_26733 BUILTIN Ljava/util/function/Supplier; - FIELD field_36469 CODEC Lcom/mojang/serialization/Codec; - METHOD method_30519 load (Lnet/minecraft/class_5455$class_6893;Lcom/mojang/serialization/DynamicOps;Lnet/minecraft/class_6900;)V - COMMENT Loads a dynamic registry manager from the resource manager's data files. - ARG 0 dynamicRegistryManager - ARG 1 ops - ARG 2 registryLoader - METHOD method_30520 register (Lcom/google/common/collect/ImmutableMap$Builder;Lnet/minecraft/class_5321;Lcom/mojang/serialization/Codec;)V - ARG 0 infosBuilder - ARG 1 registryRef - ARG 2 entryCodec - METHOD method_30526 load (Lcom/mojang/serialization/DynamicOps;Lnet/minecraft/class_6900$class_6901;Lnet/minecraft/class_5455$class_5456;)V - COMMENT Loads elements from the {@code ops} into the registry specified by {@code - COMMENT info} within the {@code manager}. Note that the resource manager instance - COMMENT is kept within the {@code ops}. - ARG 0 ops - ARG 1 loaderAccess - ARG 2 info - METHOD method_30527 getOptionalManaged (Lnet/minecraft/class_5321;)Ljava/util/Optional; - COMMENT Retrieves a registry optionally from this manager. - ARG 1 key - METHOD method_30530 get (Lnet/minecraft/class_5321;)Lnet/minecraft/class_2378; - COMMENT Retrieves a registry from this manager or {@link Registry#REGISTRIES}, - COMMENT or throws an exception when the registry does not exist. - COMMENT - COMMENT @throws IllegalStateException if the registry does not exist - ARG 1 key - METHOD method_31060 register (Lcom/google/common/collect/ImmutableMap$Builder;Lnet/minecraft/class_5321;Lcom/mojang/serialization/Codec;Lcom/mojang/serialization/Codec;)V - ARG 0 infosBuilder - ARG 1 registryRef - ARG 2 entryCodec - ARG 3 networkEntryCodec - METHOD method_31141 addEntriesToLoad (Lnet/minecraft/class_5506$class_5507;Lnet/minecraft/class_5455$class_5456;)V - ARG 0 entryLoader - ARG 1 info - METHOD method_33309 getManaged (Lnet/minecraft/class_5321;)Lnet/minecraft/class_2378; - COMMENT Retrieves a registry from this manager, - COMMENT or throws an exception when the registry does not exist. - COMMENT - COMMENT @throws IllegalStateException if the registry does not exist - ARG 1 key - METHOD method_33310 getOptional (Lnet/minecraft/class_5321;)Ljava/util/Optional; - ARG 1 key - METHOD method_34849 (Lcom/mojang/serialization/DataResult$PartialResult;)V - ARG 0 partialResult - METHOD method_39674 getInfos ()Ljava/lang/Iterable; - METHOD method_40299 createDynamicRegistryManager (Lcom/mojang/serialization/Dynamic;)Lnet/minecraft/class_5455; - ARG 0 dynamic - METHOD method_40300 (Lcom/mojang/serialization/Dynamic;Lnet/minecraft/class_5321;)Lnet/minecraft/class_2378; - ARG 1 registryRef - METHOD method_40301 createCodec (Lcom/mojang/serialization/codecs/UnboundedMapCodec;)Lcom/mojang/serialization/Codec; - ARG 0 originalCodec - METHOD method_40302 of (Lnet/minecraft/class_2378;)Lnet/minecraft/class_5455$class_6890; - ARG 0 registries - METHOD method_40303 (Lnet/minecraft/class_5455$class_5456;)Lcom/mojang/serialization/Codec; - ARG 0 info - METHOD method_40304 (Lnet/minecraft/class_5455$class_6892;)Z - ARG 0 entry - METHOD method_40305 (Lnet/minecraft/class_5455;)Ljava/util/Map; - ARG 0 dynamicRegistryManager - METHOD method_40306 (Lnet/minecraft/class_5321;Lcom/mojang/serialization/Codec;)Lcom/mojang/serialization/Codec; - ARG 1 codec - METHOD method_40307 createRegistry (Lnet/minecraft/class_5321;Lcom/mojang/serialization/Dynamic;)Lnet/minecraft/class_2378; - ARG 0 registryRef - ARG 1 dynamic - METHOD method_40308 streamManagedRegistries ()Ljava/util/stream/Stream; - METHOD method_40309 (Lnet/minecraft/class_2378;)Lcom/mojang/serialization/DataResult; - ARG 0 registry - METHOD method_40310 (Lnet/minecraft/class_5455$class_6892;)Lnet/minecraft/class_2378; - ARG 0 entry - METHOD method_40311 streamAllRegistries ()Ljava/util/stream/Stream; - METHOD method_40312 (Lnet/minecraft/class_5455$class_6892;)Lnet/minecraft/class_5321; - ARG 0 entry - METHOD method_40313 streamSyncedRegistries ()Ljava/util/stream/Stream; - METHOD method_40314 createAndLoad ()Lnet/minecraft/class_5455$class_6893; - METHOD method_40316 toImmutable ()Lnet/minecraft/class_5455$class_6890; - METHOD method_40317 createSimpleRegistry (Lnet/minecraft/class_5321;)Lnet/minecraft/class_2385; - ARG 0 registryRef - METHOD method_40318 streamStaticRegistries ()Ljava/util/stream/Stream; - METHOD method_40319 getNetworkEntryCodec (Lnet/minecraft/class_5321;)Lcom/mojang/serialization/DataResult; - ARG 0 registryKey - METHOD method_40320 createCodec ()Lcom/mojang/serialization/Codec; - METHOD method_40321 streamSyncedManagedRegistries ()Ljava/util/stream/Stream; - METHOD method_40323 createMutableRegistries ()Ljava/util/Map; - METHOD method_40325 createMutableRegistryManager ()Lnet/minecraft/class_5455$class_6893; - METHOD method_40326 (Lnet/minecraft/class_5321;)Lcom/mojang/serialization/DataResult; - ARG 0 registryRef - METHOD method_41200 (Lnet/minecraft/class_5455$class_6892;)Lcom/mojang/serialization/Lifecycle; - ARG 0 entry - METHOD method_41201 getRegistryLifecycle ()Lcom/mojang/serialization/Lifecycle; - CLASS class_5456 Info - COMMENT Represents the serialization behavior of the registries, including the - COMMENT id of the registry, the codec for its elements, and whether the registry - COMMENT should be sent to the client. - FIELD comp_293 registry Lnet/minecraft/class_5321; - FIELD comp_294 entryCodec Lcom/mojang/serialization/Codec; - FIELD comp_295 networkEntryCodec Lcom/mojang/serialization/Codec; - METHOD (Lnet/minecraft/class_5321;Lcom/mojang/serialization/Codec;Lcom/mojang/serialization/Codec;)V - ARG 1 registry - ARG 2 entryCodec - ARG 3 networkEntryCodec - METHOD comp_293 registry ()Lnet/minecraft/class_5321; - METHOD comp_294 entryCodec ()Lcom/mojang/serialization/Codec; - METHOD comp_295 networkEntryCodec ()Lcom/mojang/serialization/Codec; - METHOD method_30537 isSynced ()Z - CLASS class_6890 Immutable - CLASS class_6891 ImmutableImpl - FIELD field_36471 registries Ljava/util/Map; - METHOD (Ljava/util/Map;)V - ARG 1 registries - METHOD (Ljava/util/stream/Stream;)V - ARG 1 stream - METHOD method_40328 (Lnet/minecraft/class_2378;)Lnet/minecraft/class_2378; - ARG 0 registry - CLASS class_6892 Entry - METHOD method_40329 of (Lnet/minecraft/class_6880$class_6883;)Lnet/minecraft/class_5455$class_6892; - ARG 0 entry - METHOD method_40330 of (Ljava/util/Map$Entry;)Lnet/minecraft/class_5455$class_6892; - ARG 0 entry - METHOD method_40331 of (Lnet/minecraft/class_5321;Lnet/minecraft/class_2378;)Lnet/minecraft/class_5455$class_6892; - ARG 0 key - ARG 1 value - METHOD method_40332 freeze ()Lnet/minecraft/class_5455$class_6892; - CLASS class_6893 Mutable - METHOD method_40333 getOptionalMutable (Lnet/minecraft/class_5321;)Ljava/util/Optional; - ARG 1 key - METHOD method_40334 getMutable (Lnet/minecraft/class_5321;)Lnet/minecraft/class_2385; - ARG 1 key - CLASS class_6894 MutableImpl - FIELD field_36472 mutableRegistries Ljava/util/Map; - METHOD (Ljava/util/Map;)V - ARG 1 mutableRegistries - METHOD method_40336 (Lnet/minecraft/class_2385;)Lnet/minecraft/class_2385; - ARG 0 registry - METHOD method_40337 (Lnet/minecraft/class_2385;)Lnet/minecraft/class_2378; - ARG 0 registry diff --git a/mappings/net/minecraft/util/registry/MutableRegistry.mapping b/mappings/net/minecraft/util/registry/MutableRegistry.mapping deleted file mode 100644 index dd4577b391..0000000000 --- a/mappings/net/minecraft/util/registry/MutableRegistry.mapping +++ /dev/null @@ -1,23 +0,0 @@ -CLASS net/minecraft/class_2385 net/minecraft/util/registry/MutableRegistry - METHOD method_10272 add (Lnet/minecraft/class_5321;Ljava/lang/Object;Lcom/mojang/serialization/Lifecycle;)Lnet/minecraft/class_6880; - ARG 1 key - ARG 2 entry - ARG 3 lifecycle - METHOD method_10273 set (ILnet/minecraft/class_5321;Ljava/lang/Object;Lcom/mojang/serialization/Lifecycle;)Lnet/minecraft/class_6880; - ARG 1 rawId - ARG 2 key - ARG 3 value - ARG 4 lifecycle - METHOD method_31062 replace (Ljava/util/OptionalInt;Lnet/minecraft/class_5321;Ljava/lang/Object;Lcom/mojang/serialization/Lifecycle;)Lnet/minecraft/class_6880; - 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 - COMMENT the registry. The raw ID not being present may lead to buggy behavior. - 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. - ARG 1 rawId - ARG 2 key - ARG 3 newEntry - ARG 4 lifecycle - METHOD method_35863 isEmpty ()Z diff --git a/mappings/net/minecraft/util/registry/Registry.mapping b/mappings/net/minecraft/util/registry/Registry.mapping deleted file mode 100644 index 13724cdc67..0000000000 --- a/mappings/net/minecraft/util/registry/Registry.mapping +++ /dev/null @@ -1,427 +0,0 @@ -CLASS net/minecraft/class_2378 net/minecraft/util/registry/Registry - FIELD field_11137 BLOCK_ENTITY_TYPE Lnet/minecraft/class_2378; - FIELD field_11138 FEATURE Lnet/minecraft/class_2378; - FIELD field_11139 LOGGER Lorg/slf4j/Logger; - FIELD field_11140 DEFAULT_ENTRIES Ljava/util/Map; - FIELD field_11141 PARTICLE_TYPE Lnet/minecraft/class_2378; - FIELD field_11142 ITEM Lnet/minecraft/class_2348; - FIELD field_11143 POTION Lnet/minecraft/class_2348; - FIELD field_11144 REGISTRIES Lnet/minecraft/class_2378; - FIELD field_11145 ENTITY_TYPE Lnet/minecraft/class_2348; - FIELD field_11146 BLOCK Lnet/minecraft/class_2348; - FIELD field_11150 PAINTING_VARIANT Lnet/minecraft/class_2348; - FIELD field_11152 STAT_TYPE Lnet/minecraft/class_2378; - FIELD field_11154 FLUID Lnet/minecraft/class_2348; - FIELD field_11156 SOUND_EVENT Lnet/minecraft/class_2378; - FIELD field_11157 CARVER Lnet/minecraft/class_2378; - FIELD field_11158 CUSTOM_STAT Lnet/minecraft/class_2378; - FIELD field_11159 STATUS_EFFECT Lnet/minecraft/class_2378; - FIELD field_11160 ENCHANTMENT Lnet/minecraft/class_2378; - FIELD field_16643 CHUNK_STATUS Lnet/minecraft/class_2348; - FIELD field_16644 STRUCTURE_TYPE Lnet/minecraft/class_2378; - FIELD field_16645 STRUCTURE_PIECE Lnet/minecraft/class_2378; - FIELD field_16792 RULE_TEST Lnet/minecraft/class_2378; - FIELD field_16793 STRUCTURE_POOL_ELEMENT Lnet/minecraft/class_2378; - FIELD field_16794 STRUCTURE_PROCESSOR Lnet/minecraft/class_2378; - FIELD field_17166 VILLAGER_TYPE Lnet/minecraft/class_2348; - FIELD field_17167 VILLAGER_PROFESSION Lnet/minecraft/class_2348; - FIELD field_17429 SCREEN_HANDLER Lnet/minecraft/class_2378; - FIELD field_17597 RECIPE_TYPE Lnet/minecraft/class_2378; - FIELD field_17598 RECIPE_SERIALIZER Lnet/minecraft/class_2378; - FIELD field_18792 POINT_OF_INTEREST_TYPE Lnet/minecraft/class_2378; - FIELD field_18793 MEMORY_MODULE_TYPE Lnet/minecraft/class_2348; - FIELD field_18794 SENSOR_TYPE Lnet/minecraft/class_2348; - FIELD field_18795 SCHEDULE Lnet/minecraft/class_2378; - FIELD field_18796 ACTIVITY Lnet/minecraft/class_2378; - FIELD field_21445 BLOCK_STATE_PROVIDER_TYPE Lnet/minecraft/class_2378; - FIELD field_21447 FOLIAGE_PLACER_TYPE Lnet/minecraft/class_2378; - FIELD field_21448 TREE_DECORATOR_TYPE Lnet/minecraft/class_2378; - FIELD field_23398 POS_RULE_TEST Lnet/minecraft/class_2378; - FIELD field_23781 ATTRIBUTE Lnet/minecraft/class_2378; - FIELD field_23782 TRUNK_PLACER_TYPE Lnet/minecraft/class_2378; - FIELD field_24331 FEATURE_SIZE_TYPE Lnet/minecraft/class_2378; - FIELD field_25068 TREE_DECORATOR_TYPE_KEY Lnet/minecraft/class_5321; - FIELD field_25069 FEATURE_SIZE_TYPE_KEY Lnet/minecraft/class_5321; - FIELD field_25070 PARTICLE_TYPE_KEY Lnet/minecraft/class_5321; - FIELD field_25071 BIOME_SOURCE_KEY Lnet/minecraft/class_5321; - FIELD field_25072 CHUNK_GENERATOR_KEY Lnet/minecraft/class_5321; - FIELD field_25073 BLOCK_ENTITY_TYPE_KEY Lnet/minecraft/class_5321; - FIELD field_25074 PAINTING_VARIANT_KEY Lnet/minecraft/class_5321; - FIELD field_25075 CUSTOM_STAT_KEY Lnet/minecraft/class_5321; - FIELD field_25076 CHUNK_STATUS_KEY Lnet/minecraft/class_5321; - FIELD field_25077 STRUCTURE_TYPE_KEY Lnet/minecraft/class_5321; - FIELD field_25078 STRUCTURE_PIECE_KEY Lnet/minecraft/class_5321; - FIELD field_25079 RULE_TEST_KEY Lnet/minecraft/class_5321; - FIELD field_25080 POS_RULE_TEST_KEY Lnet/minecraft/class_5321; - FIELD field_25081 STRUCTURE_PROCESSOR_KEY Lnet/minecraft/class_5321; - FIELD field_25082 STRUCTURE_POOL_ELEMENT_KEY Lnet/minecraft/class_5321; - FIELD field_25083 MENU_KEY Lnet/minecraft/class_5321; - FIELD field_25084 RECIPE_TYPE_KEY Lnet/minecraft/class_5321; - FIELD field_25085 RECIPE_SERIALIZER_KEY Lnet/minecraft/class_5321; - FIELD field_25086 ATTRIBUTE_KEY Lnet/minecraft/class_5321; - FIELD field_25087 STAT_TYPE_KEY Lnet/minecraft/class_5321; - FIELD field_25088 VILLAGER_TYPE_KEY Lnet/minecraft/class_5321; - FIELD field_25089 VILLAGER_PROFESSION_KEY Lnet/minecraft/class_5321; - FIELD field_25090 POINT_OF_INTEREST_TYPE_KEY Lnet/minecraft/class_5321; - FIELD field_25091 MEMORY_MODULE_TYPE_KEY Lnet/minecraft/class_5321; - FIELD field_25092 SENSOR_TYPE_KEY Lnet/minecraft/class_5321; - FIELD field_25093 SCHEDULE_KEY Lnet/minecraft/class_5321; - FIELD field_25094 ACTIVITY_KEY Lnet/minecraft/class_5321; - FIELD field_25095 DIMENSION_TYPE_KEY Lnet/minecraft/class_5321; - 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 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; - FIELD field_25102 SOUND_EVENT_KEY Lnet/minecraft/class_5321; - FIELD field_25103 FLUID_KEY Lnet/minecraft/class_5321; - FIELD field_25104 MOB_EFFECT_KEY Lnet/minecraft/class_5321; - FIELD field_25105 BLOCK_KEY Lnet/minecraft/class_5321; - FIELD field_25106 ENCHANTMENT_KEY Lnet/minecraft/class_5321; - FIELD field_25107 ENTITY_TYPE_KEY Lnet/minecraft/class_5321; - FIELD field_25108 ITEM_KEY Lnet/minecraft/class_5321; - FIELD field_25109 POTION_KEY Lnet/minecraft/class_5321; - FIELD field_25110 CARVER_KEY Lnet/minecraft/class_5321; - FIELD field_25112 FEATURE_KEY Lnet/minecraft/class_5321; - FIELD field_25114 BIOME_KEY Lnet/minecraft/class_5321; - FIELD field_25115 BLOCK_STATE_PROVIDER_TYPE_KEY Lnet/minecraft/class_5321; - FIELD field_25117 FOLIAGE_PLACER_TYPE_KEY Lnet/minecraft/class_5321; - FIELD field_25118 TRUNK_PLACER_TYPE_KEY Lnet/minecraft/class_5321; - FIELD field_25293 LOOT_POOL_ENTRY_TYPE Lnet/minecraft/class_2378; - FIELD field_25294 LOOT_FUNCTION_TYPE Lnet/minecraft/class_2378; - 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_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 - FIELD field_25913 CONFIGURED_CARVER_KEY Lnet/minecraft/class_5321; - FIELD field_25914 CONFIGURED_FEATURE_KEY Lnet/minecraft/class_5321; - FIELD field_25915 STRUCTURE_KEY Lnet/minecraft/class_5321; - FIELD field_25916 STRUCTURE_PROCESSOR_LIST_KEY Lnet/minecraft/class_5321; - FIELD field_25917 STRUCTURE_POOL_KEY Lnet/minecraft/class_5321; - FIELD field_26374 CHUNK_GENERATOR_SETTINGS_KEY Lnet/minecraft/class_5321; - FIELD field_28005 LOOT_NUMBER_PROVIDER_TYPE_KEY Lnet/minecraft/class_5321; - FIELD field_28006 LOOT_NBT_PROVIDER_TYPE_KEY Lnet/minecraft/class_5321; - FIELD field_28007 LOOT_SCORE_PROVIDER_TYPE_KEY Lnet/minecraft/class_5321; - FIELD field_28008 LOOT_NUMBER_PROVIDER_TYPE Lnet/minecraft/class_2378; - FIELD field_28009 LOOT_NBT_PROVIDER_TYPE Lnet/minecraft/class_2378; - FIELD field_28010 LOOT_SCORE_PROVIDER_TYPE Lnet/minecraft/class_2378; - FIELD field_28263 POSITION_SOURCE_TYPE_KEY Lnet/minecraft/class_5321; - FIELD field_28264 GAME_EVENT Lnet/minecraft/class_2348; - FIELD field_28265 POSITION_SOURCE_TYPE Lnet/minecraft/class_2378; - FIELD field_28266 GAME_EVENT_KEY Lnet/minecraft/class_5321; - FIELD field_29075 FLOAT_PROVIDER_TYPE_KEY Lnet/minecraft/class_5321; - FIELD field_29076 FLOAT_PROVIDER_TYPE Lnet/minecraft/class_2378; - FIELD field_33092 INT_PROVIDER_TYPE_KEY Lnet/minecraft/class_5321; - FIELD field_33093 INT_PROVIDER_TYPE Lnet/minecraft/class_2378; - FIELD field_33094 HEIGHT_PROVIDER_TYPE_KEY Lnet/minecraft/class_5321; - FIELD field_33095 HEIGHT_PROVIDER_TYPE Lnet/minecraft/class_2378; - FIELD field_35089 BLOCK_PREDICATE_TYPE_KEY Lnet/minecraft/class_5321; - FIELD field_35090 BLOCK_PREDICATE_TYPE Lnet/minecraft/class_2378; - FIELD field_35305 MATERIAL_CONDITION_KEY Lnet/minecraft/class_5321; - FIELD field_35306 MATERIAL_RULE_KEY Lnet/minecraft/class_5321; - FIELD field_35307 MATERIAL_CONDITION Lnet/minecraft/class_2378; - FIELD field_35308 MATERIAL_RULE Lnet/minecraft/class_2378; - FIELD field_35433 NOISE_KEY Lnet/minecraft/class_5321; - FIELD field_35758 PLACED_FEATURE_KEY Lnet/minecraft/class_5321; - FIELD field_35759 PLACEMENT_MODIFIER_TYPE_KEY Lnet/minecraft/class_5321; - FIELD field_35760 PLACEMENT_MODIFIER_TYPE Lnet/minecraft/class_2378; - FIELD field_36466 STRUCTURE_PLACEMENT_KEY Lnet/minecraft/class_5321; - FIELD field_36467 STRUCTURE_PLACEMENT Lnet/minecraft/class_2378; - FIELD field_37227 STRUCTURE_SET_KEY Lnet/minecraft/class_5321; - FIELD field_37228 DENSITY_FUNCTION_KEY Lnet/minecraft/class_5321; - FIELD field_37229 DENSITY_FUNCTION_TYPE_KEY Lnet/minecraft/class_5321; - FIELD field_37230 DENSITY_FUNCTION_TYPE Lnet/minecraft/class_2378; - FIELD field_37997 COMMAND_ARGUMENT_TYPE_KEY Lnet/minecraft/class_5321; - FIELD field_37998 WORLD_PRESET_KEY Lnet/minecraft/class_5321; - FIELD field_37999 FLAT_LEVEL_GENERATOR_PRESET_KEY Lnet/minecraft/class_5321; - FIELD field_38000 COMMAND_ARGUMENT_TYPE Lnet/minecraft/class_2378; - FIELD field_38802 CAT_VARIANT_KEY Lnet/minecraft/class_5321; - FIELD field_38803 CAT_VARIANT Lnet/minecraft/class_2378; - FIELD field_38804 FROG_VARIANT_KEY Lnet/minecraft/class_5321; - FIELD field_38805 FROG_VARIANT Lnet/minecraft/class_2378; - FIELD field_38806 ROOT_PLACER_TYPE_KEY Lnet/minecraft/class_5321; - FIELD field_38807 ROOT_PLACER_TYPE Lnet/minecraft/class_2378; - FIELD field_39205 MESSAGE_TYPE_KEY Lnet/minecraft/class_5321; - FIELD field_39207 BANNER_PATTERN_KEY Lnet/minecraft/class_5321; - FIELD field_39208 BANNER_PATTERN Lnet/minecraft/class_2378; - FIELD field_39209 INSTRUMENT_KEY Lnet/minecraft/class_5321; - FIELD field_39210 INSTRUMENT Lnet/minecraft/class_2378; - METHOD (Lnet/minecraft/class_5321;Lcom/mojang/serialization/Lifecycle;)V - ARG 1 key - ARG 2 lifecycle - METHOD keys (Lcom/mojang/serialization/DynamicOps;)Ljava/util/stream/Stream; - ARG 1 ops - METHOD method_10218 (Lnet/minecraft/class_2378;)Lnet/minecraft/class_2591; - ARG 0 registry - METHOD method_10219 (Lnet/minecraft/class_2378;)Lnet/minecraft/class_1291; - ARG 0 registry - METHOD method_10220 stream ()Ljava/util/stream/Stream; - METHOD method_10221 getId (Ljava/lang/Object;)Lnet/minecraft/class_2960; - ARG 1 value - METHOD method_10222 (Lnet/minecraft/class_2378;)Lnet/minecraft/class_6018; - ARG 0 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;Lnet/minecraft/class_2378$class_6889;)Lnet/minecraft/class_2348; - ARG 0 key - ARG 1 defaultId - ARG 2 defaultEntryGetter - METHOD method_10226 register (Lnet/minecraft/class_2378;Ljava/lang/String;Ljava/lang/Object;)Ljava/lang/Object; - ARG 0 registry - ARG 1 id - ARG 2 entry - METHOD method_10227 create (Lnet/minecraft/class_5321;Lnet/minecraft/class_2385;Lnet/minecraft/class_2378$class_6889;Lcom/mojang/serialization/Lifecycle;)Lnet/minecraft/class_2385; - ARG 0 key - ARG 1 registry - ARG 2 defaultEntryGetter - ARG 3 lifecycle - METHOD method_10228 (Lnet/minecraft/class_2378;)Lnet/minecraft/class_2396; - ARG 0 registry - METHOD method_10229 (Lnet/minecraft/class_2378;)Lnet/minecraft/class_5864; - ARG 0 registry - METHOD method_10230 register (Lnet/minecraft/class_2378;Lnet/minecraft/class_2960;Ljava/lang/Object;)Ljava/lang/Object; - ARG 0 registry - ARG 1 id - ARG 2 entry - METHOD method_10231 register (Lnet/minecraft/class_2378;ILjava/lang/String;Ljava/lang/Object;)Ljava/lang/Object; - ARG 0 registry - ARG 1 rawId - ARG 2 id - ARG 3 entry - METHOD method_10233 (Lnet/minecraft/class_2378;)Lnet/minecraft/class_3414; - ARG 0 registry - METHOD method_10234 (Lnet/minecraft/class_2378;)Lnet/minecraft/class_1792; - ARG 0 registry - METHOD method_10235 getIds ()Ljava/util/Set; - METHOD method_10236 (Lnet/minecraft/class_2378;)Lnet/minecraft/class_2960; - ARG 0 registry - METHOD method_10237 (Lnet/minecraft/class_2378;)Lnet/minecraft/class_2248; - ARG 0 registry - METHOD method_10240 getRandom (Lnet/minecraft/class_5819;)Ljava/util/Optional; - ARG 1 random - METHOD method_10243 (Lnet/minecraft/class_2378;)Lnet/minecraft/class_1887; - ARG 0 registry - METHOD method_10245 (Lnet/minecraft/class_2378;)Lnet/minecraft/class_1842; - ARG 0 registry - METHOD method_10247 create (Lnet/minecraft/class_5321;Lnet/minecraft/class_2378$class_6889;)Lnet/minecraft/class_2378; - ARG 0 key - ARG 1 defaultEntryGetter - METHOD method_10248 (Lnet/minecraft/class_2378;)Lnet/minecraft/class_3611; - ARG 0 registry - METHOD method_10250 containsId (Lnet/minecraft/class_2960;)Z - ARG 1 id - METHOD method_10252 (Lnet/minecraft/class_2378;)Lnet/minecraft/class_1299; - ARG 0 registry - METHOD method_16543 (Lnet/minecraft/class_2378;)Lnet/minecraft/class_2806; - ARG 0 registry - METHOD method_16701 (Lnet/minecraft/class_2378;)Lnet/minecraft/class_3827; - ARG 0 registry - METHOD method_17172 (Lnet/minecraft/class_2378;)Lnet/minecraft/class_3852; - ARG 0 registry - METHOD method_17173 (Lnet/minecraft/class_2378;)Lnet/minecraft/class_3854; - ARG 0 registry - METHOD method_17583 (Lnet/minecraft/class_2378;)Lnet/minecraft/class_3917; - ARG 0 registry - METHOD method_17797 (Lnet/minecraft/class_2378;)Lnet/minecraft/class_1865; - ARG 0 registry - METHOD method_17798 (Lnet/minecraft/class_2378;)Lnet/minecraft/class_3956; - ARG 0 registry - METHOD method_17966 getOrEmpty (Lnet/minecraft/class_2960;)Ljava/util/Optional; - ARG 1 id - METHOD method_19449 (Lnet/minecraft/class_2378;)Lnet/minecraft/class_4168; - ARG 0 registry - METHOD method_19450 (Lnet/minecraft/class_2378;)Lnet/minecraft/class_4170; - ARG 0 registry - METHOD method_19451 (Lnet/minecraft/class_2378;)Lnet/minecraft/class_4149; - ARG 0 registry - METHOD method_19452 (Lnet/minecraft/class_2378;)Lnet/minecraft/class_4140; - ARG 0 registry - METHOD method_20574 (Lnet/minecraft/class_2378;)Lnet/minecraft/class_3448; - ARG 0 registry - METHOD method_26429 (Lnet/minecraft/class_2378;)Lnet/minecraft/class_4996; - ARG 0 registry - METHOD method_27041 (Lnet/minecraft/class_2378;)Lnet/minecraft/class_1320; - ARG 0 registry - METHOD method_29103 validate (Lnet/minecraft/class_2378;)V - ARG 0 registries - METHOD method_29106 createRegistryKey (Ljava/lang/String;)Lnet/minecraft/class_5321; - ARG 0 registryId - 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;Lnet/minecraft/class_2378$class_6889;)Lnet/minecraft/class_2378; - ARG 0 key - ARG 1 lifecycle - ARG 2 defaultEntryGetter - METHOD method_29109 create (Lnet/minecraft/class_5321;Ljava/lang/String;Lcom/mojang/serialization/Lifecycle;Lnet/minecraft/class_2378$class_6889;)Lnet/minecraft/class_2348; - ARG 0 key - ARG 1 defaultId - ARG 2 lifecycle - ARG 3 defaultEntryGetter - METHOD method_29113 getKey (Ljava/lang/Object;)Ljava/util/Optional; - ARG 1 entry - METHOD method_29396 (Lnet/minecraft/class_2378;)Lnet/minecraft/class_5342; - ARG 0 registry - METHOD method_29397 (Lnet/minecraft/class_2378;)Lnet/minecraft/class_5339; - ARG 0 registry - METHOD method_29398 (Lnet/minecraft/class_2378;)Lnet/minecraft/class_5338; - ARG 0 registry - METHOD method_29722 getEntrySet ()Ljava/util/Set; - METHOD method_30517 getKey ()Lnet/minecraft/class_5321; - 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 - COMMENT @throws IllegalStateException if the entry was not present in the registry - ARG 1 key - METHOD method_31189 getOrEmpty (Lnet/minecraft/class_5321;)Ljava/util/Optional; - ARG 1 key - METHOD method_32693 (Lnet/minecraft/class_2378;)Lnet/minecraft/class_5669; - ARG 0 registry - METHOD method_32694 (Lnet/minecraft/class_2378;)Lnet/minecraft/class_5650; - ARG 0 registry - METHOD method_32695 (Lnet/minecraft/class_2378;)Lnet/minecraft/class_5657; - ARG 0 registry - METHOD method_33104 (Lnet/minecraft/class_2378;)Lnet/minecraft/class_5717; - ARG 0 registry - METHOD method_33105 (Lnet/minecraft/class_2378;)Lnet/minecraft/class_5712; - ARG 0 registry - METHOD method_34025 (Lnet/minecraft/class_2378;)Lnet/minecraft/class_3816; - ARG 0 registry - METHOD method_34028 (Lcom/mojang/serialization/DynamicOps;Lnet/minecraft/class_2960;)Ljava/lang/Object; - ARG 1 id - METHOD method_34029 (Lnet/minecraft/class_2378;Lnet/minecraft/class_2378;)V - ARG 1 registry - METHOD method_34031 (Lnet/minecraft/class_2960;Ljava/util/function/Supplier;)V - ARG 0 id - ARG 1 defaultEntry - METHOD method_34033 (Lnet/minecraft/class_2378;)Lnet/minecraft/class_3828; - ARG 0 registry - METHOD method_34034 (Lnet/minecraft/class_2378;)Lnet/minecraft/class_5202; - ARG 0 registry - METHOD method_34035 (Lnet/minecraft/class_2378;)Lnet/minecraft/class_4663; - ARG 0 registry - METHOD method_34036 (Lnet/minecraft/class_2378;)Lnet/minecraft/class_5142; - ARG 0 registry - METHOD method_34037 (Lnet/minecraft/class_2378;)Lnet/minecraft/class_4648; - ARG 0 registry - METHOD method_34038 (Lnet/minecraft/class_2378;)Lnet/minecraft/class_6647; - ARG 0 registry - METHOD method_34039 (Lnet/minecraft/class_2378;)Lnet/minecraft/class_4652; - ARG 0 registry - METHOD method_34040 (Lnet/minecraft/class_2378;)Lnet/minecraft/class_6798; - ARG 0 registry - METHOD method_34041 (Lnet/minecraft/class_2378;)Lnet/minecraft/class_3773; - ARG 0 registry - METHOD method_34042 (Lnet/minecraft/class_2378;)Lnet/minecraft/class_7151; - ARG 0 registry - METHOD method_34043 (Lnet/minecraft/class_2378;)Lnet/minecraft/class_3031; - ARG 0 registry - METHOD method_34044 (Lnet/minecraft/class_2378;)Lnet/minecraft/class_2939; - ARG 0 registry - METHOD method_35842 contains (Lnet/minecraft/class_5321;)Z - ARG 1 key - METHOD method_35844 (Lnet/minecraft/class_2378;)Lnet/minecraft/class_6123; - ARG 0 registry - METHOD method_39197 register (Lnet/minecraft/class_2378;Lnet/minecraft/class_5321;Ljava/lang/Object;)Ljava/lang/Object; - ARG 0 registry - ARG 1 key - ARG 2 entry - METHOD method_39667 (Lnet/minecraft/class_2960;)Lcom/mojang/serialization/DataResult; - ARG 1 id - METHOD method_39668 (Ljava/lang/Object;)Lcom/mojang/serialization/Lifecycle; - ARG 1 value - METHOD method_39670 (Ljava/lang/Object;)I - ARG 1 value - METHOD method_39671 (Ljava/lang/Object;)Lcom/mojang/serialization/DataResult; - ARG 1 value - METHOD method_39673 getCodec ()Lcom/mojang/serialization/Codec; - METHOD method_40252 containsTag (Lnet/minecraft/class_6862;)Z - ARG 1 tag - METHOD method_40257 populateTags (Ljava/util/Map;)V - ARG 1 tagEntries - METHOD method_40260 getOrCreateEntryList (Lnet/minecraft/class_6862;)Lnet/minecraft/class_6885$class_6888; - ARG 1 tag - METHOD method_40264 getEntry (Lnet/minecraft/class_5321;)Ljava/util/Optional; - ARG 1 key - METHOD method_40265 getEntry (I)Ljava/util/Optional; - ARG 1 rawId - METHOD method_40266 getEntryList (Lnet/minecraft/class_6862;)Ljava/util/Optional; - ARG 1 tag - METHOD method_40268 getOrCreateEntryDataResult (Lnet/minecraft/class_5321;)Lcom/mojang/serialization/DataResult; - ARG 1 key - METHOD method_40269 createEntry (Ljava/lang/Object;)Lnet/minecraft/class_6880$class_6883; - ARG 1 value - METHOD method_40270 streamEntries ()Ljava/util/stream/Stream; - METHOD method_40272 streamTagsAndEntries ()Ljava/util/stream/Stream; - METHOD method_40273 streamTags ()Ljava/util/stream/Stream; - METHOD method_40276 freeze ()Lnet/minecraft/class_2378; - METHOD method_40278 clearTags ()V - METHOD method_40279 (Lnet/minecraft/class_6880;)Lcom/mojang/serialization/Lifecycle; - ARG 1 entry - METHOD method_40281 create (Lnet/minecraft/class_5321;Lcom/mojang/serialization/Lifecycle;Ljava/util/function/Function;Lnet/minecraft/class_2378$class_6889;)Lnet/minecraft/class_2378; - ARG 0 key - ARG 1 lifecycle - ARG 2 valueToEntryFunction - ARG 3 defaultEntryGetter - METHOD method_40282 create (Lnet/minecraft/class_5321;Ljava/lang/String;Lcom/mojang/serialization/Lifecycle;Ljava/util/function/Function;Lnet/minecraft/class_2378$class_6889;)Lnet/minecraft/class_2348; - ARG 0 key - ARG 1 defaultId - ARG 2 lifecycle - ARG 3 valueToEntryFunction - ARG 4 defaultEntryGetter - METHOD method_40283 create (Lnet/minecraft/class_5321;Ljava/lang/String;Ljava/util/function/Function;Lnet/minecraft/class_2378$class_6889;)Lnet/minecraft/class_2348; - ARG 0 key - ARG 1 defaultId - ARG 2 valueToEntryFunction - ARG 3 defaultEntryGetter - METHOD method_40284 (Lnet/minecraft/class_6880;)Lcom/mojang/serialization/Lifecycle; - ARG 1 entry - METHOD method_40285 (Lnet/minecraft/class_6880;)Lcom/mojang/serialization/DataResult; - ARG 1 entry - METHOD method_40286 iterateEntries (Lnet/minecraft/class_6862;)Ljava/lang/Iterable; - ARG 1 tag - METHOD method_40288 (Lnet/minecraft/class_2960;)Lcom/mojang/serialization/DataResult; - ARG 1 id - METHOD method_40290 entryOf (Lnet/minecraft/class_5321;)Lnet/minecraft/class_6880; - ARG 1 key - METHOD method_40292 freezeRegistries ()V - METHOD method_40293 (Lnet/minecraft/class_2378;)Lnet/minecraft/class_6875; - ARG 0 registry - METHOD method_40294 createEntryCodec ()Lcom/mojang/serialization/Codec; - METHOD method_40295 getIndexedEntries ()Lnet/minecraft/class_2359; - METHOD method_42021 getKeys ()Ljava/util/Set; - METHOD method_43223 (Lnet/minecraft/class_2378;)Lnet/minecraft/class_7106; - ARG 0 registry - METHOD method_43224 (Lnet/minecraft/class_2378;)Lnet/minecraft/class_7375; - ARG 0 registry - METHOD method_43225 (Lnet/minecraft/class_2378;)Lnet/minecraft/class_7388; - ARG 0 registry - METHOD method_44298 getOrCreateEntry (Lnet/minecraft/class_5321;)Lnet/minecraft/class_6880; - ARG 1 key - CLASS 1 - METHOD method_40296 (Lnet/minecraft/class_6880$class_6883;)Lnet/minecraft/class_6880; - ARG 0 entry - CLASS class_6889 DefaultEntryGetter - METHOD run (Lnet/minecraft/class_2378;)Ljava/lang/Object; - ARG 1 registry diff --git a/mappings/net/minecraft/util/registry/RegistryEntry.mapping b/mappings/net/minecraft/util/registry/RegistryEntry.mapping deleted file mode 100644 index ef7c8e1380..0000000000 --- a/mappings/net/minecraft/util/registry/RegistryEntry.mapping +++ /dev/null @@ -1,46 +0,0 @@ -CLASS net/minecraft/class_6880 net/minecraft/util/registry/RegistryEntry - METHOD method_40220 isIn (Lnet/minecraft/class_6862;)Z - ARG 1 tag - METHOD method_40221 upcast (Lnet/minecraft/class_6880;)Lnet/minecraft/class_6880; - ARG 0 entry - METHOD method_40222 matchesRegistry (Lnet/minecraft/class_2378;)Z - ARG 1 registry - METHOD method_40223 of (Ljava/lang/Object;)Lnet/minecraft/class_6880; - ARG 0 value - METHOD method_40224 matches (Ljava/util/function/Predicate;)Z - ARG 1 predicate - METHOD method_40225 matchesKey (Lnet/minecraft/class_5321;)Z - ARG 1 key - METHOD method_40226 matchesId (Lnet/minecraft/class_2960;)Z - ARG 1 id - METHOD method_40227 hasKeyAndValue ()Z - METHOD method_40228 streamTags ()Ljava/util/stream/Stream; - METHOD method_40229 getKeyOrValue ()Lcom/mojang/datafixers/util/Either; - METHOD method_40230 getKey ()Ljava/util/Optional; - METHOD method_40231 getType ()Lnet/minecraft/class_6880$class_6882; - CLASS class_6881 Direct - CLASS class_6882 Type - CLASS class_6883 Reference - FIELD field_36449 registry Lnet/minecraft/class_2378; - FIELD field_36450 tags Ljava/util/Set; - FIELD field_36451 referenceType Lnet/minecraft/class_6880$class_6883$class_6884; - FIELD field_36452 registryKey Lnet/minecraft/class_5321; - FIELD field_36453 value Ljava/lang/Object; - METHOD (Lnet/minecraft/class_6880$class_6883$class_6884;Lnet/minecraft/class_2378;Lnet/minecraft/class_5321;Ljava/lang/Object;)V - ARG 1 referenceType - ARG 2 registry - ARG 3 registryKey - ARG 4 value - METHOD method_40233 intrusive (Lnet/minecraft/class_2378;Ljava/lang/Object;)Lnet/minecraft/class_6880$class_6883; - ARG 0 registry - ARG 1 value - METHOD method_40234 standAlone (Lnet/minecraft/class_2378;Lnet/minecraft/class_5321;)Lnet/minecraft/class_6880$class_6883; - ARG 0 registry - ARG 1 registryKey - METHOD method_40235 setTags (Ljava/util/Collection;)V - ARG 1 tags - METHOD method_40236 setKeyAndValue (Lnet/minecraft/class_5321;Ljava/lang/Object;)V - ARG 1 key - ARG 2 value - METHOD method_40237 registryKey ()Lnet/minecraft/class_5321; - CLASS class_6884 Type diff --git a/mappings/net/minecraft/util/registry/RegistryEntryList.mapping b/mappings/net/minecraft/util/registry/RegistryEntryList.mapping deleted file mode 100644 index 576d192f78..0000000000 --- a/mappings/net/minecraft/util/registry/RegistryEntryList.mapping +++ /dev/null @@ -1,39 +0,0 @@ -CLASS net/minecraft/class_6885 net/minecraft/util/registry/RegistryEntryList - METHOD method_40239 stream ()Ljava/util/stream/Stream; - METHOD method_40240 get (I)Lnet/minecraft/class_6880; - ARG 1 index - METHOD method_40241 contains (Lnet/minecraft/class_6880;)Z - ARG 1 entry - METHOD method_40242 of (Ljava/util/List;)Lnet/minecraft/class_6885$class_6886; - ARG 0 entries - METHOD method_40243 getRandom (Lnet/minecraft/class_5819;)Ljava/util/Optional; - ARG 1 random - METHOD method_40244 of (Ljava/util/function/Function;Ljava/util/List;)Lnet/minecraft/class_6885$class_6886; - ARG 0 mapper - ARG 1 values - METHOD method_40245 of (Ljava/util/function/Function;[Ljava/lang/Object;)Lnet/minecraft/class_6885$class_6886; - ARG 0 mapper - ARG 1 values - METHOD method_40246 of ([Lnet/minecraft/class_6880;)Lnet/minecraft/class_6885$class_6886; - ARG 0 entries - METHOD method_40247 size ()I - METHOD method_40248 getStorage ()Lcom/mojang/datafixers/util/Either; - METHOD method_40560 isOf (Lnet/minecraft/class_2378;)Z - ARG 1 registry - CLASS class_6886 Direct - FIELD field_36457 entries Ljava/util/List; - FIELD field_36458 entrySet Ljava/util/Set; - METHOD (Ljava/util/List;)V - ARG 1 entries - CLASS class_6887 ListBacked - METHOD method_40249 getEntries ()Ljava/util/List; - CLASS class_6888 Named - FIELD field_36459 tag Lnet/minecraft/class_6862; - FIELD field_36460 entries Ljava/util/List; - FIELD field_36633 registry Lnet/minecraft/class_2378; - METHOD (Lnet/minecraft/class_2378;Lnet/minecraft/class_6862;)V - ARG 1 registry - ARG 2 tag - METHOD method_40250 copyOf (Ljava/util/List;)V - ARG 1 entries - METHOD method_40251 getTag ()Lnet/minecraft/class_6862; diff --git a/mappings/net/minecraft/util/shape/BitSetVoxelSet.mapping b/mappings/net/minecraft/util/shape/BitSetVoxelSet.mapping index 75aed209de..b6b09bf18c 100644 --- a/mappings/net/minecraft/util/shape/BitSetVoxelSet.mapping +++ b/mappings/net/minecraft/util/shape/BitSetVoxelSet.mapping @@ -8,6 +8,10 @@ CLASS net/minecraft/class_244 net/minecraft/util/shape/BitSetVoxelSet FIELD field_1360 maxZ I METHOD (Lnet/minecraft/class_251;)V ARG 1 other + METHOD method_1038 (Lnet/minecraft/class_247;Lnet/minecraft/class_251;IILnet/minecraft/class_251;IILnet/minecraft/class_244;II[I[ZIII)Z + ARG 12 z1 + ARG 13 z2 + ARG 14 zIndex METHOD method_1039 getIndex (III)I ARG 1 x ARG 2 y @@ -19,7 +23,25 @@ CLASS net/minecraft/class_244 net/minecraft/util/shape/BitSetVoxelSet ARG 3 yPoints ARG 4 zPoints ARG 5 function + METHOD method_1041 (Lnet/minecraft/class_255;Lnet/minecraft/class_255;Lnet/minecraft/class_247;Lnet/minecraft/class_251;Lnet/minecraft/class_251;Lnet/minecraft/class_244;[IIII)Z + ARG 7 x1 + ARG 8 x2 + ARG 9 xIndex + METHOD method_1042 (Lnet/minecraft/class_255;Lnet/minecraft/class_247;Lnet/minecraft/class_251;ILnet/minecraft/class_251;ILnet/minecraft/class_244;I[I[ZIII)Z + ARG 10 y1 + ARG 11 y2 + ARG 12 yIndex METHOD method_1059 isColumnFull (IIII)Z + ARG 1 z1 + ARG 2 z2 + ARG 3 x + ARG 4 y + METHOD method_31938 isXzSquareFull (IIIII)Z + ARG 1 x1 + ARG 2 x2 + ARG 3 z1 + ARG 4 z2 + ARG 5 y METHOD method_31939 create (IIIIIIIII)Lnet/minecraft/class_244; ARG 0 sizeX ARG 1 sizeY @@ -34,3 +56,13 @@ CLASS net/minecraft/class_244 net/minecraft/util/shape/BitSetVoxelSet ARG 1 x ARG 2 y ARG 3 z + ARG 4 updateBounds + METHOD method_31941 forEachBox (Lnet/minecraft/class_251;Lnet/minecraft/class_251$class_253;Z)V + ARG 0 voxelSet + ARG 1 callback + ARG 2 coalesce + METHOD method_31942 clearColumn (IIII)V + ARG 1 z1 + ARG 2 z2 + ARG 3 x + ARG 4 y diff --git a/mappings/net/minecraft/util/shape/DisjointPairList.mapping b/mappings/net/minecraft/util/shape/DisjointPairList.mapping index 0f963de111..37d500fbd5 100644 --- a/mappings/net/minecraft/util/shape/DisjointPairList.mapping +++ b/mappings/net/minecraft/util/shape/DisjointPairList.mapping @@ -9,3 +9,8 @@ CLASS net/minecraft/class_257 net/minecraft/util/shape/DisjointPairList METHOD getDouble (I)D ARG 1 position METHOD method_1067 iterateSections (Lnet/minecraft/class_255$class_256;)Z + ARG 1 predicate + METHOD method_1068 (Lnet/minecraft/class_255$class_256;III)Z + ARG 1 x + ARG 2 y + ARG 3 index diff --git a/mappings/net/minecraft/util/shape/SimplePairList.mapping b/mappings/net/minecraft/util/shape/SimplePairList.mapping index fd7adf6794..1175f301dd 100644 --- a/mappings/net/minecraft/util/shape/SimplePairList.mapping +++ b/mappings/net/minecraft/util/shape/SimplePairList.mapping @@ -2,6 +2,7 @@ CLASS net/minecraft/class_254 net/minecraft/util/shape/SimplePairList FIELD field_1376 minValues [I FIELD field_1377 valueIndices [D FIELD field_1378 maxValues [I + FIELD field_27346 ZERO Lit/unimi/dsi/fastutil/doubles/DoubleList; FIELD field_27347 size I METHOD (Lit/unimi/dsi/fastutil/doubles/DoubleList;Lit/unimi/dsi/fastutil/doubles/DoubleList;ZZ)V ARG 1 first diff --git a/mappings/net/minecraft/util/shape/VoxelSet.mapping b/mappings/net/minecraft/util/shape/VoxelSet.mapping index a19ae1d96a..8bae45ea50 100644 --- a/mappings/net/minecraft/util/shape/VoxelSet.mapping +++ b/mappings/net/minecraft/util/shape/VoxelSet.mapping @@ -24,10 +24,12 @@ CLASS net/minecraft/class_251 net/minecraft/util/shape/VoxelSet METHOD method_1051 getSize (Lnet/minecraft/class_2350$class_2351;)I ARG 1 axis METHOD method_1052 forEachEdge (Lnet/minecraft/class_251$class_253;Lnet/minecraft/class_2335;Z)V + ARG 1 callback ARG 2 direction + ARG 3 coalesce METHOD method_1053 forEachBox (Lnet/minecraft/class_251$class_253;Z)V ARG 1 consumer - ARG 2 largest + ARG 2 coalesce METHOD method_1055 getMin (Lnet/minecraft/class_2350$class_2351;)I ARG 1 axis METHOD method_1056 isEmpty ()Z @@ -52,6 +54,8 @@ CLASS net/minecraft/class_251 net/minecraft/util/shape/VoxelSet ARG 2 y ARG 3 z METHOD method_1064 forEachEdge (Lnet/minecraft/class_251$class_253;Z)V + ARG 1 callback + ARG 2 coalesce METHOD method_35592 getStartingAxisCoord (Lnet/minecraft/class_2350$class_2351;II)I ARG 1 axis ARG 2 from diff --git a/mappings/net/minecraft/util/shape/VoxelShape.mapping b/mappings/net/minecraft/util/shape/VoxelShape.mapping index 827c0107df..4c9bf83b05 100644 --- a/mappings/net/minecraft/util/shape/VoxelShape.mapping +++ b/mappings/net/minecraft/util/shape/VoxelShape.mapping @@ -89,3 +89,4 @@ CLASS net/minecraft/class_265 net/minecraft/util/shape/VoxelShape ARG 1 axis ARG 2 from ARG 4 to + METHOD method_52620 asCuboid ()Lnet/minecraft/class_265; diff --git a/mappings/net/minecraft/util/shape/VoxelShapes.mapping b/mappings/net/minecraft/util/shape/VoxelShapes.mapping index 4fe21bb22e..ce411d42ba 100644 --- a/mappings/net/minecraft/util/shape/VoxelShapes.mapping +++ b/mappings/net/minecraft/util/shape/VoxelShapes.mapping @@ -2,6 +2,7 @@ CLASS net/minecraft/class_259 net/minecraft/util/shape/VoxelShapes FIELD field_1384 EMPTY Lnet/minecraft/class_265; FIELD field_1385 FULL_CUBE Lnet/minecraft/class_265; FIELD field_17669 UNBOUNDED Lnet/minecraft/class_265; + FIELD field_31880 MIN_SIZE D METHOD method_1069 createListPair (ILit/unimi/dsi/fastutil/doubles/DoubleList;Lit/unimi/dsi/fastutil/doubles/DoubleList;ZZ)Lnet/minecraft/class_255; ARG 0 size ARG 1 first diff --git a/mappings/net/minecraft/util/thread/FutureQueue.mapping b/mappings/net/minecraft/util/thread/FutureQueue.mapping index 114431863a..f2653ec084 100644 --- a/mappings/net/minecraft/util/thread/FutureQueue.mapping +++ b/mappings/net/minecraft/util/thread/FutureQueue.mapping @@ -1,12 +1,15 @@ CLASS net/minecraft/class_7620 net/minecraft/util/thread/FutureQueue COMMENT A functional interface that can enqueue completable futures. FIELD field_39831 LOGGER Lorg/slf4j/Logger; - FIELD field_39832 NOOP Lnet/minecraft/class_7620; METHOD append (Lnet/minecraft/class_7620$class_7621;)V ARG 1 future - METHOD method_44905 (Lnet/minecraft/class_7620$class_7621;)V - ARG 0 future - METHOD method_44906 (Ljava/lang/Throwable;)Ljava/lang/Object; + METHOD immediate (Ljava/util/concurrent/Executor;)Lnet/minecraft/class_7620; + ARG 0 executor + METHOD method_45311 (Ljava/lang/Throwable;)Ljava/lang/Object; ARG 0 throwable + METHOD method_45312 (Ljava/util/concurrent/Executor;Lnet/minecraft/class_7620$class_7621;)V + ARG 1 future CLASS class_7621 FutureSupplier COMMENT A functional interface supplying the queued future to {@link FutureQueue}. + METHOD submit (Ljava/util/concurrent/Executor;)Ljava/util/concurrent/CompletableFuture; + ARG 1 executor diff --git a/mappings/net/minecraft/util/thread/LockHelper.mapping b/mappings/net/minecraft/util/thread/LockHelper.mapping index b5e748e9cf..85d9596fca 100644 --- a/mappings/net/minecraft/util/thread/LockHelper.mapping +++ b/mappings/net/minecraft/util/thread/LockHelper.mapping @@ -11,4 +11,5 @@ CLASS net/minecraft/class_5798 net/minecraft/util/thread/LockHelper ARG 0 message ARG 1 thread METHOD method_39935 lock ()V + METHOD method_39936 formatStackTraceForThread (Ljava/lang/Thread;)Ljava/lang/String; METHOD method_39937 unlock ()V diff --git a/mappings/net/minecraft/village/Merchant.mapping b/mappings/net/minecraft/village/Merchant.mapping index 850a2ee188..89e8e4cb67 100644 --- a/mappings/net/minecraft/village/Merchant.mapping +++ b/mappings/net/minecraft/village/Merchant.mapping @@ -2,7 +2,7 @@ CLASS net/minecraft/class_1915 net/minecraft/village/Merchant METHOD method_17448 (ILnet/minecraft/class_1661;Lnet/minecraft/class_1657;)Lnet/minecraft/class_1703; ARG 1 syncId ARG 2 playerInventory - ARG 3 player + ARG 3 playerx METHOD method_17449 sendOffers (Lnet/minecraft/class_1657;Lnet/minecraft/class_2561;I)V ARG 1 player ARG 2 test diff --git a/mappings/net/minecraft/village/TradeOffers.mapping b/mappings/net/minecraft/village/TradeOffers.mapping index cf6327b929..11e0e13680 100644 --- a/mappings/net/minecraft/village/TradeOffers.mapping +++ b/mappings/net/minecraft/village/TradeOffers.mapping @@ -15,14 +15,32 @@ CLASS net/minecraft/class_3853 net/minecraft/village/TradeOffers FIELD field_30626 MASTER_TRADE_XP I FIELD field_30627 LOW_PRICE_MULTIPLIER F FIELD field_30628 HIGH_PRICE_MULTIPLIER F + FIELD field_45128 REBALANCED_PROFESSION_TO_LEVELED_TRADE Ljava/util/Map; + FIELD field_45129 REBALANCED_WANDERING_TRADER_TRADES Ljava/util/List; METHOD method_16928 copyToFastUtilMap (Lcom/google/common/collect/ImmutableMap;)Lit/unimi/dsi/fastutil/ints/Int2ObjectMap; ARG 0 map METHOD method_16929 (Ljava/util/HashMap;)V ARG 0 map + METHOD method_52551 createMasterLibrarianTradeFactory ()Lnet/minecraft/class_3853$class_1652; + METHOD method_52552 createLibrarianTradeFactory (I)Lnet/minecraft/class_3853$class_1652; + ARG 0 experience + METHOD method_52553 createPotionStack (Lnet/minecraft/class_1842;)Lnet/minecraft/class_1799; + ARG 0 potion CLASS class_1648 EnchantBookFactory FIELD field_18557 experience I + FIELD field_45131 possibleEnchantments Ljava/util/List; + FIELD field_45132 minLevel I + FIELD field_45133 maxLevel I METHOD (I)V ARG 1 experience + METHOD (III[Lnet/minecraft/class_1887;)V + ARG 1 experience + ARG 2 minLevel + ARG 3 maxLevel + ARG 4 possibleEnchantments + METHOD (I[Lnet/minecraft/class_1887;)V + ARG 1 experience + ARG 2 possibleEnchantments CLASS class_1652 Factory COMMENT A factory to create trade offers. METHOD method_7246 create (Lnet/minecraft/class_1297;Lnet/minecraft/class_5819;)Lnet/minecraft/class_1914; @@ -60,17 +78,28 @@ CLASS net/minecraft/class_3853 net/minecraft/village/TradeOffers ARG 4 experience METHOD method_19200 getDye (Lnet/minecraft/class_5819;)Lnet/minecraft/class_1769; ARG 0 random - CLASS class_4161 BuyForOneEmeraldFactory - FIELD field_18548 buy Lnet/minecraft/class_1792; + CLASS class_4161 BuyItemFactory FIELD field_18549 price I FIELD field_18550 maxUses I FIELD field_18551 experience I FIELD field_18552 multiplier F + FIELD field_45130 stack Lnet/minecraft/class_1799; + METHOD (Lnet/minecraft/class_1799;III)V + ARG 1 stack + ARG 2 maxUses + ARG 3 experience + ARG 4 price METHOD (Lnet/minecraft/class_1935;III)V ARG 1 item - ARG 2 price + ARG 2 count ARG 3 maxUses ARG 4 experience + METHOD (Lnet/minecraft/class_1935;IIII)V + ARG 1 item + ARG 2 count + ARG 3 maxUses + ARG 4 experience + ARG 5 price CLASS class_4162 TypeAwareBuyForOneEmeraldFactory FIELD field_18553 map Ljava/util/Map; FIELD field_18554 count I @@ -129,7 +158,6 @@ CLASS net/minecraft/class_3853 net/minecraft/village/TradeOffers CLASS class_4165 SellItemFactory FIELD field_18571 sell Lnet/minecraft/class_1799; FIELD field_18572 price I - FIELD field_18573 count I FIELD field_18574 maxUses I FIELD field_18575 experience I FIELD field_18576 multiplier F @@ -164,10 +192,13 @@ CLASS net/minecraft/class_3853 net/minecraft/village/TradeOffers ARG 4 maxUses ARG 5 experience CLASS class_4166 SellSuspiciousStewFactory - FIELD field_18577 effect Lnet/minecraft/class_1291; - FIELD field_18578 duration I FIELD field_18579 experience I FIELD field_18580 multiplier F + FIELD field_45756 stewEffects Ljava/util/List; + METHOD (Ljava/util/List;IF)V + ARG 1 stewEffects + ARG 2 experience + ARG 3 multiplier METHOD (Lnet/minecraft/class_1291;II)V ARG 1 effect ARG 2 duration @@ -191,3 +222,11 @@ CLASS net/minecraft/class_3853 net/minecraft/village/TradeOffers ARG 7 experience METHOD method_19203 (Lnet/minecraft/class_1842;)Z ARG 0 potion + CLASS class_8640 TypedWrapperFactory + FIELD field_45134 typeToFactory Ljava/util/Map; + METHOD (Ljava/util/Map;)V + ARG 1 typeToFactory + METHOD method_52555 (Lnet/minecraft/class_3854;)V + ARG 0 type + METHOD method_52556 (Ljava/util/Map;Lnet/minecraft/class_3854;)Z + ARG 1 type diff --git a/mappings/net/minecraft/village/VillageGossipType.mapping b/mappings/net/minecraft/village/VillageGossipType.mapping index bc261e3af6..97d38a7e02 100644 --- a/mappings/net/minecraft/village/VillageGossipType.mapping +++ b/mappings/net/minecraft/village/VillageGossipType.mapping @@ -3,18 +3,14 @@ CLASS net/minecraft/class_4139 net/minecraft/village/VillageGossipType FIELD field_18431 multiplier I FIELD field_18432 maxValue I FIELD field_18434 shareDecrement I - FIELD field_18435 BY_KEY Ljava/util/Map; FIELD field_19354 decay I FIELD field_30240 MAX_TRADING_REPUTATION I FIELD field_30241 TRADING_GOSSIP_SHARE_DECREMENT I FIELD field_30242 TRADING_GOSSIP_DECAY I + FIELD field_41672 CODEC Lcom/mojang/serialization/Codec; METHOD (Ljava/lang/String;ILjava/lang/String;IIII)V ARG 3 key ARG 4 multiplier ARG 5 maxReputation ARG 6 decay ARG 7 shareDecrement - METHOD method_19089 (Lnet/minecraft/class_4139;)Ljava/lang/String; - ARG 0 type - METHOD method_19090 byKey (Ljava/lang/String;)Lnet/minecraft/class_4139; - ARG 0 key diff --git a/mappings/net/minecraft/village/VillagerGossips.mapping b/mappings/net/minecraft/village/VillagerGossips.mapping index db7a322a0c..2e7f158287 100644 --- a/mappings/net/minecraft/village/VillagerGossips.mapping +++ b/mappings/net/minecraft/village/VillagerGossips.mapping @@ -1,5 +1,6 @@ CLASS net/minecraft/class_4136 net/minecraft/village/VillagerGossips FIELD field_18419 entityReputation Ljava/util/Map; + FIELD field_41669 LOGGER Lorg/slf4j/Logger; METHOD method_19059 max (II)I ARG 0 left ARG 1 right @@ -18,7 +19,7 @@ CLASS net/minecraft/class_4136 net/minecraft/village/VillagerGossips ARG 3 right METHOD method_19066 deserialize (Lcom/mojang/serialization/Dynamic;)V ARG 1 dynamic - METHOD method_19067 serialize (Lcom/mojang/serialization/DynamicOps;)Lcom/mojang/serialization/Dynamic; + METHOD method_19067 serialize (Lcom/mojang/serialization/DynamicOps;)Ljava/lang/Object; ARG 1 ops METHOD method_19069 (Ljava/util/Map$Entry;)Ljava/util/stream/Stream; ARG 0 entry @@ -40,10 +41,6 @@ CLASS net/minecraft/class_4136 net/minecraft/village/VillagerGossips METHOD method_19076 (Ljava/util/UUID;)Lnet/minecraft/class_4136$class_4137; ARG 0 uuid METHOD method_20651 decay ()V - METHOD method_28350 (Lcom/mojang/serialization/DataResult;)Ljava/util/stream/Stream; - ARG 0 result - METHOD method_28351 (Lcom/mojang/serialization/DynamicOps;Lnet/minecraft/class_4136$class_4138;)Lcom/mojang/serialization/Dynamic; - ARG 1 entry METHOD method_35120 getEntityReputationAssociatedGossips ()Ljava/util/Map; METHOD method_35121 remove (Lnet/minecraft/class_4139;)V ARG 1 type @@ -61,6 +58,10 @@ CLASS net/minecraft/class_4136 net/minecraft/village/VillagerGossips ARG 1 target ARG 2 type ARG 3 value + METHOD method_47925 (Ljava/lang/String;)V + ARG 0 error + METHOD method_47926 (Ljava/lang/String;)V + ARG 0 error CLASS class_4137 Reputation FIELD field_18420 associatedGossip Lit/unimi/dsi/fastutil/objects/Object2IntMap; METHOD method_19078 (Lit/unimi/dsi/fastutil/objects/Object2IntMap$Entry;)I @@ -80,18 +81,18 @@ CLASS net/minecraft/class_4136 net/minecraft/village/VillagerGossips METHOD method_20655 remove (Lnet/minecraft/class_4139;)V ARG 1 gossipType CLASS class_4138 GossipEntry - FIELD field_18421 target Ljava/util/UUID; - FIELD field_18422 type Lnet/minecraft/class_4139; - FIELD field_18423 value I - FIELD field_30237 TARGET_KEY Ljava/lang/String; - FIELD field_30238 TYPE_KEY Ljava/lang/String; - FIELD field_30239 VALUE_KEY Ljava/lang/String; + FIELD comp_1180 target Ljava/util/UUID; + FIELD comp_1181 type Lnet/minecraft/class_4139; + FIELD comp_1182 value I + FIELD field_41670 CODEC Lcom/mojang/serialization/Codec; + FIELD field_41671 LIST_CODEC Lcom/mojang/serialization/Codec; METHOD (Ljava/util/UUID;Lnet/minecraft/class_4139;I)V ARG 1 target ARG 2 type ARG 3 value + METHOD comp_1180 target ()Ljava/util/UUID; + METHOD comp_1181 type ()Lnet/minecraft/class_4139; + METHOD comp_1182 value ()I METHOD method_19083 getValue ()I - METHOD method_19084 deserialize (Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/DataResult; - ARG 0 dynamic - METHOD method_19087 serialize (Lcom/mojang/serialization/DynamicOps;)Lcom/mojang/serialization/Dynamic; - ARG 1 ops + METHOD method_47927 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 0 instance diff --git a/mappings/net/minecraft/village/raid/Raid.mapping b/mappings/net/minecraft/village/raid/Raid.mapping index cda3a90e3b..c23dd4999e 100644 --- a/mappings/net/minecraft/village/raid/Raid.mapping +++ b/mappings/net/minecraft/village/raid/Raid.mapping @@ -25,6 +25,7 @@ CLASS net/minecraft/class_3765 net/minecraft/village/raid/Raid FIELD field_19024 finishCooldown I FIELD field_19172 preCalculatedRavagerSpawnLocation Ljava/util/Optional; FIELD field_30670 MAX_DESPAWN_COUNTER I + FIELD field_30675 SQUARED_MAX_RAIDER_DISTANCE I FIELD field_30683 OMINOUS_BANNER_TRANSLATION_KEY Ljava/lang/String; FIELD field_30684 RAIDERS_REMAINING_TRANSLATION_KEY Ljava/lang/String; FIELD field_30686 DEFAULT_PRE_RAID_TICKS I @@ -61,7 +62,7 @@ CLASS net/minecraft/class_3765 net/minecraft/village/raid/Raid ARG 2 entity METHOD method_16506 invalidate ()V METHOD method_16508 (Ljava/lang/Integer;)Ljava/util/Set; - ARG 0 wave + ARG 0 wavex METHOD method_16509 tick ()V METHOD method_16510 removeFromWave (Lnet/minecraft/class_3763;Z)V ARG 1 entity diff --git a/mappings/net/minecraft/village/raid/RaidManager.mapping b/mappings/net/minecraft/village/raid/RaidManager.mapping index 06f194c6be..b95887d696 100644 --- a/mappings/net/minecraft/village/raid/RaidManager.mapping +++ b/mappings/net/minecraft/village/raid/RaidManager.mapping @@ -25,6 +25,10 @@ CLASS net/minecraft/class_3767 net/minecraft/village/raid/RaidManager ARG 2 searchDistance METHOD method_44012 (Lnet/minecraft/class_6880;)Z ARG 0 poiType + METHOD method_52559 getPersistentStateType (Lnet/minecraft/class_3218;)Lnet/minecraft/class_18$class_8645; + ARG 0 world + METHOD method_52561 (Lnet/minecraft/class_3218;Lnet/minecraft/class_2487;)Lnet/minecraft/class_3767; + ARG 1 nbt METHOD method_77 fromNbt (Lnet/minecraft/class_3218;Lnet/minecraft/class_2487;)Lnet/minecraft/class_3767; ARG 0 world ARG 1 nbt diff --git a/mappings/net/minecraft/world/BlockCollisionSpliterator.mapping b/mappings/net/minecraft/world/BlockCollisionSpliterator.mapping index 3473e12f86..621b58ec4d 100644 --- a/mappings/net/minecraft/world/BlockCollisionSpliterator.mapping +++ b/mappings/net/minecraft/world/BlockCollisionSpliterator.mapping @@ -8,15 +8,13 @@ CLASS net/minecraft/class_5329 net/minecraft/world/BlockCollisionSpliterator FIELD field_35108 chunk Lnet/minecraft/class_1922; FIELD field_35109 chunkPos J FIELD field_35590 forEntity Z - METHOD (Lnet/minecraft/class_1941;Lnet/minecraft/class_1297;Lnet/minecraft/class_238;)V - ARG 1 world - ARG 2 entity - ARG 3 box - METHOD (Lnet/minecraft/class_1941;Lnet/minecraft/class_1297;Lnet/minecraft/class_238;Z)V + FIELD field_44787 resultFunction Ljava/util/function/BiFunction; + METHOD (Lnet/minecraft/class_1941;Lnet/minecraft/class_1297;Lnet/minecraft/class_238;ZLjava/util/function/BiFunction;)V ARG 1 world ARG 2 entity ARG 3 box ARG 4 forEntity + ARG 5 resultFunction METHOD method_29283 getChunk (II)Lnet/minecraft/class_1922; ARG 1 x ARG 2 z diff --git a/mappings/net/minecraft/world/BlockView.mapping b/mappings/net/minecraft/world/BlockView.mapping index f71151874d..2eac0fac06 100644 --- a/mappings/net/minecraft/world/BlockView.mapping +++ b/mappings/net/minecraft/world/BlockView.mapping @@ -3,7 +3,7 @@ CLASS net/minecraft/class_1922 net/minecraft/world/BlockView METHOD method_17742 raycast (Lnet/minecraft/class_3959;)Lnet/minecraft/class_3965; ARG 1 context METHOD method_17743 (Lnet/minecraft/class_3959;Lnet/minecraft/class_2338;)Lnet/minecraft/class_3965; - ARG 1 context + ARG 1 innerContext ARG 2 pos METHOD method_17744 raycast (Lnet/minecraft/class_243;Lnet/minecraft/class_243;Ljava/lang/Object;Ljava/util/function/BiFunction;Ljava/util/function/Function;)Ljava/lang/Object; ARG 0 start @@ -18,7 +18,7 @@ CLASS net/minecraft/class_1922 net/minecraft/world/BlockView ARG 4 shape ARG 5 state METHOD method_17746 (Lnet/minecraft/class_3959;)Lnet/minecraft/class_3965; - ARG 0 context + ARG 0 innerContext METHOD method_29546 getStatesInBox (Lnet/minecraft/class_238;)Ljava/util/stream/Stream; ARG 1 box METHOD method_30346 getDismountHeight (Lnet/minecraft/class_265;Ljava/util/function/Supplier;)D @@ -29,10 +29,10 @@ CLASS net/minecraft/class_1922 net/minecraft/world/BlockView METHOD method_32880 raycast (Lnet/minecraft/class_5702;)Lnet/minecraft/class_3965; ARG 1 context METHOD method_32881 (Lnet/minecraft/class_5702;Lnet/minecraft/class_2338;)Lnet/minecraft/class_3965; - ARG 1 context + ARG 1 innerContext ARG 2 pos METHOD method_32882 (Lnet/minecraft/class_5702;)Lnet/minecraft/class_3965; - ARG 0 context + ARG 0 innerContext METHOD method_35230 getBlockEntity (Lnet/minecraft/class_2338;Lnet/minecraft/class_2591;)Ljava/util/Optional; ARG 1 pos ARG 2 type diff --git a/mappings/net/minecraft/world/ChunkUpdateState.mapping b/mappings/net/minecraft/world/ChunkUpdateState.mapping index ec8dc01423..627ab0222c 100644 --- a/mappings/net/minecraft/world/ChunkUpdateState.mapping +++ b/mappings/net/minecraft/world/ChunkUpdateState.mapping @@ -17,3 +17,4 @@ CLASS net/minecraft/class_3440 net/minecraft/world/ChunkUpdateState METHOD method_14898 getAll ()Lit/unimi/dsi/fastutil/longs/LongSet; METHOD method_32358 fromNbt (Lnet/minecraft/class_2487;)Lnet/minecraft/class_3440; ARG 0 nbt + METHOD method_52601 getPersistentStateType ()Lnet/minecraft/class_18$class_8645; diff --git a/mappings/net/minecraft/world/CollisionView.mapping b/mappings/net/minecraft/world/CollisionView.mapping index cc26a9a9b1..fbfc191c04 100644 --- a/mappings/net/minecraft/world/CollisionView.mapping +++ b/mappings/net/minecraft/world/CollisionView.mapping @@ -25,6 +25,21 @@ CLASS net/minecraft/class_1941 net/minecraft/world/CollisionView METHOD method_39455 getWorldBorderCollisions (Lnet/minecraft/class_1297;Lnet/minecraft/class_238;)Lnet/minecraft/class_265; ARG 1 entity ARG 2 box + METHOD method_51715 (Lnet/minecraft/class_2338$class_2339;Lnet/minecraft/class_265;)Lnet/minecraft/class_2338; + ARG 0 pos + ARG 1 voxelShape + METHOD method_51716 (Lnet/minecraft/class_2338$class_2339;Lnet/minecraft/class_265;)Lnet/minecraft/class_265; + ARG 0 pos + ARG 1 voxelShape + METHOD method_51717 (Lnet/minecraft/class_2338$class_2339;Lnet/minecraft/class_265;)Lnet/minecraft/class_265; + ARG 0 pos + ARG 1 voxelShape + METHOD method_51718 findSupportingBlockPos (Lnet/minecraft/class_1297;Lnet/minecraft/class_238;)Ljava/util/Optional; + ARG 1 entity + ARG 2 box + METHOD method_52569 isBlockSpaceEmpty (Lnet/minecraft/class_1297;Lnet/minecraft/class_238;)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 diff --git a/mappings/net/minecraft/world/CommandBlockExecutor.mapping b/mappings/net/minecraft/world/CommandBlockExecutor.mapping index c313f3a2bb..67d915681f 100644 --- a/mappings/net/minecraft/world/CommandBlockExecutor.mapping +++ b/mappings/net/minecraft/world/CommandBlockExecutor.mapping @@ -14,6 +14,7 @@ CLASS net/minecraft/class_1918 net/minecraft/world/CommandBlockExecutor FIELD field_9167 lastExecution J FIELD field_9168 command Ljava/lang/String; FIELD field_9169 DATE_FORMAT Ljava/text/SimpleDateFormat; + METHOD method_52175 isEditable ()Z METHOD method_8286 setCommand (Ljava/lang/String;)V ARG 1 command METHOD method_8287 setTrackOutput (Z)V diff --git a/mappings/net/minecraft/world/Difficulty.mapping b/mappings/net/minecraft/world/Difficulty.mapping index d40cb281a1..b751195118 100644 --- a/mappings/net/minecraft/world/Difficulty.mapping +++ b/mappings/net/minecraft/world/Difficulty.mapping @@ -1,5 +1,6 @@ CLASS net/minecraft/class_1267 net/minecraft/world/Difficulty - FIELD field_5800 BY_NAME [Lnet/minecraft/class_1267; + FIELD field_41668 CODEC Lnet/minecraft/class_3542$class_7292; + FIELD field_5800 BY_ID Ljava/util/function/IntFunction; FIELD field_5803 id I FIELD field_5806 name Ljava/lang/String; METHOD (Ljava/lang/String;IILjava/lang/String;)V @@ -7,8 +8,9 @@ CLASS net/minecraft/class_1267 net/minecraft/world/Difficulty ARG 4 name METHOD method_16691 byName (Ljava/lang/String;)Lnet/minecraft/class_1267; ARG 0 name + METHOD method_48556 getInfo ()Lnet/minecraft/class_2561; METHOD method_5460 getName ()Ljava/lang/String; METHOD method_5461 getId ()I - METHOD method_5462 byOrdinal (I)Lnet/minecraft/class_1267; - ARG 0 ordinal + METHOD method_5462 byId (I)Lnet/minecraft/class_1267; + ARG 0 id METHOD method_5463 getTranslatableName ()Lnet/minecraft/class_2561; diff --git a/mappings/net/minecraft/world/EntityView.mapping b/mappings/net/minecraft/world/EntityView.mapping index 616bb3a502..711ca02da3 100644 --- a/mappings/net/minecraft/world/EntityView.mapping +++ b/mappings/net/minecraft/world/EntityView.mapping @@ -64,6 +64,8 @@ CLASS net/minecraft/class_1924 net/minecraft/world/EntityView ARG 6 y ARG 8 z ARG 10 box + METHOD method_31591 (Lnet/minecraft/class_1309;)Z + ARG 0 entityOfClass METHOD method_8333 getOtherEntities (Lnet/minecraft/class_1297;Lnet/minecraft/class_238;Ljava/util/function/Predicate;)Ljava/util/List; COMMENT Computes a list of entities within some box, excluding the given entity, that satisfy the given predicate. COMMENT diff --git a/mappings/net/minecraft/world/FeatureUpdater.mapping b/mappings/net/minecraft/world/FeatureUpdater.mapping index 6413cf1e98..83732762e1 100644 --- a/mappings/net/minecraft/world/FeatureUpdater.mapping +++ b/mappings/net/minecraft/world/FeatureUpdater.mapping @@ -4,8 +4,13 @@ CLASS net/minecraft/class_3360 net/minecraft/world/FeatureUpdater FIELD field_14434 needsUpdate Z FIELD field_14435 OLD_TO_NEW Ljava/util/Map; FIELD field_14436 ANCIENT_TO_OLD Ljava/util/Map; + FIELD field_17658 oldNames Ljava/util/List; + FIELD field_17659 newNames Ljava/util/List; + FIELD field_37194 NEW_STRUCTURE_NAMES Ljava/util/Set; METHOD (Lnet/minecraft/class_26;Ljava/util/List;Ljava/util/List;)V ARG 1 persistentStateManager + ARG 2 oldNames + ARG 3 newNames METHOD method_14734 init (Lnet/minecraft/class_26;)V ARG 1 persistentStateManager METHOD method_14735 getUpdatedReferences (Lnet/minecraft/class_2487;)Lnet/minecraft/class_2487; @@ -25,6 +30,7 @@ CLASS net/minecraft/class_3360 net/minecraft/world/FeatureUpdater METHOD method_14742 (Ljava/util/HashMap;)V ARG 0 map METHOD method_14744 markResolved (J)V + ARG 1 chunkPos METHOD method_14745 create (Lnet/minecraft/class_5321;Lnet/minecraft/class_26;)Lnet/minecraft/class_3360; ARG 0 world ARG 1 persistentStateManager diff --git a/mappings/net/minecraft/world/ForcedChunkState.mapping b/mappings/net/minecraft/world/ForcedChunkState.mapping index a2cf68cb48..629d859b73 100644 --- a/mappings/net/minecraft/world/ForcedChunkState.mapping +++ b/mappings/net/minecraft/world/ForcedChunkState.mapping @@ -6,4 +6,5 @@ CLASS net/minecraft/class_1932 net/minecraft/world/ForcedChunkState ARG 1 chunks METHOD method_32350 fromNbt (Lnet/minecraft/class_2487;)Lnet/minecraft/class_1932; ARG 0 nbt + METHOD method_52570 getPersistentStateType ()Lnet/minecraft/class_18$class_8645; METHOD method_8375 getChunks ()Lit/unimi/dsi/fastutil/longs/LongSet; diff --git a/mappings/net/minecraft/world/GameMode.mapping b/mappings/net/minecraft/world/GameMode.mapping index 9943c78323..b52a668377 100644 --- a/mappings/net/minecraft/world/GameMode.mapping +++ b/mappings/net/minecraft/world/GameMode.mapping @@ -3,6 +3,8 @@ CLASS net/minecraft/class_1934 net/minecraft/world/GameMode FIELD field_28046 simpleTranslatableName Lnet/minecraft/class_2561; FIELD field_28047 translatableName Lnet/minecraft/class_2561; FIELD field_30964 UNKNOWN I + FIELD field_41676 CODEC Lnet/minecraft/class_3542$class_7292; + FIELD field_41677 BY_ID Ljava/util/function/IntFunction; FIELD field_9217 id I FIELD field_9221 name Ljava/lang/String; METHOD (Ljava/lang/String;IILjava/lang/String;)V @@ -17,9 +19,6 @@ CLASS net/minecraft/class_1934 net/minecraft/world/GameMode ARG 0 name ARG 1 defaultMode METHOD method_8379 getId ()I - METHOD method_8380 byId (ILnet/minecraft/class_1934;)Lnet/minecraft/class_1934; - ARG 0 id - ARG 1 defaultMode METHOD method_8381 getName ()Ljava/lang/String; METHOD method_8382 setAbilities (Lnet/minecraft/class_1656;)V ARG 1 abilities diff --git a/mappings/net/minecraft/world/Heightmap.mapping b/mappings/net/minecraft/world/Heightmap.mapping index 687c67e46f..505dd405b9 100644 --- a/mappings/net/minecraft/world/Heightmap.mapping +++ b/mappings/net/minecraft/world/Heightmap.mapping @@ -30,13 +30,14 @@ CLASS net/minecraft/class_2902 net/minecraft/world/Heightmap METHOD method_12603 get (II)I ARG 1 x ARG 2 z - METHOD method_16680 (Lnet/minecraft/class_2680;)Z - ARG 0 state METHOD method_16682 (Lnet/minecraft/class_2680;)Z ARG 0 state METHOD method_16684 populateHeightmaps (Lnet/minecraft/class_2791;Ljava/util/Set;)V ARG 0 chunk ARG 1 types + METHOD method_35334 (II)I + ARG 1 x + ARG 2 z CLASS class_2903 Type FIELD field_13198 purpose Lnet/minecraft/class_2902$class_2904; FIELD field_13204 name Ljava/lang/String; diff --git a/mappings/net/minecraft/world/IdCountsState.mapping b/mappings/net/minecraft/world/IdCountsState.mapping index a85691a6f4..37f06b5e4b 100644 --- a/mappings/net/minecraft/world/IdCountsState.mapping +++ b/mappings/net/minecraft/world/IdCountsState.mapping @@ -4,3 +4,4 @@ CLASS net/minecraft/class_3978 net/minecraft/world/IdCountsState METHOD method_17920 getNextMapId ()I METHOD method_32360 fromNbt (Lnet/minecraft/class_2487;)Lnet/minecraft/class_3978; ARG 0 nbt + METHOD method_52610 getPersistentStateType ()Lnet/minecraft/class_18$class_8645; diff --git a/mappings/net/minecraft/world/LightType.mapping b/mappings/net/minecraft/world/LightType.mapping index 95afd389e8..0fe330a6d8 100644 --- a/mappings/net/minecraft/world/LightType.mapping +++ b/mappings/net/minecraft/world/LightType.mapping @@ -1,4 +1 @@ CLASS net/minecraft/class_1944 net/minecraft/world/LightType - FIELD field_9283 value I - METHOD (Ljava/lang/String;II)V - ARG 3 value diff --git a/mappings/net/minecraft/world/MobSpawnerEntry.mapping b/mappings/net/minecraft/world/MobSpawnerEntry.mapping index c4b9efbdbc..f09323a88f 100644 --- a/mappings/net/minecraft/world/MobSpawnerEntry.mapping +++ b/mappings/net/minecraft/world/MobSpawnerEntry.mapping @@ -1,18 +1,18 @@ CLASS net/minecraft/class_1952 net/minecraft/world/MobSpawnerEntry FIELD comp_64 entity Lnet/minecraft/class_2487; FIELD comp_65 customSpawnRules Ljava/util/Optional; - FIELD field_30977 DEFAULT_ENTITY_ID Ljava/lang/String; FIELD field_34460 CODEC Lcom/mojang/serialization/Codec; FIELD field_34461 DATA_POOL_CODEC Lcom/mojang/serialization/Codec; + FIELD field_40893 ENTITY_KEY Ljava/lang/String; METHOD comp_64 entity ()Lnet/minecraft/class_2487; METHOD comp_65 customSpawnRules ()Ljava/util/Optional; METHOD equals (Ljava/lang/Object;)Z ARG 1 o METHOD method_38093 getNbt ()Lnet/minecraft/class_2487; + METHOD method_38094 (Lnet/minecraft/class_1952;)Ljava/util/Optional; + ARG 0 entry METHOD method_38095 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; ARG 0 instance - METHOD method_38096 (Lnet/minecraft/class_2487;)V - ARG 0 nbt METHOD method_38097 getCustomSpawnRules ()Ljava/util/Optional; METHOD method_38098 (Lnet/minecraft/class_1952;)Lnet/minecraft/class_2487; ARG 0 entry @@ -33,3 +33,5 @@ CLASS net/minecraft/class_1952 net/minecraft/world/MobSpawnerEntry ARG 0 instance METHOD method_38102 (Lnet/minecraft/class_1952$class_6542;)Lnet/minecraft/class_6497; ARG 0 rules + METHOD method_51719 createLightLimitCodec (Ljava/lang/String;)Lcom/mojang/serialization/MapCodec; + ARG 0 name diff --git a/mappings/net/minecraft/world/MobSpawnerLogic.mapping b/mappings/net/minecraft/world/MobSpawnerLogic.mapping index 125ccc6bd5..23321123d4 100644 --- a/mappings/net/minecraft/world/MobSpawnerLogic.mapping +++ b/mappings/net/minecraft/world/MobSpawnerLogic.mapping @@ -1,4 +1,5 @@ CLASS net/minecraft/class_1917 net/minecraft/world/MobSpawnerLogic + FIELD field_40877 SPAWN_DATA_KEY Ljava/lang/String; FIELD field_9149 spawnCount I FIELD field_9150 maxSpawnDelay I FIELD field_9151 minSpawnDelay I @@ -9,7 +10,9 @@ CLASS net/minecraft/class_1917 net/minecraft/world/MobSpawnerLogic FIELD field_9156 LOGGER Lorg/slf4j/Logger; FIELD field_9157 spawnRange I FIELD field_9158 requiredPlayerRange I + FIELD field_9159 lastRotation D FIELD field_9160 maxNearbyEntities I + FIELD field_9161 rotation D METHOD method_18085 (DDDLnet/minecraft/class_1297;)Lnet/minecraft/class_1297; ARG 6 entity METHOD method_31588 serverTick (Lnet/minecraft/class_3218;Lnet/minecraft/class_2338;)V @@ -18,24 +21,25 @@ CLASS net/minecraft/class_1917 net/minecraft/world/MobSpawnerLogic METHOD method_31589 clientTick (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;)V ARG 1 world ARG 2 pos - METHOD method_33355 (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_6008$class_6010;)V - ARG 3 spawnPotential METHOD method_33356 (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_6008$class_6010;)V ARG 3 spawnPotential - METHOD method_38079 (Ljava/lang/String;)V - ARG 0 error METHOD method_38080 (Ljava/lang/String;)V ARG 0 error - METHOD method_38082 (Ljava/lang/String;)V - ARG 0 error + METHOD method_46404 getSpawnEntry (Lnet/minecraft/class_1937;Lnet/minecraft/class_5819;Lnet/minecraft/class_2338;)Lnet/minecraft/class_1952; + ARG 1 world + ARG 2 random + ARG 3 pos METHOD method_8272 writeNbt (Lnet/minecraft/class_2487;)Lnet/minecraft/class_2487; ARG 1 nbt METHOD method_8273 sendStatus (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;I)V ARG 1 world ARG 2 pos ARG 3 status - METHOD method_8274 setEntityId (Lnet/minecraft/class_1299;)V + METHOD method_8274 setEntityId (Lnet/minecraft/class_1299;Lnet/minecraft/class_1937;Lnet/minecraft/class_5819;Lnet/minecraft/class_2338;)V ARG 1 type + ARG 2 world + ARG 3 random + ARG 4 pos METHOD method_8275 handleStatus (Lnet/minecraft/class_1937;I)Z ARG 1 world ARG 2 status @@ -43,6 +47,8 @@ CLASS net/minecraft/class_1917 net/minecraft/world/MobSpawnerLogic ARG 1 world ARG 2 pos ARG 3 spawnEntry + METHOD method_8278 getRotation ()D + METHOD method_8279 getLastRotation ()D METHOD method_8280 readNbt (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_2487;)V ARG 1 world ARG 2 pos @@ -50,8 +56,10 @@ CLASS net/minecraft/class_1917 net/minecraft/world/MobSpawnerLogic METHOD method_8282 updateSpawns (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;)V ARG 1 world ARG 2 pos - METHOD method_8283 getRenderedEntity (Lnet/minecraft/class_1937;)Lnet/minecraft/class_1297; + METHOD method_8283 getRenderedEntity (Lnet/minecraft/class_1937;Lnet/minecraft/class_5819;Lnet/minecraft/class_2338;)Lnet/minecraft/class_1297; ARG 1 world + ARG 2 random + ARG 3 pos METHOD method_8284 isPlayerInRange (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;)Z ARG 1 world ARG 2 pos diff --git a/mappings/net/minecraft/world/ModifiableWorld.mapping b/mappings/net/minecraft/world/ModifiableWorld.mapping index bed8117b3a..b6411ff18e 100644 --- a/mappings/net/minecraft/world/ModifiableWorld.mapping +++ b/mappings/net/minecraft/world/ModifiableWorld.mapping @@ -95,7 +95,6 @@ CLASS net/minecraft/class_1945 net/minecraft/world/ModifiableWorld COMMENT

  • {@link net.minecraft.block.Block#FORCE_STATE Block.FORCE_STATE}
    • COMMENT
  • {@link net.minecraft.block.Block#SKIP_DROPS Block.SKIP_DROPS}
    • COMMENT
  • {@link net.minecraft.block.Block#MOVED Block.MOVED}
    • - COMMENT
  • {@link net.minecraft.block.Block#SKIP_LIGHTING_UPDATES Block.SKIP_LIGHTING_UPDATES}
    • COMMENT
COMMENT COMMENT @see #setBlockState(BlockPos, BlockState, int, int) diff --git a/mappings/net/minecraft/world/PersistentState.mapping b/mappings/net/minecraft/world/PersistentState.mapping index 4975e7de99..6816fe182c 100644 --- a/mappings/net/minecraft/world/PersistentState.mapping +++ b/mappings/net/minecraft/world/PersistentState.mapping @@ -9,3 +9,4 @@ CLASS net/minecraft/class_18 net/minecraft/world/PersistentState ARG 1 dirty METHOD method_79 isDirty ()Z METHOD method_80 markDirty ()V + CLASS class_8645 Type diff --git a/mappings/net/minecraft/world/PersistentStateManager.mapping b/mappings/net/minecraft/world/PersistentStateManager.mapping index fd9369a087..9568170c0d 100644 --- a/mappings/net/minecraft/world/PersistentStateManager.mapping +++ b/mappings/net/minecraft/world/PersistentStateManager.mapping @@ -6,9 +6,10 @@ CLASS net/minecraft/class_26 net/minecraft/world/PersistentStateManager METHOD (Ljava/io/File;Lcom/mojang/datafixers/DataFixer;)V ARG 1 directory ARG 2 dataFixer - METHOD method_120 readFromFile (Ljava/util/function/Function;Ljava/lang/String;)Lnet/minecraft/class_18; + METHOD method_120 readFromFile (Ljava/util/function/Function;Lnet/minecraft/class_4284;Ljava/lang/String;)Lnet/minecraft/class_18; ARG 1 readFunction - ARG 2 id + ARG 2 dataFixTypes + ARG 3 id METHOD method_123 set (Ljava/lang/String;Lnet/minecraft/class_18;)V ARG 1 id ARG 2 state @@ -17,15 +18,15 @@ CLASS net/minecraft/class_26 net/minecraft/world/PersistentStateManager ARG 1 stream METHOD method_17922 getFile (Ljava/lang/String;)Ljava/io/File; ARG 1 id - METHOD method_17923 readNbt (Ljava/lang/String;I)Lnet/minecraft/class_2487; + METHOD method_17923 readNbt (Ljava/lang/String;Lnet/minecraft/class_4284;I)Lnet/minecraft/class_2487; ARG 1 id - ARG 2 dataVersion - METHOD method_17924 getOrCreate (Ljava/util/function/Function;Ljava/util/function/Supplier;Ljava/lang/String;)Lnet/minecraft/class_18; - ARG 1 readFunction - ARG 2 supplier - ARG 3 id - METHOD method_20786 get (Ljava/util/function/Function;Ljava/lang/String;)Lnet/minecraft/class_18; - ARG 1 readFunction + ARG 2 dataFixTypes + ARG 3 currentSaveVersion + METHOD method_17924 getOrCreate (Lnet/minecraft/class_18$class_8645;Ljava/lang/String;)Lnet/minecraft/class_18; + ARG 1 type + ARG 2 id + METHOD method_20786 get (Lnet/minecraft/class_18$class_8645;Ljava/lang/String;)Lnet/minecraft/class_18; + ARG 1 type ARG 2 id METHOD method_32384 (Ljava/lang/String;Lnet/minecraft/class_18;)V ARG 1 id diff --git a/mappings/net/minecraft/world/PortalForcer.mapping b/mappings/net/minecraft/world/PortalForcer.mapping index 4c32a33ed0..4bb8892cb7 100644 --- a/mappings/net/minecraft/world/PortalForcer.mapping +++ b/mappings/net/minecraft/world/PortalForcer.mapping @@ -11,7 +11,7 @@ CLASS net/minecraft/class_1946 net/minecraft/world/PortalForcer METHOD method_30479 (Lnet/minecraft/class_4156;)Lnet/minecraft/class_5459$class_5460; ARG 1 poi METHOD method_30480 (Lnet/minecraft/class_2680;Lnet/minecraft/class_2338;)Z - ARG 2 pos + ARG 2 posx METHOD method_30481 isValidPortalPos (Lnet/minecraft/class_2338;Lnet/minecraft/class_2338$class_2339;Lnet/minecraft/class_2350;I)Z ARG 1 pos ARG 2 temp @@ -28,3 +28,5 @@ CLASS net/minecraft/class_1946 net/minecraft/world/PortalForcer ARG 1 poi METHOD method_39663 (Lnet/minecraft/class_2784;Lnet/minecraft/class_4156;)Z ARG 1 poi + METHOD method_45550 isBlockStateValid (Lnet/minecraft/class_2338$class_2339;)Z + ARG 1 pos diff --git a/mappings/net/minecraft/world/RedstoneView.mapping b/mappings/net/minecraft/world/RedstoneView.mapping new file mode 100644 index 0000000000..0aae688ebc --- /dev/null +++ b/mappings/net/minecraft/world/RedstoneView.mapping @@ -0,0 +1,21 @@ +CLASS net/minecraft/class_8235 net/minecraft/world/RedstoneView + FIELD field_43226 DIRECTIONS [Lnet/minecraft/class_2350; + METHOD method_49803 isReceivingRedstonePower (Lnet/minecraft/class_2338;)Z + ARG 1 pos + METHOD method_49804 getReceivedRedstonePower (Lnet/minecraft/class_2338;)I + ARG 1 pos + METHOD method_49805 getStrongRedstonePower (Lnet/minecraft/class_2338;Lnet/minecraft/class_2350;)I + ARG 1 pos + ARG 2 direction + METHOD method_49806 getEmittedRedstonePower (Lnet/minecraft/class_2338;Lnet/minecraft/class_2350;Z)I + ARG 1 pos + ARG 2 direction + ARG 3 onlyFromGate + METHOD method_49807 isEmittingRedstonePower (Lnet/minecraft/class_2338;Lnet/minecraft/class_2350;)Z + ARG 1 pos + ARG 2 direction + METHOD method_49808 getEmittedRedstonePower (Lnet/minecraft/class_2338;Lnet/minecraft/class_2350;)I + ARG 1 pos + ARG 2 direction + METHOD method_49809 getReceivedStrongRedstonePower (Lnet/minecraft/class_2338;)I + ARG 1 pos diff --git a/mappings/net/minecraft/world/RegistryWorldView.mapping b/mappings/net/minecraft/world/RegistryWorldView.mapping index a40e6bdfc3..504dfbe45d 100644 --- a/mappings/net/minecraft/world/RegistryWorldView.mapping +++ b/mappings/net/minecraft/world/RegistryWorldView.mapping @@ -3,4 +3,3 @@ CLASS net/minecraft/class_5423 net/minecraft/world/RegistryWorldView COMMENT a registry manager. COMMENT COMMENT @see #getRegistryManager() - METHOD method_30349 getRegistryManager ()Lnet/minecraft/class_5455; diff --git a/mappings/net/minecraft/world/SaveProperties.mapping b/mappings/net/minecraft/world/SaveProperties.mapping index a7d73d2dfe..1c0567e7fc 100644 --- a/mappings/net/minecraft/world/SaveProperties.mapping +++ b/mappings/net/minecraft/world/SaveProperties.mapping @@ -34,10 +34,14 @@ CLASS net/minecraft/class_5219 net/minecraft/world/SaveProperties ARG 1 id METHOD method_27859 getMainWorldProperties ()Lnet/minecraft/class_5268; 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 + METHOD method_29036 getDragonFight ()Lnet/minecraft/class_2881$class_8576; + METHOD method_29037 setDragonFight (Lnet/minecraft/class_2881$class_8576;)V ARG 1 dragonFight 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 - ARG 1 dataPackSettings + METHOD method_29589 getDataConfiguration ()Lnet/minecraft/class_7712; + METHOD method_29590 updateLevelInfo (Lnet/minecraft/class_7712;)V + ARG 1 dataConfiguration + METHOD method_45555 isFlatWorld ()Z + METHOD method_45556 isDebugWorld ()Z + METHOD method_45560 getEnabledFeatures ()Lnet/minecraft/class_7699; + METHOD method_49900 getRemovedFeatures ()Ljava/util/Set; diff --git a/mappings/net/minecraft/world/SpawnHelper.mapping b/mappings/net/minecraft/world/SpawnHelper.mapping index e3d73ea07a..ea7eb6f107 100644 --- a/mappings/net/minecraft/world/SpawnHelper.mapping +++ b/mappings/net/minecraft/world/SpawnHelper.mapping @@ -58,7 +58,7 @@ CLASS net/minecraft/class_1948 net/minecraft/world/SpawnHelper ARG 5 biomeEntry METHOD method_35238 (Lnet/minecraft/class_1299;Lnet/minecraft/class_2338;Lnet/minecraft/class_2791;)Z ARG 0 type - ARG 1 pos + ARG 1 posx ARG 2 chunk METHOD method_35239 (Lnet/minecraft/class_1308;Lnet/minecraft/class_2791;)V ARG 0 entity diff --git a/mappings/net/minecraft/world/StructureLocator.mapping b/mappings/net/minecraft/world/StructureLocator.mapping index c94965dbeb..ec9aabc161 100644 --- a/mappings/net/minecraft/world/StructureLocator.mapping +++ b/mappings/net/minecraft/world/StructureLocator.mapping @@ -58,7 +58,7 @@ CLASS net/minecraft/class_6832 net/minecraft/world/StructureLocator ARG 0 feature ARG 1 references METHOD method_39837 (Lnet/minecraft/class_3195;Ljava/lang/Long;Lit/unimi/dsi/fastutil/objects/Object2IntMap;)Lit/unimi/dsi/fastutil/objects/Object2IntMap; - ARG 1 pos + ARG 1 posx ARG 2 referencesByStructure METHOD method_39838 createMapIfEmpty (Lit/unimi/dsi/fastutil/objects/Object2IntMap;)Lit/unimi/dsi/fastutil/objects/Object2IntMap; ARG 0 map diff --git a/mappings/net/minecraft/world/World.mapping b/mappings/net/minecraft/world/World.mapping index 3e2147ce17..cf48b738d4 100644 --- a/mappings/net/minecraft/world/World.mapping +++ b/mappings/net/minecraft/world/World.mapping @@ -18,11 +18,12 @@ CLASS net/minecraft/class_1937 net/minecraft/world/World FIELD field_36402 dimensionEntry Lnet/minecraft/class_6880; FIELD field_38226 neighborUpdater Lnet/minecraft/class_7165; FIELD field_38861 threadSafeRandom Lnet/minecraft/class_5819; + FIELD field_42475 registryManager Lnet/minecraft/class_5455; + FIELD field_42476 damageSources Lnet/minecraft/class_8109; FIELD field_9223 border Lnet/minecraft/class_2784; FIELD field_9226 ambientDarkness I FIELD field_9229 random Lnet/minecraft/class_5819; FIELD field_9232 properties Lnet/minecraft/class_5269; - FIELD field_9233 DIRECTIONS [Lnet/minecraft/class_2350; FIELD field_9234 thunderGradient F FIELD field_9235 rainGradient F FIELD field_9236 isClient Z @@ -32,15 +33,16 @@ CLASS net/minecraft/class_1937 net/minecraft/world/World FIELD field_9251 thunderGradientPrev F FIELD field_9253 rainGradientPrev F FIELD field_9256 lcgBlockSeed I - METHOD (Lnet/minecraft/class_5269;Lnet/minecraft/class_5321;Lnet/minecraft/class_6880;Ljava/util/function/Supplier;ZZJI)V + METHOD (Lnet/minecraft/class_5269;Lnet/minecraft/class_5321;Lnet/minecraft/class_5455;Lnet/minecraft/class_6880;Ljava/util/function/Supplier;ZZJI)V ARG 1 properties ARG 2 registryRef - ARG 3 dimension - ARG 4 profiler - ARG 5 isClient - ARG 6 debugWorld - ARG 7 seed - ARG 9 maxChainedNeighborUpdates + ARG 3 registryManager + ARG 4 dimensionEntry + ARG 5 profiler + ARG 6 isClient + ARG 7 debugWorld + ARG 8 biomeAccess + ARG 10 maxChainedNeighborUpdates METHOD method_16107 getProfiler ()Lnet/minecraft/class_3695; METHOD method_16109 scheduleBlockRerenderIfNeeded (Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;Lnet/minecraft/class_2680;)V ARG 1 pos @@ -129,8 +131,6 @@ CLASS net/minecraft/class_1937 net/minecraft/world/World METHOD method_31595 addBlockBreakParticles (Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;)V ARG 1 pos ARG 2 state - METHOD method_31596 (Ljava/util/function/Predicate;Ljava/util/List;Lnet/minecraft/class_5575;Lnet/minecraft/class_1297;)V - ARG 3 entity METHOD method_38989 shouldUpdatePostDeath (Lnet/minecraft/class_1297;)Z ARG 1 entity METHOD method_39425 shouldTickBlocksInChunk (J)Z @@ -148,7 +148,7 @@ CLASS net/minecraft/class_1937 net/minecraft/world/World METHOD method_43126 getSpawnPos ()Lnet/minecraft/class_2338; METHOD method_43127 getSpawnAngle ()F METHOD method_43128 playSound (Lnet/minecraft/class_1657;DDDLnet/minecraft/class_3414;Lnet/minecraft/class_3419;FF)V - ARG 1 player + ARG 1 except ARG 2 x ARG 4 y ARG 6 z @@ -157,13 +157,82 @@ CLASS net/minecraft/class_1937 net/minecraft/world/World ARG 10 volume ARG 11 pitch METHOD method_43129 playSoundFromEntity (Lnet/minecraft/class_1657;Lnet/minecraft/class_1297;Lnet/minecraft/class_3414;Lnet/minecraft/class_3419;FF)V - ARG 1 player + ARG 1 except ARG 2 entity ARG 3 sound ARG 4 category ARG 5 volume ARG 6 pitch METHOD method_44013 getDimensionKey ()Lnet/minecraft/class_5321; + METHOD method_45445 playSound (Lnet/minecraft/class_1297;Lnet/minecraft/class_2338;Lnet/minecraft/class_3414;Lnet/minecraft/class_3419;FF)V + ARG 1 except + ARG 2 pos + ARG 3 sound + ARG 4 category + ARG 5 volume + ARG 6 pitch + METHOD method_45446 playSoundAtBlockCenter (Lnet/minecraft/class_2338;Lnet/minecraft/class_3414;Lnet/minecraft/class_3419;FFZ)V + ARG 1 pos + ARG 2 sound + ARG 3 category + ARG 4 volume + ARG 5 pitch + ARG 6 useDistance + METHOD method_46407 createExplosion (Lnet/minecraft/class_1297;Lnet/minecraft/class_1282;Lnet/minecraft/class_5362;Lnet/minecraft/class_243;FZLnet/minecraft/class_1937$class_7867;)Lnet/minecraft/class_1927; + COMMENT Creates an explosion. + COMMENT + COMMENT @see #createExplosion(Entity, DamageSource, ExplosionBehavior, double, double, double, float, boolean, World.ExplosionSourceType) + ARG 1 entity + ARG 2 damageSource + ARG 3 behavior + ARG 4 pos + ARG 5 power + ARG 6 createFire + ARG 7 explosionSourceType + METHOD method_46668 createExplosion (Lnet/minecraft/class_1297;Lnet/minecraft/class_1282;Lnet/minecraft/class_5362;DDDFZLnet/minecraft/class_1937$class_7867;Z)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 explosionSourceType + ARG 13 particles + METHOD method_46669 getDestructionType (Lnet/minecraft/class_1928$class_4313;)Lnet/minecraft/class_1927$class_4179; + ARG 1 gameRuleKey + METHOD method_47574 collectEntitiesByType (Lnet/minecraft/class_5575;Lnet/minecraft/class_238;Ljava/util/function/Predicate;Ljava/util/List;)V + ARG 1 filter + ARG 2 box + ARG 3 predicate + ARG 4 result + METHOD method_47575 collectEntitiesByType (Lnet/minecraft/class_5575;Lnet/minecraft/class_238;Ljava/util/function/Predicate;Ljava/util/List;I)V + COMMENT Collects entities of the given type in {@code box}, up to {@code limit}. Using this can + COMMENT improve performance, especially if {@code limit} is small. + COMMENT + COMMENT @see #getEntitiesByType + ARG 1 filter + ARG 2 box + ARG 3 predicate + ARG 4 result + ARG 5 limit + METHOD method_47576 (Ljava/util/function/Predicate;Ljava/util/List;ILnet/minecraft/class_5575;Lnet/minecraft/class_1297;)Lnet/minecraft/class_7927$class_7928; + ARG 4 entity + METHOD method_47967 playSound (Lnet/minecraft/class_1657;DDDLnet/minecraft/class_3414;Lnet/minecraft/class_3419;FFJ)V + ARG 1 except + ARG 2 x + ARG 4 y + ARG 6 z + ARG 8 sound + ARG 9 category + ARG 10 volume + ARG 11 pitch + ARG 12 seed + METHOD method_48760 sendEntityDamage (Lnet/minecraft/class_1297;Lnet/minecraft/class_1282;)V + ARG 1 entity + ARG 2 damageSource + METHOD method_48963 getDamageSources ()Lnet/minecraft/class_8109; METHOD method_8413 updateListeners (Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;Lnet/minecraft/class_2680;I)V ARG 1 pos ARG 2 oldState @@ -192,21 +261,21 @@ CLASS net/minecraft/class_1937 net/minecraft/world/World METHOD method_8430 getRainGradient (F)F ARG 1 delta METHOD method_8433 getRecipeManager ()Lnet/minecraft/class_1863; - METHOD method_8437 createExplosion (Lnet/minecraft/class_1297;DDDFLnet/minecraft/class_1927$class_4179;)Lnet/minecraft/class_1927; + METHOD method_8437 createExplosion (Lnet/minecraft/class_1297;DDDFLnet/minecraft/class_1937$class_7867;)Lnet/minecraft/class_1927; COMMENT Creates an explosion without creating fire. COMMENT - COMMENT @see #createExplosion(Entity, DamageSource, ExplosionBehavior, double, double, double, float, boolean, Explosion.DestructionType) + COMMENT @see #createExplosion(Entity, DamageSource, ExplosionBehavior, double, double, double, float, boolean, World.ExplosionSourceType) ARG 1 entity ARG 2 x ARG 4 y ARG 6 z ARG 8 power - ARG 9 destructionType + ARG 9 explosionSourceType METHOD method_8438 addBlockEntity (Lnet/minecraft/class_2586;)V ARG 1 blockEntity METHOD method_8442 getSkyAngleRadians (F)F ARG 1 tickDelta - METHOD method_8449 playSoundFromEntity (Lnet/minecraft/class_1657;Lnet/minecraft/class_1297;Lnet/minecraft/class_3414;Lnet/minecraft/class_3419;FFJ)V + METHOD method_8449 playSoundFromEntity (Lnet/minecraft/class_1657;Lnet/minecraft/class_1297;Lnet/minecraft/class_6880;Lnet/minecraft/class_3419;FFJ)V ARG 1 except COMMENT the player that should not receive the sound, or {@code null} ARG 2 entity @@ -222,13 +291,13 @@ CLASS net/minecraft/class_1937 net/minecraft/world/World COMMENT @see #updateNeighborsExcept(BlockPos, Block, Direction) ARG 1 pos ARG 2 sourceBlock - 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; + METHOD method_8454 createExplosion (Lnet/minecraft/class_1297;Lnet/minecraft/class_1282;Lnet/minecraft/class_5362;DDDFZLnet/minecraft/class_1937$class_7867;)Lnet/minecraft/class_1927; COMMENT Creates an explosion. ARG 1 entity COMMENT the entity that exploded (like TNT) or {@code null} to indicate no entity exploded ARG 2 damageSource COMMENT the custom damage source, or {@code null} to use the default - COMMENT ({@link DamageSource#explosion(Explosion)}) + COMMENT ({@link net.minecraft.entity.damage.DamageSources#explosion(Explosion)}) ARG 3 behavior COMMENT the explosion behavior, or {@code null} to use the default ARG 4 x @@ -237,16 +306,12 @@ CLASS net/minecraft/class_1937 net/minecraft/world/World ARG 10 power ARG 11 createFire COMMENT whether the explosion should create fire - ARG 12 destructionType - COMMENT the destruction type of the explosion + ARG 12 explosionSourceType METHOD method_8455 updateComparators (Lnet/minecraft/class_2338;Lnet/minecraft/class_2248;)V ARG 1 pos ARG 2 block METHOD method_8458 isSavingDisabled ()Z - METHOD method_8459 isEmittingRedstonePower (Lnet/minecraft/class_2338;Lnet/minecraft/class_2350;)Z - ARG 1 pos - ARG 2 direction - METHOD method_8465 playSound (Lnet/minecraft/class_1657;DDDLnet/minecraft/class_3414;Lnet/minecraft/class_3419;FFJ)V + METHOD method_8465 playSound (Lnet/minecraft/class_1657;DDDLnet/minecraft/class_6880;Lnet/minecraft/class_3419;FFJ)V ARG 1 except COMMENT the player that should not receive the sound, or {@code null} ARG 2 x @@ -282,15 +347,6 @@ CLASS net/minecraft/class_1937 net/minecraft/world/World ARG 1 pos METHOD method_8478 getThunderGradient (F)F ARG 1 delta - METHOD method_8479 isReceivingRedstonePower (Lnet/minecraft/class_2338;)Z - ARG 1 pos - METHOD method_8480 hasHighHumidity (Lnet/minecraft/class_2338;)Z - COMMENT {@return whether the biome at {@code pos} has high humidity} - COMMENT - COMMENT

Humidity affects the chance of fire spreading. - ARG 1 pos - METHOD method_8482 getReceivedRedstonePower (Lnet/minecraft/class_2338;)I - ARG 1 pos METHOD method_8486 playSound (DDDLnet/minecraft/class_3414;Lnet/minecraft/class_3419;FFZ)V ARG 1 x ARG 3 y @@ -300,8 +356,6 @@ CLASS net/minecraft/class_1937 net/minecraft/world/World 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 COMMENT Triggers a neighbor update originating from {@code sourcePos} at COMMENT {@code pos}. @@ -320,9 +374,6 @@ CLASS net/minecraft/class_1937 net/minecraft/world/World ARG 12 velocityZ METHOD method_8496 setThunderGradient (F)V ARG 1 thunderGradient - METHOD method_8499 getEmittedRedstonePower (Lnet/minecraft/class_2338;Lnet/minecraft/class_2350;)I - ARG 1 pos - ARG 2 direction METHOD method_8500 getWorldChunk (Lnet/minecraft/class_2338;)Lnet/minecraft/class_2818; COMMENT {@return the chunk that contains {@code pos}} ARG 1 pos @@ -393,17 +444,17 @@ CLASS net/minecraft/class_1937 net/minecraft/world/World ARG 1 x ARG 2 y ARG 3 z - METHOD method_8537 createExplosion (Lnet/minecraft/class_1297;DDDFZLnet/minecraft/class_1927$class_4179;)Lnet/minecraft/class_1927; + METHOD method_8537 createExplosion (Lnet/minecraft/class_1297;DDDFZLnet/minecraft/class_1937$class_7867;)Lnet/minecraft/class_1927; COMMENT Creates an explosion. COMMENT - COMMENT @see #createExplosion(Entity, DamageSource, ExplosionBehavior, double, double, double, float, boolean, Explosion.DestructionType) + COMMENT @see #createExplosion(Entity, DamageSource, ExplosionBehavior, double, double, double, float, boolean, World.ExplosionSourceType) ARG 1 entity ARG 2 x ARG 4 y ARG 6 z ARG 8 power ARG 9 createFire - ARG 10 destructionType + ARG 10 explosionSourceType METHOD method_8538 addDetailsToCrashReport (Lnet/minecraft/class_128;)Lnet/minecraft/class_129; ARG 1 report METHOD method_8543 initWeatherGradients ()V @@ -420,3 +471,4 @@ CLASS net/minecraft/class_1937 net/minecraft/world/World ARG 13 nbt METHOD method_8558 isValidHorizontally (Lnet/minecraft/class_2338;)Z ARG 0 pos + CLASS class_7867 ExplosionSourceType diff --git a/mappings/net/minecraft/world/WorldAccess.mapping b/mappings/net/minecraft/world/WorldAccess.mapping index 7911e34b45..5b828cea5b 100644 --- a/mappings/net/minecraft/world/WorldAccess.mapping +++ b/mappings/net/minecraft/world/WorldAccess.mapping @@ -13,20 +13,20 @@ CLASS net/minecraft/class_1936 net/minecraft/world/WorldAccess ARG 2 event ARG 3 pos METHOD method_39224 getTickOrder ()J - METHOD method_39279 createAndScheduleBlockTick (Lnet/minecraft/class_2338;Lnet/minecraft/class_2248;I)V + METHOD method_39279 scheduleBlockTick (Lnet/minecraft/class_2338;Lnet/minecraft/class_2248;I)V ARG 1 pos ARG 2 block ARG 3 delay - METHOD method_39280 createAndScheduleBlockTick (Lnet/minecraft/class_2338;Lnet/minecraft/class_2248;ILnet/minecraft/class_1953;)V + METHOD method_39280 scheduleBlockTick (Lnet/minecraft/class_2338;Lnet/minecraft/class_2248;ILnet/minecraft/class_1953;)V ARG 1 pos ARG 2 block ARG 3 delay ARG 4 priority - METHOD method_39281 createAndScheduleFluidTick (Lnet/minecraft/class_2338;Lnet/minecraft/class_3611;I)V + METHOD method_39281 scheduleFluidTick (Lnet/minecraft/class_2338;Lnet/minecraft/class_3611;I)V ARG 1 pos ARG 2 fluid ARG 3 delay - METHOD method_39282 createAndScheduleFluidTick (Lnet/minecraft/class_2338;Lnet/minecraft/class_3611;ILnet/minecraft/class_1953;)V + METHOD method_39282 scheduleFluidTick (Lnet/minecraft/class_2338;Lnet/minecraft/class_3611;ILnet/minecraft/class_1953;)V ARG 1 pos ARG 2 fluid ARG 3 delay @@ -55,8 +55,13 @@ CLASS net/minecraft/class_1936 net/minecraft/world/WorldAccess ARG 1 event ARG 2 pos ARG 3 emitter + METHOD method_45447 playSound (Lnet/minecraft/class_1657;Lnet/minecraft/class_2338;Lnet/minecraft/class_3414;Lnet/minecraft/class_3419;)V + ARG 1 except + ARG 2 pos + ARG 3 sound + ARG 4 category METHOD method_8396 playSound (Lnet/minecraft/class_1657;Lnet/minecraft/class_2338;Lnet/minecraft/class_3414;Lnet/minecraft/class_3419;FF)V - ARG 1 player + ARG 1 except ARG 2 pos ARG 3 sound ARG 4 category diff --git a/mappings/net/minecraft/world/WorldEvents.mapping b/mappings/net/minecraft/world/WorldEvents.mapping index 4962af39c7..5d43b17af6 100644 --- a/mappings/net/minecraft/world/WorldEvents.mapping +++ b/mappings/net/minecraft/world/WorldEvents.mapping @@ -52,14 +52,6 @@ CLASS net/minecraft/class_6088 net/minecraft/world/WorldEvents COMMENT A brewing stand brews. COMMENT
Plays the brewing stand brewing sound event. COMMENT

Called by {@link net.minecraft.block.entity.BrewingStandBlockEntity#craft(net.minecraft.world.World, net.minecraft.util.math.BlockPos, net.minecraft.util.collection.DefaultedList) BrewingStandBlockEntity#craft} - FIELD field_31124 IRON_TRAPDOOR_CLOSES I - COMMENT An iron trapdoor closes. - COMMENT
Plays the iron trapdoor closing sound event. - COMMENT

Called by {@link net.minecraft.block.TrapdoorBlock#playToggleSound(net.minecraft.entity.player.PlayerEntity, net.minecraft.world.World, net.minecraft.util.math.BlockPos, boolean) TrapdoorBlock#playToggleSound} - FIELD field_31125 IRON_TRAPDOOR_OPENS I - COMMENT An iron trapdoor opens. - COMMENT
Plays the iron trapdoor opening sound event. - COMMENT

Called by {@link net.minecraft.block.TrapdoorBlock#playToggleSound(net.minecraft.entity.player.PlayerEntity, net.minecraft.world.World, net.minecraft.util.math.BlockPos, boolean) TrapdoorBlock#playToggleSound} FIELD field_31126 END_PORTAL_OPENED I COMMENT An end portal is opened. COMMENT
Plays the end portal spawn sound event. @@ -152,7 +144,7 @@ CLASS net/minecraft/class_6088 net/minecraft/world/WorldEvents COMMENT {@link net.minecraft.block.CarvedPumpkinBlock#trySpawnEntity(net.minecraft.world.World, net.minecraft.util.math.BlockPos) CarvedPumpkinBlock#trySpawnEntity}, COMMENT {@link net.minecraft.entity.ai.goal.EatGrassGoal#tick() EatGrassGoal#tick}, COMMENT {@link net.minecraft.entity.passive.FoxEntity#tick() FoxEntity#tick}, - COMMENT {@link net.minecraft.block.PowderSnowBlock#tryDrainFluid(net.minecraft.world.WorldAccess, net.minecraft.util.math.BlockPos, net.minecraft.block.BlockState) PowderSnowBlock#tryDrainFluid}, + COMMENT {@link net.minecraft.block.PowderSnowBlock#tryDrainFluid(net.minecraft.entity.player.PlayerEntity, net.minecraft.world.WorldAccess, net.minecraft.util.math.BlockPos, net.minecraft.block.BlockState) PowderSnowBlock#tryDrainFluid}, COMMENT {@link net.minecraft.entity.passive.RabbitEntity.EatCarrotCropGoal#tick() RabbitEntity.EatCarrotCropGoal#tick}, COMMENT {@link net.minecraft.block.SpongeBlock#update(net.minecraft.world.World, net.minecraft.util.math.BlockPos) SpongeBlock#update}, COMMENT {@link net.minecraft.block.TurtleEggBlock#breakEgg(net.minecraft.world.World, net.minecraft.util.math.BlockPos, net.minecraft.block.BlockState) TurtleEggBlock#breakEgg}, @@ -246,24 +238,6 @@ CLASS net/minecraft/class_6088 net/minecraft/world/WorldEvents COMMENT A firework rocket is shot. COMMENT
Plays the firework shoot sound event. COMMENT

Called by {@link net.minecraft.block.dispenser.DispenserBehavior DispenserBehavior} - FIELD field_31163 IRON_DOOR_OPENS I - COMMENT An iron door is opened. - COMMENT
Plays the iron door opening sound event. - COMMENT

Called by {@link net.minecraft.block.DoorBlock#playOpenCloseSound(net.minecraft.world.World, net.minecraft.util.math.BlockPos, boolean) DoorBlock#playOpenCloseSound} - FIELD field_31164 WOODEN_DOOR_OPENS I - COMMENT A wooden door is opened. - COMMENT
Plays the wooden door opening sound event. - COMMENT

Called by {@link net.minecraft.block.DoorBlock#onUse(net.minecraft.block.BlockState, net.minecraft.world.World, net.minecraft.util.math.BlockPos, net.minecraft.entity.player.PlayerEntity, net.minecraft.util.Hand, net.minecraft.util.hit.BlockHitResult) DoorBlock#onUse}, - COMMENT and {@link net.minecraft.block.DoorBlock#playOpenCloseSound(net.minecraft.world.World, net.minecraft.util.math.BlockPos, boolean) DoorBlock#playOpenCloseSound} - FIELD field_31165 WOODEN_TRAPDOOR_OPENS I - COMMENT A wooden trapdoor is opened. - COMMENT
Plays the wooden trapdoor opening sound event. - COMMENT

Called by {@link net.minecraft.block.TrapdoorBlock#playToggleSound(net.minecraft.entity.player.PlayerEntity, net.minecraft.world.World, net.minecraft.util.math.BlockPos, boolean) TrapdoorBlock#playToggleSound} - FIELD field_31166 FENCE_GATE_OPENS I - COMMENT A fence gate is opened. - COMMENT
Plays the fence gate opening sound event. - COMMENT

Called by {@link net.minecraft.block.FenceGateBlock#onUse(net.minecraft.block.BlockState, net.minecraft.world.World, net.minecraft.util.math.BlockPos, net.minecraft.entity.player.PlayerEntity, net.minecraft.util.Hand, net.minecraft.util.hit.BlockHitResult) FenceGateBlock#onUse}, - COMMENT and {@link net.minecraft.block.FenceGateBlock#neighborUpdate(net.minecraft.block.BlockState, net.minecraft.world.World, net.minecraft.util.math.BlockPos, net.minecraft.block.Block, net.minecraft.util.math.BlockPos, boolean) FenceGateBlock#neighborUpdate} FIELD field_31167 FIRE_EXTINGUISHED I COMMENT Fire is extinguished. COMMENT
Plays the appropriate fire extinguish sound event. @@ -271,31 +245,6 @@ CLASS net/minecraft/class_6088 net/minecraft/world/WorldEvents COMMENT

Called by {@link net.minecraft.block.AbstractFireBlock#onBreak(net.minecraft.world.World, net.minecraft.util.math.BlockPos, net.minecraft.block.BlockState, net.minecraft.entity.player.PlayerEntity) AbstractFireBlock#onBreak}, COMMENT {@link net.minecraft.entity.projectile.thrown.PotionEntity#extinguishFire(net.minecraft.util.math.BlockPos) PotionEntity#extinguishFire}, COMMENT and {@link net.minecraft.item.ShovelItem#useOnBlock(net.minecraft.item.ItemUsageContext) ShovelItem#useOnBlock} - FIELD field_31168 MUSIC_DISC_PLAYED I - COMMENT A music disc is played. - COMMENT
Plays the appropriate music. - COMMENT
The Raw ID of the music disc item must be supplied as extra data. - COMMENT
A {@code 0} should be passed to stop music. - COMMENT

Called by {@link net.minecraft.item.MusicDiscItem#useOnBlock(net.minecraft.item.ItemUsageContext) MusicDiscItem#useOnBlock}, - COMMENT and {@link net.minecraft.block.JukeboxBlock#removeRecord(net.minecraft.world.World, net.minecraft.util.math.BlockPos) JukeboxBlock#removeRecord} - FIELD field_31169 IRON_DOOR_CLOSES I - COMMENT An iron door is closed. - COMMENT
Plays the iron door closing sound event. - COMMENT

Called by {@link net.minecraft.block.DoorBlock#playOpenCloseSound(net.minecraft.world.World, net.minecraft.util.math.BlockPos, boolean) DoorBlock#playOpenCloseSound} - FIELD field_31170 WOODEN_DOOR_CLOSES I - COMMENT A wooden door is closed. - COMMENT
Plays the wooden door closing sound event. - COMMENT

Called by {@link net.minecraft.block.DoorBlock#onUse(net.minecraft.block.BlockState, net.minecraft.world.World, net.minecraft.util.math.BlockPos, net.minecraft.entity.player.PlayerEntity, net.minecraft.util.Hand, net.minecraft.util.hit.BlockHitResult) DoorBlock#onUse}, - COMMENT and {@link net.minecraft.block.DoorBlock#playOpenCloseSound(net.minecraft.world.World, net.minecraft.util.math.BlockPos, boolean) DoorBlock#playOpenCloseSound} - FIELD field_31171 WOODEN_TRAPDOOR_CLOSES I - COMMENT A wooden trapdoor is closed. - COMMENT
Plays the wooden trapdoor closing sound event. - COMMENT

Called by {@link net.minecraft.block.TrapdoorBlock#playToggleSound(net.minecraft.entity.player.PlayerEntity, net.minecraft.world.World, net.minecraft.util.math.BlockPos, boolean) TrapdoorBlock#playToggleSound} - FIELD field_31172 FENCE_GATE_CLOSES I - COMMENT A fence gate is closed. - COMMENT
Plays the fence gate closing sound event. - COMMENT

Called by {@link net.minecraft.block.FenceGateBlock#onUse(net.minecraft.block.BlockState, net.minecraft.world.World, net.minecraft.util.math.BlockPos, net.minecraft.entity.player.PlayerEntity, net.minecraft.util.Hand, net.minecraft.util.hit.BlockHitResult) FenceGateBlock#onUse}, - COMMENT and {@link net.minecraft.block.FenceGateBlock#neighborUpdate(net.minecraft.block.BlockState, net.minecraft.world.World, net.minecraft.util.math.BlockPos, net.minecraft.block.Block, net.minecraft.util.math.BlockPos, boolean) FenceGateBlock#neighborUpdate} FIELD field_31173 GHAST_WARNS I COMMENT A ghast warns its victim. COMMENT
Plays the ghast warn sound event. @@ -349,10 +298,29 @@ CLASS net/minecraft/class_6088 net/minecraft/world/WorldEvents COMMENT an anonymous class in {@link net.minecraft.block.dispenser.DispenserBehavior#registerDefaults() DispenserBehavior#registerDefaults}, COMMENT and {@link net.minecraft.entity.ai.brain.task.BoneMealTask#keepRunning(net.minecraft.server.world.ServerWorld, net.minecraft.entity.passive.VillagerEntity, long) BoneMealTask#keepRunning} FIELD field_37586 SCULK_CHARGE I - COMMENT Sculk... charges? Sculk is weird. + COMMENT Sculk releases a charge. COMMENT
Spawns sculk charge particles. - COMMENT
Called by {@link net.minecraft.block.entity.SculkSpreadManager#tick(net.minecraft.world.WorldAccess, net.minecraft.util.math.BlockPos, net.minecraft.util.math.random.Random, boolean) SculkSpreadManager#tick} + COMMENT

Called by {@link net.minecraft.block.entity.SculkSpreadManager#tick(net.minecraft.world.WorldAccess, net.minecraft.util.math.BlockPos, net.minecraft.util.math.random.Random, boolean) SculkSpreadManager#tick} FIELD field_38228 SCULK_SHRIEKS I COMMENT A sculk shrieker shrieks. COMMENT
Spawns shriek particles and plays the shriek sound event. - COMMENT
Called by {@link net.minecraft.block.entity.SculkShriekerBlockEntity#shriek(net.minecraft.server.world.ServerWorld, net.minecraft.entity.Entity) SculkShriekerBlockEntity#shriek} + COMMENT

Called by {@link net.minecraft.block.entity.SculkShriekerBlockEntity#shriek(net.minecraft.server.world.ServerWorld, net.minecraft.entity.Entity) SculkShriekerBlockEntity#shriek} + FIELD field_42759 BLOCK_FINISHED_BRUSHING I + COMMENT A block has been completely brushed. + COMMENT
Spawns block break particles and plays the block's brushing complete sound. + COMMENT

The block's raw ID must be supplied as extra data. + COMMENT

Called by {@link net.minecraft.block.entity.BrushableBlockEntity#finishBrushing(net.minecraft.entity.player.PlayerEntity) BrushableBlockEntity#finishBrushing} + FIELD field_42760 JUKEBOX_STARTS_PLAYING I + COMMENT A jukebox starts playing a music disc. + COMMENT
Plays the appropriate music. + COMMENT

The raw ID of the music disc item must be supplied as extra data. + COMMENT

Called by {@link net.minecraft.block.entity.JukeboxBlockEntity#startPlaying() JukeboxBlockEntity#startPlaying} + FIELD field_42761 JUKEBOX_STOPS_PLAYING I + COMMENT A jukebox stops playing a music disc. + COMMENT
Stops any music currently playing. + COMMENT

Called by {@link net.minecraft.block.entity.JukeboxBlockEntity#stopPlaying() JukeboxBlockEntity#stopPlaying} + FIELD field_43238 SNIFFER_EGG_CRACKS I + COMMENT A sniffer egg cracks. + COMMENT
Spawns between 1 and 3 egg crack particles. + COMMENT

If a {@code 1} is passed as extra data, between 3 and 6 egg crack particles are spawned instead. + COMMENT

Called by {@link net.minecraft.block.SnifferEggBlock#onBlockAdded(net.minecraft.block.BlockState, net.minecraft.world.World, net.minecraft.util.math.BlockPos, net.minecraft.block.BlockState, boolean) SnifferEggBlock#onBlockAdded} diff --git a/mappings/net/minecraft/world/WorldView.mapping b/mappings/net/minecraft/world/WorldView.mapping index d5e75d6410..60458fd92a 100644 --- a/mappings/net/minecraft/world/WorldView.mapping +++ b/mappings/net/minecraft/world/WorldView.mapping @@ -18,9 +18,6 @@ CLASS net/minecraft/class_4538 net/minecraft/world/WorldView METHOD method_22343 isRegionLoaded (Lnet/minecraft/class_2338;Lnet/minecraft/class_2338;)Z ARG 1 min ARG 2 max - METHOD method_22344 getStrongRedstonePower (Lnet/minecraft/class_2338;Lnet/minecraft/class_2350;)I - ARG 1 pos - ARG 2 direction METHOD method_22345 containsFluid (Lnet/minecraft/class_238;)Z COMMENT {@return {@code true} if any of the blocks inside {@code box} contain fluid} ARG 1 box @@ -54,6 +51,7 @@ CLASS net/minecraft/class_4538 net/minecraft/world/WorldView ARG 1 pos METHOD method_29556 getStatesInBoxIfLoaded (Lnet/minecraft/class_238;)Ljava/util/stream/Stream; ARG 1 box + METHOD method_30349 getRegistryManager ()Lnet/minecraft/class_5455; METHOD method_33597 isRegionLoaded (IIII)Z ARG 1 minX ARG 2 minZ @@ -64,6 +62,9 @@ CLASS net/minecraft/class_4538 net/minecraft/world/WorldView ARG 2 z METHOD method_42309 getPhototaxisFavor (Lnet/minecraft/class_2338;)F ARG 1 pos + METHOD method_45162 getEnabledFeatures ()Lnet/minecraft/class_7699; + METHOD method_45448 createCommandRegistryWrapper (Lnet/minecraft/class_5321;)Lnet/minecraft/class_7225; + ARG 1 registryRef METHOD method_8392 getChunk (II)Lnet/minecraft/class_2791; COMMENT {@return the chunk with position {@code chunkX} and {@code chunkZ}} ARG 1 chunkX diff --git a/mappings/net/minecraft/world/biome/Biome.mapping b/mappings/net/minecraft/world/biome/Biome.mapping index a27a4b024e..18b3f3f5c8 100644 --- a/mappings/net/minecraft/world/biome/Biome.mapping +++ b/mappings/net/minecraft/world/biome/Biome.mapping @@ -55,14 +55,14 @@ CLASS net/minecraft/class_1959 net/minecraft/world/biome/Biome ARG 1 pos METHOD method_39928 shouldGenerateLowerFrozenOceanSurface (Lnet/minecraft/class_2338;)Z ARG 1 pos - METHOD method_39929 isHot (Lnet/minecraft/class_2338;)Z + METHOD method_48162 getPrecipitation (Lnet/minecraft/class_2338;)Lnet/minecraft/class_1959$class_1963; ARG 1 pos + METHOD method_48163 hasPrecipitation ()Z METHOD method_8685 canSetIce (Lnet/minecraft/class_4538;Lnet/minecraft/class_2338;Z)Z ARG 1 world ARG 2 pos ARG 3 doWaterCheck METHOD method_8687 getWaterColor ()I - METHOD method_8694 getPrecipitation ()Lnet/minecraft/class_1959$class_1963; METHOD method_8696 canSetSnow (Lnet/minecraft/class_4538;Lnet/minecraft/class_2338;)Z ARG 1 world ARG 2 pos @@ -78,8 +78,6 @@ CLASS net/minecraft/class_1959 net/minecraft/world/biome/Biome ARG 3 z METHOD method_8712 getTemperature ()F METHOD method_8713 getWaterFogColor ()I - METHOD method_8715 getDownfall ()F - METHOD method_8724 hasHighHumidity ()Z CLASS 1 METHOD rehash (I)V ARG 1 n @@ -88,7 +86,7 @@ CLASS net/minecraft/class_1959 net/minecraft/world/biome/Biome FIELD field_26396 temperatureModifier Lnet/minecraft/class_1959$class_5484; FIELD field_26636 spawnSettings Lnet/minecraft/class_5483; FIELD field_26637 generationSettings Lnet/minecraft/class_5485; - FIELD field_9346 precipitation Lnet/minecraft/class_1959$class_1963; + FIELD field_41767 precipitation Z FIELD field_9349 temperature Ljava/lang/Float; FIELD field_9351 downfall Ljava/lang/Float; METHOD method_24379 effects (Lnet/minecraft/class_4763;)Lnet/minecraft/class_1959$class_1960; @@ -100,22 +98,16 @@ CLASS net/minecraft/class_1959 net/minecraft/world/biome/Biome ARG 1 generationSettings METHOD method_30974 spawnSettings (Lnet/minecraft/class_5483;)Lnet/minecraft/class_1959$class_1960; ARG 1 spawnSettings + METHOD method_48164 precipitation (Z)Lnet/minecraft/class_1959$class_1960; + ARG 1 precipitation METHOD method_8727 downfall (F)Lnet/minecraft/class_1959$class_1960; ARG 1 downfall - METHOD method_8735 precipitation (Lnet/minecraft/class_1959$class_1963;)Lnet/minecraft/class_1959$class_1960; - ARG 1 precipitation METHOD method_8747 temperature (F)Lnet/minecraft/class_1959$class_1960; ARG 1 temperature CLASS class_1963 Precipitation - FIELD field_24680 CODEC Lcom/mojang/serialization/Codec; - FIELD field_9385 name Ljava/lang/String; - METHOD (Ljava/lang/String;ILjava/lang/String;)V - ARG 3 name - METHOD method_8752 getName ()Ljava/lang/String; CLASS class_5482 Weather FIELD field_26398 CODEC Lcom/mojang/serialization/MapCodec; - METHOD (Lnet/minecraft/class_1959$class_1963;FLnet/minecraft/class_1959$class_5484;F)V - ARG 1 precipitation + METHOD (ZFLnet/minecraft/class_1959$class_5484;F)V ARG 2 temperature ARG 3 temperatureModifier ARG 4 downfall @@ -127,7 +119,7 @@ CLASS net/minecraft/class_1959 net/minecraft/world/biome/Biome ARG 0 weather METHOD method_30788 (Lnet/minecraft/class_1959$class_5482;)Ljava/lang/Float; ARG 0 weather - METHOD method_30789 (Lnet/minecraft/class_1959$class_5482;)Lnet/minecraft/class_1959$class_1963; + METHOD method_30789 (Lnet/minecraft/class_1959$class_5482;)Ljava/lang/Boolean; ARG 0 weather CLASS class_5484 TemperatureModifier FIELD field_26409 CODEC Lcom/mojang/serialization/Codec; diff --git a/mappings/net/minecraft/world/biome/BiomeEffects.mapping b/mappings/net/minecraft/world/biome/BiomeEffects.mapping index d8669c5ce4..767bc6d0c7 100644 --- a/mappings/net/minecraft/world/biome/BiomeEffects.mapping +++ b/mappings/net/minecraft/world/biome/BiomeEffects.mapping @@ -49,12 +49,36 @@ CLASS net/minecraft/class_4763 net/minecraft/world/biome/BiomeEffects COMMENT

An additions sound is played at 1.1% chance every tick as an ambient COMMENT sound whenever the player is in the biome with this effect. METHOD method_27345 getMusic ()Ljava/util/Optional; + METHOD method_28444 (Lnet/minecraft/class_4763;)Ljava/util/Optional; + ARG 0 effects METHOD method_28445 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; ARG 0 instance + METHOD method_28446 (Lnet/minecraft/class_4763;)Ljava/util/Optional; + ARG 0 effects + METHOD method_28447 (Lnet/minecraft/class_4763;)Ljava/util/Optional; + ARG 0 effects + METHOD method_28448 (Lnet/minecraft/class_4763;)Ljava/util/Optional; + ARG 0 effects + METHOD method_28449 (Lnet/minecraft/class_4763;)Ljava/util/Optional; + ARG 0 effects + METHOD method_28450 (Lnet/minecraft/class_4763;)Ljava/lang/Integer; + ARG 0 effects + METHOD method_28451 (Lnet/minecraft/class_4763;)Ljava/lang/Integer; + ARG 0 effects + METHOD method_28452 (Lnet/minecraft/class_4763;)Ljava/lang/Integer; + ARG 0 effects METHOD method_30810 getSkyColor ()I METHOD method_30811 getFoliageColor ()Ljava/util/Optional; METHOD method_30812 getGrassColor ()Ljava/util/Optional; + METHOD method_30813 (Lnet/minecraft/class_4763;)Lnet/minecraft/class_4763$class_5486; + ARG 0 effects METHOD method_30814 getGrassColorModifier ()Lnet/minecraft/class_4763$class_5486; + METHOD method_30815 (Lnet/minecraft/class_4763;)Ljava/util/Optional; + ARG 0 effects + METHOD method_30816 (Lnet/minecraft/class_4763;)Ljava/util/Optional; + ARG 0 effects + METHOD method_30817 (Lnet/minecraft/class_4763;)Ljava/lang/Integer; + ARG 0 effects CLASS class_4764 Builder FIELD field_22071 fogColor Ljava/util/OptionalInt; FIELD field_22072 waterColor Ljava/util/OptionalInt; @@ -77,8 +101,8 @@ CLASS net/minecraft/class_4763 net/minecraft/world/biome/BiomeEffects ARG 1 waterColor METHOD method_24397 waterFogColor (I)Lnet/minecraft/class_4763$class_4764; ARG 1 waterFogColor - METHOD method_24942 loopSound (Lnet/minecraft/class_3414;)Lnet/minecraft/class_4763$class_4764; - ARG 1 sound + METHOD method_24942 loopSound (Lnet/minecraft/class_6880;)Lnet/minecraft/class_4763$class_4764; + ARG 1 loopSound METHOD method_24943 moodSound (Lnet/minecraft/class_4968;)Lnet/minecraft/class_4763$class_4764; ARG 1 moodSound METHOD method_24944 additionsSound (Lnet/minecraft/class_4967;)Lnet/minecraft/class_4763$class_4764; diff --git a/mappings/net/minecraft/world/biome/BiomeParticleConfig.mapping b/mappings/net/minecraft/world/biome/BiomeParticleConfig.mapping index 49a1d47e7c..48d036b4b3 100644 --- a/mappings/net/minecraft/world/biome/BiomeParticleConfig.mapping +++ b/mappings/net/minecraft/world/biome/BiomeParticleConfig.mapping @@ -8,5 +8,9 @@ CLASS net/minecraft/class_4761 net/minecraft/world/biome/BiomeParticleConfig METHOD method_24369 getParticle ()Lnet/minecraft/class_2394; METHOD method_24370 shouldAddParticle (Lnet/minecraft/class_5819;)Z ARG 1 random + METHOD method_28398 (Lnet/minecraft/class_4761;)Ljava/lang/Float; + ARG 0 config METHOD method_28399 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; ARG 0 instance + METHOD method_28400 (Lnet/minecraft/class_4761;)Lnet/minecraft/class_2394; + ARG 0 config diff --git a/mappings/net/minecraft/world/biome/BuiltinBiomes.mapping b/mappings/net/minecraft/world/biome/BuiltinBiomes.mapping index 0c2df95feb..f5adf3939a 100644 --- a/mappings/net/minecraft/world/biome/BuiltinBiomes.mapping +++ b/mappings/net/minecraft/world/biome/BuiltinBiomes.mapping @@ -1,2 +1,3 @@ CLASS net/minecraft/class_5504 net/minecraft/world/biome/BuiltinBiomes - METHOD method_40363 getDefaultBiome (Lnet/minecraft/class_2378;)Lnet/minecraft/class_6880; + METHOD method_40363 bootstrap (Lnet/minecraft/class_7891;)V + ARG 0 biomeRegisterable diff --git a/mappings/net/minecraft/world/level/ColorResolver.mapping b/mappings/net/minecraft/world/biome/ColorResolver.mapping similarity index 58% rename from mappings/net/minecraft/world/level/ColorResolver.mapping rename to mappings/net/minecraft/world/biome/ColorResolver.mapping index 3af67c3dca..20da3c1dbe 100644 --- a/mappings/net/minecraft/world/level/ColorResolver.mapping +++ b/mappings/net/minecraft/world/biome/ColorResolver.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_6539 net/minecraft/world/level/ColorResolver +CLASS net/minecraft/class_6539 net/minecraft/world/biome/ColorResolver METHOD getColor (Lnet/minecraft/class_1959;DD)I ARG 1 biome ARG 2 x diff --git a/mappings/net/minecraft/world/biome/GenerationSettings.mapping b/mappings/net/minecraft/world/biome/GenerationSettings.mapping index e34c62b083..b8602993c4 100644 --- a/mappings/net/minecraft/world/biome/GenerationSettings.mapping +++ b/mappings/net/minecraft/world/biome/GenerationSettings.mapping @@ -11,6 +11,10 @@ CLASS net/minecraft/class_5485 net/minecraft/world/biome/GenerationSettings ARG 2 features METHOD method_30802 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; ARG 0 instance + METHOD method_30808 (Lnet/minecraft/class_5485;)Ljava/util/Map; + ARG 0 generationSettings + METHOD method_30809 (Lnet/minecraft/class_5485;)Ljava/util/List; + ARG 0 generationSettings METHOD method_30976 getCarversForStep (Lnet/minecraft/class_2893$class_2894;)Ljava/lang/Iterable; ARG 1 carverStep METHOD method_30982 getFlowerFeatures ()Ljava/util/List; @@ -19,18 +23,34 @@ CLASS net/minecraft/class_5485 net/minecraft/world/biome/GenerationSettings COMMENT Entries are guaranteed to not be null, but may be empty lists if an earlier step has no features, but a later step does. METHOD method_38105 isFeatureAllowed (Lnet/minecraft/class_6796;)Z ARG 1 feature - CLASS class_5495 Builder - FIELD field_26642 carvers Ljava/util/Map; - FIELD field_26643 features Ljava/util/List; - METHOD method_30987 build ()Lnet/minecraft/class_5485; - METHOD method_30988 addFeatureStep (I)V - ARG 1 stepIndex - METHOD method_30989 feature (ILnet/minecraft/class_6880;)Lnet/minecraft/class_5485$class_5495; - ARG 1 stepIndex + METHOD method_40138 (Lnet/minecraft/class_2975;)Z + ARG 0 feature + CLASS class_5495 LookupBackedBuilder + FIELD field_40894 placedFeatureLookup Lnet/minecraft/class_7871; + FIELD field_40895 configuredCarverLookup Lnet/minecraft/class_7871; + METHOD (Lnet/minecraft/class_7871;Lnet/minecraft/class_7871;)V + ARG 1 placedFeatureLookup + ARG 2 configuredCarverLookup + METHOD method_30991 carver (Lnet/minecraft/class_2893$class_2894;Lnet/minecraft/class_5321;)Lnet/minecraft/class_5485$class_5495; + ARG 1 carverStep + ARG 2 carverKey + METHOD method_30992 feature (Lnet/minecraft/class_2893$class_2895;Lnet/minecraft/class_5321;)Lnet/minecraft/class_5485$class_5495; + ARG 1 featureStep + ARG 2 featureKey + CLASS class_7868 Builder + FIELD field_40896 carverStepsToCarvers Ljava/util/Map; + FIELD field_40897 indexedFeaturesList Ljava/util/List; + METHOD method_46671 build ()Lnet/minecraft/class_5485; + METHOD method_46672 fillFeaturesList (I)V + ARG 1 size + METHOD method_46673 addFeature (ILnet/minecraft/class_6880;)Lnet/minecraft/class_5485$class_7868; + ARG 1 ordinal ARG 2 featureEntry - METHOD method_30991 carver (Lnet/minecraft/class_2893$class_2894;Lnet/minecraft/class_6880;)Lnet/minecraft/class_5485$class_5495; + METHOD method_46674 (Lnet/minecraft/class_2893$class_2894;)Ljava/util/List; + ARG 0 step + METHOD method_46675 carver (Lnet/minecraft/class_2893$class_2894;Lnet/minecraft/class_6880;)Lnet/minecraft/class_5485$class_7868; ARG 1 carverStep - ARG 2 carver - METHOD method_30992 feature (Lnet/minecraft/class_2893$class_2895;Lnet/minecraft/class_6880;)Lnet/minecraft/class_5485$class_5495; + ARG 2 carverEntry + METHOD method_46676 feature (Lnet/minecraft/class_2893$class_2895;Lnet/minecraft/class_6880;)Lnet/minecraft/class_5485$class_7868; ARG 1 featureStep - ARG 2 feature + ARG 2 featureEntry diff --git a/mappings/net/minecraft/world/biome/OverworldBiomeCreator.mapping b/mappings/net/minecraft/world/biome/OverworldBiomeCreator.mapping index 8399085421..cad1cec437 100644 --- a/mappings/net/minecraft/world/biome/OverworldBiomeCreator.mapping +++ b/mappings/net/minecraft/world/biome/OverworldBiomeCreator.mapping @@ -3,78 +3,147 @@ CLASS net/minecraft/class_5478 net/minecraft/world/biome/OverworldBiomeCreator FIELD field_35341 DEFAULT_WATER_FOG_COLOR I FIELD field_35342 DEFAULT_FOG_COLOR I FIELD field_35436 DEFAULT_MUSIC Lnet/minecraft/class_5195; - METHOD method_30683 createJungle ()Lnet/minecraft/class_1959; - METHOD method_30684 createMushroomFields ()Lnet/minecraft/class_1959; - METHOD method_30685 createBeach (ZZ)Lnet/minecraft/class_1959; - ARG 0 snowy - ARG 1 stony - METHOD method_30686 createRiver (Z)Lnet/minecraft/class_1959; - ARG 0 frozen - METHOD method_30687 createOldGrowthTaiga (Z)Lnet/minecraft/class_1959; - ARG 0 spruce - METHOD method_30690 createWindsweptHills (Z)Lnet/minecraft/class_1959; - ARG 0 forest + METHOD method_30683 createJungle (Lnet/minecraft/class_7871;Lnet/minecraft/class_7871;)Lnet/minecraft/class_1959; + ARG 0 featureLookup + ARG 1 carverLookup + METHOD method_30684 createMushroomFields (Lnet/minecraft/class_7871;Lnet/minecraft/class_7871;)Lnet/minecraft/class_1959; + ARG 0 featureLookup + ARG 1 carverLookup + METHOD method_30685 createBeach (Lnet/minecraft/class_7871;Lnet/minecraft/class_7871;ZZ)Lnet/minecraft/class_1959; + ARG 0 featureLookup + ARG 1 carverLookup + ARG 2 snowy + ARG 3 stony + METHOD method_30686 createRiver (Lnet/minecraft/class_7871;Lnet/minecraft/class_7871;Z)Lnet/minecraft/class_1959; + ARG 0 featureLookup + ARG 1 carverLookup + ARG 2 frozen + METHOD method_30687 createOldGrowthTaiga (Lnet/minecraft/class_7871;Lnet/minecraft/class_7871;Z)Lnet/minecraft/class_1959; + ARG 0 featureLookup + ARG 1 carverLookup + ARG 2 spruce + METHOD method_30690 createWindsweptHills (Lnet/minecraft/class_7871;Lnet/minecraft/class_7871;Z)Lnet/minecraft/class_1959; + ARG 0 featureLookup + ARG 1 carverLookup + ARG 2 forest METHOD method_30692 createOcean (Lnet/minecraft/class_5483$class_5496;IILnet/minecraft/class_5485$class_5495;)Lnet/minecraft/class_1959; ARG 0 spawnSettings ARG 1 waterColor ARG 2 waterFogColor - METHOD method_30694 createSavanna (ZZ)Lnet/minecraft/class_1959; - ARG 0 windswept - ARG 1 plateau - METHOD method_30695 createJungleFeatures (FZZZLnet/minecraft/class_5483$class_5496;)Lnet/minecraft/class_1959; - ARG 0 depth - ARG 1 bamboo - ARG 2 sparse - ARG 3 unmodified - ARG 4 spawnSettings - METHOD method_30696 createBadlands (Z)Lnet/minecraft/class_1959; - ARG 0 plateau - METHOD method_30698 createDesert ()Lnet/minecraft/class_1959; - METHOD method_30699 createTaiga (Z)Lnet/minecraft/class_1959; - ARG 0 cold - METHOD method_30701 createPlains (ZZZ)Lnet/minecraft/class_1959; - ARG 0 sunflower - ARG 1 snowy - ARG 2 iceSpikes - METHOD method_30702 createColdOcean (Z)Lnet/minecraft/class_1959; - ARG 0 deep - METHOD method_30703 createSparseJungle ()Lnet/minecraft/class_1959; - METHOD method_30704 createNormalForest (ZZZ)Lnet/minecraft/class_1959; - ARG 0 birch - ARG 1 oldGrowth - ARG 2 flower - METHOD method_30705 createDarkForest ()Lnet/minecraft/class_1959; - METHOD method_30706 createNormalOcean (Z)Lnet/minecraft/class_1959; - ARG 0 deep - METHOD method_30708 createSwamp ()Lnet/minecraft/class_1959; - METHOD method_30709 createLukewarmOcean (Z)Lnet/minecraft/class_1959; - ARG 0 deep - METHOD method_30712 createFrozenOcean (Z)Lnet/minecraft/class_1959; - ARG 0 monument - METHOD method_30714 createNormalBambooJungle ()Lnet/minecraft/class_1959; - METHOD method_30723 createWarmOcean ()Lnet/minecraft/class_1959; - METHOD method_30726 createTheVoid ()Lnet/minecraft/class_1959; + ARG 3 generationSettings + METHOD method_30694 createSavanna (Lnet/minecraft/class_7871;Lnet/minecraft/class_7871;ZZ)Lnet/minecraft/class_1959; + ARG 0 featureLookup + ARG 1 carverLookup + ARG 2 windswept + ARG 3 plateau + METHOD method_30695 createJungleFeatures (Lnet/minecraft/class_7871;Lnet/minecraft/class_7871;FZZZLnet/minecraft/class_5483$class_5496;Lnet/minecraft/class_5195;)Lnet/minecraft/class_1959; + ARG 0 featureLookup + ARG 1 carverLookup + ARG 2 depth + ARG 3 bamboo + ARG 4 sparse + ARG 5 unmodified + ARG 6 spawnSettings + ARG 7 music + METHOD method_30696 createBadlands (Lnet/minecraft/class_7871;Lnet/minecraft/class_7871;Z)Lnet/minecraft/class_1959; + ARG 0 featureLookup + ARG 1 carverLookup + ARG 2 plateau + METHOD method_30698 createDesert (Lnet/minecraft/class_7871;Lnet/minecraft/class_7871;)Lnet/minecraft/class_1959; + ARG 0 featureLookup + ARG 1 carverLookup + METHOD method_30699 createTaiga (Lnet/minecraft/class_7871;Lnet/minecraft/class_7871;Z)Lnet/minecraft/class_1959; + ARG 0 featureLookup + ARG 1 carverLookup + ARG 2 snowy + METHOD method_30701 createPlains (Lnet/minecraft/class_7871;Lnet/minecraft/class_7871;ZZZ)Lnet/minecraft/class_1959; + ARG 0 featureLookup + ARG 1 carverLookup + ARG 2 sunflower + ARG 3 snowy + ARG 4 iceSpikes + METHOD method_30702 createColdOcean (Lnet/minecraft/class_7871;Lnet/minecraft/class_7871;Z)Lnet/minecraft/class_1959; + ARG 0 featureLookup + ARG 1 carverLookup + ARG 2 deep + METHOD method_30703 createSparseJungle (Lnet/minecraft/class_7871;Lnet/minecraft/class_7871;)Lnet/minecraft/class_1959; + ARG 0 featureLookup + ARG 1 carverLookup + METHOD method_30704 createNormalForest (Lnet/minecraft/class_7871;Lnet/minecraft/class_7871;ZZZ)Lnet/minecraft/class_1959; + ARG 0 featureLookup + ARG 1 carverLookup + ARG 2 birch + ARG 3 oldGrowth + ARG 4 flower + METHOD method_30705 createDarkForest (Lnet/minecraft/class_7871;Lnet/minecraft/class_7871;)Lnet/minecraft/class_1959; + ARG 0 featureLookup + ARG 1 carverLookup + METHOD method_30706 createNormalOcean (Lnet/minecraft/class_7871;Lnet/minecraft/class_7871;Z)Lnet/minecraft/class_1959; + ARG 0 featureLookup + ARG 1 carverLookup + ARG 2 deep + METHOD method_30708 createSwamp (Lnet/minecraft/class_7871;Lnet/minecraft/class_7871;)Lnet/minecraft/class_1959; + ARG 0 featureLookup + ARG 1 carverLookup + METHOD method_30709 createLukewarmOcean (Lnet/minecraft/class_7871;Lnet/minecraft/class_7871;Z)Lnet/minecraft/class_1959; + ARG 0 featureLookup + ARG 1 carverLookup + ARG 2 deep + METHOD method_30712 createFrozenOcean (Lnet/minecraft/class_7871;Lnet/minecraft/class_7871;Z)Lnet/minecraft/class_1959; + ARG 0 featureLookup + ARG 1 carverLookup + ARG 2 deep + METHOD method_30714 createNormalBambooJungle (Lnet/minecraft/class_7871;Lnet/minecraft/class_7871;)Lnet/minecraft/class_1959; + ARG 0 featureLookup + ARG 1 carverLookup + METHOD method_30723 createWarmOcean (Lnet/minecraft/class_7871;Lnet/minecraft/class_7871;)Lnet/minecraft/class_1959; + ARG 0 featureLookup + ARG 1 carverLookup + METHOD method_30726 createTheVoid (Lnet/minecraft/class_7871;Lnet/minecraft/class_7871;)Lnet/minecraft/class_1959; + ARG 0 featureLookup + ARG 1 carverLookup METHOD method_30932 getSkyColor (F)I ARG 0 temperature - METHOD method_31066 createOceanGenerationSettings ()Lnet/minecraft/class_5485$class_5495; - METHOD method_33132 createDripstoneCaves ()Lnet/minecraft/class_1959; - METHOD method_34674 createLushCaves ()Lnet/minecraft/class_1959; - METHOD method_38574 createMeadow ()Lnet/minecraft/class_1959; - METHOD method_38575 createFrozenPeaks ()Lnet/minecraft/class_1959; - METHOD method_38576 createJaggedPeaks ()Lnet/minecraft/class_1959; - METHOD method_38577 createStonyPeaks ()Lnet/minecraft/class_1959; - METHOD method_38578 createSnowySlopes ()Lnet/minecraft/class_1959; - METHOD method_38579 createGrove ()Lnet/minecraft/class_1959; - METHOD method_39151 createBiome (Lnet/minecraft/class_1959$class_1963;FFIILnet/minecraft/class_5483$class_5496;Lnet/minecraft/class_5485$class_5495;Lnet/minecraft/class_5195;)Lnet/minecraft/class_1959; + METHOD method_31066 createOceanGenerationSettings (Lnet/minecraft/class_7871;Lnet/minecraft/class_7871;)Lnet/minecraft/class_5485$class_5495; + ARG 0 featureLookup + ARG 1 carverLookup + METHOD method_33132 createDripstoneCaves (Lnet/minecraft/class_7871;Lnet/minecraft/class_7871;)Lnet/minecraft/class_1959; + ARG 0 featureLookup + ARG 1 carverLookup + METHOD method_34674 createLushCaves (Lnet/minecraft/class_7871;Lnet/minecraft/class_7871;)Lnet/minecraft/class_1959; + ARG 0 featureLookup + ARG 1 carverLookup + METHOD method_38574 createMeadow (Lnet/minecraft/class_7871;Lnet/minecraft/class_7871;Z)Lnet/minecraft/class_1959; + ARG 0 featureLookup + ARG 1 carverLookup + ARG 2 cherryGrove + METHOD method_38575 createFrozenPeaks (Lnet/minecraft/class_7871;Lnet/minecraft/class_7871;)Lnet/minecraft/class_1959; + ARG 0 featureLookup + ARG 1 carverLookup + METHOD method_38576 createJaggedPeaks (Lnet/minecraft/class_7871;Lnet/minecraft/class_7871;)Lnet/minecraft/class_1959; + ARG 0 featureLookup + ARG 1 carverLookup + METHOD method_38577 createStonyPeaks (Lnet/minecraft/class_7871;Lnet/minecraft/class_7871;)Lnet/minecraft/class_1959; + ARG 0 featureLookup + ARG 1 carverLookup + METHOD method_38578 createSnowySlopes (Lnet/minecraft/class_7871;Lnet/minecraft/class_7871;)Lnet/minecraft/class_1959; + ARG 0 featureLookup + ARG 1 carverLookup + METHOD method_38579 createGrove (Lnet/minecraft/class_7871;Lnet/minecraft/class_7871;)Lnet/minecraft/class_1959; + ARG 0 featureLookup + ARG 1 carverLookup + METHOD method_39151 createBiome (ZFFIILjava/lang/Integer;Ljava/lang/Integer;Lnet/minecraft/class_5483$class_5496;Lnet/minecraft/class_5485$class_5495;Lnet/minecraft/class_5195;)Lnet/minecraft/class_1959; ARG 0 precipitation ARG 1 temperature ARG 2 downfall ARG 3 waterColor ARG 4 waterFogColor - ARG 5 spawnSettings - ARG 6 generationSettings - ARG 7 music - METHOD method_39152 createBiome (Lnet/minecraft/class_1959$class_1963;FFLnet/minecraft/class_5483$class_5496;Lnet/minecraft/class_5485$class_5495;Lnet/minecraft/class_5195;)Lnet/minecraft/class_1959; + ARG 5 grassColor + ARG 6 foliageColor + ARG 7 spawnSettings + ARG 8 generationSettings + ARG 9 music + METHOD method_39152 createBiome (ZFFLnet/minecraft/class_5483$class_5496;Lnet/minecraft/class_5485$class_5495;Lnet/minecraft/class_5195;)Lnet/minecraft/class_1959; ARG 0 precipitation ARG 1 temperature ARG 2 downfall @@ -83,5 +152,9 @@ CLASS net/minecraft/class_5478 net/minecraft/world/biome/OverworldBiomeCreator ARG 5 music METHOD method_39153 addBasicFeatures (Lnet/minecraft/class_5485$class_5495;)V ARG 0 generationSettings - METHOD method_42061 createDeepDark ()Lnet/minecraft/class_1959; - METHOD method_43232 createMangroveSwamp ()Lnet/minecraft/class_1959; + METHOD method_42061 createDeepDark (Lnet/minecraft/class_7871;Lnet/minecraft/class_7871;)Lnet/minecraft/class_1959; + ARG 0 featureLookup + ARG 1 carverLookup + METHOD method_43232 createMangroveSwamp (Lnet/minecraft/class_7871;Lnet/minecraft/class_7871;)Lnet/minecraft/class_1959; + ARG 0 featureLookup + ARG 1 carverLookup diff --git a/mappings/net/minecraft/world/biome/SpawnSettings.mapping b/mappings/net/minecraft/world/biome/SpawnSettings.mapping index 3f8bb71dca..bb20bc920f 100644 --- a/mappings/net/minecraft/world/biome/SpawnSettings.mapping +++ b/mappings/net/minecraft/world/biome/SpawnSettings.mapping @@ -34,26 +34,38 @@ CLASS net/minecraft/class_5483 net/minecraft/world/biome/SpawnSettings ARG 4 maxGroupSize METHOD method_28433 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; ARG 0 instance + METHOD method_28434 (Lnet/minecraft/class_5483$class_1964;)Ljava/lang/Integer; + ARG 0 spawnEntry + METHOD method_28435 (Lnet/minecraft/class_5483$class_1964;)Ljava/lang/Integer; + ARG 0 spawnEntry + METHOD method_28436 (Lnet/minecraft/class_5483$class_1964;)Lnet/minecraft/class_1299; + ARG 0 spawnEntry + METHOD method_49499 (Lnet/minecraft/class_5483$class_1964;)Lcom/mojang/serialization/DataResult; + ARG 0 spawnEntry CLASS class_5265 SpawnDensity COMMENT Embodies the density limit information of a type of entity in entity COMMENT spawning logic. The density field is generated for all entities spawned COMMENT than a specific type of entity. - FIELD field_24407 gravityLimit D - FIELD field_24408 mass D + FIELD comp_1307 gravityLimit D + FIELD comp_1308 mass D FIELD field_25820 CODEC Lcom/mojang/serialization/Codec; METHOD (DD)V ARG 1 gravityLimit ARG 3 mass - METHOD method_27837 getGravityLimit ()D + METHOD comp_1307 gravityLimit ()D COMMENT Represents the cap of gravity as in {@link COMMENT net.minecraft.util.math.GravityField#calculate(BlockPos, double)} for COMMENT entity spawning. If the cap is exceeded, the entity spawning attempt COMMENT will skip. - METHOD method_27838 getMass ()D + METHOD comp_1308 mass ()D COMMENT Represents the mass of each entity spawned. Will affect gravity COMMENT calculation. METHOD method_30359 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; ARG 0 instance + METHOD method_31014 (Lnet/minecraft/class_5483$class_5265;)Ljava/lang/Double; + ARG 0 spawnDensity + METHOD method_31015 (Lnet/minecraft/class_5483$class_5265;)Ljava/lang/Double; + ARG 0 spawnDensity CLASS class_5496 Builder FIELD field_26647 spawners Ljava/util/Map; FIELD field_26648 spawnCosts Ljava/util/Map; diff --git a/mappings/net/minecraft/world/biome/TheEndBiomeCreator.mapping b/mappings/net/minecraft/world/biome/TheEndBiomeCreator.mapping index 9708670505..2336aa5279 100644 --- a/mappings/net/minecraft/world/biome/TheEndBiomeCreator.mapping +++ b/mappings/net/minecraft/world/biome/TheEndBiomeCreator.mapping @@ -1,8 +1,18 @@ CLASS net/minecraft/class_6726 net/minecraft/world/biome/TheEndBiomeCreator - METHOD method_39140 createEndBarrens ()Lnet/minecraft/class_1959; + METHOD method_39140 createEndBarrens (Lnet/minecraft/class_7871;Lnet/minecraft/class_7871;)Lnet/minecraft/class_1959; + ARG 0 featureLookup + ARG 1 carverLookup METHOD method_39141 createEndBiome (Lnet/minecraft/class_5485$class_5495;)Lnet/minecraft/class_1959; ARG 0 builder - METHOD method_39142 createTheEnd ()Lnet/minecraft/class_1959; - METHOD method_39143 createEndMidlands ()Lnet/minecraft/class_1959; - METHOD method_39144 createEndHighlands ()Lnet/minecraft/class_1959; - METHOD method_39145 createSmallEndIslands ()Lnet/minecraft/class_1959; + METHOD method_39142 createTheEnd (Lnet/minecraft/class_7871;Lnet/minecraft/class_7871;)Lnet/minecraft/class_1959; + ARG 0 featureLookup + ARG 1 carverLookup + METHOD method_39143 createEndMidlands (Lnet/minecraft/class_7871;Lnet/minecraft/class_7871;)Lnet/minecraft/class_1959; + ARG 0 featureLookup + ARG 1 carverLookup + METHOD method_39144 createEndHighlands (Lnet/minecraft/class_7871;Lnet/minecraft/class_7871;)Lnet/minecraft/class_1959; + ARG 0 featureLookup + ARG 1 carverLookup + METHOD method_39145 createSmallEndIslands (Lnet/minecraft/class_7871;Lnet/minecraft/class_7871;)Lnet/minecraft/class_1959; + ARG 0 featureLookup + ARG 1 carverLookup diff --git a/mappings/net/minecraft/world/biome/TheNetherBiomeCreator.mapping b/mappings/net/minecraft/world/biome/TheNetherBiomeCreator.mapping index 8797307b12..40dd38af10 100644 --- a/mappings/net/minecraft/world/biome/TheNetherBiomeCreator.mapping +++ b/mappings/net/minecraft/world/biome/TheNetherBiomeCreator.mapping @@ -1,6 +1,16 @@ CLASS net/minecraft/class_6727 net/minecraft/world/biome/TheNetherBiomeCreator - METHOD method_39146 createNetherWastes ()Lnet/minecraft/class_1959; - METHOD method_39147 createSoulSandValley ()Lnet/minecraft/class_1959; - METHOD method_39148 createBasaltDeltas ()Lnet/minecraft/class_1959; - METHOD method_39149 createCrimsonForest ()Lnet/minecraft/class_1959; - METHOD method_39150 createWarpedForest ()Lnet/minecraft/class_1959; + METHOD method_39146 createNetherWastes (Lnet/minecraft/class_7871;Lnet/minecraft/class_7871;)Lnet/minecraft/class_1959; + ARG 0 featureLookup + ARG 1 carverLookup + METHOD method_39147 createSoulSandValley (Lnet/minecraft/class_7871;Lnet/minecraft/class_7871;)Lnet/minecraft/class_1959; + ARG 0 featureLookup + ARG 1 carverLookup + METHOD method_39148 createBasaltDeltas (Lnet/minecraft/class_7871;Lnet/minecraft/class_7871;)Lnet/minecraft/class_1959; + ARG 0 featureLookup + ARG 1 carverLookup + METHOD method_39149 createCrimsonForest (Lnet/minecraft/class_7871;Lnet/minecraft/class_7871;)Lnet/minecraft/class_1959; + ARG 0 featureLookup + ARG 1 carverLookup + METHOD method_39150 createWarpedForest (Lnet/minecraft/class_7871;Lnet/minecraft/class_7871;)Lnet/minecraft/class_1959; + ARG 0 featureLookup + ARG 1 carverLookup diff --git a/mappings/net/minecraft/world/biome/source/BiomeSource.mapping b/mappings/net/minecraft/world/biome/source/BiomeSource.mapping index c9cde62010..186de55865 100644 --- a/mappings/net/minecraft/world/biome/source/BiomeSource.mapping +++ b/mappings/net/minecraft/world/biome/source/BiomeSource.mapping @@ -1,10 +1,6 @@ CLASS net/minecraft/class_1966 net/minecraft/world/biome/source/BiomeSource - FIELD field_20643 biomes Ljava/util/Set; + FIELD field_20643 biomes Ljava/util/function/Supplier; FIELD field_24713 CODEC Lcom/mojang/serialization/Codec; - METHOD (Ljava/util/List;)V - ARG 1 biomes - METHOD (Ljava/util/stream/Stream;)V - ARG 1 biomeStream METHOD method_24385 locateBiome (IIIIILjava/util/function/Predicate;Lnet/minecraft/class_5819;ZLnet/minecraft/class_6544$class_6552;)Lcom/mojang/datafixers/util/Pair; ARG 1 x ARG 2 y @@ -28,6 +24,7 @@ CLASS net/minecraft/class_1966 net/minecraft/world/biome/source/BiomeSource ARG 5 predicate ARG 6 noiseSampler ARG 7 world + METHOD method_49494 biomeStream ()Ljava/util/stream/Stream; METHOD method_8762 locateBiome (IIIILjava/util/function/Predicate;Lnet/minecraft/class_5819;Lnet/minecraft/class_6544$class_6552;)Lcom/mojang/datafixers/util/Pair; ARG 1 x ARG 2 y diff --git a/mappings/net/minecraft/world/biome/source/CheckerboardBiomeSource.mapping b/mappings/net/minecraft/world/biome/source/CheckerboardBiomeSource.mapping index f61830fb2b..ed150eba3d 100644 --- a/mappings/net/minecraft/world/biome/source/CheckerboardBiomeSource.mapping +++ b/mappings/net/minecraft/world/biome/source/CheckerboardBiomeSource.mapping @@ -6,5 +6,9 @@ CLASS net/minecraft/class_1973 net/minecraft/world/biome/source/CheckerboardBiom METHOD (Lnet/minecraft/class_6885;I)V ARG 1 biomes ARG 2 size + METHOD method_28453 (Lnet/minecraft/class_1973;)Ljava/lang/Integer; + ARG 0 biomeSource METHOD method_28454 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; ARG 0 instance + METHOD method_28455 (Lnet/minecraft/class_1973;)Lnet/minecraft/class_6885; + ARG 0 biomeSource diff --git a/mappings/net/minecraft/world/biome/source/FixedBiomeSource.mapping b/mappings/net/minecraft/world/biome/source/FixedBiomeSource.mapping index e4da61d5ab..f51a4fefde 100644 --- a/mappings/net/minecraft/world/biome/source/FixedBiomeSource.mapping +++ b/mappings/net/minecraft/world/biome/source/FixedBiomeSource.mapping @@ -3,3 +3,5 @@ CLASS net/minecraft/class_1992 net/minecraft/world/biome/source/FixedBiomeSource FIELD field_9486 biome Lnet/minecraft/class_6880; METHOD (Lnet/minecraft/class_6880;)V ARG 1 biome + METHOD method_28456 (Lnet/minecraft/class_1992;)Lnet/minecraft/class_6880; + ARG 0 biomeSource diff --git a/mappings/net/minecraft/world/biome/source/MultiNoiseBiomeSource.mapping b/mappings/net/minecraft/world/biome/source/MultiNoiseBiomeSource.mapping index ddc91836f5..5da4ffcab2 100644 --- a/mappings/net/minecraft/world/biome/source/MultiNoiseBiomeSource.mapping +++ b/mappings/net/minecraft/world/biome/source/MultiNoiseBiomeSource.mapping @@ -2,70 +2,23 @@ CLASS net/minecraft/class_4766 net/minecraft/world/biome/source/MultiNoiseBiomeS FIELD field_24718 CUSTOM_CODEC Lcom/mojang/serialization/MapCodec; COMMENT Used to parse a custom biome source, when a preset hasn't been provided. FIELD field_24719 CODEC Lcom/mojang/serialization/Codec; - FIELD field_24721 instance Ljava/util/Optional; - FIELD field_34498 biomeEntries Lnet/minecraft/class_6544$class_6547; - METHOD (Lnet/minecraft/class_6544$class_6547;)V - ARG 1 entries - METHOD (Lnet/minecraft/class_6544$class_6547;Ljava/util/Optional;)V + FIELD field_34498 biomeEntries Lcom/mojang/datafixers/util/Either; + FIELD field_42984 BIOME_CODEC Lcom/mojang/serialization/MapCodec; + FIELD field_42985 PRESET_CODEC Lcom/mojang/serialization/MapCodec; + METHOD (Lcom/mojang/datafixers/util/Either;)V ARG 1 biomeEntries - ARG 2 instance - METHOD method_28457 (Lnet/minecraft/class_4766;)Lcom/mojang/datafixers/util/Either; - ARG 0 biomeSource - METHOD method_28459 (Lcom/mojang/datafixers/util/Either;)Lnet/minecraft/class_4766; - ARG 0 either - METHOD method_31085 getInstance ()Ljava/util/Optional; METHOD method_38167 getBiomeAtPoint (Lnet/minecraft/class_6544$class_6553;)Lnet/minecraft/class_6880; ARG 1 point - METHOD method_38168 matchesInstance (Lnet/minecraft/class_4766$class_5305;)Z - ARG 1 instance - METHOD method_38170 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; - ARG 0 instance - METHOD method_38172 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; - ARG 0 instance2 - METHOD method_38173 (Lnet/minecraft/class_4766;)Lnet/minecraft/class_6544$class_6547; - ARG 0 biomeSource - CLASS class_5305 Preset - FIELD field_24723 NETHER Lnet/minecraft/class_4766$class_5305; - FIELD field_24724 BY_IDENTIFIER Ljava/util/Map; - FIELD field_24725 id Lnet/minecraft/class_2960; - FIELD field_24726 biomeSourceFunction Ljava/util/function/Function; - FIELD field_34499 OVERWORLD Lnet/minecraft/class_4766$class_5305; - METHOD (Lnet/minecraft/class_2960;Ljava/util/function/Function;)V - ARG 1 id - ARG 2 biomeSourceFunction - METHOD method_28469 getBiomeSource (Lnet/minecraft/class_2378;)Lnet/minecraft/class_4766; - ARG 1 biomeRegistry - METHOD method_31088 (Lnet/minecraft/class_2378;)Lnet/minecraft/class_6544$class_6547; - ARG 0 biomeRegistry - METHOD method_38175 (Lnet/minecraft/class_2378;)Lnet/minecraft/class_6544$class_6547; - ARG 0 biomeRegistry - METHOD method_38176 (Lcom/google/common/collect/ImmutableList$Builder;Lnet/minecraft/class_2378;Lcom/mojang/datafixers/util/Pair;)V - ARG 2 pair - METHOD method_39531 getBiomeSource (Lnet/minecraft/class_4766$class_5502;Z)Lnet/minecraft/class_4766; - ARG 1 instance - ARG 2 useInstance - METHOD method_39532 getBiomeSource (Lnet/minecraft/class_2378;Z)Lnet/minecraft/class_4766; - ARG 1 biomeRegistry - ARG 2 useInstance - METHOD method_41415 streamPresets ()Ljava/util/stream/Stream; - METHOD method_41416 (Lnet/minecraft/class_6880;)Ljava/util/stream/Stream; - ARG 0 entry - METHOD method_41417 (Ljava/util/Map$Entry;)Lcom/mojang/datafixers/util/Pair; - ARG 0 entry - METHOD method_41418 stream ()Ljava/util/stream/Stream; - CLASS class_5502 Instance - FIELD comp_274 preset Lnet/minecraft/class_4766$class_5305; - FIELD comp_275 biomeRegistry Lnet/minecraft/class_2378; - FIELD field_26694 CODEC Lcom/mojang/serialization/MapCodec; - METHOD (Lnet/minecraft/class_4766$class_5305;Lnet/minecraft/class_2378;)V - ARG 1 preset - ARG 2 biomeRegistry - METHOD comp_274 preset ()Lnet/minecraft/class_4766$class_5305; - METHOD comp_275 biomeRegistry ()Lnet/minecraft/class_2378; - METHOD method_31095 (Lnet/minecraft/class_4766$class_5305;)Lcom/mojang/serialization/DataResult; - ARG 0 preset - METHOD method_31096 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; - ARG 0 instance - METHOD method_31097 (Lnet/minecraft/class_2960;)Lcom/mojang/serialization/DataResult; - ARG 0 id - METHOD method_31101 getBiomeSource ()Lnet/minecraft/class_4766; + METHOD method_38168 matchesInstance (Lnet/minecraft/class_5321;)Z + ARG 1 parameterList + METHOD method_49501 create (Lnet/minecraft/class_6544$class_6547;)Lnet/minecraft/class_4766; + ARG 0 biomeEntries + METHOD method_49502 (Lnet/minecraft/class_4766;)Lcom/mojang/datafixers/util/Either; + ARG 0 source + METHOD method_49503 create (Lnet/minecraft/class_6880;)Lnet/minecraft/class_4766; + ARG 0 biomeEntries + METHOD method_49504 (Lnet/minecraft/class_6544$class_6547;)Lnet/minecraft/class_6544$class_6547; + ARG 0 entries + METHOD method_49505 (Lnet/minecraft/class_6880;)Lnet/minecraft/class_6544$class_6547; + ARG 0 parameterListEntry + METHOD method_49506 getBiomeEntries ()Lnet/minecraft/class_6544$class_6547; diff --git a/mappings/net/minecraft/world/biome/source/MultiNoiseBiomeSourceParameterList.mapping b/mappings/net/minecraft/world/biome/source/MultiNoiseBiomeSourceParameterList.mapping new file mode 100644 index 0000000000..8e02754ba6 --- /dev/null +++ b/mappings/net/minecraft/world/biome/source/MultiNoiseBiomeSourceParameterList.mapping @@ -0,0 +1,32 @@ +CLASS net/minecraft/class_8197 net/minecraft/world/biome/source/MultiNoiseBiomeSourceParameterList + FIELD field_42986 CODEC Lcom/mojang/serialization/Codec; + FIELD field_42987 REGISTRY_CODEC Lcom/mojang/serialization/Codec; + FIELD field_42988 preset Lnet/minecraft/class_8197$class_5305; + FIELD field_42989 entries Lnet/minecraft/class_6544$class_6547; + METHOD (Lnet/minecraft/class_8197$class_5305;Lnet/minecraft/class_7871;)V + ARG 1 preset + ARG 2 biomeLookup + METHOD method_49507 getEntries ()Lnet/minecraft/class_6544$class_6547; + METHOD method_49509 (Lnet/minecraft/class_8197$class_5305;)Lnet/minecraft/class_6544$class_6547; + ARG 0 preset + METHOD method_49512 getPresetToEntriesMap ()Ljava/util/Map; + CLASS class_5305 Preset + FIELD comp_1309 id Lnet/minecraft/class_2960; + FIELD comp_1310 biomeSourceFunction Lnet/minecraft/class_8197$class_5305$class_8165; + FIELD field_24723 NETHER Lnet/minecraft/class_8197$class_5305; + FIELD field_24724 BY_IDENTIFIER Ljava/util/Map; + FIELD field_34499 OVERWORLD Lnet/minecraft/class_8197$class_5305; + FIELD field_42990 CODEC Lcom/mojang/serialization/Codec; + METHOD (Lnet/minecraft/class_2960;Lnet/minecraft/class_8197$class_5305$class_8165;)V + ARG 1 id + ARG 2 biomeSourceFunction + METHOD comp_1309 id ()Lnet/minecraft/class_2960; + METHOD comp_1310 biomeSourceFunction ()Lnet/minecraft/class_8197$class_5305$class_8165; + METHOD method_49192 (Lcom/google/common/collect/ImmutableList$Builder;Ljava/util/function/Function;Lcom/mojang/datafixers/util/Pair;)V + ARG 2 pair + METHOD method_49193 getOverworldEntries (Ljava/util/function/Function;)Lnet/minecraft/class_6544$class_6547; + ARG 0 biomeEntryGetter + METHOD method_49514 biomeStream ()Ljava/util/stream/Stream; + CLASS class_8165 BiomeSourceFunction + METHOD apply (Ljava/util/function/Function;)Lnet/minecraft/class_6544$class_6547; + ARG 1 biomeEntryGetter diff --git a/mappings/net/minecraft/world/biome/source/MultiNoiseBiomeSourceParameterLists.mapping b/mappings/net/minecraft/world/biome/source/MultiNoiseBiomeSourceParameterLists.mapping new file mode 100644 index 0000000000..94f51757bc --- /dev/null +++ b/mappings/net/minecraft/world/biome/source/MultiNoiseBiomeSourceParameterLists.mapping @@ -0,0 +1,5 @@ +CLASS net/minecraft/class_8198 net/minecraft/world/biome/source/MultiNoiseBiomeSourceParameterLists + METHOD method_49521 of (Ljava/lang/String;)Lnet/minecraft/class_5321; + ARG 0 id + METHOD method_49522 bootstrap (Lnet/minecraft/class_7891;)V + ARG 0 registry diff --git a/mappings/net/minecraft/world/biome/source/TheEndBiomeSource.mapping b/mappings/net/minecraft/world/biome/source/TheEndBiomeSource.mapping index 2531e97dcd..450bf811e1 100644 --- a/mappings/net/minecraft/world/biome/source/TheEndBiomeSource.mapping +++ b/mappings/net/minecraft/world/biome/source/TheEndBiomeSource.mapping @@ -5,15 +5,13 @@ CLASS net/minecraft/class_2169 net/minecraft/world/biome/source/TheEndBiomeSourc FIELD field_26702 midlandsBiome Lnet/minecraft/class_6880; FIELD field_26703 smallIslandsBiome Lnet/minecraft/class_6880; FIELD field_26704 barrensBiome Lnet/minecraft/class_6880; - METHOD (Lnet/minecraft/class_2378;)V - ARG 1 biomeRegistry METHOD (Lnet/minecraft/class_6880;Lnet/minecraft/class_6880;Lnet/minecraft/class_6880;Lnet/minecraft/class_6880;Lnet/minecraft/class_6880;)V ARG 1 centerBiome ARG 2 highlandsBiome ARG 3 midlandsBiome ARG 4 smallIslandsBiome ARG 5 barrensBiome - METHOD method_31105 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + METHOD method_46679 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; ARG 0 instance - METHOD method_31106 (Lnet/minecraft/class_2169;)Lnet/minecraft/class_2378; - ARG 0 biomeSource + METHOD method_46680 createVanilla (Lnet/minecraft/class_7871;)Lnet/minecraft/class_2169; + ARG 0 biomeLookup diff --git a/mappings/net/minecraft/world/biome/source/util/MultiNoiseUtil.mapping b/mappings/net/minecraft/world/biome/source/util/MultiNoiseUtil.mapping index 189b22748b..97078b349d 100644 --- a/mappings/net/minecraft/world/biome/source/util/MultiNoiseUtil.mapping +++ b/mappings/net/minecraft/world/biome/source/util/MultiNoiseUtil.mapping @@ -139,6 +139,10 @@ CLASS net/minecraft/class_6544 net/minecraft/world/biome/source/util/MultiNoiseU COMMENT Note that this method only exists for testing, and is usually a lot slower COMMENT than {@link #getValue}. ARG 1 point + METHOD method_49497 createCodec (Lcom/mojang/serialization/MapCodec;)Lcom/mojang/serialization/Codec; + ARG 0 entryCodec + METHOD method_49498 (Lcom/mojang/serialization/MapCodec;Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 1 instance CLASS class_6548 SearchTree FIELD field_34486 MAX_NODES_FOR_SIMPLE_TREE I FIELD field_34487 firstNode Lnet/minecraft/class_6544$class_6548$class_6550; diff --git a/mappings/net/minecraft/world/biome/source/util/VanillaBiomeParameters.mapping b/mappings/net/minecraft/world/biome/source/util/VanillaBiomeParameters.mapping index 52c39c8586..3b1a1182ff 100644 --- a/mappings/net/minecraft/world/biome/source/util/VanillaBiomeParameters.mapping +++ b/mappings/net/minecraft/world/biome/source/util/VanillaBiomeParameters.mapping @@ -216,6 +216,5 @@ CLASS net/minecraft/class_6554 net/minecraft/world/biome/source/util/VanillaBiom ARG 6 weirdness ARG 7 offset ARG 8 biome - METHOD method_43718 (DD)Z - ARG 0 erosion - ARG 2 depth + METHOD method_46678 writeDebug (Ljava/util/function/Consumer;)V + ARG 1 parameters diff --git a/mappings/net/minecraft/world/chunk/Chunk.mapping b/mappings/net/minecraft/world/chunk/Chunk.mapping index 90da3cdb24..9a67945691 100644 --- a/mappings/net/minecraft/world/chunk/Chunk.mapping +++ b/mappings/net/minecraft/world/chunk/Chunk.mapping @@ -10,6 +10,7 @@ CLASS net/minecraft/class_2791 net/minecraft/world/chunk/Chunk FIELD field_34543 blockEntities Ljava/util/Map; FIELD field_34544 heightLimitView Lnet/minecraft/class_5539; FIELD field_34545 sectionArray [Lnet/minecraft/class_2826; + FIELD field_34548 LOGGER Lorg/slf4j/Logger; FIELD field_34549 lightOn Z FIELD field_34550 inhabitedTime J FIELD field_34552 structureStarts Ljava/util/Map; @@ -17,13 +18,15 @@ CLASS net/minecraft/class_2791 net/minecraft/world/chunk/Chunk FIELD field_35468 blendingData Lnet/minecraft/class_6749; FIELD field_37052 EMPTY_STRUCTURE_REFERENCES Lit/unimi/dsi/fastutil/longs/LongSet; FIELD field_39411 generationSettings Lnet/minecraft/class_5485; + FIELD field_44632 MISSING_SECTION I + FIELD field_44708 chunkSkyLight Lnet/minecraft/class_8528; METHOD (Lnet/minecraft/class_1923;Lnet/minecraft/class_2843;Lnet/minecraft/class_5539;Lnet/minecraft/class_2378;J[Lnet/minecraft/class_2826;Lnet/minecraft/class_6749;)V ARG 1 pos ARG 2 upgradeData ARG 3 heightLimitView - ARG 4 biome + ARG 4 biomeRegistry ARG 5 inhabitedTime - ARG 7 sectionArrayInitializer + ARG 7 sectionArray ARG 8 blendingData METHOD method_12002 addEntity (Lnet/minecraft/class_1297;)V ARG 1 entity @@ -48,7 +51,6 @@ CLASS net/minecraft/class_2791 net/minecraft/world/chunk/Chunk METHOD method_12013 getBlockTickScheduler ()Lnet/minecraft/class_6763; METHOD method_12014 getFluidTickScheduler ()Lnet/minecraft/class_6763; METHOD method_12016 getStructureStarts ()Ljava/util/Map; - METHOD method_12018 getLightSourcesStream ()Ljava/util/stream/Stream; METHOD method_12020 setLightOn (Z)V ARG 1 lightOn METHOD method_12021 getBlockEntityPositions ()Ljava/util/Set; @@ -74,7 +76,7 @@ CLASS net/minecraft/class_2791 net/minecraft/world/chunk/Chunk METHOD method_12038 isLightOn ()Z METHOD method_12039 markBlockForPostProcessing (Lnet/minecraft/class_2338;)V ARG 1 pos - METHOD method_12040 getHighestNonEmptySection ()Lnet/minecraft/class_2826; + METHOD method_12040 getHighestNonEmptySection ()I METHOD method_12041 removeBlockEntity (Lnet/minecraft/class_2338;)V ARG 1 pos METHOD method_12042 addPendingBlockEntityNbt (Lnet/minecraft/class_2487;)V @@ -89,10 +91,9 @@ CLASS net/minecraft/class_2791 net/minecraft/world/chunk/Chunk ARG 1 ySectionCoord METHOD method_38255 getOrCreateChunkNoiseSampler (Ljava/util/function/Function;)Lnet/minecraft/class_6568; ARG 1 chunkNoiseSamplerCreator - METHOD method_38256 fillSectionArray (Lnet/minecraft/class_5539;Lnet/minecraft/class_2378;[Lnet/minecraft/class_2826;)V - ARG 0 world - ARG 1 biome - ARG 2 sectionArray + METHOD method_38256 fillSectionArray (Lnet/minecraft/class_2378;[Lnet/minecraft/class_2826;)V + ARG 0 biomeRegistry + ARG 1 sectionArray METHOD method_38257 populateBiomes (Lnet/minecraft/class_6780;Lnet/minecraft/class_6544$class_6552;)V ARG 1 biomeSupplier ARG 2 sampler @@ -117,4 +118,10 @@ CLASS net/minecraft/class_2791 net/minecraft/world/chunk/Chunk METHOD method_39461 hasBelowZeroRetrogen ()Z METHOD method_44214 getOrCreateGenerationSettings (Ljava/util/function/Supplier;)Lnet/minecraft/class_5485; ARG 1 generationSettingsCreator + METHOD method_51522 refreshSurfaceY ()V + METHOD method_51523 (Lnet/minecraft/class_2680;)Z + ARG 0 blockState + METHOD method_51525 forEachBlockMatchingPredicate (Ljava/util/function/Predicate;Ljava/util/function/BiConsumer;)V + ARG 1 predicate + ARG 2 consumer CLASS class_6745 TickSchedulers diff --git a/mappings/net/minecraft/world/chunk/ChunkNibbleArray.mapping b/mappings/net/minecraft/world/chunk/ChunkNibbleArray.mapping index 2988a8a4b8..b3ca1df098 100644 --- a/mappings/net/minecraft/world/chunk/ChunkNibbleArray.mapping +++ b/mappings/net/minecraft/world/chunk/ChunkNibbleArray.mapping @@ -12,8 +12,9 @@ CLASS net/minecraft/class_2804 net/minecraft/world/chunk/ChunkNibbleArray FIELD field_31404 COPY_BLOCK_SIZE I FIELD field_31405 NIBBLE_BITS I FIELD field_34052 COPY_TIMES I + FIELD field_44635 defaultValue I METHOD (I)V - ARG 1 size + ARG 1 defaultValue METHOD ([B)V ARG 1 bytes METHOD method_12137 asByteArray ()[B @@ -55,3 +56,10 @@ CLASS net/minecraft/class_2804 net/minecraft/world/chunk/ChunkNibbleArray COMMENT {@return if the nibble at {@code n} is stored in the less COMMENT significant (smaller) 4 bits of the byte in the backing array} ARG 0 i + METHOD method_51379 isUninitialized (I)Z + ARG 1 expectedDefaultValue + METHOD method_51380 isArrayUninitialized ()Z + METHOD method_51381 pack (I)B + ARG 0 value + METHOD method_51527 clear (I)V + ARG 1 defaultValue diff --git a/mappings/net/minecraft/world/chunk/ChunkProvider.mapping b/mappings/net/minecraft/world/chunk/ChunkProvider.mapping index 2a217d4a29..fc74b4309e 100644 --- a/mappings/net/minecraft/world/chunk/ChunkProvider.mapping +++ b/mappings/net/minecraft/world/chunk/ChunkProvider.mapping @@ -1,5 +1,5 @@ CLASS net/minecraft/class_2823 net/minecraft/world/chunk/ChunkProvider - METHOD method_12246 getChunk (II)Lnet/minecraft/class_1922; + METHOD method_12246 getChunk (II)Lnet/minecraft/class_8527; ARG 1 chunkX ARG 2 chunkZ METHOD method_12247 onLightUpdate (Lnet/minecraft/class_1944;Lnet/minecraft/class_4076;)V diff --git a/mappings/net/minecraft/world/chunk/ChunkSection.mapping b/mappings/net/minecraft/world/chunk/ChunkSection.mapping index 79fae71e03..202717d245 100644 --- a/mappings/net/minecraft/world/chunk/ChunkSection.mapping +++ b/mappings/net/minecraft/world/chunk/ChunkSection.mapping @@ -1,17 +1,14 @@ CLASS net/minecraft/class_2826 net/minecraft/world/chunk/ChunkSection FIELD field_12877 nonEmptyBlockCount S FIELD field_12878 blockStateContainer Lnet/minecraft/class_2841; - FIELD field_12880 yOffset I FIELD field_12881 nonEmptyFluidCount S FIELD field_12882 randomTickableBlockCount S FIELD field_34556 biomeContainer Lnet/minecraft/class_7522; - METHOD (ILnet/minecraft/class_2378;)V - ARG 1 chunkPos - ARG 2 biomeRegistry - METHOD (ILnet/minecraft/class_2841;Lnet/minecraft/class_7522;)V - ARG 1 chunkPos - ARG 2 blockStateContainer - ARG 3 biomeContainer + METHOD (Lnet/minecraft/class_2378;)V + ARG 1 biomeRegistry + METHOD (Lnet/minecraft/class_2841;Lnet/minecraft/class_7522;)V + ARG 1 blockStateContainer + ARG 2 biomeContainer METHOD method_12253 calculateCounts ()V METHOD method_12254 getBlockState (III)Lnet/minecraft/class_2680; ARG 1 x @@ -29,9 +26,8 @@ CLASS net/minecraft/class_2826 net/minecraft/world/chunk/ChunkSection ARG 5 lock METHOD method_12257 toPacket (Lnet/minecraft/class_2540;)V ARG 1 buf - METHOD method_12258 fromPacket (Lnet/minecraft/class_2540;)V + METHOD method_12258 readDataPacket (Lnet/minecraft/class_2540;)V ARG 1 buf - METHOD method_12259 getYOffset ()I METHOD method_12260 getPacketSize ()I METHOD method_12262 hasRandomTicks ()Z METHOD method_12263 hasRandomBlockTicks ()Z @@ -46,19 +42,20 @@ CLASS net/minecraft/class_2826 net/minecraft/world/chunk/ChunkSection METHOD method_16677 unlock ()V METHOD method_19523 hasAny (Ljava/util/function/Predicate;)Z ARG 1 predicate - METHOD method_31729 blockCoordFromChunkCoord (I)I - ARG 0 chunkPos - METHOD method_38291 populateBiomes (Lnet/minecraft/class_6780;Lnet/minecraft/class_6544$class_6552;II)V + METHOD method_38291 populateBiomes (Lnet/minecraft/class_6780;Lnet/minecraft/class_6544$class_6552;III)V ARG 1 biomeSupplier ARG 2 sampler ARG 3 x - ARG 4 z + ARG 4 y + ARG 5 z METHOD method_38292 isEmpty ()Z METHOD method_38293 getBiome (III)Lnet/minecraft/class_6880; ARG 1 x ARG 2 y ARG 3 z METHOD method_38294 getBiomeContainer ()Lnet/minecraft/class_7522; + METHOD method_49526 readBiomePacket (Lnet/minecraft/class_2540;)V + ARG 1 buf CLASS class_6869 BlockStateCounter FIELD field_36408 nonEmptyBlockCount I FIELD field_36409 randomTickableBlockCount I diff --git a/mappings/net/minecraft/world/chunk/ChunkStatus.mapping b/mappings/net/minecraft/world/chunk/ChunkStatus.mapping index 187780c0a6..73f59056f2 100644 --- a/mappings/net/minecraft/world/chunk/ChunkStatus.mapping +++ b/mappings/net/minecraft/world/chunk/ChunkStatus.mapping @@ -1,7 +1,6 @@ CLASS net/minecraft/class_2806 net/minecraft/world/chunk/ChunkStatus FIELD field_12787 chunkType Lnet/minecraft/class_2806$class_2808; FIELD field_12788 STATUS_TO_DISTANCE Lit/unimi/dsi/fastutil/ints/IntList; - FIELD field_12789 id Ljava/lang/String; FIELD field_12791 DISTANCE_TO_STATUS Ljava/util/List; FIELD field_12792 generationTask Lnet/minecraft/class_2806$class_2807; FIELD field_12793 heightMapTypes Ljava/util/EnumSet; @@ -13,16 +12,17 @@ CLASS net/minecraft/class_2806 net/minecraft/world/chunk/ChunkStatus FIELD field_19345 STATUS_BUMP_LOAD_TASK Lnet/minecraft/class_2806$class_4305; COMMENT A load task which only bumps the chunk status of the chunk. FIELD field_19346 loadTask Lnet/minecraft/class_2806$class_4305; - METHOD (Ljava/lang/String;Lnet/minecraft/class_2806;ILjava/util/EnumSet;Lnet/minecraft/class_2806$class_2808;Lnet/minecraft/class_2806$class_2807;Lnet/minecraft/class_2806$class_4305;)V - ARG 1 id - ARG 2 previous - ARG 3 taskMargin + FIELD field_44634 shouldAlwaysUpgrade Z + METHOD (Lnet/minecraft/class_2806;IZLjava/util/EnumSet;Lnet/minecraft/class_2806$class_2808;Lnet/minecraft/class_2806$class_2807;Lnet/minecraft/class_2806$class_4305;)V + ARG 1 previous + ARG 2 taskMargin + ARG 3 shouldAlwaysUpgrade ARG 4 heightMapTypes ARG 5 chunkType ARG 6 generationTask ARG 7 loadTask METHOD method_12152 getTaskMargin ()I - METHOD method_12154 runGenerationTask (Ljava/util/concurrent/Executor;Lnet/minecraft/class_3218;Lnet/minecraft/class_2794;Lnet/minecraft/class_3485;Lnet/minecraft/class_3227;Ljava/util/function/Function;Ljava/util/List;Z)Ljava/util/concurrent/CompletableFuture; + METHOD method_12154 runGenerationTask (Ljava/util/concurrent/Executor;Lnet/minecraft/class_3218;Lnet/minecraft/class_2794;Lnet/minecraft/class_3485;Lnet/minecraft/class_3227;Ljava/util/function/Function;Ljava/util/List;)Ljava/util/concurrent/CompletableFuture; ARG 1 executor ARG 2 world ARG 3 generator @@ -30,7 +30,6 @@ CLASS net/minecraft/class_2806 net/minecraft/world/chunk/ChunkStatus ARG 5 lightingProvider ARG 6 fullChunkConverter ARG 7 chunks - ARG 8 regenerate METHOD method_12155 getMaxDistanceFromFull ()I METHOD method_12160 getHeightmapTypes ()Ljava/util/EnumSet; METHOD method_12161 byDistanceFromFull (I)Lnet/minecraft/class_2806; @@ -42,7 +41,6 @@ CLASS net/minecraft/class_2806 net/minecraft/world/chunk/ChunkStatus ARG 0 statusToDistance METHOD method_12168 byId (Ljava/lang/String;)Lnet/minecraft/class_2806; ARG 0 id - METHOD method_12172 getId ()Ljava/lang/String; METHOD method_12175 getDistanceFromFull (Lnet/minecraft/class_2806;)I ARG 0 status METHOD method_16555 register (Ljava/lang/String;Lnet/minecraft/class_2806;ILjava/util/EnumSet;Lnet/minecraft/class_2806$class_2808;Lnet/minecraft/class_2806$class_3768;)Lnet/minecraft/class_2806; @@ -87,16 +85,9 @@ CLASS net/minecraft/class_2806 net/minecraft/world/chunk/ChunkStatus ARG 2 generator ARG 3 chunks ARG 4 chunk - METHOD method_17036 (Lnet/minecraft/class_2806;Lnet/minecraft/class_3218;Lnet/minecraft/class_2794;Ljava/util/List;Lnet/minecraft/class_2791;)V - ARG 0 targetStatus - ARG 1 world - ARG 2 generator - ARG 3 chunks - ARG 4 chunk - METHOD method_20608 shouldExcludeBlockLight (Lnet/minecraft/class_2806;Lnet/minecraft/class_2791;)Z - ARG 0 status - ARG 1 chunk - METHOD method_20609 (Lnet/minecraft/class_2806;Ljava/util/concurrent/Executor;Lnet/minecraft/class_3218;Lnet/minecraft/class_2794;Lnet/minecraft/class_3485;Lnet/minecraft/class_3227;Ljava/util/function/Function;Ljava/util/List;Lnet/minecraft/class_2791;Z)Ljava/util/concurrent/CompletableFuture; + METHOD method_20608 shouldExcludeBlockLight (Lnet/minecraft/class_2791;)Z + ARG 0 chunk + METHOD method_20609 (Lnet/minecraft/class_2806;Ljava/util/concurrent/Executor;Lnet/minecraft/class_3218;Lnet/minecraft/class_2794;Lnet/minecraft/class_3485;Lnet/minecraft/class_3227;Ljava/util/function/Function;Ljava/util/List;Lnet/minecraft/class_2791;)Ljava/util/concurrent/CompletableFuture; ARG 0 targetStatus ARG 1 executor ARG 2 world @@ -106,26 +97,25 @@ CLASS net/minecraft/class_2806 net/minecraft/world/chunk/ChunkStatus ARG 6 fullChunkConverter ARG 7 chunks ARG 8 chunk - ARG 9 regenerate - METHOD method_20610 getLightingFuture (Lnet/minecraft/class_2806;Lnet/minecraft/class_3227;Lnet/minecraft/class_2791;)Ljava/util/concurrent/CompletableFuture; - ARG 0 status - ARG 1 lightingProvider - ARG 2 chunk - METHOD method_20611 register (Ljava/lang/String;Lnet/minecraft/class_2806;ILjava/util/EnumSet;Lnet/minecraft/class_2806$class_2808;Lnet/minecraft/class_2806$class_2807;Lnet/minecraft/class_2806$class_4305;)Lnet/minecraft/class_2806; + METHOD method_20610 getLightingFuture (Lnet/minecraft/class_3227;Lnet/minecraft/class_2791;)Ljava/util/concurrent/CompletableFuture; + ARG 0 lightingProvider + ARG 1 chunk + METHOD method_20611 register (Ljava/lang/String;Lnet/minecraft/class_2806;IZLjava/util/EnumSet;Lnet/minecraft/class_2806$class_2808;Lnet/minecraft/class_2806$class_2807;Lnet/minecraft/class_2806$class_4305;)Lnet/minecraft/class_2806; ARG 0 id ARG 1 previous ARG 2 taskMargin - ARG 3 heightMapTypes - ARG 4 chunkType - ARG 5 task - ARG 6 loadTask + ARG 3 shouldAlwaysUpgrade + ARG 4 heightMapTypes + ARG 5 chunkType + ARG 6 generationTask + ARG 7 loadTask METHOD method_20612 runLoadTask (Lnet/minecraft/class_3218;Lnet/minecraft/class_3485;Lnet/minecraft/class_3227;Ljava/util/function/Function;Lnet/minecraft/class_2791;)Ljava/util/concurrent/CompletableFuture; ARG 1 world ARG 2 structureTemplateManager ARG 3 lightingProvider ARG 4 fullChunkConverter ARG 5 chunk - METHOD method_20613 (Lnet/minecraft/class_2806;Ljava/util/concurrent/Executor;Lnet/minecraft/class_3218;Lnet/minecraft/class_2794;Lnet/minecraft/class_3485;Lnet/minecraft/class_3227;Ljava/util/function/Function;Ljava/util/List;Lnet/minecraft/class_2791;Z)Ljava/util/concurrent/CompletableFuture; + METHOD method_20614 (Lnet/minecraft/class_2806;Ljava/util/concurrent/Executor;Lnet/minecraft/class_3218;Lnet/minecraft/class_2794;Lnet/minecraft/class_3485;Lnet/minecraft/class_3227;Ljava/util/function/Function;Ljava/util/List;Lnet/minecraft/class_2791;)Ljava/util/concurrent/CompletableFuture; ARG 0 targetStatus ARG 1 executor ARG 2 world @@ -135,18 +125,6 @@ CLASS net/minecraft/class_2806 net/minecraft/world/chunk/ChunkStatus ARG 6 fullChunkConverter ARG 7 chunks ARG 8 chunk - ARG 9 regenerate - METHOD method_20614 (Lnet/minecraft/class_2806;Ljava/util/concurrent/Executor;Lnet/minecraft/class_3218;Lnet/minecraft/class_2794;Lnet/minecraft/class_3485;Lnet/minecraft/class_3227;Ljava/util/function/Function;Ljava/util/List;Lnet/minecraft/class_2791;Z)Ljava/util/concurrent/CompletableFuture; - ARG 0 targetStatus - ARG 1 executor - ARG 2 world - ARG 3 generator - ARG 4 structureTemplateManager - ARG 5 lightingProvider - ARG 6 fullChunkConverter - ARG 7 chunks - ARG 8 chunk - ARG 9 regenerate METHOD method_20615 (Lnet/minecraft/class_2806;Lnet/minecraft/class_3218;Lnet/minecraft/class_3485;Lnet/minecraft/class_3227;Ljava/util/function/Function;Lnet/minecraft/class_2791;)Ljava/util/concurrent/CompletableFuture; ARG 0 targetStatus ARG 1 world @@ -154,12 +132,6 @@ CLASS net/minecraft/class_2806 net/minecraft/world/chunk/ChunkStatus ARG 3 lightingProvider ARG 4 fullChunkConverter ARG 5 chunk - METHOD method_38277 (Lnet/minecraft/class_2806;Lnet/minecraft/class_3218;Lnet/minecraft/class_2794;Ljava/util/List;Lnet/minecraft/class_2791;)V - ARG 0 targetStatus - ARG 1 world - ARG 2 generator - ARG 3 chunks - ARG 4 chunk METHOD method_38278 (Lnet/minecraft/class_2806;Lnet/minecraft/class_3218;Lnet/minecraft/class_3485;Lnet/minecraft/class_3227;Ljava/util/function/Function;Lnet/minecraft/class_2791;)Ljava/util/concurrent/CompletableFuture; ARG 0 targetStatus ARG 1 world @@ -167,17 +139,15 @@ CLASS net/minecraft/class_2806 net/minecraft/world/chunk/ChunkStatus ARG 3 lightingProvider ARG 4 fullChunkConverter ARG 5 chunk - METHOD method_38280 (Lnet/minecraft/class_6613;Lcom/mojang/datafixers/util/Either;)Lcom/mojang/datafixers/util/Either; - ARG 1 either METHOD method_38282 (Lnet/minecraft/class_2806;Lnet/minecraft/class_3218;Lnet/minecraft/class_2794;Ljava/util/List;Lnet/minecraft/class_2791;)V ARG 0 targetStatus ARG 1 world ARG 2 generator ARG 3 chunks ARG 4 chunk - METHOD method_38283 (Lnet/minecraft/class_2806;Lnet/minecraft/class_2791;)Lcom/mojang/datafixers/util/Either; - ARG 1 chunk - METHOD method_38284 (Lnet/minecraft/class_2806;Ljava/util/concurrent/Executor;Lnet/minecraft/class_3218;Lnet/minecraft/class_2794;Lnet/minecraft/class_3485;Lnet/minecraft/class_3227;Ljava/util/function/Function;Ljava/util/List;Lnet/minecraft/class_2791;Z)Ljava/util/concurrent/CompletableFuture; + METHOD method_38283 (Lnet/minecraft/class_2791;)Lcom/mojang/datafixers/util/Either; + ARG 0 populatedChunk + METHOD method_38284 (Lnet/minecraft/class_2806;Ljava/util/concurrent/Executor;Lnet/minecraft/class_3218;Lnet/minecraft/class_2794;Lnet/minecraft/class_3485;Lnet/minecraft/class_3227;Ljava/util/function/Function;Ljava/util/List;Lnet/minecraft/class_2791;)Ljava/util/concurrent/CompletableFuture; ARG 0 targetStatus ARG 1 executor ARG 2 world @@ -187,8 +157,7 @@ CLASS net/minecraft/class_2806 net/minecraft/world/chunk/ChunkStatus ARG 6 fullChunkConverter ARG 7 chunks ARG 8 chunk - ARG 9 regenerate - METHOD method_38285 (Lnet/minecraft/class_2806;Ljava/util/concurrent/Executor;Lnet/minecraft/class_3218;Lnet/minecraft/class_2794;Lnet/minecraft/class_3485;Lnet/minecraft/class_3227;Ljava/util/function/Function;Ljava/util/List;Lnet/minecraft/class_2791;Z)Ljava/util/concurrent/CompletableFuture; + METHOD method_38285 (Lnet/minecraft/class_2806;Ljava/util/concurrent/Executor;Lnet/minecraft/class_3218;Lnet/minecraft/class_2794;Lnet/minecraft/class_3485;Lnet/minecraft/class_3227;Ljava/util/function/Function;Ljava/util/List;Lnet/minecraft/class_2791;)Ljava/util/concurrent/CompletableFuture; ARG 0 targetStatus ARG 1 executor ARG 2 world @@ -198,10 +167,9 @@ CLASS net/minecraft/class_2806 net/minecraft/world/chunk/ChunkStatus ARG 6 fullChunkConverter ARG 7 chunks ARG 8 chunk - ARG 9 regenerate - METHOD method_39463 (Lnet/minecraft/class_2806;Lnet/minecraft/class_2791;)Lcom/mojang/datafixers/util/Either; - ARG 1 chunk - METHOD method_39464 (Lnet/minecraft/class_2806;Ljava/util/concurrent/Executor;Lnet/minecraft/class_3218;Lnet/minecraft/class_2794;Lnet/minecraft/class_3485;Lnet/minecraft/class_3227;Ljava/util/function/Function;Ljava/util/List;Lnet/minecraft/class_2791;Z)Ljava/util/concurrent/CompletableFuture; + METHOD method_39463 (Lnet/minecraft/class_2791;)Lcom/mojang/datafixers/util/Either; + ARG 0 populatedChunk + METHOD method_39464 (Lnet/minecraft/class_2806;Ljava/util/concurrent/Executor;Lnet/minecraft/class_3218;Lnet/minecraft/class_2794;Lnet/minecraft/class_3485;Lnet/minecraft/class_3227;Ljava/util/function/Function;Ljava/util/List;Lnet/minecraft/class_2791;)Ljava/util/concurrent/CompletableFuture; ARG 0 targetStatus ARG 1 executor ARG 2 world @@ -211,13 +179,6 @@ CLASS net/minecraft/class_2806 net/minecraft/world/chunk/ChunkStatus ARG 6 fullChunkConverter ARG 7 chunks ARG 8 chunk - ARG 9 regenerate - METHOD method_39789 (Lnet/minecraft/class_2806;Lnet/minecraft/class_3218;Lnet/minecraft/class_2794;Ljava/util/List;Lnet/minecraft/class_2791;)V - ARG 0 targetStatus - ARG 1 world - ARG 2 generator - ARG 3 chunks - ARG 4 chunk METHOD method_39790 (Lnet/minecraft/class_2806;Lnet/minecraft/class_3218;Lnet/minecraft/class_3485;Lnet/minecraft/class_3227;Ljava/util/function/Function;Lnet/minecraft/class_2791;)Ljava/util/concurrent/CompletableFuture; ARG 0 targetStatus ARG 1 world @@ -232,9 +193,39 @@ CLASS net/minecraft/class_2806 net/minecraft/world/chunk/ChunkStatus ARG 3 lightingProvider ARG 4 fullChunkConverter ARG 5 chunk + METHOD method_51373 getInitializeLightingFuture (Lnet/minecraft/class_3227;Lnet/minecraft/class_2791;)Ljava/util/concurrent/CompletableFuture; + ARG 0 lightingProvider + ARG 1 chunk + METHOD method_51374 (Lnet/minecraft/class_6613;Lcom/mojang/datafixers/util/Either;)Lcom/mojang/datafixers/util/Either; + ARG 2 chunk + METHOD method_51375 (Lnet/minecraft/class_2806;Lnet/minecraft/class_3218;Lnet/minecraft/class_2794;Ljava/util/List;Lnet/minecraft/class_2791;)V + ARG 0 targetStatus + ARG 1 world + ARG 2 generator + ARG 3 chunks + ARG 4 chunk + METHOD method_51376 (Lnet/minecraft/class_2806;Ljava/util/concurrent/Executor;Lnet/minecraft/class_3218;Lnet/minecraft/class_2794;Lnet/minecraft/class_3485;Lnet/minecraft/class_3227;Ljava/util/function/Function;Ljava/util/List;Lnet/minecraft/class_2791;)Ljava/util/concurrent/CompletableFuture; + ARG 0 targetStatus + ARG 1 executor + ARG 2 world + ARG 3 generator + ARG 4 structureTemplateManager + ARG 5 lightingProvider + ARG 6 fullChunkConverter + ARG 7 chunks + ARG 8 chunk + METHOD method_51377 (Lnet/minecraft/class_2806;Lnet/minecraft/class_3218;Lnet/minecraft/class_2794;Ljava/util/List;Lnet/minecraft/class_2791;)V + ARG 0 targetStatus + ARG 1 world + ARG 2 chunkGenerator + ARG 3 chunks + ARG 4 chunk + METHOD method_51378 shouldAlwaysUpgrade ()Z + METHOD method_52270 (Lnet/minecraft/class_2791;)V + ARG 1 c CLASS class_2807 GenerationTask COMMENT A task called when a chunk needs to be generated. - METHOD doWork (Lnet/minecraft/class_2806;Ljava/util/concurrent/Executor;Lnet/minecraft/class_3218;Lnet/minecraft/class_2794;Lnet/minecraft/class_3485;Lnet/minecraft/class_3227;Ljava/util/function/Function;Ljava/util/List;Lnet/minecraft/class_2791;Z)Ljava/util/concurrent/CompletableFuture; + METHOD doWork (Lnet/minecraft/class_2806;Ljava/util/concurrent/Executor;Lnet/minecraft/class_3218;Lnet/minecraft/class_2794;Lnet/minecraft/class_3485;Lnet/minecraft/class_3227;Ljava/util/function/Function;Ljava/util/List;Lnet/minecraft/class_2791;)Ljava/util/concurrent/CompletableFuture; ARG 1 targetStatus COMMENT the status the chunk will be set to after the task is completed ARG 2 executor @@ -246,7 +237,6 @@ CLASS net/minecraft/class_2806 net/minecraft/world/chunk/ChunkStatus COMMENT a function that can convert a raw chunk to a full chunk ARG 8 chunks ARG 9 chunk - ARG 10 regenerate CLASS class_2808 ChunkType COMMENT Specifies the type of a chunk FIELD field_12807 LEVELCHUNK Lnet/minecraft/class_2806$class_2808; diff --git a/mappings/net/minecraft/world/chunk/ChunkStatusChangeListener.mapping b/mappings/net/minecraft/world/chunk/ChunkStatusChangeListener.mapping index e80603d0f2..359378add2 100644 --- a/mappings/net/minecraft/world/chunk/ChunkStatusChangeListener.mapping +++ b/mappings/net/minecraft/world/chunk/ChunkStatusChangeListener.mapping @@ -1,4 +1,4 @@ CLASS net/minecraft/class_5567 net/minecraft/world/chunk/ChunkStatusChangeListener - METHOD onChunkStatusChange (Lnet/minecraft/class_1923;Lnet/minecraft/class_3193$class_3194;)V + METHOD onChunkStatusChange (Lnet/minecraft/class_1923;Lnet/minecraft/class_3194;)V ARG 1 pos ARG 2 levelType diff --git a/mappings/net/minecraft/world/chunk/ChunkToNibbleArrayMap.mapping b/mappings/net/minecraft/world/chunk/ChunkToNibbleArrayMap.mapping index fff8aea535..94221d056b 100644 --- a/mappings/net/minecraft/world/chunk/ChunkToNibbleArrayMap.mapping +++ b/mappings/net/minecraft/world/chunk/ChunkToNibbleArrayMap.mapping @@ -12,7 +12,7 @@ CLASS net/minecraft/class_3556 net/minecraft/world/chunk/ChunkToNibbleArrayMap ARG 1 chunkPos METHOD method_15501 get (J)Lnet/minecraft/class_2804; ARG 1 chunkPos - METHOD method_15502 replaceWithCopy (J)V + METHOD method_15502 replaceWithCopy (J)Lnet/minecraft/class_2804; ARG 1 pos METHOD method_15503 containsKey (J)Z ARG 1 chunkPos diff --git a/mappings/net/minecraft/world/chunk/ProtoChunk.mapping b/mappings/net/minecraft/world/chunk/ProtoChunk.mapping index f18512879f..414110091d 100644 --- a/mappings/net/minecraft/world/chunk/ProtoChunk.mapping +++ b/mappings/net/minecraft/world/chunk/ProtoChunk.mapping @@ -1,6 +1,5 @@ CLASS net/minecraft/class_2839 net/minecraft/world/chunk/ProtoChunk FIELD field_12918 status Lnet/minecraft/class_2806; - FIELD field_12919 lightSources Ljava/util/List; FIELD field_12926 carvingMasks Ljava/util/Map; FIELD field_12929 entities Ljava/util/List; FIELD field_17105 lightingProvider Lnet/minecraft/class_3568; @@ -25,16 +24,12 @@ CLASS net/minecraft/class_2839 net/minecraft/world/chunk/ProtoChunk METHOD method_12025 getCarvingMask (Lnet/minecraft/class_2893$class_2894;)Lnet/minecraft/class_6643; ARG 1 step METHOD method_12295 getEntities ()Ljava/util/List; - METHOD method_12296 getLightSourcesBySection ()[Lit/unimi/dsi/fastutil/shorts/ShortList; METHOD method_12297 (Lnet/minecraft/class_2893$class_2894;)Lnet/minecraft/class_6643; ARG 1 step2 METHOD method_12300 getPackedSectionRelative (Lnet/minecraft/class_2338;)S ARG 0 pos METHOD method_12302 addEntity (Lnet/minecraft/class_2487;)V ARG 1 entityNbt - METHOD method_12304 addLightSource (SI)V - ARG 1 chunkSliceRel - ARG 2 sectionY METHOD method_12307 setCarvingMask (Lnet/minecraft/class_2893$class_2894;Lnet/minecraft/class_6643;)V ARG 1 step ARG 2 carvingMask @@ -45,8 +40,6 @@ CLASS net/minecraft/class_2839 net/minecraft/world/chunk/ProtoChunk ARG 0 sectionRel ARG 1 sectionY ARG 2 chunkPos - METHOD method_12315 addLightSource (Lnet/minecraft/class_2338;)V - ARG 1 pos METHOD method_12316 getBlockEntityNbts ()Ljava/util/Map; METHOD method_17032 setLightingProvider (Lnet/minecraft/class_3568;)V ARG 1 lightingProvider diff --git a/mappings/net/minecraft/world/chunk/WorldChunk.mapping b/mappings/net/minecraft/world/chunk/WorldChunk.mapping index 9b3cd50566..347cc56f0b 100644 --- a/mappings/net/minecraft/world/chunk/WorldChunk.mapping +++ b/mappings/net/minecraft/world/chunk/WorldChunk.mapping @@ -9,7 +9,6 @@ CLASS net/minecraft/class_2818 net/minecraft/world/chunk/WorldChunk FIELD field_28129 gameEventDispatchers Lit/unimi/dsi/fastutil/ints/Int2ObjectMap; FIELD field_35471 blockTickScheduler Lnet/minecraft/class_6755; FIELD field_35472 fluidTickScheduler Lnet/minecraft/class_6755; - FIELD field_36218 shouldRenderOnUpdate Z METHOD (Lnet/minecraft/class_1937;Lnet/minecraft/class_1923;)V ARG 1 world ARG 2 pos @@ -47,7 +46,7 @@ CLASS net/minecraft/class_2818 net/minecraft/world/chunk/WorldChunk METHOD method_12224 loadFromPacket (Lnet/minecraft/class_2540;Lnet/minecraft/class_2487;Ljava/util/function/Consumer;)V ARG 1 buf ARG 2 nbt - METHOD method_12225 getLevelType ()Lnet/minecraft/class_3193$class_3194; + METHOD method_12225 getLevelType ()Lnet/minecraft/class_3194; METHOD method_12226 setLoadedToWorld (Z)V ARG 1 loadedToWorld METHOD method_12234 getFluidState (III)Lnet/minecraft/class_3610; @@ -61,7 +60,7 @@ CLASS net/minecraft/class_2818 net/minecraft/world/chunk/WorldChunk METHOD method_31716 (Lnet/minecraft/class_2338;Lnet/minecraft/class_2591;Lnet/minecraft/class_2487;)V ARG 1 pos ARG 2 blockEntityType - ARG 3 nbt + ARG 3 nbtx METHOD method_31718 wrapTicker (Lnet/minecraft/class_2586;Lnet/minecraft/class_5558;)Lnet/minecraft/class_5562; ARG 1 blockEntity ARG 2 blockEntityTicker @@ -74,8 +73,8 @@ CLASS net/minecraft/class_2818 net/minecraft/world/chunk/WorldChunk ARG 1 pos METHOD method_31725 removeBlockEntityTicker (Lnet/minecraft/class_2338;)V ARG 1 pos - METHOD method_32917 (Lnet/minecraft/class_3218;I)Lnet/minecraft/class_5713; - ARG 1 sectionCoord + METHOD method_32917 (Lnet/minecraft/class_3218;II)Lnet/minecraft/class_5713; + ARG 3 sectionCoord METHOD method_32918 removeGameEventListener (Lnet/minecraft/class_2586;Lnet/minecraft/class_3218;)V ARG 1 blockEntity ARG 2 world @@ -91,9 +90,10 @@ CLASS net/minecraft/class_2818 net/minecraft/world/chunk/WorldChunk ARG 1 world METHOD method_39306 removeChunkTickSchedulers (Lnet/minecraft/class_3218;)V ARG 1 world - METHOD method_39791 shouldRenderOnUpdate ()Z - METHOD method_39792 setShouldRenderOnUpdate (Z)V - ARG 1 shouldRenderOnUpdate + METHOD method_49525 loadBiomeFromPacket (Lnet/minecraft/class_2540;)V + ARG 1 buf + METHOD method_51382 removeGameEventDispatcher (I)V + ARG 1 ySectionCoord CLASS class_2819 CreationType CLASS class_5563 DirectBlockEntityTickInvoker FIELD field_27223 worldChunk Lnet/minecraft/class_2818; diff --git a/mappings/net/minecraft/world/chunk/ReadOnlyChunk.mapping b/mappings/net/minecraft/world/chunk/WrapperProtoChunk.mapping similarity index 57% rename from mappings/net/minecraft/world/chunk/ReadOnlyChunk.mapping rename to mappings/net/minecraft/world/chunk/WrapperProtoChunk.mapping index 67e1801b2e..104211d404 100644 --- a/mappings/net/minecraft/world/chunk/ReadOnlyChunk.mapping +++ b/mappings/net/minecraft/world/chunk/WrapperProtoChunk.mapping @@ -1,8 +1,11 @@ -CLASS net/minecraft/class_2821 net/minecraft/world/chunk/ReadOnlyChunk - COMMENT Represents a read only view of a world chunk used in world generation. +CLASS net/minecraft/class_2821 net/minecraft/world/chunk/WrapperProtoChunk + COMMENT Represents a chunk that wraps a world chunk, used in world generation. + COMMENT This is usually read-only. FIELD field_12866 wrapped Lnet/minecraft/class_2818; + FIELD field_34554 propagateToWrapped Z METHOD (Lnet/minecraft/class_2818;Z)V ARG 1 wrapped + ARG 2 propagateToWrapped METHOD method_12239 transformHeightmapType (Lnet/minecraft/class_2902$class_2903;)Lnet/minecraft/class_2902$class_2903; ARG 1 type METHOD method_12240 getWrappedChunk ()Lnet/minecraft/class_2818; diff --git a/mappings/net/minecraft/world/chunk/light/ChunkBlockLightProvider.mapping b/mappings/net/minecraft/world/chunk/light/ChunkBlockLightProvider.mapping index 3acc35ee5a..a840cf5c46 100644 --- a/mappings/net/minecraft/world/chunk/light/ChunkBlockLightProvider.mapping +++ b/mappings/net/minecraft/world/chunk/light/ChunkBlockLightProvider.mapping @@ -1,7 +1,13 @@ CLASS net/minecraft/class_3552 net/minecraft/world/chunk/light/ChunkBlockLightProvider - FIELD field_15778 DIRECTIONS [Lnet/minecraft/class_2350; FIELD field_16511 mutablePos Lnet/minecraft/class_2338$class_2339; METHOD (Lnet/minecraft/class_2823;)V ARG 1 chunkProvider - METHOD method_15474 getLightSourceLuminance (J)I + METHOD (Lnet/minecraft/class_2823;Lnet/minecraft/class_3547;)V + ARG 1 chunkProvider + ARG 2 blockLightStorage + METHOD method_15474 getLightSourceLuminance (JLnet/minecraft/class_2680;)I + ARG 1 blockPos + ARG 3 blockState + METHOD method_51532 (Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;)V ARG 1 blockPos + ARG 2 blockState diff --git a/mappings/net/minecraft/world/chunk/light/ChunkLightProvider.mapping b/mappings/net/minecraft/world/chunk/light/ChunkLightProvider.mapping index 3696de588e..7b32132e27 100644 --- a/mappings/net/minecraft/world/chunk/light/ChunkLightProvider.mapping +++ b/mappings/net/minecraft/world/chunk/light/ChunkLightProvider.mapping @@ -1,23 +1,18 @@ CLASS net/minecraft/class_3558 net/minecraft/world/chunk/light/ChunkLightProvider - FIELD field_15792 type Lnet/minecraft/class_1944; FIELD field_15793 lightStorage Lnet/minecraft/class_3560; FIELD field_15795 chunkProvider Lnet/minecraft/class_2823; FIELD field_16513 DIRECTIONS [Lnet/minecraft/class_2350; FIELD field_17397 cachedChunkPositions [J - FIELD field_17398 cachedChunks [Lnet/minecraft/class_1922; + FIELD field_17398 cachedChunks [Lnet/minecraft/class_8527; FIELD field_19284 reusableBlockPos Lnet/minecraft/class_2338$class_2339; - METHOD (Lnet/minecraft/class_2823;Lnet/minecraft/class_1944;Lnet/minecraft/class_3560;)V + FIELD field_44733 blockPositionsToCheck Lit/unimi/dsi/fastutil/longs/LongOpenHashSet; + METHOD (Lnet/minecraft/class_2823;Lnet/minecraft/class_3560;)V ARG 1 chunkProvider - ARG 2 type - ARG 3 lightStorage - METHOD method_15515 enqueueSectionData (JLnet/minecraft/class_2804;Z)V + ARG 2 lightStorage + METHOD method_15515 enqueueSectionData (JLnet/minecraft/class_2804;)V ARG 1 sectionPos ARG 3 lightArray - ARG 4 nonEdge - METHOD method_15517 getCurrentLevelFromSection (Lnet/minecraft/class_2804;J)I - ARG 1 section - ARG 2 blockPos - METHOD method_17529 getChunk (II)Lnet/minecraft/class_1922; + METHOD method_17529 getChunk (II)Lnet/minecraft/class_8527; ARG 1 chunkX ARG 2 chunkZ METHOD method_17530 clearChunkCache ()V @@ -29,15 +24,101 @@ CLASS net/minecraft/class_3558 net/minecraft/world/chunk/light/ChunkLightProvide ARG 4 pos2 ARG 5 direction ARG 6 opacity2 - METHOD method_20479 getStateForLighting (JLorg/apache/commons/lang3/mutable/MutableInt;)Lnet/minecraft/class_2680; - ARG 1 pos - ARG 3 opacity METHOD method_20599 setRetainColumn (Lnet/minecraft/class_1923;Z)V ARG 1 pos ARG 2 retainData METHOD method_20710 getOpaqueShape (Lnet/minecraft/class_2680;JLnet/minecraft/class_2350;)Lnet/minecraft/class_265; - ARG 1 world + ARG 1 blockState ARG 2 pos - ARG 4 facing + ARG 4 direction METHOD method_22875 displaySectionLevel (J)Ljava/lang/String; ARG 1 sectionPos + METHOD method_50016 shapesCoverFullCube (JLnet/minecraft/class_2680;JLnet/minecraft/class_2680;Lnet/minecraft/class_2350;)Z + ARG 1 sourceId + ARG 3 sourceState + ARG 4 targetId + ARG 6 targetState + ARG 7 direction + METHOD method_50017 getOpacity (Lnet/minecraft/class_2680;Lnet/minecraft/class_2338;)I + ARG 1 state + ARG 2 pos + METHOD method_50018 getStateForLighting (Lnet/minecraft/class_2338;)Lnet/minecraft/class_2680; + ARG 1 pos + METHOD method_51529 (J)V + ARG 1 blockPos + METHOD method_51530 (JJ)V + ARG 1 blockPos + METHOD method_51531 (JJI)V + ARG 1 blockPos + ARG 5 lightLevel + METHOD method_51561 needsLightUpdate (Lnet/minecraft/class_1922;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;Lnet/minecraft/class_2680;)Z + ARG 0 blockView + ARG 1 pos + ARG 2 oldState + ARG 3 newState + METHOD method_51562 getOpaqueShape (Lnet/minecraft/class_1922;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;Lnet/minecraft/class_2350;)Lnet/minecraft/class_265; + ARG 0 blockView + ARG 1 pos + ARG 2 blockState + ARG 3 direction + METHOD method_51563 isTrivialForLighting (Lnet/minecraft/class_2680;)Z + ARG 0 blockState + METHOD method_51565 (JJ)V + ARG 1 blockPos + ARG 3 flags + METHOD method_51566 (JJ)V + ARG 1 blockPos + ARG 3 flags + METHOD method_51568 getStatus (J)Lnet/minecraft/class_3560$class_8530; + ARG 1 sectionPos + CLASS class_8531 + COMMENT Methods for manipulating a set of bitflags with yet unknown functionality. + COMMENT + COMMENT

    + COMMENT
  • Bits 0 – 3 likely store a light level.
    • + COMMENT
  • Bits 4 – 9 store a flag for each of the six directions.
    • + COMMENT
  • Bit 10 stores whether the block at this position is trivial for lighting — if its opacity is not directionally dependent.
    • + COMMENT
  • Bit 11 stores a flag with unknown function.
    • + COMMENT
+ FIELD field_44737 DIRECTION_BIT_OFFSET I + FIELD field_44740 DIRECTION_BIT_MASK J + METHOD method_51571 packWithAllDirectionsSet (I)J + ARG 0 lightLevel + METHOD method_51572 packWithOneDirectionCleared (ILnet/minecraft/class_2350;)J + ARG 0 lightLevel + ARG 1 direction + METHOD method_51573 (IZ)J + ARG 0 lightLevel + ARG 1 trivial + METHOD method_51574 (IZLnet/minecraft/class_2350;)J + ARG 0 lightLevel + ARG 1 trivial + ARG 2 direction + METHOD method_51575 getLightLevel (J)I + ARG 0 packed + METHOD method_51576 withLightLevel (JI)J + ARG 0 packed + ARG 2 lightLevel + METHOD method_51577 isDirectionBitSet (JLnet/minecraft/class_2350;)Z + ARG 0 packed + ARG 2 direction + METHOD method_51578 (ZZZZZ)J + ARG 0 down + ARG 1 north + ARG 2 south + ARG 3 west + ARG 4 east + METHOD method_51579 (IZLnet/minecraft/class_2350;)J + ARG 0 lightLevel + ARG 1 trivial + ARG 2 direction + METHOD method_51580 isTrivial (J)Z + ARG 0 packed + METHOD method_51581 setDirectionBit (JLnet/minecraft/class_2350;)J + ARG 0 packed + ARG 2 direction + METHOD method_51582 (J)Z + ARG 0 packed + METHOD method_51583 clearDirectionBit (JLnet/minecraft/class_2350;)J + ARG 0 packed + ARG 2 direction diff --git a/mappings/net/minecraft/world/chunk/light/ChunkSkyLight.mapping b/mappings/net/minecraft/world/chunk/light/ChunkSkyLight.mapping new file mode 100644 index 0000000000..a6a2189c11 --- /dev/null +++ b/mappings/net/minecraft/world/chunk/light/ChunkSkyLight.mapping @@ -0,0 +1,53 @@ +CLASS net/minecraft/class_8528 net/minecraft/world/chunk/light/ChunkSkyLight + FIELD field_44712 minY I + FIELD field_44713 palette Lnet/minecraft/class_6490; + FIELD field_44714 reusableBlockPos1 Lnet/minecraft/class_2338$class_2339; + FIELD field_44715 reusableBlockPos2 Lnet/minecraft/class_2338$class_2339; + METHOD (Lnet/minecraft/class_5539;)V + ARG 1 heightLimitView + METHOD method_51533 getMaxSurfaceY ()I + METHOD method_51534 fill (I)V + ARG 1 y + METHOD method_51535 get (II)I + ARG 1 localX + ARG 2 localZ + METHOD method_51536 isSkyLightAccessible (Lnet/minecraft/class_1922;III)Z + ARG 1 blockView + ARG 2 localX + ARG 3 y + ARG 4 localZ + METHOD method_51537 isSkyLightAccessible (Lnet/minecraft/class_1922;IILnet/minecraft/class_2338;Lnet/minecraft/class_2680;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;)Z + ARG 1 blockView + ARG 2 packedIndex + ARG 3 value + ARG 4 upperPos + ARG 5 upperState + ARG 6 lowerPos + ARG 7 lowerState + METHOD method_51538 locateLightBlockingBlockBelow (Lnet/minecraft/class_1922;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;)I + ARG 1 blockView + ARG 2 pos + ARG 3 blockState + METHOD method_51539 faceBlocksLight (Lnet/minecraft/class_1922;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;)Z + ARG 0 blockView + ARG 1 upperPos + ARG 2 upperState + ARG 3 lowerPos + ARG 4 lowerState + METHOD method_51540 refreshSurfaceY (Lnet/minecraft/class_2791;)V + ARG 1 chunk + METHOD method_51541 calculateSurfaceY (Lnet/minecraft/class_2791;III)I + ARG 1 chunk + ARG 2 topSectionIndex + ARG 3 localX + ARG 4 localZ + METHOD method_51542 get (I)I + ARG 1 index + METHOD method_51543 set (II)V + ARG 1 index + ARG 2 y + METHOD method_51544 convertMinY (I)I + ARG 1 y + METHOD method_51545 getPackedIndex (II)I + ARG 0 localX + ARG 1 localZ diff --git a/mappings/net/minecraft/world/chunk/light/ChunkSkyLightProvider.mapping b/mappings/net/minecraft/world/chunk/light/ChunkSkyLightProvider.mapping index e617ca93c9..ea578d99b5 100644 --- a/mappings/net/minecraft/world/chunk/light/ChunkSkyLightProvider.mapping +++ b/mappings/net/minecraft/world/chunk/light/ChunkSkyLightProvider.mapping @@ -1,5 +1,25 @@ CLASS net/minecraft/class_3572 net/minecraft/world/chunk/light/ChunkSkyLightProvider - FIELD field_15825 HORIZONTAL_DIRECTIONS [Lnet/minecraft/class_2350; - FIELD field_15826 DIRECTIONS [Lnet/minecraft/class_2350; METHOD (Lnet/minecraft/class_2823;)V ARG 1 chunkProvider + METHOD (Lnet/minecraft/class_2823;Lnet/minecraft/class_3569;)V + ARG 1 chunkProvider + ARG 2 lightStorage + METHOD method_51585 (III)I + ARG 1 x + ARG 2 z + METHOD method_51586 (IIII)V + ARG 1 x + ARG 2 z + METHOD method_51587 (JLnet/minecraft/class_2350;IZI)V + ARG 1 blockPos + ARG 3 direction + ARG 4 lightLevel + METHOD method_51588 exitsChunkXZ (Lnet/minecraft/class_2350;II)Z + ARG 0 direction + ARG 1 localX + ARG 2 localZ + METHOD method_51589 (II)Lnet/minecraft/class_8528; + ARG 1 chunkX + ARG 2 chunkZ + METHOD method_51592 getNumberOfSectionsBelowPos (J)I + ARG 1 blockPos diff --git a/mappings/net/minecraft/world/chunk/light/LevelPropagator.mapping b/mappings/net/minecraft/world/chunk/light/LevelPropagator.mapping index 9aab3df3cc..bb070eb445 100644 --- a/mappings/net/minecraft/world/chunk/light/LevelPropagator.mapping +++ b/mappings/net/minecraft/world/chunk/light/LevelPropagator.mapping @@ -1,10 +1,9 @@ CLASS net/minecraft/class_3554 net/minecraft/world/chunk/light/LevelPropagator - FIELD field_15781 minPendingLevel I FIELD field_15782 hasPendingUpdates Z FIELD field_15783 levelCount I FIELD field_15784 pendingUpdates Lit/unimi/dsi/fastutil/longs/Long2ByteMap; - FIELD field_15785 pendingIdUpdatesByLevel [Lit/unimi/dsi/fastutil/longs/LongLinkedOpenHashSet; FIELD field_31706 MAX_LEVEL I + FIELD field_43396 pendingUpdateQueue Lnet/minecraft/class_8257; METHOD (III)V ARG 1 levelCount ARG 2 expectedLevelSize @@ -14,20 +13,13 @@ CLASS net/minecraft/class_3554 net/minecraft/world/chunk/light/LevelPropagator ARG 3 id ARG 5 level ARG 6 decrease - METHOD method_15479 addPendingUpdate (JII)V - ARG 1 id - ARG 3 level - ARG 4 targetLevel METHOD method_15480 getLevel (J)I ARG 1 id - METHOD method_15481 increaseMinPendingLevel (I)V - ARG 1 maxLevel METHOD method_15482 updateLevel (JJIIIZ)V ARG 1 sourceId ARG 3 id ARG 5 level ARG 6 currentLevel - ARG 7 pendingLevel ARG 8 decrease METHOD method_15483 removePendingUpdate (J)V ARG 1 id @@ -52,26 +44,18 @@ CLASS net/minecraft/class_3554 net/minecraft/world/chunk/light/LevelPropagator ARG 3 targetId ARG 5 level METHOD method_15489 hasPendingUpdates ()Z - METHOD method_15490 minLevel (II)I - ARG 1 a - ARG 2 b METHOD method_15491 resetLevel (J)V ARG 1 id METHOD method_15492 applyPendingUpdates (I)I ARG 1 maxSteps - METHOD method_15493 removePendingUpdate (JIIZ)V - ARG 1 id - ARG 3 level - ARG 4 levelCount - ARG 5 removeFully METHOD method_15494 isMarker (J)Z ARG 1 id METHOD method_24206 removePendingUpdateIf (Ljava/util/function/LongPredicate;)V ARG 1 predicate METHOD method_24208 getPendingUpdateCount ()I + METHOD method_50014 calculateLevel (II)I + ARG 1 a + ARG 2 b CLASS 1 METHOD rehash (I)V ARG 1 newN - CLASS 2 - METHOD rehash (I)V - ARG 1 newN diff --git a/mappings/net/minecraft/world/chunk/light/LightSourceView.mapping b/mappings/net/minecraft/world/chunk/light/LightSourceView.mapping new file mode 100644 index 0000000000..77d86a094a --- /dev/null +++ b/mappings/net/minecraft/world/chunk/light/LightSourceView.mapping @@ -0,0 +1,4 @@ +CLASS net/minecraft/class_8527 net/minecraft/world/chunk/light/LightSourceView + METHOD method_12018 getChunkSkyLight ()Lnet/minecraft/class_8528; + METHOD method_51524 forEachLightSource (Ljava/util/function/BiConsumer;)V + ARG 1 callback diff --git a/mappings/net/minecraft/world/chunk/light/LightStorage.mapping b/mappings/net/minecraft/world/chunk/light/LightStorage.mapping index cb3552eea7..e64c1fea1a 100644 --- a/mappings/net/minecraft/world/chunk/light/LightStorage.mapping +++ b/mappings/net/minecraft/world/chunk/light/LightStorage.mapping @@ -11,21 +11,17 @@ CLASS net/minecraft/class_3560 net/minecraft/world/chunk/light/LightStorage COMMENT @see SkyLightStorage COMMENT @see BlockLightStorage FIELD field_15796 storage Lnet/minecraft/class_3556; - FIELD field_15797 markedNotReadySections Lit/unimi/dsi/fastutil/longs/LongSet; FIELD field_15798 sectionsToRemove Lit/unimi/dsi/fastutil/longs/LongSet; - FIELD field_15799 DIRECTIONS [Lnet/minecraft/class_2350; - FIELD field_15800 hasLightUpdates Z - FIELD field_15801 EMPTY Lnet/minecraft/class_2804; FIELD field_15802 dirtySections Lit/unimi/dsi/fastutil/longs/LongSet; FIELD field_15803 chunkProvider Lnet/minecraft/class_2823; - FIELD field_15804 markedReadySections Lit/unimi/dsi/fastutil/longs/LongSet; FIELD field_15805 lightType Lnet/minecraft/class_1944; FIELD field_15806 uncachedStorage Lnet/minecraft/class_3556; FIELD field_15807 queuedSections Lit/unimi/dsi/fastutil/longs/Long2ObjectMap; - FIELD field_15808 readySections Lit/unimi/dsi/fastutil/longs/LongSet; FIELD field_16448 notifySections Lit/unimi/dsi/fastutil/longs/LongSet; FIELD field_19342 columnsToRetain Lit/unimi/dsi/fastutil/longs/LongSet; - FIELD field_25621 queuedEdgeSections Lit/unimi/dsi/fastutil/longs/LongSet; + FIELD field_44716 sectionPropagations Lit/unimi/dsi/fastutil/longs/Long2ByteMap; + FIELD field_44717 hasLightUpdates Z + FIELD field_44718 enabledColumns Lit/unimi/dsi/fastutil/longs/LongSet; METHOD (Lnet/minecraft/class_1944;Lnet/minecraft/class_2823;Lnet/minecraft/class_3556;)V ARG 1 lightType ARG 2 chunkProvider @@ -43,18 +39,15 @@ CLASS net/minecraft/class_3560 net/minecraft/world/chunk/light/LightStorage METHOD method_15526 setSectionStatus (JZ)V ARG 1 sectionPos ARG 3 notReady - METHOD method_15527 updateLight (Lnet/minecraft/class_3558;ZZ)V + METHOD method_15527 updateLight (Lnet/minecraft/class_3558;)V ARG 1 lightProvider - ARG 2 doSkylight - ARG 3 skipEdgeLightPropagation METHOD method_15528 hasLightUpdates ()Z METHOD method_15529 createSection (J)Lnet/minecraft/class_2804; ARG 1 sectionPos METHOD method_15530 notifyChanges ()V - METHOD method_15532 enqueueSectionData (JLnet/minecraft/class_2804;Z)V + METHOD method_15532 enqueueSectionData (JLnet/minecraft/class_2804;)V ARG 1 sectionPos ARG 3 array - ARG 4 nonEdge METHOD method_15533 getLightSection (Lnet/minecraft/class_3556;J)Lnet/minecraft/class_2804; ARG 1 storage ARG 2 sectionPos @@ -63,19 +56,48 @@ CLASS net/minecraft/class_3560 net/minecraft/world/chunk/light/LightStorage METHOD method_15535 setColumnEnabled (JZ)V ARG 1 columnPos ARG 3 enabled - METHOD method_15536 removeSection (Lnet/minecraft/class_3558;J)V - ARG 1 storage - ARG 2 sectionPos METHOD method_15537 get (J)I ARG 1 blockPos METHOD method_15538 getLight (J)I ARG 1 blockPos - METHOD method_15539 updateAll ()V METHOD method_20533 getLightSection (J)Lnet/minecraft/class_2804; ARG 1 sectionPos METHOD method_20600 setRetainColumn (JZ)V ARG 1 sectionPos ARG 3 retain - METHOD method_29967 updateSection (Lnet/minecraft/class_3558;J)V - ARG 1 lightProvider - ARG 2 sectionPos + METHOD method_51415 addNotifySections (J)V + ARG 1 id + METHOD method_51546 setSectionPropagation (JB)V + ARG 1 sectionPos + ARG 3 flags + METHOD method_51547 (J)Lnet/minecraft/class_2804; + ARG 1 sectionPos + METHOD method_51548 isSectionInEnabledColumn (J)Z + ARG 1 sectionPos + METHOD method_51549 getStatus (J)Lnet/minecraft/class_3560$class_8530; + ARG 1 sectionPos + METHOD method_51550 queueForUpdate (J)V + ARG 1 sectionPos + METHOD method_51551 queueForRemoval (J)V + ARG 1 sectionPos + CLASS class_8529 PropagationFlags + FIELD field_44720 MIN_NEIGHBOR_COUNT I + FIELD field_44721 MAX_NEIGHBOR_COUNT I + FIELD field_44723 NEIGHBOR_COUNT_MASK B + METHOD method_51552 isReady (B)Z + ARG 0 packed + METHOD method_51553 withNeighborCount (BI)B + ARG 0 packed + ARG 1 neighborCount + METHOD method_51554 setReady (BZ)B + ARG 0 packed + ARG 1 ready + METHOD method_51555 getNeighborCount (B)I + ARG 0 packed + METHOD method_51556 getStatus (B)Lnet/minecraft/class_3560$class_8530; + ARG 0 packed + CLASS class_8530 Status + FIELD field_44727 sigil Ljava/lang/String; + METHOD (Ljava/lang/String;ILjava/lang/String;)V + ARG 3 sigil + METHOD method_51557 getSigil ()Ljava/lang/String; diff --git a/mappings/net/minecraft/world/chunk/light/LightingProvider.mapping b/mappings/net/minecraft/world/chunk/light/LightingProvider.mapping index 985ec15213..1c6df0a3fc 100644 --- a/mappings/net/minecraft/world/chunk/light/LightingProvider.mapping +++ b/mappings/net/minecraft/world/chunk/light/LightingProvider.mapping @@ -6,11 +6,10 @@ CLASS net/minecraft/class_3568 net/minecraft/world/chunk/light/LightingProvider ARG 1 chunkProvider ARG 2 hasBlockLight ARG 3 hasSkyLight - METHOD method_15558 enqueueSectionData (Lnet/minecraft/class_1944;Lnet/minecraft/class_4076;Lnet/minecraft/class_2804;Z)V + METHOD method_15558 enqueueSectionData (Lnet/minecraft/class_1944;Lnet/minecraft/class_4076;Lnet/minecraft/class_2804;)V ARG 1 lightType ARG 2 pos ARG 3 nibbles - ARG 4 nonEdge METHOD method_15562 get (Lnet/minecraft/class_1944;)Lnet/minecraft/class_3562; ARG 1 lightType METHOD method_20601 setRetainData (Lnet/minecraft/class_1923;Z)V @@ -25,3 +24,8 @@ CLASS net/minecraft/class_3568 net/minecraft/world/chunk/light/LightingProvider METHOD method_31928 getHeight ()I METHOD method_31929 getBottomY ()I METHOD method_31930 getTopY ()I + METHOD method_51559 isLightingEnabled (Lnet/minecraft/class_4076;)Z + ARG 1 sectionPos + METHOD method_51560 getStatus (Lnet/minecraft/class_1944;Lnet/minecraft/class_4076;)Lnet/minecraft/class_3560$class_8530; + ARG 1 lightType + ARG 2 pos diff --git a/mappings/net/minecraft/world/chunk/light/LightingView.mapping b/mappings/net/minecraft/world/chunk/light/LightingView.mapping index 95b4b1272e..6544dcc6e7 100644 --- a/mappings/net/minecraft/world/chunk/light/LightingView.mapping +++ b/mappings/net/minecraft/world/chunk/light/LightingView.mapping @@ -4,12 +4,7 @@ CLASS net/minecraft/class_3565 net/minecraft/world/chunk/light/LightingView ARG 2 retainData METHOD method_15513 checkBlock (Lnet/minecraft/class_2338;)V ARG 1 pos - METHOD method_15514 addLightSource (Lnet/minecraft/class_2338;I)V - ARG 1 pos - ARG 2 level - METHOD method_15516 doLightUpdates (IZZ)I - ARG 2 doSkylight - ARG 3 skipEdgeLightPropagation + METHOD method_15516 doLightUpdates ()I METHOD method_15518 hasUpdates ()Z METHOD method_15551 setSectionStatus (Lnet/minecraft/class_4076;Z)V ARG 1 pos @@ -17,3 +12,5 @@ CLASS net/minecraft/class_3565 net/minecraft/world/chunk/light/LightingView METHOD method_15552 setSectionStatus (Lnet/minecraft/class_2338;Z)V ARG 1 pos ARG 2 notReady + METHOD method_51471 propagateLight (Lnet/minecraft/class_1923;)V + ARG 1 chunkPos diff --git a/mappings/net/minecraft/world/chunk/light/PendingUpdateQueue.mapping b/mappings/net/minecraft/world/chunk/light/PendingUpdateQueue.mapping new file mode 100644 index 0000000000..e1f8fae6bd --- /dev/null +++ b/mappings/net/minecraft/world/chunk/light/PendingUpdateQueue.mapping @@ -0,0 +1,21 @@ +CLASS net/minecraft/class_8257 net/minecraft/world/chunk/light/PendingUpdateQueue + FIELD field_43399 levelCount I + FIELD field_43400 pendingIdUpdatesByLevel [Lit/unimi/dsi/fastutil/longs/LongLinkedOpenHashSet; + FIELD field_43401 minPendingLevel I + METHOD (II)V + ARG 1 levelCount + ARG 2 expectedLevelSize + METHOD method_50019 dequeue ()J + METHOD method_50020 increaseMinPendingLevel (I)V + ARG 1 maxLevel + METHOD method_50021 enqueue (JI)V + ARG 1 id + ARG 3 level + METHOD method_50022 remove (JII)V + ARG 1 id + ARG 3 level + ARG 4 levelCount + METHOD method_50023 isEmpty ()Z + CLASS 1 + METHOD rehash (I)V + ARG 1 newN diff --git a/mappings/net/minecraft/world/chunk/light/SkyLightStorage.mapping b/mappings/net/minecraft/world/chunk/light/SkyLightStorage.mapping index 857b84f247..ccdbd5c185 100644 --- a/mappings/net/minecraft/world/chunk/light/SkyLightStorage.mapping +++ b/mappings/net/minecraft/world/chunk/light/SkyLightStorage.mapping @@ -1,27 +1,18 @@ CLASS net/minecraft/class_3569 net/minecraft/world/chunk/light/SkyLightStorage - FIELD field_15815 sectionsToUpdate Lit/unimi/dsi/fastutil/longs/LongSet; - FIELD field_15816 sectionsToRemove Lit/unimi/dsi/fastutil/longs/LongSet; - FIELD field_15817 enabledColumns Lit/unimi/dsi/fastutil/longs/LongSet; - FIELD field_15818 LIGHT_REDUCTION_DIRECTIONS [Lnet/minecraft/class_2350; - FIELD field_15819 hasUpdates Z METHOD (Lnet/minecraft/class_2823;)V ARG 1 chunkProvider - METHOD method_15566 isSectionEnabled (J)Z - ARG 1 sectionPos METHOD method_15567 isAboveMinHeight (I)Z ARG 1 sectionY METHOD method_15568 isAtOrAboveTopmostSection (J)Z ARG 1 sectionPos - METHOD method_15569 checkForUpdates ()V - METHOD method_20809 enqueueRemoveSection (J)V - ARG 1 sectionPos - METHOD method_20810 enqueueAddSection (J)V - ARG 1 sectionPos METHOD method_31931 getLight (JZ)I ARG 1 blockPos ARG 3 cached METHOD method_37460 copy (Lnet/minecraft/class_2804;)Lnet/minecraft/class_2804; ARG 0 source + METHOD method_51593 getMinSectionY ()I + METHOD method_51594 getTopSectionForColumn (J)I + ARG 1 columnPos CLASS class_3570 Data FIELD field_15821 columnToTopSection Lit/unimi/dsi/fastutil/longs/Long2IntOpenHashMap; FIELD field_15822 minSectionY I diff --git a/mappings/net/minecraft/world/dimension/DimensionOptions.mapping b/mappings/net/minecraft/world/dimension/DimensionOptions.mapping index 53dec95582..a486cd6ab3 100644 --- a/mappings/net/minecraft/world/dimension/DimensionOptions.mapping +++ b/mappings/net/minecraft/world/dimension/DimensionOptions.mapping @@ -1,25 +1,14 @@ CLASS net/minecraft/class_5363 net/minecraft/world/dimension/DimensionOptions + FIELD comp_1012 dimensionTypeEntry Lnet/minecraft/class_6880; + FIELD comp_1013 chunkGenerator Lnet/minecraft/class_2794; FIELD field_25411 CODEC Lcom/mojang/serialization/Codec; FIELD field_25412 OVERWORLD Lnet/minecraft/class_5321; FIELD field_25413 NETHER Lnet/minecraft/class_5321; FIELD field_25414 END Lnet/minecraft/class_5321; - FIELD field_25415 BASE_DIMENSIONS Ljava/util/Set; - FIELD field_25416 dimensionTypeEntry Lnet/minecraft/class_6880; - FIELD field_25417 chunkGenerator Lnet/minecraft/class_2794; METHOD (Lnet/minecraft/class_6880;Lnet/minecraft/class_2794;)V ARG 1 dimensionTypeEntry ARG 2 chunkGenerator - METHOD method_29566 getDimensionTypeEntry ()Lnet/minecraft/class_6880; - METHOD method_29567 hasDefaultSettings (Lnet/minecraft/class_2378;)Z - ARG 0 registry + METHOD comp_1012 dimensionTypeEntry ()Lnet/minecraft/class_6880; + METHOD comp_1013 chunkGenerator ()Lnet/minecraft/class_2794; METHOD method_29568 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; ARG 0 instance - METHOD method_29569 createRegistry (Lnet/minecraft/class_2378;)Lnet/minecraft/class_2378; - ARG 0 registry - METHOD method_29571 getChunkGenerator ()Lnet/minecraft/class_2794; - METHOD method_41525 (Lnet/minecraft/class_2378;Lnet/minecraft/class_2385;Lnet/minecraft/class_5321;)V - ARG 2 registryKey - METHOD method_41526 streamRegistry (Ljava/util/stream/Stream;)Ljava/util/stream/Stream; - ARG 0 stream - METHOD method_41527 (Lnet/minecraft/class_5321;)Z - ARG 0 registryKey diff --git a/mappings/net/minecraft/world/dimension/DimensionOptionsRegistryHolder.mapping b/mappings/net/minecraft/world/dimension/DimensionOptionsRegistryHolder.mapping new file mode 100644 index 0000000000..8ded369e15 --- /dev/null +++ b/mappings/net/minecraft/world/dimension/DimensionOptionsRegistryHolder.mapping @@ -0,0 +1,55 @@ +CLASS net/minecraft/class_7723 net/minecraft/world/dimension/DimensionOptionsRegistryHolder + FIELD field_40363 CODEC Lcom/mojang/serialization/MapCodec; + FIELD field_40364 VANILLA_KEYS Ljava/util/Set; + FIELD field_40365 VANILLA_KEY_COUNT I + METHOD method_45513 getChunkGenerator ()Lnet/minecraft/class_2794; + METHOD method_45514 getOrEmpty (Lnet/minecraft/class_5321;)Ljava/util/Optional; + ARG 1 key + METHOD method_45515 getLifecycle (Lnet/minecraft/class_5321;Lnet/minecraft/class_5363;)Lcom/mojang/serialization/Lifecycle; + ARG 0 key + ARG 1 dimensionOptions + METHOD method_45516 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 0 instance + METHOD method_45517 isOverworldVanilla (Lnet/minecraft/class_5363;)Z + ARG 0 dimensionOptions + METHOD method_45518 toConfig (Lnet/minecraft/class_2378;)Lnet/minecraft/class_7723$class_7725; + ARG 1 existingRegistry + METHOD method_45519 createRegistry (Lnet/minecraft/class_2378;Lnet/minecraft/class_6880;Lnet/minecraft/class_2794;)Lnet/minecraft/class_2378; + ARG 0 currentRegistry + ARG 1 overworldEntry + ARG 2 chunkGenerator + METHOD method_45520 createRegistry (Lnet/minecraft/class_2378;Lnet/minecraft/class_2378;Lnet/minecraft/class_2794;)Lnet/minecraft/class_2378; + ARG 0 dynamicRegistry + ARG 1 currentRegistry + ARG 2 chunkGenerator + METHOD method_45521 (Lnet/minecraft/class_2378;Ljava/util/List;Lnet/minecraft/class_5321;)V + ARG 3 key + METHOD method_45522 with (Lnet/minecraft/class_5455;Lnet/minecraft/class_2794;)Lnet/minecraft/class_7723; + ARG 1 dynamicRegistryManager + ARG 2 chunkGenerator + METHOD method_45523 (Lnet/minecraft/class_2385;Lnet/minecraft/class_7723$class_7724;)V + ARG 1 entry + METHOD method_45524 (Ljava/util/List;Lnet/minecraft/class_5321;Lnet/minecraft/class_5363;)V + ARG 2 dimensionOptions + METHOD method_45525 streamAll (Ljava/util/stream/Stream;)Ljava/util/stream/Stream; + ARG 0 otherKeys + METHOD method_45526 getWorldKeys ()Lcom/google/common/collect/ImmutableSet; + METHOD method_45528 isVanilla (Lnet/minecraft/class_5321;Lnet/minecraft/class_5363;)Z + ARG 0 key + ARG 1 dimensionOptions + METHOD method_45529 isNetherVanilla (Lnet/minecraft/class_5363;)Z + ARG 0 dimensionOptions + METHOD method_45530 getSpecialProperty (Lnet/minecraft/class_2378;)Lnet/minecraft/class_31$class_7729; + ARG 0 dimensionOptionsRegistry + METHOD method_45531 isDebug ()Z + METHOD method_45532 (Lnet/minecraft/class_5321;)Z + ARG 0 key + METHOD method_45533 isTheEndVanilla (Lnet/minecraft/class_5363;)Z + ARG 0 dimensionOptions + METHOD method_45534 (Lnet/minecraft/class_5363;)Lnet/minecraft/class_31$class_7729; + ARG 0 overworldEntry + CLASS class_7724 Entry + METHOD method_45535 getLifecycle ()Lcom/mojang/serialization/Lifecycle; + CLASS class_7725 DimensionsConfig + METHOD method_45536 getLifecycle ()Lcom/mojang/serialization/Lifecycle; + METHOD method_45537 toDynamicRegistryManager ()Lnet/minecraft/class_5455$class_6890; diff --git a/mappings/net/minecraft/world/dimension/DimensionTypeRegistrar.mapping b/mappings/net/minecraft/world/dimension/DimensionTypeRegistrar.mapping index 4fea2b7338..64aa717bc9 100644 --- a/mappings/net/minecraft/world/dimension/DimensionTypeRegistrar.mapping +++ b/mappings/net/minecraft/world/dimension/DimensionTypeRegistrar.mapping @@ -1,3 +1,3 @@ CLASS net/minecraft/class_7231 net/minecraft/world/dimension/DimensionTypeRegistrar - METHOD method_42043 initAndGetDefault (Lnet/minecraft/class_2378;)Lnet/minecraft/class_6880; - ARG 0 registry + METHOD method_42043 bootstrap (Lnet/minecraft/class_7891;)V + ARG 0 dimensionTypeRegisterable diff --git a/mappings/net/minecraft/world/dimension/AreaHelper.mapping b/mappings/net/minecraft/world/dimension/NetherPortal.mapping similarity index 81% rename from mappings/net/minecraft/world/dimension/AreaHelper.mapping rename to mappings/net/minecraft/world/dimension/NetherPortal.mapping index 39cc85342b..d6e8399d3f 100644 --- a/mappings/net/minecraft/world/dimension/AreaHelper.mapping +++ b/mappings/net/minecraft/world/dimension/NetherPortal.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_2424 net/minecraft/world/dimension/AreaHelper +CLASS net/minecraft/class_2424 net/minecraft/world/dimension/NetherPortal FIELD field_11311 width I FIELD field_11312 height I FIELD field_11313 foundPortalBlocks I @@ -8,7 +8,11 @@ CLASS net/minecraft/class_2424 net/minecraft/world/dimension/AreaHelper FIELD field_11318 world Lnet/minecraft/class_1936; FIELD field_25883 IS_VALID_FRAME_BLOCK Lnet/minecraft/class_4970$class_4973; FIELD field_31823 MAX_WIDTH I + FIELD field_31824 MAX_HEIGHT I FIELD field_31825 MIN_WIDTH I + FIELD field_31826 MIN_HEIGHT I + FIELD field_41086 FALLBACK_THRESHOLD F + FIELD field_41087 HEIGHT_STRETCH D METHOD (Lnet/minecraft/class_1936;Lnet/minecraft/class_2338;Lnet/minecraft/class_2350$class_2351;)V ARG 1 world ARG 2 pos @@ -18,7 +22,7 @@ CLASS net/minecraft/class_2424 net/minecraft/world/dimension/AreaHelper METHOD method_10360 isValid ()Z METHOD method_10362 wasAlreadyValid ()Z METHOD method_10363 createPortal ()V - METHOD method_30484 getNetherTeleportTarget (Lnet/minecraft/class_3218;Lnet/minecraft/class_5459$class_5460;Lnet/minecraft/class_2350$class_2351;Lnet/minecraft/class_243;Lnet/minecraft/class_4048;Lnet/minecraft/class_243;FF)Lnet/minecraft/class_5454; + METHOD method_30484 getNetherTeleportTarget (Lnet/minecraft/class_3218;Lnet/minecraft/class_5459$class_5460;Lnet/minecraft/class_2350$class_2351;Lnet/minecraft/class_243;Lnet/minecraft/class_1297;Lnet/minecraft/class_243;FF)Lnet/minecraft/class_5454; COMMENT Determines a {@link TeleportTarget} based on a specific portal. COMMENT COMMENT

The offset, velocity, and angle are modified based on the portal's axis. @@ -26,7 +30,7 @@ CLASS net/minecraft/class_2424 net/minecraft/world/dimension/AreaHelper ARG 1 portalRect ARG 2 portalAxis ARG 3 offset - ARG 4 dimensions + ARG 4 entity ARG 5 velocity ARG 6 yaw ARG 7 pitch @@ -62,3 +66,10 @@ CLASS net/minecraft/class_2424 net/minecraft/world/dimension/AreaHelper ARG 3 entityDimensions METHOD method_30495 getWidth ()I METHOD method_30496 getHeight ()I + METHOD method_47381 (DLnet/minecraft/class_243;)Lnet/minecraft/class_243; + ARG 2 pos + METHOD method_47382 findOpenPosition (Lnet/minecraft/class_243;Lnet/minecraft/class_3218;Lnet/minecraft/class_1297;Lnet/minecraft/class_4048;)Lnet/minecraft/class_243; + ARG 0 fallback + ARG 1 world + ARG 2 entity + ARG 3 dimensions diff --git a/mappings/net/minecraft/world/entity/EntityIndex.mapping b/mappings/net/minecraft/world/entity/EntityIndex.mapping index 1d3255530a..e8bab8b3fe 100644 --- a/mappings/net/minecraft/world/entity/EntityIndex.mapping +++ b/mappings/net/minecraft/world/entity/EntityIndex.mapping @@ -8,9 +8,9 @@ CLASS net/minecraft/class_5570 net/minecraft/world/entity/EntityIndex ARG 1 id METHOD method_31753 add (Lnet/minecraft/class_5568;)V ARG 1 entity - METHOD method_31754 forEach (Lnet/minecraft/class_5575;Ljava/util/function/Consumer;)V + METHOD method_31754 forEach (Lnet/minecraft/class_5575;Lnet/minecraft/class_7927;)V ARG 1 filter - ARG 2 action + ARG 2 consumer METHOD method_31755 get (Ljava/util/UUID;)Lnet/minecraft/class_5568; ARG 1 uuid METHOD method_31756 size ()I diff --git a/mappings/net/minecraft/world/entity/EntityLookup.mapping b/mappings/net/minecraft/world/entity/EntityLookup.mapping index f7afb27ea3..7f524678c9 100644 --- a/mappings/net/minecraft/world/entity/EntityLookup.mapping +++ b/mappings/net/minecraft/world/entity/EntityLookup.mapping @@ -9,19 +9,19 @@ CLASS net/minecraft/class_5577 net/minecraft/world/entity/EntityLookup METHOD method_31804 get (I)Lnet/minecraft/class_5568; COMMENT Returns an entity by its network ID, or {@code null} if none is found. ARG 1 id - METHOD method_31805 forEachIntersects (Lnet/minecraft/class_5575;Lnet/minecraft/class_238;Ljava/util/function/Consumer;)V + METHOD method_31805 forEachIntersects (Lnet/minecraft/class_5575;Lnet/minecraft/class_238;Lnet/minecraft/class_7927;)V ARG 1 filter ARG 2 box - ARG 3 action - METHOD method_31806 forEach (Lnet/minecraft/class_5575;Ljava/util/function/Consumer;)V + ARG 3 consumer + METHOD method_31806 forEach (Lnet/minecraft/class_5575;Lnet/minecraft/class_7927;)V COMMENT Performs an {@code action} on each entity of type {@code U} within this COMMENT lookup. COMMENT COMMENT @param the type of entity to perform action on ARG 1 filter COMMENT specifies the desired type of entity - ARG 2 action - COMMENT the action to perform + ARG 2 consumer + COMMENT the consumer, additionally checking whether to perform the next iteration or to stop early METHOD method_31807 forEachIntersects (Lnet/minecraft/class_238;Ljava/util/function/Consumer;)V ARG 1 box ARG 2 action diff --git a/mappings/net/minecraft/world/entity/EntityTrackingSection.mapping b/mappings/net/minecraft/world/entity/EntityTrackingSection.mapping index f1258d799c..8e1a594df7 100644 --- a/mappings/net/minecraft/world/entity/EntityTrackingSection.mapping +++ b/mappings/net/minecraft/world/entity/EntityTrackingSection.mapping @@ -7,17 +7,17 @@ CLASS net/minecraft/class_5572 net/minecraft/world/entity/EntityTrackingSection ARG 1 entityClass ARG 2 status METHOD method_31761 isEmpty ()Z - METHOD method_31762 forEach (Lnet/minecraft/class_5575;Lnet/minecraft/class_238;Ljava/util/function/Consumer;)V + METHOD method_31762 forEach (Lnet/minecraft/class_5575;Lnet/minecraft/class_238;Lnet/minecraft/class_7927;)Lnet/minecraft/class_7927$class_7928; ARG 1 type ARG 2 box - ARG 3 action + ARG 3 consumer METHOD method_31763 swapStatus (Lnet/minecraft/class_5584;)Lnet/minecraft/class_5584; ARG 1 status METHOD method_31764 add (Lnet/minecraft/class_5568;)V ARG 1 entity - METHOD method_31765 forEach (Lnet/minecraft/class_238;Ljava/util/function/Consumer;)V + METHOD method_31765 forEach (Lnet/minecraft/class_238;Lnet/minecraft/class_7927;)Lnet/minecraft/class_7927$class_7928; ARG 1 box - ARG 2 action + ARG 2 consumer METHOD method_31766 stream ()Ljava/util/stream/Stream; METHOD method_31767 remove (Lnet/minecraft/class_5568;)Z ARG 1 entity diff --git a/mappings/net/minecraft/world/entity/EntityTrackingStatus.mapping b/mappings/net/minecraft/world/entity/EntityTrackingStatus.mapping index 3b582e20e0..10378145be 100644 --- a/mappings/net/minecraft/world/entity/EntityTrackingStatus.mapping +++ b/mappings/net/minecraft/world/entity/EntityTrackingStatus.mapping @@ -8,6 +8,6 @@ CLASS net/minecraft/class_5584 net/minecraft/world/entity/EntityTrackingStatus ARG 3 tracked ARG 4 tick METHOD method_31883 shouldTick ()Z - METHOD method_31884 fromLevelType (Lnet/minecraft/class_3193$class_3194;)Lnet/minecraft/class_5584; + METHOD method_31884 fromLevelType (Lnet/minecraft/class_3194;)Lnet/minecraft/class_5584; ARG 0 levelType METHOD method_31885 shouldTrack ()Z diff --git a/mappings/net/minecraft/world/entity/SectionedEntityCache.mapping b/mappings/net/minecraft/world/entity/SectionedEntityCache.mapping index 96b5ef95df..6ababc3f58 100644 --- a/mappings/net/minecraft/world/entity/SectionedEntityCache.mapping +++ b/mappings/net/minecraft/world/entity/SectionedEntityCache.mapping @@ -15,24 +15,25 @@ CLASS net/minecraft/class_5573 net/minecraft/world/entity/SectionedEntityCache ARG 2 chunkZ METHOD method_31772 getSections (J)Ljava/util/stream/LongStream; ARG 1 chunkPos - METHOD method_31773 forEachIntersects (Lnet/minecraft/class_5575;Lnet/minecraft/class_238;Ljava/util/function/Consumer;)V + METHOD method_31773 forEachIntersects (Lnet/minecraft/class_5575;Lnet/minecraft/class_238;Lnet/minecraft/class_7927;)V ARG 1 filter ARG 2 box - ARG 3 action - METHOD method_31777 forEachInBox (Lnet/minecraft/class_238;Ljava/util/function/Consumer;)V + ARG 3 consumer + METHOD method_31777 forEachInBox (Lnet/minecraft/class_238;Lnet/minecraft/class_7927;)V COMMENT Runs the given action on each collection of entities in the chunk sections within the given box. ARG 1 box - ARG 2 action - METHOD method_31778 (Lnet/minecraft/class_5575;Lnet/minecraft/class_238;Ljava/util/function/Consumer;Lnet/minecraft/class_5572;)V + ARG 2 consumer + METHOD method_31778 (Lnet/minecraft/class_5575;Lnet/minecraft/class_238;Lnet/minecraft/class_7927;Lnet/minecraft/class_5572;)Lnet/minecraft/class_7927$class_7928; ARG 3 section METHOD method_31780 (Lit/unimi/dsi/fastutil/longs/LongSet;J)V + ARG 0 trackingSection ARG 1 sectionPos METHOD method_31781 sectionCount ()I METHOD method_31782 getTrackingSections (J)Ljava/util/stream/Stream; ARG 1 chunkPos - METHOD method_31783 forEachIntersects (Lnet/minecraft/class_238;Ljava/util/function/Consumer;)V + METHOD method_31783 forEachIntersects (Lnet/minecraft/class_238;Lnet/minecraft/class_7927;)V ARG 1 box - ARG 2 action + ARG 2 consumer METHOD method_31784 getTrackingSection (J)Lnet/minecraft/class_5572; ARG 1 sectionPos METHOD method_31785 findTrackingSection (J)Lnet/minecraft/class_5572; @@ -43,5 +44,5 @@ CLASS net/minecraft/class_5573 net/minecraft/world/entity/SectionedEntityCache ARG 0 sectionPos METHOD method_31788 addSection (J)Lnet/minecraft/class_5572; ARG 1 sectionPos - METHOD method_39465 (Lnet/minecraft/class_238;Ljava/util/function/Consumer;Lnet/minecraft/class_5572;)V + METHOD method_39465 (Lnet/minecraft/class_238;Lnet/minecraft/class_7927;Lnet/minecraft/class_5572;)Lnet/minecraft/class_7927$class_7928; ARG 2 section diff --git a/mappings/net/minecraft/world/event/EntityPositionSource.mapping b/mappings/net/minecraft/world/event/EntityPositionSource.mapping index f49a46ce1a..e672fa9fdd 100644 --- a/mappings/net/minecraft/world/event/EntityPositionSource.mapping +++ b/mappings/net/minecraft/world/event/EntityPositionSource.mapping @@ -23,7 +23,7 @@ CLASS net/minecraft/class_5709 net/minecraft/world/event/EntityPositionSource METHOD method_42676 (Lcom/mojang/datafixers/util/Either;)Ljava/lang/Integer; ARG 0 entityId METHOD method_42677 (Ljava/lang/Integer;)Ljava/util/UUID; - ARG 0 entityId + ARG 0 entityIdx METHOD method_42678 (Ljava/util/UUID;)Ljava/lang/Integer; ARG 0 uuid METHOD method_42679 (Ljava/util/UUID;Ljava/lang/Float;)Lnet/minecraft/class_5709; diff --git a/mappings/net/minecraft/world/event/GameEvent.mapping b/mappings/net/minecraft/world/event/GameEvent.mapping index 08eb19c833..134143571f 100644 --- a/mappings/net/minecraft/world/event/GameEvent.mapping +++ b/mappings/net/minecraft/world/event/GameEvent.mapping @@ -1,12 +1,9 @@ CLASS net/minecraft/class_5712 net/minecraft/world/event/GameEvent - FIELD field_28153 id Ljava/lang/String; FIELD field_28154 range I FIELD field_31449 DEFAULT_RANGE I FIELD field_36412 registryEntry Lnet/minecraft/class_6880$class_6883; - METHOD (Ljava/lang/String;I)V - ARG 1 id - ARG 2 range - METHOD method_32938 getId ()Ljava/lang/String; + METHOD (I)V + ARG 1 range METHOD method_32939 register (Ljava/lang/String;)Lnet/minecraft/class_5712; ARG 0 id METHOD method_32940 register (Ljava/lang/String;I)Lnet/minecraft/class_5712; diff --git a/mappings/net/minecraft/world/event/PositionSource.mapping b/mappings/net/minecraft/world/event/PositionSource.mapping index 471d2c824e..cc87ae848d 100644 --- a/mappings/net/minecraft/world/event/PositionSource.mapping +++ b/mappings/net/minecraft/world/event/PositionSource.mapping @@ -4,7 +4,7 @@ CLASS net/minecraft/class_5716 net/minecraft/world/event/PositionSource COMMENT @see net.minecraft.world.event.listener.GameEventListener#getPositionSource() FIELD field_28184 CODEC Lcom/mojang/serialization/Codec; COMMENT A codec for encoding and decoding any position source whose {@link #getType() type} - COMMENT is in the {@link net.minecraft.util.registry.Registry#POSITION_SOURCE_TYPE registry}. + COMMENT is in the {@link net.minecraft.registry.Registries#POSITION_SOURCE_TYPE registry}. METHOD method_32955 getType ()Lnet/minecraft/class_5717; COMMENT Returns the type of this position source. METHOD method_32956 getPos (Lnet/minecraft/class_1937;)Ljava/util/Optional; diff --git a/mappings/net/minecraft/world/event/Vibrations.mapping b/mappings/net/minecraft/world/event/Vibrations.mapping new file mode 100644 index 0000000000..1d59e4dcf0 --- /dev/null +++ b/mappings/net/minecraft/world/event/Vibrations.mapping @@ -0,0 +1,121 @@ +CLASS net/minecraft/class_8514 net/minecraft/world/event/Vibrations + FIELD field_44638 RESONATIONS [Lnet/minecraft/class_5712; + FIELD field_44639 FREQUENCIES Ljava/util/function/ToIntFunction; + METHOD method_51298 getVibrationListenerData ()Lnet/minecraft/class_8514$class_8515; + METHOD method_51299 getVibrationCallback ()Lnet/minecraft/class_8514$class_5719; + METHOD method_51383 (Lit/unimi/dsi/fastutil/objects/Object2IntOpenHashMap;)V + ARG 0 frequencies + METHOD method_51384 getSignalStrength (FI)I + ARG 0 distance + ARG 1 range + METHOD method_51385 getFrequency (Lnet/minecraft/class_5712;)I + ARG 0 event + METHOD method_51386 getResonation (I)Lnet/minecraft/class_5712; + ARG 0 frequency + CLASS class_5719 Callback + METHOD method_32969 accept (Lnet/minecraft/class_3218;Lnet/minecraft/class_2338;Lnet/minecraft/class_5712;Lnet/minecraft/class_1297;Lnet/minecraft/class_1297;F)V + COMMENT Accepts a game event after delay. + ARG 1 world + ARG 2 pos + ARG 3 event + ARG 4 sourceEntity + ARG 5 entity + ARG 6 distance + METHOD method_32970 accepts (Lnet/minecraft/class_3218;Lnet/minecraft/class_2338;Lnet/minecraft/class_5712;Lnet/minecraft/class_5712$class_7397;)Z + COMMENT Returns whether the callback wants to accept this event. + ARG 1 world + ARG 2 pos + ARG 3 event + ARG 4 emitter + METHOD method_42210 getTag ()Lnet/minecraft/class_6862; + METHOD method_42324 canAccept (Lnet/minecraft/class_5712;Lnet/minecraft/class_5712$class_7397;)Z + ARG 1 gameEvent + ARG 2 emitter + METHOD method_42672 onListen ()V + METHOD method_43695 triggersAvoidCriterion ()Z + METHOD method_49797 getRange ()I + METHOD method_51300 getPositionSource ()Lnet/minecraft/class_5716; + METHOD method_51363 requiresTickingChunksAround ()Z + METHOD method_51410 getDelay (F)I + ARG 1 distance + CLASS class_8515 ListenerData + FIELD field_44640 CODEC Lcom/mojang/serialization/Codec; + FIELD field_44641 LISTENER_NBT_KEY Ljava/lang/String; + FIELD field_44642 vibration Lnet/minecraft/class_7269; + FIELD field_44643 delay I + FIELD field_44644 vibrationSelector Lnet/minecraft/class_7722; + FIELD field_44645 spawnParticle Z + METHOD (Lnet/minecraft/class_7269;Lnet/minecraft/class_7722;IZ)V + ARG 1 vibration + ARG 2 vibrationSelector + ARG 3 delay + ARG 4 spawnParticle + METHOD method_51387 getSelector ()Lnet/minecraft/class_7722; + METHOD method_51388 setDelay (I)V + ARG 1 delay + METHOD method_51389 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 0 instance + METHOD method_51390 setVibration (Lnet/minecraft/class_7269;)V + ARG 1 vibration + METHOD method_51391 (Lnet/minecraft/class_8514$class_8515;)Ljava/util/Optional; + ARG 0 listenerData + METHOD method_51392 (Ljava/util/Optional;Lnet/minecraft/class_7722;Ljava/lang/Integer;)Lnet/minecraft/class_8514$class_8515; + ARG 0 vibration + ARG 1 selector + ARG 2 delay + METHOD method_51393 setSpawnParticle (Z)V + ARG 1 spawnParticle + METHOD method_51394 getVibration ()Lnet/minecraft/class_7269; + METHOD method_51395 getDelay ()I + METHOD method_51396 tickDelay ()V + METHOD method_51397 shouldSpawnParticle ()Z + CLASS class_8516 VibrationListener + FIELD field_44646 receiver Lnet/minecraft/class_8514; + METHOD (Lnet/minecraft/class_8514;)V + ARG 1 receiver + METHOD method_51398 (Lnet/minecraft/class_3218;Lnet/minecraft/class_5712;Lnet/minecraft/class_5712$class_7397;Lnet/minecraft/class_243;Lnet/minecraft/class_243;)V + ARG 5 pos + METHOD method_51399 listen (Lnet/minecraft/class_3218;Lnet/minecraft/class_8514$class_8515;Lnet/minecraft/class_5712;Lnet/minecraft/class_5712$class_7397;Lnet/minecraft/class_243;Lnet/minecraft/class_243;)V + ARG 1 world + ARG 2 listenerData + ARG 3 event + ARG 4 emitter + ARG 5 emitterPos + ARG 6 listenerPos + METHOD method_51400 isOccluded (Lnet/minecraft/class_1937;Lnet/minecraft/class_243;Lnet/minecraft/class_243;)Z + ARG 0 world + ARG 1 emitterPos + ARG 2 listenerPos + METHOD method_51401 (Lnet/minecraft/class_2680;)Z + ARG 0 state + METHOD method_51402 getTravelDelay (Lnet/minecraft/class_2338;Lnet/minecraft/class_2338;)F + ARG 0 emitterPos + ARG 1 listenerPos + METHOD method_51403 forceListen (Lnet/minecraft/class_3218;Lnet/minecraft/class_5712;Lnet/minecraft/class_5712$class_7397;Lnet/minecraft/class_243;)V + ARG 1 world + ARG 2 event + ARG 3 emitter + ARG 4 emitterPos + CLASS class_8517 Ticker + METHOD method_51404 tryListen (Lnet/minecraft/class_3218;Lnet/minecraft/class_8514$class_8515;Lnet/minecraft/class_8514$class_5719;)V + ARG 0 world + ARG 1 listenerData + ARG 2 callback + METHOD method_51405 accept (Lnet/minecraft/class_3218;Lnet/minecraft/class_8514$class_8515;Lnet/minecraft/class_8514$class_5719;Lnet/minecraft/class_7269;)Z + ARG 0 world + ARG 1 listenerData + ARG 2 callback + ARG 3 vibration + METHOD method_51406 tick (Lnet/minecraft/class_1937;Lnet/minecraft/class_8514$class_8515;Lnet/minecraft/class_8514$class_5719;)V + ARG 0 world + ARG 1 listenerData + ARG 2 callback + METHOD method_51407 areChunksTickingAround (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;)Z + ARG 0 world + ARG 1 pos + METHOD method_51408 (Lnet/minecraft/class_8514$class_8515;Lnet/minecraft/class_8514$class_5719;Lnet/minecraft/class_3218;Lnet/minecraft/class_7269;)V + ARG 3 vibration + METHOD method_51409 spawnVibrationParticle (Lnet/minecraft/class_3218;Lnet/minecraft/class_8514$class_8515;Lnet/minecraft/class_8514$class_5719;)V + ARG 0 world + ARG 1 listenerData + ARG 2 callback diff --git a/mappings/net/minecraft/world/event/listener/EntityGameEventHandler.mapping b/mappings/net/minecraft/world/event/listener/EntityGameEventHandler.mapping index 7bfe56ad4b..42de294c41 100644 --- a/mappings/net/minecraft/world/event/listener/EntityGameEventHandler.mapping +++ b/mappings/net/minecraft/world/event/listener/EntityGameEventHandler.mapping @@ -25,10 +25,3 @@ CLASS net/minecraft/class_5715 net/minecraft/world/event/listener/EntityGameEven METHOD method_42336 (Lnet/minecraft/class_3218;Lnet/minecraft/class_4076;)V ARG 2 sectionPos METHOD method_43152 getListener ()Lnet/minecraft/class_5714; - METHOD method_43153 setListener (Lnet/minecraft/class_5714;Lnet/minecraft/class_1937;)V - ARG 1 listener - ARG 2 world - METHOD method_43154 (Lnet/minecraft/class_5714;Lnet/minecraft/class_5713;)V - ARG 1 dispatcher - METHOD method_43155 (Lnet/minecraft/class_5714;Lnet/minecraft/class_5713;)V - ARG 1 dispatcher diff --git a/mappings/net/minecraft/world/event/listener/GameEventDispatchManager.mapping b/mappings/net/minecraft/world/event/listener/GameEventDispatchManager.mapping new file mode 100644 index 0000000000..0dddbc8053 --- /dev/null +++ b/mappings/net/minecraft/world/event/listener/GameEventDispatchManager.mapping @@ -0,0 +1,15 @@ +CLASS net/minecraft/class_7719 net/minecraft/world/event/listener/GameEventDispatchManager + COMMENT Dispatches game events to {@link GameEventDispatcher} instance in the applicable + COMMENT chunk sections. + FIELD field_40352 world Lnet/minecraft/class_3218; + METHOD (Lnet/minecraft/class_3218;)V + ARG 1 world + METHOD method_45490 dispatch (Lnet/minecraft/class_5712;Lnet/minecraft/class_243;Lnet/minecraft/class_5712$class_7397;)V + ARG 1 event + ARG 2 emitterPos + ARG 3 emitter + METHOD method_45491 dispatchListenersByDistance (Ljava/util/List;)V + ARG 1 messages + METHOD method_45492 (Ljava/util/List;Lnet/minecraft/class_5712;Lnet/minecraft/class_243;Lnet/minecraft/class_5712$class_7397;Lnet/minecraft/class_5714;Lnet/minecraft/class_243;)V + ARG 5 listener + ARG 6 listenerPos diff --git a/mappings/net/minecraft/world/event/listener/GameEventDispatcher.mapping b/mappings/net/minecraft/world/event/listener/GameEventDispatcher.mapping index 1a2123daaa..c92e5d9b6c 100644 --- a/mappings/net/minecraft/world/event/listener/GameEventDispatcher.mapping +++ b/mappings/net/minecraft/world/event/listener/GameEventDispatcher.mapping @@ -4,13 +4,13 @@ CLASS net/minecraft/class_5713 net/minecraft/world/event/listener/GameEventDispa COMMENT An unmodifiable, empty (non-operative) dispatcher. METHOD method_32942 isEmpty ()Z COMMENT Returns whether this dispatcher has no listeners. - METHOD method_32943 dispatch (Lnet/minecraft/class_5712;Lnet/minecraft/class_243;Lnet/minecraft/class_5712$class_7397;Ljava/util/function/BiConsumer;)Z + METHOD method_32943 dispatch (Lnet/minecraft/class_5712;Lnet/minecraft/class_243;Lnet/minecraft/class_5712$class_7397;Lnet/minecraft/class_5713$class_7721;)Z COMMENT Dispatches an event to all the listeners in this dispatcher. ARG 1 event COMMENT the event ARG 2 pos ARG 3 emitter - ARG 4 onListenerAccept + ARG 4 callback METHOD method_32944 addListener (Lnet/minecraft/class_5714;)V COMMENT Adds a listener to this dispatcher. ARG 1 listener @@ -19,3 +19,7 @@ CLASS net/minecraft/class_5713 net/minecraft/world/event/listener/GameEventDispa COMMENT Removes a listener from this dispatcher if it is present. ARG 1 listener COMMENT the listener to remove + CLASS class_7721 DispatchCallback + METHOD visit (Lnet/minecraft/class_5714;Lnet/minecraft/class_243;)V + ARG 1 listener + ARG 2 listenerPos diff --git a/mappings/net/minecraft/world/event/listener/GameEventListener.mapping b/mappings/net/minecraft/world/event/listener/GameEventListener.mapping index f59e69e876..d1ad1b40e6 100644 --- a/mappings/net/minecraft/world/event/listener/GameEventListener.mapping +++ b/mappings/net/minecraft/world/event/listener/GameEventListener.mapping @@ -2,12 +2,17 @@ CLASS net/minecraft/class_5714 net/minecraft/world/event/listener/GameEventListe COMMENT A game event listener listens to game events from {@link GameEventDispatcher}s. METHOD method_32946 getPositionSource ()Lnet/minecraft/class_5716; COMMENT Returns the position source of this listener. - METHOD method_32947 listen (Lnet/minecraft/class_3218;Lnet/minecraft/class_5712$class_7447;)Z + METHOD method_32947 listen (Lnet/minecraft/class_3218;Lnet/minecraft/class_5712;Lnet/minecraft/class_5712$class_7397;Lnet/minecraft/class_243;)Z COMMENT Listens to an incoming game event. COMMENT COMMENT @return {@code true} if the game event has been accepted by this listener ARG 1 world ARG 2 event + ARG 3 emitter + ARG 4 emitterPos METHOD method_32948 getRange ()I COMMENT Returns the range, in blocks, of the listener. - METHOD method_43723 shouldListenImmediately ()Z + METHOD method_45472 getTriggerOrder ()Lnet/minecraft/class_5714$class_7720; + CLASS class_7720 TriggerOrder + CLASS class_8513 Holder + METHOD method_51358 getEventListener ()Lnet/minecraft/class_5714; diff --git a/mappings/net/minecraft/world/event/listener/SimpleGameEventDispatcher.mapping b/mappings/net/minecraft/world/event/listener/SimpleGameEventDispatcher.mapping index aba72e3183..3798141254 100644 --- a/mappings/net/minecraft/world/event/listener/SimpleGameEventDispatcher.mapping +++ b/mappings/net/minecraft/world/event/listener/SimpleGameEventDispatcher.mapping @@ -8,9 +8,16 @@ CLASS net/minecraft/class_5711 net/minecraft/world/event/listener/SimpleGameEven FIELD field_37673 toRemove Ljava/util/Set; FIELD field_37674 toAdd Ljava/util/List; FIELD field_37675 dispatching Z - METHOD (Lnet/minecraft/class_3218;)V + FIELD field_44636 ySectionCoord I + FIELD field_44637 disposalCallback Lnet/minecraft/class_5711$class_8512; + METHOD (Lnet/minecraft/class_3218;ILnet/minecraft/class_5711$class_8512;)V ARG 1 world + ARG 2 ySectionCoord + ARG 3 disposalCallback METHOD method_32936 dispatchTo (Lnet/minecraft/class_3218;Lnet/minecraft/class_243;Lnet/minecraft/class_5714;)Ljava/util/Optional; ARG 0 world ARG 1 listenerPos ARG 2 listener + CLASS class_8512 DisposalCallback + METHOD apply (I)V + ARG 1 ySectionCoord diff --git a/mappings/net/minecraft/world/event/listener/Vibration.mapping b/mappings/net/minecraft/world/event/listener/Vibration.mapping new file mode 100644 index 0000000000..c3159cfb6d --- /dev/null +++ b/mappings/net/minecraft/world/event/listener/Vibration.mapping @@ -0,0 +1,35 @@ +CLASS net/minecraft/class_7269 net/minecraft/world/event/listener/Vibration + FIELD field_38245 CODEC Lcom/mojang/serialization/Codec; + METHOD (Lnet/minecraft/class_5712;FLnet/minecraft/class_243;Ljava/util/UUID;Ljava/util/UUID;)V + ARG 1 gameEvent + ARG 2 distance + ARG 3 pos + ARG 4 uuid + ARG 5 projectileOwnerUuid + METHOD (Lnet/minecraft/class_5712;FLnet/minecraft/class_243;Lnet/minecraft/class_1297;)V + ARG 1 gameEvent + ARG 2 distance + ARG 3 pos + ARG 4 entity + METHOD method_42348 getEntity (Lnet/minecraft/class_3218;)Ljava/util/Optional; + ARG 1 world + METHOD method_42349 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 0 instance + METHOD method_42684 getOwnerUuid (Lnet/minecraft/class_1297;)Ljava/util/UUID; + ARG 0 entity + METHOD method_42685 (Lnet/minecraft/class_5712;Ljava/lang/Float;Lnet/minecraft/class_243;Ljava/util/Optional;Ljava/util/Optional;)Lnet/minecraft/class_7269; + ARG 0 event + ARG 1 distance + ARG 2 pos + ARG 3 uuid + ARG 4 projectileOwnerUuid + METHOD method_42686 (Lnet/minecraft/class_7269;)Ljava/util/Optional; + ARG 0 vibration + METHOD method_42687 getOwner (Lnet/minecraft/class_3218;)Ljava/util/Optional; + ARG 1 world + METHOD method_42688 (Lnet/minecraft/class_1297;)Lnet/minecraft/class_1676; + ARG 0 entity + METHOD method_42689 (Lnet/minecraft/class_7269;)Ljava/util/Optional; + ARG 0 vibration + METHOD method_42691 (Lnet/minecraft/class_1297;)Z + ARG 0 entity diff --git a/mappings/net/minecraft/world/event/listener/VibrationListener.mapping b/mappings/net/minecraft/world/event/listener/VibrationListener.mapping deleted file mode 100644 index 59a97050ae..0000000000 --- a/mappings/net/minecraft/world/event/listener/VibrationListener.mapping +++ /dev/null @@ -1,106 +0,0 @@ -CLASS net/minecraft/class_5718 net/minecraft/world/event/listener/VibrationListener - FIELD field_28187 positionSource Lnet/minecraft/class_5716; - FIELD field_28188 range I - FIELD field_28189 callback Lnet/minecraft/class_5718$class_5719; - FIELD field_28190 vibration Lnet/minecraft/class_5718$class_7269; - FIELD field_28191 distance F - FIELD field_28192 delay I - METHOD (Lnet/minecraft/class_5716;ILnet/minecraft/class_5718$class_5719;Lnet/minecraft/class_5718$class_7269;FI)V - ARG 1 positionSource - ARG 2 range - ARG 3 callback - ARG 4 vibration - ARG 5 distance - ARG 6 delay - METHOD method_32964 tick (Lnet/minecraft/class_1937;)V - ARG 1 world - METHOD method_32966 isOccluded (Lnet/minecraft/class_1937;Lnet/minecraft/class_243;Lnet/minecraft/class_243;)Z - ARG 0 world - ARG 1 start - ARG 2 end - METHOD method_32967 (Lnet/minecraft/class_2680;)Z - ARG 0 state - METHOD method_42339 listen (Lnet/minecraft/class_3218;Lnet/minecraft/class_5712;Lnet/minecraft/class_5712$class_7397;Lnet/minecraft/class_243;Lnet/minecraft/class_243;)V - ARG 1 world - ARG 2 gameEvent - ARG 3 emitter - ARG 4 start - ARG 5 end - METHOD method_42340 createCodec (Lnet/minecraft/class_5718$class_5719;)Lcom/mojang/serialization/Codec; - ARG 0 callback - METHOD method_42341 (Lnet/minecraft/class_5718$class_5719;Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; - ARG 1 instance - METHOD method_42342 (Lnet/minecraft/class_5718$class_5719;Lnet/minecraft/class_5716;Ljava/lang/Integer;Ljava/util/Optional;Ljava/lang/Float;Ljava/lang/Integer;)Lnet/minecraft/class_5718; - ARG 1 positionSource - ARG 2 range - ARG 3 vibration - ARG 4 distance - ARG 5 delay - METHOD method_42343 (Lnet/minecraft/class_5718;)Ljava/lang/Integer; - ARG 0 listener - METHOD method_42344 (Lnet/minecraft/class_5718;)Ljava/lang/Float; - ARG 0 listener - METHOD method_42345 (Lnet/minecraft/class_5718;)Ljava/util/Optional; - ARG 0 listener - METHOD method_42346 (Lnet/minecraft/class_5718;)Ljava/lang/Integer; - ARG 0 listener - METHOD method_42347 (Lnet/minecraft/class_5718;)Lnet/minecraft/class_5716; - ARG 0 listener - CLASS class_5719 Callback - METHOD method_32969 accept (Lnet/minecraft/class_3218;Lnet/minecraft/class_5714;Lnet/minecraft/class_2338;Lnet/minecraft/class_5712;Lnet/minecraft/class_1297;Lnet/minecraft/class_1297;F)V - COMMENT Accepts a game event after delay. - ARG 1 world - ARG 2 listener - ARG 3 pos - ARG 4 event - ARG 5 entity - ARG 6 sourceEntity - ARG 7 distance - METHOD method_32970 accepts (Lnet/minecraft/class_3218;Lnet/minecraft/class_5714;Lnet/minecraft/class_2338;Lnet/minecraft/class_5712;Lnet/minecraft/class_5712$class_7397;)Z - COMMENT Returns whether the callback wants to accept this event. - ARG 1 world - ARG 2 listener - ARG 3 pos - ARG 4 event - ARG 5 emitter - METHOD method_42210 getTag ()Lnet/minecraft/class_6862; - METHOD method_42324 canAccept (Lnet/minecraft/class_5712;Lnet/minecraft/class_5712$class_7397;)Z - ARG 1 gameEvent - ARG 2 emitter - METHOD method_42672 onListen ()V - METHOD method_43695 triggersAvoidCriterion ()Z - CLASS class_7269 Vibration - FIELD field_38245 CODEC Lcom/mojang/serialization/Codec; - METHOD (Lnet/minecraft/class_5712;FLnet/minecraft/class_243;Ljava/util/UUID;Ljava/util/UUID;)V - ARG 1 gameEvent - ARG 2 distance - ARG 3 pos - ARG 4 uuid - ARG 5 projectileOwnerUuid - METHOD (Lnet/minecraft/class_5712;FLnet/minecraft/class_243;Lnet/minecraft/class_1297;)V - ARG 1 gameEvent - ARG 2 distance - ARG 3 pos - ARG 4 entity - METHOD method_42348 getEntity (Lnet/minecraft/class_3218;)Ljava/util/Optional; - ARG 1 world - METHOD method_42349 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; - ARG 0 instance - METHOD method_42684 getOwnerUuid (Lnet/minecraft/class_1297;)Ljava/util/UUID; - ARG 0 entity - METHOD method_42685 (Lnet/minecraft/class_5712;Ljava/lang/Float;Lnet/minecraft/class_243;Ljava/util/Optional;Ljava/util/Optional;)Lnet/minecraft/class_5718$class_7269; - ARG 0 event - ARG 1 distance - ARG 2 pos - ARG 3 uuid - ARG 4 projectileOwnerUuid - METHOD method_42686 (Lnet/minecraft/class_5718$class_7269;)Ljava/util/Optional; - ARG 0 vibration - METHOD method_42687 getOwner (Lnet/minecraft/class_3218;)Ljava/util/Optional; - ARG 1 world - METHOD method_42688 (Lnet/minecraft/class_1297;)Lnet/minecraft/class_1676; - ARG 0 entity - METHOD method_42689 (Lnet/minecraft/class_5718$class_7269;)Ljava/util/Optional; - ARG 0 vibration - METHOD method_42691 (Lnet/minecraft/class_1297;)Z - ARG 0 entity diff --git a/mappings/net/minecraft/world/event/listener/VibrationSelector.mapping b/mappings/net/minecraft/world/event/listener/VibrationSelector.mapping new file mode 100644 index 0000000000..3b8d07846d --- /dev/null +++ b/mappings/net/minecraft/world/event/listener/VibrationSelector.mapping @@ -0,0 +1,20 @@ +CLASS net/minecraft/class_7722 net/minecraft/world/event/listener/VibrationSelector + COMMENT Selects a vibration to accept in case multiple ones are received at the same tick. + FIELD field_40359 CODEC Lcom/mojang/serialization/Codec; + FIELD field_40360 current Ljava/util/Optional; + METHOD (Ljava/util/Optional;J)V + ARG 1 vibration + ARG 2 tick + METHOD method_45501 clear ()V + METHOD method_45502 getVibrationToTick (J)Ljava/util/Optional; + ARG 1 currentTick + METHOD method_45503 (JLnet/minecraft/class_7269;)Lorg/apache/commons/lang3/tuple/Pair; + ARG 2 vibration2 + METHOD method_45504 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 0 instance + METHOD method_45505 tryAccept (Lnet/minecraft/class_7269;J)V + ARG 1 vibration + ARG 2 tick + METHOD method_45507 shouldSelect (Lnet/minecraft/class_7269;J)Z + ARG 1 vibration + ARG 2 tick diff --git a/mappings/net/minecraft/world/explosion/Explosion.mapping b/mappings/net/minecraft/world/explosion/Explosion.mapping index 37ed155151..1749a625f7 100644 --- a/mappings/net/minecraft/world/explosion/Explosion.mapping +++ b/mappings/net/minecraft/world/explosion/Explosion.mapping @@ -13,13 +13,6 @@ CLASS net/minecraft/class_1927 net/minecraft/world/explosion/Explosion FIELD field_9193 damageSource Lnet/minecraft/class_1282; FIELD field_9194 affectedPlayers Ljava/util/Map; FIELD field_9195 x D - METHOD (Lnet/minecraft/class_1937;Lnet/minecraft/class_1297;DDDF)V - ARG 1 world - ARG 2 entity - ARG 3 x - ARG 5 y - ARG 7 z - ARG 9 power METHOD (Lnet/minecraft/class_1937;Lnet/minecraft/class_1297;DDDFLjava/util/List;)V ARG 1 world ARG 2 entity @@ -69,6 +62,8 @@ CLASS net/minecraft/class_1927 net/minecraft/world/explosion/Explosion ARG 2 stack METHOD method_29553 chooseBehavior (Lnet/minecraft/class_1297;)Lnet/minecraft/class_5362; ARG 1 entity + METHOD method_46406 getEntity ()Lnet/minecraft/class_1297; + METHOD method_46667 shouldDestroy ()Z METHOD method_8346 getAffectedBlocks ()Ljava/util/List; METHOD method_8347 getCausingEntity ()Lnet/minecraft/class_1309; METHOD method_8348 collectBlocksAndDamageEntities ()V diff --git a/mappings/net/minecraft/world/gen/FlatLevelGeneratorPreset.mapping b/mappings/net/minecraft/world/gen/FlatLevelGeneratorPreset.mapping index 68b7ea5511..20caca2e2d 100644 --- a/mappings/net/minecraft/world/gen/FlatLevelGeneratorPreset.mapping +++ b/mappings/net/minecraft/world/gen/FlatLevelGeneratorPreset.mapping @@ -1,6 +1,8 @@ CLASS net/minecraft/class_7142 net/minecraft/world/gen/FlatLevelGeneratorPreset FIELD field_37711 CODEC Lcom/mojang/serialization/Codec; FIELD field_37712 ENTRY_CODEC Lcom/mojang/serialization/Codec; + METHOD method_41576 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 0 instance METHOD method_41577 (Lnet/minecraft/class_7142;)Lnet/minecraft/class_3232; ARG 0 preset METHOD method_41578 (Lnet/minecraft/class_7142;)Lnet/minecraft/class_6880; diff --git a/mappings/net/minecraft/world/gen/FlatLevelGeneratorPresets.mapping b/mappings/net/minecraft/world/gen/FlatLevelGeneratorPresets.mapping index 3ee43cdefb..f04226af35 100644 --- a/mappings/net/minecraft/world/gen/FlatLevelGeneratorPresets.mapping +++ b/mappings/net/minecraft/world/gen/FlatLevelGeneratorPresets.mapping @@ -1,19 +1,18 @@ CLASS net/minecraft/class_7143 net/minecraft/world/gen/FlatLevelGeneratorPresets - METHOD method_41579 initAndGetDefault (Lnet/minecraft/class_2378;)Lnet/minecraft/class_6880; + METHOD method_41579 bootstrap (Lnet/minecraft/class_7891;)V + ARG 0 presetRegisterable METHOD method_41580 of (Ljava/lang/String;)Lnet/minecraft/class_5321; ARG 0 id CLASS class_7144 Registrar - FIELD field_37722 flatLevelGeneratorPresetRegistry Lnet/minecraft/class_2378; - FIELD field_37723 biomeRegistry Lnet/minecraft/class_2378; - FIELD field_37724 structureSetRegistry Lnet/minecraft/class_2378; - METHOD method_41581 initAndGetDefault ()Lnet/minecraft/class_6880; - METHOD method_41582 (Lnet/minecraft/class_5321;)Ljava/util/stream/Stream; - ARG 1 structureSet - METHOD method_41583 createAndRegister (Lnet/minecraft/class_5321;Lnet/minecraft/class_1935;Lnet/minecraft/class_5321;Ljava/util/Set;ZZ[Lnet/minecraft/class_3229;)Lnet/minecraft/class_6880; + FIELD field_40917 presetRegisterable Lnet/minecraft/class_7891; + METHOD (Lnet/minecraft/class_7891;)V + ARG 1 presetRegisterable + METHOD method_41581 bootstrap ()V + METHOD method_41583 createAndRegister (Lnet/minecraft/class_5321;Lnet/minecraft/class_1935;Lnet/minecraft/class_5321;Ljava/util/Set;ZZ[Lnet/minecraft/class_3229;)V ARG 1 registryKey ARG 2 icon ARG 3 biome - ARG 4 structureSets + ARG 4 structureSetKeys ARG 5 hasFeatures ARG 6 hasLakes ARG 7 layers diff --git a/mappings/net/minecraft/world/gen/GeneratorOptions.mapping b/mappings/net/minecraft/world/gen/GeneratorOptions.mapping index 8900dd0005..7101b87d7f 100644 --- a/mappings/net/minecraft/world/gen/GeneratorOptions.mapping +++ b/mappings/net/minecraft/world/gen/GeneratorOptions.mapping @@ -3,53 +3,32 @@ CLASS net/minecraft/class_5285 net/minecraft/world/gen/GeneratorOptions FIELD field_24527 generateStructures Z FIELD field_24528 bonusChest Z FIELD field_24532 legacyCustomOptions Ljava/util/Optional; - FIELD field_24826 CODEC Lcom/mojang/serialization/Codec; - FIELD field_24827 options Lnet/minecraft/class_2378; - METHOD (JZZLnet/minecraft/class_2378;)V + FIELD field_24826 CODEC Lcom/mojang/serialization/MapCodec; + FIELD field_40367 DEMO_OPTIONS Lnet/minecraft/class_5285; + METHOD (JZZ)V ARG 1 seed ARG 3 generateStructures ARG 4 bonusChest - ARG 5 options - METHOD (JZZLnet/minecraft/class_2378;Ljava/util/Optional;)V + METHOD (JZZLjava/util/Optional;)V ARG 1 seed ARG 3 generateStructures ARG 4 bonusChest - ARG 5 options - ARG 6 legacyCustomOptions - METHOD method_28024 withHardcore (ZLjava/util/OptionalLong;)Lnet/minecraft/class_5285; - ARG 1 hardcore - ARG 2 seed + ARG 5 legacyCustomOptions + METHOD method_28024 withSeed (Ljava/util/OptionalLong;)Lnet/minecraft/class_5285; + ARG 1 seed METHOD method_28028 getSeed ()J METHOD method_28029 shouldGenerateStructures ()Z METHOD method_28030 hasBonusChest ()Z - METHOD method_28032 getChunkGenerator ()Lnet/minecraft/class_2794; - METHOD method_28033 isDebugWorld ()Z - METHOD method_28034 isFlatWorld ()Z METHOD method_28035 isLegacyCustomizedType ()Z - METHOD method_28036 withBonusChest ()Lnet/minecraft/class_5285; - METHOD method_28037 toggleGenerateStructures ()Lnet/minecraft/class_5285; - METHOD method_28038 toggleBonusChest ()Lnet/minecraft/class_5285; + METHOD method_28036 withBonusChest (Z)Lnet/minecraft/class_5285; + ARG 1 bonusChest + METHOD method_28605 (Lnet/minecraft/class_5285;)Ljava/util/Optional; + ARG 0 generatorOptions METHOD method_28606 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; ARG 0 instance - METHOD method_28608 getRegistryWithReplacedOverworldGenerator (Lnet/minecraft/class_2378;Lnet/minecraft/class_2378;Lnet/minecraft/class_2794;)Lnet/minecraft/class_2378; - ARG 0 dimensionTypeRegistry - ARG 1 options - ARG 2 overworldGenerator - METHOD method_28609 getDimensions ()Lnet/minecraft/class_2378; - METHOD method_28610 validate ()Lcom/mojang/serialization/DataResult; - METHOD method_28611 isStable ()Z - METHOD method_29575 getWorlds ()Lcom/google/common/collect/ImmutableSet; - METHOD method_29962 getRegistryWithReplacedOverworld (Lnet/minecraft/class_2378;Lnet/minecraft/class_6880;Lnet/minecraft/class_2794;)Lnet/minecraft/class_2378; - ARG 0 options - ARG 1 dimensionType - ARG 2 overworldGenerator - METHOD method_39334 toWorldKey (Lnet/minecraft/class_5321;)Lnet/minecraft/class_5321; - ARG 0 dimensionOptionsKey - METHOD method_39335 toDimensionOptionsKey (Lnet/minecraft/class_5321;)Lnet/minecraft/class_5321; - ARG 0 worldKey - METHOD method_40024 parseSeed (Ljava/lang/String;)Ljava/util/OptionalLong; + METHOD method_45541 createRandom ()Lnet/minecraft/class_5285; + METHOD method_45542 withStructures (Z)Lnet/minecraft/class_5285; + ARG 1 structures + METHOD method_46720 parseSeed (Ljava/lang/String;)Ljava/util/OptionalLong; ARG 0 seed - METHOD method_41563 create (Lnet/minecraft/class_5455;Lnet/minecraft/class_5285;Lnet/minecraft/class_2794;)Lnet/minecraft/class_5285; - ARG 0 dynamicRegistryManager - ARG 1 generatorOptions - ARG 2 chunkGenerator + METHOD method_46721 getRandomSeed ()J diff --git a/mappings/net/minecraft/world/gen/OreVeinSampler.mapping b/mappings/net/minecraft/world/gen/OreVeinSampler.mapping index 8169a8829e..7777b6e74b 100644 --- a/mappings/net/minecraft/world/gen/OreVeinSampler.mapping +++ b/mappings/net/minecraft/world/gen/OreVeinSampler.mapping @@ -1,5 +1,20 @@ CLASS net/minecraft/class_6955 net/minecraft/world/gen/OreVeinSampler + FIELD field_36620 DENSITY_THRESHOLD F + COMMENT The density threshold required to generate any blocks as part of an ore vein. + FIELD field_36621 MAX_DENSITY_INTRUSION I + COMMENT The number of blocks away from the minimum or maximum height at which + COMMENT ores in an ore vein generates at the maximum density. + FIELD field_36622 LIMINAL_DENSITY_REDUCTION D + COMMENT The decrease in density at the minimum or maximum height compared to the + COMMENT maximum density. + FIELD field_36623 BLOCK_GENERATION_CHANCE F + COMMENT The probability that a given block will be replaced by an ore vein, + COMMENT given that the density check has passed. + FIELD field_36624 MIN_ORE_CHANCE F + FIELD field_36625 MAX_ORE_CHANCE F + FIELD field_36626 DENSITY_FOR_MAX_ORE_CHANCE F FIELD field_36627 RAW_ORE_BLOCK_CHANCE F + FIELD field_36628 VEIN_GAP_THRESHOLD F METHOD method_40547 (Lnet/minecraft/class_6910;Lnet/minecraft/class_2680;Lnet/minecraft/class_6574;Lnet/minecraft/class_6910;Lnet/minecraft/class_6910;Lnet/minecraft/class_6910$class_6912;)Lnet/minecraft/class_2680; ARG 5 pos METHOD method_40548 create (Lnet/minecraft/class_6910;Lnet/minecraft/class_6910;Lnet/minecraft/class_6910;Lnet/minecraft/class_6574;)Lnet/minecraft/class_6568$class_6569; diff --git a/mappings/net/minecraft/world/gen/StructureAccessor.mapping b/mappings/net/minecraft/world/gen/StructureAccessor.mapping index d28620b268..874c17b252 100644 --- a/mappings/net/minecraft/world/gen/StructureAccessor.mapping +++ b/mappings/net/minecraft/world/gen/StructureAccessor.mapping @@ -65,3 +65,5 @@ CLASS net/minecraft/class_5138 net/minecraft/world/gen/StructureAccessor METHOD method_41413 getStructureContaining (Lnet/minecraft/class_2338;Lnet/minecraft/class_6862;)Lnet/minecraft/class_3449; ARG 1 pos ARG 2 structureTag + METHOD method_41414 (Lnet/minecraft/class_2378;Lnet/minecraft/class_6862;Lnet/minecraft/class_3195;)Z + ARG 2 structure diff --git a/mappings/net/minecraft/world/gen/StructureWeightSampler.mapping b/mappings/net/minecraft/world/gen/StructureWeightSampler.mapping index d8b84fb45d..9d198d296b 100644 --- a/mappings/net/minecraft/world/gen/StructureWeightSampler.mapping +++ b/mappings/net/minecraft/world/gen/StructureWeightSampler.mapping @@ -3,6 +3,11 @@ CLASS net/minecraft/class_5817 net/minecraft/world/gen/StructureWeightSampler FIELD field_28741 STRUCTURE_WEIGHT_TABLE [F FIELD field_28744 pieceIterator Lit/unimi/dsi/fastutil/objects/ObjectListIterator; FIELD field_28745 junctionIterator Lit/unimi/dsi/fastutil/objects/ObjectListIterator; + FIELD field_31461 INDEX_OFFSET I + FIELD field_31462 EDGE_LENGTH I + METHOD (Lit/unimi/dsi/fastutil/objects/ObjectListIterator;Lit/unimi/dsi/fastutil/objects/ObjectListIterator;)V + ARG 1 pieceIterator + ARG 2 junctionIterator METHOD method_33640 ([F)V ARG 0 array METHOD method_33641 getStructureWeight (IIII)D @@ -10,6 +15,7 @@ CLASS net/minecraft/class_5817 net/minecraft/world/gen/StructureWeightSampler ARG 0 x ARG 1 y ARG 2 z + ARG 3 yy METHOD method_33642 calculateStructureWeight (III)D COMMENT Calculates the structure weight for the given position. COMMENT

The weight increases as x and z approach {@code (0, 0)}, and positive y values make the weight negative while negative y values make the weight positive. @@ -20,13 +26,22 @@ CLASS net/minecraft/class_5817 net/minecraft/world/gen/StructureWeightSampler ARG 0 x ARG 1 y ARG 2 z + METHOD method_42692 indexInBounds (I)Z + ARG 0 i + METHOD method_42693 structureWeight (IDI)D + ARG 0 x + ARG 1 y + ARG 3 z METHOD method_42694 (Lnet/minecraft/class_1923;Lit/unimi/dsi/fastutil/objects/ObjectList;IILit/unimi/dsi/fastutil/objects/ObjectList;Lnet/minecraft/class_3449;)V ARG 0 pos + ARG 1 piecesOut ARG 2 startX ARG 3 startZ + ARG 4 jigsawJunctionsOut ARG 5 start METHOD method_42695 createStructureWeightSampler (Lnet/minecraft/class_5138;Lnet/minecraft/class_1923;)Lnet/minecraft/class_5817; ARG 0 world ARG 1 pos METHOD method_42696 (Lnet/minecraft/class_3195;)Z ARG 0 structure + CLASS class_7301 Piece diff --git a/mappings/net/minecraft/world/gen/WorldPreset.mapping b/mappings/net/minecraft/world/gen/WorldPreset.mapping index 36d9411384..6d69ab511b 100644 --- a/mappings/net/minecraft/world/gen/WorldPreset.mapping +++ b/mappings/net/minecraft/world/gen/WorldPreset.mapping @@ -5,17 +5,13 @@ CLASS net/minecraft/class_7145 net/minecraft/world/gen/WorldPreset METHOD (Ljava/util/Map;)V ARG 1 dimensions METHOD method_41584 getOverworld ()Ljava/util/Optional; - METHOD method_41585 createGeneratorOptions (JZZ)Lnet/minecraft/class_5285; - ARG 1 seed - ARG 3 generateStructures - ARG 4 bonusChest - METHOD method_41587 createGeneratorOptions (Lnet/minecraft/class_5285;)Lnet/minecraft/class_5285; - ARG 1 generatorOptions + METHOD method_41586 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 0 instance METHOD method_41588 (Lnet/minecraft/class_7145;)Ljava/util/Map; ARG 0 preset METHOD method_41589 (Lnet/minecraft/class_2385;Lnet/minecraft/class_5321;)V ARG 2 registryKey - METHOD method_41590 getOverworldOrElseThrow ()Lnet/minecraft/class_5363; METHOD method_41591 createDimensionOptionsRegistry ()Lnet/minecraft/class_2378; METHOD method_44351 validate (Lnet/minecraft/class_7145;)Lcom/mojang/serialization/DataResult; ARG 0 preset + METHOD method_45546 createDimensionsRegistryHolder ()Lnet/minecraft/class_7723; diff --git a/mappings/net/minecraft/world/gen/WorldPresets.mapping b/mappings/net/minecraft/world/gen/WorldPresets.mapping index 8493ff27fb..0a199ef695 100644 --- a/mappings/net/minecraft/world/gen/WorldPresets.mapping +++ b/mappings/net/minecraft/world/gen/WorldPresets.mapping @@ -5,40 +5,31 @@ CLASS net/minecraft/class_5317 net/minecraft/world/gen/WorldPresets FIELD field_25059 DEBUG_ALL_BLOCK_STATES Lnet/minecraft/class_5321; FIELD field_35756 LARGE_BIOMES Lnet/minecraft/class_5321; FIELD field_35757 AMPLIFIED Lnet/minecraft/class_5321; - METHOD method_29077 createDefaultOptions (Lnet/minecraft/class_5455;JZZ)Lnet/minecraft/class_5285; - ARG 0 dynamicRegistryManager - ARG 1 seed - ARG 3 generateStructures - ARG 4 bonusChest - METHOD method_41593 initAndGetDefault (Lnet/minecraft/class_2378;)Lnet/minecraft/class_6880; - METHOD method_41594 getWorldPreset (Lnet/minecraft/class_5285;)Ljava/util/Optional; - ARG 0 generatorOptions - METHOD method_41595 createDefaultOptions (Lnet/minecraft/class_5455;)Lnet/minecraft/class_5285; - ARG 0 dynamicRegistryManager - METHOD method_41596 createDefaultOptions (Lnet/minecraft/class_5455;J)Lnet/minecraft/class_5285; - ARG 0 dynamicRegistryManager - ARG 1 seed + METHOD method_41593 bootstrap (Lnet/minecraft/class_7891;)V + ARG 0 presetRegisterable + METHOD method_41594 getWorldPreset (Lnet/minecraft/class_2378;)Ljava/util/Optional; + ARG 0 registry METHOD method_41597 of (Ljava/lang/String;)Lnet/minecraft/class_5321; ARG 0 id - METHOD method_41598 createDemoOptions (Lnet/minecraft/class_5455;)Lnet/minecraft/class_5285; + METHOD method_41598 createDemoOptions (Lnet/minecraft/class_5455;)Lnet/minecraft/class_7723; ARG 0 dynamicRegistryManager METHOD method_41599 getDefaultOverworldOptions (Lnet/minecraft/class_5455;)Lnet/minecraft/class_5363; ARG 0 dynamicRegistryManager + METHOD method_45547 (Lnet/minecraft/class_5363;)Ljava/util/Optional; + ARG 0 overworld CLASS class_7146 Registrar - FIELD field_37728 worldPresetRegistry Lnet/minecraft/class_2378; - FIELD field_37729 dimensionTypeRegistry Lnet/minecraft/class_2378; - FIELD field_37730 biomeRegistry Lnet/minecraft/class_2378; - FIELD field_37731 structureSetRegistry Lnet/minecraft/class_2378; - FIELD field_37732 chunkGeneratorSettingsRegistry Lnet/minecraft/class_2378; - FIELD field_37733 noiseParametersRegistry Lnet/minecraft/class_2378; + FIELD field_37730 biomeLookup Lnet/minecraft/class_7871; + FIELD field_37731 structureSetLookup Lnet/minecraft/class_7871; + FIELD field_37732 chunkGeneratorSettingsLookup Lnet/minecraft/class_7871; FIELD field_37734 overworldDimensionType Lnet/minecraft/class_6880; - FIELD field_37735 theNetherDimensionType Lnet/minecraft/class_6880; - FIELD field_37736 netherChunkGeneratorSettings Lnet/minecraft/class_6880; FIELD field_37737 netherDimensionOptions Lnet/minecraft/class_5363; - FIELD field_37738 theEndDimensionType Lnet/minecraft/class_6880; - FIELD field_37739 endChunkGeneratorSettings Lnet/minecraft/class_6880; FIELD field_37740 endDimensionOptions Lnet/minecraft/class_5363; - METHOD method_41600 initAndGetDefault ()Lnet/minecraft/class_6880; + FIELD field_40919 presetRegisterable Lnet/minecraft/class_7891; + FIELD field_40920 featureLookup Lnet/minecraft/class_7871; + FIELD field_42993 multiNoisePresetLookup Lnet/minecraft/class_7871; + METHOD (Lnet/minecraft/class_7891;)V + ARG 1 presetRegisterable + METHOD method_41600 bootstrap ()V METHOD method_41601 createOverworldOptions (Lnet/minecraft/class_1966;Lnet/minecraft/class_6880;)Lnet/minecraft/class_5363; ARG 1 biomeSource ARG 2 chunkGeneratorSettings @@ -46,6 +37,8 @@ CLASS net/minecraft/class_5317 net/minecraft/world/gen/WorldPresets ARG 1 chunkGenerator METHOD method_41603 createPreset (Lnet/minecraft/class_5363;)Lnet/minecraft/class_7145; ARG 1 dimensionOptions - METHOD method_41604 register (Lnet/minecraft/class_5321;Lnet/minecraft/class_5363;)Lnet/minecraft/class_6880; + METHOD method_41604 register (Lnet/minecraft/class_5321;Lnet/minecraft/class_5363;)V ARG 1 key ARG 2 dimensionOptions + METHOD method_49257 bootstrap (Lnet/minecraft/class_1966;)V + ARG 1 biomeSource diff --git a/mappings/net/minecraft/world/gen/blockpredicate/BlockPredicate.mapping b/mappings/net/minecraft/world/gen/blockpredicate/BlockPredicate.mapping index 685beb0652..9deeedd19e 100644 --- a/mappings/net/minecraft/world/gen/blockpredicate/BlockPredicate.mapping +++ b/mappings/net/minecraft/world/gen/blockpredicate/BlockPredicate.mapping @@ -59,3 +59,6 @@ CLASS net/minecraft/class_6646 net/minecraft/world/gen/blockpredicate/BlockPredi ARG 0 blocks METHOD method_43291 matchingFluids ([Lnet/minecraft/class_3611;)Lnet/minecraft/class_6646; ARG 0 fluids + METHOD method_45543 noFluid (Lnet/minecraft/class_2382;)Lnet/minecraft/class_6646; + ARG 0 offset + METHOD method_45544 noFluid ()Lnet/minecraft/class_6646; diff --git a/mappings/net/minecraft/world/gen/blockpredicate/HasSturdyFacePredicate.mapping b/mappings/net/minecraft/world/gen/blockpredicate/HasSturdyFacePredicate.mapping index b2035a2430..a2507782ad 100644 --- a/mappings/net/minecraft/world/gen/blockpredicate/HasSturdyFacePredicate.mapping +++ b/mappings/net/minecraft/world/gen/blockpredicate/HasSturdyFacePredicate.mapping @@ -5,6 +5,8 @@ CLASS net/minecraft/class_6847 net/minecraft/world/gen/blockpredicate/HasSturdyF METHOD (Lnet/minecraft/class_2382;Lnet/minecraft/class_2350;)V ARG 1 offset ARG 2 face + METHOD method_39912 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 0 instance METHOD method_39913 (Lnet/minecraft/class_6847;)Lnet/minecraft/class_2350; ARG 0 predicate METHOD method_39914 (Lnet/minecraft/class_6847;)Lnet/minecraft/class_2382; diff --git a/mappings/net/minecraft/world/gen/blockpredicate/InsideWorldBoundsBlockPredicate.mapping b/mappings/net/minecraft/world/gen/blockpredicate/InsideWorldBoundsBlockPredicate.mapping index 6a7367432f..66b8f1a3e0 100644 --- a/mappings/net/minecraft/world/gen/blockpredicate/InsideWorldBoundsBlockPredicate.mapping +++ b/mappings/net/minecraft/world/gen/blockpredicate/InsideWorldBoundsBlockPredicate.mapping @@ -3,6 +3,8 @@ CLASS net/minecraft/class_6783 net/minecraft/world/gen/blockpredicate/InsideWorl FIELD field_35701 offset Lnet/minecraft/class_2382; METHOD (Lnet/minecraft/class_2382;)V ARG 1 offset + METHOD method_39588 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 0 instance METHOD method_39589 (Lnet/minecraft/class_6783;)Lnet/minecraft/class_2382; ARG 0 predicate METHOD test (Ljava/lang/Object;Ljava/lang/Object;)Z diff --git a/mappings/net/minecraft/world/gen/blockpredicate/MatchingBlockTagPredicate.mapping b/mappings/net/minecraft/world/gen/blockpredicate/MatchingBlockTagPredicate.mapping index 6fca006711..f3ce4e3d9c 100644 --- a/mappings/net/minecraft/world/gen/blockpredicate/MatchingBlockTagPredicate.mapping +++ b/mappings/net/minecraft/world/gen/blockpredicate/MatchingBlockTagPredicate.mapping @@ -6,3 +6,5 @@ CLASS net/minecraft/class_6848 net/minecraft/world/gen/blockpredicate/MatchingBl ARG 2 tag METHOD method_39915 (Lnet/minecraft/class_6848;)Lnet/minecraft/class_6862; ARG 0 predicate + METHOD method_39916 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 0 instance diff --git a/mappings/net/minecraft/world/gen/blockpredicate/SolidBlockPredicate.mapping b/mappings/net/minecraft/world/gen/blockpredicate/SolidBlockPredicate.mapping index 112380d035..5cd2d70764 100644 --- a/mappings/net/minecraft/world/gen/blockpredicate/SolidBlockPredicate.mapping +++ b/mappings/net/minecraft/world/gen/blockpredicate/SolidBlockPredicate.mapping @@ -1,2 +1,4 @@ CLASS net/minecraft/class_6784 net/minecraft/world/gen/blockpredicate/SolidBlockPredicate FIELD field_35702 CODEC Lcom/mojang/serialization/Codec; + METHOD method_39590 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 0 instance diff --git a/mappings/net/minecraft/world/gen/carver/Carver.mapping b/mappings/net/minecraft/world/gen/carver/Carver.mapping index ab8639d2db..08d0d88d55 100644 --- a/mappings/net/minecraft/world/gen/carver/Carver.mapping +++ b/mappings/net/minecraft/world/gen/carver/Carver.mapping @@ -33,7 +33,10 @@ CLASS net/minecraft/class_2939 net/minecraft/world/gen/carver/Carver ARG 3 chunk ARG 4 posToBiome ARG 5 mask + ARG 6 pos + ARG 7 tmp ARG 8 aquiferSampler + ARG 9 replacedGrassy METHOD method_28614 configure (Lnet/minecraft/class_5871;)Lnet/minecraft/class_2922; ARG 1 config METHOD method_28616 getCodec ()Lcom/mojang/serialization/Codec; @@ -50,6 +53,11 @@ CLASS net/minecraft/class_2939 net/minecraft/world/gen/carver/Carver ARG 3 chunk ARG 4 posToBiome ARG 5 aquiferSampler + ARG 6 x + ARG 8 y + ARG 10 z + ARG 12 width + ARG 14 height ARG 16 mask ARG 17 skipPredicate METHOD method_33980 isDebug (Lnet/minecraft/class_5871;)Z diff --git a/mappings/net/minecraft/world/gen/carver/CaveCarver.mapping b/mappings/net/minecraft/world/gen/carver/CaveCarver.mapping index 5d20079df4..a55739b112 100644 --- a/mappings/net/minecraft/world/gen/carver/CaveCarver.mapping +++ b/mappings/net/minecraft/world/gen/carver/CaveCarver.mapping @@ -37,7 +37,7 @@ CLASS net/minecraft/class_2925 net/minecraft/world/gen/carver/CaveCarver ARG 4 scaledRelativeZ ARG 6 floorY METHOD method_33975 (DLnet/minecraft/class_5873;DDDI)Z - ARG 2 context + ARG 2 contextx ARG 3 scaledRelativeX ARG 5 scaledRelativeY ARG 7 scaledRelativeZ diff --git a/mappings/net/minecraft/world/gen/carver/CaveCarverConfig.mapping b/mappings/net/minecraft/world/gen/carver/CaveCarverConfig.mapping index f088ad037e..3b507a0a13 100644 --- a/mappings/net/minecraft/world/gen/carver/CaveCarverConfig.mapping +++ b/mappings/net/minecraft/world/gen/carver/CaveCarverConfig.mapping @@ -35,3 +35,5 @@ CLASS net/minecraft/class_6108 net/minecraft/world/gen/carver/CaveCarverConfig ARG 0 config METHOD method_35355 (Lnet/minecraft/class_6108;)Lnet/minecraft/class_5863; ARG 0 config + METHOD method_35356 (Lnet/minecraft/class_6108;)Lnet/minecraft/class_5871; + ARG 0 config diff --git a/mappings/net/minecraft/world/gen/carver/ConfiguredCarvers.mapping b/mappings/net/minecraft/world/gen/carver/ConfiguredCarvers.mapping index 3276d8278b..34a6a74361 100644 --- a/mappings/net/minecraft/world/gen/carver/ConfiguredCarvers.mapping +++ b/mappings/net/minecraft/world/gen/carver/ConfiguredCarvers.mapping @@ -1,4 +1,5 @@ CLASS net/minecraft/class_5463 net/minecraft/world/gen/carver/ConfiguredCarvers - METHOD method_30588 register (Ljava/lang/String;Lnet/minecraft/class_2922;)Lnet/minecraft/class_6880; + METHOD method_30588 register (Ljava/lang/String;)Lnet/minecraft/class_5321; ARG 0 id - ARG 1 configuredCarver + METHOD method_46843 bootstrap (Lnet/minecraft/class_7891;)V + ARG 0 carverRegisterable diff --git a/mappings/net/minecraft/world/gen/carver/RavineCarver.mapping b/mappings/net/minecraft/world/gen/carver/RavineCarver.mapping index ca7d170aa5..3266baccca 100644 --- a/mappings/net/minecraft/world/gen/carver/RavineCarver.mapping +++ b/mappings/net/minecraft/world/gen/carver/RavineCarver.mapping @@ -30,11 +30,11 @@ CLASS net/minecraft/class_5870 net/minecraft/world/gen/carver/RavineCarver ARG 7 scaledRelativeZ ARG 9 y METHOD method_33965 ([FLnet/minecraft/class_5873;DDDI)Z - ARG 2 context + ARG 2 contextx ARG 3 scaledRelativeX ARG 5 scaledRelativeY ARG 7 scaledRelativeZ - ARG 9 y + ARG 9 yx METHOD method_33966 createHorizontalStretchFactors (Lnet/minecraft/class_5873;Lnet/minecraft/class_5869;Lnet/minecraft/class_5819;)[F ARG 1 context ARG 2 config diff --git a/mappings/net/minecraft/world/gen/chunk/Blender.mapping b/mappings/net/minecraft/world/gen/chunk/Blender.mapping index 1e684e8305..83dc8aec09 100644 --- a/mappings/net/minecraft/world/gen/chunk/Blender.mapping +++ b/mappings/net/minecraft/world/gen/chunk/Blender.mapping @@ -90,7 +90,7 @@ CLASS net/minecraft/class_6748 net/minecraft/world/gen/chunk/Blender ARG 5 offsetZ METHOD method_39814 (Ljava/util/List;Lnet/minecraft/class_2355;Lnet/minecraft/class_6749;)V ARG 1 direction - ARG 2 data + ARG 2 datax METHOD method_39815 createClosestDistanceFunction (Lnet/minecraft/class_6749;Ljava/util/Map;)Lnet/minecraft/class_6748$class_6831; ARG 0 data ARG 1 neighborData diff --git a/mappings/net/minecraft/world/gen/chunk/BlendingData.mapping b/mappings/net/minecraft/world/gen/chunk/BlendingData.mapping index e0e15b8c67..fd20b46f7b 100644 --- a/mappings/net/minecraft/world/gen/chunk/BlendingData.mapping +++ b/mappings/net/minecraft/world/gen/chunk/BlendingData.mapping @@ -56,15 +56,21 @@ CLASS net/minecraft/class_6749 net/minecraft/world/gen/chunk/BlendingData ARG 2 chunkBlockX ARG 3 chunkBlockZ ARG 4 surfaceHeight + METHOD method_39567 (D)Z + ARG 0 height METHOD method_39570 getBlendingData (Lnet/minecraft/class_3233;II)Lnet/minecraft/class_6749; ARG 0 chunkRegion ARG 1 chunkX ARG 2 chunkZ + METHOD method_39571 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 0 instance METHOD method_39572 initChunkBlendingData (Lnet/minecraft/class_2791;Ljava/util/Set;)V ARG 1 chunk ARG 2 newNoiseChunkDirections METHOD method_39573 validate (Lnet/minecraft/class_6749;)Lcom/mojang/serialization/DataResult; ARG 0 data + METHOD method_39574 ([D)V + ARG 0 heights2 METHOD method_39575 getCollidableBlockDensity ([DI)D ARG 1 collidableBlockDensityColumn ARG 2 halfSectionY @@ -83,6 +89,8 @@ CLASS net/minecraft/class_6749 net/minecraft/world/gen/chunk/BlendingData ARG 1 chunkX ARG 2 chunkZ ARG 3 oldNoise + METHOD method_39580 (Lnet/minecraft/class_6749;)Ljava/util/Optional; + ARG 0 blendingData METHOD method_39581 getOneAboveBottomHalfSectionY ()I METHOD method_39582 getSouthEastIndex (II)I COMMENT Gets the south east index for the given chunk-local biome coordinates. @@ -96,7 +104,7 @@ CLASS net/minecraft/class_6749 net/minecraft/world/gen/chunk/BlendingData COMMENT the chunk-local biome Z coordinate METHOD method_39583 getBottomHalfSectionY ()I METHOD method_39905 getAboveCollidableBlockValue (Lnet/minecraft/class_2791;Lnet/minecraft/class_2338$class_2339;)D - COMMENT {@return {@code 1.0} if there is a collidable block below, otherwise {@code -1}.} + COMMENT {@return {@code 1.0} if there is a collidable block below, otherwise {@code -1}} ARG 0 chunk ARG 1 mutablePos COMMENT will be moved down by one block by this method @@ -117,6 +125,10 @@ CLASS net/minecraft/class_6749 net/minecraft/world/gen/chunk/BlendingData ARG 2 chunkBlockX ARG 3 chunkBlockZ METHOD method_41567 getVerticalBiomeCount ()I + METHOD method_41568 (Lnet/minecraft/class_6749;)Ljava/lang/Integer; + ARG 0 blendingData + METHOD method_41569 (Lnet/minecraft/class_6749;)Ljava/lang/Integer; + ARG 0 blendingData CLASS class_6750 CollidableBlockDensityConsumer METHOD consume (IIID)V ARG 1 biomeX diff --git a/mappings/net/minecraft/world/gen/chunk/ChunkGenerator.mapping b/mappings/net/minecraft/world/gen/chunk/ChunkGenerator.mapping index 3a822fca48..be7566e7fc 100644 --- a/mappings/net/minecraft/world/gen/chunk/ChunkGenerator.mapping +++ b/mappings/net/minecraft/world/gen/chunk/ChunkGenerator.mapping @@ -4,23 +4,13 @@ CLASS net/minecraft/class_2794 net/minecraft/world/gen/chunk/ChunkGenerator 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 biomeSource Lnet/minecraft/class_1966; FIELD field_24746 CODEC Lcom/mojang/serialization/Codec; - FIELD field_36405 concentricRingPositions Ljava/util/Map; - FIELD field_37053 structureSetRegistry Lnet/minecraft/class_2378; - FIELD field_37054 structureOverrides Ljava/util/Optional; - FIELD field_37055 structurePlacements Ljava/util/Map; - FIELD field_37056 hasComputedStructurePlacements Z - FIELD field_37254 LOGGER Lorg/slf4j/Logger; FIELD field_39412 indexedFeaturesListSupplier Ljava/util/function/Supplier; FIELD field_39413 generationSettingsGetter Ljava/util/function/Function; - METHOD (Lnet/minecraft/class_2378;Ljava/util/Optional;Lnet/minecraft/class_1966;)V - ARG 1 structureSetRegistry - ARG 2 structureOverrides - ARG 3 biomeSource - METHOD (Lnet/minecraft/class_2378;Ljava/util/Optional;Lnet/minecraft/class_1966;Ljava/util/function/Function;)V - ARG 1 structureSetRegistry - ARG 2 structureOverrides - ARG 3 biomeSource - ARG 4 generationSettingsGetter + METHOD (Lnet/minecraft/class_1966;)V + ARG 1 biomeSource + METHOD (Lnet/minecraft/class_1966;Ljava/util/function/Function;)V + ARG 1 biomeSource + ARG 2 generationSettingsGetter METHOD method_12088 populateNoise (Ljava/util/concurrent/Executor;Lnet/minecraft/class_6748;Lnet/minecraft/class_7138;Lnet/minecraft/class_5138;Lnet/minecraft/class_2791;)Ljava/util/concurrent/CompletableFuture; COMMENT Generates the base shape of the chunk out of the basic block states as decided by this chunk generator's config. ARG 1 executor @@ -74,14 +64,13 @@ CLASS net/minecraft/class_2794 net/minecraft/world/gen/chunk/ChunkGenerator ARG 2 accessor ARG 3 group ARG 4 pos - METHOD method_16129 setStructureStarts (Lnet/minecraft/class_5455;Lnet/minecraft/class_7138;Lnet/minecraft/class_5138;Lnet/minecraft/class_2791;Lnet/minecraft/class_3485;J)V + METHOD method_16129 setStructureStarts (Lnet/minecraft/class_5455;Lnet/minecraft/class_7869;Lnet/minecraft/class_5138;Lnet/minecraft/class_2791;Lnet/minecraft/class_3485;)V COMMENT Determines which structures should start in the given chunk and creates their starting points. ARG 1 registryManager - ARG 2 noiseConfig + ARG 2 placementCalculator ARG 3 structureAccessor ARG 4 chunk ARG 5 structureTemplateManager - ARG 6 seed 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. COMMENT A radius of 8 chunks around the given chunk will be searched for structure starts. @@ -115,10 +104,6 @@ CLASS net/minecraft/class_2794 net/minecraft/world/gen/chunk/ChunkGenerator ARG 3 world ARG 4 noiseConfig METHOD method_28506 getCodec ()Lcom/mojang/serialization/Codec; - METHOD method_28509 generateConcentricRingPositions (Lnet/minecraft/class_6880;Lnet/minecraft/class_7138;Lnet/minecraft/class_6871;)Ljava/util/concurrent/CompletableFuture; - ARG 1 structureSet - ARG 2 noiseConfig - ARG 3 concentricRingsStructurePlacement METHOD method_33730 getMinimumY ()I METHOD method_38264 getStructureReferences (Lnet/minecraft/class_5138;Lnet/minecraft/class_2791;Lnet/minecraft/class_4076;Lnet/minecraft/class_3195;)I ARG 0 structureAccessor @@ -129,13 +114,12 @@ CLASS net/minecraft/class_2794 net/minecraft/world/gen/chunk/ChunkGenerator ARG 6 start METHOD method_38268 (Lnet/minecraft/class_3195;)Ljava/lang/Integer; ARG 0 structureType - METHOD method_38275 populateBiomes (Lnet/minecraft/class_2378;Ljava/util/concurrent/Executor;Lnet/minecraft/class_7138;Lnet/minecraft/class_6748;Lnet/minecraft/class_5138;Lnet/minecraft/class_2791;)Ljava/util/concurrent/CompletableFuture; - ARG 1 biomeRegistry - ARG 2 executor - ARG 3 noiseConfig - ARG 4 blender - ARG 5 structureAccessor - ARG 6 chunk + METHOD method_38275 populateBiomes (Ljava/util/concurrent/Executor;Lnet/minecraft/class_7138;Lnet/minecraft/class_6748;Lnet/minecraft/class_5138;Lnet/minecraft/class_2791;)Ljava/util/concurrent/CompletableFuture; + ARG 1 executor + ARG 2 noiseConfig + ARG 3 blender + ARG 4 structureAccessor + ARG 5 chunk METHOD method_39301 getCodecKey ()Ljava/util/Optional; METHOD method_39462 getBlockBoxForChunk (Lnet/minecraft/class_2791;)Lnet/minecraft/class_3341; ARG 0 chunk @@ -153,9 +137,6 @@ CLASS net/minecraft/class_2794 net/minecraft/world/gen/chunk/ChunkGenerator ARG 6 skipReferencedStructures ARG 7 seed ARG 9 placement - METHOD method_40147 getConcentricRingsStartChunks (Lnet/minecraft/class_6871;Lnet/minecraft/class_7138;)Ljava/util/List; - ARG 1 structurePlacement - ARG 2 noiseConfig METHOD method_40148 locateConcentricRingsStructure (Ljava/util/Set;Lnet/minecraft/class_3218;Lnet/minecraft/class_5138;Lnet/minecraft/class_2338;ZLnet/minecraft/class_6871;)Lcom/mojang/datafixers/util/Pair; ARG 1 structures ARG 2 world @@ -167,15 +148,10 @@ CLASS net/minecraft/class_2794 net/minecraft/world/gen/chunk/ChunkGenerator ARG 1 text ARG 2 noiseConfig ARG 3 pos - METHOD method_41039 streamStructureSets ()Ljava/util/stream/Stream; METHOD method_41040 (Lnet/minecraft/class_5138;Lnet/minecraft/class_2338;Lnet/minecraft/class_3449;)Z ARG 2 start - METHOD method_41041 (Lnet/minecraft/class_5138;Lnet/minecraft/class_4076;Lnet/minecraft/class_2791;Lnet/minecraft/class_7138;JLnet/minecraft/class_1923;Lnet/minecraft/class_5455;Lnet/minecraft/class_3485;Lnet/minecraft/class_6880;)V - ARG 10 structureSet - METHOD method_41042 createStructureSetRegistryGetter (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/Products$P1; - ARG 0 instance - METHOD method_41043 (Lnet/minecraft/class_2794;)Lnet/minecraft/class_2378; - ARG 0 chunkGenerator + METHOD method_41041 (Lnet/minecraft/class_5138;Lnet/minecraft/class_4076;Lnet/minecraft/class_2791;Lnet/minecraft/class_7869;Lnet/minecraft/class_1923;Lnet/minecraft/class_5455;Lnet/minecraft/class_7138;Lnet/minecraft/class_3485;Lnet/minecraft/class_6880;)V + ARG 9 structureSet METHOD method_41044 trySetStructureStart (Lnet/minecraft/class_7059$class_7060;Lnet/minecraft/class_5138;Lnet/minecraft/class_5455;Lnet/minecraft/class_7138;Lnet/minecraft/class_3485;JLnet/minecraft/class_2791;Lnet/minecraft/class_1923;Lnet/minecraft/class_4076;)Z ARG 1 weightedEntry ARG 2 structureAccessor @@ -194,24 +170,6 @@ CLASS net/minecraft/class_2794 net/minecraft/world/gen/chunk/ChunkGenerator ARG 1 start METHOD method_41052 (Lorg/apache/commons/lang3/mutable/MutableBoolean;Ljava/util/function/Predicate;Lnet/minecraft/class_3449;)V ARG 2 start - METHOD method_41053 shouldStructureGenerateInRange (Lnet/minecraft/class_6880;Lnet/minecraft/class_7138;JIII)Z - ARG 1 structureSet - ARG 2 noiseConfig - ARG 3 seed - ARG 5 chunkX - ARG 6 chunkZ - ARG 7 chunkRange - METHOD method_41054 (Lnet/minecraft/class_3195;)Ljava/util/List; - ARG 0 structureType - METHOD method_41055 getStructurePlacement (Lnet/minecraft/class_6880;Lnet/minecraft/class_7138;)Ljava/util/List; - ARG 1 structureEntry - ARG 2 noiseConfig - METHOD method_41056 (Ljava/util/Set;Lnet/minecraft/class_7138;Lnet/minecraft/class_6880;)V - ARG 3 structureSet - METHOD method_41057 computeStructurePlacements (Lnet/minecraft/class_7138;)V - ARG 1 noiseConfig - METHOD method_41058 computeStructurePlacementsIfNeeded (Lnet/minecraft/class_7138;)V - ARG 1 noiseConfig METHOD method_41521 checkNotReferenced (Lnet/minecraft/class_5138;Lnet/minecraft/class_3449;)Z ARG 0 structureAccessor ARG 1 start @@ -228,3 +186,7 @@ CLASS net/minecraft/class_2794 net/minecraft/world/gen/chunk/ChunkGenerator ARG 1 biomeEntry METHOD method_44218 (Lnet/minecraft/class_6880;)Lnet/minecraft/class_5485; ARG 0 biomeEntry + METHOD method_46696 createStructurePlacementCalculator (Lnet/minecraft/class_7225;Lnet/minecraft/class_7138;J)Lnet/minecraft/class_7869; + ARG 1 structureSetRegistry + ARG 2 noiseConfig + ARG 3 seed diff --git a/mappings/net/minecraft/world/gen/chunk/ChunkGeneratorSettings.mapping b/mappings/net/minecraft/world/gen/chunk/ChunkGeneratorSettings.mapping index ca3dd98253..49a05aa703 100644 --- a/mappings/net/minecraft/world/gen/chunk/ChunkGeneratorSettings.mapping +++ b/mappings/net/minecraft/world/gen/chunk/ChunkGeneratorSettings.mapping @@ -33,19 +33,20 @@ CLASS net/minecraft/class_5284 net/minecraft/world/gen/chunk/ChunkGeneratorSetti METHOD comp_483 usesLegacyRandom ()Z METHOD method_28558 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; ARG 0 instance - METHOD method_30641 createNetherSettings ()Lnet/minecraft/class_5284; - METHOD method_30642 createEndSettings ()Lnet/minecraft/class_5284; - METHOD method_30643 createSurfaceSettings (ZZ)Lnet/minecraft/class_5284; - ARG 0 amplified - ARG 1 largeBiomes - METHOD method_30644 register (Lnet/minecraft/class_2378;Lnet/minecraft/class_5321;Lnet/minecraft/class_5284;)Lnet/minecraft/class_6880; - ARG 0 registry - ARG 1 key - ARG 2 chunkGeneratorSettings - METHOD method_31111 initAndGetDefault (Lnet/minecraft/class_2378;)Lnet/minecraft/class_6880; - ARG 0 registry + METHOD method_30641 createNetherSettings (Lnet/minecraft/class_7891;)Lnet/minecraft/class_5284; + ARG 0 registerable + METHOD method_30642 createEndSettings (Lnet/minecraft/class_7891;)Lnet/minecraft/class_5284; + ARG 0 registerable + METHOD method_30643 createSurfaceSettings (Lnet/minecraft/class_7891;ZZ)Lnet/minecraft/class_5284; + ARG 0 registerable + ARG 1 amplified + ARG 2 largeBiomes + METHOD method_31111 bootstrap (Lnet/minecraft/class_7891;)V + ARG 0 chunkGenerationSettingsRegisterable METHOD method_33757 hasAquifers ()Z METHOD method_38999 getRandomProvider ()Lnet/minecraft/class_2919$class_6675; - METHOD method_39901 createCavesSettings ()Lnet/minecraft/class_5284; - METHOD method_39902 createFloatingIslandsSettings ()Lnet/minecraft/class_5284; + METHOD method_39901 createCavesSettings (Lnet/minecraft/class_7891;)Lnet/minecraft/class_5284; + ARG 0 registerable + METHOD method_39902 createFloatingIslandsSettings (Lnet/minecraft/class_7891;)Lnet/minecraft/class_5284; + ARG 0 registerable METHOD method_44323 createMissingSettings ()Lnet/minecraft/class_5284; diff --git a/mappings/net/minecraft/world/gen/chunk/ChunkNoiseSampler.mapping b/mappings/net/minecraft/world/gen/chunk/ChunkNoiseSampler.mapping index 2f31770f66..6229910da2 100644 --- a/mappings/net/minecraft/world/gen/chunk/ChunkNoiseSampler.mapping +++ b/mappings/net/minecraft/world/gen/chunk/ChunkNoiseSampler.mapping @@ -1,11 +1,16 @@ CLASS net/minecraft/class_6568 net/minecraft/world/gen/chunk/ChunkNoiseSampler - FIELD field_34598 cellHeight I + COMMENT {@code ChunkNoiseSampler} is responsible for sampling the density functions for + COMMENT the cells in each chunk, managing caches and interpolators, the {@code Blender}, + COMMENT and the block state samplers. + COMMENT + COMMENT

An instance of this is created for every chunk. + FIELD field_34598 verticalCellCount I FIELD field_34599 horizontalCellCount I FIELD field_34600 minimumCellY I FIELD field_34601 startCellX I FIELD field_34602 startCellZ I - FIELD field_34603 biomeX I - FIELD field_34604 biomeZ I + FIELD field_34603 startBiomeX I + FIELD field_34604 startBiomeZ I FIELD field_34605 interpolators Ljava/util/List; FIELD field_34613 aquiferSampler Lnet/minecraft/class_6350; FIELD field_35487 blender Lnet/minecraft/class_6748; @@ -19,7 +24,12 @@ CLASS net/minecraft/class_6568 net/minecraft/world/gen/chunk/ChunkNoiseSampler FIELD field_36577 sampleUniqueIndex J FIELD field_36578 cacheOnceUniqueIndex J FIELD field_36579 index I - FIELD field_36580 eachApplier Lnet/minecraft/class_6910$class_6911; + FIELD field_36580 interpolationEachApplier Lnet/minecraft/class_6910$class_6911; + COMMENT The implementation of {@code EachApplier} that is used for filling the + COMMENT interpolators' density buffers. + COMMENT + COMMENT

It runs on a vertical column of cells, with the density being sampled at the first + COMMENT block in the cell (cell-local coordinate {@code 0} for X, Y and Z). FIELD field_36581 caches Ljava/util/List; FIELD field_36582 actualDensityFunctionCache Ljava/util/Map; FIELD field_36583 initialDensityWithoutJaggedness Lnet/minecraft/class_6910; @@ -28,48 +38,74 @@ CLASS net/minecraft/class_6568 net/minecraft/world/gen/chunk/ChunkNoiseSampler FIELD field_36586 cachedBlendOffsetDensityFunction Lnet/minecraft/class_6568$class_6951; FIELD field_36587 lastBlendingColumnPos J FIELD field_36588 lastBlendingResult Lnet/minecraft/class_6748$class_6956; - FIELD field_36589 biomeHorizontalEnd I - FIELD field_36590 horizontalBlockSize I - FIELD field_36591 verticalBlockSize I + FIELD field_36589 horizontalBiomeEnd I + FIELD field_36590 horizontalCellBlockCount I + FIELD field_36591 verticalCellBlockCount I FIELD field_36592 isInInterpolationLoop Z - FIELD field_36593 isSamplingNoise Z + FIELD field_36593 isSamplingForCaches Z FIELD field_36594 startBlockX I FIELD field_37113 beardifying Lnet/minecraft/class_6916$class_7050; METHOD (ILnet/minecraft/class_7138;IILnet/minecraft/class_5309;Lnet/minecraft/class_6916$class_7050;Lnet/minecraft/class_5284;Lnet/minecraft/class_6350$class_6565;Lnet/minecraft/class_6748;)V ARG 1 horizontalCellCount ARG 2 noiseConfig - ARG 3 startX - ARG 4 startZ + ARG 3 startBlockX + ARG 4 startBlockZ ARG 5 generationShapeConfig ARG 6 beardifying ARG 7 chunkGeneratorSettings ARG 8 fluidLevelSampler ARG 9 blender - METHOD method_38336 sampleStartNoise ()V - METHOD method_38337 sampleNoiseY (ID)V + METHOD method_38336 sampleStartDensity ()V + COMMENT Samples the density values for all cells in the chunk with the first X coordinate. + COMMENT This is done for every {@code interpolated} function. The resulting density values + COMMENT will be stored in the interpolator's start density buffer. + METHOD method_38337 interpolateY (ID)V + COMMENT Interpolates density values on the Y axis for every interpolator. ARG 1 blockY - ARG 2 cellDeltaY + COMMENT the absolute block Y coordinate + ARG 2 deltaY + COMMENT the cell-local block Y coordinate divided by the number of blocks in a cell vertically METHOD method_38338 (DLnet/minecraft/class_6568$class_5917;)V ARG 2 interpolator - METHOD method_38339 sampleEndNoise (I)V + METHOD method_38339 sampleEndDensity (I)V + COMMENT Samples the density values for all cells in the chunk with the given X coordinate. + COMMENT This is done for every {@code interpolated} function. The resulting density values + COMMENT will be stored in the interpolator's end density buffer. ARG 1 cellX + COMMENT the chunk-local cell X coordinate METHOD method_38342 (IILnet/minecraft/class_6568$class_5917;)V ARG 2 interpolator METHOD method_38348 swapBuffers ()V - METHOD method_38349 sampleNoiseX (ID)V + COMMENT Swaps the start and end density buffers of every interpolator. + METHOD method_38349 interpolateX (ID)V + COMMENT Interpolates density values on the X axis for every interpolator. ARG 1 blockX - ARG 2 cellDeltaX + COMMENT the absolute block X coordinate + ARG 2 deltaX + COMMENT the cell-local block X coordinate divided by the number of blocks in a cell horizontally METHOD method_38350 (DLnet/minecraft/class_6568$class_5917;)V ARG 2 interpolator METHOD method_38354 getAquiferSampler ()Lnet/minecraft/class_6350; - METHOD method_38355 sampleNoiseZ (ID)V + METHOD method_38355 interpolateZ (ID)V + COMMENT Interpolates density values on the Z axis for every interpolator. ARG 1 blockZ - ARG 2 cellDeltaZ + COMMENT the absolute block Z coordinate + ARG 2 deltaZ + COMMENT the cell-local block Z coordinate divided by the number of blocks in a cell vertically METHOD method_38356 (DLnet/minecraft/class_6568$class_5917;)V ARG 2 interpolator - METHOD method_38362 sampleNoiseCorners (II)V + METHOD method_38362 onSampledCellCorners (II)V + COMMENT This should be called when the start and end density buffers are + COMMENT correctly filled for the current cell. + COMMENT + COMMENT

This starts the interpolators and fills the cell caches. + COMMENT + COMMENT @implNote For filling the cell caches, {@code this} is used as the + COMMENT {@link net.minecraft.world.gen.densityfunction.DensityFunction.EachApplier EachApplier}. ARG 1 cellY + COMMENT the chunk-local cell Y coordinate ARG 2 cellZ + COMMENT the chunk-local cell Z coordinate METHOD method_39543 create (Lnet/minecraft/class_2791;Lnet/minecraft/class_7138;Lnet/minecraft/class_6916$class_7050;Lnet/minecraft/class_5284;Lnet/minecraft/class_6350$class_6565;Lnet/minecraft/class_6748;)Lnet/minecraft/class_6568; ARG 0 chunk ARG 1 noiseConfig @@ -83,27 +119,39 @@ CLASS net/minecraft/class_6568 net/minecraft/world/gen/chunk/ChunkNoiseSampler ARG 1 blockX ARG 2 blockZ METHOD method_40529 getActualDensityFunction (Lnet/minecraft/class_6910;)Lnet/minecraft/class_6910; - ARG 1 densityFunction + COMMENT {@return the actual density function for a given density function} + COMMENT + COMMENT

The classes in {@link DensityFunctionTypes} for caches, interpolators, + COMMENT {@code blend_alpha} and {@code blend_offset} use simple stub implementations + COMMENT that get replaced with their actual implementation by calling this method. + ARG 1 function + COMMENT the density function to get an actual implementation for METHOD method_40530 (Lnet/minecraft/class_6910;Lnet/minecraft/class_6910$class_6912;)Lnet/minecraft/class_2680; ARG 2 pos METHOD method_40531 createMultiNoiseSampler (Lnet/minecraft/class_6953;Ljava/util/List;)Lnet/minecraft/class_6544$class_6552; ARG 1 noiseRouter ARG 2 spawnTarget - METHOD method_40532 sampleNoise (ZI)V + METHOD method_40532 sampleDensity (ZI)V + COMMENT Samples the density values for all cells in the chunk with the given X coordinate. + COMMENT This is done for every {@code interpolated} function. ARG 1 start - ARG 2 nextCellX + COMMENT whether to store the results in the start or end density buffer + ARG 2 cellX + COMMENT the current cell X coordinate METHOD method_40533 getActualDensityFunctionImpl (Lnet/minecraft/class_6910;)Lnet/minecraft/class_6910; - ARG 1 densityFunction + COMMENT {@return the actual density function for a given density function} + ARG 1 function METHOD method_40535 calculateBlendResult (II)Lnet/minecraft/class_6748$class_6956; ARG 1 blockX ARG 2 blockZ METHOD method_40536 sampleBlockState ()Lnet/minecraft/class_2680; METHOD method_40537 stopInterpolation ()V - METHOD method_42361 getHorizontalBlockSize ()I - METHOD method_42362 getVerticalBlockSize ()I - CLASS class_5917 NoiseInterpolator - FIELD field_29227 startNoiseBuffer [[D - FIELD field_29228 endNoiseBuffer [[D + COMMENT Stops the interpolation loop for this chunk. + METHOD method_42361 getHorizontalCellBlockCount ()I + METHOD method_42362 getVerticalCellBlockCount ()I + CLASS class_5917 DensityInterpolator + FIELD field_29227 startDensityBuffer [[D + FIELD field_29228 endDensityBuffer [[D FIELD field_29233 x0y0z0 D FIELD field_29234 x0y0z1 D FIELD field_29235 x1y0z0 D @@ -118,22 +166,29 @@ CLASS net/minecraft/class_6568 net/minecraft/world/gen/chunk/ChunkNoiseSampler FIELD field_29244 x1z1 D FIELD field_29245 z0 D FIELD field_29246 z1 D - FIELD field_34623 columnSampler Lnet/minecraft/class_6910; + FIELD field_34623 delegate Lnet/minecraft/class_6910; FIELD field_34624 result D METHOD (Lnet/minecraft/class_6568;Lnet/minecraft/class_6910;)V - ARG 2 columnSampler - METHOD method_34287 sampleNoiseY (D)V + ARG 2 delegate + METHOD method_34287 interpolateY (D)V + COMMENT Interpolates the eight densities on the Y axis. ARG 1 deltaY - METHOD method_34289 sampleNoiseCorners (II)V - ARG 1 noiseY - ARG 2 noiseZ + METHOD method_34289 onSampledCellCorners (II)V + COMMENT Copies the densities of the eight corners of the current cell into their + COMMENT respective fields. + ARG 1 cellY + COMMENT the cell's Y coordinate + ARG 2 cellZ + COMMENT the cell's chunk-local Z coordinate METHOD method_34291 swapBuffers ()V - METHOD method_34292 sampleNoiseX (D)V + METHOD method_34292 interpolateX (D)V + COMMENT Interpolates the four remaining densities on the X axis. ARG 1 deltaX METHOD method_34293 createBuffer (II)[[D ARG 1 sizeZ ARG 2 sizeX - METHOD method_38363 sampleNoiseZ (D)V + METHOD method_38363 interpolateZ (D)V + COMMENT Interpolates the two remaining densities on the Z axis. ARG 1 deltaZ CLASS class_6569 BlockStateSampler METHOD calculate sample (Lnet/minecraft/class_6910$class_6912;)Lnet/minecraft/class_2680; @@ -159,7 +214,7 @@ CLASS net/minecraft/class_6568 net/minecraft/world/gen/chunk/ChunkNoiseSampler FIELD field_36610 cache [D METHOD (Lnet/minecraft/class_6568;Lnet/minecraft/class_6910;)V ARG 2 delegate - CLASS class_6951 FlatCacheDensityFunction + CLASS class_6951 FlatCache FIELD field_36612 delegate Lnet/minecraft/class_6910; FIELD field_36613 cache [[D METHOD (Lnet/minecraft/class_6568;Lnet/minecraft/class_6910;Z)V diff --git a/mappings/net/minecraft/world/gen/chunk/DebugChunkGenerator.mapping b/mappings/net/minecraft/world/gen/chunk/DebugChunkGenerator.mapping index 821a53051d..64ae6e3bdb 100644 --- a/mappings/net/minecraft/world/gen/chunk/DebugChunkGenerator.mapping +++ b/mappings/net/minecraft/world/gen/chunk/DebugChunkGenerator.mapping @@ -5,13 +5,12 @@ CLASS net/minecraft/class_2891 net/minecraft/world/gen/chunk/DebugChunkGenerator FIELD field_13163 BLOCK_STATES Ljava/util/List; FIELD field_13164 BARRIER Lnet/minecraft/class_2680; FIELD field_24768 CODEC Lcom/mojang/serialization/Codec; - FIELD field_26747 biomeRegistry Lnet/minecraft/class_2378; - METHOD (Lnet/minecraft/class_2378;Lnet/minecraft/class_2378;)V - ARG 1 structureSetRegistry - ARG 2 biomeRegistry + METHOD (Lnet/minecraft/class_6880$class_6883;)V + ARG 1 biomeEntry METHOD method_12578 getBlockState (II)Lnet/minecraft/class_2680; ARG 0 x ARG 1 z METHOD method_12579 (Lnet/minecraft/class_2248;)Ljava/util/stream/Stream; ARG 0 block - METHOD method_31169 getBiomeRegistry ()Lnet/minecraft/class_2378; + METHOD method_40465 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 0 instance diff --git a/mappings/net/minecraft/world/gen/chunk/FlatChunkGenerator.mapping b/mappings/net/minecraft/world/gen/chunk/FlatChunkGenerator.mapping index 0d6b819492..64dc60a6a7 100644 --- a/mappings/net/minecraft/world/gen/chunk/FlatChunkGenerator.mapping +++ b/mappings/net/minecraft/world/gen/chunk/FlatChunkGenerator.mapping @@ -1,9 +1,8 @@ CLASS net/minecraft/class_2897 net/minecraft/world/gen/chunk/FlatChunkGenerator FIELD field_24510 config Lnet/minecraft/class_3232; FIELD field_24769 CODEC Lcom/mojang/serialization/Codec; - METHOD (Lnet/minecraft/class_2378;Lnet/minecraft/class_3232;)V - ARG 1 structureSetRegistry - ARG 2 config + METHOD (Lnet/minecraft/class_3232;)V + ARG 1 config METHOD method_28002 (Lnet/minecraft/class_2680;)Lnet/minecraft/class_2680; ARG 0 state METHOD method_28545 getConfig ()Lnet/minecraft/class_3232; diff --git a/mappings/net/minecraft/world/gen/chunk/FlatChunkGeneratorConfig.mapping b/mappings/net/minecraft/world/gen/chunk/FlatChunkGeneratorConfig.mapping index 567da1cce2..3259df58f9 100644 --- a/mappings/net/minecraft/world/gen/chunk/FlatChunkGeneratorConfig.mapping +++ b/mappings/net/minecraft/world/gen/chunk/FlatChunkGeneratorConfig.mapping @@ -7,24 +7,26 @@ CLASS net/minecraft/class_3232 net/minecraft/world/gen/chunk/FlatChunkGeneratorC FIELD field_24975 CODEC Lcom/mojang/serialization/Codec; FIELD field_24976 hasFeatures Z FIELD field_24977 hasLakes Z - FIELD field_26748 biomeRegistry Lnet/minecraft/class_2378; FIELD field_37145 structureOverrides Ljava/util/Optional; - METHOD (Ljava/util/Optional;Lnet/minecraft/class_2378;)V + FIELD field_40918 features Ljava/util/List; + METHOD (Ljava/util/Optional;Ljava/util/List;ZZLjava/util/Optional;Lnet/minecraft/class_6880$class_6883;Lnet/minecraft/class_6880;Lnet/minecraft/class_6880;)V ARG 1 structureOverrides - ARG 2 biomeRegistry - METHOD (Lnet/minecraft/class_2378;Ljava/util/Optional;Ljava/util/List;ZZLjava/util/Optional;)V - ARG 1 biomeRegistry - ARG 2 structureOverrides - ARG 3 layers - ARG 4 hasLakes - ARG 5 hasFeatures - ARG 6 biome - METHOD method_14309 getDefaultConfig (Lnet/minecraft/class_2378;Lnet/minecraft/class_2378;)Lnet/minecraft/class_3232; - ARG 0 biomeRegistry - ARG 1 structureSetRegistry + ARG 2 layers + ARG 3 lakes + ARG 4 features + ARG 5 biome + ARG 6 fallback + ARG 7 undergroundLavaLakeFeature + ARG 8 surfaceLavaLakeFeature + METHOD (Ljava/util/Optional;Lnet/minecraft/class_6880;Ljava/util/List;)V + ARG 1 structureOverrides + ARG 2 biome + ARG 3 features + METHOD method_14309 getDefaultConfig (Lnet/minecraft/class_7871;Lnet/minecraft/class_7871;Lnet/minecraft/class_7871;)Lnet/minecraft/class_3232; + ARG 0 biomeLookup + ARG 1 structureSetLookup + ARG 2 featureLookup METHOD method_14312 getLayerBlocks ()Ljava/util/List; - METHOD method_14325 setBiome (Lnet/minecraft/class_6880;)V - ARG 1 biome METHOD method_14326 getBiome ()Lnet/minecraft/class_6880; METHOD method_14327 getLayers ()Ljava/util/List; METHOD method_14330 updateLayerBlocks ()V @@ -32,13 +34,29 @@ CLASS net/minecraft/class_3232 net/minecraft/world/gen/chunk/FlatChunkGeneratorC METHOD method_28913 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; ARG 0 instance METHOD method_28916 enableLakes ()V - METHOD method_29965 withLayers (Ljava/util/List;Ljava/util/Optional;)Lnet/minecraft/class_3232; - ARG 1 layers - ARG 2 structureOverrides + METHOD method_30046 (Lnet/minecraft/class_3232;)Ljava/lang/Boolean; + ARG 0 config + METHOD method_30047 (Lnet/minecraft/class_3232;)Ljava/lang/Boolean; + ARG 0 config + METHOD method_31182 (Lnet/minecraft/class_3232;)Ljava/util/Optional; + ARG 0 config METHOD method_33067 checkHeight (Lnet/minecraft/class_3232;)Lcom/mojang/serialization/DataResult; ARG 0 config METHOD method_34741 (Lnet/minecraft/class_2680;)Z ARG 0 state METHOD method_41139 getStructureOverrides ()Ljava/util/Optional; + METHOD method_41140 (Lnet/minecraft/class_3232;)Ljava/util/Optional; + ARG 0 config METHOD method_44225 createGenerationSettings (Lnet/minecraft/class_6880;)Lnet/minecraft/class_5485; ARG 1 biomeEntry + METHOD method_46726 getPlains (Lnet/minecraft/class_7871;)Lnet/minecraft/class_6880; + ARG 0 biomeLookup + METHOD method_46727 with (Ljava/util/List;Ljava/util/Optional;Lnet/minecraft/class_6880;)Lnet/minecraft/class_3232; + ARG 1 layers + ARG 2 structureOverrides + ARG 3 biome + METHOD method_46728 getBiome (Ljava/util/Optional;Lnet/minecraft/class_6880;)Lnet/minecraft/class_6880; + ARG 0 biome + ARG 1 fallback + METHOD method_46729 getLavaLakes (Lnet/minecraft/class_7871;)Ljava/util/List; + ARG 0 featureLookup diff --git a/mappings/net/minecraft/world/gen/chunk/FlatChunkGeneratorLayer.mapping b/mappings/net/minecraft/world/gen/chunk/FlatChunkGeneratorLayer.mapping index 8fbd4cc26f..7fb37bcf56 100644 --- a/mappings/net/minecraft/world/gen/chunk/FlatChunkGeneratorLayer.mapping +++ b/mappings/net/minecraft/world/gen/chunk/FlatChunkGeneratorLayer.mapping @@ -9,3 +9,5 @@ CLASS net/minecraft/class_3229 net/minecraft/world/gen/chunk/FlatChunkGeneratorL METHOD method_14289 getThickness ()I METHOD method_28909 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; ARG 0 instance + METHOD method_28910 (Lnet/minecraft/class_3229;)Lnet/minecraft/class_2248; + ARG 0 layer diff --git a/mappings/net/minecraft/world/gen/chunk/GenerationShapeConfig.mapping b/mappings/net/minecraft/world/gen/chunk/GenerationShapeConfig.mapping index df0bff6e9c..0c065589a0 100644 --- a/mappings/net/minecraft/world/gen/chunk/GenerationShapeConfig.mapping +++ b/mappings/net/minecraft/world/gen/chunk/GenerationShapeConfig.mapping @@ -27,7 +27,7 @@ CLASS net/minecraft/class_5309 net/minecraft/world/gen/chunk/GenerationShapeConf ARG 0 config METHOD method_32996 (Lcom/mojang/serialization/DataResult$PartialResult;)V ARG 0 result - METHOD method_39545 verticalBlockSize ()I - METHOD method_39546 horizontalBlockSize ()I + METHOD method_39545 verticalCellBlockCount ()I + METHOD method_39546 horizontalCellBlockCount ()I METHOD method_42368 trimHeight (Lnet/minecraft/class_5539;)Lnet/minecraft/class_5309; ARG 1 world diff --git a/mappings/net/minecraft/world/gen/chunk/NoiseChunkGenerator.mapping b/mappings/net/minecraft/world/gen/chunk/NoiseChunkGenerator.mapping index 2fa3a9ccd1..69620643dd 100644 --- a/mappings/net/minecraft/world/gen/chunk/NoiseChunkGenerator.mapping +++ b/mappings/net/minecraft/world/gen/chunk/NoiseChunkGenerator.mapping @@ -1,15 +1,11 @@ CLASS net/minecraft/class_3754 net/minecraft/world/gen/chunk/NoiseChunkGenerator - FIELD field_16576 defaultBlock Lnet/minecraft/class_2680; FIELD field_16648 AIR Lnet/minecraft/class_2680; FIELD field_24773 CODEC Lcom/mojang/serialization/Codec; FIELD field_24774 settings Lnet/minecraft/class_6880; - FIELD field_34591 fluidLevelSampler Lnet/minecraft/class_6350$class_6565; - FIELD field_35361 noiseRegistry Lnet/minecraft/class_2378; - METHOD (Lnet/minecraft/class_2378;Lnet/minecraft/class_2378;Lnet/minecraft/class_1966;Lnet/minecraft/class_6880;)V - ARG 1 structureSetRegistry - ARG 2 noiseRegistry - ARG 3 populationSource - ARG 4 settings + FIELD field_34591 fluidLevelSampler Ljava/util/function/Supplier; + METHOD (Lnet/minecraft/class_1966;Lnet/minecraft/class_6880;)V + ARG 1 biomeSource + ARG 2 settings METHOD method_26263 sampleHeightmap (Lnet/minecraft/class_5539;Lnet/minecraft/class_7138;IILorg/apache/commons/lang3/mutable/MutableObject;Ljava/util/function/Predicate;)Ljava/util/OptionalInt; ARG 1 world ARG 2 noiseConfig @@ -42,21 +38,15 @@ CLASS net/minecraft/class_3754 net/minecraft/world/gen/chunk/NoiseChunkGenerator ARG 3 y ARG 4 z ARG 5 state - METHOD method_38325 (Lnet/minecraft/class_6350$class_6351;ILnet/minecraft/class_6350$class_6351;Lnet/minecraft/class_6350$class_6351;III)Lnet/minecraft/class_6350$class_6351; - ARG 4 x - ARG 5 y - ARG 6 z METHOD method_38327 populateBiomes (Lnet/minecraft/class_6748;Lnet/minecraft/class_7138;Lnet/minecraft/class_5138;Lnet/minecraft/class_2791;)V ARG 1 blender ARG 2 noiseConfig ARG 3 structureAccessor ARG 4 chunk - METHOD method_39172 (Lnet/minecraft/class_3754;)Lnet/minecraft/class_2378; - ARG 0 generator METHOD method_41535 (Lnet/minecraft/class_5138;Lnet/minecraft/class_3233;Lnet/minecraft/class_7138;Lnet/minecraft/class_2791;)Lnet/minecraft/class_6568; - ARG 4 chunk + ARG 4 chunkx METHOD method_41536 (Lnet/minecraft/class_5138;Lnet/minecraft/class_6748;Lnet/minecraft/class_7138;Lnet/minecraft/class_2791;)Lnet/minecraft/class_6568; - ARG 4 chunk + ARG 4 chunkx METHOD method_41537 createChunkNoiseSampler (Lnet/minecraft/class_2791;Lnet/minecraft/class_5138;Lnet/minecraft/class_6748;Lnet/minecraft/class_7138;)Lnet/minecraft/class_6568; ARG 1 chunk ARG 2 world @@ -71,7 +61,13 @@ CLASS net/minecraft/class_3754 net/minecraft/world/gen/chunk/NoiseChunkGenerator ARG 6 biomeRegistry ARG 7 blender METHOD method_41539 (Lnet/minecraft/class_5138;Lnet/minecraft/class_6748;Lnet/minecraft/class_7138;Lnet/minecraft/class_2791;)Lnet/minecraft/class_6568; - ARG 4 chunk + ARG 4 chunkx METHOD method_41540 (Lnet/minecraft/class_5138;Lnet/minecraft/class_6748;Lnet/minecraft/class_7138;Lnet/minecraft/class_2791;)Lnet/minecraft/class_6568; - ARG 4 chunk + ARG 4 chunkx METHOD method_41541 getSettings ()Lnet/minecraft/class_6880; + METHOD method_45509 (Lnet/minecraft/class_6350$class_6351;ILnet/minecraft/class_6350$class_6351;Lnet/minecraft/class_6350$class_6351;III)Lnet/minecraft/class_6350$class_6351; + ARG 4 x + ARG 5 y + ARG 6 z + METHOD method_45510 createFluidLevelSampler (Lnet/minecraft/class_5284;)Lnet/minecraft/class_6350$class_6565; + ARG 0 settings diff --git a/mappings/net/minecraft/world/gen/chunk/placement/ConcentricRingsStructurePlacement.mapping b/mappings/net/minecraft/world/gen/chunk/placement/ConcentricRingsStructurePlacement.mapping index dd8beb0e00..49c806f3ba 100644 --- a/mappings/net/minecraft/world/gen/chunk/placement/ConcentricRingsStructurePlacement.mapping +++ b/mappings/net/minecraft/world/gen/chunk/placement/ConcentricRingsStructurePlacement.mapping @@ -23,5 +23,7 @@ CLASS net/minecraft/class_6871 net/minecraft/world/gen/chunk/placement/Concentri ARG 0 instance METHOD method_41627 getDistance ()I METHOD method_41628 getSpread ()I + METHOD method_41629 buildConcentricRingsCodec (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/Products$P9; + ARG 0 instance METHOD method_41630 getCount ()I METHOD method_41631 getPreferredBiomes ()Lnet/minecraft/class_6885; diff --git a/mappings/net/minecraft/world/gen/chunk/placement/RandomSpreadStructurePlacement.mapping b/mappings/net/minecraft/world/gen/chunk/placement/RandomSpreadStructurePlacement.mapping index cc6091a58b..a7658261f1 100644 --- a/mappings/net/minecraft/world/gen/chunk/placement/RandomSpreadStructurePlacement.mapping +++ b/mappings/net/minecraft/world/gen/chunk/placement/RandomSpreadStructurePlacement.mapping @@ -23,8 +23,8 @@ CLASS net/minecraft/class_6872 net/minecraft/world/gen/chunk/placement/RandomSpr ARG 4 chunkZ METHOD method_40170 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; ARG 0 instance - METHOD method_40171 (Lnet/minecraft/class_6872;)Lcom/mojang/serialization/DataResult; - ARG 0 placement METHOD method_41632 getSpacing ()I METHOD method_41633 getSeparation ()I METHOD method_41634 getSpreadType ()Lnet/minecraft/class_6873; + METHOD method_51720 validate (Lnet/minecraft/class_6872;)Lcom/mojang/serialization/DataResult; + ARG 0 structurePlacement diff --git a/mappings/net/minecraft/world/gen/chunk/placement/StructurePlacement.mapping b/mappings/net/minecraft/world/gen/chunk/placement/StructurePlacement.mapping index ee3d8227ba..f36c41788e 100644 --- a/mappings/net/minecraft/world/gen/chunk/placement/StructurePlacement.mapping +++ b/mappings/net/minecraft/world/gen/chunk/placement/StructurePlacement.mapping @@ -13,12 +13,10 @@ CLASS net/minecraft/class_6874 net/minecraft/world/gen/chunk/placement/Structure ARG 4 salt ARG 5 exclusionZone METHOD method_40166 getType ()Lnet/minecraft/class_6875; - METHOD method_40168 isStartChunk (Lnet/minecraft/class_2794;Lnet/minecraft/class_7138;JII)Z - ARG 1 chunkGenerator - ARG 2 noiseConfig - ARG 3 seed - ARG 5 chunkX - ARG 6 chunkZ + METHOD method_40168 isStartChunk (Lnet/minecraft/class_7869;II)Z + ARG 1 calculator + ARG 2 chunkX + ARG 3 chunkZ METHOD method_41635 defaultShouldGenerate (JIIIF)Z ARG 0 seed ARG 2 salt @@ -27,18 +25,18 @@ CLASS net/minecraft/class_6874 net/minecraft/world/gen/chunk/placement/Structure ARG 5 frequency METHOD method_41636 getLocatePos (Lnet/minecraft/class_1923;)Lnet/minecraft/class_2338; ARG 1 chunkPos + METHOD method_41637 buildCodec (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/Products$P5; + ARG 0 instance METHOD method_41638 legacyType3ShouldGenerate (JIIIF)Z ARG 0 seed ARG 2 salt ARG 3 chunkX ARG 4 chunkZ ARG 5 frequency - METHOD method_41639 shouldGenerate (Lnet/minecraft/class_2794;Lnet/minecraft/class_7138;JII)Z - ARG 1 chunkGenerator - ARG 2 noiseConfig - ARG 3 seed - ARG 5 chunkX - ARG 6 chunkZ + METHOD method_41639 shouldGenerate (Lnet/minecraft/class_7869;II)Z + ARG 1 calculator + ARG 2 chunkX + ARG 3 chunkZ METHOD method_41640 legacyType2ShouldGenerate (JIIIF)Z ARG 0 seed ARG 2 salt @@ -58,12 +56,12 @@ CLASS net/minecraft/class_6874 net/minecraft/world/gen/chunk/placement/Structure METHOD method_41646 getExclusionZone ()Ljava/util/Optional; CLASS class_7152 ExclusionZone FIELD field_37781 CODEC Lcom/mojang/serialization/Codec; - METHOD method_41648 shouldExclude (Lnet/minecraft/class_2794;Lnet/minecraft/class_7138;JII)Z - ARG 1 chunkGenerator - ARG 2 noiseConfig - ARG 3 seed - ARG 5 x - ARG 6 z + METHOD method_41647 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 0 instance + METHOD method_41648 shouldExclude (Lnet/minecraft/class_7869;II)Z + ARG 1 calculator + ARG 2 centerChunkX + ARG 3 centerChunkZ CLASS class_7153 GenerationPredicate METHOD shouldGenerate (JIIIF)Z ARG 1 seed diff --git a/mappings/net/minecraft/world/gen/chunk/placement/StructurePlacementCalculator.mapping b/mappings/net/minecraft/world/gen/chunk/placement/StructurePlacementCalculator.mapping new file mode 100644 index 0000000000..72918ff85e --- /dev/null +++ b/mappings/net/minecraft/world/gen/chunk/placement/StructurePlacementCalculator.mapping @@ -0,0 +1,58 @@ +CLASS net/minecraft/class_7869 net/minecraft/world/gen/chunk/placement/StructurePlacementCalculator + FIELD field_40899 LOGGER Lorg/slf4j/Logger; + FIELD field_40900 noiseConfig Lnet/minecraft/class_7138; + FIELD field_40901 biomeSource Lnet/minecraft/class_1966; + FIELD field_40902 structureSeed J + FIELD field_40903 concentricRingSeed J + FIELD field_40904 structuresToPlacements Ljava/util/Map; + FIELD field_40905 concentricPlacementsToPositions Ljava/util/Map; + FIELD field_40906 calculated Z + FIELD field_40907 structureSets Ljava/util/List; + METHOD (Lnet/minecraft/class_7138;Lnet/minecraft/class_1966;JJLjava/util/List;)V + ARG 1 noiseConfig + ARG 2 biomeSource + ARG 3 structureSeed + ARG 5 concentricRingSeed + ARG 7 structureSets + METHOD method_46697 getStructureSets ()Ljava/util/List; + METHOD method_46699 (Lnet/minecraft/class_1966;Lnet/minecraft/class_6880$class_6883;)Z + ARG 1 structureSet + METHOD method_46700 (Lnet/minecraft/class_1966;Lnet/minecraft/class_6880;)Z + ARG 1 structureSet + METHOD method_46701 (Lcom/google/common/base/Stopwatch;Lnet/minecraft/class_6880;Ljava/util/List;)Ljava/util/List; + ARG 2 positions + METHOD method_46702 create (Lnet/minecraft/class_7138;JLnet/minecraft/class_1966;Lnet/minecraft/class_7225;)Lnet/minecraft/class_7869; + ARG 0 noiseConfig + ARG 1 seed + ARG 3 biomeSource + ARG 4 structureSetRegistry + METHOD method_46703 create (Lnet/minecraft/class_7138;JLnet/minecraft/class_1966;Ljava/util/stream/Stream;)Lnet/minecraft/class_7869; + ARG 0 noiseConfig + ARG 1 seed + ARG 3 biomeSource + ARG 4 structureSets + METHOD method_46704 (Lnet/minecraft/class_3195;)Ljava/util/List; + ARG 0 structure + METHOD method_46705 (Lnet/minecraft/class_7059$class_7060;)Ljava/util/stream/Stream; + ARG 0 structure + METHOD method_46706 hasValidBiome (Lnet/minecraft/class_7059;Lnet/minecraft/class_1966;)Z + ARG 0 structureSet + ARG 1 biomeSource + METHOD method_46707 getPlacementPositions (Lnet/minecraft/class_6871;)Ljava/util/List; + ARG 1 placement + METHOD method_46708 getPlacements (Lnet/minecraft/class_6880;)Ljava/util/List; + ARG 1 structureEntry + METHOD method_46709 canGenerate (Lnet/minecraft/class_6880;III)Z + ARG 1 structureSetEntry + ARG 2 centerChunkX + ARG 3 centerChunkZ + ARG 4 chunkCount + METHOD method_46710 calculateConcentricsRingPlacementPos (Lnet/minecraft/class_6880;Lnet/minecraft/class_6871;)Ljava/util/concurrent/CompletableFuture; + ARG 1 structureSetEntry + ARG 2 placement + METHOD method_46711 (Ljava/util/Set;Lnet/minecraft/class_6880;)V + ARG 2 structureSet + METHOD method_46712 tryCalculate ()V + METHOD method_46713 getNoiseConfig ()Lnet/minecraft/class_7138; + METHOD method_46714 getStructureSeed ()J + METHOD method_46715 calculate ()V diff --git a/mappings/net/minecraft/world/gen/chunk/placement/StructurePlacementType.mapping b/mappings/net/minecraft/world/gen/chunk/placement/StructurePlacementType.mapping index bed83b23ac..a5999815c4 100644 --- a/mappings/net/minecraft/world/gen/chunk/placement/StructurePlacementType.mapping +++ b/mappings/net/minecraft/world/gen/chunk/placement/StructurePlacementType.mapping @@ -1,3 +1,4 @@ CLASS net/minecraft/class_6875 net/minecraft/world/gen/chunk/placement/StructurePlacementType METHOD method_40177 register (Ljava/lang/String;Lcom/mojang/serialization/Codec;)Lnet/minecraft/class_6875; + ARG 0 id ARG 1 codec diff --git a/mappings/net/minecraft/world/gen/densityfunction/DensityFunction.mapping b/mappings/net/minecraft/world/gen/densityfunction/DensityFunction.mapping index 55d33fd30d..ff4962c4fa 100644 --- a/mappings/net/minecraft/world/gen/densityfunction/DensityFunction.mapping +++ b/mappings/net/minecraft/world/gen/densityfunction/DensityFunction.mapping @@ -1,17 +1,32 @@ CLASS net/minecraft/class_6910 net/minecraft/world/gen/densityfunction/DensityFunction + COMMENT Represents a function that maps from a block position to a density value. + COMMENT + COMMENT

It can be defined in code or in data packs by using pre-defined function types + COMMENT like constant values or {@code add}, which in turn use other density functions + COMMENT to define their operands. FIELD field_37057 CODEC Lcom/mojang/serialization/Codec; FIELD field_37058 REGISTRY_ENTRY_CODEC Lcom/mojang/serialization/Codec; FIELD field_37059 FUNCTION_CODEC Lcom/mojang/serialization/Codec; METHOD method_40464 sample (Lnet/minecraft/class_6910$class_6912;)D + COMMENT {@return the density value for the given block position} ARG 1 pos + COMMENT the block position METHOD method_40468 clamp (DD)Lnet/minecraft/class_6910; ARG 1 min ARG 3 max METHOD method_40469 apply (Lnet/minecraft/class_6910$class_6915;)Lnet/minecraft/class_6910; + COMMENT Applies the visitor to every child density function and {@code this}. + COMMENT + COMMENT @return the resulting density function ARG 1 visitor - METHOD method_40470 applyEach ([DLnet/minecraft/class_6910$class_6911;)V + COMMENT the visitor that should be applied to this density function + METHOD method_40470 fill ([DLnet/minecraft/class_6910$class_6911;)V + COMMENT Fills an array of densities using {@code this} density function and + COMMENT the {@link EachApplier}. ARG 1 densities + COMMENT the array of densities to fill, like a buffer or a cache ARG 2 applier + COMMENT the {@code EachApplier} to use. It has a method for filling the array, as well as to get a block position for an index METHOD method_40471 abs ()Lnet/minecraft/class_6910; METHOD method_40472 square ()Lnet/minecraft/class_6910; METHOD method_40473 cube ()Lnet/minecraft/class_6910; @@ -22,14 +37,38 @@ CLASS net/minecraft/class_6910 net/minecraft/world/gen/densityfunction/DensityFu ARG 0 function METHOD method_41062 getCodecHolder ()Lnet/minecraft/class_7243; CLASS class_6911 EachApplier - METHOD method_40477 getPosAt (I)Lnet/minecraft/class_6910$class_6912; + COMMENT {@code EachApplier} is used to fill an array of densities, like a density buffer + COMMENT or cache, with values from a density function. + COMMENT + COMMENT

This exists because {@link net.minecraft.world.gen.chunk.ChunkNoiseSampler ChunkNoiseSampler} + COMMENT uses itself as the block position passed to density functions and needs to set the + COMMENT position fields correctly before calling {@code sample}, as well as setting fields + COMMENT for the implementation of caches. + METHOD method_40477 at (I)Lnet/minecraft/class_6910$class_6912; + COMMENT {@return the block position at a specific index of the density array} + COMMENT + COMMENT

If you want to manually iterate the array and call {@link DensityFunction#sample} + COMMENT to set the individual elements in an implementation of {@link DensityFunction#fill}, + COMMENT this method can be used to get the block position required for that. + COMMENT + COMMENT @implNote This can have side effects. ARG 1 index - METHOD method_40478 applyEach ([DLnet/minecraft/class_6910;)V + METHOD method_40478 fill ([DLnet/minecraft/class_6910;)V + COMMENT Fills the density array using a density function. + COMMENT + COMMENT @implNote This can have side effects. ARG 1 densities ARG 2 densityFunction CLASS class_6912 NoisePos + COMMENT {@code NoisePos} represents the absolute block position that is passed + COMMENT to density functions. + COMMENT + COMMENT

It also has a way to get the currently active {@link Blender}. METHOD method_39327 getBlender ()Lnet/minecraft/class_6748; CLASS class_6913 Base + COMMENT Represents a density function that has no other density functions as an argument, + COMMENT and provides default implementations of {@link #fill} and + COMMENT {@link #apply(DensityFunctionVisitor)} for this case. CLASS class_6914 UnblendedNoisePos CLASS class_6915 DensityFunctionVisitor METHOD apply (Lnet/minecraft/class_6910;)Lnet/minecraft/class_6910; diff --git a/mappings/net/minecraft/world/gen/densityfunction/DensityFunctions.mapping b/mappings/net/minecraft/world/gen/densityfunction/DensityFunctions.mapping index f35aa46426..ea4a6a0407 100644 --- a/mappings/net/minecraft/world/gen/densityfunction/DensityFunctions.mapping +++ b/mappings/net/minecraft/world/gen/densityfunction/DensityFunctions.mapping @@ -13,90 +13,98 @@ CLASS net/minecraft/class_6954 net/minecraft/world/gen/densityfunction/DensityFu METHOD method_40541 applyBlending (Lnet/minecraft/class_6910;Lnet/minecraft/class_6910;)Lnet/minecraft/class_6910; ARG 0 function ARG 1 blendOffset - METHOD method_41100 initAndGetDefault (Lnet/minecraft/class_2378;)Lnet/minecraft/class_6880; - ARG 0 registry - METHOD method_41101 createCavesFunction (Lnet/minecraft/class_2378;Lnet/minecraft/class_6910;)Lnet/minecraft/class_6910; - ARG 0 registry - ARG 1 slopedCheese - METHOD method_41103 createSurfaceNoiseRouter (Lnet/minecraft/class_2378;ZZ)Lnet/minecraft/class_6953; + METHOD method_41100 bootstrap (Lnet/minecraft/class_7891;)Lnet/minecraft/class_6880; + ARG 0 densityFunctionRegisterable + METHOD method_41101 createCavesFunction (Lnet/minecraft/class_7871;Lnet/minecraft/class_7871;Lnet/minecraft/class_6910;)Lnet/minecraft/class_6910; + ARG 0 densityFunctionLookup + ARG 1 noiseParametersLookup + ARG 2 slopedCheese + METHOD method_41103 createSurfaceNoiseRouter (Lnet/minecraft/class_7871;Lnet/minecraft/class_7871;ZZ)Lnet/minecraft/class_6953; COMMENT Creates the {@link NoiseRouter} for the overworld and the surface world type. COMMENT COMMENT @return the created {@code NoiseRouter} - ARG 0 registry - ARG 1 largeBiomes - COMMENT whether the large biomes world type is used - ARG 2 amplified - COMMENT whether the amplified world type is used + ARG 0 densityFunctionLookup + ARG 1 noiseParametersLookup + ARG 2 largeBiomes + ARG 3 amplified METHOD method_41109 of (Ljava/lang/String;)Lnet/minecraft/class_5321; ARG 0 id - METHOD method_41111 getNoiseParametersEntry (Lnet/minecraft/class_5321;)Lnet/minecraft/class_6880; - ARG 0 key - METHOD method_41112 register (Lnet/minecraft/class_2378;Lnet/minecraft/class_5321;Lnet/minecraft/class_6910;)Lnet/minecraft/class_6880; - ARG 0 registry - ARG 1 key - ARG 2 densityFunction - METHOD method_41113 createCavesSpaghettiRoughnessOverworldFunction ()Lnet/minecraft/class_6910; - METHOD method_41116 entryHolder (Lnet/minecraft/class_2378;Lnet/minecraft/class_5321;)Lnet/minecraft/class_6910; - ARG 0 registry + METHOD method_41113 createCavesSpaghettiRoughnessOverworldFunction (Lnet/minecraft/class_7871;)Lnet/minecraft/class_6910; + ARG 0 noiseParametersLookup + METHOD method_41116 entryHolder (Lnet/minecraft/class_7871;Lnet/minecraft/class_5321;)Lnet/minecraft/class_6910; + ARG 0 densityFunctionRegisterable ARG 1 key - METHOD method_41117 createCavesEntrancesOverworldFunction (Lnet/minecraft/class_2378;)Lnet/minecraft/class_6910; - ARG 0 registry - METHOD method_41118 createNetherNoiseRouter (Lnet/minecraft/class_2378;)Lnet/minecraft/class_6953; + METHOD method_41117 createCavesEntrancesOverworldFunction (Lnet/minecraft/class_7871;Lnet/minecraft/class_7871;)Lnet/minecraft/class_6910; + ARG 0 densityFunctionLookup + ARG 1 noiseParametersLookup + METHOD method_41118 createNetherNoiseRouter (Lnet/minecraft/class_7871;Lnet/minecraft/class_7871;)Lnet/minecraft/class_6953; COMMENT Creates the {@link NoiseRouter} for the nether. COMMENT COMMENT @return the created {@code NoiseRouter} - ARG 0 registry - METHOD method_41119 createCavesNoodleOverworldFunction (Lnet/minecraft/class_2378;)Lnet/minecraft/class_6910; - ARG 0 registry - METHOD method_41120 createEndNoiseRouter (Lnet/minecraft/class_2378;)Lnet/minecraft/class_6953; + ARG 0 densityFunctionLookup + ARG 1 noiseParametersLookup + METHOD method_41119 createCavesNoodleOverworldFunction (Lnet/minecraft/class_7871;Lnet/minecraft/class_7871;)Lnet/minecraft/class_6910; + ARG 0 densityFunctionLookup + ARG 1 noiseParametersLookup + METHOD method_41120 createEndNoiseRouter (Lnet/minecraft/class_7871;)Lnet/minecraft/class_6953; COMMENT Creates the {@link NoiseRouter} for The End. COMMENT COMMENT @return the created {@code NoiseRouter} - ARG 0 registry - METHOD method_41121 createCavePillarsOverworldFunction ()Lnet/minecraft/class_6910; - METHOD method_41122 createCavesSpaghetti2dOverworldFunction (Lnet/minecraft/class_2378;)Lnet/minecraft/class_6910; - ARG 0 registry + ARG 0 densityFunctionLookup + METHOD method_41121 createCavePillarsOverworldFunction (Lnet/minecraft/class_7871;)Lnet/minecraft/class_6910; + ARG 0 noiseParametersLookup + METHOD method_41122 createCavesSpaghetti2dOverworldFunction (Lnet/minecraft/class_7871;Lnet/minecraft/class_7871;)Lnet/minecraft/class_6910; + ARG 0 densityFunctionLookup + ARG 1 noiseParametersLookup METHOD method_41207 applyBlendDensity (Lnet/minecraft/class_6910;)Lnet/minecraft/class_6910; ARG 0 density - METHOD method_41211 createMultiNoiseDependentNoiseRouter (Lnet/minecraft/class_2378;Lnet/minecraft/class_6910;)Lnet/minecraft/class_6953; - ARG 0 registry - ARG 1 density + METHOD method_41211 createMultiNoiseDependentNoiseRouter (Lnet/minecraft/class_7871;Lnet/minecraft/class_7871;Lnet/minecraft/class_6910;)Lnet/minecraft/class_6953; + ARG 0 densityFunctionLookup + ARG 1 noiseParametersLookup + ARG 2 density METHOD method_41546 getPeaksValleysNoise (F)F ARG 0 weirdness METHOD method_41547 createRidgesFoldedOverworldFunction (Lnet/minecraft/class_6910;)Lnet/minecraft/class_6910; ARG 0 input - METHOD method_41548 registerSlopedCheeseFunction (Lnet/minecraft/class_2378;Lnet/minecraft/class_6910;Lnet/minecraft/class_6880;Lnet/minecraft/class_6880;Lnet/minecraft/class_5321;Lnet/minecraft/class_5321;Lnet/minecraft/class_5321;Lnet/minecraft/class_5321;Lnet/minecraft/class_5321;Z)V + METHOD method_41548 registerSlopedCheeseFunction (Lnet/minecraft/class_7891;Lnet/minecraft/class_7871;Lnet/minecraft/class_6910;Lnet/minecraft/class_6880;Lnet/minecraft/class_6880;Lnet/minecraft/class_5321;Lnet/minecraft/class_5321;Lnet/minecraft/class_5321;Lnet/minecraft/class_5321;Lnet/minecraft/class_5321;Z)V COMMENT Creates and registers the {@code sloped_cheese} density function. COMMENT This is used for the normal, large biomes and amplified world types. - ARG 0 registry - ARG 1 jaggedNoise - ARG 2 continents - ARG 3 erosion - ARG 4 offsetKey - ARG 5 factorKey - ARG 6 jaggednessKey - ARG 7 depthKey - ARG 8 slopedCheeseKey - ARG 9 amplified - METHOD method_41549 createCavesNoiseRouter (Lnet/minecraft/class_2378;)Lnet/minecraft/class_6953; + ARG 0 densityFunctionRegisterable + ARG 1 densityFunctionLookup + ARG 2 jaggedNoise + ARG 3 continents + ARG 4 erosion + ARG 5 offsetKey + ARG 6 factorKey + ARG 7 jaggednessKey + ARG 8 depthKey + ARG 9 slopedCheeseKey + ARG 10 amplified + METHOD method_41549 createCavesNoiseRouter (Lnet/minecraft/class_7871;Lnet/minecraft/class_7871;)Lnet/minecraft/class_6953; COMMENT Creates the {@link NoiseRouter} for the caves world type. COMMENT COMMENT @return the created {@code NoiseRouter} - ARG 0 registry - METHOD method_41551 registerAndGetHolder (Lnet/minecraft/class_2378;Lnet/minecraft/class_5321;Lnet/minecraft/class_6910;)Lnet/minecraft/class_6910; - ARG 0 registry + ARG 0 densityFunctionLookup + ARG 1 noiseParametersLookup + METHOD method_41550 (Lnet/minecraft/class_6955$class_6354;)I + ARG 0 veinType + METHOD method_41551 registerAndGetHolder (Lnet/minecraft/class_7891;Lnet/minecraft/class_5321;Lnet/minecraft/class_6910;)Lnet/minecraft/class_6910; + ARG 0 densityFunctionRegisterable ARG 1 key ARG 2 densityFunction - METHOD method_41552 createFloatingIslandsNoiseRouter (Lnet/minecraft/class_2378;)Lnet/minecraft/class_6953; + METHOD method_41552 createFloatingIslandsNoiseRouter (Lnet/minecraft/class_7871;Lnet/minecraft/class_7871;)Lnet/minecraft/class_6953; COMMENT Creates the {@link NoiseRouter} for the floating islands world type. COMMENT COMMENT @return the created {@code NoiseRouter} - ARG 0 registry - METHOD method_42363 applyCavesSlides (Lnet/minecraft/class_2378;II)Lnet/minecraft/class_6910; + ARG 0 densityFunctionLookup + ARG 1 noiseParametersLookup + METHOD method_41553 (Lnet/minecraft/class_6955$class_6354;)I + ARG 0 veinType + METHOD method_42363 applyCavesSlides (Lnet/minecraft/class_7871;II)Lnet/minecraft/class_6910; COMMENT Applies the slides for the nether and the caves world type. COMMENT COMMENT @return the created density function - ARG 0 registry + ARG 0 densityFunctionLookup ARG 1 minY COMMENT the minimum block Y coordinate of the world ARG 2 maxY diff --git a/mappings/net/minecraft/world/gen/feature/BlockColumnFeature.mapping b/mappings/net/minecraft/world/gen/feature/BlockColumnFeature.mapping index 05617b282b..bf07e01421 100644 --- a/mappings/net/minecraft/world/gen/feature/BlockColumnFeature.mapping +++ b/mappings/net/minecraft/world/gen/feature/BlockColumnFeature.mapping @@ -1 +1,6 @@ CLASS net/minecraft/class_6654 net/minecraft/world/gen/feature/BlockColumnFeature + METHOD method_38906 adjustLayerHeights ([IIIZ)V + ARG 0 layerHeights + ARG 1 expectedHeight + ARG 2 actualHeight + ARG 3 prioritizeTip diff --git a/mappings/net/minecraft/world/gen/feature/ConfiguredFeatures.mapping b/mappings/net/minecraft/world/gen/feature/ConfiguredFeatures.mapping index c81f97c224..c36c27a579 100644 --- a/mappings/net/minecraft/world/gen/feature/ConfiguredFeatures.mapping +++ b/mappings/net/minecraft/world/gen/feature/ConfiguredFeatures.mapping @@ -1,5 +1,6 @@ CLASS net/minecraft/class_6803 net/minecraft/world/gen/feature/ConfiguredFeatures - METHOD method_39702 getDefaultConfiguredFeature (Lnet/minecraft/class_2378;)Lnet/minecraft/class_6880; + METHOD method_39702 bootstrap (Lnet/minecraft/class_7891;)V + ARG 0 featureRegisterable METHOD method_39703 createRandomPatchFeatureConfig (ILnet/minecraft/class_6880;)Lnet/minecraft/class_4638; ARG 0 tries ARG 1 feature @@ -15,12 +16,16 @@ CLASS net/minecraft/class_6803 net/minecraft/world/gen/feature/ConfiguredFeature ARG 1 config ARG 2 predicateBlocks ARG 3 tries - METHOD method_39708 register (Ljava/lang/String;Lnet/minecraft/class_3031;Lnet/minecraft/class_3037;)Lnet/minecraft/class_6880; - ARG 0 id - ARG 1 feature - ARG 2 config + METHOD method_39708 register (Lnet/minecraft/class_7891;Lnet/minecraft/class_5321;Lnet/minecraft/class_3031;Lnet/minecraft/class_3037;)V + ARG 0 registerable + ARG 1 key + ARG 2 feature + ARG 3 config METHOD method_39709 createBlockPredicate (Ljava/util/List;)Lnet/minecraft/class_6646; ARG 0 validGround - METHOD method_40364 register (Ljava/lang/String;Lnet/minecraft/class_3031;)Lnet/minecraft/class_6880; + METHOD method_40364 register (Lnet/minecraft/class_7891;Lnet/minecraft/class_5321;Lnet/minecraft/class_3031;)V + ARG 0 registerable + ARG 1 key + ARG 2 feature + METHOD method_46852 of (Ljava/lang/String;)Lnet/minecraft/class_5321; ARG 0 id - ARG 1 feature diff --git a/mappings/net/minecraft/world/gen/feature/DefaultBiomeFeatures.mapping b/mappings/net/minecraft/world/gen/feature/DefaultBiomeFeatures.mapping index 0a58ba9abf..a8e11a7f38 100644 --- a/mappings/net/minecraft/world/gen/feature/DefaultBiomeFeatures.mapping +++ b/mappings/net/minecraft/world/gen/feature/DefaultBiomeFeatures.mapping @@ -185,3 +185,5 @@ CLASS net/minecraft/class_3864 net/minecraft/world/gen/feature/DefaultBiomeFeatu ARG 0 builder METHOD method_43231 addGrassAndClayDisks (Lnet/minecraft/class_5485$class_5495;)V ARG 0 builder + METHOD method_49390 addCherryGroveFeatures (Lnet/minecraft/class_5485$class_5495;)V + ARG 0 builder diff --git a/mappings/net/minecraft/world/gen/feature/DesertWellFeature.mapping b/mappings/net/minecraft/world/gen/feature/DesertWellFeature.mapping index 1a20b180a9..c54bd702f1 100644 --- a/mappings/net/minecraft/world/gen/feature/DesertWellFeature.mapping +++ b/mappings/net/minecraft/world/gen/feature/DesertWellFeature.mapping @@ -3,3 +3,9 @@ CLASS net/minecraft/class_3005 net/minecraft/world/gen/feature/DesertWellFeature FIELD field_13450 CAN_GENERATE Lnet/minecraft/class_2715; FIELD field_13451 wall Lnet/minecraft/class_2680; FIELD field_13452 slab Lnet/minecraft/class_2680; + FIELD field_43324 sand Lnet/minecraft/class_2680; + METHOD method_49235 (Lnet/minecraft/class_2338;Lnet/minecraft/class_8174;)V + ARG 1 blockEntity + METHOD method_49883 generateSuspiciousSand (Lnet/minecraft/class_5281;Lnet/minecraft/class_2338;)V + ARG 0 world + ARG 1 pos diff --git a/mappings/net/minecraft/world/gen/feature/EndConfiguredFeatures.mapping b/mappings/net/minecraft/world/gen/feature/EndConfiguredFeatures.mapping index 35cd8a71e6..c4341b2b4f 100644 --- a/mappings/net/minecraft/world/gen/feature/EndConfiguredFeatures.mapping +++ b/mappings/net/minecraft/world/gen/feature/EndConfiguredFeatures.mapping @@ -1,6 +1,8 @@ CLASS net/minecraft/class_6802 net/minecraft/world/gen/feature/EndConfiguredFeatures - FIELD field_35795 END_SPIKE Lnet/minecraft/class_6880; - FIELD field_35796 END_GATEWAY_RETURN Lnet/minecraft/class_6880; - FIELD field_35797 END_GATEWAY_DELAYED Lnet/minecraft/class_6880; - FIELD field_35798 CHORUS_PLANT Lnet/minecraft/class_6880; - FIELD field_35799 END_ISLAND Lnet/minecraft/class_6880; + FIELD field_35795 END_SPIKE Lnet/minecraft/class_5321; + FIELD field_35796 END_GATEWAY_RETURN Lnet/minecraft/class_5321; + FIELD field_35797 END_GATEWAY_DELAYED Lnet/minecraft/class_5321; + FIELD field_35798 CHORUS_PLANT Lnet/minecraft/class_5321; + FIELD field_35799 END_ISLAND Lnet/minecraft/class_5321; + METHOD method_46851 bootstrap (Lnet/minecraft/class_7891;)V + ARG 0 featureRegisterable diff --git a/mappings/net/minecraft/world/gen/feature/EndPlacedFeatures.mapping b/mappings/net/minecraft/world/gen/feature/EndPlacedFeatures.mapping index 451bc737b1..098011a3fe 100644 --- a/mappings/net/minecraft/world/gen/feature/EndPlacedFeatures.mapping +++ b/mappings/net/minecraft/world/gen/feature/EndPlacedFeatures.mapping @@ -1,5 +1,7 @@ CLASS net/minecraft/class_6813 net/minecraft/world/gen/feature/EndPlacedFeatures - FIELD field_35997 END_SPIKE Lnet/minecraft/class_6880; - FIELD field_35998 END_GATEWAY_RETURN Lnet/minecraft/class_6880; - FIELD field_35999 CHORUS_PLANT Lnet/minecraft/class_6880; - FIELD field_36000 END_ISLAND_DECORATED Lnet/minecraft/class_6880; + FIELD field_35997 END_SPIKE Lnet/minecraft/class_5321; + FIELD field_35998 END_GATEWAY_RETURN Lnet/minecraft/class_5321; + FIELD field_35999 CHORUS_PLANT Lnet/minecraft/class_5321; + FIELD field_36000 END_ISLAND_DECORATED Lnet/minecraft/class_5321; + METHOD method_46861 bootstrap (Lnet/minecraft/class_7891;)V + ARG 0 featureRegisterable diff --git a/mappings/net/minecraft/world/gen/feature/EndPortalFeature.mapping b/mappings/net/minecraft/world/gen/feature/EndPortalFeature.mapping index 7157feed57..118c03eea4 100644 --- a/mappings/net/minecraft/world/gen/feature/EndPortalFeature.mapping +++ b/mappings/net/minecraft/world/gen/feature/EndPortalFeature.mapping @@ -3,3 +3,5 @@ CLASS net/minecraft/class_3033 net/minecraft/world/gen/feature/EndPortalFeature FIELD field_13600 ORIGIN Lnet/minecraft/class_2338; METHOD (Z)V ARG 1 open + METHOD method_51862 offsetOrigin (Lnet/minecraft/class_2338;)Lnet/minecraft/class_2338; + ARG 0 pos diff --git a/mappings/net/minecraft/world/gen/feature/EndSpikeFeature.mapping b/mappings/net/minecraft/world/gen/feature/EndSpikeFeature.mapping index e2f97dae6b..74c171c550 100644 --- a/mappings/net/minecraft/world/gen/feature/EndSpikeFeature.mapping +++ b/mappings/net/minecraft/world/gen/feature/EndSpikeFeature.mapping @@ -1,5 +1,7 @@ CLASS net/minecraft/class_3310 net/minecraft/world/gen/feature/EndSpikeFeature FIELD field_14309 CACHE Lcom/google/common/cache/LoadingCache; + FIELD field_31516 COUNT I + FIELD field_31517 DISTANCE_FROM_ORIGIN I METHOD method_14506 getSpikes (Lnet/minecraft/class_5281;)Ljava/util/List; ARG 0 world METHOD method_15888 generateSpike (Lnet/minecraft/class_5425;Lnet/minecraft/class_5819;Lnet/minecraft/class_3666;Lnet/minecraft/class_3310$class_3181;)V diff --git a/mappings/net/minecraft/world/gen/feature/HugeFungusFeature.mapping b/mappings/net/minecraft/world/gen/feature/HugeFungusFeature.mapping index a7cc94354f..0a3c1b2378 100644 --- a/mappings/net/minecraft/world/gen/feature/HugeFungusFeature.mapping +++ b/mappings/net/minecraft/world/gen/feature/HugeFungusFeature.mapping @@ -7,7 +7,7 @@ CLASS net/minecraft/class_4781 net/minecraft/world/gen/feature/HugeFungusFeature ARG 5 decorationChance ARG 6 generationChance ARG 7 vineChance - METHOD method_24440 generateStem (Lnet/minecraft/class_1936;Lnet/minecraft/class_5819;Lnet/minecraft/class_4780;Lnet/minecraft/class_2338;IZ)V + METHOD method_24440 generateStem (Lnet/minecraft/class_5281;Lnet/minecraft/class_5819;Lnet/minecraft/class_4780;Lnet/minecraft/class_2338;IZ)V ARG 1 world ARG 2 random ARG 3 config @@ -24,16 +24,15 @@ CLASS net/minecraft/class_4781 net/minecraft/world/gen/feature/HugeFungusFeature ARG 0 pos ARG 1 world ARG 2 random - METHOD method_24443 generateHat (Lnet/minecraft/class_1936;Lnet/minecraft/class_5819;Lnet/minecraft/class_4780;Lnet/minecraft/class_2338;IZ)V + METHOD method_24443 generateHat (Lnet/minecraft/class_5281;Lnet/minecraft/class_5819;Lnet/minecraft/class_4780;Lnet/minecraft/class_2338;IZ)V ARG 1 world ARG 2 random ARG 3 config ARG 4 pos ARG 5 hatHeight ARG 6 thickStem - METHOD method_24866 isReplaceable (Lnet/minecraft/class_1936;Lnet/minecraft/class_2338;Z)Z + METHOD method_24866 isReplaceable (Lnet/minecraft/class_5281;Lnet/minecraft/class_2338;Lnet/minecraft/class_4780;Z)Z ARG 0 world ARG 1 pos - ARG 2 replacePlants - METHOD method_29297 (ZLnet/minecraft/class_2680;)Z - ARG 1 state + ARG 2 config + ARG 3 checkConfig diff --git a/mappings/net/minecraft/world/gen/feature/HugeFungusFeatureConfig.mapping b/mappings/net/minecraft/world/gen/feature/HugeFungusFeatureConfig.mapping index dfaf91b91a..8b0c1ed160 100644 --- a/mappings/net/minecraft/world/gen/feature/HugeFungusFeatureConfig.mapping +++ b/mappings/net/minecraft/world/gen/feature/HugeFungusFeatureConfig.mapping @@ -5,12 +5,14 @@ CLASS net/minecraft/class_4780 net/minecraft/world/gen/feature/HugeFungusFeature FIELD field_22194 planted Z FIELD field_22435 validBaseBlock Lnet/minecraft/class_2680; FIELD field_24838 CODEC Lcom/mojang/serialization/Codec; - METHOD (Lnet/minecraft/class_2680;Lnet/minecraft/class_2680;Lnet/minecraft/class_2680;Lnet/minecraft/class_2680;Z)V + FIELD field_44709 replaceableBlocks Lnet/minecraft/class_6646; + METHOD (Lnet/minecraft/class_2680;Lnet/minecraft/class_2680;Lnet/minecraft/class_2680;Lnet/minecraft/class_2680;Lnet/minecraft/class_6646;Z)V ARG 1 validBaseBlock ARG 2 stemState ARG 3 hatState ARG 4 decorationState - ARG 5 planted + ARG 5 replaceableBlocks + ARG 6 planted METHOD method_28630 (Lnet/minecraft/class_4780;)Ljava/lang/Boolean; ARG 0 config METHOD method_28631 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; @@ -23,3 +25,5 @@ CLASS net/minecraft/class_4780 net/minecraft/world/gen/feature/HugeFungusFeature ARG 0 config METHOD method_28635 (Lnet/minecraft/class_4780;)Lnet/minecraft/class_2680; ARG 0 config + METHOD method_51528 (Lnet/minecraft/class_4780;)Lnet/minecraft/class_6646; + ARG 0 config diff --git a/mappings/net/minecraft/world/gen/feature/IcebergFeature.mapping b/mappings/net/minecraft/world/gen/feature/IcebergFeature.mapping index c9ed8cec33..36f3db5045 100644 --- a/mappings/net/minecraft/world/gen/feature/IcebergFeature.mapping +++ b/mappings/net/minecraft/world/gen/feature/IcebergFeature.mapping @@ -20,6 +20,7 @@ CLASS net/minecraft/class_3074 net/minecraft/world/gen/feature/IcebergFeature ARG 2 pos ARG 4 height METHOD method_13419 (Lnet/minecraft/class_5819;III)I + ARG 1 random ARG 2 y ARG 3 height ARG 4 factor @@ -29,6 +30,7 @@ CLASS net/minecraft/class_3074 net/minecraft/world/gen/feature/IcebergFeature ARG 1 x ARG 2 z ARG 3 pos + ARG 5 random METHOD method_13422 clearSnowAbove (Lnet/minecraft/class_1936;Lnet/minecraft/class_2338;)V ARG 1 world ARG 2 pos @@ -42,6 +44,7 @@ CLASS net/minecraft/class_3074 net/minecraft/world/gen/feature/IcebergFeature METHOD method_13425 placeBlockOrSnow (Lnet/minecraft/class_2338;Lnet/minecraft/class_1936;Lnet/minecraft/class_5819;IIZZLnet/minecraft/class_2680;)V ARG 1 pos ARG 2 world + ARG 3 random ARG 4 heightRemaining ARG 5 height ARG 6 lessSnow @@ -49,6 +52,7 @@ CLASS net/minecraft/class_3074 net/minecraft/world/gen/feature/IcebergFeature ARG 8 state METHOD method_13426 placeAt (Lnet/minecraft/class_1936;Lnet/minecraft/class_5819;Lnet/minecraft/class_2338;IIIIIIZIDZLnet/minecraft/class_2680;)V ARG 1 world + ARG 2 random ARG 3 pos ARG 4 height ARG 5 offsetX @@ -58,9 +62,11 @@ CLASS net/minecraft/class_3074 net/minecraft/world/gen/feature/IcebergFeature ARG 14 placeSnow ARG 15 state METHOD method_13427 (Lnet/minecraft/class_5819;III)I + ARG 1 random ARG 2 y ARG 3 height ARG 4 factor METHOD method_13428 (Lnet/minecraft/class_5819;Lnet/minecraft/class_1936;IILnet/minecraft/class_2338;ZIDI)V + ARG 1 random ARG 2 world ARG 5 pos diff --git a/mappings/net/minecraft/world/gen/feature/LargeDripstoneFeature.mapping b/mappings/net/minecraft/world/gen/feature/LargeDripstoneFeature.mapping index 9034945da3..a1f3fe4bcf 100644 --- a/mappings/net/minecraft/world/gen/feature/LargeDripstoneFeature.mapping +++ b/mappings/net/minecraft/world/gen/feature/LargeDripstoneFeature.mapping @@ -40,6 +40,7 @@ CLASS net/minecraft/class_5727 net/minecraft/world/gen/feature/LargeDripstoneFea FIELD field_28212 wind Lnet/minecraft/class_243; METHOD (ILnet/minecraft/class_5819;Lnet/minecraft/class_5863;)V ARG 1 y + ARG 2 random ARG 3 wind METHOD method_33031 modify (Lnet/minecraft/class_2338;)Lnet/minecraft/class_2338; ARG 1 pos diff --git a/mappings/net/minecraft/world/gen/feature/MiscConfiguredFeatures.mapping b/mappings/net/minecraft/world/gen/feature/MiscConfiguredFeatures.mapping index e9e118325b..dd29c015a8 100644 --- a/mappings/net/minecraft/world/gen/feature/MiscConfiguredFeatures.mapping +++ b/mappings/net/minecraft/world/gen/feature/MiscConfiguredFeatures.mapping @@ -1,19 +1,21 @@ CLASS net/minecraft/class_6804 net/minecraft/world/gen/feature/MiscConfiguredFeatures - FIELD field_35800 ICE_SPIKE Lnet/minecraft/class_6880; - FIELD field_35801 ICE_PATCH Lnet/minecraft/class_6880; - FIELD field_35802 FOREST_ROCK Lnet/minecraft/class_6880; - FIELD field_35803 ICEBERG_PACKED Lnet/minecraft/class_6880; - FIELD field_35804 ICEBERG_BLUE Lnet/minecraft/class_6880; - FIELD field_35805 BLUE_ICE Lnet/minecraft/class_6880; - FIELD field_35806 LAKE_LAVA Lnet/minecraft/class_6880; - FIELD field_35807 DISK_CLAY Lnet/minecraft/class_6880; - FIELD field_35808 DISK_GRAVEL Lnet/minecraft/class_6880; - FIELD field_35809 DISK_SAND Lnet/minecraft/class_6880; - FIELD field_35810 FREEZE_TOP_LAYER Lnet/minecraft/class_6880; - FIELD field_35811 BONUS_CHEST Lnet/minecraft/class_6880; - FIELD field_35812 VOID_START_PLATFORM Lnet/minecraft/class_6880; - FIELD field_35813 DESERT_WELL Lnet/minecraft/class_6880; - FIELD field_35814 SPRING_LAVA_OVERWORLD Lnet/minecraft/class_6880; - FIELD field_35815 SPRING_LAVA_FROZEN Lnet/minecraft/class_6880; - FIELD field_35816 SPRING_WATER Lnet/minecraft/class_6880; - FIELD field_38809 DISK_GRASS Lnet/minecraft/class_6880; + FIELD field_35800 ICE_SPIKE Lnet/minecraft/class_5321; + FIELD field_35801 ICE_PATCH Lnet/minecraft/class_5321; + FIELD field_35802 FOREST_ROCK Lnet/minecraft/class_5321; + FIELD field_35803 ICEBERG_PACKED Lnet/minecraft/class_5321; + FIELD field_35804 ICEBERG_BLUE Lnet/minecraft/class_5321; + FIELD field_35805 BLUE_ICE Lnet/minecraft/class_5321; + FIELD field_35806 LAKE_LAVA Lnet/minecraft/class_5321; + FIELD field_35807 DISK_CLAY Lnet/minecraft/class_5321; + FIELD field_35808 DISK_GRAVEL Lnet/minecraft/class_5321; + FIELD field_35809 DISK_SAND Lnet/minecraft/class_5321; + FIELD field_35810 FREEZE_TOP_LAYER Lnet/minecraft/class_5321; + FIELD field_35811 BONUS_CHEST Lnet/minecraft/class_5321; + FIELD field_35812 VOID_START_PLATFORM Lnet/minecraft/class_5321; + FIELD field_35813 DESERT_WELL Lnet/minecraft/class_5321; + FIELD field_35814 SPRING_LAVA_OVERWORLD Lnet/minecraft/class_5321; + FIELD field_35815 SPRING_LAVA_FROZEN Lnet/minecraft/class_5321; + FIELD field_35816 SPRING_WATER Lnet/minecraft/class_5321; + FIELD field_38809 DISK_GRASS Lnet/minecraft/class_5321; + METHOD method_46853 bootstrap (Lnet/minecraft/class_7891;)V + ARG 0 featureRegisterable diff --git a/mappings/net/minecraft/world/gen/feature/MiscPlacedFeatures.mapping b/mappings/net/minecraft/world/gen/feature/MiscPlacedFeatures.mapping index 7fc1d0ec68..87ee3ab4fa 100644 --- a/mappings/net/minecraft/world/gen/feature/MiscPlacedFeatures.mapping +++ b/mappings/net/minecraft/world/gen/feature/MiscPlacedFeatures.mapping @@ -1,19 +1,21 @@ CLASS net/minecraft/class_6814 net/minecraft/world/gen/feature/MiscPlacedFeatures - FIELD field_36001 ICE_SPIKE Lnet/minecraft/class_6880; - FIELD field_36002 ICE_PATCH Lnet/minecraft/class_6880; - FIELD field_36003 FOREST_ROCK Lnet/minecraft/class_6880; - FIELD field_36004 ICEBERG_PACKED Lnet/minecraft/class_6880; - FIELD field_36005 ICEBERG_BLUE Lnet/minecraft/class_6880; - FIELD field_36006 BLUE_ICE Lnet/minecraft/class_6880; - FIELD field_36007 LAKE_LAVA_UNDERGROUND Lnet/minecraft/class_6880; - FIELD field_36008 LAKE_LAVA_SURFACE Lnet/minecraft/class_6880; - FIELD field_36009 DISK_CLAY Lnet/minecraft/class_6880; - FIELD field_36010 DISK_GRAVEL Lnet/minecraft/class_6880; - FIELD field_36011 DISK_SAND Lnet/minecraft/class_6880; - FIELD field_36012 FREEZE_TOP_LAYER Lnet/minecraft/class_6880; - FIELD field_36013 VOID_START_PLATFORM Lnet/minecraft/class_6880; - FIELD field_36014 DESERT_WELL Lnet/minecraft/class_6880; - FIELD field_36015 SPRING_LAVA Lnet/minecraft/class_6880; - FIELD field_36016 SPRING_LAVA_FROZEN Lnet/minecraft/class_6880; - FIELD field_36017 SPRING_WATER Lnet/minecraft/class_6880; - FIELD field_38813 DISK_GRASS Lnet/minecraft/class_6880; + FIELD field_36001 ICE_SPIKE Lnet/minecraft/class_5321; + FIELD field_36002 ICE_PATCH Lnet/minecraft/class_5321; + FIELD field_36003 FOREST_ROCK Lnet/minecraft/class_5321; + FIELD field_36004 ICEBERG_PACKED Lnet/minecraft/class_5321; + FIELD field_36005 ICEBERG_BLUE Lnet/minecraft/class_5321; + FIELD field_36006 BLUE_ICE Lnet/minecraft/class_5321; + FIELD field_36007 LAKE_LAVA_UNDERGROUND Lnet/minecraft/class_5321; + FIELD field_36008 LAKE_LAVA_SURFACE Lnet/minecraft/class_5321; + FIELD field_36009 DISK_CLAY Lnet/minecraft/class_5321; + FIELD field_36010 DISK_GRAVEL Lnet/minecraft/class_5321; + FIELD field_36011 DISK_SAND Lnet/minecraft/class_5321; + FIELD field_36012 FREEZE_TOP_LAYER Lnet/minecraft/class_5321; + FIELD field_36013 VOID_START_PLATFORM Lnet/minecraft/class_5321; + FIELD field_36014 DESERT_WELL Lnet/minecraft/class_5321; + FIELD field_36015 SPRING_LAVA Lnet/minecraft/class_5321; + FIELD field_36016 SPRING_LAVA_FROZEN Lnet/minecraft/class_5321; + FIELD field_36017 SPRING_WATER Lnet/minecraft/class_5321; + FIELD field_38813 DISK_GRASS Lnet/minecraft/class_5321; + METHOD method_46862 bootstrap (Lnet/minecraft/class_7891;)V + ARG 0 featureRegisterable diff --git a/mappings/net/minecraft/world/gen/feature/NetherConfiguredFeatures.mapping b/mappings/net/minecraft/world/gen/feature/NetherConfiguredFeatures.mapping index a071579aaa..94975453bd 100644 --- a/mappings/net/minecraft/world/gen/feature/NetherConfiguredFeatures.mapping +++ b/mappings/net/minecraft/world/gen/feature/NetherConfiguredFeatures.mapping @@ -1,25 +1,25 @@ CLASS net/minecraft/class_6805 net/minecraft/world/gen/feature/NetherConfiguredFeatures - FIELD field_35817 DELTA Lnet/minecraft/class_6880; - FIELD field_35818 SMALL_BASALT_COLUMNS Lnet/minecraft/class_6880; - FIELD field_35819 SMALL_BASALT_COLUMNS_TEMP Lnet/minecraft/class_6880; - FIELD field_35820 BASALT_BLOBS Lnet/minecraft/class_6880; - FIELD field_35821 BLACKSTONE_BLOBS Lnet/minecraft/class_6880; - FIELD field_35822 GLOWSTONE_EXTRA Lnet/minecraft/class_6880; - FIELD field_35823 CRIMSON_FOREST_VEGETATION_PROVIDER Lnet/minecraft/class_4657; - FIELD field_35824 CRIMSON_FOREST_VEGETATION Lnet/minecraft/class_6880; - FIELD field_35825 CRIMSON_FOREST_VEGETATION_BONEMEAL Lnet/minecraft/class_6880; - FIELD field_35826 WARPED_FOREST_VEGETATION_PROVIDER Lnet/minecraft/class_4657; - FIELD field_35827 WARPED_FOREST_VEGETATION Lnet/minecraft/class_6880; - FIELD field_35828 WARPED_FOREST_VEGETATION_BONEMEAL Lnet/minecraft/class_6880; - FIELD field_35829 NETHER_SPROUTS Lnet/minecraft/class_6880; - FIELD field_35830 NETHER_SPROUTS_BONEMEAL Lnet/minecraft/class_6880; - FIELD field_35831 TWISTING_VINES Lnet/minecraft/class_6880; - FIELD field_35832 TWISTING_VINES_BONEMEAL Lnet/minecraft/class_6880; - FIELD field_35833 WEEPING_VINES Lnet/minecraft/class_6880; - FIELD field_35834 PATCH_CRIMSON_ROOTS Lnet/minecraft/class_6880; - FIELD field_35835 BASALT_PILLAR Lnet/minecraft/class_6880; - FIELD field_35836 SPRING_LAVA_NETHER Lnet/minecraft/class_6880; - FIELD field_35837 SPRING_NETHER_CLOSED Lnet/minecraft/class_6880; - FIELD field_35838 SPRING_NETHER_OPEN Lnet/minecraft/class_6880; - FIELD field_35839 PATCH_FIRE Lnet/minecraft/class_6880; - FIELD field_35840 PATCH_SOUL_FIRE Lnet/minecraft/class_6880; + FIELD field_35817 DELTA Lnet/minecraft/class_5321; + FIELD field_35818 SMALL_BASALT_COLUMNS Lnet/minecraft/class_5321; + FIELD field_35819 SMALL_BASALT_COLUMNS_TEMP Lnet/minecraft/class_5321; + FIELD field_35820 BASALT_BLOBS Lnet/minecraft/class_5321; + FIELD field_35821 BLACKSTONE_BLOBS Lnet/minecraft/class_5321; + FIELD field_35822 GLOWSTONE_EXTRA Lnet/minecraft/class_5321; + FIELD field_35824 CRIMSON_FOREST_VEGETATION Lnet/minecraft/class_5321; + FIELD field_35825 CRIMSON_FOREST_VEGETATION_BONEMEAL Lnet/minecraft/class_5321; + FIELD field_35827 WARPED_FOREST_VEGETATION Lnet/minecraft/class_5321; + FIELD field_35828 WARPED_FOREST_VEGETATION_BONEMEAL Lnet/minecraft/class_5321; + FIELD field_35829 NETHER_SPROUTS Lnet/minecraft/class_5321; + FIELD field_35830 NETHER_SPROUTS_BONEMEAL Lnet/minecraft/class_5321; + FIELD field_35831 TWISTING_VINES Lnet/minecraft/class_5321; + FIELD field_35832 TWISTING_VINES_BONEMEAL Lnet/minecraft/class_5321; + FIELD field_35833 WEEPING_VINES Lnet/minecraft/class_5321; + FIELD field_35834 PATCH_CRIMSON_ROOTS Lnet/minecraft/class_5321; + FIELD field_35835 BASALT_PILLAR Lnet/minecraft/class_5321; + FIELD field_35836 SPRING_LAVA_NETHER Lnet/minecraft/class_5321; + FIELD field_35837 SPRING_NETHER_CLOSED Lnet/minecraft/class_5321; + FIELD field_35838 SPRING_NETHER_OPEN Lnet/minecraft/class_5321; + FIELD field_35839 PATCH_FIRE Lnet/minecraft/class_5321; + FIELD field_35840 PATCH_SOUL_FIRE Lnet/minecraft/class_5321; + METHOD method_46854 bootstrap (Lnet/minecraft/class_7891;)V + ARG 0 featureRegisterable diff --git a/mappings/net/minecraft/world/gen/feature/NetherPlacedFeatures.mapping b/mappings/net/minecraft/world/gen/feature/NetherPlacedFeatures.mapping index 2c217d24cd..0096a05f7f 100644 --- a/mappings/net/minecraft/world/gen/feature/NetherPlacedFeatures.mapping +++ b/mappings/net/minecraft/world/gen/feature/NetherPlacedFeatures.mapping @@ -1,22 +1,23 @@ CLASS net/minecraft/class_6815 net/minecraft/world/gen/feature/NetherPlacedFeatures - FIELD field_36018 DELTA Lnet/minecraft/class_6880; - FIELD field_36019 SMALL_BASALT_COLUMNS Lnet/minecraft/class_6880; - FIELD field_36020 LARGE_BASALT_COLUMNS Lnet/minecraft/class_6880; - FIELD field_36021 BASALT_BLOBS Lnet/minecraft/class_6880; - FIELD field_36022 BLACKSTONE_BLOBS Lnet/minecraft/class_6880; - FIELD field_36023 GLOWSTONE_EXTRA Lnet/minecraft/class_6880; - FIELD field_36024 GLOWSTONE Lnet/minecraft/class_6880; - FIELD field_36025 CRIMSON_FOREST_VEGETATION Lnet/minecraft/class_6880; - FIELD field_36026 WARPED_FOREST_VEGETATION Lnet/minecraft/class_6880; - FIELD field_36027 NETHER_SPROUTS Lnet/minecraft/class_6880; - FIELD field_36028 TWISTING_VINES Lnet/minecraft/class_6880; - FIELD field_36029 WEEPING_VINES Lnet/minecraft/class_6880; - FIELD field_36030 PATCH_CRIMSON_ROOTS Lnet/minecraft/class_6880; - FIELD field_36031 BASALT_PILLAR Lnet/minecraft/class_6880; - FIELD field_36032 SPRING_DELTA Lnet/minecraft/class_6880; - FIELD field_36033 SPRING_CLOSED Lnet/minecraft/class_6880; - FIELD field_36034 SPRING_CLOSED_DOUBLE Lnet/minecraft/class_6880; - FIELD field_36035 SPRING_OPEN Lnet/minecraft/class_6880; - FIELD field_36036 FIRE_MODIFIERS Ljava/util/List; - FIELD field_36037 PATCH_SOUL_FIRE Lnet/minecraft/class_6880; - FIELD field_36038 PATCH_FIRE Lnet/minecraft/class_6880; + FIELD field_36018 DELTA Lnet/minecraft/class_5321; + FIELD field_36019 SMALL_BASALT_COLUMNS Lnet/minecraft/class_5321; + FIELD field_36020 LARGE_BASALT_COLUMNS Lnet/minecraft/class_5321; + FIELD field_36021 BASALT_BLOBS Lnet/minecraft/class_5321; + FIELD field_36022 BLACKSTONE_BLOBS Lnet/minecraft/class_5321; + FIELD field_36023 GLOWSTONE_EXTRA Lnet/minecraft/class_5321; + FIELD field_36024 GLOWSTONE Lnet/minecraft/class_5321; + FIELD field_36025 CRIMSON_FOREST_VEGETATION Lnet/minecraft/class_5321; + FIELD field_36026 WARPED_FOREST_VEGETATION Lnet/minecraft/class_5321; + FIELD field_36027 NETHER_SPROUTS Lnet/minecraft/class_5321; + FIELD field_36028 TWISTING_VINES Lnet/minecraft/class_5321; + FIELD field_36029 WEEPING_VINES Lnet/minecraft/class_5321; + FIELD field_36030 PATCH_CRIMSON_ROOTS Lnet/minecraft/class_5321; + FIELD field_36031 BASALT_PILLAR Lnet/minecraft/class_5321; + FIELD field_36032 SPRING_DELTA Lnet/minecraft/class_5321; + FIELD field_36033 SPRING_CLOSED Lnet/minecraft/class_5321; + FIELD field_36034 SPRING_CLOSED_DOUBLE Lnet/minecraft/class_5321; + FIELD field_36035 SPRING_OPEN Lnet/minecraft/class_5321; + FIELD field_36037 PATCH_SOUL_FIRE Lnet/minecraft/class_5321; + FIELD field_36038 PATCH_FIRE Lnet/minecraft/class_5321; + METHOD method_46863 bootstrap (Lnet/minecraft/class_7891;)V + ARG 0 featureRegisterable diff --git a/mappings/net/minecraft/world/gen/feature/OceanConfiguredFeatures.mapping b/mappings/net/minecraft/world/gen/feature/OceanConfiguredFeatures.mapping index b0431d2a66..5296867854 100644 --- a/mappings/net/minecraft/world/gen/feature/OceanConfiguredFeatures.mapping +++ b/mappings/net/minecraft/world/gen/feature/OceanConfiguredFeatures.mapping @@ -1,9 +1,11 @@ CLASS net/minecraft/class_6800 net/minecraft/world/gen/feature/OceanConfiguredFeatures - FIELD field_35762 SEAGRASS_SHORT Lnet/minecraft/class_6880; - FIELD field_35763 SEAGRASS_SLIGHTLY_LESS_SHORT Lnet/minecraft/class_6880; - FIELD field_35764 SEAGRASS_MID Lnet/minecraft/class_6880; - FIELD field_35765 SEAGRASS_TALL Lnet/minecraft/class_6880; - FIELD field_35766 SEA_PICKLE Lnet/minecraft/class_6880; - FIELD field_35767 SEAGRASS_SIMPLE Lnet/minecraft/class_6880; - FIELD field_35768 KELP Lnet/minecraft/class_6880; - FIELD field_35769 WARM_OCEAN_VEGETATION Lnet/minecraft/class_6880; + FIELD field_35762 SEAGRASS_SHORT Lnet/minecraft/class_5321; + FIELD field_35763 SEAGRASS_SLIGHTLY_LESS_SHORT Lnet/minecraft/class_5321; + FIELD field_35764 SEAGRASS_MID Lnet/minecraft/class_5321; + FIELD field_35765 SEAGRASS_TALL Lnet/minecraft/class_5321; + FIELD field_35766 SEA_PICKLE Lnet/minecraft/class_5321; + FIELD field_35767 SEAGRASS_SIMPLE Lnet/minecraft/class_5321; + FIELD field_35768 KELP Lnet/minecraft/class_5321; + FIELD field_35769 WARM_OCEAN_VEGETATION Lnet/minecraft/class_5321; + METHOD method_46849 bootstrap (Lnet/minecraft/class_7891;)V + ARG 0 featureRegisterable diff --git a/mappings/net/minecraft/world/gen/feature/OceanPlacedFeatures.mapping b/mappings/net/minecraft/world/gen/feature/OceanPlacedFeatures.mapping index b20d7ef75c..de0ddbf031 100644 --- a/mappings/net/minecraft/world/gen/feature/OceanPlacedFeatures.mapping +++ b/mappings/net/minecraft/world/gen/feature/OceanPlacedFeatures.mapping @@ -1,16 +1,18 @@ CLASS net/minecraft/class_6811 net/minecraft/world/gen/feature/OceanPlacedFeatures - FIELD field_35967 SEAGRASS_WARM Lnet/minecraft/class_6880; - FIELD field_35968 SEAGRASS_NORMAL Lnet/minecraft/class_6880; - FIELD field_35969 SEAGRASS_COLD Lnet/minecraft/class_6880; - FIELD field_35970 SEAGRASS_RIVER Lnet/minecraft/class_6880; - FIELD field_35971 SEAGRASS_SWAMP Lnet/minecraft/class_6880; - FIELD field_35972 SEAGRASS_DEEP_WARM Lnet/minecraft/class_6880; - FIELD field_35973 SEAGRASS_DEEP Lnet/minecraft/class_6880; - FIELD field_35974 SEAGRASS_DEEP_COLD Lnet/minecraft/class_6880; - FIELD field_35975 SEAGRASS_SIMPLE Lnet/minecraft/class_6880; - FIELD field_35976 SEA_PICKLE Lnet/minecraft/class_6880; - FIELD field_35977 KELP_COLD Lnet/minecraft/class_6880; - FIELD field_35978 KELP_WARM Lnet/minecraft/class_6880; - FIELD field_35979 WARM_OCEAN_VEGETATION Lnet/minecraft/class_6880; + FIELD field_35967 SEAGRASS_WARM Lnet/minecraft/class_5321; + FIELD field_35968 SEAGRASS_NORMAL Lnet/minecraft/class_5321; + FIELD field_35969 SEAGRASS_COLD Lnet/minecraft/class_5321; + FIELD field_35970 SEAGRASS_RIVER Lnet/minecraft/class_5321; + FIELD field_35971 SEAGRASS_SWAMP Lnet/minecraft/class_5321; + FIELD field_35972 SEAGRASS_DEEP_WARM Lnet/minecraft/class_5321; + FIELD field_35973 SEAGRASS_DEEP Lnet/minecraft/class_5321; + FIELD field_35974 SEAGRASS_DEEP_COLD Lnet/minecraft/class_5321; + FIELD field_35975 SEAGRASS_SIMPLE Lnet/minecraft/class_5321; + FIELD field_35976 SEA_PICKLE Lnet/minecraft/class_5321; + FIELD field_35977 KELP_COLD Lnet/minecraft/class_5321; + FIELD field_35978 KELP_WARM Lnet/minecraft/class_5321; + FIELD field_35979 WARM_OCEAN_VEGETATION Lnet/minecraft/class_5321; METHOD method_39731 seagrassModifiers (I)Ljava/util/List; ARG 0 count + METHOD method_46859 bootstrap (Lnet/minecraft/class_7891;)V + ARG 0 featureRegisterable diff --git a/mappings/net/minecraft/world/gen/feature/OreConfiguredFeatures.mapping b/mappings/net/minecraft/world/gen/feature/OreConfiguredFeatures.mapping index c408b57a80..1d813f3a89 100644 --- a/mappings/net/minecraft/world/gen/feature/OreConfiguredFeatures.mapping +++ b/mappings/net/minecraft/world/gen/feature/OreConfiguredFeatures.mapping @@ -1,43 +1,35 @@ CLASS net/minecraft/class_6806 net/minecraft/world/gen/feature/OreConfiguredFeatures - FIELD field_35841 ORE_IRON_SMALL Lnet/minecraft/class_6880; - FIELD field_35842 ORE_GOLD Lnet/minecraft/class_6880; - FIELD field_35843 ORE_GOLD_BURIED Lnet/minecraft/class_6880; - FIELD field_35844 ORE_REDSTONE Lnet/minecraft/class_6880; - FIELD field_35845 ORE_DIAMOND_SMALL Lnet/minecraft/class_6880; - FIELD field_35846 ORE_DIAMOND_LARGE Lnet/minecraft/class_6880; - FIELD field_35847 ORE_DIAMOND_BURIED Lnet/minecraft/class_6880; - FIELD field_35848 ORE_LAPIS Lnet/minecraft/class_6880; - FIELD field_35849 ORE_LAPIS_BURIED Lnet/minecraft/class_6880; - FIELD field_35850 ORE_INFESTED Lnet/minecraft/class_6880; - FIELD field_35851 ORE_EMERALD Lnet/minecraft/class_6880; - FIELD field_35852 ORE_ANCIENT_DEBRIS_LARGE Lnet/minecraft/class_6880; - FIELD field_35853 ORE_ANCIENT_DEBRIS_SMALL Lnet/minecraft/class_6880; - FIELD field_35854 ORE_COPPER_SMALL Lnet/minecraft/class_6880; - FIELD field_35855 ORE_COPPER_LARGE Lnet/minecraft/class_6880; - FIELD field_35856 ORE_CLAY Lnet/minecraft/class_6880; - FIELD field_35857 BASE_STONE_OVERWORLD Lnet/minecraft/class_3825; - FIELD field_35858 STONE_ORE_REPLACEABLES Lnet/minecraft/class_3825; - FIELD field_35859 DEEPSLATE_ORE_REPLACEABLES Lnet/minecraft/class_3825; - FIELD field_35860 NETHERRACK Lnet/minecraft/class_3825; - FIELD field_35861 BASE_STONE_NETHER Lnet/minecraft/class_3825; - FIELD field_35862 IRON_ORES Ljava/util/List; - FIELD field_35863 OVERWORLD_GOLD_ORES Ljava/util/List; - FIELD field_35864 DIAMOND_ORES Ljava/util/List; - FIELD field_35865 LAPIS_ORES Ljava/util/List; - FIELD field_35866 COPPER_ORES Ljava/util/List; - FIELD field_35867 COAL_ORES Ljava/util/List; - FIELD field_35868 ORE_MAGMA Lnet/minecraft/class_6880; - FIELD field_35869 ORE_SOUL_SAND Lnet/minecraft/class_6880; - FIELD field_35870 ORE_NETHER_GOLD Lnet/minecraft/class_6880; - FIELD field_35871 ORE_QUARTZ Lnet/minecraft/class_6880; - FIELD field_35872 ORE_GRAVEL_NETHER Lnet/minecraft/class_6880; - FIELD field_35873 ORE_BLACKSTONE Lnet/minecraft/class_6880; - FIELD field_35874 ORE_DIRT Lnet/minecraft/class_6880; - FIELD field_35875 ORE_GRAVEL Lnet/minecraft/class_6880; - FIELD field_35876 ORE_GRANITE Lnet/minecraft/class_6880; - FIELD field_35877 ORE_DIORITE Lnet/minecraft/class_6880; - FIELD field_35878 ORE_ANDESITE Lnet/minecraft/class_6880; - FIELD field_35879 ORE_TUFF Lnet/minecraft/class_6880; - FIELD field_35880 ORE_COAL Lnet/minecraft/class_6880; - FIELD field_35881 ORE_COAL_BURIED Lnet/minecraft/class_6880; - FIELD field_35882 ORE_IRON Lnet/minecraft/class_6880; + FIELD field_35841 ORE_IRON_SMALL Lnet/minecraft/class_5321; + FIELD field_35842 ORE_GOLD Lnet/minecraft/class_5321; + FIELD field_35843 ORE_GOLD_BURIED Lnet/minecraft/class_5321; + FIELD field_35844 ORE_REDSTONE Lnet/minecraft/class_5321; + FIELD field_35845 ORE_DIAMOND_SMALL Lnet/minecraft/class_5321; + FIELD field_35846 ORE_DIAMOND_LARGE Lnet/minecraft/class_5321; + FIELD field_35847 ORE_DIAMOND_BURIED Lnet/minecraft/class_5321; + FIELD field_35848 ORE_LAPIS Lnet/minecraft/class_5321; + FIELD field_35849 ORE_LAPIS_BURIED Lnet/minecraft/class_5321; + FIELD field_35850 ORE_INFESTED Lnet/minecraft/class_5321; + FIELD field_35851 ORE_EMERALD Lnet/minecraft/class_5321; + FIELD field_35852 ORE_ANCIENT_DEBRIS_LARGE Lnet/minecraft/class_5321; + FIELD field_35853 ORE_ANCIENT_DEBRIS_SMALL Lnet/minecraft/class_5321; + FIELD field_35854 ORE_COPPER_SMALL Lnet/minecraft/class_5321; + FIELD field_35855 ORE_COPPER_LARGE Lnet/minecraft/class_5321; + FIELD field_35856 ORE_CLAY Lnet/minecraft/class_5321; + FIELD field_35868 ORE_MAGMA Lnet/minecraft/class_5321; + FIELD field_35869 ORE_SOUL_SAND Lnet/minecraft/class_5321; + FIELD field_35870 ORE_NETHER_GOLD Lnet/minecraft/class_5321; + FIELD field_35871 ORE_QUARTZ Lnet/minecraft/class_5321; + FIELD field_35872 ORE_GRAVEL_NETHER Lnet/minecraft/class_5321; + FIELD field_35873 ORE_BLACKSTONE Lnet/minecraft/class_5321; + FIELD field_35874 ORE_DIRT Lnet/minecraft/class_5321; + FIELD field_35875 ORE_GRAVEL Lnet/minecraft/class_5321; + FIELD field_35876 ORE_GRANITE Lnet/minecraft/class_5321; + FIELD field_35877 ORE_DIORITE Lnet/minecraft/class_5321; + FIELD field_35878 ORE_ANDESITE Lnet/minecraft/class_5321; + FIELD field_35879 ORE_TUFF Lnet/minecraft/class_5321; + FIELD field_35880 ORE_COAL Lnet/minecraft/class_5321; + FIELD field_35881 ORE_COAL_BURIED Lnet/minecraft/class_5321; + FIELD field_35882 ORE_IRON Lnet/minecraft/class_5321; + FIELD field_45663 ORE_DIAMOND_MEDIUM Lnet/minecraft/class_5321; + METHOD method_46855 bootstrap (Lnet/minecraft/class_7891;)V + ARG 0 featureRegisterable diff --git a/mappings/net/minecraft/world/gen/feature/OreFeature.mapping b/mappings/net/minecraft/world/gen/feature/OreFeature.mapping index 0c0fc8c24b..20202bb089 100644 --- a/mappings/net/minecraft/world/gen/feature/OreFeature.mapping +++ b/mappings/net/minecraft/world/gen/feature/OreFeature.mapping @@ -1,6 +1,7 @@ CLASS net/minecraft/class_3122 net/minecraft/world/gen/feature/OreFeature METHOD method_13629 generateVeinPart (Lnet/minecraft/class_5281;Lnet/minecraft/class_5819;Lnet/minecraft/class_3124;DDDDDDIIIII)Z ARG 1 world + ARG 2 random ARG 3 config ARG 4 startX ARG 6 endX @@ -16,8 +17,10 @@ CLASS net/minecraft/class_3122 net/minecraft/world/gen/feature/OreFeature METHOD method_33983 shouldPlace (Lnet/minecraft/class_2680;Ljava/util/function/Function;Lnet/minecraft/class_5819;Lnet/minecraft/class_3124;Lnet/minecraft/class_3124$class_5876;Lnet/minecraft/class_2338$class_2339;)Z ARG 0 state ARG 1 posToState + ARG 2 random ARG 3 config ARG 4 target ARG 5 pos METHOD method_33984 shouldNotDiscard (Lnet/minecraft/class_5819;F)Z + ARG 0 random ARG 1 chance diff --git a/mappings/net/minecraft/world/gen/feature/OrePlacedFeatures.mapping b/mappings/net/minecraft/world/gen/feature/OrePlacedFeatures.mapping index 62f1d8fa5a..c90778df1e 100644 --- a/mappings/net/minecraft/world/gen/feature/OrePlacedFeatures.mapping +++ b/mappings/net/minecraft/world/gen/feature/OrePlacedFeatures.mapping @@ -1,43 +1,44 @@ CLASS net/minecraft/class_6816 net/minecraft/world/gen/feature/OrePlacedFeatures - FIELD field_36039 ORE_REDSTONE_LOWER Lnet/minecraft/class_6880; - FIELD field_36040 ORE_DIAMOND Lnet/minecraft/class_6880; - FIELD field_36041 ORE_DIAMOND_LARGE Lnet/minecraft/class_6880; - FIELD field_36042 ORE_DIAMOND_BURIED Lnet/minecraft/class_6880; - FIELD field_36043 ORE_LAPIS Lnet/minecraft/class_6880; - FIELD field_36044 ORE_LAPIS_BURIED Lnet/minecraft/class_6880; - FIELD field_36045 ORE_INFESTED Lnet/minecraft/class_6880; - FIELD field_36046 ORE_EMERALD Lnet/minecraft/class_6880; - FIELD field_36047 ORE_ANCIENT_DEBRIS_LARGE Lnet/minecraft/class_6880; - FIELD field_36048 ORE_DEBRIS_SMALL Lnet/minecraft/class_6880; - FIELD field_36049 ORE_COPPER Lnet/minecraft/class_6880; - FIELD field_36050 ORE_COPPER_LARGE Lnet/minecraft/class_6880; - FIELD field_36051 ORE_CLAY Lnet/minecraft/class_6880; - FIELD field_36052 ORE_MAGMA Lnet/minecraft/class_6880; - FIELD field_36053 ORE_SOUL_SAND Lnet/minecraft/class_6880; - FIELD field_36054 ORE_GOLD_DELTAS Lnet/minecraft/class_6880; - FIELD field_36055 ORE_QUARTZ_DELTAS Lnet/minecraft/class_6880; - FIELD field_36056 ORE_GOLD_NETHER Lnet/minecraft/class_6880; - FIELD field_36057 ORE_QUARTZ_NETHER Lnet/minecraft/class_6880; - FIELD field_36058 ORE_GRAVEL_NETHER Lnet/minecraft/class_6880; - FIELD field_36059 ORE_BLACKSTONE Lnet/minecraft/class_6880; - FIELD field_36060 ORE_DIRT Lnet/minecraft/class_6880; - FIELD field_36061 ORE_GRAVEL Lnet/minecraft/class_6880; - FIELD field_36062 ORE_GRANITE_UPPER Lnet/minecraft/class_6880; - FIELD field_36063 ORE_GRANITE_LOWER Lnet/minecraft/class_6880; - FIELD field_36064 ORE_DIORITE_UPPER Lnet/minecraft/class_6880; - FIELD field_36065 ORE_DIORITE_LOWER Lnet/minecraft/class_6880; - FIELD field_36066 ORE_ANDESITE_UPPER Lnet/minecraft/class_6880; - FIELD field_36067 ORE_ANDESITE_LOWER Lnet/minecraft/class_6880; - FIELD field_36068 ORE_TUFF Lnet/minecraft/class_6880; - FIELD field_36069 ORE_COAL_UPPER Lnet/minecraft/class_6880; - FIELD field_36070 ORE_COAL_LOWER Lnet/minecraft/class_6880; - FIELD field_36071 ORE_IRON_UPPER Lnet/minecraft/class_6880; - FIELD field_36072 ORE_IRON_MIDDLE Lnet/minecraft/class_6880; - FIELD field_36073 ORE_IRON_SMALL Lnet/minecraft/class_6880; - FIELD field_36074 ORE_GOLD_EXTRA Lnet/minecraft/class_6880; - FIELD field_36075 ORE_GOLD Lnet/minecraft/class_6880; - FIELD field_36076 ORE_GOLD_LOWER Lnet/minecraft/class_6880; - FIELD field_36077 ORE_REDSTONE Lnet/minecraft/class_6880; + FIELD field_36039 ORE_REDSTONE_LOWER Lnet/minecraft/class_5321; + FIELD field_36040 ORE_DIAMOND Lnet/minecraft/class_5321; + FIELD field_36041 ORE_DIAMOND_LARGE Lnet/minecraft/class_5321; + FIELD field_36042 ORE_DIAMOND_BURIED Lnet/minecraft/class_5321; + FIELD field_36043 ORE_LAPIS Lnet/minecraft/class_5321; + FIELD field_36044 ORE_LAPIS_BURIED Lnet/minecraft/class_5321; + FIELD field_36045 ORE_INFESTED Lnet/minecraft/class_5321; + FIELD field_36046 ORE_EMERALD Lnet/minecraft/class_5321; + FIELD field_36047 ORE_ANCIENT_DEBRIS_LARGE Lnet/minecraft/class_5321; + FIELD field_36048 ORE_DEBRIS_SMALL Lnet/minecraft/class_5321; + FIELD field_36049 ORE_COPPER Lnet/minecraft/class_5321; + FIELD field_36050 ORE_COPPER_LARGE Lnet/minecraft/class_5321; + FIELD field_36051 ORE_CLAY Lnet/minecraft/class_5321; + FIELD field_36052 ORE_MAGMA Lnet/minecraft/class_5321; + FIELD field_36053 ORE_SOUL_SAND Lnet/minecraft/class_5321; + FIELD field_36054 ORE_GOLD_DELTAS Lnet/minecraft/class_5321; + FIELD field_36055 ORE_QUARTZ_DELTAS Lnet/minecraft/class_5321; + FIELD field_36056 ORE_GOLD_NETHER Lnet/minecraft/class_5321; + FIELD field_36057 ORE_QUARTZ_NETHER Lnet/minecraft/class_5321; + FIELD field_36058 ORE_GRAVEL_NETHER Lnet/minecraft/class_5321; + FIELD field_36059 ORE_BLACKSTONE Lnet/minecraft/class_5321; + FIELD field_36060 ORE_DIRT Lnet/minecraft/class_5321; + FIELD field_36061 ORE_GRAVEL Lnet/minecraft/class_5321; + FIELD field_36062 ORE_GRANITE_UPPER Lnet/minecraft/class_5321; + FIELD field_36063 ORE_GRANITE_LOWER Lnet/minecraft/class_5321; + FIELD field_36064 ORE_DIORITE_UPPER Lnet/minecraft/class_5321; + FIELD field_36065 ORE_DIORITE_LOWER Lnet/minecraft/class_5321; + FIELD field_36066 ORE_ANDESITE_UPPER Lnet/minecraft/class_5321; + FIELD field_36067 ORE_ANDESITE_LOWER Lnet/minecraft/class_5321; + FIELD field_36068 ORE_TUFF Lnet/minecraft/class_5321; + FIELD field_36069 ORE_COAL_UPPER Lnet/minecraft/class_5321; + FIELD field_36070 ORE_COAL_LOWER Lnet/minecraft/class_5321; + FIELD field_36071 ORE_IRON_UPPER Lnet/minecraft/class_5321; + FIELD field_36072 ORE_IRON_MIDDLE Lnet/minecraft/class_5321; + FIELD field_36073 ORE_IRON_SMALL Lnet/minecraft/class_5321; + FIELD field_36074 ORE_GOLD_EXTRA Lnet/minecraft/class_5321; + FIELD field_36075 ORE_GOLD Lnet/minecraft/class_5321; + FIELD field_36076 ORE_GOLD_LOWER Lnet/minecraft/class_5321; + FIELD field_36077 ORE_REDSTONE Lnet/minecraft/class_5321; + FIELD field_45664 ORE_DIAMOND_MEDIUM Lnet/minecraft/class_5321; METHOD method_39732 modifiersWithCount (ILnet/minecraft/class_6797;)Ljava/util/List; ARG 0 count ARG 1 heightModifier @@ -47,3 +48,5 @@ CLASS net/minecraft/class_6816 net/minecraft/world/gen/feature/OrePlacedFeatures METHOD method_39734 modifiersWithRarity (ILnet/minecraft/class_6797;)Ljava/util/List; ARG 0 chance ARG 1 heightModifier + METHOD method_46864 bootstrap (Lnet/minecraft/class_7891;)V + ARG 0 featureRegisterable diff --git a/mappings/net/minecraft/world/gen/feature/PileConfiguredFeatures.mapping b/mappings/net/minecraft/world/gen/feature/PileConfiguredFeatures.mapping index c397b20147..48a6dd5fe8 100644 --- a/mappings/net/minecraft/world/gen/feature/PileConfiguredFeatures.mapping +++ b/mappings/net/minecraft/world/gen/feature/PileConfiguredFeatures.mapping @@ -1,6 +1,8 @@ CLASS net/minecraft/class_6807 net/minecraft/world/gen/feature/PileConfiguredFeatures - FIELD field_35883 PILE_HAY Lnet/minecraft/class_6880; - FIELD field_35884 PILE_MELON Lnet/minecraft/class_6880; - FIELD field_35885 PILE_SNOW Lnet/minecraft/class_6880; - FIELD field_35886 PILE_ICE Lnet/minecraft/class_6880; - FIELD field_35887 PILE_PUMPKIN Lnet/minecraft/class_6880; + FIELD field_35883 PILE_HAY Lnet/minecraft/class_5321; + FIELD field_35884 PILE_MELON Lnet/minecraft/class_5321; + FIELD field_35885 PILE_SNOW Lnet/minecraft/class_5321; + FIELD field_35886 PILE_ICE Lnet/minecraft/class_5321; + FIELD field_35887 PILE_PUMPKIN Lnet/minecraft/class_5321; + METHOD method_46856 bootstrap (Lnet/minecraft/class_7891;)V + ARG 0 featureRegisterable diff --git a/mappings/net/minecraft/world/gen/feature/PlacedFeature.mapping b/mappings/net/minecraft/world/gen/feature/PlacedFeature.mapping index a231e646a1..29ed215a22 100644 --- a/mappings/net/minecraft/world/gen/feature/PlacedFeature.mapping +++ b/mappings/net/minecraft/world/gen/feature/PlacedFeature.mapping @@ -13,12 +13,16 @@ CLASS net/minecraft/class_6796 net/minecraft/world/gen/feature/PlacedFeature METHOD method_39644 generateUnregistered (Lnet/minecraft/class_5281;Lnet/minecraft/class_2794;Lnet/minecraft/class_5819;Lnet/minecraft/class_2338;)Z ARG 1 world ARG 2 generator + ARG 3 random ARG 4 pos + METHOD method_39646 (Lnet/minecraft/class_2975;Lnet/minecraft/class_5444;Lnet/minecraft/class_5819;Lorg/apache/commons/lang3/mutable/MutableBoolean;Lnet/minecraft/class_2338;)V + ARG 4 placedPos METHOD method_39648 generate (Lnet/minecraft/class_5444;Lnet/minecraft/class_5819;Lnet/minecraft/class_2338;)Z ARG 1 context + ARG 2 random ARG 3 pos METHOD method_39649 (Lnet/minecraft/class_6797;Lnet/minecraft/class_5444;Lnet/minecraft/class_5819;Lnet/minecraft/class_2338;)Ljava/util/stream/Stream; - ARG 3 pos + ARG 3 posx METHOD method_39650 generate (Lnet/minecraft/class_5281;Lnet/minecraft/class_2794;Lnet/minecraft/class_5819;Lnet/minecraft/class_2338;)Z COMMENT Generates a configured feature at the positions obtained by applying COMMENT placement modifiers to the given position. @@ -28,4 +32,5 @@ CLASS net/minecraft/class_6796 net/minecraft/world/gen/feature/PlacedFeature COMMENT Stream#flatMap flatMap} in order they appear in the list. ARG 1 world ARG 2 generator + ARG 3 random ARG 4 pos diff --git a/mappings/net/minecraft/world/gen/feature/PlacedFeatures.mapping b/mappings/net/minecraft/world/gen/feature/PlacedFeatures.mapping index 878cef843d..eb1637442d 100644 --- a/mappings/net/minecraft/world/gen/feature/PlacedFeatures.mapping +++ b/mappings/net/minecraft/world/gen/feature/PlacedFeatures.mapping @@ -8,15 +8,17 @@ CLASS net/minecraft/class_6817 net/minecraft/world/gen/feature/PlacedFeatures FIELD field_36084 EIGHT_ABOVE_AND_BELOW_RANGE Lnet/minecraft/class_6797; FIELD field_36085 FOUR_ABOVE_AND_BELOW_RANGE Lnet/minecraft/class_6797; FIELD field_36086 BOTTOM_TO_120_RANGE Lnet/minecraft/class_6797; - METHOD method_39735 getDefaultPlacedFeature (Lnet/minecraft/class_2378;)Lnet/minecraft/class_6880; + METHOD method_39735 bootstrap (Lnet/minecraft/class_7891;)V + ARG 0 featureRegisterable METHOD method_39736 createCountExtraModifier (IFI)Lnet/minecraft/class_6797; ARG 0 count ARG 1 extraChance ARG 2 extraCount - METHOD method_39737 register (Ljava/lang/String;Lnet/minecraft/class_6880;Ljava/util/List;)Lnet/minecraft/class_6880; - ARG 0 id - ARG 1 registryEntry - ARG 2 modifiers + METHOD method_39737 register (Lnet/minecraft/class_7891;Lnet/minecraft/class_5321;Lnet/minecraft/class_6880;Ljava/util/List;)V + ARG 0 featureRegisterable + ARG 1 key + ARG 2 feature + ARG 3 modifiers METHOD method_40365 wouldSurvive (Lnet/minecraft/class_2248;)Lnet/minecraft/class_6658; ARG 0 block METHOD method_40366 createEntry (Lnet/minecraft/class_3031;Lnet/minecraft/class_3037;)Lnet/minecraft/class_6880; @@ -31,10 +33,13 @@ CLASS net/minecraft/class_6817 net/minecraft/world/gen/feature/PlacedFeatures ARG 1 featureConfig ARG 2 modifiers METHOD method_40369 createEntry (Lnet/minecraft/class_6880;[Lnet/minecraft/class_6797;)Lnet/minecraft/class_6880; - ARG 0 registryEntry + ARG 0 feature ARG 1 modifiers - METHOD method_40370 register (Ljava/lang/String;Lnet/minecraft/class_6880;[Lnet/minecraft/class_6797;)Lnet/minecraft/class_6880; - ARG 0 id - ARG 1 registryEntry - ARG 2 modifiers + METHOD method_40370 register (Lnet/minecraft/class_7891;Lnet/minecraft/class_5321;Lnet/minecraft/class_6880;[Lnet/minecraft/class_6797;)V + ARG 0 featureRegisterable + ARG 1 key + ARG 2 feature + ARG 3 modifiers METHOD method_40371 isAir ()Lnet/minecraft/class_6661; + METHOD method_46865 of (Ljava/lang/String;)Lnet/minecraft/class_5321; + ARG 0 id diff --git a/mappings/net/minecraft/world/gen/feature/RandomFeatureEntry.mapping b/mappings/net/minecraft/world/gen/feature/RandomFeatureEntry.mapping index 3f68f0acb7..58394cc38c 100644 --- a/mappings/net/minecraft/world/gen/feature/RandomFeatureEntry.mapping +++ b/mappings/net/minecraft/world/gen/feature/RandomFeatureEntry.mapping @@ -8,6 +8,7 @@ CLASS net/minecraft/class_3226 net/minecraft/world/gen/feature/RandomFeatureEntr METHOD method_14271 generate (Lnet/minecraft/class_5281;Lnet/minecraft/class_2794;Lnet/minecraft/class_5819;Lnet/minecraft/class_2338;)Z ARG 1 world ARG 2 chunkGenerator + ARG 3 random ARG 4 pos METHOD method_28668 (Lnet/minecraft/class_3226;)Ljava/lang/Float; ARG 0 config diff --git a/mappings/net/minecraft/world/gen/feature/RootSystemFeature.mapping b/mappings/net/minecraft/world/gen/feature/RootSystemFeature.mapping index 2a9df189e1..1582b96dd4 100644 --- a/mappings/net/minecraft/world/gen/feature/RootSystemFeature.mapping +++ b/mappings/net/minecraft/world/gen/feature/RootSystemFeature.mapping @@ -5,6 +5,7 @@ CLASS net/minecraft/class_5921 net/minecraft/world/gen/feature/RootSystemFeature ARG 0 world ARG 1 generator ARG 2 config + ARG 3 random ARG 4 mutablePos ARG 5 pos METHOD method_34310 hasSpaceForTree (Lnet/minecraft/class_5281;Lnet/minecraft/class_5926;Lnet/minecraft/class_2338;)Z @@ -14,12 +15,14 @@ CLASS net/minecraft/class_5921 net/minecraft/world/gen/feature/RootSystemFeature METHOD method_34311 generateRoots (Lnet/minecraft/class_5281;Lnet/minecraft/class_5926;Lnet/minecraft/class_5819;IILnet/minecraft/class_2338$class_2339;)V ARG 0 world ARG 1 config + ARG 2 random ARG 3 x ARG 4 z ARG 5 mutablePos METHOD method_34312 generateHangingRoots (Lnet/minecraft/class_5281;Lnet/minecraft/class_5926;Lnet/minecraft/class_5819;Lnet/minecraft/class_2338;Lnet/minecraft/class_2338$class_2339;)V ARG 0 world ARG 1 config + ARG 2 random ARG 3 pos ARG 4 mutablePos METHOD method_36419 isAirOrWater (Lnet/minecraft/class_2680;II)Z @@ -31,3 +34,4 @@ CLASS net/minecraft/class_5921 net/minecraft/world/gen/feature/RootSystemFeature ARG 1 maxY ARG 2 world ARG 3 config + ARG 4 random diff --git a/mappings/net/minecraft/world/gen/feature/ScatteredOreFeature.mapping b/mappings/net/minecraft/world/gen/feature/ScatteredOreFeature.mapping index 5359799129..8d8499a2b8 100644 --- a/mappings/net/minecraft/world/gen/feature/ScatteredOreFeature.mapping +++ b/mappings/net/minecraft/world/gen/feature/ScatteredOreFeature.mapping @@ -1,7 +1,10 @@ CLASS net/minecraft/class_5875 net/minecraft/world/gen/feature/ScatteredOreFeature + FIELD field_31515 MAX_SPREAD I METHOD method_33985 setPos (Lnet/minecraft/class_2338$class_2339;Lnet/minecraft/class_5819;Lnet/minecraft/class_2338;I)V ARG 1 mutable + ARG 2 random ARG 3 origin ARG 4 spread METHOD method_33986 getSpread (Lnet/minecraft/class_5819;I)I + ARG 1 random ARG 2 spread diff --git a/mappings/net/minecraft/world/gen/feature/TreeConfiguredFeatures.mapping b/mappings/net/minecraft/world/gen/feature/TreeConfiguredFeatures.mapping index 0d51b45612..1729088ec2 100644 --- a/mappings/net/minecraft/world/gen/feature/TreeConfiguredFeatures.mapping +++ b/mappings/net/minecraft/world/gen/feature/TreeConfiguredFeatures.mapping @@ -1,44 +1,41 @@ CLASS net/minecraft/class_6808 net/minecraft/world/gen/feature/TreeConfiguredFeatures - FIELD field_35888 BIRCH_BEES_0002 Lnet/minecraft/class_6880; - FIELD field_35889 BIRCH_BEES_002 Lnet/minecraft/class_6880; - FIELD field_35890 BIRCH_BEES_005 Lnet/minecraft/class_6880; - FIELD field_35891 FANCY_OAK_BEES_0002 Lnet/minecraft/class_6880; - FIELD field_35892 FANCY_OAK_BEES_002 Lnet/minecraft/class_6880; - FIELD field_35893 FANCY_OAK_BEES_005 Lnet/minecraft/class_6880; - FIELD field_35894 FANCY_OAK_BEES Lnet/minecraft/class_6880; - FIELD field_35895 BEES_0002 Lnet/minecraft/class_4659; - FIELD field_35896 BEES_002 Lnet/minecraft/class_4659; - FIELD field_35897 BEES_005 Lnet/minecraft/class_4659; - FIELD field_35898 BEES Lnet/minecraft/class_4659; - FIELD field_35899 CRIMSON_FUNGUS Lnet/minecraft/class_6880; - FIELD field_35900 CRIMSON_FUNGUS_PLANTED Lnet/minecraft/class_6880; - FIELD field_35901 WARPED_FUNGUS Lnet/minecraft/class_6880; - FIELD field_35902 WARPED_FUNGUS_PLANTED Lnet/minecraft/class_6880; - FIELD field_35903 HUGE_BROWN_MUSHROOM Lnet/minecraft/class_6880; - FIELD field_35904 HUGE_RED_MUSHROOM Lnet/minecraft/class_6880; - FIELD field_35905 OAK Lnet/minecraft/class_6880; - FIELD field_35906 DARK_OAK Lnet/minecraft/class_6880; - FIELD field_35907 BIRCH Lnet/minecraft/class_6880; - FIELD field_35908 ACACIA Lnet/minecraft/class_6880; - FIELD field_35909 SPRUCE Lnet/minecraft/class_6880; - FIELD field_35910 PINE Lnet/minecraft/class_6880; - FIELD field_35911 JUNGLE_TREE Lnet/minecraft/class_6880; - FIELD field_35912 FANCY_OAK Lnet/minecraft/class_6880; - FIELD field_35913 JUNGLE_TREE_NO_VINE Lnet/minecraft/class_6880; - FIELD field_35914 MEGA_JUNGLE_TREE Lnet/minecraft/class_6880; - FIELD field_35915 MEGA_SPRUCE Lnet/minecraft/class_6880; - FIELD field_35916 MEGA_PINE Lnet/minecraft/class_6880; - FIELD field_35917 SUPER_BIRCH_BEES_0002 Lnet/minecraft/class_6880; - FIELD field_35918 SUPER_BIRCH_BEES Lnet/minecraft/class_6880; - FIELD field_35919 SWAMP_OAK Lnet/minecraft/class_6880; - FIELD field_35920 JUNGLE_BUSH Lnet/minecraft/class_6880; - FIELD field_35921 AZALEA_TREE Lnet/minecraft/class_6880; - FIELD field_35922 OAK_BEES_0002 Lnet/minecraft/class_6880; - FIELD field_35923 OAK_BEES_002 Lnet/minecraft/class_6880; - FIELD field_35924 OAK_BEES_005 Lnet/minecraft/class_6880; - FIELD field_38810 MANGROVE Lnet/minecraft/class_6880; - FIELD field_38811 TALL_MANGROVE Lnet/minecraft/class_6880; - FIELD field_38922 BEES_001 Lnet/minecraft/class_4659; + FIELD field_35888 BIRCH_BEES_0002 Lnet/minecraft/class_5321; + FIELD field_35889 BIRCH_BEES_002 Lnet/minecraft/class_5321; + FIELD field_35890 BIRCH_BEES_005 Lnet/minecraft/class_5321; + FIELD field_35891 FANCY_OAK_BEES_0002 Lnet/minecraft/class_5321; + FIELD field_35892 FANCY_OAK_BEES_002 Lnet/minecraft/class_5321; + FIELD field_35893 FANCY_OAK_BEES_005 Lnet/minecraft/class_5321; + FIELD field_35894 FANCY_OAK_BEES Lnet/minecraft/class_5321; + FIELD field_35899 CRIMSON_FUNGUS Lnet/minecraft/class_5321; + FIELD field_35900 CRIMSON_FUNGUS_PLANTED Lnet/minecraft/class_5321; + FIELD field_35901 WARPED_FUNGUS Lnet/minecraft/class_5321; + FIELD field_35902 WARPED_FUNGUS_PLANTED Lnet/minecraft/class_5321; + FIELD field_35903 HUGE_BROWN_MUSHROOM Lnet/minecraft/class_5321; + FIELD field_35904 HUGE_RED_MUSHROOM Lnet/minecraft/class_5321; + FIELD field_35905 OAK Lnet/minecraft/class_5321; + FIELD field_35906 DARK_OAK Lnet/minecraft/class_5321; + FIELD field_35907 BIRCH Lnet/minecraft/class_5321; + FIELD field_35908 ACACIA Lnet/minecraft/class_5321; + FIELD field_35909 SPRUCE Lnet/minecraft/class_5321; + FIELD field_35910 PINE Lnet/minecraft/class_5321; + FIELD field_35911 JUNGLE_TREE Lnet/minecraft/class_5321; + FIELD field_35912 FANCY_OAK Lnet/minecraft/class_5321; + FIELD field_35913 JUNGLE_TREE_NO_VINE Lnet/minecraft/class_5321; + FIELD field_35914 MEGA_JUNGLE_TREE Lnet/minecraft/class_5321; + FIELD field_35915 MEGA_SPRUCE Lnet/minecraft/class_5321; + FIELD field_35916 MEGA_PINE Lnet/minecraft/class_5321; + FIELD field_35917 SUPER_BIRCH_BEES_0002 Lnet/minecraft/class_5321; + FIELD field_35918 SUPER_BIRCH_BEES Lnet/minecraft/class_5321; + FIELD field_35919 SWAMP_OAK Lnet/minecraft/class_5321; + FIELD field_35920 JUNGLE_BUSH Lnet/minecraft/class_5321; + FIELD field_35921 AZALEA_TREE Lnet/minecraft/class_5321; + FIELD field_35922 OAK_BEES_0002 Lnet/minecraft/class_5321; + FIELD field_35923 OAK_BEES_002 Lnet/minecraft/class_5321; + FIELD field_35924 OAK_BEES_005 Lnet/minecraft/class_5321; + FIELD field_38810 MANGROVE Lnet/minecraft/class_5321; + FIELD field_38811 TALL_MANGROVE Lnet/minecraft/class_5321; + FIELD field_42959 CHERRY_BEES_005 Lnet/minecraft/class_5321; + FIELD field_42960 CHERRY Lnet/minecraft/class_5321; METHOD method_39710 oak ()Lnet/minecraft/class_4643$class_4644; METHOD method_39711 builder (Lnet/minecraft/class_2248;Lnet/minecraft/class_2248;IIII)Lnet/minecraft/class_4643$class_4644; ARG 0 log @@ -51,3 +48,6 @@ CLASS net/minecraft/class_6808 net/minecraft/world/gen/feature/TreeConfiguredFea METHOD method_39713 superBirch ()Lnet/minecraft/class_4643$class_4644; METHOD method_39714 jungle ()Lnet/minecraft/class_4643$class_4644; METHOD method_39715 fancyOak ()Lnet/minecraft/class_4643$class_4644; + METHOD method_46857 bootstrap (Lnet/minecraft/class_7891;)V + ARG 0 featureRegisterable + METHOD method_49392 cherry ()Lnet/minecraft/class_4643$class_4644; diff --git a/mappings/net/minecraft/world/gen/feature/TreeFeature.mapping b/mappings/net/minecraft/world/gen/feature/TreeFeature.mapping index 449e1c66b4..641fff7e79 100644 --- a/mappings/net/minecraft/world/gen/feature/TreeFeature.mapping +++ b/mappings/net/minecraft/world/gen/feature/TreeFeature.mapping @@ -4,13 +4,13 @@ CLASS net/minecraft/class_2944 net/minecraft/world/gen/feature/TreeFeature ARG 0 world ARG 1 pos ARG 2 state - METHOD method_12775 generate (Lnet/minecraft/class_5281;Lnet/minecraft/class_5819;Lnet/minecraft/class_2338;Ljava/util/function/BiConsumer;Ljava/util/function/BiConsumer;Ljava/util/function/BiConsumer;Lnet/minecraft/class_4643;)Z + METHOD method_12775 generate (Lnet/minecraft/class_5281;Lnet/minecraft/class_5819;Lnet/minecraft/class_2338;Ljava/util/function/BiConsumer;Ljava/util/function/BiConsumer;Lnet/minecraft/class_4647$class_8179;Lnet/minecraft/class_4643;)Z ARG 1 world ARG 2 random ARG 3 pos ARG 4 rootPlacerReplacer ARG 5 trunkPlacerReplacer - ARG 6 foliagePlacerReplacer + ARG 6 blockPlacer ARG 7 config METHOD method_16416 isVine (Lnet/minecraft/class_3746;Lnet/minecraft/class_2338;)Z ARG 0 world @@ -20,21 +20,12 @@ CLASS net/minecraft/class_2944 net/minecraft/world/gen/feature/TreeFeature METHOD method_16420 isAirOrLeaves (Lnet/minecraft/class_3746;Lnet/minecraft/class_2338;)Z ARG 0 world ARG 1 pos - METHOD method_16421 (Lnet/minecraft/class_2680;)Z - ARG 0 state - METHOD method_16422 isWater (Lnet/minecraft/class_3746;Lnet/minecraft/class_2338;)Z - ARG 0 world - ARG 1 pos - METHOD method_16425 isReplaceablePlant (Lnet/minecraft/class_3746;Lnet/minecraft/class_2338;)Z - ARG 0 world - ARG 1 pos - METHOD method_16428 (Lnet/minecraft/class_2680;)Z - ARG 0 state METHOD method_23380 placeLogsAndLeaves (Lnet/minecraft/class_1936;Lnet/minecraft/class_3341;Ljava/util/Set;Ljava/util/Set;Ljava/util/Set;)Lnet/minecraft/class_251; ARG 0 world ARG 1 box ARG 2 trunkPositions ARG 3 decorationPositions + ARG 4 rootPositions METHOD method_23381 (Lnet/minecraft/class_4662$class_7402;Lnet/minecraft/class_4662;)V ARG 1 decorator METHOD method_23384 (Lnet/minecraft/class_2680;)Z @@ -42,24 +33,25 @@ CLASS net/minecraft/class_2944 net/minecraft/world/gen/feature/TreeFeature METHOD method_27371 canReplace (Lnet/minecraft/class_3746;Lnet/minecraft/class_2338;)Z ARG 0 world ARG 1 pos - METHOD method_27372 (Lnet/minecraft/class_4643;Lnet/minecraft/class_5281;Ljava/util/function/BiConsumer;Lnet/minecraft/class_5819;IIILnet/minecraft/class_4647$class_5208;)V + METHOD method_27372 (Lnet/minecraft/class_4643;Lnet/minecraft/class_5281;Lnet/minecraft/class_4647$class_8179;Lnet/minecraft/class_5819;IIILnet/minecraft/class_4647$class_5208;)V ARG 7 node METHOD method_29963 getTopPosition (Lnet/minecraft/class_3746;ILnet/minecraft/class_2338;Lnet/minecraft/class_4643;)I ARG 1 world ARG 2 height ARG 3 pos ARG 4 config + METHOD method_35363 (Lnet/minecraft/class_5281;Ljava/util/Set;Ljava/util/Set;Ljava/util/Set;Lnet/minecraft/class_3341;)Ljava/lang/Boolean; + ARG 4 box METHOD method_35364 (Ljava/util/Set;Lnet/minecraft/class_5281;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;)V ARG 2 pos ARG 3 state - METHOD method_35365 (Ljava/util/Set;Lnet/minecraft/class_5281;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;)V - ARG 2 pos - ARG 3 state - METHOD method_35366 (Ljava/util/Set;Lnet/minecraft/class_5281;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;)V - ARG 2 pos - ARG 3 state METHOD method_43162 (Ljava/util/Set;Lnet/minecraft/class_5281;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;)V ARG 2 pos ARG 3 state METHOD method_43293 (Lnet/minecraft/class_2338;Lnet/minecraft/class_5819;Lnet/minecraft/class_7387;)Lnet/minecraft/class_2338; ARG 2 rootPlacer + METHOD method_49238 (Ljava/util/Set;Lnet/minecraft/class_5281;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;)V + ARG 2 pos + ARG 3 state + METHOD method_51179 (Lnet/minecraft/class_2680;)Z + ARG 0 state diff --git a/mappings/net/minecraft/world/gen/feature/TreePlacedFeatures.mapping b/mappings/net/minecraft/world/gen/feature/TreePlacedFeatures.mapping index 4009dc9a73..724c2473b4 100644 --- a/mappings/net/minecraft/world/gen/feature/TreePlacedFeatures.mapping +++ b/mappings/net/minecraft/world/gen/feature/TreePlacedFeatures.mapping @@ -1,30 +1,32 @@ CLASS net/minecraft/class_6818 net/minecraft/world/gen/feature/TreePlacedFeatures - FIELD field_36087 FANCY_OAK_BEES Lnet/minecraft/class_6880; - FIELD field_36088 CRIMSON_FUNGI Lnet/minecraft/class_6880; - FIELD field_36089 WARPED_FUNGI Lnet/minecraft/class_6880; - FIELD field_36090 OAK_CHECKED Lnet/minecraft/class_6880; - FIELD field_36091 DARK_OAK_CHECKED Lnet/minecraft/class_6880; - FIELD field_36092 BIRCH_CHECKED Lnet/minecraft/class_6880; - FIELD field_36093 ACACIA_CHECKED Lnet/minecraft/class_6880; - FIELD field_36094 SPRUCE_CHECKED Lnet/minecraft/class_6880; - FIELD field_36095 ON_SNOW_PREDICATE Lnet/minecraft/class_6646; - FIELD field_36096 ON_SNOW_MODIFIERS Ljava/util/List; - FIELD field_36097 PINE_ON_SNOW Lnet/minecraft/class_6880; - FIELD field_36098 SPRUCE_ON_SNOW Lnet/minecraft/class_6880; - FIELD field_36099 PINE_CHECKED Lnet/minecraft/class_6880; - FIELD field_36100 JUNGLE_TREE Lnet/minecraft/class_6880; - FIELD field_36101 FANCY_OAK_CHECKED Lnet/minecraft/class_6880; - FIELD field_36102 MEGA_JUNGLE_TREE_CHECKED Lnet/minecraft/class_6880; - FIELD field_36103 MEGA_SPRUCE_CHECKED Lnet/minecraft/class_6880; - FIELD field_36104 MEGA_PINE_CHECKED Lnet/minecraft/class_6880; - FIELD field_36105 JUNGLE_BUSH Lnet/minecraft/class_6880; - FIELD field_36106 SUPER_BIRCH_BEES_0002 Lnet/minecraft/class_6880; - FIELD field_36107 SUPER_BIRCH_BEES Lnet/minecraft/class_6880; - FIELD field_36108 OAK_BEES_0002 Lnet/minecraft/class_6880; - FIELD field_36109 OAK_BEES_002 Lnet/minecraft/class_6880; - FIELD field_36110 BIRCH_BEES_0002 Lnet/minecraft/class_6880; - FIELD field_36111 BIRCH_BEES_002 Lnet/minecraft/class_6880; - FIELD field_36112 FANCY_OAK_BEES_0002 Lnet/minecraft/class_6880; - FIELD field_36113 FANCY_OAK_BEES_002 Lnet/minecraft/class_6880; - FIELD field_38814 MANGROVE_CHECKED Lnet/minecraft/class_6880; - FIELD field_38815 TALL_MANGROVE_CHECKED Lnet/minecraft/class_6880; + FIELD field_36087 FANCY_OAK_BEES Lnet/minecraft/class_5321; + FIELD field_36088 CRIMSON_FUNGI Lnet/minecraft/class_5321; + FIELD field_36089 WARPED_FUNGI Lnet/minecraft/class_5321; + FIELD field_36090 OAK_CHECKED Lnet/minecraft/class_5321; + FIELD field_36091 DARK_OAK_CHECKED Lnet/minecraft/class_5321; + FIELD field_36092 BIRCH_CHECKED Lnet/minecraft/class_5321; + FIELD field_36093 ACACIA_CHECKED Lnet/minecraft/class_5321; + FIELD field_36094 SPRUCE_CHECKED Lnet/minecraft/class_5321; + FIELD field_36097 PINE_ON_SNOW Lnet/minecraft/class_5321; + FIELD field_36098 SPRUCE_ON_SNOW Lnet/minecraft/class_5321; + FIELD field_36099 PINE_CHECKED Lnet/minecraft/class_5321; + FIELD field_36100 JUNGLE_TREE Lnet/minecraft/class_5321; + FIELD field_36101 FANCY_OAK_CHECKED Lnet/minecraft/class_5321; + FIELD field_36102 MEGA_JUNGLE_TREE_CHECKED Lnet/minecraft/class_5321; + FIELD field_36103 MEGA_SPRUCE_CHECKED Lnet/minecraft/class_5321; + FIELD field_36104 MEGA_PINE_CHECKED Lnet/minecraft/class_5321; + FIELD field_36105 JUNGLE_BUSH Lnet/minecraft/class_5321; + FIELD field_36106 SUPER_BIRCH_BEES_0002 Lnet/minecraft/class_5321; + FIELD field_36107 SUPER_BIRCH_BEES Lnet/minecraft/class_5321; + FIELD field_36108 OAK_BEES_0002 Lnet/minecraft/class_5321; + FIELD field_36109 OAK_BEES_002 Lnet/minecraft/class_5321; + FIELD field_36110 BIRCH_BEES_0002 Lnet/minecraft/class_5321; + FIELD field_36111 BIRCH_BEES_002 Lnet/minecraft/class_5321; + FIELD field_36112 FANCY_OAK_BEES_0002 Lnet/minecraft/class_5321; + FIELD field_36113 FANCY_OAK_BEES_002 Lnet/minecraft/class_5321; + FIELD field_38814 MANGROVE_CHECKED Lnet/minecraft/class_5321; + FIELD field_38815 TALL_MANGROVE_CHECKED Lnet/minecraft/class_5321; + FIELD field_42962 CHERRY_BEES_005 Lnet/minecraft/class_5321; + FIELD field_42963 CHERRY_CHECKED Lnet/minecraft/class_5321; + METHOD method_46866 bootstrap (Lnet/minecraft/class_7891;)V + ARG 0 featureRegisterable diff --git a/mappings/net/minecraft/world/gen/feature/UndergroundConfiguredFeatures.mapping b/mappings/net/minecraft/world/gen/feature/UndergroundConfiguredFeatures.mapping index 42cd8dd5ef..0a361624d6 100644 --- a/mappings/net/minecraft/world/gen/feature/UndergroundConfiguredFeatures.mapping +++ b/mappings/net/minecraft/world/gen/feature/UndergroundConfiguredFeatures.mapping @@ -1,34 +1,30 @@ CLASS net/minecraft/class_6801 net/minecraft/world/gen/feature/UndergroundConfiguredFeatures - FIELD field_35770 MONSTER_ROOM Lnet/minecraft/class_6880; - FIELD field_35771 FOSSIL_COAL Lnet/minecraft/class_6880; - FIELD field_35772 FOSSIL_DIAMONDS Lnet/minecraft/class_6880; - FIELD field_35773 DRIPSTONE_CLUSTER Lnet/minecraft/class_6880; - FIELD field_35774 LARGE_DRIPSTONE Lnet/minecraft/class_6880; - FIELD field_35775 POINTED_DRIPSTONE Lnet/minecraft/class_6880; - FIELD field_35776 UNDERWATER_MAGMA Lnet/minecraft/class_6880; - FIELD field_35777 GLOW_LICHEN Lnet/minecraft/class_6880; - FIELD field_35778 ROOTED_AZALEA_TREE Lnet/minecraft/class_6880; - FIELD field_35779 CAVE_VINE Lnet/minecraft/class_6880; - FIELD field_35780 CAVE_VINE_IN_MOSS Lnet/minecraft/class_6880; - FIELD field_35781 MOSS_VEGETATION Lnet/minecraft/class_6880; - FIELD field_35782 MOSS_PATCH Lnet/minecraft/class_6880; - FIELD field_35783 MOSS_PATCH_BONEMEAL Lnet/minecraft/class_6880; - FIELD field_35784 DRIPLEAF Lnet/minecraft/class_6880; - FIELD field_35785 CLAY_WITH_DRIPLEAVES Lnet/minecraft/class_6880; - FIELD field_35786 CLAY_POOL_WITH_DRIPLEAVES Lnet/minecraft/class_6880; - FIELD field_35787 LUSH_CAVES_CLAY Lnet/minecraft/class_6880; - FIELD field_35788 MOSS_PATCH_CEILING Lnet/minecraft/class_6880; - FIELD field_35789 SPORE_BLOSSOM Lnet/minecraft/class_6880; - FIELD field_35790 AMETHYST_GEODE Lnet/minecraft/class_6880; - FIELD field_35791 FOSSIL_IDS Ljava/util/List; - FIELD field_35792 COAL_FOSSIL_IDS Ljava/util/List; - FIELD field_35793 CAVE_VINES_PLANT_PROVIDER Lnet/minecraft/class_4657; - FIELD field_35794 RANDOMIZED_AGE_CAVE_VINES_PROVIDER Lnet/minecraft/class_5929; - FIELD field_38032 SCULK_VEIN_BLOCK Lnet/minecraft/class_5778; - FIELD field_38033 SCULK_PATCH_DEEP_DARK Lnet/minecraft/class_6880; - FIELD field_38034 SCULK_VEIN Lnet/minecraft/class_6880; - FIELD field_38035 GLOW_LICHEN_BLOCK Lnet/minecraft/class_5778; - FIELD field_38477 SCULK_PATCH_ANCIENT_CITY Lnet/minecraft/class_6880; + FIELD field_35770 MONSTER_ROOM Lnet/minecraft/class_5321; + FIELD field_35771 FOSSIL_COAL Lnet/minecraft/class_5321; + FIELD field_35772 FOSSIL_DIAMONDS Lnet/minecraft/class_5321; + FIELD field_35773 DRIPSTONE_CLUSTER Lnet/minecraft/class_5321; + FIELD field_35774 LARGE_DRIPSTONE Lnet/minecraft/class_5321; + FIELD field_35775 POINTED_DRIPSTONE Lnet/minecraft/class_5321; + FIELD field_35776 UNDERWATER_MAGMA Lnet/minecraft/class_5321; + FIELD field_35777 GLOW_LICHEN Lnet/minecraft/class_5321; + FIELD field_35778 ROOTED_AZALEA_TREE Lnet/minecraft/class_5321; + FIELD field_35779 CAVE_VINE Lnet/minecraft/class_5321; + FIELD field_35780 CAVE_VINE_IN_MOSS Lnet/minecraft/class_5321; + FIELD field_35781 MOSS_VEGETATION Lnet/minecraft/class_5321; + FIELD field_35782 MOSS_PATCH Lnet/minecraft/class_5321; + FIELD field_35783 MOSS_PATCH_BONEMEAL Lnet/minecraft/class_5321; + FIELD field_35784 DRIPLEAF Lnet/minecraft/class_5321; + FIELD field_35785 CLAY_WITH_DRIPLEAVES Lnet/minecraft/class_5321; + FIELD field_35786 CLAY_POOL_WITH_DRIPLEAVES Lnet/minecraft/class_5321; + FIELD field_35787 LUSH_CAVES_CLAY Lnet/minecraft/class_5321; + FIELD field_35788 MOSS_PATCH_CEILING Lnet/minecraft/class_5321; + FIELD field_35789 SPORE_BLOSSOM Lnet/minecraft/class_5321; + FIELD field_35790 AMETHYST_GEODE Lnet/minecraft/class_5321; + FIELD field_38033 SCULK_PATCH_DEEP_DARK Lnet/minecraft/class_5321; + FIELD field_38034 SCULK_VEIN Lnet/minecraft/class_5321; + FIELD field_38477 SCULK_PATCH_ANCIENT_CITY Lnet/minecraft/class_5321; METHOD method_39686 createSmallDripleafFeature ()Lnet/minecraft/class_6880; METHOD method_39687 createBigDripleafFeature (Lnet/minecraft/class_2350;)Lnet/minecraft/class_6880; ARG 0 direction + METHOD method_46850 bootstrap (Lnet/minecraft/class_7891;)V + ARG 0 featureRegisterable diff --git a/mappings/net/minecraft/world/gen/feature/UndergroundPlacedFeatures.mapping b/mappings/net/minecraft/world/gen/feature/UndergroundPlacedFeatures.mapping index 2a989c035c..2eb2146d00 100644 --- a/mappings/net/minecraft/world/gen/feature/UndergroundPlacedFeatures.mapping +++ b/mappings/net/minecraft/world/gen/feature/UndergroundPlacedFeatures.mapping @@ -1,21 +1,23 @@ CLASS net/minecraft/class_6812 net/minecraft/world/gen/feature/UndergroundPlacedFeatures - FIELD field_35980 MONSTER_ROOM Lnet/minecraft/class_6880; - FIELD field_35981 MONSTER_ROOM_DEEP Lnet/minecraft/class_6880; - FIELD field_35982 FOSSIL_UPPER Lnet/minecraft/class_6880; - FIELD field_35983 FOSSIL_LOWER Lnet/minecraft/class_6880; - FIELD field_35984 DRIPSTONE_CLUSTER Lnet/minecraft/class_6880; - FIELD field_35985 LARGE_DRIPSTONE Lnet/minecraft/class_6880; - FIELD field_35986 POINTED_DRIPSTONE Lnet/minecraft/class_6880; - FIELD field_35987 UNDERWATER_MAGMA Lnet/minecraft/class_6880; - FIELD field_35988 GLOW_LICHEN Lnet/minecraft/class_6880; - FIELD field_35989 ROOTED_AZALEA_TREE Lnet/minecraft/class_6880; - FIELD field_35990 CAVE_VINES Lnet/minecraft/class_6880; - FIELD field_35991 LUSH_CAVES_VEGETATION Lnet/minecraft/class_6880; - FIELD field_35992 LUSH_CAVES_CLAY Lnet/minecraft/class_6880; - FIELD field_35993 LUSH_CAVES_CEILING_VEGETATION Lnet/minecraft/class_6880; - FIELD field_35994 SPORE_BLOSSOM Lnet/minecraft/class_6880; - FIELD field_35995 CLASSIC_VINES_CAVE_FEATURE Lnet/minecraft/class_6880; - FIELD field_35996 AMETHYST_GEODE Lnet/minecraft/class_6880; - FIELD field_38036 SCULK_PATCH_DEEP_DARK Lnet/minecraft/class_6880; - FIELD field_38037 SCULK_VEIN Lnet/minecraft/class_6880; - FIELD field_38478 SCULK_PATCH_ANCIENT_CITY Lnet/minecraft/class_6880; + FIELD field_35980 MONSTER_ROOM Lnet/minecraft/class_5321; + FIELD field_35981 MONSTER_ROOM_DEEP Lnet/minecraft/class_5321; + FIELD field_35982 FOSSIL_UPPER Lnet/minecraft/class_5321; + FIELD field_35983 FOSSIL_LOWER Lnet/minecraft/class_5321; + FIELD field_35984 DRIPSTONE_CLUSTER Lnet/minecraft/class_5321; + FIELD field_35985 LARGE_DRIPSTONE Lnet/minecraft/class_5321; + FIELD field_35986 POINTED_DRIPSTONE Lnet/minecraft/class_5321; + FIELD field_35987 UNDERWATER_MAGMA Lnet/minecraft/class_5321; + FIELD field_35988 GLOW_LICHEN Lnet/minecraft/class_5321; + FIELD field_35989 ROOTED_AZALEA_TREE Lnet/minecraft/class_5321; + FIELD field_35990 CAVE_VINES Lnet/minecraft/class_5321; + FIELD field_35991 LUSH_CAVES_VEGETATION Lnet/minecraft/class_5321; + FIELD field_35992 LUSH_CAVES_CLAY Lnet/minecraft/class_5321; + FIELD field_35993 LUSH_CAVES_CEILING_VEGETATION Lnet/minecraft/class_5321; + FIELD field_35994 SPORE_BLOSSOM Lnet/minecraft/class_5321; + FIELD field_35995 CLASSIC_VINES_CAVE_FEATURE Lnet/minecraft/class_5321; + FIELD field_35996 AMETHYST_GEODE Lnet/minecraft/class_5321; + FIELD field_38036 SCULK_PATCH_DEEP_DARK Lnet/minecraft/class_5321; + FIELD field_38037 SCULK_VEIN Lnet/minecraft/class_5321; + FIELD field_38478 SCULK_PATCH_ANCIENT_CITY Lnet/minecraft/class_5321; + METHOD method_46860 bootstrap (Lnet/minecraft/class_7891;)V + ARG 0 featureRegisterable diff --git a/mappings/net/minecraft/world/gen/feature/VegetationConfiguredFeatures.mapping b/mappings/net/minecraft/world/gen/feature/VegetationConfiguredFeatures.mapping index 9c992f168b..1b6018ea95 100644 --- a/mappings/net/minecraft/world/gen/feature/VegetationConfiguredFeatures.mapping +++ b/mappings/net/minecraft/world/gen/feature/VegetationConfiguredFeatures.mapping @@ -1,47 +1,50 @@ CLASS net/minecraft/class_6809 net/minecraft/world/gen/feature/VegetationConfiguredFeatures - FIELD field_35925 TREES_FLOWER_FOREST Lnet/minecraft/class_6880; - FIELD field_35926 MEADOW_TREES Lnet/minecraft/class_6880; - FIELD field_35927 TREES_TAIGA Lnet/minecraft/class_6880; - FIELD field_35928 TREES_GROVE Lnet/minecraft/class_6880; - FIELD field_35929 TREES_SAVANNA Lnet/minecraft/class_6880; - FIELD field_35930 BIRCH_TALL Lnet/minecraft/class_6880; - FIELD field_35931 TREES_WINDSWEPT_HILLS Lnet/minecraft/class_6880; - FIELD field_35932 TREES_WATER Lnet/minecraft/class_6880; - FIELD field_35933 TREES_BIRCH_AND_OAK Lnet/minecraft/class_6880; - FIELD field_35934 TREES_PLAINS Lnet/minecraft/class_6880; - FIELD field_35935 TREES_SPARSE_JUNGLE Lnet/minecraft/class_6880; - FIELD field_35936 TREES_OLD_GROWTH_SPRUCE_TAIGA Lnet/minecraft/class_6880; - FIELD field_35937 TREES_OLD_GROWTH_PINE_TAIGA Lnet/minecraft/class_6880; - FIELD field_35938 TREES_JUNGLE Lnet/minecraft/class_6880; - FIELD field_35939 BAMBOO_VEGETATION Lnet/minecraft/class_6880; - FIELD field_35940 MUSHROOM_ISLAND_VEGETATION Lnet/minecraft/class_6880; - FIELD field_35941 BAMBOO_NO_PODZOL Lnet/minecraft/class_6880; - FIELD field_35942 BAMBOO_SOME_PODZOL Lnet/minecraft/class_6880; - FIELD field_35943 VINES Lnet/minecraft/class_6880; - FIELD field_35944 PATCH_BROWN_MUSHROOM Lnet/minecraft/class_6880; - FIELD field_35945 PATCH_RED_MUSHROOM Lnet/minecraft/class_6880; - FIELD field_35946 PATCH_SUNFLOWER Lnet/minecraft/class_6880; - FIELD field_35947 PATCH_PUMPKIN Lnet/minecraft/class_6880; - FIELD field_35948 PATCH_BERRY_BUSH Lnet/minecraft/class_6880; - FIELD field_35949 PATCH_TAIGA_GRASS Lnet/minecraft/class_6880; - FIELD field_35950 PATCH_GRASS Lnet/minecraft/class_6880; - FIELD field_35951 PATCH_GRASS_JUNGLE Lnet/minecraft/class_6880; - FIELD field_35952 SINGLE_PIECE_OF_GRASS Lnet/minecraft/class_6880; - FIELD field_35953 PATCH_DEAD_BUSH Lnet/minecraft/class_6880; - FIELD field_35954 PATCH_MELON Lnet/minecraft/class_6880; - FIELD field_35955 PATCH_WATERLILY Lnet/minecraft/class_6880; - FIELD field_35956 PATCH_TALL_GRASS Lnet/minecraft/class_6880; - FIELD field_35957 PATCH_LARGE_FERN Lnet/minecraft/class_6880; - FIELD field_35958 PATCH_CACTUS Lnet/minecraft/class_6880; - FIELD field_35959 PATCH_SUGAR_CANE Lnet/minecraft/class_6880; - FIELD field_35960 FLOWER_DEFAULT Lnet/minecraft/class_6880; - FIELD field_35961 FLOWER_FLOWER_FOREST Lnet/minecraft/class_6880; - FIELD field_35962 FLOWER_SWAMP Lnet/minecraft/class_6880; - FIELD field_35963 FLOWER_PLAIN Lnet/minecraft/class_6880; - FIELD field_35964 FLOWER_MEADOW Lnet/minecraft/class_6880; - FIELD field_35965 FOREST_FLOWERS Lnet/minecraft/class_6880; - FIELD field_35966 DARK_FOREST_VEGETATION Lnet/minecraft/class_6880; - FIELD field_38812 MANGROVE_VEGETATION Lnet/minecraft/class_6880; + FIELD field_35925 TREES_FLOWER_FOREST Lnet/minecraft/class_5321; + FIELD field_35926 MEADOW_TREES Lnet/minecraft/class_5321; + FIELD field_35927 TREES_TAIGA Lnet/minecraft/class_5321; + FIELD field_35928 TREES_GROVE Lnet/minecraft/class_5321; + FIELD field_35929 TREES_SAVANNA Lnet/minecraft/class_5321; + FIELD field_35930 BIRCH_TALL Lnet/minecraft/class_5321; + FIELD field_35931 TREES_WINDSWEPT_HILLS Lnet/minecraft/class_5321; + FIELD field_35932 TREES_WATER Lnet/minecraft/class_5321; + FIELD field_35933 TREES_BIRCH_AND_OAK Lnet/minecraft/class_5321; + FIELD field_35934 TREES_PLAINS Lnet/minecraft/class_5321; + FIELD field_35935 TREES_SPARSE_JUNGLE Lnet/minecraft/class_5321; + FIELD field_35936 TREES_OLD_GROWTH_SPRUCE_TAIGA Lnet/minecraft/class_5321; + FIELD field_35937 TREES_OLD_GROWTH_PINE_TAIGA Lnet/minecraft/class_5321; + FIELD field_35938 TREES_JUNGLE Lnet/minecraft/class_5321; + FIELD field_35939 BAMBOO_VEGETATION Lnet/minecraft/class_5321; + FIELD field_35940 MUSHROOM_ISLAND_VEGETATION Lnet/minecraft/class_5321; + FIELD field_35941 BAMBOO_NO_PODZOL Lnet/minecraft/class_5321; + FIELD field_35942 BAMBOO_SOME_PODZOL Lnet/minecraft/class_5321; + FIELD field_35943 VINES Lnet/minecraft/class_5321; + FIELD field_35944 PATCH_BROWN_MUSHROOM Lnet/minecraft/class_5321; + FIELD field_35945 PATCH_RED_MUSHROOM Lnet/minecraft/class_5321; + FIELD field_35946 PATCH_SUNFLOWER Lnet/minecraft/class_5321; + FIELD field_35947 PATCH_PUMPKIN Lnet/minecraft/class_5321; + FIELD field_35948 PATCH_BERRY_BUSH Lnet/minecraft/class_5321; + FIELD field_35949 PATCH_TAIGA_GRASS Lnet/minecraft/class_5321; + FIELD field_35950 PATCH_GRASS Lnet/minecraft/class_5321; + FIELD field_35951 PATCH_GRASS_JUNGLE Lnet/minecraft/class_5321; + FIELD field_35952 SINGLE_PIECE_OF_GRASS Lnet/minecraft/class_5321; + FIELD field_35953 PATCH_DEAD_BUSH Lnet/minecraft/class_5321; + FIELD field_35954 PATCH_MELON Lnet/minecraft/class_5321; + FIELD field_35955 PATCH_WATERLILY Lnet/minecraft/class_5321; + FIELD field_35956 PATCH_TALL_GRASS Lnet/minecraft/class_5321; + FIELD field_35957 PATCH_LARGE_FERN Lnet/minecraft/class_5321; + FIELD field_35958 PATCH_CACTUS Lnet/minecraft/class_5321; + FIELD field_35959 PATCH_SUGAR_CANE Lnet/minecraft/class_5321; + FIELD field_35960 FLOWER_DEFAULT Lnet/minecraft/class_5321; + FIELD field_35961 FLOWER_FLOWER_FOREST Lnet/minecraft/class_5321; + FIELD field_35962 FLOWER_SWAMP Lnet/minecraft/class_5321; + FIELD field_35963 FLOWER_PLAIN Lnet/minecraft/class_5321; + FIELD field_35964 FLOWER_MEADOW Lnet/minecraft/class_5321; + FIELD field_35965 FOREST_FLOWERS Lnet/minecraft/class_5321; + FIELD field_35966 DARK_FOREST_VEGETATION Lnet/minecraft/class_5321; + FIELD field_38812 MANGROVE_VEGETATION Lnet/minecraft/class_5321; + FIELD field_42961 FLOWER_CHERRY Lnet/minecraft/class_5321; METHOD method_39717 createRandomPatchFeatureConfig (Lnet/minecraft/class_4651;I)Lnet/minecraft/class_4638; ARG 0 block ARG 1 tries + METHOD method_46858 bootstrap (Lnet/minecraft/class_7891;)V + ARG 0 featureRegisterable diff --git a/mappings/net/minecraft/world/gen/feature/VegetationPatchFeature.mapping b/mappings/net/minecraft/world/gen/feature/VegetationPatchFeature.mapping index e4bc094156..e774842822 100644 --- a/mappings/net/minecraft/world/gen/feature/VegetationPatchFeature.mapping +++ b/mappings/net/minecraft/world/gen/feature/VegetationPatchFeature.mapping @@ -17,12 +17,14 @@ CLASS net/minecraft/class_5922 net/minecraft/world/gen/feature/VegetationPatchFe ARG 1 world ARG 2 config ARG 3 replaceable + ARG 4 random ARG 5 pos ARG 6 depth METHOD method_34318 generateVegetation (Lnet/minecraft/class_5821;Lnet/minecraft/class_5281;Lnet/minecraft/class_5927;Lnet/minecraft/class_5819;Ljava/util/Set;II)V ARG 1 context ARG 2 world ARG 3 config + ARG 4 random ARG 5 positions ARG 6 radiusX ARG 7 radiusZ diff --git a/mappings/net/minecraft/world/gen/feature/VegetationPlacedFeatures.mapping b/mappings/net/minecraft/world/gen/feature/VegetationPlacedFeatures.mapping index 38d5924d66..46538cb7e7 100644 --- a/mappings/net/minecraft/world/gen/feature/VegetationPlacedFeatures.mapping +++ b/mappings/net/minecraft/world/gen/feature/VegetationPlacedFeatures.mapping @@ -1,87 +1,91 @@ CLASS net/minecraft/class_6819 net/minecraft/world/gen/feature/VegetationPlacedFeatures - FIELD field_36114 PATCH_SUGAR_CANE_SWAMP Lnet/minecraft/class_6880; - FIELD field_36115 PATCH_SUGAR_CANE_DESERT Lnet/minecraft/class_6880; - FIELD field_36116 PATCH_SUGAR_CANE_BADLANDS Lnet/minecraft/class_6880; - FIELD field_36117 PATCH_SUGAR_CANE Lnet/minecraft/class_6880; - FIELD field_36118 BROWN_MUSHROOM_NETHER Lnet/minecraft/class_6880; - FIELD field_36119 RED_MUSHROOM_NETHER Lnet/minecraft/class_6880; - FIELD field_36120 BROWN_MUSHROOM_NORMAL Lnet/minecraft/class_6880; - FIELD field_36121 RED_MUSHROOM_NORMAL Lnet/minecraft/class_6880; - FIELD field_36122 BROWN_MUSHROOM_TAIGA Lnet/minecraft/class_6880; - FIELD field_36123 RED_MUSHROOM_TAIGA Lnet/minecraft/class_6880; - FIELD field_36124 BROWN_MUSHROOM_OLD_GROWTH Lnet/minecraft/class_6880; - FIELD field_36125 RED_MUSHROOM_OLD_GROWTH Lnet/minecraft/class_6880; - FIELD field_36126 BROWN_MUSHROOM_SWAMP Lnet/minecraft/class_6880; - FIELD field_36127 RED_MUSHROOM_SWAMP Lnet/minecraft/class_6880; - FIELD field_36128 FLOWER_WARM Lnet/minecraft/class_6880; - FIELD field_36129 FLOWER_DEFAULT Lnet/minecraft/class_6880; - FIELD field_36130 FLOWER_FLOWER_FOREST Lnet/minecraft/class_6880; - FIELD field_36131 FLOWER_SWAMP Lnet/minecraft/class_6880; - FIELD field_36132 FLOWER_PLAIN Lnet/minecraft/class_6880; - FIELD field_36133 FLOWER_MEADOW Lnet/minecraft/class_6880; + FIELD field_36114 PATCH_SUGAR_CANE_SWAMP Lnet/minecraft/class_5321; + FIELD field_36115 PATCH_SUGAR_CANE_DESERT Lnet/minecraft/class_5321; + FIELD field_36116 PATCH_SUGAR_CANE_BADLANDS Lnet/minecraft/class_5321; + FIELD field_36117 PATCH_SUGAR_CANE Lnet/minecraft/class_5321; + FIELD field_36118 BROWN_MUSHROOM_NETHER Lnet/minecraft/class_5321; + FIELD field_36119 RED_MUSHROOM_NETHER Lnet/minecraft/class_5321; + FIELD field_36120 BROWN_MUSHROOM_NORMAL Lnet/minecraft/class_5321; + FIELD field_36121 RED_MUSHROOM_NORMAL Lnet/minecraft/class_5321; + FIELD field_36122 BROWN_MUSHROOM_TAIGA Lnet/minecraft/class_5321; + FIELD field_36123 RED_MUSHROOM_TAIGA Lnet/minecraft/class_5321; + FIELD field_36124 BROWN_MUSHROOM_OLD_GROWTH Lnet/minecraft/class_5321; + FIELD field_36125 RED_MUSHROOM_OLD_GROWTH Lnet/minecraft/class_5321; + FIELD field_36126 BROWN_MUSHROOM_SWAMP Lnet/minecraft/class_5321; + FIELD field_36127 RED_MUSHROOM_SWAMP Lnet/minecraft/class_5321; + FIELD field_36128 FLOWER_WARM Lnet/minecraft/class_5321; + FIELD field_36129 FLOWER_DEFAULT Lnet/minecraft/class_5321; + FIELD field_36130 FLOWER_FLOWER_FOREST Lnet/minecraft/class_5321; + FIELD field_36131 FLOWER_SWAMP Lnet/minecraft/class_5321; + FIELD field_36132 FLOWER_PLAIN Lnet/minecraft/class_5321; + FIELD field_36133 FLOWER_MEADOW Lnet/minecraft/class_5321; FIELD field_36134 NOT_IN_SURFACE_WATER_MODIFIER Lnet/minecraft/class_6797; - FIELD field_36135 TREES_PLAINS Lnet/minecraft/class_6880; - FIELD field_36136 DARK_FOREST_VEGETATION Lnet/minecraft/class_6880; - FIELD field_36137 FLOWER_FOREST_FLOWERS Lnet/minecraft/class_6880; - FIELD field_36138 FOREST_FLOWERS Lnet/minecraft/class_6880; - FIELD field_36139 TREES_FLOWER_FOREST Lnet/minecraft/class_6880; - FIELD field_36140 BAMBOO_LIGHT Lnet/minecraft/class_6880; - FIELD field_36141 TREES_MEADOW Lnet/minecraft/class_6880; - FIELD field_36142 TREES_TAIGA Lnet/minecraft/class_6880; - FIELD field_36143 TREES_GROVE Lnet/minecraft/class_6880; - FIELD field_36144 TREES_BADLANDS Lnet/minecraft/class_6880; - FIELD field_36145 TREES_SNOWY Lnet/minecraft/class_6880; - FIELD field_36146 TREES_SWAMP Lnet/minecraft/class_6880; - FIELD field_36147 TREES_WINDSWEPT_SAVANNA Lnet/minecraft/class_6880; - FIELD field_36148 TREES_SAVANNA Lnet/minecraft/class_6880; - FIELD field_36149 BIRCH_TALL Lnet/minecraft/class_6880; - FIELD field_36150 TREES_BIRCH Lnet/minecraft/class_6880; - FIELD field_36151 TREES_WINDSWEPT_FOREST Lnet/minecraft/class_6880; - FIELD field_36152 TREES_WINDSWEPT_HILLS Lnet/minecraft/class_6880; - FIELD field_36153 TREES_WATER Lnet/minecraft/class_6880; - FIELD field_36154 TREES_BIRCH_AND_OAK Lnet/minecraft/class_6880; - FIELD field_36155 TREES_SPARSE_JUNGLE Lnet/minecraft/class_6880; - FIELD field_36156 TREES_OLD_GROWTH_SPRUCE_TAIGA Lnet/minecraft/class_6880; - FIELD field_36157 TREES_OLD_GROWTH_PINE_TAIGA Lnet/minecraft/class_6880; - FIELD field_36158 TREES_JUNGLE Lnet/minecraft/class_6880; - FIELD field_36159 BAMBOO_VEGETATION Lnet/minecraft/class_6880; - FIELD field_36160 MUSHROOM_ISLAND_VEGETATION Lnet/minecraft/class_6880; - FIELD field_36161 BAMBOO Lnet/minecraft/class_6880; - FIELD field_36162 VINES Lnet/minecraft/class_6880; - FIELD field_36163 PATCH_SUNFLOWER Lnet/minecraft/class_6880; - FIELD field_36164 PATCH_PUMPKIN Lnet/minecraft/class_6880; - FIELD field_36165 PATCH_GRASS_PLAIN Lnet/minecraft/class_6880; - FIELD field_36166 PATCH_GRASS_FOREST Lnet/minecraft/class_6880; - FIELD field_36167 PATCH_GRASS_BADLANDS Lnet/minecraft/class_6880; - FIELD field_36168 PATCH_GRASS_SAVANNA Lnet/minecraft/class_6880; - FIELD field_36169 PATCH_GRASS_NORMAL Lnet/minecraft/class_6880; - FIELD field_36170 PATCH_GRASS_TAIGA_2 Lnet/minecraft/class_6880; - FIELD field_36171 PATCH_GRASS_TAIGA Lnet/minecraft/class_6880; - FIELD field_36172 PATCH_GRASS_JUNGLE Lnet/minecraft/class_6880; - FIELD field_36173 GRASS_BONEMEAL Lnet/minecraft/class_6880; - FIELD field_36174 PATCH_DEAD_BUSH_2 Lnet/minecraft/class_6880; - FIELD field_36175 PATCH_DEAD_BUSH Lnet/minecraft/class_6880; - FIELD field_36176 PATCH_DEAD_BUSH_BADLANDS Lnet/minecraft/class_6880; - FIELD field_36177 PATCH_MELON Lnet/minecraft/class_6880; - FIELD field_36178 PATCH_BERRY_COMMON Lnet/minecraft/class_6880; - FIELD field_36179 PATCH_BERRY_RARE Lnet/minecraft/class_6880; - FIELD field_36180 PATCH_WATERLILY Lnet/minecraft/class_6880; - FIELD field_36181 PATCH_TALL_GRASS_2 Lnet/minecraft/class_6880; - FIELD field_36182 PATCH_TALL_GRASS Lnet/minecraft/class_6880; - FIELD field_36183 PATCH_LARGE_FERN Lnet/minecraft/class_6880; - FIELD field_36184 PATCH_CACTUS_DESERT Lnet/minecraft/class_6880; - FIELD field_36185 PATCH_CACTUS_DECORATED Lnet/minecraft/class_6880; - FIELD field_36292 PATCH_MELON_SPARSE Lnet/minecraft/class_6880; - FIELD field_38816 TREES_MANGROVE Lnet/minecraft/class_6880; + FIELD field_36135 TREES_PLAINS Lnet/minecraft/class_5321; + FIELD field_36136 DARK_FOREST_VEGETATION Lnet/minecraft/class_5321; + FIELD field_36137 FLOWER_FOREST_FLOWERS Lnet/minecraft/class_5321; + FIELD field_36138 FOREST_FLOWERS Lnet/minecraft/class_5321; + FIELD field_36139 TREES_FLOWER_FOREST Lnet/minecraft/class_5321; + FIELD field_36140 BAMBOO_LIGHT Lnet/minecraft/class_5321; + FIELD field_36141 TREES_MEADOW Lnet/minecraft/class_5321; + FIELD field_36142 TREES_TAIGA Lnet/minecraft/class_5321; + FIELD field_36143 TREES_GROVE Lnet/minecraft/class_5321; + FIELD field_36144 TREES_BADLANDS Lnet/minecraft/class_5321; + FIELD field_36145 TREES_SNOWY Lnet/minecraft/class_5321; + FIELD field_36146 TREES_SWAMP Lnet/minecraft/class_5321; + FIELD field_36147 TREES_WINDSWEPT_SAVANNA Lnet/minecraft/class_5321; + FIELD field_36148 TREES_SAVANNA Lnet/minecraft/class_5321; + FIELD field_36149 BIRCH_TALL Lnet/minecraft/class_5321; + FIELD field_36150 TREES_BIRCH Lnet/minecraft/class_5321; + FIELD field_36151 TREES_WINDSWEPT_FOREST Lnet/minecraft/class_5321; + FIELD field_36152 TREES_WINDSWEPT_HILLS Lnet/minecraft/class_5321; + FIELD field_36153 TREES_WATER Lnet/minecraft/class_5321; + FIELD field_36154 TREES_BIRCH_AND_OAK Lnet/minecraft/class_5321; + FIELD field_36155 TREES_SPARSE_JUNGLE Lnet/minecraft/class_5321; + FIELD field_36156 TREES_OLD_GROWTH_SPRUCE_TAIGA Lnet/minecraft/class_5321; + FIELD field_36157 TREES_OLD_GROWTH_PINE_TAIGA Lnet/minecraft/class_5321; + FIELD field_36158 TREES_JUNGLE Lnet/minecraft/class_5321; + FIELD field_36159 BAMBOO_VEGETATION Lnet/minecraft/class_5321; + FIELD field_36160 MUSHROOM_ISLAND_VEGETATION Lnet/minecraft/class_5321; + FIELD field_36161 BAMBOO Lnet/minecraft/class_5321; + FIELD field_36162 VINES Lnet/minecraft/class_5321; + FIELD field_36163 PATCH_SUNFLOWER Lnet/minecraft/class_5321; + FIELD field_36164 PATCH_PUMPKIN Lnet/minecraft/class_5321; + FIELD field_36165 PATCH_GRASS_PLAIN Lnet/minecraft/class_5321; + FIELD field_36166 PATCH_GRASS_FOREST Lnet/minecraft/class_5321; + FIELD field_36167 PATCH_GRASS_BADLANDS Lnet/minecraft/class_5321; + FIELD field_36168 PATCH_GRASS_SAVANNA Lnet/minecraft/class_5321; + FIELD field_36169 PATCH_GRASS_NORMAL Lnet/minecraft/class_5321; + FIELD field_36170 PATCH_GRASS_TAIGA_2 Lnet/minecraft/class_5321; + FIELD field_36171 PATCH_GRASS_TAIGA Lnet/minecraft/class_5321; + FIELD field_36172 PATCH_GRASS_JUNGLE Lnet/minecraft/class_5321; + FIELD field_36173 GRASS_BONEMEAL Lnet/minecraft/class_5321; + FIELD field_36174 PATCH_DEAD_BUSH_2 Lnet/minecraft/class_5321; + FIELD field_36175 PATCH_DEAD_BUSH Lnet/minecraft/class_5321; + FIELD field_36176 PATCH_DEAD_BUSH_BADLANDS Lnet/minecraft/class_5321; + FIELD field_36177 PATCH_MELON Lnet/minecraft/class_5321; + FIELD field_36178 PATCH_BERRY_COMMON Lnet/minecraft/class_5321; + FIELD field_36179 PATCH_BERRY_RARE Lnet/minecraft/class_5321; + FIELD field_36180 PATCH_WATERLILY Lnet/minecraft/class_5321; + FIELD field_36181 PATCH_TALL_GRASS_2 Lnet/minecraft/class_5321; + FIELD field_36182 PATCH_TALL_GRASS Lnet/minecraft/class_5321; + FIELD field_36183 PATCH_LARGE_FERN Lnet/minecraft/class_5321; + FIELD field_36184 PATCH_CACTUS_DESERT Lnet/minecraft/class_5321; + FIELD field_36185 PATCH_CACTUS_DECORATED Lnet/minecraft/class_5321; + FIELD field_36292 PATCH_MELON_SPARSE Lnet/minecraft/class_5321; + FIELD field_38816 TREES_MANGROVE Lnet/minecraft/class_5321; + FIELD field_42964 FLOWER_CHERRY Lnet/minecraft/class_5321; + FIELD field_42965 TREES_CHERRY Lnet/minecraft/class_5321; METHOD method_39738 modifiers (I)Ljava/util/List; ARG 0 count - METHOD method_39739 modifiersWithChance (ILnet/minecraft/class_6797;)Ljava/util/List; + METHOD method_39739 mushroomModifiers (ILnet/minecraft/class_6797;)Ljava/util/List; ARG 0 chance ARG 1 modifier - METHOD method_39740 modifiers (Lnet/minecraft/class_6797;)Ljava/util/List; + METHOD method_39740 treeModifiers (Lnet/minecraft/class_6797;)Ljava/util/List; ARG 0 modifier - METHOD method_39741 modifiersWithWouldSurvive (Lnet/minecraft/class_6797;Lnet/minecraft/class_2248;)Ljava/util/List; + METHOD method_39741 treeModifiersWithWouldSurvive (Lnet/minecraft/class_6797;Lnet/minecraft/class_2248;)Ljava/util/List; ARG 0 modifier ARG 1 block - METHOD method_39742 modifiersBuilder (Lnet/minecraft/class_6797;)Lcom/google/common/collect/ImmutableList$Builder; + METHOD method_39742 treeModifiersBuilder (Lnet/minecraft/class_6797;)Lcom/google/common/collect/ImmutableList$Builder; ARG 0 countModifier + METHOD method_46867 bootstrap (Lnet/minecraft/class_7891;)V + ARG 0 featureRegisterable diff --git a/mappings/net/minecraft/world/gen/feature/VillagePlacedFeatures.mapping b/mappings/net/minecraft/world/gen/feature/VillagePlacedFeatures.mapping index 12bccbc13d..ea9f18169c 100644 --- a/mappings/net/minecraft/world/gen/feature/VillagePlacedFeatures.mapping +++ b/mappings/net/minecraft/world/gen/feature/VillagePlacedFeatures.mapping @@ -1,14 +1,16 @@ CLASS net/minecraft/class_6825 net/minecraft/world/gen/feature/VillagePlacedFeatures - FIELD field_36195 PILE_HAY Lnet/minecraft/class_6880; - FIELD field_36196 PILE_MELON Lnet/minecraft/class_6880; - FIELD field_36197 PILE_SNOW Lnet/minecraft/class_6880; - FIELD field_36198 PILE_ICE Lnet/minecraft/class_6880; - FIELD field_36199 PILE_PUMPKIN Lnet/minecraft/class_6880; - FIELD field_36200 OAK Lnet/minecraft/class_6880; - FIELD field_36201 ACACIA Lnet/minecraft/class_6880; - FIELD field_36202 SPRUCE Lnet/minecraft/class_6880; - FIELD field_36203 PINE Lnet/minecraft/class_6880; - FIELD field_36204 PATCH_CACTUS Lnet/minecraft/class_6880; - FIELD field_36205 FLOWER_PLAIN Lnet/minecraft/class_6880; - FIELD field_36206 PATCH_TAIGA_GRASS Lnet/minecraft/class_6880; - FIELD field_36207 PATCH_BERRY_BUSH Lnet/minecraft/class_6880; + FIELD field_36195 PILE_HAY Lnet/minecraft/class_5321; + FIELD field_36196 PILE_MELON Lnet/minecraft/class_5321; + FIELD field_36197 PILE_SNOW Lnet/minecraft/class_5321; + FIELD field_36198 PILE_ICE Lnet/minecraft/class_5321; + FIELD field_36199 PILE_PUMPKIN Lnet/minecraft/class_5321; + FIELD field_36200 OAK Lnet/minecraft/class_5321; + FIELD field_36201 ACACIA Lnet/minecraft/class_5321; + FIELD field_36202 SPRUCE Lnet/minecraft/class_5321; + FIELD field_36203 PINE Lnet/minecraft/class_5321; + FIELD field_36204 PATCH_CACTUS Lnet/minecraft/class_5321; + FIELD field_36205 FLOWER_PLAIN Lnet/minecraft/class_5321; + FIELD field_36206 PATCH_TAIGA_GRASS Lnet/minecraft/class_5321; + FIELD field_36207 PATCH_BERRY_BUSH Lnet/minecraft/class_5321; + METHOD method_46868 bootstrap (Lnet/minecraft/class_7891;)V + ARG 0 featureRegisterable diff --git a/mappings/net/minecraft/world/gen/feature/VoidStartPlatformFeature.mapping b/mappings/net/minecraft/world/gen/feature/VoidStartPlatformFeature.mapping index 628283003c..6cf8629f11 100644 --- a/mappings/net/minecraft/world/gen/feature/VoidStartPlatformFeature.mapping +++ b/mappings/net/minecraft/world/gen/feature/VoidStartPlatformFeature.mapping @@ -1,6 +1,7 @@ CLASS net/minecraft/class_3217 net/minecraft/world/gen/feature/VoidStartPlatformFeature FIELD field_19241 START_BLOCK Lnet/minecraft/class_2338; FIELD field_19242 START_CHUNK Lnet/minecraft/class_1923; + FIELD field_31520 MAX_RADIUS I METHOD method_20403 getDistance (IIII)I ARG 0 x1 ARG 1 z1 diff --git a/mappings/net/minecraft/world/gen/feature/size/FeatureSize.mapping b/mappings/net/minecraft/world/gen/feature/size/FeatureSize.mapping index 11be171b0b..a84a654447 100644 --- a/mappings/net/minecraft/world/gen/feature/size/FeatureSize.mapping +++ b/mappings/net/minecraft/world/gen/feature/size/FeatureSize.mapping @@ -10,4 +10,8 @@ CLASS net/minecraft/class_5201 net/minecraft/world/gen/feature/size/FeatureSize ARG 1 height ARG 2 y METHOD method_28820 createCodec ()Lcom/mojang/serialization/codecs/RecordCodecBuilder; + METHOD method_28822 (Ljava/util/Optional;)Ljava/util/OptionalInt; + ARG 0 minClippedHeight + METHOD method_28823 (Ljava/util/OptionalInt;)Ljava/util/Optional; + ARG 0 minClippedHeight METHOD method_28824 getType ()Lnet/minecraft/class_5202; diff --git a/mappings/net/minecraft/world/gen/foliage/CherryFoliagePlacer.mapping b/mappings/net/minecraft/world/gen/foliage/CherryFoliagePlacer.mapping new file mode 100644 index 0000000000..64160b33ea --- /dev/null +++ b/mappings/net/minecraft/world/gen/foliage/CherryFoliagePlacer.mapping @@ -0,0 +1,25 @@ +CLASS net/minecraft/class_8178 net/minecraft/world/gen/foliage/CherryFoliagePlacer + FIELD field_42841 CODEC Lcom/mojang/serialization/Codec; + FIELD field_42842 height Lnet/minecraft/class_6017; + FIELD field_42843 wideBottomLayerHoleChance F + FIELD field_42844 cornerHoleChance F + FIELD field_42845 hangingLeavesChance F + FIELD field_42846 hangingLeavesExtensionChance F + METHOD (Lnet/minecraft/class_6017;Lnet/minecraft/class_6017;Lnet/minecraft/class_6017;FFFF)V + ARG 1 radius + ARG 2 offset + ARG 3 height + ARG 4 wideBottomLayerHoleChance + ARG 5 cornerHoleChance + ARG 6 hangingLeavesChance + ARG 7 hangingLeavesExtensionChance + METHOD method_49242 (Lnet/minecraft/class_8178;)Ljava/lang/Float; + ARG 0 foliagePlacer + METHOD method_49243 (Lnet/minecraft/class_8178;)Ljava/lang/Float; + ARG 0 foliagePlacer + METHOD method_49244 (Lnet/minecraft/class_8178;)Ljava/lang/Float; + ARG 0 foliagePlacer + METHOD method_49245 (Lnet/minecraft/class_8178;)Ljava/lang/Float; + ARG 0 foliagePlacer + METHOD method_49246 (Lnet/minecraft/class_8178;)Lnet/minecraft/class_6017; + ARG 0 foliagePlacer diff --git a/mappings/net/minecraft/world/gen/foliage/FoliagePlacer.mapping b/mappings/net/minecraft/world/gen/foliage/FoliagePlacer.mapping index 5c0a31e201..5e47e92dc1 100644 --- a/mappings/net/minecraft/world/gen/foliage/FoliagePlacer.mapping +++ b/mappings/net/minecraft/world/gen/foliage/FoliagePlacer.mapping @@ -5,10 +5,10 @@ CLASS net/minecraft/class_4647 net/minecraft/world/gen/foliage/FoliagePlacer METHOD (Lnet/minecraft/class_6017;Lnet/minecraft/class_6017;)V ARG 1 radius ARG 2 offset - METHOD method_23448 generate (Lnet/minecraft/class_3746;Ljava/util/function/BiConsumer;Lnet/minecraft/class_5819;Lnet/minecraft/class_4643;ILnet/minecraft/class_4647$class_5208;III)V + METHOD method_23448 generate (Lnet/minecraft/class_3746;Lnet/minecraft/class_4647$class_8179;Lnet/minecraft/class_5819;Lnet/minecraft/class_4643;ILnet/minecraft/class_4647$class_5208;III)V COMMENT This is the main method used to generate foliage. ARG 1 world - ARG 2 replacer + ARG 2 placer ARG 3 random ARG 4 config ARG 5 trunkHeight @@ -16,10 +16,10 @@ CLASS net/minecraft/class_4647 net/minecraft/world/gen/foliage/FoliagePlacer ARG 7 foliageHeight ARG 8 radius ARG 9 offset - METHOD method_23449 generateSquare (Lnet/minecraft/class_3746;Ljava/util/function/BiConsumer;Lnet/minecraft/class_5819;Lnet/minecraft/class_4643;Lnet/minecraft/class_2338;IIZ)V + METHOD method_23449 generateSquare (Lnet/minecraft/class_3746;Lnet/minecraft/class_4647$class_8179;Lnet/minecraft/class_5819;Lnet/minecraft/class_4643;Lnet/minecraft/class_2338;IIZ)V COMMENT Generates a square of leaves with the given radius. Sub-classes can use the method {@code isInvalidForLeaves} to exclude certain positions, such as corners. ARG 1 world - ARG 2 replacer + ARG 2 placer ARG 3 random ARG 4 config ARG 5 centerPos @@ -41,9 +41,9 @@ CLASS net/minecraft/class_4647 net/minecraft/world/gen/foliage/FoliagePlacer ARG 1 random ARG 2 trunkHeight ARG 3 config - METHOD method_27385 generate (Lnet/minecraft/class_3746;Ljava/util/function/BiConsumer;Lnet/minecraft/class_5819;Lnet/minecraft/class_4643;ILnet/minecraft/class_4647$class_5208;II)V + METHOD method_27385 generate (Lnet/minecraft/class_3746;Lnet/minecraft/class_4647$class_8179;Lnet/minecraft/class_5819;Lnet/minecraft/class_4643;ILnet/minecraft/class_4647$class_5208;II)V ARG 1 world - ARG 2 replacer + ARG 2 placer ARG 3 random ARG 4 config ARG 5 trunkHeight @@ -64,16 +64,36 @@ CLASS net/minecraft/class_4647 net/minecraft/world/gen/foliage/FoliagePlacer METHOD method_30410 (Lnet/minecraft/class_4647;)Lnet/minecraft/class_6017; ARG 0 placer METHOD method_30411 fillFoliagePlacerFields (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/Products$P2; + ARG 0 instance METHOD method_30412 (Lnet/minecraft/class_4647;)Lnet/minecraft/class_6017; ARG 0 placer - METHOD method_34359 placeFoliageBlock (Lnet/minecraft/class_3746;Ljava/util/function/BiConsumer;Lnet/minecraft/class_5819;Lnet/minecraft/class_4643;Lnet/minecraft/class_2338;)V + METHOD method_34359 placeFoliageBlock (Lnet/minecraft/class_3746;Lnet/minecraft/class_4647$class_8179;Lnet/minecraft/class_5819;Lnet/minecraft/class_4643;Lnet/minecraft/class_2338;)Z ARG 0 world - ARG 1 replacer + ARG 1 placer ARG 2 random ARG 3 config ARG 4 pos METHOD method_42380 (Lnet/minecraft/class_3610;)Z ARG 0 fluidState + METHOD method_49247 generateSquareWithHangingLeaves (Lnet/minecraft/class_3746;Lnet/minecraft/class_4647$class_8179;Lnet/minecraft/class_5819;Lnet/minecraft/class_4643;Lnet/minecraft/class_2338;IIZFF)V + ARG 1 world + ARG 2 placer + ARG 3 random + ARG 4 config + ARG 5 centerPos + ARG 6 radius + ARG 7 y + ARG 8 giantTrunk + ARG 9 hangingLeavesChance + ARG 10 hangingLeavesExtensionChance + METHOD method_49884 placeFoliageBlock (Lnet/minecraft/class_3746;Lnet/minecraft/class_4647$class_8179;Lnet/minecraft/class_5819;Lnet/minecraft/class_4643;FLnet/minecraft/class_2338;Lnet/minecraft/class_2338$class_2339;)Z + ARG 0 world + ARG 1 placer + ARG 2 random + ARG 3 config + ARG 4 chance + ARG 5 origin + ARG 6 pos CLASS class_5208 TreeNode COMMENT A point on a tree to generate foliage around FIELD field_24158 center Lnet/minecraft/class_2338; @@ -87,3 +107,9 @@ CLASS net/minecraft/class_4647 net/minecraft/world/gen/foliage/FoliagePlacer METHOD method_27389 getFoliageRadius ()I METHOD method_27390 isGiantTrunk ()Z COMMENT Whether this node is the top of a giant (2x2 block) trunk + CLASS class_8179 BlockPlacer + METHOD method_49239 hasPlacedBlock (Lnet/minecraft/class_2338;)Z + ARG 1 pos + METHOD method_49240 placeBlock (Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;)V + ARG 1 pos + ARG 2 state diff --git a/mappings/net/minecraft/world/gen/heightprovider/ConstantHeightProvider.mapping b/mappings/net/minecraft/world/gen/heightprovider/ConstantHeightProvider.mapping index f6796454ce..2a4bd08066 100644 --- a/mappings/net/minecraft/world/gen/heightprovider/ConstantHeightProvider.mapping +++ b/mappings/net/minecraft/world/gen/heightprovider/ConstantHeightProvider.mapping @@ -4,16 +4,6 @@ CLASS net/minecraft/class_6121 net/minecraft/world/gen/heightprovider/ConstantHe FIELD field_31538 offset Lnet/minecraft/class_5843; METHOD (Lnet/minecraft/class_5843;)V ARG 1 offset - METHOD method_35381 (Lcom/mojang/datafixers/util/Either;)Lnet/minecraft/class_6121; - ARG 0 either - METHOD method_35382 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; - ARG 0 instance METHOD method_35383 create (Lnet/minecraft/class_5843;)Lnet/minecraft/class_6121; ARG 0 offset - METHOD method_35384 (Lnet/minecraft/class_6121;)Lcom/mojang/datafixers/util/Either; - ARG 0 provider METHOD method_35385 getOffset ()Lnet/minecraft/class_5843; - METHOD method_35386 (Lnet/minecraft/class_6121;)Lnet/minecraft/class_6121; - ARG 0 provider - METHOD method_35387 (Lnet/minecraft/class_6121;)Lnet/minecraft/class_5843; - ARG 0 provider diff --git a/mappings/net/minecraft/world/gen/heightprovider/HeightProvider.mapping b/mappings/net/minecraft/world/gen/heightprovider/HeightProvider.mapping index c322decd70..ab19a39842 100644 --- a/mappings/net/minecraft/world/gen/heightprovider/HeightProvider.mapping +++ b/mappings/net/minecraft/world/gen/heightprovider/HeightProvider.mapping @@ -1,4 +1,5 @@ CLASS net/minecraft/class_6122 net/minecraft/world/gen/heightprovider/HeightProvider + FIELD field_31539 OFFSET_OR_HEIGHT_CODEC Lcom/mojang/serialization/Codec; FIELD field_31540 CODEC Lcom/mojang/serialization/Codec; METHOD method_35388 getType ()Lnet/minecraft/class_6123; METHOD method_35389 (Lcom/mojang/datafixers/util/Either;)Lnet/minecraft/class_6122; diff --git a/mappings/net/minecraft/world/gen/noise/BuiltinNoiseParameters.mapping b/mappings/net/minecraft/world/gen/noise/BuiltinNoiseParameters.mapping index c8b1acdaa3..08ba82b55e 100644 --- a/mappings/net/minecraft/world/gen/noise/BuiltinNoiseParameters.mapping +++ b/mappings/net/minecraft/world/gen/noise/BuiltinNoiseParameters.mapping @@ -1,4 +1,17 @@ CLASS net/minecraft/class_6736 net/minecraft/world/gen/noise/BuiltinNoiseParameters - METHOD method_39216 init (Lnet/minecraft/class_2378;)Lnet/minecraft/class_6880; - METHOD method_39217 register (Lnet/minecraft/class_2378;Lnet/minecraft/class_5321;ID[D)Lnet/minecraft/class_6880; - METHOD method_39493 register (Lnet/minecraft/class_2378;ILnet/minecraft/class_5321;Lnet/minecraft/class_5321;Lnet/minecraft/class_5321;Lnet/minecraft/class_5321;)V + FIELD field_40960 OFFSET Lnet/minecraft/class_5216$class_5487; + METHOD method_39216 bootstrap (Lnet/minecraft/class_7891;)V + ARG 0 noiseParametersRegisterable + METHOD method_39217 register (Lnet/minecraft/class_7891;Lnet/minecraft/class_5321;ID[D)V + ARG 0 noiseParametersRegisterable + ARG 1 key + ARG 2 firstOctave + ARG 3 firstAmplitude + ARG 5 amplitudes + METHOD method_39493 register (Lnet/minecraft/class_7891;ILnet/minecraft/class_5321;Lnet/minecraft/class_5321;Lnet/minecraft/class_5321;Lnet/minecraft/class_5321;)V + ARG 0 noiseParametersRegisterable + ARG 1 octaveOffset + ARG 2 temperatureKey + ARG 3 vegetationKey + ARG 4 continentalnessKey + ARG 5 erosionKey diff --git a/mappings/net/minecraft/world/gen/noise/NoiseConfig.mapping b/mappings/net/minecraft/world/gen/noise/NoiseConfig.mapping index d03c329f86..3c5077a97a 100644 --- a/mappings/net/minecraft/world/gen/noise/NoiseConfig.mapping +++ b/mappings/net/minecraft/world/gen/noise/NoiseConfig.mapping @@ -1,7 +1,6 @@ CLASS net/minecraft/class_7138 net/minecraft/world/gen/noise/NoiseConfig FIELD field_38254 randomDeriver Lnet/minecraft/class_6574; - FIELD field_38255 legacyWorldSeed J - FIELD field_38256 noiseParametersRegistry Lnet/minecraft/class_2378; + FIELD field_38256 noiseParametersRegistry Lnet/minecraft/class_7871; FIELD field_38257 noiseRouter Lnet/minecraft/class_6953; FIELD field_38258 multiNoiseSampler Lnet/minecraft/class_6544$class_6552; FIELD field_38259 surfaceBuilder Lnet/minecraft/class_6724; @@ -9,16 +8,16 @@ CLASS net/minecraft/class_7138 net/minecraft/world/gen/noise/NoiseConfig FIELD field_38261 oreRandomDeriver Lnet/minecraft/class_6574; FIELD field_38262 noises Ljava/util/Map; FIELD field_38263 randomDerivers Ljava/util/Map; - METHOD (Lnet/minecraft/class_5284;Lnet/minecraft/class_2378;J)V + METHOD (Lnet/minecraft/class_5284;Lnet/minecraft/class_7871;J)V ARG 1 chunkGeneratorSettings - ARG 2 noiseRegistry + ARG 2 noiseParametersLookup ARG 3 seed - METHOD method_41556 create (Lnet/minecraft/class_5284;Lnet/minecraft/class_2378;J)Lnet/minecraft/class_7138; + METHOD method_41556 create (Lnet/minecraft/class_5284;Lnet/minecraft/class_7871;J)Lnet/minecraft/class_7138; ARG 0 chunkGeneratorSettings - ARG 1 noiseParametersRegistry + ARG 1 noiseParametersLookup ARG 2 legacyWorldSeed - METHOD method_41557 create (Lnet/minecraft/class_5455;Lnet/minecraft/class_5321;J)Lnet/minecraft/class_7138; - ARG 0 dynamicRegistryManager + METHOD method_41557 create (Lnet/minecraft/class_7871$class_7872;Lnet/minecraft/class_5321;J)Lnet/minecraft/class_7138; + ARG 0 registryLookup ARG 1 chunkGeneratorSettingsKey ARG 2 legacyWorldSeed METHOD method_41558 getOrCreateSampler (Lnet/minecraft/class_5321;)Lnet/minecraft/class_5216; @@ -29,12 +28,15 @@ CLASS net/minecraft/class_7138 net/minecraft/world/gen/noise/NoiseConfig ARG 1 id METHOD method_41561 (Lnet/minecraft/class_2960;Lnet/minecraft/class_2960;)Lnet/minecraft/class_6574; ARG 2 id2 - METHOD method_42369 getLegacyWorldSeed ()J METHOD method_42370 getNoiseRouter ()Lnet/minecraft/class_6953; METHOD method_42371 getMultiNoiseSampler ()Lnet/minecraft/class_6544$class_6552; METHOD method_42372 getSurfaceBuilder ()Lnet/minecraft/class_6724; METHOD method_42373 getAquiferRandomDeriver ()Lnet/minecraft/class_6574; METHOD method_42374 getOreRandomDeriver ()Lnet/minecraft/class_6574; + CLASS 1 + FIELD field_40362 unwrapped Ljava/util/Map; + METHOD method_45512 unwrap (Lnet/minecraft/class_6910;)Lnet/minecraft/class_6910; + ARG 1 densityFunction CLASS class_7271 LegacyNoiseDensityFunctionVisitor FIELD field_38267 cache Ljava/util/Map; METHOD method_42375 createRandom (J)Lnet/minecraft/class_5819; diff --git a/mappings/net/minecraft/world/gen/noise/NoiseParametersKeys.mapping b/mappings/net/minecraft/world/gen/noise/NoiseParametersKeys.mapping index 38558c1917..e33037ad2b 100644 --- a/mappings/net/minecraft/world/gen/noise/NoiseParametersKeys.mapping +++ b/mappings/net/minecraft/world/gen/noise/NoiseParametersKeys.mapping @@ -1,4 +1,7 @@ CLASS net/minecraft/class_6731 net/minecraft/world/gen/noise/NoiseParametersKeys - METHOD method_39174 register (Ljava/lang/String;)Lnet/minecraft/class_5321; + METHOD method_39174 of (Ljava/lang/String;)Lnet/minecraft/class_5321; ARG 0 id - METHOD method_41127 createNoiseSampler (Lnet/minecraft/class_2378;Lnet/minecraft/class_6574;Lnet/minecraft/class_5321;)Lnet/minecraft/class_5216; + METHOD method_41127 createNoiseSampler (Lnet/minecraft/class_7871;Lnet/minecraft/class_6574;Lnet/minecraft/class_5321;)Lnet/minecraft/class_5216; + ARG 0 noiseParametersLookup + ARG 1 splitter + ARG 2 key diff --git a/mappings/net/minecraft/world/gen/stateprovider/BlockStateProvider.mapping b/mappings/net/minecraft/world/gen/stateprovider/BlockStateProvider.mapping index ff54324a5f..f4786a4f00 100644 --- a/mappings/net/minecraft/world/gen/stateprovider/BlockStateProvider.mapping +++ b/mappings/net/minecraft/world/gen/stateprovider/BlockStateProvider.mapping @@ -1,7 +1,7 @@ CLASS net/minecraft/class_4651 net/minecraft/world/gen/stateprovider/BlockStateProvider COMMENT A provider for {@linkplain BlockState block states}. Results may be random or based on a block position. FIELD field_24937 TYPE_CODEC Lcom/mojang/serialization/Codec; - METHOD method_23455 getBlockState (Lnet/minecraft/class_5819;Lnet/minecraft/class_2338;)Lnet/minecraft/class_2680; + METHOD method_23455 get (Lnet/minecraft/class_5819;Lnet/minecraft/class_2338;)Lnet/minecraft/class_2680; COMMENT {@return a provided block state} ARG 1 random ARG 2 pos diff --git a/mappings/net/minecraft/world/gen/structure/DesertPyramidStructure.mapping b/mappings/net/minecraft/world/gen/structure/DesertPyramidStructure.mapping index 30a6bbb0cc..140dad8955 100644 --- a/mappings/net/minecraft/world/gen/structure/DesertPyramidStructure.mapping +++ b/mappings/net/minecraft/world/gen/structure/DesertPyramidStructure.mapping @@ -1,2 +1,8 @@ CLASS net/minecraft/class_3006 net/minecraft/world/gen/structure/DesertPyramidStructure FIELD field_37791 CODEC Lcom/mojang/serialization/Codec; + METHOD method_51181 placeSuspiciousSand (Lnet/minecraft/class_3341;Lnet/minecraft/class_5281;Lnet/minecraft/class_2338;)V + ARG 0 box + ARG 1 world + ARG 2 pos + METHOD method_51182 (Lnet/minecraft/class_2338;Lnet/minecraft/class_8174;)V + ARG 1 blockEntity diff --git a/mappings/net/minecraft/world/gen/structure/JigsawStructure.mapping b/mappings/net/minecraft/world/gen/structure/JigsawStructure.mapping index 47d1a72a8c..2325a9b30d 100644 --- a/mappings/net/minecraft/world/gen/structure/JigsawStructure.mapping +++ b/mappings/net/minecraft/world/gen/structure/JigsawStructure.mapping @@ -32,8 +32,6 @@ CLASS net/minecraft/class_5434 net/minecraft/world/gen/structure/JigsawStructure ARG 8 maxDistanceFromCenter METHOD method_41662 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; ARG 0 instance - METHOD method_42703 (Lnet/minecraft/class_5434;)Lcom/mojang/serialization/DataResult; - ARG 0 feature METHOD method_42704 (Lnet/minecraft/class_5434;)Ljava/lang/Integer; ARG 0 structure METHOD method_42705 (Lnet/minecraft/class_5434;)Ljava/util/Optional; @@ -42,7 +40,8 @@ CLASS net/minecraft/class_5434 net/minecraft/world/gen/structure/JigsawStructure ARG 0 structure METHOD method_42707 (Lnet/minecraft/class_5434;)Lnet/minecraft/class_6122; ARG 0 structure - METHOD method_42708 createValidator ()Ljava/util/function/Function; + METHOD method_42708 validate (Lnet/minecraft/class_5434;)Lcom/mojang/serialization/DataResult; + ARG 0 structure METHOD method_42709 (Lnet/minecraft/class_5434;)Ljava/lang/Integer; ARG 0 structure METHOD method_42710 (Lnet/minecraft/class_5434;)Lnet/minecraft/class_6880; diff --git a/mappings/net/minecraft/world/gen/structure/MineshaftStructure.mapping b/mappings/net/minecraft/world/gen/structure/MineshaftStructure.mapping index c41f0c41f0..dafcbd3488 100644 --- a/mappings/net/minecraft/world/gen/structure/MineshaftStructure.mapping +++ b/mappings/net/minecraft/world/gen/structure/MineshaftStructure.mapping @@ -6,20 +6,24 @@ CLASS net/minecraft/class_3098 net/minecraft/world/gen/structure/MineshaftStruct ARG 2 type METHOD method_38678 addPieces (Lnet/minecraft/class_6626;Lnet/minecraft/class_3195$class_7149;)I ARG 1 collector + ARG 2 context + METHOD method_41667 (Lnet/minecraft/class_3098;)Lnet/minecraft/class_3098$class_3100; + ARG 0 mineshaftStructure CLASS class_3100 Type FIELD field_13689 name Ljava/lang/String; FIELD field_24839 CODEC Lcom/mojang/serialization/Codec; FIELD field_28850 log Lnet/minecraft/class_2680; FIELD field_28851 planks Lnet/minecraft/class_2680; FIELD field_28852 fence Lnet/minecraft/class_2680; + FIELD field_41680 BY_ID Ljava/util/function/IntFunction; METHOD (Ljava/lang/String;ILjava/lang/String;Lnet/minecraft/class_2248;Lnet/minecraft/class_2248;Lnet/minecraft/class_2248;)V ARG 3 name ARG 4 log ARG 5 planks ARG 6 fence METHOD method_13534 getName ()Ljava/lang/String; - METHOD method_13535 byIndex (I)Lnet/minecraft/class_3098$class_3100; - ARG 0 index + METHOD method_13535 byId (I)Lnet/minecraft/class_3098$class_3100; + ARG 0 id METHOD method_33760 getLog ()Lnet/minecraft/class_2680; METHOD method_33761 getPlanks ()Lnet/minecraft/class_2680; METHOD method_33762 getFence ()Lnet/minecraft/class_2680; diff --git a/mappings/net/minecraft/world/gen/structure/NetherFossilStructure.mapping b/mappings/net/minecraft/world/gen/structure/NetherFossilStructure.mapping index d90fc53057..d7728434f0 100644 --- a/mappings/net/minecraft/world/gen/structure/NetherFossilStructure.mapping +++ b/mappings/net/minecraft/world/gen/structure/NetherFossilStructure.mapping @@ -6,5 +6,6 @@ CLASS net/minecraft/class_4785 net/minecraft/world/gen/structure/NetherFossilStr ARG 2 height METHOD method_41672 (Lnet/minecraft/class_3195$class_7149;Lnet/minecraft/class_2919;Lnet/minecraft/class_2338;Lnet/minecraft/class_6626;)V ARG 0 collector + ARG 3 holder METHOD method_41673 (Lnet/minecraft/class_4785;)Lnet/minecraft/class_6122; ARG 0 structure diff --git a/mappings/net/minecraft/world/gen/structure/RuinedPortalStructure.mapping b/mappings/net/minecraft/world/gen/structure/RuinedPortalStructure.mapping index d61a38fd8e..321aaa1190 100644 --- a/mappings/net/minecraft/world/gen/structure/RuinedPortalStructure.mapping +++ b/mappings/net/minecraft/world/gen/structure/RuinedPortalStructure.mapping @@ -1,6 +1,8 @@ CLASS net/minecraft/class_5183 net/minecraft/world/gen/structure/RuinedPortalStructure FIELD field_23998 RARE_PORTAL_STRUCTURE_IDS [Ljava/lang/String; FIELD field_23999 COMMON_PORTAL_STRUCTURE_IDS [Ljava/lang/String; + FIELD field_31511 MIN_BLOCKS_ABOVE_WORLD_BOTTOM I + FIELD field_31512 RARE_PORTAL_CHANCE F FIELD field_37812 CODEC Lcom/mojang/serialization/Codec; FIELD field_37813 setups Ljava/util/List; METHOD (Lnet/minecraft/class_3195$class_7302;Ljava/util/List;)V @@ -9,6 +11,8 @@ CLASS net/minecraft/class_5183 net/minecraft/world/gen/structure/RuinedPortalStr METHOD (Lnet/minecraft/class_3195$class_7302;Lnet/minecraft/class_5183$class_7155;)V ARG 1 config ARG 2 setup + METHOD method_27205 (Lnet/minecraft/class_2794;Lnet/minecraft/class_5539;Lnet/minecraft/class_7138;Lnet/minecraft/class_2338;)Lnet/minecraft/class_4966; + ARG 3 pos METHOD method_27209 isColdAt (Lnet/minecraft/class_2338;Lnet/minecraft/class_6880;)Z ARG 0 pos ARG 1 biome @@ -26,6 +30,12 @@ CLASS net/minecraft/class_5183 net/minecraft/world/gen/structure/RuinedPortalStr ARG 6 box ARG 7 world ARG 8 noiseConfig + METHOD method_41682 shouldPlaceAirPocket (Lnet/minecraft/class_2919;F)Z + ARG 0 random + ARG 1 probability + METHOD method_41683 (Lnet/minecraft/class_5183$class_7155;Lnet/minecraft/class_5189$class_5190;Lnet/minecraft/class_2338;Lnet/minecraft/class_3195$class_7149;Lnet/minecraft/class_7138;Lnet/minecraft/class_2960;Lnet/minecraft/class_3499;Lnet/minecraft/class_2470;Lnet/minecraft/class_2415;Lnet/minecraft/class_2338;Lnet/minecraft/class_6626;)V + ARG 10 collector METHOD method_41684 (Lnet/minecraft/class_5183;)Ljava/util/List; ARG 0 structure CLASS class_7155 Setup + FIELD field_37814 CODEC Lcom/mojang/serialization/Codec; diff --git a/mappings/net/minecraft/world/gen/structure/Structure.mapping b/mappings/net/minecraft/world/gen/structure/Structure.mapping index b5d2955b69..c02f6607bf 100644 --- a/mappings/net/minecraft/world/gen/structure/Structure.mapping +++ b/mappings/net/minecraft/world/gen/structure/Structure.mapping @@ -31,11 +31,9 @@ CLASS net/minecraft/class_3195 net/minecraft/world/gen/structure/Structure ARG 0 context ARG 1 heightmap ARG 2 generator - METHOD method_41613 isBiomeValid (Lnet/minecraft/class_3195$class_7150;Lnet/minecraft/class_2794;Lnet/minecraft/class_7138;Ljava/util/function/Predicate;)Z + METHOD method_41613 isBiomeValid (Lnet/minecraft/class_3195$class_7150;Lnet/minecraft/class_3195$class_7149;)Z ARG 0 result - ARG 1 chunkGenerator - ARG 2 noiseConfig - ARG 3 validBiomes + ARG 1 context METHOD method_41614 createStructureStart (Lnet/minecraft/class_5455;Lnet/minecraft/class_2794;Lnet/minecraft/class_1966;Lnet/minecraft/class_7138;Lnet/minecraft/class_3485;JLnet/minecraft/class_1923;ILnet/minecraft/class_5539;Ljava/util/function/Predicate;)Lnet/minecraft/class_3449; ARG 1 dynamicRegistryManager ARG 2 chunkGenerator @@ -68,6 +66,10 @@ CLASS net/minecraft/class_3195 net/minecraft/world/gen/structure/Structure METHOD method_42700 (Ljava/util/function/Function;Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; ARG 1 instance METHOD method_42701 getTerrainAdaptation ()Lnet/minecraft/class_5847; + METHOD method_47931 (Lnet/minecraft/class_3195$class_7149;Lnet/minecraft/class_3195$class_7150;)Z + ARG 1 position + METHOD method_47932 getValidStructurePosition (Lnet/minecraft/class_3195$class_7149;)Ljava/util/Optional; + ARG 1 context CLASS class_7149 Context FIELD comp_561 dynamicRegistryManager Lnet/minecraft/class_5455; FIELD comp_564 noiseConfig Lnet/minecraft/class_7138; diff --git a/mappings/net/minecraft/world/gen/structure/Structures.mapping b/mappings/net/minecraft/world/gen/structure/Structures.mapping index e6b4d058d7..af02408eb9 100644 --- a/mappings/net/minecraft/world/gen/structure/Structures.mapping +++ b/mappings/net/minecraft/world/gen/structure/Structures.mapping @@ -1,51 +1,15 @@ CLASS net/minecraft/class_5470 net/minecraft/world/gen/structure/Structures - FIELD field_26287 RUINED_PORTAL_JUNGLE Lnet/minecraft/class_6880; - FIELD field_26288 RUINED_PORTAL_SWAMP Lnet/minecraft/class_6880; - FIELD field_26289 RUINED_PORTAL_MOUNTAIN Lnet/minecraft/class_6880; - FIELD field_26290 RUINED_PORTAL_OCEAN Lnet/minecraft/class_6880; - FIELD field_26291 RUINED_PORTAL_NETHER Lnet/minecraft/class_6880; - FIELD field_26292 PILLAGER_OUTPOST Lnet/minecraft/class_6880; - FIELD field_26293 MINESHAFT Lnet/minecraft/class_6880; - FIELD field_26294 MINESHAFT_MESA Lnet/minecraft/class_6880; - FIELD field_26295 MANSION Lnet/minecraft/class_6880; - FIELD field_26296 JUNGLE_PYRAMID Lnet/minecraft/class_6880; - FIELD field_26297 DESERT_PYRAMID Lnet/minecraft/class_6880; - FIELD field_26298 IGLOO Lnet/minecraft/class_6880; - FIELD field_26299 SHIPWRECK Lnet/minecraft/class_6880; - FIELD field_26300 SHIPWRECK_BEACHED Lnet/minecraft/class_6880; - FIELD field_26301 SWAMP_HUT Lnet/minecraft/class_6880; - FIELD field_26302 STRONGHOLD Lnet/minecraft/class_6880; - FIELD field_26303 MONUMENT Lnet/minecraft/class_6880; - FIELD field_26304 OCEAN_RUIN_COLD Lnet/minecraft/class_6880; - FIELD field_26305 OCEAN_RUIN_WARM Lnet/minecraft/class_6880; - FIELD field_26306 FORTRESS Lnet/minecraft/class_6880; - FIELD field_26307 NETHER_FOSSIL Lnet/minecraft/class_6880; - FIELD field_26308 END_CITY Lnet/minecraft/class_6880; - FIELD field_26309 BURIED_TREASURE Lnet/minecraft/class_6880; - FIELD field_26310 BASTION_REMNANT Lnet/minecraft/class_6880; - FIELD field_26311 VILLAGE_PLAINS Lnet/minecraft/class_6880; - FIELD field_26312 VILLAGE_DESERT Lnet/minecraft/class_6880; - FIELD field_26313 VILLAGE_SAVANNA Lnet/minecraft/class_6880; - FIELD field_26314 VILLAGE_SNOWY Lnet/minecraft/class_6880; - FIELD field_26315 VILLAGE_TAIGA Lnet/minecraft/class_6880; - FIELD field_26316 RUINED_PORTAL Lnet/minecraft/class_6880; - FIELD field_26317 RUINED_PORTAL_DESERT Lnet/minecraft/class_6880; - FIELD field_38476 ANCIENT_CITY Lnet/minecraft/class_6880; - METHOD method_30603 register (Lnet/minecraft/class_5321;Lnet/minecraft/class_3195;)Lnet/minecraft/class_6880; - ARG 0 key - ARG 1 structure - METHOD method_38569 getDefault (Lnet/minecraft/class_2378;)Lnet/minecraft/class_6880; - METHOD method_42044 getOrCreateBiomeTag (Lnet/minecraft/class_6862;)Lnet/minecraft/class_6885; - ARG 0 key - METHOD method_42757 createConfig (Lnet/minecraft/class_6862;Lnet/minecraft/class_2893$class_2895;Lnet/minecraft/class_5847;)Lnet/minecraft/class_3195$class_7302; - ARG 0 biomeTag + METHOD method_38569 bootstrap (Lnet/minecraft/class_7891;)V + ARG 0 structureRegisterable + METHOD method_42757 createConfig (Lnet/minecraft/class_6885;Lnet/minecraft/class_2893$class_2895;Lnet/minecraft/class_5847;)Lnet/minecraft/class_3195$class_7302; + ARG 0 biomes ARG 1 featureStep ARG 2 terrainAdaptation - METHOD method_42758 createConfig (Lnet/minecraft/class_6862;Lnet/minecraft/class_5847;)Lnet/minecraft/class_3195$class_7302; - ARG 0 biomeTag + METHOD method_42758 createConfig (Lnet/minecraft/class_6885;Lnet/minecraft/class_5847;)Lnet/minecraft/class_3195$class_7302; + ARG 0 biomes ARG 1 terrainAdaptation - METHOD method_42759 createConfig (Lnet/minecraft/class_6862;Ljava/util/Map;Lnet/minecraft/class_2893$class_2895;Lnet/minecraft/class_5847;)Lnet/minecraft/class_3195$class_7302; - ARG 0 biomeTag + METHOD method_42759 createConfig (Lnet/minecraft/class_6885;Ljava/util/Map;Lnet/minecraft/class_2893$class_2895;Lnet/minecraft/class_5847;)Lnet/minecraft/class_3195$class_7302; + ARG 0 biomes ARG 1 spawns ARG 2 featureStep ARG 3 terrainAdaptation diff --git a/mappings/net/minecraft/world/gen/surfacebuilder/MaterialRules.mapping b/mappings/net/minecraft/world/gen/surfacebuilder/MaterialRules.mapping index c504a1abf7..afa84445a9 100644 --- a/mappings/net/minecraft/world/gen/surfacebuilder/MaterialRules.mapping +++ b/mappings/net/minecraft/world/gen/surfacebuilder/MaterialRules.mapping @@ -107,6 +107,9 @@ CLASS net/minecraft/class_6686 net/minecraft/world/gen/surfacebuilder/MaterialRu FIELD field_35619 stoneDepthBelow I FIELD field_35620 stoneDepthAbove I FIELD field_35676 chunkNoiseSampler Lnet/minecraft/class_6568; + FIELD field_35678 secondaryDepth D + FIELD field_36278 packedChunkPos J + FIELD field_36279 estimatedSurfaceHeights [I FIELD field_37703 noiseConfig Lnet/minecraft/class_7138; METHOD (Lnet/minecraft/class_6724;Lnet/minecraft/class_7138;Lnet/minecraft/class_2791;Lnet/minecraft/class_6568;Ljava/util/function/Function;Lnet/minecraft/class_2378;Lnet/minecraft/class_5868;)V ARG 1 surfaceBuilder @@ -125,6 +128,12 @@ CLASS net/minecraft/class_6686 net/minecraft/world/gen/surfacebuilder/MaterialRu ARG 4 blockX ARG 5 blockY ARG 6 blockZ + METHOD method_39550 getSecondaryDepth ()D + METHOD method_39551 estimateSurfaceHeight ()I + METHOD method_39903 blockToChunkCoord (I)I + ARG 0 blockCoord + METHOD method_39904 chunkToBlockCoord (I)I + ARG 0 chunkCoord CLASS class_6695 NegativeRunDepthPredicate CLASS class_6696 SteepSlopePredicate CLASS class_6771 SurfacePredicate diff --git a/mappings/net/minecraft/world/gen/surfacebuilder/SurfaceBuilder.mapping b/mappings/net/minecraft/world/gen/surfacebuilder/SurfaceBuilder.mapping index d5d83172ee..73394befd4 100644 --- a/mappings/net/minecraft/world/gen/surfacebuilder/SurfaceBuilder.mapping +++ b/mappings/net/minecraft/world/gen/surfacebuilder/SurfaceBuilder.mapping @@ -70,3 +70,9 @@ CLASS net/minecraft/class_6724 net/minecraft/world/gen/surfacebuilder/SurfaceBui ARG 7 hasFluid METHOD method_39333 isDefaultBlock (Lnet/minecraft/class_2680;)Z ARG 1 state + METHOD method_39552 sampleRunDepth (II)I + ARG 1 blockX + ARG 2 blockZ + METHOD method_39555 sampleSecondaryDepth (II)D + ARG 1 blockX + ARG 2 blockZ diff --git a/mappings/net/minecraft/world/gen/treedecorator/TreeDecorator.mapping b/mappings/net/minecraft/world/gen/treedecorator/TreeDecorator.mapping index 751aa6ef44..fa2f8d719f 100644 --- a/mappings/net/minecraft/world/gen/treedecorator/TreeDecorator.mapping +++ b/mappings/net/minecraft/world/gen/treedecorator/TreeDecorator.mapping @@ -20,7 +20,7 @@ CLASS net/minecraft/class_4662 net/minecraft/world/gen/treedecorator/TreeDecorat ARG 6 rootPositions METHOD method_43316 getWorld ()Lnet/minecraft/class_3746; METHOD method_43317 isAir (Lnet/minecraft/class_2338;)Z - ARG 1 poa + ARG 1 pos METHOD method_43318 replace (Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;)V ARG 1 pos ARG 2 state diff --git a/mappings/net/minecraft/world/gen/trunk/CherryTrunkPlacer.mapping b/mappings/net/minecraft/world/gen/trunk/CherryTrunkPlacer.mapping new file mode 100644 index 0000000000..7ef539b01d --- /dev/null +++ b/mappings/net/minecraft/world/gen/trunk/CherryTrunkPlacer.mapping @@ -0,0 +1,42 @@ +CLASS net/minecraft/class_8180 net/minecraft/world/gen/trunk/CherryTrunkPlacer + FIELD field_42848 CODEC Lcom/mojang/serialization/Codec; + FIELD field_42849 BRANCH_START_OFFSET_FROM_TOP_CODEC Lcom/mojang/serialization/Codec; + FIELD field_42850 branchCount Lnet/minecraft/class_6017; + FIELD field_42851 branchHorizontalLength Lnet/minecraft/class_6017; + FIELD field_42852 branchStartOffsetFromTop Lnet/minecraft/class_6019; + FIELD field_42853 secondBranchStartOffsetFromTop Lnet/minecraft/class_6019; + FIELD field_42854 branchEndOffsetFromTop Lnet/minecraft/class_6017; + METHOD (IIILnet/minecraft/class_6017;Lnet/minecraft/class_6017;Lnet/minecraft/class_6019;Lnet/minecraft/class_6017;)V + ARG 1 baseHeight + ARG 2 firstRandomHeight + ARG 3 secondRandomHeight + ARG 4 branchCount + ARG 5 branchHorizontalLength + ARG 6 branchStartOffsetFromTop + ARG 7 branchEndOffsetFromTop + METHOD method_49248 (Lnet/minecraft/class_6019;)Lcom/mojang/serialization/DataResult; + ARG 0 branchStartOffsetFromTop + METHOD method_49249 generateBranch (Lnet/minecraft/class_3746;Ljava/util/function/BiConsumer;Lnet/minecraft/class_5819;ILnet/minecraft/class_2338;Lnet/minecraft/class_4643;Ljava/util/function/Function;Lnet/minecraft/class_2350;IZLnet/minecraft/class_2338$class_2339;)Lnet/minecraft/class_4647$class_5208; + ARG 1 world + ARG 2 replacer + ARG 3 random + ARG 4 height + ARG 5 startPos + ARG 6 config + ARG 7 withAxisFunction + ARG 8 direction + ARG 9 branchStartOffset + ARG 10 branchBelowHeight + ARG 11 mutablePos + METHOD method_49250 (Lnet/minecraft/class_8180;)Lnet/minecraft/class_6017; + ARG 0 trunkPlacer + METHOD method_49251 (Lnet/minecraft/class_2350;Lnet/minecraft/class_2680;)Lnet/minecraft/class_2680; + ARG 1 state + METHOD method_49252 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 0 instance + METHOD method_49253 (Lnet/minecraft/class_8180;)Lnet/minecraft/class_6019; + ARG 0 trunkPlacer + METHOD method_49254 (Lnet/minecraft/class_8180;)Lnet/minecraft/class_6017; + ARG 0 trunkPlacer + METHOD method_49255 (Lnet/minecraft/class_8180;)Lnet/minecraft/class_6017; + ARG 0 trunkPlacer diff --git a/mappings/net/minecraft/world/gen/trunk/GiantTrunkPlacer.mapping b/mappings/net/minecraft/world/gen/trunk/GiantTrunkPlacer.mapping index 90583b7eff..b88639d684 100644 --- a/mappings/net/minecraft/world/gen/trunk/GiantTrunkPlacer.mapping +++ b/mappings/net/minecraft/world/gen/trunk/GiantTrunkPlacer.mapping @@ -1,5 +1,14 @@ CLASS net/minecraft/class_5214 net/minecraft/world/gen/trunk/GiantTrunkPlacer FIELD field_24969 CODEC Lcom/mojang/serialization/Codec; METHOD method_27399 setLog (Lnet/minecraft/class_3746;Ljava/util/function/BiConsumer;Lnet/minecraft/class_5819;Lnet/minecraft/class_2338$class_2339;Lnet/minecraft/class_4643;Lnet/minecraft/class_2338;III)V + ARG 1 world + ARG 2 replacer + ARG 3 random + ARG 4 tmpPos + ARG 5 config + ARG 6 startPos + ARG 7 dx + ARG 8 dy + ARG 9 dz METHOD method_28900 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; ARG 0 instance diff --git a/mappings/net/minecraft/world/gen/trunk/LargeOakTrunkPlacer.mapping b/mappings/net/minecraft/world/gen/trunk/LargeOakTrunkPlacer.mapping index b844281694..371a200914 100644 --- a/mappings/net/minecraft/world/gen/trunk/LargeOakTrunkPlacer.mapping +++ b/mappings/net/minecraft/world/gen/trunk/LargeOakTrunkPlacer.mapping @@ -6,11 +6,15 @@ CLASS net/minecraft/class_5212 net/minecraft/world/gen/trunk/LargeOakTrunkPlacer METHOD method_27392 makeBranches (Lnet/minecraft/class_3746;Ljava/util/function/BiConsumer;Lnet/minecraft/class_5819;ILnet/minecraft/class_2338;Ljava/util/List;Lnet/minecraft/class_4643;)V ARG 1 world ARG 2 replacer + ARG 3 random ARG 4 treeHeight ARG 5 startPos ARG 6 branchPositions ARG 7 config METHOD method_27393 makeOrCheckBranch (Lnet/minecraft/class_3746;Ljava/util/function/BiConsumer;Lnet/minecraft/class_5819;Lnet/minecraft/class_2338;Lnet/minecraft/class_2338;ZLnet/minecraft/class_4643;)Z + ARG 1 world + ARG 2 replacer + ARG 3 random ARG 4 startPos ARG 5 branchPos ARG 6 make diff --git a/mappings/net/minecraft/world/level/LevelInfo.mapping b/mappings/net/minecraft/world/level/LevelInfo.mapping index 36cd06825a..eb808253e9 100644 --- a/mappings/net/minecraft/world/level/LevelInfo.mapping +++ b/mappings/net/minecraft/world/level/LevelInfo.mapping @@ -2,18 +2,18 @@ CLASS net/minecraft/class_1940 net/minecraft/world/level/LevelInfo FIELD field_24105 name Ljava/lang/String; FIELD field_24106 difficulty Lnet/minecraft/class_1267; FIELD field_24107 gameRules Lnet/minecraft/class_1928; - FIELD field_25403 dataPackSettings Lnet/minecraft/class_5359; + FIELD field_25403 dataConfiguration Lnet/minecraft/class_7712; FIELD field_9257 gameMode Lnet/minecraft/class_1934; FIELD field_9261 allowCommands Z FIELD field_9262 hardcore Z - METHOD (Ljava/lang/String;Lnet/minecraft/class_1934;ZLnet/minecraft/class_1267;ZLnet/minecraft/class_1928;Lnet/minecraft/class_5359;)V + METHOD (Ljava/lang/String;Lnet/minecraft/class_1934;ZLnet/minecraft/class_1267;ZLnet/minecraft/class_1928;Lnet/minecraft/class_7712;)V ARG 1 name ARG 2 gameMode ARG 3 hardcore ARG 4 difficulty ARG 5 allowCommands ARG 6 gameRules - ARG 7 dataPackSettings + ARG 7 dataConfiguration METHOD method_27339 getLevelName ()Ljava/lang/String; METHOD method_27340 getDifficulty ()Lnet/minecraft/class_1267; METHOD method_27341 getGameRules ()Lnet/minecraft/class_1928; @@ -21,15 +21,15 @@ CLASS net/minecraft/class_1940 net/minecraft/world/level/LevelInfo ARG 1 difficulty 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; + METHOD method_28383 fromDynamic (Lcom/mojang/serialization/Dynamic;Lnet/minecraft/class_7712;)Lnet/minecraft/class_1940; ARG 0 dynamic - ARG 1 dataPackSettings + ARG 1 dataConfiguration METHOD method_28384 (Ljava/lang/Number;)Lnet/minecraft/class_1267; ARG 0 difficulty METHOD method_28385 withCopiedGameRules ()Lnet/minecraft/class_1940; - METHOD method_29557 withDataPackSettings (Lnet/minecraft/class_5359;)Lnet/minecraft/class_1940; - ARG 1 dataPackSettings - METHOD method_29558 getDataPackSettings ()Lnet/minecraft/class_5359; + METHOD method_29557 withDataConfiguration (Lnet/minecraft/class_7712;)Lnet/minecraft/class_1940; + ARG 1 dataConfiguration + METHOD method_29558 getDataConfiguration ()Lnet/minecraft/class_7712; METHOD method_8574 getGameMode ()Lnet/minecraft/class_1934; METHOD method_8582 areCommandsAllowed ()Z METHOD method_8583 isHardcore ()Z diff --git a/mappings/net/minecraft/world/level/LevelProperties.mapping b/mappings/net/minecraft/world/level/LevelProperties.mapping index 1bca812bea..c6ca9c4299 100644 --- a/mappings/net/minecraft/world/level/LevelProperties.mapping +++ b/mappings/net/minecraft/world/level/LevelProperties.mapping @@ -26,13 +26,15 @@ CLASS net/minecraft/class_31 net/minecraft/world/level/LevelProperties FIELD field_24193 worldBorder Lnet/minecraft/class_2784$class_5200; FIELD field_25029 LOGGER Lorg/slf4j/Logger; FIELD field_25030 levelInfo Lnet/minecraft/class_1940; - FIELD field_25031 dragonFight Lnet/minecraft/class_2487; + FIELD field_25031 dragonFight Lnet/minecraft/class_2881$class_8576; FIELD field_25425 generatorOptions Lnet/minecraft/class_5285; FIELD field_25426 lifecycle Lcom/mojang/serialization/Lifecycle; FIELD field_26367 spawnAngle F FIELD field_31843 WORLD_GEN_SETTINGS_KEY Ljava/lang/String; FIELD field_36349 PLAYER_KEY Ljava/lang/String; - METHOD (Lcom/mojang/datafixers/DataFixer;ILnet/minecraft/class_2487;ZIIIFJJIIIZIZZZLnet/minecraft/class_2784$class_5200;IILjava/util/UUID;Ljava/util/Set;Lnet/minecraft/class_236;Lnet/minecraft/class_2487;Lnet/minecraft/class_2487;Lnet/minecraft/class_1940;Lnet/minecraft/class_5285;Lcom/mojang/serialization/Lifecycle;)V + FIELD field_40372 specialProperty Lnet/minecraft/class_31$class_7729; + FIELD field_43352 removedFeatures Ljava/util/Set; + METHOD (Lcom/mojang/datafixers/DataFixer;ILnet/minecraft/class_2487;ZIIIFJJIIIZIZZZLnet/minecraft/class_2784$class_5200;IILjava/util/UUID;Ljava/util/Set;Ljava/util/Set;Lnet/minecraft/class_236;Lnet/minecraft/class_2487;Lnet/minecraft/class_2881$class_8576;Lnet/minecraft/class_1940;Lnet/minecraft/class_5285;Lnet/minecraft/class_31$class_7729;Lcom/mojang/serialization/Lifecycle;)V ARG 1 dataFixer ARG 2 dataVersion ARG 3 playerData @@ -56,27 +58,38 @@ CLASS net/minecraft/class_31 net/minecraft/world/level/LevelProperties ARG 23 wanderingTraderSpawnChance ARG 24 wanderingTraderId ARG 25 serverBrands - ARG 26 scheduledEvents - ARG 27 customBossEvents - ARG 28 dragonFight - ARG 29 levelInfo - ARG 30 generatorOptions - ARG 31 lifecycle - METHOD (Lnet/minecraft/class_1940;Lnet/minecraft/class_5285;Lcom/mojang/serialization/Lifecycle;)V + ARG 26 removedFeatures + ARG 27 scheduledEvents + ARG 28 customBossEvents + ARG 29 dragonFight + ARG 30 levelInfo + ARG 31 generatorOptions + ARG 32 specialProperty + ARG 33 lifecycle + METHOD (Lnet/minecraft/class_1940;Lnet/minecraft/class_5285;Lnet/minecraft/class_31$class_7729;Lcom/mojang/serialization/Lifecycle;)V ARG 1 levelInfo ARG 2 generatorOptions - ARG 3 lifecycle + ARG 3 specialProperty + ARG 4 lifecycle METHOD method_158 updateProperties (Lnet/minecraft/class_5455;Lnet/minecraft/class_2487;Lnet/minecraft/class_2487;)V ARG 1 registryManager ARG 2 levelNbt ARG 3 playerNbt 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; + 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_31$class_7729;Lnet/minecraft/class_5285;Lcom/mojang/serialization/Lifecycle;)Lnet/minecraft/class_31; ARG 0 dynamic ARG 1 dataFixer ARG 2 dataVersion ARG 3 playerData ARG 4 levelInfo ARG 5 saveVersionInfo - ARG 6 generatorOptions - ARG 7 lifecycle + ARG 6 specialProperty + ARG 7 generatorOptions + ARG 8 lifecycle + METHOD method_45557 (Lcom/mojang/serialization/DataResult$PartialResult;)V + ARG 0 result + METHOD method_45558 (Lnet/minecraft/class_2487;Lnet/minecraft/class_2520;)V + ARG 1 dataConfiguration + METHOD method_49902 createStringList (Ljava/util/Set;)Lnet/minecraft/class_2499; + ARG 0 strings + CLASS class_7729 SpecialProperty diff --git a/mappings/net/minecraft/world/level/WorldGenSettings.mapping b/mappings/net/minecraft/world/level/WorldGenSettings.mapping new file mode 100644 index 0000000000..c751e5e8b9 --- /dev/null +++ b/mappings/net/minecraft/world/level/WorldGenSettings.mapping @@ -0,0 +1,16 @@ +CLASS net/minecraft/class_7726 net/minecraft/world/level/WorldGenSettings + FIELD comp_1019 generatorOptions Lnet/minecraft/class_5285; + FIELD comp_1020 dimensionOptionsRegistryHolder Lnet/minecraft/class_7723; + FIELD field_40366 CODEC Lcom/mojang/serialization/Codec; + METHOD comp_1019 generatorOptions ()Lnet/minecraft/class_5285; + METHOD comp_1020 dimensionOptionsRegistryHolder ()Lnet/minecraft/class_7723; + METHOD method_45538 encode (Lcom/mojang/serialization/DynamicOps;Lnet/minecraft/class_5285;Lnet/minecraft/class_7723;)Lcom/mojang/serialization/DataResult; + ARG 0 registryOps + ARG 1 generatorOptions + ARG 2 dimensionOptionsRegistryHolder + METHOD method_45539 encode (Lcom/mojang/serialization/DynamicOps;Lnet/minecraft/class_5285;Lnet/minecraft/class_5455;)Lcom/mojang/serialization/DataResult; + ARG 0 registryOps + ARG 1 generatorOptions + ARG 2 dynamicRegistryManager + METHOD method_45540 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 0 instance diff --git a/mappings/net/minecraft/world/level/storage/LevelStorage.mapping b/mappings/net/minecraft/world/level/storage/LevelStorage.mapping index 23f39bdaae..72e614685d 100644 --- a/mappings/net/minecraft/world/level/storage/LevelStorage.mapping +++ b/mappings/net/minecraft/world/level/storage/LevelStorage.mapping @@ -6,14 +6,19 @@ CLASS net/minecraft/class_32 net/minecraft/world/level/storage/LevelStorage FIELD field_200 TIME_FORMATTER Ljava/time/format/DateTimeFormatter; FIELD field_25020 GENERATOR_OPTION_KEYS Lcom/google/common/collect/ImmutableList; FIELD field_36348 DATA_KEY Ljava/lang/String; - METHOD (Ljava/nio/file/Path;Ljava/nio/file/Path;Lcom/mojang/datafixers/DataFixer;)V + FIELD field_44950 ALLOWED_SYMLINKS_FILE_NAME Ljava/lang/String; + FIELD field_44951 DEFAULT_ALLOWED_SYMLINK_MATCHER Ljava/nio/file/PathMatcher; + FIELD field_44952 symlinkFinder Lnet/minecraft/class_8580; + METHOD (Ljava/nio/file/Path;Ljava/nio/file/Path;Lnet/minecraft/class_8580;Lcom/mojang/datafixers/DataFixer;)V ARG 1 savesDirectory ARG 2 backupsDirectory - ARG 3 dataFixer - METHOD method_17926 createLevelDataParser (Lcom/mojang/serialization/DynamicOps;Lnet/minecraft/class_5359;Lcom/mojang/serialization/Lifecycle;)Ljava/util/function/BiFunction; + ARG 3 symlinkFinder + ARG 4 dataFixer + METHOD method_17926 createLevelDataParser (Lcom/mojang/serialization/DynamicOps;Lnet/minecraft/class_7712;Lnet/minecraft/class_2378;Lcom/mojang/serialization/Lifecycle;)Ljava/util/function/BiFunction; ARG 0 ops - ARG 1 dataPackSettings - ARG 2 lifecycle + ARG 1 dataConfiguration + ARG 2 dimensionOptionsRegistry + ARG 3 lifecycle METHOD method_17931 getCurrentVersion ()I METHOD method_19636 getSavesDirectory ()Ljava/nio/file/Path; METHOD method_230 levelExists (Ljava/lang/String;)Z @@ -27,9 +32,9 @@ CLASS net/minecraft/class_32 net/minecraft/world/level/storage/LevelStorage ARG 2 levelDataParser METHOD method_26999 create (Ljava/nio/file/Path;)Lnet/minecraft/class_32; ARG 0 path - METHOD method_27002 createSession (Ljava/lang/String;)Lnet/minecraft/class_32$class_5143; + METHOD method_27002 createSessionWithoutSymlinkCheck (Ljava/lang/String;)Lnet/minecraft/class_32$class_5143; ARG 1 directoryName - METHOD method_29010 readGeneratorProperties (Lcom/mojang/serialization/Dynamic;Lcom/mojang/datafixers/DataFixer;I)Lcom/mojang/datafixers/util/Pair; + METHOD method_29010 readGeneratorProperties (Lcom/mojang/serialization/Dynamic;Lcom/mojang/datafixers/DataFixer;I)Lcom/mojang/serialization/DataResult; ARG 0 levelData ARG 1 dataFixer ARG 2 version @@ -39,12 +44,12 @@ CLASS net/minecraft/class_32 net/minecraft/world/level/storage/LevelStorage METHOD method_29015 (Lnet/minecraft/class_32$class_7411;ZLjava/nio/file/Path;Lcom/mojang/datafixers/DataFixer;)Lnet/minecraft/class_34; ARG 3 path ARG 4 dataFixer - METHOD method_29580 parseDataPackSettings (Lcom/mojang/serialization/Dynamic;)Lnet/minecraft/class_5359; + METHOD method_29580 parseDataPackSettings (Lcom/mojang/serialization/Dynamic;)Lnet/minecraft/class_7712; ARG 0 dynamic - METHOD method_29582 (Lcom/mojang/serialization/DynamicOps;Lnet/minecraft/class_5359;Lcom/mojang/serialization/Lifecycle;Ljava/nio/file/Path;Lcom/mojang/datafixers/DataFixer;)Lnet/minecraft/class_31; - ARG 3 path - ARG 4 dataFixer - METHOD method_29583 readDataPackSettings (Ljava/nio/file/Path;Lcom/mojang/datafixers/DataFixer;)Lnet/minecraft/class_5359; + METHOD method_29582 (Lcom/mojang/serialization/DynamicOps;Lnet/minecraft/class_7712;Lnet/minecraft/class_2378;Lcom/mojang/serialization/Lifecycle;Ljava/nio/file/Path;Lcom/mojang/datafixers/DataFixer;)Lcom/mojang/datafixers/util/Pair; + ARG 4 path + ARG 5 dataFixer + METHOD method_29583 readDataPackSettings (Ljava/nio/file/Path;Lcom/mojang/datafixers/DataFixer;)Lnet/minecraft/class_7712; ARG 0 path ARG 1 dataFixer METHOD method_35504 getFormatName ()Ljava/lang/String; @@ -61,22 +66,39 @@ CLASS net/minecraft/class_32 net/minecraft/world/level/storage/LevelStorage ARG 0 path METHOD method_43495 (Ljava/util/List;)Ljava/util/List; ARG 0 summaries + METHOD method_45551 (Lnet/minecraft/class_2960;)V + ARG 0 id + METHOD method_45552 parseEnabledFeatures (Lcom/mojang/serialization/Dynamic;)Lnet/minecraft/class_7699; + ARG 0 levelData + METHOD method_45553 (Lcom/mojang/serialization/Dynamic;)Ljava/util/stream/Stream; + ARG 0 featureFlag + METHOD method_52235 createSymlinkFinder (Ljava/nio/file/Path;)Lnet/minecraft/class_8580; + ARG 0 allowedSymlinksFile + METHOD method_52236 createSession (Ljava/lang/String;)Lnet/minecraft/class_32$class_5143; + ARG 1 directoryName + METHOD method_52237 getSymlinkFinder ()Lnet/minecraft/class_8580; + METHOD method_52238 resolve (Ljava/lang/String;)Ljava/nio/file/Path; + ARG 1 name + METHOD method_52616 (Ljava/nio/file/Path;)Z + ARG 0 path CLASS class_5143 Session FIELD field_23767 lock Lnet/minecraft/class_5125; FIELD field_23768 directory Lnet/minecraft/class_32$class_7411; FIELD field_23769 directoryName Ljava/lang/String; FIELD field_24190 paths Ljava/util/Map; - METHOD (Lnet/minecraft/class_32;Ljava/lang/String;)V + METHOD (Lnet/minecraft/class_32;Ljava/lang/String;Ljava/nio/file/Path;)V ARG 2 directoryName + ARG 3 path METHOD method_27005 getDirectoryName ()Ljava/lang/String; METHOD method_27008 save (Ljava/lang/String;)V ARG 1 name METHOD method_27010 getDirectory (Lnet/minecraft/class_5218;)Ljava/nio/file/Path; ARG 1 savePath - METHOD method_27013 readLevelProperties (Lcom/mojang/serialization/DynamicOps;Lnet/minecraft/class_5359;Lcom/mojang/serialization/Lifecycle;)Lnet/minecraft/class_5219; + METHOD method_27013 readLevelProperties (Lcom/mojang/serialization/DynamicOps;Lnet/minecraft/class_7712;Lnet/minecraft/class_2378;Lcom/mojang/serialization/Lifecycle;)Lcom/mojang/datafixers/util/Pair; ARG 1 ops - ARG 2 dataPackSettings - ARG 3 lifecycle + ARG 2 dataConfiguration + ARG 3 dimensionOptionsRegistry + ARG 4 lifecycle METHOD method_27014 getIconFile ()Ljava/util/Optional; METHOD method_27015 deleteSessionLock ()V METHOD method_27016 createBackup ()J @@ -92,7 +114,8 @@ CLASS net/minecraft/class_32 net/minecraft/world/level/storage/LevelStorage ARG 3 nbt METHOD method_27427 createSaveHandler ()Lnet/minecraft/class_29; METHOD method_29584 getLevelSummary ()Lnet/minecraft/class_34; - METHOD method_29585 getDataPackSettings ()Lnet/minecraft/class_5359; + METHOD method_29585 getDataPackSettings ()Lnet/minecraft/class_7712; + METHOD method_52617 getLevelStorage ()Lnet/minecraft/class_32; CLASS 1 METHOD postVisitDirectory (Ljava/lang/Object;Ljava/io/IOException;)Ljava/nio/file/FileVisitResult; ARG 1 path diff --git a/mappings/net/minecraft/world/level/storage/LevelSummary.mapping b/mappings/net/minecraft/world/level/storage/LevelSummary.mapping index b659ded9d0..47d8c70fee 100644 --- a/mappings/net/minecraft/world/level/storage/LevelSummary.mapping +++ b/mappings/net/minecraft/world/level/storage/LevelSummary.mapping @@ -6,13 +6,15 @@ CLASS net/minecraft/class_34 net/minecraft/world/level/storage/LevelSummary FIELD field_24191 details Lnet/minecraft/class_2561; FIELD field_25022 levelInfo Lnet/minecraft/class_1940; FIELD field_25023 versionInfo Lnet/minecraft/class_5315; - METHOD (Lnet/minecraft/class_1940;Lnet/minecraft/class_5315;Ljava/lang/String;ZZLjava/nio/file/Path;)V + FIELD field_40371 experimental Z + METHOD (Lnet/minecraft/class_1940;Lnet/minecraft/class_5315;Ljava/lang/String;ZZZLjava/nio/file/Path;)V ARG 1 levelInfo ARG 2 versionInfo ARG 3 name ARG 4 requiresConversion ARG 5 locked - ARG 6 iconPath + ARG 6 experimental + ARG 7 iconPath METHOD compareTo (Ljava/lang/Object;)I ARG 1 other METHOD method_247 getGameMode ()Lnet/minecraft/class_1934; @@ -34,6 +36,9 @@ CLASS net/minecraft/class_34 net/minecraft/world/level/storage/LevelSummary METHOD method_33784 isUnavailable ()Z METHOD method_35505 getLevelInfo ()Lnet/minecraft/class_1940; METHOD method_38496 isVersionAvailable ()Z + METHOD method_45554 isExperimental ()Z + METHOD method_48165 (Lnet/minecraft/class_2583;)Lnet/minecraft/class_2583; + ARG 0 style CLASS class_5781 ConversionWarning FIELD field_28440 backup Z FIELD field_28441 boldRedFormatting Z @@ -45,3 +50,9 @@ CLASS net/minecraft/class_34 net/minecraft/world/level/storage/LevelSummary METHOD method_33406 promptsBackup ()Z METHOD method_33407 needsBoldRedFormatting ()Z METHOD method_33408 getTranslationKeySuffix ()Ljava/lang/String; + CLASS class_8578 SymlinkLevelSummary + METHOD (Ljava/lang/String;Ljava/nio/file/Path;)V + ARG 1 name + ARG 2 iconPath + METHOD method_52239 (Lnet/minecraft/class_2583;)Lnet/minecraft/class_2583; + ARG 0 style diff --git a/mappings/net/minecraft/world/poi/PointOfInterestStorage.mapping b/mappings/net/minecraft/world/poi/PointOfInterestStorage.mapping index 1bb328c637..2d27abc887 100644 --- a/mappings/net/minecraft/world/poi/PointOfInterestStorage.mapping +++ b/mappings/net/minecraft/world/poi/PointOfInterestStorage.mapping @@ -52,8 +52,8 @@ CLASS net/minecraft/class_4153 net/minecraft/world/poi/PointOfInterestStorage ARG 1 pos METHOD method_19133 isOccupied (J)Z ARG 1 pos - METHOD method_19510 initForPalette (Lnet/minecraft/class_1923;Lnet/minecraft/class_2826;)V - ARG 1 chunkPos + METHOD method_19510 initForPalette (Lnet/minecraft/class_4076;Lnet/minecraft/class_2826;)V + ARG 1 sectionPos ARG 2 chunkSection METHOD method_19511 (Lnet/minecraft/class_2826;Ljava/util/function/BiConsumer;Lnet/minecraft/class_2338;)V ARG 2 pos @@ -169,3 +169,5 @@ CLASS net/minecraft/class_4153 net/minecraft/world/poi/PointOfInterestStorage METHOD (Ljava/lang/String;ILjava/util/function/Predicate;)V ARG 3 predicate METHOD method_19135 getPredicate ()Ljava/util/function/Predicate; + METHOD method_19136 (Lnet/minecraft/class_4156;)Z + ARG 0 poi diff --git a/mappings/net/minecraft/world/poi/PointOfInterestTypes.mapping b/mappings/net/minecraft/world/poi/PointOfInterestTypes.mapping index 1ccf30cd06..89cf5518d9 100644 --- a/mappings/net/minecraft/world/poi/PointOfInterestTypes.mapping +++ b/mappings/net/minecraft/world/poi/PointOfInterestTypes.mapping @@ -1,5 +1,4 @@ CLASS net/minecraft/class_7477 net/minecraft/world/poi/PointOfInterestTypes - FIELD field_39298 POI_STATES Ljava/util/Set; FIELD field_39299 BED_HEADS Ljava/util/Set; FIELD field_39300 CAULDRONS Ljava/util/Set; FIELD field_39301 POI_STATES_TO_TYPE Ljava/util/Map; @@ -7,8 +6,9 @@ CLASS net/minecraft/class_7477 net/minecraft/world/poi/PointOfInterestTypes ARG 0 block METHOD method_43989 getTypeForState (Lnet/minecraft/class_2680;)Ljava/util/Optional; ARG 0 state - METHOD method_43990 registerStates (Lnet/minecraft/class_6880;)V - ARG 0 poiType + METHOD method_43990 registerStates (Lnet/minecraft/class_6880;Ljava/util/Set;)V + ARG 0 poiTypeEntry + ARG 1 states METHOD method_43991 (Lnet/minecraft/class_6880;Lnet/minecraft/class_2680;)V ARG 1 state METHOD method_43992 registerAndGetDefault (Lnet/minecraft/class_2378;)Lnet/minecraft/class_4158; @@ -21,3 +21,5 @@ CLASS net/minecraft/class_7477 net/minecraft/world/poi/PointOfInterestTypes ARG 4 searchDistance METHOD method_43994 of (Ljava/lang/String;)Lnet/minecraft/class_5321; ARG 0 id + METHOD method_46397 isPointOfInterest (Lnet/minecraft/class_2680;)Z + ARG 0 state diff --git a/mappings/net/minecraft/world/spawner/CatSpawner.mapping b/mappings/net/minecraft/world/spawner/CatSpawner.mapping index 0b86bba222..67b4a7754c 100644 --- a/mappings/net/minecraft/world/spawner/CatSpawner.mapping +++ b/mappings/net/minecraft/world/spawner/CatSpawner.mapping @@ -25,3 +25,5 @@ CLASS net/minecraft/class_4274 net/minecraft/world/spawner/CatSpawner COMMENT @implNote Cats spawn when there are more than 5 occupied beds and less than 5 existing cats. ARG 1 world ARG 2 pos + METHOD method_44004 (Lnet/minecraft/class_6880;)Z + ARG 0 entry diff --git a/mappings/net/minecraft/world/storage/EntityChunkDataAccess.mapping b/mappings/net/minecraft/world/storage/EntityChunkDataAccess.mapping index 7bb36b3950..62f6f65e3f 100644 --- a/mappings/net/minecraft/world/storage/EntityChunkDataAccess.mapping +++ b/mappings/net/minecraft/world/storage/EntityChunkDataAccess.mapping @@ -17,8 +17,6 @@ CLASS net/minecraft/class_5565 net/minecraft/world/storage/EntityChunkDataAccess ARG 1 ex METHOD method_31731 (Lnet/minecraft/class_1923;Ljava/util/Optional;)Lnet/minecraft/class_5566; ARG 2 nbt - METHOD method_31732 getChunkDataVersion (Lnet/minecraft/class_2487;)I - ARG 0 chunkNbt METHOD method_31733 putChunkPos (Lnet/minecraft/class_2487;Lnet/minecraft/class_1923;)V ARG 0 chunkNbt ARG 1 pos diff --git a/mappings/net/minecraft/world/storage/RegionBasedStorage.mapping b/mappings/net/minecraft/world/storage/RegionBasedStorage.mapping index 8bed288009..44fbc1af2d 100644 --- a/mappings/net/minecraft/world/storage/RegionBasedStorage.mapping +++ b/mappings/net/minecraft/world/storage/RegionBasedStorage.mapping @@ -15,3 +15,6 @@ CLASS net/minecraft/class_2867 net/minecraft/world/storage/RegionBasedStorage ARG 1 pos ARG 2 nbt METHOD method_26982 sync ()V + METHOD method_39802 scanChunk (Lnet/minecraft/class_1923;Lnet/minecraft/class_6836;)V + ARG 1 chunkPos + ARG 2 scanner diff --git a/mappings/net/minecraft/world/storage/RegionFile.mapping b/mappings/net/minecraft/world/storage/RegionFile.mapping index e1cdf2f0ca..6213b68631 100644 --- a/mappings/net/minecraft/world/storage/RegionFile.mapping +++ b/mappings/net/minecraft/world/storage/RegionFile.mapping @@ -8,6 +8,7 @@ CLASS net/minecraft/class_2861 net/minecraft/world/storage/RegionFile FIELD field_20440 saveTimes Ljava/nio/IntBuffer; FIELD field_20441 sectors Lnet/minecraft/class_4485; FIELD field_20657 directory Ljava/nio/file/Path; + FIELD field_31417 SECTOR_DATA_LIMIT I FIELD field_31421 FILE_EXTENSION Ljava/lang/String; METHOD (Ljava/nio/file/Path;Ljava/nio/file/Path;Lnet/minecraft/class_4486;Z)V ARG 1 file diff --git a/mappings/net/minecraft/world/TickPriority.mapping b/mappings/net/minecraft/world/tick/TickPriority.mapping similarity index 72% rename from mappings/net/minecraft/world/TickPriority.mapping rename to mappings/net/minecraft/world/tick/TickPriority.mapping index 2b2093baf4..265eaa1251 100644 --- a/mappings/net/minecraft/world/TickPriority.mapping +++ b/mappings/net/minecraft/world/tick/TickPriority.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_1953 net/minecraft/world/TickPriority +CLASS net/minecraft/class_1953 net/minecraft/world/tick/TickPriority FIELD field_9308 index I METHOD (Ljava/lang/String;II)V ARG 3 index diff --git a/mappings/net/minecraft/world/tick/WorldTickScheduler.mapping b/mappings/net/minecraft/world/tick/WorldTickScheduler.mapping index 51941e8932..a942f6564c 100644 --- a/mappings/net/minecraft/world/tick/WorldTickScheduler.mapping +++ b/mappings/net/minecraft/world/tick/WorldTickScheduler.mapping @@ -48,13 +48,8 @@ CLASS net/minecraft/class_6757 net/minecraft/world/tick/WorldTickScheduler METHOD method_39385 (Lnet/minecraft/class_6755;Lnet/minecraft/class_6760;)V ARG 1 chunkTickScheduler ARG 2 tick - METHOD method_39386 (Lnet/minecraft/class_2382;JJLnet/minecraft/class_6760;)V - ARG 6 tick METHOD method_39387 (Lit/unimi/dsi/fastutil/longs/Long2LongOpenHashMap;)V ARG 0 map - METHOD method_39388 (Ljava/util/function/Predicate;Ljava/util/List;JLnet/minecraft/class_6755;)V - ARG 2 chunkPos - ARG 4 chunkTickScheduler METHOD method_39389 addTickableTicks (Ljava/util/Queue;Lnet/minecraft/class_6755;JI)V ARG 1 tickableChunkTickSchedulers ARG 2 chunkTickScheduler @@ -72,8 +67,17 @@ CLASS net/minecraft/class_6757 net/minecraft/world/tick/WorldTickScheduler METHOD method_39395 addTickableTick (Lnet/minecraft/class_6760;)V ARG 1 tick METHOD method_39396 copyTickableTicksList ()V - METHOD method_39973 (Lnet/minecraft/class_3341;Lnet/minecraft/class_6760;)Z + METHOD method_48166 (Lnet/minecraft/class_3341;Lnet/minecraft/class_6760;)Z ARG 1 tick + METHOD method_48167 scheduleTicks (Lnet/minecraft/class_6757;Lnet/minecraft/class_3341;Lnet/minecraft/class_2382;)V + ARG 1 scheduler + ARG 2 box + ARG 3 offset + METHOD method_48168 (Lnet/minecraft/class_2382;JJLnet/minecraft/class_6760;)V + ARG 6 tick + METHOD method_48169 (Ljava/util/function/Predicate;Ljava/util/List;JLnet/minecraft/class_6755;)V + ARG 2 chunkPos + ARG 4 chunkTickScheduler CLASS class_6758 ChunkVisitor METHOD accept (JLnet/minecraft/class_6755;)V ARG 1 chunkPos diff --git a/mappings/net/minecraft/world/updater/WorldUpdater.mapping b/mappings/net/minecraft/world/updater/WorldUpdater.mapping index c4227bffe7..9a79f3ca52 100644 --- a/mappings/net/minecraft/world/updater/WorldUpdater.mapping +++ b/mappings/net/minecraft/world/updater/WorldUpdater.mapping @@ -3,7 +3,8 @@ CLASS net/minecraft/class_1257 net/minecraft/world/updater/WorldUpdater FIELD field_19225 eraseCache Z FIELD field_24083 session Lnet/minecraft/class_32$class_5143; FIELD field_24084 dataFixer Lcom/mojang/datafixers/DataFixer; - FIELD field_35454 generatorOptions Lnet/minecraft/class_5285; + FIELD field_40113 dimensionOptionsRegistry Lnet/minecraft/class_2378; + FIELD field_40114 worldKeys Ljava/util/Set; FIELD field_5755 persistentStateManager Lnet/minecraft/class_26; FIELD field_5756 LOGGER Lorg/slf4j/Logger; FIELD field_5757 UPDATE_THREAD_FACTORY Ljava/util/concurrent/ThreadFactory; @@ -16,17 +17,17 @@ CLASS net/minecraft/class_1257 net/minecraft/world/updater/WorldUpdater FIELD field_5766 upgradedChunkCount I FIELD field_5767 updateThread Ljava/lang/Thread; FIELD field_5768 totalChunkCount I - METHOD (Lnet/minecraft/class_32$class_5143;Lcom/mojang/datafixers/DataFixer;Lnet/minecraft/class_5285;Z)V + METHOD (Lnet/minecraft/class_32$class_5143;Lcom/mojang/datafixers/DataFixer;Lnet/minecraft/class_2378;Z)V ARG 1 session ARG 2 dataFixer - ARG 3 generatorOptions + ARG 3 dimensionOptionsRegistry ARG 4 eraseCache METHOD method_17829 (Ljava/io/File;Ljava/lang/String;)Z ARG 0 directory ARG 1 name METHOD method_17830 getChunkPositions (Lnet/minecraft/class_5321;)Ljava/util/List; ARG 1 world - METHOD method_28304 getWorlds ()Lcom/google/common/collect/ImmutableSet; + METHOD method_28304 getWorlds ()Ljava/util/Set; METHOD method_5393 getProgress (Lnet/minecraft/class_5321;)F ARG 1 world METHOD method_5394 getStatus ()Lnet/minecraft/class_2561; diff --git a/settings.gradle b/settings.gradle index 7b82d7d6be..ccda7f7251 100644 --- a/settings.gradle +++ b/settings.gradle @@ -14,6 +14,8 @@ if (!JavaVersion.current().isCompatibleWith(JavaVersion.VERSION_17)) { throw new UnsupportedOperationException("Yarn's buildscript requires Java 17 or higher.") } +enableFeaturePreview "STABLE_CONFIGURATION_CACHE" + rootProject.name = "yarn" includeBuild 'filament' \ No newline at end of file diff --git a/src/packageDocs/java/net/minecraft/block/cauldron/package-info.java b/src/packageDocs/java/net/minecraft/block/cauldron/package-info.java new file mode 100644 index 0000000000..bc953ac2f0 --- /dev/null +++ b/src/packageDocs/java/net/minecraft/block/cauldron/package-info.java @@ -0,0 +1,11 @@ +/* + * This file is free for everyone to use under the Creative Commons Zero license. + */ + +/** + * Provides the {@linkplain net.minecraft.block.cauldron.CauldronBehavior cauldron behavior} system, + * which determines what happens when a player interacts with a cauldron. + * + * @see net.minecraft.block.AbstractCauldronBlock + */ +package net.minecraft.block.cauldron; diff --git a/src/packageDocs/java/net/minecraft/util/registry/package-info.java b/src/packageDocs/java/net/minecraft/util/registry/package-info.java new file mode 100644 index 0000000000..9404653de9 --- /dev/null +++ b/src/packageDocs/java/net/minecraft/util/registry/package-info.java @@ -0,0 +1,10 @@ +/* + * This file is free for everyone to use under the Creative Commons Zero license. + */ + +/** + * Contains the registry, used to register various in-game components, and related classes. + * + * @see Registry + */ +package net.minecraft.util.registry; diff --git a/unpick-definitions/entity_status.unpick b/unpick-definitions/entity_status.unpick index 5381f1c4dd..0c85fc9ed1 100644 --- a/unpick-definitions/entity_status.unpick +++ b/unpick-definitions/entity_status.unpick @@ -6,18 +6,14 @@ constant entity_statuses net/minecraft/entity/EntityStatuses BLOCK_WITH_SHIELD constant entity_statuses net/minecraft/entity/EntityStatuses BREAK_SHIELD constant entity_statuses net/minecraft/entity/EntityStatuses PULL_HOOKED_ENTITY constant entity_statuses net/minecraft/entity/EntityStatuses HIT_ARMOR_STAND -constant entity_statuses net/minecraft/entity/EntityStatuses DAMAGE_FROM_THORNS constant entity_statuses net/minecraft/entity/EntityStatuses STOP_LOOKING_AT_VILLAGER constant entity_statuses net/minecraft/entity/EntityStatuses USE_TOTEM_OF_UNDYING -constant entity_statuses net/minecraft/entity/EntityStatuses DAMAGE_FROM_DROWNING -constant entity_statuses net/minecraft/entity/EntityStatuses DAMAGE_FROM_FIRE constant entity_statuses net/minecraft/entity/EntityStatuses ADD_DOLPHIN_HAPPY_VILLAGER_PARTICLES constant entity_statuses net/minecraft/entity/EntityStatuses STUN_RAVAGER constant entity_statuses net/minecraft/entity/EntityStatuses TAME_OCELOT_FAILED constant entity_statuses net/minecraft/entity/EntityStatuses TAME_OCELOT_SUCCESS constant entity_statuses net/minecraft/entity/EntityStatuses ADD_SPLASH_PARTICLES constant entity_statuses net/minecraft/entity/EntityStatuses ADD_CLOUD_PARTICLES -constant entity_statuses net/minecraft/entity/EntityStatuses DAMAGE_FROM_BERRY_BUSH constant entity_statuses net/minecraft/entity/EntityStatuses CREATE_EATING_PARTICLES constant entity_statuses net/minecraft/entity/EntityStatuses ADD_PORTAL_PARTICLES constant entity_statuses net/minecraft/entity/EntityStatuses BREAK_MAINHAND @@ -31,8 +27,6 @@ constant entity_statuses net/minecraft/entity/EntityStatuses DRIP_HONEY constant entity_statuses net/minecraft/entity/EntityStatuses DRIP_RICH_HONEY constant entity_statuses net/minecraft/entity/EntityStatuses SWAP_HANDS constant entity_statuses net/minecraft/entity/EntityStatuses RESET_WOLF_SHAKE -constant entity_statuses net/minecraft/entity/EntityStatuses DAMAGE_FROM_FREEZING -constant entity_statuses net/minecraft/entity/EntityStatuses DAMAGE_FROM_GENERIC_SOURCE constant entity_statuses net/minecraft/entity/EntityStatuses PLAY_DEATH_SOUND_OR_ADD_PROJECTILE_HIT_PARTICLES constant entity_statuses net/minecraft/entity/EntityStatuses PLAY_ATTACK_SOUND constant entity_statuses net/minecraft/entity/EntityStatuses ADD_NEGATIVE_PLAYER_REACTION_PARTICLES @@ -61,6 +55,7 @@ constant entity_statuses net/minecraft/entity/EntityStatuses FINISH_RAM constant entity_statuses net/minecraft/entity/EntityStatuses ADD_DEATH_PARTICLES constant entity_statuses net/minecraft/entity/EntityStatuses EARS_TWITCH constant entity_statuses net/minecraft/entity/EntityStatuses SONIC_BOOM +constant entity_statuses net/minecraft/entity/EntityStatuses START_DIGGING target_method net/minecraft/entity/Entity handleStatus (B)V param 0 entity_statuses diff --git a/unpick-definitions/gl.unpick b/unpick-definitions/gl.unpick index 97c3982163..7f74921cbe 100644 --- a/unpick-definitions/gl.unpick +++ b/unpick-definitions/gl.unpick @@ -60,7 +60,6 @@ constant gl_type com/mojang/blaze3d/platform/GlConst GL_UNSIGNED_SHORT constant gl_type com/mojang/blaze3d/platform/GlConst GL_INT constant gl_type com/mojang/blaze3d/platform/GlConst GL_UNSIGNED_INT constant gl_type com/mojang/blaze3d/platform/GlConst GL_FLOAT -constant gl_type com/mojang/blaze3d/platform/GlConst GL_UNSIGNED_INT_8_8_8_8_REV constant gl_framebuffer_attachment com/mojang/blaze3d/platform/GlConst GL_COLOR_ATTACHMENT0 constant gl_framebuffer_attachment com/mojang/blaze3d/platform/GlConst GL_DEPTH_ATTACHMENT @@ -105,7 +104,6 @@ constant gl_debug_severity org/lwjgl/opengl/GL43 GL_DEBUG_SEVERITY_NOTIFICATION constant gl_enable_state org/lwjgl/opengl/GL11 GL_BLEND constant gl_enable_state org/lwjgl/opengl/GL11 GL_DEPTH_TEST constant gl_enable_state org/lwjgl/opengl/GL11 GL_CULL_FACE -constant gl_enable_state org/lwjgl/opengl/GL11 GL_POLYGON_OFFSET_FULL constant gl_enable_state org/lwjgl/opengl/GL11 GL_POLYGON_OFFSET_LINE constant gl_enable_state org/lwjgl/opengl/GL11 GL_COLOR_LOGIC_OP constant gl_enable_state org/lwjgl/opengl/GL11 GL_SCISSOR_TEST @@ -154,7 +152,6 @@ constant gl_get_string_name org/lwjgl/opengl/GL11 GL_EXTENSIONS # GlStateManager -constant gl_get_integer_pname org/lwjgl/opengl/GL11 GL_DRAW_FRAMEBUFFER_BINDING constant gl_get_integer_pname org/lwjgl/opengl/GL11 GL_MAX_TEXTURE_SIZE constant gl_logic_op org/lwjgl/opengl/GL11 GL_CLEAR diff --git a/unpick-definitions/key_bindings.unpick b/unpick-definitions/key_bindings.unpick index 3512f16d9b..59f290b0df 100644 --- a/unpick-definitions/key_bindings.unpick +++ b/unpick-definitions/key_bindings.unpick @@ -108,11 +108,9 @@ constant key_codes org/lwjgl/glfw/GLFW GLFW_KEY_TAB constant key_codes org/lwjgl/glfw/GLFW GLFW_KEY_LEFT_ALT constant key_codes org/lwjgl/glfw/GLFW GLFW_KEY_LEFT_CONTROL constant key_codes org/lwjgl/glfw/GLFW GLFW_KEY_LEFT_SHIFT -constant key_codes org/lwjgl/glfw/GLFW GLFW_KEY_LEFT_WIN constant key_codes org/lwjgl/glfw/GLFW GLFW_KEY_RIGHT_ALT constant key_codes org/lwjgl/glfw/GLFW GLFW_KEY_RIGHT_CONTROL constant key_codes org/lwjgl/glfw/GLFW GLFW_KEY_RIGHT_SHIFT -constant key_codes org/lwjgl/glfw/GLFW GLFW_KEY_RIGHT_WIN constant key_codes org/lwjgl/glfw/GLFW GLFW_KEY_ENTER constant key_codes org/lwjgl/glfw/GLFW GLFW_KEY_ESCAPE constant key_codes org/lwjgl/glfw/GLFW GLFW_KEY_BACKSPACE diff --git a/unpick-definitions/network_packets.unpick b/unpick-definitions/network_packets.unpick index f4e90f0f76..c6013304d8 100644 --- a/unpick-definitions/network_packets.unpick +++ b/unpick-definitions/network_packets.unpick @@ -20,7 +20,6 @@ target_method net/minecraft/network/packet/s2c/play/BlockEntityUpdateS2CPacket g return s2c_block_entity_type constant s2c_animation_id net/minecraft/network/packet/s2c/play/EntityAnimationS2CPacket SWING_MAIN_HAND -constant s2c_animation_id net/minecraft/network/packet/s2c/play/EntityAnimationS2CPacket DAMAGE constant s2c_animation_id net/minecraft/network/packet/s2c/play/EntityAnimationS2CPacket WAKE_UP constant s2c_animation_id net/minecraft/network/packet/s2c/play/EntityAnimationS2CPacket SWING_OFF_HAND constant s2c_animation_id net/minecraft/network/packet/s2c/play/EntityAnimationS2CPacket CRIT diff --git a/unpick-definitions/set_block_state_flags.unpick b/unpick-definitions/set_block_state_flags.unpick index 8ab322d610..4b81317267 100644 --- a/unpick-definitions/set_block_state_flags.unpick +++ b/unpick-definitions/set_block_state_flags.unpick @@ -8,7 +8,6 @@ flag set_block_state_flags net/minecraft/block/Block REDRAW_ON_MAIN_THREAD flag set_block_state_flags net/minecraft/block/Block FORCE_STATE flag set_block_state_flags net/minecraft/block/Block SKIP_DROPS flag set_block_state_flags net/minecraft/block/Block MOVED -flag set_block_state_flags net/minecraft/block/Block SKIP_LIGHTING_UPDATES target_method net/minecraft/world/ModifiableWorld setBlockState (Lnet/minecraft/util/math/BlockPos;Lnet/minecraft/block/BlockState;I)Z param 2 set_block_state_flags diff --git a/unpick-definitions/world_events.unpick b/unpick-definitions/world_events.unpick index 1d07b3718d..6a1b2f4ca5 100644 --- a/unpick-definitions/world_events.unpick +++ b/unpick-definitions/world_events.unpick @@ -5,16 +5,9 @@ constant world_events net/minecraft/world/WorldEvents DISPENSER_FAILS constant world_events net/minecraft/world/WorldEvents DISPENSER_LAUNCHES_PROJECTILE constant world_events net/minecraft/world/WorldEvents EYE_OF_ENDER_LAUNCHES constant world_events net/minecraft/world/WorldEvents FIREWORK_ROCKET_SHOOTS -constant world_events net/minecraft/world/WorldEvents IRON_DOOR_OPENS -constant world_events net/minecraft/world/WorldEvents WOODEN_DOOR_OPENS -constant world_events net/minecraft/world/WorldEvents WOODEN_TRAPDOOR_OPENS -constant world_events net/minecraft/world/WorldEvents FENCE_GATE_OPENS constant world_events net/minecraft/world/WorldEvents FIRE_EXTINGUISHED -constant world_events net/minecraft/world/WorldEvents MUSIC_DISC_PLAYED -constant world_events net/minecraft/world/WorldEvents IRON_DOOR_CLOSES -constant world_events net/minecraft/world/WorldEvents WOODEN_DOOR_CLOSES -constant world_events net/minecraft/world/WorldEvents WOODEN_TRAPDOOR_CLOSES -constant world_events net/minecraft/world/WorldEvents FENCE_GATE_CLOSES +constant world_events net/minecraft/world/WorldEvents JUKEBOX_STARTS_PLAYING +constant world_events net/minecraft/world/WorldEvents JUKEBOX_STOPS_PLAYING constant world_events net/minecraft/world/WorldEvents GHAST_WARNS constant world_events net/minecraft/world/WorldEvents GHAST_SHOOTS constant world_events net/minecraft/world/WorldEvents ENDER_DRAGON_SHOOTS @@ -36,8 +29,6 @@ constant world_events net/minecraft/world/WorldEvents TRAVEL_THROUGH_PORTAL constant world_events net/minecraft/world/WorldEvents CHORUS_FLOWER_GROWS constant world_events net/minecraft/world/WorldEvents CHORUS_FLOWER_DIES constant world_events net/minecraft/world/WorldEvents BREWING_STAND_BREWS -constant world_events net/minecraft/world/WorldEvents IRON_TRAPDOOR_CLOSES -constant world_events net/minecraft/world/WorldEvents IRON_TRAPDOOR_OPENS constant world_events net/minecraft/world/WorldEvents END_PORTAL_OPENED constant world_events net/minecraft/world/WorldEvents PHANTOM_BITES constant world_events net/minecraft/world/WorldEvents ZOMBIE_CONVERTS_TO_DROWNED @@ -73,6 +64,8 @@ constant world_events net/minecraft/world/WorldEvents BLOCK_SCRAPED constant world_events net/minecraft/world/WorldEvents BONE_MEAL_USED constant world_events net/minecraft/world/WorldEvents SCULK_CHARGE constant world_events net/minecraft/world/WorldEvents SCULK_SHRIEKS +constant world_events net/minecraft/world/WorldEvents BLOCK_FINISHED_BRUSHING +constant world_events net/minecraft/world/WorldEvents SNIFFER_EGG_CRACKS target_method net/minecraft/world/WorldAccess syncWorldEvent (Lnet/minecraft/entity/player/PlayerEntity;ILnet/minecraft/util/math/BlockPos;I)V param 1 world_events @@ -88,7 +81,3 @@ target_method net/minecraft/network/packet/s2c/play/WorldEventS2CPacket ( param 0 world_events target_method net/minecraft/network/packet/s2c/play/WorldEventS2CPacket getEventId ()I return world_events -target_method net/minecraft/block/DoorBlock getOpenSoundEventId ()I - return world_events -target_method net/minecraft/block/DoorBlock getCloseSoundEventId ()I - return world_events From 1096ea9b599c2eca46cac5cc9f7fe80cf00eafaa Mon Sep 17 00:00:00 2001 From: YanisBft Date: Fri, 1 Sep 2023 06:28:29 +0200 Subject: [PATCH 6/6] fix docs --- mappings/net/minecraft/item/ArmorMaterial.mapping | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/mappings/net/minecraft/item/ArmorMaterial.mapping b/mappings/net/minecraft/item/ArmorMaterial.mapping index 8d8f6cdf77..540d44921e 100644 --- a/mappings/net/minecraft/item/ArmorMaterial.mapping +++ b/mappings/net/minecraft/item/ArmorMaterial.mapping @@ -14,12 +14,12 @@ CLASS net/minecraft/class_1741 net/minecraft/item/ArmorMaterial COMMENT COMMENT

COMMENT The value returned here will set the {@link Item.Settings} max durability option when passed - COMMENT into {@link ArmorItem#ArmorItem(net.minecraft.item.ArmorMaterial, EquipmentSlot, Item.Settings)} + COMMENT into {@link ArmorItem#ArmorItem(net.minecraft.item.ArmorMaterial, ArmorItem.Type, Item.Settings)} COMMENT if the value was not already specified. COMMENT COMMENT @return the total durability an {@link ArmorItem} with this {@link ArmorMaterial} has ARG 1 type - COMMENT the {@link EquipmentSlot} containing the {@link Item} with this {@link ArmorMaterial} + COMMENT the {@link ArmorItem.Type} of the {@link Item} with this {@link ArmorMaterial} METHOD method_48403 getProtection (Lnet/minecraft/class_1738$class_8051;)I COMMENT Returns the amount of armor protection points offered by an {@link ArmorItem} COMMENT using this {@link ArmorMaterial} while it is worn by a player. @@ -30,7 +30,7 @@ CLASS net/minecraft/class_1741 net/minecraft/item/ArmorMaterial COMMENT COMMENT @return the amount of armor protection points offered by an {@link ArmorItem} with this {@link ArmorMaterial} ARG 1 type - COMMENT the {@link EquipmentSlot} containing the {@link Item} with this {@link ArmorMaterial} + COMMENT the {@link ArmorItem.Type} of the {@link Item} with this {@link ArmorMaterial} METHOD method_7694 getName ()Ljava/lang/String; COMMENT Returns the {@code name} of this {@link ArmorMaterial}, which is used for locating armor texture files. COMMENT