mirrors/yarn
mirrors
/
yarn
mirror of https://github.com/FabricMC/yarn.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

[WIP] More JSON model work (#354) 

* More JSON model work

* Fix typo in ModelTransformation deserializer

* More assorted stuff

* BakedModel tweaks
This commit is contained in:
Shadowfacts 2018-12-24 03:57:04 -05:00 committed by Adrian Siekierka
parent 3cfa622330
commit 82636ba1f3
13 changed files with 59 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
mappings/net/minecraft/client/render/model/BakedModel.mapping
View File

@ -3,8 +3,9 @@ CLASS doy net/minecraft/client/render/model/BakedModel
METHOD a getQuads (Lbpm;Ley;Ljava/util/Random;)Ljava/util/List;
ARG 1 state
ARG 2 face
ARG 3 random
METHOD b hasDepthInGui ()Z
METHOD c isBuiltin ()Z
METHOD d getSprite ()Ldno;
METHOD e getTransformations ()Ldfk;
METHOD e getTransformation ()Ldfk;
METHOD f getItemPropertyOverrides ()Ldfi;

5
mappings/net/minecraft/client/render/model/BakedModelManager.mapping
View File

@ -1,10 +1,13 @@
CLASS dpc net/minecraft/client/render/model/BakedModelManager
FIELD a modelMap Ljava/util/Map;
FIELD b spriteMap Ldnn;
FIELD b spriteAtlas Ldnn;
FIELD c blockStateMaps Ldet;
FIELD d missingModel Ldoy;
METHOD <init> (Ldnn;)V
ARG 1 spriteAtlas
METHOD a getMissingModel ()Ldoy;
METHOD a getModel (Ldpd;)Ldoy;
ARG 1 id
METHOD a onResourceReload (Lwj;)V
ARG 1 manager
METHOD b getBlockStateMaps ()Ldet;

3
mappings/net/minecraft/client/render/model/BasicBakedModel.mapping
View File

@ -25,8 +25,9 @@ CLASS dpg net/minecraft/client/render/model/BasicBakedModel
METHOD a getQuads (Lbpm;Ley;Ljava/util/Random;)Ljava/util/List;
ARG 1 state
ARG 2 face
ARG 3 random
METHOD b hasDepthInGui ()Z
METHOD c isBuiltin ()Z
METHOD d getSprite ()Ldno;
METHOD e getTransformations ()Ldfk;
METHOD e getTransformation ()Ldfk;
METHOD f getItemPropertyOverrides ()Ldfi;

3
mappings/net/minecraft/client/render/model/BuiltinBakedModel.mapping
View File

@ -6,8 +6,9 @@ CLASS dpa net/minecraft/client/render/model/BuiltinBakedModel
METHOD a getQuads (Lbpm;Ley;Ljava/util/Random;)Ljava/util/List;
ARG 1 state
ARG 2 face
ARG 3 random
METHOD b hasDepthInGui ()Z
METHOD c isBuiltin ()Z
METHOD d getSprite ()Ldno;
METHOD e getTransformations ()Ldfk;
METHOD e getTransformation ()Ldfk;
METHOD f getItemPropertyOverrides ()Ldfi;

1
mappings/net/minecraft/client/render/model/ModelLoader.mapping
View File

@ -3,6 +3,7 @@ CLASS dpb net/minecraft/client/render/model/ModelLoader
FIELD A BLOCK_STATE_FACTORY_OVERRIDES Ljava/util/Map;
FIELD B resourceContainer Lwj;
FIELD C spriteAtlas Ldnn;
FIELD D modelsToLoad Ljava/util/Set;
FIELD F unbakedModels Ljava/util/Map;
FIELD G modelRotationCache Ljava/util/Map;
FIELD I bakedModels Ljava/util/Map;

1
mappings/net/minecraft/client/render/model/ModelRotationContainer.mapping
View File

@ -1,2 +1,3 @@
CLASS dpe net/minecraft/client/render/model/ModelRotationContainer
METHOD b getRotation ()Ldoz;
METHOD c isUvLocked ()Z

3
mappings/net/minecraft/client/render/model/MultipartBakedModel.mapping
View File

@ -8,8 +8,9 @@ CLASS dpf net/minecraft/client/render/model/MultipartBakedModel
METHOD a getQuads (Lbpm;Ley;Ljava/util/Random;)Ljava/util/List;
ARG 1 state
ARG 2 face
ARG 3 random
METHOD b hasDepthInGui ()Z
METHOD c isBuiltin ()Z
METHOD d getSprite ()Ldno;
METHOD e getTransformations ()Ldfk;
METHOD e getTransformation ()Ldfk;
METHOD f getItemPropertyOverrides ()Ldfi;

4
mappings/dfq.mapping → mappings/net/minecraft/client/render/model/MultipartUnbakedModel.mapping
View File

@ -1,5 +1,5 @@
CLASS dfq
CLASS dfq$a
CLASS dfq net/minecraft/client/render/model/MultipartUnbakedModel
CLASS dfq$a Deserializer
METHOD a bake (Ldpb;Ljava/util/function/Function;Ldpe;)Ldoy;
ARG 1 loader
ARG 2 textureGetter

3
mappings/net/minecraft/client/render/model/WeightedBakedModel.mapping
View File

@ -14,8 +14,9 @@ CLASS dpi net/minecraft/client/render/model/WeightedBakedModel
METHOD a getQuads (Lbpm;Ley;Ljava/util/Random;)Ljava/util/List;
ARG 1 state
ARG 2 face
ARG 3 random
METHOD b hasDepthInGui ()Z
METHOD c isBuiltin ()Z
METHOD d getSprite ()Ldno;
METHOD e getTransformations ()Ldfk;
METHOD e getTransformation ()Ldfk;
METHOD f getItemPropertyOverrides ()Ldfi;

9
mappings/net/minecraft/client/render/model/json/JsonUnbakedModel.mapping
View File

@ -2,6 +2,15 @@ CLASS dfc net/minecraft/client/render/model/json/JsonUnbakedModel
CLASS dfc$a TextureResolutionContext
METHOD <init> (Ldfc;)V
CLASS dfc$b Deserializer
METHOD a deserializeOverrides (Lcom/google/gson/JsonDeserializationContext;Lcom/google/gson/JsonObject;)Ljava/util/List;
ARG 1 context
ARG 2 object
METHOD a (Lcom/google/gson/JsonElement;Ljava/lang/reflect/Type;Lcom/google/gson/JsonDeserializationContext;)Ldfc;
ARG 1 element
ARG 2 type
ARG 3 context
METHOD a deserializeAmbientOcclusion (Lcom/google/gson/JsonObject;)Z
ARG 1 object
METHOD b deserializeElements (Lcom/google/gson/JsonDeserializationContext;Lcom/google/gson/JsonObject;)Ljava/util/List;
ARG 1 context
ARG 2 object

2
mappings/net/minecraft/client/render/model/json/ModelTransformation.mapping
View File

@ -1,5 +1,5 @@
CLASS dfk net/minecraft/client/render/model/json/ModelTransformation
CLASS dfk$a Deserializser
CLASS dfk$a Deserializer
METHOD a parseModelTransformation (Lcom/google/gson/JsonDeserializationContext;Lcom/google/gson/JsonObject;Ljava/lang/String;)Ldfj;
ARG 1 ctx
ARG 2 json

15
mappings/net/minecraft/client/render/model/json/ModelVariant.mapping
View File

@ -1,4 +1,17 @@
CLASS dfm net/minecraft/client/render/model/json/ModelVariant
CLASS dfm$a Deserializer
METHOD a (Lcom/google/gson/JsonElement;Ljava/lang/reflect/Type;Lcom/google/gson/JsonDeserializationContext;)Ldfm;
ARG 1 element
ARG 2 type
ARG 3 context
METHOD a deserializeRotation (Lcom/google/gson/JsonObject;)Ldoz;
ARG 1 object
METHOD b deserializeModel (Lcom/google/gson/JsonObject;)Lqc;
ARG 1 object
METHOD c deserializeWeight (Lcom/google/gson/JsonObject;)I
ARG 1 object
METHOD d deserializeUvLock (Lcom/google/gson/JsonObject;)Z
ARG 1 object
FIELD a location Lqc;
FIELD b rotation Ldoz;
FIELD c uvLock Z
@ -7,6 +20,8 @@ CLASS dfm net/minecraft/client/render/model/json/ModelVariant
ARG 1 location
ARG 2 rotation
ARG 3 uvLock
ARG 4 weight
METHOD a getLocation ()Lqc;
METHOD b getRotation ()Ldoz;
METHOD c isUvLocked ()Z
METHOD d getWeight ()I

16
mappings/net/minecraft/client/render/model/json/ModelVariantMap.mapping
View File

@ -1,2 +1,18 @@
CLASS dfd net/minecraft/client/render/model/json/ModelVariantMap
CLASS dfd$a
FIELD a gson Lcom/google/gson/Gson;
CLASS dfd$b Deserializer
METHOD a deserializeVariants (Lcom/google/gson/JsonDeserializationContext;Lcom/google/gson/JsonObject;)Ljava/util/Map;
ARG 1 context
ARG 2 object
METHOD a (Lcom/google/gson/JsonElement;Ljava/lang/reflect/Type;Lcom/google/gson/JsonDeserializationContext;)Ldfd;
ARG 1 element
ARG 2 type
ARG 3 context
METHOD b deserializeMultipart (Lcom/google/gson/JsonDeserializationContext;Lcom/google/gson/JsonObject;)Ldfq;
ARG 1 context
ARG 2 object
FIELD a variantMap Ljava/util/Map;
FIELD b multipartModel Ldfq;
METHOD a deserialize (Ldfd$a;Ljava/io/Reader;)Ldfd;
ARG 1 reader