Mapped several things across all the modelling classes and renderers (#799)

* WeightedBakedModel.ModelEntry -> WeightedBakedModel.Entry

* Json ModelElement

* Mapped CubeFace
field_3958 -> DIRECTION_LOOKUP
method_3163 -> getFace

* Vector4f

* Vector4f.method_4929 -> Vector4f.viewboxMatrix

* Mapped BakedQuadFactory

* Resource reload listener

* ModelLoader
ModelLoader.class_4455 -> ModelLoader.ModelDefinition (as hinted by Mojang)

* field_20848 -> BLOCK_DESTRUCTION_STAGES
BLOCK_BREAKING_STAGES -> BLOCK_DESTRUCTION_STAGE_TEXTURES

* BakedModel
deserialize -> deserialize (where's the synthetic?)

* Back to this I guess.

* These mappings were lost in the rebase. :/

* getLightBrightness -> getRelativeDirectionalBrightness
getBrightnessInteger -> getLightmapCoordinate

* Mapped some incidental names relating to Sprite
This commit is contained in:
­Sollace 2019-11-19 17:19:05 +02:00 committed by modmuss50
parent ec47b4448e
commit abe91b29fa
18 changed files with 194 additions and 35 deletions

View File

@ -1,17 +1,17 @@
CLASS net/minecraft/class_1092 net/minecraft/client/render/model/BakedModelManager
FIELD field_20277 colorMap Lnet/minecraft/class_324;
FIELD field_20278 stateToModelIndex Lit/unimi/dsi/fastutil/objects/Object2IntMap;
FIELD field_20278 stateLookup Lit/unimi/dsi/fastutil/objects/Object2IntMap;
FIELD field_5407 missingModel Lnet/minecraft/class_1087;
FIELD field_5408 modelMap Ljava/util/Map;
FIELD field_5408 models Ljava/util/Map;
FIELD field_5409 spriteAtlas Lnet/minecraft/class_1059;
FIELD field_5410 blockStateMaps Lnet/minecraft/class_773;
FIELD field_5410 blockModelCache Lnet/minecraft/class_773;
METHOD <init> (Lnet/minecraft/class_1059;Lnet/minecraft/class_324;)V
ARG 1 spriteAtlas
ARG 2 colorMap
METHOD method_21611 shouldRerender (Lnet/minecraft/class_2680;Lnet/minecraft/class_2680;)Z
ARG 1 old
ARG 2 updated
ARG 1 from
ARG 2 to
METHOD method_4742 getModel (Lnet/minecraft/class_1091;)Lnet/minecraft/class_1087;
ARG 1 id
METHOD method_4743 getBlockStateMaps ()Lnet/minecraft/class_773;
METHOD method_4743 getBlockModels ()Lnet/minecraft/class_773;
METHOD method_4744 getMissingModel ()Lnet/minecraft/class_1087;

View File

@ -1,5 +1,59 @@
CLASS net/minecraft/class_796 net/minecraft/client/render/model/BakedQuadFactory
FIELD field_4259 MAX_SCALE F
FIELD field_4260 MIN_SCALE F
METHOD method_3454 uvLock (Lnet/minecraft/class_787;Lnet/minecraft/class_2350;Lnet/minecraft/class_4590;Lnet/minecraft/class_2960;)Lnet/minecraft/class_787;
ARG 0 texture
ARG 1 orientation
ARG 2 rotation
ARG 3 modelId
METHOD method_3455 transformVertex (Lnet/minecraft/class_1160;Lnet/minecraft/class_4590;)V
ARG 1 vertex
ARG 2 transformation
METHOD method_3456 getRelativeDirectionalBrightness (Lnet/minecraft/class_2350;)F
ARG 1 direction
METHOD method_3457 getLightmapCoordinate (Lnet/minecraft/class_2350;)I
ARG 1 direction
METHOD method_3458 packVertexData (Lnet/minecraft/class_787;Lnet/minecraft/class_1058;Lnet/minecraft/class_2350;[FLnet/minecraft/class_4590;Lnet/minecraft/class_789;Z)[I
ARG 1 texture
ARG 2 sprite
ARG 3 direction
ARG 4 positionMatrix
ARG 5 orientation
ARG 6 rotation
ARG 7 shaded
METHOD method_3459 getPositionMatrix (Lnet/minecraft/class_1160;Lnet/minecraft/class_1160;)[F
ARG 1 from
ARG 2 to
METHOD method_3460 packVertexData ([IILnet/minecraft/class_1160;ILnet/minecraft/class_1058;Lnet/minecraft/class_787;)V
ARG 1 vertices
ARG 2 cornerIndex
ARG 3 position
ARG 4 brightness
ARG 5 sprite
ARG 6 texture
METHOD method_3461 packVertexData ([IILnet/minecraft/class_2350;Lnet/minecraft/class_787;[FLnet/minecraft/class_1058;Lnet/minecraft/class_4590;Lnet/minecraft/class_789;Z)V
ARG 1 vertices
ARG 2 cornerIndex
ARG 3 direction
ARG 4 texture
ARG 5 positionMatrix
ARG 6 sprite
ARG 7 orientation
ARG 8 rotation
ARG 9 shaded
METHOD method_3462 encodeDirection ([ILnet/minecraft/class_2350;)V
ARG 1 rotationMatrix
ARG 2 direction
METHOD method_3463 rotateVertex (Lnet/minecraft/class_1160;Lnet/minecraft/class_789;)V
ARG 1 vector
ARG 2 rotation
METHOD method_3464 transformVertex (Lnet/minecraft/class_1160;Lnet/minecraft/class_1160;Lnet/minecraft/class_1159;Lnet/minecraft/class_1160;)V
ARG 1 vertex
ARG 2 origin
ARG 3 transformationMatrix
ARG 4 scale
METHOD method_3467 decodeDirection ([I)Lnet/minecraft/class_2350;
ARG 0 rotationMatrix
METHOD method_3468 bake (Lnet/minecraft/class_1160;Lnet/minecraft/class_1160;Lnet/minecraft/class_783;Lnet/minecraft/class_1058;Lnet/minecraft/class_2350;Lnet/minecraft/class_3665;Lnet/minecraft/class_789;ZLnet/minecraft/class_2960;)Lnet/minecraft/class_777;
ARG 1 from
ARG 2 to
@ -9,3 +63,4 @@ CLASS net/minecraft/class_796 net/minecraft/client/render/model/BakedQuadFactory
ARG 6 settings
ARG 7 rotation
ARG 8 shade
ARG 9 modelId

View File

@ -10,5 +10,15 @@ CLASS net/minecraft/class_753 net/minecraft/client/render/model/CubeFace
FIELD field_3973 zSide I
FIELD field_3974 ySide I
FIELD field_3975 xSide I
METHOD <init> (III)V
ARG 1 x
ARG 2 y
ARG 3 z
FIELD field_3958 DIRECTION_LOOKUP [Lnet/minecraft/class_753;
FIELD field_3959 corners [Lnet/minecraft/class_753$class_755;
METHOD <init> (Ljava/lang/String;I[Lnet/minecraft/class_753$class_755;)V
ARG 3 corners
METHOD method_3162 getCorner (I)Lnet/minecraft/class_753$class_755;
ARG 1 corner
METHOD method_3163 getFace (Lnet/minecraft/class_2350;)Lnet/minecraft/class_753;
ARG 0 direction

View File

@ -1,3 +1,3 @@
CLASS net/minecraft/class_3665 net/minecraft/client/render/model/ModelBakeSettings
METHOD method_3509 getRotation ()Lnet/minecraft/class_4590;
METHOD method_3512 isUvLocked ()Z
METHOD method_3512 isShaded ()Z

View File

@ -1,15 +1,45 @@
CLASS net/minecraft/class_1088 net/minecraft/client/render/model/ModelLoader
CLASS class_1089 ModelLoaderException
CLASS class_4455 ModelValuePair
FIELD field_20275 model Ljava/util/List;
FIELD field_20276 propertyValues Ljava/util/List;
METHOD <init> (Ljava/lang/String;)V
ARG 1 message
CLASS class_4455 ModelDefinition
FIELD field_20275 components Ljava/util/List;
FIELD field_20276 values Ljava/util/List;
METHOD <init> (Ljava/lang/String;)V
ARG 1 message
METHOD <init> (Ljava/util/List;Ljava/util/List;)V
ARG 1 components
ARG 2 values
METHOD equals (Ljava/lang/Object;)Z
ARG 1 o
METHOD method_21607 create (Lnet/minecraft/class_2680;Lnet/minecraft/class_816;Ljava/util/Collection;)Lnet/minecraft/class_1088$class_4455;
ARG 0 state
ARG 1 rawModel
ARG 2 properties
METHOD method_21608 create (Lnet/minecraft/class_2680;Lnet/minecraft/class_1100;Ljava/util/Collection;)Lnet/minecraft/class_1088$class_4455;
METHOD method_21609 getValues (Lnet/minecraft/class_2680;Ljava/util/Collection;)Ljava/util/List;
ARG 0 state
ARG 1 rawModel
ARG 2 properties
METHOD method_21609 getStateValues (Lnet/minecraft/class_2680;Ljava/util/Collection;)Ljava/util/List;
ARG 0 state
ARG 1 properties
FIELD field_17907 spriteAtlasData Lnet/minecraft/class_1059$class_4007;
FIELD field_20273 currentModelIndex I
FIELD field_20274 stateToModelIndex Lit/unimi/dsi/fastutil/objects/Object2IntMap;
FIELD field_21020 BLOCK_BREAKING_STAGES Ljava/util/List;
FIELD field_20272 colorationManager Lnet/minecraft/class_324;
FIELD field_20273 nextStateId I
FIELD field_20274 stateLookup Lit/unimi/dsi/fastutil/objects/Object2IntMap;
FIELD field_20845 SHULKER Lnet/minecraft/class_2960;
FIELD field_20846 SHULKER_COLORS Ljava/util/List;
FIELD field_20847 BANNER_BASE Lnet/minecraft/class_2960;
FIELD field_20848 BLOCK_DESTRUCTION_STAGES Ljava/util/List;
FIELD field_21014 OAK_SIGN Lnet/minecraft/class_2960;
FIELD field_21015 SPRUCE_SIGN Lnet/minecraft/class_2960;
FIELD field_21016 BIRCH_SIGN Lnet/minecraft/class_2960;
FIELD field_21017 ACACIA_SIGN Lnet/minecraft/class_2960;
FIELD field_21018 JUNGLE_SIGN Lnet/minecraft/class_2960;
FIELD field_21019 DARK_OAK_SIGN Lnet/minecraft/class_2960;
FIELD field_21020 BLOCK_DESTRUCTION_STAGE_TEXTURES Ljava/util/List;
FIELD field_21557 SHIELD_BASE Lnet/minecraft/class_2960;
FIELD field_21558 SHIELD_BASE_NO_PATTERN Lnet/minecraft/class_2960;
FIELD field_5370 FIRE_1 Lnet/minecraft/class_2960;
FIELD field_5371 MISSING_DEFINITION Ljava/lang/String;
FIELD field_5372 KEY_VALUE_SPLITTER Lcom/google/common/base/Splitter;
@ -36,15 +66,18 @@ CLASS net/minecraft/class_1088 net/minecraft/client/render/model/ModelLoader
FIELD field_5400 GENERATION_MARKER Lnet/minecraft/class_793;
FIELD field_5402 spriteAtlas Lnet/minecraft/class_1059;
METHOD <init> (Lnet/minecraft/class_3300;Lnet/minecraft/class_1059;Lnet/minecraft/class_324;Lnet/minecraft/class_3695;)V
ARG 1 resourceManager
ARG 2 spriteAtlas
ARG 3 colorationManager
ARG 4 profiler
METHOD method_15878 bake (Lnet/minecraft/class_2960;Lnet/minecraft/class_3665;)Lnet/minecraft/class_1087;
ARG 1 id
ARG 2 settings
METHOD method_18177 upload (Lnet/minecraft/class_3695;)V
ARG 1 profiler
METHOD method_21603 groupBlockStates (Ljava/lang/Iterable;)V
METHOD method_21603 addStates (Ljava/lang/Iterable;)V
ARG 1 states
METHOD method_21605 getStateToModelIndex ()Lit/unimi/dsi/fastutil/objects/Object2IntMap;
METHOD method_21605 getStateLookup ()Lit/unimi/dsi/fastutil/objects/Object2IntMap;
METHOD method_4715 loadModel (Lnet/minecraft/class_2960;)V
ARG 1 id
METHOD method_4718 loadModelFromJson (Lnet/minecraft/class_2960;)Lnet/minecraft/class_793;

View File

@ -11,5 +11,6 @@ CLASS net/minecraft/class_1095 net/minecraft/client/render/model/MultipartBakedM
FIELD field_5428 itemPropertyOverrides Lnet/minecraft/class_806;
FIELD field_5429 depthGui Z
FIELD field_5430 ambientOcclusion Z
FIELD field_5431 stateCache Ljava/util/Map;
METHOD <init> (Ljava/util/List;)V
ARG 1 components

View File

@ -4,8 +4,8 @@ CLASS net/minecraft/class_816 net/minecraft/client/render/model/MultipartUnbaked
METHOD <init> (Lnet/minecraft/class_790$class_791;)V
ARG 1 context
METHOD deserialize (Lcom/google/gson/JsonElement;Ljava/lang/reflect/Type;Lcom/google/gson/JsonDeserializationContext;)Ljava/lang/Object;
ARG 1 functionJson
ARG 2 unused
ARG 1 json
ARG 2 type
ARG 3 context
METHOD method_3522 deserializeComponents (Lcom/google/gson/JsonDeserializationContext;Lcom/google/gson/JsonArray;)Ljava/util/List;
ARG 1 context

View File

@ -3,6 +3,7 @@ CLASS net/minecraft/class_1100 net/minecraft/client/render/model/UnbakedModel
ARG 1 loader
ARG 2 textureGetter
ARG 3 rotationContainer
ARG 4 modelId
METHOD method_4754 getTextureDependencies (Ljava/util/function/Function;Ljava/util/Set;)Ljava/util/Collection;
ARG 1 unbakedModelGetter
ARG 2 unresolvedTextureReferences

View File

@ -5,7 +5,7 @@ CLASS net/minecraft/class_1097 net/minecraft/client/render/model/WeightedBakedMo
METHOD method_4752 add (Lnet/minecraft/class_1087;I)Lnet/minecraft/class_1097$class_1098;
ARG 1 model
ARG 2 weight
CLASS class_1099 ModelEntry
CLASS class_1099 Entry
FIELD field_5437 model Lnet/minecraft/class_1087;
METHOD <init> (Lnet/minecraft/class_1087;I)V
ARG 1 model

View File

@ -4,7 +4,11 @@ CLASS net/minecraft/class_801 net/minecraft/client/render/model/json/ItemModelGe
FIELD field_4272 level I
FIELD field_4273 max I
FIELD field_4274 min I
METHOD <init> (Lnet/minecraft/class_801$class_803;II)V
ARG 2 width
ARG 3 depth
METHOD method_3483 expand (I)V
ARG 1 newValue
METHOD method_3484 getSide ()Lnet/minecraft/class_801$class_803;
METHOD method_3485 getMax ()I
METHOD method_3486 getLevel ()I
@ -13,6 +17,10 @@ CLASS net/minecraft/class_801 net/minecraft/client/render/model/json/ItemModelGe
FIELD field_4276 direction Lnet/minecraft/class_2350;
FIELD field_4279 offsetY I
FIELD field_4280 offsetX I
METHOD <init> (Ljava/lang/String;ILnet/minecraft/class_2350;II)V
ARG 3 direction
ARG 4 offsetX
ARG 5 offsetY
METHOD method_3488 getDirection ()Lnet/minecraft/class_2350;
METHOD method_3489 getOffsetY ()I
METHOD method_3490 getOffsetX ()I
@ -23,9 +31,14 @@ CLASS net/minecraft/class_801 net/minecraft/client/render/model/json/ItemModelGe
ARG 2 frame
ARG 3 x
ARG 4 y
ARG 5 sizeX
ARG 6 sizeY
METHOD method_3476 buildCube (Lnet/minecraft/class_801$class_803;Ljava/util/List;Lnet/minecraft/class_1058;IIIIIZ)V
ARG 2 cubes
ARG 3 sprite
ARG 4 frame
ARG 5 x
ARG 6 y
METHOD method_3478 getFrames (Lnet/minecraft/class_1058;)Ljava/util/List;
ARG 1 sprite
METHOD method_3479 create (Ljava/util/function/Function;Lnet/minecraft/class_793;)Lnet/minecraft/class_793;
ARG 1 textureGetter
ARG 2 blockModel
@ -37,6 +50,7 @@ CLASS net/minecraft/class_801 net/minecraft/client/render/model/json/ItemModelGe
ARG 1 sprite
ARG 2 key
ARG 3 layer
METHOD method_3482 (Ljava/util/List;Lnet/minecraft/class_801$class_803;II)V
METHOD method_3482 buildCube (Ljava/util/List;Lnet/minecraft/class_801$class_803;II)V
ARG 1 cubes
ARG 3 x
ARG 4 y

View File

@ -1,5 +1,9 @@
CLASS net/minecraft/class_785 net/minecraft/client/render/model/json/ModelElement
CLASS class_786 Deserializer
METHOD deserialize (Lcom/google/gson/JsonElement;Ljava/lang/reflect/Type;Lcom/google/gson/JsonDeserializationContext;)Ljava/lang/Object;
ARG 1 json
ARG 2 type
ARG 3 context
METHOD method_3403 deserializeRotationAngle (Lcom/google/gson/JsonObject;)F
ARG 1 object
METHOD method_3404 deserializeFaces (Lcom/google/gson/JsonDeserializationContext;Lcom/google/gson/JsonObject;)Ljava/util/Map;
@ -36,5 +40,6 @@ CLASS net/minecraft/class_785 net/minecraft/client/render/model/json/ModelElemen
ARG 3 faces
ARG 4 rotation
ARG 5 shade
METHOD method_3401 getUvs (Lnet/minecraft/class_2350;)[F
METHOD method_3402 setUvs ()V
METHOD method_3401 getRotatedMatrix (Lnet/minecraft/class_2350;)[F
ARG 1 direction
METHOD method_3402 initTextures ()V

View File

@ -19,6 +19,8 @@ CLASS net/minecraft/class_787 net/minecraft/client/render/model/json/ModelElemen
ARG 2 rotation
METHOD method_3413 getRotatedUVIndex (I)I
ARG 1 rotation
METHOD method_3414 getDirectionIndex (I)I
ARG 1 offset
METHOD method_3415 getU (I)F
ARG 1 rotation
METHOD method_3416 getV (I)F

View File

@ -1,8 +1,11 @@
CLASS net/minecraft/class_1080 net/minecraft/client/resource/metadata/AnimationFrameResourceMetadata
FIELD field_5340 time I
FIELD field_5341 index I
METHOD <init> (I)V
ARG 1 index
METHOD <init> (II)V
ARG 1 index
ARG 2 time
METHOD method_4689 usesDefaultFrameTime ()Z
METHOD method_4690 getIndex ()I
METHOD method_4691 getTime ()I

View File

@ -10,10 +10,14 @@ CLASS net/minecraft/class_1079 net/minecraft/client/resource/metadata/AnimationR
ARG 2 width
ARG 3 height
ARG 4 defaultFrameTime
ARG 5 interpolate
METHOD method_4680 getFrameIndex (I)I
ARG 1 frameIndex
METHOD method_4681 getFrame (I)Lnet/minecraft/class_1080;
ARG 1 frameIndex
METHOD method_4682 getFrameCount ()I
METHOD method_4683 getFrameTime (I)I
ARG 1 frameIndex
METHOD method_4684 getDefaultFrameTime ()I
METHOD method_4685 shouldInterpolate ()Z
METHOD method_4686 getHeight ()I

View File

@ -15,16 +15,27 @@ CLASS net/minecraft/class_1058 net/minecraft/client/texture/Sprite
FIELD field_5271 animationMetadata Lnet/minecraft/class_1079;
FIELD field_5272 frameTicks I
FIELD field_5273 frameIndex I
FIELD field_5274 srgbLinearMap [F
FIELD field_5274 SRGB_LINEAR_MAP [F
METHOD <init> (Lnet/minecraft/class_2960;II)V
ARG 1 id
ARG 2 width
ARG 3 height
METHOD <init> (Lnet/minecraft/class_2960;Lnet/minecraft/class_1050;Lnet/minecraft/class_1079;)V
ARG 1 id
ARG 2 sourceFile
ARG 3 animationData
METHOD method_18340 isDivisibleBy (II)Z
ARG 0 number
ARG 1 divisor
METHOD method_18341 getDimensions (IIII)Lcom/mojang/datafixers/util/Pair;
ARG 0 animationMetadataWidth
ARG 1 animationMetadataHeight
ARG 2 width
ARG 3 height
METHOD method_4570 getV (D)F
ARG 0 frameWidth
ARG 1 frameHeight
ARG 2 imageWidth
ARG 3 imageHeight
METHOD method_23841 getFrameDeltaFactor ()F
METHOD method_23842 getAnimationFrameDelta ()F
METHOD method_4570 getFrameV (D)F
ARG 1 frame
METHOD method_4571 lerp (DII)I
ARG 1 multiplier
ARG 3 first
@ -32,13 +43,19 @@ CLASS net/minecraft/class_1058 net/minecraft/client/texture/Sprite
METHOD method_4573 upload (I)V
ARG 1 frame
METHOD method_4574 srgbToLinear (I)F
ARG 0 rgbComponentValue
METHOD method_4575 getMaxV ()F
METHOD method_4576 load (Lnet/minecraft/class_3298;I)V
ARG 1 resource
ARG 2 mipLevel
METHOD method_4577 getMaxU ()F
METHOD method_4578 getWidth ()I
METHOD method_4579 upload (II[Lnet/minecraft/class_1011;)V
METHOD method_4580 getU (D)F
ARG 1 frameX
ARG 2 frameY
ARG 3 output
METHOD method_4580 getFrameU (D)F
ARG 1 frame
METHOD method_4581 blendPixels (IIIIZ)I
ARG 0 colorTopLeft
ARG 1 colorTopRight
@ -63,6 +80,7 @@ CLASS net/minecraft/class_1058 net/minecraft/client/texture/Sprite
ARG 3 x
ARG 4 y
METHOD method_4590 generateMipmaps (I)V
ARG 1 mipLevel
METHOD method_4591 generateMipmapsInternal (I)V
ARG 1 mipLevels
METHOD method_4592 getFrameCount ()I

View File

@ -33,9 +33,10 @@ CLASS net/minecraft/class_1159 net/minecraft/client/util/math/Matrix4f
METHOD method_4927 writeToBuffer (Ljava/nio/FloatBuffer;Z)V
ARG 1 buffer
ARG 2 atBufferStart
METHOD method_4929 (DFFF)Lnet/minecraft/class_1159;
METHOD method_4929 viewboxMatrix (DFFF)Lnet/minecraft/class_1159;
ARG 0 fov
ARG 2 aspectRatio
ARG 3 cameraDepth
ARG 4 viewDistance
METHOD method_4931 set (IIF)V
ARG 1 row

View File

@ -8,6 +8,8 @@ CLASS net/minecraft/class_1162 net/minecraft/client/util/math/Vector4f
ARG 2 y
ARG 3 z
ARG 4 w
METHOD <init> (Lnet/minecraft/class_1160;)V
ARG 1 vector
METHOD equals (Ljava/lang/Object;)Z
ARG 1 o
METHOD method_22674 multiply (Lnet/minecraft/class_1159;)V
@ -23,8 +25,18 @@ CLASS net/minecraft/class_1162 net/minecraft/client/util/math/Vector4f
ARG 3 y
ARG 4 z
ARG 5 w
METHOD method_23851 set (FFFF)V
ARG 1 x
ARG 2 y
ARG 3 z
ARG 4 w
METHOD method_23852 setQuarternion (Lnet/minecraft/class_1158;)V
ARG 1 quarternion
METHOD method_23853 getW ()F
METHOD method_4953 getX ()F
METHOD method_4954 multiplyXyz (Lnet/minecraft/class_1160;)V
ARG 1 other
METHOD method_4954 multiplyComponentwise (Lnet/minecraft/class_1160;)V
ARG 1 vector
METHOD method_4956 getY ()F
METHOD method_4957 getZ ()F
METHOD method_4959 (Lnet/minecraft/class_1158;)V
ARG 1 quaternion

View File

@ -1,6 +1,6 @@
CLASS net/minecraft/class_4080 net/minecraft/resource/SinglePreparationResourceReloadListener
METHOD method_18788 apply (Ljava/lang/Object;Lnet/minecraft/class_3300;Lnet/minecraft/class_3695;)V
ARG 1 preparedObject
ARG 1 loader
ARG 2 manager
ARG 3 profiler
METHOD method_18789 prepare (Lnet/minecraft/class_3300;Lnet/minecraft/class_3695;)Ljava/lang/Object;