diff --git a/mappings/net/minecraft/util/collection/Int2ObjectBiMap.mapping b/mappings/net/minecraft/util/collection/Int2ObjectBiMap.mapping index efeb0f3e32..dd91c42e8b 100644 --- a/mappings/net/minecraft/util/collection/Int2ObjectBiMap.mapping +++ b/mappings/net/minecraft/util/collection/Int2ObjectBiMap.mapping @@ -28,3 +28,5 @@ CLASS net/minecraft/class_3513 net/minecraft/util/collection/Int2ObjectBiMap METHOD method_15232 findIndex (Ljava/lang/Object;I)I ARG 1 value ARG 2 id + METHOD method_28138 containsId (I)Z + ARG 1 id diff --git a/mappings/net/minecraft/util/registry/Registry.mapping b/mappings/net/minecraft/util/registry/Registry.mapping index d6450e415d..ce992c8bbf 100644 --- a/mappings/net/minecraft/util/registry/Registry.mapping +++ b/mappings/net/minecraft/util/registry/Registry.mapping @@ -74,6 +74,11 @@ CLASS net/minecraft/class_2378 net/minecraft/util/registry/Registry FIELD field_25095 DIMENSION_TYPE_KEY Lnet/minecraft/class_5321; FIELD field_25096 BIOME_SOURCE Lnet/minecraft/class_2378; FIELD field_25097 CHUNK_GENERATOR Lnet/minecraft/class_2378; + FIELD field_25098 registryKey Lnet/minecraft/class_5321; + COMMENT The {@linkplain RegistryKey} representing the ID of the actual registry. + FIELD field_25099 lifecycle Lcom/mojang/serialization/Lifecycle; + FIELD field_25100 ROOT_KEY Lnet/minecraft/class_2960; + FIELD field_25101 ROOT Lnet/minecraft/class_2385; FIELD field_25102 SOUND_EVENT_KEY Lnet/minecraft/class_5321; FIELD field_25103 FLUID_KEY Lnet/minecraft/class_5321; FIELD field_25104 MOB_EFFECT_KEY Lnet/minecraft/class_5321; @@ -97,12 +102,15 @@ CLASS net/minecraft/class_2378 net/minecraft/util/registry/Registry 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;Ljava/util/function/Supplier;)Lnet/minecraft/class_2348; + ARG 1 defaultId ARG 2 defaultEntry METHOD method_10226 register (Lnet/minecraft/class_2378;Ljava/lang/String;Ljava/lang/Object;)Ljava/lang/Object; ARG 0 registry ARG 1 id ARG 2 entry - METHOD method_10227 putDefaultEntry (Lnet/minecraft/class_5321;Lnet/minecraft/class_2385;Ljava/util/function/Supplier;)Lnet/minecraft/class_2385; + METHOD method_10227 create (Lnet/minecraft/class_5321;Lnet/minecraft/class_2385;Ljava/util/function/Supplier;)Lnet/minecraft/class_2385; + ARG 1 registry + ARG 2 defaultEntry METHOD method_10230 register (Lnet/minecraft/class_2378;Lnet/minecraft/class_2960;Ljava/lang/Object;)Ljava/lang/Object; ARG 0 registry ARG 1 id @@ -114,9 +122,25 @@ CLASS net/minecraft/class_2378 net/minecraft/util/registry/Registry ARG 3 entry METHOD method_10235 getIds ()Ljava/util/Set; METHOD method_10247 create (Lnet/minecraft/class_5321;Ljava/util/function/Supplier;)Lnet/minecraft/class_2378; + ARG 1 defaultEntry METHOD method_10249 getRawId (Ljava/lang/Object;)I ARG 1 entry METHOD method_10250 containsId (Lnet/minecraft/class_2960;)Z ARG 1 id METHOD method_17966 getOrEmpty (Lnet/minecraft/class_2960;)Ljava/util/Optional; ARG 1 id + METHOD method_29103 validate (Lnet/minecraft/class_2385;)V + ARG 0 registry + 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; + METHOD method_29108 create (Lnet/minecraft/class_5321;Lcom/mojang/serialization/Lifecycle;Ljava/util/function/Supplier;)Lnet/minecraft/class_2378; + ARG 2 defaultEntry + METHOD method_29109 create (Lnet/minecraft/class_5321;Ljava/lang/String;Lcom/mojang/serialization/Lifecycle;Ljava/util/function/Supplier;)Lnet/minecraft/class_2348; + ARG 1 defaultId + ARG 3 defaultEntry + METHOD method_29111 containsId (I)Z + ARG 1 id + METHOD method_29112 containsKey (Lnet/minecraft/class_5321;)Z + METHOD method_29113 getKey (Ljava/lang/Object;)Lnet/minecraft/class_5321; + ARG 1 value diff --git a/mappings/net/minecraft/util/registry/RegistryKey.mapping b/mappings/net/minecraft/util/registry/RegistryKey.mapping new file mode 100644 index 0000000000..7375a37aab --- /dev/null +++ b/mappings/net/minecraft/util/registry/RegistryKey.mapping @@ -0,0 +1,16 @@ +CLASS net/minecraft/class_5321 net/minecraft/util/registry/RegistryKey + FIELD field_25136 INSTANCES Ljava/util/Map; + FIELD field_25137 registryId Lnet/minecraft/class_2960; + FIELD field_25138 valueId Lnet/minecraft/class_2960; + METHOD (Lnet/minecraft/class_2960;Lnet/minecraft/class_2960;)V + ARG 1 registryId + ARG 2 valueId + METHOD method_29177 getValueId ()Lnet/minecraft/class_2960; + METHOD method_29179 getOrCreate (Lnet/minecraft/class_5321;Lnet/minecraft/class_2960;)Lnet/minecraft/class_5321; + ARG 0 registryId + ARG 1 valueId + METHOD method_29180 getOrCreateRootKey (Lnet/minecraft/class_2960;)Lnet/minecraft/class_5321; + ARG 0 registryId + METHOD method_29181 getOrCreate (Lnet/minecraft/class_2960;Lnet/minecraft/class_2960;)Lnet/minecraft/class_5321; + ARG 0 registryId + ARG 1 valueId diff --git a/mappings/net/minecraft/util/registry/SimpleRegistry.mapping b/mappings/net/minecraft/util/registry/SimpleRegistry.mapping index ba6213fc45..adafbf0a77 100644 --- a/mappings/net/minecraft/util/registry/SimpleRegistry.mapping +++ b/mappings/net/minecraft/util/registry/SimpleRegistry.mapping @@ -1,7 +1,8 @@ CLASS net/minecraft/class_2370 net/minecraft/util/registry/SimpleRegistry - FIELD field_11107 entries Lcom/google/common/collect/BiMap; + FIELD field_11107 entriesById Lcom/google/common/collect/BiMap; FIELD field_11108 randomEntries [Ljava/lang/Object; FIELD field_11109 nextId I FIELD field_11110 indexedEntries Lnet/minecraft/class_3513; FIELD field_11111 LOGGER Lorg/apache/logging/log4j/Logger; + FIELD field_25067 entriesByKey Lcom/google/common/collect/BiMap; METHOD method_10240 getRandom (Ljava/util/Random;)Ljava/lang/Object;