diff --git a/mappings/dds.mapping b/mappings/dds.mapping new file mode 100644 index 0000000000..b0af161f81 --- /dev/null +++ b/mappings/dds.mapping @@ -0,0 +1,7 @@ +CLASS dds + METHOD a bake (Ldmx;Ljava/util/function/Function;Ldna;)Ldmu; + ARG 1 loader + ARG 2 textureGetter + METHOD a getTextureDependencies (Ljava/util/function/Function;Ljava/util/Set;)Ljava/util/Collection; + ARG 1 unbakedModelGetter + METHOD f getModelDependencies ()Ljava/util/Collection; diff --git a/mappings/dna.mapping b/mappings/dna.mapping deleted file mode 100644 index 362785dfb6..0000000000 --- a/mappings/dna.mapping +++ /dev/null @@ -1,2 +0,0 @@ -CLASS dna - METHOD b getRotation ()Ldmv; diff --git a/mappings/net/minecraft/client/render/model/BasicBakedModel.mapping b/mappings/net/minecraft/client/render/model/BasicBakedModel.mapping index 437c576a56..12c55e0499 100644 --- a/mappings/net/minecraft/client/render/model/BasicBakedModel.mapping +++ b/mappings/net/minecraft/client/render/model/BasicBakedModel.mapping @@ -6,7 +6,7 @@ CLASS dnc net/minecraft/client/render/model/BasicBakedModel FIELD d usesAO Z FIELD e particleTexture Ldlm; FIELD f depthInGui Z - FIELD g transformationList Lddm; + FIELD g transformations Lddm; METHOD a addQuad (Ldcz;)Ldnc$a; METHOD a setParticle (Ldlm;)Ldnc$a; METHOD a addQuad (Ley;Ldcz;)Ldnc$a; @@ -16,7 +16,7 @@ CLASS dnc net/minecraft/client/render/model/BasicBakedModel FIELD c usesAO Z FIELD d depthInGui Z FIELD e sprite Ldlm; - FIELD f transformationList Lddm; + FIELD f transformations Lddm; FIELD g itemPropertyOverrides Lddk; METHOD (Ljava/util/List;Ljava/util/Map;ZZLdlm;Lddm;Lddk;)V ARG 3 usesAO diff --git a/mappings/net/minecraft/client/render/model/BuiltinBakedModel.mapping b/mappings/net/minecraft/client/render/model/BuiltinBakedModel.mapping index 69b76eb81c..767edd5d0b 100644 --- a/mappings/net/minecraft/client/render/model/BuiltinBakedModel.mapping +++ b/mappings/net/minecraft/client/render/model/BuiltinBakedModel.mapping @@ -1,5 +1,5 @@ CLASS dmw net/minecraft/client/render/model/BuiltinBakedModel - FIELD a transformationList Lddm; + FIELD a transformations Lddm; FIELD b itemOverrideList Lddk; FIELD c sprite Ldlm; METHOD a useAmbientOcclusion ()Z diff --git a/mappings/net/minecraft/client/render/model/ModelLoader.mapping b/mappings/net/minecraft/client/render/model/ModelLoader.mapping new file mode 100644 index 0000000000..9d6dc63caf --- /dev/null +++ b/mappings/net/minecraft/client/render/model/ModelLoader.mapping @@ -0,0 +1,42 @@ +CLASS dmx net/minecraft/client/render/model/ModelLoader + CLASS dmx$a ModelLoaderException + METHOD (Ljava/lang/String;)V + ARG 1 message + FIELD A BLOCK_STATE_FACTORY_OVERRIDES Ljava/util/Map; + FIELD B resourceContainer Lwc; + FIELD C spriteAtlas Ldll; + FIELD F unbakedModels Ljava/util/Map; + FIELD G modelRotationCache Ljava/util/Map; + FIELD I bakedModels Ljava/util/Map; + FIELD p MISSING Ldmz; + FIELD q MISSING_DEFINITION Ljava/lang/String; + FIELD r GENERATION_MARKER Ldde; + FIELD s BLOCK_ENTITY_MARKER Ldde; + FIELD t DEFAULT_TEXTURES Ljava/util/Set; + FIELD u LOGGER Lorg/apache/logging/log4j/Logger; + FIELD v BUILTIN_MODEL_DEFINITIONS Ljava/util/Map; + FIELD w COMMA_SPLITTER Lcom/google/common/base/Splitter; + FIELD x KEY_VALUE_SPLITTER Lcom/google/common/base/Splitter; + FIELD y ITEM_FRAME_STATE_FACTORY Lbok; + FIELD z ITEM_MODEL_GENERATOR Lddi; + METHOD a getBakedModelMap ()Ljava/util/Map; + METHOD a stateKeyToPredicate (Lbok;Ljava/lang/String;)Ljava/util/function/Predicate; + ARG 0 stateFactory + ARG 1 key + METHOD a getPropertyValue (Lbpl;Ljava/lang/String;)Ljava/lang/Comparable; + ARG 0 property + ARG 1 string + METHOD a addModel (Ldmz;)V + ARG 1 id + METHOD a getOrLoadModel (Lpy;)Ldnd; + ARG 1 id + ARG 2 defaultModel + METHOD a bake (Lpy;Ldna;)Ldmu; + ARG 1 id + ARG 2 rotation + METHOD a putModel (Lpy;Ldnd;)V + ARG 1 id + ARG 2 model + METHOD b loadModel (Lpy;)V + METHOD c loadModelFromJson (Lpy;)Ldde; + ARG 1 id diff --git a/mappings/net/minecraft/client/render/model/ModelManager.mapping b/mappings/net/minecraft/client/render/model/ModelManager.mapping deleted file mode 100644 index 77735dbdeb..0000000000 --- a/mappings/net/minecraft/client/render/model/ModelManager.mapping +++ /dev/null @@ -1,8 +0,0 @@ -CLASS dmx net/minecraft/client/render/model/ModelManager - FIELD B resourceContainer Lwc; - FIELD C spriteAtlas Ldll; - FIELD E modelRegistry Lddf$a; - FIELD p MISSING Ldmz; - FIELD t DEFAULT_TEXTURES Ljava/util/Set; - FIELD u LOGGER Lorg/apache/logging/log4j/Logger; - METHOD c loadModel (Lpy;)Ldde; diff --git a/mappings/net/minecraft/client/render/model/ModelRotationContainer.mapping b/mappings/net/minecraft/client/render/model/ModelRotationContainer.mapping new file mode 100644 index 0000000000..a76f317c80 --- /dev/null +++ b/mappings/net/minecraft/client/render/model/ModelRotationContainer.mapping @@ -0,0 +1,2 @@ +CLASS dna net/minecraft/client/render/model/ModelRotationContainer + METHOD b getRotation ()Ldmv; diff --git a/mappings/net/minecraft/client/render/model/UnbakedModel.mapping b/mappings/net/minecraft/client/render/model/UnbakedModel.mapping new file mode 100644 index 0000000000..0d82dd92e3 --- /dev/null +++ b/mappings/net/minecraft/client/render/model/UnbakedModel.mapping @@ -0,0 +1,7 @@ +CLASS dnd net/minecraft/client/render/model/UnbakedModel + METHOD a bake (Ldmx;Ljava/util/function/Function;Ldna;)Ldmu; + ARG 1 loader + ARG 2 textureGetter + METHOD a getTextureDependencies (Ljava/util/function/Function;Ljava/util/Set;)Ljava/util/Collection; + ARG 1 unbakedModelGetter + METHOD f getModelDependencies ()Ljava/util/Collection; diff --git a/mappings/net/minecraft/client/render/model/json/ItemModelGenerator.mapping b/mappings/net/minecraft/client/render/model/json/ItemModelGenerator.mapping new file mode 100644 index 0000000000..234a3afc41 --- /dev/null +++ b/mappings/net/minecraft/client/render/model/json/ItemModelGenerator.mapping @@ -0,0 +1,5 @@ +CLASS ddi net/minecraft/client/render/model/json/ItemModelGenerator + FIELD a LAYERS Ljava/util/List; + METHOD a create (Ljava/util/function/Function;Ldde;)Ldde; + ARG 1 textureGetter + ARG 2 itemModel diff --git a/mappings/net/minecraft/client/render/model/json/JsonUnbakedModel.mapping b/mappings/net/minecraft/client/render/model/json/JsonUnbakedModel.mapping new file mode 100644 index 0000000000..6c0ebdb42e --- /dev/null +++ b/mappings/net/minecraft/client/render/model/json/JsonUnbakedModel.mapping @@ -0,0 +1,32 @@ +CLASS dde net/minecraft/client/render/model/json/JsonUnbakedModel + FIELD a GSON Lcom/google/gson/Gson; + FIELD b id Ljava/lang/String; + FIELD c textureMap Ljava/util/Map; + FIELD d parent Ldde; + FIELD e parentId Lpy; + FIELD f LOGGER Lorg/apache/logging/log4j/Logger; + FIELD g QUAD_FACTORY Lddh; + FIELD h elements Ljava/util/List; + FIELD i depthInGui Z + FIELD j ambientOcclusion Z + FIELD k transformations Lddm; + FIELD l overrides Ljava/util/List; + METHOD (Lpy;Ljava/util/List;Ljava/util/Map;ZZLddm;Ljava/util/List;)V + ARG 1 parentId + ARG 2 elements + ARG 3 textureMap + ARG 4 ambientOcclusion + METHOD a getElements ()Ljava/util/List; + METHOD a getTransformation (Lddm$b;)Lddl; + METHOD a bake (Ldmx;Ljava/util/function/Function;Ldna;)Ldmu; + ARG 1 loader + ARG 2 textureGetter + METHOD a deserialize (Ljava/io/Reader;)Ldde; + METHOD a deserialize (Ljava/lang/String;)Ldde; + METHOD a getTextureDependencies (Ljava/util/function/Function;Ljava/util/Set;)Ljava/util/Collection; + ARG 1 unbakedModelGetter + METHOD b hasAmbientOcclusion ()Z + METHOD c hasDepthInGui ()Z + METHOD e getOverrides ()Ljava/util/List; + METHOD f getModelDependencies ()Ljava/util/Collection; + METHOD h getTransformations ()Lddm; diff --git a/mappings/net/minecraft/client/render/model/json/Model.mapping b/mappings/net/minecraft/client/render/model/json/Model.mapping deleted file mode 100644 index b53d3733e4..0000000000 --- a/mappings/net/minecraft/client/render/model/json/Model.mapping +++ /dev/null @@ -1,19 +0,0 @@ -CLASS dde net/minecraft/client/render/model/json/Model - FIELD a GSON Lcom/google/gson/Gson; - FIELD c textureMap Ljava/util/Map; - FIELD f LOGGER Lorg/apache/logging/log4j/Logger; - FIELD h elements Ljava/util/List; - FIELD j ambientOcclusion Z - FIELD l overrides Ljava/util/List; - METHOD (Lpy;Ljava/util/List;Ljava/util/Map;ZZLddm;Ljava/util/List;)V - ARG 1 parentId - ARG 2 elements - ARG 3 textureMap - ARG 4 ambientOcclusion - METHOD a getElements ()Ljava/util/List; - METHOD a getTransformation (Lddm$b;)Lddl; - METHOD a load (Ljava/io/Reader;)Ldde; - METHOD a load (Ljava/lang/String;)Ldde; - METHOD b hasAmbientOcclusion ()Z - METHOD e getOverrides ()Ljava/util/List; - METHOD h getTransformationList ()Lddm; diff --git a/mappings/net/minecraft/client/render/model/json/ModelItemFactory.mapping b/mappings/net/minecraft/client/render/model/json/ModelItemFactory.mapping deleted file mode 100644 index 01aa114532..0000000000 --- a/mappings/net/minecraft/client/render/model/json/ModelItemFactory.mapping +++ /dev/null @@ -1 +0,0 @@ -CLASS ddi net/minecraft/client/render/model/json/ModelItemFactory diff --git a/mappings/net/minecraft/client/render/model/json/ModelTransformationList.mapping b/mappings/net/minecraft/client/render/model/json/ModelTransformations.mapping similarity index 99% rename from mappings/net/minecraft/client/render/model/json/ModelTransformationList.mapping rename to mappings/net/minecraft/client/render/model/json/ModelTransformations.mapping index 4f36a7db58..e31efeaacd 100644 --- a/mappings/net/minecraft/client/render/model/json/ModelTransformationList.mapping +++ b/mappings/net/minecraft/client/render/model/json/ModelTransformations.mapping @@ -1,4 +1,4 @@ -CLASS ddm net/minecraft/client/render/model/json/ModelTransformationList +CLASS ddm net/minecraft/client/render/model/json/ModelTransformations CLASS ddm$b Type FIELD a ORIGIN Lddm$b; FIELD b THIRD_PERSON_LEFT_HAND Lddm$b; diff --git a/mappings/net/minecraft/client/render/model/json/ModelVariantMap.mapping b/mappings/net/minecraft/client/render/model/json/ModelVariantMap.mapping index 5a5850b152..49056113fa 100644 --- a/mappings/net/minecraft/client/render/model/json/ModelVariantMap.mapping +++ b/mappings/net/minecraft/client/render/model/json/ModelVariantMap.mapping @@ -1,2 +1,3 @@ CLASS ddf net/minecraft/client/render/model/json/ModelVariantMap + CLASS ddf$a FIELD a variantMap Ljava/util/Map; diff --git a/mappings/net/minecraft/client/render/model/json/ModelVariantSet.mapping b/mappings/net/minecraft/client/render/model/json/ModelVariantSet.mapping deleted file mode 100644 index 0703dbcd09..0000000000 --- a/mappings/net/minecraft/client/render/model/json/ModelVariantSet.mapping +++ /dev/null @@ -1,3 +0,0 @@ -CLASS ddn net/minecraft/client/render/model/json/ModelVariantSet - FIELD a variants Ljava/util/List; - METHOD a getVariants ()Ljava/util/List; diff --git a/mappings/net/minecraft/client/render/model/json/WeightedUnbakedModel.mapping b/mappings/net/minecraft/client/render/model/json/WeightedUnbakedModel.mapping new file mode 100644 index 0000000000..38a359de9e --- /dev/null +++ b/mappings/net/minecraft/client/render/model/json/WeightedUnbakedModel.mapping @@ -0,0 +1,9 @@ +CLASS ddn net/minecraft/client/render/model/json/WeightedUnbakedModel + FIELD a variants Ljava/util/List; + METHOD a getVariants ()Ljava/util/List; + METHOD a bake (Ldmx;Ljava/util/function/Function;Ldna;)Ldmu; + ARG 1 loader + ARG 2 textureGetter + METHOD a getTextureDependencies (Ljava/util/function/Function;Ljava/util/Set;)Ljava/util/Collection; + ARG 1 unbakedModelGetter + METHOD f getModelDependencies ()Ljava/util/Collection;