From d12e55b8cccfcb9bc09fc019acacbd0c3b8c9a71 Mon Sep 17 00:00:00 2001 From: modmuss50 Date: Wed, 6 Nov 2024 17:00:37 +0000 Subject: [PATCH] 24w45a --- build.gradle | 2 +- .../net/minecraft/block/AbstractBlock.mapping | 4 +- .../block/CreakingHeartBlock.mapping | 5 +- .../minecraft/block/ShulkerBoxBlock.mapping | 6 - .../block/entity/BannerBlockEntity.mapping | 4 - .../block/entity/BedBlockEntity.mapping | 2 - .../block/entity/BlockEntity.mapping | 5 - .../entity/DecoratedPotBlockEntity.mapping | 3 - .../block/spawner/TrialSpawnerData.mapping | 4 - mappings/net/minecraft/class_10415.mapping | 5 + mappings/net/minecraft/class_10526.mapping | 5 + .../minecraft/client/MinecraftClient.mapping | 4 - .../color/item/ItemColorProvider.mapping | 6 - .../client/color/item/ItemColors.mapping | 38 ----- .../minecraft/client/gui/DrawContext.mapping | 3 - .../screen/GameModeSelectionScreen.mapping | 4 - .../screen/world/CreateWorldScreen.mapping | 2 - .../world/WorldScreenOptionGrid.mapping | 5 +- .../client/gui/widget/ClickableWidget.mapping | 3 - .../client/gui/widget/EditBoxWidget.mapping | 2 - .../client/gui/widget/EntryListWidget.mapping | 35 ----- .../gui/widget/ScrollableWidget.mapping | 38 ----- .../ClampedModelPredicateProvider.mapping | 6 - .../CompassAnglePredicateProvider.mapping | 47 ------ .../item/ModelPredicateProvider.mapping | 2 +- .../ModelPredicateProviderRegistry.mapping | 148 ------------------ .../client/particle/CrackParticle.mapping | 7 +- .../render/TexturedRenderLayers.mapping | 4 - .../render/block/BlockRenderManager.mapping | 4 +- .../BlockEntityRenderDispatcher.mapping | 23 +-- .../entity/BlockEntityRendererFactory.mapping | 5 +- .../ShulkerBoxBlockEntityRenderer.mapping | 4 +- .../entity/SkullBlockEntityRenderer.mapping | 6 +- .../entity/VaultBlockEntityRenderer.mapping | 14 -- .../render/entity/BipedEntityRenderer.mapping | 2 +- .../entity/DisplayEntityRenderer.mapping | 1 - .../entity/EntityRenderDispatcher.mapping | 13 +- .../entity/EntityRendererFactory.mapping | 4 +- .../FireworkRocketEntityRenderer.mapping | 1 - .../entity/FlyingItemEntityRenderer.mapping | 1 - .../render/entity/ItemEntityRenderer.mapping | 23 +-- .../entity/ItemFrameEntityRenderer.mapping | 5 +- .../entity/LivingEntityRenderer.mapping | 1 - .../OminousItemSpawnerEntityRenderer.mapping | 1 - .../entity/PlayerEntityRenderer.mapping | 11 +- .../equipment/EquipmentModelLoader.mapping | 3 +- .../equipment/EquipmentRenderer.mapping | 6 +- .../DolphinHeldItemFeatureRenderer.mapping | 4 - .../feature/EmissiveFeatureRenderer.mapping | 2 +- .../entity/feature/FeatureRenderer.mapping | 2 - .../FoxHeldItemFeatureRenderer.mapping | 4 - .../feature/HeadFeatureRenderer.mapping | 9 +- .../feature/HeldItemFeatureRenderer.mapping | 14 +- .../feature/LlamaDecorFeatureRenderer.mapping | 3 +- .../PandaHeldItemFeatureRenderer.mapping | 4 - .../PlayerHeldItemFeatureRenderer.mapping | 8 - .../SnowGolemPumpkinFeatureRenderer.mapping | 4 +- .../VillagerHeldItemFeatureRenderer.mapping | 7 +- .../entity/model/BipedEntityModel.mapping | 3 - .../FireworkRocketEntityRenderState.mapping | 3 +- .../state/FlyingItemEntityRenderState.mapping | 2 - .../ItemDisplayEntityRenderState.mapping | 2 - .../state/ItemEntityRenderState.mapping | 2 - .../state/ItemFrameEntityRenderState.mapping | 2 - .../state/LivingEntityRenderState.mapping | 10 +- ...minousItemSpawnerEntityRenderState.mapping | 3 - .../state/PlayerEntityRenderState.mapping | 6 - .../item/BuiltinModelItemRenderer.mapping | 29 ---- .../client/render/item/ItemModels.mapping | 13 -- .../client/render/item/ItemRenderer.mapping | 98 +----------- .../client/render/model/BakedModel.mapping | 2 - .../render/model/BakedModelManager.mapping | 38 +---- .../render/model/BakedQuadFactory.mapping | 39 ----- .../render/model/BasicBakedModel.mapping | 3 - .../render/model/BlockStatesLoader.mapping | 11 +- .../render/model/BuiltinBakedModel.mapping | 8 - .../client/render/model/ItemModel.mapping | 12 -- .../client/render/model/ModelBaker.mapping | 26 +-- .../client/render/model/ModelGrouper.mapping | 3 +- .../client/render/model/Models.mapping | 6 - .../model/ReferencedModelsCollector.mapping | 23 +-- .../client/render/model/UnbakedModel.mapping | 22 +-- .../model/json/ItemModelGenerator.mapping | 4 +- .../model/json/JsonUnbakedModel.mapping | 60 +------ .../render/model/json/ModelOverride.mapping | 24 --- .../model/json/ModelOverrideList.mapping | 33 ---- .../model/json/ModelTransformation.mapping | 28 ++-- .../render/model/json/ModelVariant.mapping | 14 +- .../render/model/json/ModelVariantMap.mapping | 2 +- .../model/json/WeightedUnbakedModel.mapping | 2 +- .../client/util/ModelIdentifier.mapping | 3 - .../type/CustomModelDataComponent.mapping | 1 - .../type/EquippableComponent.mapping | 3 +- .../type/PotionContentsComponent.mapping | 4 - mappings/net/minecraft/data/DataCache.mapping | 5 - .../net/minecraft/data/DataProvider.mapping | 2 - mappings/net/minecraft/data/Main.mapping | 19 +-- .../client/BlockStateModelGenerator.mapping | 51 +----- .../client/EquipmentModelProvider.mapping | 3 +- .../data/client/ItemModelGenerator.mapping | 42 +---- .../net/minecraft/data/client/Model.mapping | 18 +-- .../data/client/ModelProvider.mapping | 19 --- .../data/client/TexturedModel.mapping | 1 - .../datafixer/fix/ComponentFix.mapping | 2 - mappings/net/minecraft/entity/Entity.mapping | 4 +- .../net/minecraft/entity/LivingEntity.mapping | 1 - .../entity/ai/control/LookControl.mapping | 2 - .../entity/ai/pathing/BirdNavigation.mapping | 3 - .../entity/ai/pathing/MobNavigation.mapping | 3 - .../minecraft/entity/mob/MobEntity.mapping | 4 - .../entity/mob/PhantomEntity.mapping | 3 - .../entity/passive/BeeEntity.mapping | 3 - .../entity/passive/FoxEntity.mapping | 3 - .../entity/passive/SheepEntity.mapping | 9 -- .../entity/passive/SquidEntity.mapping | 2 - .../projectile/FishingBobberEntity.mapping | 3 +- .../entity/raid/RaiderEntity.mapping | 4 - mappings/net/minecraft/item/BlockItem.mapping | 3 - .../net/minecraft/item/BundleItem.mapping | 8 - mappings/net/minecraft/item/Item.mapping | 6 +- mappings/net/minecraft/item/ItemStack.mapping | 1 - mappings/net/minecraft/item/Items.mapping | 34 ---- .../net/minecraft/item/SpawnEggItem.mapping | 13 +- .../item/equipment/EquipmentModels.mapping | 28 ++-- .../item/equipment/trim/ArmorTrim.mapping | 8 - .../equipment/trim/ArmorTrimMaterial.mapping | 5 +- .../equipment/trim/ArmorTrimMaterials.mapping | 7 +- .../SetAttributesLootFunction.mapping | 2 - .../SetCustomModelDataLootFunction.mapping | 6 +- .../c2s/play/VehicleMoveC2SPacket.mapping | 20 +-- .../s2c/play/VehicleMoveS2CPacket.mapping | 20 +-- .../entry/RegistryEntryListCodec.mapping | 6 - .../minecraft/resource/JsonDataLoader.mapping | 14 +- .../screen/BeaconScreenHandler.mapping | 6 - .../server/network/ServerPlayerEntity.mapping | 1 - .../world/ThrottledChunkTaskScheduler.mapping | 2 - .../packageinfo/PackageInfo10409.mapping | 1 + .../packageinfo/PackageInfo10412.mapping | 1 + .../packageinfo/PackageInfo10413.mapping | 1 + .../packageinfo/PackageInfo10414.mapping | 1 + .../packageinfo/PackageInfo10470.mapping | 1 + .../packageinfo/PackageInfo10486.mapping | 1 + .../packageinfo/PackageInfo10487.mapping | 1 + .../packageinfo/PackageInfo10497.mapping | 1 + .../packageinfo/PackageInfo10520.mapping | 1 + .../packageinfo/PackageInfo6292.mapping | 1 - .../packageinfo/PackageInfo6293.mapping | 1 - .../packageinfo/PackageInfo6294.mapping | 1 - .../world/biome/FoliageColors.mapping | 4 - .../minecraft/world/chunk/WorldChunk.mapping | 2 - 150 files changed, 154 insertions(+), 1392 deletions(-) create mode 100644 mappings/net/minecraft/class_10415.mapping create mode 100644 mappings/net/minecraft/class_10526.mapping delete mode 100644 mappings/net/minecraft/client/color/item/ItemColorProvider.mapping delete mode 100644 mappings/net/minecraft/client/color/item/ItemColors.mapping delete mode 100644 mappings/net/minecraft/client/item/ClampedModelPredicateProvider.mapping delete mode 100644 mappings/net/minecraft/client/item/CompassAnglePredicateProvider.mapping delete mode 100644 mappings/net/minecraft/client/item/ModelPredicateProviderRegistry.mapping delete mode 100644 mappings/net/minecraft/client/render/entity/state/OminousItemSpawnerEntityRenderState.mapping delete mode 100644 mappings/net/minecraft/client/render/item/BuiltinModelItemRenderer.mapping delete mode 100644 mappings/net/minecraft/client/render/item/ItemModels.mapping delete mode 100644 mappings/net/minecraft/client/render/model/BuiltinBakedModel.mapping delete mode 100644 mappings/net/minecraft/client/render/model/ItemModel.mapping delete mode 100644 mappings/net/minecraft/client/render/model/Models.mapping delete mode 100644 mappings/net/minecraft/client/render/model/json/ModelOverride.mapping delete mode 100644 mappings/net/minecraft/client/render/model/json/ModelOverrideList.mapping create mode 100644 mappings/net/minecraft/unused/packageinfo/PackageInfo10409.mapping create mode 100644 mappings/net/minecraft/unused/packageinfo/PackageInfo10412.mapping create mode 100644 mappings/net/minecraft/unused/packageinfo/PackageInfo10413.mapping create mode 100644 mappings/net/minecraft/unused/packageinfo/PackageInfo10414.mapping create mode 100644 mappings/net/minecraft/unused/packageinfo/PackageInfo10470.mapping create mode 100644 mappings/net/minecraft/unused/packageinfo/PackageInfo10486.mapping create mode 100644 mappings/net/minecraft/unused/packageinfo/PackageInfo10487.mapping create mode 100644 mappings/net/minecraft/unused/packageinfo/PackageInfo10497.mapping create mode 100644 mappings/net/minecraft/unused/packageinfo/PackageInfo10520.mapping delete mode 100644 mappings/net/minecraft/unused/packageinfo/PackageInfo6292.mapping delete mode 100644 mappings/net/minecraft/unused/packageinfo/PackageInfo6293.mapping delete mode 100644 mappings/net/minecraft/unused/packageinfo/PackageInfo6294.mapping diff --git a/build.gradle b/build.gradle index ca7feb90d2..4a7e2f6e87 100644 --- a/build.gradle +++ b/build.gradle @@ -19,7 +19,7 @@ plugins { id 'net.fabricmc.filament' } -def minecraft_version = "24w44a" +def minecraft_version = "24w45a" filament { minecraftVersion = minecraft_version diff --git a/mappings/net/minecraft/block/AbstractBlock.mapping b/mappings/net/minecraft/block/AbstractBlock.mapping index 8e3ec2ce3e..96dddbeb94 100644 --- a/mappings/net/minecraft/block/AbstractBlock.mapping +++ b/mappings/net/minecraft/block/AbstractBlock.mapping @@ -717,7 +717,7 @@ CLASS net/minecraft/class_4970 net/minecraft/block/AbstractBlock ARG 3 pos METHOD method_9573 getSoundGroup (Lnet/minecraft/class_2680;)Lnet/minecraft/class_2498; ARG 1 state - METHOD method_9574 getPickStack (Lnet/minecraft/class_4538;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;)Lnet/minecraft/class_1799; + METHOD method_9574 getPickStack (Lnet/minecraft/class_4538;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;Z)Lnet/minecraft/class_1799; ARG 1 world ARG 2 pos ARG 3 state @@ -1345,7 +1345,7 @@ CLASS net/minecraft/class_4970 net/minecraft/block/AbstractBlock METHOD method_64025 getInsideCollisionShape (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;)Lnet/minecraft/class_265; ARG 1 world ARG 2 pos - METHOD method_65171 getPickStack (Lnet/minecraft/class_4538;Lnet/minecraft/class_2338;)Lnet/minecraft/class_1799; + METHOD method_65171 getPickStack (Lnet/minecraft/class_4538;Lnet/minecraft/class_2338;Z)Lnet/minecraft/class_1799; ARG 1 world ARG 2 pos CLASS class_3752 ShapeCache diff --git a/mappings/net/minecraft/block/CreakingHeartBlock.mapping b/mappings/net/minecraft/block/CreakingHeartBlock.mapping index 349f95ac10..2d37b70412 100644 --- a/mappings/net/minecraft/block/CreakingHeartBlock.mapping +++ b/mappings/net/minecraft/block/CreakingHeartBlock.mapping @@ -16,7 +16,4 @@ CLASS net/minecraft/class_10319 net/minecraft/block/CreakingHeartBlock ARG 2 pos METHOD method_65147 isNightAndNatural (Lnet/minecraft/class_1937;)Z ARG 0 world - METHOD method_65148 dropExperienceOnBreak (Lnet/minecraft/class_2680;Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;)V - ARG 1 state - ARG 2 world - ARG 3 pos + METHOD method_65148 dropExperienceOnBreak (Lnet/minecraft/class_1657;Lnet/minecraft/class_2680;Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;)V diff --git a/mappings/net/minecraft/block/ShulkerBoxBlock.mapping b/mappings/net/minecraft/block/ShulkerBoxBlock.mapping index f6eb119eb1..a0e879836a 100644 --- a/mappings/net/minecraft/block/ShulkerBoxBlock.mapping +++ b/mappings/net/minecraft/block/ShulkerBoxBlock.mapping @@ -18,10 +18,6 @@ CLASS net/minecraft/class_2480 net/minecraft/block/ShulkerBoxBlock ARG 1 lootConsumer METHOD method_10525 get (Lnet/minecraft/class_1767;)Lnet/minecraft/class_2248; ARG 0 dyeColor - METHOD method_10526 getColor (Lnet/minecraft/class_2248;)Lnet/minecraft/class_1767; - ARG 0 block - METHOD method_10527 getColor (Lnet/minecraft/class_1792;)Lnet/minecraft/class_1767; - ARG 0 item METHOD method_10528 getColor ()Lnet/minecraft/class_1767; METHOD method_10529 getItemStack (Lnet/minecraft/class_1767;)Lnet/minecraft/class_1799; ARG 0 color @@ -30,8 +26,6 @@ CLASS net/minecraft/class_2480 net/minecraft/block/ShulkerBoxBlock ARG 1 world ARG 2 pos ARG 3 entity - METHOD method_38234 (Lnet/minecraft/class_1799;Lnet/minecraft/class_4538;Lnet/minecraft/class_2627;)V - ARG 2 blockEntity METHOD method_47378 (Ljava/util/EnumMap;)V ARG 0 map METHOD method_54040 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; diff --git a/mappings/net/minecraft/block/entity/BannerBlockEntity.mapping b/mappings/net/minecraft/block/entity/BannerBlockEntity.mapping index 38adceb66a..d8ba656639 100644 --- a/mappings/net/minecraft/block/entity/BannerBlockEntity.mapping +++ b/mappings/net/minecraft/block/entity/BannerBlockEntity.mapping @@ -11,12 +11,8 @@ CLASS net/minecraft/class_2573 net/minecraft/block/entity/BannerBlockEntity 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_10907 getPickStack ()Lnet/minecraft/class_1799; METHOD method_10908 getColorForState ()Lnet/minecraft/class_1767; - METHOD method_10913 readFrom (Lnet/minecraft/class_1799;Lnet/minecraft/class_1767;)V - ARG 1 stack - ARG 2 baseColor METHOD method_57566 (Ljava/lang/String;)V ARG 0 patterns METHOD method_58121 (Lnet/minecraft/class_9307;)V diff --git a/mappings/net/minecraft/block/entity/BedBlockEntity.mapping b/mappings/net/minecraft/block/entity/BedBlockEntity.mapping index cd4cb31047..6fa057f198 100644 --- a/mappings/net/minecraft/block/entity/BedBlockEntity.mapping +++ b/mappings/net/minecraft/block/entity/BedBlockEntity.mapping @@ -8,5 +8,3 @@ CLASS net/minecraft/class_2587 net/minecraft/block/entity/BedBlockEntity ARG 2 state ARG 3 color METHOD method_11018 getColor ()Lnet/minecraft/class_1767; - METHOD method_11019 setColor (Lnet/minecraft/class_1767;)V - ARG 1 color diff --git a/mappings/net/minecraft/block/entity/BlockEntity.mapping b/mappings/net/minecraft/block/entity/BlockEntity.mapping index 7326e5fd34..13a9a2b466 100644 --- a/mappings/net/minecraft/block/entity/BlockEntity.mapping +++ b/mappings/net/minecraft/block/entity/BlockEntity.mapping @@ -175,11 +175,6 @@ CLASS net/minecraft/class_2586 net/minecraft/block/entity/BlockEntity COMMENT keys to store the position. This is incompatible with {@link COMMENT net.minecraft.nbt.NbtHelper#fromBlockPos} that use uppercase keys. ARG 0 nbt - 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 registries 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 c8790057b8..a15d808d9d 100644 --- a/mappings/net/minecraft/block/entity/DecoratedPotBlockEntity.mapping +++ b/mappings/net/minecraft/block/entity/DecoratedPotBlockEntity.mapping @@ -10,13 +10,10 @@ CLASS net/minecraft/class_8172 net/minecraft/block/entity/DecoratedPotBlockEntit METHOD (Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;)V ARG 1 pos ARG 2 state - METHOD method_49196 readFrom (Lnet/minecraft/class_1799;)V - ARG 1 stack METHOD method_49204 getHorizontalFacing ()Lnet/minecraft/class_2350; 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_8837 WobbleType diff --git a/mappings/net/minecraft/block/spawner/TrialSpawnerData.mapping b/mappings/net/minecraft/block/spawner/TrialSpawnerData.mapping index b7a3e9ded7..6e2db1a3a2 100644 --- a/mappings/net/minecraft/block/spawner/TrialSpawnerData.mapping +++ b/mappings/net/minecraft/block/spawner/TrialSpawnerData.mapping @@ -39,10 +39,6 @@ CLASS net/minecraft/class_8966 net/minecraft/block/spawner/TrialSpawnerData METHOD method_55188 getSpawnData (Lnet/minecraft/class_8963;Lnet/minecraft/class_5819;)Lnet/minecraft/class_1952; ARG 1 logic ARG 2 random - METHOD method_55189 setEntityType (Lnet/minecraft/class_8963;Lnet/minecraft/class_5819;Lnet/minecraft/class_1299;)V - ARG 1 logic - ARG 2 random - ARG 3 type METHOD method_55190 setDisplayEntity (Lnet/minecraft/class_8963;Lnet/minecraft/class_1937;Lnet/minecraft/class_8967;)Lnet/minecraft/class_1297; ARG 1 logic ARG 2 world diff --git a/mappings/net/minecraft/class_10415.mapping b/mappings/net/minecraft/class_10415.mapping new file mode 100644 index 0000000000..1cf9eaf13f --- /dev/null +++ b/mappings/net/minecraft/class_10415.mapping @@ -0,0 +1,5 @@ +CLASS net/minecraft/class_10415 + METHOD method_44384 renderOverlay (Lnet/minecraft/class_332;)V + METHOD method_44386 drawBox (Lnet/minecraft/class_332;)V + METHOD method_44389 renderContents (Lnet/minecraft/class_332;IIF)V + METHOD method_44391 getContentsHeight ()I diff --git a/mappings/net/minecraft/class_10526.mapping b/mappings/net/minecraft/class_10526.mapping new file mode 100644 index 0000000000..52ea353fbc --- /dev/null +++ b/mappings/net/minecraft/class_10526.mapping @@ -0,0 +1,5 @@ +CLASS net/minecraft/class_10526 + METHOD method_62326 resolve (Lnet/minecraft/class_10526$class_10103;)V + CLASS class_10103 Resolver + METHOD method_62642 resolve (Lnet/minecraft/class_2960;)Lnet/minecraft/class_1100; + ARG 1 id diff --git a/mappings/net/minecraft/client/MinecraftClient.mapping b/mappings/net/minecraft/client/MinecraftClient.mapping index a70cbb9eda..240d786809 100644 --- a/mappings/net/minecraft/client/MinecraftClient.mapping +++ b/mappings/net/minecraft/client/MinecraftClient.mapping @@ -110,7 +110,6 @@ CLASS net/minecraft/class_310 net/minecraft/client/MinecraftClient FIELD field_1757 resourcePackDir Ljava/nio/file/Path; FIELD field_1758 tutorialManager Lnet/minecraft/class_1156; FIELD field_1759 integratedServerRunning Z - FIELD field_1760 itemColors Lnet/minecraft/class_325; FIELD field_1761 interactionManager Lnet/minecraft/class_636; FIELD field_1762 LOGGER Lorg/slf4j/Logger; FIELD field_1763 bakedModelManager Lnet/minecraft/class_1092; @@ -143,7 +142,6 @@ CLASS net/minecraft/class_310 net/minecraft/client/MinecraftClient FIELD field_26842 socialInteractionsManager Lnet/minecraft/class_5520; FIELD field_26843 socialInteractionsToast Lnet/minecraft/class_372; FIELD field_26902 userApiService Lcom/mojang/authlib/minecraft/UserApiService; - FIELD field_27387 entityModelLoader Lnet/minecraft/class_5599; FIELD field_27388 blockEntityRenderDispatcher Lnet/minecraft/class_824; FIELD field_29569 recorder Lnet/minecraft/class_5962; FIELD field_32144 wireFrame Z @@ -186,7 +184,6 @@ CLASS net/minecraft/class_310 net/minecraft/client/MinecraftClient FIELD field_52752 mapTextureManager Lnet/minecraft/class_10093; FIELD field_52753 inactivityFpsLimiter Lnet/minecraft/class_9919; FIELD field_53831 shaderLoader Lnet/minecraft/class_10151; - FIELD field_54150 equipmentModelLoader Lnet/minecraft/class_10201; FIELD field_54267 tracyFrameCapturer Lnet/minecraft/class_10219; METHOD (Lnet/minecraft/class_542;)V ARG 1 args @@ -531,7 +528,6 @@ CLASS net/minecraft/class_310 net/minecraft/client/MinecraftClient METHOD method_62887 getShaderLoader ()Lnet/minecraft/class_10151; METHOD method_63507 onShaderResourceReloadFailure (Ljava/lang/Exception;)V ARG 1 exception - METHOD method_64036 getEquipmentModelLoader ()Lnet/minecraft/class_10201; CLASS 1 FIELD field_52756 closed Z CLASS class_5859 ChatRestriction diff --git a/mappings/net/minecraft/client/color/item/ItemColorProvider.mapping b/mappings/net/minecraft/client/color/item/ItemColorProvider.mapping deleted file mode 100644 index 4c54d8a3ad..0000000000 --- a/mappings/net/minecraft/client/color/item/ItemColorProvider.mapping +++ /dev/null @@ -1,6 +0,0 @@ -CLASS net/minecraft/class_326 net/minecraft/client/color/item/ItemColorProvider - METHOD getColor (Lnet/minecraft/class_1799;I)I - COMMENT {@return the color of the item stack for the specified tint index, - COMMENT or -1 if not tinted} - ARG 1 stack - ARG 2 tintIndex diff --git a/mappings/net/minecraft/client/color/item/ItemColors.mapping b/mappings/net/minecraft/client/color/item/ItemColors.mapping deleted file mode 100644 index dc25924c7f..0000000000 --- a/mappings/net/minecraft/client/color/item/ItemColors.mapping +++ /dev/null @@ -1,38 +0,0 @@ -CLASS net/minecraft/class_325 net/minecraft/client/color/item/ItemColors - FIELD field_1996 providers Lnet/minecraft/class_2361; - FIELD field_32165 NO_COLOR I - METHOD method_1699 (Lnet/minecraft/class_1826;Lnet/minecraft/class_1799;I)I - ARG 1 stack - ARG 2 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_1704 getColor (Lnet/minecraft/class_1799;I)I - ARG 1 item - ARG 2 tintIndex - METHOD method_1705 (Lnet/minecraft/class_1799;I)I - ARG 0 stack - ARG 1 tintIndex - METHOD method_1706 create (Lnet/minecraft/class_324;)Lnet/minecraft/class_325; - ARG 0 blockColors - METHOD method_1707 (Lnet/minecraft/class_1799;I)I - ARG 0 stack - ARG 1 tintIndex - METHOD method_1708 register (Lnet/minecraft/class_326;[Lnet/minecraft/class_1935;)V - ARG 1 provider - ARG 2 items - METHOD method_43767 (Lnet/minecraft/class_1799;I)I - ARG 0 stack - ARG 1 tintIndex - METHOD method_57705 (Lnet/minecraft/class_1799;I)I - ARG 0 stack - ARG 1 tintIndex - METHOD method_57706 (Lnet/minecraft/class_1799;I)I - ARG 0 stack - ARG 1 tintIndex - METHOD method_57707 (Lnet/minecraft/class_1799;I)I - ARG 0 stack - ARG 1 tintIndex diff --git a/mappings/net/minecraft/client/gui/DrawContext.mapping b/mappings/net/minecraft/client/gui/DrawContext.mapping index 320f857c02..98b01ad9c7 100644 --- a/mappings/net/minecraft/client/gui/DrawContext.mapping +++ b/mappings/net/minecraft/client/gui/DrawContext.mapping @@ -5,7 +5,6 @@ CLASS net/minecraft/class_332 net/minecraft/client/gui/DrawContext FIELD field_44659 scissorStack Lnet/minecraft/class_332$class_8214; FIELD field_45337 guiAtlasManager Lnet/minecraft/class_8658; METHOD (Lnet/minecraft/class_310;Lnet/minecraft/class_4587;Lnet/minecraft/class_4597$class_4598;)V - ARG 1 client ARG 2 matrices ARG 3 vertexConsumers METHOD (Lnet/minecraft/class_310;Lnet/minecraft/class_4597$class_4598;)V @@ -202,8 +201,6 @@ CLASS net/minecraft/class_332 net/minecraft/client/gui/DrawContext ARG 6 seed METHOD method_51425 drawItem (Lnet/minecraft/class_1309;Lnet/minecraft/class_1937;Lnet/minecraft/class_1799;IIII)V ARG 1 entity - ARG 2 world - ARG 3 stack ARG 4 x ARG 5 y ARG 6 seed diff --git a/mappings/net/minecraft/client/gui/screen/GameModeSelectionScreen.mapping b/mappings/net/minecraft/client/gui/screen/GameModeSelectionScreen.mapping index 841556cc2f..ed2a383fcc 100644 --- a/mappings/net/minecraft/client/gui/screen/GameModeSelectionScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/GameModeSelectionScreen.mapping @@ -41,10 +41,6 @@ CLASS net/minecraft/class_5289 net/minecraft/client/gui/screen/GameModeSelection CLASS class_5291 ButtonWidget FIELD field_24586 gameMode Lnet/minecraft/class_5289$class_5290; FIELD field_24587 selected Z - METHOD (Lnet/minecraft/class_5289;Lnet/minecraft/class_5289$class_5290;II)V - ARG 2 gameMode - ARG 3 x - ARG 4 y METHOD method_28080 drawBackground (Lnet/minecraft/class_332;)V ARG 1 context METHOD method_28082 drawSelectionBox (Lnet/minecraft/class_332;)V diff --git a/mappings/net/minecraft/client/gui/screen/world/CreateWorldScreen.mapping b/mappings/net/minecraft/client/gui/screen/world/CreateWorldScreen.mapping index 375427dc6e..89d54836f2 100644 --- a/mappings/net/minecraft/client/gui/screen/world/CreateWorldScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/world/CreateWorldScreen.mapping @@ -227,8 +227,6 @@ CLASS net/minecraft/class_525 net/minecraft/client/gui/screen/world/CreateWorldS ARG 2 worldType METHOD method_48673 (Lnet/minecraft/class_5676;Lnet/minecraft/class_8100;)V ARG 2 creator - METHOD method_48674 (Lnet/minecraft/class_7845$class_7939;Lnet/minecraft/class_8021;)V - ARG 1 widget METHOD method_48675 (Lnet/minecraft/class_8096;Lnet/minecraft/class_8100;)V ARG 1 creator METHOD method_48676 (Lnet/minecraft/class_8100;)V diff --git a/mappings/net/minecraft/client/gui/screen/world/WorldScreenOptionGrid.mapping b/mappings/net/minecraft/client/gui/screen/world/WorldScreenOptionGrid.mapping index e9dcb06b0a..2bd180729a 100644 --- a/mappings/net/minecraft/client/gui/screen/world/WorldScreenOptionGrid.mapping +++ b/mappings/net/minecraft/client/gui/screen/world/WorldScreenOptionGrid.mapping @@ -1,7 +1,7 @@ CLASS net/minecraft/class_8096 net/minecraft/client/gui/screen/world/WorldScreenOptionGrid FIELD field_42196 BUTTON_WIDTH I FIELD field_42197 options Ljava/util/List; - METHOD (Ljava/util/List;)V + METHOD (Ljava/util/List;Lnet/minecraft/class_8133;)V ARG 1 options METHOD method_48683 refresh ()V METHOD method_48684 builder (I)Lnet/minecraft/class_8096$class_8097; @@ -17,8 +17,7 @@ CLASS net/minecraft/class_8096 net/minecraft/client/gui/screen/world/WorldScreen ARG 1 width METHOD method_48685 marginLeft (I)Lnet/minecraft/class_8096$class_8097; ARG 1 marginLeft - METHOD method_48686 build (Ljava/util/function/Consumer;)Lnet/minecraft/class_8096; - ARG 1 widgetConsumer + METHOD method_48686 build ()Lnet/minecraft/class_8096; METHOD method_48687 add (Lnet/minecraft/class_2561;Ljava/util/function/BooleanSupplier;Ljava/util/function/Consumer;)Lnet/minecraft/class_8096$class_8099; ARG 1 text ARG 2 getter diff --git a/mappings/net/minecraft/client/gui/widget/ClickableWidget.mapping b/mappings/net/minecraft/client/gui/widget/ClickableWidget.mapping index 8e941dffad..80777a64dc 100644 --- a/mappings/net/minecraft/client/gui/widget/ClickableWidget.mapping +++ b/mappings/net/minecraft/client/gui/widget/ClickableWidget.mapping @@ -42,9 +42,6 @@ CLASS net/minecraft/class_339 net/minecraft/client/gui/widget/ClickableWidget METHOD method_25358 setWidth (I)V ARG 1 width METHOD method_25360 getNarrationMessage ()Lnet/minecraft/class_5250; - METHOD method_25361 clicked (DD)Z - ARG 1 mouseX - ARG 3 mouseY METHOD method_25367 isSelected ()Z METHOD method_25369 getMessage ()Lnet/minecraft/class_2561; METHOD method_32602 getNarrationMessage (Lnet/minecraft/class_2561;)Lnet/minecraft/class_5250; diff --git a/mappings/net/minecraft/client/gui/widget/EditBoxWidget.mapping b/mappings/net/minecraft/client/gui/widget/EditBoxWidget.mapping index 9169098bc9..09279c67d3 100644 --- a/mappings/net/minecraft/client/gui/widget/EditBoxWidget.mapping +++ b/mappings/net/minecraft/client/gui/widget/EditBoxWidget.mapping @@ -50,5 +50,3 @@ CLASS net/minecraft/class_7529 net/minecraft/client/gui/widget/EditBoxWidget METHOD method_44405 getText ()Ljava/lang/String; COMMENT {@return the current text of the edit box} METHOD method_44407 onCursorChange ()V - METHOD method_44408 getMaxLinesWithoutOverflow ()D - COMMENT {@return the maximum amount of lines the widget can hold without overflowing} diff --git a/mappings/net/minecraft/client/gui/widget/EntryListWidget.mapping b/mappings/net/minecraft/client/gui/widget/EntryListWidget.mapping index 48dbd9b8e5..bf3d05de6d 100644 --- a/mappings/net/minecraft/client/gui/widget/EntryListWidget.mapping +++ b/mappings/net/minecraft/client/gui/widget/EntryListWidget.mapping @@ -5,12 +5,8 @@ CLASS net/minecraft/class_350 net/minecraft/client/gui/widget/EntryListWidget FIELD field_22744 centerListVertically Z FIELD field_22747 renderHeader Z FIELD field_22748 headerHeight I - FIELD field_22749 scrollAmount D - FIELD field_22750 scrolling Z FIELD field_22751 selected Lnet/minecraft/class_350$class_351; FIELD field_33780 hoveredEntry Lnet/minecraft/class_350$class_351; - FIELD field_45908 SCROLLER_TEXTURE Lnet/minecraft/class_2960; - FIELD field_49477 SCROLLER_BACKGROUND_TEXTURE Lnet/minecraft/class_2960; FIELD field_49478 MENU_LIST_BACKGROUND_TEXTURE Lnet/minecraft/class_2960; FIELD field_49892 INWORLD_MENU_LIST_BACKGROUND_TEXTURE Lnet/minecraft/class_2960; METHOD (Lnet/minecraft/class_310;IIII)V @@ -19,19 +15,11 @@ CLASS net/minecraft/class_350 net/minecraft/client/gui/widget/EntryListWidget ARG 3 height ARG 4 y ARG 5 itemHeight - METHOD method_25307 setScrollAmount (D)V - ARG 1 amount METHOD method_25308 getEntryAtPosition (DD)Lnet/minecraft/class_350$class_351; ARG 1 x ARG 3 y METHOD method_25309 scroll (I)V ARG 1 amount - METHOD method_25310 clickedHeader (II)Z - COMMENT Called when the header is clicked. - COMMENT - COMMENT @return {@code true} to indicate that the event handling is successful/valid - ARG 1 x - ARG 2 y METHOD method_25311 renderList (Lnet/minecraft/class_332;IIF)V ARG 1 context ARG 2 mouseX @@ -45,14 +33,6 @@ CLASS net/minecraft/class_350 net/minecraft/client/gui/widget/EntryListWidget ARG 1 entry METHOD method_25314 replaceEntries (Ljava/util/Collection;)V ARG 1 newEntries - METHOD method_25315 setRenderHeader (ZI)V - ARG 1 renderHeader - ARG 2 headerHeight - METHOD method_25317 getMaxPosition ()I - METHOD method_25318 updateScrollingState (DDI)V - ARG 1 mouseX - ARG 3 mouseY - ARG 5 button METHOD method_25319 getRowBottom (I)I ARG 1 index METHOD method_25320 renderDecorations (Lnet/minecraft/class_332;II)V @@ -68,10 +48,8 @@ CLASS net/minecraft/class_350 net/minecraft/client/gui/widget/EntryListWidget ARG 1 index METHOD method_25328 ensureVisible (Lnet/minecraft/class_350$class_351;)V ARG 1 entry - METHOD method_25329 getScrollbarX ()I METHOD method_25330 removeEntry (Lnet/minecraft/class_350$class_351;)Z ARG 1 entry - METHOD method_25331 getMaxScroll ()I METHOD method_25332 isSelectedEntry (I)Z ARG 1 index METHOD method_25334 getSelectedOrNull ()Lnet/minecraft/class_350$class_351; @@ -82,7 +60,6 @@ CLASS net/minecraft/class_350 net/minecraft/client/gui/widget/EntryListWidget ARG 1 index METHOD method_25339 clearEntries ()V METHOD method_25340 getEntryCount ()I - METHOD method_25341 getScrollAmount ()D METHOD method_25342 getRowLeft ()I METHOD method_29621 setEntryParentList (Lnet/minecraft/class_350$class_351;)V ARG 1 entry @@ -126,10 +103,6 @@ CLASS net/minecraft/class_350 net/minecraft/client/gui/widget/EntryListWidget ARG 0 entry METHOD method_49603 enableScissor (Lnet/minecraft/class_332;)V ARG 1 context - METHOD method_53812 isSelectButton (I)Z - ARG 1 button - METHOD method_57710 getBorderBoxLeft ()I - METHOD method_57711 getBorderBoxRight ()I METHOD method_57712 position (ILnet/minecraft/class_8132;)V ARG 1 width ARG 2 layout @@ -141,14 +114,6 @@ CLASS net/minecraft/class_350 net/minecraft/client/gui/widget/EntryListWidget ARG 3 y METHOD method_57715 drawMenuListBackground (Lnet/minecraft/class_332;)V ARG 1 context - METHOD method_57716 getScrollbarMarginX ()I - METHOD method_57717 isScrollbarVisible ()Z - METHOD method_57718 getDefaultScrollbarX ()I - METHOD method_60321 setScrollAmountOnly (D)V - COMMENT Sets the scroll amount to {@code amount}. Unlike {@link #setScrollAmount}, - COMMENT this has no side effects (like loading more entries). - ARG 1 amount - METHOD method_60322 refreshScroll ()V METHOD method_64847 setSelected (I)V ARG 1 index CLASS class_351 Entry diff --git a/mappings/net/minecraft/client/gui/widget/ScrollableWidget.mapping b/mappings/net/minecraft/client/gui/widget/ScrollableWidget.mapping index 185b534e3d..68e84fb296 100644 --- a/mappings/net/minecraft/client/gui/widget/ScrollableWidget.mapping +++ b/mappings/net/minecraft/client/gui/widget/ScrollableWidget.mapping @@ -1,43 +1,12 @@ CLASS net/minecraft/class_7528 net/minecraft/client/gui/widget/ScrollableWidget COMMENT A widget that can be focused and vertically scrolled. - FIELD field_39496 PADDING I FIELD field_39497 scrollY D FIELD field_39498 scrollbarDragged Z - FIELD field_45905 TEXT_FIELD_TEXTURES Lnet/minecraft/class_8666; FIELD field_45906 SCROLLER_TEXTURE Lnet/minecraft/class_2960; - FIELD field_45907 SCROLLER_WIDTH I - METHOD method_44381 getPadding ()I METHOD method_44382 setScrollY (D)V ARG 1 scrollY - METHOD method_44383 isVisible (II)Z - ARG 1 top - ARG 2 bottom - METHOD method_44384 renderOverlay (Lnet/minecraft/class_332;)V - COMMENT Renders overlays that are not scrolled but part of the widget. - COMMENT - COMMENT

This renders the scrollbar by default. Subclasses can override this to - COMMENT render other overlays, but {@code super} call is necessary to make sure the scrollbar - COMMENT renders when it should. - ARG 1 context - METHOD method_44385 getPaddingDoubled ()I - METHOD method_44386 drawBox (Lnet/minecraft/class_332;)V - COMMENT Draws the box that the contents are rendered over, including its borders. - ARG 1 context METHOD method_44387 getScrollY ()D - METHOD method_44388 isWithinBounds (DD)Z - ARG 1 mouseX - ARG 3 mouseY - METHOD method_44389 renderContents (Lnet/minecraft/class_332;IIF)V - COMMENT Renders the scrolled contents. Subclasses must override this. The rendered contents - COMMENT may overflow; the caller should trim those using {@link - COMMENT net.minecraft.client.gui.DrawContext#enableScissor}. - ARG 1 context - ARG 2 mouseX - ARG 3 mouseY - ARG 4 delta METHOD method_44390 getMaxScrollY ()I - METHOD method_44391 getContentsHeight ()I - COMMENT {@return the total height of the contents} METHOD method_44392 overflows ()Z COMMENT {@return whether the contents overflow and needs a scrollbar} METHOD method_44393 getDeltaYPerScroll ()D @@ -45,10 +14,3 @@ CLASS net/minecraft/class_7528 net/minecraft/client/gui/widget/ScrollableWidget METHOD method_44395 getContentsHeightWithPadding ()I METHOD method_44396 drawScrollbar (Lnet/minecraft/class_332;)V ARG 1 context - METHOD method_52233 drawBox (Lnet/minecraft/class_332;IIII)V - ARG 1 context - ARG 2 x - ARG 3 y - ARG 4 width - ARG 5 height - METHOD method_53532 getScrollerWidth ()I diff --git a/mappings/net/minecraft/client/item/ClampedModelPredicateProvider.mapping b/mappings/net/minecraft/client/item/ClampedModelPredicateProvider.mapping deleted file mode 100644 index ae516d1de8..0000000000 --- a/mappings/net/minecraft/client/item/ClampedModelPredicateProvider.mapping +++ /dev/null @@ -1,6 +0,0 @@ -CLASS net/minecraft/class_6395 net/minecraft/client/item/ClampedModelPredicateProvider - METHOD unclampedCall (Lnet/minecraft/class_1799;Lnet/minecraft/class_638;Lnet/minecraft/class_1309;I)F - ARG 1 stack - ARG 2 world - ARG 3 entity - ARG 4 seed diff --git a/mappings/net/minecraft/client/item/CompassAnglePredicateProvider.mapping b/mappings/net/minecraft/client/item/CompassAnglePredicateProvider.mapping deleted file mode 100644 index 6334cff7ef..0000000000 --- a/mappings/net/minecraft/client/item/CompassAnglePredicateProvider.mapping +++ /dev/null @@ -1,47 +0,0 @@ -CLASS net/minecraft/class_7391 net/minecraft/client/item/CompassAnglePredicateProvider - FIELD field_24449 aimedInterpolator Lnet/minecraft/class_7391$class_5171; - FIELD field_24450 aimlessInterpolator Lnet/minecraft/class_7391$class_5171; - FIELD field_38799 compassTarget Lnet/minecraft/class_7391$class_7392; - METHOD (Lnet/minecraft/class_7391$class_7392;)V - ARG 1 compassTarget - METHOD method_32800 scatter (I)I - COMMENT Scatters a seed by integer overflow in multiplication onto the whole - COMMENT int domain. - ARG 1 seed - METHOD method_43212 getAimlessAngle (IJ)F - ARG 1 seed - ARG 2 time - METHOD method_43213 getBodyYaw (Lnet/minecraft/class_1297;)D - ARG 1 entity - METHOD method_43214 getAngleTo (Lnet/minecraft/class_1297;JLnet/minecraft/class_2338;)F - ARG 1 entity - ARG 2 time - ARG 4 pos - METHOD method_43215 getClientWorld (Lnet/minecraft/class_1297;Lnet/minecraft/class_638;)Lnet/minecraft/class_638; - ARG 1 entity - ARG 2 world - METHOD method_43216 getAngleTo (Lnet/minecraft/class_1297;Lnet/minecraft/class_2338;)D - ARG 1 entity - ARG 2 pos - METHOD method_43217 canPointTo (Lnet/minecraft/class_1297;Lnet/minecraft/class_4208;)Z - ARG 1 entity - ARG 2 pos - METHOD method_43218 getAngle (Lnet/minecraft/class_1799;Lnet/minecraft/class_638;ILnet/minecraft/class_1297;)F - ARG 1 stack - ARG 2 world - ARG 3 seed - ARG 4 entity - CLASS class_5171 AngleInterpolator - FIELD field_23980 value D - FIELD field_23981 speed D - FIELD field_23982 lastUpdateTime J - METHOD method_27190 update (JD)V - ARG 1 time - ARG 3 target - METHOD method_27316 shouldUpdate (J)Z - ARG 1 time - CLASS class_7392 CompassTarget - METHOD getPos (Lnet/minecraft/class_638;Lnet/minecraft/class_1799;Lnet/minecraft/class_1297;)Lnet/minecraft/class_4208; - ARG 1 world - ARG 2 stack - ARG 3 entity diff --git a/mappings/net/minecraft/client/item/ModelPredicateProvider.mapping b/mappings/net/minecraft/client/item/ModelPredicateProvider.mapping index 3efbe2bd41..16e249e651 100644 --- a/mappings/net/minecraft/client/item/ModelPredicateProvider.mapping +++ b/mappings/net/minecraft/client/item/ModelPredicateProvider.mapping @@ -1,5 +1,5 @@ CLASS net/minecraft/class_1800 net/minecraft/client/item/ModelPredicateProvider - METHOD call (Lnet/minecraft/class_1799;Lnet/minecraft/class_638;Lnet/minecraft/class_1309;I)F + METHOD method_65644 call (Lnet/minecraft/class_1799;Lnet/minecraft/class_638;Lnet/minecraft/class_1309;I)F ARG 1 stack ARG 2 world ARG 3 entity diff --git a/mappings/net/minecraft/client/item/ModelPredicateProviderRegistry.mapping b/mappings/net/minecraft/client/item/ModelPredicateProviderRegistry.mapping deleted file mode 100644 index 318b3fa7bb..0000000000 --- a/mappings/net/minecraft/client/item/ModelPredicateProviderRegistry.mapping +++ /dev/null @@ -1,148 +0,0 @@ -CLASS net/minecraft/class_5272 net/minecraft/client/item/ModelPredicateProviderRegistry - FIELD field_24443 GLOBAL Ljava/util/Map; - FIELD field_24444 DAMAGED_ID Lnet/minecraft/class_2960; - FIELD field_24445 DAMAGE_ID Lnet/minecraft/class_2960; - 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; - METHOD method_27877 (Lnet/minecraft/class_1792;)Ljava/util/Map; - ARG 0 key - METHOD method_27878 get (Lnet/minecraft/class_1799;Lnet/minecraft/class_2960;)Lnet/minecraft/class_1800; - ARG 0 stack - ARG 1 id - METHOD method_27879 register (Lnet/minecraft/class_1792;Lnet/minecraft/class_2960;Lnet/minecraft/class_6395;)V - ARG 0 item - ARG 1 id - ARG 2 provider - METHOD method_27880 (Lnet/minecraft/class_1799;Lnet/minecraft/class_638;Lnet/minecraft/class_1309;I)F - ARG 0 stack - ARG 1 world - ARG 2 entity - ARG 3 seed - METHOD method_27881 register (Lnet/minecraft/class_2960;Lnet/minecraft/class_6395;)Lnet/minecraft/class_6395; - ARG 0 id - ARG 1 provider - METHOD method_27882 (Lnet/minecraft/class_1799;Lnet/minecraft/class_638;Lnet/minecraft/class_1309;I)F - ARG 0 stack - ARG 1 world - ARG 2 entity - ARG 3 seed - METHOD method_27883 (Lnet/minecraft/class_1799;Lnet/minecraft/class_638;Lnet/minecraft/class_1309;I)F - ARG 0 stack - ARG 1 world - ARG 2 entity - ARG 3 seed - METHOD method_27884 (Lnet/minecraft/class_1799;Lnet/minecraft/class_638;Lnet/minecraft/class_1309;I)F - ARG 0 stack - ARG 1 world - ARG 2 entity - ARG 3 seed - METHOD method_27885 (Lnet/minecraft/class_1799;Lnet/minecraft/class_638;Lnet/minecraft/class_1309;I)F - ARG 0 stack - ARG 1 world - ARG 2 entity - ARG 3 seed - METHOD method_27886 (Lnet/minecraft/class_1799;Lnet/minecraft/class_638;Lnet/minecraft/class_1309;I)F - ARG 0 stack - ARG 1 world - ARG 2 entity - ARG 3 seed - METHOD method_27887 (Lnet/minecraft/class_1799;Lnet/minecraft/class_638;Lnet/minecraft/class_1309;I)F - ARG 0 stack - ARG 1 world - ARG 2 entity - ARG 3 seed - METHOD method_27888 (Lnet/minecraft/class_1799;Lnet/minecraft/class_638;Lnet/minecraft/class_1309;I)F - ARG 0 stack - ARG 1 world - ARG 2 entity - ARG 3 seed - METHOD method_27889 (Lnet/minecraft/class_1799;Lnet/minecraft/class_638;Lnet/minecraft/class_1309;I)F - ARG 0 stack - ARG 1 world - ARG 2 entity - ARG 3 seed - METHOD method_27890 (Lnet/minecraft/class_1799;Lnet/minecraft/class_638;Lnet/minecraft/class_1309;I)F - ARG 0 stack - ARG 1 world - ARG 2 entity - ARG 3 seed - METHOD method_27891 (Lnet/minecraft/class_1799;Lnet/minecraft/class_638;Lnet/minecraft/class_1309;I)F - ARG 0 stack - ARG 1 world - ARG 2 entity - ARG 3 seed - METHOD method_27892 (Lnet/minecraft/class_1799;Lnet/minecraft/class_638;Lnet/minecraft/class_1309;I)F - ARG 0 stack - ARG 1 world - ARG 2 entity - ARG 3 seed - METHOD method_27893 (Lnet/minecraft/class_1799;Lnet/minecraft/class_638;Lnet/minecraft/class_1309;I)F - ARG 0 stack - ARG 1 world - ARG 2 entity - ARG 3 seed - METHOD method_27894 (Lnet/minecraft/class_1799;Lnet/minecraft/class_638;Lnet/minecraft/class_1309;I)F - ARG 0 stack - ARG 1 world - ARG 2 entity - ARG 3 seed - METHOD method_27895 (Lnet/minecraft/class_1799;Lnet/minecraft/class_638;Lnet/minecraft/class_1309;I)F - ARG 0 stack - ARG 1 world - ARG 2 entity - ARG 3 seed - METHOD method_32202 (Lnet/minecraft/class_1799;Lnet/minecraft/class_638;Lnet/minecraft/class_1309;I)F - ARG 0 stack - ARG 1 world - ARG 2 entity - ARG 3 seed - METHOD method_35803 (Lnet/minecraft/class_1799;Lnet/minecraft/class_638;Lnet/minecraft/class_1309;I)F - ARG 0 stack - ARG 1 world - ARG 2 entity - ARG 3 seed - METHOD method_37106 registerCustomModelData (Lnet/minecraft/class_1800;)V - ARG 0 provider - METHOD method_43219 (Lnet/minecraft/class_638;Lnet/minecraft/class_1799;Lnet/minecraft/class_1297;)Lnet/minecraft/class_4208; - ARG 0 world - ARG 1 stack - ARG 2 entity - METHOD method_43220 (Lnet/minecraft/class_638;Lnet/minecraft/class_1799;Lnet/minecraft/class_1297;)Lnet/minecraft/class_4208; - ARG 0 world - ARG 1 stack - ARG 2 entity - METHOD method_43611 (Lnet/minecraft/class_1799;Lnet/minecraft/class_638;Lnet/minecraft/class_1309;I)F - ARG 0 stack - ARG 1 world - ARG 2 entity - ARG 3 seed - METHOD method_48484 (Lnet/minecraft/class_1799;Lnet/minecraft/class_638;Lnet/minecraft/class_1309;I)F - ARG 0 stack - ARG 1 world - ARG 2 entity - ARG 3 seed - METHOD method_49351 (Lnet/minecraft/class_1799;Lnet/minecraft/class_638;Lnet/minecraft/class_1309;I)F - ARG 0 stack - ARG 1 world - ARG 2 entity - ARG 3 seed - METHOD method_63532 getHoneyLevel (Lnet/minecraft/class_1799;)I - ARG 0 stack - METHOD method_63533 (Lnet/minecraft/class_1799;Lnet/minecraft/class_638;Lnet/minecraft/class_1309;I)F - ARG 0 stack - ARG 1 world - ARG 2 entity - ARG 3 seed - METHOD method_63534 (Lnet/minecraft/class_1799;Lnet/minecraft/class_638;Lnet/minecraft/class_1309;I)F - ARG 0 stack - ARG 1 world - ARG 2 entity - ARG 3 seed - CLASS 1 - FIELD field_7910 step D - FIELD field_7911 time D - FIELD field_7913 lastTick J - METHOD method_7736 getTime (Lnet/minecraft/class_1937;D)D - ARG 1 world - ARG 2 skyAngle diff --git a/mappings/net/minecraft/client/particle/CrackParticle.mapping b/mappings/net/minecraft/client/particle/CrackParticle.mapping index 27d5406a18..f599913b6e 100644 --- a/mappings/net/minecraft/client/particle/CrackParticle.mapping +++ b/mappings/net/minecraft/client/particle/CrackParticle.mapping @@ -1,7 +1,7 @@ CLASS net/minecraft/class_647 net/minecraft/client/particle/CrackParticle FIELD field_17783 sampleU F FIELD field_17784 sampleV F - METHOD (Lnet/minecraft/class_638;DDDDDDLnet/minecraft/class_1799;)V + METHOD (Lnet/minecraft/class_638;DDDDDDLnet/minecraft/class_10444;)V ARG 1 world ARG 2 x ARG 4 y @@ -9,13 +9,10 @@ CLASS net/minecraft/class_647 net/minecraft/client/particle/CrackParticle ARG 8 velocityX ARG 10 velocityY ARG 12 velocityZ - ARG 14 stack - METHOD (Lnet/minecraft/class_638;DDDLnet/minecraft/class_1799;)V - ARG 1 world + METHOD (Lnet/minecraft/class_638;DDDLnet/minecraft/class_10444;)V ARG 2 x ARG 4 y ARG 6 z - ARG 8 stack CLASS class_648 ItemFactory CLASS class_649 SlimeballFactory CLASS class_650 SnowballFactory diff --git a/mappings/net/minecraft/client/render/TexturedRenderLayers.mapping b/mappings/net/minecraft/client/render/TexturedRenderLayers.mapping index 2cb0b7e145..cbd1a0b554 100644 --- a/mappings/net/minecraft/client/render/TexturedRenderLayers.mapping +++ b/mappings/net/minecraft/client/render/TexturedRenderLayers.mapping @@ -31,8 +31,6 @@ CLASS net/minecraft/class_4722 net/minecraft/client/render/TexturedRenderLayers FIELD field_51914 DECORATED_POT_BASE Lnet/minecraft/class_4730; FIELD field_51915 DECORATED_POT_SIDE Lnet/minecraft/class_4730; METHOD method_24059 getBannerPatterns ()Lnet/minecraft/class_1921; - METHOD method_24061 (Lnet/minecraft/class_1767;)Lnet/minecraft/class_4730; - ARG 0 color METHOD method_24062 getChestTextureId (Lnet/minecraft/class_2586;Lnet/minecraft/class_2745;Z)Lnet/minecraft/class_4730; ARG 0 blockEntity ARG 1 type @@ -47,8 +45,6 @@ CLASS net/minecraft/class_4722 net/minecraft/client/render/TexturedRenderLayers METHOD method_24065 createChestTextureId (Ljava/lang/String;)Lnet/minecraft/class_4730; ARG 0 variant METHOD method_24067 getShieldPatterns ()Lnet/minecraft/class_1921; - METHOD method_24068 (Ljava/lang/String;)Lnet/minecraft/class_4730; - ARG 0 colorName METHOD method_24069 getBeds ()Lnet/minecraft/class_1921; METHOD method_24070 getShulkerBoxes ()Lnet/minecraft/class_1921; METHOD method_24071 getSign ()Lnet/minecraft/class_1921; diff --git a/mappings/net/minecraft/client/render/block/BlockRenderManager.mapping b/mappings/net/minecraft/client/render/block/BlockRenderManager.mapping index 9908f8ed8d..af2a7b74fa 100644 --- a/mappings/net/minecraft/client/render/block/BlockRenderManager.mapping +++ b/mappings/net/minecraft/client/render/block/BlockRenderManager.mapping @@ -1,13 +1,11 @@ CLASS net/minecraft/class_776 net/minecraft/client/render/block/BlockRenderManager FIELD field_20987 blockColors Lnet/minecraft/class_324; - FIELD field_27742 builtinModelItemRenderer Lnet/minecraft/class_756; FIELD field_4167 fluidRenderer Lnet/minecraft/class_775; FIELD field_4168 models Lnet/minecraft/class_773; FIELD field_4169 random Lnet/minecraft/class_5819; FIELD field_4170 blockModelRenderer Lnet/minecraft/class_778; - METHOD (Lnet/minecraft/class_773;Lnet/minecraft/class_756;Lnet/minecraft/class_324;)V + METHOD (Lnet/minecraft/class_773;Ljava/util/function/Supplier;Lnet/minecraft/class_324;)V ARG 1 models - ARG 2 builtinModelItemRenderer ARG 3 blockColors METHOD method_23071 renderDamage (Lnet/minecraft/class_2680;Lnet/minecraft/class_2338;Lnet/minecraft/class_1920;Lnet/minecraft/class_4587;Lnet/minecraft/class_4588;)V ARG 1 state diff --git a/mappings/net/minecraft/client/render/block/entity/BlockEntityRenderDispatcher.mapping b/mappings/net/minecraft/client/render/block/entity/BlockEntityRenderDispatcher.mapping index e8842d7452..b13ecdbdc5 100644 --- a/mappings/net/minecraft/client/render/block/entity/BlockEntityRenderDispatcher.mapping +++ b/mappings/net/minecraft/client/render/block/entity/BlockEntityRenderDispatcher.mapping @@ -1,25 +1,15 @@ CLASS net/minecraft/class_824 net/minecraft/client/render/block/entity/BlockEntityRenderDispatcher - FIELD field_27746 entityModelLoader Lnet/minecraft/class_5599; - FIELD field_27747 blockRenderManager Ljava/util/function/Supplier; - FIELD field_38880 itemRenderer Ljava/util/function/Supplier; - FIELD field_38881 entityRenderDispatcher Ljava/util/function/Supplier; + FIELD field_27746 entityModelLoader Ljava/util/function/Supplier; + FIELD field_27747 blockRenderManager Lnet/minecraft/class_776; + FIELD field_38880 itemRenderer Lnet/minecraft/class_918; + FIELD field_38881 entityRenderDispatcher Lnet/minecraft/class_898; FIELD field_4342 textRenderer Lnet/minecraft/class_327; FIELD field_4344 camera Lnet/minecraft/class_4184; FIELD field_4345 renderers Ljava/util/Map; FIELD field_4348 world Lnet/minecraft/class_1937; FIELD field_4350 crosshairTarget Lnet/minecraft/class_239; - METHOD (Lnet/minecraft/class_327;Lnet/minecraft/class_5599;Ljava/util/function/Supplier;Ljava/util/function/Supplier;Ljava/util/function/Supplier;)V + METHOD (Lnet/minecraft/class_327;Ljava/util/function/Supplier;Lnet/minecraft/class_776;Lnet/minecraft/class_10442;Lnet/minecraft/class_918;Lnet/minecraft/class_898;)V ARG 1 textRenderer - ARG 2 entityModelLoader - ARG 3 blockRenderManager - ARG 4 itemRenderer - ARG 5 entityRenderDispatcher - METHOD method_23077 renderEntity (Lnet/minecraft/class_2586;Lnet/minecraft/class_4587;Lnet/minecraft/class_4597;II)Z - ARG 1 entity - ARG 2 matrix - ARG 3 vertexConsumerProvider - ARG 4 light - ARG 5 overlay METHOD method_23079 render (Lnet/minecraft/class_827;Lnet/minecraft/class_2586;FLnet/minecraft/class_4587;Lnet/minecraft/class_4597;)V ARG 0 renderer ARG 1 blockEntity @@ -34,9 +24,6 @@ CLASS net/minecraft/class_824 net/minecraft/client/render/block/entity/BlockEnti ARG 1 blockEntity METHOD method_3551 setWorld (Lnet/minecraft/class_1937;)V ARG 1 world - METHOD method_3554 runReported (Lnet/minecraft/class_2586;Ljava/lang/Runnable;)V - ARG 0 blockEntity - ARG 1 runnable METHOD method_3555 render (Lnet/minecraft/class_2586;FLnet/minecraft/class_4587;Lnet/minecraft/class_4597;)V ARG 1 blockEntity ARG 2 tickDelta diff --git a/mappings/net/minecraft/client/render/block/entity/BlockEntityRendererFactory.mapping b/mappings/net/minecraft/client/render/block/entity/BlockEntityRendererFactory.mapping index 5f82469d98..2c98215f57 100644 --- a/mappings/net/minecraft/client/render/block/entity/BlockEntityRendererFactory.mapping +++ b/mappings/net/minecraft/client/render/block/entity/BlockEntityRendererFactory.mapping @@ -8,13 +8,10 @@ CLASS net/minecraft/class_5614 net/minecraft/client/render/block/entity/BlockEnt FIELD field_27751 textRenderer Lnet/minecraft/class_327; FIELD field_38882 itemRenderer Lnet/minecraft/class_918; FIELD field_38883 entityRenderDispatcher Lnet/minecraft/class_898; - METHOD (Lnet/minecraft/class_824;Lnet/minecraft/class_776;Lnet/minecraft/class_918;Lnet/minecraft/class_898;Lnet/minecraft/class_5599;Lnet/minecraft/class_327;)V + METHOD (Lnet/minecraft/class_824;Lnet/minecraft/class_776;Lnet/minecraft/class_10442;Lnet/minecraft/class_918;Lnet/minecraft/class_898;Lnet/minecraft/class_5599;Lnet/minecraft/class_327;)V ARG 1 renderDispatcher ARG 2 renderManager ARG 3 itemRenderer - ARG 4 entityRenderDispatcher - ARG 5 layerRenderDispatcher - ARG 6 textRenderer METHOD method_32139 getRenderDispatcher ()Lnet/minecraft/class_824; METHOD method_32140 getLayerModelPart (Lnet/minecraft/class_5601;)Lnet/minecraft/class_630; ARG 1 modelLayer diff --git a/mappings/net/minecraft/client/render/block/entity/ShulkerBoxBlockEntityRenderer.mapping b/mappings/net/minecraft/client/render/block/entity/ShulkerBoxBlockEntityRenderer.mapping index 59a7312d3a..554dcb0631 100644 --- a/mappings/net/minecraft/client/render/block/entity/ShulkerBoxBlockEntityRenderer.mapping +++ b/mappings/net/minecraft/client/render/block/entity/ShulkerBoxBlockEntityRenderer.mapping @@ -6,6 +6,4 @@ CLASS net/minecraft/class_834 net/minecraft/client/render/block/entity/ShulkerBo FIELD field_53169 lid Lnet/minecraft/class_630; METHOD (Lnet/minecraft/class_630;)V ARG 1 root - METHOD method_62341 animateLid (Lnet/minecraft/class_2627;F)V - ARG 1 blockEntity - ARG 2 delta + METHOD method_62341 animateLid (F)V diff --git a/mappings/net/minecraft/client/render/block/entity/SkullBlockEntityRenderer.mapping b/mappings/net/minecraft/client/render/block/entity/SkullBlockEntityRenderer.mapping index 4fbcb0048c..055c486847 100644 --- a/mappings/net/minecraft/client/render/block/entity/SkullBlockEntityRenderer.mapping +++ b/mappings/net/minecraft/client/render/block/entity/SkullBlockEntityRenderer.mapping @@ -1,9 +1,7 @@ CLASS net/minecraft/class_836 net/minecraft/client/render/block/entity/SkullBlockEntityRenderer FIELD field_4390 TEXTURES Ljava/util/Map; - FIELD field_4391 MODELS Ljava/util/Map; - METHOD (Lnet/minecraft/class_5614$class_5615;)V - ARG 1 ctx - METHOD method_32160 getModels (Lnet/minecraft/class_5599;)Ljava/util/Map; + FIELD field_4391 MODELS Ljava/util/function/Function; + METHOD method_32160 getModels (Lnet/minecraft/class_5599;Lnet/minecraft/class_2484$class_2485;)Lnet/minecraft/class_5598; ARG 0 modelLoader METHOD method_32161 renderSkull (Lnet/minecraft/class_2350;FFLnet/minecraft/class_4587;Lnet/minecraft/class_4597;ILnet/minecraft/class_5598;Lnet/minecraft/class_1921;)V ARG 0 direction diff --git a/mappings/net/minecraft/client/render/block/entity/VaultBlockEntityRenderer.mapping b/mappings/net/minecraft/client/render/block/entity/VaultBlockEntityRenderer.mapping index 9ea51f55ff..b4f192adef 100644 --- a/mappings/net/minecraft/client/render/block/entity/VaultBlockEntityRenderer.mapping +++ b/mappings/net/minecraft/client/render/block/entity/VaultBlockEntityRenderer.mapping @@ -1,16 +1,2 @@ CLASS net/minecraft/class_9214 net/minecraft/client/render/block/entity/VaultBlockEntityRenderer - FIELD field_48952 itemRenderer Lnet/minecraft/class_918; FIELD field_48953 random Lnet/minecraft/class_5819; - METHOD (Lnet/minecraft/class_5614$class_5615;)V - ARG 1 context - METHOD method_56851 renderDisplayItem (FLnet/minecraft/class_1937;Lnet/minecraft/class_4587;Lnet/minecraft/class_4597;ILnet/minecraft/class_1799;Lnet/minecraft/class_918;FFLnet/minecraft/class_5819;)V - ARG 0 tickDelta - ARG 1 world - ARG 2 matrices - ARG 3 vertexConsumers - ARG 4 light - ARG 5 stack - ARG 6 itemRenderer - ARG 7 prevRotation - ARG 8 rotation - ARG 9 random diff --git a/mappings/net/minecraft/client/render/entity/BipedEntityRenderer.mapping b/mappings/net/minecraft/client/render/entity/BipedEntityRenderer.mapping index beb0d7f17b..3be735e96a 100644 --- a/mappings/net/minecraft/client/render/entity/BipedEntityRenderer.mapping +++ b/mappings/net/minecraft/client/render/entity/BipedEntityRenderer.mapping @@ -14,7 +14,7 @@ CLASS net/minecraft/class_909 net/minecraft/client/render/entity/BipedEntityRend ARG 3 babyModel ARG 4 scale ARG 5 headTransformation - METHOD method_62461 updateBipedRenderState (Lnet/minecraft/class_1309;Lnet/minecraft/class_10034;F)V + METHOD method_62461 updateBipedRenderState (Lnet/minecraft/class_1309;Lnet/minecraft/class_10034;FLnet/minecraft/class_10442;)V ARG 0 entity ARG 1 state ARG 2 tickDelta diff --git a/mappings/net/minecraft/client/render/entity/DisplayEntityRenderer.mapping b/mappings/net/minecraft/client/render/entity/DisplayEntityRenderer.mapping index d587ca923d..de05e8c6a5 100644 --- a/mappings/net/minecraft/client/render/entity/DisplayEntityRenderer.mapping +++ b/mappings/net/minecraft/client/render/entity/DisplayEntityRenderer.mapping @@ -24,7 +24,6 @@ CLASS net/minecraft/class_8138 net/minecraft/client/render/entity/DisplayEntityR CLASS class_8139 BlockDisplayEntityRenderer FIELD field_42528 blockRenderManager Lnet/minecraft/class_776; CLASS class_8140 ItemDisplayEntityRenderer - FIELD field_42529 itemRenderer Lnet/minecraft/class_918; CLASS class_8141 TextDisplayEntityRenderer FIELD field_42531 displayTextRenderer Lnet/minecraft/class_327; METHOD method_49057 getLines (Lnet/minecraft/class_2561;I)Lnet/minecraft/class_8113$class_8123$class_8125; diff --git a/mappings/net/minecraft/client/render/entity/EntityRenderDispatcher.mapping b/mappings/net/minecraft/client/render/entity/EntityRenderDispatcher.mapping index 831b5293dd..b64f4cc90e 100644 --- a/mappings/net/minecraft/client/render/entity/EntityRenderDispatcher.mapping +++ b/mappings/net/minecraft/client/render/entity/EntityRenderDispatcher.mapping @@ -1,8 +1,7 @@ CLASS net/minecraft/class_898 net/minecraft/client/render/entity/EntityRenderDispatcher FIELD field_21009 SHADOW_LAYER Lnet/minecraft/class_1921; FIELD field_21794 rotation Lorg/joml/Quaternionf; - FIELD field_27759 itemRenderer Lnet/minecraft/class_918; - FIELD field_27760 modelLoader Lnet/minecraft/class_5599; + FIELD field_27760 modelLoader Ljava/util/function/Supplier; FIELD field_38886 blockRenderManager Lnet/minecraft/class_776; FIELD field_38887 heldItemRenderer Lnet/minecraft/class_759; FIELD field_4678 targetedEntity Lnet/minecraft/class_1297; @@ -16,17 +15,9 @@ CLASS net/minecraft/class_898 net/minecraft/client/render/entity/EntityRenderDis FIELD field_4692 gameOptions Lnet/minecraft/class_315; FIELD field_4696 renderers Ljava/util/Map; FIELD field_53188 mapRenderer Lnet/minecraft/class_330; - FIELD field_54173 equipmentModelLoader Lnet/minecraft/class_10201; - METHOD (Lnet/minecraft/class_310;Lnet/minecraft/class_1060;Lnet/minecraft/class_918;Lnet/minecraft/class_330;Lnet/minecraft/class_776;Lnet/minecraft/class_327;Lnet/minecraft/class_315;Lnet/minecraft/class_5599;Lnet/minecraft/class_10201;)V + METHOD (Lnet/minecraft/class_310;Lnet/minecraft/class_1060;Lnet/minecraft/class_10442;Lnet/minecraft/class_918;Lnet/minecraft/class_330;Lnet/minecraft/class_776;Lnet/minecraft/class_327;Lnet/minecraft/class_315;Ljava/util/function/Supplier;Lnet/minecraft/class_10201;)V ARG 1 client ARG 2 textureManager - ARG 3 itemRenderer - ARG 4 mapRenderer - ARG 5 blockRenderManager - ARG 6 textRenderer - ARG 7 gameOptions - ARG 8 modelLoader - ARG 9 equipmentModelLoader METHOD method_23161 drawFireVertex (Lnet/minecraft/class_4587$class_4665;Lnet/minecraft/class_4588;FFFFF)V ARG 0 entry ARG 1 vertices diff --git a/mappings/net/minecraft/client/render/entity/EntityRendererFactory.mapping b/mappings/net/minecraft/client/render/entity/EntityRendererFactory.mapping index 371627fdbf..b6cd4a479a 100644 --- a/mappings/net/minecraft/client/render/entity/EntityRendererFactory.mapping +++ b/mappings/net/minecraft/client/render/entity/EntityRendererFactory.mapping @@ -3,7 +3,6 @@ CLASS net/minecraft/class_5617 net/minecraft/client/render/entity/EntityRenderer ARG 1 ctx CLASS class_5618 Context FIELD field_27762 renderDispatcher Lnet/minecraft/class_898; - FIELD field_27763 itemRenderer Lnet/minecraft/class_918; FIELD field_27764 resourceManager Lnet/minecraft/class_3300; FIELD field_27765 modelLoader Lnet/minecraft/class_5599; FIELD field_27766 textRenderer Lnet/minecraft/class_327; @@ -11,7 +10,7 @@ CLASS net/minecraft/class_5617 net/minecraft/client/render/entity/EntityRenderer FIELD field_53190 mapRenderer Lnet/minecraft/class_330; FIELD field_54174 equipmentModelLoader Lnet/minecraft/class_10201; FIELD field_54175 equipmentRenderer Lnet/minecraft/class_10197; - METHOD (Lnet/minecraft/class_898;Lnet/minecraft/class_918;Lnet/minecraft/class_330;Lnet/minecraft/class_776;Lnet/minecraft/class_3300;Lnet/minecraft/class_5599;Lnet/minecraft/class_10201;Lnet/minecraft/class_327;)V + METHOD (Lnet/minecraft/class_898;Lnet/minecraft/class_10442;Lnet/minecraft/class_330;Lnet/minecraft/class_776;Lnet/minecraft/class_3300;Lnet/minecraft/class_5599;Lnet/minecraft/class_10201;Lnet/minecraft/class_327;)V ARG 1 renderDispatcher ARG 2 itemRenderer ARG 3 mapRenderer @@ -23,7 +22,6 @@ CLASS net/minecraft/class_5617 net/minecraft/client/render/entity/EntityRenderer METHOD method_32166 getRenderDispatcher ()Lnet/minecraft/class_898; METHOD method_32167 getPart (Lnet/minecraft/class_5601;)Lnet/minecraft/class_630; ARG 1 layer - METHOD method_32168 getItemRenderer ()Lnet/minecraft/class_918; METHOD method_32169 getResourceManager ()Lnet/minecraft/class_3300; METHOD method_32170 getModelLoader ()Lnet/minecraft/class_5599; METHOD method_32171 getTextRenderer ()Lnet/minecraft/class_327; diff --git a/mappings/net/minecraft/client/render/entity/FireworkRocketEntityRenderer.mapping b/mappings/net/minecraft/client/render/entity/FireworkRocketEntityRenderer.mapping index 86e5307734..d8b8b18eef 100644 --- a/mappings/net/minecraft/client/render/entity/FireworkRocketEntityRenderer.mapping +++ b/mappings/net/minecraft/client/render/entity/FireworkRocketEntityRenderer.mapping @@ -1,2 +1 @@ CLASS net/minecraft/class_903 net/minecraft/client/render/entity/FireworkRocketEntityRenderer - FIELD field_4703 itemRenderer Lnet/minecraft/class_918; diff --git a/mappings/net/minecraft/client/render/entity/FlyingItemEntityRenderer.mapping b/mappings/net/minecraft/client/render/entity/FlyingItemEntityRenderer.mapping index 5de10444ab..b3e9017634 100644 --- a/mappings/net/minecraft/client/render/entity/FlyingItemEntityRenderer.mapping +++ b/mappings/net/minecraft/client/render/entity/FlyingItemEntityRenderer.mapping @@ -1,7 +1,6 @@ CLASS net/minecraft/class_953 net/minecraft/client/render/entity/FlyingItemEntityRenderer FIELD field_17147 scale F FIELD field_21745 lit Z - FIELD field_4792 itemRenderer Lnet/minecraft/class_918; METHOD (Lnet/minecraft/class_5617$class_5618;FZ)V ARG 1 ctx ARG 2 scale diff --git a/mappings/net/minecraft/client/render/entity/ItemEntityRenderer.mapping b/mappings/net/minecraft/client/render/entity/ItemEntityRenderer.mapping index e2532f3deb..a0672104ba 100644 --- a/mappings/net/minecraft/client/render/entity/ItemEntityRenderer.mapping +++ b/mappings/net/minecraft/client/render/entity/ItemEntityRenderer.mapping @@ -1,24 +1,3 @@ CLASS net/minecraft/class_916 net/minecraft/client/render/entity/ItemEntityRenderer FIELD field_4725 random Lnet/minecraft/class_5819; - FIELD field_4726 itemRenderer Lnet/minecraft/class_918; - METHOD method_56855 getRenderedAmount (I)I - ARG 0 stackSize - METHOD method_56856 getSeed (Lnet/minecraft/class_1799;)I - ARG 0 stack - METHOD method_56857 renderStack (Lnet/minecraft/class_918;Lnet/minecraft/class_4587;Lnet/minecraft/class_4597;ILnet/minecraft/class_1799;Lnet/minecraft/class_5819;Lnet/minecraft/class_1937;)V - ARG 0 itemRenderer - ARG 1 matrices - ARG 2 vertexConsumers - ARG 3 light - ARG 4 stack - ARG 5 random - ARG 6 world - METHOD method_56858 renderStack (Lnet/minecraft/class_918;Lnet/minecraft/class_4587;Lnet/minecraft/class_4597;ILnet/minecraft/class_1799;Lnet/minecraft/class_1087;ZLnet/minecraft/class_5819;)V - ARG 0 itemRenderer - ARG 1 matrices - ARG 2 vertexConsumers - ARG 3 light - ARG 4 stack - ARG 5 model - ARG 6 depth - ARG 7 random + METHOD method_56858 renderStack (Lnet/minecraft/class_4587;Lnet/minecraft/class_4597;ILnet/minecraft/class_10428;Lnet/minecraft/class_5819;)V diff --git a/mappings/net/minecraft/client/render/entity/ItemFrameEntityRenderer.mapping b/mappings/net/minecraft/client/render/entity/ItemFrameEntityRenderer.mapping index ea6144cece..cde164619b 100644 --- a/mappings/net/minecraft/client/render/entity/ItemFrameEntityRenderer.mapping +++ b/mappings/net/minecraft/client/render/entity/ItemFrameEntityRenderer.mapping @@ -1,12 +1,9 @@ CLASS net/minecraft/class_915 net/minecraft/client/render/entity/ItemFrameEntityRenderer FIELD field_32932 GLOW_FRAME_BLOCK_LIGHT I FIELD field_38891 blockRenderManager Lnet/minecraft/class_776; - FIELD field_4720 itemRenderer Lnet/minecraft/class_918; FIELD field_53191 mapRenderer Lnet/minecraft/class_330; METHOD method_33433 getLight (ZII)I ARG 1 glow ARG 2 glowLight ARG 3 regularLight - METHOD method_33434 getModelId (ZLnet/minecraft/class_1799;)Lnet/minecraft/class_1091; - ARG 1 glow - ARG 2 stack + METHOD method_33434 getModelId (Lnet/minecraft/class_10040;)Lnet/minecraft/class_1091; diff --git a/mappings/net/minecraft/client/render/entity/LivingEntityRenderer.mapping b/mappings/net/minecraft/client/render/entity/LivingEntityRenderer.mapping index f8ca594fb1..5d4db14149 100644 --- a/mappings/net/minecraft/client/render/entity/LivingEntityRenderer.mapping +++ b/mappings/net/minecraft/client/render/entity/LivingEntityRenderer.mapping @@ -1,7 +1,6 @@ CLASS net/minecraft/class_922 net/minecraft/client/render/entity/LivingEntityRenderer FIELD field_4737 model Lnet/minecraft/class_583; FIELD field_4738 features Ljava/util/List; - FIELD field_53193 itemRenderer Lnet/minecraft/class_918; METHOD (Lnet/minecraft/class_5617$class_5618;Lnet/minecraft/class_583;F)V ARG 1 ctx ARG 2 model diff --git a/mappings/net/minecraft/client/render/entity/OminousItemSpawnerEntityRenderer.mapping b/mappings/net/minecraft/client/render/entity/OminousItemSpawnerEntityRenderer.mapping index 5e9346ccc4..2826fbcf96 100644 --- a/mappings/net/minecraft/client/render/entity/OminousItemSpawnerEntityRenderer.mapping +++ b/mappings/net/minecraft/client/render/entity/OminousItemSpawnerEntityRenderer.mapping @@ -1,2 +1 @@ CLASS net/minecraft/class_9483 net/minecraft/client/render/entity/OminousItemSpawnerEntityRenderer - FIELD field_50233 itemRenderer Lnet/minecraft/class_918; diff --git a/mappings/net/minecraft/client/render/entity/PlayerEntityRenderer.mapping b/mappings/net/minecraft/client/render/entity/PlayerEntityRenderer.mapping index 2ed415c248..4a3c541f1a 100644 --- a/mappings/net/minecraft/client/render/entity/PlayerEntityRenderer.mapping +++ b/mappings/net/minecraft/client/render/entity/PlayerEntityRenderer.mapping @@ -9,9 +9,7 @@ CLASS net/minecraft/class_1007 net/minecraft/client/render/entity/PlayerEntityRe ARG 4 skinTexture ARG 5 arm ARG 6 sleeveVisible - METHOD method_4210 getArmPose (Lnet/minecraft/class_10055;Lnet/minecraft/class_10055$class_10056;Lnet/minecraft/class_1268;)Lnet/minecraft/class_572$class_573; - ARG 0 state - ARG 1 handState + METHOD method_4210 getArmPose (Lnet/minecraft/class_1657;Lnet/minecraft/class_1799;Lnet/minecraft/class_1268;)Lnet/minecraft/class_572$class_573; ARG 2 hand METHOD method_4220 renderRightArm (Lnet/minecraft/class_4587;Lnet/minecraft/class_4597;ILnet/minecraft/class_2960;Z)V ARG 1 matrices @@ -27,10 +25,6 @@ CLASS net/minecraft/class_1007 net/minecraft/client/render/entity/PlayerEntityRe ARG 5 sleeveVisible METHOD method_62602 (Lnet/minecraft/class_1299;)Z ARG 0 type - METHOD method_62603 updateHandState (Lnet/minecraft/class_742;Lnet/minecraft/class_10055$class_10056;Lnet/minecraft/class_1268;)V - ARG 1 player - ARG 2 handState - ARG 3 hand METHOD method_62605 getShoulderParrotVariant (Lnet/minecraft/class_742;Z)Lnet/minecraft/class_1453$class_7989; ARG 0 player ARG 1 left @@ -42,6 +36,5 @@ CLASS net/minecraft/class_1007 net/minecraft/client/render/entity/PlayerEntityRe ARG 0 player ARG 1 state ARG 2 tickDelta - METHOD method_64258 getArmPose (Lnet/minecraft/class_10055;Lnet/minecraft/class_1306;)Lnet/minecraft/class_572$class_573; - ARG 0 state + METHOD method_64258 getArmPose (Lnet/minecraft/class_742;Lnet/minecraft/class_1306;)Lnet/minecraft/class_572$class_573; ARG 1 arm diff --git a/mappings/net/minecraft/client/render/entity/equipment/EquipmentModelLoader.mapping b/mappings/net/minecraft/client/render/entity/equipment/EquipmentModelLoader.mapping index 31d19ce7ff..5927a677ac 100644 --- a/mappings/net/minecraft/client/render/entity/equipment/EquipmentModelLoader.mapping +++ b/mappings/net/minecraft/client/render/entity/equipment/EquipmentModelLoader.mapping @@ -1,5 +1,4 @@ CLASS net/minecraft/class_10201 net/minecraft/client/render/entity/equipment/EquipmentModelLoader FIELD field_54189 EMPTY Lnet/minecraft/class_10186; FIELD field_54190 models Ljava/util/Map; - METHOD method_64087 get (Lnet/minecraft/class_2960;)Lnet/minecraft/class_10186; - ARG 1 id + METHOD method_64087 get (Lnet/minecraft/class_5321;)Lnet/minecraft/class_10186; diff --git a/mappings/net/minecraft/client/render/entity/equipment/EquipmentRenderer.mapping b/mappings/net/minecraft/client/render/entity/equipment/EquipmentRenderer.mapping index e238444901..7f2722d4be 100644 --- a/mappings/net/minecraft/client/render/entity/equipment/EquipmentRenderer.mapping +++ b/mappings/net/minecraft/client/render/entity/equipment/EquipmentRenderer.mapping @@ -8,17 +8,15 @@ CLASS net/minecraft/class_10197 net/minecraft/client/render/entity/equipment/Equ METHOD method_64076 getDyeColor (Lnet/minecraft/class_10186$class_10189;I)I ARG 0 layer ARG 1 dyeColor - METHOD method_64077 render (Lnet/minecraft/class_10186$class_10190;Lnet/minecraft/class_2960;Lnet/minecraft/class_3879;Lnet/minecraft/class_1799;Lnet/minecraft/class_4587;Lnet/minecraft/class_4597;I)V + METHOD method_64077 render (Lnet/minecraft/class_10186$class_10190;Lnet/minecraft/class_5321;Lnet/minecraft/class_3879;Lnet/minecraft/class_1799;Lnet/minecraft/class_4587;Lnet/minecraft/class_4597;I)V ARG 1 layerType - ARG 2 modelId ARG 3 model ARG 4 stack ARG 5 matrices ARG 6 vertexConsumers ARG 7 light - METHOD method_64078 render (Lnet/minecraft/class_10186$class_10190;Lnet/minecraft/class_2960;Lnet/minecraft/class_3879;Lnet/minecraft/class_1799;Lnet/minecraft/class_4587;Lnet/minecraft/class_4597;ILnet/minecraft/class_2960;)V + METHOD method_64078 render (Lnet/minecraft/class_10186$class_10190;Lnet/minecraft/class_5321;Lnet/minecraft/class_3879;Lnet/minecraft/class_1799;Lnet/minecraft/class_4587;Lnet/minecraft/class_4597;ILnet/minecraft/class_2960;)V ARG 1 layerType - ARG 2 modelId ARG 3 model ARG 4 stack ARG 5 matrices diff --git a/mappings/net/minecraft/client/render/entity/feature/DolphinHeldItemFeatureRenderer.mapping b/mappings/net/minecraft/client/render/entity/feature/DolphinHeldItemFeatureRenderer.mapping index b201706da7..46fb80cc8c 100644 --- a/mappings/net/minecraft/client/render/entity/feature/DolphinHeldItemFeatureRenderer.mapping +++ b/mappings/net/minecraft/client/render/entity/feature/DolphinHeldItemFeatureRenderer.mapping @@ -1,5 +1 @@ CLASS net/minecraft/class_977 net/minecraft/client/render/entity/feature/DolphinHeldItemFeatureRenderer - FIELD field_38898 itemRenderer Lnet/minecraft/class_918; - METHOD (Lnet/minecraft/class_3883;Lnet/minecraft/class_918;)V - ARG 1 context - ARG 2 itemRenderer diff --git a/mappings/net/minecraft/client/render/entity/feature/EmissiveFeatureRenderer.mapping b/mappings/net/minecraft/client/render/entity/feature/EmissiveFeatureRenderer.mapping index 1d2a57e069..96d286f1eb 100644 --- a/mappings/net/minecraft/client/render/entity/feature/EmissiveFeatureRenderer.mapping +++ b/mappings/net/minecraft/client/render/entity/feature/EmissiveFeatureRenderer.mapping @@ -3,7 +3,7 @@ CLASS net/minecraft/class_7288 net/minecraft/client/render/entity/feature/Emissi FIELD field_38356 animationAlphaAdjuster Lnet/minecraft/class_7288$class_7289; FIELD field_38464 modelPartVisibility Lnet/minecraft/class_7288$class_7311; FIELD field_54861 renderLayerFunction Ljava/util/function/Function; - METHOD (Lnet/minecraft/class_3883;Lnet/minecraft/class_2960;Lnet/minecraft/class_7288$class_7289;Lnet/minecraft/class_7288$class_7311;Ljava/util/function/Function;)V + METHOD (Lnet/minecraft/class_3883;Lnet/minecraft/class_2960;Lnet/minecraft/class_7288$class_7289;Lnet/minecraft/class_7288$class_7311;Ljava/util/function/Function;Z)V ARG 1 context ARG 2 texture ARG 3 animationAlphaAdjuster diff --git a/mappings/net/minecraft/client/render/entity/feature/FeatureRenderer.mapping b/mappings/net/minecraft/client/render/entity/feature/FeatureRenderer.mapping index 0eba2709ed..ddbced77fa 100644 --- a/mappings/net/minecraft/client/render/entity/feature/FeatureRenderer.mapping +++ b/mappings/net/minecraft/client/render/entity/feature/FeatureRenderer.mapping @@ -1,7 +1,5 @@ CLASS net/minecraft/class_3887 net/minecraft/client/render/entity/feature/FeatureRenderer FIELD field_17155 context Lnet/minecraft/class_3883; - METHOD (Lnet/minecraft/class_3883;)V - ARG 1 context METHOD method_17165 getContextModel ()Lnet/minecraft/class_583; METHOD method_23196 render (Lnet/minecraft/class_583;Lnet/minecraft/class_2960;Lnet/minecraft/class_4587;Lnet/minecraft/class_4597;ILnet/minecraft/class_10042;I)V ARG 0 contextModel diff --git a/mappings/net/minecraft/client/render/entity/feature/FoxHeldItemFeatureRenderer.mapping b/mappings/net/minecraft/client/render/entity/feature/FoxHeldItemFeatureRenderer.mapping index 73ead8b190..1a185ba982 100644 --- a/mappings/net/minecraft/client/render/entity/feature/FoxHeldItemFeatureRenderer.mapping +++ b/mappings/net/minecraft/client/render/entity/feature/FoxHeldItemFeatureRenderer.mapping @@ -1,5 +1 @@ CLASS net/minecraft/class_4043 net/minecraft/client/render/entity/feature/FoxHeldItemFeatureRenderer - FIELD field_38899 itemRenderer Lnet/minecraft/class_918; - METHOD (Lnet/minecraft/class_3883;Lnet/minecraft/class_918;)V - ARG 1 context - ARG 2 itemRenderer diff --git a/mappings/net/minecraft/client/render/entity/feature/HeadFeatureRenderer.mapping b/mappings/net/minecraft/client/render/entity/feature/HeadFeatureRenderer.mapping index 89fdb5ab88..62019b6726 100644 --- a/mappings/net/minecraft/client/render/entity/feature/HeadFeatureRenderer.mapping +++ b/mappings/net/minecraft/client/render/entity/feature/HeadFeatureRenderer.mapping @@ -1,16 +1,13 @@ CLASS net/minecraft/class_976 net/minecraft/client/render/entity/feature/HeadFeatureRenderer - FIELD field_27771 headModels Ljava/util/Map; - FIELD field_38897 heldItemRenderer Lnet/minecraft/class_918; + FIELD field_27771 headModels Ljava/util/function/Function; FIELD field_53211 headTransformation Lnet/minecraft/class_976$class_9994; - METHOD (Lnet/minecraft/class_3883;Lnet/minecraft/class_5599;Lnet/minecraft/class_918;)V + METHOD (Lnet/minecraft/class_3883;Lnet/minecraft/class_5599;)V ARG 1 context ARG 2 loader - ARG 3 itemRenderer - METHOD (Lnet/minecraft/class_3883;Lnet/minecraft/class_5599;Lnet/minecraft/class_976$class_9994;Lnet/minecraft/class_918;)V + METHOD (Lnet/minecraft/class_3883;Lnet/minecraft/class_5599;Lnet/minecraft/class_976$class_9994;)V ARG 1 context ARG 2 loader ARG 3 headTransformation - ARG 4 itemRenderer METHOD method_32798 translate (Lnet/minecraft/class_4587;Lnet/minecraft/class_976$class_9994;)V ARG 0 matrices ARG 1 transformation diff --git a/mappings/net/minecraft/client/render/entity/feature/HeldItemFeatureRenderer.mapping b/mappings/net/minecraft/client/render/entity/feature/HeldItemFeatureRenderer.mapping index f50bfbb170..3f2ce543cc 100644 --- a/mappings/net/minecraft/client/render/entity/feature/HeldItemFeatureRenderer.mapping +++ b/mappings/net/minecraft/client/render/entity/feature/HeldItemFeatureRenderer.mapping @@ -1,14 +1,2 @@ CLASS net/minecraft/class_989 net/minecraft/client/render/entity/feature/HeldItemFeatureRenderer - FIELD field_38901 itemRenderer Lnet/minecraft/class_918; - METHOD (Lnet/minecraft/class_3883;Lnet/minecraft/class_918;)V - ARG 1 context - ARG 2 itemRenderer - METHOD method_4192 renderItem (Lnet/minecraft/class_10042;Lnet/minecraft/class_1087;Lnet/minecraft/class_1799;Lnet/minecraft/class_811;Lnet/minecraft/class_1306;Lnet/minecraft/class_4587;Lnet/minecraft/class_4597;I)V - ARG 1 state - ARG 2 model - ARG 3 stack - ARG 4 modelTransformation - ARG 5 arm - ARG 6 matrices - ARG 7 vertexConsumers - ARG 8 light + METHOD method_4192 renderItem (Lnet/minecraft/class_10426;Lnet/minecraft/class_10444;Lnet/minecraft/class_1306;Lnet/minecraft/class_4587;Lnet/minecraft/class_4597;I)V diff --git a/mappings/net/minecraft/client/render/entity/feature/LlamaDecorFeatureRenderer.mapping b/mappings/net/minecraft/client/render/entity/feature/LlamaDecorFeatureRenderer.mapping index f2575d7c2b..06e6d7e46e 100644 --- a/mappings/net/minecraft/client/render/entity/feature/LlamaDecorFeatureRenderer.mapping +++ b/mappings/net/minecraft/client/render/entity/feature/LlamaDecorFeatureRenderer.mapping @@ -6,10 +6,9 @@ CLASS net/minecraft/class_988 net/minecraft/client/render/entity/feature/LlamaDe ARG 1 context ARG 2 loader ARG 3 equipmentRenderer - METHOD method_64083 render (Lnet/minecraft/class_4587;Lnet/minecraft/class_4597;Lnet/minecraft/class_10043;Lnet/minecraft/class_1799;Lnet/minecraft/class_2960;I)V + METHOD method_64083 render (Lnet/minecraft/class_4587;Lnet/minecraft/class_4597;Lnet/minecraft/class_10043;Lnet/minecraft/class_1799;Lnet/minecraft/class_5321;I)V ARG 1 matrices ARG 2 vertexConsumers ARG 3 state ARG 4 stack - ARG 5 modelId ARG 6 light diff --git a/mappings/net/minecraft/client/render/entity/feature/PandaHeldItemFeatureRenderer.mapping b/mappings/net/minecraft/client/render/entity/feature/PandaHeldItemFeatureRenderer.mapping index 7cc891f5b8..8650b98213 100644 --- a/mappings/net/minecraft/client/render/entity/feature/PandaHeldItemFeatureRenderer.mapping +++ b/mappings/net/minecraft/client/render/entity/feature/PandaHeldItemFeatureRenderer.mapping @@ -1,5 +1 @@ CLASS net/minecraft/class_990 net/minecraft/client/render/entity/feature/PandaHeldItemFeatureRenderer - FIELD field_38903 itemRenderer Lnet/minecraft/class_918; - METHOD (Lnet/minecraft/class_3883;Lnet/minecraft/class_918;)V - ARG 1 context - ARG 2 itemRenderer diff --git a/mappings/net/minecraft/client/render/entity/feature/PlayerHeldItemFeatureRenderer.mapping b/mappings/net/minecraft/client/render/entity/feature/PlayerHeldItemFeatureRenderer.mapping index 45531a6d5e..2597de6bc1 100644 --- a/mappings/net/minecraft/client/render/entity/feature/PlayerHeldItemFeatureRenderer.mapping +++ b/mappings/net/minecraft/client/render/entity/feature/PlayerHeldItemFeatureRenderer.mapping @@ -1,11 +1,3 @@ CLASS net/minecraft/class_5697 net/minecraft/client/render/entity/feature/PlayerHeldItemFeatureRenderer FIELD field_32944 HEAD_YAW F FIELD field_32945 HEAD_ROLL F - FIELD field_38904 playerHeldItemRenderer Lnet/minecraft/class_918; - METHOD method_32799 renderSpyglass (Lnet/minecraft/class_1087;Lnet/minecraft/class_1799;Lnet/minecraft/class_1306;Lnet/minecraft/class_4587;Lnet/minecraft/class_4597;I)V - ARG 1 model - ARG 2 stack - ARG 3 arm - ARG 4 matrices - ARG 5 vertexConsumers - ARG 6 light diff --git a/mappings/net/minecraft/client/render/entity/feature/SnowGolemPumpkinFeatureRenderer.mapping b/mappings/net/minecraft/client/render/entity/feature/SnowGolemPumpkinFeatureRenderer.mapping index 7b38aae35f..9b97f07936 100644 --- a/mappings/net/minecraft/client/render/entity/feature/SnowGolemPumpkinFeatureRenderer.mapping +++ b/mappings/net/minecraft/client/render/entity/feature/SnowGolemPumpkinFeatureRenderer.mapping @@ -1,7 +1,5 @@ CLASS net/minecraft/class_996 net/minecraft/client/render/entity/feature/SnowGolemPumpkinFeatureRenderer FIELD field_38905 blockRenderManager Lnet/minecraft/class_776; - FIELD field_38906 itemRenderer Lnet/minecraft/class_918; - METHOD (Lnet/minecraft/class_3883;Lnet/minecraft/class_776;Lnet/minecraft/class_918;)V + METHOD (Lnet/minecraft/class_3883;Lnet/minecraft/class_776;)V ARG 1 context ARG 2 blockRenderManager - ARG 3 itemRenderer diff --git a/mappings/net/minecraft/client/render/entity/feature/VillagerHeldItemFeatureRenderer.mapping b/mappings/net/minecraft/client/render/entity/feature/VillagerHeldItemFeatureRenderer.mapping index 7a03c0a4a7..3dd127b559 100644 --- a/mappings/net/minecraft/client/render/entity/feature/VillagerHeldItemFeatureRenderer.mapping +++ b/mappings/net/minecraft/client/render/entity/feature/VillagerHeldItemFeatureRenderer.mapping @@ -1,8 +1,5 @@ CLASS net/minecraft/class_4004 net/minecraft/client/render/entity/feature/VillagerHeldItemFeatureRenderer - FIELD field_38896 itemRenderer Lnet/minecraft/class_918; - METHOD (Lnet/minecraft/class_3883;Lnet/minecraft/class_918;)V + METHOD (Lnet/minecraft/class_3883;)V ARG 1 context - ARG 2 itemRenderer - METHOD method_65251 applyTransforms (Lnet/minecraft/class_10042;Lnet/minecraft/class_4587;)V - ARG 1 state + METHOD method_65251 applyTransforms (Lnet/minecraft/class_10427;Lnet/minecraft/class_4587;)V ARG 2 matrices diff --git a/mappings/net/minecraft/client/render/entity/model/BipedEntityModel.mapping b/mappings/net/minecraft/client/render/entity/model/BipedEntityModel.mapping index 024abb4408..4af0e98f61 100644 --- a/mappings/net/minecraft/client/render/entity/model/BipedEntityModel.mapping +++ b/mappings/net/minecraft/client/render/entity/model/BipedEntityModel.mapping @@ -60,9 +60,6 @@ CLASS net/minecraft/class_572 net/minecraft/client/render/entity/model/BipedEnti METHOD method_54131 positionBlockingArm (Lnet/minecraft/class_630;Z)V ARG 1 arm ARG 2 rightArm - METHOD method_62081 getArmPose (Lnet/minecraft/class_10034;Lnet/minecraft/class_1306;)Lnet/minecraft/class_572$class_573; - ARG 1 state - ARG 2 arm METHOD method_64254 copyTransforms (Lnet/minecraft/class_572;)V ARG 1 model CLASS class_573 ArmPose diff --git a/mappings/net/minecraft/client/render/entity/state/FireworkRocketEntityRenderState.mapping b/mappings/net/minecraft/client/render/entity/state/FireworkRocketEntityRenderState.mapping index 1cbe6c2b5b..10d6e5f20d 100644 --- a/mappings/net/minecraft/client/render/entity/state/FireworkRocketEntityRenderState.mapping +++ b/mappings/net/minecraft/client/render/entity/state/FireworkRocketEntityRenderState.mapping @@ -1,4 +1,3 @@ CLASS net/minecraft/class_10025 net/minecraft/client/render/entity/state/FireworkRocketEntityRenderState FIELD field_53367 shotAtAngle Z - FIELD field_53368 model Lnet/minecraft/class_1087; - FIELD field_53369 stack Lnet/minecraft/class_1799; + FIELD field_53369 stack Lnet/minecraft/class_10444; diff --git a/mappings/net/minecraft/client/render/entity/state/FlyingItemEntityRenderState.mapping b/mappings/net/minecraft/client/render/entity/state/FlyingItemEntityRenderState.mapping index a41cf47cca..4411d3252d 100644 --- a/mappings/net/minecraft/client/render/entity/state/FlyingItemEntityRenderState.mapping +++ b/mappings/net/minecraft/client/render/entity/state/FlyingItemEntityRenderState.mapping @@ -1,3 +1 @@ CLASS net/minecraft/class_10072 net/minecraft/client/render/entity/state/FlyingItemEntityRenderState - FIELD field_53590 model Lnet/minecraft/class_1087; - FIELD field_53591 stack Lnet/minecraft/class_1799; diff --git a/mappings/net/minecraft/client/render/entity/state/ItemDisplayEntityRenderState.mapping b/mappings/net/minecraft/client/render/entity/state/ItemDisplayEntityRenderState.mapping index d7e1a65c24..fb3da4d514 100644 --- a/mappings/net/minecraft/client/render/entity/state/ItemDisplayEntityRenderState.mapping +++ b/mappings/net/minecraft/client/render/entity/state/ItemDisplayEntityRenderState.mapping @@ -1,3 +1 @@ CLASS net/minecraft/class_10038 net/minecraft/client/render/entity/state/ItemDisplayEntityRenderState - FIELD field_53433 data Lnet/minecraft/class_8113$class_8122$class_8226; - FIELD field_53434 model Lnet/minecraft/class_1087; diff --git a/mappings/net/minecraft/client/render/entity/state/ItemEntityRenderState.mapping b/mappings/net/minecraft/client/render/entity/state/ItemEntityRenderState.mapping index 492c5d9f60..68c9ab8b28 100644 --- a/mappings/net/minecraft/client/render/entity/state/ItemEntityRenderState.mapping +++ b/mappings/net/minecraft/client/render/entity/state/ItemEntityRenderState.mapping @@ -1,4 +1,2 @@ CLASS net/minecraft/class_10039 net/minecraft/client/render/entity/state/ItemEntityRenderState FIELD field_53435 uniqueOffset F - FIELD field_53436 model Lnet/minecraft/class_1087; - FIELD field_53437 stack Lnet/minecraft/class_1799; diff --git a/mappings/net/minecraft/client/render/entity/state/ItemFrameEntityRenderState.mapping b/mappings/net/minecraft/client/render/entity/state/ItemFrameEntityRenderState.mapping index c38ee8bc97..318b19fa30 100644 --- a/mappings/net/minecraft/client/render/entity/state/ItemFrameEntityRenderState.mapping +++ b/mappings/net/minecraft/client/render/entity/state/ItemFrameEntityRenderState.mapping @@ -1,8 +1,6 @@ CLASS net/minecraft/class_10040 net/minecraft/client/render/entity/state/ItemFrameEntityRenderState FIELD field_53438 facing Lnet/minecraft/class_2350; - FIELD field_53439 contents Lnet/minecraft/class_1799; FIELD field_53440 rotation I FIELD field_53441 glow Z - FIELD field_53442 itemModel Lnet/minecraft/class_1087; FIELD field_53443 mapId Lnet/minecraft/class_9209; FIELD field_53444 mapRenderState Lnet/minecraft/class_10090; diff --git a/mappings/net/minecraft/client/render/entity/state/LivingEntityRenderState.mapping b/mappings/net/minecraft/client/render/entity/state/LivingEntityRenderState.mapping index 78c5fdabd8..84b2bdbf11 100644 --- a/mappings/net/minecraft/client/render/entity/state/LivingEntityRenderState.mapping +++ b/mappings/net/minecraft/client/render/entity/state/LivingEntityRenderState.mapping @@ -19,14 +19,6 @@ CLASS net/minecraft/class_10042 net/minecraft/client/render/entity/state/LivingE FIELD field_53463 sleepingDirection Lnet/minecraft/class_2350; FIELD field_53464 customName Lnet/minecraft/class_2561; FIELD field_53465 pose Lnet/minecraft/class_4050; - FIELD field_53466 equippedHeadItemModel Lnet/minecraft/class_1087; - FIELD field_53467 equippedHeadStack Lnet/minecraft/class_1799; - FIELD field_53468 mainArm Lnet/minecraft/class_1306; - FIELD field_53469 rightHandItemModel Lnet/minecraft/class_1087; - FIELD field_53470 rightHandStack Lnet/minecraft/class_1799; - FIELD field_53471 leftHandItemModel Lnet/minecraft/class_1087; - FIELD field_53472 leftHandStack Lnet/minecraft/class_1799; + FIELD field_53467 equippedHeadStack Lnet/minecraft/class_10444; METHOD method_62613 isInPose (Lnet/minecraft/class_4050;)Z ARG 1 pose - METHOD method_62614 getMainHandStack ()Lnet/minecraft/class_1799; - METHOD method_62615 getMainHandItemModel ()Lnet/minecraft/class_1087; diff --git a/mappings/net/minecraft/client/render/entity/state/OminousItemSpawnerEntityRenderState.mapping b/mappings/net/minecraft/client/render/entity/state/OminousItemSpawnerEntityRenderState.mapping deleted file mode 100644 index c386d6af25..0000000000 --- a/mappings/net/minecraft/client/render/entity/state/OminousItemSpawnerEntityRenderState.mapping +++ /dev/null @@ -1,3 +0,0 @@ -CLASS net/minecraft/class_10048 net/minecraft/client/render/entity/state/OminousItemSpawnerEntityRenderState - FIELD field_53494 model Lnet/minecraft/class_1087; - FIELD field_53495 stack Lnet/minecraft/class_1799; diff --git a/mappings/net/minecraft/client/render/entity/state/PlayerEntityRenderState.mapping b/mappings/net/minecraft/client/render/entity/state/PlayerEntityRenderState.mapping index 7bea50d45f..16eea286f8 100644 --- a/mappings/net/minecraft/client/render/entity/state/PlayerEntityRenderState.mapping +++ b/mappings/net/minecraft/client/render/entity/state/PlayerEntityRenderState.mapping @@ -2,8 +2,6 @@ CLASS net/minecraft/class_10055 net/minecraft/client/render/entity/state/PlayerE FIELD field_53520 skinTextures Lnet/minecraft/class_8685; FIELD field_53521 flyingRotation F FIELD field_53522 handSwinging Z - FIELD field_53523 mainHandState Lnet/minecraft/class_10055$class_10056; - FIELD field_53524 offHandState Lnet/minecraft/class_10055$class_10056; FIELD field_53525 playerName Lnet/minecraft/class_2561; FIELD field_53526 leftShoulderParrotVariant Lnet/minecraft/class_1453$class_7989; FIELD field_53527 rightShoulderParrotVariant Lnet/minecraft/class_1453$class_7989; @@ -23,7 +21,3 @@ CLASS net/minecraft/class_10055 net/minecraft/client/render/entity/state/PlayerE FIELD field_53545 leftPantsLegVisible Z FIELD field_53546 rightPantsLegVisible Z METHOD method_64259 getGlidingProgress ()F - CLASS class_10056 HandState - FIELD field_53547 empty Z - FIELD field_53548 itemUseAction Lnet/minecraft/class_1839; - FIELD field_53549 hasChargedCrossbow Z diff --git a/mappings/net/minecraft/client/render/item/BuiltinModelItemRenderer.mapping b/mappings/net/minecraft/client/render/item/BuiltinModelItemRenderer.mapping deleted file mode 100644 index 349ae7987e..0000000000 --- a/mappings/net/minecraft/client/render/item/BuiltinModelItemRenderer.mapping +++ /dev/null @@ -1,29 +0,0 @@ -CLASS net/minecraft/class_756 net/minecraft/client/render/item/BuiltinModelItemRenderer - FIELD field_27737 skullModels Ljava/util/Map; - FIELD field_27738 blockEntityRenderDispatcher Lnet/minecraft/class_824; - FIELD field_27739 entityModelLoader Lnet/minecraft/class_5599; - FIELD field_3976 renderChestNormal Lnet/minecraft/class_2595; - FIELD field_3977 renderChestEnder Lnet/minecraft/class_2611; - FIELD field_3978 renderChestTrapped Lnet/minecraft/class_2595; - FIELD field_3979 renderConduit Lnet/minecraft/class_2597; - FIELD field_3980 modelShield Lnet/minecraft/class_600; - FIELD field_3981 RENDER_SHULKER_BOX_DYED [Lnet/minecraft/class_2627; - FIELD field_3982 renderBed Lnet/minecraft/class_2587; - FIELD field_3983 renderBanner Lnet/minecraft/class_2573; - FIELD field_3984 RENDER_SHULKER_BOX Lnet/minecraft/class_2627; - FIELD field_3985 modelTrident Lnet/minecraft/class_613; - FIELD field_42909 renderDecoratedPot Lnet/minecraft/class_8172; - METHOD (Lnet/minecraft/class_824;Lnet/minecraft/class_5599;)V - ARG 1 blockEntityRenderDispatcher - ARG 2 entityModelLoader - METHOD method_3166 render (Lnet/minecraft/class_1799;Lnet/minecraft/class_811;Lnet/minecraft/class_4587;Lnet/minecraft/class_4597;II)V - ARG 1 stack - ARG 2 mode - ARG 3 matrices - ARG 4 vertexConsumers - ARG 5 light - ARG 6 overlay - METHOD method_32132 (Lnet/minecraft/class_1767;)Lnet/minecraft/class_2627; - ARG 0 color - METHOD method_57795 (Lnet/minecraft/class_1799;Lnet/minecraft/class_9296;)V - ARG 1 profile diff --git a/mappings/net/minecraft/client/render/item/ItemModels.mapping b/mappings/net/minecraft/client/render/item/ItemModels.mapping deleted file mode 100644 index bf234ded34..0000000000 --- a/mappings/net/minecraft/client/render/item/ItemModels.mapping +++ /dev/null @@ -1,13 +0,0 @@ -CLASS net/minecraft/class_763 net/minecraft/client/render/item/ItemModels - FIELD field_54157 models Ljava/util/Map; - FIELD field_54158 missingModelSupplier Ljava/util/function/Supplier; - FIELD field_54159 idToModel Ljava/util/function/Function; - METHOD (Lnet/minecraft/class_1092;)V - ARG 1 modelManager - METHOD method_3308 getModel (Lnet/minecraft/class_1799;)Lnet/minecraft/class_1087; - ARG 1 stack - METHOD method_64056 clearModels ()V - METHOD method_64057 getModel (Lnet/minecraft/class_2960;)Lnet/minecraft/class_1087; - ARG 1 id - METHOD method_64058 (Lnet/minecraft/class_1092;Lnet/minecraft/class_2960;)Lnet/minecraft/class_1087; - ARG 1 id diff --git a/mappings/net/minecraft/client/render/item/ItemRenderer.mapping b/mappings/net/minecraft/client/render/item/ItemRenderer.mapping index 9bc69dde5a..90b386ee3f 100644 --- a/mappings/net/minecraft/client/render/item/ItemRenderer.mapping +++ b/mappings/net/minecraft/client/render/item/ItemRenderer.mapping @@ -1,21 +1,10 @@ CLASS net/minecraft/class_918 net/minecraft/client/render/item/ItemRenderer - FIELD field_27770 builtinModelItemRenderer Lnet/minecraft/class_756; FIELD field_32935 COMPASS_WITH_GLINT_GUI_MODEL_MULTIPLIER F FIELD field_32936 COMPASS_WITH_GLINT_FIRST_PERSON_MODEL_MULTIPLIER F - FIELD field_40532 TRIDENT Lnet/minecraft/class_1091; - FIELD field_40533 SPYGLASS Lnet/minecraft/class_1091; FIELD field_43086 ENTITY_ENCHANTMENT_GLINT Lnet/minecraft/class_2960; FIELD field_43087 ITEM_ENCHANTMENT_GLINT Lnet/minecraft/class_2960; - FIELD field_4732 models Lnet/minecraft/class_763; - FIELD field_4733 colors Lnet/minecraft/class_325; - FIELD field_54176 bakedModelManager Lnet/minecraft/class_1092; - METHOD (Lnet/minecraft/class_1092;Lnet/minecraft/class_325;Lnet/minecraft/class_756;)V - ARG 1 bakedModelManager - ARG 2 colors - ARG 3 builtinModelItemRenderer METHOD method_23177 renderItem (Lnet/minecraft/class_1309;Lnet/minecraft/class_1799;Lnet/minecraft/class_811;ZLnet/minecraft/class_4587;Lnet/minecraft/class_4597;Lnet/minecraft/class_1937;III)V ARG 1 entity - ARG 2 item ARG 3 transformationMode ARG 4 leftHanded ARG 5 matrices @@ -33,34 +22,13 @@ CLASS net/minecraft/class_918 net/minecraft/client/render/item/ItemRenderer ARG 6 vertexConsumers ARG 7 world ARG 8 seed - METHOD method_23179 renderItem (Lnet/minecraft/class_1799;Lnet/minecraft/class_811;ZLnet/minecraft/class_4587;Lnet/minecraft/class_4597;IILnet/minecraft/class_1087;)V - ARG 1 stack - ARG 2 transformationMode - ARG 3 leftHanded - ARG 4 matrices - ARG 5 vertexConsumers - ARG 6 light - ARG 7 overlay - ARG 8 model - METHOD method_23180 renderBakedItemQuads (Lnet/minecraft/class_4587;Lnet/minecraft/class_4588;Ljava/util/List;Lnet/minecraft/class_1799;II)V - ARG 1 matrices - ARG 2 vertices - ARG 3 quads - ARG 4 stack - ARG 5 light - ARG 6 overlay + METHOD method_23180 renderBakedItemQuads (Lnet/minecraft/class_4587;Lnet/minecraft/class_4588;Ljava/util/List;[III)V METHOD method_23181 getItemGlintConsumer (Lnet/minecraft/class_4597;Lnet/minecraft/class_1921;ZZ)Lnet/minecraft/class_4588; ARG 0 vertexConsumers ARG 1 layer ARG 2 solid ARG 3 glint - METHOD method_23182 renderBakedItemModel (Lnet/minecraft/class_1087;Lnet/minecraft/class_1799;IILnet/minecraft/class_4587;Lnet/minecraft/class_4588;)V - ARG 1 model - ARG 2 stack - ARG 3 light - ARG 4 overlay - ARG 5 matrices - ARG 6 vertices + METHOD method_23182 renderBakedItemModel (Lnet/minecraft/class_1087;[IIILnet/minecraft/class_4587;Lnet/minecraft/class_4588;)V METHOD method_27952 getArmorGlintConsumer (Lnet/minecraft/class_4597;Lnet/minecraft/class_1921;Z)Lnet/minecraft/class_4588; ARG 0 provider ARG 1 layer @@ -69,64 +37,4 @@ CLASS net/minecraft/class_918 net/minecraft/client/render/item/ItemRenderer ARG 0 provider ARG 1 layer ARG 2 entry - METHOD method_4019 getModel (Lnet/minecraft/class_1799;Lnet/minecraft/class_1937;Lnet/minecraft/class_1309;I)Lnet/minecraft/class_1087; - ARG 1 stack - ARG 2 world - ARG 3 entity - ARG 4 seed - METHOD method_51795 usesDynamicDisplay (Lnet/minecraft/class_1799;)Z - ARG 0 stack - METHOD method_62475 getModel (Lnet/minecraft/class_1799;Lnet/minecraft/class_1309;Lnet/minecraft/class_811;)Lnet/minecraft/class_1087; - ARG 1 stack - ARG 2 entity - ARG 3 transformationMode - METHOD method_62476 renderItem (Lnet/minecraft/class_1799;Lnet/minecraft/class_811;Lnet/minecraft/class_4587;Lnet/minecraft/class_4597;IILnet/minecraft/class_1087;Z)V - ARG 1 stack - ARG 2 transformationMode - ARG 3 matrices - ARG 4 vertexConsumers - ARG 5 light - ARG 6 overlay - ARG 7 model - ARG 8 useInventoryModel - METHOD method_62477 renderBundle (Lnet/minecraft/class_1799;Lnet/minecraft/class_811;ZLnet/minecraft/class_4587;Lnet/minecraft/class_4597;IILnet/minecraft/class_1087;Lnet/minecraft/class_1937;Lnet/minecraft/class_1309;I)V - ARG 1 stack - ARG 2 transformationMode - ARG 3 leftHanded - ARG 4 matrices - ARG 5 vertexConsumers - ARG 6 light - ARG 7 overlay - ARG 8 model - ARG 9 world - ARG 10 entity - ARG 11 seed - METHOD method_64073 renderItem (Lnet/minecraft/class_1799;Lnet/minecraft/class_811;ZLnet/minecraft/class_4587;Lnet/minecraft/class_4597;IILnet/minecraft/class_1087;Z)V - ARG 1 stack - ARG 2 transformationMode - ARG 3 leftHanded - ARG 4 matrices - ARG 5 vertexConsumers - ARG 6 light - ARG 7 overlay - ARG 8 model - ARG 9 useInventoryModel - METHOD method_64074 renderItem (Lnet/minecraft/class_1799;Lnet/minecraft/class_811;ZLnet/minecraft/class_4587;Lnet/minecraft/class_4597;IILnet/minecraft/class_1087;ZF)V - ARG 1 stack - ARG 2 transformationMode - ARG 3 leftHanded - ARG 4 matrices - ARG 5 vertexConsumers - ARG 6 light - ARG 7 overlay - ARG 8 model - ARG 9 useInventoryModel - ARG 10 z - METHOD method_64255 shouldUseInventoryModel (Lnet/minecraft/class_811;)Z - ARG 0 transformationMode - METHOD method_64256 getModelOrOverride (Lnet/minecraft/class_1087;Lnet/minecraft/class_1799;Lnet/minecraft/class_1937;Lnet/minecraft/class_1309;I)Lnet/minecraft/class_1087; - ARG 1 model - ARG 2 stack - ARG 3 world - ARG 4 entity - ARG 5 seed + METHOD method_62476 renderItem (Lnet/minecraft/class_811;Lnet/minecraft/class_4587;Lnet/minecraft/class_4597;II[ILnet/minecraft/class_1087;Lnet/minecraft/class_1921;Lnet/minecraft/class_10444$class_10445;)V diff --git a/mappings/net/minecraft/client/render/model/BakedModel.mapping b/mappings/net/minecraft/client/render/model/BakedModel.mapping index b7acc2b4ab..c68b5705e9 100644 --- a/mappings/net/minecraft/client/render/model/BakedModel.mapping +++ b/mappings/net/minecraft/client/render/model/BakedModel.mapping @@ -11,10 +11,8 @@ CLASS net/minecraft/class_1087 net/minecraft/client/render/model/BakedModel ARG 3 random METHOD method_4708 useAmbientOcclusion ()Z METHOD method_4709 getTransformation ()Lnet/minecraft/class_809; - METHOD method_4710 getOverrides ()Lnet/minecraft/class_806; METHOD method_4711 getParticleSprite ()Lnet/minecraft/class_1058; COMMENT {@return a texture that represents the model} COMMENT

COMMENT This is primarily used in particles. For example, block break particles use this sprite. METHOD method_4712 hasDepth ()Z - METHOD method_4713 isBuiltin ()Z diff --git a/mappings/net/minecraft/client/render/model/BakedModelManager.mapping b/mappings/net/minecraft/client/render/model/BakedModelManager.mapping index d22502cc36..310767c547 100644 --- a/mappings/net/minecraft/client/render/model/BakedModelManager.mapping +++ b/mappings/net/minecraft/client/render/model/BakedModelManager.mapping @@ -1,22 +1,16 @@ CLASS net/minecraft/class_1092 net/minecraft/client/render/model/BakedModelManager FIELD field_20277 colorMap Lnet/minecraft/class_324; - FIELD field_20278 stateLookup Lit/unimi/dsi/fastutil/objects/Object2IntMap; FIELD field_21775 atlasManager Lnet/minecraft/class_4724; FIELD field_21777 mipmapLevels I FIELD field_40573 LOGGER Lorg/slf4j/Logger; FIELD field_40574 LAYERS_TO_LOADERS Ljava/util/Map; - FIELD field_53675 BLOCK_STATES_FINDER Lnet/minecraft/class_7654; FIELD field_53676 MODELS_FINDER Lnet/minecraft/class_7654; FIELD field_5407 missingModel Lnet/minecraft/class_1087; - FIELD field_5408 models Ljava/util/Map; FIELD field_5410 blockModelCache Lnet/minecraft/class_773; METHOD (Lnet/minecraft/class_1060;Lnet/minecraft/class_324;I)V ARG 1 textureManager - ARG 2 colorMap ARG 3 mipmap METHOD method_18179 upload (Lnet/minecraft/class_1092$class_7779;Lnet/minecraft/class_3695;)V - ARG 1 bakingResult - ARG 2 profiler METHOD method_21611 shouldRerender (Lnet/minecraft/class_2680;Lnet/minecraft/class_2680;)Z ARG 1 from ARG 2 to @@ -24,32 +18,16 @@ CLASS net/minecraft/class_1092 net/minecraft/client/render/model/BakedModelManag ARG 1 mipmapLevels METHOD method_24153 getAtlas (Lnet/minecraft/class_2960;)Lnet/minecraft/class_1059; ARG 1 id - METHOD method_45879 (Lnet/minecraft/class_1091;Ljava/util/Collection;)V - ARG 0 modelId - ARG 1 spriteIds METHOD method_45881 reloadModels (Lnet/minecraft/class_3300;Ljava/util/concurrent/Executor;)Ljava/util/concurrent/CompletableFuture; ARG 0 resourceManager ARG 1 executor - METHOD method_45883 bake (Lnet/minecraft/class_3695;Ljava/util/Map;Lnet/minecraft/class_1088;Lit/unimi/dsi/fastutil/objects/Object2IntMap;)Lnet/minecraft/class_1092$class_7779; - ARG 1 profiler - ARG 2 preparations - ARG 3 modelLoader - ARG 4 modelGroups + METHOD method_45883 bake (Lnet/minecraft/class_3695;Ljava/util/Map;Lnet/minecraft/class_1088;Lit/unimi/dsi/fastutil/objects/Object2IntMap;Lnet/minecraft/class_5599;Lnet/minecraft/class_10418;)Lnet/minecraft/class_1092$class_7779; METHOD method_45886 (Lnet/minecraft/class_4730;)Ljava/lang/String; ARG 0 spriteId METHOD method_45887 (Lnet/minecraft/class_1092$class_7779;)Ljava/util/concurrent/CompletionStage; ARG 0 result METHOD method_45888 (Lnet/minecraft/class_1092$class_7779;Ljava/lang/Void;)Lnet/minecraft/class_1092$class_7779; ARG 1 void_ - METHOD method_45891 (Ljava/util/Map;Lcom/google/common/collect/Multimap;Lnet/minecraft/class_1091;Lnet/minecraft/class_4730;)Lnet/minecraft/class_1058; - ARG 2 modelId - ARG 3 spriteId - METHOD method_45892 (Ljava/util/Map;Lnet/minecraft/class_1087;Ljava/util/Map;Lnet/minecraft/class_2680;)V - ARG 3 state - METHOD method_45896 reloadBlockStates (Lnet/minecraft/class_9824;Lnet/minecraft/class_3300;Ljava/util/concurrent/Executor;)Ljava/util/concurrent/CompletableFuture; - ARG 0 blockStatesLoader - ARG 1 resourceManager - ARG 2 executor METHOD method_45897 (Ljava/util/List;)Ljava/util/Map; ARG 0 models METHOD method_45899 (Ljava/util/concurrent/Executor;Ljava/util/Map;)Ljava/util/concurrent/CompletionStage; @@ -61,17 +39,5 @@ CLASS net/minecraft/class_1092 net/minecraft/client/render/model/BakedModelManag METHOD method_62654 group (Lnet/minecraft/class_324;Lnet/minecraft/class_9824$class_10095;)Lit/unimi/dsi/fastutil/objects/Object2IntMap; ARG 0 colors ARG 1 definition - METHOD method_62656 (Lnet/minecraft/class_1100;Lnet/minecraft/class_9824$class_10095;Ljava/util/Map;)Lnet/minecraft/class_10097; - ARG 2 definition - ARG 3 models - METHOD method_62657 collect (Lnet/minecraft/class_1100;Ljava/util/Map;Lnet/minecraft/class_9824$class_10095;)Lnet/minecraft/class_10097; - ARG 1 missingModel - ARG 2 inputs - ARG 3 definition - METHOD method_62658 (Ljava/util/List;)Lnet/minecraft/class_9824$class_10095; - ARG 0 blockStates - METHOD method_62662 (Ljava/util/function/Function;Lnet/minecraft/class_9824;Ljava/util/concurrent/Executor;Ljava/util/Map;)Ljava/util/concurrent/CompletionStage; - ARG 3 blockStates + METHOD method_62657 collect (Lnet/minecraft/class_1100;Ljava/util/Map;Lnet/minecraft/class_9824$class_10095;Lnet/minecraft/class_10521$class_10522;)Lnet/minecraft/class_10097; CLASS class_7779 BakingResult - FIELD comp_1058 modelLoader Lnet/minecraft/class_1088; - METHOD comp_1058 modelLoader ()Lnet/minecraft/class_1088; diff --git a/mappings/net/minecraft/client/render/model/BakedQuadFactory.mapping b/mappings/net/minecraft/client/render/model/BakedQuadFactory.mapping index 82548a0f45..0ff44af78a 100644 --- a/mappings/net/minecraft/client/render/model/BakedQuadFactory.mapping +++ b/mappings/net/minecraft/client/render/model/BakedQuadFactory.mapping @@ -6,53 +6,14 @@ CLASS net/minecraft/class_796 net/minecraft/client/render/model/BakedQuadFactory ARG 1 orientation ARG 2 rotation METHOD method_3455 transformVertex (Lorg/joml/Vector3f;Lnet/minecraft/class_4590;)V - ARG 1 vertex - ARG 2 transformation METHOD method_3458 packVertexData (Lnet/minecraft/class_787;Lnet/minecraft/class_1058;Lnet/minecraft/class_2350;[FLnet/minecraft/class_4590;Lnet/minecraft/class_789;)[I - ARG 1 texture - ARG 2 sprite - ARG 3 direction - ARG 4 positionMatrix - ARG 5 orientation - ARG 6 rotation METHOD method_3459 getPositionMatrix (Lorg/joml/Vector3f;Lorg/joml/Vector3f;)[F - ARG 1 from - ARG 2 to METHOD method_3460 packVertexData ([IILorg/joml/Vector3f;Lnet/minecraft/class_1058;Lnet/minecraft/class_787;)V - ARG 1 vertices - ARG 2 cornerIndex - ARG 3 position - ARG 4 sprite - ARG 5 modelElementTexture METHOD method_3461 packVertexData ([IILnet/minecraft/class_2350;Lnet/minecraft/class_787;[FLnet/minecraft/class_1058;Lnet/minecraft/class_4590;Lnet/minecraft/class_789;)V - ARG 1 vertices - ARG 2 cornerIndex - ARG 3 direction - ARG 4 texture - ARG 5 positionMatrix - ARG 6 sprite - ARG 7 orientation - ARG 8 rotation METHOD method_3462 encodeDirection ([ILnet/minecraft/class_2350;)V - ARG 1 rotationMatrix - ARG 2 direction METHOD method_3463 rotateVertex (Lorg/joml/Vector3f;Lnet/minecraft/class_789;)V - ARG 1 vector - ARG 2 rotation METHOD method_3464 transformVertex (Lorg/joml/Vector3f;Lorg/joml/Vector3f;Lorg/joml/Matrix4f;Lorg/joml/Vector3f;)V - ARG 1 vertex - ARG 2 origin - ARG 3 transformationMatrix - ARG 4 scale METHOD method_3467 decodeDirection ([I)Lnet/minecraft/class_2350; ARG 0 rotationMatrix METHOD method_3468 bake (Lorg/joml/Vector3f;Lorg/joml/Vector3f;Lnet/minecraft/class_783;Lnet/minecraft/class_1058;Lnet/minecraft/class_2350;Lnet/minecraft/class_3665;Lnet/minecraft/class_789;ZI)Lnet/minecraft/class_777; ARG 1 from - ARG 2 to - ARG 3 face - ARG 4 texture - ARG 5 side - ARG 6 settings - ARG 7 rotation - ARG 8 shade - ARG 9 lightEmission diff --git a/mappings/net/minecraft/client/render/model/BasicBakedModel.mapping b/mappings/net/minecraft/client/render/model/BasicBakedModel.mapping index 92c58708e5..8ece214190 100644 --- a/mappings/net/minecraft/client/render/model/BasicBakedModel.mapping +++ b/mappings/net/minecraft/client/render/model/BasicBakedModel.mapping @@ -22,9 +22,6 @@ CLASS net/minecraft/class_1093 net/minecraft/client/render/model/BasicBakedModel FIELD field_5421 usesAo Z FIELD field_5422 faceQuads Ljava/util/EnumMap; FIELD field_5424 particleTexture Lnet/minecraft/class_1058; - METHOD (Lnet/minecraft/class_793;Z)V - ARG 1 unbakedModel - ARG 2 hasDepth METHOD (ZZZLnet/minecraft/class_809;)V ARG 1 usesAo ARG 2 isSideLit diff --git a/mappings/net/minecraft/client/render/model/BlockStatesLoader.mapping b/mappings/net/minecraft/client/render/model/BlockStatesLoader.mapping index 7e8eeb87a0..a17e51883c 100644 --- a/mappings/net/minecraft/client/render/model/BlockStatesLoader.mapping +++ b/mappings/net/minecraft/client/render/model/BlockStatesLoader.mapping @@ -11,17 +11,8 @@ CLASS net/minecraft/class_9824 net/minecraft/client/render/model/BlockStatesLoad FIELD field_53655 MAP_FALSE_VARIANT Ljava/lang/String; FIELD field_53656 GLOW_ITEM_FRAME_ID Lnet/minecraft/class_2960; FIELD field_53657 ITEM_FRAME_ID Lnet/minecraft/class_2960; - FIELD field_53658 missingModel Lnet/minecraft/class_1100; - METHOD (Lnet/minecraft/class_1100;)V - ARG 1 missingModel METHOD method_62626 getIdToStatesConverter ()Ljava/util/function/Function; - METHOD method_62627 combine (Lnet/minecraft/class_2960;Lnet/minecraft/class_2689;Ljava/util/List;)Lnet/minecraft/class_9824$class_10095; - ARG 1 id - ARG 2 stateManager - ARG 3 definitions - METHOD method_62628 (Ljava/util/Map;Lnet/minecraft/class_2680;Lnet/minecraft/class_9979;)V - ARG 1 state - ARG 2 model + METHOD method_62627 combine (Lnet/minecraft/class_2960;Lnet/minecraft/class_2689;Ljava/util/List;Lnet/minecraft/class_1100;)Lnet/minecraft/class_9824$class_10095; CLASS class_10094 PackBlockStateDefinition CLASS class_10095 BlockStateDefinition CLASS class_9825 BlockModel diff --git a/mappings/net/minecraft/client/render/model/BuiltinBakedModel.mapping b/mappings/net/minecraft/client/render/model/BuiltinBakedModel.mapping deleted file mode 100644 index 3511ac0fd2..0000000000 --- a/mappings/net/minecraft/client/render/model/BuiltinBakedModel.mapping +++ /dev/null @@ -1,8 +0,0 @@ -CLASS net/minecraft/class_1090 net/minecraft/client/render/model/BuiltinBakedModel - FIELD field_16594 sprite Lnet/minecraft/class_1058; - FIELD field_21862 sideLit Z - FIELD field_5404 transformation Lnet/minecraft/class_809; - METHOD (Lnet/minecraft/class_809;Lnet/minecraft/class_1058;Z)V - ARG 1 transformation - ARG 2 sprite - ARG 3 sideLit diff --git a/mappings/net/minecraft/client/render/model/ItemModel.mapping b/mappings/net/minecraft/client/render/model/ItemModel.mapping deleted file mode 100644 index 2e29fe3cee..0000000000 --- a/mappings/net/minecraft/client/render/model/ItemModel.mapping +++ /dev/null @@ -1,12 +0,0 @@ -CLASS net/minecraft/class_10202 net/minecraft/client/render/model/ItemModel - FIELD field_54191 id Lnet/minecraft/class_2960; - FIELD field_54192 overrides Ljava/util/List; - METHOD (Lnet/minecraft/class_2960;)V - ARG 1 id - METHOD method_64089 (Lnet/minecraft/class_1100$class_10103;Lnet/minecraft/class_799;)V - ARG 1 override - CLASS class_10203 BakedItemModel - FIELD field_54193 overrides Lnet/minecraft/class_806; - METHOD (Lnet/minecraft/class_1087;Lnet/minecraft/class_806;)V - ARG 1 wrapped - ARG 2 overrides diff --git a/mappings/net/minecraft/client/render/model/ModelBaker.mapping b/mappings/net/minecraft/client/render/model/ModelBaker.mapping index 3f7ed378d1..444903ffc9 100644 --- a/mappings/net/minecraft/client/render/model/ModelBaker.mapping +++ b/mappings/net/minecraft/client/render/model/ModelBaker.mapping @@ -6,46 +6,26 @@ CLASS net/minecraft/class_1088 net/minecraft/client/render/model/ModelBaker FIELD field_21558 SHIELD_BASE_NO_PATTERN Lnet/minecraft/class_4730; FIELD field_21772 BLOCK_DESTRUCTION_RENDER_LAYERS Ljava/util/List; FIELD field_52275 missingModel Lnet/minecraft/class_1100; - FIELD field_53662 models Ljava/util/Map; - FIELD field_53663 resolvedModels Ljava/util/Map; FIELD field_5370 FIRE_1 Lnet/minecraft/class_4730; FIELD field_5380 LOGGER Lorg/slf4j/Logger; FIELD field_5381 LAVA_FLOW Lnet/minecraft/class_4730; - FIELD field_5384 ITEM_MODEL_GENERATOR Lnet/minecraft/class_801; - FIELD field_5387 bakedModels Ljava/util/Map; FIELD field_5388 WATER_OVERLAY Lnet/minecraft/class_4730; FIELD field_5391 WATER_FLOW Lnet/minecraft/class_4730; FIELD field_5397 FIRE_0 Lnet/minecraft/class_4730; FIELD field_5398 bakedModelCache Ljava/util/Map; - METHOD (Ljava/util/Map;Ljava/util/Map;Lnet/minecraft/class_1100;)V - ARG 1 models - ARG 2 resolvedModels - ARG 3 missingModel METHOD method_22820 (I)Lnet/minecraft/class_2960; ARG 0 stage METHOD method_23216 (Lnet/minecraft/class_2960;)Lnet/minecraft/class_2960; ARG 0 id - METHOD method_45876 bake (Lnet/minecraft/class_1088$class_9826;)V + METHOD method_45876 bake (Lnet/minecraft/class_1088$class_9826;)Lnet/minecraft/class_1088$class_10524; ARG 1 spriteGetter - METHOD method_4734 getBakedModels ()Ljava/util/Map; METHOD method_60912 (Ljava/lang/String;)Ljava/lang/String; ARG 0 path - METHOD method_61072 (Lnet/minecraft/class_1088$class_9826;Lnet/minecraft/class_1091;Lnet/minecraft/class_1100;)V - ARG 2 id - ARG 3 model CLASS class_7776 BakedModelCacheKey CLASS class_7778 BakerImpl - FIELD field_40572 textureGetter Ljava/util/function/Function; - METHOD (Lnet/minecraft/class_1088;Lnet/minecraft/class_1088$class_9826;Lnet/minecraft/class_1091;)V + METHOD (Lnet/minecraft/class_1088;Lnet/minecraft/class_1088$class_9826;Lnet/minecraft/class_10525;)V ARG 2 spriteGetter - ARG 3 modelId METHOD method_45872 getModel (Lnet/minecraft/class_2960;)Lnet/minecraft/class_1100; - METHOD method_45878 (Lnet/minecraft/class_1088$class_9826;Lnet/minecraft/class_1091;Lnet/minecraft/class_4730;)Lnet/minecraft/class_1058; - ARG 2 spriteId - METHOD method_61077 bake (Lnet/minecraft/class_1100;Lnet/minecraft/class_3665;)Lnet/minecraft/class_1087; - ARG 1 model - ARG 2 settings CLASS class_9826 SpriteGetter - METHOD get (Lnet/minecraft/class_1091;Lnet/minecraft/class_4730;)Lnet/minecraft/class_1058; - ARG 1 modelId + METHOD method_65739 get (Lnet/minecraft/class_10525;Lnet/minecraft/class_4730;)Lnet/minecraft/class_1058; ARG 2 spriteId diff --git a/mappings/net/minecraft/client/render/model/ModelGrouper.mapping b/mappings/net/minecraft/client/render/model/ModelGrouper.mapping index c42df8d08c..d6484569a9 100644 --- a/mappings/net/minecraft/client/render/model/ModelGrouper.mapping +++ b/mappings/net/minecraft/client/render/model/ModelGrouper.mapping @@ -12,9 +12,8 @@ CLASS net/minecraft/class_10099 net/minecraft/client/render/model/ModelGrouper ARG 3 modelId ARG 4 model CLASS class_10100 GroupKey - METHOD method_62651 of (Lnet/minecraft/class_2680;Lnet/minecraft/class_1100;Ljava/util/List;)Lnet/minecraft/class_10099$class_10100; + METHOD method_62651 of (Lnet/minecraft/class_2680;Lnet/minecraft/class_9979;Ljava/util/List;)Lnet/minecraft/class_10099$class_10100; ARG 0 state - ARG 1 model ARG 2 properties METHOD method_62652 getColoringValues (Lnet/minecraft/class_2680;Ljava/util/List;)Ljava/util/List; ARG 0 state diff --git a/mappings/net/minecraft/client/render/model/Models.mapping b/mappings/net/minecraft/client/render/model/Models.mapping deleted file mode 100644 index e53fa8b324..0000000000 --- a/mappings/net/minecraft/client/render/model/Models.mapping +++ /dev/null @@ -1,6 +0,0 @@ -CLASS net/minecraft/class_10101 net/minecraft/client/render/model/Models - METHOD method_62664 forBuiltin (Ljava/lang/String;)Lnet/minecraft/class_2960; - ARG 0 path - METHOD method_62665 createMarkerModel (Ljava/lang/String;Lnet/minecraft/class_793$class_4751;)Lnet/minecraft/class_1100; - ARG 0 id - ARG 1 guiLight diff --git a/mappings/net/minecraft/client/render/model/ReferencedModelsCollector.mapping b/mappings/net/minecraft/client/render/model/ReferencedModelsCollector.mapping index 406a4e15dd..f8ed278ef8 100644 --- a/mappings/net/minecraft/client/render/model/ReferencedModelsCollector.mapping +++ b/mappings/net/minecraft/client/render/model/ReferencedModelsCollector.mapping @@ -2,38 +2,19 @@ CLASS net/minecraft/class_10097 net/minecraft/client/render/model/ReferencedMode FIELD field_53664 LOGGER Lorg/slf4j/Logger; FIELD field_53665 inputs Ljava/util/Map; FIELD field_53666 missingModel Lnet/minecraft/class_1100; - FIELD field_53667 topLevelModels Ljava/util/Map; + FIELD field_53667 topLevelModels Ljava/util/List; FIELD field_53668 resolvedModels Ljava/util/Map; - FIELD field_54194 ITEM_DIRECTORY Ljava/lang/String; METHOD (Ljava/util/Map;Lnet/minecraft/class_1100;)V ARG 1 inputs ARG 2 missingModel METHOD method_62630 resolveAll ()V - METHOD method_62632 addBlockStates (Lnet/minecraft/class_9824$class_10095;)V - ARG 1 definition - METHOD method_62634 (Ljava/util/Set;Lnet/minecraft/class_1091;Lnet/minecraft/class_9824$class_9825;)V - ARG 2 id - ARG 3 model - METHOD method_62635 addTopLevelModel (Lnet/minecraft/class_1091;Lnet/minecraft/class_1100;)V - ARG 1 modelId - ARG 2 model - METHOD method_62636 (Lnet/minecraft/class_1100;)V + METHOD method_62636 (Lnet/minecraft/class_10526;)V ARG 1 model - METHOD method_62637 getTopLevelModels ()Ljava/util/Map; METHOD method_62638 computeResolvedModel (Lnet/minecraft/class_2960;)Lnet/minecraft/class_1100; ARG 1 id METHOD method_62639 getResolvedModels ()Ljava/util/Map; METHOD method_62640 getModel (Lnet/minecraft/class_2960;)Lnet/minecraft/class_1100; ARG 1 id - METHOD method_64090 (Lnet/minecraft/class_1091;)Ljava/lang/String; - ARG 0 id - METHOD method_64091 (Ljava/lang/String;)Ljava/lang/String; - ARG 0 path - METHOD method_64092 (Ljava/util/Set;Lnet/minecraft/class_2960;)V - ARG 2 id - METHOD method_64093 (Ljava/util/Set;Lnet/minecraft/class_6880$class_6883;)V - ARG 1 entry - METHOD method_64094 getRequiredModels ()Ljava/util/Set; CLASS class_10098 ResolverImpl FIELD field_53670 stack Ljava/util/List; FIELD field_53671 visited Ljava/util/Set; diff --git a/mappings/net/minecraft/client/render/model/UnbakedModel.mapping b/mappings/net/minecraft/client/render/model/UnbakedModel.mapping index da46525db8..6b326ef23e 100644 --- a/mappings/net/minecraft/client/render/model/UnbakedModel.mapping +++ b/mappings/net/minecraft/client/render/model/UnbakedModel.mapping @@ -1,10 +1,14 @@ CLASS net/minecraft/class_1100 net/minecraft/client/render/model/UnbakedModel - METHOD method_4753 bake (Lnet/minecraft/class_7775;Ljava/util/function/Function;Lnet/minecraft/class_3665;)Lnet/minecraft/class_1087; - ARG 1 baker - ARG 2 textureGetter - ARG 3 rotationContainer - METHOD method_62326 resolve (Lnet/minecraft/class_1100$class_10103;)V - ARG 1 resolver - CLASS class_10103 Resolver - METHOD method_62642 resolve (Lnet/minecraft/class_2960;)Lnet/minecraft/class_1100; - ARG 1 id + METHOD method_24298 getGuiLight ()Lnet/minecraft/class_1100$class_4751; + METHOD method_4753 bake (Lnet/minecraft/class_10419;Lnet/minecraft/class_7775;Lnet/minecraft/class_3665;ZZLnet/minecraft/class_809;)Lnet/minecraft/class_1087; + CLASS class_4751 GuiLight + FIELD field_21858 ITEM Lnet/minecraft/class_1100$class_4751; + COMMENT The model will be shaded from the front, like a basic item + FIELD field_21859 BLOCK Lnet/minecraft/class_1100$class_4751; + COMMENT The model will be shaded from the side, like a block. + FIELD field_21860 name Ljava/lang/String; + METHOD (Ljava/lang/String;ILjava/lang/String;)V + ARG 3 name + METHOD method_24299 isSide ()Z + METHOD method_24300 byName (Ljava/lang/String;)Lnet/minecraft/class_1100$class_4751; + ARG 0 value diff --git a/mappings/net/minecraft/client/render/model/json/ItemModelGenerator.mapping b/mappings/net/minecraft/client/render/model/json/ItemModelGenerator.mapping index 0c0959bc5a..a9c18b1255 100644 --- a/mappings/net/minecraft/client/render/model/json/ItemModelGenerator.mapping +++ b/mappings/net/minecraft/client/render/model/json/ItemModelGenerator.mapping @@ -20,9 +20,7 @@ CLASS net/minecraft/class_801 net/minecraft/client/render/model/json/ItemModelGe ARG 6 height METHOD method_3478 getFrames (Lnet/minecraft/class_7764;)Ljava/util/List; ARG 1 sprite - METHOD method_3479 create (Ljava/util/function/Function;Lnet/minecraft/class_793;)Lnet/minecraft/class_793; - ARG 1 textureGetter - ARG 2 blockModel + METHOD method_3479 create (Lnet/minecraft/class_10419;Lnet/minecraft/class_10527;Lnet/minecraft/class_3665;ZZLnet/minecraft/class_809;)Lnet/minecraft/class_1087; METHOD method_3480 addLayerElements (ILjava/lang/String;Lnet/minecraft/class_7764;)Ljava/util/List; ARG 1 layer ARG 2 key diff --git a/mappings/net/minecraft/client/render/model/json/JsonUnbakedModel.mapping b/mappings/net/minecraft/client/render/model/json/JsonUnbakedModel.mapping index a9dadb30a2..ace35d303f 100644 --- a/mappings/net/minecraft/client/render/model/json/JsonUnbakedModel.mapping +++ b/mappings/net/minecraft/client/render/model/json/JsonUnbakedModel.mapping @@ -1,83 +1,31 @@ CLASS net/minecraft/class_793 net/minecraft/client/render/model/json/JsonUnbakedModel - FIELD field_21857 guiLight Lnet/minecraft/class_793$class_4751; - FIELD field_32792 PARTICLE_KEY Ljava/lang/String; - FIELD field_32793 TEXTURE_REFERENCE_INITIAL C - COMMENT The initial character ({@value}) of a texture reference in JSON; used to - COMMENT distinguish texture references from other references. + FIELD field_21857 guiLight Lnet/minecraft/class_1100$class_4751; FIELD field_4244 ambientOcclusion Ljava/lang/Boolean; FIELD field_4245 elements Ljava/util/List; FIELD field_4247 parentId Lnet/minecraft/class_2960; - FIELD field_4248 LOGGER Lorg/slf4j/Logger; - FIELD field_4249 QUAD_FACTORY Lnet/minecraft/class_796; FIELD field_4250 transformations Lnet/minecraft/class_809; - FIELD field_4251 textureMap Ljava/util/Map; - FIELD field_4252 id Ljava/lang/String; - FIELD field_4253 parent Lnet/minecraft/class_793; + FIELD field_4253 parent Lnet/minecraft/class_1100; FIELD field_4254 GSON Lcom/google/gson/Gson; - FIELD field_4255 overrides Ljava/util/List; - FIELD field_54858 MISSING_SPRITE Lnet/minecraft/class_4730; - METHOD (Lnet/minecraft/class_2960;Ljava/util/List;Ljava/util/Map;Ljava/lang/Boolean;Lnet/minecraft/class_793$class_4751;Lnet/minecraft/class_809;Ljava/util/List;)V + METHOD (Lnet/minecraft/class_2960;Ljava/util/List;Lnet/minecraft/class_10419$class_10420;Ljava/lang/Boolean;Lnet/minecraft/class_1100$class_4751;Lnet/minecraft/class_809;)V ARG 1 parentId ARG 2 elements - ARG 3 textureMap ARG 4 ambientOcclusion ARG 5 guiLight ARG 6 transformations - ARG 7 overrides - METHOD method_24077 resolveSprite (Ljava/lang/String;)Lnet/minecraft/class_4730; - ARG 1 spriteName - METHOD method_24298 getGuiLight ()Lnet/minecraft/class_793$class_4751; - METHOD method_3431 getRootModel ()Lnet/minecraft/class_793; - METHOD method_3432 textureExists (Ljava/lang/String;)Z - ARG 1 name METHOD method_3433 getElements ()Ljava/util/List; - METHOD method_3434 getOverrides ()Ljava/util/List; METHOD method_3437 deserialize (Ljava/io/Reader;)Lnet/minecraft/class_793; ARG 0 input - METHOD method_3438 getTransformation (Lnet/minecraft/class_811;)Lnet/minecraft/class_804; - ARG 1 renderMode - METHOD method_3439 isTextureReference (Ljava/lang/String;)Z - ARG 0 reference - METHOD method_3442 resolveTexture (Ljava/lang/String;)Lcom/mojang/datafixers/util/Either; - ARG 1 name - METHOD method_3443 getTransformations ()Lnet/minecraft/class_809; - METHOD method_3444 useAmbientOcclusion ()Z - METHOD method_3446 bake (Ljava/util/function/Function;Lnet/minecraft/class_3665;Z)Lnet/minecraft/class_1087; - METHOD method_3447 createQuad (Lnet/minecraft/class_785;Lnet/minecraft/class_783;Lnet/minecraft/class_1058;Lnet/minecraft/class_2350;Lnet/minecraft/class_3665;)Lnet/minecraft/class_777; - ARG 0 element - ARG 1 elementFace - ARG 2 sprite - ARG 3 side - ARG 4 settings - METHOD method_35789 needsResolution ()Z - CLASS class_4751 GuiLight - FIELD field_21858 ITEM Lnet/minecraft/class_793$class_4751; - COMMENT The model will be shaded from the front, like a basic item - FIELD field_21859 BLOCK Lnet/minecraft/class_793$class_4751; - COMMENT The model will be shaded from the side, like a block. - FIELD field_21860 name Ljava/lang/String; - METHOD (Ljava/lang/String;ILjava/lang/String;)V - ARG 3 name - METHOD method_24299 isSide ()Z - METHOD method_24300 byName (Ljava/lang/String;)Lnet/minecraft/class_793$class_4751; - ARG 0 value CLASS class_795 Deserializer METHOD deserialize (Lcom/google/gson/JsonElement;Ljava/lang/reflect/Type;Lcom/google/gson/JsonDeserializationContext;)Ljava/lang/Object; ARG 1 element ARG 2 unused ARG 3 ctx - METHOD method_24079 resolveReference (Lnet/minecraft/class_2960;Ljava/lang/String;)Lcom/mojang/datafixers/util/Either; - ARG 0 id - ARG 1 name - METHOD method_3448 texturesFromJson (Lcom/google/gson/JsonObject;)Ljava/util/Map; + METHOD method_3448 texturesFromJson (Lcom/google/gson/JsonObject;)Lnet/minecraft/class_10419$class_10420; ARG 1 object METHOD method_3449 elementsFromJson (Lcom/google/gson/JsonDeserializationContext;Lcom/google/gson/JsonObject;)Ljava/util/List; ARG 1 context ARG 2 json METHOD method_3450 parentFromJson (Lcom/google/gson/JsonObject;)Ljava/lang/String; ARG 1 json - METHOD method_3452 overridesFromJson (Lcom/google/gson/JsonDeserializationContext;Lcom/google/gson/JsonObject;)Ljava/util/List; - ARG 1 context - ARG 2 object METHOD method_3453 ambientOcclusionFromJson (Lcom/google/gson/JsonObject;)Ljava/lang/Boolean; ARG 1 json diff --git a/mappings/net/minecraft/client/render/model/json/ModelOverride.mapping b/mappings/net/minecraft/client/render/model/json/ModelOverride.mapping deleted file mode 100644 index dddc6e7534..0000000000 --- a/mappings/net/minecraft/client/render/model/json/ModelOverride.mapping +++ /dev/null @@ -1,24 +0,0 @@ -CLASS net/minecraft/class_799 net/minecraft/client/render/model/json/ModelOverride - FIELD comp_3193 modelId Lnet/minecraft/class_2960; - FIELD comp_3194 conditions Ljava/util/List; - METHOD (Lnet/minecraft/class_2960;Ljava/util/List;)V - ARG 1 modelId - METHOD comp_3193 modelId ()Lnet/minecraft/class_2960; - METHOD comp_3194 conditions ()Ljava/util/List; - CLASS class_5826 Condition - FIELD comp_3195 type Lnet/minecraft/class_2960; - FIELD comp_3196 threshold F - METHOD (Lnet/minecraft/class_2960;F)V - ARG 1 type - ARG 2 threshold - METHOD comp_3195 type ()Lnet/minecraft/class_2960; - METHOD comp_3196 threshold ()F - CLASS class_800 Deserializer - METHOD deserialize (Lcom/google/gson/JsonElement;Ljava/lang/reflect/Type;Lcom/google/gson/JsonDeserializationContext;)Ljava/lang/Object; - ARG 1 functionJson - ARG 2 unused - ARG 3 context - METHOD method_33691 (Ljava/util/Map$Entry;)Lnet/minecraft/class_799$class_5826; - ARG 0 entry - METHOD method_3474 deserializeMinPropertyValues (Lcom/google/gson/JsonObject;)Ljava/util/List; - ARG 1 object diff --git a/mappings/net/minecraft/client/render/model/json/ModelOverrideList.mapping b/mappings/net/minecraft/client/render/model/json/ModelOverrideList.mapping deleted file mode 100644 index e99a340ed5..0000000000 --- a/mappings/net/minecraft/client/render/model/json/ModelOverrideList.mapping +++ /dev/null @@ -1,33 +0,0 @@ -CLASS net/minecraft/class_806 net/minecraft/client/render/model/json/ModelOverrideList - FIELD field_28792 overrides [Lnet/minecraft/class_806$class_5827; - FIELD field_28793 conditionTypes [Lnet/minecraft/class_2960; - FIELD field_4292 EMPTY Lnet/minecraft/class_806; - METHOD (Lnet/minecraft/class_7775;Ljava/util/List;)V - ARG 1 baker - ARG 2 overrides - METHOD method_33696 (Lit/unimi/dsi/fastutil/objects/Object2IntMap;Lnet/minecraft/class_799$class_5826;)Lnet/minecraft/class_806$class_5828; - ARG 0 map - ARG 1 condition - METHOD method_64063 getModel (Lnet/minecraft/class_1799;Lnet/minecraft/class_638;Lnet/minecraft/class_1309;I)Lnet/minecraft/class_1087; - ARG 1 stack - ARG 2 world - ARG 3 entity - ARG 4 seed - CLASS class_5827 BakedOverride - FIELD comp_3189 conditions [Lnet/minecraft/class_806$class_5828; - FIELD comp_3190 model Lnet/minecraft/class_1087; - METHOD ([Lnet/minecraft/class_806$class_5828;Lnet/minecraft/class_1087;)V - ARG 1 conditions - ARG 2 model - METHOD comp_3189 conditions ()[Lnet/minecraft/class_806$class_5828; - METHOD comp_3190 model ()Lnet/minecraft/class_1087; - METHOD method_33700 test ([F)Z - ARG 1 values - CLASS class_5828 InlinedCondition - FIELD comp_3191 index I - FIELD comp_3192 threshold F - METHOD (IF)V - ARG 1 index - ARG 2 threshold - METHOD comp_3191 index ()I - METHOD comp_3192 threshold ()F diff --git a/mappings/net/minecraft/client/render/model/json/ModelTransformation.mapping b/mappings/net/minecraft/client/render/model/json/ModelTransformation.mapping index 646300fc4e..149228f0f0 100644 --- a/mappings/net/minecraft/client/render/model/json/ModelTransformation.mapping +++ b/mappings/net/minecraft/client/render/model/json/ModelTransformation.mapping @@ -1,13 +1,13 @@ CLASS net/minecraft/class_809 net/minecraft/client/render/model/json/ModelTransformation - FIELD field_4300 gui Lnet/minecraft/class_804; + FIELD comp_3368 thirdPersonLeftHand Lnet/minecraft/class_804; + FIELD comp_3369 thirdPersonRightHand Lnet/minecraft/class_804; + FIELD comp_3370 firstPersonLeftHand Lnet/minecraft/class_804; + FIELD comp_3371 firstPersonRightHand Lnet/minecraft/class_804; + FIELD comp_3372 head Lnet/minecraft/class_804; + FIELD comp_3373 gui Lnet/minecraft/class_804; + FIELD comp_3374 ground Lnet/minecraft/class_804; + FIELD comp_3375 fixed Lnet/minecraft/class_804; FIELD field_4301 NONE Lnet/minecraft/class_809; - FIELD field_4302 firstPersonLeftHand Lnet/minecraft/class_804; - FIELD field_4303 ground Lnet/minecraft/class_804; - FIELD field_4304 firstPersonRightHand Lnet/minecraft/class_804; - FIELD field_4305 thirdPersonLeftHand Lnet/minecraft/class_804; - FIELD field_4306 fixed Lnet/minecraft/class_804; - FIELD field_4307 thirdPersonRightHand Lnet/minecraft/class_804; - FIELD field_4311 head Lnet/minecraft/class_804; METHOD (Lnet/minecraft/class_804;Lnet/minecraft/class_804;Lnet/minecraft/class_804;Lnet/minecraft/class_804;Lnet/minecraft/class_804;Lnet/minecraft/class_804;Lnet/minecraft/class_804;Lnet/minecraft/class_804;)V ARG 1 thirdPersonLeftHand ARG 2 thirdPersonRightHand @@ -17,10 +17,14 @@ CLASS net/minecraft/class_809 net/minecraft/client/render/model/json/ModelTransf ARG 6 gui ARG 7 ground ARG 8 fixed - METHOD (Lnet/minecraft/class_809;)V - ARG 1 other - METHOD method_3501 isTransformationDefined (Lnet/minecraft/class_811;)Z - ARG 1 renderMode + METHOD comp_3368 thirdPersonLeftHand ()Lnet/minecraft/class_804; + METHOD comp_3369 thirdPersonRightHand ()Lnet/minecraft/class_804; + METHOD comp_3370 firstPersonLeftHand ()Lnet/minecraft/class_804; + METHOD comp_3371 firstPersonRightHand ()Lnet/minecraft/class_804; + METHOD comp_3372 head ()Lnet/minecraft/class_804; + METHOD comp_3373 gui ()Lnet/minecraft/class_804; + METHOD comp_3374 ground ()Lnet/minecraft/class_804; + METHOD comp_3375 fixed ()Lnet/minecraft/class_804; METHOD method_3503 getTransformation (Lnet/minecraft/class_811;)Lnet/minecraft/class_804; ARG 1 renderMode CLASS class_810 Deserializer diff --git a/mappings/net/minecraft/client/render/model/json/ModelVariant.mapping b/mappings/net/minecraft/client/render/model/json/ModelVariant.mapping index b9cddde428..35dce827e2 100644 --- a/mappings/net/minecraft/client/render/model/json/ModelVariant.mapping +++ b/mappings/net/minecraft/client/render/model/json/ModelVariant.mapping @@ -1,17 +1,19 @@ CLASS net/minecraft/class_813 net/minecraft/client/render/model/json/ModelVariant - FIELD field_4325 weight I - FIELD field_4326 location Lnet/minecraft/class_2960; - FIELD field_4327 uvLock Z - FIELD field_4328 rotation Lnet/minecraft/class_4590; + FIELD comp_3379 location Lnet/minecraft/class_2960; + FIELD comp_3380 rotation Lnet/minecraft/class_4590; + FIELD comp_3381 uvLock Z + FIELD comp_3382 weight I METHOD (Lnet/minecraft/class_2960;Lnet/minecraft/class_4590;ZI)V ARG 1 location ARG 2 rotation ARG 3 uvLock ARG 4 weight + METHOD comp_3379 location ()Lnet/minecraft/class_2960; + METHOD comp_3380 rotation ()Lnet/minecraft/class_4590; + METHOD comp_3381 uvLock ()Z + METHOD comp_3382 weight ()I METHOD equals (Ljava/lang/Object;)Z ARG 1 o - METHOD method_3510 getLocation ()Lnet/minecraft/class_2960; - METHOD method_3511 getWeight ()I CLASS class_814 Deserializer FIELD field_32810 DEFAULT_UV_LOCK Z FIELD field_32811 DEFAULT_WEIGHT I diff --git a/mappings/net/minecraft/client/render/model/json/ModelVariantMap.mapping b/mappings/net/minecraft/client/render/model/json/ModelVariantMap.mapping index 722b7f95ae..fbce51802e 100644 --- a/mappings/net/minecraft/client/render/model/json/ModelVariantMap.mapping +++ b/mappings/net/minecraft/client/render/model/json/ModelVariantMap.mapping @@ -26,7 +26,7 @@ CLASS net/minecraft/class_790 net/minecraft/client/render/model/json/ModelVarian METHOD method_62327 parse (Lnet/minecraft/class_2689;Ljava/lang/String;)Ljava/util/Map; ARG 1 stateManager ARG 2 path - METHOD method_62328 (Lnet/minecraft/class_1100;Ljava/util/Map$Entry;)Z + METHOD method_62328 (Lnet/minecraft/class_9979;Ljava/util/Map$Entry;)Z ARG 1 entry METHOD method_62329 (Ljava/util/List;Lnet/minecraft/class_2689;Ljava/util/Map;Lnet/minecraft/class_816;Ljava/lang/String;Ljava/lang/String;Lnet/minecraft/class_807;)V ARG 6 key diff --git a/mappings/net/minecraft/client/render/model/json/WeightedUnbakedModel.mapping b/mappings/net/minecraft/client/render/model/json/WeightedUnbakedModel.mapping index 2dff92e68f..779f35e4d1 100644 --- a/mappings/net/minecraft/client/render/model/json/WeightedUnbakedModel.mapping +++ b/mappings/net/minecraft/client/render/model/json/WeightedUnbakedModel.mapping @@ -3,7 +3,7 @@ CLASS net/minecraft/class_807 net/minecraft/client/render/model/json/WeightedUnb METHOD comp_3049 variants ()Ljava/util/List; METHOD equals (Ljava/lang/Object;)Z ARG 1 o - METHOD method_62333 (Lnet/minecraft/class_1100$class_10103;Lnet/minecraft/class_813;)V + METHOD method_62333 (Lnet/minecraft/class_10526$class_10103;Lnet/minecraft/class_813;)V ARG 1 variant CLASS class_808 Deserializer METHOD deserialize (Lcom/google/gson/JsonElement;Ljava/lang/reflect/Type;Lcom/google/gson/JsonDeserializationContext;)Ljava/lang/Object; diff --git a/mappings/net/minecraft/client/util/ModelIdentifier.mapping b/mappings/net/minecraft/client/util/ModelIdentifier.mapping index 9902a38485..e0364f5430 100644 --- a/mappings/net/minecraft/client/util/ModelIdentifier.mapping +++ b/mappings/net/minecraft/client/util/ModelIdentifier.mapping @@ -1,10 +1,7 @@ CLASS net/minecraft/class_1091 net/minecraft/client/util/ModelIdentifier - FIELD field_52277 INVENTORY_VARIANT Ljava/lang/String; METHOD (Lnet/minecraft/class_2960;Ljava/lang/String;)V ARG 1 id ARG 2 variant METHOD method_45911 toLowerCase (Ljava/lang/String;)Ljava/lang/String; ARG 0 string METHOD method_4740 getVariant ()Ljava/lang/String; - METHOD method_61078 ofInventoryVariant (Lnet/minecraft/class_2960;)Lnet/minecraft/class_1091; - ARG 0 id diff --git a/mappings/net/minecraft/component/type/CustomModelDataComponent.mapping b/mappings/net/minecraft/component/type/CustomModelDataComponent.mapping index e831f880b4..01a8c132ba 100644 --- a/mappings/net/minecraft/component/type/CustomModelDataComponent.mapping +++ b/mappings/net/minecraft/component/type/CustomModelDataComponent.mapping @@ -1,4 +1,3 @@ CLASS net/minecraft/class_9280 net/minecraft/component/type/CustomModelDataComponent - FIELD field_49307 DEFAULT Lnet/minecraft/class_9280; FIELD field_49308 CODEC Lcom/mojang/serialization/Codec; FIELD field_49309 PACKET_CODEC Lnet/minecraft/class_9139; diff --git a/mappings/net/minecraft/component/type/EquippableComponent.mapping b/mappings/net/minecraft/component/type/EquippableComponent.mapping index 06ea7e6175..44b0a8af0d 100644 --- a/mappings/net/minecraft/component/type/EquippableComponent.mapping +++ b/mappings/net/minecraft/component/type/EquippableComponent.mapping @@ -24,8 +24,7 @@ CLASS net/minecraft/class_10192 net/minecraft/component/type/EquippableComponent METHOD (Lnet/minecraft/class_1304;)V ARG 1 slot METHOD method_64203 build ()Lnet/minecraft/class_10192; - METHOD method_64204 model (Lnet/minecraft/class_2960;)Lnet/minecraft/class_10192$class_10217; - ARG 1 model + METHOD method_64204 model (Lnet/minecraft/class_5321;)Lnet/minecraft/class_10192$class_10217; METHOD method_64205 equipSound (Lnet/minecraft/class_6880;)Lnet/minecraft/class_10192$class_10217; ARG 1 equipSound METHOD method_64206 allowedEntities (Lnet/minecraft/class_6885;)Lnet/minecraft/class_10192$class_10217; diff --git a/mappings/net/minecraft/component/type/PotionContentsComponent.mapping b/mappings/net/minecraft/component/type/PotionContentsComponent.mapping index 26eb92b9ae..c5faec1b66 100644 --- a/mappings/net/minecraft/component/type/PotionContentsComponent.mapping +++ b/mappings/net/minecraft/component/type/PotionContentsComponent.mapping @@ -37,10 +37,6 @@ CLASS net/minecraft/class_1844 net/minecraft/component/type/PotionContentsCompon ARG 1 prefix METHOD method_64196 (Lnet/minecraft/class_6880;)Ljava/lang/String; ARG 0 potionEntry - METHOD method_8055 getColor (Ljava/lang/Iterable;)I - ARG 0 effects - METHOD method_8062 getColor (Lnet/minecraft/class_6880;)I - ARG 0 potion METHOD method_8064 getColor ()I METHOD method_8065 buildTooltip (Ljava/lang/Iterable;Ljava/util/function/Consumer;FF)V ARG 0 effects diff --git a/mappings/net/minecraft/data/DataCache.mapping b/mappings/net/minecraft/data/DataCache.mapping index 823cdd4d53..ad42a0035c 100644 --- a/mappings/net/minecraft/data/DataCache.mapping +++ b/mappings/net/minecraft/data/DataCache.mapping @@ -26,7 +26,6 @@ CLASS net/minecraft/class_2408 net/minecraft/data/DataCache METHOD method_46569 store (Lnet/minecraft/class_2408$class_7860;)V ARG 1 runResult METHOD method_46570 run (Ljava/lang/String;Lnet/minecraft/class_2408$class_7859;)Ljava/util/concurrent/CompletableFuture; - ARG 1 providerName ARG 2 runner METHOD method_46571 (Ljava/util/Set;Ljava/lang/String;Lnet/minecraft/class_2408$class_7405;)V ARG 2 providerName @@ -41,10 +40,6 @@ CLASS net/minecraft/class_2408 net/minecraft/data/DataCache FIELD field_38921 cacheMissCount Ljava/util/concurrent/atomic/AtomicInteger; FIELD field_40835 providerName Ljava/lang/String; FIELD field_40836 closed Z - METHOD (Lnet/minecraft/class_2408;Ljava/lang/String;Ljava/lang/String;Lnet/minecraft/class_2408$class_7405;)V - ARG 2 providerName - ARG 3 version - ARG 4 oldCache METHOD method_43355 isCacheInvalid (Ljava/nio/file/Path;Lcom/google/common/hash/HashCode;)Z ARG 1 path ARG 2 hashCode diff --git a/mappings/net/minecraft/data/DataProvider.mapping b/mappings/net/minecraft/data/DataProvider.mapping index 1816925f17..f9f4ba2284 100644 --- a/mappings/net/minecraft/data/DataProvider.mapping +++ b/mappings/net/minecraft/data/DataProvider.mapping @@ -24,8 +24,6 @@ CLASS net/minecraft/class_2405 net/minecraft/data/DataProvider ARG 1 codec ARG 2 value ARG 3 path - METHOD method_64109 (Lnet/minecraft/class_7403;Lcom/mojang/serialization/Codec;Lnet/minecraft/class_7784$class_7489;Ljava/util/Map$Entry;)Ljava/util/concurrent/CompletableFuture; - ARG 3 entry METHOD method_64110 writeAllToPath (Lnet/minecraft/class_7403;Lcom/mojang/serialization/Codec;Lnet/minecraft/class_7784$class_7489;Ljava/util/Map;)Ljava/util/concurrent/CompletableFuture; ARG 0 writer ARG 1 codec diff --git a/mappings/net/minecraft/data/Main.mapping b/mappings/net/minecraft/data/Main.mapping index 60ebf9c8dc..60655870e9 100644 --- a/mappings/net/minecraft/data/Main.mapping +++ b/mappings/net/minecraft/data/Main.mapping @@ -1,12 +1,6 @@ CLASS net/minecraft/data/Main METHOD main ([Ljava/lang/String;)V ARG 0 args - METHOD method_46595 (Ljava/util/Collection;Lnet/minecraft/class_7784;)Lnet/minecraft/class_2461; - ARG 1 outputx - METHOD method_46598 (Ljava/util/Collection;Lnet/minecraft/class_7784;)Lnet/minecraft/class_2463; - ARG 1 outputx - METHOD method_46599 (Ljava/util/concurrent/CompletableFuture;Lnet/minecraft/class_2474;Lnet/minecraft/class_7784;)Lnet/minecraft/class_2471; - ARG 2 outputx METHOD method_46839 toFactory (Ljava/util/function/BiFunction;Ljava/util/concurrent/CompletableFuture;)Lnet/minecraft/class_2405$class_7857; ARG 0 baseFactory ARG 1 registriesFuture @@ -14,19 +8,8 @@ CLASS net/minecraft/data/Main ARG 2 output METHOD method_4967 (Ljava/lang/String;)Ljava/nio/file/Path; ARG 0 input - METHOD method_4968 create (Ljava/nio/file/Path;Ljava/util/Collection;ZZZZZLnet/minecraft/class_6489;Z)Lnet/minecraft/class_2403; - ARG 0 output + METHOD method_4968 create (Lnet/minecraft/class_2403;Ljava/util/Collection;ZZZ)V ARG 1 inputs ARG 2 includeClient ARG 3 includeServer ARG 4 includeDev - ARG 5 includeReports - ARG 6 validate - ARG 7 gameVersion - ARG 8 ignoreCache - METHOD method_52888 (Lnet/minecraft/class_7784;)Lnet/minecraft/class_7796; - ARG 0 outputx - METHOD method_62731 (Lnet/minecraft/class_7784;)Lnet/minecraft/class_7796; - ARG 0 outputx - METHOD method_62732 (Lnet/minecraft/class_7784;)Lnet/minecraft/class_7796; - ARG 0 outputx diff --git a/mappings/net/minecraft/data/client/BlockStateModelGenerator.mapping b/mappings/net/minecraft/data/client/BlockStateModelGenerator.mapping index cd0780d83b..42699142d7 100644 --- a/mappings/net/minecraft/data/client/BlockStateModelGenerator.mapping +++ b/mappings/net/minecraft/data/client/BlockStateModelGenerator.mapping @@ -1,7 +1,6 @@ CLASS net/minecraft/class_4910 net/minecraft/data/client/BlockStateModelGenerator FIELD field_22830 blockStateCollector Ljava/util/function/Consumer; FIELD field_22831 modelCollector Ljava/util/function/BiConsumer; - FIELD field_22832 simpleItemModelExemptionCollector Ljava/util/function/Consumer; FIELD field_28548 CONNECTION_VARIANT_FUNCTIONS Ljava/util/List; COMMENT A map from a boolean property about connection on one direction to a COMMENT function that creates a block state variant for connection on that @@ -11,10 +10,8 @@ CLASS net/minecraft/class_4910 net/minecraft/data/client/BlockStateModelGenerato FIELD field_28552 VARIANT_POOL_FUNCTIONS Ljava/util/Map; FIELD field_29504 stoneStateFactories Ljava/util/Map; FIELD field_41526 CHISELED_BOOKSHELF_MODEL_CACHE Ljava/util/Map; - METHOD (Ljava/util/function/Consumer;Ljava/util/function/BiConsumer;Ljava/util/function/Consumer;)V + METHOD (Ljava/util/function/Consumer;Lnet/minecraft/class_10405;Ljava/util/function/BiConsumer;)V ARG 1 blockStateCollector - ARG 2 modelCollector - ARG 3 simpleItemModelExemptionCollector METHOD method_25508 registerChorusPlant ()V METHOD method_25509 registerComposter ()V METHOD method_25510 registerDaylightDetector ()V @@ -48,12 +45,6 @@ CLASS net/minecraft/class_4910 net/minecraft/data/client/BlockStateModelGenerato ARG 2 prefix ARG 3 textures METHOD method_25537 registerItemModel (Lnet/minecraft/class_1792;)V - ARG 1 item - METHOD method_25538 registerParentedItemModel (Lnet/minecraft/class_1792;Lnet/minecraft/class_2960;)V - ARG 1 item - ARG 2 parentModelId - METHOD method_25540 excludeFromSimpleItemModelGeneration (Lnet/minecraft/class_2248;)V - ARG 1 block METHOD method_25542 registerBuiltinWithParticle (Lnet/minecraft/class_2248;Lnet/minecraft/class_1792;)V ARG 1 block ARG 2 particleSource @@ -82,7 +73,6 @@ CLASS net/minecraft/class_4910 net/minecraft/data/client/BlockStateModelGenerato ARG 2 ageProperty ARG 3 ageTextureIndices METHOD method_25548 registerTintableCross (Lnet/minecraft/class_2248;Lnet/minecraft/class_4910$class_4913;)V - ARG 2 tintType METHOD method_25549 registerTintableCross (Lnet/minecraft/class_2248;Lnet/minecraft/class_4910$class_4913;Lnet/minecraft/class_4944;)V ARG 1 block ARG 2 tintType @@ -98,8 +88,6 @@ CLASS net/minecraft/class_4910 net/minecraft/data/client/BlockStateModelGenerato ARG 2 verticalModelFactory ARG 3 horizontalModelFactory METHOD method_25556 registerItemModel (Lnet/minecraft/class_2248;Ljava/lang/String;)V - ARG 1 block - ARG 2 textureSuffix METHOD method_25557 createSubModel (Lnet/minecraft/class_2248;Ljava/lang/String;Lnet/minecraft/class_4942;Ljava/util/function/Function;)Lnet/minecraft/class_2960; ARG 1 block ARG 2 suffix @@ -143,9 +131,6 @@ CLASS net/minecraft/class_4910 net/minecraft/data/client/BlockStateModelGenerato ARG 1 processor METHOD method_25584 createModelVariantWithRandomHorizontalRotations (Lnet/minecraft/class_2960;)[Lnet/minecraft/class_4935; ARG 0 modelId - METHOD method_25585 registerBuiltin (Lnet/minecraft/class_2960;Lnet/minecraft/class_2248;)Lnet/minecraft/class_4910$class_4911; - ARG 1 modelId - ARG 2 particleBlock METHOD method_25590 registerStonecutter ()V METHOD method_25591 registerStructureBlock ()V METHOD method_25592 registerSweetBerryBush ()V @@ -156,7 +141,6 @@ CLASS net/minecraft/class_4910 net/minecraft/data/client/BlockStateModelGenerato METHOD method_25598 registerInfestedStone ()V METHOD method_25599 createNorthDefaultHorizontalRotationStates ()Lnet/minecraft/class_4926; METHOD method_25600 registerItemModel (Lnet/minecraft/class_2248;)V - ARG 1 block METHOD method_25601 registerCoralFan (Lnet/minecraft/class_2248;Lnet/minecraft/class_2248;)V ARG 1 coralFanBlock ARG 2 coralWallFanBlock @@ -212,9 +196,6 @@ CLASS net/minecraft/class_4910 net/minecraft/data/client/BlockStateModelGenerato METHOD method_25630 createEastDefaultHorizontalRotationStates ()Lnet/minecraft/class_4926; METHOD method_25631 registerRotatable (Lnet/minecraft/class_2248;)V ARG 1 block - METHOD method_25632 registerBuiltin (Lnet/minecraft/class_2248;Lnet/minecraft/class_2248;)Lnet/minecraft/class_4910$class_4911; - ARG 1 block - ARG 2 particleBlock METHOD method_25634 createBlockStateWithRandomHorizontalRotations (Lnet/minecraft/class_2248;Lnet/minecraft/class_2960;)Lnet/minecraft/class_4925; ARG 0 block ARG 1 modelId @@ -245,7 +226,6 @@ CLASS net/minecraft/class_4910 net/minecraft/data/client/BlockStateModelGenerato METHOD method_25650 registerCubeAllModelTexturePool (Lnet/minecraft/class_2248;)Lnet/minecraft/class_4910$class_4912; ARG 1 block METHOD method_25651 registerGlassPane (Lnet/minecraft/class_2248;Lnet/minecraft/class_2248;)V - ARG 1 glass ARG 2 glassPane METHOD method_25652 registerCooker (Lnet/minecraft/class_2248;Lnet/minecraft/class_4946$class_4947;)V ARG 1 cooker @@ -318,9 +298,6 @@ CLASS net/minecraft/class_4910 net/minecraft/data/client/BlockStateModelGenerato METHOD method_25680 registerBarrel ()V METHOD method_25681 registerSimpleState (Lnet/minecraft/class_2248;)V ARG 1 block - METHOD method_25682 registerBed (Lnet/minecraft/class_2248;Lnet/minecraft/class_2248;)V - ARG 1 bed - ARG 2 particleSource METHOD method_25684 registerBell ()V METHOD method_25685 registerTurnableRail (Lnet/minecraft/class_2248;)V ARG 1 rail @@ -360,7 +337,7 @@ CLASS net/minecraft/class_4910 net/minecraft/data/client/BlockStateModelGenerato METHOD method_25708 registerNorthDefaultHorizontalRotation (Lnet/minecraft/class_2248;)V ARG 1 block METHOD method_25709 registerCauldrons ()V - METHOD method_25710 registerShulkerBox (Lnet/minecraft/class_2248;)V + METHOD method_25710 registerShulkerBox (Lnet/minecraft/class_2248;Lnet/minecraft/class_1767;)V ARG 1 shulkerBox METHOD method_25711 registerChorusFlower ()V METHOD method_25712 registerEndPortalFrame ()V @@ -399,8 +376,6 @@ CLASS net/minecraft/class_4910 net/minecraft/data/client/BlockStateModelGenerato METHOD method_33712 registerSmallDripleaf ()V METHOD method_33713 registerAzalea (Lnet/minecraft/class_2248;)V ARG 1 block - METHOD method_34603 (Lnet/minecraft/class_1826;)V - ARG 1 item METHOD method_34606 (Lnet/minecraft/class_2248;Lnet/minecraft/class_4944;Ljava/lang/Integer;)Lnet/minecraft/class_4935; ARG 3 age METHOD method_34608 createStoneState (Lnet/minecraft/class_2248;Lnet/minecraft/class_2960;Lnet/minecraft/class_4944;Ljava/util/function/BiConsumer;)Lnet/minecraft/class_4917; @@ -481,10 +456,6 @@ CLASS net/minecraft/class_4910 net/minecraft/data/client/BlockStateModelGenerato METHOD method_34659 (Lnet/minecraft/class_4935;)Lnet/minecraft/class_4935; ARG 0 variant METHOD method_34852 registerLightningRod ()V - METHOD method_35868 registerSingleton (Lnet/minecraft/class_2248;Lnet/minecraft/class_4944;Lnet/minecraft/class_4942;)V - ARG 1 block - ARG 2 textures - ARG 3 model METHOD method_36440 registerInfestedDeepslate ()V METHOD method_37317 registerPottedAzaleaBush (Lnet/minecraft/class_2248;)V ARG 1 block @@ -521,7 +492,6 @@ CLASS net/minecraft/class_4910 net/minecraft/data/client/BlockStateModelGenerato ARG 4 southModelId ARG 5 westModelId METHOD method_46190 registerHangingSign (Lnet/minecraft/class_2248;Lnet/minecraft/class_2248;Lnet/minecraft/class_2248;)V - ARG 1 strippedLog ARG 2 hangingSign ARG 3 wallHangingSign METHOD method_46193 registerChiseledBookshelf ()V @@ -627,26 +597,11 @@ CLASS net/minecraft/class_4910 net/minecraft/data/client/BlockStateModelGenerato ARG 1 block METHOD method_65291 registerMultifaceBlockModel (Lnet/minecraft/class_2248;)V ARG 1 block - METHOD method_65292 registerTwoLayersItemModel (Lnet/minecraft/class_2248;Ljava/lang/String;)V - ARG 1 block - ARG 2 secondLayerSuffix METHOD method_65294 (Lnet/minecraft/class_2248;Lnet/minecraft/class_4918$class_4921;Lnet/minecraft/class_2746;)V ARG 2 property METHOD method_65295 registerMultifaceBlock (Lnet/minecraft/class_2248;Lnet/minecraft/class_1792;)V ARG 1 block ARG 2 item - CLASS class_4911 BuiltinModelPool - FIELD field_22835 modelId Lnet/minecraft/class_2960; - METHOD (Lnet/minecraft/class_4910;Lnet/minecraft/class_2960;Lnet/minecraft/class_2248;)V - ARG 2 modelId - ARG 3 block - METHOD method_25713 includeWithItem (Lnet/minecraft/class_4942;[Lnet/minecraft/class_2248;)Lnet/minecraft/class_4910$class_4911; - ARG 1 model - ARG 2 blocks - METHOD method_25714 includeWithItem ([Lnet/minecraft/class_2248;)Lnet/minecraft/class_4910$class_4911; - ARG 1 blocks - METHOD method_25715 includeWithoutItem ([Lnet/minecraft/class_2248;)Lnet/minecraft/class_4910$class_4911; - ARG 1 blocks CLASS class_4912 BlockTexturePool FIELD field_22837 textures Lnet/minecraft/class_4944; FIELD field_22838 baseModelId Lnet/minecraft/class_2960; @@ -709,7 +664,7 @@ CLASS net/minecraft/class_4910 net/minecraft/data/client/BlockStateModelGenerato METHOD method_25727 getFlowerPotCrossModel ()Lnet/minecraft/class_4942; METHOD method_65296 getTextureMap (Lnet/minecraft/class_2248;)Lnet/minecraft/class_4944; ARG 1 block - METHOD method_65297 registerItemModel (Lnet/minecraft/class_4910;Lnet/minecraft/class_2248;)V + METHOD method_65297 registerItemModel (Lnet/minecraft/class_4910;Lnet/minecraft/class_2248;)Lnet/minecraft/class_2960; ARG 1 modelGenerator ARG 2 block METHOD method_65298 getFlowerPotTextureMap (Lnet/minecraft/class_2248;)Lnet/minecraft/class_4944; diff --git a/mappings/net/minecraft/data/client/EquipmentModelProvider.mapping b/mappings/net/minecraft/data/client/EquipmentModelProvider.mapping index 508bf42058..d0caf8793e 100644 --- a/mappings/net/minecraft/data/client/EquipmentModelProvider.mapping +++ b/mappings/net/minecraft/data/client/EquipmentModelProvider.mapping @@ -2,6 +2,5 @@ CLASS net/minecraft/class_10206 net/minecraft/data/client/EquipmentModelProvider FIELD field_54202 pathResolver Lnet/minecraft/class_7784$class_7489; METHOD (Lnet/minecraft/class_7784;)V ARG 1 output - METHOD method_64112 (Ljava/util/Map;Lnet/minecraft/class_2960;Lnet/minecraft/class_10186;)V - ARG 1 id + METHOD method_64112 (Ljava/util/Map;Lnet/minecraft/class_5321;Lnet/minecraft/class_10186;)V ARG 2 model diff --git a/mappings/net/minecraft/data/client/ItemModelGenerator.mapping b/mappings/net/minecraft/data/client/ItemModelGenerator.mapping index 4641e3e3f3..cdca8f6fde 100644 --- a/mappings/net/minecraft/data/client/ItemModelGenerator.mapping +++ b/mappings/net/minecraft/data/client/ItemModelGenerator.mapping @@ -1,54 +1,14 @@ CLASS net/minecraft/class_4915 net/minecraft/data/client/ItemModelGenerator - FIELD field_22844 writer Ljava/util/function/BiConsumer; - FIELD field_42086 TRIM_TYPE Lnet/minecraft/class_2960; - FIELD field_42087 TRIM_MATERIALS Ljava/util/List; - METHOD (Ljava/util/function/BiConsumer;)V - ARG 1 writer METHOD method_25731 register ()V - METHOD method_25732 register (Lnet/minecraft/class_1792;Lnet/minecraft/class_1792;Lnet/minecraft/class_4942;)V - ARG 1 item - ARG 2 texture - ARG 3 model - METHOD method_25733 register (Lnet/minecraft/class_1792;Lnet/minecraft/class_4942;)V - ARG 1 item - ARG 2 model - METHOD method_25734 register (Lnet/minecraft/class_1792;Ljava/lang/String;Lnet/minecraft/class_4942;)V - ARG 1 item - ARG 2 suffix - ARG 3 model - METHOD method_43228 registerCompass (Lnet/minecraft/class_1792;)V - ARG 1 compass METHOD method_43229 registerClock (Lnet/minecraft/class_1792;)V ARG 1 clock - METHOD method_48517 uploadArmor (Lnet/minecraft/class_2960;Lnet/minecraft/class_2960;Lnet/minecraft/class_2960;)V + METHOD method_48517 uploadArmor (Lnet/minecraft/class_2960;Lnet/minecraft/class_2960;Lnet/minecraft/class_2960;)Lnet/minecraft/class_2960; ARG 1 id ARG 2 layer0 ARG 3 layer1 - METHOD method_48518 suffixTrim (Lnet/minecraft/class_2960;Ljava/lang/String;)Lnet/minecraft/class_2960; - ARG 1 id - ARG 2 trimMaterialName - METHOD method_48519 createArmorJson (Lnet/minecraft/class_2960;Ljava/util/Map;Lnet/minecraft/class_2960;)Lcom/google/gson/JsonObject; - ARG 1 id - ARG 2 textures - ARG 3 modelId - METHOD method_48522 (Lnet/minecraft/class_2960;Lnet/minecraft/class_2960;Ljava/util/Map;)Lcom/google/gson/JsonObject; - ARG 2 id - ARG 3 textures - METHOD method_48523 registerArmor (Lnet/minecraft/class_1792;Lnet/minecraft/class_2960;Lnet/minecraft/class_10186;Lnet/minecraft/class_1304;)V - ARG 1 item - ARG 2 modelId - ARG 3 model - ARG 4 slot METHOD method_48742 uploadArmor (Lnet/minecraft/class_2960;Lnet/minecraft/class_2960;Lnet/minecraft/class_2960;Lnet/minecraft/class_2960;)V ARG 1 id ARG 2 layer0 ARG 3 layer1 ARG 4 layer2 - METHOD method_48743 (Lnet/minecraft/class_2960;Lnet/minecraft/class_2960;Ljava/util/Map;)Lcom/google/gson/JsonObject; - ARG 2 id - ARG 3 textures - METHOD method_57960 registerWolfArmor (Lnet/minecraft/class_1792;)V - ARG 1 armor CLASS class_8072 TrimMaterial - METHOD method_48744 getAppliedName (Lnet/minecraft/class_2960;)Ljava/lang/String; - ARG 1 modelId diff --git a/mappings/net/minecraft/data/client/Model.mapping b/mappings/net/minecraft/data/client/Model.mapping index 818c1dba85..f0c496ca5a 100644 --- a/mappings/net/minecraft/data/client/Model.mapping +++ b/mappings/net/minecraft/data/client/Model.mapping @@ -26,22 +26,6 @@ CLASS net/minecraft/class_4942 net/minecraft/data/client/Model ARG 2 suffix ARG 3 textures ARG 4 modelCollector - METHOD method_48524 createJson (Lnet/minecraft/class_2960;Ljava/util/Map;)Lcom/google/gson/JsonObject; - ARG 1 id - ARG 2 textures - METHOD method_48525 upload (Lnet/minecraft/class_2960;Lnet/minecraft/class_4944;Ljava/util/function/BiConsumer;Lnet/minecraft/class_4942$class_8073;)Lnet/minecraft/class_2960; - ARG 1 id - ARG 2 textures - ARG 3 modelCollector - ARG 4 jsonFactory - METHOD method_48526 (Lcom/google/gson/JsonObject;Lnet/minecraft/class_2960;)V - ARG 1 parent - METHOD method_48527 (Lcom/google/gson/JsonObject;Lnet/minecraft/class_4945;Lnet/minecraft/class_2960;)V - ARG 1 textureKey - ARG 2 texture + METHOD method_48525 upload (Lnet/minecraft/class_1792;Lnet/minecraft/class_4944;Ljava/util/function/BiConsumer;)Lnet/minecraft/class_2960; METHOD method_54828 getBlockSubModelId (Lnet/minecraft/class_2248;)Lnet/minecraft/class_2960; ARG 1 block - CLASS class_8073 JsonFactory - METHOD create (Lnet/minecraft/class_2960;Ljava/util/Map;)Lcom/google/gson/JsonObject; - ARG 1 id - ARG 2 textures diff --git a/mappings/net/minecraft/data/client/ModelProvider.mapping b/mappings/net/minecraft/data/client/ModelProvider.mapping index e3d8e0dbe8..625579f1a6 100644 --- a/mappings/net/minecraft/data/client/ModelProvider.mapping +++ b/mappings/net/minecraft/data/client/ModelProvider.mapping @@ -3,22 +3,3 @@ CLASS net/minecraft/class_4916 net/minecraft/data/client/ModelProvider FIELD field_39376 modelsPathResolver Lnet/minecraft/class_7784$class_7489; METHOD (Lnet/minecraft/class_7784;)V ARG 1 output - METHOD method_25735 writeJsons (Lnet/minecraft/class_7403;Ljava/util/Map;Ljava/util/function/Function;)Ljava/util/concurrent/CompletableFuture; - ARG 1 cache - ARG 2 models - ARG 3 pathGetter - METHOD method_25738 (Ljava/util/Map;Lnet/minecraft/class_2248;)Z - ARG 1 block - METHOD method_25739 (Ljava/util/Map;Lnet/minecraft/class_4917;)V - ARG 1 blockStateSupplier - METHOD method_25740 (Ljava/util/Map;Lnet/minecraft/class_2960;Ljava/util/function/Supplier;)V - ARG 1 id - ARG 2 jsonSupplier - METHOD method_25741 (Ljava/util/Set;Ljava/util/Map;Lnet/minecraft/class_2248;)V - ARG 2 block - METHOD method_25742 (Ljava/util/function/Function;Lnet/minecraft/class_7403;Ljava/util/Map$Entry;)Ljava/util/concurrent/CompletableFuture; - ARG 2 entry - METHOD method_44110 (Lnet/minecraft/class_2248;)Ljava/nio/file/Path; - ARG 1 block - METHOD method_53817 (Ljava/util/Map$Entry;)Z - ARG 0 entry diff --git a/mappings/net/minecraft/data/client/TexturedModel.mapping b/mappings/net/minecraft/data/client/TexturedModel.mapping index 8893062695..589e8e6015 100644 --- a/mappings/net/minecraft/data/client/TexturedModel.mapping +++ b/mappings/net/minecraft/data/client/TexturedModel.mapping @@ -11,7 +11,6 @@ CLASS net/minecraft/class_4946 net/minecraft/data/client/TexturedModel FIELD field_23044 CARPET Lnet/minecraft/class_4946$class_4947; FIELD field_23045 TEMPLATE_GLAZED_TERRACOTTA Lnet/minecraft/class_4946$class_4947; FIELD field_23046 CORAL_FAN Lnet/minecraft/class_4946$class_4947; - FIELD field_23047 PARTICLE Lnet/minecraft/class_4946$class_4947; FIELD field_23048 TEMPLATE_ANVIL Lnet/minecraft/class_4946$class_4947; FIELD field_23049 LEAVES Lnet/minecraft/class_4946$class_4947; FIELD field_23050 TEMPLATE_LANTERN Lnet/minecraft/class_4946$class_4947; diff --git a/mappings/net/minecraft/datafixer/fix/ComponentFix.mapping b/mappings/net/minecraft/datafixer/fix/ComponentFix.mapping index d7c821e251..55e3520ac8 100644 --- a/mappings/net/minecraft/datafixer/fix/ComponentFix.mapping +++ b/mappings/net/minecraft/datafixer/fix/ComponentFix.mapping @@ -13,5 +13,3 @@ CLASS net/minecraft/class_9342 net/minecraft/datafixer/fix/ComponentFix ARG 4 newComponentId METHOD method_58045 fixComponent (Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic; ARG 1 dynamic - METHOD method_58046 (Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic; - ARG 1 dynamic diff --git a/mappings/net/minecraft/entity/Entity.mapping b/mappings/net/minecraft/entity/Entity.mapping index 6574c4635e..4beed564bf 100644 --- a/mappings/net/minecraft/entity/Entity.mapping +++ b/mappings/net/minecraft/entity/Entity.mapping @@ -1377,10 +1377,8 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity COMMENT COMMENT @see #setSneaking COMMENT @see #isInSneakingPose - METHOD method_5716 updateKilledAdvancementCriterion (Lnet/minecraft/class_1297;ILnet/minecraft/class_1282;)V + METHOD method_5716 updateKilledAdvancementCriterion (Lnet/minecraft/class_1297;Lnet/minecraft/class_1282;)V ARG 1 entityKilled - ARG 2 score - ARG 3 damageSource METHOD method_5718 getBrightnessAtEyes ()F METHOD method_5719 copyPositionAndRotation (Lnet/minecraft/class_1297;)V COMMENT Sets the entity's position and rotation the same as {@code entity}. diff --git a/mappings/net/minecraft/entity/LivingEntity.mapping b/mappings/net/minecraft/entity/LivingEntity.mapping index d73b26aa64..4470d81565 100644 --- a/mappings/net/minecraft/entity/LivingEntity.mapping +++ b/mappings/net/minecraft/entity/LivingEntity.mapping @@ -49,7 +49,6 @@ CLASS net/minecraft/class_1309 net/minecraft/entity/LivingEntity FIELD field_6229 lastHandSwingProgress F FIELD field_6230 lastAttackedTime I FIELD field_6231 SPRINTING_SPEED_BOOST Lnet/minecraft/class_1322; - FIELD field_6232 scoreAmount I FIELD field_6233 stepBobbingAmount F FIELD field_6234 syncedHandStacks Lnet/minecraft/class_2371; FIELD field_6235 hurtTime I diff --git a/mappings/net/minecraft/entity/ai/control/LookControl.mapping b/mappings/net/minecraft/entity/ai/control/LookControl.mapping index e3304457bc..95500b4b05 100644 --- a/mappings/net/minecraft/entity/ai/control/LookControl.mapping +++ b/mappings/net/minecraft/entity/ai/control/LookControl.mapping @@ -7,8 +7,6 @@ CLASS net/minecraft/class_1333 net/minecraft/entity/ai/control/LookControl FIELD field_6362 z D FIELD field_6363 y D FIELD field_6364 x D - METHOD (Lnet/minecraft/class_1308;)V - ARG 1 entity METHOD method_19615 lookAt (Lnet/minecraft/class_243;)V ARG 1 direction METHOD method_20248 lookAt (DDD)V diff --git a/mappings/net/minecraft/entity/ai/pathing/BirdNavigation.mapping b/mappings/net/minecraft/entity/ai/pathing/BirdNavigation.mapping index 0e7a61db2e..92bbad25bf 100644 --- a/mappings/net/minecraft/entity/ai/pathing/BirdNavigation.mapping +++ b/mappings/net/minecraft/entity/ai/pathing/BirdNavigation.mapping @@ -1,6 +1,3 @@ CLASS net/minecraft/class_1407 net/minecraft/entity/ai/pathing/BirdNavigation - METHOD method_35128 canEnterOpenDoors ()Z - METHOD method_6331 setCanEnterOpenDoors (Z)V - ARG 1 canEnterOpenDoors METHOD method_6332 setCanPathThroughDoors (Z)V ARG 1 canPathThroughDoors diff --git a/mappings/net/minecraft/entity/ai/pathing/MobNavigation.mapping b/mappings/net/minecraft/entity/ai/pathing/MobNavigation.mapping index c245cd8b49..6f1ffd3069 100644 --- a/mappings/net/minecraft/entity/ai/pathing/MobNavigation.mapping +++ b/mappings/net/minecraft/entity/ai/pathing/MobNavigation.mapping @@ -2,8 +2,6 @@ CLASS net/minecraft/class_1409 net/minecraft/entity/ai/pathing/MobNavigation FIELD field_6686 avoidSunlight Z METHOD method_26338 canWalkOnPath (Lnet/minecraft/class_7;)Z ARG 1 pathType - METHOD method_35139 setCanEnterOpenDoors (Z)V - ARG 1 canEnterOpenDoors METHOD method_46645 setCanWalkOverFences (Z)V ARG 1 canWalkOverFences METHOD method_6361 setAvoidSunlight (Z)V @@ -12,4 +10,3 @@ CLASS net/minecraft/class_1409 net/minecraft/entity/ai/pathing/MobNavigation COMMENT The y-position to act as if the entity is at for pathfinding purposes METHOD method_6363 setCanPathThroughDoors (Z)V ARG 1 canPathThroughDoors - METHOD method_6366 canEnterOpenDoors ()Z diff --git a/mappings/net/minecraft/entity/mob/MobEntity.mapping b/mappings/net/minecraft/entity/mob/MobEntity.mapping index 9836edbbfa..9f36944865 100644 --- a/mappings/net/minecraft/entity/mob/MobEntity.mapping +++ b/mappings/net/minecraft/entity/mob/MobEntity.mapping @@ -153,8 +153,6 @@ CLASS net/minecraft/class_1308 net/minecraft/entity/mob/MobEntity METHOD method_56677 isWearingBodyArmor ()Z METHOD method_56678 equipBodyArmor (Lnet/minecraft/class_1799;)V ARG 1 stack - METHOD method_57296 hasComponentsOtherThanDamage (Lnet/minecraft/class_1799;)Z - ARG 0 stack METHOD method_58634 setEquipmentFromTable (Lnet/minecraft/class_9652;)V ARG 1 equipmentTable METHOD method_58635 createEquipmentLootParameters (Lnet/minecraft/class_3218;)Lnet/minecraft/class_8567; @@ -195,8 +193,6 @@ CLASS net/minecraft/class_1308 net/minecraft/entity/mob/MobEntity METHOD method_5952 setCanPickUpLoot (Z)V ARG 1 canPickUpLoot METHOD method_5955 prefersNewEquipment (Lnet/minecraft/class_1799;Lnet/minecraft/class_1799;Lnet/minecraft/class_1304;)Z - ARG 1 newStack - ARG 2 oldStack ARG 3 slot METHOD method_5957 canSpawn (Lnet/minecraft/class_4538;)Z ARG 1 world diff --git a/mappings/net/minecraft/entity/mob/PhantomEntity.mapping b/mappings/net/minecraft/entity/mob/PhantomEntity.mapping index 7bb2b0a7e0..777458f4db 100644 --- a/mappings/net/minecraft/entity/mob/PhantomEntity.mapping +++ b/mappings/net/minecraft/entity/mob/PhantomEntity.mapping @@ -30,9 +30,6 @@ CLASS net/minecraft/class_1593 net/minecraft/entity/mob/PhantomEntity FIELD field_7328 angle F METHOD method_7103 adjustDirection ()V CLASS class_1599 PhantomLookControl - METHOD (Lnet/minecraft/class_1593;Lnet/minecraft/class_1308;)V - ARG 1 phantom - ARG 2 entity CLASS class_1600 PhantomMoveControl FIELD field_7331 targetSpeed F COMMENT The movement speed that the phantom tends towards diff --git a/mappings/net/minecraft/entity/passive/BeeEntity.mapping b/mappings/net/minecraft/entity/passive/BeeEntity.mapping index e6e9ad0468..daa78f4dca 100644 --- a/mappings/net/minecraft/entity/passive/BeeEntity.mapping +++ b/mappings/net/minecraft/entity/passive/BeeEntity.mapping @@ -149,13 +149,10 @@ CLASS net/minecraft/class_4466 net/minecraft/entity/passive/BeeEntity CLASS class_4478 PollinateGoal FIELD field_20378 pollinationTicks I FIELD field_20379 lastPollinationTick I - FIELD field_20617 flowerPredicate Ljava/util/function/Predicate; FIELD field_21080 running Z FIELD field_21511 nextTarget Lnet/minecraft/class_243; FIELD field_21651 ticks I FIELD field_52459 unreachableFlowerPosCache Lit/unimi/dsi/fastutil/longs/Long2LongOpenHashMap; - METHOD method_21819 (Lnet/minecraft/class_2680;)Z - ARG 0 state METHOD method_21820 completedPollination ()Z METHOD method_21821 getFlower ()Ljava/util/Optional; METHOD method_23346 isRunning ()Z diff --git a/mappings/net/minecraft/entity/passive/FoxEntity.mapping b/mappings/net/minecraft/entity/passive/FoxEntity.mapping index 667ad91fbb..e0d5647416 100644 --- a/mappings/net/minecraft/entity/passive/FoxEntity.mapping +++ b/mappings/net/minecraft/entity/passive/FoxEntity.mapping @@ -187,9 +187,6 @@ CLASS net/minecraft/class_4019 net/minecraft/entity/passive/FoxEntity METHOD method_18317 getId ()I CLASS class_4052 FollowParentGoal FIELD field_18104 fox Lnet/minecraft/class_4019; - METHOD (Lnet/minecraft/class_4019;Lnet/minecraft/class_4019;D)V - ARG 2 fox - ARG 3 speed CLASS class_4292 LookAtEntityGoal METHOD (Lnet/minecraft/class_4019;Lnet/minecraft/class_1308;Ljava/lang/Class;F)V ARG 2 fox diff --git a/mappings/net/minecraft/entity/passive/SheepEntity.mapping b/mappings/net/minecraft/entity/passive/SheepEntity.mapping index 7d48981259..29170799e7 100644 --- a/mappings/net/minecraft/entity/passive/SheepEntity.mapping +++ b/mappings/net/minecraft/entity/passive/SheepEntity.mapping @@ -4,14 +4,9 @@ CLASS net/minecraft/class_1472 net/minecraft/entity/passive/SheepEntity FIELD field_6867 COLORS Ljava/util/Map; FIELD field_6869 eatGrassGoal Lnet/minecraft/class_1345; FIELD field_6870 COLOR Lnet/minecraft/class_2940; - METHOD method_17689 (Lnet/minecraft/class_9694;Lnet/minecraft/class_3218;Lnet/minecraft/class_8786;)Lnet/minecraft/class_1799; - ARG 2 recipe METHOD method_26893 createSheepAttributes ()Lnet/minecraft/class_5132$class_5133; METHOD method_58375 (Lnet/minecraft/class_1799;)Z ARG 0 stack - METHOD method_59936 createChildColorRecipeInput (Lnet/minecraft/class_1767;Lnet/minecraft/class_1767;)Lnet/minecraft/class_9694; - ARG 0 firstColor - ARG 1 secondColor METHOD method_6628 getNeckAngle (F)F ARG 1 delta METHOD method_6629 isSheared ()Z @@ -28,9 +23,5 @@ CLASS net/minecraft/class_1472 net/minecraft/entity/passive/SheepEntity ARG 1 sheared METHOD method_6638 (Lnet/minecraft/class_1767;)Lnet/minecraft/class_1767; ARG 0 color - METHOD method_6639 getChildColor (Lnet/minecraft/class_3218;Lnet/minecraft/class_1472;Lnet/minecraft/class_1472;)Lnet/minecraft/class_1767; - ARG 1 world - ARG 2 firstParent - ARG 3 secondParent METHOD method_6641 getHeadAngle (F)F ARG 1 delta diff --git a/mappings/net/minecraft/entity/passive/SquidEntity.mapping b/mappings/net/minecraft/entity/passive/SquidEntity.mapping index d952246125..c06b83b3a3 100644 --- a/mappings/net/minecraft/entity/passive/SquidEntity.mapping +++ b/mappings/net/minecraft/entity/passive/SquidEntity.mapping @@ -27,5 +27,3 @@ CLASS net/minecraft/class_1477 net/minecraft/entity/passive/SquidEntity FIELD field_6915 timer I CLASS class_1479 SwimGoal FIELD field_6917 squid Lnet/minecraft/class_1477; - METHOD (Lnet/minecraft/class_1477;Lnet/minecraft/class_1477;)V - ARG 2 squid diff --git a/mappings/net/minecraft/entity/projectile/FishingBobberEntity.mapping b/mappings/net/minecraft/entity/projectile/FishingBobberEntity.mapping index f3dca8b7db..6dcfd85289 100644 --- a/mappings/net/minecraft/entity/projectile/FishingBobberEntity.mapping +++ b/mappings/net/minecraft/entity/projectile/FishingBobberEntity.mapping @@ -20,12 +20,11 @@ CLASS net/minecraft/class_1536 net/minecraft/entity/projectile/FishingBobberEnti ARG 2 world ARG 3 luckBonus ARG 4 waitTimeReductionTicks - METHOD (Lnet/minecraft/class_1657;Lnet/minecraft/class_1937;IILnet/minecraft/class_1799;)V + METHOD (Lnet/minecraft/class_1657;Lnet/minecraft/class_1937;II)V ARG 1 thrower ARG 2 world ARG 3 luckBonus ARG 4 waitTimeReductionTicks - ARG 5 stack METHOD method_26086 isOpenOrWaterAround (Lnet/minecraft/class_2338;)Z ARG 1 pos METHOD method_26088 isInOpenWater ()Z diff --git a/mappings/net/minecraft/entity/raid/RaiderEntity.mapping b/mappings/net/minecraft/entity/raid/RaiderEntity.mapping index 80e6a9de3a..3527ce371f 100644 --- a/mappings/net/minecraft/entity/raid/RaiderEntity.mapping +++ b/mappings/net/minecraft/entity/raid/RaiderEntity.mapping @@ -42,10 +42,6 @@ CLASS net/minecraft/class_3763 net/minecraft/entity/raid/RaiderEntity FIELD field_18881 closeRaiderPredicate Lnet/minecraft/class_4051; FIELD field_18883 raider Lnet/minecraft/class_3763; FIELD field_18884 squaredDistance F - METHOD (Lnet/minecraft/class_3763;Lnet/minecraft/class_1543;F)V - ARG 1 raider - ARG 2 illager - ARG 3 distance CLASS class_4260 CelebrateGoal FIELD field_19034 raider Lnet/minecraft/class_3763; METHOD (Lnet/minecraft/class_3763;Lnet/minecraft/class_3763;)V diff --git a/mappings/net/minecraft/item/BlockItem.mapping b/mappings/net/minecraft/item/BlockItem.mapping index c5818748dd..3dba60c0e6 100644 --- a/mappings/net/minecraft/item/BlockItem.mapping +++ b/mappings/net/minecraft/item/BlockItem.mapping @@ -1,9 +1,6 @@ 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_55029 OP_BLOCK_WARNING_LINE_1 Lnet/minecraft/class_2561; - FIELD field_55030 OP_BLOCK_WARNING_LINE_2 Lnet/minecraft/class_2561; - FIELD field_55031 OP_BLOCK_WARNING_LINE_3 Lnet/minecraft/class_2561; FIELD field_7901 block Lnet/minecraft/class_2248; METHOD (Lnet/minecraft/class_2248;Lnet/minecraft/class_1792$class_1793;)V ARG 1 block diff --git a/mappings/net/minecraft/item/BundleItem.mapping b/mappings/net/minecraft/item/BundleItem.mapping index ce73b68fba..037e43e58f 100644 --- a/mappings/net/minecraft/item/BundleItem.mapping +++ b/mappings/net/minecraft/item/BundleItem.mapping @@ -6,12 +6,6 @@ CLASS net/minecraft/class_5537 net/minecraft/item/BundleItem FIELD field_52578 MAX_TOOLTIP_STACKS_SHOWN_WHEN_TOO_MANY_TYPES I FIELD field_52579 FULL_ITEM_BAR_COLOR I FIELD field_54111 MAX_USE_TIME I - FIELD field_54112 openFrontTexture Lnet/minecraft/class_2960; - FIELD field_54113 openBackTexture Lnet/minecraft/class_2960; - METHOD (Lnet/minecraft/class_2960;Lnet/minecraft/class_2960;Lnet/minecraft/class_1792$class_1793;)V - ARG 1 openFrontTexture - ARG 2 openBackTexture - ARG 3 settings METHOD method_31561 getAmountFilled (Lnet/minecraft/class_1799;)F ARG 0 stack METHOD method_32757 dropFirstBundledStack (Lnet/minecraft/class_1799;Lnet/minecraft/class_1657;)Z @@ -45,8 +39,6 @@ CLASS net/minecraft/class_5537 net/minecraft/item/BundleItem ARG 0 stack ARG 1 player ARG 2 contents - METHOD method_63677 getOpenFrontTexture ()Lnet/minecraft/class_2960; - METHOD method_63678 getOpenBackTexture ()Lnet/minecraft/class_2960; METHOD method_64277 getBundle (Lnet/minecraft/class_1767;)Lnet/minecraft/class_1792; ARG 0 color METHOD method_64502 onContentChanged (Lnet/minecraft/class_1657;)V diff --git a/mappings/net/minecraft/item/Item.mapping b/mappings/net/minecraft/item/Item.mapping index b10d87afdb..6bb3493a58 100644 --- a/mappings/net/minecraft/item/Item.mapping +++ b/mappings/net/minecraft/item/Item.mapping @@ -381,8 +381,6 @@ CLASS net/minecraft/class_1792 net/minecraft/item/Item ARG 2 consumableComponent METHOD method_62834 useRemainder (Lnet/minecraft/class_1792;)Lnet/minecraft/class_1792$class_1793; ARG 1 convertInto - METHOD method_63681 modelId (Lnet/minecraft/class_2960;)Lnet/minecraft/class_1792$class_1793; - ARG 1 modelId METHOD method_63682 equippable (Lnet/minecraft/class_1304;)Lnet/minecraft/class_1792$class_1793; ARG 1 slot METHOD method_63684 translationKey (Ljava/lang/String;)Lnet/minecraft/class_1792$class_1793; @@ -435,12 +433,10 @@ CLASS net/minecraft/class_1792 net/minecraft/item/Item CLASS class_9635 TooltipContext FIELD field_51353 DEFAULT Lnet/minecraft/class_1792$class_9635; METHOD method_59527 getRegistryLookup ()Lnet/minecraft/class_7225$class_7874; - METHOD method_59528 create (Lnet/minecraft/class_1937;Lnet/minecraft/class_1657;)Lnet/minecraft/class_1792$class_9635; + METHOD method_59528 create (Lnet/minecraft/class_1937;)Lnet/minecraft/class_1792$class_9635; ARG 0 world - ARG 1 player METHOD method_59529 getMapState (Lnet/minecraft/class_9209;)Lnet/minecraft/class_22; ARG 1 mapIdComponent METHOD method_59530 create (Lnet/minecraft/class_7225$class_7874;)Lnet/minecraft/class_1792$class_9635; ARG 0 registries METHOD method_59531 getUpdateTickRate ()F - METHOD method_65129 getPlayerPermissionLevel ()I diff --git a/mappings/net/minecraft/item/ItemStack.mapping b/mappings/net/minecraft/item/ItemStack.mapping index 29f66a9c8f..de48e60b7a 100644 --- a/mappings/net/minecraft/item/ItemStack.mapping +++ b/mappings/net/minecraft/item/ItemStack.mapping @@ -373,7 +373,6 @@ CLASS net/minecraft/class_1799 net/minecraft/item/ItemStack ARG 0 item METHOD method_61655 canRepairWith (Lnet/minecraft/class_1799;)Z ARG 1 ingredient - METHOD method_61656 clearComponentChanges ()V METHOD method_61657 shouldBreak ()Z METHOD method_62837 applyRemainderAndCooldown (Lnet/minecraft/class_1309;Lnet/minecraft/class_1799;)Lnet/minecraft/class_1799; ARG 1 user diff --git a/mappings/net/minecraft/item/Items.mapping b/mappings/net/minecraft/item/Items.mapping index abafca6a42..d317087fba 100644 --- a/mappings/net/minecraft/item/Items.mapping +++ b/mappings/net/minecraft/item/Items.mapping @@ -1348,8 +1348,6 @@ CLASS net/minecraft/class_1802 net/minecraft/item/Items ARG 0 settings METHOD method_63856 (Lnet/minecraft/class_1792$class_1793;)Lnet/minecraft/class_1792; ARG 0 settings - METHOD method_63857 (Lnet/minecraft/class_1792$class_1793;)Lnet/minecraft/class_1792; - ARG 0 settings METHOD method_63858 (Lnet/minecraft/class_1792$class_1793;)Lnet/minecraft/class_1792; ARG 0 settings METHOD method_63859 (Lnet/minecraft/class_1792$class_1793;)Lnet/minecraft/class_1792; @@ -1628,38 +1626,6 @@ CLASS net/minecraft/class_1802 net/minecraft/item/Items METHOD method_63985 (Lnet/minecraft/class_2248;Lnet/minecraft/class_1792$class_1793;)Lnet/minecraft/class_1792; ARG 0 block ARG 1 settings - METHOD method_64280 (Lnet/minecraft/class_1792$class_1793;)Lnet/minecraft/class_1792; - ARG 0 settings - METHOD method_64281 (Lnet/minecraft/class_1792$class_1793;)Lnet/minecraft/class_1792; - ARG 0 settings - METHOD method_64282 (Lnet/minecraft/class_1792$class_1793;)Lnet/minecraft/class_1792; - ARG 0 settings - METHOD method_64283 (Lnet/minecraft/class_1792$class_1793;)Lnet/minecraft/class_1792; - ARG 0 settings - METHOD method_64284 (Lnet/minecraft/class_1792$class_1793;)Lnet/minecraft/class_1792; - ARG 0 settings - METHOD method_64285 (Lnet/minecraft/class_1792$class_1793;)Lnet/minecraft/class_1792; - ARG 0 settings - METHOD method_64286 (Lnet/minecraft/class_1792$class_1793;)Lnet/minecraft/class_1792; - ARG 0 settings - METHOD method_64287 (Lnet/minecraft/class_1792$class_1793;)Lnet/minecraft/class_1792; - ARG 0 settings - METHOD method_64288 (Lnet/minecraft/class_1792$class_1793;)Lnet/minecraft/class_1792; - ARG 0 settings - METHOD method_64289 (Lnet/minecraft/class_1792$class_1793;)Lnet/minecraft/class_1792; - ARG 0 settings - METHOD method_64290 (Lnet/minecraft/class_1792$class_1793;)Lnet/minecraft/class_1792; - ARG 0 settings - METHOD method_64291 (Lnet/minecraft/class_1792$class_1793;)Lnet/minecraft/class_1792; - ARG 0 settings - METHOD method_64292 (Lnet/minecraft/class_1792$class_1793;)Lnet/minecraft/class_1792; - ARG 0 settings - METHOD method_64293 (Lnet/minecraft/class_1792$class_1793;)Lnet/minecraft/class_1792; - ARG 0 settings - METHOD method_64294 (Lnet/minecraft/class_1792$class_1793;)Lnet/minecraft/class_1792; - ARG 0 settings - METHOD method_64295 (Lnet/minecraft/class_1792$class_1793;)Lnet/minecraft/class_1792; - ARG 0 settings METHOD method_64296 (Lnet/minecraft/class_1792$class_1793;)Lnet/minecraft/class_1792; ARG 0 settings METHOD method_64658 (Lnet/minecraft/class_2248;Lnet/minecraft/class_1792$class_1793;)Lnet/minecraft/class_1792; diff --git a/mappings/net/minecraft/item/SpawnEggItem.mapping b/mappings/net/minecraft/item/SpawnEggItem.mapping index 84f044f05b..7845c7bc91 100644 --- a/mappings/net/minecraft/item/SpawnEggItem.mapping +++ b/mappings/net/minecraft/item/SpawnEggItem.mapping @@ -1,14 +1,9 @@ CLASS net/minecraft/class_1826 net/minecraft/item/SpawnEggItem FIELD field_49273 ENTITY_TYPE_MAP_CODEC Lcom/mojang/serialization/MapCodec; FIELD field_8914 SPAWN_EGGS Ljava/util/Map; - FIELD field_8915 secondaryColor I - FIELD field_8916 primaryColor I FIELD field_8917 type Lnet/minecraft/class_1299; - METHOD (Lnet/minecraft/class_1299;IILnet/minecraft/class_1792$class_1793;)V + METHOD (Lnet/minecraft/class_1299;Lnet/minecraft/class_1792$class_1793;)V ARG 1 type - ARG 2 primaryColor - ARG 3 secondaryColor - ARG 4 settings METHOD method_24793 spawnBaby (Lnet/minecraft/class_1657;Lnet/minecraft/class_1308;Lnet/minecraft/class_1299;Lnet/minecraft/class_3218;Lnet/minecraft/class_243;Lnet/minecraft/class_1799;)Ljava/util/Optional; ARG 1 user ARG 2 entity @@ -18,12 +13,6 @@ CLASS net/minecraft/class_1826 net/minecraft/item/SpawnEggItem ARG 6 stack METHOD method_8015 getEntityType (Lnet/minecraft/class_1799;)Lnet/minecraft/class_1299; ARG 1 stack - METHOD method_8016 getColor (I)I - COMMENT {@return the color of the specified tint index} - COMMENT - COMMENT @implSpec If the tint index is 0, returns {@link #primaryColor}. Otherwise, returns {@link #secondaryColor}. - ARG 1 tintIndex - COMMENT the tint index METHOD method_8017 getAll ()Ljava/lang/Iterable; METHOD method_8018 isOfSameEntityType (Lnet/minecraft/class_1799;Lnet/minecraft/class_1299;)Z ARG 1 stack diff --git a/mappings/net/minecraft/item/equipment/EquipmentModels.mapping b/mappings/net/minecraft/item/equipment/EquipmentModels.mapping index 9e0018864a..43b1ba39dc 100644 --- a/mappings/net/minecraft/item/equipment/EquipmentModels.mapping +++ b/mappings/net/minecraft/item/equipment/EquipmentModels.mapping @@ -1,20 +1,14 @@ CLASS net/minecraft/class_10191 net/minecraft/item/equipment/EquipmentModels - FIELD field_54134 LEATHER Lnet/minecraft/class_2960; - FIELD field_54135 CHAINMAIL Lnet/minecraft/class_2960; - FIELD field_54136 IRON Lnet/minecraft/class_2960; - FIELD field_54137 GOLD Lnet/minecraft/class_2960; - FIELD field_54138 DIAMOND Lnet/minecraft/class_2960; - FIELD field_54139 TURTLE_SCUTE Lnet/minecraft/class_2960; - FIELD field_54140 NETHERITE Lnet/minecraft/class_2960; - FIELD field_54141 ARMADILLO_SCUTE Lnet/minecraft/class_2960; - FIELD field_54142 ELYTRA Lnet/minecraft/class_2960; + FIELD field_54134 LEATHER Lnet/minecraft/class_5321; + FIELD field_54135 CHAINMAIL Lnet/minecraft/class_5321; + FIELD field_54136 IRON Lnet/minecraft/class_5321; + FIELD field_54137 GOLD Lnet/minecraft/class_5321; + FIELD field_54138 DIAMOND Lnet/minecraft/class_5321; + FIELD field_54139 TURTLE_SCUTE Lnet/minecraft/class_5321; + FIELD field_54140 NETHERITE Lnet/minecraft/class_5321; + FIELD field_54141 ARMADILLO_SCUTE Lnet/minecraft/class_5321; + FIELD field_54142 ELYTRA Lnet/minecraft/class_5321; FIELD field_54143 CARPET_FROM_COLOR Ljava/util/Map; - FIELD field_54144 TRADER_LLAMA Lnet/minecraft/class_2960; - METHOD method_64011 (Lnet/minecraft/class_1767;)Lnet/minecraft/class_2960; + FIELD field_54144 TRADER_LLAMA Lnet/minecraft/class_5321; + METHOD method_64011 (Lnet/minecraft/class_1767;)Lnet/minecraft/class_5321; ARG 0 color - METHOD method_64012 buildHumanoid (Ljava/lang/String;)Lnet/minecraft/class_10186; - ARG 0 path - METHOD method_64013 accept (Ljava/util/function/BiConsumer;)V - ARG 0 equipmentModelBiConsumer - METHOD method_64014 buildHumanoidAndHorse (Ljava/lang/String;)Lnet/minecraft/class_10186; - ARG 0 path diff --git a/mappings/net/minecraft/item/equipment/trim/ArmorTrim.mapping b/mappings/net/minecraft/item/equipment/trim/ArmorTrim.mapping index 63b90953be..c85e92a954 100644 --- a/mappings/net/minecraft/item/equipment/trim/ArmorTrim.mapping +++ b/mappings/net/minecraft/item/equipment/trim/ArmorTrim.mapping @@ -18,9 +18,6 @@ CLASS net/minecraft/class_8053 net/minecraft/item/equipment/trim/ArmorTrim METHOD method_48427 equals (Lnet/minecraft/class_6880;Lnet/minecraft/class_6880;)Z ARG 1 pattern ARG 2 material - METHOD method_48577 getMaterialAssetNameFor (Lnet/minecraft/class_6880;Lnet/minecraft/class_2960;)Ljava/lang/String; - ARG 0 material - ARG 1 modelId METHOD method_57406 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; ARG 0 instance METHOD method_57407 (Lnet/minecraft/class_8053;)Ljava/lang/Boolean; @@ -29,8 +26,3 @@ CLASS net/minecraft/class_8053 net/minecraft/item/equipment/trim/ArmorTrim ARG 0 trim METHOD method_58421 withShowInTooltip (Z)Lnet/minecraft/class_8053; ARG 1 showInTooltip - METHOD method_64019 getTexture (Lnet/minecraft/class_10186$class_10190;Lnet/minecraft/class_2960;)Lnet/minecraft/class_2960; - ARG 1 layerType - ARG 2 modelId - METHOD method_64020 (Lnet/minecraft/class_10186$class_10190;Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String; - ARG 2 patternName diff --git a/mappings/net/minecraft/item/equipment/trim/ArmorTrimMaterial.mapping b/mappings/net/minecraft/item/equipment/trim/ArmorTrimMaterial.mapping index 717edb8613..cd6868e80a 100644 --- a/mappings/net/minecraft/item/equipment/trim/ArmorTrimMaterial.mapping +++ b/mappings/net/minecraft/item/equipment/trim/ArmorTrimMaterial.mapping @@ -5,9 +5,6 @@ CLASS net/minecraft/class_8054 net/minecraft/item/equipment/trim/ArmorTrimMateri FIELD field_49281 ENTRY_PACKET_CODEC Lnet/minecraft/class_9139; METHOD method_48437 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; ARG 0 instance - METHOD method_48438 of (Ljava/lang/String;Lnet/minecraft/class_1792;FLnet/minecraft/class_2561;Ljava/util/Map;)Lnet/minecraft/class_8054; + METHOD method_48438 of (Ljava/lang/String;Lnet/minecraft/class_1792;Lnet/minecraft/class_2561;Ljava/util/Map;)Lnet/minecraft/class_8054; ARG 0 assetName ARG 1 ingredient - ARG 2 itemModelIndex - ARG 3 description - ARG 4 overrideArmorMaterials diff --git a/mappings/net/minecraft/item/equipment/trim/ArmorTrimMaterials.mapping b/mappings/net/minecraft/item/equipment/trim/ArmorTrimMaterials.mapping index 41ecb1bad5..8d9edc13c6 100644 --- a/mappings/net/minecraft/item/equipment/trim/ArmorTrimMaterials.mapping +++ b/mappings/net/minecraft/item/equipment/trim/ArmorTrimMaterials.mapping @@ -8,16 +8,13 @@ CLASS net/minecraft/class_8055 net/minecraft/item/equipment/trim/ArmorTrimMateri ARG 0 id METHOD method_48442 bootstrap (Lnet/minecraft/class_7891;)V ARG 0 registry - METHOD method_48443 register (Lnet/minecraft/class_7891;Lnet/minecraft/class_5321;Lnet/minecraft/class_1792;Lnet/minecraft/class_2583;FLjava/util/Map;)V + METHOD method_48443 register (Lnet/minecraft/class_7891;Lnet/minecraft/class_5321;Lnet/minecraft/class_1792;Lnet/minecraft/class_2583;Ljava/util/Map;)V ARG 0 registry ARG 1 key ARG 2 ingredient ARG 3 style - ARG 4 itemModelIndex - ARG 5 overrideArmorMaterials - METHOD method_48578 register (Lnet/minecraft/class_7891;Lnet/minecraft/class_5321;Lnet/minecraft/class_1792;Lnet/minecraft/class_2583;F)V + METHOD method_48578 register (Lnet/minecraft/class_7891;Lnet/minecraft/class_5321;Lnet/minecraft/class_1792;Lnet/minecraft/class_2583;)V ARG 0 registry ARG 1 key ARG 2 ingredient ARG 3 style - ARG 4 itemModelIndex diff --git a/mappings/net/minecraft/loot/function/SetAttributesLootFunction.mapping b/mappings/net/minecraft/loot/function/SetAttributesLootFunction.mapping index fc4b03ce0b..a7dc829ec5 100644 --- a/mappings/net/minecraft/loot/function/SetAttributesLootFunction.mapping +++ b/mappings/net/minecraft/loot/function/SetAttributesLootFunction.mapping @@ -41,8 +41,6 @@ CLASS net/minecraft/class_137 net/minecraft/loot/function/SetAttributesLootFunct METHOD comp_1864 id ()Lnet/minecraft/class_2960; METHOD method_53358 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; ARG 0 instance - METHOD method_53359 (Ljava/util/List;)Lcom/mojang/datafixers/util/Either; - ARG 0 slots CLASS class_6155 Builder FIELD field_31855 attributes Ljava/util/List; FIELD field_51361 replace Z diff --git a/mappings/net/minecraft/loot/function/SetCustomModelDataLootFunction.mapping b/mappings/net/minecraft/loot/function/SetCustomModelDataLootFunction.mapping index b0c865aafe..db2ead2f35 100644 --- a/mappings/net/minecraft/loot/function/SetCustomModelDataLootFunction.mapping +++ b/mappings/net/minecraft/loot/function/SetCustomModelDataLootFunction.mapping @@ -1,10 +1,8 @@ CLASS net/minecraft/class_9670 net/minecraft/loot/function/SetCustomModelDataLootFunction FIELD field_51434 CODEC Lcom/mojang/serialization/MapCodec; - FIELD field_51435 value Lnet/minecraft/class_5658; - METHOD (Ljava/util/List;Lnet/minecraft/class_5658;)V + METHOD (Ljava/util/List;Ljava/util/Optional;Ljava/util/Optional;Ljava/util/Optional;Ljava/util/Optional;)V ARG 1 conditions - ARG 2 value - METHOD method_59747 (Lnet/minecraft/class_9670;)Lnet/minecraft/class_5658; + METHOD method_59747 (Lnet/minecraft/class_9670;)Ljava/util/Optional; ARG 0 lootFunction METHOD method_59748 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; ARG 0 instance diff --git a/mappings/net/minecraft/network/packet/c2s/play/VehicleMoveC2SPacket.mapping b/mappings/net/minecraft/network/packet/c2s/play/VehicleMoveC2SPacket.mapping index 34b856dd2e..1089796352 100644 --- a/mappings/net/minecraft/network/packet/c2s/play/VehicleMoveC2SPacket.mapping +++ b/mappings/net/minecraft/network/packet/c2s/play/VehicleMoveC2SPacket.mapping @@ -1,18 +1,6 @@ CLASS net/minecraft/class_2833 net/minecraft/network/packet/c2s/play/VehicleMoveC2SPacket - FIELD field_12895 z D - FIELD field_12896 pitch F - FIELD field_12897 y D - FIELD field_12898 yaw F - FIELD field_12899 x D + FIELD comp_3351 yaw F + FIELD comp_3352 pitch F FIELD field_48202 CODEC Lnet/minecraft/class_9139; - METHOD (Lnet/minecraft/class_1297;)V - ARG 1 entity - METHOD (Lnet/minecraft/class_2540;)V - ARG 1 buf - METHOD method_12276 getZ ()D - METHOD method_12277 getPitch ()F - METHOD method_12279 getX ()D - METHOD method_12280 getY ()D - METHOD method_12281 getYaw ()F - METHOD method_55983 write (Lnet/minecraft/class_2540;)V - ARG 1 buf + METHOD comp_3351 yaw ()F + METHOD comp_3352 pitch ()F diff --git a/mappings/net/minecraft/network/packet/s2c/play/VehicleMoveS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/VehicleMoveS2CPacket.mapping index ba391123be..aac64409f4 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/VehicleMoveS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/VehicleMoveS2CPacket.mapping @@ -1,18 +1,6 @@ CLASS net/minecraft/class_2692 net/minecraft/network/packet/s2c/play/VehicleMoveS2CPacket - FIELD field_12320 z D - FIELD field_12321 pitch F - FIELD field_12322 y D - FIELD field_12323 yaw F - FIELD field_12324 x D + FIELD comp_3348 yaw F + FIELD comp_3349 pitch F FIELD field_47943 CODEC Lnet/minecraft/class_9139; - METHOD (Lnet/minecraft/class_1297;)V - ARG 1 entity - METHOD (Lnet/minecraft/class_2540;)V - ARG 1 buf - METHOD method_11670 getZ ()D - METHOD method_11671 getPitch ()F - METHOD method_11673 getX ()D - METHOD method_11674 getY ()D - METHOD method_11675 getYaw ()F - METHOD method_55893 write (Lnet/minecraft/class_2540;)V - ARG 1 buf + METHOD comp_3348 yaw ()F + METHOD comp_3349 pitch ()F diff --git a/mappings/net/minecraft/registry/entry/RegistryEntryListCodec.mapping b/mappings/net/minecraft/registry/entry/RegistryEntryListCodec.mapping index 1371bc762a..de2f99618a 100644 --- a/mappings/net/minecraft/registry/entry/RegistryEntryListCodec.mapping +++ b/mappings/net/minecraft/registry/entry/RegistryEntryListCodec.mapping @@ -16,8 +16,6 @@ CLASS net/minecraft/class_6898 net/minecraft/registry/entry/RegistryEntryListCod ARG 1 entryList ARG 2 ops ARG 3 prefix - METHOD method_40380 (Lcom/mojang/datafixers/util/Either;)Ljava/util/List; - ARG 0 either METHOD method_40381 (Lcom/mojang/datafixers/util/Pair;)Lcom/mojang/serialization/DataResult; ARG 0 pair METHOD method_40382 createDirectEntryListCodec (Lcom/mojang/serialization/Codec;Z)Lcom/mojang/serialization/Codec; @@ -32,8 +30,6 @@ CLASS net/minecraft/class_6898 net/minecraft/registry/entry/RegistryEntryListCod ARG 1 tag METHOD method_40386 (Lnet/minecraft/class_7871;Lcom/mojang/datafixers/util/Pair;)Lcom/mojang/serialization/DataResult; ARG 1 pair - METHOD method_40387 (Ljava/util/List;)Lcom/mojang/datafixers/util/Either; - ARG 0 entries METHOD method_40388 create (Lnet/minecraft/class_5321;Lcom/mojang/serialization/Codec;Z)Lcom/mojang/serialization/Codec; ARG 0 registryRef ARG 1 entryCodec @@ -44,8 +40,6 @@ CLASS net/minecraft/class_6898 net/minecraft/registry/entry/RegistryEntryListCod ARG 1 entryList ARG 2 ops ARG 3 prefix - METHOD method_40390 (Ljava/util/List;)Ljava/util/List; - ARG 0 entries METHOD method_58028 (Lcom/mojang/datafixers/util/Pair;Lnet/minecraft/class_6885;)Lcom/mojang/datafixers/util/Pair; ARG 1 entries METHOD method_58029 get (Lnet/minecraft/class_7871;Lnet/minecraft/class_6862;)Lcom/mojang/serialization/DataResult; diff --git a/mappings/net/minecraft/resource/JsonDataLoader.mapping b/mappings/net/minecraft/resource/JsonDataLoader.mapping index 42072bf581..14f4096db7 100644 --- a/mappings/net/minecraft/resource/JsonDataLoader.mapping +++ b/mappings/net/minecraft/resource/JsonDataLoader.mapping @@ -2,23 +2,13 @@ CLASS net/minecraft/class_4309 net/minecraft/resource/JsonDataLoader COMMENT An abstract implementation of resource reloader that reads JSON files COMMENT into values in the prepare stage. FIELD field_19377 LOGGER Lorg/slf4j/Logger; - FIELD field_19380 dataType Ljava/lang/String; FIELD field_54055 ops Lcom/mojang/serialization/DynamicOps; FIELD field_54056 codec Lcom/mojang/serialization/Codec; - METHOD (Lcom/mojang/serialization/Codec;Ljava/lang/String;)V - ARG 1 codec - ARG 2 dataType - METHOD (Lcom/mojang/serialization/DynamicOps;Lcom/mojang/serialization/Codec;Ljava/lang/String;)V + METHOD (Lcom/mojang/serialization/DynamicOps;Lcom/mojang/serialization/Codec;Lnet/minecraft/class_7654;)V ARG 1 ops ARG 2 codec - ARG 3 dataType - METHOD (Lnet/minecraft/class_7225$class_7874;Lcom/mojang/serialization/Codec;Ljava/lang/String;)V - ARG 1 registries - ARG 2 codec - ARG 3 dataType - METHOD method_51148 load (Lnet/minecraft/class_3300;Ljava/lang/String;Lcom/mojang/serialization/DynamicOps;Lcom/mojang/serialization/Codec;Ljava/util/Map;)V + METHOD method_51148 load (Lnet/minecraft/class_3300;Lnet/minecraft/class_7654;Lcom/mojang/serialization/DynamicOps;Lcom/mojang/serialization/Codec;Ljava/util/Map;)V ARG 0 manager - ARG 1 dataType ARG 2 ops ARG 3 codec ARG 4 result diff --git a/mappings/net/minecraft/screen/BeaconScreenHandler.mapping b/mappings/net/minecraft/screen/BeaconScreenHandler.mapping index d1f06e3651..29c77cae86 100644 --- a/mappings/net/minecraft/screen/BeaconScreenHandler.mapping +++ b/mappings/net/minecraft/screen/BeaconScreenHandler.mapping @@ -30,9 +30,3 @@ CLASS net/minecraft/class_1704 net/minecraft/screen/BeaconScreenHandler METHOD method_53174 getStatusEffectForRawId (I)Lnet/minecraft/class_6880; ARG 0 id CLASS class_1705 PaymentSlot - METHOD (Lnet/minecraft/class_1704;Lnet/minecraft/class_1263;III)V - ARG 1 screenHandler - ARG 2 inventory - ARG 3 index - ARG 4 x - ARG 5 y diff --git a/mappings/net/minecraft/server/network/ServerPlayerEntity.mapping b/mappings/net/minecraft/server/network/ServerPlayerEntity.mapping index 97d8e1b8e3..f2108f94e3 100644 --- a/mappings/net/minecraft/server/network/ServerPlayerEntity.mapping +++ b/mappings/net/minecraft/server/network/ServerPlayerEntity.mapping @@ -35,7 +35,6 @@ CLASS net/minecraft/class_3222 net/minecraft/server/network/ServerPlayerEntity FIELD field_13995 server Lnet/minecraft/server/MinecraftServer; FIELD field_13996 recipeBook Lnet/minecraft/class_3441; FIELD field_13997 syncedHealth F - FIELD field_13998 joinInvulnerabilityTicks I FIELD field_23191 spawnPointDimension Lnet/minecraft/class_5321; FIELD field_23192 spawnPointPosition Lnet/minecraft/class_2338; FIELD field_23193 spawnForced Z diff --git a/mappings/net/minecraft/server/world/ThrottledChunkTaskScheduler.mapping b/mappings/net/minecraft/server/world/ThrottledChunkTaskScheduler.mapping index 45324a0810..f302e9bab3 100644 --- a/mappings/net/minecraft/server/world/ThrottledChunkTaskScheduler.mapping +++ b/mappings/net/minecraft/server/world/ThrottledChunkTaskScheduler.mapping @@ -6,6 +6,4 @@ CLASS net/minecraft/class_10173 net/minecraft/server/world/ThrottledChunkTaskSch ARG 1 executor ARG 2 dispatchExecutor ARG 3 maxConcurrentChunks - METHOD method_63564 (Ljava/lang/Long;)Ljava/lang/String; - ARG 0 chunkPos METHOD method_63565 toDumpString ()Ljava/lang/String; diff --git a/mappings/net/minecraft/unused/packageinfo/PackageInfo10409.mapping b/mappings/net/minecraft/unused/packageinfo/PackageInfo10409.mapping new file mode 100644 index 0000000000..8fa25f1ada --- /dev/null +++ b/mappings/net/minecraft/unused/packageinfo/PackageInfo10409.mapping @@ -0,0 +1 @@ +CLASS net/minecraft/class_10409 net/minecraft/unused/packageinfo/PackageInfo10409 diff --git a/mappings/net/minecraft/unused/packageinfo/PackageInfo10412.mapping b/mappings/net/minecraft/unused/packageinfo/PackageInfo10412.mapping new file mode 100644 index 0000000000..a89e17bc41 --- /dev/null +++ b/mappings/net/minecraft/unused/packageinfo/PackageInfo10412.mapping @@ -0,0 +1 @@ +CLASS net/minecraft/class_10412 net/minecraft/unused/packageinfo/PackageInfo10412 diff --git a/mappings/net/minecraft/unused/packageinfo/PackageInfo10413.mapping b/mappings/net/minecraft/unused/packageinfo/PackageInfo10413.mapping new file mode 100644 index 0000000000..45c7094e31 --- /dev/null +++ b/mappings/net/minecraft/unused/packageinfo/PackageInfo10413.mapping @@ -0,0 +1 @@ +CLASS net/minecraft/class_10413 net/minecraft/unused/packageinfo/PackageInfo10413 diff --git a/mappings/net/minecraft/unused/packageinfo/PackageInfo10414.mapping b/mappings/net/minecraft/unused/packageinfo/PackageInfo10414.mapping new file mode 100644 index 0000000000..3fb38305f3 --- /dev/null +++ b/mappings/net/minecraft/unused/packageinfo/PackageInfo10414.mapping @@ -0,0 +1 @@ +CLASS net/minecraft/class_10414 net/minecraft/unused/packageinfo/PackageInfo10414 diff --git a/mappings/net/minecraft/unused/packageinfo/PackageInfo10470.mapping b/mappings/net/minecraft/unused/packageinfo/PackageInfo10470.mapping new file mode 100644 index 0000000000..b0f8dc796a --- /dev/null +++ b/mappings/net/minecraft/unused/packageinfo/PackageInfo10470.mapping @@ -0,0 +1 @@ +CLASS net/minecraft/class_10470 net/minecraft/unused/packageinfo/PackageInfo10470 diff --git a/mappings/net/minecraft/unused/packageinfo/PackageInfo10486.mapping b/mappings/net/minecraft/unused/packageinfo/PackageInfo10486.mapping new file mode 100644 index 0000000000..0be1ecd757 --- /dev/null +++ b/mappings/net/minecraft/unused/packageinfo/PackageInfo10486.mapping @@ -0,0 +1 @@ +CLASS net/minecraft/class_10486 net/minecraft/unused/packageinfo/PackageInfo10486 diff --git a/mappings/net/minecraft/unused/packageinfo/PackageInfo10487.mapping b/mappings/net/minecraft/unused/packageinfo/PackageInfo10487.mapping new file mode 100644 index 0000000000..b9f280ad09 --- /dev/null +++ b/mappings/net/minecraft/unused/packageinfo/PackageInfo10487.mapping @@ -0,0 +1 @@ +CLASS net/minecraft/class_10487 net/minecraft/unused/packageinfo/PackageInfo10487 diff --git a/mappings/net/minecraft/unused/packageinfo/PackageInfo10497.mapping b/mappings/net/minecraft/unused/packageinfo/PackageInfo10497.mapping new file mode 100644 index 0000000000..5e1fa0d265 --- /dev/null +++ b/mappings/net/minecraft/unused/packageinfo/PackageInfo10497.mapping @@ -0,0 +1 @@ +CLASS net/minecraft/class_10497 net/minecraft/unused/packageinfo/PackageInfo10497 diff --git a/mappings/net/minecraft/unused/packageinfo/PackageInfo10520.mapping b/mappings/net/minecraft/unused/packageinfo/PackageInfo10520.mapping new file mode 100644 index 0000000000..1481c2f6ee --- /dev/null +++ b/mappings/net/minecraft/unused/packageinfo/PackageInfo10520.mapping @@ -0,0 +1 @@ +CLASS net/minecraft/class_10520 net/minecraft/unused/packageinfo/PackageInfo10520 diff --git a/mappings/net/minecraft/unused/packageinfo/PackageInfo6292.mapping b/mappings/net/minecraft/unused/packageinfo/PackageInfo6292.mapping deleted file mode 100644 index 3357f88819..0000000000 --- a/mappings/net/minecraft/unused/packageinfo/PackageInfo6292.mapping +++ /dev/null @@ -1 +0,0 @@ -CLASS net/minecraft/class_6292 net/minecraft/unused/packageinfo/PackageInfo6292 diff --git a/mappings/net/minecraft/unused/packageinfo/PackageInfo6293.mapping b/mappings/net/minecraft/unused/packageinfo/PackageInfo6293.mapping deleted file mode 100644 index ca2c3fc704..0000000000 --- a/mappings/net/minecraft/unused/packageinfo/PackageInfo6293.mapping +++ /dev/null @@ -1 +0,0 @@ -CLASS net/minecraft/class_6293 net/minecraft/unused/packageinfo/PackageInfo6293 diff --git a/mappings/net/minecraft/unused/packageinfo/PackageInfo6294.mapping b/mappings/net/minecraft/unused/packageinfo/PackageInfo6294.mapping deleted file mode 100644 index db359ea91f..0000000000 --- a/mappings/net/minecraft/unused/packageinfo/PackageInfo6294.mapping +++ /dev/null @@ -1 +0,0 @@ -CLASS net/minecraft/class_6294 net/minecraft/unused/packageinfo/PackageInfo6294 diff --git a/mappings/net/minecraft/world/biome/FoliageColors.mapping b/mappings/net/minecraft/world/biome/FoliageColors.mapping index d31ad472cb..abb58265fa 100644 --- a/mappings/net/minecraft/world/biome/FoliageColors.mapping +++ b/mappings/net/minecraft/world/biome/FoliageColors.mapping @@ -1,11 +1,7 @@ CLASS net/minecraft/class_1926 net/minecraft/world/biome/FoliageColors FIELD field_9183 colorMap [I - METHOD method_43717 getMangroveColor ()I METHOD method_8340 setColorMap ([I)V ARG 0 pixels - METHOD method_8341 getDefaultColor ()I - METHOD method_8342 getSpruceColor ()I - METHOD method_8343 getBirchColor ()I METHOD method_8344 getColor (DD)I ARG 0 temperature ARG 2 humidity diff --git a/mappings/net/minecraft/world/chunk/WorldChunk.mapping b/mappings/net/minecraft/world/chunk/WorldChunk.mapping index 41ec22ec80..a8fe96db53 100644 --- a/mappings/net/minecraft/world/chunk/WorldChunk.mapping +++ b/mappings/net/minecraft/world/chunk/WorldChunk.mapping @@ -115,8 +115,6 @@ CLASS net/minecraft/class_2818 net/minecraft/world/chunk/WorldChunk ARG 3 ticker CLASS class_5564 WrappedBlockEntityTickInvoker FIELD field_27228 wrapped Lnet/minecraft/class_5562; - METHOD (Lnet/minecraft/class_2818;Lnet/minecraft/class_5562;)V - ARG 2 wrapped METHOD method_31727 setWrapped (Lnet/minecraft/class_5562;)V ARG 1 wrapped CLASS class_6829 EntityLoader