diff --git a/mappings/net/minecraft/block/Block.mapping b/mappings/net/minecraft/block/Block.mapping index 72e564ecb5..164a80d438 100644 --- a/mappings/net/minecraft/block/Block.mapping +++ b/mappings/net/minecraft/block/Block.mapping @@ -147,7 +147,7 @@ CLASS none/akw net/minecraft/block/Block ARG 0 block METHOD a (Lnone/akw;Lnone/akw;)Z METHOD a setSoundGroup (Lnone/apu;)Lnone/akw; - METHOD a (Lnone/asj;)Lnone/apg; + METHOD a getRenderType (Lnone/asj;)Lnone/apg; ARG 0 state METHOD a getDropItem (Lnone/asj;Ljava/util/Random;I)Lnone/aeo; ARG 0 state diff --git a/mappings/net/minecraft/block/BlockLiquidBase.mapping b/mappings/net/minecraft/block/BlockLiquidBase.mapping index 75359661ef..6721af658e 100644 --- a/mappings/net/minecraft/block/BlockLiquidBase.mapping +++ b/mappings/net/minecraft/block/BlockLiquidBase.mapping @@ -2,6 +2,7 @@ CLASS none/ans net/minecraft/block/BlockLiquidBase FIELD b LEVEL Lnone/asy; METHOD a deserializeState (I)Lnone/asj; METHOD a getDropAmount (Ljava/util/Random;)I + METHOD a getRenderType (Lnone/asj;)Lnone/apg; METHOD a getDropItem (Lnone/asj;Ljava/util/Random;I)Lnone/aeo; METHOD a getCollisionBox (Lnone/asj;Lnone/aiy;Lnone/cn;)Lnone/bcp; METHOD b createStateFactory ()Lnone/ask; diff --git a/mappings/net/minecraft/block/BlockRenderType.mapping b/mappings/net/minecraft/block/BlockRenderType.mapping new file mode 100644 index 0000000000..d4a1a01845 --- /dev/null +++ b/mappings/net/minecraft/block/BlockRenderType.mapping @@ -0,0 +1,2 @@ +CLASS none/apg net/minecraft/block/BlockRenderType + FIELD a NONE Lnone/apg; diff --git a/mappings/net/minecraft/block/BlockStateFactory.mapping b/mappings/net/minecraft/block/BlockStateFactory.mapping index b059f35c15..29d866301a 100644 --- a/mappings/net/minecraft/block/BlockStateFactory.mapping +++ b/mappings/net/minecraft/block/BlockStateFactory.mapping @@ -62,6 +62,7 @@ CLASS none/ask net/minecraft/block/BlockStateFactory METHOD equals (Ljava/lang/Object;)Z ARG 0 other METHOD g getMapColor ()Lnone/ayp; + METHOD i getRenderType ()Lnone/apg; METHOD m emitsRedstonePower ()Z METHOD o getPistonBehavior ()Lnone/ayr; METHOD s getValues ()Lcom/google/common/collect/ImmutableMap; diff --git a/mappings/net/minecraft/block/BlockWithTileEntity.mapping b/mappings/net/minecraft/block/BlockWithTileEntity.mapping index 6a131fb24e..d457584db8 100644 --- a/mappings/net/minecraft/block/BlockWithTileEntity.mapping +++ b/mappings/net/minecraft/block/BlockWithTileEntity.mapping @@ -8,7 +8,7 @@ CLASS none/akq net/minecraft/block/BlockWithTileEntity ARG 0 world ARG 1 pos ARG 2 facing - METHOD a (Lnone/asj;)Lnone/apg; + METHOD a getRenderType (Lnone/asj;)Lnone/apg; ARG 0 state METHOD a (Lnone/asj;Lnone/aiu;Lnone/cn;II)Z ARG 0 state diff --git a/mappings/net/minecraft/block/IBlockInfoProxy.mapping b/mappings/net/minecraft/block/IBlockInfoProxy.mapping index e286c91ad9..d43595ed9f 100644 --- a/mappings/net/minecraft/block/IBlockInfoProxy.mapping +++ b/mappings/net/minecraft/block/IBlockInfoProxy.mapping @@ -52,5 +52,6 @@ CLASS none/asi net/minecraft/block/IBlockInfoProxy ARG 0 view ARG 1 pos METHOD g getMapColor ()Lnone/ayp; + METHOD i getRenderType ()Lnone/apg; METHOD m emitsRedstonePower ()Z METHOD o getPistonBehavior ()Lnone/ayr; diff --git a/mappings/net/minecraft/block/impl/BlockAir.mapping b/mappings/net/minecraft/block/impl/BlockAir.mapping index 571d7b1194..2b86d41ac1 100644 --- a/mappings/net/minecraft/block/impl/BlockAir.mapping +++ b/mappings/net/minecraft/block/impl/BlockAir.mapping @@ -8,7 +8,7 @@ CLASS none/akm net/minecraft/block/impl/BlockAir METHOD a isAir (Lnone/aiy;Lnone/cn;)Z ARG 0 view ARG 1 pos - METHOD a (Lnone/asj;)Lnone/apg; + METHOD a getRenderType (Lnone/asj;)Lnone/apg; ARG 0 state METHOD a getCollisionBox (Lnone/asj;Lnone/aiy;Lnone/cn;)Lnone/bcp; ARG 0 state diff --git a/mappings/net/minecraft/block/impl/BlockBarrier.mapping b/mappings/net/minecraft/block/impl/BlockBarrier.mapping index 92030a3840..9cad4c878b 100644 --- a/mappings/net/minecraft/block/impl/BlockBarrier.mapping +++ b/mappings/net/minecraft/block/impl/BlockBarrier.mapping @@ -5,7 +5,7 @@ CLASS none/akp net/minecraft/block/impl/BlockBarrier ARG 2 state ARG 3 dropChance ARG 4 fortune - METHOD a (Lnone/asj;)Lnone/apg; + METHOD a getRenderType (Lnone/asj;)Lnone/apg; ARG 0 state METHOD b (Lnone/asj;)Z ARG 0 state diff --git a/mappings/net/minecraft/block/impl/BlockBeacon.mapping b/mappings/net/minecraft/block/impl/BlockBeacon.mapping index 675aaea6a0..141ceee1b1 100644 --- a/mappings/net/minecraft/block/impl/BlockBeacon.mapping +++ b/mappings/net/minecraft/block/impl/BlockBeacon.mapping @@ -18,7 +18,7 @@ CLASS none/akt net/minecraft/block/impl/BlockBeacon ARG 2 state ARG 3 player ARG 4 stack - METHOD a (Lnone/asj;)Lnone/apg; + METHOD a getRenderType (Lnone/asj;)Lnone/apg; ARG 0 state METHOD a (Lnone/asj;Lnone/aiu;Lnone/cn;Lnone/akw;)V ARG 0 state diff --git a/mappings/net/minecraft/block/impl/BlockBrewingStand.mapping b/mappings/net/minecraft/block/impl/BlockBrewingStand.mapping index 9b0524121a..0ca5010c99 100644 --- a/mappings/net/minecraft/block/impl/BlockBrewingStand.mapping +++ b/mappings/net/minecraft/block/impl/BlockBrewingStand.mapping @@ -27,7 +27,7 @@ CLASS none/alb net/minecraft/block/impl/BlockBrewingStand ARG 2 state ARG 3 player ARG 4 stack - METHOD a (Lnone/asj;)Lnone/apg; + METHOD a getRenderType (Lnone/asj;)Lnone/apg; ARG 0 state METHOD a getDropItem (Lnone/asj;Ljava/util/Random;I)Lnone/aeo; ARG 0 state diff --git a/mappings/net/minecraft/block/impl/BlockChest.mapping b/mappings/net/minecraft/block/impl/BlockChest.mapping index 6241fd36fa..45d2d6908f 100644 --- a/mappings/net/minecraft/block/impl/BlockChest.mapping +++ b/mappings/net/minecraft/block/impl/BlockChest.mapping @@ -16,6 +16,7 @@ CLASS none/ali net/minecraft/block/impl/BlockChest METHOD a (Lnone/aiu;Lnone/cn;)Z METHOD a activate (Lnone/aiu;Lnone/cn;Lnone/asj;Lnone/aak;Lnone/qz;Lnone/cu;FFF)Z METHOD a getStateForPlacement (Lnone/aiu;Lnone/cn;Lnone/cu;FFFILnone/sn;)Lnone/asj; + METHOD a getRenderType (Lnone/asj;)Lnone/apg; METHOD a applyMirror (Lnone/asj;Lnone/anw;)Lnone/asj; ARG 0 state ARG 1 mirror diff --git a/mappings/net/minecraft/block/impl/BlockCommand.mapping b/mappings/net/minecraft/block/impl/BlockCommand.mapping index 34df17f777..80c0fa1d42 100644 --- a/mappings/net/minecraft/block/impl/BlockCommand.mapping +++ b/mappings/net/minecraft/block/impl/BlockCommand.mapping @@ -8,6 +8,7 @@ CLASS none/alo net/minecraft/block/impl/BlockCommand METHOD a createTileEntity (Lnone/aiu;I)Lnone/arb; METHOD a activate (Lnone/aiu;Lnone/cn;Lnone/asj;Lnone/aak;Lnone/qz;Lnone/cu;FFF)Z METHOD a getStateForPlacement (Lnone/aiu;Lnone/cn;Lnone/cu;FFFILnone/sn;)Lnone/asj; + METHOD a getRenderType (Lnone/asj;)Lnone/apg; METHOD a applyMirror (Lnone/asj;Lnone/anw;)Lnone/asj; ARG 0 state ARG 1 mirror diff --git a/mappings/net/minecraft/block/impl/BlockDaylightDetector.mapping b/mappings/net/minecraft/block/impl/BlockDaylightDetector.mapping index 6054469d09..d5e7831d83 100644 --- a/mappings/net/minecraft/block/impl/BlockDaylightDetector.mapping +++ b/mappings/net/minecraft/block/impl/BlockDaylightDetector.mapping @@ -9,6 +9,7 @@ CLASS none/als net/minecraft/block/impl/BlockDaylightDetector METHOD a createTileEntity (Lnone/aiu;I)Lnone/arb; METHOD a getDropStack (Lnone/aiu;Lnone/cn;Lnone/asj;)Lnone/aeq; METHOD a activate (Lnone/aiu;Lnone/cn;Lnone/asj;Lnone/aak;Lnone/qz;Lnone/cu;FFF)Z + METHOD a getRenderType (Lnone/asj;)Lnone/apg; METHOD a getDropItem (Lnone/asj;Ljava/util/Random;I)Lnone/aeo; METHOD b createStateFactory ()Lnone/ask; METHOD b getBoundingBox (Lnone/asj;Lnone/aiy;Lnone/cn;)Lnone/bcp; diff --git a/mappings/net/minecraft/block/impl/BlockDispenser.mapping b/mappings/net/minecraft/block/impl/BlockDispenser.mapping index 65b761437b..f2eaaf9547 100644 --- a/mappings/net/minecraft/block/impl/BlockDispenser.mapping +++ b/mappings/net/minecraft/block/impl/BlockDispenser.mapping @@ -9,6 +9,7 @@ CLASS none/aly net/minecraft/block/impl/BlockDispenser METHOD a createTileEntity (Lnone/aiu;I)Lnone/arb; METHOD a activate (Lnone/aiu;Lnone/cn;Lnone/asj;Lnone/aak;Lnone/qz;Lnone/cu;FFF)Z METHOD a getStateForPlacement (Lnone/aiu;Lnone/cn;Lnone/cu;FFFILnone/sn;)Lnone/asj; + METHOD a getRenderType (Lnone/asj;)Lnone/apg; METHOD a applyMirror (Lnone/asj;Lnone/anw;)Lnone/asj; ARG 0 state ARG 1 mirror diff --git a/mappings/net/minecraft/block/impl/BlockEnchantingTable.mapping b/mappings/net/minecraft/block/impl/BlockEnchantingTable.mapping index 1f02a4be4d..6d6a5efc7a 100644 --- a/mappings/net/minecraft/block/impl/BlockEnchantingTable.mapping +++ b/mappings/net/minecraft/block/impl/BlockEnchantingTable.mapping @@ -2,4 +2,5 @@ CLASS none/ame net/minecraft/block/impl/BlockEnchantingTable FIELD a BOX Lnone/bcp; METHOD a createTileEntity (Lnone/aiu;I)Lnone/arb; METHOD a activate (Lnone/aiu;Lnone/cn;Lnone/asj;Lnone/aak;Lnone/qz;Lnone/cu;FFF)Z + METHOD a getRenderType (Lnone/asj;)Lnone/apg; METHOD b getBoundingBox (Lnone/asj;Lnone/aiy;Lnone/cn;)Lnone/bcp; diff --git a/mappings/net/minecraft/block/impl/BlockEnderChest.mapping b/mappings/net/minecraft/block/impl/BlockEnderChest.mapping index b331a19e78..873dfce43d 100644 --- a/mappings/net/minecraft/block/impl/BlockEnderChest.mapping +++ b/mappings/net/minecraft/block/impl/BlockEnderChest.mapping @@ -6,6 +6,7 @@ CLASS none/amj net/minecraft/block/impl/BlockEnderChest METHOD a createTileEntity (Lnone/aiu;I)Lnone/arb; METHOD a activate (Lnone/aiu;Lnone/cn;Lnone/asj;Lnone/aak;Lnone/qz;Lnone/cu;FFF)Z METHOD a getStateForPlacement (Lnone/aiu;Lnone/cn;Lnone/cu;FFFILnone/sn;)Lnone/asj; + METHOD a getRenderType (Lnone/asj;)Lnone/apg; METHOD a getDropItem (Lnone/asj;Ljava/util/Random;I)Lnone/aeo; METHOD a applyMirror (Lnone/asj;Lnone/anw;)Lnone/asj; ARG 0 state diff --git a/mappings/net/minecraft/block/impl/BlockFlowerPot.mapping b/mappings/net/minecraft/block/impl/BlockFlowerPot.mapping index 89e7083d90..8bdd3ab96c 100644 --- a/mappings/net/minecraft/block/impl/BlockFlowerPot.mapping +++ b/mappings/net/minecraft/block/impl/BlockFlowerPot.mapping @@ -5,6 +5,7 @@ CLASS none/amr net/minecraft/block/impl/BlockFlowerPot METHOD a (Lnone/aiu;Lnone/cn;)Z METHOD a getDropStack (Lnone/aiu;Lnone/cn;Lnone/asj;)Lnone/aeq; METHOD a activate (Lnone/aiu;Lnone/cn;Lnone/asj;Lnone/aak;Lnone/qz;Lnone/cu;FFF)Z + METHOD a getRenderType (Lnone/asj;)Lnone/apg; METHOD a getDropItem (Lnone/asj;Ljava/util/Random;I)Lnone/aeo; METHOD b createStateFactory ()Lnone/ask; METHOD b getBoundingBox (Lnone/asj;Lnone/aiy;Lnone/cn;)Lnone/bcp; diff --git a/mappings/net/minecraft/block/impl/BlockFurnace.mapping b/mappings/net/minecraft/block/impl/BlockFurnace.mapping index c0f25de5d0..571f7bdf8b 100644 --- a/mappings/net/minecraft/block/impl/BlockFurnace.mapping +++ b/mappings/net/minecraft/block/impl/BlockFurnace.mapping @@ -5,6 +5,7 @@ CLASS none/amw net/minecraft/block/impl/BlockFurnace METHOD a getDropStack (Lnone/aiu;Lnone/cn;Lnone/asj;)Lnone/aeq; METHOD a activate (Lnone/aiu;Lnone/cn;Lnone/asj;Lnone/aak;Lnone/qz;Lnone/cu;FFF)Z METHOD a getStateForPlacement (Lnone/aiu;Lnone/cn;Lnone/cu;FFFILnone/sn;)Lnone/asj; + METHOD a getRenderType (Lnone/asj;)Lnone/apg; METHOD a getDropItem (Lnone/asj;Ljava/util/Random;I)Lnone/aeo; METHOD a applyMirror (Lnone/asj;Lnone/anw;)Lnone/asj; ARG 0 state diff --git a/mappings/net/minecraft/block/impl/BlockHopper.mapping b/mappings/net/minecraft/block/impl/BlockHopper.mapping index 768767178d..13d8b8d1bf 100644 --- a/mappings/net/minecraft/block/impl/BlockHopper.mapping +++ b/mappings/net/minecraft/block/impl/BlockHopper.mapping @@ -10,6 +10,7 @@ CLASS none/anj net/minecraft/block/impl/BlockHopper METHOD a createTileEntity (Lnone/aiu;I)Lnone/arb; METHOD a activate (Lnone/aiu;Lnone/cn;Lnone/asj;Lnone/aak;Lnone/qz;Lnone/cu;FFF)Z METHOD a getStateForPlacement (Lnone/aiu;Lnone/cn;Lnone/cu;FFFILnone/sn;)Lnone/asj; + METHOD a getRenderType (Lnone/asj;)Lnone/apg; METHOD a addBoundingBoxes (Lnone/asj;Lnone/aiu;Lnone/cn;Lnone/bcp;Ljava/util/List;Lnone/se;)V METHOD a applyMirror (Lnone/asj;Lnone/anw;)Lnone/asj; ARG 0 state diff --git a/mappings/net/minecraft/block/impl/BlockJukebox.mapping b/mappings/net/minecraft/block/impl/BlockJukebox.mapping index c597cac541..5f95eb4f66 100644 --- a/mappings/net/minecraft/block/impl/BlockJukebox.mapping +++ b/mappings/net/minecraft/block/impl/BlockJukebox.mapping @@ -16,5 +16,6 @@ CLASS none/ann net/minecraft/block/impl/BlockJukebox ARG 3 dropChance ARG 4 fortune METHOD a activate (Lnone/aiu;Lnone/cn;Lnone/asj;Lnone/aak;Lnone/qz;Lnone/cu;FFF)Z + METHOD a getRenderType (Lnone/asj;)Lnone/apg; METHOD b createStateFactory ()Lnone/ask; METHOD e serializeState (Lnone/asj;)I diff --git a/mappings/net/minecraft/block/impl/BlockMobSpawner.mapping b/mappings/net/minecraft/block/impl/BlockMobSpawner.mapping index 1175aa6177..c6a0862497 100644 --- a/mappings/net/minecraft/block/impl/BlockMobSpawner.mapping +++ b/mappings/net/minecraft/block/impl/BlockMobSpawner.mapping @@ -8,5 +8,6 @@ CLASS none/anx net/minecraft/block/impl/BlockMobSpawner ARG 2 state ARG 3 dropChance ARG 4 fortune + METHOD a getRenderType (Lnone/asj;)Lnone/apg; METHOD a getDropItem (Lnone/asj;Ljava/util/Random;I)Lnone/aeo; METHOD f getRenderLayer ()Lnone/aim; diff --git a/mappings/net/minecraft/block/impl/BlockNote.mapping b/mappings/net/minecraft/block/impl/BlockNote.mapping index f796bd9a93..94d7751426 100644 --- a/mappings/net/minecraft/block/impl/BlockNote.mapping +++ b/mappings/net/minecraft/block/impl/BlockNote.mapping @@ -2,5 +2,6 @@ CLASS none/aoi net/minecraft/block/impl/BlockNote FIELD a SOUNDS Ljava/util/List; METHOD a createTileEntity (Lnone/aiu;I)Lnone/arb; METHOD a activate (Lnone/aiu;Lnone/cn;Lnone/asj;Lnone/aak;Lnone/qz;Lnone/cu;FFF)Z + METHOD a getRenderType (Lnone/asj;)Lnone/apg; METHOD e getSound (I)Lnone/nk; ARG 0 instrument diff --git a/mappings/net/minecraft/block/impl/BlockStructure.mapping b/mappings/net/minecraft/block/impl/BlockStructure.mapping index 81be46496e..c4389cb756 100644 --- a/mappings/net/minecraft/block/impl/BlockStructure.mapping +++ b/mappings/net/minecraft/block/impl/BlockStructure.mapping @@ -5,5 +5,6 @@ CLASS none/aqg net/minecraft/block/impl/BlockStructure METHOD a createTileEntity (Lnone/aiu;I)Lnone/arb; METHOD a activate (Lnone/aiu;Lnone/cn;Lnone/asj;Lnone/aak;Lnone/qz;Lnone/cu;FFF)Z METHOD a getStateForPlacement (Lnone/aiu;Lnone/cn;Lnone/cu;FFFILnone/sn;)Lnone/asj; + METHOD a getRenderType (Lnone/asj;)Lnone/apg; METHOD b createStateFactory ()Lnone/ask; METHOD e serializeState (Lnone/asj;)I diff --git a/mappings/net/minecraft/block/impl/BlockStructureVoid.mapping b/mappings/net/minecraft/block/impl/BlockStructureVoid.mapping index 446161e42f..6940e96b05 100644 --- a/mappings/net/minecraft/block/impl/BlockStructureVoid.mapping +++ b/mappings/net/minecraft/block/impl/BlockStructureVoid.mapping @@ -6,5 +6,6 @@ CLASS none/aqh net/minecraft/block/impl/BlockStructureVoid ARG 2 state ARG 3 dropChance ARG 4 fortune + METHOD a getRenderType (Lnone/asj;)Lnone/apg; METHOD a getCollisionBox (Lnone/asj;Lnone/aiy;Lnone/cn;)Lnone/bcp; METHOD b getBoundingBox (Lnone/asj;Lnone/aiy;Lnone/cn;)Lnone/bcp; diff --git a/mappings/net/minecraft/client/render/WorldRenderer.mapping b/mappings/net/minecraft/client/render/WorldRenderer.mapping index 6fa552006f..90ab586bfb 100644 --- a/mappings/net/minecraft/client/render/WorldRenderer.mapping +++ b/mappings/net/minecraft/client/render/WorldRenderer.mapping @@ -1,4 +1,5 @@ CLASS none/boq net/minecraft/client/render/WorldRenderer + FIELD a anaglyphEnabled Z FIELD e LOGGER Lorg/apache/logging/log4j/Logger; FIELD h mc Lnone/bdo; METHOD a (FJ)V diff --git a/mappings/net/minecraft/client/render/block/BlockLiquidRenderer.mapping b/mappings/net/minecraft/client/render/block/BlockLiquidRenderer.mapping new file mode 100644 index 0000000000..0a98918aab --- /dev/null +++ b/mappings/net/minecraft/client/render/block/BlockLiquidRenderer.mapping @@ -0,0 +1,11 @@ +CLASS none/bpn net/minecraft/client/render/block/BlockLiquidRenderer + FIELD a colorMap Lnone/bdx; + FIELD b spritesLava [Lnone/bxb; + FIELD c spritesWater [Lnone/bxb; + FIELD d spriteWaterOverlay Lnone/bxb; + METHOD a loadSprites ()V + METHOD a render (Lnone/aiy;Lnone/asj;Lnone/cn;Lnone/bok;)Z + ARG 0 view + ARG 1 state + ARG 2 pos + ARG 3 vertexBuffer diff --git a/mappings/net/minecraft/client/render/block/BlockRenderManager.mapping b/mappings/net/minecraft/client/render/block/BlockRenderManager.mapping new file mode 100644 index 0000000000..e91081777d --- /dev/null +++ b/mappings/net/minecraft/client/render/block/BlockRenderManager.mapping @@ -0,0 +1,19 @@ +CLASS none/bpm net/minecraft/client/render/block/BlockRenderManager + FIELD a maps Lnone/bpl; + FIELD b renderer Lnone/bpo; + FIELD d liquidRenderer Lnone/bpn; + METHOD (Lnone/bpl;Lnone/bdx;)V + ARG 0 maps + ARG 1 colorMap + METHOD a getStateMaps ()Lnone/bpl; + METHOD a getModel (Lnone/asj;)Lnone/bzj; + ARG 0 state + METHOD a render (Lnone/asj;F)V + ARG 0 state + METHOD a tesselate (Lnone/asj;Lnone/cn;Lnone/bxb;Lnone/aiy;)V + ARG 0 state + ARG 1 pos + ARG 3 view + METHOD a onResourceReload (Lnone/bya;)V + ARG 0 container + METHOD b getRenderer ()Lnone/bpo; diff --git a/mappings/net/minecraft/client/render/block/BlockRenderer.mapping b/mappings/net/minecraft/client/render/block/BlockRenderer.mapping new file mode 100644 index 0000000000..6ff0476033 --- /dev/null +++ b/mappings/net/minecraft/client/render/block/BlockRenderer.mapping @@ -0,0 +1,37 @@ +CLASS none/bpo net/minecraft/client/render/block/BlockRenderer + FIELD a colorMap Lnone/bdx; + METHOD (Lnone/bdx;)V + ARG 0 colorMap + METHOD a renderQuad (FFFFLjava/util/List;)V + METHOD a tesselate (Lnone/aiy;Lnone/bzj;Lnone/asj;Lnone/cn;Lnone/bok;Z)Z + ARG 0 view + ARG 1 model + ARG 2 state + ARG 3 pos + ARG 4 buffer + METHOD a tesselate (Lnone/aiy;Lnone/bzj;Lnone/asj;Lnone/cn;Lnone/bok;ZJ)Z + ARG 0 view + ARG 1 model + ARG 2 state + ARG 3 pos + ARG 4 buffer + METHOD a render (Lnone/asj;Lnone/bzj;FFFF)V + ARG 0 state + ARG 1 model + METHOD a render (Lnone/bzj;FFFF)V + ARG 0 model + METHOD a render (Lnone/bzj;Lnone/asj;FZ)V + ARG 0 model + ARG 1 state + METHOD b tesselateSmooth (Lnone/aiy;Lnone/bzj;Lnone/asj;Lnone/cn;Lnone/bok;ZJ)Z + ARG 0 view + ARG 1 model + ARG 2 state + ARG 3 pos + ARG 4 buffer + METHOD c tesselateFlat (Lnone/aiy;Lnone/bzj;Lnone/asj;Lnone/cn;Lnone/bok;ZJ)Z + ARG 0 view + ARG 1 model + ARG 2 state + ARG 3 pos + ARG 4 buffer diff --git a/mappings/net/minecraft/client/render/item/IItemColorMapper.mapping b/mappings/net/minecraft/client/render/item/IItemColorMapper.mapping index 0dd041adfc..e717495e4e 100644 --- a/mappings/net/minecraft/client/render/item/IItemColorMapper.mapping +++ b/mappings/net/minecraft/client/render/item/IItemColorMapper.mapping @@ -1,3 +1,4 @@ CLASS none/bdz net/minecraft/client/render/item/IItemColorMapper METHOD a getColor (Lnone/aeq;I)I ARG 0 stack + ARG 1 tintIndex diff --git a/mappings/net/minecraft/client/render/item/ItemColorMap.mapping b/mappings/net/minecraft/client/render/item/ItemColorMap.mapping index cfc7ca2417..05ab733d8d 100644 --- a/mappings/net/minecraft/client/render/item/ItemColorMap.mapping +++ b/mappings/net/minecraft/client/render/item/ItemColorMap.mapping @@ -2,27 +2,35 @@ CLASS none/bea net/minecraft/client/render/item/ItemColorMap CLASS none/bea$1 METHOD a getColor (Lnone/aeq;I)I ARG 0 stack + ARG 1 tintIndex CLASS none/bea$2 METHOD a getColor (Lnone/aeq;I)I ARG 0 stack + ARG 1 tintIndex CLASS none/bea$3 METHOD a getColor (Lnone/aeq;I)I ARG 0 stack + ARG 1 tintIndex CLASS none/bea$4 METHOD a getColor (Lnone/aeq;I)I ARG 0 stack + ARG 1 tintIndex CLASS none/bea$5 METHOD a getColor (Lnone/aeq;I)I ARG 0 stack + ARG 1 tintIndex CLASS none/bea$6 METHOD a getColor (Lnone/aeq;I)I ARG 0 stack + ARG 1 tintIndex CLASS none/bea$7 METHOD a getColor (Lnone/aeq;I)I ARG 0 stack + ARG 1 tintIndex CLASS none/bea$8 METHOD a getColor (Lnone/aeq;I)I ARG 0 stack + ARG 1 tintIndex FIELD a mappers Lnone/cx; METHOD a getRenderColor (Lnone/aeq;I)I ARG 0 stack diff --git a/mappings/net/minecraft/client/render/item/ItemModelMap.mapping b/mappings/net/minecraft/client/render/item/ItemModelMap.mapping index 5bc6b1e33b..64f832d9c4 100644 --- a/mappings/net/minecraft/client/render/item/ItemModelMap.mapping +++ b/mappings/net/minecraft/client/render/item/ItemModelMap.mapping @@ -2,6 +2,10 @@ CLASS none/bov net/minecraft/client/render/item/ItemModelMap FIELD a modelIds Ljava/util/Map; FIELD b models Ljava/util/Map; FIELD c modelMappers Ljava/util/Map; + FIELD d blockModelManager Lnone/bzn; + METHOD (Lnone/bzn;)V + ARG 0 blockModelManager + METHOD a getBlockModelManager ()Lnone/bzn; METHOD a addModel (Lnone/aeo;ILnone/bzo;)V ARG 0 item ARG 1 meta diff --git a/mappings/net/minecraft/client/render/item/ItemRenderer.mapping b/mappings/net/minecraft/client/render/item/ItemRenderer.mapping index 951d624e07..83eab8e9f2 100644 --- a/mappings/net/minecraft/client/render/item/ItemRenderer.mapping +++ b/mappings/net/minecraft/client/render/item/ItemRenderer.mapping @@ -15,11 +15,14 @@ CLASS none/bto net/minecraft/client/render/item/ItemRenderer METHOD a getModel (Lnone/aeq;)Lnone/bzo; ARG 0 stack FIELD b ENCHANTMENT_GLINT_TEX Lnone/kp; + FIELD d modelMap Lnone/bov; FIELD e textureManager Lnone/bxc; - FIELD f itemColorMap Lnone/bea; + FIELD f colorMap Lnone/bea; METHOD (Lnone/bxc;Lnone/bzn;Lnone/bea;)V ARG 0 textureManager + ARG 1 blockModelManager ARG 2 itemColorMap + METHOD a getModelMap ()Lnone/bov; METHOD a registerItemModel (Lnone/aeo;ILjava/lang/String;)V ARG 0 item ARG 1 metadata @@ -27,6 +30,8 @@ CLASS none/bto net/minecraft/client/render/item/ItemRenderer METHOD a registerItemModel (Lnone/aeo;Ljava/lang/String;)V ARG 0 item ARG 1 name + METHOD a isThreeDimensionalInGUI (Lnone/aeq;)Z + ARG 0 stack METHOD a registerItemModel (Lnone/akw;ILjava/lang/String;)V ARG 0 block ARG 1 metadata @@ -55,6 +60,11 @@ CLASS none/bto net/minecraft/client/render/item/ItemRenderer ARG 6 green ARG 7 blue ARG 8 alpha + METHOD a (Lnone/bok;Ljava/util/List;ILnone/aeq;)V + ARG 0 buffer + ARG 1 quads + ARG 3 stack + METHOD a (Lnone/bok;Lnone/bpp;I)V METHOD a onResourceReload (Lnone/bya;)V ARG 0 container METHOD a (Lnone/sn;Lnone/aeq;II)V diff --git a/mappings/none/bzq.mapping b/mappings/net/minecraft/client/render/model/BakedModel.mapping similarity index 51% rename from mappings/none/bzq.mapping rename to mappings/net/minecraft/client/render/model/BakedModel.mapping index 82a21f37a1..228533a32e 100644 --- a/mappings/none/bzq.mapping +++ b/mappings/net/minecraft/client/render/model/BakedModel.mapping @@ -1,4 +1,9 @@ -CLASS none/bzq +CLASS none/bzq net/minecraft/client/render/model/BakedModel + FIELD c usesAO Z + FIELD d is3dInGui Z + METHOD (Ljava/util/List;Ljava/util/Map;ZZLnone/bxb;Lnone/bqc;Lnone/bqa;)V + ARG 2 usesAO + ARG 3 is3dInGui METHOD a useAmbientOcclusion ()Z METHOD a getQuads (Lnone/asj;Lnone/cu;J)Ljava/util/List; ARG 0 state diff --git a/mappings/net/minecraft/client/util/TextureUtils.mapping b/mappings/net/minecraft/client/util/TextureUtils.mapping index 970b942ecd..2d6083d03a 100644 --- a/mappings/net/minecraft/client/util/TextureUtils.mapping +++ b/mappings/net/minecraft/client/util/TextureUtils.mapping @@ -8,3 +8,5 @@ CLASS none/bxe net/minecraft/client/util/TextureUtils ARG 1 location METHOD b bindTexture (I)V ARG 0 texId + METHOD c getAnaglyphColor (I)I + ARG 0 color diff --git a/mappings/net/minecraft/command/CommandStats.mapping b/mappings/net/minecraft/command/CommandStats.mapping index 16ce8534ec..4300b2dead 100644 --- a/mappings/net/minecraft/command/CommandStats.mapping +++ b/mappings/net/minecraft/command/CommandStats.mapping @@ -23,4 +23,3 @@ CLASS none/o net/minecraft/command/CommandStats FIELD d AFFECTED_ITEMS Lnone/o$a; FIELD e QUERY_RESULT Lnone/o$a; METHOD values values ()[Lnone/o$a; - CLASS none/o$StatTypes diff --git a/mappings/net/minecraft/item/ItemArmor.mapping b/mappings/net/minecraft/item/ItemArmor.mapping index 970d382af7..b3b109e18a 100644 --- a/mappings/net/minecraft/item/ItemArmor.mapping +++ b/mappings/net/minecraft/item/ItemArmor.mapping @@ -29,6 +29,9 @@ CLASS none/acw net/minecraft/item/ItemArmor METHOD (Lnone/acw$a;ILnone/sj;)V ARG 0 material METHOD A_ getSlotType ()Lnone/sj; + METHOD a setDisplayColor (Lnone/aeq;I)V + ARG 0 stack + ARG 1 color METHOD a canRepair (Lnone/aeq;Lnone/aeq;)Z ARG 0 tool ARG 1 repairItem @@ -38,5 +41,11 @@ CLASS none/acw net/minecraft/item/ItemArmor ARG 2 hand METHOD a getAttributeModifiers (Lnone/sj;)Lcom/google/common/collect/Multimap; ARG 0 slotType + METHOD b getDisplayColor (Lnone/aeq;)I + ARG 0 stack METHOD c getEnchantability ()I + METHOD c removeDisplayColor (Lnone/aeq;)V + ARG 0 stack METHOD d getMaterial ()Lnone/acw$a; + METHOD e_ hasDisplayColor (Lnone/aeq;)Z + ARG 0 stack diff --git a/mappings/none/bpm.mapping b/mappings/none/bpm.mapping deleted file mode 100644 index 7b9354c724..0000000000 --- a/mappings/none/bpm.mapping +++ /dev/null @@ -1,3 +0,0 @@ -CLASS none/bpm - METHOD a onResourceReload (Lnone/bya;)V - ARG 0 container