diff --git a/build.gradle b/build.gradle index efc79bfe72..08a6e739fa 100644 --- a/build.gradle +++ b/build.gradle @@ -19,7 +19,7 @@ plugins { id 'net.fabricmc.filament' } -def minecraft_version = "25w03a" +def minecraft_version = "25w04a" filament { minecraftVersion = minecraft_version diff --git a/mappings/net/minecraft/block/AbstractBlock.mapping b/mappings/net/minecraft/block/AbstractBlock.mapping index 4e15752b12..340fae21b2 100644 --- a/mappings/net/minecraft/block/AbstractBlock.mapping +++ b/mappings/net/minecraft/block/AbstractBlock.mapping @@ -384,9 +384,8 @@ CLASS net/minecraft/class_4970 net/minecraft/block/AbstractBlock ARG 4 player ARG 5 hit METHOD method_63499 getTranslationKey ()Ljava/lang/String; - METHOD method_64022 getInsideCollisionShape (Lnet/minecraft/class_2680;Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;)Lnet/minecraft/class_265; + METHOD method_64022 getInsideCollisionShape (Lnet/minecraft/class_2680;Lnet/minecraft/class_1922;Lnet/minecraft/class_2338;Lnet/minecraft/class_1297;)Lnet/minecraft/class_265; ARG 1 state - ARG 2 world ARG 3 pos METHOD method_66388 onStateReplaced (Lnet/minecraft/class_2680;Lnet/minecraft/class_3218;Lnet/minecraft/class_2338;Z)V ARG 1 state @@ -1322,8 +1321,7 @@ CLASS net/minecraft/class_4970 net/minecraft/block/AbstractBlock ARG 0 direction METHOD method_61766 ([Lnet/minecraft/class_265;)V ARG 0 direction - METHOD method_64025 getInsideCollisionShape (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;)Lnet/minecraft/class_265; - ARG 1 world + METHOD method_64025 getInsideCollisionShape (Lnet/minecraft/class_1922;Lnet/minecraft/class_2338;Lnet/minecraft/class_1297;)Lnet/minecraft/class_265; ARG 2 pos METHOD method_65171 getPickStack (Lnet/minecraft/class_4538;Lnet/minecraft/class_2338;Z)Lnet/minecraft/class_1799; ARG 1 world diff --git a/mappings/net/minecraft/block/Block.mapping b/mappings/net/minecraft/block/Block.mapping index 9fdd105adf..c4c0897e4f 100644 --- a/mappings/net/minecraft/block/Block.mapping +++ b/mappings/net/minecraft/block/Block.mapping @@ -314,15 +314,6 @@ CLASS net/minecraft/class_2248 net/minecraft/block/Block ARG 3 state ARG 4 placer ARG 5 itemStack - METHOD method_9568 appendTooltip (Lnet/minecraft/class_1799;Lnet/minecraft/class_1792$class_9635;Ljava/util/List;Lnet/minecraft/class_1836;)V - COMMENT Appends tooltips to a stack of this block's corresponding {@linkplain - COMMENT net.minecraft.item.BlockItem block item}. Used by shulker boxes. - COMMENT - COMMENT @see Item#appendTooltip - ARG 1 stack - ARG 2 context - ARG 3 tooltip - ARG 4 options METHOD method_9576 onBreak (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;Lnet/minecraft/class_1657;)Lnet/minecraft/class_2680; COMMENT Called when a player breaks a block before the block is removed from the world. COMMENT Explosions do not trigger this. diff --git a/mappings/net/minecraft/block/DecoratedPotBlock.mapping b/mappings/net/minecraft/block/DecoratedPotBlock.mapping index dc21bf285f..5b96647f3c 100644 --- a/mappings/net/minecraft/block/DecoratedPotBlock.mapping +++ b/mappings/net/minecraft/block/DecoratedPotBlock.mapping @@ -7,5 +7,3 @@ CLASS net/minecraft/class_8168 net/minecraft/block/DecoratedPotBlock FIELD field_46333 CODEC Lcom/mojang/serialization/MapCodec; METHOD method_49815 (Lnet/minecraft/class_8172;Ljava/util/function/Consumer;)V ARG 1 lootConsumer - METHOD method_51510 (Ljava/util/List;Ljava/util/Optional;)V - ARG 1 sherd diff --git a/mappings/net/minecraft/block/LeavesBlock.mapping b/mappings/net/minecraft/block/LeavesBlock.mapping index a0bd09a4a6..5e53bea6db 100644 --- a/mappings/net/minecraft/block/LeavesBlock.mapping +++ b/mappings/net/minecraft/block/LeavesBlock.mapping @@ -3,13 +3,7 @@ CLASS net/minecraft/class_2397 net/minecraft/block/LeavesBlock FIELD field_11200 PERSISTENT Lnet/minecraft/class_2746; FIELD field_31111 MAX_DISTANCE I FIELD field_38227 WATERLOGGED Lnet/minecraft/class_2746; - FIELD field_46385 CODEC Lcom/mojang/serialization/MapCodec; - FIELD field_55772 leafParticle Lnet/minecraft/class_2394; - FIELD field_55773 leafParticleChance I - METHOD (ILnet/minecraft/class_2394;Lnet/minecraft/class_4970$class_2251;)V - ARG 1 leafParticleChance - ARG 2 leafParticle - ARG 3 settings + FIELD field_55773 leafParticleChance F METHOD method_10300 updateDistanceFromLogs (Lnet/minecraft/class_2680;Lnet/minecraft/class_1936;Lnet/minecraft/class_2338;)Lnet/minecraft/class_2680; ARG 0 state ARG 1 world @@ -20,21 +14,12 @@ CLASS net/minecraft/class_2397 net/minecraft/block/LeavesBlock ARG 1 state METHOD method_49817 getOptionalDistanceFromLog (Lnet/minecraft/class_2680;)Ljava/util/OptionalInt; ARG 0 state - METHOD method_66441 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; - ARG 0 instance METHOD method_66442 spawnWaterParticle (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_5819;Lnet/minecraft/class_2680;Lnet/minecraft/class_2338;)V ARG 0 world ARG 1 pos ARG 2 random ARG 3 state ARG 4 posBelow - METHOD method_66443 (Lnet/minecraft/class_2397;)Lnet/minecraft/class_2394; - ARG 0 block METHOD method_66444 spawnLeafParticle (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_5819;Lnet/minecraft/class_2680;Lnet/minecraft/class_2338;)V - ARG 1 world - ARG 2 pos - ARG 3 random ARG 4 state ARG 5 posBelow - METHOD method_66445 (Lnet/minecraft/class_2397;)Ljava/lang/Integer; - ARG 0 block diff --git a/mappings/net/minecraft/block/MangroveLeavesBlock.mapping b/mappings/net/minecraft/block/MangroveLeavesBlock.mapping index a0cd6e1563..b1819027a1 100644 --- a/mappings/net/minecraft/block/MangroveLeavesBlock.mapping +++ b/mappings/net/minecraft/block/MangroveLeavesBlock.mapping @@ -1,8 +1,2 @@ CLASS net/minecraft/class_7114 net/minecraft/block/MangroveLeavesBlock FIELD field_46394 CODEC Lcom/mojang/serialization/MapCodec; - METHOD method_66448 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; - ARG 0 instance - METHOD method_66449 (Lnet/minecraft/class_7114;)Lnet/minecraft/class_2394; - ARG 0 block - METHOD method_66450 (Lnet/minecraft/class_7114;)Ljava/lang/Integer; - ARG 0 block diff --git a/mappings/net/minecraft/block/ShulkerBoxBlock.mapping b/mappings/net/minecraft/block/ShulkerBoxBlock.mapping index 00c391e9ae..09668741fe 100644 --- a/mappings/net/minecraft/block/ShulkerBoxBlock.mapping +++ b/mappings/net/minecraft/block/ShulkerBoxBlock.mapping @@ -3,7 +3,6 @@ CLASS net/minecraft/class_2480 net/minecraft/block/ShulkerBoxBlock FIELD field_11495 CONTENTS_DYNAMIC_DROP_ID Lnet/minecraft/class_2960; FIELD field_11496 FACING Lnet/minecraft/class_2754; FIELD field_46440 CODEC Lcom/mojang/serialization/MapCodec; - FIELD field_49401 UNKNOWN_CONTENTS_TEXT Lnet/minecraft/class_2561; FIELD field_55792 SHAPES_BY_DIRECTION Ljava/util/Map; METHOD (Lnet/minecraft/class_1767;Lnet/minecraft/class_4970$class_2251;)V ARG 1 color diff --git a/mappings/net/minecraft/block/entity/CampfireBlockEntity.mapping b/mappings/net/minecraft/block/entity/CampfireBlockEntity.mapping index e49d8c4d46..314b3339e0 100644 --- a/mappings/net/minecraft/block/entity/CampfireBlockEntity.mapping +++ b/mappings/net/minecraft/block/entity/CampfireBlockEntity.mapping @@ -12,7 +12,6 @@ CLASS net/minecraft/class_3924 net/minecraft/block/entity/CampfireBlockEntity METHOD method_17504 (Lnet/minecraft/class_9696;Lnet/minecraft/class_3218;Lnet/minecraft/class_8786;)Lnet/minecraft/class_1799; ARG 2 recipe METHOD method_17505 getItemsBeingCooked ()Lnet/minecraft/class_2371; - METHOD method_17506 spawnItemsBeingCooked ()V METHOD method_17510 updateListeners ()V METHOD method_31666 litServerTick (Lnet/minecraft/class_3218;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;Lnet/minecraft/class_3924;Lnet/minecraft/class_1863$class_7266;)V ARG 0 world diff --git a/mappings/net/minecraft/block/entity/Spawner.mapping b/mappings/net/minecraft/block/entity/Spawner.mapping index 4d08602343..516c128463 100644 --- a/mappings/net/minecraft/block/entity/Spawner.mapping +++ b/mappings/net/minecraft/block/entity/Spawner.mapping @@ -4,12 +4,9 @@ CLASS net/minecraft/class_8959 net/minecraft/block/entity/Spawner ARG 2 random METHOD method_55119 (Lnet/minecraft/class_1299;)Lnet/minecraft/class_5250; ARG 0 entityType - METHOD method_55120 getSpawnedEntityText (Lnet/minecraft/class_1799;Ljava/lang/String;)Lnet/minecraft/class_2561; - ARG 0 stack + METHOD method_55120 getSpawnedEntityText (Lnet/minecraft/class_9279;Ljava/lang/String;)Lnet/minecraft/class_2561; ARG 1 spawnDataKey - METHOD method_55121 appendSpawnDataToTooltip (Lnet/minecraft/class_1799;Ljava/util/List;Ljava/lang/String;)V - ARG 0 stack - ARG 1 tooltip + METHOD method_55121 appendSpawnDataToTooltip (Lnet/minecraft/class_9279;Ljava/util/function/Consumer;Ljava/lang/String;)V ARG 2 spawnDataKey METHOD method_55122 getSpawnedEntityId (Lnet/minecraft/class_2487;Ljava/lang/String;)Lnet/minecraft/class_2960; ARG 0 nbt diff --git a/mappings/net/minecraft/class_10724.mapping b/mappings/net/minecraft/class_10724.mapping new file mode 100644 index 0000000000..8c49cecef5 --- /dev/null +++ b/mappings/net/minecraft/class_10724.mapping @@ -0,0 +1,2 @@ +CLASS net/minecraft/class_10724 + METHOD method_65638 getValue (Lnet/minecraft/class_1799;Lnet/minecraft/class_638;Lnet/minecraft/class_1309;ILnet/minecraft/class_811;)Z diff --git a/mappings/net/minecraft/client/color/block/BlockColors.mapping b/mappings/net/minecraft/client/color/block/BlockColors.mapping index 0836496c30..e3eaf10d38 100644 --- a/mappings/net/minecraft/client/color/block/BlockColors.mapping +++ b/mappings/net/minecraft/client/color/block/BlockColors.mapping @@ -71,11 +71,6 @@ CLASS net/minecraft/class_324 net/minecraft/client/color/block/BlockColors ARG 2 world ARG 3 pos ARG 4 tintIndex - METHOD method_1698 (Lnet/minecraft/class_2680;Lnet/minecraft/class_1920;Lnet/minecraft/class_2338;I)I - ARG 0 state - ARG 1 world - ARG 2 pos - ARG 3 tintIndex METHOD method_21592 getProperties (Lnet/minecraft/class_2248;)Ljava/util/Set; ARG 1 block METHOD method_21593 registerColorProperty (Lnet/minecraft/class_2769;[Lnet/minecraft/class_2248;)V @@ -89,8 +84,3 @@ CLASS net/minecraft/class_324 net/minecraft/client/color/block/BlockColors ARG 1 world ARG 2 pos ARG 3 tintIndex - METHOD method_66525 (Lnet/minecraft/class_2680;Lnet/minecraft/class_1920;Lnet/minecraft/class_2338;I)I - ARG 0 state - ARG 1 world - ARG 2 pos - ARG 3 tintIndex diff --git a/mappings/net/minecraft/client/data/ItemModelGenerator.mapping b/mappings/net/minecraft/client/data/ItemModelGenerator.mapping index e4a5e0fa28..4577b96add 100644 --- a/mappings/net/minecraft/client/data/ItemModelGenerator.mapping +++ b/mappings/net/minecraft/client/data/ItemModelGenerator.mapping @@ -1,9 +1,5 @@ CLASS net/minecraft/class_4915 net/minecraft/client/data/ItemModelGenerator FIELD field_55239 UNTINTED Lnet/minecraft/class_10401; - FIELD field_55240 HELMET Ljava/lang/String; - FIELD field_55241 CHESTPLATE Ljava/lang/String; - FIELD field_55242 LEGGINGS Ljava/lang/String; - FIELD field_55243 BOOTS Ljava/lang/String; FIELD field_55244 TRIM_MATERIALS Ljava/util/List; FIELD field_55245 output Lnet/minecraft/class_10405; FIELD field_55246 modelCollector Ljava/util/function/BiConsumer; @@ -31,10 +27,9 @@ CLASS net/minecraft/class_4915 net/minecraft/client/data/ItemModelGenerator ARG 1 item ARG 2 shellColor ARG 3 spotsColor - METHOD method_65429 registerArmor (Lnet/minecraft/class_1792;Lnet/minecraft/class_5321;Ljava/lang/String;Z)V + METHOD method_65429 registerArmor (Lnet/minecraft/class_1792;Lnet/minecraft/class_5321;Lnet/minecraft/class_2960;Z)V ARG 1 item ARG 2 equipmentKey - ARG 3 type ARG 4 dyeable METHOD method_65430 registerPotionTinted (Lnet/minecraft/class_1792;Lnet/minecraft/class_2960;)V ARG 1 item @@ -113,5 +108,3 @@ CLASS net/minecraft/class_4915 net/minecraft/client/data/ItemModelGenerator METHOD method_65457 registerWithDyeableOverlay (Lnet/minecraft/class_1792;)V ARG 1 item CLASS class_8072 TrimMaterial - METHOD method_65458 texture (Lnet/minecraft/class_5321;)Ljava/lang/String; - ARG 1 equipmentKey diff --git a/mappings/net/minecraft/client/gui/screen/ingame/TestInstanceBlockScreen.mapping b/mappings/net/minecraft/client/gui/screen/ingame/TestInstanceBlockScreen.mapping index a771253346..018d147ddc 100644 --- a/mappings/net/minecraft/client/gui/screen/ingame/TestInstanceBlockScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/ingame/TestInstanceBlockScreen.mapping @@ -28,8 +28,6 @@ CLASS net/minecraft/class_10643 net/minecraft/client/gui/screen/ingame/TestInsta ARG 0 testId METHOD method_66804 rotationAsText (Lnet/minecraft/class_2470;)Lnet/minecraft/class_2561; ARG 0 rotation - METHOD method_66805 (Lnet/minecraft/class_4185;)V - ARG 1 button METHOD method_66807 parse (Ljava/lang/String;)I ARG 0 value METHOD method_66808 setSize (Lnet/minecraft/class_2382;)V @@ -41,18 +39,12 @@ CLASS net/minecraft/class_10643 net/minecraft/client/gui/screen/ingame/TestInsta ARG 1 message METHOD method_66811 getWidth (I)F ARG 0 total - METHOD method_66812 (Lnet/minecraft/class_4185;)V - ARG 1 button METHOD method_66813 (Ljava/lang/String;)V ARG 1 value - METHOD method_66814 (Lnet/minecraft/class_4185;)V - ARG 1 button METHOD method_66815 refresh (Z)V ARG 1 initial METHOD method_66816 (Lnet/minecraft/class_4185;)V ARG 1 button METHOD method_66817 (Lnet/minecraft/class_4185;)V ARG 1 button - METHOD method_66818 (Lnet/minecraft/class_4185;)V - ARG 1 button METHOD method_66819 refresh ()V diff --git a/mappings/net/minecraft/client/input/Input.mapping b/mappings/net/minecraft/client/input/Input.mapping index ed38208e8f..23d1da0931 100644 --- a/mappings/net/minecraft/client/input/Input.mapping +++ b/mappings/net/minecraft/client/input/Input.mapping @@ -5,5 +5,3 @@ CLASS net/minecraft/class_744 net/minecraft/client/input/Input METHOD method_3128 getMovementInput ()Lnet/minecraft/class_241; METHOD method_3129 tick ()V METHOD method_64054 jump ()V - METHOD method_66538 multiplyMovement (F)V - ARG 1 factor diff --git a/mappings/net/minecraft/client/item/ItemAssetsLoader.mapping b/mappings/net/minecraft/client/item/ItemAssetsLoader.mapping index 6dfcae59b3..681d6f3e20 100644 --- a/mappings/net/minecraft/client/item/ItemAssetsLoader.mapping +++ b/mappings/net/minecraft/client/item/ItemAssetsLoader.mapping @@ -8,10 +8,5 @@ CLASS net/minecraft/class_10521 net/minecraft/client/item/ItemAssetsLoader ARG 1 executor METHOD method_65930 (Ljava/util/List;)Lnet/minecraft/class_10521$class_10522; ARG 0 definitions - METHOD method_65931 (Ljava/util/List;Ljava/util/concurrent/Executor;Lnet/minecraft/class_2960;Lnet/minecraft/class_3298;)V - ARG 2 id - ARG 3 resource - METHOD method_65932 (Ljava/util/concurrent/Executor;Ljava/util/Map;)Ljava/util/concurrent/CompletionStage; - ARG 1 resources CLASS class_10522 Result CLASS class_10523 Definition diff --git a/mappings/net/minecraft/client/particle/ParticleManager.mapping b/mappings/net/minecraft/client/particle/ParticleManager.mapping index 479590b79a..6c6ffecfc8 100644 --- a/mappings/net/minecraft/client/particle/ParticleManager.mapping +++ b/mappings/net/minecraft/client/particle/ParticleManager.mapping @@ -5,7 +5,6 @@ CLASS net/minecraft/class_702 net/minecraft/client/particle/ParticleManager FIELD field_29072 groupCounts Lit/unimi/dsi/fastutil/objects/Object2IntOpenHashMap; FIELD field_32657 MAX_PARTICLE_COUNT I FIELD field_3830 particles Ljava/util/Map; - FIELD field_3831 textureManager Lnet/minecraft/class_1060; FIELD field_3832 random Lnet/minecraft/class_5819; FIELD field_3834 world Lnet/minecraft/class_638; FIELD field_3835 factories Lit/unimi/dsi/fastutil/ints/Int2ObjectMap; @@ -13,7 +12,6 @@ CLASS net/minecraft/class_702 net/minecraft/client/particle/ParticleManager FIELD field_3837 newEmitterParticles Ljava/util/Queue; FIELD field_40505 LOGGER Lorg/slf4j/Logger; FIELD field_40506 FINDER Lnet/minecraft/class_7654; - FIELD field_41385 PARTICLES_PATH Lnet/minecraft/class_2960; METHOD (Lnet/minecraft/class_638;Lnet/minecraft/class_1060;)V ARG 1 world ARG 2 textureManager diff --git a/mappings/net/minecraft/client/render/TexturedRenderLayers.mapping b/mappings/net/minecraft/client/render/TexturedRenderLayers.mapping index dfa8c75c52..c7733ea97f 100644 --- a/mappings/net/minecraft/client/render/TexturedRenderLayers.mapping +++ b/mappings/net/minecraft/client/render/TexturedRenderLayers.mapping @@ -42,8 +42,6 @@ CLASS net/minecraft/class_4722 net/minecraft/client/render/TexturedRenderLayers ARG 3 right METHOD method_24064 createSignTextureId (Lnet/minecraft/class_4719;)Lnet/minecraft/class_4730; ARG 0 type - METHOD method_24065 createChestTextureId (Ljava/lang/String;)Lnet/minecraft/class_4730; - ARG 0 variant METHOD method_24067 getShieldPatterns ()Lnet/minecraft/class_1921; METHOD method_24069 getBeds ()Lnet/minecraft/class_1921; METHOD method_24070 getShulkerBoxes ()Lnet/minecraft/class_1921; @@ -67,24 +65,12 @@ CLASS net/minecraft/class_4722 net/minecraft/client/render/TexturedRenderLayers ARG 0 decal METHOD method_49341 getDecoratedPotPatternTextureId (Lnet/minecraft/class_5321;)Lnet/minecraft/class_4730; ARG 0 potPatternKey - METHOD method_49342 createDecoratedPotPatternTextureId (Lnet/minecraft/class_2960;)Lnet/minecraft/class_4730; - ARG 0 patternId - METHOD method_58138 (Lnet/minecraft/class_2960;)Lnet/minecraft/class_4730; - ARG 0 id - METHOD method_58139 (Lnet/minecraft/class_2960;)Lnet/minecraft/class_4730; - ARG 0 id METHOD method_60576 (Lnet/minecraft/class_6880$class_6883;)Lnet/minecraft/class_4730; ARG 0 pattern - METHOD method_65526 createBedTextureId (Lnet/minecraft/class_2960;)Lnet/minecraft/class_4730; - ARG 0 id METHOD method_65527 getBedTextureId (Lnet/minecraft/class_1767;)Lnet/minecraft/class_4730; ARG 0 color - METHOD method_65528 createShulkerBoxTextureId (Lnet/minecraft/class_2960;)Lnet/minecraft/class_4730; - ARG 0 id METHOD method_65529 createColorId (Lnet/minecraft/class_1767;)Lnet/minecraft/class_2960; ARG 0 color - METHOD method_65530 createChestTextureId (Lnet/minecraft/class_2960;)Lnet/minecraft/class_4730; - ARG 0 id METHOD method_65531 createBedTextureId (Lnet/minecraft/class_1767;)Lnet/minecraft/class_4730; ARG 0 color METHOD method_65532 getShulkerBoxTextureId (Lnet/minecraft/class_1767;)Lnet/minecraft/class_4730; @@ -93,7 +79,3 @@ CLASS net/minecraft/class_4722 net/minecraft/client/render/TexturedRenderLayers ARG 0 color METHOD method_65534 createShulkerBoxTextureId (Lnet/minecraft/class_1767;)Lnet/minecraft/class_4730; ARG 0 color - METHOD method_65817 createSignTextureId (Lnet/minecraft/class_2960;)Lnet/minecraft/class_4730; - ARG 0 id - METHOD method_65818 createHangingSignTextureId (Lnet/minecraft/class_2960;)Lnet/minecraft/class_4730; - ARG 0 id diff --git a/mappings/net/minecraft/client/render/entity/equipment/EquipmentRenderer.mapping b/mappings/net/minecraft/client/render/entity/equipment/EquipmentRenderer.mapping index 0ac7a0f0a3..2453765d41 100644 --- a/mappings/net/minecraft/client/render/entity/equipment/EquipmentRenderer.mapping +++ b/mappings/net/minecraft/client/render/entity/equipment/EquipmentRenderer.mapping @@ -32,8 +32,3 @@ CLASS net/minecraft/class_10197 net/minecraft/client/render/entity/equipment/Equ CLASS class_10198 LayerTextureKey CLASS class_10199 TrimSpriteKey METHOD method_65573 getTexture ()Lnet/minecraft/class_2960; - METHOD method_65574 (Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String; - ARG 2 path - METHOD method_65575 getAssetName (Lnet/minecraft/class_6880;Lnet/minecraft/class_5321;)Ljava/lang/String; - ARG 0 material - ARG 1 assetKey diff --git a/mappings/net/minecraft/client/render/item/model/ConditionItemModel.mapping b/mappings/net/minecraft/client/render/item/model/ConditionItemModel.mapping index b5d3412f9a..9eb1b9b9c3 100644 --- a/mappings/net/minecraft/client/render/item/model/ConditionItemModel.mapping +++ b/mappings/net/minecraft/client/render/item/model/ConditionItemModel.mapping @@ -1,8 +1,8 @@ CLASS net/minecraft/class_10437 net/minecraft/client/render/item/model/ConditionItemModel - FIELD field_55330 property Lnet/minecraft/class_10460; + FIELD field_55330 property Lnet/minecraft/class_10724; FIELD field_55331 onTrue Lnet/minecraft/class_10439; FIELD field_55332 onFalse Lnet/minecraft/class_10439; - METHOD (Lnet/minecraft/class_10460;Lnet/minecraft/class_10439;Lnet/minecraft/class_10439;)V + METHOD (Lnet/minecraft/class_10724;Lnet/minecraft/class_10439;Lnet/minecraft/class_10439;)V ARG 1 property ARG 2 onTrue ARG 3 onFalse diff --git a/mappings/net/minecraft/client/render/item/model/SelectItemModel.mapping b/mappings/net/minecraft/client/render/item/model/SelectItemModel.mapping index f36179da3c..8baef96b7d 100644 --- a/mappings/net/minecraft/client/render/item/model/SelectItemModel.mapping +++ b/mappings/net/minecraft/client/render/item/model/SelectItemModel.mapping @@ -1,9 +1,8 @@ CLASS net/minecraft/class_10451 net/minecraft/client/render/item/model/SelectItemModel FIELD field_55362 property Lnet/minecraft/class_10494; - FIELD field_55363 cases Lit/unimi/dsi/fastutil/objects/Object2ObjectMap; - METHOD (Lnet/minecraft/class_10494;Lit/unimi/dsi/fastutil/objects/Object2ObjectMap;)V + FIELD field_55363 cases Lnet/minecraft/class_10451$class_10722; + METHOD (Lnet/minecraft/class_10494;Lnet/minecraft/class_10451$class_10722;)V ARG 1 property - ARG 2 cases CLASS class_10452 SwitchCase METHOD method_65628 createCodec (Lcom/mojang/serialization/Codec;)Lcom/mojang/serialization/Codec; ARG 0 conditionCodec diff --git a/mappings/net/minecraft/client/render/item/property/bool/BooleanProperty.mapping b/mappings/net/minecraft/client/render/item/property/bool/BooleanProperty.mapping index 500bf4cc74..8de88c98e3 100644 --- a/mappings/net/minecraft/client/render/item/property/bool/BooleanProperty.mapping +++ b/mappings/net/minecraft/client/render/item/property/bool/BooleanProperty.mapping @@ -1,8 +1,2 @@ CLASS net/minecraft/class_10460 net/minecraft/client/render/item/property/bool/BooleanProperty METHOD method_65637 getCodec ()Lcom/mojang/serialization/MapCodec; - METHOD method_65638 getValue (Lnet/minecraft/class_1799;Lnet/minecraft/class_638;Lnet/minecraft/class_1309;ILnet/minecraft/class_811;)Z - ARG 1 stack - ARG 2 world - ARG 3 user - ARG 4 seed - ARG 5 modelTransformationMode diff --git a/mappings/net/minecraft/client/texture/atlas/AtlasSource.mapping b/mappings/net/minecraft/client/texture/atlas/AtlasSource.mapping index c85b4c2355..9187fae217 100644 --- a/mappings/net/minecraft/client/texture/atlas/AtlasSource.mapping +++ b/mappings/net/minecraft/client/texture/atlas/AtlasSource.mapping @@ -1,6 +1,5 @@ CLASS net/minecraft/class_7948 net/minecraft/client/texture/atlas/AtlasSource FIELD field_42075 RESOURCE_FINDER Lnet/minecraft/class_7654; - METHOD method_47672 getType ()Lnet/minecraft/class_7951; METHOD method_47673 load (Lnet/minecraft/class_3300;Lnet/minecraft/class_7948$class_7949;)V ARG 1 resourceManager ARG 2 regions diff --git a/mappings/net/minecraft/client/texture/atlas/AtlasSourceManager.mapping b/mappings/net/minecraft/client/texture/atlas/AtlasSourceManager.mapping index 360c25adee..4784f359d1 100644 --- a/mappings/net/minecraft/client/texture/atlas/AtlasSourceManager.mapping +++ b/mappings/net/minecraft/client/texture/atlas/AtlasSourceManager.mapping @@ -1,12 +1,3 @@ CLASS net/minecraft/class_7952 net/minecraft/client/texture/atlas/AtlasSourceManager - FIELD field_41395 CODEC Lcom/mojang/serialization/Codec; FIELD field_41396 TYPE_CODEC Lcom/mojang/serialization/Codec; FIELD field_41397 LIST_CODEC Lcom/mojang/serialization/Codec; - FIELD field_41398 SOURCE_TYPE_BY_ID Lcom/google/common/collect/BiMap; - METHOD method_47677 (Lnet/minecraft/class_2960;)Lcom/mojang/serialization/DataResult; - ARG 0 id - METHOD method_47679 (Lnet/minecraft/class_7951;)Lcom/mojang/serialization/DataResult; - ARG 0 type - METHOD method_47680 register (Ljava/lang/String;Lcom/mojang/serialization/MapCodec;)Lnet/minecraft/class_7951; - ARG 0 id - ARG 1 codec diff --git a/mappings/net/minecraft/client/texture/atlas/AtlasSourceType.mapping b/mappings/net/minecraft/client/texture/atlas/AtlasSourceType.mapping deleted file mode 100644 index 0e8ba38958..0000000000 --- a/mappings/net/minecraft/client/texture/atlas/AtlasSourceType.mapping +++ /dev/null @@ -1 +0,0 @@ -CLASS net/minecraft/class_7951 net/minecraft/client/texture/atlas/AtlasSourceType diff --git a/mappings/net/minecraft/client/texture/atlas/DirectoryAtlasSource.mapping b/mappings/net/minecraft/client/texture/atlas/DirectoryAtlasSource.mapping index 598b07c4bd..c96acc2eb4 100644 --- a/mappings/net/minecraft/client/texture/atlas/DirectoryAtlasSource.mapping +++ b/mappings/net/minecraft/client/texture/atlas/DirectoryAtlasSource.mapping @@ -1,9 +1,11 @@ CLASS net/minecraft/class_7954 net/minecraft/client/texture/atlas/DirectoryAtlasSource + FIELD comp_3613 source Ljava/lang/String; + FIELD comp_3614 prefix Ljava/lang/String; FIELD field_41399 CODEC Lcom/mojang/serialization/MapCodec; - FIELD field_41400 source Ljava/lang/String; - FIELD field_41401 prefix Ljava/lang/String; METHOD (Ljava/lang/String;Ljava/lang/String;)V ARG 1 source ARG 2 prefix + METHOD comp_3613 source ()Ljava/lang/String; + METHOD comp_3614 prefix ()Ljava/lang/String; METHOD method_47683 (Lnet/minecraft/class_7654;Lnet/minecraft/class_7948$class_7949;Lnet/minecraft/class_2960;Lnet/minecraft/class_3298;)V ARG 4 resource diff --git a/mappings/net/minecraft/client/texture/atlas/FilterAtlasSource.mapping b/mappings/net/minecraft/client/texture/atlas/FilterAtlasSource.mapping index bcf82dc54e..4881fad0bd 100644 --- a/mappings/net/minecraft/client/texture/atlas/FilterAtlasSource.mapping +++ b/mappings/net/minecraft/client/texture/atlas/FilterAtlasSource.mapping @@ -1,5 +1,6 @@ CLASS net/minecraft/class_7956 net/minecraft/client/texture/atlas/FilterAtlasSource + FIELD comp_3621 pattern Lnet/minecraft/class_7085; FIELD field_41407 CODEC Lcom/mojang/serialization/MapCodec; - FIELD field_41408 pattern Lnet/minecraft/class_7085; METHOD (Lnet/minecraft/class_7085;)V ARG 1 pattern + METHOD comp_3621 pattern ()Lnet/minecraft/class_7085; diff --git a/mappings/net/minecraft/client/texture/atlas/PalettedPermutationsAtlasSource.mapping b/mappings/net/minecraft/client/texture/atlas/PalettedPermutationsAtlasSource.mapping index 5d3f096e48..7fcab5bfb5 100644 --- a/mappings/net/minecraft/client/texture/atlas/PalettedPermutationsAtlasSource.mapping +++ b/mappings/net/minecraft/client/texture/atlas/PalettedPermutationsAtlasSource.mapping @@ -1,20 +1,18 @@ CLASS net/minecraft/class_8066 net/minecraft/client/texture/atlas/PalettedPermutationsAtlasSource + FIELD comp_3615 textures Ljava/util/List; + FIELD comp_3616 paletteKey Lnet/minecraft/class_2960; + FIELD comp_3617 permutations Ljava/util/Map; FIELD field_42077 CODEC Lcom/mojang/serialization/MapCodec; FIELD field_42078 LOGGER Lorg/slf4j/Logger; - FIELD field_42079 textures Ljava/util/List; - FIELD field_42080 permutations Ljava/util/Map; - FIELD field_42081 paletteKey Lnet/minecraft/class_2960; - METHOD (Ljava/util/List;Lnet/minecraft/class_2960;Ljava/util/Map;)V + METHOD (Ljava/util/List;Lnet/minecraft/class_2960;Ljava/util/Map;Ljava/lang/String;)V ARG 1 textures - ARG 2 paletteKey ARG 3 permutations + METHOD comp_3615 textures ()Ljava/util/List; + METHOD comp_3616 paletteKey ()Lnet/minecraft/class_2960; + METHOD comp_3617 permutations ()Ljava/util/Map; METHOD method_48486 open (Lnet/minecraft/class_3300;Lnet/minecraft/class_2960;)[I ARG 0 resourceManager ARG 1 texture - METHOD method_48487 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; - ARG 0 instance - METHOD method_48488 (Lnet/minecraft/class_8066;)Ljava/util/Map; - ARG 0 source METHOD method_48489 (Lit/unimi/dsi/fastutil/ints/Int2IntMap;I)I ARG 1 color METHOD method_48490 (Ljava/util/Map;Ljava/util/function/Supplier;Lnet/minecraft/class_3300;Ljava/lang/String;Lnet/minecraft/class_2960;)V @@ -23,10 +21,6 @@ CLASS net/minecraft/class_8066 net/minecraft/client/texture/atlas/PalettedPermut METHOD method_48492 toMapper ([I[I)Ljava/util/function/IntUnaryOperator; ARG 0 from ARG 1 to - METHOD method_48493 (Lnet/minecraft/class_8066;)Lnet/minecraft/class_2960; - ARG 0 source - METHOD method_48494 (Lnet/minecraft/class_8066;)Ljava/util/List; - ARG 0 source CLASS class_8067 PalettedSpriteRegion METHOD apply (Ljava/lang/Object;)Ljava/lang/Object; ARG 1 opener diff --git a/mappings/net/minecraft/client/texture/atlas/SingleAtlasSource.mapping b/mappings/net/minecraft/client/texture/atlas/SingleAtlasSource.mapping index 1597dd8bd1..4e9a043788 100644 --- a/mappings/net/minecraft/client/texture/atlas/SingleAtlasSource.mapping +++ b/mappings/net/minecraft/client/texture/atlas/SingleAtlasSource.mapping @@ -1,8 +1,10 @@ CLASS net/minecraft/class_7955 net/minecraft/client/texture/atlas/SingleAtlasSource + FIELD comp_3619 resource Lnet/minecraft/class_2960; + FIELD comp_3620 sprite Ljava/util/Optional; FIELD field_41402 CODEC Lcom/mojang/serialization/MapCodec; FIELD field_41403 LOGGER Lorg/slf4j/Logger; - FIELD field_41405 resource Lnet/minecraft/class_2960; - FIELD field_41406 sprite Ljava/util/Optional; METHOD (Lnet/minecraft/class_2960;Ljava/util/Optional;)V ARG 1 resource ARG 2 sprite + METHOD comp_3619 resource ()Lnet/minecraft/class_2960; + METHOD comp_3620 sprite ()Ljava/util/Optional; diff --git a/mappings/net/minecraft/client/texture/atlas/UnstitchAtlasSource.mapping b/mappings/net/minecraft/client/texture/atlas/UnstitchAtlasSource.mapping index f3ad0cb60d..fd65154d72 100644 --- a/mappings/net/minecraft/client/texture/atlas/UnstitchAtlasSource.mapping +++ b/mappings/net/minecraft/client/texture/atlas/UnstitchAtlasSource.mapping @@ -1,25 +1,21 @@ CLASS net/minecraft/class_7957 net/minecraft/client/texture/atlas/UnstitchAtlasSource + FIELD comp_3622 resource Lnet/minecraft/class_2960; + FIELD comp_3623 regions Ljava/util/List; + FIELD comp_3624 divisorX D + FIELD comp_3625 divisorY D FIELD field_41409 CODEC Lcom/mojang/serialization/MapCodec; FIELD field_41410 LOGGER Lorg/slf4j/Logger; - FIELD field_41412 resource Lnet/minecraft/class_2960; - FIELD field_41413 regions Ljava/util/List; - FIELD field_41414 divisorX D - FIELD field_41415 divisorY D METHOD (Lnet/minecraft/class_2960;Ljava/util/List;DD)V ARG 1 resource ARG 2 regions ARG 3 divisorX ARG 5 divisorY + METHOD comp_3622 resource ()Lnet/minecraft/class_2960; + METHOD comp_3623 regions ()Ljava/util/List; + METHOD comp_3624 divisorX ()D + METHOD comp_3625 divisorY ()D METHOD method_47692 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; ARG 0 instance - METHOD method_47693 (Lnet/minecraft/class_7957;)Ljava/lang/Double; - ARG 0 source - METHOD method_47694 (Lnet/minecraft/class_7957;)Ljava/lang/Double; - ARG 0 source - METHOD method_47695 (Lnet/minecraft/class_7957;)Ljava/util/List; - ARG 0 source - METHOD method_47696 (Lnet/minecraft/class_7957;)Lnet/minecraft/class_2960; - ARG 0 source CLASS class_7959 Region FIELD field_41420 CODEC Lcom/mojang/serialization/Codec; METHOD method_47699 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; diff --git a/mappings/net/minecraft/command/argument/ItemPredicateArgumentType.mapping b/mappings/net/minecraft/command/argument/ItemPredicateArgumentType.mapping index f70e57fc1c..4ee98d7455 100644 --- a/mappings/net/minecraft/command/argument/ItemPredicateArgumentType.mapping +++ b/mappings/net/minecraft/command/argument/ItemPredicateArgumentType.mapping @@ -46,10 +46,8 @@ CLASS net/minecraft/class_2293 net/minecraft/command/argument/ItemPredicateArgum ARG 1 reader CLASS class_2295 ItemStackPredicateArgument CLASS class_9444 ComponentCheck - METHOD method_58535 createPredicate (Lcom/mojang/brigadier/ImmutableStringReader;Lnet/minecraft/class_6903;Lnet/minecraft/class_2520;)Ljava/util/function/Predicate; + METHOD method_58535 createPredicate (Lcom/mojang/brigadier/ImmutableStringReader;Lcom/mojang/serialization/Dynamic;)Ljava/util/function/Predicate; ARG 1 reader - ARG 2 ops - ARG 3 nbt METHOD method_58536 read (Lcom/mojang/brigadier/ImmutableStringReader;Lnet/minecraft/class_2960;Lnet/minecraft/class_9331;)Lnet/minecraft/class_2293$class_9444; ARG 0 reader ARG 1 id @@ -66,7 +64,6 @@ CLASS net/minecraft/class_2293 net/minecraft/command/argument/ItemPredicateArgum FIELD field_50066 itemRegistryWrapper Lnet/minecraft/class_7225$class_7226; FIELD field_50067 dataComponentTypeRegistryWrapper Lnet/minecraft/class_7225$class_7226; FIELD field_50068 itemSubPredicateTypeRegistryWrapper Lnet/minecraft/class_7225$class_7226; - FIELD field_50069 nbtOps Lnet/minecraft/class_6903; METHOD (Lnet/minecraft/class_7225$class_7874;)V ARG 1 registries METHOD method_58544 (Lnet/minecraft/class_6880$class_6883;)Lnet/minecraft/class_2960; @@ -82,9 +79,7 @@ CLASS net/minecraft/class_2293 net/minecraft/command/argument/ItemPredicateArgum ARG 1 type METHOD method_58558 (Lnet/minecraft/class_9360;)Ljava/util/function/Predicate; ARG 0 predicate - METHOD method_58559 createPredicate (Lcom/mojang/brigadier/ImmutableStringReader;Lnet/minecraft/class_6903;Lnet/minecraft/class_2520;)Ljava/util/function/Predicate; + METHOD method_58559 createPredicate (Lcom/mojang/brigadier/ImmutableStringReader;Lcom/mojang/serialization/Dynamic;)Ljava/util/function/Predicate; ARG 1 reader - ARG 2 ops - ARG 3 nbt METHOD method_58560 (Lcom/mojang/brigadier/ImmutableStringReader;Ljava/lang/String;)Lcom/mojang/brigadier/exceptions/CommandSyntaxException; ARG 2 error diff --git a/mappings/net/minecraft/command/argument/ItemStringReader.mapping b/mappings/net/minecraft/command/argument/ItemStringReader.mapping index 2ee616cbff..f3cf3681b5 100644 --- a/mappings/net/minecraft/command/argument/ItemStringReader.mapping +++ b/mappings/net/minecraft/command/argument/ItemStringReader.mapping @@ -10,7 +10,7 @@ CLASS net/minecraft/class_2291 net/minecraft/command/argument/ItemStringReader FIELD field_50052 REPEATED_COMPONENT_EXCEPTION Lcom/mojang/brigadier/exceptions/DynamicCommandExceptionType; FIELD field_50053 SUGGEST_DEFAULT Ljava/util/function/Function; FIELD field_50054 itemRegistry Lnet/minecraft/class_7225$class_7226; - FIELD field_50055 nbtOps Lcom/mojang/serialization/DynamicOps; + FIELD field_50055 nbtOps Lnet/minecraft/class_6903; FIELD field_51458 MALFORMED_ITEM_EXCEPTION Lcom/mojang/brigadier/exceptions/DynamicCommandExceptionType; FIELD field_51831 EXCLAMATION_MARK C METHOD (Lnet/minecraft/class_7225$class_7874;)V @@ -56,8 +56,7 @@ CLASS net/minecraft/class_2291 net/minecraft/command/argument/ItemStringReader ARG 0 reader METHOD method_57808 suggestBracket (Lcom/mojang/brigadier/suggestion/SuggestionsBuilder;)Ljava/util/concurrent/CompletableFuture; ARG 1 builder - METHOD method_57811 readComponentValue (Lnet/minecraft/class_9331;)V - ARG 1 type + METHOD method_57811 readComponentValue (Lnet/minecraft/class_6903;Lnet/minecraft/class_9331;)V METHOD method_57812 suggestEndOfComponent (Lcom/mojang/brigadier/suggestion/SuggestionsBuilder;)Ljava/util/concurrent/CompletableFuture; ARG 1 builder METHOD method_57813 suggestEqual (Lcom/mojang/brigadier/suggestion/SuggestionsBuilder;)Ljava/util/concurrent/CompletableFuture; diff --git a/mappings/net/minecraft/command/argument/ParticleEffectArgumentType.mapping b/mappings/net/minecraft/command/argument/ParticleEffectArgumentType.mapping index 52ba8e9906..e3e79246ca 100644 --- a/mappings/net/minecraft/command/argument/ParticleEffectArgumentType.mapping +++ b/mappings/net/minecraft/command/argument/ParticleEffectArgumentType.mapping @@ -20,10 +20,7 @@ CLASS net/minecraft/class_2223 net/minecraft/command/argument/ParticleEffectArgu ARG 1 registries METHOD method_9419 (Ljava/lang/Object;)Lcom/mojang/brigadier/Message; ARG 0 id - METHOD method_9420 readParameters (Lcom/mojang/brigadier/StringReader;Lnet/minecraft/class_2396;Lnet/minecraft/class_7225$class_7874;)Lnet/minecraft/class_2394; - ARG 0 reader - ARG 1 type - ARG 2 registries + METHOD method_9420 readParameters (Lcom/mojang/serialization/DynamicOps;Lcom/mojang/brigadier/StringReader;Lnet/minecraft/class_2396;Lnet/minecraft/class_7225$class_7874;)Lnet/minecraft/class_2394; METHOD method_9421 getParticle (Lcom/mojang/brigadier/context/CommandContext;Ljava/lang/String;)Lnet/minecraft/class_2394; ARG 0 context ARG 1 name diff --git a/mappings/net/minecraft/command/argument/RegistryEntryArgumentType.mapping b/mappings/net/minecraft/command/argument/RegistryEntryArgumentType.mapping index cd8dacca0c..af98c9a5dc 100644 --- a/mappings/net/minecraft/command/argument/RegistryEntryArgumentType.mapping +++ b/mappings/net/minecraft/command/argument/RegistryEntryArgumentType.mapping @@ -18,8 +18,7 @@ CLASS net/minecraft/class_9433 net/minecraft/command/argument/RegistryEntryArgum ARG 0 registryAccess METHOD method_58483 (Ljava/lang/Object;)Lcom/mojang/brigadier/Message; ARG 0 argument - METHOD method_58484 parseAsNbt (Lcom/mojang/brigadier/StringReader;)Lnet/minecraft/class_2520; - ARG 0 stringReader + METHOD method_58484 parseAsNbt (Lcom/mojang/serialization/DynamicOps;Lcom/mojang/brigadier/StringReader;)Lcom/mojang/serialization/Dynamic; METHOD method_58485 getLootFunction (Lcom/mojang/brigadier/context/CommandContext;Ljava/lang/String;)Lnet/minecraft/class_6880; ARG 0 context ARG 1 argument diff --git a/mappings/net/minecraft/command/argument/packrat/NbtParsingRule.mapping b/mappings/net/minecraft/command/argument/packrat/NbtParsingRule.mapping index d9b269ffc7..d849e4f54e 100644 --- a/mappings/net/minecraft/command/argument/packrat/NbtParsingRule.mapping +++ b/mappings/net/minecraft/command/argument/packrat/NbtParsingRule.mapping @@ -1,2 +1 @@ CLASS net/minecraft/class_9416 net/minecraft/command/argument/packrat/NbtParsingRule - FIELD field_49971 INSTANCE Lnet/minecraft/class_9396; diff --git a/mappings/net/minecraft/command/argument/packrat/PackratParsing.mapping b/mappings/net/minecraft/command/argument/packrat/PackratParsing.mapping index 3a0134c295..c8cca8e4ac 100644 --- a/mappings/net/minecraft/command/argument/packrat/PackratParsing.mapping +++ b/mappings/net/minecraft/command/argument/packrat/PackratParsing.mapping @@ -34,10 +34,9 @@ CLASS net/minecraft/class_9437 net/minecraft/command/argument/packrat/PackratPar METHOD method_58505 componentPresencePredicate (Lcom/mojang/brigadier/ImmutableStringReader;Ljava/lang/Object;)Ljava/lang/Object; ARG 1 reader ARG 2 check - METHOD method_58506 componentMatchPredicate (Lcom/mojang/brigadier/ImmutableStringReader;Ljava/lang/Object;Lnet/minecraft/class_2520;)Ljava/lang/Object; + METHOD method_58506 componentMatchPredicate (Lcom/mojang/brigadier/ImmutableStringReader;Ljava/lang/Object;Lcom/mojang/serialization/Dynamic;)Ljava/lang/Object; ARG 1 reader ARG 2 check - ARG 3 nbt METHOD method_58507 negate (Ljava/lang/Object;)Ljava/lang/Object; ARG 1 predicate METHOD method_58508 anyOf (Ljava/util/List;)Ljava/lang/Object; @@ -46,10 +45,9 @@ CLASS net/minecraft/class_9437 net/minecraft/command/argument/packrat/PackratPar METHOD method_58510 tagMatchPredicate (Lcom/mojang/brigadier/ImmutableStringReader;Lnet/minecraft/class_2960;)Ljava/lang/Object; ARG 1 reader ARG 2 id - METHOD method_58511 subPredicatePredicate (Lcom/mojang/brigadier/ImmutableStringReader;Ljava/lang/Object;Lnet/minecraft/class_2520;)Ljava/lang/Object; + METHOD method_58511 subPredicatePredicate (Lcom/mojang/brigadier/ImmutableStringReader;Ljava/lang/Object;Lcom/mojang/serialization/Dynamic;)Ljava/lang/Object; ARG 1 reader ARG 2 check - ARG 3 nbt METHOD method_58512 streamComponentIds ()Ljava/util/stream/Stream; METHOD method_58513 componentCheck (Lcom/mojang/brigadier/ImmutableStringReader;Lnet/minecraft/class_2960;)Ljava/lang/Object; ARG 1 reader diff --git a/mappings/net/minecraft/component/DataComponentTypes.mapping b/mappings/net/minecraft/component/DataComponentTypes.mapping index 9254732356..89ca176072 100644 --- a/mappings/net/minecraft/component/DataComponentTypes.mapping +++ b/mappings/net/minecraft/component/DataComponentTypes.mapping @@ -42,8 +42,6 @@ CLASS net/minecraft/class_9334 net/minecraft/component/DataComponentTypes ARG 0 builder METHOD method_57893 (Lnet/minecraft/class_9331$class_9332;)Lnet/minecraft/class_9331$class_9332; ARG 0 builder - METHOD method_57894 (Lnet/minecraft/class_9331$class_9332;)Lnet/minecraft/class_9331$class_9332; - ARG 0 builder METHOD method_57895 (Lnet/minecraft/class_9331$class_9332;)Lnet/minecraft/class_9331$class_9332; ARG 0 builder METHOD method_57896 (Lnet/minecraft/class_9331$class_9332;)Lnet/minecraft/class_9331$class_9332; @@ -73,8 +71,6 @@ CLASS net/minecraft/class_9334 net/minecraft/component/DataComponentTypes ARG 0 builder METHOD method_57908 (Lnet/minecraft/class_9331$class_9332;)Lnet/minecraft/class_9331$class_9332; ARG 0 builder - METHOD method_57909 (Lnet/minecraft/class_9331$class_9332;)Lnet/minecraft/class_9331$class_9332; - ARG 0 builder METHOD method_57910 (Lnet/minecraft/class_9331$class_9332;)Lnet/minecraft/class_9331$class_9332; ARG 0 builder METHOD method_57911 (Lnet/minecraft/class_9331$class_9332;)Lnet/minecraft/class_9331$class_9332; @@ -127,8 +123,6 @@ CLASS net/minecraft/class_9334 net/minecraft/component/DataComponentTypes ARG 0 builder METHOD method_58566 (Lnet/minecraft/class_9331$class_9332;)Lnet/minecraft/class_9331$class_9332; ARG 0 builder - METHOD method_58567 (Lnet/minecraft/class_9331$class_9332;)Lnet/minecraft/class_9331$class_9332; - ARG 0 builder METHOD method_58568 (Lnet/minecraft/class_9331$class_9332;)Lnet/minecraft/class_9331$class_9332; ARG 0 builder METHOD method_58569 (Lnet/minecraft/class_9331$class_9332;)Lnet/minecraft/class_9331$class_9332; diff --git a/mappings/net/minecraft/component/type/AttributeModifiersComponent.mapping b/mappings/net/minecraft/component/type/AttributeModifiersComponent.mapping index 77e0d3d0f5..91e59f6eaa 100644 --- a/mappings/net/minecraft/component/type/AttributeModifiersComponent.mapping +++ b/mappings/net/minecraft/component/type/AttributeModifiersComponent.mapping @@ -3,7 +3,6 @@ CLASS net/minecraft/class_9285 net/minecraft/component/type/AttributeModifiersCo FIELD field_49327 CODEC Lcom/mojang/serialization/Codec; FIELD field_49328 PACKET_CODEC Lnet/minecraft/class_9139; FIELD field_49329 DECIMAL_FORMAT Ljava/text/DecimalFormat; - FIELD field_49751 BASE_CODEC Lcom/mojang/serialization/Codec; METHOD method_57480 builder ()Lnet/minecraft/class_9285$class_9286; METHOD method_57481 applyOperations (DLnet/minecraft/class_1304;)D ARG 1 base @@ -11,18 +10,12 @@ CLASS net/minecraft/class_9285 net/minecraft/component/type/AttributeModifiersCo METHOD method_57482 applyModifiers (Lnet/minecraft/class_1304;Ljava/util/function/BiConsumer;)V ARG 1 slot ARG 2 attributeConsumer - METHOD method_57483 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; - ARG 0 instance METHOD method_57484 with (Lnet/minecraft/class_6880;Lnet/minecraft/class_1322;Lnet/minecraft/class_9274;)Lnet/minecraft/class_9285; ARG 1 attribute ARG 2 modifier ARG 3 slot METHOD method_57485 (Ljava/text/DecimalFormat;)V ARG 0 format - METHOD method_58113 (Ljava/util/List;)Lnet/minecraft/class_9285; - ARG 0 attributeModifiers - METHOD method_58423 withShowInTooltip (Z)Lnet/minecraft/class_9285; - ARG 1 showInTooltip METHOD method_60618 applyModifiers (Lnet/minecraft/class_9274;Ljava/util/function/BiConsumer;)V ARG 1 slot ARG 2 attributeConsumer diff --git a/mappings/net/minecraft/component/type/DyedColorComponent.mapping b/mappings/net/minecraft/component/type/DyedColorComponent.mapping index fe590a9a32..1716aec5bf 100644 --- a/mappings/net/minecraft/component/type/DyedColorComponent.mapping +++ b/mappings/net/minecraft/component/type/DyedColorComponent.mapping @@ -2,16 +2,9 @@ CLASS net/minecraft/class_9282 net/minecraft/component/type/DyedColorComponent FIELD field_49312 CODEC Lcom/mojang/serialization/Codec; FIELD field_49313 PACKET_CODEC Lnet/minecraft/class_9139; FIELD field_49314 DEFAULT_COLOR I - FIELD field_49750 BASE_CODEC Lcom/mojang/serialization/Codec; - METHOD method_57469 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; - ARG 0 instance METHOD method_57470 getColor (Lnet/minecraft/class_1799;I)I ARG 0 stack ARG 1 defaultColor METHOD method_57471 setColor (Lnet/minecraft/class_1799;Ljava/util/List;)Lnet/minecraft/class_1799; ARG 0 stack ARG 1 dyes - METHOD method_58112 (Ljava/lang/Integer;)Lnet/minecraft/class_9282; - ARG 0 rgb - METHOD method_58422 withShowInTooltip (Z)Lnet/minecraft/class_9282; - ARG 1 showInTooltip diff --git a/mappings/net/minecraft/component/type/ItemEnchantmentsComponent.mapping b/mappings/net/minecraft/component/type/ItemEnchantmentsComponent.mapping index fb9f21e900..82ba276f85 100644 --- a/mappings/net/minecraft/component/type/ItemEnchantmentsComponent.mapping +++ b/mappings/net/minecraft/component/type/ItemEnchantmentsComponent.mapping @@ -4,41 +4,24 @@ CLASS net/minecraft/class_9304 net/minecraft/component/type/ItemEnchantmentsComp FIELD field_49387 PACKET_CODEC Lnet/minecraft/class_9139; FIELD field_49388 ENCHANTMENT_LEVEL_CODEC Lcom/mojang/serialization/Codec; FIELD field_49389 enchantments Lit/unimi/dsi/fastutil/objects/Object2IntOpenHashMap; - FIELD field_49390 showInTooltip Z - FIELD field_49753 INLINE_CODEC Lcom/mojang/serialization/Codec; - FIELD field_49754 BASE_CODEC Lcom/mojang/serialization/Codec; - METHOD (Lit/unimi/dsi/fastutil/objects/Object2IntOpenHashMap;Z)V + METHOD (Lit/unimi/dsi/fastutil/objects/Object2IntOpenHashMap;)V ARG 1 enchantments - ARG 2 showInTooltip METHOD equals (Ljava/lang/Object;)Z ARG 1 o METHOD method_57534 getEnchantments ()Ljava/util/Set; - METHOD method_57535 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; - ARG 0 instance METHOD method_57536 getLevel (Lnet/minecraft/class_6880;)I ARG 1 enchantment - METHOD method_57537 (Lnet/minecraft/class_9304;)Ljava/lang/Boolean; - ARG 0 component METHOD method_57539 getEnchantmentEntries ()Ljava/util/Set; METHOD method_57540 (Lnet/minecraft/class_9304;)Lit/unimi/dsi/fastutil/objects/Object2IntOpenHashMap; ARG 0 component METHOD method_57541 getSize ()I - METHOD method_57542 (Lnet/minecraft/class_9304;)Ljava/lang/Boolean; - ARG 0 component METHOD method_57543 isEmpty ()Z - METHOD method_57544 (Lnet/minecraft/class_9304;)Lit/unimi/dsi/fastutil/objects/Object2IntOpenHashMap; - ARG 0 component - METHOD method_58118 (Lit/unimi/dsi/fastutil/objects/Object2IntOpenHashMap;)Lnet/minecraft/class_9304; - ARG 0 map - METHOD method_58449 withShowInTooltip (Z)Lnet/minecraft/class_9304; - ARG 1 showInTooltip METHOD method_59716 getTooltipOrderList (Lnet/minecraft/class_7225$class_7874;Lnet/minecraft/class_5321;Lnet/minecraft/class_6862;)Lnet/minecraft/class_6885; ARG 0 registries ARG 1 registryRef ARG 2 tooltipOrderTag CLASS class_9305 Builder FIELD field_49391 enchantments Lit/unimi/dsi/fastutil/objects/Object2IntOpenHashMap; - FIELD field_49392 showInTooltip Z METHOD (Lnet/minecraft/class_9304;)V ARG 1 enchantmentsComponent METHOD method_57545 getEnchantments ()Ljava/util/Set; diff --git a/mappings/net/minecraft/component/type/JukeboxPlayableComponent.mapping b/mappings/net/minecraft/component/type/JukeboxPlayableComponent.mapping index 817ed8e261..afc8f2a58c 100644 --- a/mappings/net/minecraft/component/type/JukeboxPlayableComponent.mapping +++ b/mappings/net/minecraft/component/type/JukeboxPlayableComponent.mapping @@ -1,12 +1,8 @@ CLASS net/minecraft/class_9792 net/minecraft/component/type/JukeboxPlayableComponent FIELD field_52025 CODEC Lcom/mojang/serialization/Codec; FIELD field_52026 PACKET_CODEC Lnet/minecraft/class_9139; - METHOD method_60746 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; - ARG 0 instance METHOD method_60747 tryPlayStack (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_1799;Lnet/minecraft/class_1657;)Lnet/minecraft/class_1269; ARG 0 world ARG 1 pos ARG 2 stack ARG 3 player - METHOD method_60749 withShowInTooltip (Z)Lnet/minecraft/class_9792; - ARG 1 showInTooltip diff --git a/mappings/net/minecraft/component/type/PotionContentsComponent.mapping b/mappings/net/minecraft/component/type/PotionContentsComponent.mapping index 5c0a9c928d..173b063a13 100644 --- a/mappings/net/minecraft/component/type/PotionContentsComponent.mapping +++ b/mappings/net/minecraft/component/type/PotionContentsComponent.mapping @@ -7,10 +7,6 @@ CLASS net/minecraft/class_1844 net/minecraft/component/type/PotionContentsCompon FIELD field_49749 BASE_CODEC Lcom/mojang/serialization/Codec; METHOD (Lnet/minecraft/class_6880;)V ARG 1 potion - METHOD method_47372 buildTooltip (Ljava/util/function/Consumer;FF)V - ARG 1 textConsumer - ARG 2 durationMultiplier - ARG 3 tickRate METHOD method_55762 (Ljava/util/List;Lnet/minecraft/class_6880;Lnet/minecraft/class_1322;)V ARG 1 attribute ARG 2 modifier diff --git a/mappings/net/minecraft/component/type/UnbreakableComponent.mapping b/mappings/net/minecraft/component/type/UnbreakableComponent.mapping deleted file mode 100644 index 809127a607..0000000000 --- a/mappings/net/minecraft/component/type/UnbreakableComponent.mapping +++ /dev/null @@ -1,8 +0,0 @@ -CLASS net/minecraft/class_9300 net/minecraft/component/type/UnbreakableComponent - FIELD field_49366 CODEC Lcom/mojang/serialization/Codec; - FIELD field_49367 PACKET_CODEC Lnet/minecraft/class_9139; - FIELD field_49368 TOOLTIP_TEXT Lnet/minecraft/class_2561; - METHOD method_57515 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; - ARG 0 instance - METHOD method_58435 withShowInTooltip (Z)Lnet/minecraft/class_9300; - ARG 1 showInTooltip diff --git a/mappings/net/minecraft/data/advancement/vanilla/VanillaHusbandryTabAdvancementGenerator.mapping b/mappings/net/minecraft/data/advancement/vanilla/VanillaHusbandryTabAdvancementGenerator.mapping index 5bcbbd2833..fcedd82d4f 100644 --- a/mappings/net/minecraft/data/advancement/vanilla/VanillaHusbandryTabAdvancementGenerator.mapping +++ b/mappings/net/minecraft/data/advancement/vanilla/VanillaHusbandryTabAdvancementGenerator.mapping @@ -16,9 +16,9 @@ CLASS net/minecraft/class_2414 net/minecraft/data/advancement/vanilla/VanillaHus ARG 1 breedableAnimals METHOD method_16117 (Lnet/minecraft/class_161$class_162;Lnet/minecraft/class_6880$class_6883;)V ARG 1 entry - METHOD method_16118 requireAllCatsTamed (Lnet/minecraft/class_161$class_162;)Lnet/minecraft/class_161$class_162; + METHOD method_16118 requireAllCatsTamed (Lnet/minecraft/class_161$class_162;Lnet/minecraft/class_7225;)Lnet/minecraft/class_161$class_162; ARG 0 builder - METHOD method_43362 requireAllFrogsOnLeads (Lnet/minecraft/class_7871;Lnet/minecraft/class_7871;Lnet/minecraft/class_161$class_162;)Lnet/minecraft/class_161$class_162; + METHOD method_43362 requireAllFrogsOnLeads (Lnet/minecraft/class_7871;Lnet/minecraft/class_7871;Lnet/minecraft/class_7225;Lnet/minecraft/class_161$class_162;)Lnet/minecraft/class_161$class_162; METHOD method_47810 createBreedAllAnimalsAdvancement (Lnet/minecraft/class_8779;Ljava/util/function/Consumer;Lnet/minecraft/class_7871;Ljava/util/stream/Stream;Ljava/util/stream/Stream;)Lnet/minecraft/class_8779; ARG 0 parent ARG 1 exporter diff --git a/mappings/net/minecraft/data/loottable/EntityLootTableGenerator.mapping b/mappings/net/minecraft/data/loottable/EntityLootTableGenerator.mapping index 52c84db539..618ac6a8cb 100644 --- a/mappings/net/minecraft/data/loottable/EntityLootTableGenerator.mapping +++ b/mappings/net/minecraft/data/loottable/EntityLootTableGenerator.mapping @@ -18,9 +18,8 @@ CLASS net/minecraft/class_7789 net/minecraft/data/loottable/EntityLootTableGener METHOD method_46029 register (Lnet/minecraft/class_1299;Lnet/minecraft/class_52$class_53;)V ARG 1 entityType ARG 2 lootTable - METHOD method_46030 killedByFrog (Lnet/minecraft/class_7871;Lnet/minecraft/class_5321;)Lnet/minecraft/class_5341$class_210; + METHOD method_46030 killedByFrog (Lnet/minecraft/class_7871;Lnet/minecraft/class_7871;Lnet/minecraft/class_5321;)Lnet/minecraft/class_5341$class_210; ARG 1 registryLookup - ARG 2 frogVariant METHOD method_46031 createForSheep (Ljava/util/Map;)Lnet/minecraft/class_55$class_56; ARG 0 colorLootTables METHOD method_46032 (Ljava/util/Set;Lnet/minecraft/class_6880$class_6883;Ljava/util/function/BiConsumer;Lnet/minecraft/class_5321;Lnet/minecraft/class_52$class_53;)V diff --git a/mappings/net/minecraft/data/recipe/RecipeGenerator.mapping b/mappings/net/minecraft/data/recipe/RecipeGenerator.mapping index e7954c4dcd..40d2a2a21d 100644 --- a/mappings/net/minecraft/data/recipe/RecipeGenerator.mapping +++ b/mappings/net/minecraft/data/recipe/RecipeGenerator.mapping @@ -280,8 +280,7 @@ CLASS net/minecraft/class_2446 net/minecraft/data/recipe/RecipeGenerator ARG 1 category ARG 2 output ARG 3 input - METHOD method_48530 offerSmithingTrimRecipe (Lnet/minecraft/class_1792;Lnet/minecraft/class_5321;)V - ARG 1 input + METHOD method_48530 offerSmithingTrimRecipe (Lnet/minecraft/class_1792;Lnet/minecraft/class_5321;Lnet/minecraft/class_5321;)V METHOD method_48533 offerSmithingTemplateCopyingRecipe (Lnet/minecraft/class_1935;Lnet/minecraft/class_1935;)V ARG 1 template ARG 2 resource diff --git a/mappings/net/minecraft/data/recipe/SmithingTrimRecipeJsonBuilder.mapping b/mappings/net/minecraft/data/recipe/SmithingTrimRecipeJsonBuilder.mapping index 0c599e352b..5fda484f55 100644 --- a/mappings/net/minecraft/data/recipe/SmithingTrimRecipeJsonBuilder.mapping +++ b/mappings/net/minecraft/data/recipe/SmithingTrimRecipeJsonBuilder.mapping @@ -4,18 +4,17 @@ CLASS net/minecraft/class_8076 net/minecraft/data/recipe/SmithingTrimRecipeJsonB FIELD field_42099 base Lnet/minecraft/class_1856; FIELD field_42100 addition Lnet/minecraft/class_1856; FIELD field_46153 criteria Ljava/util/Map; - METHOD (Lnet/minecraft/class_7800;Lnet/minecraft/class_1856;Lnet/minecraft/class_1856;Lnet/minecraft/class_1856;)V + METHOD (Lnet/minecraft/class_7800;Lnet/minecraft/class_1856;Lnet/minecraft/class_1856;Lnet/minecraft/class_1856;Lnet/minecraft/class_6880;)V ARG 1 category ARG 2 template ARG 3 base ARG 4 addition METHOD method_48539 validate (Lnet/minecraft/class_5321;)V ARG 1 recipeKey - METHOD method_48540 create (Lnet/minecraft/class_1856;Lnet/minecraft/class_1856;Lnet/minecraft/class_1856;Lnet/minecraft/class_7800;)Lnet/minecraft/class_8076; + METHOD method_48540 create (Lnet/minecraft/class_1856;Lnet/minecraft/class_1856;Lnet/minecraft/class_1856;Lnet/minecraft/class_6880;Lnet/minecraft/class_7800;)Lnet/minecraft/class_8076; ARG 0 template ARG 1 base ARG 2 addition - ARG 3 category METHOD method_48541 criterion (Ljava/lang/String;Lnet/minecraft/class_175;)Lnet/minecraft/class_8076; ARG 1 name ARG 2 criterion diff --git a/mappings/net/minecraft/data/recipe/VanillaRecipeGenerator.mapping b/mappings/net/minecraft/data/recipe/VanillaRecipeGenerator.mapping index 4523f13d9e..93131e5080 100644 --- a/mappings/net/minecraft/data/recipe/VanillaRecipeGenerator.mapping +++ b/mappings/net/minecraft/data/recipe/VanillaRecipeGenerator.mapping @@ -7,8 +7,6 @@ CLASS net/minecraft/class_7803 net/minecraft/data/recipe/VanillaRecipeGenerator FIELD field_40657 LAPIS_ORES Lcom/google/common/collect/ImmutableList; FIELD field_40658 REDSTONE_ORES Lcom/google/common/collect/ImmutableList; FIELD field_40659 EMERALD_ORES Lcom/google/common/collect/ImmutableList; - METHOD method_51693 (Lnet/minecraft/class_1792;)Lnet/minecraft/class_7803$class_8905; - ARG 0 template METHOD method_51694 streamSmithingTemplates ()Ljava/util/stream/Stream; METHOD method_51695 (Lnet/minecraft/class_7803$class_8905;)V ARG 1 template diff --git a/mappings/net/minecraft/data/tag/vanilla/VanillaCatVariantTagProvider.mapping b/mappings/net/minecraft/data/tag/vanilla/VanillaCatVariantTagProvider.mapping deleted file mode 100644 index 580875ec82..0000000000 --- a/mappings/net/minecraft/data/tag/vanilla/VanillaCatVariantTagProvider.mapping +++ /dev/null @@ -1,4 +0,0 @@ -CLASS net/minecraft/class_7393 net/minecraft/data/tag/vanilla/VanillaCatVariantTagProvider - METHOD (Lnet/minecraft/class_7784;Ljava/util/concurrent/CompletableFuture;)V - ARG 1 output - ARG 2 registriesFuture diff --git a/mappings/net/minecraft/datafixer/fix/EntityProjectileOwnerFix.mapping b/mappings/net/minecraft/datafixer/fix/EntityProjectileOwnerFix.mapping index ed02eb640d..b0dbe2df92 100644 --- a/mappings/net/minecraft/datafixer/fix/EntityProjectileOwnerFix.mapping +++ b/mappings/net/minecraft/datafixer/fix/EntityProjectileOwnerFix.mapping @@ -18,7 +18,5 @@ CLASS net/minecraft/class_4860 net/minecraft/datafixer/fix/EntityProjectileOwner ARG 3 fixer METHOD method_24904 moveNestedOwnerMostLeastToArray (Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic; ARG 1 entityDynamic - METHOD method_24905 renamePotionToItem (Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic; - ARG 1 entityDynamic METHOD method_24906 moveOwnerToArray (Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic; ARG 1 entityDynamic diff --git a/mappings/net/minecraft/datafixer/fix/ParticleUnflatteningFix.mapping b/mappings/net/minecraft/datafixer/fix/ParticleUnflatteningFix.mapping index 722f1598b6..4fb024336d 100644 --- a/mappings/net/minecraft/datafixer/fix/ParticleUnflatteningFix.mapping +++ b/mappings/net/minecraft/datafixer/fix/ParticleUnflatteningFix.mapping @@ -9,8 +9,7 @@ CLASS net/minecraft/class_9650 net/minecraft/datafixer/fix/ParticleUnflatteningF METHOD method_59629 fixItemParticle (Lcom/mojang/serialization/Dynamic;Ljava/lang/String;)Lcom/mojang/serialization/Dynamic; ARG 1 dynamic ARG 2 params - METHOD method_59630 tryParse (Ljava/lang/String;)Lnet/minecraft/class_2487; - ARG 0 snbt + METHOD method_59630 tryParse (Lcom/mojang/serialization/DynamicOps;Ljava/lang/String;)Lcom/mojang/serialization/Dynamic; METHOD method_59631 fixBlockParticle (Lcom/mojang/serialization/Dynamic;Ljava/lang/String;)Lcom/mojang/serialization/Dynamic; ARG 1 dynamic ARG 2 params diff --git a/mappings/net/minecraft/entity/Entity.mapping b/mappings/net/minecraft/entity/Entity.mapping index c37e943755..183f265c0e 100644 --- a/mappings/net/minecraft/entity/Entity.mapping +++ b/mappings/net/minecraft/entity/Entity.mapping @@ -149,7 +149,6 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity FIELD field_44873 forceUpdateSupportingBlockPos Z FIELD field_47742 stateAtPos Lnet/minecraft/class_2680; FIELD field_51994 portalManager Lnet/minecraft/class_9787; - FIELD field_54946 onFire Z FIELD field_54947 queuedCollisionChecks Ljava/util/List; FIELD field_54948 collidedBlockPositions Lit/unimi/dsi/fastutil/longs/LongSet; FIELD field_55940 fireState Lnet/minecraft/class_1297$class_10628; @@ -2279,7 +2278,7 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity METHOD method_66247 isLogicalSideForUpdatingMovement ()Z METHOD method_66248 isControlledByMainPlayer ()Z METHOD method_66249 canMoveVoluntarily ()Z - METHOD method_66250 spawnBubbleColumnParticles (Lnet/minecraft/class_2338;)V + METHOD method_66250 spawnBubbleColumnParticles (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;)V ARG 1 pos METHOD method_66648 collidesWithFluid (Lnet/minecraft/class_3610;Lnet/minecraft/class_2338;Lnet/minecraft/class_243;Lnet/minecraft/class_243;)Z ARG 1 state diff --git a/mappings/net/minecraft/entity/EntityStatuses.mapping b/mappings/net/minecraft/entity/EntityStatuses.mapping index 93fc7f8663..00fea22d7f 100644 --- a/mappings/net/minecraft/entity/EntityStatuses.mapping +++ b/mappings/net/minecraft/entity/EntityStatuses.mapping @@ -1,8 +1,6 @@ CLASS net/minecraft/class_6024 net/minecraft/entity/EntityStatuses FIELD field_29995 SET_OP_LEVEL_3 B FIELD field_29996 SET_OP_LEVEL_4 B - FIELD field_29997 BLOCK_WITH_SHIELD B - FIELD field_29998 BREAK_SHIELD B FIELD field_29999 PULL_HOOKED_ENTITY B FIELD field_30000 HIT_ARMOR_STAND B FIELD field_30002 STOP_LOOKING_AT_VILLAGER B diff --git a/mappings/net/minecraft/entity/LivingEntity.mapping b/mappings/net/minecraft/entity/LivingEntity.mapping index 3b44fdd026..ccee500509 100644 --- a/mappings/net/minecraft/entity/LivingEntity.mapping +++ b/mappings/net/minecraft/entity/LivingEntity.mapping @@ -273,7 +273,6 @@ CLASS net/minecraft/class_1309 net/minecraft/entity/LivingEntity METHOD method_39760 getFallSounds ()Lnet/minecraft/class_1309$class_6823; METHOD method_41329 disableExperienceDropping ()V METHOD method_41330 isExperienceDroppingDisabled ()Z - METHOD method_42149 disablesShield ()Z METHOD method_44201 isArmorSlot (Lnet/minecraft/class_1304;)Z ARG 1 slot METHOD method_45324 areItemsDifferent (Lnet/minecraft/class_1799;Lnet/minecraft/class_1799;)Z @@ -476,8 +475,6 @@ CLASS net/minecraft/class_1309 net/minecraft/entity/LivingEntity COMMENT @see #getExperienceToDrop() METHOD method_6055 getHandSwingProgress (F)F ARG 1 tickDelta - METHOD method_6056 damageShield (F)V - ARG 1 amount METHOD method_6057 canSee (Lnet/minecraft/class_1297;)Z ARG 1 entity METHOD method_6058 getActiveHand ()Lnet/minecraft/class_1268; @@ -539,8 +536,7 @@ CLASS net/minecraft/class_1309 net/minecraft/entity/LivingEntity METHOD method_6088 getActiveStatusEffects ()Ljava/util/Map; METHOD method_6089 containsOnlyAmbientEffects (Ljava/util/Collection;)Z ARG 0 effects - METHOD method_6090 takeShieldHit (Lnet/minecraft/class_1309;)V - ARG 1 attacker + METHOD method_6090 takeShieldHit (Lnet/minecraft/class_3218;Lnet/minecraft/class_1309;)V METHOD method_6091 travel (Lnet/minecraft/class_243;)V COMMENT Allows you to do certain speed and velocity calculations. This is useful for custom vehicle behavior, or custom entity movement. This is not to be confused with AI. COMMENT diff --git a/mappings/net/minecraft/entity/decoration/painting/PaintingEntity.mapping b/mappings/net/minecraft/entity/decoration/painting/PaintingEntity.mapping index cdbfd6bb09..91c6d7739f 100644 --- a/mappings/net/minecraft/entity/decoration/painting/PaintingEntity.mapping +++ b/mappings/net/minecraft/entity/decoration/painting/PaintingEntity.mapping @@ -1,6 +1,5 @@ CLASS net/minecraft/class_1534 net/minecraft/entity/decoration/painting/PaintingEntity FIELD field_38941 VARIANT Lnet/minecraft/class_2940; - FIELD field_49239 VARIANT_ENTRY_CODEC Lcom/mojang/serialization/Codec; METHOD (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;)V ARG 1 world ARG 2 pos diff --git a/mappings/net/minecraft/entity/passive/AnimalTemperature.mapping b/mappings/net/minecraft/entity/passive/AnimalTemperature.mapping deleted file mode 100644 index 97a62e3077..0000000000 --- a/mappings/net/minecraft/entity/passive/AnimalTemperature.mapping +++ /dev/null @@ -1,7 +0,0 @@ -CLASS net/minecraft/class_10589 net/minecraft/entity/passive/AnimalTemperature - COMMENT Represents temperatures associated with {@linkplain net.minecraft.entity.passive.PigVariant pig} - COMMENT and {@linkplain net.minecraft.entity.passive.FrogVariant frog} variants. - FIELD field_55703 name Ljava/lang/String; - METHOD (Ljava/lang/String;ILjava/lang/String;)V - ARG 3 name - METHOD method_66321 getName ()Ljava/lang/String; diff --git a/mappings/net/minecraft/entity/passive/CatEntity.mapping b/mappings/net/minecraft/entity/passive/CatEntity.mapping index d486106067..933becf6ba 100644 --- a/mappings/net/minecraft/entity/passive/CatEntity.mapping +++ b/mappings/net/minecraft/entity/passive/CatEntity.mapping @@ -45,8 +45,6 @@ CLASS net/minecraft/class_1451 net/minecraft/entity/passive/CatEntity METHOD method_47843 getVariant ()Lnet/minecraft/class_6880; METHOD method_58168 tryTame (Lnet/minecraft/class_1657;)V ARG 1 player - METHOD method_58364 (Lnet/minecraft/class_2960;)Lnet/minecraft/class_5321; - ARG 0 id METHOD method_58365 (Lnet/minecraft/class_1799;)Z ARG 0 stack METHOD method_61467 isNearSleepingPlayer ()Z diff --git a/mappings/net/minecraft/entity/passive/CatVariant.mapping b/mappings/net/minecraft/entity/passive/CatVariant.mapping index 7169f1306a..81b2b02233 100644 --- a/mappings/net/minecraft/entity/passive/CatVariant.mapping +++ b/mappings/net/minecraft/entity/passive/CatVariant.mapping @@ -1,11 +1,3 @@ CLASS net/minecraft/class_7375 net/minecraft/entity/passive/CatVariant FIELD field_51941 PACKET_CODEC Lnet/minecraft/class_9139; FIELD field_55959 CODEC Lcom/mojang/serialization/Codec; - METHOD method_43090 register (Lnet/minecraft/class_2378;Lnet/minecraft/class_5321;Ljava/lang/String;)Lnet/minecraft/class_7375; - ARG 0 registry - ARG 1 key - ARG 2 textureId - METHOD method_46646 registerAndGetDefault (Lnet/minecraft/class_2378;)Lnet/minecraft/class_7375; - ARG 0 registry - METHOD method_46647 of (Ljava/lang/String;)Lnet/minecraft/class_5321; - ARG 0 id diff --git a/mappings/net/minecraft/entity/passive/FrogEntity.mapping b/mappings/net/minecraft/entity/passive/FrogEntity.mapping index 2a72685553..0d40ecec1a 100644 --- a/mappings/net/minecraft/entity/passive/FrogEntity.mapping +++ b/mappings/net/minecraft/entity/passive/FrogEntity.mapping @@ -7,7 +7,6 @@ CLASS net/minecraft/class_7102 net/minecraft/entity/passive/FrogEntity FIELD field_37456 idlingInWaterAnimationState Lnet/minecraft/class_7094; FIELD field_37457 VARIANT Lnet/minecraft/class_2940; FIELD field_37458 TARGET Lnet/minecraft/class_2940; - FIELD field_38720 VARIANT_KEY Ljava/lang/String; FIELD field_49988 DEFAULT_VARIANT_KEY Lnet/minecraft/class_5321; METHOD method_41352 setFrogTarget (Lnet/minecraft/class_1297;)V ARG 1 entity @@ -25,8 +24,6 @@ CLASS net/minecraft/class_7102 net/minecraft/entity/passive/FrogEntity ARG 2 reason ARG 3 pos ARG 4 random - METHOD method_58389 (Lnet/minecraft/class_2960;)Lnet/minecraft/class_5321; - ARG 0 variant CLASS class_7103 FrogLookControl METHOD (Lnet/minecraft/class_7102;Lnet/minecraft/class_1308;)V ARG 2 entity diff --git a/mappings/net/minecraft/entity/passive/FrogVariant.mapping b/mappings/net/minecraft/entity/passive/FrogVariant.mapping index 25a526a1cb..bd2ab0e897 100644 --- a/mappings/net/minecraft/entity/passive/FrogVariant.mapping +++ b/mappings/net/minecraft/entity/passive/FrogVariant.mapping @@ -1,14 +1,3 @@ CLASS net/minecraft/class_7106 net/minecraft/entity/passive/FrogVariant - FIELD field_37462 TEMPERATE Lnet/minecraft/class_5321; - FIELD field_37463 WARM Lnet/minecraft/class_5321; - FIELD field_37464 COLD Lnet/minecraft/class_5321; FIELD field_51942 PACKET_CODEC Lnet/minecraft/class_9139; FIELD field_55961 CODEC Lcom/mojang/serialization/Codec; - METHOD method_43091 register (Lnet/minecraft/class_2378;Lnet/minecraft/class_5321;Ljava/lang/String;)Lnet/minecraft/class_7106; - ARG 0 registry - ARG 1 key - ARG 2 id - METHOD method_58368 of (Ljava/lang/String;)Lnet/minecraft/class_5321; - ARG 0 id - METHOD method_58369 registerAndGetDefault (Lnet/minecraft/class_2378;)Lnet/minecraft/class_7106; - ARG 0 registry diff --git a/mappings/net/minecraft/entity/passive/PigEntity.mapping b/mappings/net/minecraft/entity/passive/PigEntity.mapping index 48f5554674..0f45bbe3bb 100644 --- a/mappings/net/minecraft/entity/passive/PigEntity.mapping +++ b/mappings/net/minecraft/entity/passive/PigEntity.mapping @@ -9,12 +9,6 @@ CLASS net/minecraft/class_1452 net/minecraft/entity/passive/PigEntity ARG 0 stack METHOD method_63649 (Lnet/minecraft/class_1590;)V ARG 1 zombifiedPiglin - METHOD method_66295 (Lnet/minecraft/class_5321;)Ljava/util/Optional; - ARG 1 variantKey - METHOD method_66296 (Lnet/minecraft/class_2960;)Lnet/minecraft/class_5321; - ARG 0 variantId - METHOD method_66297 (Lnet/minecraft/class_2487;Lnet/minecraft/class_5321;)V - ARG 1 variantKey METHOD method_66298 setVariant (Lnet/minecraft/class_6880;)V ARG 1 variant METHOD method_66299 getVariant ()Lnet/minecraft/class_6880; diff --git a/mappings/net/minecraft/entity/passive/PigVariant.mapping b/mappings/net/minecraft/entity/passive/PigVariant.mapping index 743f4fa589..ef0c011703 100644 --- a/mappings/net/minecraft/entity/passive/PigVariant.mapping +++ b/mappings/net/minecraft/entity/passive/PigVariant.mapping @@ -1,47 +1,7 @@ CLASS net/minecraft/class_10586 net/minecraft/entity/passive/PigVariant FIELD field_55680 CODEC Lcom/mojang/serialization/Codec; - FIELD field_55681 PACKET_CODEC Lnet/minecraft/class_9139; FIELD field_55682 ENTRY_CODEC Lcom/mojang/serialization/Codec; FIELD field_55683 ENTRY_PACKET_CODEC Lnet/minecraft/class_9139; - FIELD field_55684 model Lnet/minecraft/class_10586$class_10587; - FIELD field_55685 id Lnet/minecraft/class_2960; - FIELD field_55686 textureId Lnet/minecraft/class_2960; - FIELD field_55687 biomes Ljava/util/Optional; - METHOD (Lnet/minecraft/class_10586$class_10587;Lnet/minecraft/class_2960;Ljava/util/Optional;)V - ARG 1 model - ARG 2 id - ARG 3 biomes - METHOD equals (Ljava/lang/Object;)Z - ARG 1 o - METHOD method_66300 getModel ()Lnet/minecraft/class_10586$class_10587; - METHOD method_66301 (Lnet/minecraft/class_10586;)Ljava/util/Optional; - ARG 0 variant - METHOD method_66302 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; - ARG 0 instance - METHOD method_66303 (Ljava/lang/String;)Ljava/lang/String; - ARG 0 path - METHOD method_66304 getTextureId ()Lnet/minecraft/class_2960; - METHOD method_66305 (Lnet/minecraft/class_10586;)Lnet/minecraft/class_2960; - ARG 0 variant - METHOD method_66306 getBiomes ()Ljava/util/Optional; - METHOD method_66307 (Lnet/minecraft/class_10586;)Lnet/minecraft/class_10586$class_10587; - ARG 0 variant - METHOD method_66308 (Lnet/minecraft/class_10586;)Ljava/util/Optional; - ARG 0 variant - METHOD method_66309 (Lnet/minecraft/class_10586;)Lnet/minecraft/class_2960; - ARG 0 variant - METHOD method_66310 (Lnet/minecraft/class_10586;)Lnet/minecraft/class_10586$class_10587; - ARG 0 variant CLASS class_10587 Model FIELD field_55690 CODEC Lcom/mojang/serialization/Codec; - FIELD field_55691 PACKET_CODEC Lnet/minecraft/class_9139; - FIELD field_55692 BY_ID Ljava/util/function/IntFunction; - FIELD field_55693 id I FIELD field_55694 name Ljava/lang/String; - METHOD (Ljava/lang/String;IILjava/lang/String;)V - ARG 3 id - ARG 4 name - METHOD method_66312 (Lnet/minecraft/class_10586$class_10587;)I - ARG 0 model - METHOD method_66313 (Lnet/minecraft/class_10586$class_10587;)I - ARG 0 model diff --git a/mappings/net/minecraft/entity/passive/PigVariants.mapping b/mappings/net/minecraft/entity/passive/PigVariants.mapping index 4e10deec93..d927c299e7 100644 --- a/mappings/net/minecraft/entity/passive/PigVariants.mapping +++ b/mappings/net/minecraft/entity/passive/PigVariants.mapping @@ -3,16 +3,9 @@ CLASS net/minecraft/class_10588 net/minecraft/entity/passive/PigVariants FIELD field_55697 WARM Lnet/minecraft/class_5321; FIELD field_55698 COLD Lnet/minecraft/class_5321; FIELD field_55699 DEFAULT Lnet/minecraft/class_5321; - METHOD method_66314 fromBiome (Lnet/minecraft/class_5819;Lnet/minecraft/class_5455;Lnet/minecraft/class_6880;)Ljava/util/Optional; - ARG 0 random + METHOD method_66314 fromBiome (Lnet/minecraft/class_5819;Lnet/minecraft/class_5455;Lnet/minecraft/class_10701;)Ljava/util/Optional; ARG 1 registries - ARG 2 biomes - METHOD method_66315 of (Ljava/lang/String;)Lnet/minecraft/class_5321; - ARG 0 path - METHOD method_66316 (Lnet/minecraft/class_6880$class_6883;)Z - ARG 0 variant - METHOD method_66317 (Lnet/minecraft/class_6880;Lnet/minecraft/class_6880$class_6883;)Z - ARG 1 variant + METHOD method_66315 of (Lnet/minecraft/class_2960;)Lnet/minecraft/class_5321; METHOD method_66318 bootstrap (Lnet/minecraft/class_7891;)V ARG 0 registry METHOD method_66319 register (Lnet/minecraft/class_7891;Lnet/minecraft/class_5321;Lnet/minecraft/class_10586$class_10587;Ljava/lang/String;Lnet/minecraft/class_6862;)V @@ -21,9 +14,8 @@ CLASS net/minecraft/class_10588 net/minecraft/entity/passive/PigVariants ARG 2 model ARG 3 textureName ARG 4 biomes - METHOD method_66320 register (Lnet/minecraft/class_7891;Lnet/minecraft/class_5321;Lnet/minecraft/class_10586$class_10587;Ljava/lang/String;Ljava/util/Optional;)V + METHOD method_66320 register (Lnet/minecraft/class_7891;Lnet/minecraft/class_5321;Lnet/minecraft/class_10586$class_10587;Ljava/lang/String;Lnet/minecraft/class_10702;)V ARG 0 registry ARG 1 key ARG 2 model ARG 3 textureName - ARG 4 biomes diff --git a/mappings/net/minecraft/entity/passive/WolfEntity.mapping b/mappings/net/minecraft/entity/passive/WolfEntity.mapping index a8a43a20c5..e8c6e5df9e 100644 --- a/mappings/net/minecraft/entity/passive/WolfEntity.mapping +++ b/mappings/net/minecraft/entity/passive/WolfEntity.mapping @@ -27,18 +27,12 @@ CLASS net/minecraft/class_1493 net/minecraft/entity/passive/WolfEntity ARG 4 random METHOD method_57304 shouldArmorAbsorbDamage (Lnet/minecraft/class_1282;)Z ARG 1 source - METHOD method_58059 (Lnet/minecraft/class_5321;)Ljava/util/Optional; - ARG 1 variantKey - METHOD method_58060 (Lnet/minecraft/class_2960;)Lnet/minecraft/class_5321; - ARG 0 variantId METHOD method_58061 getTextureId ()Lnet/minecraft/class_2960; METHOD method_58062 getVariant ()Lnet/minecraft/class_6880; METHOD method_58063 setVariant (Lnet/minecraft/class_6880;)V ARG 1 variant METHOD method_58169 tryTame (Lnet/minecraft/class_1657;)V ARG 1 player - METHOD method_59937 (Lnet/minecraft/class_2487;Lnet/minecraft/class_5321;)V - ARG 1 key METHOD method_61477 getShakeProgress (F)F ARG 1 tickDelta METHOD method_6707 getFurWetBrightnessMultiplier (F)F diff --git a/mappings/net/minecraft/entity/passive/WolfVariant.mapping b/mappings/net/minecraft/entity/passive/WolfVariant.mapping index 01de168619..79f1acdff4 100644 --- a/mappings/net/minecraft/entity/passive/WolfVariant.mapping +++ b/mappings/net/minecraft/entity/passive/WolfVariant.mapping @@ -1,35 +1,4 @@ CLASS net/minecraft/class_9346 net/minecraft/entity/passive/WolfVariant FIELD field_49724 CODEC Lcom/mojang/serialization/Codec; FIELD field_49980 ENTRY_CODEC Lcom/mojang/serialization/Codec; - FIELD field_49981 wildId Lnet/minecraft/class_2960; - FIELD field_49982 tameId Lnet/minecraft/class_2960; - FIELD field_49983 angryId Lnet/minecraft/class_2960; - FIELD field_49984 wildTextureId Lnet/minecraft/class_2960; - FIELD field_49985 tameTextureId Lnet/minecraft/class_2960; - FIELD field_49986 angryTextureId Lnet/minecraft/class_2960; - FIELD field_49987 biomes Lnet/minecraft/class_6885; - FIELD field_51943 PACKET_CODEC Lnet/minecraft/class_9139; FIELD field_51944 ENTRY_PACKET_CODEC Lnet/minecraft/class_9139; - METHOD (Lnet/minecraft/class_2960;Lnet/minecraft/class_2960;Lnet/minecraft/class_2960;Lnet/minecraft/class_6885;)V - ARG 1 wildId - ARG 2 tameId - ARG 3 angryId - ARG 4 biomes - METHOD equals (Ljava/lang/Object;)Z - ARG 1 o - METHOD method_58064 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; - ARG 0 instance - METHOD method_58377 getWildTextureId ()Lnet/minecraft/class_2960; - METHOD method_58378 getTextureId (Lnet/minecraft/class_2960;)Lnet/minecraft/class_2960; - ARG 0 id - METHOD method_58379 (Lnet/minecraft/class_9346;)Lnet/minecraft/class_2960; - ARG 0 wolfVariant - METHOD method_58380 (Ljava/lang/String;)Ljava/lang/String; - ARG 0 oldPath - METHOD method_58381 getTameTextureId ()Lnet/minecraft/class_2960; - METHOD method_58382 (Lnet/minecraft/class_9346;)Lnet/minecraft/class_2960; - ARG 0 wolfVariant - METHOD method_58383 getAngryTextureId ()Lnet/minecraft/class_2960; - METHOD method_58384 (Lnet/minecraft/class_9346;)Lnet/minecraft/class_2960; - ARG 0 wolfVariant - METHOD method_58385 getBiomes ()Lnet/minecraft/class_6885; diff --git a/mappings/net/minecraft/entity/passive/WolfVariants.mapping b/mappings/net/minecraft/entity/passive/WolfVariants.mapping index fecf092cb2..233fae958f 100644 --- a/mappings/net/minecraft/entity/passive/WolfVariants.mapping +++ b/mappings/net/minecraft/entity/passive/WolfVariants.mapping @@ -1,12 +1,7 @@ CLASS net/minecraft/class_9347 net/minecraft/entity/passive/WolfVariants FIELD field_51588 DEFAULT Lnet/minecraft/class_5321; - METHOD method_58065 (Lnet/minecraft/class_6880;Lnet/minecraft/class_6880$class_6883;)Z - ARG 1 entry METHOD method_58066 of (Ljava/lang/String;)Lnet/minecraft/class_5321; ARG 0 id - METHOD method_58067 fromBiome (Lnet/minecraft/class_5455;Lnet/minecraft/class_6880;)Lnet/minecraft/class_6880; - ARG 0 dynamicRegistryManager - ARG 1 biome METHOD method_58068 bootstrap (Lnet/minecraft/class_7891;)V ARG 0 registry METHOD method_58069 register (Lnet/minecraft/class_7891;Lnet/minecraft/class_5321;Ljava/lang/String;Lnet/minecraft/class_5321;)V @@ -19,8 +14,7 @@ CLASS net/minecraft/class_9347 net/minecraft/entity/passive/WolfVariants ARG 1 key ARG 2 textureName ARG 3 biomeTag - METHOD method_58171 register (Lnet/minecraft/class_7891;Lnet/minecraft/class_5321;Ljava/lang/String;Lnet/minecraft/class_6885;)V + METHOD method_58171 register (Lnet/minecraft/class_7891;Lnet/minecraft/class_5321;Ljava/lang/String;Lnet/minecraft/class_10702;)V ARG 0 registry ARG 1 key ARG 2 textureName - ARG 3 biomes diff --git a/mappings/net/minecraft/entity/player/PlayerEntity.mapping b/mappings/net/minecraft/entity/player/PlayerEntity.mapping index cbbbabc698..afb80669f5 100644 --- a/mappings/net/minecraft/entity/player/PlayerEntity.mapping +++ b/mappings/net/minecraft/entity/player/PlayerEntity.mapping @@ -233,8 +233,6 @@ CLASS net/minecraft/class_1657 net/minecraft/entity/player/PlayerEntity ARG 1 stat METHOD method_7283 setMainArm (Lnet/minecraft/class_1306;)V ARG 1 arm - METHOD method_7284 disableShield (Lnet/minecraft/class_1799;)V - ARG 1 shield METHOD method_7285 addScore (I)V ARG 1 score METHOD method_7286 applyEnchantmentCosts (Lnet/minecraft/class_1799;I)V diff --git a/mappings/net/minecraft/entity/projectile/thrown/PotionEntity.mapping b/mappings/net/minecraft/entity/projectile/thrown/PotionEntity.mapping index cea46e92e8..ed3ce0fd0a 100644 --- a/mappings/net/minecraft/entity/projectile/thrown/PotionEntity.mapping +++ b/mappings/net/minecraft/entity/projectile/thrown/PotionEntity.mapping @@ -1,29 +1,6 @@ CLASS net/minecraft/class_1686 net/minecraft/entity/projectile/thrown/PotionEntity FIELD field_40737 AFFECTED_BY_WATER Ljava/util/function/Predicate; - METHOD (Lnet/minecraft/class_1937;DDDLnet/minecraft/class_1799;)V - ARG 1 world - ARG 2 x - ARG 4 y - ARG 6 z - ARG 8 stack - METHOD (Lnet/minecraft/class_1937;Lnet/minecraft/class_1309;Lnet/minecraft/class_1799;)V - ARG 1 world - ARG 2 owner - ARG 3 stack METHOD method_46401 (Lnet/minecraft/class_1309;)Z ARG 0 entity - METHOD method_48575 (FDI)I - ARG 3 duration - METHOD method_7497 applyLingeringPotion (Lnet/minecraft/class_1844;F)V - ARG 1 potion - ARG 2 durationScale - METHOD method_7498 applySplashPotion (Lnet/minecraft/class_3218;Ljava/lang/Iterable;FLnet/minecraft/class_1297;)V - ARG 1 world - ARG 2 effects - ARG 3 durationScale - ARG 4 hitEntity METHOD method_7499 extinguishFire (Lnet/minecraft/class_2338;)V ARG 1 pos - METHOD method_7500 applyWater (Lnet/minecraft/class_3218;)V - ARG 1 world - METHOD method_7501 isLingering ()Z diff --git a/mappings/net/minecraft/item/AirBlockItem.mapping b/mappings/net/minecraft/item/AirBlockItem.mapping index 2d89ddbe75..77f149da5e 100644 --- a/mappings/net/minecraft/item/AirBlockItem.mapping +++ b/mappings/net/minecraft/item/AirBlockItem.mapping @@ -1,5 +1,4 @@ CLASS net/minecraft/class_1739 net/minecraft/item/AirBlockItem - FIELD field_7882 block Lnet/minecraft/class_2248; METHOD (Lnet/minecraft/class_2248;Lnet/minecraft/class_1792$class_1793;)V ARG 1 block ARG 2 settings diff --git a/mappings/net/minecraft/item/AnimalArmorItem.mapping b/mappings/net/minecraft/item/AnimalArmorItem.mapping deleted file mode 100644 index c6b3f3bd31..0000000000 --- a/mappings/net/minecraft/item/AnimalArmorItem.mapping +++ /dev/null @@ -1,18 +0,0 @@ -CLASS net/minecraft/class_4059 net/minecraft/item/AnimalArmorItem - FIELD field_47824 type Lnet/minecraft/class_4059$class_9076; - METHOD (Lnet/minecraft/class_1741;Lnet/minecraft/class_4059$class_9076;Lnet/minecraft/class_1792$class_1793;)V - ARG 1 material - ARG 2 type - ARG 3 settings - METHOD (Lnet/minecraft/class_1741;Lnet/minecraft/class_4059$class_9076;Lnet/minecraft/class_6880;ZLnet/minecraft/class_1792$class_1793;)V - ARG 1 material - ARG 2 type - ARG 3 equipSound - ARG 4 damageOnHurt - ARG 5 settings - CLASS class_9076 Type - FIELD field_49256 breakSound Lnet/minecraft/class_3414; - FIELD field_54108 allowedEntities Lnet/minecraft/class_6885; - METHOD (Ljava/lang/String;ILnet/minecraft/class_3414;[Lnet/minecraft/class_1299;)V - ARG 3 breakSound - ARG 4 allowedEntities diff --git a/mappings/net/minecraft/item/BannerItem.mapping b/mappings/net/minecraft/item/BannerItem.mapping index dec1333628..6110423d3b 100644 --- a/mappings/net/minecraft/item/BannerItem.mapping +++ b/mappings/net/minecraft/item/BannerItem.mapping @@ -3,7 +3,4 @@ CLASS net/minecraft/class_1746 net/minecraft/item/BannerItem ARG 1 bannerBlock ARG 2 wallBannerBlock ARG 3 settings - METHOD method_7705 appendBannerTooltip (Lnet/minecraft/class_1799;Ljava/util/List;)V - ARG 0 stack - ARG 1 tooltip METHOD method_7706 getColor ()Lnet/minecraft/class_1767; diff --git a/mappings/net/minecraft/item/BannerPatternItem.mapping b/mappings/net/minecraft/item/BannerPatternItem.mapping deleted file mode 100644 index f62a56790a..0000000000 --- a/mappings/net/minecraft/item/BannerPatternItem.mapping +++ /dev/null @@ -1,6 +0,0 @@ -CLASS net/minecraft/class_1745 net/minecraft/item/BannerPatternItem - FIELD field_7900 patternItemTag Lnet/minecraft/class_6862; - METHOD (Lnet/minecraft/class_6862;Lnet/minecraft/class_1792$class_1793;)V - ARG 1 patternItemTag - ARG 2 settings - METHOD method_7704 getPattern ()Lnet/minecraft/class_6862; diff --git a/mappings/net/minecraft/item/BlockPredicatesChecker.mapping b/mappings/net/minecraft/item/BlockPredicatesChecker.mapping index 361b689e7a..31b0dbe196 100644 --- a/mappings/net/minecraft/item/BlockPredicatesChecker.mapping +++ b/mappings/net/minecraft/item/BlockPredicatesChecker.mapping @@ -15,15 +15,11 @@ CLASS net/minecraft/class_6538 net/minecraft/item/BlockPredicatesChecker FIELD field_49246 PACKET_CODEC Lnet/minecraft/class_9139; FIELD field_49247 CAN_BREAK_TEXT Lnet/minecraft/class_2561; FIELD field_49248 CAN_PLACE_TEXT Lnet/minecraft/class_2561; - FIELD field_49249 SINGLE_CODEC Lcom/mojang/serialization/Codec; - FIELD field_49250 FULL_CODEC Lcom/mojang/serialization/Codec; FIELD field_49251 CAN_USE_UNKNOWN_TEXT Lnet/minecraft/class_2561; FIELD field_49252 predicates Ljava/util/List; - FIELD field_49253 showInTooltip Z FIELD field_49254 tooltipText Ljava/util/List; - METHOD (Ljava/util/List;Z)V + METHOD (Ljava/util/List;)V ARG 1 predicates - ARG 2 showInTooltip METHOD equals (Ljava/lang/Object;)Z ARG 1 o METHOD method_38070 check (Lnet/minecraft/class_2694;)Z @@ -34,23 +30,12 @@ CLASS net/minecraft/class_6538 net/minecraft/item/BlockPredicatesChecker ARG 0 pos ARG 1 cachedPos ARG 2 nbtAware - METHOD method_57324 showInTooltip ()Z METHOD method_57325 (Lnet/minecraft/class_4550;)Ljava/util/stream/Stream; ARG 0 predicate - METHOD method_57326 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; - ARG 0 instance METHOD method_57327 (Lnet/minecraft/class_6538;)Ljava/util/List; ARG 0 blockPredicatesChecker METHOD method_57329 createTooltipText (Ljava/util/List;)Ljava/util/List; ARG 0 blockPredicates METHOD method_57330 addTooltips (Ljava/util/function/Consumer;)V ARG 1 adder - METHOD method_57332 (Lnet/minecraft/class_4550;)Lnet/minecraft/class_6538; - ARG 0 predicate - METHOD method_57333 (Lnet/minecraft/class_6538;)Ljava/util/List; - ARG 0 checker - METHOD method_57334 (Lnet/minecraft/class_6538;)Lcom/mojang/serialization/DataResult; - ARG 0 checker - METHOD method_58402 withShowInTooltip (Z)Lnet/minecraft/class_6538; - ARG 1 showInTooltip METHOD method_65042 getOrCreateTooltipText ()Ljava/util/List; diff --git a/mappings/net/minecraft/item/CrossbowItem.mapping b/mappings/net/minecraft/item/CrossbowItem.mapping index c6346bc43f..5a11fb8e55 100644 --- a/mappings/net/minecraft/item/CrossbowItem.mapping +++ b/mappings/net/minecraft/item/CrossbowItem.mapping @@ -21,8 +21,6 @@ CLASS net/minecraft/class_1764 net/minecraft/item/CrossbowItem ARG 2 sound METHOD method_59974 (Lnet/minecraft/class_1937;Lnet/minecraft/class_1309;Lnet/minecraft/class_6880;)V ARG 2 sound - METHOD method_59975 (Lnet/minecraft/class_1937;Lnet/minecraft/class_1309;Lnet/minecraft/class_6880;)V - ARG 2 sound METHOD method_59976 getLoadingSounds (Lnet/minecraft/class_1799;)Lnet/minecraft/class_1764$class_9693; ARG 1 stack METHOD method_7767 loadProjectiles (Lnet/minecraft/class_1309;Lnet/minecraft/class_1799;)Z diff --git a/mappings/net/minecraft/item/FilledMapItem.mapping b/mappings/net/minecraft/item/FilledMapItem.mapping index a3ca26ba41..94e32ae0aa 100644 --- a/mappings/net/minecraft/item/FilledMapItem.mapping +++ b/mappings/net/minecraft/item/FilledMapItem.mapping @@ -14,8 +14,6 @@ CLASS net/minecraft/class_1806 net/minecraft/item/FilledMapItem ARG 0 biomes ARG 1 x ARG 2 z - METHOD method_53836 getIdText (Lnet/minecraft/class_9209;)Lnet/minecraft/class_2561; - ARG 0 id METHOD method_7995 getFluidStateIfVisible (Lnet/minecraft/class_1937;Lnet/minecraft/class_2680;Lnet/minecraft/class_2338;)Lnet/minecraft/class_2680; ARG 1 world ARG 2 state diff --git a/mappings/net/minecraft/item/FireworkStarItem.mapping b/mappings/net/minecraft/item/FireworkStarItem.mapping deleted file mode 100644 index 19c3c72276..0000000000 --- a/mappings/net/minecraft/item/FireworkStarItem.mapping +++ /dev/null @@ -1 +0,0 @@ -CLASS net/minecraft/class_1780 net/minecraft/item/FireworkStarItem diff --git a/mappings/net/minecraft/item/GoatHornItem.mapping b/mappings/net/minecraft/item/GoatHornItem.mapping index 48b45e8160..c344a42ced 100644 --- a/mappings/net/minecraft/item/GoatHornItem.mapping +++ b/mappings/net/minecraft/item/GoatHornItem.mapping @@ -1,8 +1,4 @@ CLASS net/minecraft/class_7430 net/minecraft/item/GoatHornItem - FIELD field_39123 instrumentTag Lnet/minecraft/class_6862; - METHOD (Lnet/minecraft/class_6862;Lnet/minecraft/class_1792$class_1793;)V - ARG 1 instrumentTag - ARG 2 settings METHOD method_43558 getStackForInstrument (Lnet/minecraft/class_1792;Lnet/minecraft/class_6880;)Lnet/minecraft/class_1799; ARG 0 item ARG 1 instrument diff --git a/mappings/net/minecraft/item/Item.mapping b/mappings/net/minecraft/item/Item.mapping index ed24f858ec..6f93f03897 100644 --- a/mappings/net/minecraft/item/Item.mapping +++ b/mappings/net/minecraft/item/Item.mapping @@ -119,7 +119,6 @@ CLASS net/minecraft/class_1792 net/minecraft/item/Item ARG 1 stack ARG 2 world ARG 3 player - METHOD method_57336 getBreakSound ()Lnet/minecraft/class_3414; METHOD method_57347 getComponents ()Lnet/minecraft/class_9323; METHOD method_58403 getBonusAttackDamage (Lnet/minecraft/class_1297;FLnet/minecraft/class_1282;)F ARG 1 target @@ -201,14 +200,6 @@ CLASS net/minecraft/class_1792 net/minecraft/item/Item ARG 2 user ARG 3 entity ARG 4 hand - METHOD method_7851 appendTooltip (Lnet/minecraft/class_1799;Lnet/minecraft/class_1792$class_9635;Ljava/util/List;Lnet/minecraft/class_1836;)V - COMMENT Called by the client to append tooltips to an item. Subclasses can override - COMMENT this and add custom tooltips to {@code tooltip} list. - ARG 1 stack - ARG 2 context - ARG 3 tooltip - COMMENT the list of tooltips to show - ARG 4 type METHOD method_7852 usageTick (Lnet/minecraft/class_1937;Lnet/minecraft/class_1309;Lnet/minecraft/class_1799;I)V COMMENT Called on both the server and the client every tick while an entity uses COMMENT the item. Currently used by {@link CrossbowItem} to charge the crossbow. @@ -406,12 +397,11 @@ CLASS net/minecraft/class_1792 net/minecraft/item/Item ARG 1 material ARG 2 attackDamage ARG 3 attackSpeed - METHOD method_66331 tool (Lnet/minecraft/class_9886;Lnet/minecraft/class_6862;FFZ)Lnet/minecraft/class_1792$class_1793; + METHOD method_66331 tool (Lnet/minecraft/class_9886;Lnet/minecraft/class_6862;FFF)Lnet/minecraft/class_1792$class_1793; ARG 1 material ARG 2 effectiveBlocks ARG 3 attackDamage ARG 4 attackSpeed - ARG 5 canDisableBlocking METHOD method_66332 armor (Lnet/minecraft/class_1741;Lnet/minecraft/class_8051;)Lnet/minecraft/class_1792$class_1793; ARG 1 material ARG 2 type diff --git a/mappings/net/minecraft/item/ItemStack.mapping b/mappings/net/minecraft/item/ItemStack.mapping index 679555d2d8..7b75069a44 100644 --- a/mappings/net/minecraft/item/ItemStack.mapping +++ b/mappings/net/minecraft/item/ItemStack.mapping @@ -201,7 +201,6 @@ CLASS net/minecraft/class_1799 net/minecraft/item/ItemStack COMMENT is a creative mode player. ARG 1 amount ARG 2 entity - METHOD method_57351 getBreakSound ()Lnet/minecraft/class_3414; METHOD method_57352 (Lcom/mojang/serialization/Codec;)Lcom/mojang/serialization/MapCodec; ARG 0 codec METHOD method_57354 applyAttributeModifiers (Lnet/minecraft/class_1304;Ljava/util/function/BiConsumer;)V @@ -226,9 +225,8 @@ CLASS net/minecraft/class_1799 net/minecraft/item/ItemStack METHOD method_57362 stacksEqual (Ljava/util/List;Ljava/util/List;)Z ARG 0 left ARG 1 right - METHOD method_57363 appendAttributeModifiersTooltip (Ljava/util/function/Consumer;Lnet/minecraft/class_1657;)V + METHOD method_57363 appendAttributeModifiersTooltip (Ljava/util/function/Consumer;Lnet/minecraft/class_10712;Lnet/minecraft/class_1657;)V ARG 1 textConsumer - ARG 2 player METHOD method_57364 appendAttributeModifierTooltip (Ljava/util/function/Consumer;Lnet/minecraft/class_1657;Lnet/minecraft/class_6880;Lnet/minecraft/class_1322;)V ARG 1 textConsumer ARG 2 player @@ -272,11 +270,9 @@ CLASS net/minecraft/class_1799 net/minecraft/item/ItemStack ARG 1 type ARG 2 defaultValue ARG 3 applier - METHOD method_57369 appendTooltip (Lnet/minecraft/class_9331;Lnet/minecraft/class_1792$class_9635;Ljava/util/function/Consumer;Lnet/minecraft/class_1836;)V + METHOD method_57369 appendTooltip (Lnet/minecraft/class_9331;Lnet/minecraft/class_1792$class_9635;Lnet/minecraft/class_10712;Ljava/util/function/Consumer;Lnet/minecraft/class_1836;)V ARG 1 componentType ARG 2 context - ARG 3 textConsumer - ARG 4 type METHOD method_57370 (Lorg/apache/commons/lang3/mutable/MutableBoolean;Ljava/util/function/Consumer;Lnet/minecraft/class_9274;Lnet/minecraft/class_1657;Lnet/minecraft/class_6880;Lnet/minecraft/class_1322;)V ARG 5 attribute ARG 6 modifier @@ -483,7 +479,6 @@ CLASS net/minecraft/class_1799 net/minecraft/item/ItemStack METHOD method_7950 getTooltip (Lnet/minecraft/class_1792$class_9635;Lnet/minecraft/class_1657;Lnet/minecraft/class_1836;)Ljava/util/List; ARG 1 context ARG 2 player - ARG 3 type METHOD method_7951 isSuitableFor (Lnet/minecraft/class_2680;)Z COMMENT Determines whether this item can be used as a suitable tool for mining the specified block. COMMENT

diff --git a/mappings/net/minecraft/item/Items.mapping b/mappings/net/minecraft/item/Items.mapping index 31bffe3e70..632325a8b9 100644 --- a/mappings/net/minecraft/item/Items.mapping +++ b/mappings/net/minecraft/item/Items.mapping @@ -1331,8 +1331,6 @@ CLASS net/minecraft/class_1802 net/minecraft/item/Items ARG 0 settings METHOD method_63870 (Lnet/minecraft/class_1792$class_1793;)Lnet/minecraft/class_1792; ARG 0 settings - METHOD method_63872 (Lnet/minecraft/class_1792$class_1793;)Lnet/minecraft/class_1792; - ARG 0 settings METHOD method_63874 (Lnet/minecraft/class_1792$class_1793;)Lnet/minecraft/class_1792; ARG 0 settings METHOD method_63875 (Lnet/minecraft/class_1792$class_1793;)Lnet/minecraft/class_1792; @@ -1453,81 +1451,51 @@ CLASS net/minecraft/class_1802 net/minecraft/item/Items METHOD method_63943 (Lnet/minecraft/class_2248;Lnet/minecraft/class_1792$class_1793;)Lnet/minecraft/class_1792; ARG 0 block ARG 1 settings - METHOD method_63944 (Lnet/minecraft/class_1792$class_1793;)Lnet/minecraft/class_1792; - ARG 0 settings METHOD method_63945 (Lnet/minecraft/class_2248;Lnet/minecraft/class_1792$class_1793;)Lnet/minecraft/class_1792; ARG 0 block ARG 1 settings - METHOD method_63946 (Lnet/minecraft/class_1792$class_1793;)Lnet/minecraft/class_1792; - ARG 0 settings METHOD method_63947 (Lnet/minecraft/class_2248;Lnet/minecraft/class_1792$class_1793;)Lnet/minecraft/class_1792; ARG 0 block ARG 1 settings - METHOD method_63948 (Lnet/minecraft/class_1792$class_1793;)Lnet/minecraft/class_1792; - ARG 0 settings METHOD method_63949 (Lnet/minecraft/class_2248;Lnet/minecraft/class_1792$class_1793;)Lnet/minecraft/class_1792; ARG 0 block ARG 1 settings - METHOD method_63950 (Lnet/minecraft/class_1792$class_1793;)Lnet/minecraft/class_1792; - ARG 0 settings METHOD method_63951 (Lnet/minecraft/class_2248;Lnet/minecraft/class_1792$class_1793;)Lnet/minecraft/class_1792; ARG 0 block ARG 1 settings - METHOD method_63952 (Lnet/minecraft/class_1792$class_1793;)Lnet/minecraft/class_1792; - ARG 0 settings METHOD method_63953 (Lnet/minecraft/class_2248;Lnet/minecraft/class_1792$class_1793;)Lnet/minecraft/class_1792; ARG 0 block ARG 1 settings - METHOD method_63954 (Lnet/minecraft/class_1792$class_1793;)Lnet/minecraft/class_1792; - ARG 0 settings METHOD method_63955 (Lnet/minecraft/class_2248;Lnet/minecraft/class_1792$class_1793;)Lnet/minecraft/class_1792; ARG 0 block ARG 1 settings - METHOD method_63956 (Lnet/minecraft/class_1792$class_1793;)Lnet/minecraft/class_1792; - ARG 0 settings METHOD method_63957 (Lnet/minecraft/class_2248;Lnet/minecraft/class_1792$class_1793;)Lnet/minecraft/class_1792; ARG 0 block ARG 1 settings - METHOD method_63958 (Lnet/minecraft/class_1792$class_1793;)Lnet/minecraft/class_1792; - ARG 0 settings METHOD method_63959 (Lnet/minecraft/class_2248;Lnet/minecraft/class_1792$class_1793;)Lnet/minecraft/class_1792; ARG 0 block ARG 1 settings - METHOD method_63960 (Lnet/minecraft/class_1792$class_1793;)Lnet/minecraft/class_1792; - ARG 0 settings METHOD method_63961 (Lnet/minecraft/class_2248;Lnet/minecraft/class_1792$class_1793;)Lnet/minecraft/class_1792; ARG 0 block ARG 1 settings - METHOD method_63962 (Lnet/minecraft/class_1792$class_1793;)Lnet/minecraft/class_1792; - ARG 0 settings METHOD method_63963 (Lnet/minecraft/class_2248;Lnet/minecraft/class_1792$class_1793;)Lnet/minecraft/class_1792; ARG 0 block ARG 1 settings - METHOD method_63964 (Lnet/minecraft/class_1792$class_1793;)Lnet/minecraft/class_1792; - ARG 0 settings METHOD method_63965 (Lnet/minecraft/class_2248;Lnet/minecraft/class_1792$class_1793;)Lnet/minecraft/class_1792; ARG 0 block ARG 1 settings METHOD method_63967 (Lnet/minecraft/class_2248;Lnet/minecraft/class_1792$class_1793;)Lnet/minecraft/class_1792; ARG 0 block ARG 1 settings - METHOD method_63968 (Lnet/minecraft/class_1792$class_1793;)Lnet/minecraft/class_1792; - ARG 0 settings METHOD method_63969 (Lnet/minecraft/class_2248;Lnet/minecraft/class_1792$class_1793;)Lnet/minecraft/class_1792; ARG 0 block ARG 1 settings - METHOD method_63970 (Lnet/minecraft/class_1792$class_1793;)Lnet/minecraft/class_1792; - ARG 0 settings METHOD method_63971 (Lnet/minecraft/class_2248;Lnet/minecraft/class_1792$class_1793;)Lnet/minecraft/class_1792; ARG 0 block ARG 1 settings - METHOD method_63972 (Lnet/minecraft/class_1792$class_1793;)Lnet/minecraft/class_1792; - ARG 0 settings METHOD method_63973 (Lnet/minecraft/class_2248;Lnet/minecraft/class_1792$class_1793;)Lnet/minecraft/class_1792; ARG 0 block ARG 1 settings - METHOD method_63974 (Lnet/minecraft/class_1792$class_1793;)Lnet/minecraft/class_1792; - ARG 0 settings METHOD method_63975 (Lnet/minecraft/class_2248;Lnet/minecraft/class_1792$class_1793;)Lnet/minecraft/class_1792; ARG 0 block ARG 1 settings diff --git a/mappings/net/minecraft/item/ShieldItem.mapping b/mappings/net/minecraft/item/ShieldItem.mapping index 8dd22d2b17..3683df5df8 100644 --- a/mappings/net/minecraft/item/ShieldItem.mapping +++ b/mappings/net/minecraft/item/ShieldItem.mapping @@ -1,2 +1 @@ CLASS net/minecraft/class_1819 net/minecraft/item/ShieldItem - FIELD field_30919 MIN_DAMAGE_AMOUNT_TO_BREAK F diff --git a/mappings/net/minecraft/item/ToolMaterial.mapping b/mappings/net/minecraft/item/ToolMaterial.mapping index ca7c8c7e64..72824ee733 100644 --- a/mappings/net/minecraft/item/ToolMaterial.mapping +++ b/mappings/net/minecraft/item/ToolMaterial.mapping @@ -14,12 +14,11 @@ CLASS net/minecraft/class_9886 net/minecraft/item/ToolMaterial ARG 1 settings ARG 2 attackDamage ARG 3 attackSpeed - METHOD method_61663 applyToolSettings (Lnet/minecraft/class_1792$class_1793;Lnet/minecraft/class_6862;FFZ)Lnet/minecraft/class_1792$class_1793; + METHOD method_61663 applyToolSettings (Lnet/minecraft/class_1792$class_1793;Lnet/minecraft/class_6862;FFF)Lnet/minecraft/class_1792$class_1793; ARG 1 settings ARG 2 effectiveBlocks ARG 3 attackDamage ARG 4 attackSpeed - ARG 5 canDisableBlocking METHOD method_61664 createSwordAttributeModifiers (FF)Lnet/minecraft/class_9285; ARG 1 attackDamage ARG 2 attackSpeed diff --git a/mappings/net/minecraft/item/equipment/ArmorMaterial.mapping b/mappings/net/minecraft/item/equipment/ArmorMaterial.mapping index 13bbe28ff1..79278062f2 100644 --- a/mappings/net/minecraft/item/equipment/ArmorMaterial.mapping +++ b/mappings/net/minecraft/item/equipment/ArmorMaterial.mapping @@ -3,13 +3,5 @@ CLASS net/minecraft/class_1741 net/minecraft/item/equipment/ArmorMaterial COMMENT COMMENT

COMMENT To view available vanilla armor materials, visit {@link ArmorMaterials}. - METHOD method_63992 applyBodyArmorSettings (Lnet/minecraft/class_1792$class_1793;Lnet/minecraft/class_6885;)Lnet/minecraft/class_1792$class_1793; - ARG 1 settings - ARG 2 allowedEntities METHOD method_63993 createAttributeModifiers (Lnet/minecraft/class_8051;)Lnet/minecraft/class_9285; ARG 1 equipmentType - METHOD method_64503 applyBodyArmorSettings (Lnet/minecraft/class_1792$class_1793;Lnet/minecraft/class_6880;ZLnet/minecraft/class_6885;)Lnet/minecraft/class_1792$class_1793; - ARG 1 settings - ARG 2 equipSound - ARG 3 damageOnHurt - ARG 4 allowedEntities diff --git a/mappings/net/minecraft/item/equipment/trim/ArmorTrim.mapping b/mappings/net/minecraft/item/equipment/trim/ArmorTrim.mapping index c85e92a954..0ec46113e3 100644 --- a/mappings/net/minecraft/item/equipment/trim/ArmorTrim.mapping +++ b/mappings/net/minecraft/item/equipment/trim/ArmorTrim.mapping @@ -1,28 +1,11 @@ CLASS net/minecraft/class_8053 net/minecraft/item/equipment/trim/ArmorTrim FIELD comp_3179 material Lnet/minecraft/class_6880; FIELD comp_3180 pattern Lnet/minecraft/class_6880; - FIELD comp_3181 showInTooltip Z FIELD field_41994 CODEC Lcom/mojang/serialization/Codec; FIELD field_41997 UPGRADE_TEXT Lnet/minecraft/class_2561; FIELD field_49278 PACKET_CODEC Lnet/minecraft/class_9139; METHOD (Lnet/minecraft/class_6880;Lnet/minecraft/class_6880;)V ARG 1 material ARG 2 pattern - METHOD (Lnet/minecraft/class_6880;Lnet/minecraft/class_6880;Z)V - ARG 1 material - ARG 2 pattern - ARG 3 showInTooltip METHOD comp_3179 material ()Lnet/minecraft/class_6880; METHOD comp_3180 pattern ()Lnet/minecraft/class_6880; - METHOD comp_3181 showInTooltip ()Z - METHOD method_48427 equals (Lnet/minecraft/class_6880;Lnet/minecraft/class_6880;)Z - ARG 1 pattern - ARG 2 material - 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; - ARG 0 trim - METHOD method_57410 (Lnet/minecraft/class_8053;)Ljava/lang/Boolean; - ARG 0 trim - METHOD method_58421 withShowInTooltip (Z)Lnet/minecraft/class_8053; - ARG 1 showInTooltip diff --git a/mappings/net/minecraft/item/equipment/trim/ArmorTrimMaterial.mapping b/mappings/net/minecraft/item/equipment/trim/ArmorTrimMaterial.mapping index 7574a8e2df..f42d8300ee 100644 --- a/mappings/net/minecraft/item/equipment/trim/ArmorTrimMaterial.mapping +++ b/mappings/net/minecraft/item/equipment/trim/ArmorTrimMaterial.mapping @@ -3,10 +3,3 @@ CLASS net/minecraft/class_8054 net/minecraft/item/equipment/trim/ArmorTrimMateri FIELD field_42003 ENTRY_CODEC Lcom/mojang/serialization/Codec; FIELD field_49280 PACKET_CODEC Lnet/minecraft/class_9139; 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;Lnet/minecraft/class_2561;Ljava/util/Map;)Lnet/minecraft/class_8054; - ARG 0 assetName - ARG 1 ingredient - ARG 2 description - ARG 3 overrideArmorAssets diff --git a/mappings/net/minecraft/item/equipment/trim/ArmorTrimMaterials.mapping b/mappings/net/minecraft/item/equipment/trim/ArmorTrimMaterials.mapping index a10f4e7c88..e675f008b7 100644 --- a/mappings/net/minecraft/item/equipment/trim/ArmorTrimMaterials.mapping +++ b/mappings/net/minecraft/item/equipment/trim/ArmorTrimMaterials.mapping @@ -1,6 +1,4 @@ CLASS net/minecraft/class_8055 net/minecraft/item/equipment/trim/ArmorTrimMaterials - METHOD method_48439 (Lnet/minecraft/class_1799;Lnet/minecraft/class_6880$class_6883;)Z - ARG 1 recipe METHOD method_48440 get (Lnet/minecraft/class_7225$class_7874;Lnet/minecraft/class_1799;)Ljava/util/Optional; ARG 0 registries ARG 1 stack @@ -8,14 +6,6 @@ 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;Ljava/util/Map;)V + METHOD method_48443 register (Lnet/minecraft/class_7891;Lnet/minecraft/class_5321;Lnet/minecraft/class_2583;Lnet/minecraft/class_10714;)V ARG 0 registry ARG 1 key - ARG 2 ingredient - ARG 3 style - ARG 4 overrideArmorAssets - 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 diff --git a/mappings/net/minecraft/item/equipment/trim/ArmorTrimPatterns.mapping b/mappings/net/minecraft/item/equipment/trim/ArmorTrimPatterns.mapping index 5b9230283b..684b25d211 100644 --- a/mappings/net/minecraft/item/equipment/trim/ArmorTrimPatterns.mapping +++ b/mappings/net/minecraft/item/equipment/trim/ArmorTrimPatterns.mapping @@ -1,14 +1,7 @@ CLASS net/minecraft/class_8057 net/minecraft/item/equipment/trim/ArmorTrimPatterns - METHOD method_48447 (Lnet/minecraft/class_1799;Lnet/minecraft/class_6880$class_6883;)Z - ARG 1 pattern - METHOD method_48448 get (Lnet/minecraft/class_7225$class_7874;Lnet/minecraft/class_1799;)Ljava/util/Optional; - ARG 0 registries - ARG 1 stack METHOD method_48449 of (Ljava/lang/String;)Lnet/minecraft/class_5321; ARG 0 id METHOD method_48450 bootstrap (Lnet/minecraft/class_7891;)V ARG 0 registry - METHOD method_48451 register (Lnet/minecraft/class_7891;Lnet/minecraft/class_1792;Lnet/minecraft/class_5321;)V + METHOD method_48451 register (Lnet/minecraft/class_7891;Lnet/minecraft/class_5321;)V ARG 0 registry - ARG 1 template - ARG 2 key diff --git a/mappings/net/minecraft/item/tooltip/TooltipAppender.mapping b/mappings/net/minecraft/item/tooltip/TooltipAppender.mapping index b05d2b4976..1d886e20a0 100644 --- a/mappings/net/minecraft/item/tooltip/TooltipAppender.mapping +++ b/mappings/net/minecraft/item/tooltip/TooltipAppender.mapping @@ -1,5 +1,5 @@ CLASS net/minecraft/class_9299 net/minecraft/item/tooltip/TooltipAppender - METHOD method_57409 appendTooltip (Lnet/minecraft/class_1792$class_9635;Ljava/util/function/Consumer;Lnet/minecraft/class_1836;)V + METHOD method_57409 appendTooltip (Lnet/minecraft/class_1792$class_9635;Ljava/util/function/Consumer;Lnet/minecraft/class_1836;Lnet/minecraft/class_9473;)V ARG 1 context ARG 2 tooltip ARG 3 type diff --git a/mappings/net/minecraft/loot/function/ToggleTooltipsLootFunction.mapping b/mappings/net/minecraft/loot/function/ToggleTooltipsLootFunction.mapping index 6db294128f..dc8b31a05b 100644 --- a/mappings/net/minecraft/loot/function/ToggleTooltipsLootFunction.mapping +++ b/mappings/net/minecraft/loot/function/ToggleTooltipsLootFunction.mapping @@ -1,27 +1,10 @@ CLASS net/minecraft/class_9429 net/minecraft/loot/function/ToggleTooltipsLootFunction FIELD field_50027 CODEC Lcom/mojang/serialization/MapCodec; - FIELD field_50028 TOGGLES Ljava/util/Map; - FIELD field_50029 TOGGLE_CODEC Lcom/mojang/serialization/Codec; FIELD field_50030 toggles Ljava/util/Map; METHOD (Ljava/util/List;Ljava/util/Map;)V ARG 1 conditions ARG 2 toggles - METHOD method_58463 (Lnet/minecraft/class_1799;Lnet/minecraft/class_9429$class_9430;Ljava/lang/Boolean;)V - ARG 1 componentType - ARG 2 showInTooltip - METHOD method_58464 (Lnet/minecraft/class_9429$class_9430;)Lnet/minecraft/class_9429$class_9430; - ARG 0 toggle METHOD method_58465 (Lnet/minecraft/class_9429;)Ljava/util/Map; ARG 0 lootFunction - METHOD method_58466 (Lnet/minecraft/class_9331;)Lcom/mojang/serialization/DataResult; - ARG 0 componentType METHOD method_58467 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; ARG 0 instance - CLASS class_9430 Toggle - METHOD method_58469 apply (Lnet/minecraft/class_1799;Z)V - ARG 1 stack - ARG 2 showInTooltip - CLASS class_9431 TooltipSetter - METHOD withTooltip (Ljava/lang/Object;Z)Ljava/lang/Object; - ARG 1 componentType - ARG 2 showInTooltip diff --git a/mappings/net/minecraft/nbt/NbtOps.mapping b/mappings/net/minecraft/nbt/NbtOps.mapping index d9e52163b5..5aab7d2b35 100644 --- a/mappings/net/minecraft/nbt/NbtOps.mapping +++ b/mappings/net/minecraft/nbt/NbtOps.mapping @@ -156,7 +156,7 @@ CLASS net/minecraft/class_2509 net/minecraft/nbt/NbtOps METHOD (Lnet/minecraft/class_2520;)V ARG 1 nbt CLASS class_7811 BasicMerger - FIELD field_40671 EMPTY Lnet/minecraft/class_2509$class_7811; + FIELD field_40671 EMPTY Lnet/minecraft/class_2509$class_7813; CLASS class_7812 IntArrayMerger FIELD field_40672 list Lit/unimi/dsi/fastutil/ints/IntArrayList; METHOD (I)V diff --git a/mappings/net/minecraft/nbt/StringNbtReader.mapping b/mappings/net/minecraft/nbt/StringNbtReader.mapping index 6915012e38..1121f39ac2 100644 --- a/mappings/net/minecraft/nbt/StringNbtReader.mapping +++ b/mappings/net/minecraft/nbt/StringNbtReader.mapping @@ -10,7 +10,6 @@ CLASS net/minecraft/class_2522 net/minecraft/nbt/StringNbtReader FIELD field_11600 DOUBLE_PATTERN Ljava/util/regex/Pattern; FIELD field_11601 SHORT_PATTERN Ljava/util/regex/Pattern; FIELD field_11602 TRAILING Lcom/mojang/brigadier/exceptions/SimpleCommandExceptionType; - FIELD field_11603 LIST_MIXED Lcom/mojang/brigadier/exceptions/Dynamic2CommandExceptionType; FIELD field_11604 ARRAY_INVALID Lcom/mojang/brigadier/exceptions/DynamicCommandExceptionType; FIELD field_11605 EXPECTED_VALUE Lcom/mojang/brigadier/exceptions/SimpleCommandExceptionType; FIELD field_11606 BYTE_PATTERN Ljava/util/regex/Pattern; @@ -23,45 +22,23 @@ CLASS net/minecraft/class_2522 net/minecraft/nbt/StringNbtReader FIELD field_33268 SQUARE_CLOSE_BRACKET C FIELD field_33269 RIGHT_CURLY_BRACKET C FIELD field_33270 LEFT_CURLY_BRACKET C - FIELD field_45952 STRINGIFIED_CODEC Lcom/mojang/serialization/Codec; FIELD field_51469 NBT_COMPOUND_CODEC Lcom/mojang/serialization/Codec; - METHOD (Lcom/mojang/brigadier/StringReader;)V - ARG 1 reader METHOD method_10716 readComma ()Z - METHOD method_10717 parseArray ()Lnet/minecraft/class_2520; - METHOD method_10718 parse (Ljava/lang/String;)Lnet/minecraft/class_2487; - COMMENT {@return the NBT compound parsed from the {@code string}} - COMMENT - COMMENT @throws CommandSyntaxException if the reader detects a syntax error (including - COMMENT {@linkplain #TRAILING trailing strings}) - ARG 0 string + METHOD method_10717 parseArray ()Ljava/lang/Object; METHOD method_10719 expect (C)V ARG 1 c METHOD method_10720 (Ljava/lang/Object;)Lcom/mojang/brigadier/Message; ARG 0 type - METHOD method_10721 readCompound ()Lnet/minecraft/class_2487; - METHOD method_10722 parseElementPrimitive ()Lnet/minecraft/class_2520; - METHOD method_10723 parseElement ()Lnet/minecraft/class_2520; + METHOD method_10723 parseElement ()Ljava/lang/Object; COMMENT {@return the parsed NBT element} COMMENT COMMENT @throws CommandSyntaxException if the reader detects a syntax error - METHOD method_10724 (Ljava/lang/Object;Ljava/lang/Object;)Lcom/mojang/brigadier/Message; - ARG 0 receivedType - ARG 1 expectedType - METHOD method_10725 readString ()Ljava/lang/String; - METHOD method_10726 parseElementPrimitiveArray ()Lnet/minecraft/class_2520; - METHOD method_10727 parseCompound ()Lnet/minecraft/class_2487; + METHOD method_10725 readString (Lcom/mojang/brigadier/StringReader;)Ljava/lang/String; + METHOD method_10726 parseElementPrimitiveArray ()Ljava/lang/Object; + METHOD method_10727 parseCompound ()Ljava/lang/Object; COMMENT {@return the parsed NBT compound} COMMENT COMMENT @throws CommandSyntaxException if the reader detects a syntax error - METHOD method_10728 readArray (Lnet/minecraft/class_4614;Lnet/minecraft/class_4614;)Ljava/util/List; - ARG 1 arrayTypeReader - ARG 2 typeReader - METHOD method_10729 parseList ()Lnet/minecraft/class_2520; - METHOD method_10730 (Ljava/lang/Object;Ljava/lang/Object;)Lcom/mojang/brigadier/Message; - ARG 0 receivedType - ARG 1 expectedType - METHOD method_10731 parsePrimitive (Ljava/lang/String;)Lnet/minecraft/class_2520; - ARG 1 input + METHOD method_10729 parseList ()Ljava/lang/Object; METHOD method_53502 (Ljava/lang/String;)Lcom/mojang/serialization/DataResult; ARG 0 nbt diff --git a/mappings/net/minecraft/predicate/NbtPredicate.mapping b/mappings/net/minecraft/predicate/NbtPredicate.mapping index baaf1e34b0..9250711aea 100644 --- a/mappings/net/minecraft/predicate/NbtPredicate.mapping +++ b/mappings/net/minecraft/predicate/NbtPredicate.mapping @@ -7,8 +7,7 @@ CLASS net/minecraft/class_2105 net/minecraft/predicate/NbtPredicate METHOD comp_1816 nbt ()Lnet/minecraft/class_2487; METHOD method_9072 test (Lnet/minecraft/class_1297;)Z ARG 1 entity - METHOD method_9074 test (Lnet/minecraft/class_1799;)Z - ARG 1 stack + METHOD method_9074 test (Lnet/minecraft/class_9473;)Z METHOD method_9076 entityToNbt (Lnet/minecraft/class_1297;)Lnet/minecraft/class_2487; ARG 0 entity METHOD method_9077 test (Lnet/minecraft/class_2520;)Z diff --git a/mappings/net/minecraft/predicate/item/ComponentSubPredicate.mapping b/mappings/net/minecraft/predicate/item/ComponentSubPredicate.mapping index c10c0d2020..1ff5d6507b 100644 --- a/mappings/net/minecraft/predicate/item/ComponentSubPredicate.mapping +++ b/mappings/net/minecraft/predicate/item/ComponentSubPredicate.mapping @@ -1,5 +1,3 @@ CLASS net/minecraft/class_9365 net/minecraft/predicate/item/ComponentSubPredicate METHOD method_58163 getComponentType ()Lnet/minecraft/class_9331; - METHOD method_58167 test (Lnet/minecraft/class_1799;Ljava/lang/Object;)Z - ARG 1 stack - ARG 2 component + METHOD method_58167 test (Ljava/lang/Object;)Z diff --git a/mappings/net/minecraft/predicate/item/ItemSubPredicate.mapping b/mappings/net/minecraft/predicate/item/ItemSubPredicate.mapping index 657b6fde23..97eaa7575d 100644 --- a/mappings/net/minecraft/predicate/item/ItemSubPredicate.mapping +++ b/mappings/net/minecraft/predicate/item/ItemSubPredicate.mapping @@ -1,5 +1,4 @@ CLASS net/minecraft/class_9360 net/minecraft/predicate/item/ItemSubPredicate FIELD field_49805 PREDICATES_MAP_CODEC Lcom/mojang/serialization/Codec; - METHOD method_58161 test (Lnet/minecraft/class_1799;)Z - ARG 1 stack + METHOD method_58161 test (Lnet/minecraft/class_9473;)Z CLASS class_8745 Type diff --git a/mappings/net/minecraft/recipe/SmithingRecipe.mapping b/mappings/net/minecraft/recipe/SmithingRecipe.mapping index 7dd26b79a6..9df5156d7b 100644 --- a/mappings/net/minecraft/recipe/SmithingRecipe.mapping +++ b/mappings/net/minecraft/recipe/SmithingRecipe.mapping @@ -1,4 +1,4 @@ CLASS net/minecraft/class_8059 net/minecraft/recipe/SmithingRecipe METHOD method_64722 template ()Ljava/util/Optional; - METHOD method_64723 base ()Ljava/util/Optional; + METHOD method_64723 base ()Lnet/minecraft/class_1856; METHOD method_64724 addition ()Ljava/util/Optional; diff --git a/mappings/net/minecraft/recipe/SmithingTransformRecipe.mapping b/mappings/net/minecraft/recipe/SmithingTransformRecipe.mapping index 97137e82ff..e4793133b7 100644 --- a/mappings/net/minecraft/recipe/SmithingTransformRecipe.mapping +++ b/mappings/net/minecraft/recipe/SmithingTransformRecipe.mapping @@ -1,12 +1,11 @@ CLASS net/minecraft/class_8060 net/minecraft/recipe/SmithingTransformRecipe FIELD field_42030 template Ljava/util/Optional; - FIELD field_42031 base Ljava/util/Optional; + FIELD field_42031 base Lnet/minecraft/class_1856; FIELD field_42032 addition Ljava/util/Optional; FIELD field_42033 result Lnet/minecraft/class_10591; FIELD field_52605 ingredientPlacement Lnet/minecraft/class_9887; - METHOD (Ljava/util/Optional;Ljava/util/Optional;Ljava/util/Optional;Lnet/minecraft/class_10591;)V + METHOD (Ljava/util/Optional;Lnet/minecraft/class_1856;Ljava/util/Optional;Lnet/minecraft/class_10591;)V ARG 1 template - ARG 2 base ARG 3 addition ARG 4 result CLASS class_8061 Serializer @@ -18,7 +17,7 @@ CLASS net/minecraft/class_8060 net/minecraft/recipe/SmithingTransformRecipe ARG 0 instance METHOD method_53781 (Lnet/minecraft/class_8060;)Ljava/util/Optional; ARG 0 recipe - METHOD method_53782 (Lnet/minecraft/class_8060;)Ljava/util/Optional; + METHOD method_53782 (Lnet/minecraft/class_8060;)Lnet/minecraft/class_1856; ARG 0 recipe METHOD method_53783 (Lnet/minecraft/class_8060;)Ljava/util/Optional; ARG 0 recipe @@ -26,7 +25,7 @@ CLASS net/minecraft/class_8060 net/minecraft/recipe/SmithingTransformRecipe ARG 0 recipe METHOD method_61704 (Lnet/minecraft/class_8060;)Ljava/util/Optional; ARG 0 recipe - METHOD method_61705 (Lnet/minecraft/class_8060;)Ljava/util/Optional; + METHOD method_61705 (Lnet/minecraft/class_8060;)Lnet/minecraft/class_1856; ARG 0 recipe METHOD method_61706 (Lnet/minecraft/class_8060;)Ljava/util/Optional; ARG 0 recipe diff --git a/mappings/net/minecraft/recipe/SmithingTrimRecipe.mapping b/mappings/net/minecraft/recipe/SmithingTrimRecipe.mapping index 1a1e152d9f..080e37ed32 100644 --- a/mappings/net/minecraft/recipe/SmithingTrimRecipe.mapping +++ b/mappings/net/minecraft/recipe/SmithingTrimRecipe.mapping @@ -1,31 +1,18 @@ CLASS net/minecraft/class_8062 net/minecraft/recipe/SmithingTrimRecipe - FIELD field_42035 template Ljava/util/Optional; - FIELD field_42036 base Ljava/util/Optional; - FIELD field_42037 addition Ljava/util/Optional; + FIELD field_42035 template Lnet/minecraft/class_1856; + FIELD field_42036 base Lnet/minecraft/class_1856; + FIELD field_42037 addition Lnet/minecraft/class_1856; FIELD field_52606 ingredientPlacement Lnet/minecraft/class_9887; - METHOD (Ljava/util/Optional;Ljava/util/Optional;Ljava/util/Optional;)V - ARG 1 template - ARG 2 base - ARG 3 addition - METHOD method_64996 craft (Lnet/minecraft/class_7225$class_7874;Lnet/minecraft/class_1799;Lnet/minecraft/class_1799;Lnet/minecraft/class_1799;)Lnet/minecraft/class_1799; + METHOD method_64996 craft (Lnet/minecraft/class_7225$class_7874;Lnet/minecraft/class_1799;Lnet/minecraft/class_1799;Lnet/minecraft/class_6880;)Lnet/minecraft/class_1799; ARG 0 registries ARG 1 base ARG 2 addition - ARG 3 template CLASS class_8063 Serializer FIELD field_46109 CODEC Lcom/mojang/serialization/MapCodec; FIELD field_48365 PACKET_CODEC Lnet/minecraft/class_9139; - METHOD method_53784 (Lnet/minecraft/class_8062;)Ljava/util/Optional; + METHOD method_53784 (Lnet/minecraft/class_8062;)Lnet/minecraft/class_1856; ARG 0 recipe - METHOD method_53785 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; - ARG 0 instance - METHOD method_53786 (Lnet/minecraft/class_8062;)Ljava/util/Optional; + METHOD method_53786 (Lnet/minecraft/class_8062;)Lnet/minecraft/class_1856; ARG 0 recipe - METHOD method_53787 (Lnet/minecraft/class_8062;)Ljava/util/Optional; - ARG 0 recipe - METHOD method_61707 (Lnet/minecraft/class_8062;)Ljava/util/Optional; - ARG 0 recipe - METHOD method_61708 (Lnet/minecraft/class_8062;)Ljava/util/Optional; - ARG 0 recipe - METHOD method_61709 (Lnet/minecraft/class_8062;)Ljava/util/Optional; + METHOD method_53787 (Lnet/minecraft/class_8062;)Lnet/minecraft/class_1856; ARG 0 recipe diff --git a/mappings/net/minecraft/registry/Registries.mapping b/mappings/net/minecraft/registry/Registries.mapping index 4f2494edb0..fd08da308c 100644 --- a/mappings/net/minecraft/registry/Registries.mapping +++ b/mappings/net/minecraft/registry/Registries.mapping @@ -33,8 +33,6 @@ CLASS net/minecraft/class_7923 net/minecraft/registry/Registries FIELD field_41160 DENSITY_FUNCTION_TYPE Lnet/minecraft/class_2378; FIELD field_41161 STRUCTURE_PROCESSOR Lnet/minecraft/class_2378; FIELD field_41162 STRUCTURE_POOL_ELEMENT Lnet/minecraft/class_2378; - FIELD field_41163 CAT_VARIANT Lnet/minecraft/class_2378; - FIELD field_41164 FROG_VARIANT Lnet/minecraft/class_2378; FIELD field_41167 REGISTRIES Lnet/minecraft/class_2378; FIELD field_41168 LOGGER Lorg/slf4j/Logger; FIELD field_41169 DEFAULT_ENTRIES Ljava/util/Map; @@ -71,7 +69,6 @@ CLASS net/minecraft/class_7923 net/minecraft/registry/Registries FIELD field_47555 NUMBER_FORMAT_TYPE Lnet/minecraft/class_2378; FIELD field_49658 DATA_COMPONENT_TYPE Lnet/minecraft/class_2378; FIELD field_49911 ENTITY_SUB_PREDICATE_TYPE Lnet/minecraft/class_2378; - FIELD field_49912 ITEM_SUB_PREDICATE_TYPE Lnet/minecraft/class_2378; FIELD field_50078 MAP_DECORATION_TYPE Lnet/minecraft/class_2378; FIELD field_51832 ENCHANTMENT_EFFECT_COMPONENT_TYPE Lnet/minecraft/class_2378; FIELD field_51833 ENCHANTMENT_LEVEL_BASED_VALUE_TYPE Lnet/minecraft/class_2378; diff --git a/mappings/net/minecraft/registry/tag/CatVariantTags.mapping b/mappings/net/minecraft/registry/tag/CatVariantTags.mapping deleted file mode 100644 index f8aa790bd7..0000000000 --- a/mappings/net/minecraft/registry/tag/CatVariantTags.mapping +++ /dev/null @@ -1,3 +0,0 @@ -CLASS net/minecraft/class_7369 net/minecraft/registry/tag/CatVariantTags - METHOD method_43046 of (Ljava/lang/String;)Lnet/minecraft/class_6862; - ARG 0 id diff --git a/mappings/net/minecraft/server/command/SpawnArmorTrimsCommand.mapping b/mappings/net/minecraft/server/command/SpawnArmorTrimsCommand.mapping index 0a17f1ffe7..26b17b06df 100644 --- a/mappings/net/minecraft/server/command/SpawnArmorTrimsCommand.mapping +++ b/mappings/net/minecraft/server/command/SpawnArmorTrimsCommand.mapping @@ -9,14 +9,6 @@ CLASS net/minecraft/class_8044 net/minecraft/server/command/SpawnArmorTrimsComma ARG 0 context METHOD method_48335 (Lnet/minecraft/class_2168;)Z ARG 0 source - METHOD method_48336 execute (Lnet/minecraft/class_2168;Lnet/minecraft/class_1657;)I + METHOD method_48336 execute (Lnet/minecraft/class_2168;Lnet/minecraft/class_1657;Ljava/util/stream/Stream;)I ARG 0 source ARG 1 player - METHOD method_48337 (Lnet/minecraft/class_2371;Lnet/minecraft/class_2378;Lnet/minecraft/class_2378;Lnet/minecraft/class_8056;Lnet/minecraft/class_8054;)V - ARG 4 material - METHOD method_48338 (Lnet/minecraft/class_2378;Lnet/minecraft/class_8054;)Ljava/lang/Integer; - ARG 1 material - METHOD method_48339 (Lnet/minecraft/class_2378;Lnet/minecraft/class_8056;)Ljava/lang/Integer; - ARG 1 pattern - METHOD method_48340 (Lnet/minecraft/class_2378;Lnet/minecraft/class_2371;Lnet/minecraft/class_2378;Lnet/minecraft/class_8056;)V - ARG 3 pattern diff --git a/mappings/net/minecraft/test/TestEntry.mapping b/mappings/net/minecraft/test/TestEntry.mapping index 6e720a57a6..6db459387c 100644 --- a/mappings/net/minecraft/test/TestEntry.mapping +++ b/mappings/net/minecraft/test/TestEntry.mapping @@ -1,7 +1,5 @@ CLASS net/minecraft/class_10663 net/minecraft/test/TestEntry - METHOD (Ljava/util/Map;Lnet/minecraft/class_2960;Ljava/util/function/Consumer;)V - ARG 1 tests - ARG 2 functionId + METHOD (Ljava/util/Map;Lnet/minecraft/class_5321;Ljava/util/function/Consumer;)V ARG 3 function METHOD (Lnet/minecraft/class_2960;Lnet/minecraft/class_10664;Ljava/util/function/Consumer;)V ARG 1 id diff --git a/mappings/net/minecraft/unused/packageinfo/PackageInfo10705.mapping b/mappings/net/minecraft/unused/packageinfo/PackageInfo10705.mapping new file mode 100644 index 0000000000..f81d91e825 --- /dev/null +++ b/mappings/net/minecraft/unused/packageinfo/PackageInfo10705.mapping @@ -0,0 +1 @@ +CLASS net/minecraft/class_10705 net/minecraft/unused/packageinfo/PackageInfo10705 diff --git a/mappings/net/minecraft/unused/packageinfo/PackageInfo10728.mapping b/mappings/net/minecraft/unused/packageinfo/PackageInfo10728.mapping new file mode 100644 index 0000000000..19776f2dc3 --- /dev/null +++ b/mappings/net/minecraft/unused/packageinfo/PackageInfo10728.mapping @@ -0,0 +1 @@ +CLASS net/minecraft/class_10728 net/minecraft/unused/packageinfo/PackageInfo10728 diff --git a/mappings/net/minecraft/util/UserCache.mapping b/mappings/net/minecraft/util/UserCache.mapping index e4cb88be7c..d7425a215f 100644 --- a/mappings/net/minecraft/util/UserCache.mapping +++ b/mappings/net/minecraft/util/UserCache.mapping @@ -53,11 +53,6 @@ CLASS net/minecraft/class_3312 net/minecraft/util/UserCache METHOD method_39753 clearExecutor ()V METHOD method_53912 getOfflinePlayerProfile (Ljava/lang/String;)Ljava/util/Optional; ARG 0 name - CLASS 1 - METHOD onProfileLookupFailed (Ljava/lang/String;Ljava/lang/Exception;)V - ARG 2 exception - METHOD onProfileLookupSucceeded (Lcom/mojang/authlib/GameProfile;)V - ARG 1 profile CLASS class_3313 Entry FIELD field_14319 expirationDate Ljava/util/Date; FIELD field_14321 profile Lcom/mojang/authlib/GameProfile; diff --git a/mappings/net/minecraft/world/biome/FoliageColors.mapping b/mappings/net/minecraft/world/biome/FoliageColors.mapping index 8e400358de..8045ede7d2 100644 --- a/mappings/net/minecraft/world/biome/FoliageColors.mapping +++ b/mappings/net/minecraft/world/biome/FoliageColors.mapping @@ -3,7 +3,6 @@ CLASS net/minecraft/class_1926 net/minecraft/world/biome/FoliageColors FIELD field_55216 BIRCH I FIELD field_55217 DEFAULT I FIELD field_55218 MANGROVE I - FIELD field_55717 AZALEA I FIELD field_9183 colorMap [I METHOD method_8340 setColorMap ([I)V ARG 0 pixels diff --git a/mappings/net/minecraft/world/gen/treedecorator/PlaceOnGroundTreeDecorator.mapping b/mappings/net/minecraft/world/gen/treedecorator/PlaceOnGroundTreeDecorator.mapping index afe6d92675..4da66445a0 100644 --- a/mappings/net/minecraft/world/gen/treedecorator/PlaceOnGroundTreeDecorator.mapping +++ b/mappings/net/minecraft/world/gen/treedecorator/PlaceOnGroundTreeDecorator.mapping @@ -16,8 +16,6 @@ CLASS net/minecraft/class_10600 net/minecraft/world/gen/treedecorator/PlaceOnGro METHOD method_66485 generate (Lnet/minecraft/class_4662$class_7402;Lnet/minecraft/class_2338;)V ARG 1 generator ARG 2 pos - METHOD method_66486 (Lnet/minecraft/class_3610;)Z - ARG 0 state METHOD method_66487 (Lnet/minecraft/class_10600;)Ljava/lang/Integer; ARG 0 treeDecorator METHOD method_66488 (Lnet/minecraft/class_10600;)Ljava/lang/Integer; diff --git a/mappings/net/minecraft/world/spawner/CatSpawner.mapping b/mappings/net/minecraft/world/spawner/CatSpawner.mapping index 67b4a7754c..ea71129ab1 100644 --- a/mappings/net/minecraft/world/spawner/CatSpawner.mapping +++ b/mappings/net/minecraft/world/spawner/CatSpawner.mapping @@ -5,19 +5,19 @@ CLASS net/minecraft/class_4274 net/minecraft/world/spawner/CatSpawner COMMENT {@link net.minecraft.world.gen.chunk.ChunkGenerator#getEntitySpawnList}. FIELD field_19171 cooldown I FIELD field_30601 SPAWN_INTERVAL I - METHOD method_20260 spawnInSwampHut (Lnet/minecraft/class_3218;Lnet/minecraft/class_2338;)I + METHOD method_20260 spawnInSwampHut (Lnet/minecraft/class_3218;Lnet/minecraft/class_2338;)V COMMENT Tries to spawn cats in swamp huts. COMMENT COMMENT @return the number of cats spawned ARG 1 world ARG 2 pos - METHOD method_20262 spawn (Lnet/minecraft/class_2338;Lnet/minecraft/class_3218;)I + METHOD method_20262 spawn (Lnet/minecraft/class_2338;Lnet/minecraft/class_3218;Z)V COMMENT Spawns a cat. COMMENT COMMENT @return the number of cats spawned ARG 1 pos ARG 2 world - METHOD method_20263 spawnInHouse (Lnet/minecraft/class_3218;Lnet/minecraft/class_2338;)I + METHOD method_20263 spawnInHouse (Lnet/minecraft/class_3218;Lnet/minecraft/class_2338;)V COMMENT Tries to spawn cats in villages. COMMENT COMMENT @return the number of cats spawned diff --git a/mappings/net/minecraft/world/spawner/SpecialSpawner.mapping b/mappings/net/minecraft/world/spawner/SpecialSpawner.mapping index 3b80dc73c6..85696e45fb 100644 --- a/mappings/net/minecraft/world/spawner/SpecialSpawner.mapping +++ b/mappings/net/minecraft/world/spawner/SpecialSpawner.mapping @@ -10,7 +10,7 @@ CLASS net/minecraft/class_5304 net/minecraft/world/spawner/SpecialSpawner COMMENT {@link net.minecraft.world.gen.chunk.ChunkGenerator#getEntitySpawnList}. COMMENT However, cats in swamp huts are spawned in both {@link CatSpawner} and COMMENT the normal structure spawning. - METHOD method_6445 spawn (Lnet/minecraft/class_3218;ZZ)I + METHOD method_6445 spawn (Lnet/minecraft/class_3218;ZZ)V COMMENT Spawns entities into a world. COMMENT COMMENT @return the number of entities spawned