From 66cdd72bcd9ea57519f8c28531bb87629a5b7510 Mon Sep 17 00:00:00 2001 From: Nedelosk Date: Mon, 17 Oct 2016 19:37:47 +0200 Subject: [PATCH 1/8] Overwork old and add new Block rende mappings --- .../render/block/BlockRenderManager.mapping | 1 + .../client/render/block/BlockRenderer.mapping | 60 +++++++++++++------ 2 files changed, 42 insertions(+), 19 deletions(-) diff --git a/mappings/net/minecraft/client/render/block/BlockRenderManager.mapping b/mappings/net/minecraft/client/render/block/BlockRenderManager.mapping index d208836dcb..56a9d2f951 100644 --- a/mappings/net/minecraft/client/render/block/BlockRenderManager.mapping +++ b/mappings/net/minecraft/client/render/block/BlockRenderManager.mapping @@ -10,6 +10,7 @@ CLASS none/bpp net/minecraft/client/render/block/BlockRenderManager ARG 0 state METHOD a render (Lnone/asm;F)V ARG 0 state + ARG 1 colorMultiplier METHOD a tesselate (Lnone/asm;Lnone/cn;Lnone/bxe;Lnone/aja;)V ARG 0 state ARG 1 pos diff --git a/mappings/net/minecraft/client/render/block/BlockRenderer.mapping b/mappings/net/minecraft/client/render/block/BlockRenderer.mapping index 583d45eaf9..41fe39e38b 100644 --- a/mappings/net/minecraft/client/render/block/BlockRenderer.mapping +++ b/mappings/net/minecraft/client/render/block/BlockRenderer.mapping @@ -1,26 +1,26 @@ CLASS none/bpr net/minecraft/client/render/block/BlockRenderer - CLASS none/bpr$a EnumNeighborInfo + CLASS none/bpr$a NeighborData FIELD a DOWN Lnone/bpr$a; FIELD b UP Lnone/bpr$a; FIELD c NORTH Lnone/bpr$a; FIELD d SOUTH Lnone/bpr$a; FIELD e WEST Lnone/bpr$a; FIELD f EAST Lnone/bpr$a; - FIELD g corners [Lnone/cu; - FIELD h shadeWeight F - FIELD i doNonCubicWeight Z + FIELD g faces [Lnone/cu; + FIELD h weight F + FIELD i nonCubicWeight Z FIELD n VALUES [Lnone/bpr$a; METHOD (Ljava/lang/String;I[Lnone/cu;FZ[Lnone/bpr$d;[Lnone/bpr$d;[Lnone/bpr$d;[Lnone/bpr$d;)V - ARG 0 corners - ARG 1 shadeWeight - ARG 2 doNonCubicWeight - METHOD a getNeighbourInfo (Lnone/cu;)Lnone/bpr$a; + ARG 0 faces + ARG 1 weight + ARG 2 nonCubicWeight + METHOD a getData (Lnone/cu;)Lnone/bpr$a; ARG 0 facing CLASS none/bpr$b AmbientOcclusionCalculator - FIELD b vertexColorMultiplier [F - FIELD c vertexBrightness [I + FIELD b colorMultiplier [F + FIELD c brightness [I METHOD a getAmbientOcclusionBrightness (IIII)I - METHOD a getVertexBrightness (IIIIFFFF)I + METHOD a getBrightness (IIIIFFFF)I METHOD a apply (Lnone/aja;Lnone/asm;Lnone/cn;Lnone/cu;[FLjava/util/BitSet;)V ARG 0 view ARG 1 state @@ -28,17 +28,26 @@ CLASS none/bpr net/minecraft/client/render/block/BlockRenderer ARG 3 facing ARG 4 faceShape ARG 5 shapeState - CLASS none/bpr$c VertexTranslations + CLASS none/bpr$c Translation FIELD a DOWN Lnone/bpr$c; FIELD b UP Lnone/bpr$c; FIELD c NORTH Lnone/bpr$c; FIELD d SOUTH Lnone/bpr$c; FIELD e WEST Lnone/bpr$c; FIELD f EAST Lnone/bpr$c; + FIELD g firstCorner I + FIELD h secondCorner I + FIELD i thirdCorner I + FIELD j fourthCorner I FIELD k VALUES [Lnone/bpr$c; - METHOD a getVertexTranslations (Lnone/cu;)Lnone/bpr$c; + METHOD (Ljava/lang/String;IIIII)V + ARG 0 firstCorner + ARG 1 secondCorner + ARG 2 thirdCorner + ARG 3 fourthCorner + METHOD a getTranslations (Lnone/cu;)Lnone/bpr$c; ARG 0 facing - CLASS none/bpr$d Orientation + CLASS none/bpr$d NeighborOrientation FIELD a DOWN Lnone/bpr$d; FIELD b UP Lnone/bpr$d; FIELD c NORTH Lnone/bpr$d; @@ -54,11 +63,15 @@ CLASS none/bpr net/minecraft/client/render/block/BlockRenderer FIELD m shape I METHOD (Ljava/lang/String;ILnone/cu;Z)V ARG 0 facing - ARG 1 flip + ARG 1 doFlip FIELD a colorMap Lnone/bea; METHOD (Lnone/bea;)V ARG 0 colorMap METHOD a renderQuad (FFFFLjava/util/List;)V + ARG 0 colorMultiplier + ARG 1 red + ARG 2 green + ARG 3 blue ARG 4 quads METHOD a tesselateQuadsFlat (Lnone/aja;Lnone/asm;Lnone/cn;IZLnone/bon;Ljava/util/List;Ljava/util/BitSet;)V ARG 0 view @@ -84,18 +97,22 @@ CLASS none/bpr net/minecraft/client/render/block/BlockRenderer ARG 2 state ARG 3 pos ARG 4 buffer - ARG 5 checkSides + ARG 5 testSides METHOD a tesselate (Lnone/aja;Lnone/bzm;Lnone/asm;Lnone/cn;Lnone/bon;ZJ)Z ARG 0 view ARG 1 model ARG 2 state ARG 3 pos ARG 4 buffer - ARG 5 checkSides + ARG 5 testSides ARG 6 variationSeed METHOD a render (Lnone/asm;Lnone/bzm;FFFF)V ARG 0 state ARG 1 model + ARG 2 colorMultiplier + ARG 3 red + ARG 4 green + ARG 5 blue METHOD a updateShape (Lnone/asm;[ILnone/cu;[FLjava/util/BitSet;)V ARG 0 state ARG 1 vertexData @@ -104,17 +121,22 @@ CLASS none/bpr net/minecraft/client/render/block/BlockRenderer ARG 4 shapeState METHOD a render (Lnone/bzm;FFFF)V ARG 0 model + ARG 1 colorMultiplier + ARG 2 red + ARG 3 green + ARG 4 blue METHOD a render (Lnone/bzm;Lnone/asm;FZ)V ARG 0 model ARG 1 state ARG 2 colorMultiplier + ARG 3 notUseGlColor METHOD b tesselateSmooth (Lnone/aja;Lnone/bzm;Lnone/asm;Lnone/cn;Lnone/bon;ZJ)Z ARG 0 view ARG 1 model ARG 2 state ARG 3 pos ARG 4 buffer - ARG 5 checkSides + ARG 5 testSides ARG 6 variationSeed METHOD c tesselateFlat (Lnone/aja;Lnone/bzm;Lnone/asm;Lnone/cn;Lnone/bon;ZJ)Z ARG 0 view @@ -122,5 +144,5 @@ CLASS none/bpr net/minecraft/client/render/block/BlockRenderer ARG 2 state ARG 3 pos ARG 4 buffer - ARG 5 checkSides + ARG 5 testSides ARG 6 variationSeed From e542a2fc785c2383a46c759be606ef465b0e3d51 Mon Sep 17 00:00:00 2001 From: Nedelosk Date: Tue, 18 Oct 2016 00:14:29 +0200 Subject: [PATCH 2/8] Add mappings for ItemRender, Containers and Villages --- mappings/net/minecraft/block/Block.mapping | 4 +- .../minecraft/block/BlockBrewingStand.mapping | 4 +- .../net/minecraft/block/BlockCake.mapping | 4 +- .../net/minecraft/block/BlockCauldron.mapping | 4 +- .../net/minecraft/block/BlockChest.mapping | 4 +- .../net/minecraft/block/BlockCommand.mapping | 4 +- .../minecraft/block/BlockDispenser.mapping | 4 +- .../block/BlockEndPortalFrame.mapping | 4 +- .../net/minecraft/block/BlockFurnace.mapping | 4 +- .../net/minecraft/block/BlockHopper.mapping | 4 +- .../net/minecraft/block/BlockJukebox.mapping | 4 +- .../minecraft/block/BlockRailDetector.mapping | 4 +- .../minecraft/client/gui/GuiContainer.mapping | 7 ++ .../gui/container/GuiEnchanting.mapping | 1 + .../gui/ingame/GuiCreativeInventory.mapping | 25 ++++++- .../client/render/FirstPersonRenderer.mapping | 1 + .../render/block/BlockRenderManager.mapping | 1 + .../client/render/block/BlockRenderer.mapping | 60 +++++++++++----- .../client/render/item/ItemRenderer.mapping | 70 ++++++++++++++++--- .../net/minecraft/container/Container.mapping | 48 ++++++++++++- .../container/ContainerAnvil.mapping | 9 ++- .../container/ContainerBrewingStand.mapping | 4 ++ ...Generic.mapping => ContainerChest.mapping} | 2 +- .../container/ContainerCraftingTable.mapping | 7 +- .../ContainerEnchantingTable.mapping | 16 ++++- .../container/ContainerFurnace.mapping | 5 ++ .../container/ContainerHorse.mapping | 1 + .../container/ContainerPlayer.mapping | 6 +- .../container/ContainerVillager.mapping | 8 ++- .../net/minecraft/container/slot/Slot.mapping | 18 ++++- .../container/slot/SlotCraftingResult.mapping | 8 +++ .../container/slot/SlotFurnaceOutput.mapping | 8 +++ .../container/slot/SlotVillagerOutput.mapping | 28 ++++++++ .../enchantment/EnchantmentHelper.mapping | 8 +++ .../AIVillagerInteractWithOther.mapping | 7 ++ .../entity/passive/EntityVillager.mapping | 20 +++++- .../entity/player/EntityPlayer.mapping | 1 + .../net/minecraft/gui/CreativeTab.mapping | 3 + .../net/minecraft/villager/IVillager.mapping | 13 ++++ .../{sortme => villager}/VillageDoor.mapping | 11 ++- .../VillageProperties.mapping | 2 +- .../net/minecraft/villager/Villager.mapping | 20 ++++++ .../VillagerInventory.mapping | 13 +++- .../minecraft/villager/VillagerRecipe.mapping | 40 +++++++++++ .../villager/VillagerRecipeList.mapping | 17 +++++ mappings/none/acr.mapping | 5 -- mappings/none/bmg.mapping | 6 ++ mappings/none/vh.mapping | 3 - 48 files changed, 471 insertions(+), 79 deletions(-) rename mappings/net/minecraft/container/{ContainerGeneric.mapping => ContainerChest.mapping} (85%) create mode 100644 mappings/net/minecraft/container/slot/SlotVillagerOutput.mapping create mode 100644 mappings/net/minecraft/entity/ai/interact/AIVillagerInteractWithOther.mapping create mode 100644 mappings/net/minecraft/villager/IVillager.mapping rename mappings/net/minecraft/{sortme => villager}/VillageDoor.mapping (53%) rename mappings/net/minecraft/{sortme => villager}/VillageProperties.mapping (94%) create mode 100644 mappings/net/minecraft/villager/Villager.mapping rename mappings/net/minecraft/{sortme => villager}/VillagerInventory.mapping (72%) create mode 100644 mappings/net/minecraft/villager/VillagerRecipe.mapping create mode 100644 mappings/net/minecraft/villager/VillagerRecipeList.mapping delete mode 100644 mappings/none/acr.mapping delete mode 100644 mappings/none/vh.mapping diff --git a/mappings/net/minecraft/block/Block.mapping b/mappings/net/minecraft/block/Block.mapping index 09da9095cd..d79197e1cb 100644 --- a/mappings/net/minecraft/block/Block.mapping +++ b/mappings/net/minecraft/block/Block.mapping @@ -300,7 +300,7 @@ CLASS none/aky net/minecraft/block/Block ARG 2 state METHOD c (Lnone/asm;)Z ARG 0 state - METHOD c (Lnone/asm;Lnone/aiw;Lnone/cn;)I + METHOD c getComparatorInput (Lnone/asm;Lnone/aiw;Lnone/cn;)I ARG 0 state ARG 1 world ARG 2 pos @@ -375,7 +375,7 @@ CLASS none/aky net/minecraft/block/Block METHOD u getStackFromState (Lnone/asm;)Lnone/aes; ARG 0 state METHOD v getOffsetType ()Lnone/aky$a; - METHOD v (Lnone/asm;)Z + METHOD v hasComparatorInput (Lnone/asm;)Z ARG 0 state METHOD w getSoundGroup ()Lnone/apw; METHOD w setDefaultState (Lnone/asm;)V diff --git a/mappings/net/minecraft/block/BlockBrewingStand.mapping b/mappings/net/minecraft/block/BlockBrewingStand.mapping index d871c8ee0c..6005a40e2a 100644 --- a/mappings/net/minecraft/block/BlockBrewingStand.mapping +++ b/mappings/net/minecraft/block/BlockBrewingStand.mapping @@ -59,12 +59,12 @@ CLASS none/ald net/minecraft/block/BlockBrewingStand METHOD c getTranslatedName ()Ljava/lang/String; METHOD c (Lnone/asm;)Z ARG 0 state - METHOD c (Lnone/asm;Lnone/aiw;Lnone/cn;)I + METHOD c getComparatorInput (Lnone/asm;Lnone/aiw;Lnone/cn;)I ARG 0 state ARG 1 world ARG 2 pos METHOD e serializeState (Lnone/asm;)I ARG 0 state METHOD f getRenderLayer ()Lnone/aio; - METHOD v (Lnone/asm;)Z + METHOD v hasComparatorInput (Lnone/asm;)Z ARG 0 state diff --git a/mappings/net/minecraft/block/BlockCake.mapping b/mappings/net/minecraft/block/BlockCake.mapping index c9a1e9a688..48f9c7caf4 100644 --- a/mappings/net/minecraft/block/BlockCake.mapping +++ b/mappings/net/minecraft/block/BlockCake.mapping @@ -48,12 +48,12 @@ CLASS none/alh net/minecraft/block/BlockCake ARG 2 pos METHOD c (Lnone/asm;)Z ARG 0 state - METHOD c (Lnone/asm;Lnone/aiw;Lnone/cn;)I + METHOD c getComparatorInput (Lnone/asm;Lnone/aiw;Lnone/cn;)I ARG 0 state ARG 1 world ARG 2 pos METHOD e serializeState (Lnone/asm;)I ARG 0 state METHOD f getRenderLayer ()Lnone/aio; - METHOD v (Lnone/asm;)Z + METHOD v hasComparatorInput (Lnone/asm;)Z ARG 0 state diff --git a/mappings/net/minecraft/block/BlockCauldron.mapping b/mappings/net/minecraft/block/BlockCauldron.mapping index f295eff2ca..31cd37f092 100644 --- a/mappings/net/minecraft/block/BlockCauldron.mapping +++ b/mappings/net/minecraft/block/BlockCauldron.mapping @@ -53,7 +53,7 @@ CLASS none/alj net/minecraft/block/BlockCauldron ARG 2 pos METHOD c (Lnone/asm;)Z ARG 0 state - METHOD c (Lnone/asm;Lnone/aiw;Lnone/cn;)I + METHOD c getComparatorInput (Lnone/asm;Lnone/aiw;Lnone/cn;)I ARG 0 state ARG 1 world ARG 2 pos @@ -62,5 +62,5 @@ CLASS none/alj net/minecraft/block/BlockCauldron METHOD h (Lnone/aiw;Lnone/cn;)V ARG 0 world ARG 1 pos - METHOD v (Lnone/asm;)Z + METHOD v hasComparatorInput (Lnone/asm;)Z ARG 0 state diff --git a/mappings/net/minecraft/block/BlockChest.mapping b/mappings/net/minecraft/block/BlockChest.mapping index 31059d2a79..d76c02c3ba 100644 --- a/mappings/net/minecraft/block/BlockChest.mapping +++ b/mappings/net/minecraft/block/BlockChest.mapping @@ -79,7 +79,7 @@ CLASS none/alk net/minecraft/block/BlockChest ARG 2 state METHOD c (Lnone/asm;)Z ARG 0 state - METHOD c (Lnone/asm;Lnone/aiw;Lnone/cn;)I + METHOD c getComparatorInput (Lnone/asm;Lnone/aiw;Lnone/cn;)I ARG 0 state ARG 1 world ARG 2 pos @@ -92,5 +92,5 @@ CLASS none/alk net/minecraft/block/BlockChest ARG 0 state METHOD g emitsRedstonePower (Lnone/asm;)Z ARG 0 state - METHOD v (Lnone/asm;)Z + METHOD v hasComparatorInput (Lnone/asm;)Z ARG 0 state diff --git a/mappings/net/minecraft/block/BlockCommand.mapping b/mappings/net/minecraft/block/BlockCommand.mapping index 3085d94dac..69af9bae96 100644 --- a/mappings/net/minecraft/block/BlockCommand.mapping +++ b/mappings/net/minecraft/block/BlockCommand.mapping @@ -56,7 +56,7 @@ CLASS none/alq net/minecraft/block/BlockCommand ARG 1 pos ARG 2 state ARG 3 random - METHOD c (Lnone/asm;Lnone/aiw;Lnone/cn;)I + METHOD c getComparatorInput (Lnone/asm;Lnone/aiw;Lnone/cn;)I ARG 0 state ARG 1 world ARG 2 pos @@ -66,5 +66,5 @@ CLASS none/alq net/minecraft/block/BlockCommand ARG 2 state METHOD e serializeState (Lnone/asm;)I ARG 0 state - METHOD v (Lnone/asm;)Z + METHOD v hasComparatorInput (Lnone/asm;)Z ARG 0 state diff --git a/mappings/net/minecraft/block/BlockDispenser.mapping b/mappings/net/minecraft/block/BlockDispenser.mapping index 6723f5c750..564ef0cc2e 100644 --- a/mappings/net/minecraft/block/BlockDispenser.mapping +++ b/mappings/net/minecraft/block/BlockDispenser.mapping @@ -66,11 +66,11 @@ CLASS none/ama net/minecraft/block/BlockDispenser ARG 0 world ARG 1 pos ARG 2 state - METHOD c (Lnone/asm;Lnone/aiw;Lnone/cn;)I + METHOD c getComparatorInput (Lnone/asm;Lnone/aiw;Lnone/cn;)I ARG 0 state ARG 1 world ARG 2 pos METHOD e serializeState (Lnone/asm;)I ARG 0 state - METHOD v (Lnone/asm;)Z + METHOD v hasComparatorInput (Lnone/asm;)Z ARG 0 state diff --git a/mappings/net/minecraft/block/BlockEndPortalFrame.mapping b/mappings/net/minecraft/block/BlockEndPortalFrame.mapping index be3a290c0e..ed1cdb821e 100644 --- a/mappings/net/minecraft/block/BlockEndPortalFrame.mapping +++ b/mappings/net/minecraft/block/BlockEndPortalFrame.mapping @@ -41,12 +41,12 @@ CLASS none/amj net/minecraft/block/BlockEndPortalFrame ARG 2 pos METHOD c (Lnone/asm;)Z ARG 0 state - METHOD c (Lnone/asm;Lnone/aiw;Lnone/cn;)I + METHOD c getComparatorInput (Lnone/asm;Lnone/aiw;Lnone/cn;)I ARG 0 state ARG 1 world ARG 2 pos METHOD e getCompletedFramePattern ()Lnone/asq; METHOD e serializeState (Lnone/asm;)I ARG 0 state - METHOD v (Lnone/asm;)Z + METHOD v hasComparatorInput (Lnone/asm;)Z ARG 0 state diff --git a/mappings/net/minecraft/block/BlockFurnace.mapping b/mappings/net/minecraft/block/BlockFurnace.mapping index 601c713086..992eda0e57 100644 --- a/mappings/net/minecraft/block/BlockFurnace.mapping +++ b/mappings/net/minecraft/block/BlockFurnace.mapping @@ -60,11 +60,11 @@ CLASS none/amy net/minecraft/block/BlockFurnace ARG 0 world ARG 1 pos ARG 2 state - METHOD c (Lnone/asm;Lnone/aiw;Lnone/cn;)I + METHOD c getComparatorInput (Lnone/asm;Lnone/aiw;Lnone/cn;)I ARG 0 state ARG 1 world ARG 2 pos METHOD e serializeState (Lnone/asm;)I ARG 0 state - METHOD v (Lnone/asm;)Z + METHOD v hasComparatorInput (Lnone/asm;)Z ARG 0 state diff --git a/mappings/net/minecraft/block/BlockHopper.mapping b/mappings/net/minecraft/block/BlockHopper.mapping index 1e5698b82c..055ef8ceb3 100644 --- a/mappings/net/minecraft/block/BlockHopper.mapping +++ b/mappings/net/minecraft/block/BlockHopper.mapping @@ -78,7 +78,7 @@ CLASS none/anl net/minecraft/block/BlockHopper ARG 2 state METHOD c (Lnone/asm;)Z ARG 0 state - METHOD c (Lnone/asm;Lnone/aiw;Lnone/cn;)I + METHOD c getComparatorInput (Lnone/asm;Lnone/aiw;Lnone/cn;)I ARG 0 state ARG 1 world ARG 2 pos @@ -91,5 +91,5 @@ CLASS none/anl net/minecraft/block/BlockHopper ARG 0 meta METHOD k isOpaqueFullBoundsCube (Lnone/asm;)Z ARG 0 state - METHOD v (Lnone/asm;)Z + METHOD v hasComparatorInput (Lnone/asm;)Z ARG 0 state diff --git a/mappings/net/minecraft/block/BlockJukebox.mapping b/mappings/net/minecraft/block/BlockJukebox.mapping index 414ad07fe0..037e41ca6c 100644 --- a/mappings/net/minecraft/block/BlockJukebox.mapping +++ b/mappings/net/minecraft/block/BlockJukebox.mapping @@ -44,12 +44,12 @@ CLASS none/anp net/minecraft/block/BlockJukebox ARG 0 world ARG 1 pos ARG 2 state - METHOD c (Lnone/asm;Lnone/aiw;Lnone/cn;)I + METHOD c getComparatorInput (Lnone/asm;Lnone/aiw;Lnone/cn;)I ARG 0 state ARG 1 world ARG 2 pos METHOD e removeRecord (Lnone/aiw;Lnone/cn;Lnone/asm;)V METHOD e serializeState (Lnone/asm;)I ARG 0 state - METHOD v (Lnone/asm;)Z + METHOD v hasComparatorInput (Lnone/asm;)Z ARG 0 state diff --git a/mappings/net/minecraft/block/BlockRailDetector.mapping b/mappings/net/minecraft/block/BlockRailDetector.mapping index 41d773d524..b4737b30c2 100644 --- a/mappings/net/minecraft/block/BlockRailDetector.mapping +++ b/mappings/net/minecraft/block/BlockRailDetector.mapping @@ -36,7 +36,7 @@ CLASS none/alw net/minecraft/block/BlockRailDetector ARG 0 world ARG 1 pos ARG 2 state - METHOD c (Lnone/asm;Lnone/aiw;Lnone/cn;)I + METHOD c getComparatorInput (Lnone/asm;Lnone/aiw;Lnone/cn;)I ARG 0 state ARG 1 world ARG 2 pos @@ -50,5 +50,5 @@ CLASS none/alw net/minecraft/block/BlockRailDetector METHOD g getShapeProperty ()Lnone/atc; METHOD g emitsRedstonePower (Lnone/asm;)Z ARG 0 state - METHOD v (Lnone/asm;)Z + METHOD v hasComparatorInput (Lnone/asm;)Z ARG 0 state diff --git a/mappings/net/minecraft/client/gui/GuiContainer.mapping b/mappings/net/minecraft/client/gui/GuiContainer.mapping index 3a7836fbfa..72fc61b877 100644 --- a/mappings/net/minecraft/client/gui/GuiContainer.mapping +++ b/mappings/net/minecraft/client/gui/GuiContainer.mapping @@ -28,11 +28,18 @@ CLASS none/bhf net/minecraft/client/gui/GuiContainer ARG 1 mouseY ARG 2 mouseButton ARG 3 heldTime + METHOD a drawSlot (Lnone/acv;)V + ARG 0 slot METHOD a onMouseClick (Lnone/acv;IILnone/acb;)V ARG 0 slot ARG 1 invSlot ARG 2 button ARG 3 type + METHOD a drawItem (Lnone/aes;IILjava/lang/String;)V + ARG 0 stack + ARG 1 xPosition + ARG 2 yPosition + ARG 3 text METHOD b init ()V METHOD b drawForeground (II)V ARG 0 mouseX diff --git a/mappings/net/minecraft/client/gui/container/GuiEnchanting.mapping b/mappings/net/minecraft/client/gui/container/GuiEnchanting.mapping index 79657955ff..e3a8434a6f 100644 --- a/mappings/net/minecraft/client/gui/container/GuiEnchanting.mapping +++ b/mappings/net/minecraft/client/gui/container/GuiEnchanting.mapping @@ -3,6 +3,7 @@ CLASS none/bhs net/minecraft/client/gui/container/GuiEnchanting FIELD C BOOK_TEX Lnone/kp; FIELD E playerInv Lnone/aal; FIELD F rand Ljava/util/Random; + FIELD G container Lnone/ach; METHOD (Lnone/aal;Lnone/aiw;Lnone/ri;)V ARG 0 playerInv ARG 1 world diff --git a/mappings/net/minecraft/client/gui/ingame/GuiCreativeInventory.mapping b/mappings/net/minecraft/client/gui/ingame/GuiCreativeInventory.mapping index 1cb05abcc6..bb66d625f9 100644 --- a/mappings/net/minecraft/client/gui/ingame/GuiCreativeInventory.mapping +++ b/mappings/net/minecraft/client/gui/ingame/GuiCreativeInventory.mapping @@ -3,23 +3,41 @@ CLASS none/bho net/minecraft/client/gui/ingame/GuiCreativeInventory FIELD a itemList Lnone/dc; METHOD (Lnone/aam;)V ARG 0 player + METHOD a shiftItemInSlot (IIZLnone/aam;)V + ARG 0 invSlot + ARG 1 buttonId + ARG 3 player METHOD a canUse (Lnone/aam;)Z ARG 0 player + METHOD a (Lnone/aes;Lnone/acv;)Z + ARG 0 stack + ARG 1 slot METHOD b getStack (Lnone/aam;I)Lnone/aes; ARG 0 player ARG 1 slot + METHOD b (Lnone/acv;)Z + ARG 0 slot CLASS none/bho$b CreativeSlot FIELD b slot Lnone/acv; + METHOD (Lnone/bho;Lnone/acv;I)V + ARG 0 slot METHOD a getMaxStackAmount ()I METHOD a takeStack (I)Lnone/aes; ARG 0 amount - METHOD a (Lnone/aam;)Z + METHOD a canTakeItem (Lnone/aam;)Z ARG 0 player + METHOD a onTakeItem (Lnone/aam;Lnone/aes;)Lnone/aes; + ARG 0 player + ARG 1 stack METHOD a canInsert (Lnone/aes;)Z ARG 0 stack + METHOD a onContentChanged (Lnone/aes;Lnone/aes;)V + ARG 0 originalItem + ARG 1 newItem METHOD a matches (Lnone/qv;I)Z ARG 0 inventory ARG 1 invSlot + METHOD b doDrawHoveringEffect ()Z METHOD b getMaxStackAmount (Lnone/aes;)I ARG 0 stack METHOD c getBackgroundSprite ()Ljava/lang/String; @@ -29,10 +47,14 @@ CLASS none/bho net/minecraft/client/gui/ingame/GuiCreativeInventory METHOD e hasStack ()Z METHOD f markDirty ()V FIELD A searchBox Lnone/bep; + FIELD B slots Ljava/util/List; + FIELD C deleteItemSlot Lnone/acv; FIELD D clearText Z FIELD u BG_TEX Lnone/kp; FIELD v inventory Lnone/rk; FIELD w selectedTab I + FIELD x scrollPosition F + FIELD y isScrolling Z METHOD (Lnone/aam;)V ARG 0 player METHOD a onKeyPressed (CI)V @@ -72,5 +94,6 @@ CLASS none/bho net/minecraft/client/gui/ingame/GuiCreativeInventory METHOD b setSelectedTab (Lnone/ads;)V ARG 0 tab METHOD e update ()V + METHOD i doRenderScrollBar ()Z METHOD k handleMouseEvent ()V METHOD m onClosed ()V diff --git a/mappings/net/minecraft/client/render/FirstPersonRenderer.mapping b/mappings/net/minecraft/client/render/FirstPersonRenderer.mapping index 2d8c338347..a5e2a35a93 100644 --- a/mappings/net/minecraft/client/render/FirstPersonRenderer.mapping +++ b/mappings/net/minecraft/client/render/FirstPersonRenderer.mapping @@ -42,6 +42,7 @@ CLASS none/box net/minecraft/client/render/FirstPersonRenderer ARG 0 holder ARG 1 stack ARG 2 transformation + ARG 3 holdInLeftHand METHOD b renderOverlays (F)V ARG 0 deltaTicks METHOD c renderArms ()V diff --git a/mappings/net/minecraft/client/render/block/BlockRenderManager.mapping b/mappings/net/minecraft/client/render/block/BlockRenderManager.mapping index d208836dcb..56a9d2f951 100644 --- a/mappings/net/minecraft/client/render/block/BlockRenderManager.mapping +++ b/mappings/net/minecraft/client/render/block/BlockRenderManager.mapping @@ -10,6 +10,7 @@ CLASS none/bpp net/minecraft/client/render/block/BlockRenderManager ARG 0 state METHOD a render (Lnone/asm;F)V ARG 0 state + ARG 1 colorMultiplier METHOD a tesselate (Lnone/asm;Lnone/cn;Lnone/bxe;Lnone/aja;)V ARG 0 state ARG 1 pos diff --git a/mappings/net/minecraft/client/render/block/BlockRenderer.mapping b/mappings/net/minecraft/client/render/block/BlockRenderer.mapping index 583d45eaf9..41fe39e38b 100644 --- a/mappings/net/minecraft/client/render/block/BlockRenderer.mapping +++ b/mappings/net/minecraft/client/render/block/BlockRenderer.mapping @@ -1,26 +1,26 @@ CLASS none/bpr net/minecraft/client/render/block/BlockRenderer - CLASS none/bpr$a EnumNeighborInfo + CLASS none/bpr$a NeighborData FIELD a DOWN Lnone/bpr$a; FIELD b UP Lnone/bpr$a; FIELD c NORTH Lnone/bpr$a; FIELD d SOUTH Lnone/bpr$a; FIELD e WEST Lnone/bpr$a; FIELD f EAST Lnone/bpr$a; - FIELD g corners [Lnone/cu; - FIELD h shadeWeight F - FIELD i doNonCubicWeight Z + FIELD g faces [Lnone/cu; + FIELD h weight F + FIELD i nonCubicWeight Z FIELD n VALUES [Lnone/bpr$a; METHOD (Ljava/lang/String;I[Lnone/cu;FZ[Lnone/bpr$d;[Lnone/bpr$d;[Lnone/bpr$d;[Lnone/bpr$d;)V - ARG 0 corners - ARG 1 shadeWeight - ARG 2 doNonCubicWeight - METHOD a getNeighbourInfo (Lnone/cu;)Lnone/bpr$a; + ARG 0 faces + ARG 1 weight + ARG 2 nonCubicWeight + METHOD a getData (Lnone/cu;)Lnone/bpr$a; ARG 0 facing CLASS none/bpr$b AmbientOcclusionCalculator - FIELD b vertexColorMultiplier [F - FIELD c vertexBrightness [I + FIELD b colorMultiplier [F + FIELD c brightness [I METHOD a getAmbientOcclusionBrightness (IIII)I - METHOD a getVertexBrightness (IIIIFFFF)I + METHOD a getBrightness (IIIIFFFF)I METHOD a apply (Lnone/aja;Lnone/asm;Lnone/cn;Lnone/cu;[FLjava/util/BitSet;)V ARG 0 view ARG 1 state @@ -28,17 +28,26 @@ CLASS none/bpr net/minecraft/client/render/block/BlockRenderer ARG 3 facing ARG 4 faceShape ARG 5 shapeState - CLASS none/bpr$c VertexTranslations + CLASS none/bpr$c Translation FIELD a DOWN Lnone/bpr$c; FIELD b UP Lnone/bpr$c; FIELD c NORTH Lnone/bpr$c; FIELD d SOUTH Lnone/bpr$c; FIELD e WEST Lnone/bpr$c; FIELD f EAST Lnone/bpr$c; + FIELD g firstCorner I + FIELD h secondCorner I + FIELD i thirdCorner I + FIELD j fourthCorner I FIELD k VALUES [Lnone/bpr$c; - METHOD a getVertexTranslations (Lnone/cu;)Lnone/bpr$c; + METHOD (Ljava/lang/String;IIIII)V + ARG 0 firstCorner + ARG 1 secondCorner + ARG 2 thirdCorner + ARG 3 fourthCorner + METHOD a getTranslations (Lnone/cu;)Lnone/bpr$c; ARG 0 facing - CLASS none/bpr$d Orientation + CLASS none/bpr$d NeighborOrientation FIELD a DOWN Lnone/bpr$d; FIELD b UP Lnone/bpr$d; FIELD c NORTH Lnone/bpr$d; @@ -54,11 +63,15 @@ CLASS none/bpr net/minecraft/client/render/block/BlockRenderer FIELD m shape I METHOD (Ljava/lang/String;ILnone/cu;Z)V ARG 0 facing - ARG 1 flip + ARG 1 doFlip FIELD a colorMap Lnone/bea; METHOD (Lnone/bea;)V ARG 0 colorMap METHOD a renderQuad (FFFFLjava/util/List;)V + ARG 0 colorMultiplier + ARG 1 red + ARG 2 green + ARG 3 blue ARG 4 quads METHOD a tesselateQuadsFlat (Lnone/aja;Lnone/asm;Lnone/cn;IZLnone/bon;Ljava/util/List;Ljava/util/BitSet;)V ARG 0 view @@ -84,18 +97,22 @@ CLASS none/bpr net/minecraft/client/render/block/BlockRenderer ARG 2 state ARG 3 pos ARG 4 buffer - ARG 5 checkSides + ARG 5 testSides METHOD a tesselate (Lnone/aja;Lnone/bzm;Lnone/asm;Lnone/cn;Lnone/bon;ZJ)Z ARG 0 view ARG 1 model ARG 2 state ARG 3 pos ARG 4 buffer - ARG 5 checkSides + ARG 5 testSides ARG 6 variationSeed METHOD a render (Lnone/asm;Lnone/bzm;FFFF)V ARG 0 state ARG 1 model + ARG 2 colorMultiplier + ARG 3 red + ARG 4 green + ARG 5 blue METHOD a updateShape (Lnone/asm;[ILnone/cu;[FLjava/util/BitSet;)V ARG 0 state ARG 1 vertexData @@ -104,17 +121,22 @@ CLASS none/bpr net/minecraft/client/render/block/BlockRenderer ARG 4 shapeState METHOD a render (Lnone/bzm;FFFF)V ARG 0 model + ARG 1 colorMultiplier + ARG 2 red + ARG 3 green + ARG 4 blue METHOD a render (Lnone/bzm;Lnone/asm;FZ)V ARG 0 model ARG 1 state ARG 2 colorMultiplier + ARG 3 notUseGlColor METHOD b tesselateSmooth (Lnone/aja;Lnone/bzm;Lnone/asm;Lnone/cn;Lnone/bon;ZJ)Z ARG 0 view ARG 1 model ARG 2 state ARG 3 pos ARG 4 buffer - ARG 5 checkSides + ARG 5 testSides ARG 6 variationSeed METHOD c tesselateFlat (Lnone/aja;Lnone/bzm;Lnone/asm;Lnone/cn;Lnone/bon;ZJ)Z ARG 0 view @@ -122,5 +144,5 @@ CLASS none/bpr net/minecraft/client/render/block/BlockRenderer ARG 2 state ARG 3 pos ARG 4 buffer - ARG 5 checkSides + ARG 5 testSides ARG 6 variationSeed diff --git a/mappings/net/minecraft/client/render/item/ItemRenderer.mapping b/mappings/net/minecraft/client/render/item/ItemRenderer.mapping index 1ca4170109..4362ff25cb 100644 --- a/mappings/net/minecraft/client/render/item/ItemRenderer.mapping +++ b/mappings/net/minecraft/client/render/item/ItemRenderer.mapping @@ -32,6 +32,10 @@ CLASS none/btr net/minecraft/client/render/item/ItemRenderer ARG 1 blockModelManager ARG 2 itemColorMap METHOD a getModelMap ()Lnone/boy; + METHOD a renderItemModel (IIZ)V + ARG 0 xPosition + ARG 1 yPosition + ARG 2 isThreeDimensinalInGui METHOD a registerItemModel (Lnone/aeq;ILjava/lang/String;)V ARG 0 item ARG 1 metadata @@ -41,12 +45,35 @@ CLASS none/btr net/minecraft/client/render/item/ItemRenderer ARG 1 modelId METHOD a isThreeDimensionalInGUI (Lnone/aes;)Z ARG 0 stack - METHOD a getModel (Lnone/aes;Lnone/aiw;Lnone/sp;)Lnone/bzm; + METHOD a renderItemWithPropertyOverrides (Lnone/aes;II)V + ARG 0 stack + ARG 1 xPosition + ARG 2 yPosition + METHOD a renderItem (Lnone/aes;IILnone/bzm;)V + ARG 0 stack + ARG 1 xPosition + ARG 2 yPosition + ARG 3 bakedModel + METHOD a getPropertyOverrideModel (Lnone/aes;Lnone/aiw;Lnone/sp;)Lnone/bzm; ARG 0 stack ARG 1 world - METHOD a (Lnone/aes;Lnone/bzm;)V + ARG 2 entity + METHOD a renderItemWithTransformation (Lnone/aes;Lnone/bqf$b;)V + ARG 0 stack + ARG 1 type + METHOD a renderItemAndGlow (Lnone/aes;Lnone/bzm;)V ARG 0 stack ARG 1 model + METHOD a renderItemModel (Lnone/aes;Lnone/bzm;Lnone/bqf$b;Z)V + ARG 0 stack + ARG 1 model + ARG 2 type + ARG 3 holdInLeftHand + METHOD a renderItemAmountAndDamageInGUI (Lnone/aes;Lnone/sp;Lnone/bqf$b;Z)V + ARG 0 stack + ARG 1 entity + ARG 2 type + ARG 3 holdInLeftHand METHOD a registerItemModel (Lnone/aky;ILjava/lang/String;)V ARG 0 block ARG 1 metadata @@ -54,18 +81,18 @@ CLASS none/btr net/minecraft/client/render/item/ItemRenderer METHOD a registerItemModel (Lnone/aky;Ljava/lang/String;)V ARG 0 block ARG 1 modelId - METHOD a renderItemInGUI (Lnone/bef;Lnone/aes;II)V + METHOD a renderItemAmountAndDamageInGUIWithoutText (Lnone/bef;Lnone/aes;II)V ARG 0 fontRenderer ARG 1 stack ARG 2 x ARG 3 y - METHOD a renderItemInGUI (Lnone/bef;Lnone/aes;IILjava/lang/String;)V + METHOD a renderItemAmountAndDamageInGUI (Lnone/bef;Lnone/aes;IILjava/lang/String;)V ARG 0 fontRenderer ARG 1 stack ARG 2 x ARG 3 y ARG 4 text - METHOD a drawQuad (Lnone/bon;IIIIIIII)V + METHOD a renderQuad (Lnone/bon;IIIIIIII)V ARG 0 buffer ARG 1 x ARG 2 y @@ -75,14 +102,41 @@ CLASS none/btr net/minecraft/client/render/item/ItemRenderer ARG 6 green ARG 7 blue ARG 8 alpha - METHOD a (Lnone/bon;Ljava/util/List;ILnone/aes;)V + METHOD a renderItemModelWithColor (Lnone/bon;Ljava/util/List;ILnone/aes;)V ARG 0 buffer ARG 1 quads + ARG 2 color ARG 3 stack - METHOD a (Lnone/bon;Lnone/bps;I)V + METHOD a renderQuad (Lnone/bon;Lnone/bps;)V + ARG 0 buffer + ARG 1 quad + METHOD a renderColoredQuad (Lnone/bon;Lnone/bps;I)V + ARG 0 buffer + ARG 1 model + ARG 2 colorIndex + METHOD a (Lnone/bqe;)Z + ARG 0 transformation METHOD a onResourceReload (Lnone/byd;)V ARG 0 container - METHOD a (Lnone/sp;Lnone/aes;II)V + METHOD a renderEnchantmentGlow (Lnone/bzm;)V + ARG 0 model + METHOD a renderModelWithColor (Lnone/bzm;I)V + ARG 0 model + ARG 1 color + METHOD a renderModelWithColor (Lnone/bzm;ILnone/aes;)V + ARG 0 model + ARG 1 color + ARG 2 stack + METHOD a renderItemModel (Lnone/bzm;Lnone/aes;)V + ARG 0 model + ARG 1 stack + METHOD a renderItemInGui (Lnone/sp;Lnone/aes;II)V ARG 0 entity ARG 1 stack + ARG 2 xPosition + ARG 3 yPosition METHOD b registerItemModels ()V + METHOD b renderItemAndGlowInGui (Lnone/aes;II)V + ARG 0 stack + ARG 1 xPosition + ARG 2 yPosition diff --git a/mappings/net/minecraft/container/Container.mapping b/mappings/net/minecraft/container/Container.mapping index c2244b6b01..3ef303eda3 100644 --- a/mappings/net/minecraft/container/Container.mapping +++ b/mappings/net/minecraft/container/Container.mapping @@ -1,26 +1,66 @@ CLASS none/abx net/minecraft/container/Container + FIELD a actionId S FIELD b stackList Lnone/dc; FIELD c slotList Ljava/util/List; FIELD d guiId I FIELD e listeners Ljava/util/List; + FIELD i playersWithNPermission Ljava/util/Set; METHOD a getStacks ()Lnone/dc; METHOD a getSlot (I)Lnone/acv; ARG 0 slot + METHOD a onSlotClick (IILnone/acb;Lnone/aam;)Lnone/aes; + ARG 0 invSlot + ARG 1 buttonId + ARG 2 actionType + ARG 3 player + METHOD a shiftItemInSlot (IIZLnone/aam;)V + ARG 0 invSlot + ARG 1 buttonId + ARG 3 player + METHOD a (ILnone/aam;)Z + ARG 1 player METHOD a setStackInSlot (ILnone/aes;)V ARG 0 slot ARG 1 stack METHOD a updateSlotStacks (Ljava/util/List;)V ARG 0 stacks + METHOD a calculateStackSize (Ljava/util/Set;ILnone/aes;I)V + ARG 0 slots + ARG 1 rmode + ARG 2 stack + ARG 3 stackSize + METHOD a getNextActionId (Lnone/aal;)S + ARG 0 playerInventory METHOD a canUse (Lnone/aam;)Z ARG 0 player + METHOD a onButtonClick (Lnone/aam;I)Z + ARG 0 player + ARG 1 buttonId + METHOD a givePlayerPermission (Lnone/aam;Z)V + ARG 0 player + ARG 1 allowPlayerToUse METHOD a addListener (Lnone/acc;)V ARG 0 listener METHOD a addSlot (Lnone/acv;)Lnone/acv; ARG 0 slot - METHOD a (Lnone/qv;)V + METHOD a canInsertItemIntoSlot (Lnone/acv;Lnone/aes;Z)Z + ARG 0 slot + ARG 1 stack + METHOD a insertItem (Lnone/aes;IIZ)Z + ARG 0 stack + ARG 1 startIndex + ARG 2 endIndex + METHOD a (Lnone/aes;Lnone/acv;)Z + ARG 0 stack + ARG 1 slot + METHOD a calculateComparatorInput (Lnone/are;)I + ARG 0 entity + METHOD a onContentChanged (Lnone/qv;)V + ARG 0 inventoy METHOD a getMatchingSlot (Lnone/qv;I)Lnone/acv; ARG 0 inv ARG 1 invSlot + METHOD b sendContentUpdates ()V METHOD b setProperty (II)V ARG 0 pos ARG 1 value @@ -31,3 +71,9 @@ CLASS none/abx net/minecraft/container/Container ARG 1 slot METHOD b removeListener (Lnone/acc;)V ARG 0 listener + METHOD b (Lnone/acv;)Z + ARG 0 slot + METHOD b calculateComparatorInput (Lnone/qv;)I + ARG 0 inventory + METHOD c hasPlayerPermission (Lnone/aam;)Z + ARG 0 player diff --git a/mappings/net/minecraft/container/ContainerAnvil.mapping b/mappings/net/minecraft/container/ContainerAnvil.mapping index e373a4551d..7b3a457775 100644 --- a/mappings/net/minecraft/container/ContainerAnvil.mapping +++ b/mappings/net/minecraft/container/ContainerAnvil.mapping @@ -2,8 +2,11 @@ CLASS none/aby net/minecraft/container/ContainerAnvil CLASS none/aby$1 METHOD v_ markDirty ()V CLASS none/aby$2 - METHOD a (Lnone/aam;)Z + METHOD a canTakeItem (Lnone/aam;)Z ARG 0 player + METHOD a onTakeItem (Lnone/aam;Lnone/aes;)Lnone/aes; + ARG 0 player + ARG 1 stack METHOD a canInsert (Lnone/aes;)Z ARG 0 stack FIELD f LOGGER Lorg/apache/logging/log4j/Logger; @@ -28,8 +31,8 @@ CLASS none/aby net/minecraft/container/ContainerAnvil ARG 0 player METHOD a addListener (Lnone/acc;)V ARG 0 listener - METHOD a (Lnone/qv;)V - ARG 0 crafting + METHOD a onContentChanged (Lnone/qv;)V + ARG 0 inventoy METHOD b setProperty (II)V ARG 0 pos ARG 1 value diff --git a/mappings/net/minecraft/container/ContainerBrewingStand.mapping b/mappings/net/minecraft/container/ContainerBrewingStand.mapping index 65947b9194..5f58ddf179 100644 --- a/mappings/net/minecraft/container/ContainerBrewingStand.mapping +++ b/mappings/net/minecraft/container/ContainerBrewingStand.mapping @@ -23,6 +23,9 @@ CLASS none/aca net/minecraft/container/ContainerBrewingStand ARG 3 x ARG 4 y METHOD a getMaxStackAmount ()I + METHOD a onTakeItem (Lnone/aam;Lnone/aes;)Lnone/aes; + ARG 0 player + ARG 1 stack METHOD a canInsert (Lnone/aes;)Z ARG 0 stack METHOD c_ matches (Lnone/aes;)Z @@ -35,6 +38,7 @@ CLASS none/aca net/minecraft/container/ContainerBrewingStand ARG 0 player METHOD a addListener (Lnone/acc;)V ARG 0 listener + METHOD b sendContentUpdates ()V METHOD b setProperty (II)V ARG 0 pos ARG 1 value diff --git a/mappings/net/minecraft/container/ContainerGeneric.mapping b/mappings/net/minecraft/container/ContainerChest.mapping similarity index 85% rename from mappings/net/minecraft/container/ContainerGeneric.mapping rename to mappings/net/minecraft/container/ContainerChest.mapping index b7669d89c7..29d5b07b5d 100644 --- a/mappings/net/minecraft/container/ContainerGeneric.mapping +++ b/mappings/net/minecraft/container/ContainerChest.mapping @@ -1,4 +1,4 @@ -CLASS none/acd net/minecraft/container/ContainerGeneric +CLASS none/acd net/minecraft/container/ContainerChest FIELD a inventory Lnone/qv; FIELD f rows I METHOD (Lnone/qv;Lnone/qv;Lnone/aam;)V diff --git a/mappings/net/minecraft/container/ContainerCraftingTable.mapping b/mappings/net/minecraft/container/ContainerCraftingTable.mapping index dd742be6a1..184b24ffdd 100644 --- a/mappings/net/minecraft/container/ContainerCraftingTable.mapping +++ b/mappings/net/minecraft/container/ContainerCraftingTable.mapping @@ -9,8 +9,11 @@ CLASS none/acf net/minecraft/container/ContainerCraftingTable ARG 2 pos METHOD a canUse (Lnone/aam;)Z ARG 0 player - METHOD a (Lnone/qv;)V - ARG 0 crafting + METHOD a (Lnone/aes;Lnone/acv;)Z + ARG 0 stack + ARG 1 slot + METHOD a onContentChanged (Lnone/qv;)V + ARG 0 inventoy METHOD b close (Lnone/aam;)V ARG 0 player METHOD b getStack (Lnone/aam;I)Lnone/aes; diff --git a/mappings/net/minecraft/container/ContainerEnchantingTable.mapping b/mappings/net/minecraft/container/ContainerEnchantingTable.mapping index 6cf7d19c9e..2825d4a61a 100644 --- a/mappings/net/minecraft/container/ContainerEnchantingTable.mapping +++ b/mappings/net/minecraft/container/ContainerEnchantingTable.mapping @@ -10,6 +10,10 @@ CLASS none/ach net/minecraft/container/ContainerEnchantingTable METHOD a canInsert (Lnone/aes;)Z ARG 0 stack FIELD a inventory Lnone/qv; + FIELD f xpSeed I + FIELD g experienceLevels [I + FIELD h enchantmentIds [I + FIELD i enchantmentLevels [I FIELD j world Lnone/aiw; FIELD k pos Lnone/cn; FIELD l rand Ljava/util/Random; @@ -22,10 +26,16 @@ CLASS none/ach net/minecraft/container/ContainerEnchantingTable ARG 2 pos METHOD a canUse (Lnone/aam;)Z ARG 0 player + METHOD a onButtonClick (Lnone/aam;I)Z + ARG 0 player + ARG 1 buttonId METHOD a addListener (Lnone/acc;)V ARG 0 listener - METHOD a (Lnone/qv;)V - ARG 0 crafting + METHOD a (Lnone/aes;II)Ljava/util/List; + ARG 0 stack + METHOD a onContentChanged (Lnone/qv;)V + ARG 0 inventoy + METHOD b sendContentUpdates ()V METHOD b setProperty (II)V ARG 0 pos ARG 1 value @@ -34,5 +44,5 @@ CLASS none/ach net/minecraft/container/ContainerEnchantingTable METHOD b getStack (Lnone/aam;I)Lnone/aes; ARG 0 player ARG 1 slot - METHOD c (Lnone/acc;)V + METHOD c senDataToListener (Lnone/acc;)V ARG 0 listener diff --git a/mappings/net/minecraft/container/ContainerFurnace.mapping b/mappings/net/minecraft/container/ContainerFurnace.mapping index e04d8149e7..4298c0f185 100644 --- a/mappings/net/minecraft/container/ContainerFurnace.mapping +++ b/mappings/net/minecraft/container/ContainerFurnace.mapping @@ -1,5 +1,9 @@ CLASS none/acj net/minecraft/container/ContainerFurnace FIELD a inventory Lnone/qv; + FIELD f cookTime I + FIELD g totalCookTime I + FIELD h burnTime I + FIELD i fuelTime I METHOD (Lnone/aal;Lnone/qv;)V ARG 0 playerInv ARG 1 inventory @@ -7,6 +11,7 @@ CLASS none/acj net/minecraft/container/ContainerFurnace ARG 0 player METHOD a addListener (Lnone/acc;)V ARG 0 listener + METHOD b sendContentUpdates ()V METHOD b setProperty (II)V ARG 0 pos ARG 1 value diff --git a/mappings/net/minecraft/container/ContainerHorse.mapping b/mappings/net/minecraft/container/ContainerHorse.mapping index 445e228572..db83ce2933 100644 --- a/mappings/net/minecraft/container/ContainerHorse.mapping +++ b/mappings/net/minecraft/container/ContainerHorse.mapping @@ -5,6 +5,7 @@ CLASS none/acn net/minecraft/container/ContainerHorse CLASS none/acn$2 METHOD a canInsert (Lnone/aes;)Z ARG 0 stack + METHOD b doDrawHoveringEffect ()Z FIELD a playerInv Lnone/qv; FIELD f entity Lnone/xd; METHOD (Lnone/qv;Lnone/qv;Lnone/xd;Lnone/aam;)V diff --git a/mappings/net/minecraft/container/ContainerPlayer.mapping b/mappings/net/minecraft/container/ContainerPlayer.mapping index d5b3326bd4..392854ed34 100644 --- a/mappings/net/minecraft/container/ContainerPlayer.mapping +++ b/mappings/net/minecraft/container/ContainerPlayer.mapping @@ -17,7 +17,11 @@ CLASS none/aco net/minecraft/container/ContainerPlayer ARG 2 player METHOD a canUse (Lnone/aam;)Z ARG 0 player - METHOD a (Lnone/qv;)V + METHOD a (Lnone/aes;Lnone/acv;)Z + ARG 0 stack + ARG 1 slot + METHOD a onContentChanged (Lnone/qv;)V + ARG 0 inventoy METHOD b close (Lnone/aam;)V ARG 0 player METHOD b getStack (Lnone/aam;I)Lnone/aes; diff --git a/mappings/net/minecraft/container/ContainerVillager.mapping b/mappings/net/minecraft/container/ContainerVillager.mapping index f18616233a..e8fde2f8b9 100644 --- a/mappings/net/minecraft/container/ContainerVillager.mapping +++ b/mappings/net/minecraft/container/ContainerVillager.mapping @@ -1,14 +1,18 @@ CLASS none/acq net/minecraft/container/ContainerVillager + FIELD a villager Lnone/aih; + FIELD f villagerInventory Lnone/acp; FIELD g world Lnone/aiw; METHOD (Lnone/aal;Lnone/aih;Lnone/aiw;)V ARG 0 playerInv + ARG 1 villager ARG 2 world METHOD a canUse (Lnone/aam;)Z ARG 0 player METHOD a addListener (Lnone/acc;)V ARG 0 listener - METHOD a (Lnone/qv;)V - ARG 0 crafting + METHOD a onContentChanged (Lnone/qv;)V + ARG 0 inventoy + METHOD b sendContentUpdates ()V METHOD b setProperty (II)V ARG 0 pos ARG 1 value diff --git a/mappings/net/minecraft/container/slot/Slot.mapping b/mappings/net/minecraft/container/slot/Slot.mapping index c5ab7a43fd..111918e04a 100644 --- a/mappings/net/minecraft/container/slot/Slot.mapping +++ b/mappings/net/minecraft/container/slot/Slot.mapping @@ -2,22 +2,38 @@ CLASS none/acv net/minecraft/container/slot/Slot FIELD a invSlot I FIELD d inventory Lnone/qv; FIELD e id I + FIELD f xPosition I + FIELD g yPosition I METHOD (Lnone/qv;III)V ARG 0 inventory ARG 1 invSlot + ARG 2 xPosition + ARG 3 (Lnone/aam;Lnone/aih;Lnone/acp;III)V + ARG 0 player + ARG 1 villager + ARG 2 VillagerInventory + ARG 3 index + ARG 4 xPosition + ARG 5 yPosition + METHOD a takeStack (I)Lnone/aes; + ARG 0 amount + METHOD a onTakeItem (Lnone/aam;Lnone/aes;)Lnone/aes; + ARG 0 player + ARG 1 stack + METHOD a canInsert (Lnone/aes;)Z + ARG 0 stack + METHOD a onCrafted (Lnone/aes;I)V + ARG 0 stack + ARG 1 amount + METHOD a isValid (Lnone/aii;Lnone/aes;Lnone/aes;)Z + ARG 0 recipe + ARG 1 firstBuyItem + ARG 2 secondBuyItem + METHOD c onCrafted (Lnone/aes;)V + ARG 0 stack diff --git a/mappings/net/minecraft/enchantment/EnchantmentHelper.mapping b/mappings/net/minecraft/enchantment/EnchantmentHelper.mapping index 51ce6ccf5a..a6209e2bd5 100644 --- a/mappings/net/minecraft/enchantment/EnchantmentHelper.mapping +++ b/mappings/net/minecraft/enchantment/EnchantmentHelper.mapping @@ -3,6 +3,11 @@ CLASS none/ahq net/minecraft/enchantment/EnchantmentHelper METHOD a setEnchantments (Ljava/util/Map;Lnone/aes;)V ARG 0 enchantmentMap ARG 1 stack + METHOD a (Ljava/util/Random;IILnone/aes;)I + ARG 0 rand + ARG 1 num + ARG 2 enchantmentPower + ARG 3 rstack METHOD a getEnchantments (Lnone/aes;)Ljava/util/Map; ARG 0 stack METHOD a getLevel (Lnone/aho;Lnone/aes;)I @@ -13,6 +18,9 @@ CLASS none/ahq net/minecraft/enchantment/EnchantmentHelper ARG 1 entity METHOD a getKnockback (Lnone/sp;)I ARG 0 entity + METHOD b (Lnone/aho;Lnone/sp;)Lnone/aes; + ARG 0 enchantment + ARG 1 entity METHOD b getFireAspect (Lnone/sp;)I ARG 0 entity METHOD c getRespiration (Lnone/sp;)I diff --git a/mappings/net/minecraft/entity/ai/interact/AIVillagerInteractWithOther.mapping b/mappings/net/minecraft/entity/ai/interact/AIVillagerInteractWithOther.mapping new file mode 100644 index 0000000000..05bf2bdd13 --- /dev/null +++ b/mappings/net/minecraft/entity/ai/interact/AIVillagerInteractWithOther.mapping @@ -0,0 +1,7 @@ +CLASS none/vh net/minecraft/entity/ai/interact/AIVillagerInteractWithOther + FIELD e delay I + FIELD f villager Lnone/aah; + METHOD (Lnone/aah;)V + ARG 0 villager + METHOD c start ()V + METHOD e tick ()V diff --git a/mappings/net/minecraft/entity/passive/EntityVillager.mapping b/mappings/net/minecraft/entity/passive/EntityVillager.mapping index 33e18b4202..b243185ad3 100644 --- a/mappings/net/minecraft/entity/passive/EntityVillager.mapping +++ b/mappings/net/minecraft/entity/passive/EntityVillager.mapping @@ -4,8 +4,14 @@ CLASS none/aah net/minecraft/entity/passive/EntityVillager ARG 0 handler ARG 1 tag ARG 2 version + FIELD bE recipeLIst Lnone/aij; + FIELD bO inventory Lnone/rk; + FIELD bx properties Lnone/wg; FIELD by LOGGER Lorg/apache/logging/log4j/Logger; FIELD bz VILLAGER_TYPE Lnone/kj; + METHOD (Lnone/aiw;I)V + ARG 0 world + ARG 1 type METHOD G getSoundAmbient ()Lnone/nk; METHOD J getLootTableId ()Lnone/kp; METHOD M mobTick ()V @@ -14,6 +20,12 @@ CLASS none/aah net/minecraft/entity/passive/EntityVillager METHOD a interactMob (Lnone/aam;Lnone/rb;)Z ARG 0 player ARG 1 playerHand + METHOD a onSellingItem (Lnone/aes;)V + ARG 0 stack + METHOD a useRecipe (Lnone/aii;)V + ARG 0 recipe + METHOD a setRecipeLIst (Lnone/aij;)V + ARG 0 recipeLIst METHOD a deserializeCustomData (Lnone/dt;)V ARG 0 tag METHOD a onDeath (Lnone/rr;)V @@ -22,6 +34,8 @@ CLASS none/aah net/minecraft/entity/passive/EntityVillager ARG 0 other METHOD a onStruckByLightning (Lnone/yx;)V ARG 0 lightning + METHOD a_ setPlayer (Lnone/aam;)V + ARG 0 player METHOD b serializeCustomData (Lnone/dt;)V ARG 0 tag METHOD b registerTagUpgraders (Lnone/pf;)V @@ -31,9 +45,13 @@ CLASS none/aah net/minecraft/entity/passive/EntityVillager METHOD bD initAttributes ()V METHOD bV getSoundHurt ()Lnone/nk; METHOD bW getSoundDeath ()Lnone/nk; + METHOD b_ getRecipes (Lnone/aam;)Lnone/aij; + ARG 0 player METHOD bq getEyeHeight ()F METHOD de getVillagerType ()I + METHOD dj getInventory ()Lnone/rk; METHOD g setVillagerType (I)V ARG 0 value METHOD i initDataTracker ()V - METHOD i_ getNameComponent ()Lnone/fa; + METHOD i_ getDisplayName ()Lnone/fa; + METHOD s_ getPlayer ()Lnone/aam; diff --git a/mappings/net/minecraft/entity/player/EntityPlayer.mapping b/mappings/net/minecraft/entity/player/EntityPlayer.mapping index b30eb2691d..cbb8c04bd6 100644 --- a/mappings/net/minecraft/entity/player/EntityPlayer.mapping +++ b/mappings/net/minecraft/entity/player/EntityPlayer.mapping @@ -141,6 +141,7 @@ CLASS none/aam net/minecraft/entity/player/EntityPlayer METHOD cS getSleepTimer ()I METHOD cT getSpawnPosition ()Lnone/cn; METHOD cU isSpawnForced ()Z + METHOD cV getXpSeed ()I METHOD cX getHungerManager ()Lnone/abv; METHOD cZ canModifyWorld ()Z METHOD cq isSleeping ()Z diff --git a/mappings/net/minecraft/gui/CreativeTab.mapping b/mappings/net/minecraft/gui/CreativeTab.mapping index 2ed1753d1f..e876e11b7d 100644 --- a/mappings/net/minecraft/gui/CreativeTab.mapping +++ b/mappings/net/minecraft/gui/CreativeTab.mapping @@ -40,6 +40,7 @@ CLASS none/ads net/minecraft/gui/CreativeTab FIELD n id I FIELD o unlocalizedName Ljava/lang/String; FIELD p texture Ljava/lang/String; + FIELD q useScrollBar Z FIELD r tooltip Z FIELD s enchantmentTypes [Lnone/ahp; FIELD t stack Lnone/aes; @@ -66,6 +67,8 @@ CLASS none/ads net/minecraft/gui/CreativeTab METHOD g getTexture ()Ljava/lang/String; METHOD h hasTooltip ()Z METHOD i disableTooltip ()Lnone/ads; + METHOD j useScrollBar ()Z + METHOD k notUseScrollBar ()Lnone/ads; METHOD l getColumn ()I METHOD m isTopRow ()Z METHOD n getEnchantmentTypes ()[Lnone/ahp; diff --git a/mappings/net/minecraft/villager/IVillager.mapping b/mappings/net/minecraft/villager/IVillager.mapping new file mode 100644 index 0000000000..d60df7c5ad --- /dev/null +++ b/mappings/net/minecraft/villager/IVillager.mapping @@ -0,0 +1,13 @@ +CLASS none/aih net/minecraft/villager/IVillager + METHOD a onSellingItem (Lnone/aes;)V + ARG 0 stack + METHOD a useRecipe (Lnone/aii;)V + ARG 0 recipe + METHOD a setRecipeLIst (Lnone/aij;)V + ARG 0 recipeLIst + METHOD a_ setPlayer (Lnone/aam;)V + ARG 0 player + METHOD b_ getRecipes (Lnone/aam;)Lnone/aij; + ARG 0 player + METHOD i_ getDisplayName ()Lnone/fa; + METHOD s_ getPlayer ()Lnone/aam; diff --git a/mappings/net/minecraft/sortme/VillageDoor.mapping b/mappings/net/minecraft/villager/VillageDoor.mapping similarity index 53% rename from mappings/net/minecraft/sortme/VillageDoor.mapping rename to mappings/net/minecraft/villager/VillageDoor.mapping index f1989d6817..cbb8371c0f 100644 --- a/mappings/net/minecraft/sortme/VillageDoor.mapping +++ b/mappings/net/minecraft/villager/VillageDoor.mapping @@ -1,11 +1,18 @@ -CLASS none/wf net/minecraft/sortme/VillageDoor +CLASS none/wf net/minecraft/villager/VillageDoor FIELD a position Lnone/cn; FIELD c facing Lnone/cu; + METHOD (Lnone/cn;III)V + ARG 0 position METHOD (Lnone/cn;Lnone/cu;I)V ARG 0 position ARG 1 facing + METHOD a getFacing (II)Lnone/cu; METHOD a squaredDistanceTo (Lnone/cn;)I - ARG 0 pos + ARG 0 otherPosition + METHOD b (Lnone/cn;)I + ARG 0 otherPosition + METHOD c (Lnone/cn;)Z + ARG 0 otherPosition METHOD d getPosition ()Lnone/cn; METHOD f insideDirectionX ()I METHOD g insideDirectionY ()I diff --git a/mappings/net/minecraft/sortme/VillageProperties.mapping b/mappings/net/minecraft/villager/VillageProperties.mapping similarity index 94% rename from mappings/net/minecraft/sortme/VillageProperties.mapping rename to mappings/net/minecraft/villager/VillageProperties.mapping index b4aa666523..6bc1f741e5 100644 --- a/mappings/net/minecraft/sortme/VillageProperties.mapping +++ b/mappings/net/minecraft/villager/VillageProperties.mapping @@ -1,4 +1,4 @@ -CLASS none/wg net/minecraft/sortme/VillageProperties +CLASS none/wg net/minecraft/villager/VillageProperties FIELD a world Lnone/aiw; FIELD b doors Ljava/util/List; FIELD c doorPositionsAggregate Lnone/cn; diff --git a/mappings/net/minecraft/villager/Villager.mapping b/mappings/net/minecraft/villager/Villager.mapping new file mode 100644 index 0000000000..76bcb92486 --- /dev/null +++ b/mappings/net/minecraft/villager/Villager.mapping @@ -0,0 +1,20 @@ +CLASS none/aaf net/minecraft/villager/Villager + FIELD a villagerInventory Lnone/acp; + FIELD b player Lnone/aam; + FIELD c recipeList Lnone/aij; + FIELD d displayName Lnone/fa; + METHOD (Lnone/aam;Lnone/fa;)V + ARG 0 player + ARG 1 displayName + METHOD a onSellingItem (Lnone/aes;)V + ARG 0 stack + METHOD a useRecipe (Lnone/aii;)V + ARG 0 recipe + METHOD a setRecipeLIst (Lnone/aij;)V + ARG 0 recipeLIst + METHOD a_ setPlayer (Lnone/aam;)V + ARG 0 player + METHOD b_ getRecipes (Lnone/aam;)Lnone/aij; + ARG 0 player + METHOD i_ getDisplayName ()Lnone/fa; + METHOD s_ getPlayer ()Lnone/aam; diff --git a/mappings/net/minecraft/sortme/VillagerInventory.mapping b/mappings/net/minecraft/villager/VillagerInventory.mapping similarity index 72% rename from mappings/net/minecraft/sortme/VillagerInventory.mapping rename to mappings/net/minecraft/villager/VillagerInventory.mapping index c6c474193b..d6fd9fc54e 100644 --- a/mappings/net/minecraft/sortme/VillagerInventory.mapping +++ b/mappings/net/minecraft/villager/VillagerInventory.mapping @@ -1,7 +1,12 @@ -CLASS none/acp net/minecraft/sortme/VillagerInventory +CLASS none/acp net/minecraft/villager/VillagerInventory + FIELD a villager Lnone/aih; + FIELD b inventory Lnone/dc; FIELD c player Lnone/aam; + FIELD d villagerRecipe Lnone/aii; + FIELD e recipeIndex I METHOD (Lnone/aam;Lnone/aih;)V ARG 0 player + ARG 1 villager METHOD a getInvStack (I)Lnone/aes; ARG 0 slot METHOD a takeInvStack (II)Lnone/aes; @@ -26,9 +31,15 @@ CLASS none/acp net/minecraft/sortme/VillagerInventory ARG 0 player METHOD c_ getInvProperty (I)I ARG 0 pos + METHOD d setRecipeIndex (I)V + ARG 0 value + METHOD e needRecipeUpdate (I)Z + ARG 0 slot METHOD h getInvPropertyCount ()I METHOD h_ getName ()Ljava/lang/String; + METHOD i updateRecipes ()V METHOD i_ getNameAsComponent ()Lnone/fa; + METHOD j getVillagerRecipe ()Lnone/aii; METHOD m clearInv ()V METHOD n_ hasCustomName ()Z METHOD t_ getInvSize ()I diff --git a/mappings/net/minecraft/villager/VillagerRecipe.mapping b/mappings/net/minecraft/villager/VillagerRecipe.mapping new file mode 100644 index 0000000000..3de904bae8 --- /dev/null +++ b/mappings/net/minecraft/villager/VillagerRecipe.mapping @@ -0,0 +1,40 @@ +CLASS none/aii net/minecraft/villager/VillagerRecipe + FIELD a buyItem Lnone/aes; + FIELD b secondBuyItem Lnone/aes; + FIELD c sellItem Lnone/aes; + FIELD d uses I + FIELD e maxUses I + FIELD f rewardExp Z + METHOD (Lnone/aes;Lnone/aeq;)V + ARG 0 buyItem + ARG 1 sellItem + METHOD (Lnone/aes;Lnone/aes;)V + ARG 0 buyItem + ARG 1 sellItem + METHOD (Lnone/aes;Lnone/aes;Lnone/aes;)V + ARG 0 buyItem + ARG 1 secondBuyItem + ARG 2 sellItem + METHOD (Lnone/aes;Lnone/aes;Lnone/aes;II)V + ARG 0 buyItem + ARG 1 secondBuyItem + ARG 2 sellItem + ARG 3 uses + ARG 4 maxUses + METHOD (Lnone/dt;)V + ARG 0 tag + METHOD a getBuyItem ()Lnone/aes; + METHOD a increasedMaxUses (I)V + ARG 0 uses + METHOD a serialize (Lnone/dt;)V + ARG 0 tag + METHOD b getSecondBuyItem ()Lnone/aes; + METHOD c hasSecondBuyItem ()Z + METHOD d getSellItem ()Lnone/aes; + METHOD e getUses ()I + METHOD f getMaxUses ()I + METHOD g use ()V + METHOD h isDisabled ()Z + METHOD i clearUses ()V + METHOD j getRewardExp ()Z + METHOD k deserialize ()Lnone/dt; diff --git a/mappings/net/minecraft/villager/VillagerRecipeList.mapping b/mappings/net/minecraft/villager/VillagerRecipeList.mapping new file mode 100644 index 0000000000..e84e617e5c --- /dev/null +++ b/mappings/net/minecraft/villager/VillagerRecipeList.mapping @@ -0,0 +1,17 @@ +CLASS none/aij net/minecraft/villager/VillagerRecipeList + METHOD (Lnone/dt;)V + ARG 0 tag + METHOD a deserialize ()Lnone/dt; + METHOD a itemsAreEqual (Lnone/aes;Lnone/aes;)Z + ARG 0 firstItem + ARG 1 secondItem + METHOD a getValidRecipe (Lnone/aes;Lnone/aes;I)Lnone/aii; + ARG 0 firstBuyItem + ARG 1 secondBuyItem + ARG 2 recipeIndex + METHOD a serialize (Lnone/dt;)V + ARG 0 tag + METHOD a writeToBuf (Lnone/es;)V + ARG 0 byteBuf + METHOD b readFromBuf (Lnone/es;)Lnone/aij; + ARG 0 byteBuf diff --git a/mappings/none/acr.mapping b/mappings/none/acr.mapping deleted file mode 100644 index 47a7dba38e..0000000000 --- a/mappings/none/acr.mapping +++ /dev/null @@ -1,5 +0,0 @@ -CLASS none/acr - METHOD a takeStack (I)Lnone/aes; - ARG 0 amount - METHOD a canInsert (Lnone/aes;)Z - ARG 0 stack diff --git a/mappings/none/bmg.mapping b/mappings/none/bmg.mapping index 81e2289590..4024642986 100644 --- a/mappings/none/bmg.mapping +++ b/mappings/none/bmg.mapping @@ -5,6 +5,12 @@ CLASS none/bmg METHOD (Lnone/bdr;Lnone/bmf;)V ARG 0 game ARG 1 networkHandler + METHOD a (IIILnone/acb;Lnone/aam;)Lnone/aes; + ARG 0 guiId + ARG 1 invSlot + ARG 2 button + ARG 3 actionType + ARG 4 player METHOD a setCurrentGameMode (Lnone/aiu;)V ARG 0 value METHOD h isCreativeMode ()Z diff --git a/mappings/none/vh.mapping b/mappings/none/vh.mapping deleted file mode 100644 index 22897f308e..0000000000 --- a/mappings/none/vh.mapping +++ /dev/null @@ -1,3 +0,0 @@ -CLASS none/vh - METHOD c start ()V - METHOD e tick ()V From a3585a38e0434af16495939c54e672efe0268cf9 Mon Sep 17 00:00:00 2001 From: Nedelosk Date: Tue, 18 Oct 2016 00:57:42 +0200 Subject: [PATCH 3/8] Update Mappings --- mappings/net/minecraft/block/Block.mapping | 4 ++-- mappings/net/minecraft/block/BlockBrewingStand.mapping | 4 ++-- mappings/net/minecraft/block/BlockCake.mapping | 4 ++-- mappings/net/minecraft/block/BlockCauldron.mapping | 4 ++-- mappings/net/minecraft/block/BlockChest.mapping | 4 ++-- mappings/net/minecraft/block/BlockCommand.mapping | 4 ++-- mappings/net/minecraft/block/BlockDispenser.mapping | 4 ++-- .../net/minecraft/block/BlockEndPortalFrame.mapping | 4 ++-- mappings/net/minecraft/block/BlockFurnace.mapping | 4 ++-- mappings/net/minecraft/block/BlockHopper.mapping | 4 ++-- mappings/net/minecraft/block/BlockJukebox.mapping | 4 ++-- mappings/net/minecraft/block/BlockRailDetector.mapping | 4 ++-- .../client/gui/ingame/GuiCreativeInventory.mapping | 4 ++-- .../minecraft/client/render/item/ItemRenderer.mapping | 8 ++++---- mappings/net/minecraft/container/Container.mapping | 10 ++++------ .../net/minecraft/container/ContainerAnvil.mapping | 2 +- mappings/net/minecraft/container/slot/Slot.mapping | 4 ++-- .../minecraft/entity/passive/EntityVillager.mapping | 10 +++++----- mappings/net/minecraft/villager/IVillager.mapping | 8 ++++---- .../{Villager.mapping => SimpleVillager.mapping} | 10 +++++----- 20 files changed, 51 insertions(+), 53 deletions(-) rename mappings/net/minecraft/villager/{Villager.mapping => SimpleVillager.mapping} (67%) diff --git a/mappings/net/minecraft/block/Block.mapping b/mappings/net/minecraft/block/Block.mapping index d79197e1cb..bd7848e3f5 100644 --- a/mappings/net/minecraft/block/Block.mapping +++ b/mappings/net/minecraft/block/Block.mapping @@ -300,7 +300,7 @@ CLASS none/aky net/minecraft/block/Block ARG 2 state METHOD c (Lnone/asm;)Z ARG 0 state - METHOD c getComparatorInput (Lnone/asm;Lnone/aiw;Lnone/cn;)I + METHOD c getComparatorOutput (Lnone/asm;Lnone/aiw;Lnone/cn;)I ARG 0 state ARG 1 world ARG 2 pos @@ -375,7 +375,7 @@ CLASS none/aky net/minecraft/block/Block METHOD u getStackFromState (Lnone/asm;)Lnone/aes; ARG 0 state METHOD v getOffsetType ()Lnone/aky$a; - METHOD v hasComparatorInput (Lnone/asm;)Z + METHOD v hasComparatorOutput (Lnone/asm;)Z ARG 0 state METHOD w getSoundGroup ()Lnone/apw; METHOD w setDefaultState (Lnone/asm;)V diff --git a/mappings/net/minecraft/block/BlockBrewingStand.mapping b/mappings/net/minecraft/block/BlockBrewingStand.mapping index 6005a40e2a..4f63d96fb5 100644 --- a/mappings/net/minecraft/block/BlockBrewingStand.mapping +++ b/mappings/net/minecraft/block/BlockBrewingStand.mapping @@ -59,12 +59,12 @@ CLASS none/ald net/minecraft/block/BlockBrewingStand METHOD c getTranslatedName ()Ljava/lang/String; METHOD c (Lnone/asm;)Z ARG 0 state - METHOD c getComparatorInput (Lnone/asm;Lnone/aiw;Lnone/cn;)I + METHOD c getComparatorOutput (Lnone/asm;Lnone/aiw;Lnone/cn;)I ARG 0 state ARG 1 world ARG 2 pos METHOD e serializeState (Lnone/asm;)I ARG 0 state METHOD f getRenderLayer ()Lnone/aio; - METHOD v hasComparatorInput (Lnone/asm;)Z + METHOD v hasComparatorOutput (Lnone/asm;)Z ARG 0 state diff --git a/mappings/net/minecraft/block/BlockCake.mapping b/mappings/net/minecraft/block/BlockCake.mapping index 48f9c7caf4..5316fd45f0 100644 --- a/mappings/net/minecraft/block/BlockCake.mapping +++ b/mappings/net/minecraft/block/BlockCake.mapping @@ -48,12 +48,12 @@ CLASS none/alh net/minecraft/block/BlockCake ARG 2 pos METHOD c (Lnone/asm;)Z ARG 0 state - METHOD c getComparatorInput (Lnone/asm;Lnone/aiw;Lnone/cn;)I + METHOD c getComparatorOutput (Lnone/asm;Lnone/aiw;Lnone/cn;)I ARG 0 state ARG 1 world ARG 2 pos METHOD e serializeState (Lnone/asm;)I ARG 0 state METHOD f getRenderLayer ()Lnone/aio; - METHOD v hasComparatorInput (Lnone/asm;)Z + METHOD v hasComparatorOutput (Lnone/asm;)Z ARG 0 state diff --git a/mappings/net/minecraft/block/BlockCauldron.mapping b/mappings/net/minecraft/block/BlockCauldron.mapping index 31cd37f092..316ccccaf1 100644 --- a/mappings/net/minecraft/block/BlockCauldron.mapping +++ b/mappings/net/minecraft/block/BlockCauldron.mapping @@ -53,7 +53,7 @@ CLASS none/alj net/minecraft/block/BlockCauldron ARG 2 pos METHOD c (Lnone/asm;)Z ARG 0 state - METHOD c getComparatorInput (Lnone/asm;Lnone/aiw;Lnone/cn;)I + METHOD c getComparatorOutput (Lnone/asm;Lnone/aiw;Lnone/cn;)I ARG 0 state ARG 1 world ARG 2 pos @@ -62,5 +62,5 @@ CLASS none/alj net/minecraft/block/BlockCauldron METHOD h (Lnone/aiw;Lnone/cn;)V ARG 0 world ARG 1 pos - METHOD v hasComparatorInput (Lnone/asm;)Z + METHOD v hasComparatorOutput (Lnone/asm;)Z ARG 0 state diff --git a/mappings/net/minecraft/block/BlockChest.mapping b/mappings/net/minecraft/block/BlockChest.mapping index d76c02c3ba..6f4d38fe54 100644 --- a/mappings/net/minecraft/block/BlockChest.mapping +++ b/mappings/net/minecraft/block/BlockChest.mapping @@ -79,7 +79,7 @@ CLASS none/alk net/minecraft/block/BlockChest ARG 2 state METHOD c (Lnone/asm;)Z ARG 0 state - METHOD c getComparatorInput (Lnone/asm;Lnone/aiw;Lnone/cn;)I + METHOD c getComparatorOutput (Lnone/asm;Lnone/aiw;Lnone/cn;)I ARG 0 state ARG 1 world ARG 2 pos @@ -92,5 +92,5 @@ CLASS none/alk net/minecraft/block/BlockChest ARG 0 state METHOD g emitsRedstonePower (Lnone/asm;)Z ARG 0 state - METHOD v hasComparatorInput (Lnone/asm;)Z + METHOD v hasComparatorOutput (Lnone/asm;)Z ARG 0 state diff --git a/mappings/net/minecraft/block/BlockCommand.mapping b/mappings/net/minecraft/block/BlockCommand.mapping index 69af9bae96..36df2c7e42 100644 --- a/mappings/net/minecraft/block/BlockCommand.mapping +++ b/mappings/net/minecraft/block/BlockCommand.mapping @@ -56,7 +56,7 @@ CLASS none/alq net/minecraft/block/BlockCommand ARG 1 pos ARG 2 state ARG 3 random - METHOD c getComparatorInput (Lnone/asm;Lnone/aiw;Lnone/cn;)I + METHOD c getComparatorOutput (Lnone/asm;Lnone/aiw;Lnone/cn;)I ARG 0 state ARG 1 world ARG 2 pos @@ -66,5 +66,5 @@ CLASS none/alq net/minecraft/block/BlockCommand ARG 2 state METHOD e serializeState (Lnone/asm;)I ARG 0 state - METHOD v hasComparatorInput (Lnone/asm;)Z + METHOD v hasComparatorOutput (Lnone/asm;)Z ARG 0 state diff --git a/mappings/net/minecraft/block/BlockDispenser.mapping b/mappings/net/minecraft/block/BlockDispenser.mapping index 564ef0cc2e..99cdfb7e33 100644 --- a/mappings/net/minecraft/block/BlockDispenser.mapping +++ b/mappings/net/minecraft/block/BlockDispenser.mapping @@ -66,11 +66,11 @@ CLASS none/ama net/minecraft/block/BlockDispenser ARG 0 world ARG 1 pos ARG 2 state - METHOD c getComparatorInput (Lnone/asm;Lnone/aiw;Lnone/cn;)I + METHOD c getComparatorOutput (Lnone/asm;Lnone/aiw;Lnone/cn;)I ARG 0 state ARG 1 world ARG 2 pos METHOD e serializeState (Lnone/asm;)I ARG 0 state - METHOD v hasComparatorInput (Lnone/asm;)Z + METHOD v hasComparatorOutput (Lnone/asm;)Z ARG 0 state diff --git a/mappings/net/minecraft/block/BlockEndPortalFrame.mapping b/mappings/net/minecraft/block/BlockEndPortalFrame.mapping index ed1cdb821e..be8a02db9c 100644 --- a/mappings/net/minecraft/block/BlockEndPortalFrame.mapping +++ b/mappings/net/minecraft/block/BlockEndPortalFrame.mapping @@ -41,12 +41,12 @@ CLASS none/amj net/minecraft/block/BlockEndPortalFrame ARG 2 pos METHOD c (Lnone/asm;)Z ARG 0 state - METHOD c getComparatorInput (Lnone/asm;Lnone/aiw;Lnone/cn;)I + METHOD c getComparatorOutput (Lnone/asm;Lnone/aiw;Lnone/cn;)I ARG 0 state ARG 1 world ARG 2 pos METHOD e getCompletedFramePattern ()Lnone/asq; METHOD e serializeState (Lnone/asm;)I ARG 0 state - METHOD v hasComparatorInput (Lnone/asm;)Z + METHOD v hasComparatorOutput (Lnone/asm;)Z ARG 0 state diff --git a/mappings/net/minecraft/block/BlockFurnace.mapping b/mappings/net/minecraft/block/BlockFurnace.mapping index 992eda0e57..bed50e688d 100644 --- a/mappings/net/minecraft/block/BlockFurnace.mapping +++ b/mappings/net/minecraft/block/BlockFurnace.mapping @@ -60,11 +60,11 @@ CLASS none/amy net/minecraft/block/BlockFurnace ARG 0 world ARG 1 pos ARG 2 state - METHOD c getComparatorInput (Lnone/asm;Lnone/aiw;Lnone/cn;)I + METHOD c getComparatorOutput (Lnone/asm;Lnone/aiw;Lnone/cn;)I ARG 0 state ARG 1 world ARG 2 pos METHOD e serializeState (Lnone/asm;)I ARG 0 state - METHOD v hasComparatorInput (Lnone/asm;)Z + METHOD v hasComparatorOutput (Lnone/asm;)Z ARG 0 state diff --git a/mappings/net/minecraft/block/BlockHopper.mapping b/mappings/net/minecraft/block/BlockHopper.mapping index 055ef8ceb3..ffed1c3954 100644 --- a/mappings/net/minecraft/block/BlockHopper.mapping +++ b/mappings/net/minecraft/block/BlockHopper.mapping @@ -78,7 +78,7 @@ CLASS none/anl net/minecraft/block/BlockHopper ARG 2 state METHOD c (Lnone/asm;)Z ARG 0 state - METHOD c getComparatorInput (Lnone/asm;Lnone/aiw;Lnone/cn;)I + METHOD c getComparatorOutput (Lnone/asm;Lnone/aiw;Lnone/cn;)I ARG 0 state ARG 1 world ARG 2 pos @@ -91,5 +91,5 @@ CLASS none/anl net/minecraft/block/BlockHopper ARG 0 meta METHOD k isOpaqueFullBoundsCube (Lnone/asm;)Z ARG 0 state - METHOD v hasComparatorInput (Lnone/asm;)Z + METHOD v hasComparatorOutput (Lnone/asm;)Z ARG 0 state diff --git a/mappings/net/minecraft/block/BlockJukebox.mapping b/mappings/net/minecraft/block/BlockJukebox.mapping index 037e41ca6c..42409ab0e2 100644 --- a/mappings/net/minecraft/block/BlockJukebox.mapping +++ b/mappings/net/minecraft/block/BlockJukebox.mapping @@ -44,12 +44,12 @@ CLASS none/anp net/minecraft/block/BlockJukebox ARG 0 world ARG 1 pos ARG 2 state - METHOD c getComparatorInput (Lnone/asm;Lnone/aiw;Lnone/cn;)I + METHOD c getComparatorOutput (Lnone/asm;Lnone/aiw;Lnone/cn;)I ARG 0 state ARG 1 world ARG 2 pos METHOD e removeRecord (Lnone/aiw;Lnone/cn;Lnone/asm;)V METHOD e serializeState (Lnone/asm;)I ARG 0 state - METHOD v hasComparatorInput (Lnone/asm;)Z + METHOD v hasComparatorOutput (Lnone/asm;)Z ARG 0 state diff --git a/mappings/net/minecraft/block/BlockRailDetector.mapping b/mappings/net/minecraft/block/BlockRailDetector.mapping index b4737b30c2..79b30fa181 100644 --- a/mappings/net/minecraft/block/BlockRailDetector.mapping +++ b/mappings/net/minecraft/block/BlockRailDetector.mapping @@ -36,7 +36,7 @@ CLASS none/alw net/minecraft/block/BlockRailDetector ARG 0 world ARG 1 pos ARG 2 state - METHOD c getComparatorInput (Lnone/asm;Lnone/aiw;Lnone/cn;)I + METHOD c getComparatorOutput (Lnone/asm;Lnone/aiw;Lnone/cn;)I ARG 0 state ARG 1 world ARG 2 pos @@ -50,5 +50,5 @@ CLASS none/alw net/minecraft/block/BlockRailDetector METHOD g getShapeProperty ()Lnone/atc; METHOD g emitsRedstonePower (Lnone/asm;)Z ARG 0 state - METHOD v hasComparatorInput (Lnone/asm;)Z + METHOD v hasComparatorOutput (Lnone/asm;)Z ARG 0 state diff --git a/mappings/net/minecraft/client/gui/ingame/GuiCreativeInventory.mapping b/mappings/net/minecraft/client/gui/ingame/GuiCreativeInventory.mapping index bb66d625f9..02adc40c67 100644 --- a/mappings/net/minecraft/client/gui/ingame/GuiCreativeInventory.mapping +++ b/mappings/net/minecraft/client/gui/ingame/GuiCreativeInventory.mapping @@ -24,14 +24,14 @@ CLASS none/bho net/minecraft/client/gui/ingame/GuiCreativeInventory METHOD a getMaxStackAmount ()I METHOD a takeStack (I)Lnone/aes; ARG 0 amount - METHOD a canTakeItem (Lnone/aam;)Z + METHOD a canTakeItems (Lnone/aam;)Z ARG 0 player METHOD a onTakeItem (Lnone/aam;Lnone/aes;)Lnone/aes; ARG 0 player ARG 1 stack METHOD a canInsert (Lnone/aes;)Z ARG 0 stack - METHOD a onContentChanged (Lnone/aes;Lnone/aes;)V + METHOD a onStackChanged (Lnone/aes;Lnone/aes;)V ARG 0 originalItem ARG 1 newItem METHOD a matches (Lnone/qv;I)Z diff --git a/mappings/net/minecraft/client/render/item/ItemRenderer.mapping b/mappings/net/minecraft/client/render/item/ItemRenderer.mapping index 4362ff25cb..3b4dccfb89 100644 --- a/mappings/net/minecraft/client/render/item/ItemRenderer.mapping +++ b/mappings/net/minecraft/client/render/item/ItemRenderer.mapping @@ -81,12 +81,12 @@ CLASS none/btr net/minecraft/client/render/item/ItemRenderer METHOD a registerItemModel (Lnone/aky;Ljava/lang/String;)V ARG 0 block ARG 1 modelId - METHOD a renderItemAmountAndDamageInGUIWithoutText (Lnone/bef;Lnone/aes;II)V + METHOD a renderItemOverlaysInGUI (Lnone/bef;Lnone/aes;II)V ARG 0 fontRenderer ARG 1 stack ARG 2 x ARG 3 y - METHOD a renderItemAmountAndDamageInGUI (Lnone/bef;Lnone/aes;IILjava/lang/String;)V + METHOD a renderItemOverlaysInGUIWithText (Lnone/bef;Lnone/aes;IILjava/lang/String;)V ARG 0 fontRenderer ARG 1 stack ARG 2 x @@ -102,7 +102,7 @@ CLASS none/btr net/minecraft/client/render/item/ItemRenderer ARG 6 green ARG 7 blue ARG 8 alpha - METHOD a renderItemModelWithColor (Lnone/bon;Ljava/util/List;ILnone/aes;)V + METHOD a renderModelColored (Lnone/bon;Ljava/util/List;ILnone/aes;)V ARG 0 buffer ARG 1 quads ARG 2 color @@ -110,7 +110,7 @@ CLASS none/btr net/minecraft/client/render/item/ItemRenderer METHOD a renderQuad (Lnone/bon;Lnone/bps;)V ARG 0 buffer ARG 1 quad - METHOD a renderColoredQuad (Lnone/bon;Lnone/bps;I)V + METHOD a renderQuadColored (Lnone/bon;Lnone/bps;I)V ARG 0 buffer ARG 1 model ARG 2 colorIndex diff --git a/mappings/net/minecraft/container/Container.mapping b/mappings/net/minecraft/container/Container.mapping index 3ef303eda3..991bb978a3 100644 --- a/mappings/net/minecraft/container/Container.mapping +++ b/mappings/net/minecraft/container/Container.mapping @@ -4,7 +4,6 @@ CLASS none/abx net/minecraft/container/Container FIELD c slotList Ljava/util/List; FIELD d guiId I FIELD e listeners Ljava/util/List; - FIELD i playersWithNPermission Ljava/util/Set; METHOD a getStacks ()Lnone/dc; METHOD a getSlot (I)Lnone/acv; ARG 0 slot @@ -36,9 +35,8 @@ CLASS none/abx net/minecraft/container/Container METHOD a onButtonClick (Lnone/aam;I)Z ARG 0 player ARG 1 buttonId - METHOD a givePlayerPermission (Lnone/aam;Z)V + METHOD a (Lnone/aam;Z)V ARG 0 player - ARG 1 allowPlayerToUse METHOD a addListener (Lnone/acc;)V ARG 0 listener METHOD a addSlot (Lnone/acv;)Lnone/acv; @@ -53,7 +51,7 @@ CLASS none/abx net/minecraft/container/Container METHOD a (Lnone/aes;Lnone/acv;)Z ARG 0 stack ARG 1 slot - METHOD a calculateComparatorInput (Lnone/are;)I + METHOD a calculateComparatorOutput (Lnone/are;)I ARG 0 entity METHOD a onContentChanged (Lnone/qv;)V ARG 0 inventoy @@ -73,7 +71,7 @@ CLASS none/abx net/minecraft/container/Container ARG 0 listener METHOD b (Lnone/acv;)Z ARG 0 slot - METHOD b calculateComparatorInput (Lnone/qv;)I + METHOD b calculateComparatorOutput (Lnone/qv;)I ARG 0 inventory - METHOD c hasPlayerPermission (Lnone/aam;)Z + METHOD c (Lnone/aam;)Z ARG 0 player diff --git a/mappings/net/minecraft/container/ContainerAnvil.mapping b/mappings/net/minecraft/container/ContainerAnvil.mapping index 7b3a457775..98474d00d2 100644 --- a/mappings/net/minecraft/container/ContainerAnvil.mapping +++ b/mappings/net/minecraft/container/ContainerAnvil.mapping @@ -2,7 +2,7 @@ CLASS none/aby net/minecraft/container/ContainerAnvil CLASS none/aby$1 METHOD v_ markDirty ()V CLASS none/aby$2 - METHOD a canTakeItem (Lnone/aam;)Z + METHOD a canTakeItems (Lnone/aam;)Z ARG 0 player METHOD a onTakeItem (Lnone/aam;Lnone/aes;)Lnone/aes; ARG 0 player diff --git a/mappings/net/minecraft/container/slot/Slot.mapping b/mappings/net/minecraft/container/slot/Slot.mapping index 111918e04a..aabef9f7df 100644 --- a/mappings/net/minecraft/container/slot/Slot.mapping +++ b/mappings/net/minecraft/container/slot/Slot.mapping @@ -12,7 +12,7 @@ CLASS none/acv net/minecraft/container/slot/Slot METHOD a getMaxStackAmount ()I METHOD a takeStack (I)Lnone/aes; ARG 0 amount - METHOD a canTakeItem (Lnone/aam;)Z + METHOD a canTakeItems (Lnone/aam;)Z ARG 0 player METHOD a onTakeItem (Lnone/aam;Lnone/aes;)Lnone/aes; ARG 0 player @@ -22,7 +22,7 @@ CLASS none/acv net/minecraft/container/slot/Slot METHOD a onCrafted (Lnone/aes;I)V ARG 0 stack ARG 1 amount - METHOD a onContentChanged (Lnone/aes;Lnone/aes;)V + METHOD a onStackChanged (Lnone/aes;Lnone/aes;)V ARG 0 originalItem ARG 1 newItem METHOD a matches (Lnone/qv;I)Z diff --git a/mappings/net/minecraft/entity/passive/EntityVillager.mapping b/mappings/net/minecraft/entity/passive/EntityVillager.mapping index b243185ad3..8e8b03e27d 100644 --- a/mappings/net/minecraft/entity/passive/EntityVillager.mapping +++ b/mappings/net/minecraft/entity/passive/EntityVillager.mapping @@ -4,7 +4,7 @@ CLASS none/aah net/minecraft/entity/passive/EntityVillager ARG 0 handler ARG 1 tag ARG 2 version - FIELD bE recipeLIst Lnone/aij; + FIELD bE recipeList Lnone/aij; FIELD bO inventory Lnone/rk; FIELD bx properties Lnone/wg; FIELD by LOGGER Lorg/apache/logging/log4j/Logger; @@ -24,7 +24,7 @@ CLASS none/aah net/minecraft/entity/passive/EntityVillager ARG 0 stack METHOD a useRecipe (Lnone/aii;)V ARG 0 recipe - METHOD a setRecipeLIst (Lnone/aij;)V + METHOD a setRecipeList (Lnone/aij;)V ARG 0 recipeLIst METHOD a deserializeCustomData (Lnone/dt;)V ARG 0 tag @@ -34,8 +34,8 @@ CLASS none/aah net/minecraft/entity/passive/EntityVillager ARG 0 other METHOD a onStruckByLightning (Lnone/yx;)V ARG 0 lightning - METHOD a_ setPlayer (Lnone/aam;)V - ARG 0 player + METHOD a_ setCurrentCustomer (Lnone/aam;)V + ARG 0 currentCustomer METHOD b serializeCustomData (Lnone/dt;)V ARG 0 tag METHOD b registerTagUpgraders (Lnone/pf;)V @@ -54,4 +54,4 @@ CLASS none/aah net/minecraft/entity/passive/EntityVillager ARG 0 value METHOD i initDataTracker ()V METHOD i_ getDisplayName ()Lnone/fa; - METHOD s_ getPlayer ()Lnone/aam; + METHOD s_ getCurrentCustomer ()Lnone/aam; diff --git a/mappings/net/minecraft/villager/IVillager.mapping b/mappings/net/minecraft/villager/IVillager.mapping index d60df7c5ad..ae425ee4e5 100644 --- a/mappings/net/minecraft/villager/IVillager.mapping +++ b/mappings/net/minecraft/villager/IVillager.mapping @@ -3,11 +3,11 @@ CLASS none/aih net/minecraft/villager/IVillager ARG 0 stack METHOD a useRecipe (Lnone/aii;)V ARG 0 recipe - METHOD a setRecipeLIst (Lnone/aij;)V + METHOD a setRecipeList (Lnone/aij;)V ARG 0 recipeLIst - METHOD a_ setPlayer (Lnone/aam;)V - ARG 0 player + METHOD a_ setCurrentCustomer (Lnone/aam;)V + ARG 0 currentCustomer METHOD b_ getRecipes (Lnone/aam;)Lnone/aij; ARG 0 player METHOD i_ getDisplayName ()Lnone/fa; - METHOD s_ getPlayer ()Lnone/aam; + METHOD s_ getCurrentCustomer ()Lnone/aam; diff --git a/mappings/net/minecraft/villager/Villager.mapping b/mappings/net/minecraft/villager/SimpleVillager.mapping similarity index 67% rename from mappings/net/minecraft/villager/Villager.mapping rename to mappings/net/minecraft/villager/SimpleVillager.mapping index 76bcb92486..cebf2750bb 100644 --- a/mappings/net/minecraft/villager/Villager.mapping +++ b/mappings/net/minecraft/villager/SimpleVillager.mapping @@ -1,4 +1,4 @@ -CLASS none/aaf net/minecraft/villager/Villager +CLASS none/aaf net/minecraft/villager/SimpleVillager FIELD a villagerInventory Lnone/acp; FIELD b player Lnone/aam; FIELD c recipeList Lnone/aij; @@ -10,11 +10,11 @@ CLASS none/aaf net/minecraft/villager/Villager ARG 0 stack METHOD a useRecipe (Lnone/aii;)V ARG 0 recipe - METHOD a setRecipeLIst (Lnone/aij;)V + METHOD a setRecipeList (Lnone/aij;)V ARG 0 recipeLIst - METHOD a_ setPlayer (Lnone/aam;)V - ARG 0 player + METHOD a_ setCurrentCustomer (Lnone/aam;)V + ARG 0 currentCustomer METHOD b_ getRecipes (Lnone/aam;)Lnone/aij; ARG 0 player METHOD i_ getDisplayName ()Lnone/fa; - METHOD s_ getPlayer ()Lnone/aam; + METHOD s_ getCurrentCustomer ()Lnone/aam; From 8a818cffc3bb6f32c323f23fe41f934031ef62c9 Mon Sep 17 00:00:00 2001 From: Nedelosk Date: Tue, 18 Oct 2016 01:02:31 +0200 Subject: [PATCH 4/8] Fix three mappings --- .../net/minecraft/client/render/item/ItemRenderer.mapping | 4 ++-- mappings/net/minecraft/gui/CreativeTab.mapping | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/mappings/net/minecraft/client/render/item/ItemRenderer.mapping b/mappings/net/minecraft/client/render/item/ItemRenderer.mapping index 3b4dccfb89..4f7dd7e6e5 100644 --- a/mappings/net/minecraft/client/render/item/ItemRenderer.mapping +++ b/mappings/net/minecraft/client/render/item/ItemRenderer.mapping @@ -120,10 +120,10 @@ CLASS none/btr net/minecraft/client/render/item/ItemRenderer ARG 0 container METHOD a renderEnchantmentGlow (Lnone/bzm;)V ARG 0 model - METHOD a renderModelWithColor (Lnone/bzm;I)V + METHOD a renderModelColored (Lnone/bzm;I)V ARG 0 model ARG 1 color - METHOD a renderModelWithColor (Lnone/bzm;ILnone/aes;)V + METHOD a renderItemModelColored (Lnone/bzm;ILnone/aes;)V ARG 0 model ARG 1 color ARG 2 stack diff --git a/mappings/net/minecraft/gui/CreativeTab.mapping b/mappings/net/minecraft/gui/CreativeTab.mapping index e876e11b7d..a55d3e477a 100644 --- a/mappings/net/minecraft/gui/CreativeTab.mapping +++ b/mappings/net/minecraft/gui/CreativeTab.mapping @@ -68,7 +68,7 @@ CLASS none/ads net/minecraft/gui/CreativeTab METHOD h hasTooltip ()Z METHOD i disableTooltip ()Lnone/ads; METHOD j useScrollBar ()Z - METHOD k notUseScrollBar ()Lnone/ads; + METHOD k setNotUseScrollBar ()Lnone/ads; METHOD l getColumn ()I METHOD m isTopRow ()Z METHOD n getEnchantmentTypes ()[Lnone/ahp; From 102d618df604a0c6341c70c00a6b68e3ca18eba9 Mon Sep 17 00:00:00 2001 From: Nedelosk Date: Tue, 18 Oct 2016 01:04:13 +0200 Subject: [PATCH 5/8] Fix inventory ARG --- mappings/net/minecraft/container/Container.mapping | 2 +- mappings/net/minecraft/container/ContainerAnvil.mapping | 2 +- mappings/net/minecraft/container/ContainerCraftingTable.mapping | 2 +- .../net/minecraft/container/ContainerEnchantingTable.mapping | 2 +- mappings/net/minecraft/container/ContainerPlayer.mapping | 2 +- mappings/net/minecraft/container/ContainerVillager.mapping | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/mappings/net/minecraft/container/Container.mapping b/mappings/net/minecraft/container/Container.mapping index 991bb978a3..f88fe482e3 100644 --- a/mappings/net/minecraft/container/Container.mapping +++ b/mappings/net/minecraft/container/Container.mapping @@ -54,7 +54,7 @@ CLASS none/abx net/minecraft/container/Container METHOD a calculateComparatorOutput (Lnone/are;)I ARG 0 entity METHOD a onContentChanged (Lnone/qv;)V - ARG 0 inventoy + ARG 0 inventory METHOD a getMatchingSlot (Lnone/qv;I)Lnone/acv; ARG 0 inv ARG 1 invSlot diff --git a/mappings/net/minecraft/container/ContainerAnvil.mapping b/mappings/net/minecraft/container/ContainerAnvil.mapping index 98474d00d2..2de6d09a21 100644 --- a/mappings/net/minecraft/container/ContainerAnvil.mapping +++ b/mappings/net/minecraft/container/ContainerAnvil.mapping @@ -32,7 +32,7 @@ CLASS none/aby net/minecraft/container/ContainerAnvil METHOD a addListener (Lnone/acc;)V ARG 0 listener METHOD a onContentChanged (Lnone/qv;)V - ARG 0 inventoy + ARG 0 inventory METHOD b setProperty (II)V ARG 0 pos ARG 1 value diff --git a/mappings/net/minecraft/container/ContainerCraftingTable.mapping b/mappings/net/minecraft/container/ContainerCraftingTable.mapping index 184b24ffdd..7d556e2d1b 100644 --- a/mappings/net/minecraft/container/ContainerCraftingTable.mapping +++ b/mappings/net/minecraft/container/ContainerCraftingTable.mapping @@ -13,7 +13,7 @@ CLASS none/acf net/minecraft/container/ContainerCraftingTable ARG 0 stack ARG 1 slot METHOD a onContentChanged (Lnone/qv;)V - ARG 0 inventoy + ARG 0 inventory METHOD b close (Lnone/aam;)V ARG 0 player METHOD b getStack (Lnone/aam;I)Lnone/aes; diff --git a/mappings/net/minecraft/container/ContainerEnchantingTable.mapping b/mappings/net/minecraft/container/ContainerEnchantingTable.mapping index 2825d4a61a..b4c20d3150 100644 --- a/mappings/net/minecraft/container/ContainerEnchantingTable.mapping +++ b/mappings/net/minecraft/container/ContainerEnchantingTable.mapping @@ -34,7 +34,7 @@ CLASS none/ach net/minecraft/container/ContainerEnchantingTable METHOD a (Lnone/aes;II)Ljava/util/List; ARG 0 stack METHOD a onContentChanged (Lnone/qv;)V - ARG 0 inventoy + ARG 0 inventory METHOD b sendContentUpdates ()V METHOD b setProperty (II)V ARG 0 pos diff --git a/mappings/net/minecraft/container/ContainerPlayer.mapping b/mappings/net/minecraft/container/ContainerPlayer.mapping index 392854ed34..a9d2623180 100644 --- a/mappings/net/minecraft/container/ContainerPlayer.mapping +++ b/mappings/net/minecraft/container/ContainerPlayer.mapping @@ -21,7 +21,7 @@ CLASS none/aco net/minecraft/container/ContainerPlayer ARG 0 stack ARG 1 slot METHOD a onContentChanged (Lnone/qv;)V - ARG 0 inventoy + ARG 0 inventory METHOD b close (Lnone/aam;)V ARG 0 player METHOD b getStack (Lnone/aam;I)Lnone/aes; diff --git a/mappings/net/minecraft/container/ContainerVillager.mapping b/mappings/net/minecraft/container/ContainerVillager.mapping index e8fde2f8b9..c677dc124e 100644 --- a/mappings/net/minecraft/container/ContainerVillager.mapping +++ b/mappings/net/minecraft/container/ContainerVillager.mapping @@ -11,7 +11,7 @@ CLASS none/acq net/minecraft/container/ContainerVillager METHOD a addListener (Lnone/acc;)V ARG 0 listener METHOD a onContentChanged (Lnone/qv;)V - ARG 0 inventoy + ARG 0 inventory METHOD b sendContentUpdates ()V METHOD b setProperty (II)V ARG 0 pos From 07e7702f6f1a110a23895fa5b055b2c7807c5e74 Mon Sep 17 00:00:00 2001 From: Nedelosk Date: Tue, 18 Oct 2016 10:53:45 +0200 Subject: [PATCH 6/8] Improve Mappings --- .../ContainerEnchantingTable.mapping | 4 +- .../enchantment/EnchantmentHelper.mapping | 65 ++++++++++++++++++- .../entity/player/EntityPlayer.mapping | 4 +- .../minecraft/item/ItemBookEnchanted.mapping | 8 +++ 4 files changed, 75 insertions(+), 6 deletions(-) diff --git a/mappings/net/minecraft/container/ContainerEnchantingTable.mapping b/mappings/net/minecraft/container/ContainerEnchantingTable.mapping index b4c20d3150..c56601064d 100644 --- a/mappings/net/minecraft/container/ContainerEnchantingTable.mapping +++ b/mappings/net/minecraft/container/ContainerEnchantingTable.mapping @@ -10,7 +10,7 @@ CLASS none/ach net/minecraft/container/ContainerEnchantingTable METHOD a canInsert (Lnone/aes;)Z ARG 0 stack FIELD a inventory Lnone/qv; - FIELD f xpSeed I + FIELD f enchantmentTableSeed I FIELD g experienceLevels [I FIELD h enchantmentIds [I FIELD i enchantmentLevels [I @@ -31,7 +31,7 @@ CLASS none/ach net/minecraft/container/ContainerEnchantingTable ARG 1 buttonId METHOD a addListener (Lnone/acc;)V ARG 0 listener - METHOD a (Lnone/aes;II)Ljava/util/List; + METHOD a getRandomEnchantments (Lnone/aes;II)Ljava/util/List; ARG 0 stack METHOD a onContentChanged (Lnone/qv;)V ARG 0 inventory diff --git a/mappings/net/minecraft/enchantment/EnchantmentHelper.mapping b/mappings/net/minecraft/enchantment/EnchantmentHelper.mapping index a6209e2bd5..dd09fe434d 100644 --- a/mappings/net/minecraft/enchantment/EnchantmentHelper.mapping +++ b/mappings/net/minecraft/enchantment/EnchantmentHelper.mapping @@ -1,28 +1,89 @@ CLASS none/ahq net/minecraft/enchantment/EnchantmentHelper + CLASS none/ahq$a DamageTargetHandler + FIELD a user Lnone/sp; + FIELD b target Lnone/sg; + METHOD a handleEnchantment (Lnone/aho;I)V + ARG 0 enchantment + ARG 1 enchantmentLevel + CLASS none/ahq$b DamageUserHandler + FIELD a user Lnone/sp; + FIELD b attacker Lnone/sg; + METHOD a handleEnchantment (Lnone/aho;I)V + ARG 0 enchantment + ARG 1 enchantmentLevel + CLASS none/ahq$c EnchantmentHandler + METHOD a handleEnchantment (Lnone/aho;I)V + ARG 0 enchantment + ARG 1 enchantmentLevel + CLASS none/ahq$d AdditionalDamgeHandler + FIELD a additionalDamge F + FIELD b entityType Lnone/su; + METHOD a handleEnchantment (Lnone/aho;I)V + ARG 0 enchantment + ARG 1 enchantmentLevel + CLASS none/ahq$e ProtectionHandler + FIELD a protectionAmount I + FIELD b source Lnone/rr; + METHOD a handleEnchantment (Lnone/aho;I)V + ARG 0 enchantment + ARG 1 enchantmentLevel FIELD a rand Ljava/util/Random; + FIELD b protectionHandler Lnone/ahq$e; + FIELD c additionalDamgeHandler Lnone/ahq$d; + FIELD d damageUserHandler Lnone/ahq$b; + FIELD e damageTargetHandler Lnone/ahq$a; + METHOD a (ILnone/aes;Z)Ljava/util/List; + ARG 1 stack + METHOD a getProtectionAmount (Ljava/lang/Iterable;Lnone/rr;)I + ARG 0 stacks + ARG 1 source + METHOD a removeInvalidEnchantments (Ljava/util/List;Lnone/ahr;)V + ARG 0 infos + ARG 1 info METHOD a setEnchantments (Ljava/util/Map;Lnone/aes;)V ARG 0 enchantmentMap ARG 1 stack - METHOD a (Ljava/util/Random;IILnone/aes;)I + METHOD a geExperienceLevel (Ljava/util/Random;IILnone/aes;)I ARG 0 rand ARG 1 num ARG 2 enchantmentPower ARG 3 rstack + METHOD a (Ljava/util/Random;Lnone/aes;IZ)Lnone/aes; + ARG 0 rand + ARG 1 stack METHOD a getEnchantments (Lnone/aes;)Ljava/util/Map; ARG 0 stack + METHOD a getAdditionalDamge (Lnone/aes;Lnone/su;)F + ARG 0 rstack + ARG 1 attribute METHOD a getLevel (Lnone/aho;Lnone/aes;)I ARG 0 enchantment ARG 1 stack METHOD a getEquipmentLevel (Lnone/aho;Lnone/sp;)I ARG 0 ench ARG 1 entity + METHOD a handleEnchantmentArray (Lnone/ahq$c;Ljava/lang/Iterable;)V + ARG 0 EnchantmentHandler + ARG 1 stacks + METHOD a handleEnchantments (Lnone/ahq$c;Lnone/aes;)V + ARG 0 enchantmentHandler + ARG 1 stack METHOD a getKnockback (Lnone/sp;)I ARG 0 entity - METHOD b (Lnone/aho;Lnone/sp;)Lnone/aes; + METHOD a handleDamageUser (Lnone/sp;Lnone/sg;)V + ARG 0 attackingEntity + ARG 1 attackedEntity + METHOD b getEnchantmentList (Ljava/util/Random;Lnone/aes;IZ)Ljava/util/List; + ARG 0 rand + ARG 1 stack + METHOD b getHighestEnchantmentLevel (Lnone/aho;Lnone/sp;)Lnone/aes; ARG 0 enchantment ARG 1 entity METHOD b getFireAspect (Lnone/sp;)I ARG 0 entity + METHOD b handleDamageTarget (Lnone/sp;Lnone/sg;)V + ARG 0 attackingEntity + ARG 1 attackedEntity METHOD c getRespiration (Lnone/sp;)I ARG 0 entity METHOD d getDepthStrider (Lnone/sp;)I diff --git a/mappings/net/minecraft/entity/player/EntityPlayer.mapping b/mappings/net/minecraft/entity/player/EntityPlayer.mapping index cbb8c04bd6..d79b25f840 100644 --- a/mappings/net/minecraft/entity/player/EntityPlayer.mapping +++ b/mappings/net/minecraft/entity/player/EntityPlayer.mapping @@ -44,7 +44,7 @@ CLASS none/aam net/minecraft/entity/player/EntityPlayer FIELD d sleepTimer I FIELD e spawnPosition Lnone/cn; FIELD f spawnForced Z - FIELD h xpSeed I + FIELD h enchantmentTableSeed I METHOD T invalidate ()V METHOD a addExhaustion (F)V ARG 0 value @@ -141,7 +141,7 @@ CLASS none/aam net/minecraft/entity/player/EntityPlayer METHOD cS getSleepTimer ()I METHOD cT getSpawnPosition ()Lnone/cn; METHOD cU isSpawnForced ()Z - METHOD cV getXpSeed ()I + METHOD cV getEnchantmentTableSeed ()I METHOD cX getHungerManager ()Lnone/abv; METHOD cZ canModifyWorld ()Z METHOD cq isSleeping ()Z diff --git a/mappings/net/minecraft/item/ItemBookEnchanted.mapping b/mappings/net/minecraft/item/ItemBookEnchanted.mapping index 05572b19c9..43517e29a9 100644 --- a/mappings/net/minecraft/item/ItemBookEnchanted.mapping +++ b/mappings/net/minecraft/item/ItemBookEnchanted.mapping @@ -4,6 +4,14 @@ CLASS none/aeb net/minecraft/item/ItemBookEnchanted ARG 1 player ARG 2 list ARG 3 advancedTooltips + METHOD a addEnchantment (Lnone/aes;Lnone/ahr;)V + ARG 0 stack + ARG 1 rinfo + METHOD a (Lnone/aho;Ljava/util/List;)V + ARG 0 enchantment + ARG 1 stacks + METHOD a getEnchantmentBook (Lnone/ahr;)Lnone/aes; + ARG 0 info METHOD g getRarity (Lnone/aes;)Lnone/afg; ARG 0 stack METHOD g_ isTool (Lnone/aes;)Z From bbc28d1e7856c36401c6aeae8dfdb810dcfb8039 Mon Sep 17 00:00:00 2001 From: Nedelosk Date: Tue, 18 Oct 2016 15:19:38 +0200 Subject: [PATCH 7/8] Improve Mappings --- .../net/minecraft/client/render/item/ItemRenderer.mapping | 6 +++--- .../{ContainerChest.mapping => ContainerGeneric.mapping} | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) rename mappings/net/minecraft/container/{ContainerChest.mapping => ContainerGeneric.mapping} (85%) diff --git a/mappings/net/minecraft/client/render/item/ItemRenderer.mapping b/mappings/net/minecraft/client/render/item/ItemRenderer.mapping index 4f7dd7e6e5..0153904701 100644 --- a/mappings/net/minecraft/client/render/item/ItemRenderer.mapping +++ b/mappings/net/minecraft/client/render/item/ItemRenderer.mapping @@ -43,7 +43,7 @@ CLASS none/btr net/minecraft/client/render/item/ItemRenderer METHOD a registerItemModel (Lnone/aeq;Ljava/lang/String;)V ARG 0 item ARG 1 modelId - METHOD a isThreeDimensionalInGUI (Lnone/aes;)Z + METHOD a hasDepthInGui (Lnone/aes;)Z ARG 0 stack METHOD a renderItemWithPropertyOverrides (Lnone/aes;II)V ARG 0 stack @@ -68,12 +68,12 @@ CLASS none/btr net/minecraft/client/render/item/ItemRenderer ARG 0 stack ARG 1 model ARG 2 type - ARG 3 holdInLeftHand + ARG 3 leftHanded METHOD a renderItemAmountAndDamageInGUI (Lnone/aes;Lnone/sp;Lnone/bqf$b;Z)V ARG 0 stack ARG 1 entity ARG 2 type - ARG 3 holdInLeftHand + ARG 3 leftHanded METHOD a registerItemModel (Lnone/aky;ILjava/lang/String;)V ARG 0 block ARG 1 metadata diff --git a/mappings/net/minecraft/container/ContainerChest.mapping b/mappings/net/minecraft/container/ContainerGeneric.mapping similarity index 85% rename from mappings/net/minecraft/container/ContainerChest.mapping rename to mappings/net/minecraft/container/ContainerGeneric.mapping index 29d5b07b5d..b7669d89c7 100644 --- a/mappings/net/minecraft/container/ContainerChest.mapping +++ b/mappings/net/minecraft/container/ContainerGeneric.mapping @@ -1,4 +1,4 @@ -CLASS none/acd net/minecraft/container/ContainerChest +CLASS none/acd net/minecraft/container/ContainerGeneric FIELD a inventory Lnone/qv; FIELD f rows I METHOD (Lnone/qv;Lnone/qv;Lnone/aam;)V From ace89230c45aeae26b27009c931b0a7001a4f434 Mon Sep 17 00:00:00 2001 From: Nedelosk Date: Tue, 18 Oct 2016 16:18:16 +0200 Subject: [PATCH 8/8] Add missing mapping --- .../net/minecraft/client/render/FirstPersonRenderer.mapping | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mappings/net/minecraft/client/render/FirstPersonRenderer.mapping b/mappings/net/minecraft/client/render/FirstPersonRenderer.mapping index a5e2a35a93..9e0cbaa0f0 100644 --- a/mappings/net/minecraft/client/render/FirstPersonRenderer.mapping +++ b/mappings/net/minecraft/client/render/FirstPersonRenderer.mapping @@ -42,7 +42,7 @@ CLASS none/box net/minecraft/client/render/FirstPersonRenderer ARG 0 holder ARG 1 stack ARG 2 transformation - ARG 3 holdInLeftHand + ARG 3 leftHanded METHOD b renderOverlays (F)V ARG 0 deltaTicks METHOD c renderArms ()V