From 8b90654bcdf095e509ce5e009ebdf9305f5d4b1e Mon Sep 17 00:00:00 2001 From: asiekierka Date: Wed, 24 Aug 2016 19:54:06 +0200 Subject: [PATCH] initial work on models --- .../client/render/item/ItemModelMap.mapping | 22 ++++++++++++++ .../render/item/ItemModelMapper.mapping | 3 ++ .../render/{ => item}/ItemRenderer.mapping | 14 ++++----- .../client/render/model/BakedQuad.mapping | 6 ++++ .../client/render/model/IBakedModel.mapping | 5 ++++ .../client/render/model/Model.mapping | 7 +++++ .../client/render/model/ModelManager.mapping | 30 +++++++++++++++++++ .../client/render/model/ModelRotation.mapping | 27 +++++++++++++++++ .../client/render/model/ModelVariant.mapping | 16 ++++++++++ .../client/util/ItemModelMapper.mapping | 3 -- .../ImportantModelRelatedManager.mapping | 2 -- .../net/minecraft/util/math/MathUtils.mapping | 1 + mappings/none/bov.mapping | 9 ------ mappings/none/bzl.mapping | 5 ++++ mappings/none/bzn.mapping | 1 + mappings/none/bzp.mapping | 5 ++++ mappings/none/bzq.mapping | 5 ++++ mappings/none/bzr.mapping | 5 ++++ 18 files changed, 145 insertions(+), 21 deletions(-) create mode 100644 mappings/net/minecraft/client/render/item/ItemModelMap.mapping create mode 100644 mappings/net/minecraft/client/render/item/ItemModelMapper.mapping rename mappings/net/minecraft/client/render/{ => item}/ItemRenderer.mapping (87%) create mode 100644 mappings/net/minecraft/client/render/model/BakedQuad.mapping create mode 100644 mappings/net/minecraft/client/render/model/IBakedModel.mapping create mode 100644 mappings/net/minecraft/client/render/model/Model.mapping create mode 100644 mappings/net/minecraft/client/render/model/ModelManager.mapping create mode 100644 mappings/net/minecraft/client/render/model/ModelRotation.mapping create mode 100644 mappings/net/minecraft/client/render/model/ModelVariant.mapping delete mode 100644 mappings/net/minecraft/client/util/ItemModelMapper.mapping delete mode 100644 mappings/net/minecraft/sortme/ImportantModelRelatedManager.mapping delete mode 100644 mappings/none/bov.mapping create mode 100644 mappings/none/bzl.mapping create mode 100644 mappings/none/bzp.mapping create mode 100644 mappings/none/bzq.mapping create mode 100644 mappings/none/bzr.mapping diff --git a/mappings/net/minecraft/client/render/item/ItemModelMap.mapping b/mappings/net/minecraft/client/render/item/ItemModelMap.mapping new file mode 100644 index 0000000000..5bc6b1e33b --- /dev/null +++ b/mappings/net/minecraft/client/render/item/ItemModelMap.mapping @@ -0,0 +1,22 @@ +CLASS none/bov net/minecraft/client/render/item/ItemModelMap + FIELD a modelIds Ljava/util/Map; + FIELD b models Ljava/util/Map; + FIELD c modelMappers Ljava/util/Map; + METHOD a addModel (Lnone/aeo;ILnone/bzo;)V + ARG 0 item + ARG 1 meta + ARG 2 id + METHOD a addMapper (Lnone/aeo;Lnone/bow;)V + ARG 0 item + ARG 1 mapper + METHOD a getModel (Lnone/aeq;)Lnone/bzj; + ARG 0 stack + METHOD b reloadModels ()V + METHOD b getModel (Lnone/aeo;I)Lnone/bzj; + ARG 0 item + ARG 1 metadata + METHOD b getMetadata (Lnone/aeq;)I + ARG 0 stack + METHOD c getItemMetaPair (Lnone/aeo;I)I + ARG 0 item + ARG 1 metadata diff --git a/mappings/net/minecraft/client/render/item/ItemModelMapper.mapping b/mappings/net/minecraft/client/render/item/ItemModelMapper.mapping new file mode 100644 index 0000000000..403151f907 --- /dev/null +++ b/mappings/net/minecraft/client/render/item/ItemModelMapper.mapping @@ -0,0 +1,3 @@ +CLASS none/bow net/minecraft/client/render/item/ItemModelMapper + METHOD a getModel (Lnone/aeq;)Lnone/bzo; + ARG 0 stack diff --git a/mappings/net/minecraft/client/render/ItemRenderer.mapping b/mappings/net/minecraft/client/render/item/ItemRenderer.mapping similarity index 87% rename from mappings/net/minecraft/client/render/ItemRenderer.mapping rename to mappings/net/minecraft/client/render/item/ItemRenderer.mapping index 2b4f9cd037..951d624e07 100644 --- a/mappings/net/minecraft/client/render/ItemRenderer.mapping +++ b/mappings/net/minecraft/client/render/item/ItemRenderer.mapping @@ -1,19 +1,19 @@ -CLASS none/bto net/minecraft/client/render/ItemRenderer +CLASS none/bto net/minecraft/client/render/item/ItemRenderer CLASS none/bto$5 METHOD a getModel (Lnone/aeq;)Lnone/bzo; - ARG 0 stasck + ARG 0 stack CLASS none/bto$6 METHOD a getModel (Lnone/aeq;)Lnone/bzo; - ARG 0 stasck + ARG 0 stack CLASS none/bto$7 METHOD a getModel (Lnone/aeq;)Lnone/bzo; - ARG 0 stasck + ARG 0 stack CLASS none/bto$8 METHOD a getModel (Lnone/aeq;)Lnone/bzo; - ARG 0 stasck + ARG 0 stack CLASS none/bto$9 METHOD a getModel (Lnone/aeq;)Lnone/bzo; - ARG 0 stasck + ARG 0 stack FIELD b ENCHANTMENT_GLINT_TEX Lnone/kp; FIELD e textureManager Lnone/bxc; FIELD f itemColorMap Lnone/bea; @@ -39,7 +39,7 @@ CLASS none/bto net/minecraft/client/render/ItemRenderer ARG 1 stack ARG 2 x ARG 3 y - METHOD a renderItemInGIU (Lnone/bec;Lnone/aeq;IILjava/lang/String;)V + METHOD a renderItemInGUI (Lnone/bec;Lnone/aeq;IILjava/lang/String;)V ARG 0 fontRenderer ARG 1 stack ARG 2 x diff --git a/mappings/net/minecraft/client/render/model/BakedQuad.mapping b/mappings/net/minecraft/client/render/model/BakedQuad.mapping new file mode 100644 index 0000000000..92ba3d7665 --- /dev/null +++ b/mappings/net/minecraft/client/render/model/BakedQuad.mapping @@ -0,0 +1,6 @@ +CLASS none/bpp net/minecraft/client/render/model/BakedQuad + FIELD b colorIndex I + METHOD ([IILnone/cu;Lnone/bxb;)V + ARG 1 colorIndex + METHOD c hasColor ()Z + METHOD d getColorIndex ()I diff --git a/mappings/net/minecraft/client/render/model/IBakedModel.mapping b/mappings/net/minecraft/client/render/model/IBakedModel.mapping new file mode 100644 index 0000000000..5a98b6ba95 --- /dev/null +++ b/mappings/net/minecraft/client/render/model/IBakedModel.mapping @@ -0,0 +1,5 @@ +CLASS none/bzj net/minecraft/client/render/model/IBakedModel + METHOD a getQuads (Lnone/asj;Lnone/cu;J)Ljava/util/List; + ARG 0 state + ARG 1 face + ARG 2 rand diff --git a/mappings/net/minecraft/client/render/model/Model.mapping b/mappings/net/minecraft/client/render/model/Model.mapping new file mode 100644 index 0000000000..27c333ab24 --- /dev/null +++ b/mappings/net/minecraft/client/render/model/Model.mapping @@ -0,0 +1,7 @@ +CLASS none/bpu net/minecraft/client/render/model/Model + FIELD f LOGGER Lorg/apache/logging/log4j/Logger; + FIELD i ambientOcclusion Z + METHOD (Lnone/kp;Ljava/util/List;Ljava/util/Map;ZZLnone/bqc;Ljava/util/List;)V + ARG 3 ambientOcclusion + METHOD a load (Ljava/io/Reader;)Lnone/bpu; + METHOD a load (Ljava/lang/String;)Lnone/bpu; diff --git a/mappings/net/minecraft/client/render/model/ModelManager.mapping b/mappings/net/minecraft/client/render/model/ModelManager.mapping new file mode 100644 index 0000000000..9dd358c4a4 --- /dev/null +++ b/mappings/net/minecraft/client/render/model/ModelManager.mapping @@ -0,0 +1,30 @@ +CLASS none/bzm net/minecraft/client/render/model/ModelManager + FIELD b DEFAULT_TEXTURES Ljava/util/Set; + FIELD c LOGGER Lorg/apache/logging/log4j/Logger; + FIELD g resourceContainer Lnone/bya; + FIELD i models Ljava/util/Map; + FIELD l spriteAtlas Lnone/bxa; + 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 v itemVariantLists Ljava/util/Map; + METHOD (Lnone/bya;Lnone/bxa;Lnone/bpl;)V + ARG 0 resourceContainer + ARG 1 spriteAtlas + METHOD a reloadModelRegistry ()Lnone/dg; + METHOD a loadItemModel (Ljava/lang/String;Lnone/kp;Lnone/kp;)V + ARG 0 variant + ARG 2 itemId + METHOD a getItemVariants (Lnone/aeo;)Ljava/util/List; + ARG 0 item + METHOD a loadBlockModel (Lnone/bzo;Lnone/bqd;)V + ARG 0 id + METHOD b loadBlockModels ()V + METHOD b getBlockstateFileLocation (Lnone/kp;)Lnone/kp; + ARG 0 id + METHOD c loadModel (Lnone/kp;)Lnone/bpu; + ARG 0 id + METHOD d getModelFileLocation (Lnone/kp;)Lnone/kp; + ARG 0 id + METHOD g addItemVariants ()V diff --git a/mappings/net/minecraft/client/render/model/ModelRotation.mapping b/mappings/net/minecraft/client/render/model/ModelRotation.mapping new file mode 100644 index 0000000000..d8dd8266be --- /dev/null +++ b/mappings/net/minecraft/client/render/model/ModelRotation.mapping @@ -0,0 +1,27 @@ +CLASS none/bzk net/minecraft/client/render/model/ModelRotation + FIELD a X0_Y0 Lnone/bzk; + FIELD b X0_Y90 Lnone/bzk; + FIELD c X0_Y180 Lnone/bzk; + FIELD d X0_Y270 Lnone/bzk; + FIELD e X90_Y0 Lnone/bzk; + FIELD f X90_Y90 Lnone/bzk; + FIELD g X90_Y180 Lnone/bzk; + FIELD h X90_Y270 Lnone/bzk; + FIELD i X180_Y0 Lnone/bzk; + FIELD j X180_Y90 Lnone/bzk; + FIELD k X180_Y180 Lnone/bzk; + FIELD l X180_Y270 Lnone/bzk; + FIELD m X270_Y0 Lnone/bzk; + FIELD n X270_Y90 Lnone/bzk; + FIELD o X270_Y180 Lnone/bzk; + FIELD p X270_Y270 Lnone/bzk; + FIELD q ROTATIONS Ljava/util/Map; + FIELD r index I + FIELD s matrix Lorg/lwjgl/util/vector/Matrix4f; + METHOD a getMatrix ()Lorg/lwjgl/util/vector/Matrix4f; + METHOD a get (II)Lnone/bzk; + ARG 0 x + ARG 1 y + METHOD b getIndex (II)I + ARG 0 x + ARG 1 y diff --git a/mappings/net/minecraft/client/render/model/ModelVariant.mapping b/mappings/net/minecraft/client/render/model/ModelVariant.mapping new file mode 100644 index 0000000000..90cbad75cc --- /dev/null +++ b/mappings/net/minecraft/client/render/model/ModelVariant.mapping @@ -0,0 +1,16 @@ +CLASS none/bqe net/minecraft/client/render/model/ModelVariant + FIELD a location Lnone/kp; + FIELD b rotation Lnone/bzk; + FIELD c uvLock Z + FIELD d weight I + METHOD (Lnone/kp;Lnone/bzk;ZI)V + ARG 0 location + ARG 1 rotation + ARG 2 uvLock + ARG 3 weight + METHOD a getLocation ()Lnone/kp; + METHOD b getRotation ()Lnone/bzk; + METHOD c isUvLocked ()Z + METHOD d getWeighjt ()I + METHOD equals (Ljava/lang/Object;)Z + ARG 0 other diff --git a/mappings/net/minecraft/client/util/ItemModelMapper.mapping b/mappings/net/minecraft/client/util/ItemModelMapper.mapping deleted file mode 100644 index a0359283fe..0000000000 --- a/mappings/net/minecraft/client/util/ItemModelMapper.mapping +++ /dev/null @@ -1,3 +0,0 @@ -CLASS none/bow net/minecraft/client/util/ItemModelMapper - METHOD a getModel (Lnone/aeq;)Lnone/bzo; - ARG 0 stasck diff --git a/mappings/net/minecraft/sortme/ImportantModelRelatedManager.mapping b/mappings/net/minecraft/sortme/ImportantModelRelatedManager.mapping deleted file mode 100644 index 28846525a1..0000000000 --- a/mappings/net/minecraft/sortme/ImportantModelRelatedManager.mapping +++ /dev/null @@ -1,2 +0,0 @@ -CLASS none/bzm net/minecraft/sortme/ImportantModelRelatedManager - FIELD l spriteAtlas Lnone/bxa; diff --git a/mappings/net/minecraft/util/math/MathUtils.mapping b/mappings/net/minecraft/util/math/MathUtils.mapping index 9b4d61acad..aa8cc68837 100644 --- a/mappings/net/minecraft/util/math/MathUtils.mapping +++ b/mappings/net/minecraft/util/math/MathUtils.mapping @@ -32,6 +32,7 @@ CLASS none/or net/minecraft/util/math/MathUtils METHOD b cos (F)F METHOD b wrapDegrees (I)I ARG 0 val + METHOD b (II)I METHOD c floor (D)I METHOD c sqrt (F)F ARG 0 f diff --git a/mappings/none/bov.mapping b/mappings/none/bov.mapping deleted file mode 100644 index 9f3f2f7991..0000000000 --- a/mappings/none/bov.mapping +++ /dev/null @@ -1,9 +0,0 @@ -CLASS none/bov - METHOD b (Lnone/aeo;I)Lnone/bzj; - ARG 0 item - ARG 1 metadata - METHOD b getMetadata (Lnone/aeq;)I - ARG 0 stack - METHOD c getItemMetaPair (Lnone/aeo;I)I - ARG 0 item - ARG 1 metadata diff --git a/mappings/none/bzl.mapping b/mappings/none/bzl.mapping new file mode 100644 index 0000000000..77d0bea5d7 --- /dev/null +++ b/mappings/none/bzl.mapping @@ -0,0 +1,5 @@ +CLASS none/bzl + METHOD a getQuads (Lnone/asj;Lnone/cu;J)Ljava/util/List; + ARG 0 state + ARG 1 face + ARG 2 rand diff --git a/mappings/none/bzn.mapping b/mappings/none/bzn.mapping index 746d516fd8..310167b77e 100644 --- a/mappings/none/bzn.mapping +++ b/mappings/none/bzn.mapping @@ -1,3 +1,4 @@ CLASS none/bzn + FIELD a modelRegistry Lnone/dg; METHOD a onResourceReload (Lnone/bya;)V ARG 0 container diff --git a/mappings/none/bzp.mapping b/mappings/none/bzp.mapping new file mode 100644 index 0000000000..e3dfe0907d --- /dev/null +++ b/mappings/none/bzp.mapping @@ -0,0 +1,5 @@ +CLASS none/bzp + METHOD a getQuads (Lnone/asj;Lnone/cu;J)Ljava/util/List; + ARG 0 state + ARG 1 face + ARG 2 rand diff --git a/mappings/none/bzq.mapping b/mappings/none/bzq.mapping new file mode 100644 index 0000000000..0c3dfb3eaa --- /dev/null +++ b/mappings/none/bzq.mapping @@ -0,0 +1,5 @@ +CLASS none/bzq + METHOD a getQuads (Lnone/asj;Lnone/cu;J)Ljava/util/List; + ARG 0 state + ARG 1 face + ARG 2 rand diff --git a/mappings/none/bzr.mapping b/mappings/none/bzr.mapping new file mode 100644 index 0000000000..67b3f04704 --- /dev/null +++ b/mappings/none/bzr.mapping @@ -0,0 +1,5 @@ +CLASS none/bzr + METHOD a getQuads (Lnone/asj;Lnone/cu;J)Ljava/util/List; + ARG 0 state + ARG 1 face + ARG 2 rand