From 8f48f7afb664c04d82128adefc3fbc28b2295ccb Mon Sep 17 00:00:00 2001 From: asiekierka Date: Wed, 24 Aug 2016 13:57:31 +0200 Subject: [PATCH] map most of resource stuff, other refactoring in rendering --- .../client/model/impl/ModelBoat.mapping | 1 - .../client/render/ItemRenderer.mapping | 2 ++ .../entity/EntityModel.mapping} | 2 +- .../entity/EntityModelBox.mapping} | 2 +- .../entity}/PlayerModelParts.mapping | 2 +- .../entity/model/EntityModelBoat.mapping | 1 + .../TileEntityRenderManager.mapping | 19 ++++++++++++ .../resource/DirectoryResourcePack.mapping | 1 - .../client/resource/IResource.mapping | 5 ++++ .../resource/IResourceContainer.mapping | 5 ++++ .../client/resource/IResourceManager.mapping | 5 ++++ .../resource/IResourceReloadListener.mapping | 3 ++ .../resource/MinecraftResourcePack.mapping | 6 ---- .../client/resource/Resource.mapping | 21 +++++++++++++ .../client/resource/ResourceContainer.mapping | 30 +++++++++++++++++++ .../client/resource/ResourceManager.mapping | 22 ++++++++++++++ .../resource/{ => pack}/IResourcePack.mapping | 4 ++- .../pack/ResourcePackDirectory.mapping | 6 ++++ .../resource/pack/ResourcePackFile.mapping | 6 ++++ .../pack/ResourcePackMetadata.mapping | 1 + .../pack/ResourcePackMinecraft.mapping | 11 +++++++ .../pack/ResourcePackPhysical.mapping | 22 ++++++++++++++ .../client/resources/FileResourcePack.mapping | 1 - .../client/texture/TextureManager.mapping | 2 ++ .../client/util/FontRenderer.mapping | 2 ++ .../client/util/ModelIdentifier.mapping | 5 ++++ .../net/minecraft/util/Identifier.mapping | 2 +- mappings/none/boq.mapping | 3 ++ mappings/none/boy.mapping | 2 ++ mappings/none/bpm.mapping | 3 ++ mappings/none/bqw.mapping | 6 ---- mappings/none/bxo.mapping | 6 ---- mappings/none/bxw.mapping | 3 ++ mappings/none/bxx.mapping | 3 ++ mappings/none/byd.mapping | 2 ++ mappings/none/byl.mapping | 3 ++ mappings/none/bzn.mapping | 3 ++ mappings/none/cau.mapping | 2 ++ 38 files changed, 199 insertions(+), 26 deletions(-) delete mode 100644 mappings/net/minecraft/client/model/impl/ModelBoat.mapping rename mappings/net/minecraft/client/{model/Model.mapping => render/entity/EntityModel.mapping} (70%) rename mappings/net/minecraft/client/{model/ModelBox.mapping => render/entity/EntityModelBox.mapping} (86%) rename mappings/net/minecraft/client/{model => render/entity}/PlayerModelParts.mapping (87%) create mode 100644 mappings/net/minecraft/client/render/entity/model/EntityModelBoat.mapping create mode 100644 mappings/net/minecraft/client/render/tileentity/TileEntityRenderManager.mapping delete mode 100644 mappings/net/minecraft/client/resource/DirectoryResourcePack.mapping create mode 100644 mappings/net/minecraft/client/resource/IResource.mapping create mode 100644 mappings/net/minecraft/client/resource/IResourceContainer.mapping create mode 100644 mappings/net/minecraft/client/resource/IResourceManager.mapping create mode 100644 mappings/net/minecraft/client/resource/IResourceReloadListener.mapping delete mode 100644 mappings/net/minecraft/client/resource/MinecraftResourcePack.mapping create mode 100644 mappings/net/minecraft/client/resource/Resource.mapping create mode 100644 mappings/net/minecraft/client/resource/ResourceContainer.mapping create mode 100644 mappings/net/minecraft/client/resource/ResourceManager.mapping rename mappings/net/minecraft/client/resource/{ => pack}/IResourcePack.mapping (50%) create mode 100644 mappings/net/minecraft/client/resource/pack/ResourcePackDirectory.mapping create mode 100644 mappings/net/minecraft/client/resource/pack/ResourcePackFile.mapping create mode 100644 mappings/net/minecraft/client/resource/pack/ResourcePackMetadata.mapping create mode 100644 mappings/net/minecraft/client/resource/pack/ResourcePackMinecraft.mapping create mode 100644 mappings/net/minecraft/client/resource/pack/ResourcePackPhysical.mapping delete mode 100644 mappings/net/minecraft/client/resources/FileResourcePack.mapping create mode 100644 mappings/none/boq.mapping create mode 100644 mappings/none/bpm.mapping delete mode 100644 mappings/none/bqw.mapping delete mode 100644 mappings/none/bxo.mapping create mode 100644 mappings/none/bxw.mapping create mode 100644 mappings/none/bxx.mapping create mode 100644 mappings/none/byl.mapping create mode 100644 mappings/none/bzn.mapping diff --git a/mappings/net/minecraft/client/model/impl/ModelBoat.mapping b/mappings/net/minecraft/client/model/impl/ModelBoat.mapping deleted file mode 100644 index ae33ba635b..0000000000 --- a/mappings/net/minecraft/client/model/impl/ModelBoat.mapping +++ /dev/null @@ -1 +0,0 @@ -CLASS none/bjt net/minecraft/client/model/impl/ModelBoat diff --git a/mappings/net/minecraft/client/render/ItemRenderer.mapping b/mappings/net/minecraft/client/render/ItemRenderer.mapping index ee726a84e6..6671565d1d 100644 --- a/mappings/net/minecraft/client/render/ItemRenderer.mapping +++ b/mappings/net/minecraft/client/render/ItemRenderer.mapping @@ -53,6 +53,8 @@ CLASS none/bto net/minecraft/client/render/ItemRenderer ARG 6 green ARG 7 blue ARG 8 alpha + METHOD a onResourceReload (Lnone/bya;)V + ARG 0 container METHOD a (Lnone/sn;Lnone/aeq;II)V ARG 0 entity ARG 1 stack diff --git a/mappings/net/minecraft/client/model/Model.mapping b/mappings/net/minecraft/client/render/entity/EntityModel.mapping similarity index 70% rename from mappings/net/minecraft/client/model/Model.mapping rename to mappings/net/minecraft/client/render/entity/EntityModel.mapping index 826683ebe4..366d3cae65 100644 --- a/mappings/net/minecraft/client/model/Model.mapping +++ b/mappings/net/minecraft/client/render/entity/EntityModel.mapping @@ -1,4 +1,4 @@ -CLASS none/bkl net/minecraft/client/model/Model +CLASS none/bkl net/minecraft/client/render/entity/EntityModel FIELD r boxes Ljava/util/List; FIELD s textureWidth I FIELD t textureHeight I diff --git a/mappings/net/minecraft/client/model/ModelBox.mapping b/mappings/net/minecraft/client/render/entity/EntityModelBox.mapping similarity index 86% rename from mappings/net/minecraft/client/model/ModelBox.mapping rename to mappings/net/minecraft/client/render/entity/EntityModelBox.mapping index 1448ccb6a8..bf8a50a9e8 100644 --- a/mappings/net/minecraft/client/model/ModelBox.mapping +++ b/mappings/net/minecraft/client/render/entity/EntityModelBox.mapping @@ -1,4 +1,4 @@ -CLASS none/blw net/minecraft/client/model/ModelBox +CLASS none/blw net/minecraft/client/render/entity/EntityModelBox FIELD a textureWidth F FIELD b textureHeight F FIELD f pitch F diff --git a/mappings/net/minecraft/client/model/PlayerModelParts.mapping b/mappings/net/minecraft/client/render/entity/PlayerModelParts.mapping similarity index 87% rename from mappings/net/minecraft/client/model/PlayerModelParts.mapping rename to mappings/net/minecraft/client/render/entity/PlayerModelParts.mapping index 1123996077..4bf523d68d 100644 --- a/mappings/net/minecraft/client/model/PlayerModelParts.mapping +++ b/mappings/net/minecraft/client/render/entity/PlayerModelParts.mapping @@ -1,4 +1,4 @@ -CLASS none/aal net/minecraft/client/model/PlayerModelParts +CLASS none/aal net/minecraft/client/render/entity/PlayerModelParts FIELD a CAPE Lnone/aal; FIELD b BODY Lnone/aal; FIELD c LEFT_ARM Lnone/aal; diff --git a/mappings/net/minecraft/client/render/entity/model/EntityModelBoat.mapping b/mappings/net/minecraft/client/render/entity/model/EntityModelBoat.mapping new file mode 100644 index 0000000000..53a8906909 --- /dev/null +++ b/mappings/net/minecraft/client/render/entity/model/EntityModelBoat.mapping @@ -0,0 +1 @@ +CLASS none/bjt net/minecraft/client/render/entity/model/EntityModelBoat diff --git a/mappings/net/minecraft/client/render/tileentity/TileEntityRenderManager.mapping b/mappings/net/minecraft/client/render/tileentity/TileEntityRenderManager.mapping new file mode 100644 index 0000000000..88c836b642 --- /dev/null +++ b/mappings/net/minecraft/client/render/tileentity/TileEntityRenderManager.mapping @@ -0,0 +1,19 @@ +CLASS none/bqw net/minecraft/client/render/tileentity/TileEntityRenderManager + FIELD a instance Lnone/bqw; + FIELD e textureManager Lnone/bxc; + FIELD f world Lnone/aiu; + FIELD n tileEntityRenderers Ljava/util/Map; + FIELD o fontRenderer Lnone/bec; + METHOD a getFontRenderer ()Lnone/bec; + METHOD a get (Ljava/lang/Class;)Lnone/bqx; + ARG 0 tileClass + METHOD a setWorld (Lnone/aiu;)V + ARG 0 world + METHOD a get (Lnone/arb;)Lnone/bqx; + ARG 0 tile + METHOD a render (Lnone/arb;DDDF)V + ARG 0 tile + ARG 4 deltaTicks + METHOD a render (Lnone/arb;DDDFI)V + ARG 0 tile + ARG 4 deltaTicks diff --git a/mappings/net/minecraft/client/resource/DirectoryResourcePack.mapping b/mappings/net/minecraft/client/resource/DirectoryResourcePack.mapping deleted file mode 100644 index 126fdf243c..0000000000 --- a/mappings/net/minecraft/client/resource/DirectoryResourcePack.mapping +++ /dev/null @@ -1 +0,0 @@ -CLASS none/bxv net/minecraft/client/resource/DirectoryResourcePack diff --git a/mappings/net/minecraft/client/resource/IResource.mapping b/mappings/net/minecraft/client/resource/IResource.mapping new file mode 100644 index 0000000000..9d218a3fa6 --- /dev/null +++ b/mappings/net/minecraft/client/resource/IResource.mapping @@ -0,0 +1,5 @@ +CLASS none/bxz net/minecraft/client/resource/IResource + METHOD a getId ()Lnone/kp; + METHOD b getInputStream ()Ljava/io/InputStream; + METHOD c hasMetadata ()Z + METHOD d getName ()Ljava/lang/String; diff --git a/mappings/net/minecraft/client/resource/IResourceContainer.mapping b/mappings/net/minecraft/client/resource/IResourceContainer.mapping new file mode 100644 index 0000000000..dcdedf3eb5 --- /dev/null +++ b/mappings/net/minecraft/client/resource/IResourceContainer.mapping @@ -0,0 +1,5 @@ +CLASS none/bya net/minecraft/client/resource/IResourceContainer + METHOD a getResource (Lnone/kp;)Lnone/bxz; + ARG 0 id + METHOD b getAllResources (Lnone/kp;)Ljava/util/List; + ARG 0 id diff --git a/mappings/net/minecraft/client/resource/IResourceManager.mapping b/mappings/net/minecraft/client/resource/IResourceManager.mapping new file mode 100644 index 0000000000..365e68a2f9 --- /dev/null +++ b/mappings/net/minecraft/client/resource/IResourceManager.mapping @@ -0,0 +1,5 @@ +CLASS none/bxy net/minecraft/client/resource/IResourceManager + METHOD a reload (Ljava/util/List;)V + ARG 0 packs + METHOD a registerListener (Lnone/byb;)V + ARG 0 listener diff --git a/mappings/net/minecraft/client/resource/IResourceReloadListener.mapping b/mappings/net/minecraft/client/resource/IResourceReloadListener.mapping new file mode 100644 index 0000000000..f55c109baa --- /dev/null +++ b/mappings/net/minecraft/client/resource/IResourceReloadListener.mapping @@ -0,0 +1,3 @@ +CLASS none/byb net/minecraft/client/resource/IResourceReloadListener + METHOD a onResourceReload (Lnone/bya;)V + ARG 0 container diff --git a/mappings/net/minecraft/client/resource/MinecraftResourcePack.mapping b/mappings/net/minecraft/client/resource/MinecraftResourcePack.mapping deleted file mode 100644 index d441a493b4..0000000000 --- a/mappings/net/minecraft/client/resource/MinecraftResourcePack.mapping +++ /dev/null @@ -1,6 +0,0 @@ -CLASS none/bxr net/minecraft/client/resource/MinecraftResourcePack - METHOD a getLogo ()Ljava/awt/image/BufferedImage; - METHOD a open (Lnone/kp;)Ljava/io/InputStream; - ARG 0 id - METHOD b canHandle (Lnone/kp;)Z - ARG 0 id diff --git a/mappings/net/minecraft/client/resource/Resource.mapping b/mappings/net/minecraft/client/resource/Resource.mapping new file mode 100644 index 0000000000..edbb01c585 --- /dev/null +++ b/mappings/net/minecraft/client/resource/Resource.mapping @@ -0,0 +1,21 @@ +CLASS none/byh net/minecraft/client/resource/Resource + FIELD b name Ljava/lang/String; + FIELD c id Lnone/kp; + FIELD d input Ljava/io/InputStream; + FIELD e metadataInput Ljava/io/InputStream; + FIELD f packMetadata Lnone/byr; + FIELD g metadataLoaded Z + FIELD h metadataJson Lcom/google/gson/JsonObject; + METHOD (Ljava/lang/String;Lnone/kp;Ljava/io/InputStream;Ljava/io/InputStream;Lnone/byr;)V + ARG 0 name + ARG 1 id + ARG 2 input + ARG 3 metadataInput + ARG 4 packMetadata + METHOD a getId ()Lnone/kp; + METHOD b getInputStream ()Ljava/io/InputStream; + METHOD c hasMetadata ()Z + METHOD close close ()V + METHOD d getName ()Ljava/lang/String; + METHOD equals (Ljava/lang/Object;)Z + ARG 0 other diff --git a/mappings/net/minecraft/client/resource/ResourceContainer.mapping b/mappings/net/minecraft/client/resource/ResourceContainer.mapping new file mode 100644 index 0000000000..dfca2c4653 --- /dev/null +++ b/mappings/net/minecraft/client/resource/ResourceContainer.mapping @@ -0,0 +1,30 @@ +CLASS none/bxt net/minecraft/client/resource/ResourceContainer + CLASS none/bxt$a DebugInputStream + FIELD a stream Ljava/io/InputStream; + FIELD b warningMessage Ljava/lang/String; + FIELD c isClosed Z + METHOD (Ljava/io/InputStream;Lnone/kp;Ljava/lang/String;)V + ARG 0 stream + ARG 1 id + ARG 2 packName + METHOD close close ()V + METHOD read read ()I + FIELD a packs Ljava/util/List; + FIELD b LOGGER Lorg/apache/logging/log4j/Logger; + FIELD c metadata Lnone/byr; + METHOD (Lnone/byr;)V + ARG 0 metadata + METHOD a add (Lnone/byc;)V + ARG 0 pack + METHOD a getResource (Lnone/kp;)Lnone/bxz; + ARG 0 id + METHOD a open (Lnone/kp;Lnone/byc;)Ljava/io/InputStream; + ARG 0 id + ARG 1 pack + METHOD b getLogger ()Lorg/apache/logging/log4j/Logger; + METHOD b getAllResources (Lnone/kp;)Ljava/util/List; + ARG 0 id + METHOD c getMetadataLocation (Lnone/kp;)Lnone/kp; + ARG 0 id + METHOD d validateLocation (Lnone/kp;)V + ARG 0 id diff --git a/mappings/net/minecraft/client/resource/ResourceManager.mapping b/mappings/net/minecraft/client/resource/ResourceManager.mapping new file mode 100644 index 0000000000..2f888a8a97 --- /dev/null +++ b/mappings/net/minecraft/client/resource/ResourceManager.mapping @@ -0,0 +1,22 @@ +CLASS none/byg net/minecraft/client/resource/ResourceManager + FIELD a LOGGER Lorg/apache/logging/log4j/Logger; + FIELD b COMMA_JOINER Lcom/google/common/base/Joiner; + FIELD c containers Ljava/util/Map; + FIELD d listeners Ljava/util/List; + FIELD e providedAssets Ljava/util/Set; + FIELD f defaultMetadata Lnone/byr; + METHOD (Lnone/byr;)V + ARG 0 defaultMetadata + METHOD a getProvidedAssets ()Ljava/util/Set; + METHOD a reload (Ljava/util/List;)V + ARG 0 packs + METHOD a registerListener (Lnone/byb;)V + ARG 0 listener + METHOD a add (Lnone/byc;)V + ARG 0 pack + METHOD a getResource (Lnone/kp;)Lnone/bxz; + ARG 0 id + METHOD b clear ()V + METHOD b getAllResources (Lnone/kp;)Ljava/util/List; + ARG 0 id + METHOD c onReload ()V diff --git a/mappings/net/minecraft/client/resource/IResourcePack.mapping b/mappings/net/minecraft/client/resource/pack/IResourcePack.mapping similarity index 50% rename from mappings/net/minecraft/client/resource/IResourcePack.mapping rename to mappings/net/minecraft/client/resource/pack/IResourcePack.mapping index e4812aa959..dccd936daf 100644 --- a/mappings/net/minecraft/client/resource/IResourcePack.mapping +++ b/mappings/net/minecraft/client/resource/pack/IResourcePack.mapping @@ -1,6 +1,8 @@ -CLASS none/byc net/minecraft/client/resource/IResourcePack +CLASS none/byc net/minecraft/client/resource/pack/IResourcePack METHOD a getLogo ()Ljava/awt/image/BufferedImage; METHOD a open (Lnone/kp;)Ljava/io/InputStream; ARG 0 id + METHOD b getName ()Ljava/lang/String; METHOD b canHandle (Lnone/kp;)Z ARG 0 id + METHOD c getProvidedAssets ()Ljava/util/Set; diff --git a/mappings/net/minecraft/client/resource/pack/ResourcePackDirectory.mapping b/mappings/net/minecraft/client/resource/pack/ResourcePackDirectory.mapping new file mode 100644 index 0000000000..32b4890b41 --- /dev/null +++ b/mappings/net/minecraft/client/resource/pack/ResourcePackDirectory.mapping @@ -0,0 +1,6 @@ +CLASS none/bxv net/minecraft/client/resource/pack/ResourcePackDirectory + 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; diff --git a/mappings/net/minecraft/client/resource/pack/ResourcePackFile.mapping b/mappings/net/minecraft/client/resource/pack/ResourcePackFile.mapping new file mode 100644 index 0000000000..7a6b9bbc66 --- /dev/null +++ b/mappings/net/minecraft/client/resource/pack/ResourcePackFile.mapping @@ -0,0 +1,6 @@ +CLASS none/bxu net/minecraft/client/resource/pack/ResourcePackFile + 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; diff --git a/mappings/net/minecraft/client/resource/pack/ResourcePackMetadata.mapping b/mappings/net/minecraft/client/resource/pack/ResourcePackMetadata.mapping new file mode 100644 index 0000000000..ec400bfe10 --- /dev/null +++ b/mappings/net/minecraft/client/resource/pack/ResourcePackMetadata.mapping @@ -0,0 +1 @@ +CLASS none/byr net/minecraft/client/resource/pack/ResourcePackMetadata diff --git a/mappings/net/minecraft/client/resource/pack/ResourcePackMinecraft.mapping b/mappings/net/minecraft/client/resource/pack/ResourcePackMinecraft.mapping new file mode 100644 index 0000000000..ed84c880ab --- /dev/null +++ b/mappings/net/minecraft/client/resource/pack/ResourcePackMinecraft.mapping @@ -0,0 +1,11 @@ +CLASS none/bxr net/minecraft/client/resource/pack/ResourcePackMinecraft + FIELD a ASSET_NAMES Ljava/util/Set; + METHOD a getLogo ()Ljava/awt/image/BufferedImage; + METHOD a open (Lnone/kp;)Ljava/io/InputStream; + ARG 0 id + METHOD b getName ()Ljava/lang/String; + METHOD b canHandle (Lnone/kp;)Z + ARG 0 id + METHOD c getProvidedAssets ()Ljava/util/Set; + METHOD d getAssetInputStream (Lnone/kp;)Ljava/io/InputStream; + ARG 0 id diff --git a/mappings/net/minecraft/client/resource/pack/ResourcePackPhysical.mapping b/mappings/net/minecraft/client/resource/pack/ResourcePackPhysical.mapping new file mode 100644 index 0000000000..85ac3673bd --- /dev/null +++ b/mappings/net/minecraft/client/resource/pack/ResourcePackPhysical.mapping @@ -0,0 +1,22 @@ +CLASS none/bxo net/minecraft/client/resource/pack/ResourcePackPhysical + FIELD a location Ljava/io/File; + FIELD b LOGGER Lorg/apache/logging/log4j/Logger; + METHOD (Ljava/io/File;)V + ARG 0 location + METHOD a getLogo ()Ljava/awt/image/BufferedImage; + METHOD a getRelativePath (Ljava/io/File;Ljava/io/File;)Ljava/lang/String; + ARG 0 path + ARG 1 pathRelativeTo + METHOD a openByPath (Ljava/lang/String;)Ljava/io/InputStream; + ARG 0 path + METHOD a open (Lnone/kp;)Ljava/io/InputStream; + ARG 0 id + METHOD b getName ()Ljava/lang/String; + METHOD b canHandleByPath (Ljava/lang/String;)Z + ARG 0 path + METHOD b canHandle (Lnone/kp;)Z + ARG 0 id + METHOD c warnNotLowerCase (Ljava/lang/String;)V + ARG 0 path + METHOD c getPath (Lnone/kp;)Ljava/lang/String; + ARG 0 id diff --git a/mappings/net/minecraft/client/resources/FileResourcePack.mapping b/mappings/net/minecraft/client/resources/FileResourcePack.mapping deleted file mode 100644 index d4bb05de19..0000000000 --- a/mappings/net/minecraft/client/resources/FileResourcePack.mapping +++ /dev/null @@ -1 +0,0 @@ -CLASS none/bxu net/minecraft/client/resources/FileResourcePack diff --git a/mappings/net/minecraft/client/texture/TextureManager.mapping b/mappings/net/minecraft/client/texture/TextureManager.mapping index ff6fbb93e2..57a2082759 100644 --- a/mappings/net/minecraft/client/texture/TextureManager.mapping +++ b/mappings/net/minecraft/client/texture/TextureManager.mapping @@ -2,6 +2,8 @@ CLASS none/bxc net/minecraft/client/texture/TextureManager FIELD a LOGGER Lorg/apache/logging/log4j/Logger; FIELD b textures Ljava/util/Map; FIELD c updateable Ljava/util/List; + METHOD a onResourceReload (Lnone/bya;)V + ARG 0 container METHOD a bindTexture (Lnone/kp;)V ARG 0 id METHOD a (Lnone/kp;Lnone/bxg;)Z diff --git a/mappings/net/minecraft/client/util/FontRenderer.mapping b/mappings/net/minecraft/client/util/FontRenderer.mapping index 889b108e1c..6148497c59 100644 --- a/mappings/net/minecraft/client/util/FontRenderer.mapping +++ b/mappings/net/minecraft/client/util/FontRenderer.mapping @@ -19,3 +19,5 @@ CLASS none/bec net/minecraft/client/util/FontRenderer ARG 1 x ARG 2 y ARG 3 color + METHOD a onResourceReload (Lnone/bya;)V + ARG 0 container diff --git a/mappings/net/minecraft/client/util/ModelIdentifier.mapping b/mappings/net/minecraft/client/util/ModelIdentifier.mapping index be61cb21dd..604b9df10b 100644 --- a/mappings/net/minecraft/client/util/ModelIdentifier.mapping +++ b/mappings/net/minecraft/client/util/ModelIdentifier.mapping @@ -1,2 +1,7 @@ CLASS none/bzo net/minecraft/client/util/ModelIdentifier FIELD c variant Ljava/lang/String; + METHOD (Lnone/kp;Ljava/lang/String;)V + ARG 0 id + ARG 1 variant + METHOD b split (Ljava/lang/String;)[Ljava/lang/String; + METHOD c getVariant ()Ljava/lang/String; diff --git a/mappings/net/minecraft/util/Identifier.mapping b/mappings/net/minecraft/util/Identifier.mapping index 1fe31da0ab..8203cc467e 100644 --- a/mappings/net/minecraft/util/Identifier.mapping +++ b/mappings/net/minecraft/util/Identifier.mapping @@ -8,7 +8,7 @@ CLASS none/kp net/minecraft/util/Identifier ARG 1 name METHOD a getName ()Ljava/lang/String; METHOD a split (Ljava/lang/String;)[Ljava/lang/String; - ARG 0 id + ARG 0 str METHOD b getOwner ()Ljava/lang/String; METHOD equals (Ljava/lang/Object;)Z ARG 0 other diff --git a/mappings/none/boq.mapping b/mappings/none/boq.mapping new file mode 100644 index 0000000000..540e7dab35 --- /dev/null +++ b/mappings/none/boq.mapping @@ -0,0 +1,3 @@ +CLASS none/boq + METHOD a onResourceReload (Lnone/bya;)V + ARG 0 container diff --git a/mappings/none/boy.mapping b/mappings/none/boy.mapping index 77986cc137..4cabff2e58 100644 --- a/mappings/none/boy.mapping +++ b/mappings/none/boy.mapping @@ -8,3 +8,5 @@ CLASS none/boy ARG 5 z ARG 6 volume ARG 7 pitch + METHOD a onResourceReload (Lnone/bya;)V + ARG 0 container diff --git a/mappings/none/bpm.mapping b/mappings/none/bpm.mapping new file mode 100644 index 0000000000..7b9354c724 --- /dev/null +++ b/mappings/none/bpm.mapping @@ -0,0 +1,3 @@ +CLASS none/bpm + METHOD a onResourceReload (Lnone/bya;)V + ARG 0 container diff --git a/mappings/none/bqw.mapping b/mappings/none/bqw.mapping deleted file mode 100644 index 8c9381e76d..0000000000 --- a/mappings/none/bqw.mapping +++ /dev/null @@ -1,6 +0,0 @@ -CLASS none/bqw - FIELD e textureManager Lnone/bxc; - FIELD f world Lnone/aiu; - FIELD n tileEntityRenderRegistry Ljava/util/Map; - FIELD o fontRenderer Lnone/bec; - METHOD a getFontRenderer ()Lnone/bec; diff --git a/mappings/none/bxo.mapping b/mappings/none/bxo.mapping deleted file mode 100644 index a22f712f52..0000000000 --- a/mappings/none/bxo.mapping +++ /dev/null @@ -1,6 +0,0 @@ -CLASS none/bxo - METHOD a getLogo ()Ljava/awt/image/BufferedImage; - METHOD a open (Lnone/kp;)Ljava/io/InputStream; - ARG 0 id - METHOD b canHandle (Lnone/kp;)Z - ARG 0 id diff --git a/mappings/none/bxw.mapping b/mappings/none/bxw.mapping new file mode 100644 index 0000000000..bbbfcb1da4 --- /dev/null +++ b/mappings/none/bxw.mapping @@ -0,0 +1,3 @@ +CLASS none/bxw + METHOD a onResourceReload (Lnone/bya;)V + ARG 0 container diff --git a/mappings/none/bxx.mapping b/mappings/none/bxx.mapping new file mode 100644 index 0000000000..b6e5a8d394 --- /dev/null +++ b/mappings/none/bxx.mapping @@ -0,0 +1,3 @@ +CLASS none/bxx + METHOD a onResourceReload (Lnone/bya;)V + ARG 0 container diff --git a/mappings/none/byd.mapping b/mappings/none/byd.mapping index d4798b0aac..4618cd5aad 100644 --- a/mappings/none/byd.mapping +++ b/mappings/none/byd.mapping @@ -2,5 +2,7 @@ CLASS none/byd METHOD a getLogo ()Ljava/awt/image/BufferedImage; METHOD a open (Lnone/kp;)Ljava/io/InputStream; ARG 0 id + METHOD b getName ()Ljava/lang/String; METHOD b canHandle (Lnone/kp;)Z ARG 0 id + METHOD c getProvidedAssets ()Ljava/util/Set; diff --git a/mappings/none/byl.mapping b/mappings/none/byl.mapping new file mode 100644 index 0000000000..31cf26521c --- /dev/null +++ b/mappings/none/byl.mapping @@ -0,0 +1,3 @@ +CLASS none/byl + METHOD a onResourceReload (Lnone/bya;)V + ARG 0 container diff --git a/mappings/none/bzn.mapping b/mappings/none/bzn.mapping new file mode 100644 index 0000000000..746d516fd8 --- /dev/null +++ b/mappings/none/bzn.mapping @@ -0,0 +1,3 @@ +CLASS none/bzn + METHOD a onResourceReload (Lnone/bya;)V + ARG 0 container diff --git a/mappings/none/cau.mapping b/mappings/none/cau.mapping index 8b6f7f231c..d75e0b112f 100644 --- a/mappings/none/cau.mapping +++ b/mappings/none/cau.mapping @@ -1,2 +1,4 @@ CLASS none/cau METHOD D_ update ()V + METHOD a onResourceReload (Lnone/bya;)V + ARG 0 container