From f4726c6912b27aa76f494edec2bff666deba6446 Mon Sep 17 00:00:00 2001 From: modmuss50 Date: Wed, 8 Nov 2023 15:41:09 +0000 Subject: [PATCH] 23w45a --- build.gradle | 2 +- .../minecraft/advancement/Advancement.mapping | 8 -- .../advancement/AdvancementCriterion.mapping | 11 --- .../advancement/AdvancementDisplay.mapping | 13 +--- .../advancement/AdvancementFrame.mapping | 3 - .../AdvancementRequirements.mapping | 11 +-- .../advancement/AdvancementRewards.mapping | 27 +++---- .../criterion/AbstractCriterion.mapping | 6 +- .../AbstractCriterionConditions.mapping | 6 -- .../BeeNestDestroyedCriterion.mapping | 17 ++--- .../criterion/BredAnimalsCriterion.mapping | 16 ++-- .../criterion/BrewedPotionCriterion.mapping | 15 ++-- .../ChangedDimensionCriterion.mapping | 11 +-- .../ChanneledLightningCriterion.mapping | 4 +- .../ConstructBeaconCriterion.mapping | 4 +- .../criterion/ConsumeItemCriterion.mapping | 6 +- .../advancement/criterion/Criteria.mapping | 6 -- .../advancement/criterion/Criterion.mapping | 3 - .../criterion/CriterionConditions.mapping | 1 - .../CuredZombieVillagerCriterion.mapping | 11 ++- .../criterion/EffectsChangedCriterion.mapping | 11 ++- .../criterion/EnchantedItemCriterion.mapping | 9 ++- .../criterion/EnterBlockCriterion.mapping | 18 ++--- .../EntityHurtPlayerCriterion.mapping | 6 +- .../criterion/FilledBucketCriterion.mapping | 6 +- .../FishingRodHookedCriterion.mapping | 16 ++-- .../InventoryChangedCriterion.mapping | 13 +--- .../criterion/ItemCriterion.mapping | 6 +- .../ItemDurabilityChangedCriterion.mapping | 12 +-- .../KilledByCrossbowCriterion.mapping | 7 +- .../criterion/LevitationCriterion.mapping | 9 ++- .../LightningStrikeCriterion.mapping | 11 ++- .../criterion/OnKilledCriterion.mapping | 11 ++- ...yerGeneratesContainerLootCriterion.mapping | 4 +- .../PlayerHurtEntityCriterion.mapping | 11 ++- ...layerInteractedWithEntityCriterion.mapping | 11 ++- .../criterion/RecipeCraftedCriterion.mapping | 7 +- .../criterion/RecipeUnlockedCriterion.mapping | 4 +- .../criterion/ShotCrossbowCriterion.mapping | 6 +- .../criterion/SlideDownBlockCriterion.mapping | 18 ++--- .../criterion/StartedRidingCriterion.mapping | 1 + .../criterion/SummonedEntityCriterion.mapping | 6 +- .../criterion/TameAnimalCriterion.mapping | 6 +- .../criterion/TargetHitCriterion.mapping | 9 ++- ...hrownItemPickedUpByEntityCriterion.mapping | 11 ++- .../criterion/TickCriterion.mapping | 1 + .../criterion/TravelCriterion.mapping | 11 ++- .../criterion/UsedEnderEyeCriterion.mapping | 4 +- .../criterion/UsedTotemCriterion.mapping | 6 +- .../criterion/UsingItemCriterion.mapping | 6 +- .../criterion/VillagerTradeCriterion.mapping | 11 ++- .../net/minecraft/block/SpawnerBlock.mapping | 4 - .../entity/MobSpawnerBlockEntity.mapping | 2 +- .../entity/StructureBlockBlockEntity.mapping | 1 - mappings/net/minecraft/class_8959.mapping | 2 + .../screen/ingame/JigsawBlockScreen.mapping | 1 - .../particle/ExplosionEmitterParticle.mapping | 2 - .../client/render/RenderLayer.mapping | 4 +- .../command/CommandException.mapping | 5 -- .../command/CommandQueueEntry.mapping | 1 - .../recipe/ComplexRecipeJsonBuilder.mapping | 6 +- .../recipe/CookingRecipeJsonBuilder.mapping | 35 +-------- .../data/server/recipe/RecipeExporter.mapping | 3 +- .../server/recipe/RecipeJsonBuilder.mapping | 7 -- .../server/recipe/RecipeJsonProvider.mapping | 7 -- .../data/server/recipe/RecipeProvider.mapping | 18 +---- .../recipe/ShapedRecipeJsonBuilder.mapping | 21 +----- .../recipe/ShapelessRecipeJsonBuilder.mapping | 17 +---- .../SingleItemRecipeJsonBuilder.mapping | 26 +------ ...SmithingTransformRecipeJsonBuilder.mapping | 21 +----- .../SmithingTrimRecipeJsonBuilder.mapping | 10 +-- .../fix/ProjectileItemTypeFix.mapping | 4 - mappings/net/minecraft/entity/Entity.mapping | 2 +- .../entity/ai/brain/task/LongJumpTask.mapping | 9 --- .../entity/player/PlayerEntity.mapping | 3 +- .../entity/projectile/ProjectileUtil.mapping | 2 +- .../entity/vehicle/VehicleEntity.mapping | 1 - mappings/net/minecraft/item/ItemStack.mapping | 7 +- .../minecraft/loot/LootTableReporter.mapping | 15 ---- .../function/ApplyBonusLootFunction.mapping | 18 ----- .../s2c/play/ExplosionS2CPacket.mapping | 3 +- .../predicate/DamagePredicate.mapping | 3 - .../minecraft/predicate/NumberRange.mapping | 6 -- .../predicate/StatePredicate.mapping | 8 -- ...ncementEntityPredicateDeserializer.mapping | 15 ---- .../entity/DamageSourcePredicate.mapping | 3 - .../entity/DistancePredicate.mapping | 3 - .../entity/EntityEffectPredicate.mapping | 3 - .../predicate/entity/EntityPredicate.mapping | 15 ---- .../entity/LocationPredicate.mapping | 3 - .../entity/LootContextPredicate.mapping | 9 --- .../predicate/item/ItemPredicate.mapping | 7 -- .../recipe/AbstractCookingRecipe.mapping | 8 ++ .../recipe/CookingRecipeSerializer.mapping | 14 +--- .../minecraft/recipe/CuttingRecipe.mapping | 19 ++--- .../net/minecraft/recipe/Ingredient.mapping | 2 - .../net/minecraft/recipe/RecipeCodecs.mapping | 10 --- .../net/minecraft/recipe/ShapedRecipe.mapping | 74 ------------------- .../book/CraftingRecipeCategory.mapping | 2 +- .../ExperimentalRegistriesValidator.mapping | 2 +- .../net/minecraft/registry/Registries.mapping | 1 - .../registry/RegistryBuilder.mapping | 34 +-------- .../minecraft/registry/SimpleRegistry.mapping | 1 - .../server/function/LazyContainer.mapping | 2 - .../minecraft/test/StructureTestUtil.mapping | 7 +- .../packageinfo/PackageInfo8955.mapping | 1 + .../packageinfo/PackageInfo8971.mapping | 1 + .../net/minecraft/util/dynamic/Codecs.mapping | 5 +- .../minecraft/world/MobSpawnerLogic.mapping | 4 +- mappings/net/minecraft/world/World.mapping | 4 +- .../world/explosion/Explosion.mapping | 15 +--- 111 files changed, 250 insertions(+), 737 deletions(-) delete mode 100644 mappings/net/minecraft/advancement/criterion/AbstractCriterionConditions.mapping create mode 100644 mappings/net/minecraft/class_8959.mapping delete mode 100644 mappings/net/minecraft/command/CommandException.mapping delete mode 100644 mappings/net/minecraft/data/server/recipe/RecipeJsonBuilder.mapping delete mode 100644 mappings/net/minecraft/data/server/recipe/RecipeJsonProvider.mapping delete mode 100644 mappings/net/minecraft/predicate/entity/AdvancementEntityPredicateDeserializer.mapping delete mode 100644 mappings/net/minecraft/recipe/RecipeCodecs.mapping create mode 100644 mappings/net/minecraft/unused/packageinfo/PackageInfo8955.mapping create mode 100644 mappings/net/minecraft/unused/packageinfo/PackageInfo8971.mapping diff --git a/build.gradle b/build.gradle index acd2c233fb..325db06262 100644 --- a/build.gradle +++ b/build.gradle @@ -20,7 +20,7 @@ plugins { id 'net.fabricmc.filament' } -def minecraft_version = "23w44a" +def minecraft_version = "23w45a" filament { minecraftVersion = minecraft_version diff --git a/mappings/net/minecraft/advancement/Advancement.mapping b/mappings/net/minecraft/advancement/Advancement.mapping index cb2e8a1e64..29fc75a936 100644 --- a/mappings/net/minecraft/advancement/Advancement.mapping +++ b/mappings/net/minecraft/advancement/Advancement.mapping @@ -8,18 +8,10 @@ CLASS net/minecraft/class_161 net/minecraft/advancement/Advancement ARG 6 sendsTelemetryEvent METHOD equals (Ljava/lang/Object;)Z ARG 1 o - METHOD method_53621 toJson ()Lcom/google/gson/JsonObject; METHOD method_53622 getNameFromIdentity (Lnet/minecraft/class_8779;)Lnet/minecraft/class_2561; ARG 0 identifiedAdvancement METHOD method_53623 createNameFromDisplay (Lnet/minecraft/class_185;)Lnet/minecraft/class_2561; ARG 0 display - METHOD method_53624 (Lcom/google/gson/JsonObject;Lnet/minecraft/class_2960;)V - ARG 1 parent - METHOD method_53625 (Lcom/google/gson/JsonObject;Lnet/minecraft/class_185;)V - ARG 1 display - METHOD method_53626 fromJson (Lcom/google/gson/JsonObject;Lnet/minecraft/class_5257;)Lnet/minecraft/class_161; - ARG 0 json - ARG 1 predicateDeserializer METHOD method_53627 write (Lnet/minecraft/class_2540;)V ARG 1 buf METHOD method_53628 (Lnet/minecraft/class_2540;Lnet/minecraft/class_185;)V diff --git a/mappings/net/minecraft/advancement/AdvancementCriterion.mapping b/mappings/net/minecraft/advancement/AdvancementCriterion.mapping index 6671b4c507..5add717188 100644 --- a/mappings/net/minecraft/advancement/AdvancementCriterion.mapping +++ b/mappings/net/minecraft/advancement/AdvancementCriterion.mapping @@ -1,14 +1,3 @@ CLASS net/minecraft/class_175 net/minecraft/advancement/AdvancementCriterion FIELD comp_1924 conditions Lnet/minecraft/class_184; METHOD comp_1924 conditions ()Lnet/minecraft/class_184; - METHOD method_53698 fromJson (Lcom/google/gson/JsonObject;Lnet/minecraft/class_5257;Lnet/minecraft/class_179;)Lnet/minecraft/class_175; - ARG 0 json - ARG 1 predicateDeserializer - ARG 2 trigger - METHOD method_770 fromJson (Lcom/google/gson/JsonObject;Lnet/minecraft/class_5257;)Lnet/minecraft/class_175; - ARG 0 obj - ARG 1 predicateDeserializer - METHOD method_772 criteriaFromJson (Lcom/google/gson/JsonObject;Lnet/minecraft/class_5257;)Ljava/util/Map; - ARG 0 obj - ARG 1 predicateDeserializer - METHOD method_773 toJson ()Lcom/google/gson/JsonElement; diff --git a/mappings/net/minecraft/advancement/AdvancementDisplay.mapping b/mappings/net/minecraft/advancement/AdvancementDisplay.mapping index 7123cbab94..d25f06451d 100644 --- a/mappings/net/minecraft/advancement/AdvancementDisplay.mapping +++ b/mappings/net/minecraft/advancement/AdvancementDisplay.mapping @@ -6,27 +6,22 @@ CLASS net/minecraft/class_185 net/minecraft/advancement/AdvancementDisplay FIELD field_1240 title Lnet/minecraft/class_2561; FIELD field_1241 icon Lnet/minecraft/class_1799; FIELD field_1242 description Lnet/minecraft/class_2561; - FIELD field_1243 background Lnet/minecraft/class_2960; + FIELD field_1243 background Ljava/util/Optional; FIELD field_1244 y F FIELD field_1245 x F - METHOD (Lnet/minecraft/class_1799;Lnet/minecraft/class_2561;Lnet/minecraft/class_2561;Lnet/minecraft/class_2960;Lnet/minecraft/class_189;ZZZ)V + METHOD (Lnet/minecraft/class_1799;Lnet/minecraft/class_2561;Lnet/minecraft/class_2561;Ljava/util/Optional;Lnet/minecraft/class_189;ZZZ)V ARG 1 icon ARG 2 title ARG 3 description - ARG 4 background ARG 5 frame ARG 6 showToast ARG 7 announceToChat ARG 8 hidden METHOD method_808 shouldAnnounceToChat ()Z - METHOD method_809 fromJson (Lcom/google/gson/JsonObject;)Lnet/minecraft/class_185; - ARG 0 obj - METHOD method_810 iconToJson ()Lcom/google/gson/JsonObject; METHOD method_811 getTitle ()Lnet/minecraft/class_2561; - METHOD method_812 getBackground ()Lnet/minecraft/class_2960; + METHOD method_812 getBackground ()Ljava/util/Optional; METHOD method_813 toPacket (Lnet/minecraft/class_2540;)V ARG 1 buf - METHOD method_814 toJson ()Lcom/google/gson/JsonElement; METHOD method_815 getFrame ()Lnet/minecraft/class_189; METHOD method_816 setPos (FF)V ARG 1 x @@ -37,7 +32,5 @@ CLASS net/minecraft/class_185 net/minecraft/advancement/AdvancementDisplay METHOD method_820 fromPacket (Lnet/minecraft/class_2540;)Lnet/minecraft/class_185; ARG 0 buf METHOD method_821 getIcon ()Lnet/minecraft/class_1799; - METHOD method_822 iconFromJson (Lcom/google/gson/JsonObject;)Lnet/minecraft/class_1799; - ARG 0 json METHOD method_823 shouldShowToast ()Z METHOD method_824 isHidden ()Z diff --git a/mappings/net/minecraft/advancement/AdvancementFrame.mapping b/mappings/net/minecraft/advancement/AdvancementFrame.mapping index 745946d9ac..c5ebe8ec08 100644 --- a/mappings/net/minecraft/advancement/AdvancementFrame.mapping +++ b/mappings/net/minecraft/advancement/AdvancementFrame.mapping @@ -7,6 +7,3 @@ CLASS net/minecraft/class_189 net/minecraft/advancement/AdvancementFrame ARG 4 titleFormat METHOD method_30756 getToastText ()Lnet/minecraft/class_2561; METHOD method_830 getTitleFormat ()Lnet/minecraft/class_124; - METHOD method_831 getId ()Ljava/lang/String; - METHOD method_833 forName (Ljava/lang/String;)Lnet/minecraft/class_189; - ARG 0 name diff --git a/mappings/net/minecraft/advancement/AdvancementRequirements.mapping b/mappings/net/minecraft/advancement/AdvancementRequirements.mapping index 58a05d214f..31705703f0 100644 --- a/mappings/net/minecraft/advancement/AdvancementRequirements.mapping +++ b/mappings/net/minecraft/advancement/AdvancementRequirements.mapping @@ -3,27 +3,18 @@ CLASS net/minecraft/class_8782 net/minecraft/advancement/AdvancementRequirements METHOD (Lnet/minecraft/class_2540;)V ARG 1 buf METHOD method_53664 getLength ()I - METHOD method_53666 fromJson (Lcom/google/gson/JsonArray;Ljava/util/Set;)Lnet/minecraft/class_8782; - ARG 0 json - ARG 1 criteria METHOD method_53668 allOf (Ljava/util/Collection;)Lnet/minecraft/class_8782; ARG 0 requirements METHOD method_53669 matches (Ljava/util/function/Predicate;)Z ARG 1 predicate METHOD method_53670 writeRequirements (Lnet/minecraft/class_2540;)V ARG 1 buf - METHOD method_53671 anyMatch ([Ljava/lang/String;Ljava/util/function/Predicate;)Z - ARG 0 requirements + METHOD method_53671 anyMatch (Ljava/util/List;Ljava/util/function/Predicate;)Z ARG 1 predicate - METHOD method_53672 toJson ()Lcom/google/gson/JsonArray; - METHOD method_53673 (I)[[Ljava/lang/String; - ARG 0 size METHOD method_53674 anyOf (Ljava/util/Collection;)Lnet/minecraft/class_8782; ARG 0 requirements METHOD method_53675 countMatches (Ljava/util/function/Predicate;)I ARG 1 predicate - METHOD method_53676 readRequirements (Lnet/minecraft/class_2540;)[[Ljava/lang/String; - ARG 0 buf METHOD method_53677 isEmpty ()Z METHOD method_53678 getNames ()Ljava/util/Set; CLASS class_8797 CriterionMerger diff --git a/mappings/net/minecraft/advancement/AdvancementRewards.mapping b/mappings/net/minecraft/advancement/AdvancementRewards.mapping index b623b7e18f..2ec4e08fd4 100644 --- a/mappings/net/minecraft/advancement/AdvancementRewards.mapping +++ b/mappings/net/minecraft/advancement/AdvancementRewards.mapping @@ -1,27 +1,24 @@ CLASS net/minecraft/class_170 net/minecraft/advancement/AdvancementRewards - FIELD field_1163 function Lnet/minecraft/class_2159; - FIELD field_1164 loot [Lnet/minecraft/class_2960; - FIELD field_1165 experience I - FIELD field_1166 recipes [Lnet/minecraft/class_2960; + FIELD comp_2025 experience I + FIELD comp_2026 loot Ljava/util/List; + FIELD comp_2027 recipes Ljava/util/List; + FIELD comp_2028 function Ljava/util/Optional; FIELD field_1167 NONE Lnet/minecraft/class_170; - METHOD (I[Lnet/minecraft/class_2960;[Lnet/minecraft/class_2960;Lnet/minecraft/class_2159;)V + METHOD (ILjava/util/List;Ljava/util/List;Ljava/util/Optional;)V ARG 1 experience - ARG 2 loot - ARG 3 recipes - ARG 4 function + METHOD comp_2025 experience ()I + METHOD comp_2026 loot ()Ljava/util/List; + METHOD comp_2027 recipes ()Ljava/util/List; + METHOD comp_2028 function ()Ljava/util/Optional; METHOD method_17978 (Lnet/minecraft/server/MinecraftServer;Lnet/minecraft/class_3222;Lnet/minecraft/class_2158;)V ARG 2 function - METHOD method_27912 fromJson (Lcom/google/gson/JsonObject;)Lnet/minecraft/class_170; - ARG 0 json - METHOD method_34898 getRecipes ()[Lnet/minecraft/class_2960; - METHOD method_747 toJson ()Lcom/google/gson/JsonElement; METHOD method_748 apply (Lnet/minecraft/class_3222;)V ARG 1 player CLASS class_171 Builder - FIELD field_1168 recipes Ljava/util/List; + FIELD field_1168 recipes Lcom/google/common/collect/ImmutableList$Builder; FIELD field_1169 experience I - FIELD field_1170 function Lnet/minecraft/class_2960; - FIELD field_1171 loot Ljava/util/List; + FIELD field_1170 function Ljava/util/Optional; + FIELD field_1171 loot Lcom/google/common/collect/ImmutableList$Builder; METHOD method_34899 loot (Lnet/minecraft/class_2960;)Lnet/minecraft/class_170$class_171; ARG 0 loot METHOD method_34900 addLoot (Lnet/minecraft/class_2960;)Lnet/minecraft/class_170$class_171; diff --git a/mappings/net/minecraft/advancement/criterion/AbstractCriterion.mapping b/mappings/net/minecraft/advancement/criterion/AbstractCriterion.mapping index e167ca68bf..c2cde2b2a9 100644 --- a/mappings/net/minecraft/advancement/criterion/AbstractCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/AbstractCriterion.mapping @@ -5,9 +5,5 @@ CLASS net/minecraft/class_4558 net/minecraft/advancement/criterion/AbstractCrite ARG 2 predicate METHOD method_22512 (Lnet/minecraft/class_2985;)Ljava/util/Set; ARG 0 managerx - METHOD method_27854 conditionsFromJson (Lcom/google/gson/JsonObject;Ljava/util/Optional;Lnet/minecraft/class_5257;)Lnet/minecraft/class_4558$class_8788; - ARG 1 obj - ARG 2 predicate - ARG 3 predicateDeserializer CLASS class_8788 Conditions - METHOD method_27790 getPlayerPredicate ()Ljava/util/Optional; + METHOD comp_2029 getPlayerPredicate ()Ljava/util/Optional; diff --git a/mappings/net/minecraft/advancement/criterion/AbstractCriterionConditions.mapping b/mappings/net/minecraft/advancement/criterion/AbstractCriterionConditions.mapping deleted file mode 100644 index eb757d7a16..0000000000 --- a/mappings/net/minecraft/advancement/criterion/AbstractCriterionConditions.mapping +++ /dev/null @@ -1,6 +0,0 @@ -CLASS net/minecraft/class_195 net/minecraft/advancement/criterion/AbstractCriterionConditions - FIELD field_24381 playerPredicate Ljava/util/Optional; - METHOD (Ljava/util/Optional;)V - ARG 1 playerPredicate - METHOD method_53061 (Lcom/google/gson/JsonObject;Lnet/minecraft/class_5258;)V - ARG 1 predicate diff --git a/mappings/net/minecraft/advancement/criterion/BeeNestDestroyedCriterion.mapping b/mappings/net/minecraft/advancement/criterion/BeeNestDestroyedCriterion.mapping index 27eba3bcd1..9f65328fbb 100644 --- a/mappings/net/minecraft/advancement/criterion/BeeNestDestroyedCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/BeeNestDestroyedCriterion.mapping @@ -1,22 +1,23 @@ CLASS net/minecraft/class_4708 net/minecraft/advancement/criterion/BeeNestDestroyedCriterion METHOD method_23872 (Lnet/minecraft/class_2680;Lnet/minecraft/class_1799;ILnet/minecraft/class_4708$class_4709;)Z ARG 3 conditions - METHOD method_23873 getBlock (Lcom/google/gson/JsonObject;)Lnet/minecraft/class_2248; - ARG 0 root METHOD method_23875 trigger (Lnet/minecraft/class_3222;Lnet/minecraft/class_2680;Lnet/minecraft/class_1799;I)V ARG 1 player ARG 2 state ARG 3 stack ARG 4 beeCount CLASS class_4709 Conditions - FIELD field_21569 block Lnet/minecraft/class_2248; - FIELD field_21570 item Ljava/util/Optional; - FIELD field_21571 beeCount Lnet/minecraft/class_2096$class_2100; - METHOD (Ljava/util/Optional;Lnet/minecraft/class_2248;Ljava/util/Optional;Lnet/minecraft/class_2096$class_2100;)V + FIELD comp_2029 getPlayerPredicate Ljava/util/Optional; + FIELD comp_2030 block Ljava/util/Optional; + FIELD comp_2031 item Ljava/util/Optional; + FIELD comp_2032 beeCount Lnet/minecraft/class_2096$class_2100; + METHOD (Ljava/util/Optional;Ljava/util/Optional;Ljava/util/Optional;Lnet/minecraft/class_2096$class_2100;)V ARG 1 playerPredicate - ARG 2 block ARG 3 item ARG 4 beeCount + METHOD comp_2030 block ()Ljava/util/Optional; + METHOD comp_2031 item ()Ljava/util/Optional; + METHOD comp_2032 beeCount ()Lnet/minecraft/class_2096$class_2100; METHOD method_23878 test (Lnet/minecraft/class_2680;Lnet/minecraft/class_1799;I)Z ARG 1 state ARG 2 stack @@ -25,5 +26,3 @@ CLASS net/minecraft/class_4708 net/minecraft/advancement/criterion/BeeNestDestro ARG 0 block ARG 1 itemPredicateBuilder ARG 2 beeCountRange - METHOD method_53070 (Lcom/google/gson/JsonObject;Lnet/minecraft/class_2073;)V - ARG 1 item diff --git a/mappings/net/minecraft/advancement/criterion/BredAnimalsCriterion.mapping b/mappings/net/minecraft/advancement/criterion/BredAnimalsCriterion.mapping index bd22f63a2d..d183ba17d1 100644 --- a/mappings/net/minecraft/advancement/criterion/BredAnimalsCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/BredAnimalsCriterion.mapping @@ -7,27 +7,25 @@ CLASS net/minecraft/class_196 net/minecraft/advancement/criterion/BredAnimalsCri ARG 3 partner ARG 4 child CLASS class_198 Conditions - FIELD field_1275 child Ljava/util/Optional; - FIELD field_1276 parent Ljava/util/Optional; - FIELD field_1277 partner Ljava/util/Optional; + FIELD comp_2029 getPlayerPredicate Ljava/util/Optional; + FIELD comp_2033 parent Ljava/util/Optional; + FIELD comp_2034 partner Ljava/util/Optional; + FIELD comp_2035 child Ljava/util/Optional; METHOD (Ljava/util/Optional;Ljava/util/Optional;Ljava/util/Optional;Ljava/util/Optional;)V ARG 1 playerPredicate ARG 2 parentPredicate ARG 3 partnerPredicate ARG 4 childPredicate + METHOD comp_2033 parent ()Ljava/util/Optional; + METHOD comp_2034 partner ()Ljava/util/Optional; + METHOD comp_2035 child ()Ljava/util/Optional; METHOD method_29918 create (Ljava/util/Optional;Ljava/util/Optional;Ljava/util/Optional;)Lnet/minecraft/class_175; ARG 0 parent ARG 1 partner ARG 2 child - METHOD method_53074 (Lcom/google/gson/JsonObject;Lnet/minecraft/class_5258;)V - ARG 1 child METHOD method_53075 parentMatches (Ljava/util/Optional;Lnet/minecraft/class_47;)Z ARG 0 parent ARG 1 parentContext - METHOD method_53076 (Lcom/google/gson/JsonObject;Lnet/minecraft/class_5258;)V - ARG 1 partner - METHOD method_53077 (Lcom/google/gson/JsonObject;Lnet/minecraft/class_5258;)V - ARG 1 parent METHOD method_860 any ()Lnet/minecraft/class_175; METHOD method_861 create (Lnet/minecraft/class_2048$class_2049;)Lnet/minecraft/class_175; ARG 0 child diff --git a/mappings/net/minecraft/advancement/criterion/BrewedPotionCriterion.mapping b/mappings/net/minecraft/advancement/criterion/BrewedPotionCriterion.mapping index 2ef25117c1..631c9b3258 100644 --- a/mappings/net/minecraft/advancement/criterion/BrewedPotionCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/BrewedPotionCriterion.mapping @@ -1,14 +1,13 @@ CLASS net/minecraft/class_1996 net/minecraft/advancement/criterion/BrewedPotionCriterion - METHOD method_22456 (Lnet/minecraft/class_1842;Lnet/minecraft/class_1996$class_1998;)Z + METHOD method_22456 (Lnet/minecraft/class_6880;Lnet/minecraft/class_1996$class_1998;)Z ARG 1 conditions - METHOD method_8784 trigger (Lnet/minecraft/class_3222;Lnet/minecraft/class_1842;)V + METHOD method_8784 trigger (Lnet/minecraft/class_3222;Lnet/minecraft/class_6880;)V ARG 1 player - ARG 2 potion CLASS class_1998 Conditions - FIELD field_9492 potion Lnet/minecraft/class_1842; - METHOD (Ljava/util/Optional;Lnet/minecraft/class_1842;)V + FIELD comp_2029 getPlayerPredicate Ljava/util/Optional; + FIELD comp_2036 potion Ljava/util/Optional; + METHOD (Ljava/util/Optional;Ljava/util/Optional;)V ARG 1 playerPredicate - ARG 2 potion - METHOD method_8790 matches (Lnet/minecraft/class_1842;)Z - ARG 1 potion + METHOD comp_2036 potion ()Ljava/util/Optional; + METHOD method_8790 matches (Lnet/minecraft/class_6880;)Z METHOD method_8791 any ()Lnet/minecraft/class_175; diff --git a/mappings/net/minecraft/advancement/criterion/ChangedDimensionCriterion.mapping b/mappings/net/minecraft/advancement/criterion/ChangedDimensionCriterion.mapping index bfd127d61a..994d7172e1 100644 --- a/mappings/net/minecraft/advancement/criterion/ChangedDimensionCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/ChangedDimensionCriterion.mapping @@ -6,12 +6,13 @@ CLASS net/minecraft/class_1999 net/minecraft/advancement/criterion/ChangedDimens ARG 2 from ARG 3 to CLASS class_2001 Conditions - FIELD field_9497 from Lnet/minecraft/class_5321; - FIELD field_9498 to Lnet/minecraft/class_5321; - METHOD (Ljava/util/Optional;Lnet/minecraft/class_5321;Lnet/minecraft/class_5321;)V + FIELD comp_2029 getPlayerPredicate Ljava/util/Optional; + FIELD comp_2037 from Ljava/util/Optional; + FIELD comp_2038 to Ljava/util/Optional; + METHOD (Ljava/util/Optional;Ljava/util/Optional;Ljava/util/Optional;)V ARG 1 playerPredicate - ARG 2 from - ARG 3 to + METHOD comp_2037 from ()Ljava/util/Optional; + METHOD comp_2038 to ()Ljava/util/Optional; METHOD method_35068 create (Lnet/minecraft/class_5321;Lnet/minecraft/class_5321;)Lnet/minecraft/class_175; ARG 0 from ARG 1 to diff --git a/mappings/net/minecraft/advancement/criterion/ChanneledLightningCriterion.mapping b/mappings/net/minecraft/advancement/criterion/ChanneledLightningCriterion.mapping index 8f8c593baa..b643237f97 100644 --- a/mappings/net/minecraft/advancement/criterion/ChanneledLightningCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/ChanneledLightningCriterion.mapping @@ -7,10 +7,12 @@ CLASS net/minecraft/class_2002 net/minecraft/advancement/criterion/ChanneledLigh ARG 1 player ARG 2 victims CLASS class_2004 Conditions - FIELD field_9503 victims Ljava/util/List; + FIELD comp_2029 getPlayerPredicate Ljava/util/Optional; + FIELD comp_2039 victims Ljava/util/List; METHOD (Ljava/util/Optional;Ljava/util/List;)V ARG 1 playerPredicate ARG 2 victims + METHOD comp_2039 victims ()Ljava/util/List; METHOD method_8808 matches (Ljava/util/Collection;)Z ARG 1 victims METHOD method_8809 create ([Lnet/minecraft/class_2048$class_2049;)Lnet/minecraft/class_175; diff --git a/mappings/net/minecraft/advancement/criterion/ConstructBeaconCriterion.mapping b/mappings/net/minecraft/advancement/criterion/ConstructBeaconCriterion.mapping index 1a40c76733..5f98b71e11 100644 --- a/mappings/net/minecraft/advancement/criterion/ConstructBeaconCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/ConstructBeaconCriterion.mapping @@ -5,10 +5,12 @@ CLASS net/minecraft/class_2006 net/minecraft/advancement/criterion/ConstructBeac ARG 1 player ARG 2 level CLASS class_2008 Conditions - FIELD field_9508 level Lnet/minecraft/class_2096$class_2100; + FIELD comp_2029 getPlayerPredicate Ljava/util/Optional; + FIELD comp_2040 level Lnet/minecraft/class_2096$class_2100; METHOD (Ljava/util/Optional;Lnet/minecraft/class_2096$class_2100;)V ARG 1 playerPredicate ARG 2 level + METHOD comp_2040 level ()Lnet/minecraft/class_2096$class_2100; METHOD method_35110 create ()Lnet/minecraft/class_175; METHOD method_8817 matches (I)Z ARG 1 level diff --git a/mappings/net/minecraft/advancement/criterion/ConsumeItemCriterion.mapping b/mappings/net/minecraft/advancement/criterion/ConsumeItemCriterion.mapping index 5fe02e5389..13aba5a5c3 100644 --- a/mappings/net/minecraft/advancement/criterion/ConsumeItemCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/ConsumeItemCriterion.mapping @@ -5,13 +5,13 @@ CLASS net/minecraft/class_2010 net/minecraft/advancement/criterion/ConsumeItemCr ARG 1 player ARG 2 stack CLASS class_2012 Conditions - FIELD field_9513 item Ljava/util/Optional; + FIELD comp_2029 getPlayerPredicate Ljava/util/Optional; + FIELD comp_2041 item Ljava/util/Optional; METHOD (Ljava/util/Optional;Ljava/util/Optional;)V ARG 1 playerPredicate ARG 2 item + METHOD comp_2041 item ()Ljava/util/Optional; METHOD method_35112 predicate (Lnet/minecraft/class_2073$class_2074;)Lnet/minecraft/class_175; - METHOD method_53109 (Lcom/google/gson/JsonObject;Lnet/minecraft/class_2073;)V - ARG 1 item METHOD method_8826 matches (Lnet/minecraft/class_1799;)Z ARG 1 stack METHOD method_8827 any ()Lnet/minecraft/class_175; diff --git a/mappings/net/minecraft/advancement/criterion/Criteria.mapping b/mappings/net/minecraft/advancement/criterion/Criteria.mapping index 434cb5172f..4ed6d1091f 100644 --- a/mappings/net/minecraft/advancement/criterion/Criteria.mapping +++ b/mappings/net/minecraft/advancement/criterion/Criteria.mapping @@ -24,7 +24,6 @@ CLASS net/minecraft/class_174 net/minecraft/advancement/criterion/Criteria FIELD field_1202 CHANNELED_LIGHTNING Lnet/minecraft/class_2002; FIELD field_1203 FISHING_ROD_HOOKED Lnet/minecraft/class_2058; FIELD field_1204 USED_TOTEM Lnet/minecraft/class_2148; - FIELD field_1205 VALUES Lcom/google/common/collect/BiMap; FIELD field_1206 VILLAGER_TRADE Lnet/minecraft/class_2140; FIELD field_1207 RECIPE_UNLOCKED Lnet/minecraft/class_2119; FIELD field_1208 FILLED_BUCKET Lnet/minecraft/class_2054; @@ -52,11 +51,6 @@ CLASS net/minecraft/class_174 net/minecraft/advancement/criterion/Criteria FIELD field_38701 ALLAY_DROP_ITEM_ON_BLOCK Lnet/minecraft/class_4711; FIELD field_38838 AVOID_VIBRATION Lnet/minecraft/class_2135; FIELD field_44587 RECIPE_CRAFTED Lnet/minecraft/class_8508; - METHOD method_53697 getId (Lnet/minecraft/class_179;)Lnet/minecraft/class_2960; - ARG 0 criterion - METHOD method_765 getById (Lnet/minecraft/class_2960;)Lnet/minecraft/class_179; - ARG 0 id - METHOD method_766 getCriteria ()Ljava/lang/Iterable; METHOD method_767 register (Ljava/lang/String;Lnet/minecraft/class_179;)Lnet/minecraft/class_179; ARG 0 id ARG 1 criterion diff --git a/mappings/net/minecraft/advancement/criterion/Criterion.mapping b/mappings/net/minecraft/advancement/criterion/Criterion.mapping index a346dcac2d..e9d4ac7b1d 100644 --- a/mappings/net/minecraft/advancement/criterion/Criterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/Criterion.mapping @@ -9,9 +9,6 @@ CLASS net/minecraft/class_179 net/minecraft/advancement/criterion/Criterion METHOD method_793 endTrackingCondition (Lnet/minecraft/class_2985;Lnet/minecraft/class_179$class_180;)V ARG 1 manager ARG 2 conditions - METHOD method_795 conditionsFromJson (Lcom/google/gson/JsonObject;Lnet/minecraft/class_5257;)Lnet/minecraft/class_184; - ARG 1 obj - ARG 2 predicateDeserializer CLASS class_180 ConditionsContainer FIELD comp_1925 conditions Lnet/minecraft/class_184; FIELD comp_1926 advancement Lnet/minecraft/class_8779; diff --git a/mappings/net/minecraft/advancement/criterion/CriterionConditions.mapping b/mappings/net/minecraft/advancement/criterion/CriterionConditions.mapping index 10b654019f..91172e22f7 100644 --- a/mappings/net/minecraft/advancement/criterion/CriterionConditions.mapping +++ b/mappings/net/minecraft/advancement/criterion/CriterionConditions.mapping @@ -1,2 +1 @@ CLASS net/minecraft/class_184 net/minecraft/advancement/criterion/CriterionConditions - METHOD method_807 toJson ()Lcom/google/gson/JsonObject; diff --git a/mappings/net/minecraft/advancement/criterion/CuredZombieVillagerCriterion.mapping b/mappings/net/minecraft/advancement/criterion/CuredZombieVillagerCriterion.mapping index 11696f1a2b..f45da094fc 100644 --- a/mappings/net/minecraft/advancement/criterion/CuredZombieVillagerCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/CuredZombieVillagerCriterion.mapping @@ -6,16 +6,15 @@ CLASS net/minecraft/class_2014 net/minecraft/advancement/criterion/CuredZombieVi ARG 2 zombie ARG 3 villager CLASS class_2016 Conditions - FIELD field_9518 zombie Ljava/util/Optional; - FIELD field_9519 villager Ljava/util/Optional; + FIELD comp_2029 getPlayerPredicate Ljava/util/Optional; + FIELD comp_2042 zombie Ljava/util/Optional; + FIELD comp_2043 villager Ljava/util/Optional; METHOD (Ljava/util/Optional;Ljava/util/Optional;Ljava/util/Optional;)V ARG 1 playerPredicate ARG 2 zombie ARG 3 villager - METHOD method_53110 (Lcom/google/gson/JsonObject;Lnet/minecraft/class_5258;)V - ARG 1 villager - METHOD method_53111 (Lcom/google/gson/JsonObject;Lnet/minecraft/class_5258;)V - ARG 1 zombie + METHOD comp_2042 zombie ()Ljava/util/Optional; + METHOD comp_2043 villager ()Ljava/util/Optional; METHOD method_8836 any ()Lnet/minecraft/class_175; METHOD method_8837 matches (Lnet/minecraft/class_47;Lnet/minecraft/class_47;)Z ARG 1 zombie diff --git a/mappings/net/minecraft/advancement/criterion/EffectsChangedCriterion.mapping b/mappings/net/minecraft/advancement/criterion/EffectsChangedCriterion.mapping index bf03d3b51b..514dff9257 100644 --- a/mappings/net/minecraft/advancement/criterion/EffectsChangedCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/EffectsChangedCriterion.mapping @@ -5,18 +5,17 @@ CLASS net/minecraft/class_2027 net/minecraft/advancement/criterion/EffectsChange ARG 1 player ARG 2 source CLASS class_2029 Conditions - FIELD field_33909 source Ljava/util/Optional; - FIELD field_9562 effects Ljava/util/Optional; + FIELD comp_2029 getPlayerPredicate Ljava/util/Optional; + FIELD comp_2046 effects Ljava/util/Optional; + FIELD comp_2047 source Ljava/util/Optional; METHOD (Ljava/util/Optional;Ljava/util/Optional;Ljava/util/Optional;)V ARG 1 playerPredicate ARG 2 effects ARG 3 source + METHOD comp_2046 effects ()Ljava/util/Optional; + METHOD comp_2047 source ()Ljava/util/Optional; METHOD method_37224 create (Lnet/minecraft/class_2048$class_2049;)Lnet/minecraft/class_175; ARG 0 source - METHOD method_53121 (Lcom/google/gson/JsonObject;Lnet/minecraft/class_5258;)V - ARG 1 source - METHOD method_53122 (Lcom/google/gson/JsonObject;Lnet/minecraft/class_2102;)V - ARG 1 effects METHOD method_8868 matches (Lnet/minecraft/class_3222;Lnet/minecraft/class_47;)Z ARG 1 player ARG 2 context diff --git a/mappings/net/minecraft/advancement/criterion/EnchantedItemCriterion.mapping b/mappings/net/minecraft/advancement/criterion/EnchantedItemCriterion.mapping index d51b15eed4..80a71b481d 100644 --- a/mappings/net/minecraft/advancement/criterion/EnchantedItemCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/EnchantedItemCriterion.mapping @@ -6,14 +6,15 @@ CLASS net/minecraft/class_2030 net/minecraft/advancement/criterion/EnchantedItem ARG 2 stack ARG 3 levels CLASS class_2032 Conditions - FIELD field_9567 item Ljava/util/Optional; - FIELD field_9568 levels Lnet/minecraft/class_2096$class_2100; + FIELD comp_2029 getPlayerPredicate Ljava/util/Optional; + FIELD comp_2048 item Ljava/util/Optional; + FIELD comp_2049 levels Lnet/minecraft/class_2096$class_2100; METHOD (Ljava/util/Optional;Ljava/util/Optional;Lnet/minecraft/class_2096$class_2100;)V ARG 1 playerPredicate ARG 2 item ARG 3 levels - METHOD method_53124 (Lcom/google/gson/JsonObject;Lnet/minecraft/class_2073;)V - ARG 1 item + METHOD comp_2048 item ()Ljava/util/Optional; + METHOD comp_2049 levels ()Lnet/minecraft/class_2096$class_2100; METHOD method_8877 any ()Lnet/minecraft/class_175; METHOD method_8878 matches (Lnet/minecraft/class_1799;I)Z ARG 1 stack diff --git a/mappings/net/minecraft/advancement/criterion/EnterBlockCriterion.mapping b/mappings/net/minecraft/advancement/criterion/EnterBlockCriterion.mapping index ad0b4aa8ce..bb39e1de87 100644 --- a/mappings/net/minecraft/advancement/criterion/EnterBlockCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/EnterBlockCriterion.mapping @@ -1,24 +1,18 @@ CLASS net/minecraft/class_2037 net/minecraft/advancement/criterion/EnterBlockCriterion - METHOD method_22464 (Lnet/minecraft/class_2248;Ljava/lang/String;)V - ARG 1 name METHOD method_22465 (Lnet/minecraft/class_2680;Lnet/minecraft/class_2037$class_2039;)Z ARG 1 conditions - METHOD method_22466 getBlock (Lcom/google/gson/JsonObject;)Lnet/minecraft/class_2248; - ARG 0 obj - METHOD method_53127 (Lnet/minecraft/class_2248;Lnet/minecraft/class_4559;)V - ARG 1 statePredicate METHOD method_8885 trigger (Lnet/minecraft/class_3222;Lnet/minecraft/class_2680;)V ARG 1 player ARG 2 state CLASS class_2039 Conditions - FIELD field_9576 block Lnet/minecraft/class_2248; - FIELD field_9577 state Ljava/util/Optional; - METHOD (Ljava/util/Optional;Lnet/minecraft/class_2248;Ljava/util/Optional;)V + FIELD comp_2029 getPlayerPredicate Ljava/util/Optional; + FIELD comp_2050 block Ljava/util/Optional; + FIELD comp_2051 state Ljava/util/Optional; + METHOD (Ljava/util/Optional;Ljava/util/Optional;Ljava/util/Optional;)V ARG 1 playerPredicate - ARG 2 block ARG 3 state - METHOD method_53128 (Lcom/google/gson/JsonObject;Lnet/minecraft/class_4559;)V - ARG 1 state + METHOD comp_2050 block ()Ljava/util/Optional; + METHOD comp_2051 state ()Ljava/util/Optional; METHOD method_8890 block (Lnet/minecraft/class_2248;)Lnet/minecraft/class_175; ARG 0 block METHOD method_8891 matches (Lnet/minecraft/class_2680;)Z diff --git a/mappings/net/minecraft/advancement/criterion/EntityHurtPlayerCriterion.mapping b/mappings/net/minecraft/advancement/criterion/EntityHurtPlayerCriterion.mapping index e454eddd22..51b1a9e8ab 100644 --- a/mappings/net/minecraft/advancement/criterion/EntityHurtPlayerCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/EntityHurtPlayerCriterion.mapping @@ -8,15 +8,15 @@ CLASS net/minecraft/class_2044 net/minecraft/advancement/criterion/EntityHurtPla METHOD method_22468 (Lnet/minecraft/class_3222;Lnet/minecraft/class_1282;FFZLnet/minecraft/class_2044$class_2046;)Z ARG 5 conditions CLASS class_2046 Conditions - FIELD field_9593 damage Ljava/util/Optional; + FIELD comp_2029 getPlayerPredicate Ljava/util/Optional; + FIELD comp_2052 damage Ljava/util/Optional; METHOD (Ljava/util/Optional;Ljava/util/Optional;)V ARG 1 playerPredicate ARG 2 damage + METHOD comp_2052 damage ()Ljava/util/Optional; METHOD method_35209 create (Lnet/minecraft/class_2019;)Lnet/minecraft/class_175; ARG 0 predicate METHOD method_35210 create ()Lnet/minecraft/class_175; - METHOD method_53133 (Lcom/google/gson/JsonObject;Lnet/minecraft/class_2019;)V - ARG 1 damage METHOD method_8907 matches (Lnet/minecraft/class_3222;Lnet/minecraft/class_1282;FFZ)Z ARG 1 player ARG 2 damageSource diff --git a/mappings/net/minecraft/advancement/criterion/FilledBucketCriterion.mapping b/mappings/net/minecraft/advancement/criterion/FilledBucketCriterion.mapping index 9c12ec2d4c..0e9332bced 100644 --- a/mappings/net/minecraft/advancement/criterion/FilledBucketCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/FilledBucketCriterion.mapping @@ -5,12 +5,12 @@ CLASS net/minecraft/class_2054 net/minecraft/advancement/criterion/FilledBucketC ARG 1 player ARG 2 stack CLASS class_2056 Conditions - FIELD field_9616 item Ljava/util/Optional; + FIELD comp_2029 getPlayerPredicate Ljava/util/Optional; + FIELD comp_2053 item Ljava/util/Optional; METHOD (Ljava/util/Optional;Ljava/util/Optional;)V ARG 1 playerPredicate ARG 2 item - METHOD method_53149 (Lcom/google/gson/JsonObject;Lnet/minecraft/class_2073;)V - ARG 1 item + METHOD comp_2053 item ()Ljava/util/Optional; METHOD method_8937 create (Lnet/minecraft/class_2073$class_2074;)Lnet/minecraft/class_175; ARG 0 item METHOD method_8938 matches (Lnet/minecraft/class_1799;)Z diff --git a/mappings/net/minecraft/advancement/criterion/FishingRodHookedCriterion.mapping b/mappings/net/minecraft/advancement/criterion/FishingRodHookedCriterion.mapping index bbbe4a1707..7407bc221f 100644 --- a/mappings/net/minecraft/advancement/criterion/FishingRodHookedCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/FishingRodHookedCriterion.mapping @@ -7,24 +7,22 @@ CLASS net/minecraft/class_2058 net/minecraft/advancement/criterion/FishingRodHoo ARG 3 bobber ARG 4 fishingLoots CLASS class_2060 Conditions - FIELD field_24391 hookedEntity Ljava/util/Optional; - FIELD field_9621 rod Ljava/util/Optional; - FIELD field_9623 caughtItem Ljava/util/Optional; + FIELD comp_2029 getPlayerPredicate Ljava/util/Optional; + FIELD comp_2054 rod Ljava/util/Optional; + FIELD comp_2055 hookedEntity Ljava/util/Optional; + FIELD comp_2056 caughtItem Ljava/util/Optional; METHOD (Ljava/util/Optional;Ljava/util/Optional;Ljava/util/Optional;Ljava/util/Optional;)V ARG 1 playerPredicate ARG 2 rod ARG 3 hookedEntity ARG 4 caughtItem + METHOD comp_2054 rod ()Ljava/util/Optional; + METHOD comp_2055 hookedEntity ()Ljava/util/Optional; + METHOD comp_2056 caughtItem ()Ljava/util/Optional; METHOD method_27810 matches (Lnet/minecraft/class_1799;Lnet/minecraft/class_47;Ljava/util/Collection;)Z ARG 1 rodStack ARG 2 hookedEntity ARG 3 fishingLoots - METHOD method_53151 (Lcom/google/gson/JsonObject;Lnet/minecraft/class_5258;)V - ARG 1 hookedEntity - METHOD method_53152 (Lcom/google/gson/JsonObject;Lnet/minecraft/class_2073;)V - ARG 1 caughtItem - METHOD method_53153 (Lcom/google/gson/JsonObject;Lnet/minecraft/class_2073;)V - ARG 1 rod METHOD method_8947 create (Ljava/util/Optional;Ljava/util/Optional;Ljava/util/Optional;)Lnet/minecraft/class_175; ARG 0 rod ARG 1 hookedEntity diff --git a/mappings/net/minecraft/advancement/criterion/InventoryChangedCriterion.mapping b/mappings/net/minecraft/advancement/criterion/InventoryChangedCriterion.mapping index d23f60df0f..33410d42e3 100644 --- a/mappings/net/minecraft/advancement/criterion/InventoryChangedCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/InventoryChangedCriterion.mapping @@ -13,16 +13,11 @@ CLASS net/minecraft/class_2066 net/minecraft/advancement/criterion/InventoryChan ARG 2 inventory ARG 3 stack CLASS class_2068 Conditions - FIELD field_9629 occupied Lnet/minecraft/class_2096$class_2100; - FIELD field_9630 full Lnet/minecraft/class_2096$class_2100; - FIELD field_9631 empty Lnet/minecraft/class_2096$class_2100; - FIELD field_9632 items Ljava/util/List; - METHOD (Ljava/util/Optional;Lnet/minecraft/class_2096$class_2100;Lnet/minecraft/class_2096$class_2100;Lnet/minecraft/class_2096$class_2100;Ljava/util/List;)V + FIELD comp_2029 getPlayerPredicate Ljava/util/Optional; + FIELD comp_2058 items Ljava/util/List; + METHOD (Ljava/util/Optional;Lnet/minecraft/class_2066$class_2068$class_8948;Ljava/util/List;)V ARG 1 playerPredicate - ARG 2 occupied - ARG 3 full - ARG 4 empty - ARG 5 items + METHOD comp_2058 items ()Ljava/util/List; METHOD method_24363 (Lnet/minecraft/class_1799;Lnet/minecraft/class_2073;)Z ARG 1 item METHOD method_53160 items ([Lnet/minecraft/class_2073$class_2074;)Lnet/minecraft/class_175; diff --git a/mappings/net/minecraft/advancement/criterion/ItemCriterion.mapping b/mappings/net/minecraft/advancement/criterion/ItemCriterion.mapping index 5af6edc34b..1519265e30 100644 --- a/mappings/net/minecraft/advancement/criterion/ItemCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/ItemCriterion.mapping @@ -6,10 +6,12 @@ CLASS net/minecraft/class_4711 net/minecraft/advancement/criterion/ItemCriterion ARG 2 pos ARG 3 stack CLASS class_4712 Conditions - FIELD field_24495 location Ljava/util/Optional; + FIELD comp_2029 getPlayerPredicate Ljava/util/Optional; + FIELD comp_2065 location Ljava/util/Optional; METHOD (Ljava/util/Optional;Ljava/util/Optional;)V ARG 1 playerPredicate ARG 2 location + METHOD comp_2065 location ()Ljava/util/Optional; METHOD method_27981 createItemUsedOnBlock (Lnet/minecraft/class_2090$class_2091;Lnet/minecraft/class_2073$class_2074;)Lnet/minecraft/class_175; ARG 0 location ARG 1 item @@ -25,5 +27,3 @@ CLASS net/minecraft/class_4711 net/minecraft/advancement/criterion/ItemCriterion ARG 1 location METHOD method_51712 createPlacedBlock ([Lnet/minecraft/class_5341$class_210;)Lnet/minecraft/class_175; ARG 0 locationConditions - METHOD method_53167 (Lcom/google/gson/JsonObject;Lnet/minecraft/class_5258;)V - ARG 1 location diff --git a/mappings/net/minecraft/advancement/criterion/ItemDurabilityChangedCriterion.mapping b/mappings/net/minecraft/advancement/criterion/ItemDurabilityChangedCriterion.mapping index 69e80a3e35..9d963d3fef 100644 --- a/mappings/net/minecraft/advancement/criterion/ItemDurabilityChangedCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/ItemDurabilityChangedCriterion.mapping @@ -6,19 +6,21 @@ CLASS net/minecraft/class_2069 net/minecraft/advancement/criterion/ItemDurabilit ARG 2 stack ARG 3 durability CLASS class_2071 Conditions - FIELD field_9637 item Ljava/util/Optional; - FIELD field_9638 durability Lnet/minecraft/class_2096$class_2100; - FIELD field_9639 delta Lnet/minecraft/class_2096$class_2100; + FIELD comp_2029 getPlayerPredicate Ljava/util/Optional; + FIELD comp_2062 item Ljava/util/Optional; + FIELD comp_2063 durability Lnet/minecraft/class_2096$class_2100; + FIELD comp_2064 delta Lnet/minecraft/class_2096$class_2100; METHOD (Ljava/util/Optional;Ljava/util/Optional;Lnet/minecraft/class_2096$class_2100;Lnet/minecraft/class_2096$class_2100;)V ARG 1 playerPredicate ARG 2 item ARG 3 durability ARG 4 delta + METHOD comp_2062 item ()Ljava/util/Optional; + METHOD comp_2063 durability ()Lnet/minecraft/class_2096$class_2100; + METHOD comp_2064 delta ()Lnet/minecraft/class_2096$class_2100; METHOD method_35229 create (Ljava/util/Optional;Lnet/minecraft/class_2096$class_2100;)Lnet/minecraft/class_175; ARG 0 item ARG 1 durability - METHOD method_53161 (Lcom/google/gson/JsonObject;Lnet/minecraft/class_2073;)V - ARG 1 item METHOD method_8967 create (Ljava/util/Optional;Ljava/util/Optional;Lnet/minecraft/class_2096$class_2100;)Lnet/minecraft/class_175; ARG 0 playerPredicate ARG 1 item diff --git a/mappings/net/minecraft/advancement/criterion/KilledByCrossbowCriterion.mapping b/mappings/net/minecraft/advancement/criterion/KilledByCrossbowCriterion.mapping index a83da8b5ce..3d585cd440 100644 --- a/mappings/net/minecraft/advancement/criterion/KilledByCrossbowCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/KilledByCrossbowCriterion.mapping @@ -5,12 +5,15 @@ CLASS net/minecraft/class_2076 net/minecraft/advancement/criterion/KilledByCross ARG 1 player ARG 2 piercingKilledEntities CLASS class_2078 Conditions - FIELD field_9659 uniqueEntityTypes Lnet/minecraft/class_2096$class_2100; - FIELD field_9660 victims Ljava/util/List; + FIELD comp_2029 getPlayerPredicate Ljava/util/Optional; + FIELD comp_2066 victims Ljava/util/List; + FIELD comp_2067 uniqueEntityTypes Lnet/minecraft/class_2096$class_2100; METHOD (Ljava/util/Optional;Ljava/util/List;Lnet/minecraft/class_2096$class_2100;)V ARG 1 playerPredicate ARG 2 victims ARG 3 uniqueEntityTypes + METHOD comp_2066 victims ()Ljava/util/List; + METHOD comp_2067 uniqueEntityTypes ()Lnet/minecraft/class_2096$class_2100; METHOD method_8986 create ([Lnet/minecraft/class_2048$class_2049;)Lnet/minecraft/class_175; ARG 0 victimPredicates METHOD method_8987 create (Lnet/minecraft/class_2096$class_2100;)Lnet/minecraft/class_175; diff --git a/mappings/net/minecraft/advancement/criterion/LevitationCriterion.mapping b/mappings/net/minecraft/advancement/criterion/LevitationCriterion.mapping index 1f61b7d235..fdb1d7c1dc 100644 --- a/mappings/net/minecraft/advancement/criterion/LevitationCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/LevitationCriterion.mapping @@ -6,14 +6,15 @@ CLASS net/minecraft/class_2085 net/minecraft/advancement/criterion/LevitationCri ARG 2 startPos ARG 3 duration CLASS class_2087 Conditions - FIELD field_9675 distance Ljava/util/Optional; - FIELD field_9676 duration Lnet/minecraft/class_2096$class_2100; + FIELD comp_2029 getPlayerPredicate Ljava/util/Optional; + FIELD comp_2070 distance Ljava/util/Optional; + FIELD comp_2071 duration Lnet/minecraft/class_2096$class_2100; METHOD (Ljava/util/Optional;Ljava/util/Optional;Lnet/minecraft/class_2096$class_2100;)V ARG 1 playerPredicate ARG 2 distance ARG 3 duration - METHOD method_53170 (Lcom/google/gson/JsonObject;Lnet/minecraft/class_2025;)V - ARG 1 distance + METHOD comp_2070 distance ()Ljava/util/Optional; + METHOD comp_2071 duration ()Lnet/minecraft/class_2096$class_2100; METHOD method_9013 create (Lnet/minecraft/class_2025;)Lnet/minecraft/class_175; ARG 0 distance METHOD method_9014 matches (Lnet/minecraft/class_3222;Lnet/minecraft/class_243;I)Z diff --git a/mappings/net/minecraft/advancement/criterion/LightningStrikeCriterion.mapping b/mappings/net/minecraft/advancement/criterion/LightningStrikeCriterion.mapping index 559299a68e..ec56a0d1b5 100644 --- a/mappings/net/minecraft/advancement/criterion/LightningStrikeCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/LightningStrikeCriterion.mapping @@ -8,19 +8,18 @@ CLASS net/minecraft/class_6405 net/minecraft/advancement/criterion/LightningStri METHOD method_37242 (Lnet/minecraft/class_47;Ljava/util/List;Lnet/minecraft/class_6405$class_6406;)Z ARG 2 conditions CLASS class_6406 Conditions - FIELD field_33926 lightning Ljava/util/Optional; - FIELD field_33927 bystander Ljava/util/Optional; + FIELD comp_2029 getPlayerPredicate Ljava/util/Optional; + FIELD comp_2072 lightning Ljava/util/Optional; + FIELD comp_2073 bystander Ljava/util/Optional; METHOD (Ljava/util/Optional;Ljava/util/Optional;Ljava/util/Optional;)V ARG 1 playerPredicate ARG 2 lightning ARG 3 bystander + METHOD comp_2072 lightning ()Ljava/util/Optional; + METHOD comp_2073 bystander ()Ljava/util/Optional; METHOD method_37243 create (Ljava/util/Optional;Ljava/util/Optional;)Lnet/minecraft/class_175; ARG 0 lightning ARG 1 bystander METHOD method_37244 test (Lnet/minecraft/class_47;Ljava/util/List;)Z ARG 1 lightning ARG 2 bystanders - METHOD method_53176 (Lcom/google/gson/JsonObject;Lnet/minecraft/class_5258;)V - ARG 1 bystander - METHOD method_53177 (Lcom/google/gson/JsonObject;Lnet/minecraft/class_5258;)V - ARG 1 lightning diff --git a/mappings/net/minecraft/advancement/criterion/OnKilledCriterion.mapping b/mappings/net/minecraft/advancement/criterion/OnKilledCriterion.mapping index 9c34a2372e..3226afa206 100644 --- a/mappings/net/minecraft/advancement/criterion/OnKilledCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/OnKilledCriterion.mapping @@ -6,12 +6,15 @@ CLASS net/minecraft/class_2080 net/minecraft/advancement/criterion/OnKilledCrite ARG 2 entity ARG 3 killingDamage CLASS class_2083 Conditions - FIELD field_9667 killingBlow Ljava/util/Optional; - FIELD field_9668 entity Ljava/util/Optional; + FIELD comp_2029 getPlayerPredicate Ljava/util/Optional; + FIELD comp_2068 entity Ljava/util/Optional; + FIELD comp_2069 killingBlow Ljava/util/Optional; METHOD (Ljava/util/Optional;Ljava/util/Optional;Ljava/util/Optional;)V ARG 1 playerPredicate ARG 2 entity ARG 3 killingBlow + METHOD comp_2068 entity ()Ljava/util/Optional; + METHOD comp_2069 killingBlow ()Ljava/util/Optional; METHOD method_35247 createPlayerKilledEntity (Lnet/minecraft/class_2048$class_2049;Ljava/util/Optional;)Lnet/minecraft/class_175; ARG 0 killedEntityPredicateBuilder ARG 1 killingBlow @@ -40,10 +43,6 @@ CLASS net/minecraft/class_2080 net/minecraft/advancement/criterion/OnKilledCrite ARG 0 entity ARG 1 killingBlow METHOD method_42671 createKillMobNearSculkCatalyst ()Lnet/minecraft/class_175; - METHOD method_53168 (Lcom/google/gson/JsonObject;Lnet/minecraft/class_5258;)V - ARG 1 entity - METHOD method_53169 (Lcom/google/gson/JsonObject;Lnet/minecraft/class_2022;)V - ARG 1 killingBlow METHOD method_8997 createPlayerKilledEntity (Lnet/minecraft/class_2048$class_2049;)Lnet/minecraft/class_175; ARG 0 killedEntityPredicateBuilder METHOD method_8998 createEntityKilledPlayer ()Lnet/minecraft/class_175; diff --git a/mappings/net/minecraft/advancement/criterion/PlayerGeneratesContainerLootCriterion.mapping b/mappings/net/minecraft/advancement/criterion/PlayerGeneratesContainerLootCriterion.mapping index 6b4b812a1c..3fec7891fa 100644 --- a/mappings/net/minecraft/advancement/criterion/PlayerGeneratesContainerLootCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/PlayerGeneratesContainerLootCriterion.mapping @@ -5,10 +5,12 @@ CLASS net/minecraft/class_5282 net/minecraft/advancement/criterion/PlayerGenerat ARG 1 player ARG 2 id CLASS class_5283 Conditions - FIELD field_24503 lootTable Lnet/minecraft/class_2960; + FIELD comp_2029 getPlayerPredicate Ljava/util/Optional; + FIELD comp_2074 lootTable Lnet/minecraft/class_2960; METHOD (Ljava/util/Optional;Lnet/minecraft/class_2960;)V ARG 1 playerPredicate ARG 2 lootTable + METHOD comp_2074 lootTable ()Lnet/minecraft/class_2960; METHOD method_27995 create (Lnet/minecraft/class_2960;)Lnet/minecraft/class_175; ARG 0 lootTable METHOD method_27996 test (Lnet/minecraft/class_2960;)Z diff --git a/mappings/net/minecraft/advancement/criterion/PlayerHurtEntityCriterion.mapping b/mappings/net/minecraft/advancement/criterion/PlayerHurtEntityCriterion.mapping index df2c80105f..975194e787 100644 --- a/mappings/net/minecraft/advancement/criterion/PlayerHurtEntityCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/PlayerHurtEntityCriterion.mapping @@ -9,12 +9,15 @@ CLASS net/minecraft/class_2115 net/minecraft/advancement/criterion/PlayerHurtEnt ARG 5 taken ARG 6 blocked CLASS class_2117 Conditions - FIELD field_9736 damage Ljava/util/Optional; - FIELD field_9737 entity Ljava/util/Optional; + FIELD comp_2029 getPlayerPredicate Ljava/util/Optional; + FIELD comp_2077 damage Ljava/util/Optional; + FIELD comp_2078 entity Ljava/util/Optional; METHOD (Ljava/util/Optional;Ljava/util/Optional;Ljava/util/Optional;)V ARG 1 playerPredicate ARG 2 damage ARG 3 entity + METHOD comp_2077 damage ()Ljava/util/Optional; + METHOD comp_2078 entity ()Ljava/util/Optional; METHOD method_35294 create (Ljava/util/Optional;Ljava/util/Optional;)Lnet/minecraft/class_175; ARG 0 damage ARG 1 entity @@ -23,10 +26,6 @@ CLASS net/minecraft/class_2115 net/minecraft/advancement/criterion/PlayerHurtEnt METHOD method_35297 create (Lnet/minecraft/class_2019$class_2020;)Lnet/minecraft/class_175; ARG 0 damage METHOD method_35298 create ()Lnet/minecraft/class_175; - METHOD method_53214 (Lcom/google/gson/JsonObject;Lnet/minecraft/class_5258;)V - ARG 1 entity - METHOD method_53215 (Lcom/google/gson/JsonObject;Lnet/minecraft/class_2019;)V - ARG 1 damage METHOD method_9103 create (Lnet/minecraft/class_2019$class_2020;Ljava/util/Optional;)Lnet/minecraft/class_175; ARG 0 damage ARG 1 entity diff --git a/mappings/net/minecraft/advancement/criterion/PlayerInteractedWithEntityCriterion.mapping b/mappings/net/minecraft/advancement/criterion/PlayerInteractedWithEntityCriterion.mapping index 4d5656969e..ef39604975 100644 --- a/mappings/net/minecraft/advancement/criterion/PlayerInteractedWithEntityCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/PlayerInteractedWithEntityCriterion.mapping @@ -6,12 +6,15 @@ CLASS net/minecraft/class_5409 net/minecraft/advancement/criterion/PlayerInterac ARG 2 stack ARG 3 entity CLASS class_5410 Conditions - FIELD field_25700 item Ljava/util/Optional; - FIELD field_25701 entity Ljava/util/Optional; + FIELD comp_2029 getPlayerPredicate Ljava/util/Optional; + FIELD comp_2079 item Ljava/util/Optional; + FIELD comp_2080 entity Ljava/util/Optional; METHOD (Ljava/util/Optional;Ljava/util/Optional;Ljava/util/Optional;)V ARG 1 playerPredicate ARG 2 item ARG 3 entity + METHOD comp_2079 item ()Ljava/util/Optional; + METHOD comp_2080 entity ()Ljava/util/Optional; METHOD method_30099 create (Ljava/util/Optional;Lnet/minecraft/class_2073$class_2074;Ljava/util/Optional;)Lnet/minecraft/class_175; ARG 0 playerPredicate ARG 1 item @@ -22,7 +25,3 @@ CLASS net/minecraft/class_5409 net/minecraft/advancement/criterion/PlayerInterac METHOD method_43278 create (Lnet/minecraft/class_2073$class_2074;Ljava/util/Optional;)Lnet/minecraft/class_175; ARG 0 item ARG 1 entity - METHOD method_53217 (Lcom/google/gson/JsonObject;Lnet/minecraft/class_5258;)V - ARG 1 entity - METHOD method_53218 (Lcom/google/gson/JsonObject;Lnet/minecraft/class_2073;)V - ARG 1 item diff --git a/mappings/net/minecraft/advancement/criterion/RecipeCraftedCriterion.mapping b/mappings/net/minecraft/advancement/criterion/RecipeCraftedCriterion.mapping index 14c0ade19d..095ff34d59 100644 --- a/mappings/net/minecraft/advancement/criterion/RecipeCraftedCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/RecipeCraftedCriterion.mapping @@ -6,12 +6,15 @@ CLASS net/minecraft/class_8508 net/minecraft/advancement/criterion/RecipeCrafted ARG 2 recipeId ARG 3 ingredients CLASS class_8509 Conditions - FIELD field_44605 recipeId Lnet/minecraft/class_2960; - FIELD field_44606 ingredients Ljava/util/List; + FIELD comp_2029 getPlayerPredicate Ljava/util/Optional; + FIELD comp_2087 recipeId Lnet/minecraft/class_2960; + FIELD comp_2088 ingredients Ljava/util/List; METHOD (Ljava/util/Optional;Lnet/minecraft/class_2960;Ljava/util/List;)V ARG 1 playerPredicate ARG 2 recipeId ARG 3 ingredients + METHOD comp_2087 recipeId ()Lnet/minecraft/class_2960; + METHOD comp_2088 ingredients ()Ljava/util/List; METHOD method_51352 create (Lnet/minecraft/class_2960;)Lnet/minecraft/class_175; ARG 0 recipeId METHOD method_51353 create (Lnet/minecraft/class_2960;Ljava/util/List;)Lnet/minecraft/class_175; diff --git a/mappings/net/minecraft/advancement/criterion/RecipeUnlockedCriterion.mapping b/mappings/net/minecraft/advancement/criterion/RecipeUnlockedCriterion.mapping index 0e980e66b0..b15cf71078 100644 --- a/mappings/net/minecraft/advancement/criterion/RecipeUnlockedCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/RecipeUnlockedCriterion.mapping @@ -7,9 +7,11 @@ CLASS net/minecraft/class_2119 net/minecraft/advancement/criterion/RecipeUnlocke ARG 1 player ARG 2 recipe CLASS class_2121 Conditions - FIELD field_9742 recipe Lnet/minecraft/class_2960; + FIELD comp_2029 getPlayerPredicate Ljava/util/Optional; + FIELD comp_2089 recipe Lnet/minecraft/class_2960; METHOD (Ljava/util/Optional;Lnet/minecraft/class_2960;)V ARG 1 playerPredicate ARG 2 recipe + METHOD comp_2089 recipe ()Lnet/minecraft/class_2960; METHOD method_9112 matches (Lnet/minecraft/class_8786;)Z ARG 1 recipe diff --git a/mappings/net/minecraft/advancement/criterion/ShotCrossbowCriterion.mapping b/mappings/net/minecraft/advancement/criterion/ShotCrossbowCriterion.mapping index a0866ca0cc..e79985be09 100644 --- a/mappings/net/minecraft/advancement/criterion/ShotCrossbowCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/ShotCrossbowCriterion.mapping @@ -5,14 +5,14 @@ CLASS net/minecraft/class_2123 net/minecraft/advancement/criterion/ShotCrossbowC ARG 1 player ARG 2 stack CLASS class_2125 Conditions - FIELD field_9747 item Ljava/util/Optional; + FIELD comp_2029 getPlayerPredicate Ljava/util/Optional; + FIELD comp_2090 item Ljava/util/Optional; METHOD (Ljava/util/Optional;Ljava/util/Optional;)V ARG 1 playerPredicate ARG 2 item + METHOD comp_2090 item ()Ljava/util/Optional; METHOD method_35323 create (Ljava/util/Optional;)Lnet/minecraft/class_175; ARG 0 item - METHOD method_53230 (Lcom/google/gson/JsonObject;Lnet/minecraft/class_2073;)V - ARG 1 item METHOD method_9120 create (Lnet/minecraft/class_1935;)Lnet/minecraft/class_175; ARG 0 item METHOD method_9121 matches (Lnet/minecraft/class_1799;)Z diff --git a/mappings/net/minecraft/advancement/criterion/SlideDownBlockCriterion.mapping b/mappings/net/minecraft/advancement/criterion/SlideDownBlockCriterion.mapping index 0a3e229c92..01144c400a 100644 --- a/mappings/net/minecraft/advancement/criterion/SlideDownBlockCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/SlideDownBlockCriterion.mapping @@ -1,25 +1,19 @@ CLASS net/minecraft/class_4713 net/minecraft/advancement/criterion/SlideDownBlockCriterion - METHOD method_23905 (Lnet/minecraft/class_2248;Ljava/lang/String;)V - ARG 1 key METHOD method_23906 (Lnet/minecraft/class_2680;Lnet/minecraft/class_4713$class_4714;)Z ARG 1 conditions - METHOD method_23907 getBlock (Lcom/google/gson/JsonObject;)Lnet/minecraft/class_2248; - ARG 0 root METHOD method_23909 trigger (Lnet/minecraft/class_3222;Lnet/minecraft/class_2680;)V ARG 1 player ARG 2 state - METHOD method_53231 (Lnet/minecraft/class_2248;Lnet/minecraft/class_4559;)V - ARG 1 statePredicate CLASS class_4714 Conditions - FIELD field_21587 block Lnet/minecraft/class_2248; - FIELD field_21588 state Ljava/util/Optional; - METHOD (Ljava/util/Optional;Lnet/minecraft/class_2248;Ljava/util/Optional;)V + FIELD comp_2029 getPlayerPredicate Ljava/util/Optional; + FIELD comp_2091 block Ljava/util/Optional; + FIELD comp_2092 state Ljava/util/Optional; + METHOD (Ljava/util/Optional;Ljava/util/Optional;Ljava/util/Optional;)V ARG 1 playerPredicate - ARG 2 block ARG 3 state + METHOD comp_2091 block ()Ljava/util/Optional; + METHOD comp_2092 state ()Ljava/util/Optional; METHOD method_23912 create (Lnet/minecraft/class_2248;)Lnet/minecraft/class_175; ARG 0 block METHOD method_23913 test (Lnet/minecraft/class_2680;)Z ARG 1 state - METHOD method_53232 (Lcom/google/gson/JsonObject;Lnet/minecraft/class_4559;)V - ARG 1 state diff --git a/mappings/net/minecraft/advancement/criterion/StartedRidingCriterion.mapping b/mappings/net/minecraft/advancement/criterion/StartedRidingCriterion.mapping index 76b7bbacc1..750295a783 100644 --- a/mappings/net/minecraft/advancement/criterion/StartedRidingCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/StartedRidingCriterion.mapping @@ -4,5 +4,6 @@ CLASS net/minecraft/class_6407 net/minecraft/advancement/criterion/StartedRiding METHOD method_37259 (Lnet/minecraft/class_6407$class_6408;)Z ARG 0 conditions CLASS class_6408 Conditions + FIELD comp_2029 getPlayerPredicate Ljava/util/Optional; METHOD method_37260 create (Lnet/minecraft/class_2048$class_2049;)Lnet/minecraft/class_175; ARG 0 player diff --git a/mappings/net/minecraft/advancement/criterion/SummonedEntityCriterion.mapping b/mappings/net/minecraft/advancement/criterion/SummonedEntityCriterion.mapping index a8a5fa2111..b1c0ca1220 100644 --- a/mappings/net/minecraft/advancement/criterion/SummonedEntityCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/SummonedEntityCriterion.mapping @@ -5,12 +5,12 @@ CLASS net/minecraft/class_2128 net/minecraft/advancement/criterion/SummonedEntit ARG 1 player ARG 2 entity CLASS class_2130 Conditions - FIELD field_9752 entity Ljava/util/Optional; + FIELD comp_2029 getPlayerPredicate Ljava/util/Optional; + FIELD comp_2093 entity Ljava/util/Optional; METHOD (Ljava/util/Optional;Ljava/util/Optional;)V ARG 1 playerPredicate ARG 2 entity - METHOD method_53244 (Lcom/google/gson/JsonObject;Lnet/minecraft/class_5258;)V - ARG 1 entity + METHOD comp_2093 entity ()Ljava/util/Optional; METHOD method_9129 create (Lnet/minecraft/class_2048$class_2049;)Lnet/minecraft/class_175; ARG 0 summonedEntityPredicateBuilder METHOD method_9130 matches (Lnet/minecraft/class_47;)Z diff --git a/mappings/net/minecraft/advancement/criterion/TameAnimalCriterion.mapping b/mappings/net/minecraft/advancement/criterion/TameAnimalCriterion.mapping index c0766348ba..fb17936935 100644 --- a/mappings/net/minecraft/advancement/criterion/TameAnimalCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/TameAnimalCriterion.mapping @@ -5,14 +5,14 @@ CLASS net/minecraft/class_2131 net/minecraft/advancement/criterion/TameAnimalCri ARG 1 player ARG 2 entity CLASS class_2133 Conditions - FIELD field_9757 entity Ljava/util/Optional; + FIELD comp_2029 getPlayerPredicate Ljava/util/Optional; + FIELD comp_2094 entity Ljava/util/Optional; METHOD (Ljava/util/Optional;Ljava/util/Optional;)V ARG 1 playerPredicate ARG 2 entity + METHOD comp_2094 entity ()Ljava/util/Optional; METHOD method_16114 create (Lnet/minecraft/class_2048$class_2049;)Lnet/minecraft/class_175; ARG 0 entity - METHOD method_53249 (Lcom/google/gson/JsonObject;Lnet/minecraft/class_5258;)V - ARG 1 entity METHOD method_9138 any ()Lnet/minecraft/class_175; METHOD method_9139 matches (Lnet/minecraft/class_47;)Z ARG 1 entity diff --git a/mappings/net/minecraft/advancement/criterion/TargetHitCriterion.mapping b/mappings/net/minecraft/advancement/criterion/TargetHitCriterion.mapping index 089f956b3c..a694a86bb7 100644 --- a/mappings/net/minecraft/advancement/criterion/TargetHitCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/TargetHitCriterion.mapping @@ -7,12 +7,15 @@ CLASS net/minecraft/class_4851 net/minecraft/advancement/criterion/TargetHitCrit METHOD method_24951 (Lnet/minecraft/class_47;Lnet/minecraft/class_243;ILnet/minecraft/class_4851$class_4852;)Z ARG 3 conditions CLASS class_4852 Conditions - FIELD field_22430 signalStrength Lnet/minecraft/class_2096$class_2100; - FIELD field_22512 projectile Ljava/util/Optional; + FIELD comp_2029 getPlayerPredicate Ljava/util/Optional; + FIELD comp_2095 signalStrength Lnet/minecraft/class_2096$class_2100; + FIELD comp_2096 projectile Ljava/util/Optional; METHOD (Ljava/util/Optional;Lnet/minecraft/class_2096$class_2100;Ljava/util/Optional;)V ARG 1 playerPredicate ARG 2 signalStrength ARG 3 projectile + METHOD comp_2095 signalStrength ()Lnet/minecraft/class_2096$class_2100; + METHOD comp_2096 projectile ()Ljava/util/Optional; METHOD method_24865 create (Lnet/minecraft/class_2096$class_2100;Ljava/util/Optional;)Lnet/minecraft/class_175; ARG 0 signalStrength ARG 1 projectile @@ -20,5 +23,3 @@ CLASS net/minecraft/class_4851 net/minecraft/advancement/criterion/TargetHitCrit ARG 1 projectile ARG 2 hitPos ARG 3 signalStrength - METHOD method_53250 (Lcom/google/gson/JsonObject;Lnet/minecraft/class_5258;)V - ARG 1 projectile diff --git a/mappings/net/minecraft/advancement/criterion/ThrownItemPickedUpByEntityCriterion.mapping b/mappings/net/minecraft/advancement/criterion/ThrownItemPickedUpByEntityCriterion.mapping index e0777abda1..08f48002d9 100644 --- a/mappings/net/minecraft/advancement/criterion/ThrownItemPickedUpByEntityCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/ThrownItemPickedUpByEntityCriterion.mapping @@ -6,12 +6,15 @@ CLASS net/minecraft/class_5279 net/minecraft/advancement/criterion/ThrownItemPic METHOD method_27976 (Lnet/minecraft/class_3222;Lnet/minecraft/class_1799;Lnet/minecraft/class_47;Lnet/minecraft/class_5279$class_5280;)Z ARG 3 conditions CLASS class_5280 Conditions - FIELD field_24493 item Ljava/util/Optional; - FIELD field_24494 entity Ljava/util/Optional; + FIELD comp_2029 getPlayerPredicate Ljava/util/Optional; + FIELD comp_2075 item Ljava/util/Optional; + FIELD comp_2076 entity Ljava/util/Optional; METHOD (Ljava/util/Optional;Ljava/util/Optional;Ljava/util/Optional;)V ARG 1 playerPredicate ARG 2 item ARG 3 entity + METHOD comp_2075 item ()Ljava/util/Optional; + METHOD comp_2076 entity ()Ljava/util/Optional; METHOD method_27978 createThrownItemPickedUpByEntity (Lnet/minecraft/class_5258;Ljava/util/Optional;Ljava/util/Optional;)Lnet/minecraft/class_175; ARG 0 player ARG 1 item @@ -24,7 +27,3 @@ CLASS net/minecraft/class_5279 net/minecraft/advancement/criterion/ThrownItemPic ARG 0 playerPredicate ARG 1 item ARG 2 entity - METHOD method_53212 (Lcom/google/gson/JsonObject;Lnet/minecraft/class_5258;)V - ARG 1 entity - METHOD method_53213 (Lcom/google/gson/JsonObject;Lnet/minecraft/class_2073;)V - ARG 1 item diff --git a/mappings/net/minecraft/advancement/criterion/TickCriterion.mapping b/mappings/net/minecraft/advancement/criterion/TickCriterion.mapping index 0700d4ab8d..3103320a53 100644 --- a/mappings/net/minecraft/advancement/criterion/TickCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/TickCriterion.mapping @@ -4,6 +4,7 @@ CLASS net/minecraft/class_2135 net/minecraft/advancement/criterion/TickCriterion METHOD method_9141 trigger (Lnet/minecraft/class_3222;)V ARG 1 player CLASS class_2137 Conditions + FIELD comp_2029 getPlayerPredicate Ljava/util/Optional; METHOD method_43135 createLocation (Ljava/util/Optional;)Lnet/minecraft/class_175; ARG 0 entity METHOD method_43136 createLocation (Lnet/minecraft/class_2248;Lnet/minecraft/class_1792;)Lnet/minecraft/class_175; diff --git a/mappings/net/minecraft/advancement/criterion/TravelCriterion.mapping b/mappings/net/minecraft/advancement/criterion/TravelCriterion.mapping index 7a6ea77286..c03a70ee3e 100644 --- a/mappings/net/minecraft/advancement/criterion/TravelCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/TravelCriterion.mapping @@ -5,12 +5,15 @@ CLASS net/minecraft/class_2108 net/minecraft/advancement/criterion/TravelCriteri ARG 1 player ARG 2 startPos CLASS class_2110 Conditions - FIELD field_35040 startPos Ljava/util/Optional; - FIELD field_9723 distance Ljava/util/Optional; + FIELD comp_2029 getPlayerPredicate Ljava/util/Optional; + FIELD comp_2044 startPos Ljava/util/Optional; + FIELD comp_2045 distance Ljava/util/Optional; METHOD (Ljava/util/Optional;Ljava/util/Optional;Ljava/util/Optional;)V ARG 1 playerPredicate ARG 2 startPos ARG 3 distance + METHOD comp_2044 startPos ()Ljava/util/Optional; + METHOD comp_2045 distance ()Ljava/util/Optional; METHOD method_38850 rideEntityInLava (Lnet/minecraft/class_2048$class_2049;Lnet/minecraft/class_2025;)Lnet/minecraft/class_175; ARG 0 entity ARG 1 distance @@ -18,10 +21,6 @@ CLASS net/minecraft/class_2108 net/minecraft/advancement/criterion/TravelCriteri ARG 0 entity ARG 1 distance ARG 2 startPos - METHOD method_53119 (Lcom/google/gson/JsonObject;Lnet/minecraft/class_2025;)V - ARG 1 distance - METHOD method_53120 (Lcom/google/gson/JsonObject;Lnet/minecraft/class_2090;)V - ARG 1 startPos METHOD method_9085 netherTravel (Lnet/minecraft/class_2025;)Lnet/minecraft/class_175; ARG 0 distance METHOD method_9086 matches (Lnet/minecraft/class_3218;Lnet/minecraft/class_243;Lnet/minecraft/class_243;)Z diff --git a/mappings/net/minecraft/advancement/criterion/UsedEnderEyeCriterion.mapping b/mappings/net/minecraft/advancement/criterion/UsedEnderEyeCriterion.mapping index af185c7acb..05e3fa0fd7 100644 --- a/mappings/net/minecraft/advancement/criterion/UsedEnderEyeCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/UsedEnderEyeCriterion.mapping @@ -5,9 +5,11 @@ CLASS net/minecraft/class_2143 net/minecraft/advancement/criterion/UsedEnderEyeC ARG 1 player ARG 2 strongholdPos CLASS class_2145 Conditions - FIELD field_9772 distance Lnet/minecraft/class_2096$class_2099; + FIELD comp_2029 getPlayerPredicate Ljava/util/Optional; + FIELD comp_2099 distance Lnet/minecraft/class_2096$class_2099; METHOD (Ljava/util/Optional;Lnet/minecraft/class_2096$class_2099;)V ARG 1 playerPredicate ARG 2 distance + METHOD comp_2099 distance ()Lnet/minecraft/class_2096$class_2099; METHOD method_9162 matches (D)Z ARG 1 distance diff --git a/mappings/net/minecraft/advancement/criterion/UsedTotemCriterion.mapping b/mappings/net/minecraft/advancement/criterion/UsedTotemCriterion.mapping index 6b927b3b39..c6903a08b1 100644 --- a/mappings/net/minecraft/advancement/criterion/UsedTotemCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/UsedTotemCriterion.mapping @@ -5,14 +5,14 @@ CLASS net/minecraft/class_2148 net/minecraft/advancement/criterion/UsedTotemCrit ARG 1 player ARG 2 stack CLASS class_2150 Conditions - FIELD field_9777 item Ljava/util/Optional; + FIELD comp_2029 getPlayerPredicate Ljava/util/Optional; + FIELD comp_2100 item Ljava/util/Optional; METHOD (Ljava/util/Optional;Ljava/util/Optional;)V ARG 1 playerPredicate ARG 2 item + METHOD comp_2100 item ()Ljava/util/Optional; METHOD method_35399 create (Lnet/minecraft/class_2073;)Lnet/minecraft/class_175; ARG 0 itemPredicate - METHOD method_53258 (Lcom/google/gson/JsonObject;Lnet/minecraft/class_2073;)V - ARG 1 item METHOD method_9170 create (Lnet/minecraft/class_1935;)Lnet/minecraft/class_175; ARG 0 item METHOD method_9171 matches (Lnet/minecraft/class_1799;)Z diff --git a/mappings/net/minecraft/advancement/criterion/UsingItemCriterion.mapping b/mappings/net/minecraft/advancement/criterion/UsingItemCriterion.mapping index 003bfeae40..f7b2568410 100644 --- a/mappings/net/minecraft/advancement/criterion/UsingItemCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/UsingItemCriterion.mapping @@ -5,14 +5,14 @@ CLASS net/minecraft/class_6409 net/minecraft/advancement/criterion/UsingItemCrit METHOD method_37263 (Lnet/minecraft/class_1799;Lnet/minecraft/class_6409$class_6410;)Z ARG 1 conditions CLASS class_6410 Conditions - FIELD field_33938 item Ljava/util/Optional; + FIELD comp_2029 getPlayerPredicate Ljava/util/Optional; + FIELD comp_2101 item Ljava/util/Optional; METHOD (Ljava/util/Optional;Ljava/util/Optional;)V ARG 1 playerPredicate ARG 2 item + METHOD comp_2101 item ()Ljava/util/Optional; METHOD method_37265 create (Lnet/minecraft/class_2048$class_2049;Lnet/minecraft/class_2073$class_2074;)Lnet/minecraft/class_175; ARG 0 player ARG 1 item METHOD method_37266 test (Lnet/minecraft/class_1799;)Z ARG 1 stack - METHOD method_53259 (Lcom/google/gson/JsonObject;Lnet/minecraft/class_2073;)V - ARG 1 item diff --git a/mappings/net/minecraft/advancement/criterion/VillagerTradeCriterion.mapping b/mappings/net/minecraft/advancement/criterion/VillagerTradeCriterion.mapping index 0ec4cc0552..2687e4a8b7 100644 --- a/mappings/net/minecraft/advancement/criterion/VillagerTradeCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/VillagerTradeCriterion.mapping @@ -6,18 +6,17 @@ CLASS net/minecraft/class_2140 net/minecraft/advancement/criterion/VillagerTrade ARG 2 merchant ARG 3 stack CLASS class_2142 Conditions - FIELD field_9766 item Ljava/util/Optional; - FIELD field_9767 villager Ljava/util/Optional; + FIELD comp_2029 getPlayerPredicate Ljava/util/Optional; + FIELD comp_2097 villager Ljava/util/Optional; + FIELD comp_2098 item Ljava/util/Optional; METHOD (Ljava/util/Optional;Ljava/util/Optional;Ljava/util/Optional;)V ARG 1 playerPredicate ARG 2 villager ARG 3 item + METHOD comp_2097 villager ()Ljava/util/Optional; + METHOD comp_2098 item ()Ljava/util/Optional; METHOD method_38914 create (Lnet/minecraft/class_2048$class_2049;)Lnet/minecraft/class_175; ARG 0 playerPredicate - METHOD method_53255 (Lcom/google/gson/JsonObject;Lnet/minecraft/class_5258;)V - ARG 1 villager - METHOD method_53256 (Lcom/google/gson/JsonObject;Lnet/minecraft/class_2073;)V - ARG 1 item METHOD method_9153 any ()Lnet/minecraft/class_175; METHOD method_9154 matches (Lnet/minecraft/class_47;Lnet/minecraft/class_1799;)Z ARG 1 villager diff --git a/mappings/net/minecraft/block/SpawnerBlock.mapping b/mappings/net/minecraft/block/SpawnerBlock.mapping index d2ccd79f94..3b1c18a583 100644 --- a/mappings/net/minecraft/block/SpawnerBlock.mapping +++ b/mappings/net/minecraft/block/SpawnerBlock.mapping @@ -1,6 +1,2 @@ CLASS net/minecraft/class_2496 net/minecraft/block/SpawnerBlock FIELD field_46455 CODEC Lcom/mojang/serialization/MapCodec; - METHOD method_46688 (Lnet/minecraft/class_1299;)Lnet/minecraft/class_2561; - ARG 0 entityType - METHOD method_46689 getEntityNameForTooltip (Lnet/minecraft/class_1799;)Ljava/util/Optional; - ARG 1 stack diff --git a/mappings/net/minecraft/block/entity/MobSpawnerBlockEntity.mapping b/mappings/net/minecraft/block/entity/MobSpawnerBlockEntity.mapping index 8ed2430309..4fff4ccea0 100644 --- a/mappings/net/minecraft/block/entity/MobSpawnerBlockEntity.mapping +++ b/mappings/net/minecraft/block/entity/MobSpawnerBlockEntity.mapping @@ -14,6 +14,6 @@ CLASS net/minecraft/class_2636 net/minecraft/block/entity/MobSpawnerBlockEntity ARG 1 pos ARG 2 state ARG 3 blockEntity - METHOD method_46408 setEntityType (Lnet/minecraft/class_1299;Lnet/minecraft/class_5819;)V + METHOD method_46408 (Lnet/minecraft/class_1299;Lnet/minecraft/class_5819;)V ARG 1 entityType ARG 2 random diff --git a/mappings/net/minecraft/block/entity/StructureBlockBlockEntity.mapping b/mappings/net/minecraft/block/entity/StructureBlockBlockEntity.mapping index f9fb159944..bac829642b 100644 --- a/mappings/net/minecraft/block/entity/StructureBlockBlockEntity.mapping +++ b/mappings/net/minecraft/block/entity/StructureBlockBlockEntity.mapping @@ -74,7 +74,6 @@ CLASS net/minecraft/class_2633 net/minecraft/block/entity/StructureBlockBlockEnt ARG 1 rotation METHOD method_20048 createRandom (J)Lnet/minecraft/class_5819; ARG 0 seed - METHOD method_21865 getStructurePath ()Ljava/lang/String; METHOD method_34273 (Lnet/minecraft/class_2586;)Lnet/minecraft/class_2633; ARG 0 blockEntity METHOD method_34274 (Lnet/minecraft/class_2633;)Z diff --git a/mappings/net/minecraft/class_8959.mapping b/mappings/net/minecraft/class_8959.mapping new file mode 100644 index 0000000000..6245eefca4 --- /dev/null +++ b/mappings/net/minecraft/class_8959.mapping @@ -0,0 +1,2 @@ +CLASS net/minecraft/class_8959 + METHOD method_46408 setEntityType (Lnet/minecraft/class_1299;Lnet/minecraft/class_5819;)V diff --git a/mappings/net/minecraft/client/gui/screen/ingame/JigsawBlockScreen.mapping b/mappings/net/minecraft/client/gui/screen/ingame/JigsawBlockScreen.mapping index 959160bdc0..01562a248e 100644 --- a/mappings/net/minecraft/client/gui/screen/ingame/JigsawBlockScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/ingame/JigsawBlockScreen.mapping @@ -14,7 +14,6 @@ CLASS net/minecraft/class_3742 net/minecraft/client/gui/screen/ingame/JigsawBloc FIELD field_26566 NAME_TEXT Lnet/minecraft/class_2561; FIELD field_26567 TARGET_TEXT Lnet/minecraft/class_2561; FIELD field_26568 FINAL_STATE_TEXT Lnet/minecraft/class_2561; - FIELD field_32344 MAX_GENERATION_DEPTH I FIELD field_33958 generateButton Lnet/minecraft/class_4185; FIELD field_47119 PLACEMENT_PRIORITY_TEXT Lnet/minecraft/class_2561; FIELD field_47120 PLACEMENT_PRIORITY_TOOLTIP Lnet/minecraft/class_2561; diff --git a/mappings/net/minecraft/client/particle/ExplosionEmitterParticle.mapping b/mappings/net/minecraft/client/particle/ExplosionEmitterParticle.mapping index 836676ddc8..0808da23a2 100644 --- a/mappings/net/minecraft/client/particle/ExplosionEmitterParticle.mapping +++ b/mappings/net/minecraft/client/particle/ExplosionEmitterParticle.mapping @@ -1,4 +1,2 @@ CLASS net/minecraft/class_689 net/minecraft/client/particle/ExplosionEmitterParticle - FIELD field_3813 maxAge_ I - FIELD field_3814 age_ I CLASS class_690 Factory diff --git a/mappings/net/minecraft/client/render/RenderLayer.mapping b/mappings/net/minecraft/client/render/RenderLayer.mapping index 5685cd5f3c..e6f0af50aa 100644 --- a/mappings/net/minecraft/client/render/RenderLayer.mapping +++ b/mappings/net/minecraft/client/render/RenderLayer.mapping @@ -33,7 +33,7 @@ CLASS net/minecraft/class_1921 net/minecraft/client/render/RenderLayer FIELD field_29633 ENTITY_NO_OUTLINE Ljava/util/function/Function; FIELD field_29634 ENTITY_SHADOW Ljava/util/function/Function; FIELD field_29635 ENTITY_ALPHA Ljava/util/function/Function; - FIELD field_29636 EYES Ljava/util/function/Function; + FIELD field_29636 EYES Ljava/util/function/BiFunction; FIELD field_29637 CRUMBLING Ljava/util/function/Function; FIELD field_29638 TEXT Ljava/util/function/Function; FIELD field_29639 TEXT_SEE_THROUGH Ljava/util/function/Function; @@ -187,7 +187,7 @@ CLASS net/minecraft/class_1921 net/minecraft/client/render/RenderLayer ARG 0 texture METHOD method_34835 (Lnet/minecraft/class_2960;)Lnet/minecraft/class_1921; ARG 0 texture - METHOD method_34836 (Lnet/minecraft/class_2960;)Lnet/minecraft/class_1921; + METHOD method_34836 (Lnet/minecraft/class_2960;Lnet/minecraft/class_4668$class_4685;)Lnet/minecraft/class_1921; ARG 0 texture METHOD method_34837 (Lnet/minecraft/class_2960;)Lnet/minecraft/class_1921; ARG 0 texture diff --git a/mappings/net/minecraft/command/CommandException.mapping b/mappings/net/minecraft/command/CommandException.mapping deleted file mode 100644 index 8f2d2ecbab..0000000000 --- a/mappings/net/minecraft/command/CommandException.mapping +++ /dev/null @@ -1,5 +0,0 @@ -CLASS net/minecraft/class_2164 net/minecraft/command/CommandException - FIELD field_9813 message Lnet/minecraft/class_2561; - METHOD (Lnet/minecraft/class_2561;)V - ARG 1 message - METHOD method_9199 getTextMessage ()Lnet/minecraft/class_2561; diff --git a/mappings/net/minecraft/command/CommandQueueEntry.mapping b/mappings/net/minecraft/command/CommandQueueEntry.mapping index e8b885987c..8828b7ee34 100644 --- a/mappings/net/minecraft/command/CommandQueueEntry.mapping +++ b/mappings/net/minecraft/command/CommandQueueEntry.mapping @@ -1,3 +1,2 @@ CLASS net/minecraft/class_8847 net/minecraft/command/CommandQueueEntry METHOD method_54388 execute (Lnet/minecraft/class_8854;)V - ARG 1 context diff --git a/mappings/net/minecraft/data/server/recipe/ComplexRecipeJsonBuilder.mapping b/mappings/net/minecraft/data/server/recipe/ComplexRecipeJsonBuilder.mapping index 5366a7d277..8e8b0ea899 100644 --- a/mappings/net/minecraft/data/server/recipe/ComplexRecipeJsonBuilder.mapping +++ b/mappings/net/minecraft/data/server/recipe/ComplexRecipeJsonBuilder.mapping @@ -1,12 +1,8 @@ CLASS net/minecraft/class_2456 net/minecraft/data/server/recipe/ComplexRecipeJsonBuilder - FIELD field_11429 serializer Lnet/minecraft/class_1865; - METHOD (Lnet/minecraft/class_1865;)V - ARG 1 serializer METHOD method_10475 offerTo (Lnet/minecraft/class_8790;Lnet/minecraft/class_2960;)V ARG 1 exporter ARG 2 id - METHOD method_10476 create (Lnet/minecraft/class_1865;)Lnet/minecraft/class_2456; - ARG 0 serializer + METHOD method_10476 create (Ljava/util/function/Function;)Lnet/minecraft/class_2456; METHOD method_53820 offerTo (Lnet/minecraft/class_8790;Ljava/lang/String;)V ARG 1 exporter ARG 2 id diff --git a/mappings/net/minecraft/data/server/recipe/CookingRecipeJsonBuilder.mapping b/mappings/net/minecraft/data/server/recipe/CookingRecipeJsonBuilder.mapping index 14d9cabaed..0879617ef2 100644 --- a/mappings/net/minecraft/data/server/recipe/CookingRecipeJsonBuilder.mapping +++ b/mappings/net/minecraft/data/server/recipe/CookingRecipeJsonBuilder.mapping @@ -4,18 +4,16 @@ CLASS net/minecraft/class_2454 net/minecraft/data/server/recipe/CookingRecipeJso FIELD field_11417 output Lnet/minecraft/class_1792; FIELD field_11418 input Lnet/minecraft/class_1856; FIELD field_11419 group Ljava/lang/String; - FIELD field_17599 serializer Lnet/minecraft/class_1865; FIELD field_40647 category Lnet/minecraft/class_7800; FIELD field_40648 cookingCategory Lnet/minecraft/class_7709; FIELD field_46150 criteria Ljava/util/Map; - METHOD (Lnet/minecraft/class_7800;Lnet/minecraft/class_7709;Lnet/minecraft/class_1935;Lnet/minecraft/class_1856;FILnet/minecraft/class_1865;)V + METHOD (Lnet/minecraft/class_7800;Lnet/minecraft/class_7709;Lnet/minecraft/class_1935;Lnet/minecraft/class_1856;FILnet/minecraft/class_1874$class_3958;)V ARG 1 category ARG 2 cookingCategory ARG 3 output ARG 4 input ARG 5 experience ARG 6 cookingTime - ARG 7 serializer METHOD method_10471 validate (Lnet/minecraft/class_2960;)V ARG 1 recipeId METHOD method_10473 createBlasting (Lnet/minecraft/class_1856;Lnet/minecraft/class_7800;Lnet/minecraft/class_1935;FI)Lnet/minecraft/class_2454; @@ -24,13 +22,12 @@ CLASS net/minecraft/class_2454 net/minecraft/data/server/recipe/CookingRecipeJso ARG 2 output ARG 3 experience ARG 4 cookingTime - METHOD method_17801 create (Lnet/minecraft/class_1856;Lnet/minecraft/class_7800;Lnet/minecraft/class_1935;FILnet/minecraft/class_1865;)Lnet/minecraft/class_2454; + METHOD method_17801 create (Lnet/minecraft/class_1856;Lnet/minecraft/class_7800;Lnet/minecraft/class_1935;FILnet/minecraft/class_1865;Lnet/minecraft/class_1874$class_3958;)Lnet/minecraft/class_2454; ARG 0 input ARG 1 category ARG 2 output ARG 3 experience ARG 4 cookingTime - ARG 5 serializer METHOD method_17802 createSmelting (Lnet/minecraft/class_1856;Lnet/minecraft/class_7800;Lnet/minecraft/class_1935;FI)Lnet/minecraft/class_2454; ARG 0 input ARG 1 category @@ -56,31 +53,3 @@ CLASS net/minecraft/class_2454 net/minecraft/data/server/recipe/CookingRecipeJso ARG 0 output METHOD method_46217 getBlastingRecipeCategory (Lnet/minecraft/class_1935;)Lnet/minecraft/class_7709; ARG 0 output - CLASS class_2455 CookingRecipeJsonProvider - FIELD comp_1230 id Lnet/minecraft/class_2960; - FIELD comp_1231 serializer Lnet/minecraft/class_1865; - FIELD comp_1235 advancement Lnet/minecraft/class_8779; - FIELD comp_1940 group Ljava/lang/String; - FIELD comp_1941 category Lnet/minecraft/class_7709; - FIELD comp_1942 input Lnet/minecraft/class_1856; - FIELD comp_1943 result Lnet/minecraft/class_1792; - FIELD comp_1944 experience F - FIELD comp_1945 cookingTime I - METHOD (Lnet/minecraft/class_2960;Ljava/lang/String;Lnet/minecraft/class_7709;Lnet/minecraft/class_1856;Lnet/minecraft/class_1792;FILnet/minecraft/class_8779;Lnet/minecraft/class_1865;)V - ARG 1 id - ARG 2 group - ARG 3 category - ARG 4 input - ARG 5 result - ARG 6 experience - ARG 7 cookingTime - ARG 8 advancement - ARG 9 serializer - METHOD comp_1940 group ()Ljava/lang/String; - METHOD comp_1941 category ()Lnet/minecraft/class_7709; - METHOD comp_1942 input ()Lnet/minecraft/class_1856; - METHOD comp_1943 result ()Lnet/minecraft/class_1792; - METHOD comp_1944 experience ()F - METHOD comp_1945 cookingTime ()I - METHOD equals (Ljava/lang/Object;)Z - ARG 1 o diff --git a/mappings/net/minecraft/data/server/recipe/RecipeExporter.mapping b/mappings/net/minecraft/data/server/recipe/RecipeExporter.mapping index e3c4059319..13566485ca 100644 --- a/mappings/net/minecraft/data/server/recipe/RecipeExporter.mapping +++ b/mappings/net/minecraft/data/server/recipe/RecipeExporter.mapping @@ -1,4 +1,3 @@ CLASS net/minecraft/class_8790 net/minecraft/data/server/recipe/RecipeExporter METHOD method_53818 getAdvancementBuilder ()Lnet/minecraft/class_161$class_162; - METHOD method_53819 accept (Lnet/minecraft/class_2444;)V - ARG 1 recipeJsonProvider + METHOD method_53819 accept (Lnet/minecraft/class_2960;Lnet/minecraft/class_1860;Lnet/minecraft/class_8779;)V diff --git a/mappings/net/minecraft/data/server/recipe/RecipeJsonBuilder.mapping b/mappings/net/minecraft/data/server/recipe/RecipeJsonBuilder.mapping deleted file mode 100644 index 630d2bd903..0000000000 --- a/mappings/net/minecraft/data/server/recipe/RecipeJsonBuilder.mapping +++ /dev/null @@ -1,7 +0,0 @@ -CLASS net/minecraft/class_7798 net/minecraft/data/server/recipe/RecipeJsonBuilder - METHOD method_46202 getCraftingCategory (Lnet/minecraft/class_7800;)Lnet/minecraft/class_7710; - ARG 0 category - CLASS class_7799 CraftingRecipeJsonProvider - FIELD field_40633 craftingCategory Lnet/minecraft/class_7710; - METHOD (Lnet/minecraft/class_7710;)V - ARG 1 craftingCategory diff --git a/mappings/net/minecraft/data/server/recipe/RecipeJsonProvider.mapping b/mappings/net/minecraft/data/server/recipe/RecipeJsonProvider.mapping deleted file mode 100644 index b426f60e98..0000000000 --- a/mappings/net/minecraft/data/server/recipe/RecipeJsonProvider.mapping +++ /dev/null @@ -1,7 +0,0 @@ -CLASS net/minecraft/class_2444 net/minecraft/data/server/recipe/RecipeJsonProvider - METHOD comp_1230 id ()Lnet/minecraft/class_2960; - METHOD comp_1231 serializer ()Lnet/minecraft/class_1865; - METHOD comp_1235 advancement ()Lnet/minecraft/class_8779; - METHOD method_10416 serialize (Lcom/google/gson/JsonObject;)V - ARG 1 json - METHOD method_17799 toJson ()Lcom/google/gson/JsonObject; diff --git a/mappings/net/minecraft/data/server/recipe/RecipeProvider.mapping b/mappings/net/minecraft/data/server/recipe/RecipeProvider.mapping index 5990f81ff3..c8e0f8bf6a 100644 --- a/mappings/net/minecraft/data/server/recipe/RecipeProvider.mapping +++ b/mappings/net/minecraft/data/server/recipe/RecipeProvider.mapping @@ -14,11 +14,10 @@ CLASS net/minecraft/class_2446 net/minecraft/data/server/recipe/RecipeProvider ARG 0 predicates METHOD method_10426 conditionsFromItem (Lnet/minecraft/class_1935;)Lnet/minecraft/class_175; ARG 0 item - METHOD method_17585 generateCookingRecipes (Lnet/minecraft/class_8790;Ljava/lang/String;Lnet/minecraft/class_1865;I)V + METHOD method_17585 generateCookingRecipes (Lnet/minecraft/class_8790;Ljava/lang/String;Lnet/minecraft/class_1865;Lnet/minecraft/class_1874$class_3958;I)V ARG 0 exporter ARG 1 cooker ARG 2 serializer - ARG 3 cookingTime METHOD method_24475 offerPlanksRecipe2 (Lnet/minecraft/class_8790;Lnet/minecraft/class_1935;Lnet/minecraft/class_6862;I)V ARG 0 exporter ARG 1 output @@ -232,16 +231,9 @@ CLASS net/minecraft/class_2446 net/minecraft/data/server/recipe/RecipeProvider METHOD method_35914 conditionsFromItem (Lnet/minecraft/class_2096$class_2100;Lnet/minecraft/class_1935;)Lnet/minecraft/class_175; ARG 0 count ARG 1 item - METHOD method_36232 offerMultipleOptions (Lnet/minecraft/class_8790;Lnet/minecraft/class_1865;Ljava/util/List;Lnet/minecraft/class_7800;Lnet/minecraft/class_1935;FILjava/lang/String;Ljava/lang/String;)V + METHOD method_36232 offerMultipleOptions (Lnet/minecraft/class_8790;Lnet/minecraft/class_1865;Lnet/minecraft/class_1874$class_3958;Ljava/util/List;Lnet/minecraft/class_7800;Lnet/minecraft/class_1935;FILjava/lang/String;Ljava/lang/String;)V ARG 0 exporter ARG 1 serializer - ARG 2 inputs - ARG 3 category - ARG 4 output - ARG 5 experience - ARG 6 cookingTime - ARG 7 group - ARG 8 method METHOD method_36233 offerSmelting (Lnet/minecraft/class_8790;Ljava/util/List;Lnet/minecraft/class_7800;Lnet/minecraft/class_1935;FILjava/lang/String;)V ARG 0 exporter ARG 1 inputs @@ -297,14 +289,10 @@ CLASS net/minecraft/class_2446 net/minecraft/data/server/recipe/RecipeProvider ARG 6 compactingGroup ARG 7 reverseId ARG 8 reverseGroup - METHOD method_36448 offerFoodCookingRecipe (Lnet/minecraft/class_8790;Ljava/lang/String;Lnet/minecraft/class_1865;ILnet/minecraft/class_1935;Lnet/minecraft/class_1935;F)V + METHOD method_36448 offerFoodCookingRecipe (Lnet/minecraft/class_8790;Ljava/lang/String;Lnet/minecraft/class_1865;Lnet/minecraft/class_1874$class_3958;ILnet/minecraft/class_1935;Lnet/minecraft/class_1935;F)V ARG 0 exporter ARG 1 cooker ARG 2 serializer - ARG 3 cookingTime - ARG 4 input - ARG 5 output - ARG 6 experience METHOD method_36449 offerReversibleCompactingRecipesWithReverseRecipeGroup (Lnet/minecraft/class_8790;Lnet/minecraft/class_7800;Lnet/minecraft/class_1935;Lnet/minecraft/class_7800;Lnet/minecraft/class_1935;Ljava/lang/String;Ljava/lang/String;)V ARG 0 exporter ARG 1 reverseCategory diff --git a/mappings/net/minecraft/data/server/recipe/ShapedRecipeJsonBuilder.mapping b/mappings/net/minecraft/data/server/recipe/ShapedRecipeJsonBuilder.mapping index 98771633ab..f228e606f9 100644 --- a/mappings/net/minecraft/data/server/recipe/ShapedRecipeJsonBuilder.mapping +++ b/mappings/net/minecraft/data/server/recipe/ShapedRecipeJsonBuilder.mapping @@ -14,7 +14,7 @@ CLASS net/minecraft/class_2447 net/minecraft/data/server/recipe/ShapedRecipeJson METHOD method_10428 input (Ljava/lang/Character;Lnet/minecraft/class_1856;)Lnet/minecraft/class_2447; ARG 1 c ARG 2 ingredient - METHOD method_10432 validate (Lnet/minecraft/class_2960;)V + METHOD method_10432 validate (Lnet/minecraft/class_2960;)Lnet/minecraft/class_8957; ARG 1 recipeId METHOD method_10433 input (Ljava/lang/Character;Lnet/minecraft/class_6862;)Lnet/minecraft/class_2447; ARG 1 c @@ -33,22 +33,3 @@ CLASS net/minecraft/class_2447 net/minecraft/data/server/recipe/ShapedRecipeJson ARG 1 patternStr METHOD method_49380 showNotification (Z)Lnet/minecraft/class_2447; ARG 1 showNotification - CLASS class_2448 ShapedRecipeJsonProvider - FIELD field_11383 output Lnet/minecraft/class_1792; - FIELD field_11384 pattern Ljava/util/List; - FIELD field_11385 id Lnet/minecraft/class_2960; - FIELD field_11386 resultCount I - FIELD field_11387 group Ljava/lang/String; - FIELD field_11388 inputs Ljava/util/Map; - FIELD field_11389 advancement Lnet/minecraft/class_8779; - FIELD field_42957 showNotification Z - METHOD (Lnet/minecraft/class_2960;Lnet/minecraft/class_1792;ILjava/lang/String;Lnet/minecraft/class_7710;Ljava/util/List;Ljava/util/Map;Lnet/minecraft/class_8779;Z)V - ARG 1 id - ARG 2 output - ARG 3 resultCount - ARG 4 group - ARG 5 craftingCategory - ARG 6 pattern - ARG 7 inputs - ARG 8 advancement - ARG 9 showNotification diff --git a/mappings/net/minecraft/data/server/recipe/ShapelessRecipeJsonBuilder.mapping b/mappings/net/minecraft/data/server/recipe/ShapelessRecipeJsonBuilder.mapping index 75899895df..2f3721ae8f 100644 --- a/mappings/net/minecraft/data/server/recipe/ShapelessRecipeJsonBuilder.mapping +++ b/mappings/net/minecraft/data/server/recipe/ShapelessRecipeJsonBuilder.mapping @@ -1,6 +1,6 @@ CLASS net/minecraft/class_2450 net/minecraft/data/server/recipe/ShapelessRecipeJsonBuilder FIELD field_11393 advancementBuilder Ljava/util/Map; - FIELD field_11394 inputs Ljava/util/List; + FIELD field_11394 inputs Lnet/minecraft/class_2371; FIELD field_11395 count I FIELD field_11396 output Lnet/minecraft/class_1792; FIELD field_11398 group Ljava/lang/String; @@ -30,18 +30,3 @@ CLASS net/minecraft/class_2450 net/minecraft/data/server/recipe/ShapelessRecipeJ ARG 2 size METHOD method_10454 input (Lnet/minecraft/class_1935;)Lnet/minecraft/class_2450; ARG 1 itemProvider - CLASS class_2451 ShapelessRecipeJsonProvider - FIELD field_11399 group Ljava/lang/String; - FIELD field_11400 count I - FIELD field_11401 advancementBuilder Lnet/minecraft/class_8779; - FIELD field_11402 recipeId Lnet/minecraft/class_2960; - FIELD field_11403 output Lnet/minecraft/class_1792; - FIELD field_11404 inputs Ljava/util/List; - METHOD (Lnet/minecraft/class_2960;Lnet/minecraft/class_1792;ILjava/lang/String;Lnet/minecraft/class_7710;Ljava/util/List;Lnet/minecraft/class_8779;)V - ARG 1 recipeId - ARG 2 output - ARG 3 outputCount - ARG 4 group - ARG 5 craftingCategory - ARG 6 inputs - ARG 7 advancementBuilder diff --git a/mappings/net/minecraft/data/server/recipe/SingleItemRecipeJsonBuilder.mapping b/mappings/net/minecraft/data/server/recipe/SingleItemRecipeJsonBuilder.mapping index 13f9e094e3..2cd6e08b05 100644 --- a/mappings/net/minecraft/data/server/recipe/SingleItemRecipeJsonBuilder.mapping +++ b/mappings/net/minecraft/data/server/recipe/SingleItemRecipeJsonBuilder.mapping @@ -3,12 +3,10 @@ CLASS net/minecraft/class_3981 net/minecraft/data/server/recipe/SingleItemRecipe FIELD field_17691 input Lnet/minecraft/class_1856; FIELD field_17692 count I FIELD field_17694 group Ljava/lang/String; - FIELD field_17695 serializer Lnet/minecraft/class_1865; FIELD field_40650 category Lnet/minecraft/class_7800; FIELD field_46151 criteria Ljava/util/Map; - METHOD (Lnet/minecraft/class_7800;Lnet/minecraft/class_1865;Lnet/minecraft/class_1856;Lnet/minecraft/class_1935;I)V + METHOD (Lnet/minecraft/class_7800;Lnet/minecraft/class_3972$class_3974;Lnet/minecraft/class_1856;Lnet/minecraft/class_1935;I)V ARG 1 category - ARG 2 serializer ARG 3 input ARG 4 output ARG 5 count @@ -23,25 +21,3 @@ CLASS net/minecraft/class_3981 net/minecraft/data/server/recipe/SingleItemRecipe ARG 3 count METHOD method_17973 validate (Lnet/minecraft/class_2960;)V ARG 1 recipeId - CLASS class_3982 SingleItemRecipeJsonProvider - FIELD comp_1230 id Lnet/minecraft/class_2960; - FIELD comp_1231 serializer Lnet/minecraft/class_1865; - FIELD comp_1235 advancement Lnet/minecraft/class_8779; - FIELD comp_1947 group Ljava/lang/String; - FIELD comp_1948 input Lnet/minecraft/class_1856; - FIELD comp_1949 output Lnet/minecraft/class_1792; - FIELD comp_1950 count I - METHOD (Lnet/minecraft/class_2960;Lnet/minecraft/class_1865;Ljava/lang/String;Lnet/minecraft/class_1856;Lnet/minecraft/class_1792;ILnet/minecraft/class_8779;)V - ARG 1 id - ARG 2 serializer - ARG 3 group - ARG 4 input - ARG 5 output - ARG 6 outputCount - ARG 7 advancement - METHOD comp_1947 group ()Ljava/lang/String; - METHOD comp_1948 input ()Lnet/minecraft/class_1856; - METHOD comp_1949 output ()Lnet/minecraft/class_1792; - METHOD comp_1950 count ()I - METHOD equals (Ljava/lang/Object;)Z - ARG 1 o diff --git a/mappings/net/minecraft/data/server/recipe/SmithingTransformRecipeJsonBuilder.mapping b/mappings/net/minecraft/data/server/recipe/SmithingTransformRecipeJsonBuilder.mapping index 3687040116..1a7db2e0d0 100644 --- a/mappings/net/minecraft/data/server/recipe/SmithingTransformRecipeJsonBuilder.mapping +++ b/mappings/net/minecraft/data/server/recipe/SmithingTransformRecipeJsonBuilder.mapping @@ -4,15 +4,10 @@ CLASS net/minecraft/class_8074 net/minecraft/data/server/recipe/SmithingTransfor FIELD field_42092 addition Lnet/minecraft/class_1856; FIELD field_42093 category Lnet/minecraft/class_7800; FIELD field_42094 result Lnet/minecraft/class_1792; - FIELD field_42096 serializer Lnet/minecraft/class_1865; FIELD field_46152 criteria Ljava/util/Map; - METHOD (Lnet/minecraft/class_1865;Lnet/minecraft/class_1856;Lnet/minecraft/class_1856;Lnet/minecraft/class_1856;Lnet/minecraft/class_7800;Lnet/minecraft/class_1792;)V - ARG 1 serializer + METHOD (Lnet/minecraft/class_1856;Lnet/minecraft/class_1856;Lnet/minecraft/class_1856;Lnet/minecraft/class_7800;Lnet/minecraft/class_1792;)V ARG 2 template ARG 3 base - ARG 4 addition - ARG 5 category - ARG 6 result METHOD method_48534 validate (Lnet/minecraft/class_2960;)V ARG 1 recipeId METHOD method_48535 create (Lnet/minecraft/class_1856;Lnet/minecraft/class_1856;Lnet/minecraft/class_1856;Lnet/minecraft/class_7800;Lnet/minecraft/class_1792;)Lnet/minecraft/class_8074; @@ -30,17 +25,3 @@ CLASS net/minecraft/class_8074 net/minecraft/data/server/recipe/SmithingTransfor METHOD method_48538 offerTo (Lnet/minecraft/class_8790;Ljava/lang/String;)V ARG 1 exporter ARG 2 recipeId - CLASS class_8075 SmithingTransformRecipeJsonProvider - FIELD comp_1230 id Lnet/minecraft/class_2960; - FIELD comp_1231 serializer Lnet/minecraft/class_1865; - FIELD comp_1235 advancement Lnet/minecraft/class_8779; - METHOD (Lnet/minecraft/class_2960;Lnet/minecraft/class_1865;Lnet/minecraft/class_1856;Lnet/minecraft/class_1856;Lnet/minecraft/class_1856;Lnet/minecraft/class_1792;Lnet/minecraft/class_8779;)V - ARG 1 id - ARG 2 type - ARG 3 template - ARG 4 base - ARG 5 addition - ARG 6 result - ARG 7 advancement - METHOD equals (Ljava/lang/Object;)Z - ARG 1 o diff --git a/mappings/net/minecraft/data/server/recipe/SmithingTrimRecipeJsonBuilder.mapping b/mappings/net/minecraft/data/server/recipe/SmithingTrimRecipeJsonBuilder.mapping index 2679eb88cc..56be85e429 100644 --- a/mappings/net/minecraft/data/server/recipe/SmithingTrimRecipeJsonBuilder.mapping +++ b/mappings/net/minecraft/data/server/recipe/SmithingTrimRecipeJsonBuilder.mapping @@ -3,14 +3,10 @@ CLASS net/minecraft/class_8076 net/minecraft/data/server/recipe/SmithingTrimReci FIELD field_42098 template Lnet/minecraft/class_1856; FIELD field_42099 base Lnet/minecraft/class_1856; FIELD field_42100 addition Lnet/minecraft/class_1856; - FIELD field_42102 serializer Lnet/minecraft/class_1865; FIELD field_46153 criteria Ljava/util/Map; - METHOD (Lnet/minecraft/class_1865;Lnet/minecraft/class_7800;Lnet/minecraft/class_1856;Lnet/minecraft/class_1856;Lnet/minecraft/class_1856;)V - ARG 1 serializer - ARG 2 category + METHOD (Lnet/minecraft/class_7800;Lnet/minecraft/class_1856;Lnet/minecraft/class_1856;Lnet/minecraft/class_1856;)V ARG 3 template ARG 4 base - ARG 5 addition METHOD method_48539 validate (Lnet/minecraft/class_2960;)V ARG 1 recipeId METHOD method_48540 create (Lnet/minecraft/class_1856;Lnet/minecraft/class_1856;Lnet/minecraft/class_1856;Lnet/minecraft/class_7800;)Lnet/minecraft/class_8076; @@ -24,7 +20,3 @@ CLASS net/minecraft/class_8076 net/minecraft/data/server/recipe/SmithingTrimReci METHOD method_48542 offerTo (Lnet/minecraft/class_8790;Lnet/minecraft/class_2960;)V ARG 1 exporter ARG 2 recipeId - CLASS class_8077 SmithingTrimRecipeJsonProvider - FIELD comp_1230 id Lnet/minecraft/class_2960; - FIELD comp_1231 serializer Lnet/minecraft/class_1865; - FIELD comp_1235 advancement Lnet/minecraft/class_8779; diff --git a/mappings/net/minecraft/datafixer/fix/ProjectileItemTypeFix.mapping b/mappings/net/minecraft/datafixer/fix/ProjectileItemTypeFix.mapping index 2a34bb9970..4f4742eec2 100644 --- a/mappings/net/minecraft/datafixer/fix/ProjectileItemTypeFix.mapping +++ b/mappings/net/minecraft/datafixer/fix/ProjectileItemTypeFix.mapping @@ -10,8 +10,6 @@ CLASS net/minecraft/class_8918 net/minecraft/datafixer/fix/ProjectileItemTypeFix METHOD method_54731 createStack (Lcom/mojang/serialization/Dynamic;Ljava/lang/String;)Lcom/mojang/serialization/Dynamic; ARG 0 projectileData ARG 1 id - METHOD method_54732 (Ljava/lang/String;)Ljava/lang/IllegalStateException; - ARG 0 value METHOD method_54733 createFixApplier (Ljava/lang/String;Lnet/minecraft/class_8918$class_8919;)Ljava/util/function/Function; ARG 1 id ARG 2 fixer @@ -29,8 +27,6 @@ CLASS net/minecraft/class_8918 net/minecraft/datafixer/fix/ProjectileItemTypeFix ARG 1 type METHOD method_54738 (Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic; ARG 0 data - METHOD method_54739 (Ljava/lang/String;)Ljava/lang/IllegalStateException; - ARG 0 value METHOD method_54740 fixTrident (Lcom/mojang/datafixers/Typed;Lcom/mojang/datafixers/types/Type;)Lcom/mojang/datafixers/Typed; ARG 0 typed ARG 1 type diff --git a/mappings/net/minecraft/entity/Entity.mapping b/mappings/net/minecraft/entity/Entity.mapping index f28cb24ad8..af59d4b732 100644 --- a/mappings/net/minecraft/entity/Entity.mapping +++ b/mappings/net/minecraft/entity/Entity.mapping @@ -1211,7 +1211,7 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity COMMENT return {@link PistonBehavior#IGNORE}, causing the piston to not affect the entity's COMMENT position. Other piston behaviors are inapplicable to entities, and treated like COMMENT {@link PistonBehavior#NORMAL}. - METHOD method_5659 isImmuneToExplosion ()Z + METHOD method_5659 isImmuneToExplosion (Lnet/minecraft/class_1927;)Z COMMENT {@return whether the entity is immune from explosion knockback and damage} COMMENT COMMENT

Invisible {@link net.minecraft.entity.decoration.ArmorStandEntity} and diff --git a/mappings/net/minecraft/entity/ai/brain/task/LongJumpTask.mapping b/mappings/net/minecraft/entity/ai/brain/task/LongJumpTask.mapping index c74e8d29f2..18656deb6a 100644 --- a/mappings/net/minecraft/entity/ai/brain/task/LongJumpTask.mapping +++ b/mappings/net/minecraft/entity/ai/brain/task/LongJumpTask.mapping @@ -29,15 +29,6 @@ CLASS net/minecraft/class_6030 net/minecraft/entity/ai/brain/task/LongJumpTask ARG 5 entityToSound ARG 6 jumpToPredicate METHOD method_35078 getJumpingVelocity (Lnet/minecraft/class_1308;Lnet/minecraft/class_243;)Lnet/minecraft/class_243; - ARG 1 entity - ARG 2 pos - METHOD method_35079 getJumpingVelocity (Lnet/minecraft/class_1308;Lnet/minecraft/class_243;I)Lnet/minecraft/class_243; - ARG 1 entity - ARG 2 pos - ARG 3 range - METHOD method_35080 canReach (Lnet/minecraft/class_1308;Lnet/minecraft/class_4048;Lnet/minecraft/class_243;Lnet/minecraft/class_243;)Z - ARG 1 entity - ARG 2 dimensions METHOD method_41336 getTarget (Lnet/minecraft/class_3218;)Ljava/util/Optional; ARG 1 world METHOD method_41337 canJumpTo (Lnet/minecraft/class_3218;Lnet/minecraft/class_1308;Lnet/minecraft/class_2338;)Z diff --git a/mappings/net/minecraft/entity/player/PlayerEntity.mapping b/mappings/net/minecraft/entity/player/PlayerEntity.mapping index 982a86354d..65312a4c7a 100644 --- a/mappings/net/minecraft/entity/player/PlayerEntity.mapping +++ b/mappings/net/minecraft/entity/player/PlayerEntity.mapping @@ -278,8 +278,7 @@ CLASS net/minecraft/class_1657 net/minecraft/entity/player/PlayerEntity METHOD method_7333 lockRecipes (Ljava/util/Collection;)I ARG 1 recipes METHOD method_7334 getGameProfile ()Lcom/mojang/authlib/GameProfile; - METHOD method_7335 unlockRecipes ([Lnet/minecraft/class_2960;)V - ARG 1 ids + METHOD method_7335 unlockRecipes (Ljava/util/List;)V METHOD method_7337 isCreative ()Z COMMENT Returns whether this player is in creative mode. METHOD method_7338 isCreativeLevelTwoOp ()Z diff --git a/mappings/net/minecraft/entity/projectile/ProjectileUtil.mapping b/mappings/net/minecraft/entity/projectile/ProjectileUtil.mapping index 59a77b078d..84bcfb64e9 100644 --- a/mappings/net/minecraft/entity/projectile/ProjectileUtil.mapping +++ b/mappings/net/minecraft/entity/projectile/ProjectileUtil.mapping @@ -1,6 +1,6 @@ CLASS net/minecraft/class_1675 net/minecraft/entity/projectile/ProjectileUtil FIELD field_46654 DEFAULT_MARGIN F - METHOD method_18074 getCollision (Lnet/minecraft/class_243;Lnet/minecraft/class_1297;Ljava/util/function/Predicate;Lnet/minecraft/class_243;Lnet/minecraft/class_1937;F)Lnet/minecraft/class_239; + METHOD method_18074 getCollision (Lnet/minecraft/class_243;Lnet/minecraft/class_1297;Ljava/util/function/Predicate;Lnet/minecraft/class_243;Lnet/minecraft/class_1937;FLnet/minecraft/class_3959$class_3960;)Lnet/minecraft/class_239; ARG 0 pos ARG 1 entity ARG 2 predicate diff --git a/mappings/net/minecraft/entity/vehicle/VehicleEntity.mapping b/mappings/net/minecraft/entity/vehicle/VehicleEntity.mapping index d96e336489..c928f06818 100644 --- a/mappings/net/minecraft/entity/vehicle/VehicleEntity.mapping +++ b/mappings/net/minecraft/entity/vehicle/VehicleEntity.mapping @@ -2,7 +2,6 @@ CLASS net/minecraft/class_8836 net/minecraft/entity/vehicle/VehicleEntity FIELD field_46655 DAMAGE_WOBBLE_TICKS Lnet/minecraft/class_2940; FIELD field_46656 DAMAGE_WOBBLE_SIDE Lnet/minecraft/class_2940; FIELD field_46657 DAMAGE_WOBBLE_STRENGTH Lnet/minecraft/class_2940; - METHOD method_54293 shouldAlwaysKill ()Z METHOD method_54294 getDamageWobbleStrength ()F METHOD method_54295 getDamageWobbleTicks ()I METHOD method_54296 getDamageWobbleSide ()I diff --git a/mappings/net/minecraft/item/ItemStack.mapping b/mappings/net/minecraft/item/ItemStack.mapping index cc86cf9289..f57ec7ef10 100644 --- a/mappings/net/minecraft/item/ItemStack.mapping +++ b/mappings/net/minecraft/item/ItemStack.mapping @@ -127,10 +127,6 @@ CLASS net/minecraft/class_1799 net/minecraft/item/ItemStack METHOD (Lnet/minecraft/class_1935;I)V ARG 1 item ARG 2 count - METHOD (Lnet/minecraft/class_1935;ILjava/util/Optional;)V - ARG 1 item - ARG 2 count - ARG 3 nbt METHOD (Lnet/minecraft/class_2487;)V ARG 1 nbt METHOD (Lnet/minecraft/class_6880;)V @@ -138,6 +134,9 @@ CLASS net/minecraft/class_1799 net/minecraft/item/ItemStack METHOD (Lnet/minecraft/class_6880;I)V ARG 1 itemEntry ARG 2 count + METHOD (Lnet/minecraft/class_6880;ILjava/util/Optional;)V + ARG 2 count + ARG 3 nbt METHOD method_17869 (Ljava/util/List;Lnet/minecraft/class_2487;Lnet/minecraft/class_1887;)V ARG 2 e METHOD method_17870 appendEnchantments (Ljava/util/List;Lnet/minecraft/class_2499;)V diff --git a/mappings/net/minecraft/loot/LootTableReporter.mapping b/mappings/net/minecraft/loot/LootTableReporter.mapping index 175e9cc191..70f862ac14 100644 --- a/mappings/net/minecraft/loot/LootTableReporter.mapping +++ b/mappings/net/minecraft/loot/LootTableReporter.mapping @@ -2,26 +2,11 @@ CLASS net/minecraft/class_58 net/minecraft/loot/LootTableReporter FIELD field_20756 contextType Lnet/minecraft/class_176; FIELD field_44504 dataLookup Lnet/minecraft/class_8489; FIELD field_44505 referenceStack Ljava/util/Set; - FIELD field_964 name Ljava/lang/String; - FIELD field_965 messages Lcom/google/common/collect/Multimap; - FIELD field_966 nameFactory Ljava/util/function/Supplier; - METHOD (Lcom/google/common/collect/Multimap;Ljava/util/function/Supplier;Lnet/minecraft/class_176;Lnet/minecraft/class_8489;Ljava/util/Set;)V - ARG 1 messages - ARG 2 nameFactory - ARG 3 contextType - ARG 4 dataLookup - ARG 5 referenceStack - METHOD (Lnet/minecraft/class_176;Lnet/minecraft/class_8489;)V - ARG 1 contextType - ARG 2 dataLookup METHOD method_22567 validateContext (Lnet/minecraft/class_46;)V ARG 1 contextAware METHOD method_22568 withContextType (Lnet/minecraft/class_176;)Lnet/minecraft/class_58; - ARG 1 contextType - METHOD method_359 getName ()Ljava/lang/String; METHOD method_360 report (Ljava/lang/String;)V ARG 1 message - METHOD method_361 getMessages ()Lcom/google/common/collect/Multimap; METHOD method_364 makeChild (Ljava/lang/String;)Lnet/minecraft/class_58; ARG 1 name METHOD method_51218 isInStack (Lnet/minecraft/class_8488;)Z diff --git a/mappings/net/minecraft/loot/function/ApplyBonusLootFunction.mapping b/mappings/net/minecraft/loot/function/ApplyBonusLootFunction.mapping index ee99370a6e..bbc994ec00 100644 --- a/mappings/net/minecraft/loot/function/ApplyBonusLootFunction.mapping +++ b/mappings/net/minecraft/loot/function/ApplyBonusLootFunction.mapping @@ -36,24 +36,6 @@ CLASS net/minecraft/class_94 net/minecraft/loot/function/ApplyBonusLootFunction ARG 0 instance METHOD method_53302 (Lnet/minecraft/class_94;)Lnet/minecraft/class_6880; ARG 0 function - CLASS 1 - FIELD field_45809 FORMULA_KEY Ljava/lang/String; - FIELD field_45810 PARAMETERS_KEY Ljava/lang/String; - METHOD decode (Lcom/mojang/serialization/DynamicOps;Lcom/mojang/serialization/MapLike;)Lcom/mojang/serialization/DataResult; - ARG 1 ops - ARG 2 input - METHOD encode (Ljava/lang/Object;Lcom/mojang/serialization/DynamicOps;Lcom/mojang/serialization/RecordBuilder;)Lcom/mojang/serialization/RecordBuilder; - ARG 1 formula - ARG 2 ops - ARG 3 prefix - METHOD keys (Lcom/mojang/serialization/DynamicOps;)Ljava/util/stream/Stream; - ARG 1 ops - METHOD method_53303 encodeFormula (Lcom/mojang/serialization/Codec;Lnet/minecraft/class_94$class_96;Lcom/mojang/serialization/DynamicOps;)Lcom/mojang/serialization/DataResult; - ARG 1 typeCodec - ARG 2 formula - ARG 3 ops - METHOD method_53305 (Lcom/mojang/serialization/MapLike;Lcom/mojang/serialization/DynamicOps;Lcom/mojang/datafixers/util/Pair;)Lcom/mojang/serialization/DataResult; - ARG 2 pair CLASS class_95 BinomialWithBonusCount FIELD comp_1848 extra I FIELD comp_1849 probability F diff --git a/mappings/net/minecraft/network/packet/s2c/play/ExplosionS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/ExplosionS2CPacket.mapping index 498991755b..083a392cb9 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/ExplosionS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/ExplosionS2CPacket.mapping @@ -14,13 +14,12 @@ CLASS net/minecraft/class_2664 net/minecraft/network/packet/s2c/play/ExplosionS2 FIELD field_12181 affectedBlocks Ljava/util/List; FIELD field_12182 playerVelocityZ F FIELD field_12183 playerVelocityY F - METHOD (DDDFLjava/util/List;Lnet/minecraft/class_243;)V + METHOD (DDDFLjava/util/List;Lnet/minecraft/class_243;Lnet/minecraft/class_1927$class_4179;Lnet/minecraft/class_2394;Lnet/minecraft/class_2394;Lnet/minecraft/class_3414;)V ARG 1 x ARG 3 y ARG 5 z ARG 7 radius ARG 8 affectedBlocks - ARG 9 playerVelocity METHOD (Lnet/minecraft/class_2540;)V ARG 1 buf METHOD method_11472 getPlayerVelocityX ()F diff --git a/mappings/net/minecraft/predicate/DamagePredicate.mapping b/mappings/net/minecraft/predicate/DamagePredicate.mapping index 5afd3fd265..680199c8dd 100644 --- a/mappings/net/minecraft/predicate/DamagePredicate.mapping +++ b/mappings/net/minecraft/predicate/DamagePredicate.mapping @@ -18,9 +18,6 @@ CLASS net/minecraft/class_2019 net/minecraft/predicate/DamagePredicate ARG 3 dealt ARG 4 taken ARG 5 blocked - METHOD method_8839 fromJson (Lcom/google/gson/JsonElement;)Ljava/util/Optional; - ARG 0 json - METHOD method_8840 toJson ()Lcom/google/gson/JsonElement; CLASS class_2020 Builder FIELD field_9526 blocked Ljava/util/Optional; FIELD field_9527 taken Lnet/minecraft/class_2096$class_2099; diff --git a/mappings/net/minecraft/predicate/NumberRange.mapping b/mappings/net/minecraft/predicate/NumberRange.mapping index 0c7044c361..521608877a 100644 --- a/mappings/net/minecraft/predicate/NumberRange.mapping +++ b/mappings/net/minecraft/predicate/NumberRange.mapping @@ -33,7 +33,6 @@ CLASS net/minecraft/class_2096 net/minecraft/predicate/NumberRange ARG 2 max METHOD method_35286 atMost (D)Lnet/minecraft/class_2096$class_2099; ARG 0 value - METHOD method_53196 toJson ()Lcom/google/gson/JsonElement; METHOD method_9044 square (Ljava/util/Optional;)Ljava/util/Optional; METHOD method_9045 testSqrt (D)Z ARG 1 value @@ -48,8 +47,6 @@ CLASS net/minecraft/class_2096 net/minecraft/predicate/NumberRange ARG 0 reader METHOD method_9050 atLeast (D)Lnet/minecraft/class_2096$class_2099; ARG 0 value - METHOD method_9051 fromJson (Lcom/google/gson/JsonElement;)Lnet/minecraft/class_2096$class_2099; - ARG 0 element METHOD method_9052 (Ljava/lang/Double;)Ljava/lang/Double; ARG 0 value CLASS class_2100 IntRange @@ -66,15 +63,12 @@ CLASS net/minecraft/class_2096 net/minecraft/predicate/NumberRange ARG 1 value METHOD method_35289 atMost (I)Lnet/minecraft/class_2096$class_2100; ARG 0 value - METHOD method_53199 toJson ()Lcom/google/gson/JsonElement; METHOD method_9053 atLeast (I)Lnet/minecraft/class_2096$class_2100; ARG 0 value METHOD method_9054 test (I)Z ARG 1 value METHOD method_9055 parse (Lcom/mojang/brigadier/StringReader;Ljava/util/Optional;Ljava/util/Optional;)Lnet/minecraft/class_2096$class_2100; ARG 0 reader - METHOD method_9056 fromJson (Lcom/google/gson/JsonElement;)Lnet/minecraft/class_2096$class_2100; - ARG 0 element METHOD method_9057 fromStringReader (Lcom/mojang/brigadier/StringReader;Ljava/util/function/Function;)Lnet/minecraft/class_2096$class_2100; ARG 0 reader ARG 1 converter diff --git a/mappings/net/minecraft/predicate/StatePredicate.mapping b/mappings/net/minecraft/predicate/StatePredicate.mapping index 48b1e5af23..5326c100f6 100644 --- a/mappings/net/minecraft/predicate/StatePredicate.mapping +++ b/mappings/net/minecraft/predicate/StatePredicate.mapping @@ -5,21 +5,13 @@ CLASS net/minecraft/class_4559 net/minecraft/predicate/StatePredicate METHOD (Ljava/util/List;)V ARG 1 conditions METHOD comp_1830 conditions ()Ljava/util/List; - METHOD method_22513 toJson ()Lcom/google/gson/JsonElement; METHOD method_22514 test (Lnet/minecraft/class_2680;)Z ARG 1 state METHOD method_22515 test (Lnet/minecraft/class_2689;Lnet/minecraft/class_2688;)Z ARG 1 stateManager ARG 2 container - METHOD method_22516 check (Lnet/minecraft/class_2689;Ljava/util/function/Consumer;)V - ARG 1 factory - ARG 2 reporter - METHOD method_22517 (Lnet/minecraft/class_2689;Ljava/util/function/Consumer;Lnet/minecraft/class_4559$class_4562;)V - ARG 2 condition METHOD method_22518 test (Lnet/minecraft/class_3610;)Z ARG 1 state - METHOD method_22519 fromJson (Lcom/google/gson/JsonElement;)Ljava/util/Optional; - ARG 0 json METHOD method_53235 findMissing (Lnet/minecraft/class_2689;)Ljava/util/Optional; ARG 1 stateManager CLASS class_4560 Builder diff --git a/mappings/net/minecraft/predicate/entity/AdvancementEntityPredicateDeserializer.mapping b/mappings/net/minecraft/predicate/entity/AdvancementEntityPredicateDeserializer.mapping deleted file mode 100644 index 0b60bb3f7a..0000000000 --- a/mappings/net/minecraft/predicate/entity/AdvancementEntityPredicateDeserializer.mapping +++ /dev/null @@ -1,15 +0,0 @@ -CLASS net/minecraft/class_5257 net/minecraft/predicate/entity/AdvancementEntityPredicateDeserializer - FIELD field_24383 LOGGER Lorg/slf4j/Logger; - FIELD field_24384 advancementId Lnet/minecraft/class_2960; - FIELD field_44474 lootManager Lnet/minecraft/class_60; - METHOD (Lnet/minecraft/class_2960;Lnet/minecraft/class_60;)V - ARG 1 advancementId - ARG 2 lootManager - METHOD method_27795 getAdvancementId ()Lnet/minecraft/class_2960; - METHOD method_27796 loadConditions (Lcom/google/gson/JsonArray;Ljava/lang/String;Lnet/minecraft/class_176;)Ljava/util/List; - ARG 1 array - ARG 2 key - ARG 3 contextType - METHOD method_27797 (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V - ARG 1 name - ARG 2 message diff --git a/mappings/net/minecraft/predicate/entity/DamageSourcePredicate.mapping b/mappings/net/minecraft/predicate/entity/DamageSourcePredicate.mapping index 003c7c1640..95c8f241d4 100644 --- a/mappings/net/minecraft/predicate/entity/DamageSourcePredicate.mapping +++ b/mappings/net/minecraft/predicate/entity/DamageSourcePredicate.mapping @@ -12,12 +12,9 @@ CLASS net/minecraft/class_2022 net/minecraft/predicate/entity/DamageSourcePredic ARG 1 world ARG 2 pos ARG 3 damageSource - METHOD method_8846 fromJson (Lcom/google/gson/JsonElement;)Ljava/util/Optional; - ARG 0 json METHOD method_8847 test (Lnet/minecraft/class_3222;Lnet/minecraft/class_1282;)Z ARG 1 player ARG 2 damageSource - METHOD method_8848 toJson ()Lcom/google/gson/JsonElement; CLASS class_2023 Builder FIELD field_42273 tagPredicates Lcom/google/common/collect/ImmutableList$Builder; FIELD field_9544 directEntity Ljava/util/Optional; diff --git a/mappings/net/minecraft/predicate/entity/DistancePredicate.mapping b/mappings/net/minecraft/predicate/entity/DistancePredicate.mapping index 5c6590f5a9..b601310e5e 100644 --- a/mappings/net/minecraft/predicate/entity/DistancePredicate.mapping +++ b/mappings/net/minecraft/predicate/entity/DistancePredicate.mapping @@ -20,9 +20,6 @@ CLASS net/minecraft/class_2025 net/minecraft/predicate/entity/DistancePredicate ARG 0 absolute METHOD method_8856 y (Lnet/minecraft/class_2096$class_2099;)Lnet/minecraft/class_2025; ARG 0 y - METHOD method_8857 fromJson (Lcom/google/gson/JsonElement;)Ljava/util/Optional; - ARG 0 json - METHOD method_8858 toJson ()Lcom/google/gson/JsonElement; METHOD method_8859 test (DDDDDD)Z ARG 1 x0 ARG 3 y0 diff --git a/mappings/net/minecraft/predicate/entity/EntityEffectPredicate.mapping b/mappings/net/minecraft/predicate/entity/EntityEffectPredicate.mapping index 86c1eabef5..492e18e01c 100644 --- a/mappings/net/minecraft/predicate/entity/EntityEffectPredicate.mapping +++ b/mappings/net/minecraft/predicate/entity/EntityEffectPredicate.mapping @@ -8,11 +8,8 @@ CLASS net/minecraft/class_2102 net/minecraft/predicate/entity/EntityEffectPredic ARG 1 entity METHOD method_9063 test (Ljava/util/Map;)Z ARG 1 effects - METHOD method_9064 fromJson (Lcom/google/gson/JsonElement;)Ljava/util/Optional; - ARG 0 json METHOD method_9067 test (Lnet/minecraft/class_1309;)Z ARG 1 livingEntity - METHOD method_9068 toJson ()Lcom/google/gson/JsonElement; CLASS class_2103 EffectData FIELD comp_1812 amplifier Lnet/minecraft/class_2096$class_2100; FIELD comp_1813 duration Lnet/minecraft/class_2096$class_2100; diff --git a/mappings/net/minecraft/predicate/entity/EntityPredicate.mapping b/mappings/net/minecraft/predicate/entity/EntityPredicate.mapping index 0aadc1c264..e084cf7050 100644 --- a/mappings/net/minecraft/predicate/entity/EntityPredicate.mapping +++ b/mappings/net/minecraft/predicate/entity/EntityPredicate.mapping @@ -33,18 +33,6 @@ CLASS net/minecraft/class_2048 net/minecraft/predicate/entity/EntityPredicate ARG 3 entityx METHOD method_51704 asLootContextPredicate (Lnet/minecraft/class_2048;)Lnet/minecraft/class_5258; ARG 0 predicate - METHOD method_51705 contextPredicateFromJson (Lcom/google/gson/JsonObject;Ljava/lang/String;Lnet/minecraft/class_5257;)Ljava/util/Optional; - ARG 0 json - ARG 1 key - ARG 2 predicateDeserializer - METHOD method_51706 contextPredicateFromJsonElement (Ljava/lang/String;Lnet/minecraft/class_5257;Lcom/google/gson/JsonElement;)Ljava/util/Optional; - ARG 0 key - ARG 1 predicateDeserializer - ARG 2 json - METHOD method_51707 contextPredicateArrayFromJson (Lcom/google/gson/JsonObject;Ljava/lang/String;Lnet/minecraft/class_5257;)Ljava/util/List; - ARG 0 json - ARG 1 key - ARG 2 predicateDeserializer METHOD method_53134 contextPredicateFromEntityPredicate (Lnet/minecraft/class_2048$class_2049;)Lnet/minecraft/class_5258; ARG 0 builder METHOD method_53135 (Lcom/mojang/serialization/Codec;)Lcom/mojang/serialization/Codec; @@ -59,9 +47,6 @@ CLASS net/minecraft/class_2048 net/minecraft/predicate/entity/EntityPredicate ARG 1 world ARG 2 pos ARG 3 entity - METHOD method_8912 toJson ()Lcom/google/gson/JsonElement; - METHOD method_8913 fromJson (Lcom/google/gson/JsonElement;)Ljava/util/Optional; - ARG 0 json METHOD method_8914 test (Lnet/minecraft/class_3222;Lnet/minecraft/class_1297;)Z ARG 1 player ARG 2 entity diff --git a/mappings/net/minecraft/predicate/entity/LocationPredicate.mapping b/mappings/net/minecraft/predicate/entity/LocationPredicate.mapping index 3d70d77b08..275d2838b9 100644 --- a/mappings/net/minecraft/predicate/entity/LocationPredicate.mapping +++ b/mappings/net/minecraft/predicate/entity/LocationPredicate.mapping @@ -28,9 +28,6 @@ CLASS net/minecraft/class_2090 net/minecraft/predicate/entity/LocationPredicate ARG 2 x ARG 4 y ARG 6 z - METHOD method_9019 toJson ()Lcom/google/gson/JsonElement; - METHOD method_9021 fromJson (Lcom/google/gson/JsonElement;)Ljava/util/Optional; - ARG 0 json CLASS class_2091 Builder FIELD field_20717 light Ljava/util/Optional; FIELD field_20718 block Ljava/util/Optional; diff --git a/mappings/net/minecraft/predicate/entity/LootContextPredicate.mapping b/mappings/net/minecraft/predicate/entity/LootContextPredicate.mapping index 18bb40179e..53a6d8fe16 100644 --- a/mappings/net/minecraft/predicate/entity/LootContextPredicate.mapping +++ b/mappings/net/minecraft/predicate/entity/LootContextPredicate.mapping @@ -3,16 +3,7 @@ CLASS net/minecraft/class_5258 net/minecraft/predicate/entity/LootContextPredica COMMENT unified conditions to {@linkplain #test match}. Mainly used by advancements. FIELD field_24389 conditions Ljava/util/List; FIELD field_24390 combinedCondition Ljava/util/function/Predicate; - METHOD (Ljava/util/List;)V - ARG 1 conditions - METHOD method_27804 toJson ()Lcom/google/gson/JsonElement; METHOD method_27806 test (Lnet/minecraft/class_47;)Z ARG 1 context - METHOD method_27807 fromJson (Ljava/lang/String;Lnet/minecraft/class_5257;Lcom/google/gson/JsonElement;Lnet/minecraft/class_176;)Ljava/util/Optional; - ARG 0 key - ARG 1 predicateDeserializer - ARG 2 json - ARG 3 contextType - METHOD method_27808 toPredicatesJsonArray (Ljava/util/List;)Lcom/google/gson/JsonElement; METHOD method_27973 create ([Lnet/minecraft/class_5341;)Lnet/minecraft/class_5258; ARG 0 conditions diff --git a/mappings/net/minecraft/predicate/item/ItemPredicate.mapping b/mappings/net/minecraft/predicate/item/ItemPredicate.mapping index 9acbcb987a..8800ebc239 100644 --- a/mappings/net/minecraft/predicate/item/ItemPredicate.mapping +++ b/mappings/net/minecraft/predicate/item/ItemPredicate.mapping @@ -20,15 +20,8 @@ CLASS net/minecraft/class_2073 net/minecraft/predicate/item/ItemPredicate METHOD comp_1788 storedEnchantments ()Ljava/util/List; METHOD comp_1789 potion ()Ljava/util/Optional; METHOD comp_1790 nbt ()Ljava/util/Optional; - METHOD method_53164 toJson (Ljava/util/List;)Lcom/google/gson/JsonElement; - ARG 0 predicates - METHOD method_8969 fromJson (Lcom/google/gson/JsonElement;)Ljava/util/Optional; - ARG 0 el METHOD method_8970 test (Lnet/minecraft/class_1799;)Z ARG 1 stack - METHOD method_8971 toJson ()Lcom/google/gson/JsonElement; - METHOD method_8972 deserializeAll (Lcom/google/gson/JsonElement;)Ljava/util/List; - ARG 0 el CLASS class_2074 Builder FIELD field_20690 storedEnchantments Lcom/google/common/collect/ImmutableList$Builder; FIELD field_9648 count Lnet/minecraft/class_2096$class_2100; diff --git a/mappings/net/minecraft/recipe/AbstractCookingRecipe.mapping b/mappings/net/minecraft/recipe/AbstractCookingRecipe.mapping index 8579b1b9f3..cce5fd3781 100644 --- a/mappings/net/minecraft/recipe/AbstractCookingRecipe.mapping +++ b/mappings/net/minecraft/recipe/AbstractCookingRecipe.mapping @@ -17,3 +17,11 @@ CLASS net/minecraft/class_1874 net/minecraft/recipe/AbstractCookingRecipe METHOD method_45438 getCategory ()Lnet/minecraft/class_7709; METHOD method_8167 getCookingTime ()I METHOD method_8171 getExperience ()F + CLASS class_3958 RecipeFactory + METHOD create (Ljava/lang/String;Lnet/minecraft/class_7709;Lnet/minecraft/class_1856;Lnet/minecraft/class_1799;FI)Lnet/minecraft/class_1874; + ARG 1 group + ARG 2 category + ARG 3 ingredient + ARG 4 result + ARG 5 experience + ARG 6 cookingTime diff --git a/mappings/net/minecraft/recipe/CookingRecipeSerializer.mapping b/mappings/net/minecraft/recipe/CookingRecipeSerializer.mapping index 2cb554377e..2080061bbf 100644 --- a/mappings/net/minecraft/recipe/CookingRecipeSerializer.mapping +++ b/mappings/net/minecraft/recipe/CookingRecipeSerializer.mapping @@ -1,10 +1,10 @@ CLASS net/minecraft/class_3957 net/minecraft/recipe/CookingRecipeSerializer - FIELD field_17552 recipeFactory Lnet/minecraft/class_3957$class_3958; + FIELD field_17552 recipeFactory Lnet/minecraft/class_1874$class_3958; FIELD field_46105 codec Lcom/mojang/serialization/Codec; - METHOD (Lnet/minecraft/class_3957$class_3958;I)V + METHOD (Lnet/minecraft/class_1874$class_3958;I)V ARG 1 recipeFactory ARG 2 cookingTime - METHOD method_53766 (ILnet/minecraft/class_3957$class_3958;Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + METHOD method_53766 (ILnet/minecraft/class_1874$class_3958;Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; ARG 2 instance METHOD method_53767 (Lnet/minecraft/class_1874;)Ljava/lang/Integer; ARG 0 recipe @@ -18,11 +18,3 @@ CLASS net/minecraft/class_3957 net/minecraft/recipe/CookingRecipeSerializer ARG 0 recipe METHOD method_53772 (Lnet/minecraft/class_1874;)Ljava/lang/String; ARG 0 recipe - CLASS class_3958 RecipeFactory - METHOD create (Ljava/lang/String;Lnet/minecraft/class_7709;Lnet/minecraft/class_1856;Lnet/minecraft/class_1799;FI)Lnet/minecraft/class_1874; - ARG 1 group - ARG 2 category - ARG 3 ingredient - ARG 4 result - ARG 5 experience - ARG 6 cookingTime diff --git a/mappings/net/minecraft/recipe/CuttingRecipe.mapping b/mappings/net/minecraft/recipe/CuttingRecipe.mapping index b4a24af984..545d615b3f 100644 --- a/mappings/net/minecraft/recipe/CuttingRecipe.mapping +++ b/mappings/net/minecraft/recipe/CuttingRecipe.mapping @@ -13,12 +13,11 @@ CLASS net/minecraft/class_3972 net/minecraft/recipe/CuttingRecipe ARG 4 ingredient ARG 5 result CLASS class_3973 Serializer - FIELD field_17648 recipeFactory Lnet/minecraft/class_3972$class_3973$class_3974; + FIELD field_17648 recipeFactory Lnet/minecraft/class_3972$class_3974; FIELD field_46107 codec Lcom/mojang/serialization/Codec; - FIELD field_46204 RESULT_STACK_CODEC Lcom/mojang/serialization/MapCodec; - METHOD (Lnet/minecraft/class_3972$class_3973$class_3974;)V + METHOD (Lnet/minecraft/class_3972$class_3974;)V ARG 1 recipeFactory - METHOD method_53774 (Lnet/minecraft/class_3972$class_3973$class_3974;Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + METHOD method_53774 (Lnet/minecraft/class_3972$class_3974;Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; ARG 1 instance METHOD method_53777 (Lnet/minecraft/class_3972;)Lnet/minecraft/class_1856; ARG 0 recipe @@ -26,10 +25,8 @@ CLASS net/minecraft/class_3972 net/minecraft/recipe/CuttingRecipe ARG 0 recipe METHOD method_53879 (Lnet/minecraft/class_3972;)Lnet/minecraft/class_1799; ARG 0 recipe - METHOD method_53880 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; - ARG 0 instance - CLASS class_3974 RecipeFactory - METHOD create (Ljava/lang/String;Lnet/minecraft/class_1856;Lnet/minecraft/class_1799;)Lnet/minecraft/class_3972; - ARG 1 group - ARG 2 ingredient - ARG 3 result + CLASS class_3974 RecipeFactory + METHOD create (Ljava/lang/String;Lnet/minecraft/class_1856;Lnet/minecraft/class_1799;)Lnet/minecraft/class_3972; + ARG 1 group + ARG 2 ingredient + ARG 3 result diff --git a/mappings/net/minecraft/recipe/Ingredient.mapping b/mappings/net/minecraft/recipe/Ingredient.mapping index a82c2cead5..d8e0f34b27 100644 --- a/mappings/net/minecraft/recipe/Ingredient.mapping +++ b/mappings/net/minecraft/recipe/Ingredient.mapping @@ -32,8 +32,6 @@ CLASS net/minecraft/class_1856 net/minecraft/recipe/Ingredient ARG 0 buf METHOD method_8088 write (Lnet/minecraft/class_2540;)V ARG 1 buf - METHOD method_8089 toJson (Z)Lcom/google/gson/JsonElement; - ARG 1 allowEmpty METHOD method_8091 ofItems ([Lnet/minecraft/class_1935;)Lnet/minecraft/class_1856; ARG 0 items METHOD method_8092 ofEntries (Ljava/util/stream/Stream;)Lnet/minecraft/class_1856; diff --git a/mappings/net/minecraft/recipe/RecipeCodecs.mapping b/mappings/net/minecraft/recipe/RecipeCodecs.mapping deleted file mode 100644 index 214ab8cb74..0000000000 --- a/mappings/net/minecraft/recipe/RecipeCodecs.mapping +++ /dev/null @@ -1,10 +0,0 @@ -CLASS net/minecraft/class_8785 net/minecraft/recipe/RecipeCodecs - FIELD field_46092 CRAFTING_RESULT Lcom/mojang/serialization/Codec; - FIELD field_46093 INGREDIENT Lcom/mojang/serialization/Codec; - FIELD field_46094 CRAFTING_RESULT_ITEM Lcom/mojang/serialization/Codec; - METHOD method_53717 (Lnet/minecraft/class_1792;)Lcom/mojang/serialization/DataResult; - ARG 0 item - METHOD method_53718 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; - ARG 0 instance - METHOD method_53720 (Lnet/minecraft/class_1792;)Lcom/mojang/serialization/DataResult; - ARG 0 item diff --git a/mappings/net/minecraft/recipe/ShapedRecipe.mapping b/mappings/net/minecraft/recipe/ShapedRecipe.mapping index 0405a0648c..f8756dcbed 100644 --- a/mappings/net/minecraft/recipe/ShapedRecipe.mapping +++ b/mappings/net/minecraft/recipe/ShapedRecipe.mapping @@ -1,87 +1,13 @@ CLASS net/minecraft/class_1869 net/minecraft/recipe/ShapedRecipe FIELD field_40256 category Lnet/minecraft/class_7710; FIELD field_42719 showNotification Z - FIELD field_9052 ingredients Lnet/minecraft/class_2371; FIELD field_9053 result Lnet/minecraft/class_1799; - FIELD field_9054 height I - FIELD field_9055 width I FIELD field_9056 group Ljava/lang/String; - METHOD (Ljava/lang/String;Lnet/minecraft/class_7710;IILnet/minecraft/class_2371;Lnet/minecraft/class_1799;)V - ARG 1 group - ARG 2 category - ARG 3 width - ARG 4 height - ARG 5 ingredients - ARG 6 result - METHOD (Ljava/lang/String;Lnet/minecraft/class_7710;IILnet/minecraft/class_2371;Lnet/minecraft/class_1799;Z)V - ARG 1 group - ARG 2 category - ARG 3 width - ARG 4 height - ARG 5 ingredients - ARG 6 result - ARG 7 showNotification METHOD method_31585 (Lnet/minecraft/class_1856;)Z ARG 0 ingredient METHOD method_31586 (Lnet/minecraft/class_1856;)Z ARG 0 ingredient - METHOD method_8146 removePadding (Ljava/util/List;)[Ljava/lang/String; - COMMENT Removes empty space from around the recipe pattern. - COMMENT - COMMENT

Turns patterns such as: - COMMENT 

-		COMMENT {@code
-		COMMENT "   o"
-		COMMENT "   a"
-		COMMENT "    "
-		COMMENT }
-		COMMENT
- COMMENT Into: - COMMENT 
-		COMMENT {@code
-		COMMENT "o"
-		COMMENT "a"
-		COMMENT }
-		COMMENT
- COMMENT - COMMENT @return a new recipe pattern with all leading and trailing empty rows/columns removed - ARG 0 pattern METHOD method_8150 getWidth ()I - METHOD method_8151 findFirstSymbol (Ljava/lang/String;)I - ARG 0 line - METHOD method_8153 findLastSymbol (Ljava/lang/String;)I - ARG 0 pattern METHOD method_8158 getHeight ()I - METHOD method_8161 matchesPattern (Lnet/minecraft/class_8566;IIZ)Z - ARG 1 inv - ARG 2 offsetX - ARG 3 offsetY - ARG 4 flipped CLASS class_1870 Serializer - FIELD field_46100 PATTERN_CODEC Lcom/mojang/serialization/Codec; - FIELD field_46101 KEY_ENTRY_CODEC Lcom/mojang/serialization/Codec; FIELD field_46102 CODEC Lcom/mojang/serialization/Codec; - METHOD method_53737 (Lnet/minecraft/class_1869$class_1870$class_8787;)Lcom/mojang/serialization/DataResult; - ARG 0 recipe - METHOD method_53738 (Lnet/minecraft/class_1869;)Lcom/mojang/serialization/DataResult; - ARG 0 recipe - METHOD method_53740 (Ljava/util/List;)Lcom/mojang/serialization/DataResult; - ARG 0 rows - METHOD method_53743 (Ljava/lang/String;)Lcom/mojang/serialization/DataResult; - ARG 0 keyEntry - CLASS class_8787 RawShapedRecipe - FIELD field_46103 CODEC Lcom/mojang/serialization/Codec; - METHOD method_53749 (Lnet/minecraft/class_1869$class_1870$class_8787;)Ljava/lang/Boolean; - ARG 0 recipe - METHOD method_53750 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; - ARG 0 instance - METHOD method_53751 (Lnet/minecraft/class_1869$class_1870$class_8787;)Lnet/minecraft/class_1799; - ARG 0 recipe - METHOD method_53752 (Lnet/minecraft/class_1869$class_1870$class_8787;)Ljava/util/List; - ARG 0 recipe - METHOD method_53753 (Lnet/minecraft/class_1869$class_1870$class_8787;)Ljava/util/Map; - ARG 0 recipe - METHOD method_53754 (Lnet/minecraft/class_1869$class_1870$class_8787;)Lnet/minecraft/class_7710; - ARG 0 recipe - METHOD method_53755 (Lnet/minecraft/class_1869$class_1870$class_8787;)Ljava/lang/String; - ARG 0 recipe diff --git a/mappings/net/minecraft/recipe/book/CraftingRecipeCategory.mapping b/mappings/net/minecraft/recipe/book/CraftingRecipeCategory.mapping index 045c52c8ea..79a9ab251e 100644 --- a/mappings/net/minecraft/recipe/book/CraftingRecipeCategory.mapping +++ b/mappings/net/minecraft/recipe/book/CraftingRecipeCategory.mapping @@ -1,5 +1,5 @@ CLASS net/minecraft/class_7710 net/minecraft/recipe/book/CraftingRecipeCategory - FIELD field_40252 CODEC Lnet/minecraft/class_3542$class_7292; + FIELD field_40252 CODEC Lcom/mojang/serialization/Codec; FIELD field_40253 id Ljava/lang/String; METHOD (Ljava/lang/String;ILjava/lang/String;)V ARG 3 id diff --git a/mappings/net/minecraft/registry/ExperimentalRegistriesValidator.mapping b/mappings/net/minecraft/registry/ExperimentalRegistriesValidator.mapping index 804f525a94..c2bbd57871 100644 --- a/mappings/net/minecraft/registry/ExperimentalRegistriesValidator.mapping +++ b/mappings/net/minecraft/registry/ExperimentalRegistriesValidator.mapping @@ -1,5 +1,5 @@ CLASS net/minecraft/class_8931 net/minecraft/registry/ExperimentalRegistriesValidator - METHOD method_54839 (Lnet/minecraft/class_7877;Lnet/minecraft/class_7225$class_7874;)Lnet/minecraft/class_7225$class_7874; + METHOD method_54839 (Lnet/minecraft/class_7877;Lnet/minecraft/class_7225$class_7874;)Lnet/minecraft/class_7877$class_8993; ARG 1 lookup METHOD method_54840 validate (Ljava/util/concurrent/CompletableFuture;Lnet/minecraft/class_7877;)Ljava/util/concurrent/CompletableFuture; ARG 0 registriesFuture diff --git a/mappings/net/minecraft/registry/Registries.mapping b/mappings/net/minecraft/registry/Registries.mapping index 09f560e8fc..2ddbfa8dc4 100644 --- a/mappings/net/minecraft/registry/Registries.mapping +++ b/mappings/net/minecraft/registry/Registries.mapping @@ -25,7 +25,6 @@ CLASS net/minecraft/class_7923 net/minecraft/registry/Registries FIELD field_41151 TRUNK_PLACER_TYPE Lnet/minecraft/class_2378; FIELD field_41152 ROOT_PLACER_TYPE Lnet/minecraft/class_2378; FIELD field_41153 TREE_DECORATOR_TYPE Lnet/minecraft/class_2378; - FIELD field_41154 ROOT_KEY Lnet/minecraft/class_2960; FIELD field_41155 FEATURE_SIZE_TYPE Lnet/minecraft/class_2378; FIELD field_41156 BIOME_SOURCE Lnet/minecraft/class_2378; FIELD field_41157 CHUNK_GENERATOR Lnet/minecraft/class_2378; diff --git a/mappings/net/minecraft/registry/RegistryBuilder.mapping b/mappings/net/minecraft/registry/RegistryBuilder.mapping index aa9cecb792..2040d51bec 100644 --- a/mappings/net/minecraft/registry/RegistryBuilder.mapping +++ b/mappings/net/minecraft/registry/RegistryBuilder.mapping @@ -9,17 +9,12 @@ CLASS net/minecraft/class_7877 net/minecraft/registry/RegistryBuilder ARG 2 bootstrapFunction METHOD method_46778 toLookup (Lnet/minecraft/class_7225$class_7226;)Lnet/minecraft/class_7871; ARG 0 wrapper - METHOD method_46779 (Lnet/minecraft/class_5455$class_6892;)Lnet/minecraft/class_7225$class_7226; - ARG 0 entry METHOD method_46780 createWrapperLookup (Lnet/minecraft/class_5455;)Lnet/minecraft/class_7225$class_7874; - ARG 1 baseRegistryManager - METHOD method_46781 createWrapperLookup (Lnet/minecraft/class_5455;Lnet/minecraft/class_7225$class_7874;)Lnet/minecraft/class_7225$class_7874; + METHOD method_46781 createWrapperLookup (Lnet/minecraft/class_5455;Lnet/minecraft/class_7225$class_7874;Lnet/minecraft/class_8990$class_8991;)Lnet/minecraft/class_7877$class_8993; ARG 1 baseRegistryManager ARG 2 wrapperLookup METHOD method_46782 (Lnet/minecraft/class_7877$class_7878;Lnet/minecraft/class_7877$class_7884;)Lnet/minecraft/class_7877$class_7883; ARG 1 info - METHOD method_46783 (Lnet/minecraft/class_5455$class_6892;)Lnet/minecraft/class_7225$class_7226; - ARG 0 entry METHOD method_46784 createBootstrappedRegistries (Lnet/minecraft/class_5455;)Lnet/minecraft/class_7877$class_7878; ARG 1 registryManager METHOD method_46785 (Lnet/minecraft/class_7877$class_7878;Lnet/minecraft/class_7877$class_7884;)Lnet/minecraft/class_7225$class_7226; @@ -28,35 +23,18 @@ CLASS net/minecraft/class_7877 net/minecraft/registry/RegistryBuilder ARG 1 registry METHOD method_49352 (Ljava/util/Map;Lnet/minecraft/class_7877$class_7883;)V ARG 1 registry - METHOD method_49353 (Ljava/util/Map;Lnet/minecraft/class_7877$class_7883;)V - ARG 1 registry + CLASS 2 + FIELD field_40947 keysToEntries Ljava/util/Map; CLASS class_7878 Registries METHOD method_46787 createRegisterable ()Lnet/minecraft/class_7891; - METHOD method_46788 (Lnet/minecraft/class_5321;Lnet/minecraft/class_7225;)Ljava/util/Optional; - ARG 1 entryLookup - METHOD method_46789 (Lnet/minecraft/class_5321;Lnet/minecraft/class_7877$class_7881;)V - ARG 1 key - ARG 2 value METHOD method_46790 (Lcom/google/common/collect/ImmutableMap$Builder;Lnet/minecraft/class_5455$class_6892;)V ARG 1 entry METHOD method_46791 (Lcom/google/common/collect/ImmutableMap$Builder;Lnet/minecraft/class_7877$class_7885;Lnet/minecraft/class_5321;)V ARG 2 registryRef - METHOD method_46792 (Lnet/minecraft/class_6880$class_6883;Ljava/util/Iterator;Lnet/minecraft/class_6880$class_6883;)V - ARG 2 entry - METHOD method_46793 setReferenceEntryValues (Lnet/minecraft/class_7225$class_7874;)V - ARG 1 lookup - METHOD method_46794 (Lnet/minecraft/class_7225$class_7874;Lnet/minecraft/class_2960;)Ljava/util/Optional; - ARG 1 registryId - METHOD method_46795 addOwner (Lnet/minecraft/class_7876;)V - ARG 1 owner METHOD method_46796 of (Lnet/minecraft/class_5455;Ljava/util/stream/Stream;)Lnet/minecraft/class_7877$class_7878; ARG 0 dynamicRegistryManager ARG 1 registryRefs - METHOD method_46797 validateReferences ()V METHOD method_46798 throwErrors ()V - METHOD method_49354 (Lnet/minecraft/class_2960;)Lnet/minecraft/class_7877$class_7883; - ARG 0 registry - METHOD method_49355 streamRegistries ()Ljava/util/stream/Stream; CLASS class_7879 AnyOwner COMMENT An owner that owns multiple registries and holds the owner object for those. COMMENT {@link #ownerEquals} returns {@code true} for all owners {@linkplain #addOwner previously @@ -73,11 +51,7 @@ CLASS net/minecraft/class_7877 net/minecraft/registry/RegistryBuilder METHOD run (Lnet/minecraft/class_7891;)V ARG 1 registerable CLASS class_7883 InitializedRegistry - METHOD method_46802 toWrapper ()Lnet/minecraft/class_7225$class_7226; - CLASS 1 - FIELD field_40947 keysToEntries Ljava/util/Map; - METHOD method_46803 (Ljava/util/Map$Entry;)Lnet/minecraft/class_6880$class_6883; - ARG 1 entry + METHOD method_46802 toWrapper (Lnet/minecraft/class_7877$class_7879;)Lnet/minecraft/class_7225$class_7226; CLASS class_7884 RegistryInfo METHOD method_46805 init (Lnet/minecraft/class_7877$class_7878;)Lnet/minecraft/class_7877$class_7883; ARG 1 registries diff --git a/mappings/net/minecraft/registry/SimpleRegistry.mapping b/mappings/net/minecraft/registry/SimpleRegistry.mapping index 5b3beee8fe..2f9eadba24 100644 --- a/mappings/net/minecraft/registry/SimpleRegistry.mapping +++ b/mappings/net/minecraft/registry/SimpleRegistry.mapping @@ -22,7 +22,6 @@ CLASS net/minecraft/class_2370 net/minecraft/registry/SimpleRegistry ARG 1 key ARG 2 lifecycle METHOD (Lnet/minecraft/class_5321;Lcom/mojang/serialization/Lifecycle;Z)V - ARG 1 key ARG 2 lifecycle ARG 3 intrusive METHOD method_39665 (Lit/unimi/dsi/fastutil/objects/Reference2IntOpenHashMap;)V diff --git a/mappings/net/minecraft/server/function/LazyContainer.mapping b/mappings/net/minecraft/server/function/LazyContainer.mapping index 1810465bff..f6984a6343 100644 --- a/mappings/net/minecraft/server/function/LazyContainer.mapping +++ b/mappings/net/minecraft/server/function/LazyContainer.mapping @@ -5,10 +5,8 @@ CLASS net/minecraft/class_2159 net/minecraft/server/function/LazyContainer COMMENT invalid. FIELD field_9807 id Lnet/minecraft/class_2960; FIELD field_9808 function Ljava/util/Optional; - FIELD field_9809 EMPTY Lnet/minecraft/class_2159; FIELD field_9810 initialized Z METHOD (Lnet/minecraft/class_2960;)V ARG 1 id METHOD method_9196 get (Lnet/minecraft/class_2991;)Ljava/util/Optional; - ARG 1 manager METHOD method_9197 getId ()Lnet/minecraft/class_2960; diff --git a/mappings/net/minecraft/test/StructureTestUtil.mapping b/mappings/net/minecraft/test/StructureTestUtil.mapping index 126238d6d3..53167439bf 100644 --- a/mappings/net/minecraft/test/StructureTestUtil.mapping +++ b/mappings/net/minecraft/test/StructureTestUtil.mapping @@ -32,11 +32,9 @@ CLASS net/minecraft/class_4525 net/minecraft/test/StructureTestUtil ARG 2 relativePos ARG 3 rotation ARG 4 world - METHOD method_22252 placeStructureTemplate (Ljava/lang/String;Lnet/minecraft/class_2338;Lnet/minecraft/class_2470;Lnet/minecraft/class_3218;)Lnet/minecraft/class_2633; - ARG 0 name + METHOD method_22252 placeStructureTemplate (Lnet/minecraft/class_4517;Lnet/minecraft/class_2338;Lnet/minecraft/class_2470;Lnet/minecraft/class_3218;)Lnet/minecraft/class_2633; ARG 1 pos ARG 2 rotation - ARG 3 world METHOD method_22254 (ILnet/minecraft/class_3218;Lnet/minecraft/class_2338;)V ARG 2 pos METHOD method_22255 findNearestStructureBlock (Lnet/minecraft/class_2338;ILnet/minecraft/class_3218;)Lnet/minecraft/class_2338; @@ -74,8 +72,7 @@ CLASS net/minecraft/class_4525 net/minecraft/test/StructureTestUtil ARG 0 structureBlockEntity METHOD method_54901 (Lnet/minecraft/class_3218;Lnet/minecraft/class_1923;)V ARG 1 chunkPos - METHOD method_54903 initStructure (Ljava/lang/String;Lnet/minecraft/class_2338;Lnet/minecraft/class_2470;Lnet/minecraft/class_3218;)Lnet/minecraft/class_2633; - ARG 0 testName + METHOD method_54903 initStructure (Lnet/minecraft/class_4517;Lnet/minecraft/class_2338;Lnet/minecraft/class_2470;Lnet/minecraft/class_3218;)Lnet/minecraft/class_2633; ARG 1 pos ARG 2 rotation ARG 3 world diff --git a/mappings/net/minecraft/unused/packageinfo/PackageInfo8955.mapping b/mappings/net/minecraft/unused/packageinfo/PackageInfo8955.mapping new file mode 100644 index 0000000000..1216dba75d --- /dev/null +++ b/mappings/net/minecraft/unused/packageinfo/PackageInfo8955.mapping @@ -0,0 +1 @@ +CLASS net/minecraft/class_8955 net/minecraft/unused/packageinfo/PackageInfo8955 diff --git a/mappings/net/minecraft/unused/packageinfo/PackageInfo8971.mapping b/mappings/net/minecraft/unused/packageinfo/PackageInfo8971.mapping new file mode 100644 index 0000000000..9ee97e015b --- /dev/null +++ b/mappings/net/minecraft/unused/packageinfo/PackageInfo8971.mapping @@ -0,0 +1 @@ +CLASS net/minecraft/class_8971 net/minecraft/unused/packageinfo/PackageInfo8971 diff --git a/mappings/net/minecraft/util/dynamic/Codecs.mapping b/mappings/net/minecraft/util/dynamic/Codecs.mapping index 4eca25914f..dbed313038 100644 --- a/mappings/net/minecraft/util/dynamic/Codecs.mapping +++ b/mappings/net/minecraft/util/dynamic/Codecs.mapping @@ -264,8 +264,7 @@ CLASS net/minecraft/class_5699 net/minecraft/util/dynamic/Codecs ARG 1 value METHOD method_53051 (Ljava/lang/Object;Ljava/util/Optional;)Ljava/lang/Object; ARG 1 value - METHOD method_53052 createRecursive (Ljava/util/function/Function;)Lcom/mojang/serialization/Codec; - ARG 0 codecFunction + METHOD method_53052 createRecursive (Ljava/lang/String;Ljava/util/function/Function;)Lcom/mojang/serialization/Codec; METHOD method_53055 (Ljava/util/function/Supplier;Lcom/mojang/serialization/Codec;)Lcom/mojang/serialization/Codec; ARG 1 codec METHOD method_53058 object2BooleanMap (Lcom/mojang/serialization/Codec;)Lcom/mojang/serialization/Codec; @@ -408,8 +407,6 @@ CLASS net/minecraft/class_5699 net/minecraft/util/dynamic/Codecs METHOD method_43963 asString ()Ljava/lang/String; CLASS class_8741 Recursive FIELD field_45716 supplier Ljava/util/function/Supplier; - METHOD (Ljava/util/function/Function;)V - ARG 1 codecFunction METHOD decode (Lcom/mojang/serialization/DynamicOps;Ljava/lang/Object;)Lcom/mojang/serialization/DataResult; ARG 1 ops ARG 2 input diff --git a/mappings/net/minecraft/world/MobSpawnerLogic.mapping b/mappings/net/minecraft/world/MobSpawnerLogic.mapping index 23321123d4..adbb8e7537 100644 --- a/mappings/net/minecraft/world/MobSpawnerLogic.mapping +++ b/mappings/net/minecraft/world/MobSpawnerLogic.mapping @@ -56,10 +56,8 @@ CLASS net/minecraft/class_1917 net/minecraft/world/MobSpawnerLogic METHOD method_8282 updateSpawns (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;)V ARG 1 world ARG 2 pos - METHOD method_8283 getRenderedEntity (Lnet/minecraft/class_1937;Lnet/minecraft/class_5819;Lnet/minecraft/class_2338;)Lnet/minecraft/class_1297; + METHOD method_8283 getRenderedEntity (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;)Lnet/minecraft/class_1297; ARG 1 world - ARG 2 random - ARG 3 pos METHOD method_8284 isPlayerInRange (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;)Z ARG 1 world ARG 2 pos diff --git a/mappings/net/minecraft/world/World.mapping b/mappings/net/minecraft/world/World.mapping index b6113b0c88..b9efc64b95 100644 --- a/mappings/net/minecraft/world/World.mapping +++ b/mappings/net/minecraft/world/World.mapping @@ -193,7 +193,7 @@ CLASS net/minecraft/class_1937 net/minecraft/world/World ARG 5 power ARG 6 createFire ARG 7 explosionSourceType - METHOD method_46668 createExplosion (Lnet/minecraft/class_1297;Lnet/minecraft/class_1282;Lnet/minecraft/class_5362;DDDFZLnet/minecraft/class_1937$class_7867;Z)Lnet/minecraft/class_1927; + METHOD method_46668 createExplosion (Lnet/minecraft/class_1297;Lnet/minecraft/class_1282;Lnet/minecraft/class_5362;DDDFZLnet/minecraft/class_1937$class_7867;ZLnet/minecraft/class_2394;Lnet/minecraft/class_2394;Lnet/minecraft/class_3414;)Lnet/minecraft/class_1927; ARG 1 entity ARG 2 damageSource ARG 3 behavior @@ -306,7 +306,7 @@ CLASS net/minecraft/class_1937 net/minecraft/world/World COMMENT @see #updateNeighborsExcept(BlockPos, Block, Direction) ARG 1 pos ARG 2 sourceBlock - METHOD method_8454 createExplosion (Lnet/minecraft/class_1297;Lnet/minecraft/class_1282;Lnet/minecraft/class_5362;DDDFZLnet/minecraft/class_1937$class_7867;)Lnet/minecraft/class_1927; + METHOD method_8454 createExplosion (Lnet/minecraft/class_1297;Lnet/minecraft/class_1282;Lnet/minecraft/class_5362;DDDFZLnet/minecraft/class_1937$class_7867;Lnet/minecraft/class_2394;Lnet/minecraft/class_2394;Lnet/minecraft/class_3414;)Lnet/minecraft/class_1927; COMMENT Creates an explosion. ARG 1 entity COMMENT the entity that exploded (like TNT) or {@code null} to indicate no entity exploded diff --git a/mappings/net/minecraft/world/explosion/Explosion.mapping b/mappings/net/minecraft/world/explosion/Explosion.mapping index 1749a625f7..0c6372ecc6 100644 --- a/mappings/net/minecraft/world/explosion/Explosion.mapping +++ b/mappings/net/minecraft/world/explosion/Explosion.mapping @@ -13,14 +13,13 @@ CLASS net/minecraft/class_1927 net/minecraft/world/explosion/Explosion FIELD field_9193 damageSource Lnet/minecraft/class_1282; FIELD field_9194 affectedPlayers Ljava/util/Map; FIELD field_9195 x D - METHOD (Lnet/minecraft/class_1937;Lnet/minecraft/class_1297;DDDFLjava/util/List;)V + METHOD (Lnet/minecraft/class_1937;Lnet/minecraft/class_1297;DDDFLjava/util/List;Lnet/minecraft/class_1927$class_4179;Lnet/minecraft/class_2394;Lnet/minecraft/class_2394;Lnet/minecraft/class_3414;)V ARG 1 world ARG 2 entity ARG 3 x ARG 5 y ARG 7 z ARG 9 power - ARG 10 affectedBlocks METHOD (Lnet/minecraft/class_1937;Lnet/minecraft/class_1297;DDDFZLnet/minecraft/class_1927$class_4179;)V ARG 1 world ARG 2 entity @@ -40,11 +39,7 @@ CLASS net/minecraft/class_1927 net/minecraft/world/explosion/Explosion ARG 10 createFire ARG 11 destructionType ARG 12 affectedBlocks - METHOD (Lnet/minecraft/class_1937;Lnet/minecraft/class_1297;Lnet/minecraft/class_1282;Lnet/minecraft/class_5362;DDDFZLnet/minecraft/class_1927$class_4179;)V - ARG 1 world - ARG 2 entity - ARG 3 damageSource - ARG 4 behavior + METHOD (Lnet/minecraft/class_1937;Lnet/minecraft/class_1297;Lnet/minecraft/class_1282;Lnet/minecraft/class_5362;DDDFZLnet/minecraft/class_1927$class_4179;Lnet/minecraft/class_2394;Lnet/minecraft/class_2394;Lnet/minecraft/class_3414;)V ARG 5 x ARG 7 y ARG 9 z @@ -54,12 +49,9 @@ CLASS net/minecraft/class_1927 net/minecraft/world/explosion/Explosion METHOD method_17752 getExposure (Lnet/minecraft/class_243;Lnet/minecraft/class_1297;)F ARG 0 source ARG 1 entity - METHOD method_24023 tryMergeStack (Lit/unimi/dsi/fastutil/objects/ObjectArrayList;Lnet/minecraft/class_1799;Lnet/minecraft/class_2338;)V - ARG 0 stacks + METHOD method_24023 tryMergeStack (Ljava/util/List;Lnet/minecraft/class_1799;Lnet/minecraft/class_2338;)V ARG 1 stack ARG 2 pos - METHOD method_24024 (Lit/unimi/dsi/fastutil/objects/ObjectArrayList;Lnet/minecraft/class_2338;Lnet/minecraft/class_1799;)V - ARG 2 stack METHOD method_29553 chooseBehavior (Lnet/minecraft/class_1297;)Lnet/minecraft/class_5362; ARG 1 entity METHOD method_46406 getEntity ()Lnet/minecraft/class_1297; @@ -67,7 +59,6 @@ CLASS net/minecraft/class_1927 net/minecraft/world/explosion/Explosion METHOD method_8346 getAffectedBlocks ()Ljava/util/List; METHOD method_8347 getCausingEntity ()Lnet/minecraft/class_1309; METHOD method_8348 collectBlocksAndDamageEntities ()V - METHOD method_8349 getDamageSource ()Lnet/minecraft/class_1282; METHOD method_8350 affectWorld (Z)V ARG 1 particles COMMENT whether this explosion should emit explosion or explosion emitter particles around the source of the explosion