From 02287bc3a4feaec272625960b2c4937e9f1a4dea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20Magiera?= Date: Sun, 16 Oct 2016 15:07:39 +0000 Subject: [PATCH] Name some things (#119) * Name some things * Apply suggestions * Apply suggestions --- .../client/gl/GlExtensionHandler.mapping | 79 +++++++++++++++++++ .../gui/ingame/GuiStructureBlock.mapping | 50 +++++++++++- .../entity/boss/EntityEnderDragon.mapping | 2 +- .../minecraft/sortme/ShaderException.mapping | 1 + 4 files changed, 129 insertions(+), 3 deletions(-) create mode 100644 mappings/net/minecraft/sortme/ShaderException.mapping diff --git a/mappings/net/minecraft/client/gl/GlExtensionHandler.mapping b/mappings/net/minecraft/client/gl/GlExtensionHandler.mapping index 21884277dd..4556e31a9c 100644 --- a/mappings/net/minecraft/client/gl/GlExtensionHandler.mapping +++ b/mappings/net/minecraft/client/gl/GlExtensionHandler.mapping @@ -59,59 +59,138 @@ CLASS none/cbg net/minecraft/client/gl/GlExtensionHandler FIELD z GL_SOURCE0_RGB I METHOD a init ()V METHOD a deleteShader (I)V + ARG 0 shader METHOD a multiTexCoord2f (IFF)V + ARG 0 target + ARG 1 s + ARG 2 t METHOD a getProgrami (II)I + ARG 0 program + ARG 1 programName METHOD a renderbufferStorage (IIII)V + ARG 0 target + ARG 1 internalFormat + ARG 2 width + ARG 3 height METHOD a framebufferTexture2D (IIIII)V + ARG 0 target + ARG 1 attachment + ARG 2 texTarget + ARG 3 texture + ARG 4 level METHOD a getUniformLocation (ILjava/lang/CharSequence;)I + ARG 0 program + ARG 1 name METHOD a shaderSource (ILjava/nio/ByteBuffer;)V + ARG 0 shader + ARG 1 source METHOD a bufferData (ILjava/nio/ByteBuffer;I)V ARG 0 target ARG 1 data ARG 2 usage METHOD a uniform1fv (ILjava/nio/FloatBuffer;)V + ARG 0 location + ARG 1 values METHOD a uniform1iv (ILjava/nio/IntBuffer;)V + ARG 0 location + ARG 1 values METHOD a uniformMatrix2fv (IZLjava/nio/FloatBuffer;)V + ARG 0 location + ARG 1 transpose + ARG 2 matrices METHOD a shellExecute (Ljava/io/File;)V METHOD b canUseShaders ()Z METHOD b createShader (I)I + ARG 0 type METHOD b attachShader (II)V + ARG 0 program + ARG 1 shader METHOD b framebufferRenderbuffer (IIII)V + ARG 0 target + ARG 1 attachment + ARG 2 renderbufferTarget + ARG 3 renderbuffer METHOD b getAttribLocation (ILjava/lang/CharSequence;)I + ARG 0 program + ARG 1 name METHOD b uniform2fv (ILjava/nio/FloatBuffer;)V + ARG 0 location + ARG 1 values METHOD b uniform2iv (ILjava/nio/IntBuffer;)V + ARG 0 location + ARG 1 values METHOD b uniformMatrix3fv (IZLjava/nio/FloatBuffer;)V + ARG 0 location + ARG 1 transpose + ARG 2 matrices METHOD c getInitInfoLog ()Ljava/lang/String; METHOD c compileShader (I)V + ARG 0 shader METHOD c getShader (II)I + ARG 0 shader + ARG 1 programName METHOD c blendFuncSeparate (IIII)V + ARG 0 sFactorRGB + ARG 1 dFactorRGB + ARG 2 sFactorAlpha + ARG 3 dFactorAlpha METHOD c uniform3fv (ILjava/nio/FloatBuffer;)V + ARG 0 location + ARG 1 values METHOD c uniform3iv (ILjava/nio/IntBuffer;)V + ARG 0 location + ARG 1 values METHOD c uniformMatrix4fv (IZLjava/nio/FloatBuffer;)V + ARG 0 location + ARG 1 transpose + ARG 2 matrices METHOD d createProgram ()I METHOD d useProgram (I)V + ARG 0 program METHOD d getShaderInfoLog (II)Ljava/lang/String; + ARG 0 shader + ARG 1 maxLength METHOD d uniform4fv (ILjava/nio/FloatBuffer;)V + ARG 0 location + ARG 1 values METHOD d uniform4iv (ILjava/nio/IntBuffer;)V + ARG 0 location + ARG 1 values METHOD e genBuffers ()I METHOD e deleteProgram (I)V + ARG 0 program METHOD e getProgramInfoLog (II)Ljava/lang/String; + ARG 0 program + ARG 1 maxLength METHOD f useVertexBufferObjects ()Z METHOD f linkProgram (I)V + ARG 0 program METHOD f uniform1i (II)V + ARG 0 location + ARG 1 value METHOD g genFramebuffers ()I METHOD g deleteBuffers (I)V + ARG 0 buffer METHOD g bindBuffer (II)V ARG 0 target ARG 1 bufferId METHOD h genRenderbuffers ()I METHOD h deleteRenderbuffers (I)V + ARG 0 renderbuffer METHOD h bindFramebuffer (II)V + ARG 0 target + ARG 1 framebuffer METHOD i deleteFramebuffers (I)V + ARG 0 framebuffer METHOD i bindRenderbuffer (II)V + ARG 0 target + ARG 1 renderbuffer METHOD j useFramebufferObjects ()Z METHOD j checkFramebufferStatus (I)I + ARG 0 target METHOD k getCpuInfoString ()Ljava/lang/String; METHOD k activeTexture (I)V + ARG 0 texture METHOD l clientActiveTexture (I)V + ARG 0 texture METHOD m drawAxes3D (I)V diff --git a/mappings/net/minecraft/client/gui/ingame/GuiStructureBlock.mapping b/mappings/net/minecraft/client/gui/ingame/GuiStructureBlock.mapping index 1baa89e26f..71186d0441 100644 --- a/mappings/net/minecraft/client/gui/ingame/GuiStructureBlock.mapping +++ b/mappings/net/minecraft/client/gui/ingame/GuiStructureBlock.mapping @@ -1,8 +1,41 @@ CLASS none/bia net/minecraft/client/gui/ingame/GuiStructureBlock + FIELD A inputSizeY Lnone/bep; + FIELD B inputSizeZ Lnone/bep; + FIELD C inputIntegrity Lnone/bep; + FIELD D inputSeed Lnone/bep; + FIELD E inputMetadata Lnone/bep; + FIELD F buttonDone Lnone/bel; + FIELD G buttonCancel Lnone/bel; + FIELD H buttonSave Lnone/bel; + FIELD I buttonLoad Lnone/bel; + FIELD J buttonRotate0 Lnone/bel; + FIELD K buttonRotate90 Lnone/bel; + FIELD L buttonRotate180 Lnone/bel; + FIELD M buttonRotate270 Lnone/bel; + FIELD N buttonMode Lnone/bel; + FIELD O buttonDetect Lnone/bel; + FIELD P buttonEntities Lnone/bel; + FIELD Q buttonMirror Lnone/bel; + FIELD R buttonShowAir Lnone/bel; + FIELD S buttonShowBoundingBox Lnone/bel; + FIELD T textFields Ljava/util/List; + FIELD U decimalFormat Ljava/text/DecimalFormat; FIELD f LOGGER Lorg/apache/logging/log4j/Logger; - FIELD g te Lnone/ary; + FIELD g structureBlock Lnone/ary; + FIELD h mirror Lnone/any; + FIELD i rotation Lnone/apl; + FIELD r mode Lnone/ary$a; + FIELD s ignoreEntities Z + FIELD t showAir Z + FIELD u showBoundingBox Z + FIELD v inputName Lnone/bep; + FIELD w inputPosX Lnone/bep; + FIELD x inputPosY Lnone/bep; + FIELD y inputPosZ Lnone/bep; + FIELD z inputSizeX Lnone/bep; METHOD (Lnone/ary;)V - ARG 0 te + ARG 0 structureBlock + METHOD a updateIgnoreEntitiesButton ()V METHOD a handleKeyPress (CI)V ARG 0 keyChar ARG 1 keyCode @@ -14,8 +47,21 @@ CLASS none/bia net/minecraft/client/gui/ingame/GuiStructureBlock ARG 0 mouseX ARG 1 mouseY ARG 2 mouseButton + METHOD a parseLong (Ljava/lang/String;)J + ARG 0 s METHOD a handleButtonPressed (Lnone/bel;)V ARG 0 button METHOD b init ()V + METHOD b sendUpdate (I)Z + ARG 0 type + METHOD b parseFloat (Ljava/lang/String;)F + ARG 0 s + METHOD c parseInt (Ljava/lang/String;)I + ARG 0 s METHOD e update ()V + METHOD f updateShowAirButton ()V + METHOD g updateShowBoundingBoxButton ()V + METHOD h updateMirrorButton ()V + METHOD i updateRotationButton ()V + METHOD j updateMode ()V METHOD m onClosed ()V diff --git a/mappings/net/minecraft/entity/boss/EntityEnderDragon.mapping b/mappings/net/minecraft/entity/boss/EntityEnderDragon.mapping index 95205b40a4..35e285f8e0 100644 --- a/mappings/net/minecraft/entity/boss/EntityEnderDragon.mapping +++ b/mappings/net/minecraft/entity/boss/EntityEnderDragon.mapping @@ -10,8 +10,8 @@ CLASS none/xr net/minecraft/entity/boss/EntityEnderDragon FIELD by partBody Lnone/xp; FIELD bz partTail1 Lnone/xp; METHOD G getSoundAmbient ()Lnone/nk; - METHOD a getPartDamageWorld ()Lnone/aiw; METHOD L checkDespawn ()V + METHOD a getPartDamageWorld ()Lnone/aiw; METHOD a deserializeCustomData (Lnone/dt;)V ARG 0 tag METHOD a onTrackedDataSet (Lnone/kj;)V diff --git a/mappings/net/minecraft/sortme/ShaderException.mapping b/mappings/net/minecraft/sortme/ShaderException.mapping new file mode 100644 index 0000000000..fb315508ee --- /dev/null +++ b/mappings/net/minecraft/sortme/ShaderException.mapping @@ -0,0 +1 @@ +CLASS none/kt net/minecraft/sortme/ShaderException