From 7d46c653013e63d407100f358ed999ac69fa48f2 Mon Sep 17 00:00:00 2001 From: asiekierka Date: Wed, 14 Sep 2016 14:48:44 +0200 Subject: [PATCH] rendering mapping work --- .../minecraft/block/impl/BlockFlower.mapping | 18 +++++++++++++++--- .../block/impl/BlockFlowerDandelion.mapping | 1 + .../block/impl/BlockFlowerPoppy.mapping | 1 + .../tile/impl/TileEntityMobSpawner.mapping | 3 +++ .../render/entity/EntityLivingRenderer.mapping | 3 +++ .../render/entity/EntityMobRenderer.mapping} | 2 +- .../impl/EntityRendererEndermite.mapping | 1 + .../entity/impl/EntityRendererItem.mapping | 5 +++++ .../impl/EntityRendererItemFrame.mapping | 8 ++++++++ .../entity/model/EntityModelMinecart.mapping | 3 +++ .../render/item/IItemModelMapper.mapping | 3 +++ .../render/item/ItemBuiltinRenderer.mapping | 9 +++++++++ .../client/render/item/ItemColorMap.mapping | 1 + .../client/render/item/ItemModelMap.mapping | 5 +++++ .../client/render/item/ItemModelMapper.mapping | 3 --- .../client/render/item/ItemRenderer.mapping | 16 ++++++++++++---- .../client/render/model/BakedModel.mapping | 1 + .../render/model/BakedModelBuiltin.mapping | 1 + .../render/model/BakedModelWeighted.mapping | 1 + .../client/render/model/IBakedModel.mapping | 1 + .../model/json/ModelItemOverride.mapping | 8 +++++++- ...g => ModelItemPropertyOverrideList.mapping} | 4 ++-- .../impl/TileEntitySkullRenderer.mapping | 2 ++ .../client/resource/IResource.mapping | 2 ++ .../client/resource/IResourceMetadata.mapping | 1 + .../minecraft/client/resource/Resource.mapping | 3 +++ .../pack/DirectoryResourcePack.mapping | 5 +++++ .../minecraft/client/texture/Texture.mapping | 1 + ...apping => EntityMobSpawnerMinecart.mapping} | 7 ++++++- .../sortme/IEntityRendererOrSomething.mapping | 3 --- .../minecraft/sortme/MobSpawnerLogic.mapping | 10 ++++++++++ mappings/none/bkm.mapping | 3 --- mappings/none/btu.mapping | 3 --- mappings/none/bvt.mapping | 3 +++ mappings/none/bzr.mapping | 1 + 35 files changed, 118 insertions(+), 24 deletions(-) create mode 100644 mappings/net/minecraft/client/render/entity/EntityLivingRenderer.mapping rename mappings/{none/btx.mapping => net/minecraft/client/render/entity/EntityMobRenderer.mapping} (55%) create mode 100644 mappings/net/minecraft/client/render/entity/model/EntityModelMinecart.mapping create mode 100644 mappings/net/minecraft/client/render/item/IItemModelMapper.mapping create mode 100644 mappings/net/minecraft/client/render/item/ItemBuiltinRenderer.mapping delete mode 100644 mappings/net/minecraft/client/render/item/ItemModelMapper.mapping rename mappings/net/minecraft/client/render/model/json/{ModelItemOverrideList.mapping => ModelItemPropertyOverrideList.mapping} (51%) create mode 100644 mappings/net/minecraft/client/resource/IResourceMetadata.mapping create mode 100644 mappings/net/minecraft/client/texture/Texture.mapping rename mappings/net/minecraft/entity/vehicle/impl/{EntitySpawnerMinecart.mapping => EntityMobSpawnerMinecart.mapping} (66%) delete mode 100644 mappings/net/minecraft/sortme/IEntityRendererOrSomething.mapping create mode 100644 mappings/net/minecraft/sortme/MobSpawnerLogic.mapping delete mode 100644 mappings/none/bkm.mapping delete mode 100644 mappings/none/btu.mapping create mode 100644 mappings/none/bvt.mapping diff --git a/mappings/net/minecraft/block/impl/BlockFlower.mapping b/mappings/net/minecraft/block/impl/BlockFlower.mapping index 9c544d9103..2d175fde57 100644 --- a/mappings/net/minecraft/block/impl/BlockFlower.mapping +++ b/mappings/net/minecraft/block/impl/BlockFlower.mapping @@ -10,14 +10,25 @@ CLASS none/amr net/minecraft/block/impl/BlockFlower FIELD h WHITE_TULIP Lnone/amr$a; FIELD i PINK_TULIP Lnone/amr$a; FIELD j OXEYE_DAISY Lnone/amr$a; + FIELD k typeArray [[Lnone/amr$a; + FIELD l blockType Lnone/amr$b; + FIELD m meta I FIELD n name Ljava/lang/String; FIELD o shortName Ljava/lang/String; METHOD (Ljava/lang/String;ILnone/amr$b;ILjava/lang/String;Ljava/lang/String;)V - METHOD a (Lnone/amr$b;I)Lnone/amr$a; + METHOD a getBlockType ()Lnone/amr$b; + METHOD a getAllTypes (Lnone/amr$b;)[Lnone/amr$a; + ARG 0 blockType + METHOD a getType (Lnone/amr$b;I)Lnone/amr$a; + ARG 0 blockType + ARG 1 meta + METHOD b getMeta ()I METHOD d getShortName ()Ljava/lang/String; METHOD m asString ()Ljava/lang/String; METHOD values values ()[Lnone/amr$a; - CLASS none/amr$b + CLASS none/amr$b BlockType + FIELD a YELLOW Lnone/amr$b; + FIELD b RED Lnone/amr$b; METHOD a getFlowerBlock ()Lnone/amr; METHOD values values ()[Lnone/amr$b; FIELD a TYPE Lnone/asz; @@ -34,6 +45,7 @@ CLASS none/amr net/minecraft/block/impl/BlockFlower ARG 2 pos METHOD d getDropItemDamage (Lnone/asl;)I ARG 0 state + METHOD e getBlockType ()Lnone/amr$b; METHOD e serializeState (Lnone/asl;)I ARG 0 state - METHOD g ()Lnone/atb; + METHOD g getTypeProperty ()Lnone/atb; diff --git a/mappings/net/minecraft/block/impl/BlockFlowerDandelion.mapping b/mappings/net/minecraft/block/impl/BlockFlowerDandelion.mapping index d0334f558d..8e30427679 100644 --- a/mappings/net/minecraft/block/impl/BlockFlowerDandelion.mapping +++ b/mappings/net/minecraft/block/impl/BlockFlowerDandelion.mapping @@ -1 +1,2 @@ CLASS none/aqz net/minecraft/block/impl/BlockFlowerDandelion + METHOD e getBlockType ()Lnone/amr$b; diff --git a/mappings/net/minecraft/block/impl/BlockFlowerPoppy.mapping b/mappings/net/minecraft/block/impl/BlockFlowerPoppy.mapping index d246826b81..4c96629ad8 100644 --- a/mappings/net/minecraft/block/impl/BlockFlowerPoppy.mapping +++ b/mappings/net/minecraft/block/impl/BlockFlowerPoppy.mapping @@ -1 +1,2 @@ CLASS none/apa net/minecraft/block/impl/BlockFlowerPoppy + METHOD e getBlockType ()Lnone/amr$b; diff --git a/mappings/net/minecraft/block/tile/impl/TileEntityMobSpawner.mapping b/mappings/net/minecraft/block/tile/impl/TileEntityMobSpawner.mapping index 6a5d568498..cb6b6ddbe9 100644 --- a/mappings/net/minecraft/block/tile/impl/TileEntityMobSpawner.mapping +++ b/mappings/net/minecraft/block/tile/impl/TileEntityMobSpawner.mapping @@ -1,4 +1,7 @@ CLASS none/ars net/minecraft/block/tile/impl/TileEntityMobSpawner + CLASS none/ars$1 + METHOD a getWorld ()Lnone/aiv; + METHOD b getPos ()Lnone/cn; CLASS none/ars$2 METHOD a upgradeTag (Lnone/pe;Lnone/dt;I)Lnone/dt; ARG 0 handler diff --git a/mappings/net/minecraft/client/render/entity/EntityLivingRenderer.mapping b/mappings/net/minecraft/client/render/entity/EntityLivingRenderer.mapping new file mode 100644 index 0000000000..4f85495693 --- /dev/null +++ b/mappings/net/minecraft/client/render/entity/EntityLivingRenderer.mapping @@ -0,0 +1,3 @@ +CLASS none/btu net/minecraft/client/render/entity/EntityLivingRenderer + METHOD a (Lnone/sf;DDDFF)V + METHOD a (Lnone/so;DDDFF)V diff --git a/mappings/none/btx.mapping b/mappings/net/minecraft/client/render/entity/EntityMobRenderer.mapping similarity index 55% rename from mappings/none/btx.mapping rename to mappings/net/minecraft/client/render/entity/EntityMobRenderer.mapping index a9aac8f1ac..6dfc5cc1cc 100644 --- a/mappings/none/btx.mapping +++ b/mappings/net/minecraft/client/render/entity/EntityMobRenderer.mapping @@ -1,4 +1,4 @@ -CLASS none/btx +CLASS none/btx net/minecraft/client/render/entity/EntityMobRenderer METHOD a (Lnone/sf;DDDFF)V METHOD a (Lnone/so;DDDFF)V METHOD a (Lnone/sp;DDDFF)V diff --git a/mappings/net/minecraft/client/render/entity/impl/EntityRendererEndermite.mapping b/mappings/net/minecraft/client/render/entity/impl/EntityRendererEndermite.mapping index 962272ae9b..b705dac728 100644 --- a/mappings/net/minecraft/client/render/entity/impl/EntityRendererEndermite.mapping +++ b/mappings/net/minecraft/client/render/entity/impl/EntityRendererEndermite.mapping @@ -1 +1,2 @@ CLASS none/btb net/minecraft/client/render/entity/impl/EntityRendererEndermite + FIELD a ENDERMITE_TEX Lnone/kp; diff --git a/mappings/net/minecraft/client/render/entity/impl/EntityRendererItem.mapping b/mappings/net/minecraft/client/render/entity/impl/EntityRendererItem.mapping index 9b2b1d5c4c..c647ed3723 100644 --- a/mappings/net/minecraft/client/render/entity/impl/EntityRendererItem.mapping +++ b/mappings/net/minecraft/client/render/entity/impl/EntityRendererItem.mapping @@ -1,3 +1,8 @@ CLASS none/bto net/minecraft/client/render/entity/impl/EntityRendererItem + FIELD a itemRenderer Lnone/btq; + FIELD b rand Ljava/util/Random; + METHOD (Lnone/btc;Lnone/btq;)V + ARG 0 renderManager + ARG 1 itemRenderer METHOD a (Lnone/sf;DDDFF)V METHOD a (Lnone/yz;DDDFF)V diff --git a/mappings/net/minecraft/client/render/entity/impl/EntityRendererItemFrame.mapping b/mappings/net/minecraft/client/render/entity/impl/EntityRendererItemFrame.mapping index a903ac218f..85303854e9 100644 --- a/mappings/net/minecraft/client/render/entity/impl/EntityRendererItemFrame.mapping +++ b/mappings/net/minecraft/client/render/entity/impl/EntityRendererItemFrame.mapping @@ -1,3 +1,11 @@ CLASS none/btp net/minecraft/client/render/entity/impl/EntityRendererItemFrame + FIELD a MAP_BACKGROUND_TEX Lnone/kp; + FIELD b mc Lnone/bdq; + FIELD g MODEL_NORMAL Lnone/bzq; + FIELD h MODEL_MAP Lnone/bzq; + FIELD i itemRenderer Lnone/btq; + METHOD (Lnone/btc;Lnone/btq;)V + ARG 0 renderManager + ARG 1 itemRenderer METHOD a (Lnone/sf;DDDFF)V METHOD a (Lnone/yo;DDDFF)V diff --git a/mappings/net/minecraft/client/render/entity/model/EntityModelMinecart.mapping b/mappings/net/minecraft/client/render/entity/model/EntityModelMinecart.mapping new file mode 100644 index 0000000000..f37f671bc8 --- /dev/null +++ b/mappings/net/minecraft/client/render/entity/model/EntityModelMinecart.mapping @@ -0,0 +1,3 @@ +CLASS none/bkm net/minecraft/client/render/entity/model/EntityModelMinecart + METHOD a render (Lnone/sf;FFFFFF)V + ARG 0 entity diff --git a/mappings/net/minecraft/client/render/item/IItemModelMapper.mapping b/mappings/net/minecraft/client/render/item/IItemModelMapper.mapping new file mode 100644 index 0000000000..29b72d6809 --- /dev/null +++ b/mappings/net/minecraft/client/render/item/IItemModelMapper.mapping @@ -0,0 +1,3 @@ +CLASS none/boy net/minecraft/client/render/item/IItemModelMapper + METHOD a getModel (Lnone/aer;)Lnone/bzq; + ARG 0 stack diff --git a/mappings/net/minecraft/client/render/item/ItemBuiltinRenderer.mapping b/mappings/net/minecraft/client/render/item/ItemBuiltinRenderer.mapping new file mode 100644 index 0000000000..872c79d27a --- /dev/null +++ b/mappings/net/minecraft/client/render/item/ItemBuiltinRenderer.mapping @@ -0,0 +1,9 @@ +CLASS none/boq net/minecraft/client/render/item/ItemBuiltinRenderer + FIELD a INSTANCE Lnone/boq; + FIELD b renderChestNormal Lnone/arf; + FIELD c renderChestTrapped Lnone/arf; + FIELD d renderChestEnder Lnone/arm; + FIELD e renderBanner Lnone/ara; + FIELD f renderSkull Lnone/arw; + METHOD a render (Lnone/aer;)V + ARG 0 stack diff --git a/mappings/net/minecraft/client/render/item/ItemColorMap.mapping b/mappings/net/minecraft/client/render/item/ItemColorMap.mapping index baaf3efe20..c644f7a2a6 100644 --- a/mappings/net/minecraft/client/render/item/ItemColorMap.mapping +++ b/mappings/net/minecraft/client/render/item/ItemColorMap.mapping @@ -30,6 +30,7 @@ CLASS none/bec net/minecraft/client/render/item/ItemColorMap FIELD a mappers Lnone/cx; METHOD a getRenderColor (Lnone/aer;I)I ARG 0 stack + ARG 1 tintIndex METHOD a create (Lnone/bdz;)Lnone/bec; ARG 0 blockColors METHOD a register (Lnone/beb;[Lnone/aep;)V diff --git a/mappings/net/minecraft/client/render/item/ItemModelMap.mapping b/mappings/net/minecraft/client/render/item/ItemModelMap.mapping index cf3405c701..891fd257d7 100644 --- a/mappings/net/minecraft/client/render/item/ItemModelMap.mapping +++ b/mappings/net/minecraft/client/render/item/ItemModelMap.mapping @@ -6,6 +6,11 @@ CLASS none/box net/minecraft/client/render/item/ItemModelMap METHOD (Lnone/bzp;)V ARG 0 blockModelManager METHOD a getBlockModelManager ()Lnone/bzp; + METHOD a getSprite (Lnone/aep;)Lnone/bxd; + ARG 0 item + METHOD a getSprite (Lnone/aep;I)Lnone/bxd; + ARG 0 item + ARG 1 meta METHOD a addModel (Lnone/aep;ILnone/bzq;)V ARG 0 item ARG 1 meta diff --git a/mappings/net/minecraft/client/render/item/ItemModelMapper.mapping b/mappings/net/minecraft/client/render/item/ItemModelMapper.mapping deleted file mode 100644 index 22adf55eae..0000000000 --- a/mappings/net/minecraft/client/render/item/ItemModelMapper.mapping +++ /dev/null @@ -1,3 +0,0 @@ -CLASS none/boy net/minecraft/client/render/item/ItemModelMapper - METHOD a getModel (Lnone/aer;)Lnone/bzq; - ARG 0 stack diff --git a/mappings/net/minecraft/client/render/item/ItemRenderer.mapping b/mappings/net/minecraft/client/render/item/ItemRenderer.mapping index 91c3580e8a..069da8bce9 100644 --- a/mappings/net/minecraft/client/render/item/ItemRenderer.mapping +++ b/mappings/net/minecraft/client/render/item/ItemRenderer.mapping @@ -14,6 +14,7 @@ CLASS none/btq net/minecraft/client/render/item/ItemRenderer CLASS none/btq$9 METHOD a getModel (Lnone/aer;)Lnone/bzq; ARG 0 stack + FIELD a zOffset F FIELD b ENCHANTMENT_GLINT_TEX Lnone/kp; FIELD d modelMap Lnone/box; FIELD e textureManager Lnone/bxe; @@ -26,19 +27,25 @@ CLASS none/btq net/minecraft/client/render/item/ItemRenderer METHOD a registerItemModel (Lnone/aep;ILjava/lang/String;)V ARG 0 item ARG 1 metadata - ARG 2 name + ARG 2 modelId METHOD a registerItemModel (Lnone/aep;Ljava/lang/String;)V ARG 0 item - ARG 1 name + ARG 1 modelId METHOD a isThreeDimensionalInGUI (Lnone/aer;)Z ARG 0 stack + METHOD a getModel (Lnone/aer;Lnone/aiv;Lnone/so;)Lnone/bzl; + ARG 0 stack + ARG 1 world + METHOD a (Lnone/aer;Lnone/bzl;)V + ARG 0 stack + ARG 1 model METHOD a registerItemModel (Lnone/akx;ILjava/lang/String;)V ARG 0 block ARG 1 metadata - ARG 2 name + ARG 2 modelId METHOD a registerItemModel (Lnone/akx;Ljava/lang/String;)V ARG 0 block - ARG 1 name + ARG 1 modelId METHOD a renderItemInGUI (Lnone/bee;Lnone/aer;II)V ARG 0 fontRenderer ARG 1 stack @@ -70,3 +77,4 @@ CLASS none/btq net/minecraft/client/render/item/ItemRenderer METHOD a (Lnone/so;Lnone/aer;II)V ARG 0 entity ARG 1 stack + METHOD b registerItemModels ()V diff --git a/mappings/net/minecraft/client/render/model/BakedModel.mapping b/mappings/net/minecraft/client/render/model/BakedModel.mapping index b6b76f7f8d..a9c0b06258 100644 --- a/mappings/net/minecraft/client/render/model/BakedModel.mapping +++ b/mappings/net/minecraft/client/render/model/BakedModel.mapping @@ -25,3 +25,4 @@ CLASS none/bzs net/minecraft/client/render/model/BakedModel METHOD c isBuiltin ()Z METHOD d getSprite ()Lnone/bxd; METHOD e getTransformationList ()Lnone/bqe; + METHOD f getItemPropertyOverrides ()Lnone/bqc; diff --git a/mappings/net/minecraft/client/render/model/BakedModelBuiltin.mapping b/mappings/net/minecraft/client/render/model/BakedModelBuiltin.mapping index fd6296bfb9..4eb63b7b55 100644 --- a/mappings/net/minecraft/client/render/model/BakedModelBuiltin.mapping +++ b/mappings/net/minecraft/client/render/model/BakedModelBuiltin.mapping @@ -8,3 +8,4 @@ CLASS none/bzn net/minecraft/client/render/model/BakedModelBuiltin METHOD c isBuiltin ()Z METHOD d getSprite ()Lnone/bxd; METHOD e getTransformationList ()Lnone/bqe; + METHOD f getItemPropertyOverrides ()Lnone/bqc; diff --git a/mappings/net/minecraft/client/render/model/BakedModelWeighted.mapping b/mappings/net/minecraft/client/render/model/BakedModelWeighted.mapping index 4d39c65794..0183bc7f28 100644 --- a/mappings/net/minecraft/client/render/model/BakedModelWeighted.mapping +++ b/mappings/net/minecraft/client/render/model/BakedModelWeighted.mapping @@ -25,3 +25,4 @@ CLASS none/bzt net/minecraft/client/render/model/BakedModelWeighted METHOD c isBuiltin ()Z METHOD d getSprite ()Lnone/bxd; METHOD e getTransformationList ()Lnone/bqe; + METHOD f getItemPropertyOverrides ()Lnone/bqc; diff --git a/mappings/net/minecraft/client/render/model/IBakedModel.mapping b/mappings/net/minecraft/client/render/model/IBakedModel.mapping index e1391ddfbf..a56ab358ad 100644 --- a/mappings/net/minecraft/client/render/model/IBakedModel.mapping +++ b/mappings/net/minecraft/client/render/model/IBakedModel.mapping @@ -8,3 +8,4 @@ CLASS none/bzl net/minecraft/client/render/model/IBakedModel METHOD c isBuiltin ()Z METHOD d getSprite ()Lnone/bxd; METHOD e getTransformationList ()Lnone/bqe; + METHOD f getItemPropertyOverrides ()Lnone/bqc; diff --git a/mappings/net/minecraft/client/render/model/json/ModelItemOverride.mapping b/mappings/net/minecraft/client/render/model/json/ModelItemOverride.mapping index 68d64dd4eb..4369768d65 100644 --- a/mappings/net/minecraft/client/render/model/json/ModelItemOverride.mapping +++ b/mappings/net/minecraft/client/render/model/json/ModelItemOverride.mapping @@ -1,5 +1,11 @@ CLASS none/bqb net/minecraft/client/render/model/json/ModelItemOverride - METHOD a (Lnone/aer;Lnone/aiv;Lnone/so;)Z + FIELD a modelId Lnone/kp; + FIELD b minPropertyValues Ljava/util/Map; + METHOD (Lnone/kp;Ljava/util/Map;)V + ARG 0 modelId + ARG 1 minPropertyValues + METHOD a getModelId ()Lnone/kp; + METHOD a matches (Lnone/aer;Lnone/aiv;Lnone/so;)Z ARG 0 stack ARG 1 world ARG 2 entity diff --git a/mappings/net/minecraft/client/render/model/json/ModelItemOverrideList.mapping b/mappings/net/minecraft/client/render/model/json/ModelItemPropertyOverrideList.mapping similarity index 51% rename from mappings/net/minecraft/client/render/model/json/ModelItemOverrideList.mapping rename to mappings/net/minecraft/client/render/model/json/ModelItemPropertyOverrideList.mapping index 1e44ff14f8..4edfe36caf 100644 --- a/mappings/net/minecraft/client/render/model/json/ModelItemOverrideList.mapping +++ b/mappings/net/minecraft/client/render/model/json/ModelItemPropertyOverrideList.mapping @@ -1,9 +1,9 @@ -CLASS none/bqc net/minecraft/client/render/model/json/ModelItemOverrideList +CLASS none/bqc net/minecraft/client/render/model/json/ModelItemPropertyOverrideList FIELD a ORIGIN Lnone/bqc; FIELD b overrides Ljava/util/List; METHOD (Ljava/util/List;)V ARG 0 list - METHOD a (Lnone/aer;Lnone/aiv;Lnone/so;)Lnone/kp; + METHOD a getModelId (Lnone/aer;Lnone/aiv;Lnone/so;)Lnone/kp; ARG 0 stack ARG 1 world ARG 2 entity diff --git a/mappings/net/minecraft/client/render/tileentity/impl/TileEntitySkullRenderer.mapping b/mappings/net/minecraft/client/render/tileentity/impl/TileEntitySkullRenderer.mapping index 5d3dacba61..b0c71b6d05 100644 --- a/mappings/net/minecraft/client/render/tileentity/impl/TileEntitySkullRenderer.mapping +++ b/mappings/net/minecraft/client/render/tileentity/impl/TileEntitySkullRenderer.mapping @@ -1,9 +1,11 @@ CLASS none/brg net/minecraft/client/render/tileentity/impl/TileEntitySkullRenderer + FIELD a INSTANCE Lnone/brg; FIELD d SKELETON_TEX Lnone/kp; FIELD e WITHER_SKELTON_TEX Lnone/kp; FIELD f ZOMBIE_TEX Lnone/kp; FIELD g CREEEPER_TEX Lnone/kp; FIELD h DRAGON_TEX Lnone/kp; + FIELD i DRAGON_HEAD_MODEL Lnone/bls; METHOD a render (Lnone/ard;DDDFI)V ARG 0 te ARG 1 x diff --git a/mappings/net/minecraft/client/resource/IResource.mapping b/mappings/net/minecraft/client/resource/IResource.mapping index 4a84b69710..2c5cdd477f 100644 --- a/mappings/net/minecraft/client/resource/IResource.mapping +++ b/mappings/net/minecraft/client/resource/IResource.mapping @@ -1,5 +1,7 @@ CLASS none/byb net/minecraft/client/resource/IResource METHOD a getId ()Lnone/kp; + METHOD a getMetadata (Ljava/lang/String;)Lnone/byr; + ARG 0 key METHOD b getInputStream ()Ljava/io/InputStream; METHOD c hasMetadata ()Z METHOD d getName ()Ljava/lang/String; diff --git a/mappings/net/minecraft/client/resource/IResourceMetadata.mapping b/mappings/net/minecraft/client/resource/IResourceMetadata.mapping new file mode 100644 index 0000000000..f9c9fda090 --- /dev/null +++ b/mappings/net/minecraft/client/resource/IResourceMetadata.mapping @@ -0,0 +1 @@ +CLASS none/byr net/minecraft/client/resource/IResourceMetadata diff --git a/mappings/net/minecraft/client/resource/Resource.mapping b/mappings/net/minecraft/client/resource/Resource.mapping index df49211a30..614cb6c290 100644 --- a/mappings/net/minecraft/client/resource/Resource.mapping +++ b/mappings/net/minecraft/client/resource/Resource.mapping @@ -1,4 +1,5 @@ CLASS none/byj net/minecraft/client/resource/Resource + FIELD a metadataCache Ljava/util/Map; FIELD b name Ljava/lang/String; FIELD c id Lnone/kp; FIELD d input Ljava/io/InputStream; @@ -13,6 +14,8 @@ CLASS none/byj net/minecraft/client/resource/Resource ARG 3 metadataInput ARG 4 packMetadata METHOD a getId ()Lnone/kp; + METHOD a getMetadata (Ljava/lang/String;)Lnone/byr; + ARG 0 key METHOD b getInputStream ()Ljava/io/InputStream; METHOD c hasMetadata ()Z METHOD close close ()V diff --git a/mappings/net/minecraft/client/resource/pack/DirectoryResourcePack.mapping b/mappings/net/minecraft/client/resource/pack/DirectoryResourcePack.mapping index a908d609f8..6bd4869dad 100644 --- a/mappings/net/minecraft/client/resource/pack/DirectoryResourcePack.mapping +++ b/mappings/net/minecraft/client/resource/pack/DirectoryResourcePack.mapping @@ -1,8 +1,13 @@ CLASS none/bxx net/minecraft/client/resource/pack/DirectoryResourcePack FIELD b WINDOWS Z FIELD c PATH_SEP_WINDOWS Lcom/google/common/base/CharMatcher; + METHOD a isInsidePath (Ljava/io/File;Ljava/lang/String;)Z + ARG 0 path + ARG 1 filePath METHOD a openByPath (Ljava/lang/String;)Ljava/io/InputStream; ARG 0 path METHOD b canHandleByPath (Ljava/lang/String;)Z ARG 0 path METHOD c getProvidedAssets ()Ljava/util/Set; + METHOD d getFile (Ljava/lang/String;)Ljava/io/File; + ARG 0 path diff --git a/mappings/net/minecraft/client/texture/Texture.mapping b/mappings/net/minecraft/client/texture/Texture.mapping new file mode 100644 index 0000000000..fbc3a7a0bb --- /dev/null +++ b/mappings/net/minecraft/client/texture/Texture.mapping @@ -0,0 +1 @@ +CLASS none/bws net/minecraft/client/texture/Texture diff --git a/mappings/net/minecraft/entity/vehicle/impl/EntitySpawnerMinecart.mapping b/mappings/net/minecraft/entity/vehicle/impl/EntityMobSpawnerMinecart.mapping similarity index 66% rename from mappings/net/minecraft/entity/vehicle/impl/EntitySpawnerMinecart.mapping rename to mappings/net/minecraft/entity/vehicle/impl/EntityMobSpawnerMinecart.mapping index 3b12d7d0c6..9ad24cbd38 100644 --- a/mappings/net/minecraft/entity/vehicle/impl/EntitySpawnerMinecart.mapping +++ b/mappings/net/minecraft/entity/vehicle/impl/EntityMobSpawnerMinecart.mapping @@ -1,14 +1,19 @@ -CLASS none/abq net/minecraft/entity/vehicle/impl/EntitySpawnerMinecart +CLASS none/abq net/minecraft/entity/vehicle/impl/EntityMobSpawnerMinecart + CLASS none/abq$1 + METHOD a getWorld ()Lnone/aiv; + METHOD b getPos ()Lnone/cn; CLASS none/abq$2 METHOD a upgradeTag (Lnone/pe;Lnone/dt;I)Lnone/dt; ARG 0 handler ARG 1 tag ARG 2 version + FIELD a logic Lnone/ail; METHOD a deserializeCustomData (Lnone/dt;)V ARG 0 tag METHOD b serializeCustomData (Lnone/dt;)V ARG 0 tag METHOD b registerTagUpgraders (Lnone/pf;)V + ARG 0 handler METHOD v getMinecartType ()Lnone/abj$a; METHOD x getDefaultContainedBlock ()Lnone/asl; METHOD y_ update ()V diff --git a/mappings/net/minecraft/sortme/IEntityRendererOrSomething.mapping b/mappings/net/minecraft/sortme/IEntityRendererOrSomething.mapping deleted file mode 100644 index bbebd6d2e7..0000000000 --- a/mappings/net/minecraft/sortme/IEntityRendererOrSomething.mapping +++ /dev/null @@ -1,3 +0,0 @@ -CLASS none/bvt net/minecraft/sortme/IEntityRendererOrSomething - METHOD a render (Lnone/so;FFFFFFF)V - ARG 0 entity diff --git a/mappings/net/minecraft/sortme/MobSpawnerLogic.mapping b/mappings/net/minecraft/sortme/MobSpawnerLogic.mapping new file mode 100644 index 0000000000..0a97e1414b --- /dev/null +++ b/mappings/net/minecraft/sortme/MobSpawnerLogic.mapping @@ -0,0 +1,10 @@ +CLASS none/ail net/minecraft/sortme/MobSpawnerLogic + FIELD a spawnDelay I + FIELD f minSpawnDelay I + FIELD g maxSpawnDelay I + FIELD h spawnCount I + FIELD j maxNearbyEntities I + FIELD k requiredPlayerRange I + FIELD l spawnRange I + METHOD a getWorld ()Lnone/aiv; + METHOD b getPos ()Lnone/cn; diff --git a/mappings/none/bkm.mapping b/mappings/none/bkm.mapping deleted file mode 100644 index 5067770880..0000000000 --- a/mappings/none/bkm.mapping +++ /dev/null @@ -1,3 +0,0 @@ -CLASS none/bkm - METHOD a render (Lnone/sf;FFFFFF)V - ARG 0 entity diff --git a/mappings/none/btu.mapping b/mappings/none/btu.mapping deleted file mode 100644 index a7b36c78b0..0000000000 --- a/mappings/none/btu.mapping +++ /dev/null @@ -1,3 +0,0 @@ -CLASS none/btu - METHOD a (Lnone/sf;DDDFF)V - METHOD a (Lnone/so;DDDFF)V diff --git a/mappings/none/bvt.mapping b/mappings/none/bvt.mapping new file mode 100644 index 0000000000..e6160f5bf1 --- /dev/null +++ b/mappings/none/bvt.mapping @@ -0,0 +1,3 @@ +CLASS none/bvt + METHOD a render (Lnone/so;FFFFFFF)V + ARG 0 entity diff --git a/mappings/none/bzr.mapping b/mappings/none/bzr.mapping index 50a7885a02..9581fa7d88 100644 --- a/mappings/none/bzr.mapping +++ b/mappings/none/bzr.mapping @@ -8,3 +8,4 @@ CLASS none/bzr METHOD c isBuiltin ()Z METHOD d getSprite ()Lnone/bxd; METHOD e getTransformationList ()Lnone/bqe; + METHOD f getItemPropertyOverrides ()Lnone/bqc;