mirror of https://github.com/FabricMC/yarn.git
Merge branch '16w33a' of github.com:FabricMC/pomf into 16w33a
This commit is contained in:
commit
0c6a070a30
|
@ -1,11 +0,0 @@
|
||||||
CLASS none/bqp net/minecraft/client/render/block/BlockStateMap
|
|
||||||
FIELD a stateMap Ljava/util/Map;
|
|
||||||
FIELD b builtinBlocks Ljava/util/Set;
|
|
||||||
METHOD a getAll ()Ljava/util/Map;
|
|
||||||
METHOD a mapState (Lnone/akw;Lnone/bqs;)V
|
|
||||||
ARG 0 block
|
|
||||||
ARG 1 map
|
|
||||||
METHOD a mapBuiltinStates ([Lnone/akw;)V
|
|
||||||
ARG 0 blocks
|
|
||||||
METHOD b get (Lnone/akw;)Ljava/util/Map;
|
|
||||||
ARG 0 block
|
|
|
@ -0,0 +1,13 @@
|
||||||
|
CLASS none/bqp net/minecraft/client/render/block/BlockStateModelMap
|
||||||
|
FIELD a mappers Ljava/util/Map;
|
||||||
|
FIELD b builtinBlocks Ljava/util/Set;
|
||||||
|
METHOD a getModelStateMap ()Ljava/util/Map;
|
||||||
|
METHOD a getRenderStates (Lnone/akw;)Ljava/util/Set;
|
||||||
|
ARG 0 block
|
||||||
|
METHOD a registerMapper (Lnone/akw;Lnone/bqs;)V
|
||||||
|
ARG 0 block
|
||||||
|
ARG 1 map
|
||||||
|
METHOD a registerBuiltinBlocks ([Lnone/akw;)V
|
||||||
|
ARG 0 blocks
|
||||||
|
METHOD b getModelStateMap (Lnone/akw;)Ljava/util/Map;
|
||||||
|
ARG 0 block
|
|
@ -1,4 +1,4 @@
|
||||||
CLASS none/bpl net/minecraft/client/render/block/BlockStateMaps
|
CLASS none/bpl net/minecraft/client/render/block/BlockStateModelMaps
|
||||||
CLASS none/bpl$1
|
CLASS none/bpl$1
|
||||||
METHOD a getModelName (Lnone/asj;)Lnone/bzo;
|
METHOD a getModelName (Lnone/asj;)Lnone/bzo;
|
||||||
ARG 0 state
|
ARG 0 state
|
||||||
|
@ -26,15 +26,15 @@ CLASS none/bpl net/minecraft/client/render/block/BlockStateMaps
|
||||||
METHOD <init> (Lnone/bzn;)V
|
METHOD <init> (Lnone/bzn;)V
|
||||||
ARG 0 manager
|
ARG 0 manager
|
||||||
METHOD a getStateMap ()Lnone/bqp;
|
METHOD a getStateMap ()Lnone/bqp;
|
||||||
METHOD a mapState (Lnone/akw;Lnone/bqs;)V
|
METHOD a registerMapper (Lnone/akw;Lnone/bqs;)V
|
||||||
ARG 0 block
|
ARG 0 block
|
||||||
ARG 1 stateMap
|
ARG 1 stateMap
|
||||||
METHOD a getSprite (Lnone/asj;)Lnone/bxb;
|
METHOD a getSprite (Lnone/asj;)Lnone/bxb;
|
||||||
ARG 0 state
|
ARG 0 state
|
||||||
METHOD a mapBuiltinStates ([Lnone/akw;)V
|
METHOD a registerBuiltinBlocks ([Lnone/akw;)V
|
||||||
ARG 0 blocks
|
ARG 0 blocks
|
||||||
METHOD b getModelManager ()Lnone/bzn;
|
METHOD b getModelManager ()Lnone/bzn;
|
||||||
METHOD b getModel (Lnone/asj;)Lnone/bzj;
|
METHOD b getModel (Lnone/asj;)Lnone/bzj;
|
||||||
ARG 0 state
|
ARG 0 state
|
||||||
METHOD c reload ()V
|
METHOD c reload ()V
|
||||||
METHOD d mapBlockStates ()V
|
METHOD d registerStateMappers ()V
|
|
@ -1,4 +1,16 @@
|
||||||
CLASS none/bzq net/minecraft/client/render/model/BakedModel
|
CLASS none/bzq net/minecraft/client/render/model/BakedModel
|
||||||
|
CLASS none/bzq$a Builder
|
||||||
|
FIELD a quads Ljava/util/List;
|
||||||
|
FIELD b faceQuads Ljava/util/Map;
|
||||||
|
FIELD e particleTexture Lnone/bxb;
|
||||||
|
METHOD a addQuad (Lnone/bpp;)Lnone/bzq$a;
|
||||||
|
ARG 0 quad
|
||||||
|
METHOD a setParticle (Lnone/bxb;)Lnone/bzq$a;
|
||||||
|
ARG 0 sprite
|
||||||
|
METHOD a addQuad (Lnone/cu;Lnone/bpp;)Lnone/bzq$a;
|
||||||
|
ARG 0 face
|
||||||
|
ARG 1 quad
|
||||||
|
METHOD b build ()Lnone/bzj;
|
||||||
FIELD c usesAO Z
|
FIELD c usesAO Z
|
||||||
FIELD d is3dInGui Z
|
FIELD d is3dInGui Z
|
||||||
METHOD <init> (Ljava/util/List;Ljava/util/Map;ZZLnone/bxb;Lnone/bqc;Lnone/bqa;)V
|
METHOD <init> (Ljava/util/List;Ljava/util/Map;ZZLnone/bxb;Lnone/bqc;Lnone/bqa;)V
|
||||||
|
|
|
@ -1,9 +1,22 @@
|
||||||
CLASS none/bzr net/minecraft/client/render/model/BakedModelWeighted
|
CLASS none/bzr net/minecraft/client/render/model/BakedModelWeighted
|
||||||
CLASS none/bzr$a Builder
|
CLASS none/bzr$a Builder
|
||||||
|
FIELD a models Ljava/util/List;
|
||||||
|
METHOD a build ()Lnone/bzr;
|
||||||
|
METHOD a add (Lnone/bzj;I)Lnone/bzr$a;
|
||||||
|
ARG 0 model
|
||||||
|
ARG 1 weight
|
||||||
|
METHOD b getFirst ()Lnone/bzj;
|
||||||
CLASS none/bzr$b WeightedBakedModel
|
CLASS none/bzr$b WeightedBakedModel
|
||||||
|
FIELD b model Lnone/bzj;
|
||||||
|
METHOD <init> (Lnone/bzj;I)V
|
||||||
|
ARG 0 model
|
||||||
|
ARG 1 weight
|
||||||
FIELD a totalWeight I
|
FIELD a totalWeight I
|
||||||
|
FIELD b models Ljava/util/List;
|
||||||
FIELD c defaultModel Lnone/bzj;
|
FIELD c defaultModel Lnone/bzj;
|
||||||
METHOD a useAmbientOcclusion ()Z
|
METHOD a useAmbientOcclusion ()Z
|
||||||
|
METHOD a getRandomModel (J)Lnone/bzj;
|
||||||
|
ARG 0 rand
|
||||||
METHOD a getQuads (Lnone/asj;Lnone/cu;J)Ljava/util/List;
|
METHOD a getQuads (Lnone/asj;Lnone/cu;J)Ljava/util/List;
|
||||||
ARG 0 state
|
ARG 0 state
|
||||||
ARG 1 face
|
ARG 1 face
|
||||||
|
|
|
@ -1,6 +1,10 @@
|
||||||
CLASS none/bpp net/minecraft/client/render/model/BakedQuad
|
CLASS none/bpp net/minecraft/client/render/model/BakedQuad
|
||||||
|
FIELD a vertexData [I
|
||||||
FIELD b colorIndex I
|
FIELD b colorIndex I
|
||||||
METHOD <init> ([IILnone/cu;Lnone/bxb;)V
|
METHOD <init> ([IILnone/cu;Lnone/bxb;)V
|
||||||
|
ARG 0 vertexData
|
||||||
ARG 1 colorIndex
|
ARG 1 colorIndex
|
||||||
|
METHOD a ()Lnone/bxb;
|
||||||
|
METHOD b getVertexData ()[I
|
||||||
METHOD c hasColor ()Z
|
METHOD c hasColor ()Z
|
||||||
METHOD d getColorIndex ()I
|
METHOD d getColorIndex ()I
|
||||||
|
|
|
@ -0,0 +1,3 @@
|
||||||
|
CLASS none/bpw net/minecraft/client/render/model/BakedQuadRetextured
|
||||||
|
FIELD e texture Lnone/bxb;
|
||||||
|
METHOD f recalculateUvs ()V
|
|
@ -1,7 +1,18 @@
|
||||||
CLASS none/bpu net/minecraft/client/render/model/Model
|
CLASS none/bpu net/minecraft/client/render/model/Model
|
||||||
|
FIELD c textureMap Ljava/util/Map;
|
||||||
|
FIELD d parentModel Lnone/bpu;
|
||||||
|
FIELD e parentId Lnone/kp;
|
||||||
FIELD f LOGGER Lorg/apache/logging/log4j/Logger;
|
FIELD f LOGGER Lorg/apache/logging/log4j/Logger;
|
||||||
|
FIELD g elements Ljava/util/List;
|
||||||
FIELD i ambientOcclusion Z
|
FIELD i ambientOcclusion Z
|
||||||
|
FIELD k overrides Ljava/util/List;
|
||||||
METHOD <init> (Lnone/kp;Ljava/util/List;Ljava/util/Map;ZZLnone/bqc;Ljava/util/List;)V
|
METHOD <init> (Lnone/kp;Ljava/util/List;Ljava/util/Map;ZZLnone/bqc;Ljava/util/List;)V
|
||||||
|
ARG 0 parentId
|
||||||
|
ARG 1 elements
|
||||||
|
ARG 2 textureMap
|
||||||
ARG 3 ambientOcclusion
|
ARG 3 ambientOcclusion
|
||||||
|
ARG 6 overrides
|
||||||
METHOD a load (Ljava/io/Reader;)Lnone/bpu;
|
METHOD a load (Ljava/io/Reader;)Lnone/bpu;
|
||||||
METHOD a load (Ljava/lang/String;)Lnone/bpu;
|
METHOD a load (Ljava/lang/String;)Lnone/bpu;
|
||||||
|
METHOD b hasAmbientOcclusion ()Z
|
||||||
|
METHOD k hasParent ()Z
|
||||||
|
|
|
@ -0,0 +1,10 @@
|
||||||
|
CLASS none/bpq net/minecraft/client/render/model/ModelElement
|
||||||
|
FIELD a min Lorg/lwjgl/util/vector/Vector3f;
|
||||||
|
FIELD b max Lorg/lwjgl/util/vector/Vector3f;
|
||||||
|
FIELD c faces Ljava/util/Map;
|
||||||
|
FIELD d rotation Lnone/bps;
|
||||||
|
FIELD e shade Z
|
||||||
|
METHOD <init> (Lorg/lwjgl/util/vector/Vector3f;Lorg/lwjgl/util/vector/Vector3f;Ljava/util/Map;Lnone/bps;Z)V
|
||||||
|
ARG 0 min
|
||||||
|
ARG 1 max
|
||||||
|
ARG 3 rotation
|
|
@ -0,0 +1,9 @@
|
||||||
|
CLASS none/bpr net/minecraft/client/render/model/ModelElementFace
|
||||||
|
FIELD a NULL_FACING Lnone/cu;
|
||||||
|
FIELD b cullFace Lnone/cu;
|
||||||
|
FIELD c tintIndex I
|
||||||
|
FIELD d texture Ljava/lang/String;
|
||||||
|
METHOD <init> (Lnone/cu;ILjava/lang/String;Lnone/bpt;)V
|
||||||
|
ARG 0 cullFace
|
||||||
|
ARG 1 tintIndex
|
||||||
|
ARG 2 texture
|
|
@ -0,0 +1 @@
|
||||||
|
CLASS none/bps net/minecraft/client/render/model/ModelElementRotation
|
|
@ -6,13 +6,16 @@ CLASS none/bzm net/minecraft/client/render/model/ModelManager
|
||||||
FIELD e BUILTIN_MODEL_DEFS Ljava/util/Map;
|
FIELD e BUILTIN_MODEL_DEFS Ljava/util/Map;
|
||||||
FIELD f ARROW_JOINER Lcom/google/common/base/Joiner;
|
FIELD f ARROW_JOINER Lcom/google/common/base/Joiner;
|
||||||
FIELD g resourceContainer Lnone/bya;
|
FIELD g resourceContainer Lnone/bya;
|
||||||
FIELD i models Ljava/util/Map;
|
FIELD h spriteMap Ljava/util/Map;
|
||||||
|
FIELD i modelMap Ljava/util/Map;
|
||||||
|
FIELD j variantsMap Ljava/util/Map;
|
||||||
FIELD l spriteAtlas Lnone/bxa;
|
FIELD l spriteAtlas Lnone/bxa;
|
||||||
FIELD m blockStateMaps Lnone/bpl;
|
FIELD m blockStateMaps Lnone/bpl;
|
||||||
FIELD p modelRegistry Lnone/di;
|
FIELD p modelRegistry Lnone/di;
|
||||||
FIELD q EMPTY_MODEL Ljava/lang/String;
|
FIELD q EMPTY_MODEL Ljava/lang/String;
|
||||||
FIELD r BUILTIN_GENERATED Lnone/bpu;
|
FIELD r BUILTIN_GENERATED Lnone/bpu;
|
||||||
FIELD s BUILTIN_ENTITY Lnone/bpu;
|
FIELD s BUILTIN_ENTITY Lnone/bpu;
|
||||||
|
FIELD u blockVariants Ljava/util/Map;
|
||||||
FIELD v itemVariantLists Ljava/util/Map;
|
FIELD v itemVariantLists Ljava/util/Map;
|
||||||
METHOD <init> (Lnone/bya;Lnone/bxa;Lnone/bpl;)V
|
METHOD <init> (Lnone/bya;Lnone/bxa;Lnone/bpl;)V
|
||||||
ARG 0 resourceContainer
|
ARG 0 resourceContainer
|
||||||
|
@ -25,11 +28,24 @@ CLASS none/bzm net/minecraft/client/render/model/ModelManager
|
||||||
ARG 0 item
|
ARG 0 item
|
||||||
METHOD a loadBlockModel (Lnone/bzo;Lnone/bqd;)V
|
METHOD a loadBlockModel (Lnone/bzo;Lnone/bqd;)V
|
||||||
ARG 0 id
|
ARG 0 id
|
||||||
METHOD b loadBlockModels ()V
|
METHOD a getVariantContainer (Lnone/kp;)Lnone/bpv;
|
||||||
|
ARG 0 blockId
|
||||||
|
METHOD a loadVariantContainer (Lnone/kp;Lnone/bxz;)Lnone/bpv;
|
||||||
|
ARG 0 stateId
|
||||||
|
ARG 1 resource
|
||||||
|
METHOD a loadVariantContainer (Lnone/kp;Lnone/kp;)Lnone/bpv;
|
||||||
|
ARG 0 stateId
|
||||||
|
ARG 1 resourceLocation
|
||||||
|
METHOD b loadBlockVariantMaps ()V
|
||||||
METHOD b getBlockstateFileLocation (Lnone/kp;)Lnone/kp;
|
METHOD b getBlockstateFileLocation (Lnone/kp;)Lnone/kp;
|
||||||
ARG 0 id
|
ARG 0 id
|
||||||
|
METHOD c loadModels ()V
|
||||||
METHOD c loadModel (Lnone/kp;)Lnone/bpu;
|
METHOD c loadModel (Lnone/kp;)Lnone/bpu;
|
||||||
ARG 0 id
|
ARG 0 id
|
||||||
|
METHOD d loadItemBlockModels ()V
|
||||||
METHOD d getModelFileLocation (Lnone/kp;)Lnone/kp;
|
METHOD d getModelFileLocation (Lnone/kp;)Lnone/kp;
|
||||||
ARG 0 id
|
ARG 0 id
|
||||||
|
METHOD f loadItemCustomModels ()V
|
||||||
METHOD g addItemVariants ()V
|
METHOD g addItemVariants ()V
|
||||||
|
METHOD j ()Ljava/util/Set;
|
||||||
|
METHOD m registerSprites ()V
|
||||||
|
|
|
@ -0,0 +1 @@
|
||||||
|
CLASS none/bpz net/minecraft/client/render/model/ModelOverride
|
|
@ -11,6 +11,6 @@ CLASS none/bqe net/minecraft/client/render/model/ModelVariant
|
||||||
METHOD a getLocation ()Lnone/kp;
|
METHOD a getLocation ()Lnone/kp;
|
||||||
METHOD b getRotation ()Lnone/bzk;
|
METHOD b getRotation ()Lnone/bzk;
|
||||||
METHOD c isUvLocked ()Z
|
METHOD c isUvLocked ()Z
|
||||||
METHOD d getWeighjt ()I
|
METHOD d getWeight ()I
|
||||||
METHOD equals (Ljava/lang/Object;)Z
|
METHOD equals (Ljava/lang/Object;)Z
|
||||||
ARG 0 other
|
ARG 0 other
|
||||||
|
|
|
@ -0,0 +1,11 @@
|
||||||
|
CLASS none/bpv net/minecraft/client/render/model/ModelVariantMap
|
||||||
|
CLASS none/bpv$b VariantNotFoundException
|
||||||
|
FIELD a GSON Lcom/google/gson/Gson;
|
||||||
|
FIELD b variantMap Ljava/util/Map;
|
||||||
|
METHOD a getAll ()Ljava/util/Set;
|
||||||
|
METHOD a load (Ljava/io/Reader;)Lnone/bpv;
|
||||||
|
ARG 0 reader
|
||||||
|
METHOD b contains (Ljava/lang/String;)Z
|
||||||
|
ARG 0 variant
|
||||||
|
METHOD c get (Ljava/lang/String;)Lnone/bqd;
|
||||||
|
ARG 0 variant
|
|
@ -0,0 +1,7 @@
|
||||||
|
CLASS none/bqd net/minecraft/client/render/model/ModelVariantSet
|
||||||
|
FIELD a variants Ljava/util/List;
|
||||||
|
METHOD <init> (Ljava/util/List;)V
|
||||||
|
ARG 0 variants
|
||||||
|
METHOD a getVariants ()Ljava/util/List;
|
||||||
|
METHOD equals (Ljava/lang/Object;)Z
|
||||||
|
ARG 0 other
|
|
@ -1 +0,0 @@
|
||||||
CLASS none/bpq net/minecraft/client/render/model/bpq
|
|
|
@ -1 +0,0 @@
|
||||||
CLASS none/bpr net/minecraft/client/render/model/bpr
|
|
|
@ -1 +1,8 @@
|
||||||
CLASS none/bpt net/minecraft/client/render/model/bpt
|
CLASS none/bpt net/minecraft/client/render/model/bpt
|
||||||
|
FIELD a uvs [F
|
||||||
|
FIELD b rotation I
|
||||||
|
METHOD a (I)F
|
||||||
|
ARG 0 pos
|
||||||
|
METHOD b (I)F
|
||||||
|
ARG 0 pos
|
||||||
|
METHOD d (I)I
|
||||||
|
|
|
@ -1 +0,0 @@
|
||||||
CLASS none/bpz net/minecraft/client/render/model/bpz
|
|
|
@ -1,2 +0,0 @@
|
||||||
CLASS none/bpv net/minecraft/client/sortme/BlockVariantContainer
|
|
||||||
FIELD a GSON Lcom/google/gson/Gson;
|
|
|
@ -3,10 +3,13 @@ CLASS none/ly net/minecraft/world/entity/WorldEntityTracker
|
||||||
FIELD d entity Lnone/se;
|
FIELD d entity Lnone/se;
|
||||||
FIELD e trackingRange I
|
FIELD e trackingRange I
|
||||||
FIELD g updateInterval I
|
FIELD g updateInterval I
|
||||||
|
FIELD u sendVelocityUpdates Z
|
||||||
|
FIELD z trackingPlayers Ljava/util/Set;
|
||||||
METHOD <init> (Lnone/se;IIIZ)V
|
METHOD <init> (Lnone/se;IIIZ)V
|
||||||
ARG 0 entity
|
ARG 0 entity
|
||||||
ARG 1 trackingRange
|
ARG 1 trackingRange
|
||||||
ARG 3 updateInterval
|
ARG 3 updateInterval
|
||||||
|
ARG 4 sendVelocityUpdates
|
||||||
METHOD a sendToAllTracking (Lnone/fl;)V
|
METHOD a sendToAllTracking (Lnone/fl;)V
|
||||||
ARG 0 packet
|
ARG 0 packet
|
||||||
METHOD b getEntity ()Lnone/se;
|
METHOD b getEntity ()Lnone/se;
|
||||||
|
|
|
@ -15,6 +15,7 @@ CLASS none/lr net/minecraft/world/entity/WorldEntityTrackingManager
|
||||||
ARG 0 entity
|
ARG 0 entity
|
||||||
ARG 1 trackingRange
|
ARG 1 trackingRange
|
||||||
ARG 2 updateInterval
|
ARG 2 updateInterval
|
||||||
|
ARG 3 sendVelocityUpdates
|
||||||
METHOD a sendToAllTracking (Lnone/se;Lnone/fl;)V
|
METHOD a sendToAllTracking (Lnone/se;Lnone/fl;)V
|
||||||
ARG 0 entity
|
ARG 0 entity
|
||||||
ARG 1 packet
|
ARG 1 packet
|
||||||
|
|
Loading…
Reference in New Issue