From 3fa5f241ce22dc89f764664514f770b6a0402077 Mon Sep 17 00:00:00 2001 From: apple502j <33279053+apple502j@users.noreply.github.com> Date: Sun, 13 Feb 2022 02:04:11 +0900 Subject: [PATCH] 22w06a more tags/registries stuff (#3003) * 22w06a more tags/registries stuff * rename to getIndexedEntries --- .../net/minecraft/block/AbstractBlock.mapping | 4 ++++ .../client/gui/screen/PresetsScreen.mapping | 1 + .../BlockPredicateArgumentType.mapping | 1 + .../AdventureTabAdvancementGenerator.mapping | 2 ++ .../net/minecraft/fluid/FluidState.mapping | 4 ++++ .../item/BlockPredicatesChecker.mapping | 1 + .../net/minecraft/item/BoneMealItem.mapping | 8 +++++++ mappings/net/minecraft/item/ItemStack.mapping | 8 +++++++ .../net/minecraft/loot/entry/TagEntry.mapping | 2 ++ .../server/world/ServerWorld.mapping | 3 +++ .../minecraft/util/registry/Registry.mapping | 22 +++++++++++++++++++ .../minecraft/village/VillagerType.mapping | 1 + .../net/minecraft/world/SpawnHelper.mapping | 1 + .../minecraft/world/StructureLocator.mapping | 3 +++ .../net/minecraft/world/biome/Biome.mapping | 2 ++ .../world/gen/chunk/ChunkGenerator.mapping | 1 + .../world/gen/feature/CoralFeature.mapping | 6 +++++ 17 files changed, 70 insertions(+) diff --git a/mappings/net/minecraft/block/AbstractBlock.mapping b/mappings/net/minecraft/block/AbstractBlock.mapping index 69659ef910..b065b6a08e 100644 --- a/mappings/net/minecraft/block/AbstractBlock.mapping +++ b/mappings/net/minecraft/block/AbstractBlock.mapping @@ -430,6 +430,7 @@ CLASS net/minecraft/class_4970 net/minecraft/block/AbstractBlock ARG 2 propertyMap ARG 3 codec METHOD method_26164 isIn (Lnet/minecraft/class_6862;)Z + ARG 1 tag METHOD method_26165 calcBlockBreakingDelta (Lnet/minecraft/class_1657;Lnet/minecraft/class_1922;Lnet/minecraft/class_2338;)F ARG 1 player ARG 2 world @@ -672,6 +673,9 @@ CLASS net/minecraft/class_4970 net/minecraft/block/AbstractBlock ARG 1 world ARG 2 blockEntityType METHOD method_31709 hasBlockEntity ()Z + METHOD method_40143 isIn (Lnet/minecraft/class_6885;)Z + ARG 1 blocks + METHOD method_40144 streamTags ()Ljava/util/stream/Stream; CLASS class_3752 ShapeCache FIELD field_16555 lightSubtracted I FIELD field_16556 translucent Z diff --git a/mappings/net/minecraft/client/gui/screen/PresetsScreen.mapping b/mappings/net/minecraft/client/gui/screen/PresetsScreen.mapping index e390d31819..f61bb5dda7 100644 --- a/mappings/net/minecraft/client/gui/screen/PresetsScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/PresetsScreen.mapping @@ -46,6 +46,7 @@ CLASS net/minecraft/class_430 net/minecraft/client/gui/screen/PresetsScreen ARG 1 preset ARG 2 generatorConfig METHOD method_29062 getGeneratorConfigString (Lnet/minecraft/class_3232;)Ljava/lang/String; + ARG 0 config METHOD method_31127 (Ljava/util/List;ZZZ[Lnet/minecraft/class_3229;Lnet/minecraft/class_5321;Lnet/minecraft/class_2378;)Lnet/minecraft/class_3232; ARG 6 biomeRegistry CLASS class_431 SuperflatPreset diff --git a/mappings/net/minecraft/command/argument/BlockPredicateArgumentType.mapping b/mappings/net/minecraft/command/argument/BlockPredicateArgumentType.mapping index bc603b674c..3cef793ee5 100644 --- a/mappings/net/minecraft/command/argument/BlockPredicateArgumentType.mapping +++ b/mappings/net/minecraft/command/argument/BlockPredicateArgumentType.mapping @@ -27,6 +27,7 @@ CLASS net/minecraft/class_2252 net/minecraft/command/argument/BlockPredicateArgu CLASS class_2254 BlockPredicate METHOD method_38559 hasNbt ()Z METHOD method_38560 create (Lnet/minecraft/class_2378;)Ljava/util/function/Predicate; + ARG 1 blockRegistry CLASS class_2255 TagPredicate FIELD field_10676 tag Lnet/minecraft/class_6862; FIELD field_10677 nbt Lnet/minecraft/class_2487; diff --git a/mappings/net/minecraft/data/server/AdventureTabAdvancementGenerator.mapping b/mappings/net/minecraft/data/server/AdventureTabAdvancementGenerator.mapping index 4e75f0fe50..c0d3c53de3 100644 --- a/mappings/net/minecraft/data/server/AdventureTabAdvancementGenerator.mapping +++ b/mappings/net/minecraft/data/server/AdventureTabAdvancementGenerator.mapping @@ -18,3 +18,5 @@ CLASS net/minecraft/class_2412 net/minecraft/data/server/AdventureTabAdvancement ARG 0 range ARG 1 entity METHOD method_39492 getOverworldBiomes ()Ljava/util/List; + METHOD method_40361 (Lnet/minecraft/class_6880;)Ljava/util/stream/Stream; + ARG 0 biomeEntry diff --git a/mappings/net/minecraft/fluid/FluidState.mapping b/mappings/net/minecraft/fluid/FluidState.mapping index 17c5759791..3caecbc96b 100644 --- a/mappings/net/minecraft/fluid/FluidState.mapping +++ b/mappings/net/minecraft/fluid/FluidState.mapping @@ -47,3 +47,7 @@ CLASS net/minecraft/class_3610 net/minecraft/fluid/FluidState ARG 1 fluid METHOD method_39360 isOf (Lnet/minecraft/class_3611;)Z ARG 1 fluid + METHOD method_40179 isIn (Lnet/minecraft/class_6885;)Z + ARG 1 fluids + METHOD method_40180 getRegistryEntry ()Lnet/minecraft/class_6880; + METHOD method_40181 streamTags ()Ljava/util/stream/Stream; diff --git a/mappings/net/minecraft/item/BlockPredicatesChecker.mapping b/mappings/net/minecraft/item/BlockPredicatesChecker.mapping index 0b8d41f161..234252d142 100644 --- a/mappings/net/minecraft/item/BlockPredicatesChecker.mapping +++ b/mappings/net/minecraft/item/BlockPredicatesChecker.mapping @@ -21,6 +21,7 @@ CLASS net/minecraft/class_6538 net/minecraft/item/BlockPredicatesChecker COMMENT {@return true if any of the predicates in the {@code stack}'s NBT COMMENT matched against the block at {@code pos}, false otherwise} ARG 1 stack + ARG 2 blockRegistry ARG 3 pos METHOD method_38071 canUseCache (Lnet/minecraft/class_2694;Lnet/minecraft/class_2694;Z)Z ARG 0 pos diff --git a/mappings/net/minecraft/item/BoneMealItem.mapping b/mappings/net/minecraft/item/BoneMealItem.mapping index 9a9e0efa59..5045613c67 100644 --- a/mappings/net/minecraft/item/BoneMealItem.mapping +++ b/mappings/net/minecraft/item/BoneMealItem.mapping @@ -1,6 +1,14 @@ CLASS net/minecraft/class_1752 net/minecraft/item/BoneMealItem METHOD method_40006 (Lnet/minecraft/class_4970$class_4971;)Z ARG 0 state + METHOD method_40127 (Lnet/minecraft/class_1937;Lnet/minecraft/class_6885$class_6888;)Ljava/util/Optional; + ARG 1 blocks + METHOD method_40128 (Lnet/minecraft/class_6880;)Lnet/minecraft/class_2680; + ARG 0 blockEntry + METHOD method_40129 (Lnet/minecraft/class_1937;Lnet/minecraft/class_6885$class_6888;)Ljava/util/Optional; + ARG 1 blocks + METHOD method_40130 (Lnet/minecraft/class_6880;)Lnet/minecraft/class_2680; + ARG 0 blockEntry METHOD method_7719 useOnGround (Lnet/minecraft/class_1799;Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_2350;)Z ARG 0 stack ARG 1 world diff --git a/mappings/net/minecraft/item/ItemStack.mapping b/mappings/net/minecraft/item/ItemStack.mapping index fc056fdf4b..bbaaaf2919 100644 --- a/mappings/net/minecraft/item/ItemStack.mapping +++ b/mappings/net/minecraft/item/ItemStack.mapping @@ -114,6 +114,8 @@ CLASS net/minecraft/class_1799 net/minecraft/item/ItemStack ARG 3 nbt METHOD (Lnet/minecraft/class_2487;)V ARG 1 nbt + METHOD (Lnet/minecraft/class_6880;)V + ARG 1 entry 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 @@ -144,6 +146,7 @@ CLASS net/minecraft/class_1799 net/minecraft/item/ItemStack ARG 1 tooltipSection METHOD method_31572 getEquipSound ()Lnet/minecraft/class_3414; METHOD method_31573 isIn (Lnet/minecraft/class_6862;)Z + ARG 1 tag METHOD method_31574 isOf (Lnet/minecraft/class_1792;)Z ARG 1 item METHOD method_31575 onStackClicked (Lnet/minecraft/class_1735;Lnet/minecraft/class_5536;Lnet/minecraft/class_1657;)Z @@ -167,6 +170,9 @@ CLASS net/minecraft/class_1799 net/minecraft/item/ItemStack METHOD method_32347 getTooltipData ()Ljava/util/Optional; METHOD method_33262 onItemEntityDestroyed (Lnet/minecraft/class_1542;)V ARG 1 entity + METHOD method_40132 (Lnet/minecraft/class_6880;)Lnet/minecraft/class_5250; + ARG 0 entry + METHOD method_40133 streamTags ()Ljava/util/stream/Stream; METHOD method_7909 getItem ()Lnet/minecraft/class_1792; METHOD method_7910 finishUsing (Lnet/minecraft/class_1937;Lnet/minecraft/class_1309;)Lnet/minecraft/class_1799; ARG 1 world @@ -238,6 +244,7 @@ CLASS net/minecraft/class_1799 net/minecraft/item/ItemStack ARG 1 count COMMENT the count of items METHOD method_7940 canDestroy (Lnet/minecraft/class_2378;Lnet/minecraft/class_2694;)Z + ARG 1 blockRegistry ARG 2 pos METHOD method_7941 getSubNbt (Ljava/lang/String;)Lnet/minecraft/class_2487; COMMENT {@return the NBT compound at the specified key in this item stack's custom NBT, may be {@code null}} @@ -246,6 +253,7 @@ CLASS net/minecraft/class_1799 net/minecraft/item/ItemStack ARG 1 key METHOD method_7942 hasEnchantments ()Z METHOD method_7944 canPlaceOn (Lnet/minecraft/class_2378;Lnet/minecraft/class_2694;)Z + ARG 1 blockRegistry ARG 2 pos METHOD method_7945 getFrame ()Lnet/minecraft/class_1533; METHOD method_7946 isStackable ()Z diff --git a/mappings/net/minecraft/loot/entry/TagEntry.mapping b/mappings/net/minecraft/loot/entry/TagEntry.mapping index 7c399f60a1..f96d781059 100644 --- a/mappings/net/minecraft/loot/entry/TagEntry.mapping +++ b/mappings/net/minecraft/loot/entry/TagEntry.mapping @@ -25,4 +25,6 @@ CLASS net/minecraft/class_91 net/minecraft/loot/entry/TagEntry METHOD method_447 grow (Lnet/minecraft/class_47;Ljava/util/function/Consumer;)Z ARG 1 context ARG 2 lootChoiceExpander + METHOD method_449 (Ljava/util/function/Consumer;Lnet/minecraft/class_6880;)V + ARG 1 entry CLASS class_92 Serializer diff --git a/mappings/net/minecraft/server/world/ServerWorld.mapping b/mappings/net/minecraft/server/world/ServerWorld.mapping index 2b67b11ed4..7330b1afeb 100644 --- a/mappings/net/minecraft/server/world/ServerWorld.mapping +++ b/mappings/net/minecraft/server/world/ServerWorld.mapping @@ -245,6 +245,7 @@ CLASS net/minecraft/class_3218 net/minecraft/server/world/ServerWorld ARG 1 event METHOD method_23660 wakeSleepingPlayers ()V METHOD method_24500 locateBiome (Lnet/minecraft/class_5321;Lnet/minecraft/class_2338;II)Lnet/minecraft/class_2338; + ARG 1 biomeKey ARG 2 pos ARG 3 radius ARG 4 blockCheckInterval @@ -303,6 +304,8 @@ CLASS net/minecraft/class_3218 net/minecraft/server/world/ServerWorld COMMENT COMMENT @see net.minecraft.world.ServerWorldAccess#spawnEntityAndPassengers ARG 1 entity + METHOD method_31071 (Lnet/minecraft/class_5321;Lnet/minecraft/class_6880;)Z + ARG 1 entry METHOD method_31268 getDebugString ()Ljava/lang/String; METHOD method_31270 getTopFive (Ljava/lang/Iterable;Ljava/util/function/Function;)Ljava/lang/String; COMMENT Categories {@code items} with the {@code classifier} and reports a message diff --git a/mappings/net/minecraft/util/registry/Registry.mapping b/mappings/net/minecraft/util/registry/Registry.mapping index 82ab133f34..b42c43969a 100644 --- a/mappings/net/minecraft/util/registry/Registry.mapping +++ b/mappings/net/minecraft/util/registry/Registry.mapping @@ -147,6 +147,8 @@ CLASS net/minecraft/class_2378 net/minecraft/util/registry/Registry METHOD (Lnet/minecraft/class_5321;Lcom/mojang/serialization/Lifecycle;)V ARG 1 key ARG 2 lifecycle + METHOD keys (Lcom/mojang/serialization/DynamicOps;)Ljava/util/stream/Stream; + ARG 1 ops METHOD method_10218 (Lnet/minecraft/class_2378;)Lnet/minecraft/class_2591; ARG 0 registry METHOD method_10219 (Lnet/minecraft/class_2378;)Lnet/minecraft/class_1291; @@ -287,6 +289,8 @@ CLASS net/minecraft/class_2378 net/minecraft/util/registry/Registry ARG 0 registry METHOD method_34025 (Lnet/minecraft/class_2378;)Lnet/minecraft/class_3816; ARG 0 registry + METHOD method_34028 (Lcom/mojang/serialization/DynamicOps;Lnet/minecraft/class_2960;)Ljava/lang/Object; + ARG 1 id METHOD method_34029 (Lnet/minecraft/class_2378;Lnet/minecraft/class_2378;)V ARG 1 registry METHOD method_34031 (Lnet/minecraft/class_2960;Ljava/util/function/Supplier;)V @@ -326,6 +330,10 @@ CLASS net/minecraft/class_2378 net/minecraft/util/registry/Registry ARG 0 registry ARG 1 key ARG 2 entry + METHOD method_39667 (Lnet/minecraft/class_2960;)Lcom/mojang/serialization/DataResult; + ARG 1 id + METHOD method_39671 (Ljava/lang/Object;)Lcom/mojang/serialization/DataResult; + ARG 1 value METHOD method_39673 getCodec ()Lcom/mojang/serialization/Codec; METHOD method_40252 containsTag (Lnet/minecraft/class_6862;)Z ARG 1 tag @@ -361,10 +369,24 @@ CLASS net/minecraft/class_2378 net/minecraft/util/registry/Registry ARG 0 key ARG 1 defaultId ARG 2 valueToEntryFunction + METHOD method_40284 (Lnet/minecraft/class_6880;)Lcom/mojang/serialization/Lifecycle; + ARG 1 entry + METHOD method_40285 (Lnet/minecraft/class_6880;)Lcom/mojang/serialization/DataResult; + ARG 1 entry + METHOD method_40286 iterateEntries (Lnet/minecraft/class_6862;)Ljava/lang/Iterable; + ARG 1 tag + METHOD method_40288 (Lnet/minecraft/class_2960;)Lcom/mojang/serialization/DataResult; + ARG 1 id METHOD method_40290 entryOf (Lnet/minecraft/class_5321;)Lnet/minecraft/class_6880; ARG 1 key + METHOD method_40292 freezeRegistries ()V METHOD method_40293 (Lnet/minecraft/class_2378;)Lnet/minecraft/class_6875; ARG 0 registry + METHOD method_40294 getEntryCodec ()Lcom/mojang/serialization/Codec; + METHOD method_40295 getIndexedEntries ()Lnet/minecraft/class_2359; + CLASS 1 + METHOD method_40296 (Lnet/minecraft/class_6880$class_6883;)Lnet/minecraft/class_6880; + ARG 0 entry CLASS class_6889 DefaultEntryGetter METHOD run (Lnet/minecraft/class_2378;)Ljava/lang/Object; ARG 1 registry diff --git a/mappings/net/minecraft/village/VillagerType.mapping b/mappings/net/minecraft/village/VillagerType.mapping index c8348df85e..e7dee16c25 100644 --- a/mappings/net/minecraft/village/VillagerType.mapping +++ b/mappings/net/minecraft/village/VillagerType.mapping @@ -11,6 +11,7 @@ CLASS net/minecraft/class_3854 net/minecraft/village/VillagerType METHOD (Ljava/lang/String;)V ARG 1 name METHOD method_16930 forBiome (Lnet/minecraft/class_6880;)Lnet/minecraft/class_3854; + ARG 0 biomeEntry METHOD method_16931 create (Ljava/lang/String;)Lnet/minecraft/class_3854; ARG 0 id METHOD method_16932 (Ljava/util/HashMap;)V diff --git a/mappings/net/minecraft/world/SpawnHelper.mapping b/mappings/net/minecraft/world/SpawnHelper.mapping index dc443746d4..b37a7659ed 100644 --- a/mappings/net/minecraft/world/SpawnHelper.mapping +++ b/mappings/net/minecraft/world/SpawnHelper.mapping @@ -52,6 +52,7 @@ CLASS net/minecraft/class_1948 net/minecraft/world/SpawnHelper ARG 2 chunkGenerator ARG 3 spawnGroup ARG 4 pos + ARG 5 biomeEntry METHOD method_35238 (Lnet/minecraft/class_1299;Lnet/minecraft/class_2338;Lnet/minecraft/class_2791;)Z ARG 0 type ARG 1 pos diff --git a/mappings/net/minecraft/world/StructureLocator.mapping b/mappings/net/minecraft/world/StructureLocator.mapping index de3cc75043..9f70f84953 100644 --- a/mappings/net/minecraft/world/StructureLocator.mapping +++ b/mappings/net/minecraft/world/StructureLocator.mapping @@ -13,6 +13,7 @@ CLASS net/minecraft/class_6832 net/minecraft/world/StructureLocator FIELD field_36236 dataFixer Lcom/mojang/datafixers/DataFixer; FIELD field_36237 cachedFeaturesByChunkPos Lit/unimi/dsi/fastutil/longs/Long2ObjectMap; FIELD field_36238 generationPossibilityByFeature Ljava/util/Map; + FIELD field_36418 configuredStructureFeatureRegistry Lnet/minecraft/class_2378; METHOD (Lnet/minecraft/class_6830;Lnet/minecraft/class_5455;Lnet/minecraft/class_3485;Lnet/minecraft/class_5321;Lnet/minecraft/class_2794;Lnet/minecraft/class_5539;Lnet/minecraft/class_1966;JLcom/mojang/datafixers/DataFixer;)V ARG 1 chunkIoWorker ARG 2 registryManager @@ -70,5 +71,7 @@ CLASS net/minecraft/class_6832 net/minecraft/world/StructureLocator ARG 1 referencesByStructure ARG 2 feature ARG 3 skipExistingChunk + METHOD method_39841 (Ljava/util/function/Predicate;Lnet/minecraft/class_6880;)Z + ARG 1 entry METHOD method_39842 collectStructuresAndReferences (Lnet/minecraft/class_2487;)Lit/unimi/dsi/fastutil/objects/Object2IntMap; ARG 1 nbt diff --git a/mappings/net/minecraft/world/biome/Biome.mapping b/mappings/net/minecraft/world/biome/Biome.mapping index fdfc10324f..5a27e4eeba 100644 --- a/mappings/net/minecraft/world/biome/Biome.mapping +++ b/mappings/net/minecraft/world/biome/Biome.mapping @@ -41,6 +41,8 @@ CLASS net/minecraft/class_1959 net/minecraft/world/biome/Biome ARG 1 pos METHOD method_39929 isHot (Lnet/minecraft/class_2338;)Z ARG 1 pos + METHOD method_40136 getCategory (Lnet/minecraft/class_6880;)Lnet/minecraft/class_1959$class_1961; + ARG 0 biomeEntry METHOD method_8685 canSetIce (Lnet/minecraft/class_4538;Lnet/minecraft/class_2338;Z)Z ARG 1 world ARG 2 pos diff --git a/mappings/net/minecraft/world/gen/chunk/ChunkGenerator.mapping b/mappings/net/minecraft/world/gen/chunk/ChunkGenerator.mapping index 1f243a682a..fea54903ad 100644 --- a/mappings/net/minecraft/world/gen/chunk/ChunkGenerator.mapping +++ b/mappings/net/minecraft/world/gen/chunk/ChunkGenerator.mapping @@ -37,6 +37,7 @@ CLASS net/minecraft/class_2794 net/minecraft/world/gen/chunk/ChunkGenerator COMMENT COMMENT @return {@code null} if no structure could be found within the given search radius ARG 1 world + ARG 2 feature ARG 3 center ARG 4 radius COMMENT the search radius in chunks around the chunk the given block position is in; a radius of 0 will only search in the given chunk diff --git a/mappings/net/minecraft/world/gen/feature/CoralFeature.mapping b/mappings/net/minecraft/world/gen/feature/CoralFeature.mapping index e63ff66434..f0f3cb39ff 100644 --- a/mappings/net/minecraft/world/gen/feature/CoralFeature.mapping +++ b/mappings/net/minecraft/world/gen/feature/CoralFeature.mapping @@ -13,3 +13,9 @@ CLASS net/minecraft/class_2978 net/minecraft/world/gen/feature/CoralFeature ARG 2 block METHOD method_40030 (Lnet/minecraft/class_2350;Lnet/minecraft/class_1936;Lnet/minecraft/class_2338;Lnet/minecraft/class_2248;)V ARG 3 block + METHOD method_40160 (Ljava/util/Random;Lnet/minecraft/class_6885$class_6888;)Ljava/util/Optional; + ARG 1 blocks + METHOD method_40161 (Ljava/util/Random;Lnet/minecraft/class_6885$class_6888;)Ljava/util/Optional; + ARG 1 blocks + METHOD method_40162 (Ljava/util/Random;Lnet/minecraft/class_6885$class_6888;)Ljava/util/Optional; + ARG 1 blocks