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

Yet more json models (#359) 

* Multipart model stuff

* Random JSON model cleanup

* Fix casing
This commit is contained in:
Shadowfacts 2018-12-26 04:53:11 -05:00 committed by Adrian Siekierka
parent 82636ba1f3
commit b3513c61e3
22 changed files with 180 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
mappings/dfo.mapping
View File

@ -1,3 +0,0 @@
CLASS dfo
FIELD a TRUE Ldfo;
FIELD b FALSE Ldfo;

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

@ -7,6 +7,7 @@ CLASS dex net/minecraft/client/render/model/BakedQuad
ARG 1 vertexData
ARG 2 colorIndex
ARG 3 face
ARG 4 sprite
METHOD a getSprite ()Ldno;
METHOD b getVertexData ()[I
METHOD c hasColor ()Z

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

@ -3,24 +3,47 @@ CLASS dpg net/minecraft/client/render/model/BasicBakedModel
FIELD a quads Ljava/util/List;
FIELD b faceQuads Ljava/util/Map;
FIELD c itemPropertyOverrides Ldfi;
FIELD d usesAO Z
FIELD d usesAo Z
FIELD e particleTexture Ldno;
FIELD f depthInGui Z
FIELD g transformations Ldfk;
FIELD g transformation Ldfk;
METHOD <init> (Lbpm;Ldoy;Ldno;Ljava/util/Random;J)V
ARG 1 state
ARG 2 bakedModel
ARG 3 sprite
ARG 4 random
ARG 5 randomSeed
METHOD <init> (Ldfc;Ldfi;)V
ARG 1 unbakedModel
ARG 2 itemPropertyOverrides
METHOD <init> (ZZLdfk;Ldfi;)V
ARG 1 usesAo
ARG 2 depthInGui
ARG 3 transformation
ARG 4 itemPropertyOverrides
METHOD a addQuad (Ldex;)Ldpg$a;
ARG 1 quad
METHOD a setParticle (Ldno;)Ldpg$a;
ARG 1 sprite
METHOD a addQuad (Ley;Ldex;)Ldpg$a;
ARG 1 side
ARG 2 quad
METHOD b build ()Ldoy;
FIELD a quads Ljava/util/List;
FIELD b faceQuads Ljava/util/Map;
FIELD c usesAO Z
FIELD c usesAo Z
FIELD d depthInGui Z
FIELD e sprite Ldno;
FIELD f transformations Ldfk;
FIELD f transformation Ldfk;
FIELD g itemPropertyOverrides Ldfi;
METHOD <init> (Ljava/util/List;Ljava/util/Map;ZZLdno;Ldfk;Ldfi;)V
ARG 3 usesAO
ARG 1 quads
ARG 2 faceQuads
ARG 3 usesAo
ARG 4 is3dInGui
ARG 5 sprite
ARG 6 transformation
ARG 7 itemPropertyOverrides
METHOD a useAmbientOcclusion ()Z
METHOD a getQuads (Lbpm;Ley;Ljava/util/Random;)Ljava/util/List;
ARG 1 state

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

@ -1,7 +1,11 @@
CLASS dpa net/minecraft/client/render/model/BuiltinBakedModel
FIELD a transformations Ldfk;
FIELD b itemOverrideList Ldfi;
FIELD a transformation Ldfk;
FIELD b itemPropertyOverrides Ldfi;
FIELD c sprite Ldno;
METHOD <init> (Ldfk;Ldfi;Ldno;)V
ARG 1 transformation
ARG 2 itemPropertyOverrides
ARG 3 sprite
METHOD a useAmbientOcclusion ()Z
METHOD a getQuads (Lbpm;Ley;Ljava/util/Random;)Ljava/util/List;
ARG 1 state

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

@ -1,11 +1,13 @@
CLASS dpb net/minecraft/client/render/model/ModelLoader
CLASS dpb$a ModelLoaderException
FIELD A BLOCK_STATE_FACTORY_OVERRIDES Ljava/util/Map;
FIELD B resourceContainer Lwj;
FIELD B resourceManager Lwj;
FIELD C spriteAtlas Ldnn;
FIELD D modelsToLoad Ljava/util/Set;
FIELD E variantMapDeserializationContext Ldfd$a;
FIELD F unbakedModels Ljava/util/Map;
FIELD G modelRotationCache Ljava/util/Map;
FIELD H modelsToBake Ljava/util/Map;
FIELD I bakedModels Ljava/util/Map;
FIELD p MISSING Ldpd;
FIELD q MISSING_DEFINITION Ljava/lang/String;
@ -18,6 +20,9 @@ CLASS dpb net/minecraft/client/render/model/ModelLoader
FIELD x KEY_VALUE_SPLITTER Lcom/google/common/base/Splitter;
FIELD y ITEM_FRAME_STATE_FACTORY Lbpn;
FIELD z ITEM_MODEL_GENERATOR Ldfg;
METHOD <init> (Lwj;Ldnn;)V
ARG 1 resourceManager
ARG 2 spriteAtlas
METHOD a getBakedModelMap ()Ljava/util/Map;
METHOD a stateKeyToPredicate (Lbpn;Ljava/lang/String;)Ljava/util/function/Predicate;
ARG 0 stateFactory
@ -26,10 +31,16 @@ CLASS dpb net/minecraft/client/render/model/ModelLoader
ARG 0 property
ARG 1 string
METHOD a addModel (Ldpd;)V
ARG 1 modelId
METHOD a getOrLoadModel (Lqc;)Ldph;
ARG 1 id
METHOD a bake (Lqc;Ldpe;)Ldoy;
ARG 1 id
ARG 2 rotationContainer
METHOD a putModel (Lqc;Ldph;)V
ARG 1 id
ARG 2 unbakedModel
METHOD b loadModel (Lqc;)V
ARG 1 id
METHOD c loadModelFromJson (Lqc;)Ldfc;
ARG 1 id

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

@ -20,10 +20,15 @@ CLASS doz net/minecraft/client/render/model/ModelRotation
FIELD s quaternion Lcoq;
FIELD t xRotations I
FIELD u yRotations I
METHOD <init> (Ljava/lang/String;III)V
ARG 3 x
ARG 4 y
METHOD a getQuaternion ()Lcoq;
METHOD a get (II)Ldoz;
ARG 0 x
ARG 1 y
METHOD a apply (Ley;)Ley;
ARG 1 direction
METHOD b getRotation ()Ldoz;
METHOD b getIndex (II)I
ARG 0 x

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

@ -1,9 +1,18 @@
CLASS dpf net/minecraft/client/render/model/MultipartBakedModel
CLASS dpf$a Builder
FIELD a components Ljava/util/List;
METHOD a build ()Ldoy;
METHOD a addComponent (Ljava/util/function/Predicate;Ldoy;)V
ARG 1 predicate
ARG 2 model
FIELD a ambientOcclusion Z
FIELD b depthGui Z
FIELD c sprite Ldno;
FIELD d transformations Ldfk;
FIELD e itemPropertyOverrides Ldfi;
FIELD f components Ljava/util/List;
METHOD <init> (Ljava/util/List;)V
ARG 1 components
METHOD a useAmbientOcclusion ()Z
METHOD a getQuads (Lbpm;Ley;Ljava/util/Random;)Ljava/util/List;
ARG 1 state

17
mappings/net/minecraft/client/render/model/MultipartUnbakedModel.mapping
View File

@ -1,9 +1,26 @@
CLASS dfq net/minecraft/client/render/model/MultipartUnbakedModel
CLASS dfq$a Deserializer
FIELD a context Ldfd$a;
METHOD <init> (Ldfd$a;)V
ARG 1 context
METHOD a deserializeComponents (Lcom/google/gson/JsonDeserializationContext;Lcom/google/gson/JsonArray;)Ljava/util/List;
ARG 1 context
ARG 2 array
METHOD a (Lcom/google/gson/JsonElement;Ljava/lang/reflect/Type;Lcom/google/gson/JsonDeserializationContext;)Ldfq;
ARG 1 element
ARG 2 type
ARG 3 context
FIELD a stateFactory Lbpn;
FIELD b components Ljava/util/List;
METHOD <init> (Lbpn;Ljava/util/List;)V
ARG 1 stateFactory
ARG 2 components
METHOD a getComponents ()Ljava/util/List;
METHOD a bake (Ldpb;Ljava/util/function/Function;Ldpe;)Ldoy;
ARG 1 loader
ARG 2 textureGetter
ARG 3 rotationContainer
METHOD a getTextureDependencies (Ljava/util/function/Function;Ljava/util/Set;)Ljava/util/Collection;
ARG 1 unbakedModelGetter
METHOD b getModels ()Ljava/util/Set;
METHOD f getModelDependencies ()Ljava/util/Collection;

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

@ -3,13 +3,18 @@ CLASS dpi net/minecraft/client/render/model/WeightedBakedModel
FIELD a models Ljava/util/List;
METHOD a getFirst ()Ldoy;
METHOD a add (Ldoy;I)Ldpi$a;
ARG 1 model
ARG 2 weight
CLASS dpi$b ModelEntry
FIELD b model Ldoy;
METHOD <init> (Ldoy;I)V
ARG 1 weight
ARG 1 model
ARG 2 weight
FIELD a totalWeight I
FIELD b models Ljava/util/List;
FIELD c defaultModel Ldoy;
METHOD <init> (Ljava/util/List;)V
ARG 1 models
METHOD a useAmbientOcclusion ()Z
METHOD a getQuads (Lbpm;Ley;Ljava/util/Random;)Ljava/util/List;
ARG 1 state

6
mappings/net/minecraft/client/render/model/json/AndMultipartModelSelector.mapping Normal file
View File

@ -0,0 +1,6 @@
CLASS dfn net/minecraft/client/render/model/json/AndMultipartModelSelector
FIELD c selectors Ljava/lang/Iterable;
METHOD <init> (Ljava/lang/Iterable;)V
ARG 1 selectors
METHOD getPredicate (Lbpn;)Ljava/util/function/Predicate;
ARG 1 stateFactory

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

@ -1,6 +1,9 @@
CLASS dfc net/minecraft/client/render/model/json/JsonUnbakedModel
CLASS dfc$a TextureResolutionContext
FIELD a root Ldfc;
FIELD b current Ldfc;
METHOD <init> (Ldfc;)V
ARG 1 root
CLASS dfc$b Deserializer
METHOD a deserializeOverrides (Lcom/google/gson/JsonDeserializationContext;Lcom/google/gson/JsonObject;)Ljava/util/List;
ARG 1 context
@ -77,4 +80,5 @@ CLASS dfc net/minecraft/client/render/model/json/JsonUnbakedModel
ARG 1 name
METHOD e getOverrides ()Ljava/util/List;
METHOD f getModelDependencies ()Ljava/util/Collection;
METHOD g getRootModel ()Ldfc;
METHOD h getTransformations ()Ldfk;

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

@ -15,6 +15,8 @@ CLASS dey net/minecraft/client/render/model/json/ModelElement
METHOD a getDirection (Ljava/lang/String;)Ley;
ARG 1 name
METHOD b deserializeFaces (Lcom/google/gson/JsonDeserializationContext;Lcom/google/gson/JsonObject;)Ljava/util/Map;
ARG 1 context
ARG 2 object
METHOD b deserializeRotationAngle (Lcom/google/gson/JsonObject;)F
ARG 1 object
METHOD c deserializeAxis (Lcom/google/gson/JsonObject;)Ley$a;

6
mappings/net/minecraft/client/render/model/json/ModelElementFace.mapping
View File

@ -12,8 +12,10 @@ CLASS dez net/minecraft/client/render/model/json/ModelElementFace
ARG 1 object
FIELD a cullFace Ley;
FIELD b tintIndex I
FIELD c texture Ljava/lang/String;
FIELD c textureId Ljava/lang/String;
FIELD d textureData Ldfb;
METHOD <init> (Ley;ILjava/lang/String;Ldfb;)V
ARG 1 cullFace
ARG 2 tintIndex
ARG 3 texture
ARG 3 textureId
ARG 4 textureData

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

@ -1,9 +1,18 @@
CLASS dfh net/minecraft/client/render/model/json/ModelItemOverride
CLASS dfh$a Deserializer
METHOD a (Lcom/google/gson/JsonElement;Ljava/lang/reflect/Type;Lcom/google/gson/JsonDeserializationContext;)Ldfh;
ARG 1 element
ARG 2 type
ARG 3 context
METHOD a deserializeMinPropertyValues (Lcom/google/gson/JsonObject;)Ljava/util/Map;
ARG 1 object
FIELD a modelId Lqc;
FIELD b minPropertyValues Ljava/util/Map;
METHOD <init> (Lqc;Ljava/util/Map;)V
ARG 1 modelId
ARG 2 minPropertyValues
METHOD a getModelId ()Lqc;
METHOD a matches (Lawo;Lbbp;Lahe;)Z
ARG 1 stack
ARG 2 world
ARG 3 entity

12
mappings/net/minecraft/client/render/model/json/ModelItemPropertyOverrideList.mapping
View File

@ -1,2 +1,14 @@
CLASS dfi net/minecraft/client/render/model/json/ModelItemPropertyOverrideList
FIELD a ORIGIN Ldfi;
FIELD b overrides Ljava/util/List;
FIELD c models Ljava/util/List;
METHOD <init> (Ldpb;Ldfc;Ljava/util/function/Function;Ljava/util/List;)V
ARG 1 modelLoader
ARG 2 unbakedModel
ARG 3 unbakedModelGetter
ARG 4 overrides
METHOD a apply (Ldoy;Lawo;Lbbp;Lahe;)Ldoy;
ARG 1 model
ARG 2 stack
ARG 3 world
ARG 4 entity

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

@ -5,7 +5,9 @@ CLASS dfk net/minecraft/client/render/model/json/ModelTransformation
ARG 2 json
ARG 3 key
METHOD a (Lcom/google/gson/JsonElement;Ljava/lang/reflect/Type;Lcom/google/gson/JsonDeserializationContext;)Ldfk;
ARG 3 ctx
ARG 1 element
ARG 2 type
ARG 3 context
CLASS dfk$b Type
FIELD a ORIGIN Ldfk$b;
FIELD b THIRD_PERSON_LEFT_HAND Ldfk$b;

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

@ -1,6 +1,10 @@
CLASS dfd net/minecraft/client/render/model/json/ModelVariantMap
CLASS dfd$a
CLASS dfd$a DeserializationContext
FIELD a gson Lcom/google/gson/Gson;
FIELD b stateFactory Lbpn;
METHOD a getStateFactory ()Lbpn;
METHOD a setStateFactory (Lbpn;)V
ARG 1 stateFactory
CLASS dfd$b Deserializer
METHOD a deserializeVariants (Lcom/google/gson/JsonDeserializationContext;Lcom/google/gson/JsonObject;)Ljava/util/Map;
ARG 1 context
@ -14,5 +18,14 @@ CLASS dfd net/minecraft/client/render/model/json/ModelVariantMap
ARG 2 object
FIELD a variantMap Ljava/util/Map;
FIELD b multipartModel Ldfq;
METHOD <init> (Ljava/util/List;)V
ARG 1 variantMapList
METHOD <init> (Ljava/util/Map;Ldfq;)V
ARG 1 variantMap
ARG 2 multipartModel
METHOD a getVariantMap ()Ljava/util/Map;
METHOD a deserialize (Ldfd$a;Ljava/io/Reader;)Ldfd;
ARG 0 context
ARG 1 reader
METHOD c hasMultipartModel ()Z
METHOD d getMultipartMdoel ()Ldfq;

20
mappings/net/minecraft/client/render/model/json/MultipartModelComponent.mapping Normal file
View File

@ -0,0 +1,20 @@
CLASS dfs net/minecraft/client/render/model/json/MultipartModelComponent
CLASS dfs$a Deserializer
METHOD a (Lcom/google/gson/JsonElement;Ljava/lang/reflect/Type;Lcom/google/gson/JsonDeserializationContext;)Ldfs;
ARG 1 element
ARG 2 type
ARG 3 context
METHOD a deserializeSelector (Lcom/google/gson/JsonObject;)Ldfo;
ARG 0 object
METHOD a createStatePropertySelector (Ljava/util/Map$Entry;)Ldfo;
ARG 0 entry
METHOD b deserializeSelectorOrDefault (Lcom/google/gson/JsonObject;)Ldfo;
ARG 1 object
FIELD a selector Ldfo;
FIELD b model Ldfl;
METHOD <init> (Ldfo;Ldfl;)V
ARG 1 selector
ARG 2 model
METHOD a getModel ()Ldfl;
METHOD a getPredicate (Lbpn;)Ljava/util/function/Predicate;
ARG 1 stateFactory

5
mappings/net/minecraft/client/render/model/json/MultipartModelSelector.mapping Normal file
View File

@ -0,0 +1,5 @@
CLASS dfo net/minecraft/client/render/model/json/MultipartModelSelector
FIELD a TRUE Ldfo;
FIELD b FALSE Ldfo;
METHOD getPredicate (Lbpn;)Ljava/util/function/Predicate;
ARG 1 stateFactory

3
mappings/net/minecraft/client/render/model/json/OrMultipartModelSelector.mapping Normal file
View File

@ -0,0 +1,3 @@
CLASS dfr net/minecraft/client/render/model/json/OrMultipartModelSelector
METHOD getPredicate (Lbpn;)Ljava/util/function/Predicate;
ARG 1 stateFactory

7
mappings/net/minecraft/client/render/model/json/WeightedUnbakedModel.mapping
View File

@ -1,5 +1,12 @@
CLASS dfl net/minecraft/client/render/model/json/WeightedUnbakedModel
CLASS dfl$a Deserializer
METHOD a (Lcom/google/gson/JsonElement;Ljava/lang/reflect/Type;Lcom/google/gson/JsonDeserializationContext;)Ldfl;
ARG 1 element
ARG 2 type
ARG 3 context
FIELD a variants Ljava/util/List;
METHOD <init> (Ljava/util/List;)V
ARG 1 variants
METHOD a getVariants ()Ljava/util/List;
METHOD a bake (Ldpb;Ljava/util/function/Function;Ldpe;)Ldoy;
ARG 1 loader

7
mappings/net/minecraft/client/sortme/BlockStatePropertyValuePredicateFactory.mapping
View File

@ -4,3 +4,10 @@ CLASS dfp net/minecraft/client/sortme/BlockStatePropertyValuePredicateFactory
FIELD e valueString Ljava/lang/String;
METHOD <init> (Ljava/lang/String;Ljava/lang/String;)V
ARG 1 key
ARG 2 valueString
METHOD a createPredicate (Lbpn;Lbqp;Ljava/lang/String;)Ljava/util/function/Predicate;
ARG 1 stateFactory
ARG 2 property
ARG 3 valueString
METHOD getPredicate (Lbpn;)Ljava/util/function/Predicate;
ARG 1 stateFactory