Skip to content

Commit

Permalink
Add various mappings
Browse files Browse the repository at this point in the history
Fixes from review

More fixes from review

passesLight -> allowsLightTransmission, blocksLight -> preventsLightTransmission

Remove badly named params from "nearest" function
  • Loading branch information
mezz authored and asiekierka committed Oct 15, 2016
1 parent fe95325 commit 059d239
Show file tree
Hide file tree
Showing 46 changed files with 300 additions and 47 deletions.
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
.gradle/
*-merged.jar
*.DS_Store
build/
build/
.idea/
21 changes: 14 additions & 7 deletions mappings/net/minecraft/block/Block.mapping
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,9 @@ CLASS none/aky net/minecraft/block/Block
FIELD i BLOCKSTATE_ID_LIST Lnone/cx;
FIELD j FULL_BLOCK_BOX Lnone/bcs;
FIELD k NULL_BOX Lnone/bcs;
FIELD l fullBoundsCube Z
FIELD m lightOpacityLevel I
FIELD n allowsLightTransmission Z
FIELD o lightEmissionLevel I
FIELD q hardness F
FIELD r explosionResistance F
Expand Down Expand Up @@ -190,10 +193,12 @@ CLASS none/aky net/minecraft/block/Block
ARG 3 mask
ARG 4 list
ARG 5 entity
METHOD a (Lnone/asm;Lnone/aiw;Lnone/cn;Lnone/bcv;Lnone/bcv;)Lnone/bct;
METHOD a rayTrace (Lnone/asm;Lnone/aiw;Lnone/cn;Lnone/bcv;Lnone/bcv;)Lnone/bct;
ARG 0 state
ARG 1 world
ARG 2 pos
ARG 3 begin
ARG 4 end
METHOD a getCollisionBox (Lnone/asm;Lnone/aja;Lnone/cn;)Lnone/bcs;
ARG 0 state
ARG 1 view
Expand All @@ -209,7 +214,7 @@ CLASS none/aky net/minecraft/block/Block
METHOD a applyRotation (Lnone/asm;Lnone/apl;)Lnone/asm;
ARG 0 state
ARG 1 rotation
METHOD a (Lnone/asm;Lnone/sg;)Z
METHOD a allowsSpawning (Lnone/asm;Lnone/sg;)Z
ARG 0 state
ARG 1 entity
METHOD a (Lnone/asm;Z)Z
Expand All @@ -219,8 +224,10 @@ CLASS none/aky net/minecraft/block/Block
ARG 1 mask
ARG 2 list
ARG 3 box
METHOD a (Lnone/cn;Lnone/bcv;Lnone/bcv;Lnone/bcs;)Lnone/bct;
METHOD a rayTrace (Lnone/cn;Lnone/bcv;Lnone/bcv;Lnone/bcs;)Lnone/bct;
ARG 0 pos
ARG 1 begin
ARG 2 end
ARG 3 box
METHOD a getExplosionResistance (Lnone/sg;)F
ARG 0 entity
Expand Down Expand Up @@ -326,15 +333,15 @@ CLASS none/aky net/minecraft/block/Block
METHOD j getRawIdFromBlockState (Lnone/asm;)I
ARG 0 state
METHOD k setUnbreakable ()Lnone/aky;
METHOD k (Lnone/asm;)Z
METHOD k isOpaqueFullBoundsCube (Lnone/asm;)Z
ARG 0 state
METHOD l shouldTickRandomly ()Z
METHOD l (Lnone/asm;)Z
METHOD l isFullBoundsCube (Lnone/asm;)Z
ARG 0 state
METHOD m hasBlockEntity ()Z
METHOD m (Lnone/asm;)I
METHOD m getLightOpacityLevel (Lnone/asm;)I
ARG 0 state
METHOD n (Lnone/asm;)Z
METHOD n allowsLightTransmission (Lnone/asm;)Z
ARG 0 state
METHOD o getLightEmissionLevel (Lnone/asm;)I
ARG 0 state
Expand Down
2 changes: 1 addition & 1 deletion mappings/net/minecraft/block/BlockHopper.mapping
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ CLASS none/anl net/minecraft/block/BlockHopper
METHOD f getRenderLayer ()Lnone/aio;
METHOD f isEnabled (I)Z
ARG 0 meta
METHOD k (Lnone/asm;)Z
METHOD k isOpaqueFullBoundsCube (Lnone/asm;)Z
ARG 0 state
METHOD v (Lnone/asm;)Z
ARG 0 state
2 changes: 1 addition & 1 deletion mappings/net/minecraft/block/BlockMagma.mapping
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ CLASS none/anw net/minecraft/block/BlockMagma
ARG 0 world
ARG 1 pos
ARG 2 entity
METHOD a (Lnone/asm;Lnone/sg;)Z
METHOD a allowsSpawning (Lnone/asm;Lnone/sg;)Z
ARG 0 state
ARG 1 entity
METHOD b randomTick (Lnone/aiw;Lnone/cn;Lnone/asm;Ljava/util/Random;)V
Expand Down
2 changes: 1 addition & 1 deletion mappings/net/minecraft/block/BlockPiston.mapping
Original file line number Diff line number Diff line change
Expand Up @@ -74,5 +74,5 @@ CLASS none/asd net/minecraft/block/BlockPiston
ARG 0 state
METHOD e serializeState (Lnone/asm;)I
ARG 0 state
METHOD k (Lnone/asm;)Z
METHOD k isOpaqueFullBoundsCube (Lnone/asm;)Z
ARG 0 state
4 changes: 3 additions & 1 deletion mappings/net/minecraft/block/BlockPistonExtension.mapping
Original file line number Diff line number Diff line change
Expand Up @@ -38,10 +38,12 @@ CLASS none/asf net/minecraft/block/BlockPistonExtension
ARG 1 world
ARG 2 pos
ARG 3 changedBlock
METHOD a (Lnone/asm;Lnone/aiw;Lnone/cn;Lnone/bcv;Lnone/bcv;)Lnone/bct;
METHOD a rayTrace (Lnone/asm;Lnone/aiw;Lnone/cn;Lnone/bcv;Lnone/bcv;)Lnone/bct;
ARG 0 state
ARG 1 world
ARG 2 pos
ARG 3 begin
ARG 4 end
METHOD a getCollisionBox (Lnone/asm;Lnone/aja;Lnone/cn;)Lnone/bcs;
ARG 0 state
ARG 1 view
Expand Down
2 changes: 1 addition & 1 deletion mappings/net/minecraft/block/BlockPistonHead.mapping
Original file line number Diff line number Diff line change
Expand Up @@ -64,5 +64,5 @@ CLASS none/ase net/minecraft/block/BlockPistonHead
ARG 0 state
METHOD e serializeState (Lnone/asm;)I
ARG 0 state
METHOD k (Lnone/asm;)Z
METHOD k isOpaqueFullBoundsCube (Lnone/asm;)Z
ARG 0 state
2 changes: 1 addition & 1 deletion mappings/net/minecraft/block/BlockSlabBase.mapping
Original file line number Diff line number Diff line change
Expand Up @@ -39,5 +39,5 @@ CLASS none/anf net/minecraft/block/BlockSlabBase
METHOD e getTranslationKey (I)Ljava/lang/String;
ARG 0 metadata
METHOD g getVariantProperty ()Lnone/atc;
METHOD k (Lnone/asm;)Z
METHOD k isOpaqueFullBoundsCube (Lnone/asm;)Z
ARG 0 state
2 changes: 1 addition & 1 deletion mappings/net/minecraft/block/BlockSnowLayer.mapping
Original file line number Diff line number Diff line change
Expand Up @@ -55,5 +55,5 @@ CLASS none/apu net/minecraft/block/BlockSnowLayer
ARG 0 state
METHOD e serializeState (Lnone/asm;)I
ARG 0 state
METHOD k (Lnone/asm;)Z
METHOD k isOpaqueFullBoundsCube (Lnone/asm;)Z
ARG 0 state
6 changes: 4 additions & 2 deletions mappings/net/minecraft/block/BlockStairs.mapping
Original file line number Diff line number Diff line change
Expand Up @@ -77,10 +77,12 @@ CLASS none/aqa net/minecraft/block/BlockStairs
ARG 3 mask
ARG 4 list
ARG 5 entity
METHOD a (Lnone/asm;Lnone/aiw;Lnone/cn;Lnone/bcv;Lnone/bcv;)Lnone/bct;
METHOD a rayTrace (Lnone/asm;Lnone/aiw;Lnone/cn;Lnone/bcv;Lnone/bcv;)Lnone/bct;
ARG 0 state
ARG 1 world
ARG 2 pos
ARG 3 begin
ARG 4 end
METHOD a applyMirror (Lnone/asm;Lnone/any;)Lnone/asm;
ARG 0 state
ARG 1 mirror
Expand Down Expand Up @@ -128,7 +130,7 @@ CLASS none/aqa net/minecraft/block/BlockStairs
METHOD e serializeState (Lnone/asm;)I
ARG 0 state
METHOD f getRenderLayer ()Lnone/aio;
METHOD k (Lnone/asm;)Z
METHOD k isOpaqueFullBoundsCube (Lnone/asm;)Z
ARG 0 state
METHOD r getMapColor (Lnone/asm;)Lnone/ays;
ARG 0 state
5 changes: 5 additions & 0 deletions mappings/net/minecraft/block/BlockVine.mapping
Original file line number Diff line number Diff line change
@@ -1,10 +1,15 @@
CLASS none/aqr net/minecraft/block/BlockVine
FIELD B WEST_BLOCK_BOX Lnone/bcs;
FIELD C EAST_BLOCK_BOX Lnone/bcs;
FIELD D NORTH_BLOCK_BOX Lnone/bcs;
FIELD E SOUTH_BLOCK_BOX Lnone/bcs;
FIELD a UP Lnone/asy;
FIELD b NORTH Lnone/asy;
FIELD c EAST Lnone/asy;
FIELD d SOUTH Lnone/asy;
FIELD e WEST Lnone/asy;
FIELD f PROPERTIES [Lnone/asy;
FIELD g UP_BLOCK_BOX Lnone/bcs;
METHOD a deserializeState (I)Lnone/asm;
ARG 0 meta
METHOD a getDropAmount (Ljava/util/Random;)I
Expand Down
9 changes: 8 additions & 1 deletion mappings/net/minecraft/block/IBlockInfoProxy.mapping
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ CLASS none/asl net/minecraft/block/IBlockInfoProxy
ARG 2 mask
ARG 3 boxes
ARG 4 entity
METHOD a (Lnone/aiw;Lnone/cn;Lnone/bcv;Lnone/bcv;)Lnone/bct;
METHOD a rayTrace (Lnone/aiw;Lnone/cn;Lnone/bcv;Lnone/bcv;)Lnone/bct;
ARG 0 world
ARG 1 pos
METHOD a (Lnone/aja;Lnone/cn;)I
Expand All @@ -27,6 +27,9 @@ CLASS none/asl net/minecraft/block/IBlockInfoProxy
ARG 0 mirror
METHOD a applyRotation (Lnone/apl;)Lnone/asm;
ARG 0 rotation
METHOD a allowsSpawning (Lnone/sg;)Z
ARG 0 entity
METHOD b isFullBoundsCube ()Z
METHOD b getHardness (Lnone/aiw;Lnone/cn;)F
ARG 0 world
ARG 1 pos
Expand All @@ -37,6 +40,7 @@ CLASS none/asl net/minecraft/block/IBlockInfoProxy
ARG 0 view
ARG 1 pos
ARG 2 facingFrom
METHOD c getLightOpacityLevel ()I
METHOD c getBoundingBoxClient (Lnone/aiw;Lnone/cn;)Lnone/bcs;
ARG 0 world
ARG 1 pos
Expand All @@ -51,7 +55,10 @@ CLASS none/asl net/minecraft/block/IBlockInfoProxy
METHOD d getBoundingBox (Lnone/aja;Lnone/cn;)Lnone/bcs;
ARG 0 view
ARG 1 pos
METHOD e allowsLightTransmission ()Z
METHOD g getMapColor ()Lnone/ays;
METHOD h ()Z
METHOD i getRenderType ()Lnone/api;
METHOD m emitsRedstonePower ()Z
METHOD o getPistonBehavior ()Lnone/ayu;
METHOD q isOpaqueFullBoundsCube ()Z
1 change: 1 addition & 0 deletions mappings/net/minecraft/block/material/Material.mapping
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@ CLASS none/ayr net/minecraft/block/material/Material
METHOD <init> (Lnone/ays;)V
ARG 0 color
METHOD a isFullBlock ()Z
METHOD b preventsLightTransmission ()Z
METHOD c isSolid ()Z
METHOD d isLiquid ()Z
METHOD f setUnharvestable ()Lnone/ayr;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
CLASS none/ayp net/minecraft/block/material/MaterialNonSolid
METHOD a isFullBlock ()Z
METHOD b preventsLightTransmission ()Z
METHOD c isSolid ()Z
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
CLASS none/ayo net/minecraft/block/material/MaterialPartialBlock
METHOD a isFullBlock ()Z
METHOD b preventsLightTransmission ()Z
METHOD c isSolid ()Z
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
CLASS none/ayt net/minecraft/block/material/MaterialPortal
METHOD a isFullBlock ()Z
METHOD b preventsLightTransmission ()Z
METHOD c isSolid ()Z
9 changes: 8 additions & 1 deletion mappings/net/minecraft/block/state/BlockStateFactory.mapping
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ CLASS none/asn net/minecraft/block/state/BlockStateFactory
ARG 2 mask
ARG 3 boxes
ARG 4 entity
METHOD a (Lnone/aiw;Lnone/cn;Lnone/bcv;Lnone/bcv;)Lnone/bct;
METHOD a rayTrace (Lnone/aiw;Lnone/cn;Lnone/bcv;Lnone/bcv;)Lnone/bct;
ARG 0 world
ARG 1 pos
METHOD a (Lnone/aja;Lnone/cn;)I
Expand All @@ -41,6 +41,9 @@ CLASS none/asn net/minecraft/block/state/BlockStateFactory
METHOD a applyRotation (Lnone/apl;)Lnone/asm;
ARG 0 rotation
METHOD a with (Lnone/atc;Ljava/lang/Comparable;)Lnone/asm;
METHOD a allowsSpawning (Lnone/sg;)Z
ARG 0 entity
METHOD b isFullBoundsCube ()Z
METHOD b getHardness (Lnone/aiw;Lnone/cn;)F
ARG 0 world
ARG 1 pos
Expand All @@ -51,6 +54,7 @@ CLASS none/asn net/minecraft/block/state/BlockStateFactory
ARG 0 view
ARG 1 pos
ARG 2 facingFrom
METHOD c getLightOpacityLevel ()I
METHOD c getBoundingBoxClient (Lnone/aiw;Lnone/cn;)Lnone/bcs;
ARG 0 world
ARG 1 pos
Expand All @@ -67,12 +71,15 @@ CLASS none/asn net/minecraft/block/state/BlockStateFactory
METHOD d getBoundingBox (Lnone/aja;Lnone/cn;)Lnone/bcs;
ARG 0 view
ARG 1 pos
METHOD e allowsLightTransmission ()Z
METHOD equals (Ljava/lang/Object;)Z
ARG 0 other
METHOD g getMapColor ()Lnone/ays;
METHOD h ()Z
METHOD i getRenderType ()Lnone/api;
METHOD m emitsRedstonePower ()Z
METHOD o getPistonBehavior ()Lnone/ayu;
METHOD q isOpaqueFullBoundsCube ()Z
METHOD r getProperties ()Ljava/util/Collection;
METHOD s getValues ()Lcom/google/common/collect/ImmutableMap;
METHOD t getBlock ()Lnone/aky;
Expand Down
6 changes: 6 additions & 0 deletions mappings/net/minecraft/client/MinecraftGame.mapping
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,8 @@ CLASS none/bdr net/minecraft/client/MinecraftGame
FIELD R instance Lnone/bdr;
FIELD S migrationHandler Lnone/pf;
FIELD T fullscreen Z
FIELD V crashed Z
FIELD W crashReport Lnone/b;
FIELD Z snooper Lnone/rl;
FIELD aA metadataDeserializer Lnone/byu;
FIELD aB defaultResourcePacks Ljava/util/List;
Expand Down Expand Up @@ -119,6 +121,8 @@ CLASS none/bdr net/minecraft/client/MinecraftGame
METHOD a serializeBlockEntityTag (Lnone/aes;Lnone/are;)Lnone/aes;
ARG 0 stack
ARG 1 blockEntity
METHOD a setCrashReport (Lnone/b;)V
ARG 0 crashReport
METHOD a openGui (Lnone/bgn;)V
ARG 0 screen
METHOD a setCurrentServerEntry (Lnone/bmk;)V
Expand Down Expand Up @@ -156,6 +160,8 @@ CLASS none/bdr net/minecraft/client/MinecraftGame
METHOD b addSnooperInitialInfo (Lnone/rl;)V
ARG 0 snooper
METHOD c getGameVersion ()Ljava/lang/String;
METHOD c printCrashReport (Lnone/b;)V
ARG 0 crashReport
METHOD d getVersionType ()Ljava/lang/String;
METHOD e shouldUseUnicodeFont ()Z
METHOD f reloadResources ()V
Expand Down
13 changes: 13 additions & 0 deletions mappings/net/minecraft/client/gl/GlBuffer.mapping
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
CLASS none/bxn net/minecraft/client/gl/GlBuffer
FIELD a id I
FIELD b format Lnone/bxo;
FIELD c vertexCount I
METHOD <init> (Lnone/bxo;)V
ARG 0 vertexFormat
METHOD a bind ()V
METHOD a draw (I)V
ARG 0 glMode
METHOD a set (Ljava/nio/ByteBuffer;)V
ARG 0 byteBuffer
METHOD b unbind ()V
METHOD c delete ()V
5 changes: 5 additions & 0 deletions mappings/net/minecraft/client/gl/GlExtensionHandler.mapping
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,9 @@ CLASS none/cbg net/minecraft/client/gl/GlExtensionHandler
METHOD a getUniformLocation (ILjava/lang/CharSequence;)I
METHOD a shaderSource (ILjava/nio/ByteBuffer;)V
METHOD a bufferData (ILjava/nio/ByteBuffer;I)V
ARG 0 target
ARG 1 data
ARG 2 usage
METHOD a uniform1fv (ILjava/nio/FloatBuffer;)V
METHOD a uniform1iv (ILjava/nio/IntBuffer;)V
METHOD a uniformMatrix2fv (IZLjava/nio/FloatBuffer;)V
Expand Down Expand Up @@ -99,6 +102,8 @@ CLASS none/cbg net/minecraft/client/gl/GlExtensionHandler
METHOD g genFramebuffers ()I
METHOD g deleteBuffers (I)V
METHOD g bindBuffer (II)V
ARG 0 target
ARG 1 bufferId
METHOD h genRenderbuffers ()I
METHOD h deleteRenderbuffers (I)V
METHOD h bindFramebuffer (II)V
Expand Down
3 changes: 3 additions & 0 deletions mappings/net/minecraft/client/gl/GlHandler.mapping
Original file line number Diff line number Diff line change
Expand Up @@ -263,6 +263,9 @@ CLASS none/bov net/minecraft/client/gl/GlHandler
METHOD f logicOp (I)V
METHOD f newList (II)V
METHOD f drawArrays (III)V
ARG 0 mode
ARG 1 first
ARG 2 count
METHOD g disableLightSystem ()V
METHOD g activeTexture (I)V
METHOD g pixelStore (II)V
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
CLASS none/bpb net/minecraft/client/render/bpb
CLASS none/bpb net/minecraft/client/render/Renderer
CLASS none/bpb$1
METHOD a call ()Ljava/lang/String;
FIELD P renderDistance I
Expand Down Expand Up @@ -38,6 +38,8 @@ CLASS none/bpb net/minecraft/client/render/bpb
ARG 5 z
ARG 6 volume
ARG 7 pitch
METHOD a (Lnone/aio;DILnone/sg;)I
ARG 0 renderLayer
METHOD a onResourceReload (Lnone/byd;)V
ARG 0 container
METHOD a onEntityAdded (Lnone/sg;)V
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,3 +6,4 @@ CLASS none/aio net/minecraft/client/render/block/BlockRenderLayer
FIELD e name Ljava/lang/String;
METHOD <init> (Ljava/lang/String;ILjava/lang/String;)V
ARG 0 name
METHOD values values ()[Lnone/aio;
29 changes: 29 additions & 0 deletions mappings/net/minecraft/client/render/chunk/ChunkBatcher.mapping
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
CLASS none/brn net/minecraft/client/render/chunk/ChunkBatcher
CLASS none/brn$1
METHOD run run ()V
CLASS none/brn$2
METHOD run run ()V
FIELD a LOGGER Lorg/apache/logging/log4j/Logger;
FIELD b THREAD_FACTORY Ljava/util/concurrent/ThreadFactory;
FIELD d workerThreads Ljava/util/List;
FIELD e workers Ljava/util/List;
FIELD f pendingChunks Ljava/util/concurrent/PriorityBlockingQueue;
FIELD g availableBuffers Ljava/util/concurrent/BlockingQueue;
FIELD j pendingUploads Ljava/util/Queue;
FIELD k activeWorker Lnone/bro;
METHOD a getDebugString ()Ljava/lang/String;
METHOD a (Lnone/aio;Lnone/bon;Lnone/brs;Lnone/brp;D)Lcom/google/common/util/concurrent/ListenableFuture;
ARG 0 blockRenderLayer
ARG 1 vertexBuffer
ARG 2 chunkRenderer
ARG 3 chunkRenderData
METHOD a addAvailableBuffer (Lnone/bop;)V
ARG 0 buffer
METHOD a (Lnone/brs;)Z
ARG 0 chunkRenderer
METHOD b (Lnone/brs;)Z
ARG 0 chunkRenderer
METHOD c getNextAvailableBuffer ()Lnone/bop;
METHOD c (Lnone/brs;)Z
ARG 0 chunkRenderer
METHOD d getNextChunkRenderDataTask ()Lnone/brm;
Loading

0 comments on commit 059d239

Please sign in to comment.