From f8eac78aa4c30980ebc35aa476265d4356b4eb9d Mon Sep 17 00:00:00 2001 From: Adrian Siekierka Date: Sat, 13 May 2017 08:18:40 +0200 Subject: [PATCH] map RunArgs, minor cleanup --- mappings/bqf.mapping | 2 ++ .../net/minecraft/client/MinecraftGame.mapping | 2 ++ mappings/net/minecraft/client/RunArgs.mapping | 16 +++++++++++++++- mappings/net/minecraft/client/gl/Shader.mapping | 1 + .../minecraft/client/gl/ShaderException.mapping | 1 + .../net/minecraft/sortme/IFileIOTask.mapping | 2 -- .../minecraft/sortme/PlayerSkinProvider.mapping | 12 ++++++++++++ mappings/net/minecraft/sortme/Shader.mapping | 1 - .../net/minecraft/sortme/ShaderException.mapping | 1 - .../net/minecraft/sortme/SkinSomething.mapping | 5 ----- .../minecraft/util/BoundedFloatPredicate.mapping | 3 +++ mappings/net/minecraft/util/DyeColor.mapping | 1 + .../net/minecraft/util/InventoryUtils.mapping | 10 ++++++++++ .../net/minecraft/world/WorldFileIOTask.mapping | 2 ++ 14 files changed, 49 insertions(+), 10 deletions(-) create mode 100644 mappings/bqf.mapping create mode 100644 mappings/net/minecraft/client/gl/Shader.mapping create mode 100644 mappings/net/minecraft/client/gl/ShaderException.mapping delete mode 100644 mappings/net/minecraft/sortme/IFileIOTask.mapping create mode 100644 mappings/net/minecraft/sortme/PlayerSkinProvider.mapping delete mode 100644 mappings/net/minecraft/sortme/Shader.mapping delete mode 100644 mappings/net/minecraft/sortme/ShaderException.mapping delete mode 100644 mappings/net/minecraft/sortme/SkinSomething.mapping create mode 100644 mappings/net/minecraft/world/WorldFileIOTask.mapping diff --git a/mappings/bqf.mapping b/mappings/bqf.mapping new file mode 100644 index 0000000000..944e57eba4 --- /dev/null +++ b/mappings/bqf.mapping @@ -0,0 +1,2 @@ +CLASS bqf + FIELD a LOGGER Lorg/apache/logging/log4j/Logger; diff --git a/mappings/net/minecraft/client/MinecraftGame.mapping b/mappings/net/minecraft/client/MinecraftGame.mapping index 9b42667472..b46d82f693 100644 --- a/mappings/net/minecraft/client/MinecraftGame.mapping +++ b/mappings/net/minecraft/client/MinecraftGame.mapping @@ -28,6 +28,7 @@ CLASS bgm net/minecraft/client/MinecraftGame FIELD aK musicTracker Lcfm; FIELD aL logoTexture Lmd; FIELD aM sessionService Lcom/mojang/authlib/minecraft/MinecraftSessionService; + FIELD aN skinProvider Lcdd; FIELD aO taskQueue Ljava/util/Queue; FIELD aP thread Ljava/lang/Thread; FIELD aQ bakedModelManager Lcei; @@ -90,6 +91,7 @@ CLASS bgm net/minecraft/client/MinecraftGame METHOD U getSoundLoader ()Lcfp; METHOD V getMusicType ()Lcfm$a; METHOD X getSessionService ()Lcom/mojang/authlib/minecraft/MinecraftSessionService; + METHOD Y getSkinProvider ()Lcdd; METHOD Z isSnooperEnabled ()Z METHOD a start ()V METHOD a serializeBlockEntityTag (Lahf;Latu;)Lahf; diff --git a/mappings/net/minecraft/client/RunArgs.mapping b/mappings/net/minecraft/client/RunArgs.mapping index 775402c5de..115ecbd699 100644 --- a/mappings/net/minecraft/client/RunArgs.mapping +++ b/mappings/net/minecraft/client/RunArgs.mapping @@ -1,15 +1,29 @@ CLASS bnh net/minecraft/client/RunArgs + CLASS bnh$a Render + FIELD a width I + FIELD b height I + FIELD c fullscreen Z + FIELD d checkGlErrors Z CLASS bnh$b Directories FIELD a runDir Ljava/io/File; FIELD b resourcePackDir Ljava/io/File; FIELD c assetDir Ljava/io/File; FIELD d assetIndex Ljava/lang/String; + METHOD a getResourceIndex ()Lcck; + CLASS bnh$c Game + FIELD a demo Z + FIELD b version Ljava/lang/String; + FIELD c versionType Ljava/lang/String; CLASS bnh$d AutoConnect FIELD a serverIp Ljava/lang/String; FIELD b serverPort I CLASS bnh$e Network FIELD a session Lbgt; + FIELD b userProperties Lcom/mojang/authlib/properties/PropertyMap; + FIELD c profileProperties Lcom/mojang/authlib/properties/PropertyMap; FIELD d netProxy Ljava/net/Proxy; FIELD a network Lbnh$e; - FIELD c dirs Lbnh$b; + FIELD b render Lbnh$a; + FIELD c directories Lbnh$b; + FIELD d game Lbnh$c; FIELD e autoConnect Lbnh$d; diff --git a/mappings/net/minecraft/client/gl/Shader.mapping b/mappings/net/minecraft/client/gl/Shader.mapping new file mode 100644 index 0000000000..453bedf49a --- /dev/null +++ b/mappings/net/minecraft/client/gl/Shader.mapping @@ -0,0 +1 @@ +CLASS cbf net/minecraft/client/gl/Shader diff --git a/mappings/net/minecraft/client/gl/ShaderException.mapping b/mappings/net/minecraft/client/gl/ShaderException.mapping new file mode 100644 index 0000000000..25f7d593c9 --- /dev/null +++ b/mappings/net/minecraft/client/gl/ShaderException.mapping @@ -0,0 +1 @@ +CLASS mh net/minecraft/client/gl/ShaderException diff --git a/mappings/net/minecraft/sortme/IFileIOTask.mapping b/mappings/net/minecraft/sortme/IFileIOTask.mapping deleted file mode 100644 index d179b13f56..0000000000 --- a/mappings/net/minecraft/sortme/IFileIOTask.mapping +++ /dev/null @@ -1,2 +0,0 @@ -CLASS bfj net/minecraft/sortme/IFileIOTask - METHOD c run ()Z diff --git a/mappings/net/minecraft/sortme/PlayerSkinProvider.mapping b/mappings/net/minecraft/sortme/PlayerSkinProvider.mapping new file mode 100644 index 0000000000..7e7fc9e1b7 --- /dev/null +++ b/mappings/net/minecraft/sortme/PlayerSkinProvider.mapping @@ -0,0 +1,12 @@ +CLASS cdd net/minecraft/sortme/PlayerSkinProvider + CLASS cdd$2 + METHOD a filterImage (Ljava/awt/image/BufferedImage;)Ljava/awt/image/BufferedImage; + FIELD a EXECUTOR_SERVICE Ljava/util/concurrent/ExecutorService; + FIELD b textureManager Lcbx; + FIELD c skinCacheDir Ljava/io/File; + FIELD d sessionService Lcom/mojang/authlib/minecraft/MinecraftSessionService; + FIELD e skinCache Lcom/google/common/cache/LoadingCache; + METHOD a (Lcom/mojang/authlib/GameProfile;)Ljava/util/Map; + ARG 0 profile + METHOD a (Lcom/mojang/authlib/minecraft/MinecraftProfileTexture;Lcom/mojang/authlib/minecraft/MinecraftProfileTexture$Type;)Lmd; + METHOD a (Lcom/mojang/authlib/minecraft/MinecraftProfileTexture;Lcom/mojang/authlib/minecraft/MinecraftProfileTexture$Type;Lcdd$a;)Lmd; diff --git a/mappings/net/minecraft/sortme/Shader.mapping b/mappings/net/minecraft/sortme/Shader.mapping deleted file mode 100644 index deddd03629..0000000000 --- a/mappings/net/minecraft/sortme/Shader.mapping +++ /dev/null @@ -1 +0,0 @@ -CLASS cbf net/minecraft/sortme/Shader diff --git a/mappings/net/minecraft/sortme/ShaderException.mapping b/mappings/net/minecraft/sortme/ShaderException.mapping deleted file mode 100644 index 1194bc25c3..0000000000 --- a/mappings/net/minecraft/sortme/ShaderException.mapping +++ /dev/null @@ -1 +0,0 @@ -CLASS mh net/minecraft/sortme/ShaderException diff --git a/mappings/net/minecraft/sortme/SkinSomething.mapping b/mappings/net/minecraft/sortme/SkinSomething.mapping deleted file mode 100644 index 0f9cfe2970..0000000000 --- a/mappings/net/minecraft/sortme/SkinSomething.mapping +++ /dev/null @@ -1,5 +0,0 @@ -CLASS cdd net/minecraft/sortme/SkinSomething - CLASS cdd$2 - METHOD a filterImage (Ljava/awt/image/BufferedImage;)Ljava/awt/image/BufferedImage; - FIELD b textureManager Lcbx; - FIELD d sessionService Lcom/mojang/authlib/minecraft/MinecraftSessionService; diff --git a/mappings/net/minecraft/util/BoundedFloatPredicate.mapping b/mappings/net/minecraft/util/BoundedFloatPredicate.mapping index 21c3e0ea73..ac0fbd3034 100644 --- a/mappings/net/minecraft/util/BoundedFloatPredicate.mapping +++ b/mappings/net/minecraft/util/BoundedFloatPredicate.mapping @@ -2,6 +2,9 @@ CLASS ah net/minecraft/util/BoundedFloatPredicate FIELD a ALL Lah; FIELD b min Ljava/lang/Float; FIELD c max Ljava/lang/Float; + METHOD (Ljava/lang/Float;Ljava/lang/Float;)V + ARG 0 min + ARG 1 max METHOD a matches (D)Z ARG 0 d METHOD a matches (F)Z diff --git a/mappings/net/minecraft/util/DyeColor.mapping b/mappings/net/minecraft/util/DyeColor.mapping index 058d8d5425..270b024b6c 100644 --- a/mappings/net/minecraft/util/DyeColor.mapping +++ b/mappings/net/minecraft/util/DyeColor.mapping @@ -29,6 +29,7 @@ CLASS agi net/minecraft/util/DyeColor METHOD b getDyeId ()I METHOD b getDyeColor (I)Lagi; ARG 0 id + METHOD c getNameClient ()Ljava/lang/String; METHOD d getTranslationKey ()Ljava/lang/String; METHOD e getMapColor ()Lbbl; METHOD m asString ()Ljava/lang/String; diff --git a/mappings/net/minecraft/util/InventoryUtils.mapping b/mappings/net/minecraft/util/InventoryUtils.mapping index a0cca3c54c..573264548c 100644 --- a/mappings/net/minecraft/util/InventoryUtils.mapping +++ b/mappings/net/minecraft/util/InventoryUtils.mapping @@ -1,4 +1,11 @@ CLASS sr net/minecraft/util/InventoryUtils + METHOD a serialize (Lfc;Lem;)Lfc; + ARG 0 tag + ARG 1 stacks + METHOD a serialize (Lfc;Lem;Z)Lfc; + ARG 0 tag + ARG 1 stacks + ARG 2 setIfEmpty METHOD a removeStack (Ljava/util/List;I)Lahf; ARG 0 stacks ARG 1 slot @@ -6,3 +13,6 @@ CLASS sr net/minecraft/util/InventoryUtils ARG 0 stacks ARG 1 slot ARG 2 amount + METHOD b deserialize (Lfc;Lem;)V + ARG 0 tag + ARG 1 stacks diff --git a/mappings/net/minecraft/world/WorldFileIOTask.mapping b/mappings/net/minecraft/world/WorldFileIOTask.mapping new file mode 100644 index 0000000000..64b4159ef7 --- /dev/null +++ b/mappings/net/minecraft/world/WorldFileIOTask.mapping @@ -0,0 +1,2 @@ +CLASS bfj net/minecraft/world/WorldFileIOTask + METHOD c run ()Z