diff --git a/mappings/net/minecraft/block/Block.mapping b/mappings/net/minecraft/block/Block.mapping index cce4585289..0a658f0a21 100644 --- a/mappings/net/minecraft/block/Block.mapping +++ b/mappings/net/minecraft/block/Block.mapping @@ -46,6 +46,7 @@ CLASS net/minecraft/class_2248 net/minecraft/block/Block COMMENT Signals that lighting updates should be skipped. FIELD field_31036 NOTIFY_ALL I COMMENT The default setBlockState behavior. Same as {@code NOTIFY_NEIGHBORS | NOTIFY_LISTENERS}. + FIELD field_36404 registryEntry Lnet/minecraft/class_6880$class_6883; METHOD method_16361 hasTopRim (Lnet/minecraft/class_1922;Lnet/minecraft/class_2338;)Z ARG 0 world ARG 1 pos @@ -100,6 +101,7 @@ CLASS net/minecraft/class_2248 net/minecraft/block/Block ARG 0 world ARG 1 itemEntitySupplier ARG 2 stack + METHOD method_40142 getRegistryEntry ()Lnet/minecraft/class_6880$class_6883; METHOD method_9496 randomDisplayTick (Lnet/minecraft/class_2680;Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Ljava/util/Random;)V ARG 1 state ARG 2 world @@ -259,6 +261,7 @@ CLASS net/minecraft/class_2248 net/minecraft/block/Block ARG 1 world ARG 2 pos ARG 3 side + ARG 4 otherPos METHOD method_9609 getDroppedStacks (Lnet/minecraft/class_2680;Lnet/minecraft/class_3218;Lnet/minecraft/class_2338;Lnet/minecraft/class_2586;Lnet/minecraft/class_1297;Lnet/minecraft/class_1799;)Ljava/util/List; ARG 0 state ARG 1 world diff --git a/mappings/net/minecraft/class_6864.mapping b/mappings/net/minecraft/class_6864.mapping index 4b39ea6d05..d299a67ee8 100644 --- a/mappings/net/minecraft/class_6864.mapping +++ b/mappings/net/minecraft/class_6864.mapping @@ -15,3 +15,4 @@ CLASS net/minecraft/class_6864 ARG 1 buf METHOD method_33160 fromBuf (Lnet/minecraft/class_2540;)Lnet/minecraft/class_6864$class_5748; ARG 0 buf + METHOD method_40108 isEmpty ()Z diff --git a/mappings/net/minecraft/datafixer/fix/StructureSettingsFlattenFix.mapping b/mappings/net/minecraft/datafixer/fix/StructureSettingsFlattenFix.mapping new file mode 100644 index 0000000000..248895ca2e --- /dev/null +++ b/mappings/net/minecraft/datafixer/fix/StructureSettingsFlattenFix.mapping @@ -0,0 +1,3 @@ +CLASS net/minecraft/class_6867 net/minecraft/datafixer/fix/StructureSettingsFlattenFix + METHOD (Lcom/mojang/datafixers/schemas/Schema;)V + ARG 1 schema diff --git a/mappings/net/minecraft/entity/EntityType.mapping b/mappings/net/minecraft/entity/EntityType.mapping index ebbb3812bb..621bc4e387 100644 --- a/mappings/net/minecraft/entity/EntityType.mapping +++ b/mappings/net/minecraft/entity/EntityType.mapping @@ -7,6 +7,7 @@ CLASS net/minecraft/class_1299 net/minecraft/entity/EntityType FIELD field_24086 trackTickInterval I FIELD field_25355 canSpawnInside Lcom/google/common/collect/ImmutableSet; FIELD field_30053 ENTITY_TAG_KEY Ljava/lang/String; + FIELD field_36398 registryEntry Lnet/minecraft/class_6880$class_6883; FIELD field_6056 saveable Z FIELD field_6072 summonable Z FIELD field_6088 LOGGER Lorg/slf4j/Logger; @@ -15,6 +16,7 @@ CLASS net/minecraft/class_1299 net/minecraft/entity/EntityType FIELD field_6101 factory Lnet/minecraft/class_1299$class_4049; FIELD field_6106 translationKey Ljava/lang/String; METHOD (Lnet/minecraft/class_1299$class_4049;Lnet/minecraft/class_1311;ZZZZLcom/google/common/collect/ImmutableSet;Lnet/minecraft/class_4048;II)V + ARG 1 factory ARG 2 spawnGroup ARG 3 saveable ARG 4 summonable @@ -55,6 +57,7 @@ CLASS net/minecraft/class_1299 net/minecraft/entity/EntityType METHOD method_18389 alwaysUpdateVelocity ()Z METHOD method_19946 isFireImmune ()Z METHOD method_20210 isIn (Lnet/minecraft/class_6862;)Z + ARG 1 tag METHOD method_20814 isSpawnableFarFromPlayer ()Z METHOD method_29496 isInvalidSpawn (Lnet/minecraft/class_2680;)Z COMMENT Returns whether the EntityType can spawn inside the given block. @@ -68,6 +71,7 @@ CLASS net/minecraft/class_1299 net/minecraft/entity/EntityType ARG 0 entityNbtList ARG 1 world METHOD method_35050 getUntranslatedName ()Ljava/lang/String; + METHOD method_40124 getRegistryEntry ()Lnet/minecraft/class_6880$class_6883; METHOD method_5881 loadFromEntityNbt (Lnet/minecraft/class_1937;Lnet/minecraft/class_1657;Lnet/minecraft/class_1297;Lnet/minecraft/class_2487;)V ARG 0 world ARG 1 player diff --git a/mappings/net/minecraft/entity/ai/goal/PowderSnowJumpGoal.mapping b/mappings/net/minecraft/entity/ai/goal/PowderSnowJumpGoal.mapping new file mode 100644 index 0000000000..b3578849e8 --- /dev/null +++ b/mappings/net/minecraft/entity/ai/goal/PowderSnowJumpGoal.mapping @@ -0,0 +1,6 @@ +CLASS net/minecraft/class_6868 net/minecraft/entity/ai/goal/PowderSnowJumpGoal + FIELD field_36399 entity Lnet/minecraft/class_1308; + FIELD field_36400 world Lnet/minecraft/class_1937; + METHOD (Lnet/minecraft/class_1308;Lnet/minecraft/class_1937;)V + ARG 1 entity + ARG 2 world diff --git a/mappings/net/minecraft/fluid/Fluid.mapping b/mappings/net/minecraft/fluid/Fluid.mapping index 3a4b530e99..6e50bf64e7 100644 --- a/mappings/net/minecraft/fluid/Fluid.mapping +++ b/mappings/net/minecraft/fluid/Fluid.mapping @@ -2,6 +2,7 @@ CLASS net/minecraft/class_3611 net/minecraft/fluid/Fluid FIELD field_15903 defaultState Lnet/minecraft/class_3610; FIELD field_15904 STATE_IDS Lnet/minecraft/class_2361; FIELD field_15905 stateManager Lnet/minecraft/class_2689; + FIELD field_36431 registryEntry Lnet/minecraft/class_6880$class_6883; METHOD method_15774 getBucketItem ()Lnet/minecraft/class_1792; METHOD method_15775 appendProperties (Lnet/minecraft/class_2689$class_2690;)V ARG 1 builder @@ -43,6 +44,7 @@ CLASS net/minecraft/class_3611 net/minecraft/fluid/Fluid METHOD method_15790 toBlockState (Lnet/minecraft/class_3610;)Lnet/minecraft/class_2680; ARG 1 state METHOD method_15791 isIn (Lnet/minecraft/class_6862;)Z + ARG 1 tag METHOD method_15792 onRandomTick (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_3610;Ljava/util/Random;)V ARG 1 world ARG 2 pos @@ -60,3 +62,4 @@ CLASS net/minecraft/class_3611 net/minecraft/fluid/Fluid ARG 1 state METHOD method_32359 getBucketFillSound ()Ljava/util/Optional; COMMENT Returns the sound played when filling a bucket with this fluid. + METHOD method_40178 getRegistryEntry ()Lnet/minecraft/class_6880$class_6883; diff --git a/mappings/net/minecraft/item/Item.mapping b/mappings/net/minecraft/item/Item.mapping index 0570cb5757..774857f3ef 100644 --- a/mappings/net/minecraft/item/Item.mapping +++ b/mappings/net/minecraft/item/Item.mapping @@ -3,6 +3,7 @@ CLASS net/minecraft/class_1792 net/minecraft/item/Item FIELD field_21979 fireproof Z FIELD field_27017 LOGGER Lorg/slf4j/Logger; FIELD field_30887 DEFAULT_MAX_COUNT I + FIELD field_36401 registryEntry Lnet/minecraft/class_6880$class_6883; FIELD field_8001 ATTACK_SPEED_MODIFIER_ID Ljava/util/UUID; FIELD field_8003 BLOCK_ITEMS Ljava/util/Map; FIELD field_8004 group Lnet/minecraft/class_1761; @@ -51,6 +52,7 @@ CLASS net/minecraft/class_1792 net/minecraft/item/Item ARG 1 stack METHOD method_33261 onItemEntityDestroyed (Lnet/minecraft/class_1542;)V ARG 1 entity + METHOD method_40131 getRegistryEntry ()Lnet/minecraft/class_6880$class_6883; METHOD method_7836 use (Lnet/minecraft/class_1937;Lnet/minecraft/class_1657;Lnet/minecraft/class_1268;)Lnet/minecraft/class_1271; COMMENT Called when an item is used by a player. COMMENT The use action, by default, is bound to the right mouse button. diff --git a/mappings/net/minecraft/tag/Tag.mapping b/mappings/net/minecraft/tag/Tag.mapping index e37f75c05b..6db8789762 100644 --- a/mappings/net/minecraft/tag/Tag.mapping +++ b/mappings/net/minecraft/tag/Tag.mapping @@ -9,7 +9,12 @@ CLASS net/minecraft/class_3494 net/minecraft/tag/Tag COMMENT COMMENT

Its entries' iteration may be ordered COMMENT or unordered, depending on the configuration from the tag builder. + FIELD field_36392 EMPTY Lnet/minecraft/class_3494; + FIELD field_36393 values Ljava/util/List; + METHOD (Ljava/util/Collection;)V + ARG 1 values METHOD method_15138 values ()Ljava/util/List; + METHOD method_40088 empty ()Lnet/minecraft/class_3494; CLASS class_3495 Builder COMMENT A builder class to ease the creation of tags. It can also be used as a COMMENT mutable form of a tag. diff --git a/mappings/net/minecraft/tag/TagKey.mapping b/mappings/net/minecraft/tag/TagKey.mapping new file mode 100644 index 0000000000..a5665a2f8a --- /dev/null +++ b/mappings/net/minecraft/tag/TagKey.mapping @@ -0,0 +1,19 @@ +CLASS net/minecraft/class_6862 net/minecraft/tag/TagKey + FIELD comp_327 id Lnet/minecraft/class_2960; + FIELD field_36394 INTERNER Lcom/google/common/collect/Interner; + METHOD comp_327 id ()Lnet/minecraft/class_2960; + METHOD method_40089 (Lnet/minecraft/class_6862;)Ljava/lang/String; + ARG 0 string + METHOD method_40090 identifierCodec (Lnet/minecraft/class_5321;)Lcom/mojang/serialization/Codec; + ARG 0 registry + METHOD method_40091 (Lnet/minecraft/class_5321;Ljava/lang/String;)Lcom/mojang/serialization/DataResult; + ARG 1 string + METHOD method_40092 intern (Lnet/minecraft/class_5321;Lnet/minecraft/class_2960;)Lnet/minecraft/class_6862; + ARG 0 registry + ARG 1 id + METHOD method_40093 stringCodec (Lnet/minecraft/class_5321;)Lcom/mojang/serialization/Codec; + ARG 0 registry + METHOD method_40094 (Lnet/minecraft/class_5321;Lnet/minecraft/class_2960;)Lnet/minecraft/class_6862; + ARG 1 id + METHOD method_40095 (Lnet/minecraft/class_5321;Lnet/minecraft/class_2960;)Lnet/minecraft/class_6862; + ARG 1 id diff --git a/mappings/net/minecraft/tag/TagManagerLoader.mapping b/mappings/net/minecraft/tag/TagManagerLoader.mapping index d9cb314ed3..11734848f1 100644 --- a/mappings/net/minecraft/tag/TagManagerLoader.mapping +++ b/mappings/net/minecraft/tag/TagManagerLoader.mapping @@ -1,8 +1,14 @@ CLASS net/minecraft/class_3505 net/minecraft/tag/TagManagerLoader FIELD field_28312 registryManager Lnet/minecraft/class_5455; + FIELD field_36395 DIRECTORIES Ljava/util/Map; + FIELD field_36396 registryTags Ljava/util/List; METHOD (Lnet/minecraft/class_5455;)V ARG 1 registryManager METHOD method_33178 buildRequiredGroup (Lnet/minecraft/class_3300;Ljava/util/concurrent/Executor;Lnet/minecraft/class_5455$class_6892;)Ljava/util/concurrent/CompletableFuture; ARG 1 resourceManager ARG 2 prepareExecutor ARG 3 requirement + METHOD method_40096 getRegistryTags ()Ljava/util/List; + METHOD method_40099 getPath (Lnet/minecraft/class_5321;)Ljava/lang/String; + ARG 0 registry + CLASS class_6863 RegistryTags diff --git a/mappings/net/minecraft/util/collection/IndexedIterable.mapping b/mappings/net/minecraft/util/collection/IndexedIterable.mapping index dd367e6384..6caf8dfcb4 100644 --- a/mappings/net/minecraft/util/collection/IndexedIterable.mapping +++ b/mappings/net/minecraft/util/collection/IndexedIterable.mapping @@ -4,7 +4,7 @@ CLASS net/minecraft/class_2359 net/minecraft/util/collection/IndexedIterable ARG 1 index METHOD method_10204 size ()I METHOD method_10206 getRawId (Ljava/lang/Object;)I - ARG 1 entry + ARG 1 value METHOD method_39974 getOrThrow (I)Ljava/lang/Object; COMMENT {@return the value at {@code index}} COMMENT diff --git a/mappings/net/minecraft/util/registry/BuiltinRegistries.mapping b/mappings/net/minecraft/util/registry/BuiltinRegistries.mapping index 8e82ee6c97..55b7fa7d10 100644 --- a/mappings/net/minecraft/util/registry/BuiltinRegistries.mapping +++ b/mappings/net/minecraft/util/registry/BuiltinRegistries.mapping @@ -49,3 +49,7 @@ CLASS net/minecraft/class_5458 net/minecraft/util/registry/BuiltinRegistries ARG 0 registry ARG 1 key ARG 2 object + METHOD method_40360 (Lnet/minecraft/class_2378;Ljava/lang/String;Ljava/lang/Object;)Lnet/minecraft/class_6880; + ARG 0 registry + ARG 1 id + ARG 2 value diff --git a/mappings/net/minecraft/util/registry/DefaultedRegistry.mapping b/mappings/net/minecraft/util/registry/DefaultedRegistry.mapping index 68cd61c752..141fec6bc9 100644 --- a/mappings/net/minecraft/util/registry/DefaultedRegistry.mapping +++ b/mappings/net/minecraft/util/registry/DefaultedRegistry.mapping @@ -1,8 +1,9 @@ CLASS net/minecraft/class_2348 net/minecraft/util/registry/DefaultedRegistry FIELD field_11014 defaultId Lnet/minecraft/class_2960; - FIELD field_11015 defaultValue Lnet/minecraft/class_6880; + FIELD field_11015 defaultEntry Lnet/minecraft/class_6880; METHOD (Ljava/lang/String;Lnet/minecraft/class_5321;Lcom/mojang/serialization/Lifecycle;Ljava/util/function/Function;)V ARG 1 defaultId ARG 2 key ARG 3 lifecycle + ARG 4 valueToEntryFunction METHOD method_10137 getDefaultId ()Lnet/minecraft/class_2960; diff --git a/mappings/net/minecraft/util/registry/DynamicRegistryManager.mapping b/mappings/net/minecraft/util/registry/DynamicRegistryManager.mapping index cdc936e2d5..50254ebfb5 100644 --- a/mappings/net/minecraft/util/registry/DynamicRegistryManager.mapping +++ b/mappings/net/minecraft/util/registry/DynamicRegistryManager.mapping @@ -45,6 +45,8 @@ CLASS net/minecraft/class_5455 net/minecraft/util/registry/DynamicRegistryManage METHOD method_33310 getOptional (Lnet/minecraft/class_5321;)Ljava/util/Optional; ARG 1 key METHOD method_39674 getInfos ()Ljava/lang/Iterable; + METHOD method_40302 (Lnet/minecraft/class_2378;)Lnet/minecraft/class_5455$class_6890; + ARG 0 registries CLASS class_5456 Info COMMENT Represents the serialization behavior of the registries, including the COMMENT id of the registry, the codec for its elements, and whether the registry diff --git a/mappings/net/minecraft/util/registry/MutableRegistry.mapping b/mappings/net/minecraft/util/registry/MutableRegistry.mapping index b26ec39c13..dd4577b391 100644 --- a/mappings/net/minecraft/util/registry/MutableRegistry.mapping +++ b/mappings/net/minecraft/util/registry/MutableRegistry.mapping @@ -6,7 +6,7 @@ CLASS net/minecraft/class_2385 net/minecraft/util/registry/MutableRegistry METHOD method_10273 set (ILnet/minecraft/class_5321;Ljava/lang/Object;Lcom/mojang/serialization/Lifecycle;)Lnet/minecraft/class_6880; ARG 1 rawId ARG 2 key - ARG 3 entry + ARG 3 value ARG 4 lifecycle METHOD method_31062 replace (Ljava/util/OptionalInt;Lnet/minecraft/class_5321;Ljava/lang/Object;Lcom/mojang/serialization/Lifecycle;)Lnet/minecraft/class_6880; COMMENT If the given key is already present in the registry, replaces the entry associated with the given diff --git a/mappings/net/minecraft/util/registry/Registry.mapping b/mappings/net/minecraft/util/registry/Registry.mapping index 5f507db3f2..a0746f1949 100644 --- a/mappings/net/minecraft/util/registry/Registry.mapping +++ b/mappings/net/minecraft/util/registry/Registry.mapping @@ -145,9 +145,15 @@ 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 method_10218 (Lnet/minecraft/class_2378;)Lnet/minecraft/class_2591; + ARG 0 registry + METHOD method_10219 (Lnet/minecraft/class_2378;)Lnet/minecraft/class_1291; + ARG 0 registry METHOD method_10220 stream ()Ljava/util/stream/Stream; METHOD method_10221 getId (Ljava/lang/Object;)Lnet/minecraft/class_2960; - ARG 1 entry + ARG 1 value + METHOD method_10222 (Lnet/minecraft/class_2378;)Lnet/minecraft/class_6018; + ARG 0 tegistry METHOD method_10223 get (Lnet/minecraft/class_2960;)Ljava/lang/Object; ARG 1 id METHOD method_10224 create (Lnet/minecraft/class_5321;Ljava/lang/String;Lnet/minecraft/class_2378$class_6889;)Lnet/minecraft/class_2348; @@ -161,6 +167,10 @@ CLASS net/minecraft/class_2378 net/minecraft/util/registry/Registry ARG 0 key ARG 1 registry ARG 3 lifecycle + METHOD method_10228 (Lnet/minecraft/class_2378;)Lnet/minecraft/class_2396; + ARG 0 registry + METHOD method_10229 (Lnet/minecraft/class_2378;)Lnet/minecraft/class_5864; + ARG 0 registry METHOD method_10230 register (Lnet/minecraft/class_2378;Lnet/minecraft/class_2960;Ljava/lang/Object;)Ljava/lang/Object; ARG 0 registry ARG 1 id @@ -170,16 +180,65 @@ CLASS net/minecraft/class_2378 net/minecraft/util/registry/Registry ARG 1 rawId ARG 2 id ARG 3 entry + METHOD method_10233 (Lnet/minecraft/class_2378;)Lnet/minecraft/class_3414; + ARG 0 registry + METHOD method_10234 (Lnet/minecraft/class_2378;)Lnet/minecraft/class_1792; + ARG 0 registry METHOD method_10235 getIds ()Ljava/util/Set; + METHOD method_10236 (Lnet/minecraft/class_2378;)Lnet/minecraft/class_2960; + ARG 0 registry + METHOD method_10237 (Lnet/minecraft/class_2378;)Lnet/minecraft/class_2248; + ARG 0 registry METHOD method_10240 getRandom (Ljava/util/Random;)Ljava/util/Optional; ARG 1 random + METHOD method_10243 (Lnet/minecraft/class_2378;)Lnet/minecraft/class_1887; + ARG 0 registry + METHOD method_10245 (Lnet/minecraft/class_2378;)Lnet/minecraft/class_1842; + ARG 0 registry + METHOD method_10246 (Lnet/minecraft/class_2378;)Lnet/minecraft/class_1535; + ARG 0 registry METHOD method_10247 create (Lnet/minecraft/class_5321;Lnet/minecraft/class_2378$class_6889;)Lnet/minecraft/class_2378; ARG 0 key + METHOD method_10248 (Lnet/minecraft/class_2378;)Lnet/minecraft/class_3611; + ARG 0 registry METHOD method_10250 containsId (Lnet/minecraft/class_2960;)Z ARG 1 id + METHOD method_10252 (Lnet/minecraft/class_2378;)Lnet/minecraft/class_1299; + ARG 0 registry + METHOD method_16543 (Lnet/minecraft/class_2378;)Lnet/minecraft/class_2806; + ARG 0 registry + METHOD method_16701 (Lnet/minecraft/class_2378;)Lnet/minecraft/class_3827; + ARG 0 registry + METHOD method_17172 (Lnet/minecraft/class_2378;)Lnet/minecraft/class_3852; + ARG 0 registry + METHOD method_17173 (Lnet/minecraft/class_2378;)Lnet/minecraft/class_3854; + ARG 0 registry + METHOD method_17583 (Lnet/minecraft/class_2378;)Lnet/minecraft/class_3917; + ARG 0 registry + METHOD method_17797 (Lnet/minecraft/class_2378;)Lnet/minecraft/class_1865; + ARG 0 registry + METHOD method_17798 (Lnet/minecraft/class_2378;)Lnet/minecraft/class_3956; + ARG 0 registry METHOD method_17966 getOrEmpty (Lnet/minecraft/class_2960;)Ljava/util/Optional; ARG 1 id + METHOD method_19449 (Lnet/minecraft/class_2378;)Lnet/minecraft/class_4168; + ARG 0 registry + METHOD method_19450 (Lnet/minecraft/class_2378;)Lnet/minecraft/class_4170; + ARG 0 registry + METHOD method_19451 (Lnet/minecraft/class_2378;)Lnet/minecraft/class_4149; + ARG 0 registry + METHOD method_19452 (Lnet/minecraft/class_2378;)Lnet/minecraft/class_4140; + ARG 0 registry + METHOD method_19453 (Lnet/minecraft/class_2378;)Lnet/minecraft/class_4158; + ARG 0 registry + METHOD method_20574 (Lnet/minecraft/class_2378;)Lnet/minecraft/class_3448; + ARG 0 registry + METHOD method_26429 (Lnet/minecraft/class_2378;)Lnet/minecraft/class_4996; + ARG 0 registry + METHOD method_27041 (Lnet/minecraft/class_2378;)Lnet/minecraft/class_1320; + ARG 0 registry METHOD method_29103 validate (Lnet/minecraft/class_2378;)V + ARG 0 registries METHOD method_29106 createRegistryKey (Ljava/lang/String;)Lnet/minecraft/class_5321; ARG 0 registryId METHOD method_29107 get (Lnet/minecraft/class_5321;)Ljava/lang/Object; @@ -193,6 +252,14 @@ CLASS net/minecraft/class_2378 net/minecraft/util/registry/Registry ARG 2 lifecycle METHOD method_29113 getKey (Ljava/lang/Object;)Ljava/util/Optional; ARG 1 entry + METHOD method_29114 (Lnet/minecraft/class_2378;)Lcom/mojang/serialization/Codec; + ARG 0 registry + METHOD method_29396 (Lnet/minecraft/class_2378;)Lnet/minecraft/class_5342; + ARG 0 registry + METHOD method_29397 (Lnet/minecraft/class_2378;)Lnet/minecraft/class_5339; + ARG 0 registry + METHOD method_29398 (Lnet/minecraft/class_2378;)Lnet/minecraft/class_5338; + ARG 0 registry METHOD method_29722 getEntries ()Ljava/util/Set; METHOD method_30517 getKey ()Lnet/minecraft/class_5321; METHOD method_31138 getLifecycle ()Lcom/mojang/serialization/Lifecycle; @@ -206,13 +273,96 @@ CLASS net/minecraft/class_2378 net/minecraft/util/registry/Registry ARG 1 key METHOD method_31189 getOrEmpty (Lnet/minecraft/class_5321;)Ljava/util/Optional; ARG 1 key + METHOD method_32693 (Lnet/minecraft/class_2378;)Lnet/minecraft/class_5669; + ARG 0 registry + METHOD method_32694 (Lnet/minecraft/class_2378;)Lnet/minecraft/class_5650; + ARG 0 registry + METHOD method_32695 (Lnet/minecraft/class_2378;)Lnet/minecraft/class_5657; + ARG 0 registry + METHOD method_33104 (Lnet/minecraft/class_2378;)Lnet/minecraft/class_5717; + ARG 0 registry + METHOD method_33105 (Lnet/minecraft/class_2378;)Lnet/minecraft/class_5712; + ARG 0 registry + METHOD method_34025 (Lnet/minecraft/class_2378;)Lnet/minecraft/class_3816; + ARG 0 registry + 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 ARG 0 id ARG 1 defaultEntry + METHOD method_34033 (Lnet/minecraft/class_2378;)Lnet/minecraft/class_3828; + ARG 0 registry + METHOD method_34034 (Lnet/minecraft/class_2378;)Lnet/minecraft/class_5202; + ARG 0 registry + METHOD method_34035 (Lnet/minecraft/class_2378;)Lnet/minecraft/class_4663; + ARG 0 registry + METHOD method_34036 (Lnet/minecraft/class_2378;)Lnet/minecraft/class_5142; + ARG 0 registry + METHOD method_34037 (Lnet/minecraft/class_2378;)Lnet/minecraft/class_4648; + ARG 0 registry + METHOD method_34038 (Lnet/minecraft/class_2378;)Lnet/minecraft/class_6647; + ARG 0 registry + METHOD method_34039 (Lnet/minecraft/class_2378;)Lnet/minecraft/class_4652; + ARG 0 registry + METHOD method_34040 (Lnet/minecraft/class_2378;)Lnet/minecraft/class_6798; + ARG 0 registry + METHOD method_34041 (Lnet/minecraft/class_2378;)Lnet/minecraft/class_3773; + ARG 0 registry + METHOD method_34042 (Lnet/minecraft/class_2378;)Lnet/minecraft/class_3195; + ARG 0 registry + METHOD method_34043 (Lnet/minecraft/class_2378;)Lnet/minecraft/class_3031; + ARG 0 registry + METHOD method_34044 (Lnet/minecraft/class_2378;)Lnet/minecraft/class_2939; + ARG 0 registry METHOD method_35842 contains (Lnet/minecraft/class_5321;)Z ARG 1 key + METHOD method_35844 (Lnet/minecraft/class_2378;)Lnet/minecraft/class_6123; + ARG 0 registry + METHOD method_39133 (Lnet/minecraft/class_2378;)Lcom/mojang/serialization/Codec; + ARG 0 registry METHOD method_39197 register (Lnet/minecraft/class_2378;Lnet/minecraft/class_5321;Ljava/lang/Object;)Ljava/lang/Object; ARG 0 registry ARG 1 key ARG 2 entry METHOD method_39673 getCodec ()Lcom/mojang/serialization/Codec; + METHOD method_40252 containsTag (Lnet/minecraft/class_6862;)Z + ARG 1 tag + METHOD method_40257 populateTags (Ljava/util/Map;)V + ARG 1 tagEntries + METHOD method_40260 getOrCreateEntryList (Lnet/minecraft/class_6862;)Lnet/minecraft/class_6885$class_6888; + ARG 1 tag + METHOD method_40264 getEntry (Lnet/minecraft/class_5321;)Ljava/util/Optional; + ARG 1 key + METHOD method_40265 getEntry (I)Ljava/util/Optional; + ARG 1 rawId + METHOD method_40266 getEntryList (Lnet/minecraft/class_6862;)Ljava/util/Optional; + ARG 1 tag + METHOD method_40268 getOrCreateEntry (Lnet/minecraft/class_5321;)Lnet/minecraft/class_6880; + ARG 1 key + METHOD method_40269 createEntry (Ljava/lang/Object;)Lnet/minecraft/class_6880$class_6883; + ARG 1 value + METHOD method_40270 streamEntries ()Ljava/util/stream/Stream; + METHOD method_40272 streamEntryLists ()Ljava/util/stream/Stream; + METHOD method_40273 streamTags ()Ljava/util/stream/Stream; + METHOD method_40276 freeze ()Lnet/minecraft/class_2378; + METHOD method_40278 clearTags ()V + METHOD method_40281 create (Lnet/minecraft/class_5321;Lcom/mojang/serialization/Lifecycle;Ljava/util/function/Function;Lnet/minecraft/class_2378$class_6889;)Lnet/minecraft/class_2378; + ARG 0 key + ARG 1 lifecycle + ARG 2 valueToEntryFunction + METHOD method_40282 create (Lnet/minecraft/class_5321;Ljava/lang/String;Lcom/mojang/serialization/Lifecycle;Ljava/util/function/Function;Lnet/minecraft/class_2378$class_6889;)Lnet/minecraft/class_2348; + ARG 0 key + ARG 1 defaultId + ARG 2 lifecycle + ARG 3 valueToEntryFunction + METHOD method_40283 create (Lnet/minecraft/class_5321;Ljava/lang/String;Ljava/util/function/Function;Lnet/minecraft/class_2378$class_6889;)Lnet/minecraft/class_2348; + ARG 0 key + ARG 1 defaultId + ARG 2 valueToEntryFunction + METHOD method_40290 entryOf (Lnet/minecraft/class_5321;)Lnet/minecraft/class_6880; + ARG 1 key + METHOD method_40293 (Lnet/minecraft/class_2378;)Lnet/minecraft/class_6875; + ARG 0 registry + CLASS class_6889 DefaultEntryGetter + METHOD run (Lnet/minecraft/class_2378;)Ljava/lang/Object; + ARG 1 registry diff --git a/mappings/net/minecraft/util/registry/RegistryEntry.mapping b/mappings/net/minecraft/util/registry/RegistryEntry.mapping new file mode 100644 index 0000000000..b539f09196 --- /dev/null +++ b/mappings/net/minecraft/util/registry/RegistryEntry.mapping @@ -0,0 +1,46 @@ +CLASS net/minecraft/class_6880 net/minecraft/util/registry/RegistryEntry + METHOD method_40220 isIn (Lnet/minecraft/class_6862;)Z + ARG 1 tag + METHOD method_40221 upcast (Lnet/minecraft/class_6880;)Lnet/minecraft/class_6880; + ARG 0 entry + METHOD method_40222 setRegistry (Lnet/minecraft/class_2378;)Z + ARG 1 registry + METHOD method_40223 of (Ljava/lang/Object;)Lnet/minecraft/class_6880; + ARG 0 value + METHOD method_40224 matches (Ljava/util/function/Predicate;)Z + ARG 1 predicate + METHOD method_40225 matchesKey (Lnet/minecraft/class_5321;)Z + ARG 1 key + METHOD method_40226 matchesId (Lnet/minecraft/class_2960;)Z + ARG 1 id + METHOD method_40227 hasKeyAndValue ()Z + METHOD method_40228 streamTags ()Ljava/util/stream/Stream; + METHOD method_40229 getKeyOrValue ()Lcom/mojang/datafixers/util/Either; + METHOD method_40230 getKey ()Ljava/util/Optional; + METHOD method_40231 getType ()Lnet/minecraft/class_6880$class_6882; + CLASS class_6881 Direct + CLASS class_6882 Type + CLASS class_6883 Reference + FIELD field_36449 registry Lnet/minecraft/class_2378; + FIELD field_36450 tags Ljava/util/Set; + FIELD field_36451 referenceType Lnet/minecraft/class_6880$class_6883$class_6884; + FIELD field_36452 registryKey Lnet/minecraft/class_5321; + FIELD field_36453 value Ljava/lang/Object; + METHOD (Lnet/minecraft/class_6880$class_6883$class_6884;Lnet/minecraft/class_2378;Lnet/minecraft/class_5321;Ljava/lang/Object;)V + ARG 1 referenceType + ARG 2 registry + ARG 3 registryKey + ARG 4 value + METHOD method_40233 intrusive (Lnet/minecraft/class_2378;Ljava/lang/Object;)Lnet/minecraft/class_6880$class_6883; + ARG 0 registry + ARG 1 registryKey + METHOD method_40234 standAlone (Lnet/minecraft/class_2378;Lnet/minecraft/class_5321;)Lnet/minecraft/class_6880$class_6883; + ARG 0 registry + ARG 1 registryKey + METHOD method_40235 setTags (Ljava/util/Collection;)V + ARG 1 tags + METHOD method_40236 setKeyAndValue (Lnet/minecraft/class_5321;Ljava/lang/Object;)V + ARG 1 key + ARG 2 value + METHOD method_40237 registryKey ()Lnet/minecraft/class_5321; + CLASS class_6884 Type diff --git a/mappings/net/minecraft/util/registry/RegistryEntryList.mapping b/mappings/net/minecraft/util/registry/RegistryEntryList.mapping index 6bf2f69bea..080a376fd6 100644 --- a/mappings/net/minecraft/util/registry/RegistryEntryList.mapping +++ b/mappings/net/minecraft/util/registry/RegistryEntryList.mapping @@ -5,7 +5,7 @@ CLASS net/minecraft/class_6885 net/minecraft/util/registry/RegistryEntryList METHOD method_40241 contains (Lnet/minecraft/class_6880;)Z ARG 1 entry METHOD method_40242 of (Ljava/util/List;)Lnet/minecraft/class_6885$class_6886; - ARG 0 values + ARG 0 entries METHOD method_40243 getRandom (Ljava/util/Random;)Ljava/util/Optional; ARG 1 random METHOD method_40244 of (Ljava/util/function/Function;Ljava/util/List;)Lnet/minecraft/class_6885$class_6886; @@ -15,21 +15,21 @@ CLASS net/minecraft/class_6885 net/minecraft/util/registry/RegistryEntryList ARG 0 mapper ARG 1 values METHOD method_40246 of ([Lnet/minecraft/class_6880;)Lnet/minecraft/class_6885$class_6886; - ARG 0 values + ARG 0 entries METHOD method_40247 size ()I METHOD method_40248 getStorage ()Lcom/mojang/datafixers/util/Either; CLASS class_6886 Direct - FIELD field_36457 values Ljava/util/List; - FIELD field_36458 valuesSet Ljava/util/Set; + FIELD field_36457 entries Ljava/util/List; + FIELD field_36458 entrySet Ljava/util/Set; METHOD (Ljava/util/List;)V - ARG 1 values + ARG 1 entries CLASS class_6887 ListBacked - METHOD method_40249 getValues ()Ljava/util/List; + METHOD method_40249 getEntries ()Ljava/util/List; CLASS class_6888 Named FIELD field_36459 tag Lnet/minecraft/class_6862; - FIELD field_36460 cache Ljava/util/List; + FIELD field_36460 entries Ljava/util/List; METHOD (Lnet/minecraft/class_6862;)V ARG 1 tag - METHOD method_40250 cache (Ljava/util/List;)V - ARG 1 values + METHOD method_40250 copyOf (Ljava/util/List;)V + ARG 1 entries METHOD method_40251 getTag ()Lnet/minecraft/class_6862; diff --git a/mappings/net/minecraft/util/registry/RegistryEntryListCodec.mapping b/mappings/net/minecraft/util/registry/RegistryEntryListCodec.mapping new file mode 100644 index 0000000000..b017e0d00d --- /dev/null +++ b/mappings/net/minecraft/util/registry/RegistryEntryListCodec.mapping @@ -0,0 +1,9 @@ +CLASS net/minecraft/class_6898 net/minecraft/util/registry/RegistryEntryListCodec + FIELD field_36480 registry Lnet/minecraft/class_5321; + FIELD field_36481 entryCodec Lcom/mojang/serialization/Codec; + FIELD field_36482 entryListCodec Lcom/mojang/serialization/Codec; + METHOD (Lnet/minecraft/class_5321;Lcom/mojang/serialization/Codec;Z)V + ARG 1 registry + ARG 2 entryCodec + METHOD method_40382 (Lcom/mojang/serialization/Codec;Z)Lcom/mojang/serialization/Codec; + ARG 0 entryCodec diff --git a/mappings/net/minecraft/util/registry/RegistryFixedCodec.mapping b/mappings/net/minecraft/util/registry/RegistryFixedCodec.mapping new file mode 100644 index 0000000000..9f6bf80a87 --- /dev/null +++ b/mappings/net/minecraft/util/registry/RegistryFixedCodec.mapping @@ -0,0 +1,6 @@ +CLASS net/minecraft/class_6899 net/minecraft/util/registry/RegistryFixedCodec + FIELD field_36484 registry Lnet/minecraft/class_5321; + METHOD (Lnet/minecraft/class_5321;)V + ARG 1 registry + METHOD method_40400 of (Lnet/minecraft/class_5321;)Lnet/minecraft/class_6899; + ARG 0 registry diff --git a/mappings/net/minecraft/util/registry/SimpleRegistry.mapping b/mappings/net/minecraft/util/registry/SimpleRegistry.mapping index c778a2e007..9ee11044c7 100644 --- a/mappings/net/minecraft/util/registry/SimpleRegistry.mapping +++ b/mappings/net/minecraft/util/registry/SimpleRegistry.mapping @@ -7,6 +7,48 @@ CLASS net/minecraft/class_2370 net/minecraft/util/registry/SimpleRegistry FIELD field_26683 entryToRawId Lit/unimi/dsi/fastutil/objects/Object2IntMap; FIELD field_26731 entryToLifecycle Ljava/util/Map; FIELD field_26732 lifecycle Lcom/mojang/serialization/Lifecycle; + FIELD field_36461 valueToEntry Ljava/util/Map; + FIELD field_36462 tagToEntryList Ljava/util/Map; + FIELD field_36463 frozen Z + FIELD field_36464 valueToEntryFunction Ljava/util/function/Function; + FIELD field_36465 unfrozenValueToEntry Ljava/util/Map; + METHOD (Lnet/minecraft/class_5321;Lcom/mojang/serialization/Lifecycle;Ljava/util/function/Function;)V + ARG 1 key + ARG 2 lifecycle + ARG 3 valueToEntryFunction METHOD method_31051 set (ILnet/minecraft/class_5321;Ljava/lang/Object;Lcom/mojang/serialization/Lifecycle;Z)Lnet/minecraft/class_6880; ARG 1 rawId + ARG 2 key + ARG 3 value + ARG 4 lifecycle ARG 5 checkDuplicateKeys + METHOD method_40253 getValue (Lnet/minecraft/class_6880$class_6883;)Ljava/lang/Object; + ARG 0 entry + METHOD method_40254 (Lnet/minecraft/class_6880$class_6883;Ljava/util/function/Consumer;)V + ARG 0 entry + METHOD method_40255 (Lnet/minecraft/class_6885$class_6888;)V + ARG 0 entryList + METHOD method_40256 (Ljava/util/Map$Entry;)Z + ARG 0 entry + METHOD method_40258 (Ljava/util/Map;Lnet/minecraft/class_6862;Ljava/util/List;)V + ARG 1 tag + ARG 2 entries + METHOD method_40259 (Ljava/util/Map;Lnet/minecraft/class_6880$class_6883;)V + ARG 1 entry + METHOD method_40261 (Lnet/minecraft/class_6880$class_6883;)V + ARG 0 entry + METHOD method_40262 (Ljava/util/Map$Entry;)Lcom/mojang/datafixers/util/Pair; + ARG 0 entry + METHOD method_40263 (Ljava/util/Map;Lnet/minecraft/class_6862;Ljava/util/List;)V + ARG 2 tag + ARG 3 entries + METHOD method_40267 (Lnet/minecraft/class_6880$class_6883;)Z + ARG 0 entry + METHOD method_40271 (Ljava/lang/Object;)Lnet/minecraft/class_6880$class_6883; + ARG 1 key + METHOD method_40274 assertNotFrozen (Lnet/minecraft/class_5321;)V + ARG 1 key + METHOD method_40275 (Lnet/minecraft/class_5321;)Lnet/minecraft/class_6880$class_6883; + ARG 1 key + METHOD method_40277 (Lnet/minecraft/class_5321;)Lnet/minecraft/class_6880$class_6883; + ARG 1 key diff --git a/mappings/net/minecraft/world/biome/BuiltinBiomes.mapping b/mappings/net/minecraft/world/biome/BuiltinBiomes.mapping index 1b8c5027f7..902e1ee568 100644 --- a/mappings/net/minecraft/world/biome/BuiltinBiomes.mapping +++ b/mappings/net/minecraft/world/biome/BuiltinBiomes.mapping @@ -2,3 +2,4 @@ CLASS net/minecraft/class_5504 net/minecraft/world/biome/BuiltinBiomes METHOD method_31145 register (Lnet/minecraft/class_5321;Lnet/minecraft/class_1959;)V ARG 0 key ARG 1 biome + METHOD method_40363 getDefaultBiome ()Lnet/minecraft/class_6880; diff --git a/mappings/net/minecraft/world/biome/GenerationSettings.mapping b/mappings/net/minecraft/world/biome/GenerationSettings.mapping index 35b70272e6..e34c62b083 100644 --- a/mappings/net/minecraft/world/biome/GenerationSettings.mapping +++ b/mappings/net/minecraft/world/biome/GenerationSettings.mapping @@ -27,6 +27,7 @@ CLASS net/minecraft/class_5485 net/minecraft/world/biome/GenerationSettings ARG 1 stepIndex METHOD method_30989 feature (ILnet/minecraft/class_6880;)Lnet/minecraft/class_5485$class_5495; ARG 1 stepIndex + ARG 2 featureEntry METHOD method_30991 carver (Lnet/minecraft/class_2893$class_2894;Lnet/minecraft/class_6880;)Lnet/minecraft/class_5485$class_5495; ARG 1 carverStep ARG 2 carver diff --git a/mappings/net/minecraft/world/event/GameEvent.mapping b/mappings/net/minecraft/world/event/GameEvent.mapping index 4dc09a04b9..1f64af37cc 100644 --- a/mappings/net/minecraft/world/event/GameEvent.mapping +++ b/mappings/net/minecraft/world/event/GameEvent.mapping @@ -2,7 +2,9 @@ CLASS net/minecraft/class_5712 net/minecraft/world/event/GameEvent FIELD field_28153 id Ljava/lang/String; FIELD field_28154 range I FIELD field_31449 DEFAULT_RANGE I + FIELD field_36412 registryEntry Lnet/minecraft/class_6880$class_6883; METHOD (Ljava/lang/String;I)V + ARG 1 id ARG 2 range METHOD method_32938 getId ()Ljava/lang/String; METHOD method_32939 register (Ljava/lang/String;)Lnet/minecraft/class_5712; @@ -11,3 +13,6 @@ CLASS net/minecraft/class_5712 net/minecraft/world/event/GameEvent ARG 0 id ARG 1 range METHOD method_32941 getRange ()I + METHOD method_40156 isIn (Lnet/minecraft/class_6862;)Z + ARG 1 tag + METHOD method_40157 getRegistryEntry ()Lnet/minecraft/class_6880$class_6883; diff --git a/mappings/net/minecraft/world/gen/feature/ConfiguredStructureFeatures.mapping b/mappings/net/minecraft/world/gen/feature/ConfiguredStructureFeatures.mapping index 63d960603f..e065a75ed1 100644 --- a/mappings/net/minecraft/world/gen/feature/ConfiguredStructureFeatures.mapping +++ b/mappings/net/minecraft/world/gen/feature/ConfiguredStructureFeatures.mapping @@ -10,3 +10,8 @@ CLASS net/minecraft/class_5470 net/minecraft/world/gen/feature/ConfiguredStructu ARG 2 biome METHOD method_38573 (Lnet/minecraft/class_5470$class_6896;Lnet/minecraft/class_6880;Lnet/minecraft/class_5321;)V ARG 2 biome + CLASS class_6896 + METHOD accept (Lnet/minecraft/class_3195;Lnet/minecraft/class_5321;Lnet/minecraft/class_5321;)V + ARG 1 feature + ARG 2 configuredFeatureKey + ARG 3 biomeKey diff --git a/mappings/net/minecraft/world/gen/feature/PlacedFeatures.mapping b/mappings/net/minecraft/world/gen/feature/PlacedFeatures.mapping index 62870d8d4a..d6d4a22506 100644 --- a/mappings/net/minecraft/world/gen/feature/PlacedFeatures.mapping +++ b/mappings/net/minecraft/world/gen/feature/PlacedFeatures.mapping @@ -15,3 +15,26 @@ CLASS net/minecraft/class_6817 net/minecraft/world/gen/feature/PlacedFeatures ARG 2 extraCount METHOD method_39737 register (Ljava/lang/String;Lnet/minecraft/class_6880;Ljava/util/List;)Lnet/minecraft/class_6880; ARG 0 id + ARG 1 registryEntry + ARG 2 modifiers + METHOD method_40365 wouldSurvive (Lnet/minecraft/class_2248;)Lnet/minecraft/class_6658; + ARG 0 block + METHOD method_40366 createEntry (Lnet/minecraft/class_3031;Lnet/minecraft/class_3037;)Lnet/minecraft/class_6880; + ARG 0 feature + ARG 1 featureConfig + METHOD method_40367 createEntry (Lnet/minecraft/class_3031;Lnet/minecraft/class_3037;Lnet/minecraft/class_6646;)Lnet/minecraft/class_6880; + ARG 0 feature + ARG 1 featureConfig + ARG 2 predicate + METHOD method_40368 createEntry (Lnet/minecraft/class_3031;Lnet/minecraft/class_3037;[Lnet/minecraft/class_6797;)Lnet/minecraft/class_6880; + ARG 0 feature + ARG 1 featureConfig + ARG 2 modifiers + METHOD method_40369 createEntry (Lnet/minecraft/class_6880;[Lnet/minecraft/class_6797;)Lnet/minecraft/class_6880; + ARG 0 registryEntry + ARG 1 modifiers + METHOD method_40370 register (Ljava/lang/String;Lnet/minecraft/class_6880;[Lnet/minecraft/class_6797;)Lnet/minecraft/class_6880; + ARG 0 id + ARG 1 registryEntry + ARG 2 modifiers + METHOD method_40371 isAir ()Lnet/minecraft/class_6661;