From 5ffd55f7ae4ff984824aa284442e148950d15484 Mon Sep 17 00:00:00 2001 From: asiekierka Date: Sat, 10 Sep 2016 21:26:52 +0200 Subject: [PATCH] slight model data format progress --- .../client/render/block/BlockStateMap.mapping | 11 ---------- .../render/block/BlockStateModelMap.mapping | 13 ++++++++++++ ...ps.mapping => BlockStateModelMaps.mapping} | 8 ++++---- .../client/render/model/BakedModel.mapping | 12 +++++++++++ .../render/model/BakedModelWeighted.mapping | 13 ++++++++++++ .../client/render/model/BakedQuad.mapping | 4 ++++ .../render/model/BakedQuadRetextured.mapping | 3 +++ .../client/render/model/Model.mapping | 11 ++++++++++ .../client/render/model/ModelElement.mapping | 10 ++++++++++ .../render/model/ModelElementFace.mapping | 9 +++++++++ .../render/model/ModelElementRotation.mapping | 1 + .../client/render/model/ModelManager.mapping | 20 +++++++++++++++++-- .../client/render/model/ModelOverride.mapping | 1 + .../client/render/model/ModelVariant.mapping | 2 +- .../render/model/ModelVariantMap.mapping | 11 ++++++++++ .../render/model/ModelVariantSet.mapping | 7 +++++++ .../minecraft/client/render/model/bpq.mapping | 1 - .../minecraft/client/render/model/bpr.mapping | 1 - .../minecraft/client/render/model/bpt.mapping | 7 +++++++ .../minecraft/client/render/model/bpz.mapping | 1 - .../sortme/BlockVariantContainer.mapping | 2 -- .../world/entity/WorldEntityTracker.mapping | 3 +++ .../entity/WorldEntityTrackingManager.mapping | 1 + 23 files changed, 129 insertions(+), 23 deletions(-) delete mode 100644 mappings/net/minecraft/client/render/block/BlockStateMap.mapping create mode 100644 mappings/net/minecraft/client/render/block/BlockStateModelMap.mapping rename mappings/net/minecraft/client/render/block/{BlockStateMaps.mapping => BlockStateModelMaps.mapping} (82%) create mode 100644 mappings/net/minecraft/client/render/model/BakedQuadRetextured.mapping create mode 100644 mappings/net/minecraft/client/render/model/ModelElement.mapping create mode 100644 mappings/net/minecraft/client/render/model/ModelElementFace.mapping create mode 100644 mappings/net/minecraft/client/render/model/ModelElementRotation.mapping create mode 100644 mappings/net/minecraft/client/render/model/ModelOverride.mapping create mode 100644 mappings/net/minecraft/client/render/model/ModelVariantMap.mapping create mode 100644 mappings/net/minecraft/client/render/model/ModelVariantSet.mapping delete mode 100644 mappings/net/minecraft/client/render/model/bpq.mapping delete mode 100644 mappings/net/minecraft/client/render/model/bpr.mapping delete mode 100644 mappings/net/minecraft/client/render/model/bpz.mapping delete mode 100644 mappings/net/minecraft/client/sortme/BlockVariantContainer.mapping diff --git a/mappings/net/minecraft/client/render/block/BlockStateMap.mapping b/mappings/net/minecraft/client/render/block/BlockStateMap.mapping deleted file mode 100644 index bb9f717c17..0000000000 --- a/mappings/net/minecraft/client/render/block/BlockStateMap.mapping +++ /dev/null @@ -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 diff --git a/mappings/net/minecraft/client/render/block/BlockStateModelMap.mapping b/mappings/net/minecraft/client/render/block/BlockStateModelMap.mapping new file mode 100644 index 0000000000..64c5e68b8e --- /dev/null +++ b/mappings/net/minecraft/client/render/block/BlockStateModelMap.mapping @@ -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 diff --git a/mappings/net/minecraft/client/render/block/BlockStateMaps.mapping b/mappings/net/minecraft/client/render/block/BlockStateModelMaps.mapping similarity index 82% rename from mappings/net/minecraft/client/render/block/BlockStateMaps.mapping rename to mappings/net/minecraft/client/render/block/BlockStateModelMaps.mapping index 5473cddc24..ab123d58ae 100644 --- a/mappings/net/minecraft/client/render/block/BlockStateMaps.mapping +++ b/mappings/net/minecraft/client/render/block/BlockStateModelMaps.mapping @@ -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 METHOD a getModelName (Lnone/asj;)Lnone/bzo; ARG 0 state @@ -26,15 +26,15 @@ CLASS none/bpl net/minecraft/client/render/block/BlockStateMaps METHOD (Lnone/bzn;)V ARG 0 manager 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 1 stateMap METHOD a getSprite (Lnone/asj;)Lnone/bxb; ARG 0 state - METHOD a mapBuiltinStates ([Lnone/akw;)V + METHOD a registerBuiltinBlocks ([Lnone/akw;)V ARG 0 blocks METHOD b getModelManager ()Lnone/bzn; METHOD b getModel (Lnone/asj;)Lnone/bzj; ARG 0 state METHOD c reload ()V - METHOD d mapBlockStates ()V + METHOD d registerStateMappers ()V diff --git a/mappings/net/minecraft/client/render/model/BakedModel.mapping b/mappings/net/minecraft/client/render/model/BakedModel.mapping index 228533a32e..2512dae252 100644 --- a/mappings/net/minecraft/client/render/model/BakedModel.mapping +++ b/mappings/net/minecraft/client/render/model/BakedModel.mapping @@ -1,4 +1,16 @@ 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 d is3dInGui Z METHOD (Ljava/util/List;Ljava/util/Map;ZZLnone/bxb;Lnone/bqc;Lnone/bqa;)V diff --git a/mappings/net/minecraft/client/render/model/BakedModelWeighted.mapping b/mappings/net/minecraft/client/render/model/BakedModelWeighted.mapping index 0dfdc319de..54f4b75a8f 100644 --- a/mappings/net/minecraft/client/render/model/BakedModelWeighted.mapping +++ b/mappings/net/minecraft/client/render/model/BakedModelWeighted.mapping @@ -1,9 +1,22 @@ CLASS none/bzr net/minecraft/client/render/model/BakedModelWeighted 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 + FIELD b model Lnone/bzj; + METHOD (Lnone/bzj;I)V + ARG 0 model + ARG 1 weight FIELD a totalWeight I + FIELD b models Ljava/util/List; FIELD c defaultModel Lnone/bzj; METHOD a useAmbientOcclusion ()Z + METHOD a getRandomModel (J)Lnone/bzj; + ARG 0 rand METHOD a getQuads (Lnone/asj;Lnone/cu;J)Ljava/util/List; ARG 0 state ARG 1 face diff --git a/mappings/net/minecraft/client/render/model/BakedQuad.mapping b/mappings/net/minecraft/client/render/model/BakedQuad.mapping index 92ba3d7665..ca356d2f5f 100644 --- a/mappings/net/minecraft/client/render/model/BakedQuad.mapping +++ b/mappings/net/minecraft/client/render/model/BakedQuad.mapping @@ -1,6 +1,10 @@ CLASS none/bpp net/minecraft/client/render/model/BakedQuad + FIELD a vertexData [I FIELD b colorIndex I METHOD ([IILnone/cu;Lnone/bxb;)V + ARG 0 vertexData ARG 1 colorIndex + METHOD a ()Lnone/bxb; + METHOD b getVertexData ()[I METHOD c hasColor ()Z METHOD d getColorIndex ()I diff --git a/mappings/net/minecraft/client/render/model/BakedQuadRetextured.mapping b/mappings/net/minecraft/client/render/model/BakedQuadRetextured.mapping new file mode 100644 index 0000000000..a370edca6f --- /dev/null +++ b/mappings/net/minecraft/client/render/model/BakedQuadRetextured.mapping @@ -0,0 +1,3 @@ +CLASS none/bpw net/minecraft/client/render/model/BakedQuadRetextured + FIELD e texture Lnone/bxb; + METHOD f recalculateUvs ()V diff --git a/mappings/net/minecraft/client/render/model/Model.mapping b/mappings/net/minecraft/client/render/model/Model.mapping index 27c333ab24..33c2e002f5 100644 --- a/mappings/net/minecraft/client/render/model/Model.mapping +++ b/mappings/net/minecraft/client/render/model/Model.mapping @@ -1,7 +1,18 @@ 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 g elements Ljava/util/List; FIELD i ambientOcclusion Z + FIELD k overrides Ljava/util/List; METHOD (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 6 overrides METHOD a load (Ljava/io/Reader;)Lnone/bpu; METHOD a load (Ljava/lang/String;)Lnone/bpu; + METHOD b hasAmbientOcclusion ()Z + METHOD k hasParent ()Z diff --git a/mappings/net/minecraft/client/render/model/ModelElement.mapping b/mappings/net/minecraft/client/render/model/ModelElement.mapping new file mode 100644 index 0000000000..ce0d970448 --- /dev/null +++ b/mappings/net/minecraft/client/render/model/ModelElement.mapping @@ -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 (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 diff --git a/mappings/net/minecraft/client/render/model/ModelElementFace.mapping b/mappings/net/minecraft/client/render/model/ModelElementFace.mapping new file mode 100644 index 0000000000..916e3b908f --- /dev/null +++ b/mappings/net/minecraft/client/render/model/ModelElementFace.mapping @@ -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 (Lnone/cu;ILjava/lang/String;Lnone/bpt;)V + ARG 0 cullFace + ARG 1 tintIndex + ARG 2 texture diff --git a/mappings/net/minecraft/client/render/model/ModelElementRotation.mapping b/mappings/net/minecraft/client/render/model/ModelElementRotation.mapping new file mode 100644 index 0000000000..b8b2523858 --- /dev/null +++ b/mappings/net/minecraft/client/render/model/ModelElementRotation.mapping @@ -0,0 +1 @@ +CLASS none/bps net/minecraft/client/render/model/ModelElementRotation diff --git a/mappings/net/minecraft/client/render/model/ModelManager.mapping b/mappings/net/minecraft/client/render/model/ModelManager.mapping index f549a3c332..fb4b486a1c 100644 --- a/mappings/net/minecraft/client/render/model/ModelManager.mapping +++ b/mappings/net/minecraft/client/render/model/ModelManager.mapping @@ -6,13 +6,16 @@ CLASS none/bzm net/minecraft/client/render/model/ModelManager FIELD e BUILTIN_MODEL_DEFS Ljava/util/Map; FIELD f ARROW_JOINER Lcom/google/common/base/Joiner; 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 m blockStateMaps Lnone/bpl; FIELD p modelRegistry Lnone/di; FIELD q EMPTY_MODEL Ljava/lang/String; FIELD r BUILTIN_GENERATED Lnone/bpu; FIELD s BUILTIN_ENTITY Lnone/bpu; + FIELD u blockVariants Ljava/util/Map; FIELD v itemVariantLists Ljava/util/Map; METHOD (Lnone/bya;Lnone/bxa;Lnone/bpl;)V ARG 0 resourceContainer @@ -25,11 +28,24 @@ CLASS none/bzm net/minecraft/client/render/model/ModelManager ARG 0 item METHOD a loadBlockModel (Lnone/bzo;Lnone/bqd;)V 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; ARG 0 id + METHOD c loadModels ()V METHOD c loadModel (Lnone/kp;)Lnone/bpu; ARG 0 id + METHOD d loadItemBlockModels ()V METHOD d getModelFileLocation (Lnone/kp;)Lnone/kp; ARG 0 id + METHOD f loadItemCustomModels ()V METHOD g addItemVariants ()V + METHOD j ()Ljava/util/Set; + METHOD m registerSprites ()V diff --git a/mappings/net/minecraft/client/render/model/ModelOverride.mapping b/mappings/net/minecraft/client/render/model/ModelOverride.mapping new file mode 100644 index 0000000000..666e853c3e --- /dev/null +++ b/mappings/net/minecraft/client/render/model/ModelOverride.mapping @@ -0,0 +1 @@ +CLASS none/bpz net/minecraft/client/render/model/ModelOverride diff --git a/mappings/net/minecraft/client/render/model/ModelVariant.mapping b/mappings/net/minecraft/client/render/model/ModelVariant.mapping index 90cbad75cc..3811aa7a90 100644 --- a/mappings/net/minecraft/client/render/model/ModelVariant.mapping +++ b/mappings/net/minecraft/client/render/model/ModelVariant.mapping @@ -11,6 +11,6 @@ CLASS none/bqe net/minecraft/client/render/model/ModelVariant METHOD a getLocation ()Lnone/kp; METHOD b getRotation ()Lnone/bzk; METHOD c isUvLocked ()Z - METHOD d getWeighjt ()I + METHOD d getWeight ()I METHOD equals (Ljava/lang/Object;)Z ARG 0 other diff --git a/mappings/net/minecraft/client/render/model/ModelVariantMap.mapping b/mappings/net/minecraft/client/render/model/ModelVariantMap.mapping new file mode 100644 index 0000000000..1afa3970f7 --- /dev/null +++ b/mappings/net/minecraft/client/render/model/ModelVariantMap.mapping @@ -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 diff --git a/mappings/net/minecraft/client/render/model/ModelVariantSet.mapping b/mappings/net/minecraft/client/render/model/ModelVariantSet.mapping new file mode 100644 index 0000000000..4f036e3183 --- /dev/null +++ b/mappings/net/minecraft/client/render/model/ModelVariantSet.mapping @@ -0,0 +1,7 @@ +CLASS none/bqd net/minecraft/client/render/model/ModelVariantSet + FIELD a variants Ljava/util/List; + METHOD (Ljava/util/List;)V + ARG 0 variants + METHOD a getVariants ()Ljava/util/List; + METHOD equals (Ljava/lang/Object;)Z + ARG 0 other diff --git a/mappings/net/minecraft/client/render/model/bpq.mapping b/mappings/net/minecraft/client/render/model/bpq.mapping deleted file mode 100644 index 0ba5b10a2a..0000000000 --- a/mappings/net/minecraft/client/render/model/bpq.mapping +++ /dev/null @@ -1 +0,0 @@ -CLASS none/bpq net/minecraft/client/render/model/bpq diff --git a/mappings/net/minecraft/client/render/model/bpr.mapping b/mappings/net/minecraft/client/render/model/bpr.mapping deleted file mode 100644 index 04f96344b7..0000000000 --- a/mappings/net/minecraft/client/render/model/bpr.mapping +++ /dev/null @@ -1 +0,0 @@ -CLASS none/bpr net/minecraft/client/render/model/bpr diff --git a/mappings/net/minecraft/client/render/model/bpt.mapping b/mappings/net/minecraft/client/render/model/bpt.mapping index dd5beff599..0793211e4c 100644 --- a/mappings/net/minecraft/client/render/model/bpt.mapping +++ b/mappings/net/minecraft/client/render/model/bpt.mapping @@ -1 +1,8 @@ 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 diff --git a/mappings/net/minecraft/client/render/model/bpz.mapping b/mappings/net/minecraft/client/render/model/bpz.mapping deleted file mode 100644 index 31caffb5af..0000000000 --- a/mappings/net/minecraft/client/render/model/bpz.mapping +++ /dev/null @@ -1 +0,0 @@ -CLASS none/bpz net/minecraft/client/render/model/bpz diff --git a/mappings/net/minecraft/client/sortme/BlockVariantContainer.mapping b/mappings/net/minecraft/client/sortme/BlockVariantContainer.mapping deleted file mode 100644 index b9054c0ed2..0000000000 --- a/mappings/net/minecraft/client/sortme/BlockVariantContainer.mapping +++ /dev/null @@ -1,2 +0,0 @@ -CLASS none/bpv net/minecraft/client/sortme/BlockVariantContainer - FIELD a GSON Lcom/google/gson/Gson; diff --git a/mappings/net/minecraft/world/entity/WorldEntityTracker.mapping b/mappings/net/minecraft/world/entity/WorldEntityTracker.mapping index 0693518b26..4c98b8f7fe 100644 --- a/mappings/net/minecraft/world/entity/WorldEntityTracker.mapping +++ b/mappings/net/minecraft/world/entity/WorldEntityTracker.mapping @@ -3,10 +3,13 @@ CLASS none/ly net/minecraft/world/entity/WorldEntityTracker FIELD d entity Lnone/se; FIELD e trackingRange I FIELD g updateInterval I + FIELD u sendVelocityUpdates Z + FIELD z trackingPlayers Ljava/util/Set; METHOD (Lnone/se;IIIZ)V ARG 0 entity ARG 1 trackingRange ARG 3 updateInterval + ARG 4 sendVelocityUpdates METHOD a sendToAllTracking (Lnone/fl;)V ARG 0 packet METHOD b getEntity ()Lnone/se; diff --git a/mappings/net/minecraft/world/entity/WorldEntityTrackingManager.mapping b/mappings/net/minecraft/world/entity/WorldEntityTrackingManager.mapping index 1f957984cf..236f46d31c 100644 --- a/mappings/net/minecraft/world/entity/WorldEntityTrackingManager.mapping +++ b/mappings/net/minecraft/world/entity/WorldEntityTrackingManager.mapping @@ -15,6 +15,7 @@ CLASS none/lr net/minecraft/world/entity/WorldEntityTrackingManager ARG 0 entity ARG 1 trackingRange ARG 2 updateInterval + ARG 3 sendVelocityUpdates METHOD a sendToAllTracking (Lnone/se;Lnone/fl;)V ARG 0 entity ARG 1 packet