From 90fffc782a3a55bc1d518bde914bd01aaf6609a0 Mon Sep 17 00:00:00 2001 From: modmuss50 Date: Wed, 28 Feb 2024 19:15:21 +0000 Subject: [PATCH] 24w09a --- build.gradle | 2 +- .../net/minecraft/SharedConstants.mapping | 30 --- .../block/AbstractBannerBlock.mapping | 4 - .../net/minecraft/block/AbstractBlock.mapping | 10 +- .../minecraft/block/DecoratedPotBlock.mapping | 6 - .../net/minecraft/block/FlowerBlock.mapping | 7 +- .../minecraft/block/PlayerSkullBlock.mapping | 4 - .../block/SuspiciousStewIngredient.mapping | 8 +- .../block/entity/BannerBlockEntity.mapping | 20 +- .../block/entity/BannerPattern.mapping | 19 -- .../block/entity/BeehiveBlockEntity.mapping | 32 +-- .../block/entity/BlockEntity.mapping | 2 - .../entity/DecoratedPotBlockEntity.mapping | 18 +- .../LockableContainerBlockEntity.mapping | 2 - .../net/minecraft/block/entity/Sherds.mapping | 9 + .../entity/ShulkerBoxBlockEntity.mapping | 2 +- .../block/entity/SkullBlockEntity.mapping | 9 - .../block/entity/VaultBlockEntity.mapping | 4 +- .../block/spawner/TrialSpawnerData.mapping | 2 +- mappings/net/minecraft/class_9273.mapping | 2 + mappings/net/minecraft/class_9283.mapping | 12 + mappings/net/minecraft/class_9298.mapping | 6 + mappings/net/minecraft/class_9307.mapping | 9 + .../client/color/item/ItemColors.mapping | 9 - .../client/gl/JsonEffectShaderProgram.mapping | 6 +- .../client/gl/PostEffectPass.mapping | 3 +- .../client/gl/PostEffectProcessor.mapping | 4 +- .../minecraft/client/gui/hud/DebugHud.mapping | 6 - .../AccessibilityOnboardingScreen.mapping | 1 - .../gui/screen/OutOfMemoryScreen.mapping | 1 - .../screen/Realms32BitWarningScreen.mapping | 2 - .../client/gui/screen/Screen.mapping | 4 - .../client/gui/screen/StatsListener.mapping | 3 - .../client/gui/screen/StatsScreen.mapping | 15 +- .../client/gui/screen/TitleScreen.mapping | 3 - .../client/gui/screen/WarningScreen.mapping | 11 +- .../advancement/AdvancementsScreen.mapping | 2 +- .../gui/screen/ingame/BookEditScreen.mapping | 3 +- .../gui/screen/ingame/BookScreen.mapping | 21 -- .../ingame/CreativeInventoryScreen.mapping | 1 - .../gui/screen/ingame/LoomScreen.mapping | 2 +- .../MultiplayerWarningScreen.mapping | 4 - .../option/ControlsOptionsScreen.mapping | 3 - .../screen/option/GameOptionsScreen.mapping | 2 +- .../gui/screen/option/KeybindsScreen.mapping | 2 - .../option/LanguageOptionsScreen.mapping | 4 - .../screen/option/MouseOptionsScreen.mapping | 2 - .../gui/screen/option/OptionsScreen.mapping | 1 - .../screen/option/SimpleOptionsScreen.mapping | 3 - .../screen/option/SkinOptionsScreen.mapping | 2 - .../screen/option/SoundOptionsScreen.mapping | 2 - .../screen/option/TelemetryInfoScreen.mapping | 7 - .../screen/option/VideoOptionsScreen.mapping | 2 - .../pack/ExperimentalWarningScreen.mapping | 1 - .../report/AbuseReportReasonScreen.mapping | 8 - .../gui/screen/report/ReportScreen.mapping | 6 - .../screen/world/CreateWorldScreen.mapping | 2 - .../world/CustomizeBuffetLevelScreen.mapping | 1 - .../screen/world/EditGameRulesScreen.mapping | 3 - .../tooltip/BundleTooltipComponent.mapping | 4 +- .../client/gui/widget/EntryListWidget.mapping | 3 - .../NarratedMultilineTextWidget.mapping | 3 +- .../gui/widget/OptionListWidget.mapping | 16 +- .../gui/widget/TabNavigationWidget.mapping | 2 +- .../gui/widget/TextIconButtonWidget.mapping | 2 +- .../client/item/BundleTooltipData.mapping | 7 - .../ModelPredicateProviderRegistry.mapping | 1 - .../particle/FireworksSparkParticle.mapping | 21 +- .../gui/screen/RealmsBackupScreen.mapping | 33 +-- .../RealmsClientIncompatibleScreen.mapping | 7 - .../gui/screen/RealmsInviteScreen.mapping | 4 - .../gui/screen/RealmsPlayerScreen.mapping | 47 +--- .../client/render/VertexConsumer.mapping | 9 +- .../entity/BannerBlockEntityRenderer.mapping | 6 +- .../DecoratedPotBlockEntityRenderer.mapping | 3 +- .../feature/ArmorFeatureRenderer.mapping | 2 - .../argument/ItemPredicateReader.mapping | 3 - .../ItemPredicateStringReader.mapping | 2 - .../argument/ItemStackArgument.mapping | 8 +- .../client/BlockStateModelGenerator.mapping | 3 - .../data/report/BlockListProvider.mapping | 2 +- ...laAdventureTabAdvancementGenerator.mapping | 8 +- .../loottable/LootTableGenerator.mapping | 3 +- .../loottable/LootTableProvider.mapping | 2 - .../VanillaFishingLootTableGenerator.mapping | 3 - .../datafixer/schema/Schema3083.mapping | 4 - .../enchantment/EnchantmentHelper.mapping | 40 ---- .../entity/AreaEffectCloudEntity.mapping | 10 - .../net/minecraft/entity/CrossbowUser.mapping | 15 -- .../net/minecraft/entity/EntityType.mapping | 9 +- .../minecraft/entity/EyeOfEnderEntity.mapping | 1 - .../minecraft/entity/InventoryOwner.mapping | 4 +- .../ai/pathing/LandPathNodeMaker.mapping | 11 +- .../entity/ai/pathing/PathNodeMaker.mapping | 7 +- .../attribute/AttributeContainer.mapping | 12 - .../entity/boss/BossBarManager.mapping | 4 +- .../entity/boss/CommandBossBar.mapping | 4 +- .../painting/PaintingEntity.mapping | 5 - .../minecraft/entity/mob/MobEntity.mapping | 4 - .../entity/mob/PillagerEntity.mapping | 1 - .../entity/passive/ArmadilloEntity.mapping | 2 +- .../entity/passive/IronGolemEntity.mapping | 9 +- .../entity/passive/MooshroomEntity.mapping | 4 +- .../entity/player/PlayerEntity.mapping | 4 - .../entity/player/PlayerInventory.mapping | 4 - .../projectile/AbstractFireballEntity.mapping | 1 - .../entity/projectile/ArrowEntity.mapping | 11 - .../projectile/BreezeWindChargeEntity.mapping | 1 - .../projectile/SpectralArrowEntity.mapping | 1 - .../entity/projectile/TridentEntity.mapping | 1 - .../projectile/WindChargeEntity.mapping | 1 - .../projectile/thrown/PotionEntity.mapping | 7 +- .../entity/vehicle/VehicleInventory.mapping | 4 +- .../minecraft/inventory/ContainerLock.mapping | 5 +- .../minecraft/inventory/Inventories.mapping | 6 +- .../inventory/LootableInventory.mapping | 1 - .../inventory/SimpleInventory.mapping | 5 +- .../minecraft/item/AnimalArmorItem.mapping | 5 +- mappings/net/minecraft/item/ArmorItem.mapping | 3 +- mappings/net/minecraft/item/AxeItem.mapping | 5 - .../net/minecraft/item/BannerItem.mapping | 2 +- mappings/net/minecraft/item/BlockItem.mapping | 14 -- .../item/BlockPredicatesChecker.mapping | 10 +- .../net/minecraft/item/BundleItem.mapping | 21 -- .../net/minecraft/item/CompassItem.mapping | 14 -- .../net/minecraft/item/CrossbowItem.mapping | 54 +---- .../net/minecraft/item/DyeableItem.mapping | 16 -- .../minecraft/item/EnchantedBookItem.mapping | 6 - .../item/EnchantedGoldenAppleItem.mapping | 1 - .../net/minecraft/item/FilledMapItem.mapping | 25 +- .../minecraft/item/FireworkRocketItem.mapping | 23 -- .../minecraft/item/FireworkStarItem.mapping | 8 - .../net/minecraft/item/GoatHornItem.mapping | 4 - mappings/net/minecraft/item/HoeItem.mapping | 5 - mappings/net/minecraft/item/Item.mapping | 7 +- .../net/minecraft/item/ItemGroups.mapping | 2 - mappings/net/minecraft/item/ItemStack.mapping | 207 +--------------- .../net/minecraft/item/ItemStackSet.mapping | 2 - .../minecraft/item/KnowledgeBookItem.mapping | 1 - .../net/minecraft/item/MiningToolItem.mapping | 9 - .../net/minecraft/item/NetherStarItem.mapping | 1 - .../net/minecraft/item/PickaxeItem.mapping | 5 +- .../net/minecraft/item/PlayerHeadItem.mapping | 1 - .../minecraft/item/RangedWeaponItem.mapping | 1 + .../net/minecraft/item/ShieldItem.mapping | 3 - .../net/minecraft/item/ShovelItem.mapping | 5 - .../net/minecraft/item/SpawnEggItem.mapping | 6 +- .../minecraft/item/SuspiciousStewItem.mapping | 14 -- mappings/net/minecraft/item/SwordItem.mapping | 8 - mappings/net/minecraft/item/ToolItem.mapping | 3 - .../net/minecraft/item/TridentItem.mapping | 1 - .../minecraft/item/WritableBookItem.mapping | 2 - .../minecraft/item/WrittenBookItem.mapping | 22 -- .../net/minecraft/item/map/MapIcon.mapping | 2 - .../net/minecraft/item/map/MapState.mapping | 4 +- .../net/minecraft/item/trim/ArmorTrim.mapping | 26 --- .../loot/entry/LootTableEntry.mapping | 8 +- .../loot/function/CopyNbtLootFunction.mapping | 2 +- .../loot/function/CopyStateFunction.mapping | 3 - .../SetAttributesLootFunction.mapping | 3 +- .../function/SetBannerPatternFunction.mapping | 10 +- .../SetEnchantmentsLootFunction.mapping | 10 - .../loot/function/SetLoreLootFunction.mapping | 3 - .../loot/function/SetNbtLootFunction.mapping | 2 - .../minecraft/network/PacketByteBuf.mapping | 65 ------ .../network/codec/PacketCodecs.mapping | 39 ++-- .../s2c/login/LoginSuccessS2CPacket.mapping | 10 +- mappings/net/minecraft/potion/Potion.mapping | 5 +- .../net/minecraft/potion/PotionUtil.mapping | 43 +--- mappings/net/minecraft/potion/Potions.mapping | 5 - .../predicate/BlockPredicate.mapping | 8 - .../predicate/FluidPredicate.mapping | 4 +- .../minecraft/predicate/NbtPredicate.mapping | 1 - .../entity/EntityTypePredicate.mapping | 8 - .../entity/LocationPredicate.mapping | 21 +- .../item/EnchantmentPredicate.mapping | 3 +- .../predicate/item/ItemPredicate.mapping | 15 +- .../minecraft/recipe/RepairItemRecipe.mapping | 2 +- .../net/minecraft/registry/Registries.mapping | 2 +- .../minecraft/scoreboard/Scoreboard.mapping | 10 +- .../scoreboard/ScoreboardScore.mapping | 4 +- .../scoreboard/ScoreboardState.mapping | 10 +- .../screen/MerchantScreenHandler.mapping | 3 +- .../server/command/ResetChunksCommand.mapping | 6 - .../integrated/IntegratedServerLoader.mapping | 25 -- .../network/ServerPlayNetworkHandler.mapping | 9 - .../server/world/ChunkHolder.mapping | 26 +-- .../server/world/ChunkTicketManager.mapping | 2 - .../server/world/ServerChunkManager.mapping | 4 - .../world/ThreadedAnvilChunkStorage.mapping | 41 +--- .../net/minecraft/test/TestFunction.mapping | 18 +- .../net/minecraft/text/HoverEvent.mapping | 38 +-- mappings/net/minecraft/text/Text.mapping | 20 +- .../net/minecraft/text/TextCodecs.mapping | 5 - .../packageinfo/PackageInfo9303.mapping | 1 + .../packageinfo/PackageInfo9313.mapping | 1 + .../packageinfo/PackageInfo9337.mapping | 1 + mappings/net/minecraft/util/Util.mapping | 10 - .../net/minecraft/util/dynamic/Codecs.mapping | 5 - .../net/minecraft/village/TradeOffer.mapping | 56 ++--- .../net/minecraft/village/TradeOffers.mapping | 43 +--- .../net/minecraft/village/raid/Raid.mapping | 2 +- .../net/minecraft/world/ChunkRegion.mapping | 1 - .../minecraft/world/ChunkSerializer.mapping | 2 +- .../world/CommandBlockExecutor.mapping | 7 +- mappings/net/minecraft/world/World.mapping | 3 +- .../minecraft/world/chunk/ChunkStatus.mapping | 220 +----------------- .../minecraft/world/chunk/ChunkType.mapping | 6 + .../world/gen/StructureAccessor.mapping | 8 +- 209 files changed, 278 insertions(+), 1902 deletions(-) create mode 100644 mappings/net/minecraft/block/entity/Sherds.mapping create mode 100644 mappings/net/minecraft/class_9273.mapping create mode 100644 mappings/net/minecraft/class_9283.mapping create mode 100644 mappings/net/minecraft/class_9298.mapping create mode 100644 mappings/net/minecraft/class_9307.mapping delete mode 100644 mappings/net/minecraft/client/gui/screen/StatsListener.mapping delete mode 100644 mappings/net/minecraft/item/DyeableItem.mapping delete mode 100644 mappings/net/minecraft/item/EnchantedGoldenAppleItem.mapping delete mode 100644 mappings/net/minecraft/item/NetherStarItem.mapping create mode 100644 mappings/net/minecraft/unused/packageinfo/PackageInfo9303.mapping create mode 100644 mappings/net/minecraft/unused/packageinfo/PackageInfo9313.mapping create mode 100644 mappings/net/minecraft/unused/packageinfo/PackageInfo9337.mapping create mode 100644 mappings/net/minecraft/world/chunk/ChunkType.mapping diff --git a/build.gradle b/build.gradle index 6634c35381..4225b7c44c 100644 --- a/build.gradle +++ b/build.gradle @@ -20,7 +20,7 @@ plugins { id 'net.fabricmc.filament' } -def minecraft_version = "24w07a" +def minecraft_version = "24w09a" filament { minecraftVersion = minecraft_version diff --git a/mappings/net/minecraft/SharedConstants.mapping b/mappings/net/minecraft/SharedConstants.mapping index e6b2709750..bd625f4f6a 100644 --- a/mappings/net/minecraft/SharedConstants.mapping +++ b/mappings/net/minecraft/SharedConstants.mapping @@ -34,33 +34,3 @@ CLASS net/minecraft/class_155 net/minecraft/SharedConstants METHOD method_37896 isOutsideGenerationArea (Lnet/minecraft/class_1923;)Z ARG 0 pos METHOD method_43250 enableDataFixerOptimization ()V - METHOD method_44355 stripInvalidChars (Ljava/lang/String;Z)Ljava/lang/String; - COMMENT {@return {@code s} with {@linkplain #isValidChar invalid characters} stripped} - COMMENT - COMMENT

LF (linebreak; U+000A) may or may not be stripped depending on the passed - COMMENT {@code allowLinebreaks} value. - COMMENT - COMMENT @see #isValidChar - COMMENT @see #stripInvalidChars(String) - ARG 0 s - ARG 1 allowLinebreaks - METHOD method_643 isValidChar (C)Z - COMMENT {@return true if the character is not {@linkplain - COMMENT net.minecraft.util.Formatting#FORMATTING_CODE_PREFIX the formatting code - COMMENT prefix} (\u00a7), C0 control code (\u0000 to \u001f) or - COMMENT delete (\u007f)} - COMMENT - COMMENT @apiNote This method is used to determine if the server should - COMMENT accept a chat message sent from client. - COMMENT - COMMENT @see net.minecraft.server.network.ServerPlayNetworkHandler#hasIllegalCharacter - ARG 0 chr - METHOD method_644 stripInvalidChars (Ljava/lang/String;)Ljava/lang/String; - COMMENT {@return {@code s} with all {@linkplain #isValidChar invalid characters} stripped} - COMMENT - COMMENT

LF (linebreak; U+000A) is an invalid character and therefore stripped. Use - COMMENT {@link #stripInvalidChars(String, boolean)} to keep linebreaks. - COMMENT - COMMENT @see #isValidChar - COMMENT @see #stripInvalidChars(String, boolean) - ARG 0 s diff --git a/mappings/net/minecraft/block/AbstractBannerBlock.mapping b/mappings/net/minecraft/block/AbstractBannerBlock.mapping index 7f83727e12..e616218617 100644 --- a/mappings/net/minecraft/block/AbstractBannerBlock.mapping +++ b/mappings/net/minecraft/block/AbstractBannerBlock.mapping @@ -3,8 +3,4 @@ CLASS net/minecraft/class_2185 net/minecraft/block/AbstractBannerBlock METHOD (Lnet/minecraft/class_1767;Lnet/minecraft/class_4970$class_2251;)V ARG 1 color ARG 2 settings - METHOD method_38990 (Lnet/minecraft/class_1799;Lnet/minecraft/class_2573;)V - ARG 1 blockEntity - METHOD method_38991 (Lnet/minecraft/class_1799;Lnet/minecraft/class_2573;)V - ARG 1 blockEntity METHOD method_9303 getColor ()Lnet/minecraft/class_1767; diff --git a/mappings/net/minecraft/block/AbstractBlock.mapping b/mappings/net/minecraft/block/AbstractBlock.mapping index f752b49b2e..6340c46ace 100644 --- a/mappings/net/minecraft/block/AbstractBlock.mapping +++ b/mappings/net/minecraft/block/AbstractBlock.mapping @@ -447,7 +447,7 @@ CLASS net/minecraft/class_4970 net/minecraft/block/AbstractBlock ARG 2 world ARG 3 pos ARG 4 random - METHOD method_9516 canPathfindThrough (Lnet/minecraft/class_2680;Lnet/minecraft/class_1922;Lnet/minecraft/class_2338;Lnet/minecraft/class_10;)Z + METHOD method_9516 canPathfindThrough (Lnet/minecraft/class_2680;Lnet/minecraft/class_10;)Z COMMENT {@return if an entity using navigation type {@code type} can navigate through this block} COMMENT COMMENT @apiNote Subclasses may override this to prevent or restrict pathfinding through the @@ -455,9 +455,6 @@ CLASS net/minecraft/class_4970 net/minecraft/block/AbstractBlock COMMENT COMMENT @see AbstractBlockState#canPathfindThrough ARG 1 state - ARG 2 world - ARG 3 pos - ARG 4 type METHOD method_9517 prepare (Lnet/minecraft/class_2680;Lnet/minecraft/class_1936;Lnet/minecraft/class_2338;II)V COMMENT Called when the block state changes, before the {@linkplain #getStateForNeighborUpdate COMMENT neighbor-triggered state update} on the original block, and after the @@ -1086,10 +1083,7 @@ CLASS net/minecraft/class_4970 net/minecraft/block/AbstractBlock ARG 1 world ARG 2 pos ARG 3 type - METHOD method_26171 canPathfindThrough (Lnet/minecraft/class_1922;Lnet/minecraft/class_2338;Lnet/minecraft/class_10;)Z - ARG 1 world - ARG 2 pos - ARG 3 type + METHOD method_26171 canPathfindThrough (Lnet/minecraft/class_10;)Z METHOD method_26172 getOutlineShape (Lnet/minecraft/class_1922;Lnet/minecraft/class_2338;Lnet/minecraft/class_3726;)Lnet/minecraft/class_265; ARG 1 world ARG 2 pos diff --git a/mappings/net/minecraft/block/DecoratedPotBlock.mapping b/mappings/net/minecraft/block/DecoratedPotBlock.mapping index ea45be7fb1..ae3f51e214 100644 --- a/mappings/net/minecraft/block/DecoratedPotBlock.mapping +++ b/mappings/net/minecraft/block/DecoratedPotBlock.mapping @@ -5,9 +5,3 @@ CLASS net/minecraft/class_8168 net/minecraft/block/DecoratedPotBlock FIELD field_43236 SHERDS_DYNAMIC_DROP_ID Lnet/minecraft/class_2960; FIELD field_43237 CRACKED Lnet/minecraft/class_2746; FIELD field_46333 CODEC Lcom/mojang/serialization/MapCodec; - 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/FlowerBlock.mapping b/mappings/net/minecraft/block/FlowerBlock.mapping index 2722fdfba0..4b17ce601a 100644 --- a/mappings/net/minecraft/block/FlowerBlock.mapping +++ b/mappings/net/minecraft/block/FlowerBlock.mapping @@ -1,16 +1,13 @@ CLASS net/minecraft/class_2356 net/minecraft/block/FlowerBlock FIELD field_11085 SHAPE Lnet/minecraft/class_265; - FIELD field_45775 stewEffects Ljava/util/List; + FIELD field_45775 stewEffects Lnet/minecraft/class_9298; FIELD field_46354 STEW_EFFECT_CODEC Lcom/mojang/serialization/MapCodec; FIELD field_46355 CODEC Lcom/mojang/serialization/MapCodec; - METHOD (Ljava/util/List;Lnet/minecraft/class_4970$class_2251;)V - ARG 1 stewEffects - ARG 2 settings METHOD (Lnet/minecraft/class_6880;ILnet/minecraft/class_4970$class_2251;)V ARG 1 stewEffect ARG 2 duration ARG 3 settings - METHOD method_54015 createStewEffectList (Lnet/minecraft/class_6880;I)Ljava/util/List; + METHOD method_54015 createStewEffectList (Lnet/minecraft/class_6880;I)Lnet/minecraft/class_9298; ARG 0 effect ARG 1 duration METHOD method_54016 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; diff --git a/mappings/net/minecraft/block/PlayerSkullBlock.mapping b/mappings/net/minecraft/block/PlayerSkullBlock.mapping index 0479e94641..c0466ed896 100644 --- a/mappings/net/minecraft/block/PlayerSkullBlock.mapping +++ b/mappings/net/minecraft/block/PlayerSkullBlock.mapping @@ -1,6 +1,2 @@ CLASS net/minecraft/class_2435 net/minecraft/block/PlayerSkullBlock FIELD field_46411 CODEC Lcom/mojang/serialization/MapCodec; - METHOD method_56117 resolveSkullOwner (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_1799;)V - ARG 0 world - ARG 1 pos - ARG 2 stack diff --git a/mappings/net/minecraft/block/SuspiciousStewIngredient.mapping b/mappings/net/minecraft/block/SuspiciousStewIngredient.mapping index 9b0eb2eadd..89dec15c05 100644 --- a/mappings/net/minecraft/block/SuspiciousStewIngredient.mapping +++ b/mappings/net/minecraft/block/SuspiciousStewIngredient.mapping @@ -2,10 +2,4 @@ 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; - METHOD method_53248 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; - ARG 0 instance + METHOD method_53233 getStewEffects ()Lnet/minecraft/class_9298; diff --git a/mappings/net/minecraft/block/entity/BannerBlockEntity.mapping b/mappings/net/minecraft/block/entity/BannerBlockEntity.mapping index 495c7300c3..ee1560e627 100644 --- a/mappings/net/minecraft/block/entity/BannerBlockEntity.mapping +++ b/mappings/net/minecraft/block/entity/BannerBlockEntity.mapping @@ -1,35 +1,17 @@ CLASS net/minecraft/class_2573 net/minecraft/block/entity/BannerBlockEntity - FIELD field_11769 patterns Ljava/util/List; FIELD field_11772 customName Lnet/minecraft/class_2561; - FIELD field_11773 patternListNbt Lnet/minecraft/class_2499; + FIELD field_11773 patternListNbt Lnet/minecraft/class_9307; FIELD field_11774 baseColor Lnet/minecraft/class_1767; FIELD field_31296 MAX_PATTERN_COUNT I FIELD field_31297 PATTERNS_KEY Ljava/lang/String; - FIELD field_31298 PATTERN_KEY Ljava/lang/String; - FIELD field_31299 COLOR_KEY Ljava/lang/String; METHOD (Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;)V ARG 1 pos - ARG 2 state METHOD (Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;Lnet/minecraft/class_1767;)V ARG 1 pos ARG 2 state ARG 3 baseColor - METHOD method_10905 loadFromItemStack (Lnet/minecraft/class_1799;)V - ARG 0 stack METHOD method_10907 getPickStack ()Lnet/minecraft/class_1799; METHOD method_10908 getColorForState ()Lnet/minecraft/class_1767; - METHOD method_10910 getPatternCount (Lnet/minecraft/class_1799;)I - ARG 0 stack - METHOD method_10911 getPatterns ()Ljava/util/List; METHOD method_10913 readFrom (Lnet/minecraft/class_1799;Lnet/minecraft/class_1767;)V ARG 1 stack ARG 2 baseColor - METHOD method_16842 setCustomName (Lnet/minecraft/class_2561;)V - ARG 1 customName - METHOD method_24280 getPatternsFromNbt (Lnet/minecraft/class_1767;Lnet/minecraft/class_2499;)Ljava/util/List; - ARG 0 baseColor - ARG 1 patternListNbt - METHOD method_24281 getPatternListNbt (Lnet/minecraft/class_1799;)Lnet/minecraft/class_2499; - ARG 0 stack - METHOD method_38992 readFrom (Lnet/minecraft/class_1799;)V - ARG 1 stack diff --git a/mappings/net/minecraft/block/entity/BannerPattern.mapping b/mappings/net/minecraft/block/entity/BannerPattern.mapping index dccdfa16ce..f45af6d83e 100644 --- a/mappings/net/minecraft/block/entity/BannerPattern.mapping +++ b/mappings/net/minecraft/block/entity/BannerPattern.mapping @@ -1,23 +1,4 @@ CLASS net/minecraft/class_2582 net/minecraft/block/entity/BannerPattern - FIELD field_11824 id Ljava/lang/String; - METHOD (Ljava/lang/String;)V - ARG 1 id - METHOD method_10945 getId ()Ljava/lang/String; - METHOD method_10946 byId (Ljava/lang/String;)Lnet/minecraft/class_6880; - ARG 0 id METHOD method_22536 getSpriteId (Lnet/minecraft/class_5321;Z)Lnet/minecraft/class_2960; ARG 0 pattern ARG 1 banner - METHOD method_43719 (Ljava/lang/String;Lnet/minecraft/class_6880$class_6883;)Z - ARG 1 pattern - CLASS class_3750 Patterns - FIELD field_16548 entries Ljava/util/List; - METHOD method_16375 toNbt ()Lnet/minecraft/class_2499; - METHOD method_16376 add (Lnet/minecraft/class_6880;Lnet/minecraft/class_1767;)Lnet/minecraft/class_2582$class_3750; - ARG 1 pattern - ARG 2 color - METHOD method_31653 add (Lcom/mojang/datafixers/util/Pair;)Lnet/minecraft/class_2582$class_3750; - ARG 1 pattern - METHOD method_43720 add (Lnet/minecraft/class_5321;Lnet/minecraft/class_1767;)Lnet/minecraft/class_2582$class_3750; - ARG 1 pattern - ARG 2 color diff --git a/mappings/net/minecraft/block/entity/BeehiveBlockEntity.mapping b/mappings/net/minecraft/block/entity/BeehiveBlockEntity.mapping index 461ce8fcd9..3ca614b32c 100644 --- a/mappings/net/minecraft/block/entity/BeehiveBlockEntity.mapping +++ b/mappings/net/minecraft/block/entity/BeehiveBlockEntity.mapping @@ -2,10 +2,6 @@ CLASS net/minecraft/class_4482 net/minecraft/block/entity/BeehiveBlockEntity FIELD field_20423 bees Ljava/util/List; FIELD field_20424 flowerPos Lnet/minecraft/class_2338; FIELD field_31306 FLOWER_POS_KEY Ljava/lang/String; - FIELD field_31307 MIN_OCCUPATION_TICKS_KEY Ljava/lang/String; - FIELD field_31308 ENTITY_DATA_KEY Ljava/lang/String; - FIELD field_31309 TICKS_IN_HIVE_KEY Ljava/lang/String; - FIELD field_31310 HAS_NECTAR_KEY Ljava/lang/String; FIELD field_31311 BEES_KEY Ljava/lang/String; FIELD field_31312 MAX_BEE_COUNT I FIELD field_31313 MIN_OCCUPATION_TICKS_WITHOUT_NECTAR I @@ -15,13 +11,8 @@ CLASS net/minecraft/class_4482 net/minecraft/block/entity/BeehiveBlockEntity METHOD (Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;)V ARG 1 pos ARG 2 state - METHOD method_21848 tryEnterHive (Lnet/minecraft/class_1297;Z)V + METHOD method_21848 tryEnterHive (Lnet/minecraft/class_1297;)V ARG 1 entity - ARG 2 hasNectar - METHOD method_21849 tryEnterHive (Lnet/minecraft/class_1297;ZI)V - ARG 1 entity - ARG 2 hasNectar - ARG 3 ticksInHive METHOD method_21850 angerBees (Lnet/minecraft/class_1657;Lnet/minecraft/class_2680;Lnet/minecraft/class_4482$class_4484;)V ARG 1 player ARG 2 state @@ -31,7 +22,7 @@ CLASS net/minecraft/class_4482 net/minecraft/block/entity/BeehiveBlockEntity ARG 2 beeState METHOD method_21854 (Lnet/minecraft/class_2680;Ljava/util/List;Lnet/minecraft/class_4482$class_4484;Lnet/minecraft/class_4482$class_4483;)Z ARG 4 bee - METHOD method_21855 releaseBee (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;Lnet/minecraft/class_4482$class_4483;Ljava/util/List;Lnet/minecraft/class_4482$class_4484;Lnet/minecraft/class_2338;)Z + METHOD method_21855 releaseBee (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;Lnet/minecraft/class_4482$class_9309;Ljava/util/List;Lnet/minecraft/class_4482$class_4484;Lnet/minecraft/class_2338;)Z ARG 0 world ARG 1 pos ARG 2 state @@ -47,37 +38,20 @@ CLASS net/minecraft/class_4482 net/minecraft/block/entity/BeehiveBlockEntity ARG 2 state ARG 3 bees ARG 4 flowerPos - METHOD method_21859 getBees ()Lnet/minecraft/class_2499; METHOD method_22400 hasNoBees ()Z METHOD method_23280 isNearFire ()Z - METHOD method_23901 (Lnet/minecraft/class_1297;)Lnet/minecraft/class_1297; - ARG 0 entity METHOD method_23902 getHoneyLevel (Lnet/minecraft/class_2680;)I ARG 0 state METHOD method_23903 getBeeCount ()I METHOD method_23904 isSmoked ()Z - METHOD method_29562 ageBee (ILnet/minecraft/class_4466;)V - ARG 0 ticks - ARG 1 bee METHOD method_31656 serverTick (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;Lnet/minecraft/class_4482;)V ARG 0 world ARG 1 pos ARG 2 state ARG 3 blockEntity - METHOD method_35292 addBee (Lnet/minecraft/class_2487;IZ)V - ARG 1 nbtCompound - ARG 2 ticksInHive - ARG 3 hasNectar - METHOD method_36379 removeIrrelevantNbtKeys (Lnet/minecraft/class_2487;)V - ARG 0 compound + METHOD method_35292 addBee (Lnet/minecraft/class_4482$class_9309;)V METHOD method_40019 (Lnet/minecraft/class_4970$class_4971;)Z ARG 0 statex CLASS class_4483 Bee - FIELD field_20425 entityData Lnet/minecraft/class_2487; FIELD field_20426 ticksInHive I - FIELD field_20427 minOccupationTicks I - METHOD (Lnet/minecraft/class_2487;II)V - ARG 1 entityData - ARG 2 ticksInHive - ARG 3 minOccupationTicks CLASS class_4484 BeeState diff --git a/mappings/net/minecraft/block/entity/BlockEntity.mapping b/mappings/net/minecraft/block/entity/BlockEntity.mapping index 2d99f61fce..bb2d05d64a 100644 --- a/mappings/net/minecraft/block/entity/BlockEntity.mapping +++ b/mappings/net/minecraft/block/entity/BlockEntity.mapping @@ -185,8 +185,6 @@ CLASS net/minecraft/class_2586 net/minecraft/block/entity/BlockEntity METHOD method_38240 setStackNbt (Lnet/minecraft/class_1799;Lnet/minecraft/class_7225$class_7874;)V COMMENT Sets {@code stack}'s {@code net.minecraft.item.BlockItem#BLOCK_ENTITY_TAG_KEY} COMMENT NBT value to {@linkplain #createNbt the block entity's NBT data}. - ARG 1 stack - ARG 2 registryLookup METHOD method_38241 writeIdToNbt (Lnet/minecraft/class_2487;)V COMMENT Writes the block entity type ID to {@code nbt} under the {@code id} key. COMMENT diff --git a/mappings/net/minecraft/block/entity/DecoratedPotBlockEntity.mapping b/mappings/net/minecraft/block/entity/DecoratedPotBlockEntity.mapping index 65281a9288..0ed28b2a7d 100644 --- a/mappings/net/minecraft/block/entity/DecoratedPotBlockEntity.mapping +++ b/mappings/net/minecraft/block/entity/DecoratedPotBlockEntity.mapping @@ -1,6 +1,6 @@ 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; + FIELD field_44706 sherds Lnet/minecraft/class_8526; FIELD field_46659 ITEM_NBT_KEY Ljava/lang/String; FIELD field_46661 lastWobbleTime J FIELD field_46662 lastWobbleType Lnet/minecraft/class_8172$class_8837; @@ -13,24 +13,12 @@ CLASS net/minecraft/class_8172 net/minecraft/block/entity/DecoratedPotBlockEntit 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; + METHOD method_51511 getSherds ()Lnet/minecraft/class_8526; + METHOD method_52577 getStackWith (Lnet/minecraft/class_8526;)Lnet/minecraft/class_1799; ARG 0 sherds METHOD method_52578 asStack ()Lnet/minecraft/class_1799; METHOD method_54301 wobble (Lnet/minecraft/class_8172$class_8837;)V ARG 1 wobbleType - 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 CLASS class_8837 WobbleType FIELD field_46666 lengthInTicks I METHOD (Ljava/lang/String;II)V diff --git a/mappings/net/minecraft/block/entity/LockableContainerBlockEntity.mapping b/mappings/net/minecraft/block/entity/LockableContainerBlockEntity.mapping index 489fdb345e..fe9d0ad119 100644 --- a/mappings/net/minecraft/block/entity/LockableContainerBlockEntity.mapping +++ b/mappings/net/minecraft/block/entity/LockableContainerBlockEntity.mapping @@ -5,8 +5,6 @@ CLASS net/minecraft/class_2624 net/minecraft/block/entity/LockableContainerBlock ARG 0 player ARG 1 lock ARG 2 containerName - METHOD method_17488 setCustomName (Lnet/minecraft/class_2561;)V - ARG 1 customName METHOD method_17489 checkUnlocked (Lnet/minecraft/class_1657;)Z ARG 1 player METHOD method_17823 getContainerName ()Lnet/minecraft/class_2561; diff --git a/mappings/net/minecraft/block/entity/Sherds.mapping b/mappings/net/minecraft/block/entity/Sherds.mapping new file mode 100644 index 0000000000..072cf2475b --- /dev/null +++ b/mappings/net/minecraft/block/entity/Sherds.mapping @@ -0,0 +1,9 @@ +CLASS net/minecraft/class_8526 net/minecraft/block/entity/Sherds + FIELD field_44707 DEFAULT Lnet/minecraft/class_8526; + METHOD method_51512 stream ()Ljava/util/List; + METHOD method_51513 toNbt (Lnet/minecraft/class_2487;)Lnet/minecraft/class_2487; + ARG 1 nbt + METHOD method_51514 getSherd (Ljava/util/List;I)Ljava/util/Optional; + ARG 1 index + METHOD method_51516 fromNbt (Lnet/minecraft/class_2487;)Lnet/minecraft/class_8526; + ARG 0 nbt diff --git a/mappings/net/minecraft/block/entity/ShulkerBoxBlockEntity.mapping b/mappings/net/minecraft/block/entity/ShulkerBoxBlockEntity.mapping index d3dc5b69c2..d57f7d35bd 100644 --- a/mappings/net/minecraft/block/entity/ShulkerBoxBlockEntity.mapping +++ b/mappings/net/minecraft/block/entity/ShulkerBoxBlockEntity.mapping @@ -28,7 +28,7 @@ CLASS net/minecraft/class_2627 net/minecraft/block/entity/ShulkerBoxBlockEntity ARG 1 world ARG 2 pos ARG 3 state - METHOD method_11319 readInventoryNbt (Lnet/minecraft/class_2487;)V + METHOD method_11319 readInventoryNbt (Lnet/minecraft/class_2487;Lnet/minecraft/class_7225$class_7874;)V ARG 1 nbt METHOD method_11320 getColor ()Lnet/minecraft/class_1767; METHOD method_20047 updateNeighborStates (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;)V diff --git a/mappings/net/minecraft/block/entity/SkullBlockEntity.mapping b/mappings/net/minecraft/block/entity/SkullBlockEntity.mapping index bef5c47544..92ef10ffdc 100644 --- a/mappings/net/minecraft/block/entity/SkullBlockEntity.mapping +++ b/mappings/net/minecraft/block/entity/SkullBlockEntity.mapping @@ -31,19 +31,10 @@ CLASS net/minecraft/class_2631 net/minecraft/block/entity/SkullBlockEntity ARG 0 runnable METHOD method_52580 fetchProfile (Ljava/lang/String;)Ljava/util/concurrent/CompletableFuture; ARG 0 name - 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_52586 hasTextures (Lcom/mojang/authlib/GameProfile;)Z ARG 0 profile METHOD method_52587 (Ljava/util/Optional;)V ARG 1 profile - 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 METHOD method_54081 fetchProfile (Ljava/lang/String;Lnet/minecraft/class_7497;Ljava/util/function/BooleanSupplier;)Ljava/util/concurrent/CompletableFuture; ARG 0 name ARG 1 apiServices diff --git a/mappings/net/minecraft/block/entity/VaultBlockEntity.mapping b/mappings/net/minecraft/block/entity/VaultBlockEntity.mapping index 31084ead4e..b67d15f5fe 100644 --- a/mappings/net/minecraft/block/entity/VaultBlockEntity.mapping +++ b/mappings/net/minecraft/block/entity/VaultBlockEntity.mapping @@ -7,7 +7,7 @@ CLASS net/minecraft/class_9199 net/minecraft/block/entity/VaultBlockEntity METHOD (Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;)V ARG 1 pos ARG 2 state - METHOD method_56729 encodeValue (Lcom/mojang/serialization/Codec;Ljava/lang/Object;)Lnet/minecraft/class_2520; + METHOD method_56729 encodeValue (Lcom/mojang/serialization/Codec;Ljava/lang/Object;Lnet/minecraft/class_7225$class_7874;)Lnet/minecraft/class_2520; ARG 0 codec ARG 1 value METHOD method_56730 setConfig (Lnet/minecraft/class_9203;)V @@ -15,8 +15,6 @@ CLASS net/minecraft/class_9199 net/minecraft/block/entity/VaultBlockEntity METHOD method_56731 getServerData ()Lnet/minecraft/class_9204; METHOD method_56733 (Lnet/minecraft/class_9203;)V ARG 1 config - METHOD method_56734 (Lnet/minecraft/class_2487;)V - ARG 1 nbt METHOD method_56735 getSharedData ()Lnet/minecraft/class_9205; METHOD method_56736 getClientData ()Lnet/minecraft/class_9202; METHOD method_56737 getConfig ()Lnet/minecraft/class_9203; diff --git a/mappings/net/minecraft/block/spawner/TrialSpawnerData.mapping b/mappings/net/minecraft/block/spawner/TrialSpawnerData.mapping index e654665cd4..a9bec66c56 100644 --- a/mappings/net/minecraft/block/spawner/TrialSpawnerData.mapping +++ b/mappings/net/minecraft/block/spawner/TrialSpawnerData.mapping @@ -64,7 +64,7 @@ CLASS net/minecraft/class_8966 net/minecraft/block/spawner/TrialSpawnerData ARG 1 pos METHOD method_55196 (Lnet/minecraft/class_2487;Lnet/minecraft/class_1952;)V ARG 1 spawnData - METHOD method_55197 hasSpawnData ()Z + METHOD method_55197 hasSpawnData (Lnet/minecraft/class_8963;Lnet/minecraft/class_5819;)Z METHOD method_55198 isCooldownAtRepeating (Lnet/minecraft/class_3218;Lnet/minecraft/class_8965;F)Z ARG 1 world ARG 2 config diff --git a/mappings/net/minecraft/class_9273.mapping b/mappings/net/minecraft/class_9273.mapping new file mode 100644 index 0000000000..533375faee --- /dev/null +++ b/mappings/net/minecraft/class_9273.mapping @@ -0,0 +1,2 @@ +CLASS net/minecraft/class_9273 + CLASS class_4621 Crack diff --git a/mappings/net/minecraft/class_9283.mapping b/mappings/net/minecraft/class_9283.mapping new file mode 100644 index 0000000000..12a68422d8 --- /dev/null +++ b/mappings/net/minecraft/class_9283.mapping @@ -0,0 +1,12 @@ +CLASS net/minecraft/class_9283 + CLASS class_1782 Type + FIELD field_7971 name Ljava/lang/String; + FIELD field_7972 id I + 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 ()Lnet/minecraft/class_5250; + METHOD method_7813 byId (I)Lnet/minecraft/class_9283$class_1782; + ARG 0 id + METHOD method_7816 getId ()I diff --git a/mappings/net/minecraft/class_9298.mapping b/mappings/net/minecraft/class_9298.mapping new file mode 100644 index 0000000000..70033a6263 --- /dev/null +++ b/mappings/net/minecraft/class_9298.mapping @@ -0,0 +1,6 @@ +CLASS net/minecraft/class_9298 + CLASS class_8751 StewEffect + FIELD field_45782 CODEC Lcom/mojang/serialization/Codec; + METHOD method_53247 createStatusEffectInstance ()Lnet/minecraft/class_1293; + METHOD method_53248 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 0 instance diff --git a/mappings/net/minecraft/class_9307.mapping b/mappings/net/minecraft/class_9307.mapping new file mode 100644 index 0000000000..0ff6192a77 --- /dev/null +++ b/mappings/net/minecraft/class_9307.mapping @@ -0,0 +1,9 @@ +CLASS net/minecraft/class_9307 + CLASS class_3750 Patterns + FIELD field_16548 entries Lcom/google/common/collect/ImmutableList$Builder; + METHOD method_16376 add (Lnet/minecraft/class_6880;Lnet/minecraft/class_1767;)Lnet/minecraft/class_9307$class_3750; + ARG 1 pattern + ARG 2 color + METHOD method_43720 add (Lnet/minecraft/class_5321;Lnet/minecraft/class_1767;)Lnet/minecraft/class_9307$class_3750; + ARG 1 pattern + ARG 2 color diff --git a/mappings/net/minecraft/client/color/item/ItemColors.mapping b/mappings/net/minecraft/client/color/item/ItemColors.mapping index 7b8206aa6f..0831dd3149 100644 --- a/mappings/net/minecraft/client/color/item/ItemColors.mapping +++ b/mappings/net/minecraft/client/color/item/ItemColors.mapping @@ -4,18 +4,12 @@ CLASS net/minecraft/class_325 net/minecraft/client/color/item/ItemColors METHOD method_1699 (Lnet/minecraft/class_1826;Lnet/minecraft/class_1799;I)I ARG 1 stack ARG 2 tintIndex - METHOD method_1700 (Lnet/minecraft/class_1799;I)I - ARG 0 stack - ARG 1 tintIndex METHOD method_1701 (Lnet/minecraft/class_1799;I)I ARG 0 stack ARG 1 tintIndex METHOD method_1702 (Lnet/minecraft/class_324;Lnet/minecraft/class_1799;I)I ARG 1 stack ARG 2 tintIndex - METHOD method_1703 (Lnet/minecraft/class_1799;I)I - ARG 0 stack - ARG 1 tintIndex METHOD method_1704 getColor (Lnet/minecraft/class_1799;I)I ARG 1 item ARG 2 tintIndex @@ -30,9 +24,6 @@ CLASS net/minecraft/class_325 net/minecraft/client/color/item/ItemColors METHOD method_1708 register (Lnet/minecraft/class_326;[Lnet/minecraft/class_1935;)V ARG 1 provider ARG 2 items - METHOD method_1709 (Lnet/minecraft/class_1799;I)I - ARG 0 stack - ARG 1 tintIndex METHOD method_43767 (Lnet/minecraft/class_1799;I)I ARG 0 stack ARG 1 tintIndex diff --git a/mappings/net/minecraft/client/gl/JsonEffectShaderProgram.mapping b/mappings/net/minecraft/client/gl/JsonEffectShaderProgram.mapping index 53d12e6288..c3fdf7ec28 100644 --- a/mappings/net/minecraft/client/gl/JsonEffectShaderProgram.mapping +++ b/mappings/net/minecraft/client/gl/JsonEffectShaderProgram.mapping @@ -18,8 +18,7 @@ CLASS net/minecraft/class_280 net/minecraft/client/gl/JsonEffectShaderProgram FIELD field_1520 DEFAULT_UNIFORM Lnet/minecraft/class_278; 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 + METHOD (Lnet/minecraft/class_5912;Ljava/lang/String;)V ARG 2 name METHOD method_1268 finalizeUniformsAndSamplers ()V METHOD method_1269 bindSampler (Ljava/lang/String;Ljava/util/function/IntSupplier;)V @@ -36,8 +35,7 @@ CLASS net/minecraft/class_280 net/minecraft/client/gl/JsonEffectShaderProgram METHOD method_1277 enable ()V METHOD method_16035 deserializeBlendState (Lcom/google/gson/JsonObject;)Lnet/minecraft/class_277; ARG 0 json - METHOD method_16036 loadEffect (Lnet/minecraft/class_3300;Lnet/minecraft/class_281$class_282;Ljava/lang/String;)Lnet/minecraft/class_5937; - ARG 0 resourceManager + METHOD method_16036 loadEffect (Lnet/minecraft/class_5912;Lnet/minecraft/class_281$class_282;Ljava/lang/String;)Lnet/minecraft/class_5937; ARG 1 type ARG 2 name METHOD method_35763 getName ()Ljava/lang/String; diff --git a/mappings/net/minecraft/client/gl/PostEffectPass.mapping b/mappings/net/minecraft/client/gl/PostEffectPass.mapping index 2931d0a1d0..b36b226db8 100644 --- a/mappings/net/minecraft/client/gl/PostEffectPass.mapping +++ b/mappings/net/minecraft/client/gl/PostEffectPass.mapping @@ -7,8 +7,7 @@ CLASS net/minecraft/class_283 net/minecraft/client/gl/PostEffectPass FIELD field_1538 output Lnet/minecraft/class_276; FIELD field_1539 samplerNames Ljava/util/List; FIELD field_1540 program Lnet/minecraft/class_280; - METHOD (Lnet/minecraft/class_3300;Ljava/lang/String;Lnet/minecraft/class_276;Lnet/minecraft/class_276;)V - ARG 1 resourceManager + METHOD (Lnet/minecraft/class_5912;Ljava/lang/String;Lnet/minecraft/class_276;Lnet/minecraft/class_276;)V ARG 2 programName ARG 3 input ARG 4 output diff --git a/mappings/net/minecraft/client/gl/PostEffectProcessor.mapping b/mappings/net/minecraft/client/gl/PostEffectProcessor.mapping index 8264878d4b..5235ebb010 100644 --- a/mappings/net/minecraft/client/gl/PostEffectProcessor.mapping +++ b/mappings/net/minecraft/client/gl/PostEffectProcessor.mapping @@ -9,11 +9,9 @@ CLASS net/minecraft/class_279 net/minecraft/client/gl/PostEffectProcessor FIELD field_1499 mainTarget Lnet/minecraft/class_276; FIELD field_1500 lastTickDelta F FIELD field_1501 time F - FIELD field_1502 resourceManager Lnet/minecraft/class_3300; FIELD field_32770 MAIN_TARGET_NAME Ljava/lang/String; - METHOD (Lnet/minecraft/class_1060;Lnet/minecraft/class_3300;Lnet/minecraft/class_276;Lnet/minecraft/class_2960;)V + METHOD (Lnet/minecraft/class_1060;Lnet/minecraft/class_5912;Lnet/minecraft/class_276;Lnet/minecraft/class_2960;)V ARG 1 textureManager - ARG 2 resourceManager ARG 3 framebuffer ARG 4 id METHOD method_1256 parseEffect (Lnet/minecraft/class_1060;Lnet/minecraft/class_2960;)V diff --git a/mappings/net/minecraft/client/gui/hud/DebugHud.mapping b/mappings/net/minecraft/client/gui/hud/DebugHud.mapping index 04babc2b55..9e10fe7310 100644 --- a/mappings/net/minecraft/client/gui/hud/DebugHud.mapping +++ b/mappings/net/minecraft/client/gui/hud/DebugHud.mapping @@ -44,12 +44,6 @@ CLASS net/minecraft/class_340 net/minecraft/client/gui/hud/DebugHud ARG 1 context METHOD method_20455 (Ljava/util/EnumMap;)V ARG 0 types - METHOD method_20540 (Lnet/minecraft/class_2791;)Lnet/minecraft/class_2818; - ARG 0 chunk - METHOD method_20541 (Lcom/mojang/datafixers/util/Either;)Lnet/minecraft/class_2818; - ARG 0 either - METHOD method_20542 (Lnet/minecraft/class_3193$class_3724;)Lnet/minecraft/class_2818; - ARG 0 unloaded METHOD method_20603 getServerWorld ()Lnet/minecraft/class_3218; METHOD method_27870 (Lit/unimi/dsi/fastutil/objects/Object2IntMap;Lnet/minecraft/class_1311;)Ljava/lang/String; ARG 1 group diff --git a/mappings/net/minecraft/client/gui/screen/AccessibilityOnboardingScreen.mapping b/mappings/net/minecraft/client/gui/screen/AccessibilityOnboardingScreen.mapping index 4decaa170c..eb95bf03ef 100644 --- a/mappings/net/minecraft/client/gui/screen/AccessibilityOnboardingScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/AccessibilityOnboardingScreen.mapping @@ -1,6 +1,5 @@ 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 diff --git a/mappings/net/minecraft/client/gui/screen/OutOfMemoryScreen.mapping b/mappings/net/minecraft/client/gui/screen/OutOfMemoryScreen.mapping index ecb4030edd..060b049448 100644 --- a/mappings/net/minecraft/client/gui/screen/OutOfMemoryScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/OutOfMemoryScreen.mapping @@ -1,5 +1,4 @@ CLASS net/minecraft/class_428 net/minecraft/client/gui/screen/OutOfMemoryScreen - FIELD field_37907 message Lnet/minecraft/class_5489; METHOD method_19834 (Lnet/minecraft/class_4185;)V ARG 1 button METHOD method_19835 (Lnet/minecraft/class_4185;)V diff --git a/mappings/net/minecraft/client/gui/screen/Realms32BitWarningScreen.mapping b/mappings/net/minecraft/client/gui/screen/Realms32BitWarningScreen.mapping index a4c8078a66..a3a1bc3224 100644 --- a/mappings/net/minecraft/client/gui/screen/Realms32BitWarningScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/Realms32BitWarningScreen.mapping @@ -6,5 +6,3 @@ CLASS net/minecraft/class_7064 net/minecraft/client/gui/screen/Realms32BitWarnin 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/Screen.mapping b/mappings/net/minecraft/client/gui/screen/Screen.mapping index a6f764bda0..e1a7638a59 100644 --- a/mappings/net/minecraft/client/gui/screen/Screen.mapping +++ b/mappings/net/minecraft/client/gui/screen/Screen.mapping @@ -22,7 +22,6 @@ CLASS net/minecraft/class_437 net/minecraft/client/gui/screen/Screen 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 @@ -78,9 +77,6 @@ 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_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 diff --git a/mappings/net/minecraft/client/gui/screen/StatsListener.mapping b/mappings/net/minecraft/client/gui/screen/StatsListener.mapping deleted file mode 100644 index 1c877c2cb6..0000000000 --- a/mappings/net/minecraft/client/gui/screen/StatsListener.mapping +++ /dev/null @@ -1,3 +0,0 @@ -CLASS net/minecraft/class_452 net/minecraft/client/gui/screen/StatsListener - FIELD field_2668 PROGRESS_BAR_STAGES [Ljava/lang/String; - METHOD method_2300 onStatsReady ()V diff --git a/mappings/net/minecraft/client/gui/screen/StatsScreen.mapping b/mappings/net/minecraft/client/gui/screen/StatsScreen.mapping index 01b13ee12f..8a44a7310a 100644 --- a/mappings/net/minecraft/client/gui/screen/StatsScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/StatsScreen.mapping @@ -27,18 +27,7 @@ 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_332;IILnet/minecraft/class_2960;)V - ARG 1 context - ARG 2 x - ARG 3 y - ARG 4 texture - METHOD method_2285 getColumnX (I)I - ARG 1 index - 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 + METHOD method_2300 onStatsReady ()V METHOD method_27027 getStatTranslationKey (Lnet/minecraft/class_3445;)Ljava/lang/String; ARG 0 stat CLASS class_4198 GeneralStatsListWidget @@ -62,8 +51,6 @@ CLASS net/minecraft/class_447 net/minecraft/client/gui/screen/StatsScreen 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_19408 selectStatType (Lnet/minecraft/class_3448;)V ARG 1 statType METHOD method_19409 getHeaderIndex (Lnet/minecraft/class_3448;)I diff --git a/mappings/net/minecraft/client/gui/screen/TitleScreen.mapping b/mappings/net/minecraft/client/gui/screen/TitleScreen.mapping index 5af5631388..739b84fbb9 100644 --- a/mappings/net/minecraft/client/gui/screen/TitleScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/TitleScreen.mapping @@ -1,10 +1,7 @@ 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_18222 doBackgroundFade Z FIELD field_23775 LOGGER Lorg/slf4j/Logger; - FIELD field_2585 backgroundRenderer Lnet/minecraft/class_766; FIELD field_2586 splashText Lnet/minecraft/class_8519; FIELD field_2590 buttonResetDemo Lnet/minecraft/class_4185; FIELD field_2592 realmsNotificationGui Lnet/minecraft/class_4399; diff --git a/mappings/net/minecraft/client/gui/screen/WarningScreen.mapping b/mappings/net/minecraft/client/gui/screen/WarningScreen.mapping index 4c28c70212..dc880ad25d 100644 --- a/mappings/net/minecraft/client/gui/screen/WarningScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/WarningScreen.mapping @@ -1,20 +1,11 @@ CLASS net/minecraft/class_7065 net/minecraft/client/gui/screen/WarningScreen FIELD field_37217 checkbox Lnet/minecraft/class_4286; - FIELD field_37219 message Lnet/minecraft/class_2561; FIELD field_37220 checkMessage Lnet/minecraft/class_2561; FIELD field_37221 narratedText Lnet/minecraft/class_2561; - FIELD field_37222 messageText Lnet/minecraft/class_5489; + FIELD field_37222 messageText Lnet/minecraft/class_2561; METHOD (Lnet/minecraft/class_2561;Lnet/minecraft/class_2561;Lnet/minecraft/class_2561;)V ARG 1 header ARG 2 message ARG 3 narratedText METHOD (Lnet/minecraft/class_2561;Lnet/minecraft/class_2561;Lnet/minecraft/class_2561;Lnet/minecraft/class_2561;)V ARG 1 header - ARG 2 message - ARG 3 checkMessage - ARG 4 narratedText - METHOD method_41160 initButtons (I)V - ARG 1 yOffset - METHOD method_44068 getLineHeight ()I - METHOD method_44663 drawTitle (Lnet/minecraft/class_332;)V - ARG 1 context diff --git a/mappings/net/minecraft/client/gui/screen/advancement/AdvancementsScreen.mapping b/mappings/net/minecraft/client/gui/screen/advancement/AdvancementsScreen.mapping index 4d3190d04d..0d3f582ef5 100644 --- a/mappings/net/minecraft/client/gui/screen/advancement/AdvancementsScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/advancement/AdvancementsScreen.mapping @@ -15,7 +15,7 @@ CLASS net/minecraft/class_457 net/minecraft/client/gui/screen/advancement/Advanc FIELD field_32307 PAGE_OFFSET_Y I FIELD field_32308 TITLE_OFFSET_X I FIELD field_32309 TITLE_OFFSET_Y I - METHOD (Lnet/minecraft/class_632;)V + METHOD (Lnet/minecraft/class_632;Lnet/minecraft/class_437;)V ARG 1 advancementHandler METHOD method_2334 drawWindow (Lnet/minecraft/class_332;II)V ARG 1 context diff --git a/mappings/net/minecraft/client/gui/screen/ingame/BookEditScreen.mapping b/mappings/net/minecraft/client/gui/screen/ingame/BookEditScreen.mapping index ba154eb108..dad186d132 100644 --- a/mappings/net/minecraft/client/gui/screen/ingame/BookEditScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/ingame/BookEditScreen.mapping @@ -118,8 +118,7 @@ CLASS net/minecraft/class_473 net/minecraft/client/gui/screen/ingame/BookEditScr METHOD method_27597 moveUpLine ()V METHOD method_27598 moveDownLine ()V METHOD method_27872 changePage ()V - METHOD method_37433 writeNbtData (Z)V - ARG 1 signBook + METHOD method_37433 writeNbtData ()V CLASS class_475 Line FIELD field_24278 style Lnet/minecraft/class_2583; FIELD field_24279 content Ljava/lang/String; diff --git a/mappings/net/minecraft/client/gui/screen/ingame/BookScreen.mapping b/mappings/net/minecraft/client/gui/screen/ingame/BookScreen.mapping index c8dd37b4d6..dae730bfb9 100644 --- a/mappings/net/minecraft/client/gui/screen/ingame/BookScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/ingame/BookScreen.mapping @@ -27,8 +27,6 @@ CLASS net/minecraft/class_3872 net/minecraft/client/gui/screen/ingame/BookScreen METHOD method_17059 updatePageButtons ()V METHOD method_17554 setPageProvider (Lnet/minecraft/class_3872$class_3931;)V ARG 1 pageProvider - METHOD method_17555 readPages (Lnet/minecraft/class_2487;)Ljava/util/List; - ARG 0 nbt METHOD method_17556 setPage (I)Z ARG 1 index METHOD method_17557 addCloseButton ()V @@ -41,29 +39,10 @@ CLASS net/minecraft/class_3872 net/minecraft/client/gui/screen/ingame/BookScreen ARG 1 button METHOD method_19886 (Lnet/minecraft/class_4185;)V ARG 1 button - METHOD method_33888 filterPages (Lnet/minecraft/class_2487;Ljava/util/function/Consumer;)V - ARG 0 nbt - ARG 1 pageConsumer - METHOD method_33889 (Lnet/minecraft/class_2487;Lnet/minecraft/class_2499;I)Ljava/lang/String; - ARG 2 page METHOD method_34494 closeScreen ()V CLASS class_3931 Contents METHOD method_17560 getPageCount ()I - METHOD method_17561 getPageUnchecked (I)Lnet/minecraft/class_5348; - ARG 1 index METHOD method_17562 create (Lnet/minecraft/class_1799;)Lnet/minecraft/class_3872$class_3931; ARG 0 stack METHOD method_17563 getPage (I)Lnet/minecraft/class_5348; ARG 1 index - CLASS class_3932 WritableBookContents - FIELD field_17419 pages Ljava/util/List; - METHOD (Lnet/minecraft/class_1799;)V - ARG 1 stack - METHOD method_17564 getPages (Lnet/minecraft/class_1799;)Ljava/util/List; - ARG 0 stack - CLASS class_3933 WrittenBookContents - FIELD field_17420 pages Ljava/util/List; - METHOD (Lnet/minecraft/class_1799;)V - ARG 1 stack - METHOD method_17565 getPages (Lnet/minecraft/class_1799;)Ljava/util/List; - ARG 0 stack diff --git a/mappings/net/minecraft/client/gui/screen/ingame/CreativeInventoryScreen.mapping b/mappings/net/minecraft/client/gui/screen/ingame/CreativeInventoryScreen.mapping index 9cb3d069a8..a08162a23a 100644 --- a/mappings/net/minecraft/client/gui/screen/ingame/CreativeInventoryScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/ingame/CreativeInventoryScreen.mapping @@ -12,7 +12,6 @@ CLASS net/minecraft/class_481 net/minecraft/client/gui/screen/ingame/CreativeInv FIELD field_2895 INVENTORY Lnet/minecraft/class_1277; 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 FIELD field_32338 COLUMNS_COUNT I FIELD field_32339 TAB_WIDTH I diff --git a/mappings/net/minecraft/client/gui/screen/ingame/LoomScreen.mapping b/mappings/net/minecraft/client/gui/screen/ingame/LoomScreen.mapping index b307c79a3a..4d82a31964 100644 --- a/mappings/net/minecraft/client/gui/screen/ingame/LoomScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/ingame/LoomScreen.mapping @@ -1,6 +1,6 @@ CLASS net/minecraft/class_494 net/minecraft/client/gui/screen/ingame/LoomScreen FIELD field_21694 bannerField Lnet/minecraft/class_630; - FIELD field_21841 bannerPatterns Ljava/util/List; + FIELD field_21841 bannerPatterns Lnet/minecraft/class_9307; FIELD field_2954 dye Lnet/minecraft/class_1799; FIELD field_2955 banner Lnet/minecraft/class_1799; FIELD field_2958 scrollbarClicked Z diff --git a/mappings/net/minecraft/client/gui/screen/multiplayer/MultiplayerWarningScreen.mapping b/mappings/net/minecraft/client/gui/screen/multiplayer/MultiplayerWarningScreen.mapping index 95d219000b..4532953c32 100644 --- a/mappings/net/minecraft/client/gui/screen/multiplayer/MultiplayerWarningScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/multiplayer/MultiplayerWarningScreen.mapping @@ -6,7 +6,3 @@ 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/option/ControlsOptionsScreen.mapping b/mappings/net/minecraft/client/gui/screen/option/ControlsOptionsScreen.mapping index e320a7edd4..fb4c83b25e 100644 --- a/mappings/net/minecraft/client/gui/screen/option/ControlsOptionsScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/option/ControlsOptionsScreen.mapping @@ -1,11 +1,8 @@ CLASS net/minecraft/class_458 net/minecraft/client/gui/screen/option/ControlsOptionsScreen - FIELD field_36369 MARGIN_Y I METHOD (Lnet/minecraft/class_437;Lnet/minecraft/class_315;)V ARG 1 parent ARG 2 options METHOD method_19872 (Lnet/minecraft/class_4185;)V ARG 1 button - METHOD method_19873 (Lnet/minecraft/class_4185;)V - ARG 1 button METHOD method_20412 (Lnet/minecraft/class_4185;)V ARG 1 button diff --git a/mappings/net/minecraft/client/gui/screen/option/GameOptionsScreen.mapping b/mappings/net/minecraft/client/gui/screen/option/GameOptionsScreen.mapping index 686666580e..b32e974974 100644 --- a/mappings/net/minecraft/client/gui/screen/option/GameOptionsScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/option/GameOptionsScreen.mapping @@ -2,6 +2,6 @@ CLASS net/minecraft/class_4667 net/minecraft/client/gui/screen/option/GameOption FIELD field_21335 parent Lnet/minecraft/class_437; FIELD field_21336 gameOptions Lnet/minecraft/class_315; METHOD (Lnet/minecraft/class_437;Lnet/minecraft/class_315;Lnet/minecraft/class_2561;)V - ARG 1 parent ARG 2 gameOptions ARG 3 title + METHOD method_31387 initFooter ()V diff --git a/mappings/net/minecraft/client/gui/screen/option/KeybindsScreen.mapping b/mappings/net/minecraft/client/gui/screen/option/KeybindsScreen.mapping index 9545e96cdd..c3b362b6bc 100644 --- a/mappings/net/minecraft/client/gui/screen/option/KeybindsScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/option/KeybindsScreen.mapping @@ -6,7 +6,5 @@ CLASS net/minecraft/class_6599 net/minecraft/client/gui/screen/option/KeybindsSc METHOD (Lnet/minecraft/class_437;Lnet/minecraft/class_315;)V ARG 1 parent ARG 2 gameOptions - METHOD method_38531 (Lnet/minecraft/class_4185;)V - ARG 1 button METHOD method_38532 (Lnet/minecraft/class_4185;)V ARG 1 button diff --git a/mappings/net/minecraft/client/gui/screen/option/LanguageOptionsScreen.mapping b/mappings/net/minecraft/client/gui/screen/option/LanguageOptionsScreen.mapping index b71a3042e8..6b081e0a9a 100644 --- a/mappings/net/minecraft/client/gui/screen/option/LanguageOptionsScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/option/LanguageOptionsScreen.mapping @@ -6,11 +6,7 @@ CLASS net/minecraft/class_426 net/minecraft/client/gui/screen/option/LanguageOpt ARG 1 parent ARG 2 options ARG 3 languageManager - METHOD method_19820 (Lnet/minecraft/class_4185;)V - ARG 1 button METHOD method_52184 onDone ()V - METHOD method_57042 (Lnet/minecraft/class_4185;)V - ARG 1 button CLASS class_4195 LanguageSelectionListWidget METHOD (Lnet/minecraft/class_426;Lnet/minecraft/class_310;)V ARG 2 client diff --git a/mappings/net/minecraft/client/gui/screen/option/MouseOptionsScreen.mapping b/mappings/net/minecraft/client/gui/screen/option/MouseOptionsScreen.mapping index f17b428e73..28c283c7ea 100644 --- a/mappings/net/minecraft/client/gui/screen/option/MouseOptionsScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/option/MouseOptionsScreen.mapping @@ -3,7 +3,5 @@ CLASS net/minecraft/class_4288 net/minecraft/client/gui/screen/option/MouseOptio METHOD (Lnet/minecraft/class_437;Lnet/minecraft/class_315;)V ARG 1 parent ARG 2 gameOptions - METHOD method_20411 (Lnet/minecraft/class_4185;)V - ARG 1 button METHOD method_41841 getOptions (Lnet/minecraft/class_315;)[Lnet/minecraft/class_7172; ARG 0 gameOptions diff --git a/mappings/net/minecraft/client/gui/screen/option/OptionsScreen.mapping b/mappings/net/minecraft/client/gui/screen/option/OptionsScreen.mapping index c68c1878b5..333550a1b4 100644 --- a/mappings/net/minecraft/client/gui/screen/option/OptionsScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/option/OptionsScreen.mapping @@ -15,7 +15,6 @@ CLASS net/minecraft/class_429 net/minecraft/client/gui/screen/option/OptionsScre 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_20374 lockDifficulty (Z)V ARG 1 difficultyLocked diff --git a/mappings/net/minecraft/client/gui/screen/option/SimpleOptionsScreen.mapping b/mappings/net/minecraft/client/gui/screen/option/SimpleOptionsScreen.mapping index 43a9a8ee09..ebeb4157f6 100644 --- a/mappings/net/minecraft/client/gui/screen/option/SimpleOptionsScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/option/SimpleOptionsScreen.mapping @@ -7,7 +7,4 @@ CLASS net/minecraft/class_5500 net/minecraft/client/gui/screen/option/SimpleOpti ARG 2 gameOptions ARG 3 title ARG 4 options - METHOD method_31049 (Lnet/minecraft/class_4185;)V - ARG 1 button METHOD method_31050 updateNarratorButtonText ()V - METHOD method_31387 initFooter ()V diff --git a/mappings/net/minecraft/client/gui/screen/option/SkinOptionsScreen.mapping b/mappings/net/minecraft/client/gui/screen/option/SkinOptionsScreen.mapping index fec7a50968..50e24a791b 100644 --- a/mappings/net/minecraft/client/gui/screen/option/SkinOptionsScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/option/SkinOptionsScreen.mapping @@ -2,8 +2,6 @@ CLASS net/minecraft/class_440 net/minecraft/client/gui/screen/option/SkinOptions METHOD (Lnet/minecraft/class_437;Lnet/minecraft/class_315;)V ARG 1 parent ARG 2 gameOptions - METHOD method_19853 (Lnet/minecraft/class_4185;)V - ARG 1 button METHOD method_32640 (Lnet/minecraft/class_1664;Lnet/minecraft/class_5676;Ljava/lang/Boolean;)V ARG 2 button ARG 3 enabled diff --git a/mappings/net/minecraft/client/gui/screen/option/SoundOptionsScreen.mapping b/mappings/net/minecraft/client/gui/screen/option/SoundOptionsScreen.mapping index 8ac6fe7c52..15ff9f6c5d 100644 --- a/mappings/net/minecraft/client/gui/screen/option/SoundOptionsScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/option/SoundOptionsScreen.mapping @@ -3,8 +3,6 @@ CLASS net/minecraft/class_443 net/minecraft/client/gui/screen/option/SoundOption 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; diff --git a/mappings/net/minecraft/client/gui/screen/option/TelemetryInfoScreen.mapping b/mappings/net/minecraft/client/gui/screen/option/TelemetryInfoScreen.mapping index 1accc171b4..f9ac21ef57 100644 --- a/mappings/net/minecraft/client/gui/screen/option/TelemetryInfoScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/option/TelemetryInfoScreen.mapping @@ -11,15 +11,9 @@ CLASS net/minecraft/class_7944 net/minecraft/client/gui/screen/option/TelemetryI FIELD field_45567 PRIVACY_STATEMENT_TEXT Lnet/minecraft/class_2561; FIELD field_47126 OPT_IN_DESCRIPTION_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_47650 openFeedbackPage (Lnet/minecraft/class_4185;)V ARG 1 button METHOD method_47651 openLogDirectory (Lnet/minecraft/class_4185;)V @@ -32,4 +26,3 @@ CLASS net/minecraft/class_7944 net/minecraft/client/gui/screen/option/TelemetryI METHOD method_54803 updateOptIn (Lnet/minecraft/class_339;Z)V ARG 1 checkbox ARG 2 checked - METHOD method_54804 getLayout ()Lnet/minecraft/class_8133; diff --git a/mappings/net/minecraft/client/gui/screen/option/VideoOptionsScreen.mapping b/mappings/net/minecraft/client/gui/screen/option/VideoOptionsScreen.mapping index 0ecabfd5fe..227adb596f 100644 --- a/mappings/net/minecraft/client/gui/screen/option/VideoOptionsScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/option/VideoOptionsScreen.mapping @@ -10,8 +10,6 @@ CLASS net/minecraft/class_446 net/minecraft/client/gui/screen/option/VideoOption METHOD (Lnet/minecraft/class_437;Lnet/minecraft/class_315;)V ARG 1 parent ARG 2 options - METHOD method_19865 (Lnet/minecraft/class_1041;Lnet/minecraft/class_4185;)V - ARG 2 button METHOD method_30052 (Lnet/minecraft/class_4185;)V ARG 1 button METHOD method_30053 (Lnet/minecraft/class_4185;)V diff --git a/mappings/net/minecraft/client/gui/screen/pack/ExperimentalWarningScreen.mapping b/mappings/net/minecraft/client/gui/screen/pack/ExperimentalWarningScreen.mapping index 246502c0e1..3e82d77e91 100644 --- a/mappings/net/minecraft/client/gui/screen/pack/ExperimentalWarningScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/pack/ExperimentalWarningScreen.mapping @@ -17,7 +17,6 @@ CLASS net/minecraft/class_7745 net/minecraft/client/gui/screen/pack/Experimental 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 diff --git a/mappings/net/minecraft/client/gui/screen/report/AbuseReportReasonScreen.mapping b/mappings/net/minecraft/client/gui/screen/report/AbuseReportReasonScreen.mapping index 3a58a41bb5..4efc765f8c 100644 --- a/mappings/net/minecraft/client/gui/screen/report/AbuseReportReasonScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/report/AbuseReportReasonScreen.mapping @@ -1,27 +1,19 @@ CLASS net/minecraft/class_7551 net/minecraft/client/gui/screen/report/AbuseReportReasonScreen FIELD field_39612 TITLE_TEXT Lnet/minecraft/class_2561; FIELD field_39613 DESCRIPTION_TEXT Lnet/minecraft/class_2561; - FIELD field_39614 REASON_LIST_BOTTOM_MARGIN I FIELD field_39615 parent Lnet/minecraft/class_437; FIELD field_39616 reasonList Lnet/minecraft/class_7551$class_7552; FIELD field_39618 reasonConsumer Ljava/util/function/Consumer; - FIELD field_39732 DONE_BUTTON_WIDTH I - FIELD field_39733 DONE_BUTTON_HEIGHT I - FIELD field_39734 SCREEN_WIDTH I FIELD field_39735 TOP_MARGIN I 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 - ARG 1 parent ARG 2 reason ARG 3 reasonConsumer METHOD method_44520 (Lnet/minecraft/class_4185;)V ARG 1 button METHOD method_44668 getTop ()I METHOD method_44669 getBottom ()I - METHOD method_44674 getDoneButtonY ()I - METHOD method_44675 getLeft ()I - METHOD method_44676 getRight ()I CLASS class_7552 ReasonListWidget METHOD (Lnet/minecraft/class_7551;Lnet/minecraft/class_310;)V ARG 2 client diff --git a/mappings/net/minecraft/client/gui/screen/report/ReportScreen.mapping b/mappings/net/minecraft/client/gui/screen/report/ReportScreen.mapping index 43674a4945..1e36d84ce1 100644 --- a/mappings/net/minecraft/client/gui/screen/report/ReportScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/report/ReportScreen.mapping @@ -44,9 +44,3 @@ CLASS net/minecraft/class_8768 net/minecraft/client/gui/screen/report/ReportScre 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/world/CreateWorldScreen.mapping b/mappings/net/minecraft/client/gui/screen/world/CreateWorldScreen.mapping index 9102dba6b1..3f5aad040c 100644 --- a/mappings/net/minecraft/client/gui/screen/world/CreateWorldScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/world/CreateWorldScreen.mapping @@ -7,7 +7,6 @@ CLASS net/minecraft/class_525 net/minecraft/client/gui/screen/world/CreateWorldS FIELD field_3187 parent Lnet/minecraft/class_437; FIELD field_32434 TEMP_DIR_PREFIX Ljava/lang/String; FIELD field_37911 PREPARING_TEXT Lnet/minecraft/class_2561; - 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; @@ -16,7 +15,6 @@ CLASS net/minecraft/class_525 net/minecraft/client/gui/screen/world/CreateWorldS 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 diff --git a/mappings/net/minecraft/client/gui/screen/world/CustomizeBuffetLevelScreen.mapping b/mappings/net/minecraft/client/gui/screen/world/CustomizeBuffetLevelScreen.mapping index 026fb83c8a..922b150857 100644 --- a/mappings/net/minecraft/client/gui/screen/world/CustomizeBuffetLevelScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/world/CustomizeBuffetLevelScreen.mapping @@ -7,7 +7,6 @@ CLASS net/minecraft/class_415 net/minecraft/client/gui/screen/world/CustomizeBuf FIELD field_25888 biomeRegistry Lnet/minecraft/class_2378; FIELD field_26535 BUFFET_BIOME_TEXT Lnet/minecraft/class_2561; METHOD (Lnet/minecraft/class_437;Lnet/minecraft/class_7193;Ljava/util/function/Consumer;)V - ARG 1 parent ARG 2 generatorOptionsHolder ARG 3 onDone METHOD method_19801 (Lnet/minecraft/class_4185;)V diff --git a/mappings/net/minecraft/client/gui/screen/world/EditGameRulesScreen.mapping b/mappings/net/minecraft/client/gui/screen/world/EditGameRulesScreen.mapping index acf0eb8508..0e3675c1c4 100644 --- a/mappings/net/minecraft/client/gui/screen/world/EditGameRulesScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/world/EditGameRulesScreen.mapping @@ -1,6 +1,5 @@ CLASS net/minecraft/class_5235 net/minecraft/client/gui/screen/world/EditGameRulesScreen FIELD field_24293 ruleSaver Ljava/util/function/Consumer; - 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_24298 gameRules Lnet/minecraft/class_1928; @@ -11,8 +10,6 @@ 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_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 diff --git a/mappings/net/minecraft/client/gui/tooltip/BundleTooltipComponent.mapping b/mappings/net/minecraft/client/gui/tooltip/BundleTooltipComponent.mapping index be20ad9f50..ada4895c33 100644 --- a/mappings/net/minecraft/client/gui/tooltip/BundleTooltipComponent.mapping +++ b/mappings/net/minecraft/client/gui/tooltip/BundleTooltipComponent.mapping @@ -1,10 +1,8 @@ CLASS net/minecraft/class_5682 net/minecraft/client/gui/tooltip/BundleTooltipComponent - FIELD field_27995 inventory Lnet/minecraft/class_2371; - 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 + METHOD (Lnet/minecraft/class_9276;)V ARG 1 data METHOD method_33287 drawSlot (IIIZLnet/minecraft/class_332;Lnet/minecraft/class_327;)V ARG 1 x diff --git a/mappings/net/minecraft/client/gui/widget/EntryListWidget.mapping b/mappings/net/minecraft/client/gui/widget/EntryListWidget.mapping index e41cee6c5d..4b3b8e39ef 100644 --- a/mappings/net/minecraft/client/gui/widget/EntryListWidget.mapping +++ b/mappings/net/minecraft/client/gui/widget/EntryListWidget.mapping @@ -8,7 +8,6 @@ CLASS net/minecraft/class_350 net/minecraft/client/gui/widget/EntryListWidget 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_33780 hoveredEntry Lnet/minecraft/class_350$class_351; FIELD field_45908 SCROLLER_TEXTURE Lnet/minecraft/class_2960; METHOD (Lnet/minecraft/class_310;IIII)V @@ -84,8 +83,6 @@ CLASS net/minecraft/class_350 net/minecraft/client/gui/widget/EntryListWidget METHOD method_25342 getRowLeft ()I METHOD method_29621 setEntryParentList (Lnet/minecraft/class_350$class_351;)V ARG 1 entry - METHOD method_31322 setRenderBackground (Z)V - ARG 1 renderBackground METHOD method_31383 getRowRight ()I METHOD method_37017 appendNarrations (Lnet/minecraft/class_6382;Lnet/minecraft/class_350$class_351;)V ARG 1 builder diff --git a/mappings/net/minecraft/client/gui/widget/NarratedMultilineTextWidget.mapping b/mappings/net/minecraft/client/gui/widget/NarratedMultilineTextWidget.mapping index 13dfe30416..93ee7dfc02 100644 --- a/mappings/net/minecraft/client/gui/widget/NarratedMultilineTextWidget.mapping +++ b/mappings/net/minecraft/client/gui/widget/NarratedMultilineTextWidget.mapping @@ -1,12 +1,11 @@ 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 + METHOD (ILnet/minecraft/class_2561;Lnet/minecraft/class_327;ZI)V ARG 1 maxWidth ARG 2 message ARG 3 textRenderer diff --git a/mappings/net/minecraft/client/gui/widget/OptionListWidget.mapping b/mappings/net/minecraft/client/gui/widget/OptionListWidget.mapping index ab69ee0557..9b02a2ad91 100644 --- a/mappings/net/minecraft/client/gui/widget/OptionListWidget.mapping +++ b/mappings/net/minecraft/client/gui/widget/OptionListWidget.mapping @@ -1,8 +1,7 @@ CLASS net/minecraft/class_353 net/minecraft/client/gui/widget/OptionListWidget - METHOD method_20406 addSingleOptionEntry (Lnet/minecraft/class_7172;)I + METHOD method_20406 addSingleOptionEntry (Lnet/minecraft/class_7172;)V ARG 1 option METHOD method_20407 addOptionEntry (Lnet/minecraft/class_7172;Lnet/minecraft/class_7172;)V - ARG 1 firstOption ARG 2 secondOption METHOD method_20408 addAll ([Lnet/minecraft/class_7172;)V ARG 1 options @@ -14,16 +13,9 @@ CLASS net/minecraft/class_353 net/minecraft/client/gui/widget/OptionListWidget CLASS class_354 WidgetEntry FIELD field_18214 widgets Ljava/util/List; FIELD field_27983 optionsToWidgets Ljava/util/Map; - METHOD (Ljava/util/Map;)V + METHOD (Ljava/util/Map;Lnet/minecraft/class_4667;)V 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; + METHOD method_20409 create (Lnet/minecraft/class_315;Lnet/minecraft/class_7172;Lnet/minecraft/class_4667;)Lnet/minecraft/class_353$class_354; ARG 0 options - ARG 1 width - ARG 2 option - METHOD method_20410 create (Lnet/minecraft/class_315;ILnet/minecraft/class_7172;Lnet/minecraft/class_7172;)Lnet/minecraft/class_353$class_354; + METHOD method_20410 create (Lnet/minecraft/class_315;Lnet/minecraft/class_7172;Lnet/minecraft/class_7172;Lnet/minecraft/class_4667;)Lnet/minecraft/class_353$class_354; ARG 0 options - ARG 1 width - ARG 2 firstOption - ARG 3 secondOption diff --git a/mappings/net/minecraft/client/gui/widget/TabNavigationWidget.mapping b/mappings/net/minecraft/client/gui/widget/TabNavigationWidget.mapping index 690c5aa6f1..1bd6cd88ff 100644 --- a/mappings/net/minecraft/client/gui/widget/TabNavigationWidget.mapping +++ b/mappings/net/minecraft/client/gui/widget/TabNavigationWidget.mapping @@ -4,7 +4,7 @@ CLASS net/minecraft/class_8089 net/minecraft/client/gui/widget/TabNavigationWidg 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; + FIELD field_43080 grid Lnet/minecraft/class_8667; METHOD (ILnet/minecraft/class_8088;Ljava/lang/Iterable;)V ARG 1 x ARG 2 tabManager diff --git a/mappings/net/minecraft/client/gui/widget/TextIconButtonWidget.mapping b/mappings/net/minecraft/client/gui/widget/TextIconButtonWidget.mapping index bcd4e240e1..a1a84c5b13 100644 --- a/mappings/net/minecraft/client/gui/widget/TextIconButtonWidget.mapping +++ b/mappings/net/minecraft/client/gui/widget/TextIconButtonWidget.mapping @@ -5,7 +5,7 @@ CLASS net/minecraft/class_8662 net/minecraft/client/gui/widget/TextIconButtonWid 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 + METHOD (IILnet/minecraft/class_2561;IILnet/minecraft/class_2960;Lnet/minecraft/class_4185$class_4241;Lnet/minecraft/class_4185$class_7841;)V ARG 1 width ARG 2 height ARG 3 message diff --git a/mappings/net/minecraft/client/item/BundleTooltipData.mapping b/mappings/net/minecraft/client/item/BundleTooltipData.mapping index 303478f618..ae3fe4b10a 100644 --- a/mappings/net/minecraft/client/item/BundleTooltipData.mapping +++ b/mappings/net/minecraft/client/item/BundleTooltipData.mapping @@ -1,8 +1 @@ CLASS net/minecraft/class_5631 net/minecraft/client/item/BundleTooltipData - FIELD field_27874 inventory Lnet/minecraft/class_2371; - FIELD field_28353 bundleOccupancy I - METHOD (Lnet/minecraft/class_2371;I)V - ARG 1 inventory - ARG 2 bundleOccupancy - METHOD method_32340 getInventory ()Lnet/minecraft/class_2371; - METHOD method_32341 getBundleOccupancy ()I diff --git a/mappings/net/minecraft/client/item/ModelPredicateProviderRegistry.mapping b/mappings/net/minecraft/client/item/ModelPredicateProviderRegistry.mapping index 69a133919f..5094db2e00 100644 --- a/mappings/net/minecraft/client/item/ModelPredicateProviderRegistry.mapping +++ b/mappings/net/minecraft/client/item/ModelPredicateProviderRegistry.mapping @@ -5,7 +5,6 @@ CLASS net/minecraft/class_5272 net/minecraft/client/item/ModelPredicateProviderR FIELD field_24446 DAMAGED_PROVIDER Lnet/minecraft/class_6395; FIELD field_24447 DAMAGE_PROVIDER Lnet/minecraft/class_6395; FIELD field_24448 ITEM_SPECIFIC Ljava/util/Map; - FIELD field_32947 CUSTOM_MODEL_DATA_KEY Ljava/lang/String; METHOD method_27877 (Lnet/minecraft/class_1792;)Ljava/util/Map; ARG 0 key METHOD method_27878 get (Lnet/minecraft/class_1792;Lnet/minecraft/class_2960;)Lnet/minecraft/class_1800; diff --git a/mappings/net/minecraft/client/particle/FireworksSparkParticle.mapping b/mappings/net/minecraft/client/particle/FireworksSparkParticle.mapping index d2f774eba9..ff2ab76e22 100644 --- a/mappings/net/minecraft/client/particle/FireworksSparkParticle.mapping +++ b/mappings/net/minecraft/client/particle/FireworksSparkParticle.mapping @@ -24,10 +24,10 @@ CLASS net/minecraft/class_677 net/minecraft/client/particle/FireworksSparkPartic ARG 1 trail CLASS class_681 FireworkParticle FIELD field_3805 particleManager Lnet/minecraft/class_702; - FIELD field_3806 explosions Lnet/minecraft/class_2499; + FIELD field_3806 explosions Ljava/util/List; FIELD field_3807 flicker Z FIELD field_3808 age I - METHOD (Lnet/minecraft/class_638;DDDDDDLnet/minecraft/class_702;Lnet/minecraft/class_2487;)V + METHOD (Lnet/minecraft/class_638;DDDDDDLnet/minecraft/class_702;Ljava/util/List;)V ARG 1 world ARG 2 x ARG 4 y @@ -36,37 +36,28 @@ CLASS net/minecraft/class_677 net/minecraft/client/particle/FireworksSparkPartic ARG 10 velocityY ARG 12 velocityZ ARG 14 particleManager - ARG 15 nbt - METHOD method_3028 explodeStar (D[[D[I[IZZZ)V + METHOD method_3028 explodeStar (D[[DLit/unimi/dsi/fastutil/ints/IntList;Lit/unimi/dsi/fastutil/ints/IntList;ZZZ)V ARG 1 size ARG 3 pattern - ARG 4 colors - ARG 5 fadeColors ARG 6 trail ARG 7 flicker ARG 8 keepShape METHOD method_3029 isFar ()Z - METHOD method_3030 addExplosionParticle (DDDDDD[I[IZZ)V + METHOD method_3030 addExplosionParticle (DDDDDDLit/unimi/dsi/fastutil/ints/IntList;Lit/unimi/dsi/fastutil/ints/IntList;ZZ)V ARG 1 x ARG 3 y ARG 5 z ARG 7 velocityX ARG 9 velocityY ARG 11 velocityZ - ARG 13 colors - ARG 14 fadeColors ARG 15 trail ARG 16 flicker - METHOD method_3031 explodeBall (DI[I[IZZ)V + METHOD method_3031 explodeBall (DILit/unimi/dsi/fastutil/ints/IntList;Lit/unimi/dsi/fastutil/ints/IntList;ZZ)V ARG 1 size ARG 3 amount - ARG 4 colors - ARG 5 fadeColors ARG 6 trail ARG 7 flicker - METHOD method_3032 explodeBurst ([I[IZZ)V - ARG 1 colors - ARG 2 fadeColors + METHOD method_3032 explodeBurst (Lit/unimi/dsi/fastutil/ints/IntList;Lit/unimi/dsi/fastutil/ints/IntList;ZZ)V ARG 3 trail ARG 4 flicker CLASS class_3997 FlashFactory diff --git a/mappings/net/minecraft/client/realms/gui/screen/RealmsBackupScreen.mapping b/mappings/net/minecraft/client/realms/gui/screen/RealmsBackupScreen.mapping index f5cf4d4d33..a7ce78c587 100644 --- a/mappings/net/minecraft/client/realms/gui/screen/RealmsBackupScreen.mapping +++ b/mappings/net/minecraft/client/realms/gui/screen/RealmsBackupScreen.mapping @@ -2,13 +2,9 @@ CLASS net/minecraft/class_4381 net/minecraft/client/realms/gui/screen/RealmsBack FIELD field_19741 LOGGER Lorg/slf4j/Logger; FIELD field_19743 parent Lnet/minecraft/class_4388; FIELD field_19744 backups Ljava/util/List; - FIELD field_19746 backupObjectSelectionList Lnet/minecraft/class_4381$class_4382; - FIELD field_19747 selectedBackup I FIELD field_19748 slotId I FIELD field_19749 downloadButton Lnet/minecraft/class_4185; - FIELD field_19750 restoreButton Lnet/minecraft/class_4185; - FIELD field_19751 changesButton Lnet/minecraft/class_4185; - FIELD field_19752 noBackups Ljava/lang/Boolean; + FIELD field_19752 noBackups Z FIELD field_19753 serverData Lnet/minecraft/class_4877; FIELD field_26471 RESTORE_TEXT Lnet/minecraft/class_2561; FIELD field_26472 CHANGES_TOOLTIP Lnet/minecraft/class_2561; @@ -19,51 +15,24 @@ CLASS net/minecraft/class_4381 net/minecraft/client/realms/gui/screen/RealmsBack ARG 1 parent ARG 2 serverData ARG 3 slotId - METHOD method_21155 restoreClicked (I)V - ARG 1 selectedBackup - METHOD method_21160 updateButtonStates ()V - METHOD method_21162 shouldChangesButtonBeVisible ()Z - METHOD method_21164 shouldRestoreButtonBeVisible ()Z METHOD method_21166 downloadClicked ()V - METHOD method_21168 downloadWorldData ()V - METHOD method_21170 restore ()V - METHOD method_25106 (Lnet/minecraft/class_4185;)V - ARG 1 button - METHOD method_25109 (Lnet/minecraft/class_4185;)V - ARG 1 button METHOD method_25110 (Lnet/minecraft/class_4185;)V ARG 1 button METHOD method_25111 (Z)V ARG 1 confirmed METHOD method_25113 (Lnet/minecraft/class_4185;)V ARG 1 button - METHOD method_25114 (Z)V - ARG 1 confirmed CLASS class_4382 BackupObjectSelectionList - METHOD method_21172 selectInviteListItem (I)V - ARG 1 item METHOD method_21173 addEntry (Lnet/minecraft/class_4867;)V 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_21176 getMediumDatePresentation (Ljava/util/Date;)Ljava/lang/String; ARG 1 lastModifiedDate - 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/RealmsClientIncompatibleScreen.mapping b/mappings/net/minecraft/client/realms/gui/screen/RealmsClientIncompatibleScreen.mapping index b290626046..55aee5a011 100644 --- a/mappings/net/minecraft/client/realms/gui/screen/RealmsClientIncompatibleScreen.mapping +++ b/mappings/net/minecraft/client/realms/gui/screen/RealmsClientIncompatibleScreen.mapping @@ -1,10 +1,3 @@ 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; - FIELD field_39419 INCOMPATIBLE_LINES_UNSTABLE [Lnet/minecraft/class_2561; - METHOD (Lnet/minecraft/class_437;)V - ARG 1 parent - METHOD method_25132 (Lnet/minecraft/class_4185;)V - ARG 1 button - METHOD method_44255 getLines ()[Lnet/minecraft/class_2561; diff --git a/mappings/net/minecraft/client/realms/gui/screen/RealmsInviteScreen.mapping b/mappings/net/minecraft/client/realms/gui/screen/RealmsInviteScreen.mapping index 6f6f805e24..8c0e96f8e0 100644 --- a/mappings/net/minecraft/client/realms/gui/screen/RealmsInviteScreen.mapping +++ b/mappings/net/minecraft/client/realms/gui/screen/RealmsInviteScreen.mapping @@ -7,16 +7,12 @@ 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 ARG 3 serverData METHOD method_21284 onInvite ()V METHOD method_21286 showError (Lnet/minecraft/class_2561;)V ARG 1 errorMessage - METHOD method_25161 (Lnet/minecraft/class_4185;)V - ARG 1 button METHOD method_25162 (Lnet/minecraft/class_4185;)V ARG 1 button diff --git a/mappings/net/minecraft/client/realms/gui/screen/RealmsPlayerScreen.mapping b/mappings/net/minecraft/client/realms/gui/screen/RealmsPlayerScreen.mapping index fa9db5e6b8..f16ff5a727 100644 --- a/mappings/net/minecraft/client/realms/gui/screen/RealmsPlayerScreen.mapping +++ b/mappings/net/minecraft/client/realms/gui/screen/RealmsPlayerScreen.mapping @@ -2,65 +2,24 @@ CLASS net/minecraft/class_4406 net/minecraft/client/realms/gui/screen/RealmsPlay FIELD field_19958 LOGGER Lorg/slf4j/Logger; 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_19966 removeButton Lnet/minecraft/class_4185; - FIELD field_19967 opdeopButton Lnet/minecraft/class_4185; - FIELD field_19970 player I FIELD field_19971 stateChanged Z - FIELD field_22707 OPTIONS_BACKGROUND Lnet/minecraft/class_2960; - 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_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_21328 updateOps (Lnet/minecraft/class_4870;)V - ARG 1 ops METHOD method_21333 backButtonClicked ()V - METHOD method_21334 op (I)V - ARG 1 index - METHOD method_21339 deop (I)V - ARG 1 index - METHOD method_21344 uninvite (I)V - ARG 1 index - 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 (Lnet/minecraft/class_4874;Z)V - ARG 2 confirmed METHOD method_25197 (Lnet/minecraft/class_4185;)V ARG 1 button CLASS class_4407 InvitedObjectSelectionList - METHOD method_21353 selectInviteListItem (I)V - 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; + FIELD field_44536 uninviteButton Lnet/minecraft/class_4185; + FIELD field_44537 opButton Lnet/minecraft/class_4185; + FIELD field_44538 deopButton Lnet/minecraft/class_4185; METHOD (Lnet/minecraft/class_4406;Lnet/minecraft/class_4874;)V ARG 2 playerInfo - 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 diff --git a/mappings/net/minecraft/client/render/VertexConsumer.mapping b/mappings/net/minecraft/client/render/VertexConsumer.mapping index f2db1147d9..291556b7ee 100644 --- a/mappings/net/minecraft/client/render/VertexConsumer.mapping +++ b/mappings/net/minecraft/client/render/VertexConsumer.mapping @@ -113,7 +113,7 @@ CLASS net/minecraft/class_4588 net/minecraft/client/render/VertexConsumer ARG 2 x ARG 3 y ARG 4 z - METHOD method_22919 quad (Lnet/minecraft/class_4587$class_4665;Lnet/minecraft/class_777;FFFII)V + METHOD method_22919 quad (Lnet/minecraft/class_4587$class_4665;Lnet/minecraft/class_777;FFFFII)V COMMENT Specifies the vertex elements from {@code quad} and starts consuming COMMENT the next vertex. COMMENT @@ -124,9 +124,7 @@ CLASS net/minecraft/class_4588 net/minecraft/client/render/VertexConsumer ARG 3 red ARG 4 green ARG 5 blue - ARG 6 light - ARG 7 overlay - METHOD method_22920 quad (Lnet/minecraft/class_4587$class_4665;Lnet/minecraft/class_777;[FFFF[IIZ)V + METHOD method_22920 quad (Lnet/minecraft/class_4587$class_4665;Lnet/minecraft/class_777;[FFFFF[IIZ)V COMMENT Specifies the vertex elements from {@code quad} and starts consuming COMMENT the next vertex. COMMENT @@ -138,9 +136,6 @@ CLASS net/minecraft/class_4588 net/minecraft/client/render/VertexConsumer ARG 4 red ARG 5 green ARG 6 blue - ARG 7 lights - ARG 8 overlay - ARG 9 useQuadColorData METHOD method_22921 light (II)Lnet/minecraft/class_4588; COMMENT Specifies the {@linkplain VertexFormats#LIGHT_ELEMENT COMMENT light element} of the current vertex. diff --git a/mappings/net/minecraft/client/render/block/entity/BannerBlockEntityRenderer.mapping b/mappings/net/minecraft/client/render/block/entity/BannerBlockEntityRenderer.mapping index d859d169b1..1ad388fd6a 100644 --- a/mappings/net/minecraft/client/render/block/entity/BannerBlockEntityRenderer.mapping +++ b/mappings/net/minecraft/client/render/block/entity/BannerBlockEntityRenderer.mapping @@ -10,7 +10,7 @@ CLASS net/minecraft/class_823 net/minecraft/client/render/block/entity/BannerBlo FIELD field_32821 CROSSBAR Ljava/lang/String; METHOD (Lnet/minecraft/class_5614$class_5615;)V ARG 1 ctx - METHOD method_23802 renderCanvas (Lnet/minecraft/class_4587;Lnet/minecraft/class_4597;IILnet/minecraft/class_630;Lnet/minecraft/class_4730;ZLjava/util/List;Z)V + METHOD method_23802 renderCanvas (Lnet/minecraft/class_4587;Lnet/minecraft/class_4597;IILnet/minecraft/class_630;Lnet/minecraft/class_4730;ZLnet/minecraft/class_9307;Z)V ARG 0 matrices ARG 1 vertexConsumers ARG 2 light @@ -18,9 +18,8 @@ CLASS net/minecraft/class_823 net/minecraft/client/render/block/entity/BannerBlo ARG 4 canvas ARG 5 baseSprite ARG 6 isBanner - ARG 7 patterns ARG 8 glint - METHOD method_29999 renderCanvas (Lnet/minecraft/class_4587;Lnet/minecraft/class_4597;IILnet/minecraft/class_630;Lnet/minecraft/class_4730;ZLjava/util/List;)V + METHOD method_29999 renderCanvas (Lnet/minecraft/class_4587;Lnet/minecraft/class_4597;IILnet/minecraft/class_630;Lnet/minecraft/class_4730;ZLnet/minecraft/class_9307;)V ARG 0 matrices ARG 1 vertexConsumers ARG 2 light @@ -28,7 +27,6 @@ CLASS net/minecraft/class_823 net/minecraft/client/render/block/entity/BannerBlo ARG 4 canvas ARG 5 baseSprite ARG 6 isBanner - ARG 7 patterns METHOD method_32135 getTexturedModelData ()Lnet/minecraft/class_5607; METHOD method_43789 (Lnet/minecraft/class_630;Lnet/minecraft/class_4587;Lnet/minecraft/class_4597;II[FLnet/minecraft/class_4730;)V ARG 6 sprite diff --git a/mappings/net/minecraft/client/render/block/entity/DecoratedPotBlockEntityRenderer.mapping b/mappings/net/minecraft/client/render/block/entity/DecoratedPotBlockEntityRenderer.mapping index ab32233ddd..e0da99cba1 100644 --- a/mappings/net/minecraft/client/render/block/entity/DecoratedPotBlockEntityRenderer.mapping +++ b/mappings/net/minecraft/client/render/block/entity/DecoratedPotBlockEntityRenderer.mapping @@ -16,8 +16,7 @@ CLASS net/minecraft/class_8188 net/minecraft/client/render/block/entity/Decorate 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_49343 getTextureIdFromSherd (Ljava/util/Optional;)Lnet/minecraft/class_4730; 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 diff --git a/mappings/net/minecraft/client/render/entity/feature/ArmorFeatureRenderer.mapping b/mappings/net/minecraft/client/render/entity/feature/ArmorFeatureRenderer.mapping index 06015ad50d..a81a5d24be 100644 --- a/mappings/net/minecraft/client/render/entity/feature/ArmorFeatureRenderer.mapping +++ b/mappings/net/minecraft/client/render/entity/feature/ArmorFeatureRenderer.mapping @@ -39,8 +39,6 @@ CLASS net/minecraft/class_970 net/minecraft/client/render/entity/feature/ArmorFe 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 diff --git a/mappings/net/minecraft/command/argument/ItemPredicateReader.mapping b/mappings/net/minecraft/command/argument/ItemPredicateReader.mapping index 8bc4d2a30e..2c73829299 100644 --- a/mappings/net/minecraft/command/argument/ItemPredicateReader.mapping +++ b/mappings/net/minecraft/command/argument/ItemPredicateReader.mapping @@ -25,15 +25,12 @@ CLASS net/minecraft/class_9216 net/minecraft/command/argument/ItemPredicateReade ARG 2 reader ARG 3 callbacks METHOD method_56869 suggest ()V - METHOD method_56871 suggestCurlyBraceIfPossible (Lcom/mojang/brigadier/suggestion/SuggestionsBuilder;)Ljava/util/concurrent/CompletableFuture; - ARG 1 builder METHOD method_56872 readItem ()V METHOD method_56874 suggestItems (Lcom/mojang/brigadier/suggestion/SuggestionsBuilder;)Ljava/util/concurrent/CompletableFuture; ARG 1 builder METHOD method_56875 readTag ()V METHOD method_56876 suggestTags (Lcom/mojang/brigadier/suggestion/SuggestionsBuilder;)Ljava/util/concurrent/CompletableFuture; ARG 1 builder - METHOD method_56877 readNbt ()V METHOD method_56878 suggestAll (Lcom/mojang/brigadier/suggestion/SuggestionsBuilder;)Ljava/util/concurrent/CompletableFuture; ARG 1 builder CLASS class_9218 SuggestionCallbacks diff --git a/mappings/net/minecraft/command/argument/ItemPredicateStringReader.mapping b/mappings/net/minecraft/command/argument/ItemPredicateStringReader.mapping index 6aa8685f75..e5f63a3db6 100644 --- a/mappings/net/minecraft/command/argument/ItemPredicateStringReader.mapping +++ b/mappings/net/minecraft/command/argument/ItemPredicateStringReader.mapping @@ -11,5 +11,3 @@ CLASS net/minecraft/class_9215 net/minecraft/command/argument/ItemPredicateStrin ARG 1 stack METHOD method_56863 (Lnet/minecraft/class_6885;Lnet/minecraft/class_1799;)Z ARG 1 stack - METHOD method_56864 (Lnet/minecraft/class_2487;Lnet/minecraft/class_1799;)Z - ARG 1 stack diff --git a/mappings/net/minecraft/command/argument/ItemStackArgument.mapping b/mappings/net/minecraft/command/argument/ItemStackArgument.mapping index 070fc3ddb7..10179e2a34 100644 --- a/mappings/net/minecraft/command/argument/ItemStackArgument.mapping +++ b/mappings/net/minecraft/command/argument/ItemStackArgument.mapping @@ -1,18 +1,14 @@ CLASS net/minecraft/class_2290 net/minecraft/command/argument/ItemStackArgument FIELD field_10796 item Lnet/minecraft/class_6880; FIELD field_10797 OVERSTACKED_EXCEPTION Lcom/mojang/brigadier/exceptions/Dynamic2CommandExceptionType; - FIELD field_10798 nbt Lnet/minecraft/class_2487; - METHOD (Lnet/minecraft/class_6880;Lnet/minecraft/class_2487;)V + METHOD (Lnet/minecraft/class_6880;Lnet/minecraft/class_9323;)V ARG 1 item - ARG 2 nbt METHOD method_41967 getIdString ()Ljava/lang/String; METHOD method_9781 createStack (IZ)Lnet/minecraft/class_1799; ARG 1 amount ARG 2 checkOverstack - METHOD method_9782 asString ()Ljava/lang/String; + METHOD method_9782 asString (Lnet/minecraft/class_7225$class_7874;)Ljava/lang/String; METHOD method_9784 (Ljava/lang/Object;Ljava/lang/Object;)Lcom/mojang/brigadier/Message; ARG 0 item ARG 1 maxCount METHOD method_9785 getItem ()Lnet/minecraft/class_1792; - METHOD test (Ljava/lang/Object;)Z - ARG 1 stack diff --git a/mappings/net/minecraft/data/client/BlockStateModelGenerator.mapping b/mappings/net/minecraft/data/client/BlockStateModelGenerator.mapping index 16d5d6f6b8..0b7c03b609 100644 --- a/mappings/net/minecraft/data/client/BlockStateModelGenerator.mapping +++ b/mappings/net/minecraft/data/client/BlockStateModelGenerator.mapping @@ -502,9 +502,6 @@ CLASS net/minecraft/class_4910 net/minecraft/data/client/BlockStateModelGenerato 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 diff --git a/mappings/net/minecraft/data/report/BlockListProvider.mapping b/mappings/net/minecraft/data/report/BlockListProvider.mapping index 4a25c213a9..0bc112a434 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_40599 output Lnet/minecraft/class_7784; - METHOD (Lnet/minecraft/class_7784;)V + METHOD (Lnet/minecraft/class_7784;Ljava/util/concurrent/CompletableFuture;)V ARG 1 output diff --git a/mappings/net/minecraft/data/server/advancement/vanilla/VanillaAdventureTabAdvancementGenerator.mapping b/mappings/net/minecraft/data/server/advancement/vanilla/VanillaAdventureTabAdvancementGenerator.mapping index dae0124310..0242b9cc6e 100644 --- a/mappings/net/minecraft/data/server/advancement/vanilla/VanillaAdventureTabAdvancementGenerator.mapping +++ b/mappings/net/minecraft/data/server/advancement/vanilla/VanillaAdventureTabAdvancementGenerator.mapping @@ -7,19 +7,15 @@ CLASS net/minecraft/class_2412 net/minecraft/data/server/advancement/vanilla/Van METHOD method_10336 requireListedMobsKilled (Lnet/minecraft/class_161$class_162;Ljava/util/List;)Lnet/minecraft/class_161$class_162; ARG 0 builder ARG 1 entityTypes - METHOD method_10337 requireListedBiomesVisited (Lnet/minecraft/class_161$class_162;Ljava/util/List;)Lnet/minecraft/class_161$class_162; + METHOD method_10337 requireListedBiomesVisited (Lnet/minecraft/class_161$class_162;Lnet/minecraft/class_7225$class_7874;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_49356 buildAdventuringTime (Lnet/minecraft/class_7225$class_7874;Ljava/util/function/Consumer;Lnet/minecraft/class_8779;Lnet/minecraft/class_8197$class_5305;)V METHOD method_51689 requireAllExclusiveTrimmedArmor (Lnet/minecraft/class_161$class_162;)Lnet/minecraft/class_161$class_162; ARG 0 builder METHOD method_51690 (Lnet/minecraft/class_161$class_162;Lnet/minecraft/class_7803$class_8905;)V diff --git a/mappings/net/minecraft/data/server/loottable/LootTableGenerator.mapping b/mappings/net/minecraft/data/server/loottable/LootTableGenerator.mapping index 68236de7fc..0f05723cce 100644 --- a/mappings/net/minecraft/data/server/loottable/LootTableGenerator.mapping +++ b/mappings/net/minecraft/data/server/loottable/LootTableGenerator.mapping @@ -1,3 +1,2 @@ CLASS net/minecraft/class_7791 net/minecraft/data/server/loottable/LootTableGenerator - METHOD method_10399 accept (Ljava/util/function/BiConsumer;)V - ARG 1 exporter + METHOD method_10399 accept (Lnet/minecraft/class_7225$class_7874;Ljava/util/function/BiConsumer;)V diff --git a/mappings/net/minecraft/data/server/loottable/LootTableProvider.mapping b/mappings/net/minecraft/data/server/loottable/LootTableProvider.mapping index 1793e7aedd..ebdcf61051 100644 --- a/mappings/net/minecraft/data/server/loottable/LootTableProvider.mapping +++ b/mappings/net/minecraft/data/server/loottable/LootTableProvider.mapping @@ -12,8 +12,6 @@ CLASS net/minecraft/class_2438 net/minecraft/data/server/loottable/LootTableProv METHOD method_10407 (Ljava/lang/String;Ljava/lang/String;)V ARG 0 name ARG 1 message - 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 diff --git a/mappings/net/minecraft/data/server/loottable/vanilla/VanillaFishingLootTableGenerator.mapping b/mappings/net/minecraft/data/server/loottable/vanilla/VanillaFishingLootTableGenerator.mapping index 8390a86a1e..2717f4fa5a 100644 --- a/mappings/net/minecraft/data/server/loottable/vanilla/VanillaFishingLootTableGenerator.mapping +++ b/mappings/net/minecraft/data/server/loottable/vanilla/VanillaFishingLootTableGenerator.mapping @@ -1,5 +1,2 @@ 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 method_48516 createFishTableBuilder ()Lnet/minecraft/class_52$class_53; diff --git a/mappings/net/minecraft/datafixer/schema/Schema3083.mapping b/mappings/net/minecraft/datafixer/schema/Schema3083.mapping index 981b25fba8..aeb98b2e3f 100644 --- a/mappings/net/minecraft/datafixer/schema/Schema3083.mapping +++ b/mappings/net/minecraft/datafixer/schema/Schema3083.mapping @@ -1,7 +1,3 @@ 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/enchantment/EnchantmentHelper.mapping b/mappings/net/minecraft/enchantment/EnchantmentHelper.mapping index 2c5f9c9aeb..965273f19b 100644 --- a/mappings/net/minecraft/enchantment/EnchantmentHelper.mapping +++ b/mappings/net/minecraft/enchantment/EnchantmentHelper.mapping @@ -1,13 +1,4 @@ CLASS net/minecraft/class_1890 net/minecraft/enchantment/EnchantmentHelper - FIELD field_34025 ID_KEY Ljava/lang/String; - FIELD field_34026 LEVEL_KEY Ljava/lang/String; - METHOD method_17883 (Lnet/minecraft/class_1890$class_1891;Lnet/minecraft/class_2487;Lnet/minecraft/class_1887;)V - ARG 2 enchantment - METHOD method_17884 (Ljava/util/Map;Lnet/minecraft/class_2487;Lnet/minecraft/class_1887;)V - ARG 2 enchantment - METHOD method_22445 fromNbt (Lnet/minecraft/class_2499;)Ljava/util/Map; - COMMENT Loads enchantments from an NBT list. - ARG 0 list METHOD method_24365 chooseEquipmentWith (Lnet/minecraft/class_1887;Lnet/minecraft/class_1309;Ljava/util/function/Predicate;)Ljava/util/Map$Entry; COMMENT {@return a pair of an equipment slot and the item stack in the supplied COMMENT entity's slot} It indicates the item stack has the enchantment supplied @@ -25,18 +16,6 @@ CLASS net/minecraft/class_1890 net/minecraft/enchantment/EnchantmentHelper ARG 0 stack METHOD method_25951 hasSoulSpeed (Lnet/minecraft/class_1309;)Z ARG 0 entity - METHOD method_37423 getEnchantmentId (Lnet/minecraft/class_1887;)Lnet/minecraft/class_2960; - ARG 0 enchantment - METHOD method_37424 getLevelFromNbt (Lnet/minecraft/class_2487;)I - ARG 0 nbt - METHOD method_37425 writeLevelToNbt (Lnet/minecraft/class_2487;I)V - ARG 0 nbt - ARG 1 lvl - METHOD method_37426 createNbt (Lnet/minecraft/class_2960;I)Lnet/minecraft/class_2487; - ARG 0 id - ARG 1 lvl - 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 @@ -96,16 +75,6 @@ CLASS net/minecraft/class_1890 net/minecraft/enchantment/EnchantmentHelper METHOD method_8213 onTargetDamaged (Lnet/minecraft/class_1309;Lnet/minecraft/class_1297;)V ARG 0 user ARG 1 target - METHOD method_8214 set (Ljava/util/Map;Lnet/minecraft/class_1799;)V - COMMENT Sets the enchantments on an item stack. - COMMENT - COMMENT

For enchanted books, it sets the enchantments to the item stack's - COMMENT stored enchantments than regular enchantments. - COMMENT - COMMENT @see ItemStack#getEnchantments() - COMMENT @see net.minecraft.item.EnchantedBookItem#getEnchantmentNbt(ItemStack) - ARG 0 enchantments - ARG 1 stack METHOD method_8215 getLure (Lnet/minecraft/class_1799;)I ARG 0 stack METHOD method_8216 hasFrostWalker (Lnet/minecraft/class_1309;)Z @@ -123,15 +92,6 @@ CLASS net/minecraft/class_1890 net/minecraft/enchantment/EnchantmentHelper ARG 1 stack METHOD method_8221 hasVanishingCurse (Lnet/minecraft/class_1799;)Z ARG 0 stack - METHOD method_8222 get (Lnet/minecraft/class_1799;)Ljava/util/Map; - COMMENT Gets the enchantments on an item stack. - COMMENT - COMMENT

For enchanted books, it retrieves from the item stack's stored than - COMMENT regular enchantments. - COMMENT - COMMENT @see ItemStack#getEnchantments() - COMMENT @see net.minecraft.item.EnchantedBookItem#getEnchantmentNbt(ItemStack) - ARG 0 stack METHOD method_8223 getLuckOfTheSea (Lnet/minecraft/class_1799;)I ARG 0 stack METHOD method_8224 hasBindingCurse (Lnet/minecraft/class_1799;)Z diff --git a/mappings/net/minecraft/entity/AreaEffectCloudEntity.mapping b/mappings/net/minecraft/entity/AreaEffectCloudEntity.mapping index 8ca909b810..778261422b 100644 --- a/mappings/net/minecraft/entity/AreaEffectCloudEntity.mapping +++ b/mappings/net/minecraft/entity/AreaEffectCloudEntity.mapping @@ -1,13 +1,9 @@ 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 FIELD field_5931 PARTICLE_ID Lnet/minecraft/class_2940; FIELD field_5932 durationOnUse I - FIELD field_5933 potion Lnet/minecraft/class_6880; - FIELD field_5934 effects Ljava/util/List; FIELD field_5935 LOGGER Lorg/slf4j/Logger; FIELD field_5936 COLOR Lnet/minecraft/class_2940; FIELD field_5937 reapplicationDelay I @@ -31,7 +27,6 @@ CLASS net/minecraft/class_1295 net/minecraft/entity/AreaEffectCloudEntity METHOD method_35045 getRadiusGrowth ()F METHOD method_35046 getDurationOnUse ()I METHOD method_35047 getWaitTime ()I - METHOD method_35048 getPotion ()Lnet/minecraft/class_6880; METHOD method_5595 setWaitTime (I)V ARG 1 waitTime METHOD method_5596 setRadiusGrowth (F)V @@ -41,8 +36,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_5602 setColor (I)V - ARG 1 rgb METHOD method_5603 setRadius (F)V ARG 1 radius METHOD method_5604 setDuration (I)V @@ -56,7 +49,4 @@ CLASS net/minecraft/class_1295 net/minecraft/entity/AreaEffectCloudEntity METHOD method_5609 setRadiusOnUse (F)V ARG 1 radiusOnUse METHOD method_5610 addEffect (Lnet/minecraft/class_1293;)V - ARG 1 effect METHOD method_5611 isWaiting ()Z - METHOD method_5612 setPotion (Lnet/minecraft/class_6880;)V - ARG 1 potion diff --git a/mappings/net/minecraft/entity/CrossbowUser.mapping b/mappings/net/minecraft/entity/CrossbowUser.mapping index e8e16de0ed..b64881c26b 100644 --- a/mappings/net/minecraft/entity/CrossbowUser.mapping +++ b/mappings/net/minecraft/entity/CrossbowUser.mapping @@ -1,20 +1,5 @@ CLASS net/minecraft/class_3745 net/minecraft/entity/CrossbowUser - METHOD method_18811 shoot (Lnet/minecraft/class_1309;Lnet/minecraft/class_1799;Lnet/minecraft/class_1676;F)V - ARG 1 target - ARG 2 crossbow - ARG 3 projectile - ARG 4 multiShotSpray METHOD method_24651 postShoot ()V - METHOD method_24652 shoot (Lnet/minecraft/class_1309;Lnet/minecraft/class_1309;Lnet/minecraft/class_1676;FF)V - ARG 1 entity - ARG 2 target - ARG 3 projectile - ARG 4 multishotSpray - ARG 5 speed - 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 METHOD method_24654 shoot (Lnet/minecraft/class_1309;F)V ARG 1 entity ARG 2 speed diff --git a/mappings/net/minecraft/entity/EntityType.mapping b/mappings/net/minecraft/entity/EntityType.mapping index 400b4de5fc..672b4b7e61 100644 --- a/mappings/net/minecraft/entity/EntityType.mapping +++ b/mappings/net/minecraft/entity/EntityType.mapping @@ -6,7 +6,6 @@ CLASS net/minecraft/class_1299 net/minecraft/entity/EntityType FIELD field_24085 maxTrackDistance I FIELD field_24086 trackTickInterval I 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 @@ -80,13 +79,13 @@ CLASS net/minecraft/class_1299 net/minecraft/entity/EntityType 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 + METHOD method_48008 (Lnet/minecraft/class_3218;Lnet/minecraft/class_1657;Lnet/minecraft/class_9279;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 + METHOD method_48010 (Lnet/minecraft/class_2561;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 @@ -105,11 +104,9 @@ CLASS net/minecraft/class_1299 net/minecraft/entity/EntityType 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 + METHOD method_5881 loadFromEntityNbt (Lnet/minecraft/class_1937;Lnet/minecraft/class_1657;Lnet/minecraft/class_1297;Lnet/minecraft/class_9279;)V ARG 0 world ARG 1 player - ARG 2 entity - ARG 3 itemNbt METHOD method_5882 getTranslationKey ()Ljava/lang/String; METHOD method_5883 create (Lnet/minecraft/class_1937;)Lnet/minecraft/class_1297; ARG 1 world diff --git a/mappings/net/minecraft/entity/EyeOfEnderEntity.mapping b/mappings/net/minecraft/entity/EyeOfEnderEntity.mapping index e591a3a21c..5aaa3045d4 100644 --- a/mappings/net/minecraft/entity/EyeOfEnderEntity.mapping +++ b/mappings/net/minecraft/entity/EyeOfEnderEntity.mapping @@ -11,7 +11,6 @@ CLASS net/minecraft/class_1672 net/minecraft/entity/EyeOfEnderEntity ARG 4 y ARG 6 z METHOD method_16933 setItem (Lnet/minecraft/class_1799;)V - ARG 1 stack METHOD method_56684 getItem ()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/InventoryOwner.mapping b/mappings/net/minecraft/entity/InventoryOwner.mapping index ae20f287be..bf42b616ca 100644 --- a/mappings/net/minecraft/entity/InventoryOwner.mapping +++ b/mappings/net/minecraft/entity/InventoryOwner.mapping @@ -5,7 +5,7 @@ CLASS net/minecraft/class_6067 net/minecraft/entity/InventoryOwner ARG 0 entity ARG 1 inventoryOwner ARG 2 item - METHOD method_46399 writeInventory (Lnet/minecraft/class_2487;)V + METHOD method_46399 writeInventory (Lnet/minecraft/class_2487;Lnet/minecraft/class_7225$class_7874;)V ARG 1 nbt - METHOD method_46400 readInventory (Lnet/minecraft/class_2487;)V + METHOD method_46400 readInventory (Lnet/minecraft/class_2487;Lnet/minecraft/class_7225$class_7874;)V ARG 1 nbt diff --git a/mappings/net/minecraft/entity/ai/pathing/LandPathNodeMaker.mapping b/mappings/net/minecraft/entity/ai/pathing/LandPathNodeMaker.mapping index 41399c29c8..55ef3f489b 100644 --- a/mappings/net/minecraft/entity/ai/pathing/LandPathNodeMaker.mapping +++ b/mappings/net/minecraft/entity/ai/pathing/LandPathNodeMaker.mapping @@ -7,8 +7,7 @@ CLASS net/minecraft/class_14 net/minecraft/entity/ai/pathing/LandPathNodeMaker METHOD method_20536 isValidAdjacentSuccessor (Lnet/minecraft/class_9;Lnet/minecraft/class_9;)Z ARG 1 node ARG 2 successor - METHOD method_23476 getLandNodeType (Lnet/minecraft/class_1922;Lnet/minecraft/class_2338$class_2339;)Lnet/minecraft/class_7; - ARG 0 world + METHOD method_23476 getLandNodeType (Lnet/minecraft/class_9316;Lnet/minecraft/class_2338$class_2339;)Lnet/minecraft/class_7; ARG 1 pos METHOD method_29304 checkBoxCollision (Lnet/minecraft/class_238;)Z ARG 1 box @@ -65,8 +64,7 @@ CLASS net/minecraft/class_14 net/minecraft/entity/ai/pathing/LandPathNodeMaker ARG 4 type METHOD method_57089 isValidDiagonalSuccessor (Lnet/minecraft/class_9;)Z ARG 1 node - METHOD method_57090 getCollidingNodeTypes (Lnet/minecraft/class_1922;III)Ljava/util/Set; - ARG 1 world + METHOD method_57090 getCollidingNodeTypes (Lnet/minecraft/class_9316;III)Ljava/util/Set; ARG 2 x ARG 3 y ARG 4 z @@ -77,10 +75,7 @@ CLASS net/minecraft/class_14 net/minecraft/entity/ai/pathing/LandPathNodeMaker METHOD method_58 getCommonNodeType (Lnet/minecraft/class_1922;Lnet/minecraft/class_2338;)Lnet/minecraft/class_7; ARG 0 world ARG 1 pos - METHOD method_59 getNodeTypeFromNeighbors (Lnet/minecraft/class_1922;Lnet/minecraft/class_2338$class_2339;Lnet/minecraft/class_7;)Lnet/minecraft/class_7; - ARG 0 world - ARG 1 pos - ARG 2 nodeType + METHOD method_59 getNodeTypeFromNeighbors (Lnet/minecraft/class_9316;IIILnet/minecraft/class_7;)Lnet/minecraft/class_7; METHOD method_60 getFeetY (Lnet/minecraft/class_1922;Lnet/minecraft/class_2338;)D ARG 0 world ARG 1 pos diff --git a/mappings/net/minecraft/entity/ai/pathing/PathNodeMaker.mapping b/mappings/net/minecraft/entity/ai/pathing/PathNodeMaker.mapping index 1aa8df73f0..5a035576fc 100644 --- a/mappings/net/minecraft/entity/ai/pathing/PathNodeMaker.mapping +++ b/mappings/net/minecraft/entity/ai/pathing/PathNodeMaker.mapping @@ -1,5 +1,4 @@ CLASS net/minecraft/class_8 net/minecraft/entity/ai/pathing/PathNodeMaker - FIELD field_20622 cachedWorld Lnet/minecraft/class_1950; FIELD field_25 canSwim Z FIELD field_27 canOpenDoors Z FIELD field_28 entityBlockZSize I @@ -24,9 +23,8 @@ CLASS net/minecraft/class_8 net/minecraft/entity/ai/pathing/PathNodeMaker ARG 1 x ARG 3 y ARG 5 z - METHOD method_17 getDefaultNodeType (Lnet/minecraft/class_1922;III)Lnet/minecraft/class_7; + METHOD method_17 getDefaultNodeType (Lnet/minecraft/class_9316;III)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 @@ -40,9 +38,8 @@ 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;)Lnet/minecraft/class_7; + METHOD method_25 getNodeType (Lnet/minecraft/class_9316;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 diff --git a/mappings/net/minecraft/entity/attribute/AttributeContainer.mapping b/mappings/net/minecraft/entity/attribute/AttributeContainer.mapping index 446e4e8fda..f29cfffa46 100644 --- a/mappings/net/minecraft/entity/attribute/AttributeContainer.mapping +++ b/mappings/net/minecraft/entity/attribute/AttributeContainer.mapping @@ -6,18 +6,10 @@ CLASS net/minecraft/class_5131 net/minecraft/entity/attribute/AttributeContainer METHOD (Lnet/minecraft/class_5132;)V ARG 1 defaultAttributes METHOD method_26841 getTracked ()Ljava/util/Set; - METHOD method_26843 (Lnet/minecraft/class_6880;Lnet/minecraft/class_1322;)V - ARG 1 attribute - ARG 2 attributeModifier - METHOD method_26844 (Lnet/minecraft/class_6880;Ljava/util/Collection;)V - ARG 1 attribute - ARG 2 modifiers METHOD method_26845 updateTrackedStatus (Lnet/minecraft/class_1324;)V ARG 1 instance METHOD method_26846 setFrom (Lnet/minecraft/class_5131;)V ARG 1 other - METHOD method_26847 removeModifiers (Lcom/google/common/collect/Multimap;)V - ARG 1 attributeModifiers METHOD method_26849 (Lnet/minecraft/class_2487;Lnet/minecraft/class_6880$class_6883;)V ARG 2 attribute METHOD method_26850 readNbt (Lnet/minecraft/class_2499;)V @@ -27,8 +19,6 @@ CLASS net/minecraft/class_5131 net/minecraft/entity/attribute/AttributeContainer ARG 1 attribute METHOD method_26853 (Lnet/minecraft/class_1324;)V ARG 1 attributeInstance - METHOD method_26854 addTemporaryModifiers (Lcom/google/common/collect/Multimap;)V - ARG 1 attributeModifiers METHOD method_26855 toNbt ()Lnet/minecraft/class_2499; METHOD method_26856 getBaseValue (Lnet/minecraft/class_6880;)D ARG 1 attribute @@ -44,7 +34,5 @@ CLASS net/minecraft/class_5131 net/minecraft/entity/attribute/AttributeContainer 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 METHOD method_55698 (Lnet/minecraft/class_6880;)Lnet/minecraft/class_1324; ARG 1 attribute diff --git a/mappings/net/minecraft/entity/boss/BossBarManager.mapping b/mappings/net/minecraft/entity/boss/BossBarManager.mapping index e0fd3391b9..a15b43dd53 100644 --- a/mappings/net/minecraft/entity/boss/BossBarManager.mapping +++ b/mappings/net/minecraft/entity/boss/BossBarManager.mapping @@ -7,11 +7,11 @@ CLASS net/minecraft/class_3004 net/minecraft/entity/boss/BossBarManager ARG 2 displayName METHOD method_12971 get (Lnet/minecraft/class_2960;)Lnet/minecraft/class_3002; ARG 1 id - METHOD method_12972 readNbt (Lnet/minecraft/class_2487;)V + METHOD method_12972 readNbt (Lnet/minecraft/class_2487;Lnet/minecraft/class_7225$class_7874;)V ARG 1 nbt METHOD method_12973 remove (Lnet/minecraft/class_3002;)V ARG 1 bossBar - METHOD method_12974 toNbt ()Lnet/minecraft/class_2487; + METHOD method_12974 toNbt (Lnet/minecraft/class_7225$class_7874;)Lnet/minecraft/class_2487; METHOD method_12975 onPlayerConnect (Lnet/minecraft/class_3222;)V ARG 1 player METHOD method_12976 onPlayerDisconnect (Lnet/minecraft/class_3222;)V diff --git a/mappings/net/minecraft/entity/boss/CommandBossBar.mapping b/mappings/net/minecraft/entity/boss/CommandBossBar.mapping index 96e261bd9b..5b7dfee1b4 100644 --- a/mappings/net/minecraft/entity/boss/CommandBossBar.mapping +++ b/mappings/net/minecraft/entity/boss/CommandBossBar.mapping @@ -21,10 +21,10 @@ CLASS net/minecraft/class_3002 net/minecraft/entity/boss/CommandBossBar ARG 1 player METHOD method_12962 addPlayers (Ljava/util/Collection;)Z ARG 1 players - METHOD method_12963 toNbt ()Lnet/minecraft/class_2487; + METHOD method_12963 toNbt (Lnet/minecraft/class_7225$class_7874;)Lnet/minecraft/class_2487; METHOD method_12964 addPlayer (Ljava/util/UUID;)V ARG 1 uuid METHOD method_12965 toHoverableText ()Lnet/minecraft/class_2561; - METHOD method_12966 fromNbt (Lnet/minecraft/class_2487;Lnet/minecraft/class_2960;)Lnet/minecraft/class_3002; + METHOD method_12966 fromNbt (Lnet/minecraft/class_2487;Lnet/minecraft/class_2960;Lnet/minecraft/class_7225$class_7874;)Lnet/minecraft/class_3002; ARG 0 nbt ARG 1 id diff --git a/mappings/net/minecraft/entity/decoration/painting/PaintingEntity.mapping b/mappings/net/minecraft/entity/decoration/painting/PaintingEntity.mapping index 40bafccd6b..a1c2873b16 100644 --- a/mappings/net/minecraft/entity/decoration/painting/PaintingEntity.mapping +++ b/mappings/net/minecraft/entity/decoration/painting/PaintingEntity.mapping @@ -1,7 +1,6 @@ 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 @@ -23,10 +22,6 @@ CLASS net/minecraft/class_1534 net/minecraft/entity/decoration/painting/Painting METHOD method_43403 getSize (Lnet/minecraft/class_6880;)I ARG 0 variant 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/mob/MobEntity.mapping b/mappings/net/minecraft/entity/mob/MobEntity.mapping index cd7aa3085e..74e883b371 100644 --- a/mappings/net/minecraft/entity/mob/MobEntity.mapping +++ b/mappings/net/minecraft/entity/mob/MobEntity.mapping @@ -107,10 +107,6 @@ CLASS net/minecraft/class_1308 net/minecraft/entity/mob/MobEntity METHOD method_26320 prefersNewDamageableItem (Lnet/minecraft/class_1799;Lnet/minecraft/class_1799;)Z ARG 1 newStack ARG 2 oldStack - METHOD method_26321 (Ljava/lang/String;)Z - ARG 0 key - METHOD method_26322 (Ljava/lang/String;)Z - ARG 0 key METHOD method_26323 movesIndependently ()Z COMMENT When true, causes this entity to take over pathfinding for its controlling passenger. METHOD method_26828 createMobAttributes ()Lnet/minecraft/class_5132$class_5133; diff --git a/mappings/net/minecraft/entity/mob/PillagerEntity.mapping b/mappings/net/minecraft/entity/mob/PillagerEntity.mapping index a5cf650a87..60f61ef67e 100644 --- a/mappings/net/minecraft/entity/mob/PillagerEntity.mapping +++ b/mappings/net/minecraft/entity/mob/PillagerEntity.mapping @@ -1,5 +1,4 @@ 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/passive/ArmadilloEntity.mapping b/mappings/net/minecraft/entity/passive/ArmadilloEntity.mapping index 9cce001864..dff154f494 100644 --- a/mappings/net/minecraft/entity/passive/ArmadilloEntity.mapping +++ b/mappings/net/minecraft/entity/passive/ArmadilloEntity.mapping @@ -11,7 +11,7 @@ CLASS net/minecraft/class_9069 net/minecraft/entity/passive/ArmadilloEntity ARG 1 state METHOD method_55714 shouldSwitchToScaredState ()Z METHOD method_55715 startRolling ()V - METHOD method_55716 brushScute ()V + METHOD method_55716 brushScute ()Z METHOD method_55717 canRollUp ()Z METHOD method_55718 getState ()Lnet/minecraft/class_9069$class_9070; METHOD method_55719 getNextScuteShedCooldown ()I diff --git a/mappings/net/minecraft/entity/passive/IronGolemEntity.mapping b/mappings/net/minecraft/entity/passive/IronGolemEntity.mapping index 41aa251aaf..df96182093 100644 --- a/mappings/net/minecraft/entity/passive/IronGolemEntity.mapping +++ b/mappings/net/minecraft/entity/passive/IronGolemEntity.mapping @@ -9,7 +9,7 @@ CLASS net/minecraft/class_1439 net/minecraft/entity/passive/IronGolemEntity COMMENT The tracked flags of iron golems. Only has the {@code 1} bit for whether a COMMENT golem is {@linkplain #isPlayerCreated() created by a player}. METHOD method_22328 getAttackDamage ()F - METHOD method_23347 getCrack ()Lnet/minecraft/class_1439$class_4621; + METHOD method_23347 getCrack ()Lnet/minecraft/class_9273$class_4621; METHOD method_26886 createIronGolemAttributes ()Lnet/minecraft/class_5132$class_5133; METHOD method_6496 isPlayerCreated ()Z METHOD method_6497 setLookingAtVillager (Z)V @@ -20,10 +20,3 @@ CLASS net/minecraft/class_1439 net/minecraft/entity/passive/IronGolemEntity ARG 1 playerCreated METHOD method_6501 getAttackTicksLeft ()I METHOD method_6502 getLookingAtVillagerTicks ()I - CLASS class_4621 Crack - FIELD field_21491 VALUES Ljava/util/List; - FIELD field_21492 maxHealthFraction F - METHOD (Ljava/lang/String;IF)V - ARG 3 maxHealthFraction - METHOD method_23693 from (F)Lnet/minecraft/class_1439$class_4621; - ARG 0 healthFraction diff --git a/mappings/net/minecraft/entity/passive/MooshroomEntity.mapping b/mappings/net/minecraft/entity/passive/MooshroomEntity.mapping index 26f43815ac..e4d3ce080a 100644 --- a/mappings/net/minecraft/entity/passive/MooshroomEntity.mapping +++ b/mappings/net/minecraft/entity/passive/MooshroomEntity.mapping @@ -3,7 +3,7 @@ CLASS net/minecraft/class_1438 net/minecraft/entity/passive/MooshroomEntity FIELD field_18108 lightningId Ljava/util/UUID; FIELD field_30339 MUTATION_CHANCE I FIELD field_45751 STEW_EFFECTS_NBT_KEY Ljava/lang/String; - FIELD field_45752 stewEffects Ljava/util/List; + FIELD field_45752 stewEffects Lnet/minecraft/class_9298; METHOD method_18434 chooseBabyType (Lnet/minecraft/class_1438;)Lnet/minecraft/class_1438$class_4053; ARG 1 mooshroom METHOD method_18436 getStewEffectFrom (Lnet/minecraft/class_1799;)Ljava/util/Optional; @@ -14,8 +14,6 @@ CLASS net/minecraft/class_1438 net/minecraft/entity/passive/MooshroomEntity 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; diff --git a/mappings/net/minecraft/entity/player/PlayerEntity.mapping b/mappings/net/minecraft/entity/player/PlayerEntity.mapping index b5c1f47e71..e776f6d953 100644 --- a/mappings/net/minecraft/entity/player/PlayerEntity.mapping +++ b/mappings/net/minecraft/entity/player/PlayerEntity.mapping @@ -139,10 +139,6 @@ CLASS net/minecraft/class_1657 net/minecraft/entity/player/PlayerEntity ARG 2 ingredients METHOD method_52558 canChangeIntoPose (Lnet/minecraft/class_4050;)Z ARG 1 pose - METHOD method_53967 (I)Z - ARG 0 c - METHOD method_53968 isUsernameValid (Ljava/lang/String;)Z - ARG 0 name METHOD method_55754 getBlockInteractionRange ()D METHOD method_55755 getEntityInteractionRange ()D METHOD method_56092 canInteractWithEntityIn (Lnet/minecraft/class_238;D)Z diff --git a/mappings/net/minecraft/entity/player/PlayerInventory.mapping b/mappings/net/minecraft/entity/player/PlayerInventory.mapping index e52f1be203..5f3718c305 100644 --- a/mappings/net/minecraft/entity/player/PlayerInventory.mapping +++ b/mappings/net/minecraft/entity/player/PlayerInventory.mapping @@ -60,10 +60,6 @@ CLASS net/minecraft/class_1661 net/minecraft/entity/player/PlayerInventory ARG 1 scrollAmount METHOD method_7374 addPickBlock (Lnet/minecraft/class_1799;)V ARG 1 stack - METHOD method_7375 damageArmor (Lnet/minecraft/class_1282;F[I)V - ARG 1 damageSource - ARG 2 amount - ARG 3 slots METHOD method_7376 getEmptySlot ()I METHOD method_7377 clone (Lnet/minecraft/class_1661;)V ARG 1 other diff --git a/mappings/net/minecraft/entity/projectile/AbstractFireballEntity.mapping b/mappings/net/minecraft/entity/projectile/AbstractFireballEntity.mapping index 737373f090..a5c7c48c01 100644 --- a/mappings/net/minecraft/entity/projectile/AbstractFireballEntity.mapping +++ b/mappings/net/minecraft/entity/projectile/AbstractFireballEntity.mapping @@ -1,5 +1,4 @@ CLASS net/minecraft/class_3855 net/minecraft/entity/projectile/AbstractFireballEntity FIELD field_17081 ITEM Lnet/minecraft/class_2940; METHOD method_16936 setItem (Lnet/minecraft/class_1799;)V - ARG 1 stack METHOD method_56685 getItem ()Lnet/minecraft/class_1799; diff --git a/mappings/net/minecraft/entity/projectile/ArrowEntity.mapping b/mappings/net/minecraft/entity/projectile/ArrowEntity.mapping index 73ada4f338..4dab5f91d0 100644 --- a/mappings/net/minecraft/entity/projectile/ArrowEntity.mapping +++ b/mappings/net/minecraft/entity/projectile/ArrowEntity.mapping @@ -2,11 +2,7 @@ CLASS net/minecraft/class_1667 net/minecraft/entity/projectile/ArrowEntity FIELD field_30658 NO_POTION_COLOR I FIELD field_30659 PARTICLE_EFFECT_STATUS B FIELD field_30660 MAX_POTION_DURATION_TICKS I - FIELD field_46971 DEFAULT_STACK Lnet/minecraft/class_1799; FIELD field_7595 COLOR Lnet/minecraft/class_2940; - FIELD field_7596 colorSet Z - FIELD field_7597 potion Lnet/minecraft/class_6880; - FIELD field_7598 effects Ljava/util/Set; METHOD (Lnet/minecraft/class_1937;DDDLnet/minecraft/class_1799;)V ARG 1 world ARG 2 x @@ -17,15 +13,8 @@ CLASS net/minecraft/class_1667 net/minecraft/entity/projectile/ArrowEntity ARG 1 world ARG 2 owner ARG 3 stack - METHOD method_7459 initFromStack (Lnet/minecraft/class_1799;)V - ARG 1 stack METHOD method_7460 getColor ()I METHOD method_7461 spawnParticles (I)V ARG 1 amount METHOD method_7462 initColor ()V METHOD method_7463 addEffect (Lnet/minecraft/class_1293;)V - ARG 1 effect - METHOD method_7464 getCustomPotionColor (Lnet/minecraft/class_1799;)I - ARG 0 stack - METHOD method_7465 setColor (I)V - ARG 1 color diff --git a/mappings/net/minecraft/entity/projectile/BreezeWindChargeEntity.mapping b/mappings/net/minecraft/entity/projectile/BreezeWindChargeEntity.mapping index 29849a58f1..816acc83c6 100644 --- a/mappings/net/minecraft/entity/projectile/BreezeWindChargeEntity.mapping +++ b/mappings/net/minecraft/entity/projectile/BreezeWindChargeEntity.mapping @@ -1,6 +1,5 @@ CLASS net/minecraft/class_9238 net/minecraft/entity/projectile/BreezeWindChargeEntity FIELD field_49095 EXPLOSION_BEHAVIOR Lnet/minecraft/class_9236$class_9237; - FIELD field_49096 BASE_EXPLOSION_POWER F METHOD (Lnet/minecraft/class_8949;Lnet/minecraft/class_1937;)V ARG 1 breeze ARG 2 world diff --git a/mappings/net/minecraft/entity/projectile/SpectralArrowEntity.mapping b/mappings/net/minecraft/entity/projectile/SpectralArrowEntity.mapping index feb2cf0d5f..a061468810 100644 --- a/mappings/net/minecraft/entity/projectile/SpectralArrowEntity.mapping +++ b/mappings/net/minecraft/entity/projectile/SpectralArrowEntity.mapping @@ -1,5 +1,4 @@ CLASS net/minecraft/class_1679 net/minecraft/entity/projectile/SpectralArrowEntity - FIELD field_46972 DEFAULT_STACK Lnet/minecraft/class_1799; FIELD field_7636 duration I METHOD (Lnet/minecraft/class_1937;DDDLnet/minecraft/class_1799;)V ARG 1 world diff --git a/mappings/net/minecraft/entity/projectile/TridentEntity.mapping b/mappings/net/minecraft/entity/projectile/TridentEntity.mapping index aee37fdf3e..ec279aaddd 100644 --- a/mappings/net/minecraft/entity/projectile/TridentEntity.mapping +++ b/mappings/net/minecraft/entity/projectile/TridentEntity.mapping @@ -1,6 +1,5 @@ CLASS net/minecraft/class_1685 net/minecraft/entity/projectile/TridentEntity FIELD field_21514 ENCHANTED Lnet/minecraft/class_2940; - FIELD field_46973 DEFAULT_STACK Lnet/minecraft/class_1799; FIELD field_7647 LOYALTY Lnet/minecraft/class_2940; FIELD field_7648 dealtDamage Z FIELD field_7649 returnTimer I diff --git a/mappings/net/minecraft/entity/projectile/WindChargeEntity.mapping b/mappings/net/minecraft/entity/projectile/WindChargeEntity.mapping index fedce701e7..c9de18f7ad 100644 --- a/mappings/net/minecraft/entity/projectile/WindChargeEntity.mapping +++ b/mappings/net/minecraft/entity/projectile/WindChargeEntity.mapping @@ -1,6 +1,5 @@ CLASS net/minecraft/class_8956 net/minecraft/entity/projectile/WindChargeEntity FIELD field_47579 EXPLOSION_BEHAVIOR Lnet/minecraft/class_8956$class_9036; - FIELD field_49097 BASE_EXPLOSION_POWER F METHOD (Lnet/minecraft/class_1657;Lnet/minecraft/class_1937;DDD)V ARG 1 player ARG 2 world diff --git a/mappings/net/minecraft/entity/projectile/thrown/PotionEntity.mapping b/mappings/net/minecraft/entity/projectile/thrown/PotionEntity.mapping index 870d6612b6..ccb09d382c 100644 --- a/mappings/net/minecraft/entity/projectile/thrown/PotionEntity.mapping +++ b/mappings/net/minecraft/entity/projectile/thrown/PotionEntity.mapping @@ -10,11 +10,8 @@ CLASS net/minecraft/class_1686 net/minecraft/entity/projectile/thrown/PotionEnti 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_6880;)V - ARG 1 stack - ARG 2 potion - METHOD method_7498 applySplashPotion (Ljava/util/List;Lnet/minecraft/class_1297;)V - ARG 1 statusEffects + METHOD method_7497 applyLingeringPotion (Lnet/minecraft/class_1844;)V + METHOD method_7498 applySplashPotion (Ljava/lang/Iterable;Lnet/minecraft/class_1297;)V ARG 2 entity METHOD method_7499 extinguishFire (Lnet/minecraft/class_2338;)V ARG 1 pos diff --git a/mappings/net/minecraft/entity/vehicle/VehicleInventory.mapping b/mappings/net/minecraft/entity/vehicle/VehicleInventory.mapping index 39beb29812..7aa79a2327 100644 --- a/mappings/net/minecraft/entity/vehicle/VehicleInventory.mapping +++ b/mappings/net/minecraft/entity/vehicle/VehicleInventory.mapping @@ -16,7 +16,7 @@ CLASS net/minecraft/class_7265 net/minecraft/entity/vehicle/VehicleInventory ARG 3 vehicle METHOD method_42284 open (Lnet/minecraft/class_1657;)Lnet/minecraft/class_1269; ARG 1 player - METHOD method_42285 readInventoryFromNbt (Lnet/minecraft/class_2487;)V + METHOD method_42285 readInventoryFromNbt (Lnet/minecraft/class_2487;Lnet/minecraft/class_7225$class_7874;)V ARG 1 nbt METHOD method_42286 removeInventoryStack (II)Lnet/minecraft/class_1799; ARG 1 slot @@ -24,7 +24,7 @@ CLASS net/minecraft/class_7265 net/minecraft/entity/vehicle/VehicleInventory METHOD method_42287 setInventoryStack (ILnet/minecraft/class_1799;)V ARG 1 slot ARG 2 stack - METHOD method_42288 writeInventoryToNbt (Lnet/minecraft/class_2487;)V + METHOD method_42288 writeInventoryToNbt (Lnet/minecraft/class_2487;Lnet/minecraft/class_7225$class_7874;)V ARG 1 nbt METHOD method_42289 removeInventoryStack (I)Lnet/minecraft/class_1799; ARG 1 slot diff --git a/mappings/net/minecraft/inventory/ContainerLock.mapping b/mappings/net/minecraft/inventory/ContainerLock.mapping index 7d12aa552d..979d5bcf74 100644 --- a/mappings/net/minecraft/inventory/ContainerLock.mapping +++ b/mappings/net/minecraft/inventory/ContainerLock.mapping @@ -1,17 +1,16 @@ CLASS net/minecraft/class_1273 net/minecraft/inventory/ContainerLock + FIELD comp_2371 key Ljava/lang/String; FIELD field_29956 LOCK_KEY Ljava/lang/String; FIELD field_5817 EMPTY Lnet/minecraft/class_1273; COMMENT An empty container lock that can always be opened. - FIELD field_5818 key Ljava/lang/String; METHOD (Ljava/lang/String;)V ARG 1 key + METHOD comp_2371 key ()Ljava/lang/String; METHOD method_5472 canOpen (Lnet/minecraft/class_1799;)Z COMMENT Returns true if this lock can be opened with the key item stack. COMMENT

COMMENT An item stack is a valid key if the stack name matches the key string of this lock, COMMENT or if the key string is empty. - ARG 1 stack - COMMENT the key item stack METHOD method_5473 fromNbt (Lnet/minecraft/class_2487;)Lnet/minecraft/class_1273; COMMENT Creates a new {@code ContainerLock} from the {@code Lock} key of the NBT compound. COMMENT

diff --git a/mappings/net/minecraft/inventory/Inventories.mapping b/mappings/net/minecraft/inventory/Inventories.mapping index bd22e96f7b..8742f29e0e 100644 --- a/mappings/net/minecraft/inventory/Inventories.mapping +++ b/mappings/net/minecraft/inventory/Inventories.mapping @@ -17,7 +17,7 @@ CLASS net/minecraft/class_1262 net/minecraft/inventory/Inventories ARG 2 maxCount ARG 3 dryRun COMMENT whether to return the number of items which would have been removed without actually removing them - METHOD method_5426 writeNbt (Lnet/minecraft/class_2487;Lnet/minecraft/class_2371;)Lnet/minecraft/class_2487; + METHOD method_5426 writeNbt (Lnet/minecraft/class_2487;Lnet/minecraft/class_2371;Lnet/minecraft/class_7225$class_7874;)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 @@ -29,7 +29,7 @@ CLASS net/minecraft/class_1262 net/minecraft/inventory/Inventories 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; + METHOD method_5427 writeNbt (Lnet/minecraft/class_2487;Lnet/minecraft/class_2371;ZLnet/minecraft/class_7225$class_7874;)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 @@ -57,7 +57,7 @@ CLASS net/minecraft/class_1262 net/minecraft/inventory/Inventories COMMENT @return 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 + METHOD method_5429 readNbt (Lnet/minecraft/class_2487;Lnet/minecraft/class_2371;Lnet/minecraft/class_7225$class_7874;)V COMMENT Reads {@code nbt} and sets the elements of {@code stacks} accordingly. COMMENT COMMENT

See {@link #writeNbt(NbtCompound, DefaultedList, boolean)} for the serialization diff --git a/mappings/net/minecraft/inventory/LootableInventory.mapping b/mappings/net/minecraft/inventory/LootableInventory.mapping index e80746c753..cc695d9445 100644 --- a/mappings/net/minecraft/inventory/LootableInventory.mapping +++ b/mappings/net/minecraft/inventory/LootableInventory.mapping @@ -59,7 +59,6 @@ CLASS net/minecraft/class_8934 net/minecraft/inventory/LootableInventory COMMENT the inventory if this returns {@code true}. COMMENT COMMENT @return whether the loot table ID was found - ARG 1 nbt METHOD method_54872 writeLootTable (Lnet/minecraft/class_2487;)Z COMMENT Writes the loot table ID and seed to {@code nbt}, if {@linkplain #getLootTableId COMMENT the loot table ID} is not {@code null}. Implementations should skip writing the diff --git a/mappings/net/minecraft/inventory/SimpleInventory.mapping b/mappings/net/minecraft/inventory/SimpleInventory.mapping index c761ca71b0..8d5ee281ec 100644 --- a/mappings/net/minecraft/inventory/SimpleInventory.mapping +++ b/mappings/net/minecraft/inventory/SimpleInventory.mapping @@ -64,12 +64,11 @@ CLASS net/minecraft/class_1277 net/minecraft/inventory/SimpleInventory 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 + METHOD method_7659 readNbtList (Lnet/minecraft/class_2499;Lnet/minecraft/class_7225$class_7874;)V COMMENT Reads the item stacks from {@code nbtList}. COMMENT COMMENT @see #toNbtList - ARG 1 nbtList - METHOD method_7660 toNbtList ()Lnet/minecraft/class_2499; + METHOD method_7660 toNbtList (Lnet/minecraft/class_7225$class_7874;)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)}, diff --git a/mappings/net/minecraft/item/AnimalArmorItem.mapping b/mappings/net/minecraft/item/AnimalArmorItem.mapping index f9d35e8061..f769aa5160 100644 --- a/mappings/net/minecraft/item/AnimalArmorItem.mapping +++ b/mappings/net/minecraft/item/AnimalArmorItem.mapping @@ -1,15 +1,14 @@ CLASS net/minecraft/class_4059 net/minecraft/item/AnimalArmorItem FIELD field_47823 entityTexture Lnet/minecraft/class_2960; FIELD field_47824 type Lnet/minecraft/class_4059$class_9076; - METHOD (Lnet/minecraft/class_6880;Lnet/minecraft/class_4059$class_9076;Lnet/minecraft/class_1792$class_1793;)V + METHOD (Lnet/minecraft/class_6880;Lnet/minecraft/class_4059$class_9076;ZLnet/minecraft/class_1792$class_1793;)V ARG 1 material ARG 2 type - ARG 3 settings METHOD method_18454 getEntityTexture ()Lnet/minecraft/class_2960; METHOD method_55756 getType ()Lnet/minecraft/class_4059$class_9076; CLASS class_9076 Type FIELD field_47827 textureIdFunction Ljava/util/function/Function; - METHOD (Ljava/lang/String;ILjava/util/function/Function;)V + METHOD (Ljava/lang/String;ILjava/util/function/Function;Lnet/minecraft/class_3414;)V ARG 3 textureIdFunction METHOD method_56686 (Lnet/minecraft/class_2960;)Lnet/minecraft/class_2960; ARG 0 id diff --git a/mappings/net/minecraft/item/ArmorItem.mapping b/mappings/net/minecraft/item/ArmorItem.mapping index c40e188427..a7d352dec3 100644 --- a/mappings/net/minecraft/item/ArmorItem.mapping +++ b/mappings/net/minecraft/item/ArmorItem.mapping @@ -21,9 +21,8 @@ CLASS net/minecraft/class_1738 net/minecraft/item/ArmorItem FIELD field_41938 equipmentSlot Lnet/minecraft/class_1304; FIELD field_41939 name Ljava/lang/String; FIELD field_48839 CODEC Lcom/mojang/serialization/Codec; - METHOD (Ljava/lang/String;ILnet/minecraft/class_1304;Ljava/lang/String;)V + METHOD (Ljava/lang/String;ILnet/minecraft/class_1304;ILjava/lang/String;)V ARG 3 equipmentSlot - ARG 4 name METHOD method_48399 getEquipmentSlot ()Lnet/minecraft/class_1304; METHOD method_48400 getName ()Ljava/lang/String; METHOD method_56690 getMaxDamage (I)I diff --git a/mappings/net/minecraft/item/AxeItem.mapping b/mappings/net/minecraft/item/AxeItem.mapping index 9d1dcd2860..32d233f3db 100644 --- a/mappings/net/minecraft/item/AxeItem.mapping +++ b/mappings/net/minecraft/item/AxeItem.mapping @@ -1,10 +1,5 @@ CLASS net/minecraft/class_1743 net/minecraft/item/AxeItem FIELD field_7898 STRIPPED_BLOCKS Ljava/util/Map; - METHOD (Lnet/minecraft/class_1832;FFLnet/minecraft/class_1792$class_1793;)V - ARG 1 material - ARG 2 attackDamage - ARG 3 attackSpeed - ARG 4 settings METHOD method_34716 getStrippedState (Lnet/minecraft/class_2680;)Ljava/util/Optional; ARG 1 state METHOD method_34717 (Lnet/minecraft/class_2680;Lnet/minecraft/class_2248;)Lnet/minecraft/class_2680; diff --git a/mappings/net/minecraft/item/BannerItem.mapping b/mappings/net/minecraft/item/BannerItem.mapping index 4bbca4e5ca..903bccfde2 100644 --- a/mappings/net/minecraft/item/BannerItem.mapping +++ b/mappings/net/minecraft/item/BannerItem.mapping @@ -4,7 +4,7 @@ CLASS net/minecraft/class_1746 net/minecraft/item/BannerItem ARG 1 bannerBlock ARG 2 wallBannerBlock ARG 3 settings - METHOD method_43707 (Ljava/util/List;Lnet/minecraft/class_1767;Ljava/lang/String;)V + METHOD method_43707 (Ljava/util/List;Lnet/minecraft/class_9307$class_9308;Ljava/lang/String;)V ARG 2 translationKey METHOD method_43708 (Lnet/minecraft/class_5321;)Ljava/lang/String; ARG 0 key diff --git a/mappings/net/minecraft/item/BlockItem.mapping b/mappings/net/minecraft/item/BlockItem.mapping index 5089c904b4..a5ea9a5711 100644 --- a/mappings/net/minecraft/item/BlockItem.mapping +++ b/mappings/net/minecraft/item/BlockItem.mapping @@ -1,20 +1,12 @@ CLASS net/minecraft/class_1747 net/minecraft/item/BlockItem COMMENT Represents an item corresponding to a block. Using this item places a COMMENT block in the world. - FIELD field_30849 BLOCK_ENTITY_TAG_KEY Ljava/lang/String; - FIELD field_30850 BLOCK_STATE_TAG_KEY Ljava/lang/String; FIELD field_7901 block Lnet/minecraft/class_2248; METHOD (Lnet/minecraft/class_2248;Lnet/minecraft/class_1792$class_1793;)V ARG 1 block ARG 2 settings METHOD method_16356 getPlacementContext (Lnet/minecraft/class_1750;)Lnet/minecraft/class_1750; ARG 1 context - METHOD method_18082 (Lnet/minecraft/class_2680;Lnet/minecraft/class_2769;Ljava/lang/Comparable;)Lnet/minecraft/class_2680; - ARG 2 value - METHOD method_18083 with (Lnet/minecraft/class_2680;Lnet/minecraft/class_2769;Ljava/lang/String;)Lnet/minecraft/class_2680; - ARG 0 state - ARG 1 property - ARG 2 name METHOD method_18084 placeFromNbt (Lnet/minecraft/class_2338;Lnet/minecraft/class_1937;Lnet/minecraft/class_1799;Lnet/minecraft/class_2680;)Lnet/minecraft/class_2680; ARG 1 pos ARG 2 world @@ -23,12 +15,6 @@ CLASS net/minecraft/class_1747 net/minecraft/item/BlockItem METHOD method_19260 getPlaceSound (Lnet/minecraft/class_2680;)Lnet/minecraft/class_3414; ARG 1 state METHOD method_20360 checkStatePlacement ()Z - METHOD method_38072 getBlockEntityNbt (Lnet/minecraft/class_1799;)Lnet/minecraft/class_2487; - ARG 0 stack - METHOD method_38073 setBlockEntityNbt (Lnet/minecraft/class_1799;Lnet/minecraft/class_2591;Lnet/minecraft/class_2487;)V - ARG 0 stack - ARG 1 blockEntityType - ARG 2 tag METHOD method_7707 getPlacementState (Lnet/minecraft/class_1750;)Lnet/minecraft/class_2680; ARG 1 context METHOD method_7708 place (Lnet/minecraft/class_1750;Lnet/minecraft/class_2680;)Z diff --git a/mappings/net/minecraft/item/BlockPredicatesChecker.mapping b/mappings/net/minecraft/item/BlockPredicatesChecker.mapping index 9fcca36f3d..8d7b13852d 100644 --- a/mappings/net/minecraft/item/BlockPredicatesChecker.mapping +++ b/mappings/net/minecraft/item/BlockPredicatesChecker.mapping @@ -8,20 +8,12 @@ CLASS net/minecraft/class_6538 net/minecraft/item/BlockPredicatesChecker COMMENT COMMENT @apiNote This is used to implement checks for restrictions specified COMMENT using {@code CanPlaceOn} or {@code CanDestroy}. - FIELD field_34449 key Ljava/lang/String; FIELD field_34450 cachedPos Lnet/minecraft/class_2694; FIELD field_34451 lastResult Z FIELD field_34452 nbtAware Z - METHOD (Ljava/lang/String;)V - ARG 1 key - COMMENT the sub NBT key that stores the predicate, for - COMMENT example {@code "CanPlaceOn"} - METHOD method_38070 check (Lnet/minecraft/class_1799;Lnet/minecraft/class_2378;Lnet/minecraft/class_2694;)Z + METHOD method_38070 check (Lnet/minecraft/class_2694;)Z COMMENT {@return true if any of the predicates in the {@code stack}'s NBT COMMENT matched against the block at {@code pos}, false otherwise} - ARG 1 stack - ARG 2 blockRegistry - ARG 3 pos METHOD method_38071 canUseCache (Lnet/minecraft/class_2694;Lnet/minecraft/class_2694;Z)Z ARG 0 pos ARG 1 cachedPos diff --git a/mappings/net/minecraft/item/BundleItem.mapping b/mappings/net/minecraft/item/BundleItem.mapping index 4c090d6cd0..e5c14d923a 100644 --- a/mappings/net/minecraft/item/BundleItem.mapping +++ b/mappings/net/minecraft/item/BundleItem.mapping @@ -1,31 +1,10 @@ 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 - ARG 0 bundle - ARG 1 stack METHOD method_31561 getAmountFilled (Lnet/minecraft/class_1799;)F ARG 0 stack - METHOD method_31562 getItemOccupancy (Lnet/minecraft/class_1799;)I - ARG 0 stack - METHOD method_31563 getBundleOccupancy (Lnet/minecraft/class_1799;)I - ARG 0 stack - METHOD method_32344 canMergeStack (Lnet/minecraft/class_1799;Lnet/minecraft/class_2499;)Ljava/util/Optional; - ARG 0 stack - ARG 1 items - METHOD method_32345 getBundledStacks (Lnet/minecraft/class_1799;)Ljava/util/stream/Stream; - ARG 0 stack METHOD method_32757 dropAllBundledItems (Lnet/minecraft/class_1799;Lnet/minecraft/class_1657;)Z ARG 0 stack ARG 1 player - METHOD method_32758 (Lnet/minecraft/class_1799;Lnet/minecraft/class_1735;Lnet/minecraft/class_1799;)V - ARG 2 removedStack - METHOD method_32759 removeFirstStack (Lnet/minecraft/class_1799;)Ljava/util/Optional; - ARG 0 stack METHOD method_38074 playRemoveOneSound (Lnet/minecraft/class_1297;)V ARG 1 entity METHOD method_38076 playInsertSound (Lnet/minecraft/class_1297;)V diff --git a/mappings/net/minecraft/item/CompassItem.mapping b/mappings/net/minecraft/item/CompassItem.mapping index e7cfc996e2..906891ee76 100644 --- a/mappings/net/minecraft/item/CompassItem.mapping +++ b/mappings/net/minecraft/item/CompassItem.mapping @@ -1,17 +1,3 @@ CLASS net/minecraft/class_1759 net/minecraft/item/CompassItem - FIELD field_24670 LOGGER Lorg/slf4j/Logger; - FIELD field_30860 LODESTONE_POS_KEY Ljava/lang/String; - FIELD field_30861 LODESTONE_DIMENSION_KEY Ljava/lang/String; - FIELD field_30862 LODESTONE_TRACKED_KEY Ljava/lang/String; - METHOD method_26364 getLodestoneDimension (Lnet/minecraft/class_2487;)Ljava/util/Optional; - ARG 0 nbt - METHOD method_26365 hasLodestone (Lnet/minecraft/class_1799;)Z - ARG 0 stack - METHOD method_27315 writeNbt (Lnet/minecraft/class_5321;Lnet/minecraft/class_2338;Lnet/minecraft/class_2487;)V - ARG 1 worldKey - ARG 2 pos - ARG 3 nbt METHOD method_43123 createSpawnPos (Lnet/minecraft/class_1937;)Lnet/minecraft/class_4208; ARG 0 world - METHOD method_43124 createLodestonePos (Lnet/minecraft/class_2487;)Lnet/minecraft/class_4208; - ARG 0 nbt diff --git a/mappings/net/minecraft/item/CrossbowItem.mapping b/mappings/net/minecraft/item/CrossbowItem.mapping index 389b1c6811..7d43a36cc1 100644 --- a/mappings/net/minecraft/item/CrossbowItem.mapping +++ b/mappings/net/minecraft/item/CrossbowItem.mapping @@ -1,7 +1,5 @@ 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_30867 CHARGE_PROGRESS F FIELD field_30868 LOAD_PROGRESS F @@ -9,70 +7,24 @@ CLASS net/minecraft/class_1764 net/minecraft/item/CrossbowItem 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; - ARG 0 world - ARG 1 entity - ARG 2 crossbow - ARG 3 arrow - METHOD method_20309 getSpeed (Lnet/minecraft/class_1799;)F + METHOD method_20309 getSpeed (Lnet/minecraft/class_9278;)F ARG 0 stack - METHOD method_7763 shoot (Lnet/minecraft/class_1937;Lnet/minecraft/class_1309;Lnet/minecraft/class_1268;Lnet/minecraft/class_1799;Lnet/minecraft/class_1799;FZFFF)V - ARG 0 world + METHOD method_7763 (Lnet/minecraft/class_1309;Lnet/minecraft/class_1676;IFFFLnet/minecraft/class_1309;)V ARG 1 shooter - ARG 2 hand - ARG 3 crossbow - ARG 4 projectile ARG 5 soundPitch - ARG 6 creative - ARG 7 speed - ARG 8 divergence - ARG 9 simulated - METHOD method_7765 loadProjectile (Lnet/minecraft/class_1309;Lnet/minecraft/class_1799;Lnet/minecraft/class_1799;ZZ)Z - ARG 0 shooter - ARG 1 crossbow - ARG 2 projectile - ARG 3 simulated - ARG 4 creative - METHOD method_7766 clearProjectiles (Lnet/minecraft/class_1799;)V - ARG 0 crossbow METHOD method_7767 loadProjectiles (Lnet/minecraft/class_1309;Lnet/minecraft/class_1799;)Z ARG 0 shooter 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 - ARG 0 world - ARG 1 entity - ARG 2 stack METHOD method_7770 getPullProgress (ILnet/minecraft/class_1799;)F ARG 0 useTicks ARG 1 stack - METHOD method_7772 hasProjectile (Lnet/minecraft/class_1799;Lnet/minecraft/class_1792;)Z - ARG 0 crossbow - ARG 1 projectile METHOD method_7773 getQuickChargeSound (I)Lnet/minecraft/class_3414; ARG 1 stage METHOD method_7775 getPullTime (Lnet/minecraft/class_1799;)I ARG 0 stack - METHOD method_7777 shootAll (Lnet/minecraft/class_1937;Lnet/minecraft/class_1309;Lnet/minecraft/class_1268;Lnet/minecraft/class_1799;FF)V - ARG 0 world - ARG 1 entity - ARG 2 hand - ARG 3 stack - ARG 4 speed - ARG 5 divergence - METHOD method_7778 putProjectile (Lnet/minecraft/class_1799;Lnet/minecraft/class_1799;)V - ARG 0 crossbow - ARG 1 projectile - METHOD method_7780 getSoundPitches (Lnet/minecraft/class_5819;)[F - ARG 0 random + METHOD method_7777 shootAll (Lnet/minecraft/class_1937;Lnet/minecraft/class_1309;Lnet/minecraft/class_1268;Lnet/minecraft/class_1799;FFLnet/minecraft/class_1309;)V METHOD method_7781 isCharged (Lnet/minecraft/class_1799;)Z ARG 0 stack - METHOD method_7782 setCharged (Lnet/minecraft/class_1799;Z)V - ARG 0 stack - ARG 1 charged METHOD method_7784 getSoundPitch (ZLnet/minecraft/class_5819;)F ARG 0 flag ARG 1 random - METHOD method_7785 getProjectiles (Lnet/minecraft/class_1799;)Ljava/util/List; - ARG 0 crossbow diff --git a/mappings/net/minecraft/item/DyeableItem.mapping b/mappings/net/minecraft/item/DyeableItem.mapping deleted file mode 100644 index 7136144b63..0000000000 --- a/mappings/net/minecraft/item/DyeableItem.mapping +++ /dev/null @@ -1,16 +0,0 @@ -CLASS net/minecraft/class_1768 net/minecraft/item/DyeableItem - FIELD field_30871 DISPLAY_KEY Ljava/lang/String; - FIELD field_30872 DEFAULT_COLOR I - FIELD field_30873 COLOR_KEY Ljava/lang/String; - METHOD method_19261 blendAndSetColor (Lnet/minecraft/class_1799;Ljava/util/List;)Lnet/minecraft/class_1799; - ARG 0 stack - ARG 1 colors - METHOD method_7798 removeColor (Lnet/minecraft/class_1799;)V - ARG 0 stack - METHOD method_7799 setColor (Lnet/minecraft/class_1799;I)V - ARG 0 stack - ARG 1 color - METHOD method_7800 getColor (Lnet/minecraft/class_1799;)I - ARG 0 stack - METHOD method_7801 hasColor (Lnet/minecraft/class_1799;)Z - ARG 0 stack diff --git a/mappings/net/minecraft/item/EnchantedBookItem.mapping b/mappings/net/minecraft/item/EnchantedBookItem.mapping index e2f084d152..2ea37b1914 100644 --- a/mappings/net/minecraft/item/EnchantedBookItem.mapping +++ b/mappings/net/minecraft/item/EnchantedBookItem.mapping @@ -1,9 +1,3 @@ CLASS net/minecraft/class_1772 net/minecraft/item/EnchantedBookItem - FIELD field_30874 STORED_ENCHANTMENTS_KEY Ljava/lang/String; - METHOD method_7806 getEnchantmentNbt (Lnet/minecraft/class_1799;)Lnet/minecraft/class_2499; - ARG 0 stack - METHOD method_7807 addEnchantment (Lnet/minecraft/class_1799;Lnet/minecraft/class_1889;)V - ARG 0 stack - ARG 1 entry METHOD method_7808 forEnchantment (Lnet/minecraft/class_1889;)Lnet/minecraft/class_1799; ARG 0 info diff --git a/mappings/net/minecraft/item/EnchantedGoldenAppleItem.mapping b/mappings/net/minecraft/item/EnchantedGoldenAppleItem.mapping deleted file mode 100644 index 6129d827b7..0000000000 --- a/mappings/net/minecraft/item/EnchantedGoldenAppleItem.mapping +++ /dev/null @@ -1 +0,0 @@ -CLASS net/minecraft/class_1775 net/minecraft/item/EnchantedGoldenAppleItem diff --git a/mappings/net/minecraft/item/FilledMapItem.mapping b/mappings/net/minecraft/item/FilledMapItem.mapping index 6cc7322de0..a3ca26ba41 100644 --- a/mappings/net/minecraft/item/FilledMapItem.mapping +++ b/mappings/net/minecraft/item/FilledMapItem.mapping @@ -1,14 +1,7 @@ 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_17442 copyMap (Lnet/minecraft/class_1937;Lnet/minecraft/class_1799;)V ARG 0 world ARG 1 stack - METHOD method_32348 setMapId (Lnet/minecraft/class_1799;Lnet/minecraft/class_9209;)V - ARG 0 stack - ARG 1 id METHOD method_32349 allocateMapId (Lnet/minecraft/class_1937;IIIZZLnet/minecraft/class_5321;)Lnet/minecraft/class_9209; ARG 0 world ARG 1 x @@ -23,16 +16,13 @@ CLASS net/minecraft/class_1806 net/minecraft/item/FilledMapItem ARG 2 z METHOD method_53836 getIdText (Lnet/minecraft/class_9209;)Lnet/minecraft/class_2561; ARG 0 id - METHOD method_53837 getIdText (Lnet/minecraft/class_1799;)Lnet/minecraft/class_2561; - ARG 0 stack METHOD method_7995 getFluidStateIfVisible (Lnet/minecraft/class_1937;Lnet/minecraft/class_2680;Lnet/minecraft/class_2338;)Lnet/minecraft/class_2680; ARG 1 world ARG 2 state ARG 3 pos - METHOD method_7996 scale (Lnet/minecraft/class_1799;Lnet/minecraft/class_1937;I)V + METHOD method_7996 scale (Lnet/minecraft/class_1799;Lnet/minecraft/class_1937;)V ARG 0 map ARG 1 world - ARG 2 amount METHOD method_7997 getMapState (Lnet/minecraft/class_9209;Lnet/minecraft/class_1937;)Lnet/minecraft/class_22; ARG 0 id ARG 1 world @@ -40,25 +30,12 @@ CLASS net/minecraft/class_1806 net/minecraft/item/FilledMapItem ARG 1 world ARG 2 entity ARG 3 state - METHOD method_7999 getMapColor (Lnet/minecraft/class_1799;)I - ARG 0 stack - METHOD method_8000 createMapState (Lnet/minecraft/class_1799;Lnet/minecraft/class_1937;IIIZZLnet/minecraft/class_5321;)V - ARG 0 stack - ARG 1 world - ARG 2 x - ARG 3 z - ARG 4 scale - ARG 5 showIcons - ARG 6 unlimitedTracking - ARG 7 dimension 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 ARG 0 world ARG 1 map - METHOD method_8003 getMapId (Lnet/minecraft/class_1799;)Lnet/minecraft/class_9209; - ARG 0 stack METHOD method_8005 createMap (Lnet/minecraft/class_1937;IIBZZ)Lnet/minecraft/class_1799; ARG 0 world ARG 1 x diff --git a/mappings/net/minecraft/item/FireworkRocketItem.mapping b/mappings/net/minecraft/item/FireworkRocketItem.mapping index d2e234ab57..5689950038 100644 --- a/mappings/net/minecraft/item/FireworkRocketItem.mapping +++ b/mappings/net/minecraft/item/FireworkRocketItem.mapping @@ -1,26 +1,3 @@ CLASS net/minecraft/class_1781 net/minecraft/item/FireworkRocketItem - FIELD field_30875 FIREWORKS_KEY Ljava/lang/String; - FIELD field_30876 EXPLOSION_KEY Ljava/lang/String; - FIELD field_30877 EXPLOSIONS_KEY Ljava/lang/String; - FIELD field_30878 FLIGHT_KEY Ljava/lang/String; - FIELD field_30879 TYPE_KEY Ljava/lang/String; - FIELD field_30880 TRAIL_KEY Ljava/lang/String; - 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 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_7816 getId ()I diff --git a/mappings/net/minecraft/item/FireworkStarItem.mapping b/mappings/net/minecraft/item/FireworkStarItem.mapping index da8bb1c963..19c3c72276 100644 --- a/mappings/net/minecraft/item/FireworkStarItem.mapping +++ b/mappings/net/minecraft/item/FireworkStarItem.mapping @@ -1,9 +1 @@ CLASS net/minecraft/class_1780 net/minecraft/item/FireworkStarItem - METHOD method_7809 appendFireworkTooltip (Lnet/minecraft/class_2487;Ljava/util/List;)V - ARG 0 nbt - ARG 1 tooltip - METHOD method_7810 getColorText (I)Lnet/minecraft/class_2561; - ARG 0 color - METHOD method_7811 appendColors (Lnet/minecraft/class_5250;[I)Lnet/minecraft/class_2561; - ARG 0 line - ARG 1 colors diff --git a/mappings/net/minecraft/item/GoatHornItem.mapping b/mappings/net/minecraft/item/GoatHornItem.mapping index d3994b6af1..5470b260a1 100644 --- a/mappings/net/minecraft/item/GoatHornItem.mapping +++ b/mappings/net/minecraft/item/GoatHornItem.mapping @@ -1,5 +1,4 @@ CLASS net/minecraft/class_7430 net/minecraft/item/GoatHornItem - FIELD field_39052 INSTRUMENT_KEY Ljava/lang/String; FIELD field_39123 instrumentTag Lnet/minecraft/class_6862; METHOD (Lnet/minecraft/class_1792$class_1793;Lnet/minecraft/class_6862;)V ARG 1 settings @@ -7,9 +6,6 @@ CLASS net/minecraft/class_7430 net/minecraft/item/GoatHornItem METHOD method_43558 getStackForInstrument (Lnet/minecraft/class_1792;Lnet/minecraft/class_6880;)Lnet/minecraft/class_1799; ARG 0 item ARG 1 instrument - METHOD method_43561 setInstrument (Lnet/minecraft/class_1799;Lnet/minecraft/class_6880;)V - ARG 0 stack - ARG 1 instrument METHOD method_43562 setRandomInstrumentFromTag (Lnet/minecraft/class_1799;Lnet/minecraft/class_6862;Lnet/minecraft/class_5819;)V ARG 0 stack ARG 1 instrumentTag diff --git a/mappings/net/minecraft/item/HoeItem.mapping b/mappings/net/minecraft/item/HoeItem.mapping index 449cbf3d51..5b925fb877 100644 --- a/mappings/net/minecraft/item/HoeItem.mapping +++ b/mappings/net/minecraft/item/HoeItem.mapping @@ -4,11 +4,6 @@ CLASS net/minecraft/class_1794 net/minecraft/item/HoeItem COMMENT COMMENT

Tilling works so that if the predicate succeeds, the consumer (the real action) COMMENT is executed, and the hoe is damaged. - METHOD (Lnet/minecraft/class_1832;IFLnet/minecraft/class_1792$class_1793;)V - ARG 1 material - ARG 2 attackDamage - ARG 3 attackSpeed - ARG 4 settings METHOD method_36984 (Lnet/minecraft/class_2680;Lnet/minecraft/class_1838;)V ARG 1 context METHOD method_36985 createTillAndDropAction (Lnet/minecraft/class_2680;Lnet/minecraft/class_1935;)Ljava/util/function/Consumer; diff --git a/mappings/net/minecraft/item/Item.mapping b/mappings/net/minecraft/item/Item.mapping index 3e31438763..6511ead0bd 100644 --- a/mappings/net/minecraft/item/Item.mapping +++ b/mappings/net/minecraft/item/Item.mapping @@ -259,11 +259,10 @@ 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_7860 postProcessNbt (Lnet/minecraft/class_2487;)V + METHOD method_7860 postProcessNbt (Lnet/minecraft/class_1799;)V COMMENT Processes the NBT applied to an item stack of this item. COMMENT COMMENT

This is only used in vanilla to process player head NBT data. - ARG 1 nbt METHOD method_7861 finishUsing (Lnet/minecraft/class_1799;Lnet/minecraft/class_1937;Lnet/minecraft/class_1309;)Lnet/minecraft/class_1799; COMMENT Called when an entity finishes using the item, such as eating food or drinking a potion. COMMENT This method handles eating food by default. @@ -387,10 +386,6 @@ CLASS net/minecraft/class_1792 net/minecraft/item/Item COMMENT COMMENT

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

If an item is damageable, this method is ignored and data is always synced to client. METHOD method_7888 inventoryTick (Lnet/minecraft/class_1799;Lnet/minecraft/class_1937;Lnet/minecraft/class_1297;IZ)V COMMENT Called on both the client and the server every tick if the item is in the player's inventory. COMMENT diff --git a/mappings/net/minecraft/item/ItemGroups.mapping b/mappings/net/minecraft/item/ItemGroups.mapping index 84b5ef558f..da19e53f06 100644 --- a/mappings/net/minecraft/item/ItemGroups.mapping +++ b/mappings/net/minecraft/item/ItemGroups.mapping @@ -82,8 +82,6 @@ CLASS net/minecraft/class_7706 net/minecraft/item/ItemGroups 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 diff --git a/mappings/net/minecraft/item/ItemStack.mapping b/mappings/net/minecraft/item/ItemStack.mapping index 7298e61687..73e9069f04 100644 --- a/mappings/net/minecraft/item/ItemStack.mapping +++ b/mappings/net/minecraft/item/ItemStack.mapping @@ -80,39 +80,13 @@ CLASS net/minecraft/class_1799 net/minecraft/item/ItemStack COMMENT COMMENT COMMENT - FIELD field_24092 LORE_STYLE Lnet/minecraft/class_2583; FIELD field_24093 holder Lnet/minecraft/class_1297; FIELD field_24671 CODEC Lcom/mojang/serialization/Codec; - FIELD field_30890 ENCHANTMENTS_KEY Ljava/lang/String; - COMMENT The key of the enchantments in an item stack's custom NBT, whose value is {@value}. - FIELD field_30893 DISPLAY_KEY Ljava/lang/String; - COMMENT The key of the display NBT in an item stack's custom NBT, whose value is {@value}. - FIELD field_30894 NAME_KEY Ljava/lang/String; - COMMENT The key of the item stack's name in the {@linkplain #DISPLAY_KEY display NBT}, whose value is {@value}. - FIELD field_30895 LORE_KEY Ljava/lang/String; - COMMENT The key of the item stack's lore in the {@linkplain #DISPLAY_KEY display NBT}, whose value is {@value}. - FIELD field_30896 DAMAGE_KEY Ljava/lang/String; - COMMENT The key of the damage in an item stack's custom NBT, whose value is {@value}. - FIELD field_30897 COLOR_KEY Ljava/lang/String; - COMMENT The key of the item's color in the {@linkplain #DISPLAY_KEY display NBT}, whose value is {@value}. - FIELD field_30898 UNBREAKABLE_KEY Ljava/lang/String; - COMMENT The key of the unbreakable boolean in an item stack's custom NBT, whose value is {@value}. - FIELD field_30899 REPAIR_COST_KEY Ljava/lang/String; - COMMENT The key of the repair cost in an item stack's custom NBT, whose value is {@value}. - FIELD field_30900 CAN_DESTROY_KEY Ljava/lang/String; - FIELD field_30901 CAN_PLACE_ON_KEY Ljava/lang/String; - 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_47308 ADVANCEMENT_DISPLAY_CODEC Lcom/mojang/serialization/Codec; FIELD field_47309 RECIPE_RESULT_CODEC Lcom/mojang/serialization/Codec; - FIELD field_47310 INGREDIENT_ENTRY_CODEC Lcom/mojang/serialization/Codec; - FIELD field_47311 CUTTING_RECIPE_RESULT_CODEC Lcom/mojang/serialization/MapCodec; FIELD field_47312 ITEM_CODEC Lcom/mojang/serialization/Codec; FIELD field_48349 PACKET_CODEC Lnet/minecraft/class_9139; FIELD field_48350 LIST_PACKET_CODEC Lnet/minecraft/class_9139; - 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; @@ -123,12 +97,6 @@ CLASS net/minecraft/class_1799 net/minecraft/item/ItemStack COMMENT COMMENT @see ItemStack#isEmpty FIELD field_8038 item Lnet/minecraft/class_1792; - FIELD field_8040 nbt Lnet/minecraft/class_2487; - COMMENT Represents the item stack's custom NBT. - COMMENT

- COMMENT Stored at the key {@code tag} in the serialized item stack NBT. - COMMENT - COMMENT @see Item Stack NBT Operations METHOD (Ljava/lang/Void;)V ARG 1 v METHOD (Lnet/minecraft/class_1935;)V @@ -136,27 +104,17 @@ CLASS net/minecraft/class_1799 net/minecraft/item/ItemStack METHOD (Lnet/minecraft/class_1935;I)V ARG 1 item ARG 2 count - METHOD (Lnet/minecraft/class_2487;)V - ARG 1 nbt METHOD (Lnet/minecraft/class_6880;)V ARG 1 entry METHOD (Lnet/minecraft/class_6880;I)V ARG 1 itemEntry ARG 2 count - METHOD (Lnet/minecraft/class_6880;ILjava/util/Optional;)V + METHOD (Lnet/minecraft/class_6880;ILnet/minecraft/class_9326;)V ARG 1 item ARG 2 count - ARG 3 nbt - METHOD method_17869 (Ljava/util/List;Lnet/minecraft/class_2487;Lnet/minecraft/class_1887;)V - ARG 2 e - METHOD method_17870 appendEnchantments (Ljava/util/List;Lnet/minecraft/class_2499;)V - ARG 0 tooltip - ARG 1 enchantments METHOD method_19267 isFood ()Z METHOD method_21832 getDrinkSound ()Lnet/minecraft/class_3414; METHOD method_21833 getEatSound ()Lnet/minecraft/class_3414; - METHOD method_26963 (Ljava/text/DecimalFormat;)V - ARG 0 decimalFormat METHOD method_27319 getHolder ()Lnet/minecraft/class_1297; COMMENT {@return the entity that holds the stack, or {@code null} if inapplicable} COMMENT @@ -172,18 +130,6 @@ CLASS net/minecraft/class_1799 net/minecraft/item/ItemStack COMMENT @see #isInFrame COMMENT @see #getFrame COMMENT @see #getHolder - ARG 1 holder - METHOD method_28376 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; - ARG 0 instance - METHOD method_28377 (Lnet/minecraft/class_1799;)Ljava/util/Optional; - 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. - ARG 0 flags - ARG 1 tooltipSection - METHOD method_30268 addHideFlag (Lnet/minecraft/class_1799$class_5422;)V - ARG 1 tooltipSection METHOD method_31573 isIn (Lnet/minecraft/class_6862;)Z COMMENT {@return whether the item is in {@code tag}} ARG 1 tag @@ -252,28 +198,8 @@ CLASS net/minecraft/class_1799 net/minecraft/item/ItemStack ARG 1 registryEntryList METHOD method_54466 onCraftByCrafter (Lnet/minecraft/class_1937;)V ARG 1 world - METHOD method_55062 (Lnet/minecraft/class_1799;)Ljava/util/Optional; - ARG 0 stack - METHOD method_55063 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; - ARG 0 instance - METHOD method_55064 (Lnet/minecraft/class_6880;Ljava/util/Optional;)Lnet/minecraft/class_1799; - ARG 0 itemEntry - ARG 1 nbt - METHOD method_55065 (Lnet/minecraft/class_1792;)Lcom/mojang/serialization/DataResult; - ARG 0 item METHOD method_55066 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; ARG 0 instance - METHOD method_55067 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; - ARG 0 instance - METHOD method_56098 isUnbreakable ()Z - COMMENT {@return whether the item stack can never be broken} - COMMENT - COMMENT

Item stacks with {@value #UNBREAKABLE_KEY} NBT set to {@code 1b} cannot be damaged. - COMMENT - COMMENT @see Item#getMaxDamage - COMMENT @see #isDamaged - COMMENT @see #getDamage - COMMENT @see #isDamageable METHOD method_56700 (Lnet/minecraft/class_1799;)Ljava/util/Optional; ARG 0 stack METHOD method_56701 copyNbtToNewStack (Lnet/minecraft/class_1935;I)Lnet/minecraft/class_1799; @@ -312,15 +238,6 @@ CLASS net/minecraft/class_1799 net/minecraft/item/ItemStack METHOD method_7910 finishUsing (Lnet/minecraft/class_1937;Lnet/minecraft/class_1309;)Lnet/minecraft/class_1799; ARG 1 world ARG 2 user - METHOD method_7911 getOrCreateSubNbt (Ljava/lang/String;)Lnet/minecraft/class_2487; - COMMENT {@return the compound NBT at the specified key in this item stack's NBT, or a - COMMENT new compound added to the stack if absent} - COMMENT - COMMENT

This should not be used when reading the NBT, as this can modify the item stack. - COMMENT Use {@link #getSubNbt} with a check for {@code null} instead. - COMMENT - COMMENT @see Item Stack NBT Operations - ARG 1 key METHOD method_7912 setBobbingAnimationTime (I)V ARG 1 bobbingAnimationTime METHOD method_7913 use (Lnet/minecraft/class_1937;Lnet/minecraft/class_1657;Lnet/minecraft/class_1268;)Lnet/minecraft/class_1271; @@ -328,19 +245,6 @@ CLASS net/minecraft/class_1799 net/minecraft/item/ItemStack ARG 2 user ARG 3 hand METHOD method_7914 getMaxCount ()I - METHOD method_7915 fromNbt (Lnet/minecraft/class_2487;)Lnet/minecraft/class_1799; - COMMENT {@return the item stack deserialized from the NBT, or {@link #EMPTY} if - COMMENT it fails to deserialize} - COMMENT - COMMENT @see Item Stack NBT Operations - ARG 0 nbt - METHOD method_7916 addAttributeModifier (Lnet/minecraft/class_6880;Lnet/minecraft/class_1322;Lnet/minecraft/class_1304;)V - COMMENT Adds an attribute modifier to this stack. - COMMENT - COMMENT @see #getAttributeModifiers - ARG 1 attribute - ARG 2 modifier - ARG 3 slot METHOD method_7917 inventoryTick (Lnet/minecraft/class_1937;Lnet/minecraft/class_1297;IZ)V ARG 1 world ARG 2 entity @@ -360,15 +264,6 @@ CLASS net/minecraft/class_1799 net/minecraft/item/ItemStack ARG 1 user ARG 2 entity ARG 3 hand - METHOD method_7921 getEnchantments ()Lnet/minecraft/class_2499; - COMMENT {@return an NBT list of enchantments} - COMMENT - COMMENT

This will return an empty list for enchanted books, as the book itself is not - COMMENT enchanted and therefore does not store enchantments under {@value #ENCHANTMENTS_KEY} key. - COMMENT - COMMENT @see net.minecraft.enchantment.EnchantmentHelper#getLevel - COMMENT @see #addEnchantment - COMMENT @see #hasEnchantments METHOD method_7922 getTranslationKey ()Ljava/lang/String; METHOD method_7923 isEnchantable ()Z COMMENT {@return whether this item stack can be enchanted with an enchanting table} @@ -376,31 +271,6 @@ CLASS net/minecraft/class_1799 net/minecraft/item/ItemStack COMMENT

This is not used for other methods of enchanting like anvils. METHOD method_7924 getMiningSpeedMultiplier (Lnet/minecraft/class_2680;)F ARG 1 state - METHOD method_7925 removeCustomName ()V - COMMENT Removes the custom name and other NBT compounds that are now empty after the - COMMENT removal of the custom name from this item stack. - COMMENT - COMMENT @see #setCustomName - COMMENT @see #hasCustomName - METHOD method_7926 getAttributeModifiers (Lnet/minecraft/class_1304;)Lcom/google/common/collect/Multimap; - COMMENT {@return a multimap of attribute modifiers for {@code slot}} - COMMENT - COMMENT

If a custom attribute modifier exists under the {@code AttributeModifiers} key, - COMMENT this returns those modifiers only; otherwise, this returns the item's default - COMMENT attribute modifier. - COMMENT - COMMENT @see Item#getAttributeModifiers - COMMENT @see #addAttributeModifier - ARG 1 slot - METHOD method_7927 setRepairCost (I)V - COMMENT Sets the stack's repair cost used in anvils to {@code repairCost}. - COMMENT - COMMENT

This is the the value of the {@value #REPAIR_COST_KEY} key in NBT. - ARG 1 repairCost - METHOD method_7928 getRepairCost ()I - 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_7930 onStoppedUsing (Lnet/minecraft/class_1937;Lnet/minecraft/class_1309;I)V ARG 1 world ARG 2 user @@ -416,25 +286,10 @@ CLASS net/minecraft/class_1799 net/minecraft/item/ItemStack COMMENT the amount to decrement METHOD method_7935 getMaxUseTime ()I METHOD method_7936 getMaxDamage ()I - METHOD method_7937 parseBlockTag (Ljava/lang/String;)Ljava/util/Collection; - ARG 0 tag - METHOD method_7938 hasCustomName ()Z - COMMENT {@return whether this item stack has a custom name} - COMMENT - COMMENT @see #setCustomName - COMMENT @see #removeCustomName METHOD method_7939 setCount (I)V COMMENT Sets the count of items in this item stack. ARG 1 count COMMENT the count of items - METHOD method_7940 canDestroy (Lnet/minecraft/class_2378;Lnet/minecraft/class_2694;)Z - ARG 1 blockRegistry - ARG 2 pos - METHOD method_7941 getSubNbt (Ljava/lang/String;)Lnet/minecraft/class_2487; - COMMENT {@return the NBT compound at the specified key in this item stack's custom NBT, may be {@code null}} - COMMENT - COMMENT @see Item Stack NBT Operations - ARG 1 key METHOD method_7942 hasEnchantments ()Z COMMENT {@return whether the item stack has any enchantments} COMMENT @@ -442,9 +297,6 @@ CLASS net/minecraft/class_1799 net/minecraft/item/ItemStack COMMENT enchanted and therefore does not store enchantments under {@value #ENCHANTMENTS_KEY} key. COMMENT COMMENT @see #getEnchantments - METHOD method_7944 canPlaceOn (Lnet/minecraft/class_2378;Lnet/minecraft/class_2694;)Z - ARG 1 blockRegistry - ARG 2 pos METHOD method_7945 getFrame ()Lnet/minecraft/class_1533; COMMENT {@return the item frame that holds the stack, or {@code null} if inapplicable} COMMENT @@ -458,16 +310,6 @@ CLASS net/minecraft/class_1799 net/minecraft/item/ItemStack COMMENT than {@code 1} and cannot be damaged. METHOD method_7947 getCount ()I COMMENT {@return the count of items in this item stack} - METHOD method_7948 getOrCreateNbt ()Lnet/minecraft/class_2487; - COMMENT Returns the custom NBT of this item stack, or creates the custom NBT if the - COMMENT item stack did not have a custom NBT previously, mutating the stack. - COMMENT - COMMENT

This should not be used when reading the NBT, as this can modify the item stack. - COMMENT Use {@link #getNbt} with a check for {@code null} instead. - COMMENT - COMMENT @return the custom NBT of this item stack - COMMENT - COMMENT @see Item Stack NBT Operations METHOD method_7949 usageTick (Lnet/minecraft/class_1937;Lnet/minecraft/class_1309;I)V ARG 1 world ARG 2 user @@ -489,13 +331,6 @@ CLASS net/minecraft/class_1799 net/minecraft/item/ItemStack ARG 2 state ARG 3 pos ARG 4 miner - METHOD method_7953 writeNbt (Lnet/minecraft/class_2487;)Lnet/minecraft/class_2487; - COMMENT Writes the serialized item stack into the given {@link NbtCompound}. - COMMENT - COMMENT @return the written NBT compound - COMMENT @see Item Stack NBT Operations - ARG 1 nbt - COMMENT the NBT compound to write to METHOD method_7954 toHoverableText ()Lnet/minecraft/class_2561; COMMENT {@return a text consisting of the bracketed {@linkplain #getName stack name} that COMMENT can be hovered to show the item stack's tooltip} @@ -518,14 +353,6 @@ CLASS net/minecraft/class_1799 net/minecraft/item/ItemStack ARG 4 breakCallback COMMENT a callback run when the item "breaks" 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. - COMMENT - COMMENT @see Item Stack NBT Operations - ARG 1 key - COMMENT the key where to put the given {@link NbtElement} - ARG 2 element - COMMENT the NBT element to put METHOD method_7960 isEmpty ()Z COMMENT {@return whether this item stack is empty} METHOD method_7961 isInFrame ()Z @@ -550,10 +377,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_7969 getNbt ()Lnet/minecraft/class_2487; - COMMENT {@return the custom NBT of this item stack, may be {@code null}} - COMMENT - COMMENT @see Item Stack NBT Operations METHOD method_7970 damage (ILnet/minecraft/class_1309;Lnet/minecraft/class_1304;)V COMMENT Damages this item stack. This method should be used when an entity, including a player, COMMENT damages the stack. This does not damage {@linkplain #isDamageable non-damageable} @@ -617,16 +440,6 @@ CLASS net/minecraft/class_1799 net/minecraft/item/ItemStack COMMENT @see #damage(int, LivingEntity, EquipmentSlot) ARG 1 damage 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 - COMMENT passed, this will remove the custom name (but does not remove other NBT compounds - COMMENT even if they are empty). - COMMENT - COMMENT @return this item stack - COMMENT - COMMENT @see #removeCustomName - COMMENT @see #hasCustomName - ARG 1 name METHOD method_7978 addEnchantment (Lnet/minecraft/class_1887;I)V COMMENT Enchants this item with the given enchantment and level. COMMENT @@ -639,23 +452,12 @@ CLASS net/minecraft/class_1799 net/minecraft/item/ItemStack METHOD method_7979 postHit (Lnet/minecraft/class_1309;Lnet/minecraft/class_1657;)V ARG 1 target ARG 2 attacker - METHOD method_7980 setNbt (Lnet/minecraft/class_2487;)V - COMMENT Sets the custom NBT of this item stack. - COMMENT - COMMENT @see Item Stack NBT Operations - ARG 1 nbt - COMMENT the custom NBT compound, may be {@code null} to reset METHOD method_7981 useOnBlock (Lnet/minecraft/class_1838;)Lnet/minecraft/class_1269; ARG 1 context METHOD method_7982 onCraftByPlayer (Lnet/minecraft/class_1937;Lnet/minecraft/class_1657;I)V ARG 1 world ARG 2 player ARG 3 amount - METHOD method_7983 removeSubNbt (Ljava/lang/String;)V - COMMENT Removes the sub NBT element at the specified key in this item stack's custom NBT. - COMMENT - COMMENT @see Item Stack NBT Operations - ARG 1 key METHOD method_7984 areItemsEqual (Lnet/minecraft/class_1799;Lnet/minecraft/class_1799;)Z COMMENT {@return whether the given item stacks contain the same item, regardless of item count or NBT} COMMENT @@ -663,10 +465,6 @@ CLASS net/minecraft/class_1799 net/minecraft/item/ItemStack COMMENT @see #areItemsAndNbtEqual ARG 0 left ARG 1 right - METHOD method_7985 hasNbt ()Z - COMMENT {@return whether this item stack has custom NBT} - COMMENT - COMMENT @see Item Stack NBT Operations METHOD method_7986 isDamaged ()Z COMMENT {@return whether the item stack is {@linkplain #isDamageable damageable} and has damage} COMMENT @@ -674,6 +472,3 @@ CLASS net/minecraft/class_1799 net/minecraft/item/ItemStack COMMENT @see #getDamage CLASS 1 FIELD field_48351 ITEM_PACKET_CODEC Lnet/minecraft/class_9139; - 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 index cfb08f19a3..cd6bcb227f 100644 --- a/mappings/net/minecraft/item/ItemStackSet.mapping +++ b/mappings/net/minecraft/item/ItemStackSet.mapping @@ -1,8 +1,6 @@ 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 diff --git a/mappings/net/minecraft/item/KnowledgeBookItem.mapping b/mappings/net/minecraft/item/KnowledgeBookItem.mapping index 52017ad108..17e449d193 100644 --- a/mappings/net/minecraft/item/KnowledgeBookItem.mapping +++ b/mappings/net/minecraft/item/KnowledgeBookItem.mapping @@ -1,3 +1,2 @@ CLASS net/minecraft/class_1801 net/minecraft/item/KnowledgeBookItem - FIELD field_30906 RECIPES_KEY Ljava/lang/String; FIELD field_8042 LOGGER Lorg/slf4j/Logger; diff --git a/mappings/net/minecraft/item/MiningToolItem.mapping b/mappings/net/minecraft/item/MiningToolItem.mapping index a30bc175fe..50e8c99b66 100644 --- a/mappings/net/minecraft/item/MiningToolItem.mapping +++ b/mappings/net/minecraft/item/MiningToolItem.mapping @@ -1,12 +1,3 @@ CLASS net/minecraft/class_1766 net/minecraft/item/MiningToolItem - FIELD field_23742 attributeModifiers Lcom/google/common/collect/Multimap; - FIELD field_7939 attackDamage F FIELD field_7940 miningSpeed F FIELD field_7941 effectiveBlocks Lnet/minecraft/class_6862; - METHOD (FFLnet/minecraft/class_1832;Lnet/minecraft/class_6862;Lnet/minecraft/class_1792$class_1793;)V - ARG 1 attackDamage - ARG 2 attackSpeed - ARG 3 material - ARG 4 effectiveBlocks - ARG 5 settings - METHOD method_26366 getAttackDamage ()F diff --git a/mappings/net/minecraft/item/NetherStarItem.mapping b/mappings/net/minecraft/item/NetherStarItem.mapping deleted file mode 100644 index 66b4a29460..0000000000 --- a/mappings/net/minecraft/item/NetherStarItem.mapping +++ /dev/null @@ -1 +0,0 @@ -CLASS net/minecraft/class_1824 net/minecraft/item/NetherStarItem diff --git a/mappings/net/minecraft/item/PickaxeItem.mapping b/mappings/net/minecraft/item/PickaxeItem.mapping index f2daccba17..5c7f3d724d 100644 --- a/mappings/net/minecraft/item/PickaxeItem.mapping +++ b/mappings/net/minecraft/item/PickaxeItem.mapping @@ -1,6 +1,3 @@ CLASS net/minecraft/class_1810 net/minecraft/item/PickaxeItem - METHOD (Lnet/minecraft/class_1832;IFLnet/minecraft/class_1792$class_1793;)V + METHOD (Lnet/minecraft/class_1832;Lnet/minecraft/class_1792$class_1793;)V ARG 1 material - ARG 2 attackDamage - ARG 3 attackSpeed - ARG 4 settings diff --git a/mappings/net/minecraft/item/PlayerHeadItem.mapping b/mappings/net/minecraft/item/PlayerHeadItem.mapping index ec55f090c6..460a0cef21 100644 --- a/mappings/net/minecraft/item/PlayerHeadItem.mapping +++ b/mappings/net/minecraft/item/PlayerHeadItem.mapping @@ -1,5 +1,4 @@ CLASS net/minecraft/class_1809 net/minecraft/item/PlayerHeadItem - FIELD field_30916 SKULL_OWNER_KEY Ljava/lang/String; METHOD (Lnet/minecraft/class_2248;Lnet/minecraft/class_2248;Lnet/minecraft/class_1792$class_1793;)V ARG 1 block ARG 2 wallBlock diff --git a/mappings/net/minecraft/item/RangedWeaponItem.mapping b/mappings/net/minecraft/item/RangedWeaponItem.mapping index b2b2ffe01f..f8ebe095c1 100644 --- a/mappings/net/minecraft/item/RangedWeaponItem.mapping +++ b/mappings/net/minecraft/item/RangedWeaponItem.mapping @@ -11,3 +11,4 @@ CLASS net/minecraft/class_1811 net/minecraft/item/RangedWeaponItem METHOD method_19268 getProjectiles ()Ljava/util/function/Predicate; METHOD method_20310 getHeldProjectiles ()Ljava/util/function/Predicate; METHOD method_24792 getRange ()I + METHOD method_7763 shoot (Lnet/minecraft/class_1309;Lnet/minecraft/class_1676;IFFFLnet/minecraft/class_1309;)V diff --git a/mappings/net/minecraft/item/ShieldItem.mapping b/mappings/net/minecraft/item/ShieldItem.mapping index d18c9b5a9c..8dd22d2b17 100644 --- a/mappings/net/minecraft/item/ShieldItem.mapping +++ b/mappings/net/minecraft/item/ShieldItem.mapping @@ -1,5 +1,2 @@ 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/ShovelItem.mapping b/mappings/net/minecraft/item/ShovelItem.mapping index a5fc2f733a..e81a16defd 100644 --- a/mappings/net/minecraft/item/ShovelItem.mapping +++ b/mappings/net/minecraft/item/ShovelItem.mapping @@ -1,7 +1,2 @@ CLASS net/minecraft/class_1821 net/minecraft/item/ShovelItem FIELD field_8912 PATH_STATES Ljava/util/Map; - METHOD (Lnet/minecraft/class_1832;FFLnet/minecraft/class_1792$class_1793;)V - ARG 1 material - ARG 2 attackDamage - ARG 3 attackSpeed - ARG 4 settings diff --git a/mappings/net/minecraft/item/SpawnEggItem.mapping b/mappings/net/minecraft/item/SpawnEggItem.mapping index 120de5876d..b10a84e0d5 100644 --- a/mappings/net/minecraft/item/SpawnEggItem.mapping +++ b/mappings/net/minecraft/item/SpawnEggItem.mapping @@ -15,8 +15,7 @@ CLASS net/minecraft/class_1826 net/minecraft/item/SpawnEggItem ARG 4 world ARG 5 pos ARG 6 stack - METHOD method_8015 getEntityType (Lnet/minecraft/class_2487;)Lnet/minecraft/class_1299; - ARG 1 nbt + METHOD method_8015 getEntityType (Lnet/minecraft/class_1799;)Lnet/minecraft/class_1299; METHOD method_8016 getColor (I)I COMMENT {@return the color of the specified tint index} COMMENT @@ -24,8 +23,7 @@ CLASS net/minecraft/class_1826 net/minecraft/item/SpawnEggItem ARG 1 tintIndex COMMENT the tint index METHOD method_8017 getAll ()Ljava/lang/Iterable; - METHOD method_8018 isOfSameEntityType (Lnet/minecraft/class_2487;Lnet/minecraft/class_1299;)Z - ARG 1 nbt + METHOD method_8018 isOfSameEntityType (Lnet/minecraft/class_1799;Lnet/minecraft/class_1299;)Z ARG 2 type METHOD method_8019 forEntity (Lnet/minecraft/class_1299;)Lnet/minecraft/class_1826; ARG 0 type diff --git a/mappings/net/minecraft/item/SuspiciousStewItem.mapping b/mappings/net/minecraft/item/SuspiciousStewItem.mapping index d01f5ec084..e30dba79f3 100644 --- a/mappings/net/minecraft/item/SuspiciousStewItem.mapping +++ b/mappings/net/minecraft/item/SuspiciousStewItem.mapping @@ -1,16 +1,2 @@ CLASS net/minecraft/class_1830 net/minecraft/item/SuspiciousStewItem - FIELD field_30923 EFFECTS_KEY Ljava/lang/String; 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 - 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/SwordItem.mapping b/mappings/net/minecraft/item/SwordItem.mapping index 2326fe456f..1e770f3510 100644 --- a/mappings/net/minecraft/item/SwordItem.mapping +++ b/mappings/net/minecraft/item/SwordItem.mapping @@ -1,9 +1 @@ CLASS net/minecraft/class_1829 net/minecraft/item/SwordItem - FIELD field_23745 attributeModifiers Lcom/google/common/collect/Multimap; - FIELD field_8920 attackDamage F - METHOD (Lnet/minecraft/class_1832;IFLnet/minecraft/class_1792$class_1793;)V - ARG 1 toolMaterial - ARG 2 attackDamage - ARG 3 attackSpeed - ARG 4 settings - METHOD method_8020 getAttackDamage ()F diff --git a/mappings/net/minecraft/item/ToolItem.mapping b/mappings/net/minecraft/item/ToolItem.mapping index 46f5687896..2fb8603d12 100644 --- a/mappings/net/minecraft/item/ToolItem.mapping +++ b/mappings/net/minecraft/item/ToolItem.mapping @@ -16,8 +16,5 @@ CLASS net/minecraft/class_1831 net/minecraft/item/ToolItem COMMENT

  • Hoe: {@link net.minecraft.item.HoeItem}
    • COMMENT FIELD field_8921 material Lnet/minecraft/class_1832; - METHOD (Lnet/minecraft/class_1832;Lnet/minecraft/class_1792$class_1793;)V - ARG 1 material - ARG 2 settings METHOD method_8022 getMaterial ()Lnet/minecraft/class_1832; COMMENT @return the {@link ToolMaterial} used by this {@link ToolItem} diff --git a/mappings/net/minecraft/item/TridentItem.mapping b/mappings/net/minecraft/item/TridentItem.mapping index 812096ed15..5841be2bc8 100644 --- a/mappings/net/minecraft/item/TridentItem.mapping +++ b/mappings/net/minecraft/item/TridentItem.mapping @@ -1,5 +1,4 @@ CLASS net/minecraft/class_1835 net/minecraft/item/TridentItem - FIELD field_23746 attributeModifiers Lcom/google/common/collect/Multimap; FIELD field_30926 MIN_DRAW_DURATION I FIELD field_30927 ATTACK_DAMAGE F FIELD field_30928 THROW_SPEED F diff --git a/mappings/net/minecraft/item/WritableBookItem.mapping b/mappings/net/minecraft/item/WritableBookItem.mapping index 0d09d0a111..8d98bbe2bc 100644 --- a/mappings/net/minecraft/item/WritableBookItem.mapping +++ b/mappings/net/minecraft/item/WritableBookItem.mapping @@ -1,3 +1 @@ CLASS net/minecraft/class_1840 net/minecraft/item/WritableBookItem - METHOD method_8047 isValid (Lnet/minecraft/class_2487;)Z - ARG 0 nbt diff --git a/mappings/net/minecraft/item/WrittenBookItem.mapping b/mappings/net/minecraft/item/WrittenBookItem.mapping index ef95e8f2bb..bdfa6b2900 100644 --- a/mappings/net/minecraft/item/WrittenBookItem.mapping +++ b/mappings/net/minecraft/item/WrittenBookItem.mapping @@ -1,26 +1,4 @@ CLASS net/minecraft/class_1843 net/minecraft/item/WrittenBookItem - 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; - FIELD field_30938 PAGES_KEY Ljava/lang/String; - FIELD field_30939 FILTERED_PAGES_KEY Ljava/lang/String; - FIELD field_30940 GENERATION_KEY Ljava/lang/String; - FIELD field_30941 RESOLVED_KEY Ljava/lang/String; - METHOD method_17443 getPageCount (Lnet/minecraft/class_1799;)I - ARG 0 stack - METHOD method_33826 textToJson (Lnet/minecraft/class_2168;Lnet/minecraft/class_1657;Ljava/lang/String;)Ljava/lang/String; - ARG 0 commandSource - ARG 1 player - ARG 2 text - METHOD method_8052 getGeneration (Lnet/minecraft/class_1799;)I - ARG 0 stack - METHOD method_8053 isValid (Lnet/minecraft/class_2487;)Z - ARG 0 nbt METHOD method_8054 resolve (Lnet/minecraft/class_1799;Lnet/minecraft/class_2168;Lnet/minecraft/class_1657;)Z ARG 0 book ARG 1 commandSource diff --git a/mappings/net/minecraft/item/map/MapIcon.mapping b/mappings/net/minecraft/item/map/MapIcon.mapping index 5c5437bb30..8ad3e572e8 100644 --- a/mappings/net/minecraft/item/map/MapIcon.mapping +++ b/mappings/net/minecraft/item/map/MapIcon.mapping @@ -43,5 +43,3 @@ CLASS net/minecraft/class_20 net/minecraft/item/map/MapIcon METHOD method_96 getTintColor ()I METHOD method_97 hasTintColor ()Z METHOD method_98 getId ()B - METHOD method_99 byId (B)Lnet/minecraft/class_20$class_21; - ARG 0 id diff --git a/mappings/net/minecraft/item/map/MapState.mapping b/mappings/net/minecraft/item/map/MapState.mapping index 8506c851ad..855b5106a4 100644 --- a/mappings/net/minecraft/item/map/MapState.mapping +++ b/mappings/net/minecraft/item/map/MapState.mapping @@ -87,14 +87,12 @@ CLASS net/minecraft/class_22 net/minecraft/item/map/MapState ARG 5 showIcons ARG 6 unlimitedTracking ARG 7 dimension - METHOD method_32364 zoomOut (I)Lnet/minecraft/class_22; + METHOD method_32364 zoomOut ()Lnet/minecraft/class_22; COMMENT Creates a new map state which is a zoomed out version of the current one. COMMENT

    COMMENT The scale of the new map state is {@code currentScale + zoomOutScale} and clamped between {@code 0} and {@code 4}. COMMENT

    COMMENT The colors are not copied, neither are the icons. - ARG 1 zoomOutScale - COMMENT the amount to add to the scale of the map METHOD method_32365 putColor (IIB)Z COMMENT Sets the color at the specified coordinates if the current color is different. COMMENT diff --git a/mappings/net/minecraft/item/trim/ArmorTrim.mapping b/mappings/net/minecraft/item/trim/ArmorTrim.mapping index 42fd967746..81a3e1e2a9 100644 --- a/mappings/net/minecraft/item/trim/ArmorTrim.mapping +++ b/mappings/net/minecraft/item/trim/ArmorTrim.mapping @@ -1,7 +1,5 @@ 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; @@ -13,37 +11,13 @@ CLASS net/minecraft/class_8053 net/minecraft/item/trim/ArmorTrim 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_6880;)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_6880;)Lnet/minecraft/class_2960; ARG 1 armorMaterial - METHOD method_48435 (Lnet/minecraft/class_6880;Lnet/minecraft/class_6880;)Lnet/minecraft/class_2960; - ARG 2 armorMaterial METHOD method_48436 getGenericModelId (Lnet/minecraft/class_6880;)Lnet/minecraft/class_2960; ARG 1 armorMaterial METHOD method_48577 getMaterialAssetNameFor (Lnet/minecraft/class_6880;)Ljava/lang/String; ARG 1 armorMaterial - METHOD method_52565 (ZLjava/lang/String;)V - ARG 1 error diff --git a/mappings/net/minecraft/loot/entry/LootTableEntry.mapping b/mappings/net/minecraft/loot/entry/LootTableEntry.mapping index 506d89a1c0..9fb3898da9 100644 --- a/mappings/net/minecraft/loot/entry/LootTableEntry.mapping +++ b/mappings/net/minecraft/loot/entry/LootTableEntry.mapping @@ -1,8 +1,6 @@ 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;IILjava/util/List;Ljava/util/List;)V - ARG 1 id + METHOD (Lcom/mojang/datafixers/util/Either;IILjava/util/List;Ljava/util/List;)V ARG 2 weight ARG 3 quality ARG 4 conditions @@ -14,9 +12,7 @@ CLASS net/minecraft/class_83 net/minecraft/loot/entry/LootTableEntry ARG 2 quality ARG 3 conditions ARG 4 functions - METHOD method_51222 (Lnet/minecraft/class_58;Lnet/minecraft/class_8488;Lnet/minecraft/class_52;)V - ARG 3 table - METHOD method_53293 (Lnet/minecraft/class_83;)Lnet/minecraft/class_2960; + METHOD method_53293 (Lnet/minecraft/class_83;)Lcom/mojang/datafixers/util/Either; ARG 0 entry METHOD method_53294 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; ARG 0 instance diff --git a/mappings/net/minecraft/loot/function/CopyNbtLootFunction.mapping b/mappings/net/minecraft/loot/function/CopyNbtLootFunction.mapping index 4da3e4ab6f..2c0ceedf19 100644 --- a/mappings/net/minecraft/loot/function/CopyNbtLootFunction.mapping +++ b/mappings/net/minecraft/loot/function/CopyNbtLootFunction.mapping @@ -6,7 +6,7 @@ CLASS net/minecraft/class_3837 net/minecraft/loot/function/CopyNbtLootFunction ARG 1 conditions ARG 2 source ARG 3 operations - METHOD method_16846 (Lnet/minecraft/class_1799;Lnet/minecraft/class_2520;Lnet/minecraft/class_3837$class_3839;)V + METHOD method_16846 (Ljava/util/function/Supplier;Lnet/minecraft/class_2520;Lnet/minecraft/class_3837$class_3839;)V ARG 2 operation METHOD method_16848 builder (Lnet/minecraft/class_5651;)Lnet/minecraft/class_3837$class_3838; ARG 0 source diff --git a/mappings/net/minecraft/loot/function/CopyStateFunction.mapping b/mappings/net/minecraft/loot/function/CopyStateFunction.mapping index d2d558613f..7b2275cdfa 100644 --- a/mappings/net/minecraft/loot/function/CopyStateFunction.mapping +++ b/mappings/net/minecraft/loot/function/CopyStateFunction.mapping @@ -12,9 +12,6 @@ CLASS net/minecraft/class_4488 net/minecraft/loot/function/CopyStateFunction ARG 3 properties METHOD method_21892 builder (Lnet/minecraft/class_2248;)Lnet/minecraft/class_4488$class_4489; ARG 0 block - METHOD method_21893 getPropertyName (Lnet/minecraft/class_2680;Lnet/minecraft/class_2769;)Ljava/lang/String; - ARG 0 state - ARG 1 property METHOD method_53310 (Lnet/minecraft/class_4488;)Ljava/util/List; ARG 0 function METHOD method_53311 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; diff --git a/mappings/net/minecraft/loot/function/SetAttributesLootFunction.mapping b/mappings/net/minecraft/loot/function/SetAttributesLootFunction.mapping index c996f63f48..9902ad1860 100644 --- a/mappings/net/minecraft/loot/function/SetAttributesLootFunction.mapping +++ b/mappings/net/minecraft/loot/function/SetAttributesLootFunction.mapping @@ -52,7 +52,6 @@ CLASS net/minecraft/class_137 net/minecraft/loot/function/SetAttributesLootFunct ARG 3 operation ARG 4 amount METHOD method_35528 build ()Lnet/minecraft/class_137$class_138; - METHOD method_35529 slot (Lnet/minecraft/class_1304;)Lnet/minecraft/class_137$class_6156; - ARG 1 slot + METHOD method_35529 slot (Lnet/minecraft/class_9274;)Lnet/minecraft/class_137$class_6156; METHOD method_35530 uuid (Ljava/util/UUID;)Lnet/minecraft/class_137$class_6156; ARG 1 uuid diff --git a/mappings/net/minecraft/loot/function/SetBannerPatternFunction.mapping b/mappings/net/minecraft/loot/function/SetBannerPatternFunction.mapping index 0a7a3e0a97..318b12d51b 100644 --- a/mappings/net/minecraft/loot/function/SetBannerPatternFunction.mapping +++ b/mappings/net/minecraft/loot/function/SetBannerPatternFunction.mapping @@ -1,11 +1,9 @@ CLASS net/minecraft/class_5592 net/minecraft/loot/function/SetBannerPatternFunction - FIELD field_27343 patterns Ljava/util/List; + FIELD field_27343 patterns Lnet/minecraft/class_9307; FIELD field_27344 append Z 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 + METHOD (Ljava/util/List;Lnet/minecraft/class_9307;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 @@ -13,10 +11,10 @@ CLASS net/minecraft/class_5592 net/minecraft/loot/function/SetBannerPatternFunct ARG 0 function METHOD method_53361 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; ARG 0 instance - METHOD method_53362 (Lnet/minecraft/class_5592;)Ljava/util/List; + METHOD method_53362 (Lnet/minecraft/class_5592;)Lnet/minecraft/class_9307; ARG 0 function CLASS class_6157 Builder - FIELD field_31862 patterns Lcom/google/common/collect/ImmutableList$Builder; + FIELD field_31862 patterns Lnet/minecraft/class_9307$class_3750; FIELD field_31863 append Z METHOD (Z)V ARG 1 append diff --git a/mappings/net/minecraft/loot/function/SetEnchantmentsLootFunction.mapping b/mappings/net/minecraft/loot/function/SetEnchantmentsLootFunction.mapping index 11ddde2235..a51ae0a46e 100644 --- a/mappings/net/minecraft/loot/function/SetEnchantmentsLootFunction.mapping +++ b/mappings/net/minecraft/loot/function/SetEnchantmentsLootFunction.mapping @@ -11,16 +11,6 @@ CLASS net/minecraft/class_5642 net/minecraft/loot/function/SetEnchantmentsLootFu 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 - ARG 0 map - ARG 1 enchantment - ARG 2 level - METHOD method_32412 (Ljava/util/Map;Lnet/minecraft/class_1887;Ljava/lang/Integer;)V - ARG 1 enchantment - ARG 2 level - METHOD method_32414 (Ljava/util/Map;Lnet/minecraft/class_1887;Ljava/lang/Integer;)V - ARG 1 enchantment - ARG 2 level METHOD method_53370 (Lnet/minecraft/class_5642;)Ljava/lang/Boolean; ARG 0 function METHOD method_53371 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; diff --git a/mappings/net/minecraft/loot/function/SetLoreLootFunction.mapping b/mappings/net/minecraft/loot/function/SetLoreLootFunction.mapping index bb5c910ee6..a4f2d2682f 100644 --- a/mappings/net/minecraft/loot/function/SetLoreLootFunction.mapping +++ b/mappings/net/minecraft/loot/function/SetLoreLootFunction.mapping @@ -8,9 +8,6 @@ CLASS net/minecraft/class_3671 net/minecraft/loot/function/SetLoreLootFunction ARG 2 replace ARG 3 lore ARG 4 entity - METHOD method_15964 getLoreForMerge (Lnet/minecraft/class_1799;Z)Lnet/minecraft/class_2499; - ARG 1 stack - ARG 2 otherLoreExists METHOD method_35544 builder ()Lnet/minecraft/class_3671$class_6159; METHOD method_53381 (Lnet/minecraft/class_47$class_50;)Ljava/util/Set; ARG 0 entity diff --git a/mappings/net/minecraft/loot/function/SetNbtLootFunction.mapping b/mappings/net/minecraft/loot/function/SetNbtLootFunction.mapping index d68bfb4f13..b4fdaedc36 100644 --- a/mappings/net/minecraft/loot/function/SetNbtLootFunction.mapping +++ b/mappings/net/minecraft/loot/function/SetNbtLootFunction.mapping @@ -10,5 +10,3 @@ CLASS net/minecraft/class_159 net/minecraft/loot/function/SetNbtLootFunction ARG 0 instance 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 diff --git a/mappings/net/minecraft/network/PacketByteBuf.mapping b/mappings/net/minecraft/network/PacketByteBuf.mapping index bcf7826a6b..5fdb921f82 100644 --- a/mappings/net/minecraft/network/PacketByteBuf.mapping +++ b/mappings/net/minecraft/network/PacketByteBuf.mapping @@ -784,58 +784,6 @@ CLASS net/minecraft/class_2540 net/minecraft/network/PacketByteBuf METHOD method_37453 getMaxValidator (Ljava/util/function/IntFunction;I)Ljava/util/function/IntFunction; ARG 0 applier ARG 1 max - METHOD method_43616 writeGameProfile (Lcom/mojang/authlib/GameProfile;)V - COMMENT Writes a game profile to this buf. A game profile is represented by a - COMMENT {@linkplain #writeUuid(UUID) uuid}, a username string, and a collection of - COMMENT {@linkplain #writeProperty(Property) properties}. - COMMENT - COMMENT @see #readGameProfile() - ARG 1 gameProfile - METHOD method_43617 writeProperty (Lcom/mojang/authlib/properties/Property;)V - COMMENT Writes a property to this buf. A property is represented by a string representing - COMMENT the property key, a string representing the property value, a boolean indicating - COMMENT whether the property is signed, and a string representing the signature (only - COMMENT exists if signed). - COMMENT - COMMENT @see #readProperty() - ARG 1 property - METHOD method_43619 writeEither (Lcom/mojang/datafixers/util/Either;Lnet/minecraft/class_9142;Lnet/minecraft/class_9142;)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, - COMMENT followed by the value. - COMMENT - COMMENT @see #readEither(PacketByteBuf.PacketReader, PacketByteBuf.PacketReader) - ARG 1 either - ARG 2 leftWriter - ARG 3 rightWriter - METHOD method_43620 (Lnet/minecraft/class_9142;Ljava/lang/Object;)V - ARG 2 object - METHOD method_43621 (Lnet/minecraft/class_9142;Ljava/lang/Object;)V - ARG 2 object - METHOD method_43622 readEither (Lnet/minecraft/class_9141;Lnet/minecraft/class_9141;)Lcom/mojang/datafixers/util/Either; - COMMENT Reads an {@code Either} from this buf. An either is represented by - COMMENT a boolean indicating if the left side or the right side of the either, - COMMENT followed by the value. - COMMENT - COMMENT @return the read either - COMMENT @see #writeEither(Either, PacketByteBuf.PacketWriter, PacketByteBuf.PacketWriter) - ARG 1 leftReader - ARG 2 rightReader - METHOD method_43623 readGameProfile ()Lcom/mojang/authlib/GameProfile; - COMMENT Reads a game profile from this buf. A game profile is represented by a - COMMENT {@linkplain #readUuid() uuid}, a username string, and a collection of - COMMENT {@linkplain #readProperty() properties}. - COMMENT - COMMENT @return the game profile - COMMENT @see #writeGameProfile(GameProfile) - METHOD method_43624 readProperty ()Lcom/mojang/authlib/properties/Property; - COMMENT Reads a property from this buf. A property is represented by a string representing - COMMENT the property key, a string representing the property value, a boolean indicating - COMMENT whether the property is signed, and a string representing the signature (only - COMMENT exists if signed). - COMMENT - COMMENT @return the property - COMMENT @see #writeProperty(Property) METHOD method_43826 writeNullable (Ljava/lang/Object;Lnet/minecraft/class_9142;)V COMMENT Writes a nullable value to this buf. A nullable value is represented by COMMENT a boolean indicating if the value is not null, followed by the value only if @@ -906,14 +854,6 @@ 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_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. @@ -946,11 +886,6 @@ CLASS net/minecraft/class_2540 net/minecraft/network/PacketByteBuf 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_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. diff --git a/mappings/net/minecraft/network/codec/PacketCodecs.mapping b/mappings/net/minecraft/network/codec/PacketCodecs.mapping index 203e8dd95a..d45cdb31c8 100644 --- a/mappings/net/minecraft/network/codec/PacketCodecs.mapping +++ b/mappings/net/minecraft/network/codec/PacketCodecs.mapping @@ -188,10 +188,6 @@ CLASS net/minecraft/class_9135 net/minecraft/network/codec/PacketCodecs COMMENT @see net.minecraft.network.PacketByteBuf#readNbt(NbtSizeTracker) COMMENT @see net.minecraft.network.PacketByteBuf#writeNbt(NbtElement) ARG 0 sizeTracker - METHOD method_56379 (Lnet/minecraft/class_2487;)Lnet/minecraft/class_2520; - ARG 0 nbt - METHOD method_56380 (Lnet/minecraft/class_2520;)Lnet/minecraft/class_2487; - ARG 0 nbt METHOD method_56381 (Lnet/minecraft/class_2520;Ljava/lang/String;)Lio/netty/handler/codec/DecoderException; ARG 1 error METHOD method_56382 optional (Lnet/minecraft/class_9139;)Lnet/minecraft/class_9139; @@ -229,31 +225,26 @@ CLASS net/minecraft/class_9135 net/minecraft/network/codec/PacketCodecs ARG 0 maxLength METHOD method_56896 registryCodec (Lcom/mojang/serialization/Codec;)Lnet/minecraft/class_9139; ARG 0 codec - CLASS 4 - METHOD method_56899 (Ljava/lang/Object;Ljava/lang/String;)Lio/netty/handler/codec/EncoderException; - ARG 1 error - METHOD method_56900 (Lnet/minecraft/class_2520;Ljava/lang/String;)Lio/netty/handler/codec/DecoderException; - ARG 1 error - CLASS 10 - METHOD method_56419 (Lnet/minecraft/class_9139;Lio/netty/buffer/ByteBuf;Lnet/minecraft/class_9139;Ljava/lang/Object;Ljava/lang/Object;)V - ARG 3 k - ARG 4 v - CLASS 13 - METHOD method_56424 getIterable (Lnet/minecraft/class_9129;)Lnet/minecraft/class_2359; - ARG 1 buf - CLASS 14 - FIELD field_48562 DIRECT_ENTRY_MARKER I - METHOD method_56390 getEntries (Lnet/minecraft/class_9129;)Lnet/minecraft/class_2359; - ARG 1 buf - CLASS 21 + CLASS 2 METHOD method_56403 decode (Lio/netty/buffer/ByteBuf;)[B ARG 1 buf METHOD method_56404 encode (Lio/netty/buffer/ByteBuf;[B)V ARG 1 buf ARG 2 value - CLASS 22 + CLASS 5 + METHOD method_56899 (Ljava/lang/Object;Ljava/lang/String;)Lio/netty/handler/codec/EncoderException; + ARG 1 error + METHOD method_56900 (Lnet/minecraft/class_2520;Ljava/lang/String;)Lio/netty/handler/codec/DecoderException; + ARG 1 error + CLASS 10 + CLASS 15 + METHOD method_56424 getIterable (Lnet/minecraft/class_9129;)Lnet/minecraft/class_2359; + ARG 1 buf + CLASS 16 + FIELD field_48562 DIRECT_ENTRY_MARKER I + METHOD method_56390 getEntries (Lnet/minecraft/class_9129;)Lnet/minecraft/class_2359; + ARG 1 buf + CLASS 27 METHOD method_56407 read (Lio/netty/buffer/ByteBuf;)[B ARG 1 buf METHOD method_56408 write (Lio/netty/buffer/ByteBuf;[B)V - ARG 1 buf - ARG 2 value diff --git a/mappings/net/minecraft/network/packet/s2c/login/LoginSuccessS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/login/LoginSuccessS2CPacket.mapping index adeb5c8c7e..7a235ba0dc 100644 --- a/mappings/net/minecraft/network/packet/s2c/login/LoginSuccessS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/login/LoginSuccessS2CPacket.mapping @@ -1,10 +1,4 @@ CLASS net/minecraft/class_2901 net/minecraft/network/packet/s2c/login/LoginSuccessS2CPacket - FIELD field_13190 profile Lcom/mojang/authlib/GameProfile; + FIELD comp_2363 profile Lcom/mojang/authlib/GameProfile; FIELD field_48233 CODEC Lnet/minecraft/class_9139; - METHOD (Lcom/mojang/authlib/GameProfile;)V - ARG 1 profile - METHOD (Lnet/minecraft/class_2540;)V - ARG 1 buf - METHOD method_12593 getProfile ()Lcom/mojang/authlib/GameProfile; - METHOD method_56011 write (Lnet/minecraft/class_2540;)V - ARG 1 buf + METHOD comp_2363 profile ()Lcom/mojang/authlib/GameProfile; diff --git a/mappings/net/minecraft/potion/Potion.mapping b/mappings/net/minecraft/potion/Potion.mapping index e23aa8ca58..e3f25622eb 100644 --- a/mappings/net/minecraft/potion/Potion.mapping +++ b/mappings/net/minecraft/potion/Potion.mapping @@ -6,10 +6,7 @@ CLASS net/minecraft/class_1842 net/minecraft/potion/Potion ARG 2 effects METHOD ([Lnet/minecraft/class_1293;)V ARG 1 effects - METHOD method_8048 byId (Ljava/lang/String;)Lnet/minecraft/class_6880; - ARG 0 id METHOD method_8049 getEffects ()Ljava/util/List; METHOD method_8050 hasInstantEffect ()Z - METHOD method_8051 finishTranslationKey (Lnet/minecraft/class_6880;Ljava/lang/String;)Ljava/lang/String; - ARG 0 potion + METHOD method_8051 finishTranslationKey (Ljava/util/Optional;Ljava/lang/String;)Ljava/lang/String; ARG 1 prefix diff --git a/mappings/net/minecraft/potion/PotionUtil.mapping b/mappings/net/minecraft/potion/PotionUtil.mapping index c4d148fcd1..d2a3f09e64 100644 --- a/mappings/net/minecraft/potion/PotionUtil.mapping +++ b/mappings/net/minecraft/potion/PotionUtil.mapping @@ -1,49 +1,18 @@ CLASS net/minecraft/class_1844 net/minecraft/potion/PotionUtil + FIELD comp_2380 getCustomPotionEffects Ljava/util/List; FIELD field_25817 NONE_TEXT Lnet/minecraft/class_2561; - FIELD field_30943 CUSTOM_POTION_EFFECTS_KEY Ljava/lang/String; - 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;FF)V - ARG 0 stack - ARG 1 list + METHOD comp_2380 getCustomPotionEffects ()Ljava/util/List; + METHOD method_47372 buildTooltip (Ljava/util/function/Consumer;FF)V ARG 2 durationMultiplier ARG 3 tickRate METHOD method_55762 (Ljava/util/List;Lnet/minecraft/class_6880;Lnet/minecraft/class_1322;)V ARG 1 attribute ARG 2 modifier - 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; - ARG 0 stack - ARG 1 effects - METHOD method_8057 getPotion (Lnet/minecraft/class_2487;)Lnet/minecraft/class_6880; - ARG 0 compound - METHOD method_8058 getCustomPotionEffects (Lnet/minecraft/class_2487;Ljava/util/List;)V - ARG 0 nbt - ARG 1 list - METHOD method_8059 getPotionEffects (Lnet/minecraft/class_6880;Ljava/util/Collection;)Ljava/util/List; - ARG 0 potion - ARG 1 custom - METHOD method_8060 getCustomPotionEffects (Lnet/minecraft/class_2487;)Ljava/util/List; - ARG 0 nbt - METHOD method_8061 setPotion (Lnet/minecraft/class_1799;Lnet/minecraft/class_6880;)Lnet/minecraft/class_1799; - ARG 0 stack - ARG 1 potion + METHOD method_8055 getColor (Ljava/lang/Iterable;)I METHOD method_8062 getColor (Lnet/minecraft/class_6880;)I ARG 0 potion - METHOD method_8063 getPotion (Lnet/minecraft/class_1799;)Lnet/minecraft/class_6880; - ARG 0 stack - METHOD method_8064 getColor (Lnet/minecraft/class_1799;)I - ARG 0 stack - METHOD method_8065 buildTooltip (Ljava/util/List;Ljava/util/List;FF)V - ARG 0 statusEffects - ARG 1 list + METHOD method_8064 getColor ()I + METHOD method_8065 buildTooltip (Ljava/lang/Iterable;Ljava/util/function/Consumer;FF)V ARG 2 durationMultiplier ARG 3 tickRate - METHOD method_8066 getPotionEffects (Lnet/minecraft/class_2487;)Ljava/util/List; - ARG 0 nbt - METHOD method_8067 getPotionEffects (Lnet/minecraft/class_1799;)Ljava/util/List; - ARG 0 stack - METHOD method_8068 getCustomPotionEffects (Lnet/minecraft/class_1799;)Ljava/util/List; - ARG 0 stack diff --git a/mappings/net/minecraft/potion/Potions.mapping b/mappings/net/minecraft/potion/Potions.mapping index aa576b03ec..b76b243ea3 100644 --- a/mappings/net/minecraft/potion/Potions.mapping +++ b/mappings/net/minecraft/potion/Potions.mapping @@ -1,9 +1,4 @@ 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_6880; - METHOD method_48962 register (Lnet/minecraft/class_5321;Lnet/minecraft/class_1842;)Lnet/minecraft/class_6880; - ARG 0 key - ARG 1 potion METHOD method_55763 registerAndGetDefault (Lnet/minecraft/class_2378;)Lnet/minecraft/class_6880; ARG 0 registry METHOD method_8084 register (Ljava/lang/String;Lnet/minecraft/class_1842;)Lnet/minecraft/class_6880; diff --git a/mappings/net/minecraft/predicate/BlockPredicate.mapping b/mappings/net/minecraft/predicate/BlockPredicate.mapping index 25f8108841..3b56c6e398 100644 --- a/mappings/net/minecraft/predicate/BlockPredicate.mapping +++ b/mappings/net/minecraft/predicate/BlockPredicate.mapping @@ -1,18 +1,10 @@ CLASS net/minecraft/class_4550 net/minecraft/predicate/BlockPredicate FIELD comp_1733 state Ljava/util/Optional; FIELD field_45723 CODEC Lcom/mojang/serialization/Codec; - FIELD field_45724 BLOCK_ENTRY_LIST_CODEC Lcom/mojang/serialization/Codec; METHOD comp_1733 state ()Ljava/util/Optional; METHOD method_22454 test (Lnet/minecraft/class_3218;Lnet/minecraft/class_2338;)Z - ARG 1 world - ARG 2 pos - METHOD method_53071 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; - ARG 0 instance - METHOD method_53072 (Lnet/minecraft/class_6885;)Ljava/util/List; - ARG 0 blocks CLASS class_4710 Builder 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; diff --git a/mappings/net/minecraft/predicate/FluidPredicate.mapping b/mappings/net/minecraft/predicate/FluidPredicate.mapping index 97a2f3dc93..635f67afe3 100644 --- a/mappings/net/minecraft/predicate/FluidPredicate.mapping +++ b/mappings/net/minecraft/predicate/FluidPredicate.mapping @@ -8,12 +8,10 @@ CLASS net/minecraft/class_4551 net/minecraft/predicate/FluidPredicate METHOD method_53156 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; ARG 0 instance CLASS class_6079 Builder - 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 + METHOD method_35222 tag (Lnet/minecraft/class_6885;)Lnet/minecraft/class_4551$class_6079; METHOD method_35223 state (Lnet/minecraft/class_4559;)Lnet/minecraft/class_4551$class_6079; ARG 1 state METHOD method_35224 fluid (Lnet/minecraft/class_3611;)Lnet/minecraft/class_4551$class_6079; diff --git a/mappings/net/minecraft/predicate/NbtPredicate.mapping b/mappings/net/minecraft/predicate/NbtPredicate.mapping index b5d22ca12d..c3acd02bf5 100644 --- a/mappings/net/minecraft/predicate/NbtPredicate.mapping +++ b/mappings/net/minecraft/predicate/NbtPredicate.mapping @@ -7,7 +7,6 @@ CLASS net/minecraft/class_2105 net/minecraft/predicate/NbtPredicate METHOD method_9072 test (Lnet/minecraft/class_1297;)Z ARG 1 entity METHOD method_9074 test (Lnet/minecraft/class_1799;)Z - ARG 1 stack 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/entity/EntityTypePredicate.mapping b/mappings/net/minecraft/predicate/entity/EntityTypePredicate.mapping index 0a8e0c73b9..7adae7e860 100644 --- a/mappings/net/minecraft/predicate/entity/EntityTypePredicate.mapping +++ b/mappings/net/minecraft/predicate/entity/EntityTypePredicate.mapping @@ -1,13 +1,5 @@ CLASS net/minecraft/class_2050 net/minecraft/predicate/entity/EntityTypePredicate FIELD field_45749 CODEC Lcom/mojang/serialization/Codec; - METHOD method_53143 (Lnet/minecraft/class_2050;)Lcom/mojang/serialization/DataResult; - ARG 0 predicate - METHOD method_53144 (Lcom/mojang/datafixers/util/Either;)Lnet/minecraft/class_2050; - ARG 0 either - METHOD method_53145 (Lnet/minecraft/class_6880;)Lnet/minecraft/class_2050; - ARG 0 type - METHOD method_53147 (Lnet/minecraft/class_6862;)Lnet/minecraft/class_2050; - ARG 0 tag METHOD method_8925 matches (Lnet/minecraft/class_1299;)Z ARG 1 type METHOD method_8926 create (Lnet/minecraft/class_6862;)Lnet/minecraft/class_2050; diff --git a/mappings/net/minecraft/predicate/entity/LocationPredicate.mapping b/mappings/net/minecraft/predicate/entity/LocationPredicate.mapping index 330e34766e..f0d1a73729 100644 --- a/mappings/net/minecraft/predicate/entity/LocationPredicate.mapping +++ b/mappings/net/minecraft/predicate/entity/LocationPredicate.mapping @@ -2,15 +2,6 @@ CLASS net/minecraft/class_2090 net/minecraft/predicate/entity/LocationPredicate FIELD field_45760 CODEC Lcom/mojang/serialization/Codec; METHOD method_53178 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; ARG 0 instance - 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 @@ -38,25 +29,21 @@ CLASS net/minecraft/class_2090 net/minecraft/predicate/entity/LocationPredicate 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 structure (Lnet/minecraft/class_5321;)Lnet/minecraft/class_2090$class_2091; - ARG 1 structure + METHOD method_35277 structure (Lnet/minecraft/class_6885;)Lnet/minecraft/class_2090$class_2091; 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_53180 createBiome (Lnet/minecraft/class_6880;)Lnet/minecraft/class_2090$class_2091; 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_53183 createStructure (Lnet/minecraft/class_6880;)Lnet/minecraft/class_2090$class_2091; 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 + METHOD method_9024 biome (Lnet/minecraft/class_6885;)Lnet/minecraft/class_2090$class_2091; CLASS class_8747 PositionRange FIELD field_45761 CODEC Lcom/mojang/serialization/Codec; METHOD method_53184 test (DDD)Z diff --git a/mappings/net/minecraft/predicate/item/EnchantmentPredicate.mapping b/mappings/net/minecraft/predicate/item/EnchantmentPredicate.mapping index 1a78cabc84..2c9395cbd8 100644 --- a/mappings/net/minecraft/predicate/item/EnchantmentPredicate.mapping +++ b/mappings/net/minecraft/predicate/item/EnchantmentPredicate.mapping @@ -7,5 +7,4 @@ CLASS net/minecraft/class_2035 net/minecraft/predicate/item/EnchantmentPredicate METHOD comp_1749 levels ()Lnet/minecraft/class_2096$class_2100; METHOD method_53126 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; ARG 0 instance - METHOD method_8880 test (Ljava/util/Map;)Z - ARG 1 enchantments + METHOD method_8880 test (Lnet/minecraft/class_9304;)Z diff --git a/mappings/net/minecraft/predicate/item/ItemPredicate.mapping b/mappings/net/minecraft/predicate/item/ItemPredicate.mapping index dd123aefbe..fc3fbc265d 100644 --- a/mappings/net/minecraft/predicate/item/ItemPredicate.mapping +++ b/mappings/net/minecraft/predicate/item/ItemPredicate.mapping @@ -1,13 +1,5 @@ CLASS net/minecraft/class_2073 net/minecraft/predicate/item/ItemPredicate 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 - METHOD method_53162 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; - ARG 0 instance - METHOD method_53163 (Lnet/minecraft/class_6885;)Ljava/util/List; - ARG 0 items METHOD method_8970 test (Lnet/minecraft/class_1799;)Z ARG 1 stack CLASS class_2074 Builder @@ -16,13 +8,8 @@ CLASS net/minecraft/class_2073 net/minecraft/predicate/item/ItemPredicate 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 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_6880;)Lnet/minecraft/class_2073$class_2074; - ARG 1 potion + METHOD method_35232 potion (Lnet/minecraft/class_6885;)Lnet/minecraft/class_2073$class_2074; METHOD method_35233 count (Lnet/minecraft/class_2096$class_2100;)Lnet/minecraft/class_2073$class_2074; ARG 1 count METHOD method_35234 storedEnchantment (Lnet/minecraft/class_2035;)Lnet/minecraft/class_2073$class_2074; diff --git a/mappings/net/minecraft/recipe/RepairItemRecipe.mapping b/mappings/net/minecraft/recipe/RepairItemRecipe.mapping index 0c034e3d3f..df39ca4214 100644 --- a/mappings/net/minecraft/recipe/RepairItemRecipe.mapping +++ b/mappings/net/minecraft/recipe/RepairItemRecipe.mapping @@ -1,3 +1,3 @@ CLASS net/minecraft/class_4317 net/minecraft/recipe/RepairItemRecipe - METHOD method_24364 (Ljava/util/Map;Ljava/util/Map;Lnet/minecraft/class_1799;Lnet/minecraft/class_1887;)V + METHOD method_24364 (Lnet/minecraft/class_9304;Lnet/minecraft/class_9304;Lnet/minecraft/class_9304$class_9305;Lnet/minecraft/class_1887;)V ARG 3 enchantment diff --git a/mappings/net/minecraft/registry/Registries.mapping b/mappings/net/minecraft/registry/Registries.mapping index 52a879ac3e..5fc1c8545c 100644 --- a/mappings/net/minecraft/registry/Registries.mapping +++ b/mappings/net/minecraft/registry/Registries.mapping @@ -49,7 +49,7 @@ CLASS net/minecraft/class_7923 net/minecraft/registry/Registries 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_41179 POTION Lnet/minecraft/class_2378; 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; diff --git a/mappings/net/minecraft/scoreboard/Scoreboard.mapping b/mappings/net/minecraft/scoreboard/Scoreboard.mapping index 96087f7980..8897ce3b14 100644 --- a/mappings/net/minecraft/scoreboard/Scoreboard.mapping +++ b/mappings/net/minecraft/scoreboard/Scoreboard.mapping @@ -43,7 +43,7 @@ CLASS net/minecraft/class_269 net/minecraft/scoreboard/Scoreboard ARG 4 renderType ARG 5 displayAutoUpdate ARG 6 numberFormat - METHOD method_1169 toNbt ()Lnet/minecraft/class_2499; + METHOD method_1169 toNbt (Lnet/minecraft/class_7225$class_7874;)Lnet/minecraft/class_2499; METHOD method_1170 getNullableObjective (Ljava/lang/String;)Lnet/minecraft/class_266; ARG 1 name METHOD method_1171 addTeam (Ljava/lang/String;)Lnet/minecraft/class_268; @@ -69,7 +69,7 @@ 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_1188 readNbt (Lnet/minecraft/class_2499;)V + METHOD method_1188 readNbt (Lnet/minecraft/class_2499;Lnet/minecraft/class_7225$class_7874;)V ARG 1 list METHOD method_1189 getObjectiveForSlot (Lnet/minecraft/class_8646;)Lnet/minecraft/class_266; ARG 1 slot @@ -95,12 +95,6 @@ CLASS net/minecraft/class_269 net/minecraft/scoreboard/Scoreboard ARG 1 scoreHolder ARG 2 objective ARG 3 forceWritable - METHOD method_55426 (Ljava/lang/String;Lnet/minecraft/class_2499;Lnet/minecraft/class_266;Lnet/minecraft/class_267;)V - ARG 2 objective - ARG 3 score - METHOD method_55428 (Lnet/minecraft/class_2499;Ljava/lang/String;Lnet/minecraft/class_9012;)V - ARG 1 name - ARG 2 scores METHOD method_55429 removeScores (Lnet/minecraft/class_9015;)V ARG 1 scoreHolder METHOD method_55430 getScore (Lnet/minecraft/class_9015;Lnet/minecraft/class_266;)Lnet/minecraft/class_9013; diff --git a/mappings/net/minecraft/scoreboard/ScoreboardScore.mapping b/mappings/net/minecraft/scoreboard/ScoreboardScore.mapping index ec8c5b9030..d59fe42335 100644 --- a/mappings/net/minecraft/scoreboard/ScoreboardScore.mapping +++ b/mappings/net/minecraft/scoreboard/ScoreboardScore.mapping @@ -13,7 +13,7 @@ CLASS net/minecraft/class_267 net/minecraft/scoreboard/ScoreboardScore ARG 1 score METHOD method_55402 (Lnet/minecraft/class_267;Lnet/minecraft/class_9022;)V ARG 1 format - METHOD method_55403 fromNbt (Lnet/minecraft/class_2487;)Lnet/minecraft/class_267; + METHOD method_55403 fromNbt (Lnet/minecraft/class_2487;Lnet/minecraft/class_7225$class_7874;)Lnet/minecraft/class_267; ARG 0 nbt METHOD method_55404 (Lnet/minecraft/class_2487;Lnet/minecraft/class_2520;)V ARG 1 formatElement @@ -22,4 +22,4 @@ CLASS net/minecraft/class_267 net/minecraft/scoreboard/ScoreboardScore METHOD method_55406 setNumberFormat (Lnet/minecraft/class_9022;)V ARG 1 numberFormat METHOD method_55407 getDisplayText ()Lnet/minecraft/class_2561; - METHOD method_55408 toNbt ()Lnet/minecraft/class_2487; + METHOD method_55408 toNbt (Lnet/minecraft/class_7225$class_7874;)Lnet/minecraft/class_2487; diff --git a/mappings/net/minecraft/scoreboard/ScoreboardState.mapping b/mappings/net/minecraft/scoreboard/ScoreboardState.mapping index 7ef47d2b40..4e50545319 100644 --- a/mappings/net/minecraft/scoreboard/ScoreboardState.mapping +++ b/mappings/net/minecraft/scoreboard/ScoreboardState.mapping @@ -7,15 +7,15 @@ CLASS net/minecraft/class_273 net/minecraft/scoreboard/ScoreboardState METHOD method_1215 readTeamPlayersNbt (Lnet/minecraft/class_268;Lnet/minecraft/class_2499;)V ARG 1 team ARG 2 nbt - METHOD method_1216 objectivesToNbt ()Lnet/minecraft/class_2499; - METHOD method_1217 teamsToNbt ()Lnet/minecraft/class_2499; - METHOD method_1219 readTeamsNbt (Lnet/minecraft/class_2499;)V + METHOD method_1216 objectivesToNbt (Lnet/minecraft/class_7225$class_7874;)Lnet/minecraft/class_2499; + METHOD method_1217 teamsToNbt (Lnet/minecraft/class_7225$class_7874;)Lnet/minecraft/class_2499; + METHOD method_1219 readTeamsNbt (Lnet/minecraft/class_2499;Lnet/minecraft/class_7225$class_7874;)V ARG 1 nbt - METHOD method_1220 readObjectivesNbt (Lnet/minecraft/class_2499;)V + METHOD method_1220 readObjectivesNbt (Lnet/minecraft/class_2499;Lnet/minecraft/class_7225$class_7874;)V ARG 1 nbt METHOD method_1221 readDisplaySlotsNbt (Lnet/minecraft/class_2487;)V ARG 1 nbt METHOD method_1222 writeDisplaySlotsNbt (Lnet/minecraft/class_2487;)V ARG 1 nbt - METHOD method_32481 readNbt (Lnet/minecraft/class_2487;)Lnet/minecraft/class_273; + METHOD method_32481 readNbt (Lnet/minecraft/class_2487;Lnet/minecraft/class_7225$class_7874;)Lnet/minecraft/class_273; ARG 1 nbt diff --git a/mappings/net/minecraft/screen/MerchantScreenHandler.mapping b/mappings/net/minecraft/screen/MerchantScreenHandler.mapping index 85a14cdbc6..7666ba486e 100644 --- a/mappings/net/minecraft/screen/MerchantScreenHandler.mapping +++ b/mappings/net/minecraft/screen/MerchantScreenHandler.mapping @@ -35,10 +35,9 @@ CLASS net/minecraft/class_1728 net/minecraft/screen/MerchantScreenHandler ARG 1 levelProgress METHOD method_19258 getLevelProgress ()I METHOD method_19259 isLeveled ()Z - METHOD method_20214 autofill (ILnet/minecraft/class_1799;Z)V + METHOD method_20214 autofill (ILnet/minecraft/class_9306;)V ARG 1 slot ARG 2 stack - ARG 3 ignoreTags METHOD method_20215 switchTo (I)V ARG 1 recipeIndex METHOD method_20595 playYesSound ()V diff --git a/mappings/net/minecraft/server/command/ResetChunksCommand.mapping b/mappings/net/minecraft/server/command/ResetChunksCommand.mapping index 11e800405a..868ba6fe06 100644 --- a/mappings/net/minecraft/server/command/ResetChunksCommand.mapping +++ b/mappings/net/minecraft/server/command/ResetChunksCommand.mapping @@ -1,11 +1,5 @@ CLASS net/minecraft/class_6608 net/minecraft/server/command/ResetChunksCommand FIELD field_34882 LOGGER Lorg/slf4j/Logger; - METHOD method_38620 (Lnet/minecraft/class_2791;)V - ARG 0 chunk - METHOD method_38621 (Lnet/minecraft/class_2806;Lnet/minecraft/class_3846;Lnet/minecraft/class_3218;Lnet/minecraft/class_3215;Ljava/util/List;Lcom/mojang/datafixers/util/Unit;)Ljava/util/concurrent/CompletionStage; - ARG 5 unit - METHOD method_38622 (Lnet/minecraft/class_2806;Lcom/mojang/datafixers/util/Either;)Lcom/mojang/datafixers/util/Unit; - ARG 1 either METHOD method_38623 register (Lcom/mojang/brigadier/CommandDispatcher;)V ARG 0 dispatcher METHOD method_38624 (Lcom/mojang/brigadier/context/CommandContext;)I diff --git a/mappings/net/minecraft/server/integrated/IntegratedServerLoader.mapping b/mappings/net/minecraft/server/integrated/IntegratedServerLoader.mapping index 3d5f1f231a..14716bf5ec 100644 --- a/mappings/net/minecraft/server/integrated/IntegratedServerLoader.mapping +++ b/mappings/net/minecraft/server/integrated/IntegratedServerLoader.mapping @@ -52,36 +52,11 @@ CLASS net/minecraft/class_7196 net/minecraft/server/integrated/IntegratedServerL ARG 1 levelProperties ARG 2 safeMode ARG 3 dataPackManager - METHOD method_54611 (Lnet/minecraft/class_32$class_5143;Lnet/minecraft/class_3283;Lnet/minecraft/class_6904;Lnet/minecraft/class_1066;Ljava/lang/Runnable;Ljava/lang/Boolean;)V - ARG 6 confirmed - METHOD method_54612 (Lnet/minecraft/class_32$class_5143;Lcom/mojang/serialization/Dynamic;Ljava/lang/Runnable;ZZ)V - ARG 4 backup - ARG 5 eraseCache - METHOD method_54614 start (Lnet/minecraft/class_32$class_5143;Lcom/mojang/serialization/Dynamic;ZZLjava/lang/Runnable;)V - ARG 1 session - ARG 2 levelProperties - ARG 3 safeMode - ARG 4 canShowBackupPrompt - ARG 5 onCancel - METHOD method_54615 start (Lnet/minecraft/class_32$class_5143;Ljava/lang/Runnable;)V - ARG 1 session - ARG 2 onCancel - METHOD method_54616 (Lnet/minecraft/class_32$class_5143;Ljava/lang/Runnable;Z)V - ARG 3 recovered METHOD method_54617 (Lnet/minecraft/class_32$class_5143;Ljava/lang/Runnable;ZZ)V ARG 2 backup ARG 3 eraseCache - METHOD method_54618 start (Ljava/lang/String;Ljava/lang/Runnable;)V - ARG 1 levelName - ARG 2 onCancel - METHOD method_54619 (Ljava/lang/Throwable;)Ljava/lang/Void; - ARG 1 throwable - METHOD method_54620 (Ljava/lang/Void;)Ljava/lang/Boolean; - ARG 0 v METHOD method_54622 (Lcom/mojang/serialization/Dynamic;Lnet/minecraft/class_7237$class_7660;)Lnet/minecraft/class_7237$class_7661; ARG 1 context - METHOD method_54625 (Ljava/lang/Throwable;)Ljava/util/concurrent/CompletionStage; - ARG 1 throwable METHOD method_55510 applyWorldPack (Lnet/minecraft/class_1066;Lnet/minecraft/class_32$class_5143;)Ljava/util/concurrent/CompletableFuture; ARG 1 loader ARG 2 session diff --git a/mappings/net/minecraft/server/network/ServerPlayNetworkHandler.mapping b/mappings/net/minecraft/server/network/ServerPlayNetworkHandler.mapping index a516183dd8..ca132f87ef 100644 --- a/mappings/net/minecraft/server/network/ServerPlayNetworkHandler.mapping +++ b/mappings/net/minecraft/server/network/ServerPlayNetworkHandler.mapping @@ -98,7 +98,6 @@ CLASS net/minecraft/class_3244 net/minecraft/server/network/ServerPlayNetworkHan METHOD method_31277 filterText (Ljava/lang/String;)Ljava/util/concurrent/CompletableFuture; ARG 1 text METHOD method_31278 updateBookContent (Ljava/util/List;I)V - ARG 1 pages ARG 2 slotId METHOD method_31279 filterTexts (Ljava/util/List;)Ljava/util/concurrent/CompletableFuture; ARG 1 texts @@ -111,14 +110,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_33796 setTextToBook (Ljava/util/List;Ljava/util/function/UnaryOperator;Lnet/minecraft/class_1799;)V - ARG 1 messages - ARG 2 postProcessor - ARG 3 book - METHOD method_33797 (Ljava/util/function/UnaryOperator;Lnet/minecraft/class_5837;)Lnet/minecraft/class_2519; - ARG 1 message - METHOD method_33799 (Ljava/lang/String;)Ljava/lang/String; - ARG 0 text METHOD method_34882 clampHorizontal (D)D ARG 0 d METHOD method_34883 clampVertical (D)D diff --git a/mappings/net/minecraft/server/world/ChunkHolder.mapping b/mappings/net/minecraft/server/world/ChunkHolder.mapping index a68756a393..08093aeb65 100644 --- a/mappings/net/minecraft/server/world/ChunkHolder.mapping +++ b/mappings/net/minecraft/server/world/ChunkHolder.mapping @@ -7,8 +7,8 @@ CLASS net/minecraft/class_3193 net/minecraft/server/world/ChunkHolder FIELD field_13870 skyLightUpdateBits Ljava/util/BitSet; FIELD field_13871 blockLightUpdateBits Ljava/util/BitSet; 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; + FIELD field_16426 UNLOADED_CHUNK Lnet/minecraft/class_9259; + FIELD field_16427 UNLOADED_WORLD_CHUNK Lnet/minecraft/class_9259; FIELD field_16428 savingFuture Ljava/util/concurrent/CompletableFuture; FIELD field_16429 UNLOADED_WORLD_CHUNK_FUTURE Ljava/util/concurrent/CompletableFuture; FIELD field_16430 UNLOADED_CHUNK_FUTURE Ljava/util/concurrent/CompletableFuture; @@ -28,7 +28,7 @@ CLASS net/minecraft/class_3193 net/minecraft/server/world/ChunkHolder COMMENT Entries for a section are null if the section has no positions marked for update. FIELD field_26929 world Lnet/minecraft/class_5539; FIELD field_28806 actionStack Lnet/minecraft/class_5831; - FIELD field_36388 CHUNK_LOADING_NOT_FINISHED Lcom/mojang/datafixers/util/Either; + FIELD field_36388 CHUNK_LOADING_NOT_FINISHED Lnet/minecraft/class_9259; FIELD field_46085 postProcessingFuture Ljava/util/concurrent/CompletableFuture; 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 @@ -69,8 +69,6 @@ CLASS net/minecraft/class_3193 net/minecraft/server/world/ChunkHolder COMMENT chunk section y coordinate METHOD method_15890 setLevel (I)V ARG 1 level - METHOD method_16142 (Lnet/minecraft/class_2791;)Lnet/minecraft/class_2791; - ARG 0 chunk METHOD method_16143 combineSavingFuture (Ljava/util/concurrent/CompletableFuture;Ljava/lang/String;)V ARG 1 then ARG 2 thenDesc @@ -78,11 +76,6 @@ CLASS net/minecraft/class_3193 net/minecraft/server/world/ChunkHolder METHOD method_16145 getTickingFuture ()Ljava/util/concurrent/CompletableFuture; METHOD method_16146 getFutureFor (Lnet/minecraft/class_2806;)Ljava/util/concurrent/CompletableFuture; ARG 1 leastStatus - METHOD method_16147 (Lnet/minecraft/class_2791;Lcom/mojang/datafixers/util/Either;)Lnet/minecraft/class_2791; - ARG 0 result - ARG 1 thenResult - METHOD method_16148 (Lnet/minecraft/class_2791;Lnet/minecraft/class_3193$class_3724;)Lnet/minecraft/class_2791; - ARG 1 unloaded METHOD method_17207 setCompletedLevel (I)V ARG 1 level METHOD method_17208 getCompletedLevel ()I @@ -110,14 +103,10 @@ CLASS net/minecraft/class_3193 net/minecraft/server/world/ChunkHolder ARG 1 thenDesc ARG 2 then METHOD method_40066 collectFuturesByStatus ()Ljava/util/List; - METHOD method_41205 getAccessibleChunk ()Lnet/minecraft/class_2818; METHOD method_53680 combinePostProcessingFuture (Ljava/util/concurrent/CompletableFuture;)V ARG 1 postProcessingFuture METHOD method_53681 getPostProcessingFuture ()Ljava/util/concurrent/CompletableFuture; METHOD method_53682 getPostProcessedChunk ()Lnet/minecraft/class_2818; - 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; CLASS class_3896 LevelUpdateListener METHOD method_17209 updateLevel (Lnet/minecraft/class_1923;Ljava/util/function/IntSupplier;ILjava/util/function/IntConsumer;)V ARG 1 pos @@ -129,10 +118,13 @@ CLASS net/minecraft/class_3193 net/minecraft/server/world/ChunkHolder ARG 1 chunkPos ARG 2 onlyOnWatchDistanceEdge CLASS class_5830 MultithreadAction - FIELD field_28807 thread Ljava/lang/Thread; - FIELD field_28808 action Ljava/util/concurrent/CompletableFuture; - FIELD field_28809 actionDesc Ljava/lang/String; + FIELD comp_2364 thread Ljava/lang/Thread; + FIELD comp_2365 action Ljava/util/concurrent/CompletableFuture; + FIELD comp_2366 actionDesc Ljava/lang/String; METHOD (Ljava/lang/Thread;Ljava/util/concurrent/CompletableFuture;Ljava/lang/String;)V ARG 1 thread ARG 2 action ARG 3 actionDesc + METHOD comp_2364 thread ()Ljava/lang/Thread; + METHOD comp_2365 action ()Ljava/util/concurrent/CompletableFuture; + METHOD comp_2366 actionDesc ()Ljava/lang/String; diff --git a/mappings/net/minecraft/server/world/ChunkTicketManager.mapping b/mappings/net/minecraft/server/world/ChunkTicketManager.mapping index 49827b48ea..4908fc5a03 100644 --- a/mappings/net/minecraft/server/world/ChunkTicketManager.mapping +++ b/mappings/net/minecraft/server/world/ChunkTicketManager.mapping @@ -75,8 +75,6 @@ CLASS net/minecraft/class_3204 net/minecraft/server/world/ChunkTicketManager ARG 2 pos ARG 3 radius ARG 4 argument - METHOD method_17642 (JLcom/mojang/datafixers/util/Either;)V - ARG 3 either METHOD method_17645 removeTicket (JLnet/minecraft/class_3228;)V ARG 1 pos ARG 3 ticket diff --git a/mappings/net/minecraft/server/world/ServerChunkManager.mapping b/mappings/net/minecraft/server/world/ServerChunkManager.mapping index 2c5f4108c9..31bc7e2e0a 100644 --- a/mappings/net/minecraft/server/world/ServerChunkManager.mapping +++ b/mappings/net/minecraft/server/world/ServerChunkManager.mapping @@ -48,12 +48,8 @@ CLASS net/minecraft/class_3215 net/minecraft/server/world/ServerChunkManager METHOD method_14144 applyViewDistance (I)V ARG 1 watchDistance METHOD method_14161 tickChunks ()V - METHOD method_16150 (Lnet/minecraft/class_2791;)Lnet/minecraft/class_2791; - ARG 0 chunk 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 COMMENT Adds a chunk ticket to the ticket manager. COMMENT diff --git a/mappings/net/minecraft/server/world/ThreadedAnvilChunkStorage.mapping b/mappings/net/minecraft/server/world/ThreadedAnvilChunkStorage.mapping index 801cabfec0..49c87472f5 100644 --- a/mappings/net/minecraft/server/world/ThreadedAnvilChunkStorage.mapping +++ b/mappings/net/minecraft/server/world/ThreadedAnvilChunkStorage.mapping @@ -15,7 +15,6 @@ CLASS net/minecraft/class_3898 net/minecraft/server/world/ThreadedAnvilChunkStor FIELD field_17230 totalChunksLoadedCount Ljava/util/concurrent/atomic/AtomicInteger; FIELD field_17442 worldGenerationProgressListener Lnet/minecraft/class_3949; 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_18241 playerChunkWatchingManager Lnet/minecraft/class_3210; FIELD field_18242 entityTrackers Lit/unimi/dsi/fastutil/ints/Int2ObjectMap; @@ -50,7 +49,7 @@ CLASS net/minecraft/class_3898 net/minecraft/server/world/ThreadedAnvilChunkStor METHOD method_17212 getLightingProvider ()Lnet/minecraft/class_3227; METHOD method_17214 setViewDistance (I)V ARG 1 watchDistance - METHOD method_17215 (IIILjava/util/List;)Lcom/mojang/datafixers/util/Either; + METHOD method_17215 (IIILjava/util/List;)Lnet/minecraft/class_9259; ARG 4 chunks METHOD method_17216 getChunkHolder (J)Lnet/minecraft/class_3193; ARG 1 pos @@ -64,12 +63,7 @@ CLASS net/minecraft/class_3898 net/minecraft/server/world/ThreadedAnvilChunkStor ARG 1 centerChunk ARG 2 margin ARG 3 distanceToStatus - 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; - ARG 5 chunks - METHOD method_17226 convertToFullChunk (Lnet/minecraft/class_3193;)Ljava/util/concurrent/CompletableFuture; - ARG 1 chunkHolder + METHOD method_17226 convertToFullChunk (Lnet/minecraft/class_3193;Lnet/minecraft/class_2791;)Ljava/util/concurrent/CompletableFuture; METHOD method_17227 (Lnet/minecraft/class_3193;Lnet/minecraft/class_2791;)Lnet/minecraft/class_2791; ARG 2 protoChunk METHOD method_17228 save (Lnet/minecraft/class_2791;)Z @@ -77,8 +71,6 @@ CLASS net/minecraft/class_3898 net/minecraft/server/world/ThreadedAnvilChunkStor METHOD method_17229 getRequiredStatusForGeneration (Lnet/minecraft/class_2806;I)Lnet/minecraft/class_2806; ARG 1 centerChunkTargetStatus ARG 2 distance - METHOD method_17230 (Lcom/mojang/datafixers/util/Either;)Lcom/mojang/datafixers/util/Either; - ARG 0 either METHOD method_17232 (Ljava/util/List;)Lnet/minecraft/class_2818; ARG 0 chunks METHOD method_17233 tick (Ljava/util/function/BooleanSupplier;)V @@ -149,19 +141,11 @@ CLASS net/minecraft/class_3898 net/minecraft/server/world/ThreadedAnvilChunkStor METHOD method_19487 (Lnet/minecraft/class_3193;Ljava/lang/Runnable;)V ARG 2 task METHOD method_19488 getPointOfInterestStorage ()Lnet/minecraft/class_4153; - METHOD method_19534 (Lnet/minecraft/class_3193;Lnet/minecraft/class_2791;)Ljava/util/concurrent/CompletableFuture; - ARG 2 chunk - METHOD method_20440 (Lnet/minecraft/class_1923;Lnet/minecraft/class_3193$class_3724;)Ljava/util/concurrent/CompletableFuture; - ARG 2 unloaded METHOD method_20441 releaseLightTicket (Lnet/minecraft/class_1923;)V ARG 1 pos METHOD method_20458 tryUnloadChunk (JLnet/minecraft/class_3193;)V ARG 1 pos ARG 3 holder - METHOD method_20460 (Lnet/minecraft/class_3193;Lcom/mojang/datafixers/util/Either;)Lcom/mojang/datafixers/util/Either; - 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 @@ -194,13 +178,9 @@ CLASS net/minecraft/class_3898 net/minecraft/server/world/ThreadedAnvilChunkStor 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; - ARG 0 chunk - METHOD method_21678 (Lnet/minecraft/class_3193$class_3724;)Ljava/lang/String; - ARG 0 unloaded METHOD method_23272 getChunkLoadingDebugInfo (Lnet/minecraft/class_1923;)Ljava/lang/String; ARG 1 chunkPos - METHOD method_27053 mark (Lnet/minecraft/class_1923;Lnet/minecraft/class_2806$class_2808;)B + METHOD method_27053 mark (Lnet/minecraft/class_1923;Lnet/minecraft/class_2808;)B ARG 1 pos ARG 2 type METHOD method_27054 markAsProtoChunk (Lnet/minecraft/class_1923;)V @@ -256,14 +236,12 @@ CLASS net/minecraft/class_3898 net/minecraft/server/world/ThreadedAnvilChunkStor 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; + METHOD method_43374 (Lnet/minecraft/class_1923;Ljava/lang/Throwable;)Lnet/minecraft/class_2791; ARG 2 throwable - METHOD method_43375 (Lnet/minecraft/class_1923;Ljava/util/Optional;)Lcom/mojang/datafixers/util/Either; + METHOD method_43375 (Lnet/minecraft/class_1923;Ljava/util/Optional;)Lnet/minecraft/class_2791; ARG 2 nbt - METHOD method_43376 recoverFromException (Ljava/lang/Throwable;Lnet/minecraft/class_1923;)Lcom/mojang/datafixers/util/Either; + METHOD method_43376 recoverFromException (Ljava/lang/Throwable;Lnet/minecraft/class_1923;)Lnet/minecraft/class_2791; ARG 1 throwable ARG 2 chunkPos METHOD method_43377 (Ljava/util/Optional;)Ljava/util/Optional; @@ -288,10 +266,7 @@ CLASS net/minecraft/class_3898 net/minecraft/server/world/ThreadedAnvilChunkStor 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 + METHOD method_51834 (Lnet/minecraft/class_9259;Ljava/lang/Throwable;)Ljava/lang/Object; ARG 2 throwable METHOD method_52345 isTracked (Lnet/minecraft/class_3222;II)Z ARG 1 player @@ -319,8 +294,6 @@ CLASS net/minecraft/class_3898 net/minecraft/server/world/ThreadedAnvilChunkStor ARG 1 chunkPos METHOD method_52355 (Lnet/minecraft/class_3222;Lnet/minecraft/class_1923;)V ARG 2 chunkPos - METHOD method_53683 (Lnet/minecraft/class_3193;Lcom/mojang/datafixers/util/Either;)Lcom/mojang/datafixers/util/Either; - ARG 2 either METHOD method_53684 (Lnet/minecraft/class_3193;Lnet/minecraft/class_2818;)V ARG 2 chunk METHOD method_53685 forceLighting (Lnet/minecraft/class_1923;I)V diff --git a/mappings/net/minecraft/test/TestFunction.mapping b/mappings/net/minecraft/test/TestFunction.mapping index 6b98b8d9cd..a352587efd 100644 --- a/mappings/net/minecraft/test/TestFunction.mapping +++ b/mappings/net/minecraft/test/TestFunction.mapping @@ -12,16 +12,6 @@ CLASS net/minecraft/class_4529 net/minecraft/test/TestFunction ARG 5 duration ARG 7 required ARG 8 starter - METHOD (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Lnet/minecraft/class_2470;IJZIIZLjava/util/function/Consumer;)V - ARG 1 batchId - ARG 2 templatePath - ARG 3 templateName - ARG 4 rotation - ARG 5 tickLimit - ARG 6 duration - ARG 8 required - ARG 9 requiredSuccesses - ARG 10 maxAttempts METHOD (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Lnet/minecraft/class_2470;IJZLjava/util/function/Consumer;)V ARG 1 batchId ARG 2 templatePath @@ -31,6 +21,14 @@ CLASS net/minecraft/class_4529 net/minecraft/test/TestFunction ARG 6 setupTicks ARG 8 required ARG 9 starter + METHOD (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Lnet/minecraft/class_2470;IJZZIIZLjava/util/function/Consumer;)V + ARG 1 batchId + ARG 2 templatePath + ARG 3 templateName + ARG 4 rotation + ARG 5 tickLimit + ARG 6 duration + ARG 8 required METHOD comp_2218 batchId ()Ljava/lang/String; METHOD comp_2219 templatePath ()Ljava/lang/String; METHOD comp_2220 templateName ()Ljava/lang/String; diff --git a/mappings/net/minecraft/text/HoverEvent.mapping b/mappings/net/minecraft/text/HoverEvent.mapping index 5fe44027c3..94d31af3cf 100644 --- a/mappings/net/minecraft/text/HoverEvent.mapping +++ b/mappings/net/minecraft/text/HoverEvent.mapping @@ -26,11 +26,10 @@ CLASS net/minecraft/class_2568 net/minecraft/text/HoverEvent FIELD field_46604 CODEC Lcom/mojang/serialization/Codec; FIELD field_46605 codec Lcom/mojang/serialization/Codec; FIELD field_46606 legacyCodec Lcom/mojang/serialization/Codec; - METHOD (Ljava/lang/String;ZLcom/mojang/serialization/Codec;Ljava/util/function/Function;)V + METHOD (Ljava/lang/String;ZLcom/mojang/serialization/Codec;Lnet/minecraft/class_2568$class_9341;)V ARG 1 name ARG 2 parsable ARG 3 contentCodec - ARG 4 legacySerializer METHOD method_27667 isParsable ()Z METHOD method_27676 cast (Ljava/lang/Object;)Ljava/lang/Object; ARG 1 o @@ -38,10 +37,6 @@ CLASS net/minecraft/class_2568 net/minecraft/text/HoverEvent ARG 0 action METHOD method_54187 (Lnet/minecraft/class_2568$class_8826;)Ljava/lang/Object; ARG 0 action - METHOD method_54189 (Ljava/lang/Object;)Lnet/minecraft/class_2568$class_8826; - ARG 1 text - METHOD method_54191 (Ljava/lang/Object;)Lnet/minecraft/class_2568$class_8826; - ARG 1 content CLASS class_5248 EntityContent FIELD field_24351 entityType Lnet/minecraft/class_1299; FIELD field_24352 uuid Ljava/util/UUID; @@ -61,7 +56,7 @@ CLASS net/minecraft/class_2568 net/minecraft/text/HoverEvent METHOD method_27682 asTooltip ()Ljava/util/List; METHOD method_54193 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; ARG 0 instance - METHOD method_54195 legacySerializer (Lnet/minecraft/class_2561;)Lcom/mojang/serialization/DataResult; + METHOD method_54195 legacySerializer (Lnet/minecraft/class_2561;Lnet/minecraft/class_6903;)Lcom/mojang/serialization/DataResult; ARG 0 text METHOD method_54196 (Lnet/minecraft/class_2568$class_5248;)Ljava/util/Optional; ARG 0 content @@ -70,41 +65,20 @@ CLASS net/minecraft/class_2568 net/minecraft/text/HoverEvent METHOD method_54198 (Lnet/minecraft/class_2568$class_5248;)Lnet/minecraft/class_1299; ARG 0 content CLASS class_5249 ItemStackContent - FIELD field_24355 item Lnet/minecraft/class_1792; + FIELD field_24355 item Lnet/minecraft/class_6880; FIELD field_24356 count I - FIELD field_24357 nbt Ljava/util/Optional; FIELD field_24358 stack Lnet/minecraft/class_1799; FIELD field_46608 ITEM_STACK_CODEC Lcom/mojang/serialization/Codec; FIELD field_46609 CODEC Lcom/mojang/serialization/Codec; - METHOD (Lnet/minecraft/class_1792;ILjava/util/Optional;)V - ARG 1 item - ARG 2 count - ARG 3 nbt - METHOD (Lnet/minecraft/class_1792;ILnet/minecraft/class_2487;)V - ARG 1 item - ARG 2 count - ARG 3 nbt METHOD (Lnet/minecraft/class_1799;)V ARG 1 stack + METHOD (Lnet/minecraft/class_6880;ILnet/minecraft/class_9326;)V + ARG 2 count METHOD equals (Ljava/lang/Object;)Z ARG 1 o METHOD method_27683 asStack ()Lnet/minecraft/class_1799; - METHOD method_54199 (Lnet/minecraft/class_1792;)Lnet/minecraft/class_2568$class_5249; - ARG 0 item - METHOD method_54201 (Lcom/mojang/datafixers/util/Either;)Lnet/minecraft/class_2568$class_5249; - ARG 0 either - METHOD method_54202 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; - ARG 0 instance - METHOD method_54203 legacySerializer (Lnet/minecraft/class_2561;)Lcom/mojang/serialization/DataResult; + METHOD method_54203 legacySerializer (Lnet/minecraft/class_2561;Lnet/minecraft/class_6903;)Lcom/mojang/serialization/DataResult; ARG 0 text - METHOD method_54204 (Lnet/minecraft/class_2568$class_5249;)Lnet/minecraft/class_2568$class_5249; - ARG 0 content - METHOD method_54205 (Lnet/minecraft/class_2568$class_5249;)Ljava/util/Optional; - ARG 0 content - METHOD method_54206 (Lnet/minecraft/class_2568$class_5249;)Ljava/lang/Integer; - ARG 0 content - METHOD method_54207 (Lnet/minecraft/class_2568$class_5249;)Lnet/minecraft/class_1792; - ARG 0 content CLASS class_8826 EventData FIELD field_46610 CODEC Lcom/mojang/serialization/MapCodec; FIELD field_46611 LEGACY_CODEC Lcom/mojang/serialization/MapCodec; diff --git a/mappings/net/minecraft/text/Text.mapping b/mappings/net/minecraft/text/Text.mapping index c05d84c244..6125591bb7 100644 --- a/mappings/net/minecraft/text/Text.mapping +++ b/mappings/net/minecraft/text/Text.mapping @@ -120,19 +120,17 @@ CLASS net/minecraft/class_2561 net/minecraft/text/Text COMMENT Such texts are serialized as a string instead of an object. CLASS class_2562 Serialization FIELD field_11754 GSON Lcom/google/gson/Gson; - METHOD method_10867 toJsonString (Lnet/minecraft/class_2561;)Ljava/lang/String; + METHOD method_10867 toJsonString (Lnet/minecraft/class_2561;Lnet/minecraft/class_7225$class_7874;)Ljava/lang/String; ARG 0 text - METHOD method_10868 toJsonTree (Lnet/minecraft/class_2561;)Lcom/google/gson/JsonElement; + METHOD method_10871 fromJson (Lcom/google/gson/JsonElement;Lnet/minecraft/class_7225$class_7874;)Lnet/minecraft/class_5250; + ARG 0 json + METHOD method_10872 fromJsonTree (Lcom/google/gson/JsonElement;Lnet/minecraft/class_7225$class_7874;)Lnet/minecraft/class_5250; + ARG 0 json + METHOD method_10873 fromLenientJson (Ljava/lang/String;Lnet/minecraft/class_7225$class_7874;)Lnet/minecraft/class_5250; + ARG 0 json + METHOD method_10874 toJson (Lnet/minecraft/class_2561;Lnet/minecraft/class_7225$class_7874;)Lcom/google/gson/JsonElement; ARG 0 text - METHOD method_10871 fromJson (Lcom/google/gson/JsonElement;)Lnet/minecraft/class_5250; - ARG 0 json - METHOD method_10872 fromJsonTree (Lcom/google/gson/JsonElement;)Lnet/minecraft/class_5250; - ARG 0 json - METHOD method_10873 fromLenientJson (Ljava/lang/String;)Lnet/minecraft/class_5250; - ARG 0 json - METHOD method_10874 toJson (Lnet/minecraft/class_2561;)Lcom/google/gson/JsonElement; - ARG 0 text - METHOD method_10877 fromJson (Ljava/lang/String;)Lnet/minecraft/class_5250; + METHOD method_10877 fromJson (Ljava/lang/String;Lnet/minecraft/class_7225$class_7874;)Lnet/minecraft/class_5250; ARG 0 json CLASS class_8822 Serializer METHOD deserialize (Lcom/google/gson/JsonElement;Ljava/lang/reflect/Type;Lcom/google/gson/JsonDeserializationContext;)Ljava/lang/Object; diff --git a/mappings/net/minecraft/text/TextCodecs.mapping b/mappings/net/minecraft/text/TextCodecs.mapping index eeac4f9873..52047eed12 100644 --- a/mappings/net/minecraft/text/TextCodecs.mapping +++ b/mappings/net/minecraft/text/TextCodecs.mapping @@ -3,9 +3,6 @@ CLASS net/minecraft/class_8824 net/minecraft/text/TextCodecs FIELD field_46598 STRINGIFIED_CODEC Lcom/mojang/serialization/Codec; FIELD field_48540 REGISTRY_PACKET_CODEC Lnet/minecraft/class_9139; FIELD field_48985 OPTIONAL_PACKET_CODEC Lnet/minecraft/class_9139; - FIELD field_48986 PACKET_CODEC Lnet/minecraft/class_9139; - METHOD method_54164 (Lcom/google/gson/JsonElement;)Lcom/mojang/serialization/DataResult; - ARG 0 json METHOD method_54165 (Lcom/mojang/datafixers/util/Either;)Lnet/minecraft/class_2561; ARG 0 either METHOD method_54166 createCodec (Lcom/mojang/serialization/Codec;)Lcom/mojang/serialization/Codec; @@ -29,8 +26,6 @@ CLASS net/minecraft/class_8824 net/minecraft/text/TextCodecs ARG 0 either2 METHOD method_54177 (Lnet/minecraft/class_2561;)Lnet/minecraft/class_2561; ARG 0 text - METHOD method_54179 (Lnet/minecraft/class_2561;)Lcom/mojang/serialization/DataResult; - ARG 0 text CLASS class_8825 FuzzyCodec FIELD field_46599 codecs Ljava/util/List; FIELD field_46600 codecGetter Ljava/util/function/Function; diff --git a/mappings/net/minecraft/unused/packageinfo/PackageInfo9303.mapping b/mappings/net/minecraft/unused/packageinfo/PackageInfo9303.mapping new file mode 100644 index 0000000000..1d577550fa --- /dev/null +++ b/mappings/net/minecraft/unused/packageinfo/PackageInfo9303.mapping @@ -0,0 +1 @@ +CLASS net/minecraft/class_9303 net/minecraft/unused/packageinfo/PackageInfo9303 diff --git a/mappings/net/minecraft/unused/packageinfo/PackageInfo9313.mapping b/mappings/net/minecraft/unused/packageinfo/PackageInfo9313.mapping new file mode 100644 index 0000000000..54da949bac --- /dev/null +++ b/mappings/net/minecraft/unused/packageinfo/PackageInfo9313.mapping @@ -0,0 +1 @@ +CLASS net/minecraft/class_9313 net/minecraft/unused/packageinfo/PackageInfo9313 diff --git a/mappings/net/minecraft/unused/packageinfo/PackageInfo9337.mapping b/mappings/net/minecraft/unused/packageinfo/PackageInfo9337.mapping new file mode 100644 index 0000000000..58f83bfc44 --- /dev/null +++ b/mappings/net/minecraft/unused/packageinfo/PackageInfo9337.mapping @@ -0,0 +1 @@ +CLASS net/minecraft/class_9337 net/minecraft/unused/packageinfo/PackageInfo9337 diff --git a/mappings/net/minecraft/util/Util.mapping b/mappings/net/minecraft/util/Util.mapping index affefeabfa..e65a1d9199 100644 --- a/mappings/net/minecraft/util/Util.mapping +++ b/mappings/net/minecraft/util/Util.mapping @@ -281,16 +281,6 @@ CLASS net/minecraft/class_156 net/minecraft/util/Util 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_53909 lastIdentityIndexGetter (Ljava/util/List;)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 using identity comparison} diff --git a/mappings/net/minecraft/util/dynamic/Codecs.mapping b/mappings/net/minecraft/util/dynamic/Codecs.mapping index 00c5bacda6..2c99ff25ca 100644 --- a/mappings/net/minecraft/util/dynamic/Codecs.mapping +++ b/mappings/net/minecraft/util/dynamic/Codecs.mapping @@ -24,7 +24,6 @@ CLASS net/minecraft/class_5699 net/minecraft/util/dynamic/Codecs 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; @@ -224,8 +223,6 @@ CLASS net/minecraft/class_5699 net/minecraft/util/dynamic/Codecs 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; @@ -284,8 +281,6 @@ CLASS net/minecraft/class_5699 net/minecraft/util/dynamic/Codecs ARG 1 elementCodec METHOD method_53826 (Ljava/lang/String;)Lcom/mojang/serialization/DataResult; ARG 0 string - METHOD method_53917 (Lcom/google/gson/JsonElement;)Lcom/mojang/serialization/DataResult; - ARG 0 json METHOD method_53918 fromOps (Lcom/mojang/serialization/DynamicOps;)Lcom/mojang/serialization/Codec; ARG 0 ops METHOD method_53919 (Lcom/mojang/serialization/DynamicOps;Lcom/mojang/serialization/Dynamic;)Ljava/lang/Object; diff --git a/mappings/net/minecraft/village/TradeOffer.mapping b/mappings/net/minecraft/village/TradeOffer.mapping index 088338327f..c663e53bac 100644 --- a/mappings/net/minecraft/village/TradeOffer.mapping +++ b/mappings/net/minecraft/village/TradeOffer.mapping @@ -4,57 +4,38 @@ CLASS net/minecraft/class_1914 net/minecraft/village/TradeOffer FIELD field_18678 priceMultiplier F FIELD field_18679 merchantExperience I FIELD field_48371 PACKET_CODEC Lnet/minecraft/class_9139; - FIELD field_48372 ignoreNbt Z FIELD field_48849 CODEC Lcom/mojang/serialization/Codec; - FIELD field_9143 secondBuyItem Lnet/minecraft/class_1799; + FIELD field_9143 secondBuyItem Ljava/util/Optional; FIELD field_9144 maxUses I FIELD field_9145 rewardingPlayerExperience Z - FIELD field_9146 firstBuyItem Lnet/minecraft/class_1799; + FIELD field_9146 firstBuyItem Lnet/minecraft/class_9306; FIELD field_9147 uses I FIELD field_9148 sellItem Lnet/minecraft/class_1799; - METHOD (Lnet/minecraft/class_1799;Lnet/minecraft/class_1799;IIF)V - ARG 1 buyItem - ARG 2 sellItem - ARG 3 maxUses - ARG 4 merchantExperience - ARG 5 priceMultiplier - METHOD (Lnet/minecraft/class_1799;Lnet/minecraft/class_1799;Lnet/minecraft/class_1799;IIF)V + METHOD (Lnet/minecraft/class_1914;)V + ARG 1 offer + METHOD (Lnet/minecraft/class_9306;Ljava/util/Optional;Lnet/minecraft/class_1799;IIF)V ARG 1 firstBuyItem - ARG 2 secondBuyItem ARG 3 sellItem ARG 4 maxUses ARG 5 merchantExperience ARG 6 priceMultiplier - METHOD (Lnet/minecraft/class_1799;Lnet/minecraft/class_1799;Lnet/minecraft/class_1799;IIIF)V + METHOD (Lnet/minecraft/class_9306;Ljava/util/Optional;Lnet/minecraft/class_1799;IIIF)V ARG 1 firstBuyItem - ARG 2 secondBuyItem ARG 3 sellItem ARG 4 uses ARG 5 maxUses ARG 6 merchantExperience ARG 7 priceMultiplier - METHOD (Lnet/minecraft/class_1799;Lnet/minecraft/class_1799;Lnet/minecraft/class_1799;IIIFI)V + METHOD (Lnet/minecraft/class_9306;Ljava/util/Optional;Lnet/minecraft/class_1799;IIIFI)V ARG 1 firstBuyItem - ARG 2 secondBuyItem ARG 3 sellItem ARG 4 uses ARG 5 maxUses ARG 6 merchantExperience ARG 7 priceMultiplier ARG 8 demandBonus - METHOD (Lnet/minecraft/class_1799;Lnet/minecraft/class_1799;Lnet/minecraft/class_1799;IIIFIZ)V + METHOD (Lnet/minecraft/class_9306;Ljava/util/Optional;Lnet/minecraft/class_1799;IIZIIFI)V ARG 1 firstBuyItem - ARG 2 secondBuyItem - ARG 3 sellItem - ARG 4 uses - ARG 5 maxUses - ARG 6 merchantExperience - ARG 7 priceMultiplier - ARG 8 demandBonus - ARG 9 ignoreNbt - METHOD (Lnet/minecraft/class_1799;Lnet/minecraft/class_1799;Lnet/minecraft/class_1799;IIZIIFIZ)V - ARG 1 firstBuyItem - ARG 2 secondBuyItem ARG 3 sellItem ARG 4 uses ARG 5 maxUses @@ -63,19 +44,17 @@ CLASS net/minecraft/class_1914 net/minecraft/village/TradeOffer ARG 8 demandBonus ARG 9 priceMultiplier ARG 10 merchantExperience - ARG 11 ignoreNbt - METHOD (Lnet/minecraft/class_1914;)V - ARG 1 offer + METHOD (Lnet/minecraft/class_9306;Lnet/minecraft/class_1799;IIF)V + ARG 1 buyItem + ARG 2 sellItem + ARG 3 maxUses + ARG 4 merchantExperience + ARG 5 priceMultiplier METHOD method_16952 matchesBuyItems (Lnet/minecraft/class_1799;Lnet/minecraft/class_1799;)Z - ARG 1 offered ARG 2 buyItem METHOD method_16953 depleteBuyItems (Lnet/minecraft/class_1799;Lnet/minecraft/class_1799;)Z ARG 1 firstBuyStack ARG 2 secondBuyStack - METHOD method_16954 acceptsBuy (Lnet/minecraft/class_1799;Lnet/minecraft/class_1799;Z)Z - ARG 0 offered - ARG 1 buyItem - ARG 2 ignoreNbt METHOD method_18019 copySellItem ()Lnet/minecraft/class_1799; COMMENT Returns a copy of the sell item of this trade offer. METHOD method_19272 getAdjustedFirstBuyItem ()Lnet/minecraft/class_1799; @@ -124,11 +103,8 @@ CLASS net/minecraft/class_1914 net/minecraft/village/TradeOffer METHOD method_56111 write (Lnet/minecraft/class_9129;Lnet/minecraft/class_1914;)V ARG 0 buf ARG 1 offer - METHOD method_56112 shouldIgnoreNbt ()Z METHOD method_56705 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; ARG 0 instance - METHOD method_56706 (Lnet/minecraft/class_1914;)Ljava/lang/Boolean; - ARG 0 tradeOffer METHOD method_56707 (Lnet/minecraft/class_1914;)Ljava/lang/Integer; ARG 0 tradeOffer METHOD method_56708 (Lnet/minecraft/class_1914;)Ljava/lang/Float; @@ -145,9 +121,9 @@ CLASS net/minecraft/class_1914 net/minecraft/village/TradeOffer ARG 0 tradeOffer METHOD method_56714 (Lnet/minecraft/class_1914;)Lnet/minecraft/class_1799; ARG 0 tradeOffer - METHOD method_56715 (Lnet/minecraft/class_1914;)Lnet/minecraft/class_1799; + METHOD method_56715 (Lnet/minecraft/class_1914;)Ljava/util/Optional; ARG 0 tradeOffer - METHOD method_56716 (Lnet/minecraft/class_1914;)Lnet/minecraft/class_1799; + METHOD method_56716 (Lnet/minecraft/class_1914;)Lnet/minecraft/class_9306; ARG 0 tradeOffer METHOD method_8244 use ()V COMMENT Increments the number of times this trade offer has been used. diff --git a/mappings/net/minecraft/village/TradeOffers.mapping b/mappings/net/minecraft/village/TradeOffers.mapping index b14131966a..52741f9832 100644 --- a/mappings/net/minecraft/village/TradeOffers.mapping +++ b/mappings/net/minecraft/village/TradeOffers.mapping @@ -94,12 +94,7 @@ CLASS net/minecraft/class_3853 net/minecraft/village/TradeOffers 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 + FIELD field_45130 stack Lnet/minecraft/class_9306; METHOD (Lnet/minecraft/class_1935;III)V ARG 1 item ARG 2 count @@ -111,6 +106,11 @@ CLASS net/minecraft/class_3853 net/minecraft/village/TradeOffers ARG 3 maxUses ARG 4 experience ARG 5 price + METHOD (Lnet/minecraft/class_9306;III)V + ARG 1 stack + ARG 2 maxUses + ARG 3 experience + ARG 4 price CLASS class_4162 TypeAwareBuyForOneEmeraldFactory FIELD field_18553 map Ljava/util/Map; FIELD field_18554 count I @@ -143,13 +143,12 @@ CLASS net/minecraft/class_3853 net/minecraft/village/TradeOffers ARG 4 experience ARG 5 multiplier CLASS class_4164 ProcessItemFactory - FIELD field_18563 toBeProcessed Lnet/minecraft/class_1799; + FIELD field_18563 toBeProcessed Lnet/minecraft/class_9306; FIELD field_18565 price I FIELD field_18566 processed Lnet/minecraft/class_1799; FIELD field_18568 maxUses I FIELD field_18569 experience I FIELD field_18570 multiplier F - FIELD field_48346 ignoreNbt Z METHOD (Lnet/minecraft/class_1935;IILnet/minecraft/class_1792;IIIF)V ARG 1 item ARG 2 count @@ -159,16 +158,6 @@ CLASS net/minecraft/class_3853 net/minecraft/village/TradeOffers ARG 6 maxUses ARG 7 experience ARG 8 mutiplier - METHOD (Lnet/minecraft/class_1935;IILnet/minecraft/class_1792;IIIFZ)V - ARG 1 item - ARG 2 count - ARG 3 price - ARG 4 processed - ARG 5 processedCount - ARG 6 maxUses - ARG 7 experience - ARG 8 multiplier - ARG 9 ignoreNbt METHOD (Lnet/minecraft/class_1935;IILnet/minecraft/class_1799;IIIF)V ARG 1 item ARG 2 count @@ -178,16 +167,9 @@ CLASS net/minecraft/class_3853 net/minecraft/village/TradeOffers ARG 6 maxUses ARG 7 experience ARG 8 multiplier - METHOD (Lnet/minecraft/class_1935;IILnet/minecraft/class_1799;IIIFZ)V - ARG 1 item + METHOD (Lnet/minecraft/class_9306;ILnet/minecraft/class_1799;IIF)V ARG 2 count - ARG 3 price - ARG 4 processed ARG 5 processedCount - ARG 6 maxUses - ARG 7 experience - ARG 8 multiplier - ARG 9 ignoreNbt CLASS class_4165 SellItemFactory FIELD field_18571 sell Lnet/minecraft/class_1799; FIELD field_18572 price I @@ -234,15 +216,14 @@ CLASS net/minecraft/class_3853 net/minecraft/village/TradeOffers CLASS class_4166 SellSuspiciousStewFactory 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 + FIELD field_45756 stewEffects Lnet/minecraft/class_9298; METHOD (Lnet/minecraft/class_6880;II)V ARG 1 effect ARG 2 duration ARG 3 experience + METHOD (Lnet/minecraft/class_9298;IF)V + ARG 2 experience + ARG 3 multiplier CLASS class_4167 SellPotionHoldingItemFactory FIELD field_18581 sell Lnet/minecraft/class_1799; FIELD field_18582 sellCount I diff --git a/mappings/net/minecraft/village/raid/Raid.mapping b/mappings/net/minecraft/village/raid/Raid.mapping index c26628b44e..44a6674385 100644 --- a/mappings/net/minecraft/village/raid/Raid.mapping +++ b/mappings/net/minecraft/village/raid/Raid.mapping @@ -24,7 +24,7 @@ CLASS net/minecraft/class_3765 net/minecraft/village/raid/Raid 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_30683 OMINOUS_BANNER_TRANSLATION_KEY Lnet/minecraft/class_2561; FIELD field_30684 RAIDERS_REMAINING_TRANSLATION_KEY Ljava/lang/String; FIELD field_30686 DEFAULT_PRE_RAID_TICKS I FIELD field_30689 MAX_ACTIVE_TICKS I diff --git a/mappings/net/minecraft/world/ChunkRegion.mapping b/mappings/net/minecraft/world/ChunkRegion.mapping index 41d7568a20..a4a3e082f0 100644 --- a/mappings/net/minecraft/world/ChunkRegion.mapping +++ b/mappings/net/minecraft/world/ChunkRegion.mapping @@ -12,7 +12,6 @@ CLASS net/minecraft/class_3233 net/minecraft/world/ChunkRegion FIELD field_20668 biomeAccess Lnet/minecraft/class_4543; FIELD field_23788 lowerCorner Lnet/minecraft/class_1923; FIELD field_23789 upperCorner Lnet/minecraft/class_1923; - FIELD field_26822 structureAccessor Lnet/minecraft/class_5138; FIELD field_28557 centerPos Lnet/minecraft/class_2791; FIELD field_33754 status Lnet/minecraft/class_2806; FIELD field_33755 placementRadius I diff --git a/mappings/net/minecraft/world/ChunkSerializer.mapping b/mappings/net/minecraft/world/ChunkSerializer.mapping index add62cc1c5..f9be226314 100644 --- a/mappings/net/minecraft/world/ChunkSerializer.mapping +++ b/mappings/net/minecraft/world/ChunkSerializer.mapping @@ -11,7 +11,7 @@ CLASS net/minecraft/class_2852 net/minecraft/world/ChunkSerializer FIELD field_37663 SECTIONS_KEY Ljava/lang/String; FIELD field_37664 BLOCK_LIGHT_KEY Ljava/lang/String; FIELD field_37665 SKY_LIGHT_KEY Ljava/lang/String; - METHOD method_12377 getChunkType (Lnet/minecraft/class_2487;)Lnet/minecraft/class_2806$class_2808; + METHOD method_12377 getChunkType (Lnet/minecraft/class_2487;)Lnet/minecraft/class_2808; ARG 0 nbt METHOD method_12385 writeStructures (Lnet/minecraft/class_6625;Lnet/minecraft/class_1923;Ljava/util/Map;Ljava/util/Map;)Lnet/minecraft/class_2487; ARG 0 context diff --git a/mappings/net/minecraft/world/CommandBlockExecutor.mapping b/mappings/net/minecraft/world/CommandBlockExecutor.mapping index c3013ff874..0003d6b5d9 100644 --- a/mappings/net/minecraft/world/CommandBlockExecutor.mapping +++ b/mappings/net/minecraft/world/CommandBlockExecutor.mapping @@ -21,15 +21,13 @@ CLASS net/minecraft/class_1918 net/minecraft/world/CommandBlockExecutor ARG 1 player METHOD method_8289 getCommand ()Ljava/lang/String; METHOD method_8290 setCustomName (Lnet/minecraft/class_2561;)V - ARG 1 name METHOD method_8291 setLastOutput (Lnet/minecraft/class_2561;)V ARG 1 lastOutput METHOD method_8292 getLastOutput ()Lnet/minecraft/class_2561; METHOD method_8293 getWorld ()Lnet/minecraft/class_3218; METHOD method_8295 markDirty ()V METHOD method_8296 isTrackingOutput ()Z - METHOD method_8297 writeNbt (Lnet/minecraft/class_2487;)Lnet/minecraft/class_2487; - ARG 1 nbt + METHOD method_8297 writeNbt (Lnet/minecraft/class_2487;Lnet/minecraft/class_7225$class_7874;)Lnet/minecraft/class_2487; METHOD method_8298 setSuccessCount (I)V ARG 1 successCount METHOD method_8299 getCustomName ()Lnet/minecraft/class_2561; @@ -38,5 +36,4 @@ CLASS net/minecraft/class_1918 net/minecraft/world/CommandBlockExecutor ARG 1 world METHOD method_8303 getSource ()Lnet/minecraft/class_2168; METHOD method_8304 getSuccessCount ()I - METHOD method_8305 readNbt (Lnet/minecraft/class_2487;)V - ARG 1 nbt + METHOD method_8305 readNbt (Lnet/minecraft/class_2487;Lnet/minecraft/class_7225$class_7874;)V diff --git a/mappings/net/minecraft/world/World.mapping b/mappings/net/minecraft/world/World.mapping index aaf5aa03ab..617ab4822b 100644 --- a/mappings/net/minecraft/world/World.mapping +++ b/mappings/net/minecraft/world/World.mapping @@ -497,14 +497,13 @@ CLASS net/minecraft/class_1937 net/minecraft/world/World METHOD method_8544 removeBlockEntity (Lnet/minecraft/class_2338;)V ARG 1 pos METHOD method_8546 isThundering ()Z - METHOD method_8547 addFireworkParticle (DDDDDDLnet/minecraft/class_2487;)V + METHOD method_8547 addFireworkParticle (DDDDDDLjava/util/List;)V ARG 1 x ARG 3 y ARG 5 z ARG 7 velocityX ARG 9 velocityY ARG 11 velocityZ - 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/chunk/ChunkStatus.mapping b/mappings/net/minecraft/world/chunk/ChunkStatus.mapping index 73f59056f2..0198459185 100644 --- a/mappings/net/minecraft/world/chunk/ChunkStatus.mapping +++ b/mappings/net/minecraft/world/chunk/ChunkStatus.mapping @@ -1,5 +1,5 @@ CLASS net/minecraft/class_2806 net/minecraft/world/chunk/ChunkStatus - FIELD field_12787 chunkType Lnet/minecraft/class_2806$class_2808; + FIELD field_12787 chunkType Lnet/minecraft/class_2808; FIELD field_12788 STATUS_TO_DISTANCE Lit/unimi/dsi/fastutil/ints/IntList; FIELD field_12791 DISTANCE_TO_STATUS Ljava/util/List; FIELD field_12792 generationTask Lnet/minecraft/class_2806$class_2807; @@ -9,11 +9,9 @@ CLASS net/minecraft/class_2806 net/minecraft/world/chunk/ChunkStatus FIELD field_16647 previous Lnet/minecraft/class_2806; FIELD field_19159 PRE_CARVER_HEIGHTMAPS Ljava/util/EnumSet; FIELD field_19160 POST_CARVER_HEIGHTMAPS Ljava/util/EnumSet; - 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; 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 + METHOD (Lnet/minecraft/class_2806;IZLjava/util/EnumSet;Lnet/minecraft/class_2808;Lnet/minecraft/class_2806$class_2807;Lnet/minecraft/class_2806$class_4305;)V ARG 1 previous ARG 2 taskMargin ARG 3 shouldAlwaysUpgrade @@ -22,19 +20,12 @@ CLASS net/minecraft/class_2806 net/minecraft/world/chunk/ChunkStatus 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;)Ljava/util/concurrent/CompletableFuture; - ARG 1 executor - ARG 2 world - ARG 3 generator - ARG 4 structureTemplateManager - ARG 5 lightingProvider - ARG 6 fullChunkConverter - ARG 7 chunks + METHOD method_12154 runGenerationTask (Lnet/minecraft/class_9312;Ljava/util/concurrent/Executor;Lnet/minecraft/class_9311;Ljava/util/List;)Ljava/util/concurrent/CompletableFuture; METHOD method_12155 getMaxDistanceFromFull ()I METHOD method_12160 getHeightmapTypes ()Ljava/util/EnumSet; METHOD method_12161 byDistanceFromFull (I)Lnet/minecraft/class_2806; ARG 0 level - METHOD method_12164 getChunkType ()Lnet/minecraft/class_2806$class_2808; + METHOD method_12164 getChunkType ()Lnet/minecraft/class_2808; METHOD method_12165 isAtLeast (Lnet/minecraft/class_2806;)Z ARG 1 chunkStatus METHOD method_12166 (Lit/unimi/dsi/fastutil/ints/IntArrayList;)V @@ -43,64 +34,10 @@ CLASS net/minecraft/class_2806 net/minecraft/world/chunk/ChunkStatus ARG 0 id 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; - ARG 0 id - ARG 1 previous - ARG 2 taskMargin - ARG 3 heightMapTypes - ARG 4 chunkType - ARG 5 task - METHOD method_16557 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; - ARG 0 id - ARG 1 previous - ARG 2 taskMargin - ARG 3 heightMapTypes - ARG 4 chunkType - ARG 5 task METHOD method_16558 createOrderedList ()Ljava/util/List; METHOD method_16559 getIndex ()I METHOD method_16560 getPrevious ()Lnet/minecraft/class_2806; - METHOD method_16565 (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_16566 (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 - ARG 2 structureTemplateManager - ARG 3 lightingProvider - ARG 4 fullChunkConverter - ARG 5 chunk - METHOD method_16569 (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_17033 (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_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 - ARG 3 generator - ARG 4 structureTemplateManager - ARG 5 lightingProvider - ARG 6 fullChunkConverter - ARG 7 chunks - ARG 8 chunk - 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; + METHOD method_20611 register (Ljava/lang/String;Lnet/minecraft/class_2806;IZLjava/util/EnumSet;Lnet/minecraft/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 @@ -109,154 +46,9 @@ CLASS net/minecraft/class_2806 net/minecraft/world/chunk/ChunkStatus 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_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 - ARG 3 generator - ARG 4 structureTemplateManager - ARG 5 lightingProvider - ARG 6 fullChunkConverter - ARG 7 chunks - ARG 8 chunk - 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 - ARG 2 structureTemplateManager - ARG 3 lightingProvider - ARG 4 fullChunkConverter - ARG 5 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 - ARG 2 structureTemplateManager - ARG 3 lightingProvider - ARG 4 fullChunkConverter - ARG 5 chunk - 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_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 - ARG 3 generator - ARG 4 structureTemplateManager - ARG 5 lightingProvider - ARG 6 fullChunkConverter - ARG 7 chunks - ARG 8 chunk - 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 - ARG 3 generator - ARG 4 structureTemplateManager - ARG 5 lightingProvider - ARG 6 fullChunkConverter - ARG 7 chunks - ARG 8 chunk - 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 - ARG 3 generator - ARG 4 structureTemplateManager - ARG 5 lightingProvider - ARG 6 fullChunkConverter - ARG 7 chunks - ARG 8 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 - ARG 2 structureTemplateManager - ARG 3 lightingProvider - ARG 4 fullChunkConverter - ARG 5 chunk - METHOD method_41523 (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 status - ARG 1 world - ARG 2 structureTemplateManager - 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_20612 runLoadTask (Lnet/minecraft/class_9312;Lnet/minecraft/class_9311;Lnet/minecraft/class_2791;)Ljava/util/concurrent/CompletableFuture; 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;)Ljava/util/concurrent/CompletableFuture; - ARG 1 targetStatus - COMMENT the status the chunk will be set to after the task is completed - ARG 2 executor - ARG 3 world - ARG 4 generator - ARG 5 structureTemplateManager - ARG 6 lightingProvider - ARG 7 fullChunkConverter - COMMENT a function that can convert a raw chunk to a full chunk - ARG 8 chunks - ARG 9 chunk - CLASS class_2808 ChunkType - COMMENT Specifies the type of a chunk - FIELD field_12807 LEVELCHUNK Lnet/minecraft/class_2806$class_2808; - COMMENT A chunk which is complete and bound to a world. - FIELD field_12808 PROTOCHUNK Lnet/minecraft/class_2806$class_2808; - COMMENT A chunk which is incomplete and not loaded to the world yet. - CLASS class_3768 SimpleGenerationTask - METHOD doWork (Lnet/minecraft/class_2806;Lnet/minecraft/class_3218;Lnet/minecraft/class_2794;Ljava/util/List;Lnet/minecraft/class_2791;)V - ARG 1 targetStatus - ARG 2 world - ARG 3 chunkGenerator - ARG 4 chunks - ARG 5 chunk CLASS class_4305 LoadTask COMMENT A task called when a chunk is loaded but does not need to be generated. - METHOD doWork (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 1 targetStatus - ARG 2 world - ARG 3 structureTemplateManager - ARG 4 lightingProvider - ARG 5 fullChunkConverter - COMMENT a function that can convert a raw chunk to a full chunk - ARG 6 chunk diff --git a/mappings/net/minecraft/world/chunk/ChunkType.mapping b/mappings/net/minecraft/world/chunk/ChunkType.mapping new file mode 100644 index 0000000000..7a5ef09167 --- /dev/null +++ b/mappings/net/minecraft/world/chunk/ChunkType.mapping @@ -0,0 +1,6 @@ +CLASS net/minecraft/class_2808 net/minecraft/world/chunk/ChunkType + COMMENT Specifies the type of a chunk + FIELD field_12807 LEVELCHUNK Lnet/minecraft/class_2808; + COMMENT A chunk which is complete and bound to a world. + FIELD field_12808 PROTOCHUNK Lnet/minecraft/class_2808; + COMMENT A chunk which is incomplete and not loaded to the world yet. diff --git a/mappings/net/minecraft/world/gen/StructureAccessor.mapping b/mappings/net/minecraft/world/gen/StructureAccessor.mapping index a590b41e91..d66efdde0c 100644 --- a/mappings/net/minecraft/world/gen/StructureAccessor.mapping +++ b/mappings/net/minecraft/world/gen/StructureAccessor.mapping @@ -54,17 +54,15 @@ CLASS net/minecraft/class_5138 net/minecraft/world/gen/StructureAccessor METHOD method_41033 structureContains (Lnet/minecraft/class_2338;Lnet/minecraft/class_3449;)Z ARG 1 pos ARG 2 structureStart - METHOD method_41034 getStructureContaining (Lnet/minecraft/class_2338;Lnet/minecraft/class_5321;)Lnet/minecraft/class_3449; + METHOD method_41034 getStructureContaining (Lnet/minecraft/class_2338;Lnet/minecraft/class_6885;)Lnet/minecraft/class_3449; ARG 1 pos - ARG 2 structure METHOD method_41035 getStructureStarts (Lnet/minecraft/class_1923;Ljava/util/function/Predicate;)Ljava/util/List; ARG 1 pos ARG 2 predicate METHOD method_41036 getRegistryManager ()Lnet/minecraft/class_5455; METHOD method_41037 getStructureReferences (Lnet/minecraft/class_2338;)Ljava/util/Map; ARG 1 pos - METHOD method_41413 getStructureContaining (Lnet/minecraft/class_2338;Lnet/minecraft/class_6862;)Lnet/minecraft/class_3449; + METHOD method_41413 getStructureContaining (Lnet/minecraft/class_2338;Ljava/util/function/Predicate;)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 + METHOD method_41414 (Lnet/minecraft/class_2378;Ljava/util/function/Predicate;Lnet/minecraft/class_3195;)Z ARG 2 structure