From fd834220b5b83d0b1a21422e7282ca8db2d5e2e1 Mon Sep 17 00:00:00 2001 From: Adrian Siekierka Date: Wed, 10 May 2017 21:24:29 +0200 Subject: [PATCH] minor mapping work --- mappings/net/minecraft/block/Block.mapping | 1 + .../net/minecraft/block/BlockBrewingStand.mapping | 1 + .../net/minecraft/block/BlockCraftingTable.mapping | 4 +++- mappings/net/minecraft/block/BlockDoor.mapping | 6 ++++++ .../minecraft/block/BlockEnchantingTable.mapping | 1 + .../net/minecraft/block/BlockEndGateway.mapping | 1 + .../net/minecraft/block/BlockEndPortal.mapping | 1 + mappings/net/minecraft/block/BlockEndRod.mapping | 1 + .../net/minecraft/block/BlockEnderChest.mapping | 1 + mappings/net/minecraft/block/BlockFalling.mapping | 1 + mappings/net/minecraft/block/BlockFire.mapping | 14 ++++++++++++++ mappings/net/minecraft/block/BlockFurnace.mapping | 9 +++++++++ .../net/minecraft/block/BlockLeavesBase.mapping | 1 + .../net/minecraft/block/BlockLiquidBase.mapping | 1 + mappings/net/minecraft/block/BlockMycelium.mapping | 1 + mappings/net/minecraft/block/BlockPortal.mapping | 1 + .../net/minecraft/block/BlockRedstoneOre.mapping | 1 + .../net/minecraft/block/BlockRedstoneTorch.mapping | 1 + .../net/minecraft/block/BlockRedstoneWire.mapping | 1 + mappings/net/minecraft/block/BlockRepeater.mapping | 1 + mappings/net/minecraft/block/BlockSponge.mapping | 1 + mappings/net/minecraft/block/BlockStairs.mapping | 1 + mappings/net/minecraft/block/BlockTorch.mapping | 1 + .../net/minecraft/client/MinecraftGame.mapping | 1 + .../client/player/EntityPlayerClient.mapping | 5 +++++ .../net/minecraft/client/world/WorldClient.mapping | 12 ++++++++++++ .../entity/player/EntityPlayerServer.mapping | 1 + .../handler/INetworkGameHandlerServer.mapping | 1 + .../handler/NetworkGameHandlerServer.mapping | 4 ++++ mappings/net/minecraft/recipe/Recipe.mapping | 1 + .../net/minecraft/recipe/RecipeArmorDye.mapping | 1 + .../net/minecraft/recipe/RecipeBookClone.mapping | 1 + .../net/minecraft/recipe/RecipeFireworks.mapping | 1 + .../net/minecraft/recipe/RecipeMapClone.mapping | 1 + .../net/minecraft/recipe/RecipeMapExtend.mapping | 1 + mappings/net/minecraft/recipe/RecipeRepair.mapping | 1 + mappings/net/minecraft/recipe/RecipeShaped.mapping | 3 +++ .../net/minecraft/recipe/RecipeTippedArrow.mapping | 1 + .../net/minecraft/recipe/SmeltingRegistry.mapping | 9 +++++++++ mappings/net/minecraft/reference/Items.mapping | 4 ++++ 40 files changed, 99 insertions(+), 1 deletion(-) diff --git a/mappings/net/minecraft/block/Block.mapping b/mappings/net/minecraft/block/Block.mapping index 77ba058547..b1c217ccad 100644 --- a/mappings/net/minecraft/block/Block.mapping +++ b/mappings/net/minecraft/block/Block.mapping @@ -63,6 +63,7 @@ CLASS ank net/minecraft/block/Block METHOD a update (Lave;Lali;Ldx;Lank;Ldx;)V METHOD a addBoundingBoxes (Lave;Lali;Ldx;Lbfm;Ljava/util/List;Lub;Z)V METHOD a rayTrace (Lave;Lali;Ldx;Lbfp;Lbfp;)Lbfn; + METHOD a randomDisplayTick (Lave;Lali;Ldx;Ljava/util/Random;)V METHOD a getCollisionBox (Lave;Lalm;Ldx;)Lbfm; METHOD a shouldRenderSide (Lave;Lalm;Ldx;Lee;)Z METHOD a applyMirror (Lave;Laqm;)Lave; diff --git a/mappings/net/minecraft/block/BlockBrewingStand.mapping b/mappings/net/minecraft/block/BlockBrewingStand.mapping index 04151012d3..4c0b6ab08e 100644 --- a/mappings/net/minecraft/block/BlockBrewingStand.mapping +++ b/mappings/net/minecraft/block/BlockBrewingStand.mapping @@ -12,6 +12,7 @@ CLASS anp net/minecraft/block/BlockBrewingStand METHOD a onPlaced (Lali;Ldx;Lave;Luk;Lahf;)V METHOD a getRenderType (Lave;)Larx; METHOD a addBoundingBoxes (Lave;Lali;Ldx;Lbfm;Ljava/util/List;Lub;Z)V + METHOD a randomDisplayTick (Lave;Lali;Ldx;Ljava/util/Random;)V METHOD a getDropItem (Lave;Ljava/util/Random;I)Lahd; METHOD b createStateFactory ()Lavf; METHOD b isFullBoundsCubeForCulling (Lave;)Z diff --git a/mappings/net/minecraft/block/BlockCraftingTable.mapping b/mappings/net/minecraft/block/BlockCraftingTable.mapping index c9d3df9d5b..e213de268b 100644 --- a/mappings/net/minecraft/block/BlockCraftingTable.mapping +++ b/mappings/net/minecraft/block/BlockCraftingTable.mapping @@ -1,5 +1,7 @@ CLASS aof net/minecraft/block/BlockCraftingTable - CLASS aof$a + CLASS aof$a ContainerProvider + FIELD a world Lali; + FIELD b pos Ldx; METHOD a createContainer (Lact;Lacu;)Laeh; METHOD h_ getName ()Ljava/lang/String; METHOD i_ getNameAsComponent ()Lgk; diff --git a/mappings/net/minecraft/block/BlockDoor.mapping b/mappings/net/minecraft/block/BlockDoor.mapping index 03f05abfd7..472a886dd2 100644 --- a/mappings/net/minecraft/block/BlockDoor.mapping +++ b/mappings/net/minecraft/block/BlockDoor.mapping @@ -34,12 +34,18 @@ CLASS aoo net/minecraft/block/BlockDoor METHOD b isFullBoundsCubeForCulling (Lave;)Z METHOD b getBoundingBox (Lave;Lalm;Ldx;)Lbfm; METHOD c getTranslatedName ()Ljava/lang/String; + METHOD c getCombinedMeta (Lalm;Ldx;)I + ARG 0 view + ARG 1 pos METHOD c getRenderingState (Lave;Lalm;Ldx;)Lave; METHOD d isOpen (Lalm;Ldx;)Z METHOD e serializeState (Lave;)I METHOD f getRenderLayer ()Lala; + METHOD f (I)Lee; METHOD f getFacing (Lalm;Ldx;)Lee; METHOD h getDropItemInternal ()Lahd; METHOD h getPistonBehavior (Lave;)Lbbn; + METHOD i isUpperHalf (I)Z + ARG 0 meta METHOD r getMapColor (Lave;)Lbbl; ARG 0 state diff --git a/mappings/net/minecraft/block/BlockEnchantingTable.mapping b/mappings/net/minecraft/block/BlockEnchantingTable.mapping index 9a1f3513b6..b7a683a773 100644 --- a/mappings/net/minecraft/block/BlockEnchantingTable.mapping +++ b/mappings/net/minecraft/block/BlockEnchantingTable.mapping @@ -6,5 +6,6 @@ CLASS aot net/minecraft/block/BlockEnchantingTable METHOD a activate (Lali;Ldx;Lave;Lacu;Lsw;Lee;FFF)Z METHOD a onPlaced (Lali;Ldx;Lave;Luk;Lahf;)V METHOD a getRenderType (Lave;)Larx; + METHOD a randomDisplayTick (Lave;Lali;Ldx;Ljava/util/Random;)V METHOD b isFullBoundsCubeForCulling (Lave;)Z METHOD b getBoundingBox (Lave;Lalm;Ldx;)Lbfm; diff --git a/mappings/net/minecraft/block/BlockEndGateway.mapping b/mappings/net/minecraft/block/BlockEndGateway.mapping index a2ef966ca6..6095ba3a27 100644 --- a/mappings/net/minecraft/block/BlockEndGateway.mapping +++ b/mappings/net/minecraft/block/BlockEndGateway.mapping @@ -3,6 +3,7 @@ CLASS aou net/minecraft/block/BlockEndGateway ARG 0 world ARG 1 meta METHOD a getPickStack (Lali;Ldx;Lave;)Lahf; + METHOD a randomDisplayTick (Lave;Lali;Ldx;Ljava/util/Random;)V METHOD a getCollisionBox (Lave;Lalm;Ldx;)Lbfm; METHOD a shouldRenderSide (Lave;Lalm;Ldx;Lee;)Z METHOD a getDropAmount (Ljava/util/Random;)I diff --git a/mappings/net/minecraft/block/BlockEndPortal.mapping b/mappings/net/minecraft/block/BlockEndPortal.mapping index 99194e0f97..96cd991e4e 100644 --- a/mappings/net/minecraft/block/BlockEndPortal.mapping +++ b/mappings/net/minecraft/block/BlockEndPortal.mapping @@ -5,6 +5,7 @@ CLASS aov net/minecraft/block/BlockEndPortal ARG 1 meta METHOD a getPickStack (Lali;Ldx;Lave;)Lahf; METHOD a addBoundingBoxes (Lave;Lali;Ldx;Lbfm;Ljava/util/List;Lub;Z)V + METHOD a randomDisplayTick (Lave;Lali;Ldx;Ljava/util/Random;)V METHOD a shouldRenderSide (Lave;Lalm;Ldx;Lee;)Z METHOD a getDropAmount (Ljava/util/Random;)I METHOD b isFullBoundsCubeForCulling (Lave;)Z diff --git a/mappings/net/minecraft/block/BlockEndRod.mapping b/mappings/net/minecraft/block/BlockEndRod.mapping index a9eec21db6..42b6919f63 100644 --- a/mappings/net/minecraft/block/BlockEndRod.mapping +++ b/mappings/net/minecraft/block/BlockEndRod.mapping @@ -6,6 +6,7 @@ CLASS aox net/minecraft/block/BlockEndRod ARG 0 meta METHOD a canPlaceAt (Lali;Ldx;)Z METHOD a getStateForPlacement (Lali;Ldx;Lee;FFFILuk;)Lave; + METHOD a randomDisplayTick (Lave;Lali;Ldx;Ljava/util/Random;)V METHOD a applyMirror (Lave;Laqm;)Lave; ARG 0 state ARG 1 mirror diff --git a/mappings/net/minecraft/block/BlockEnderChest.mapping b/mappings/net/minecraft/block/BlockEnderChest.mapping index eb1e708db2..99b20839b8 100644 --- a/mappings/net/minecraft/block/BlockEnderChest.mapping +++ b/mappings/net/minecraft/block/BlockEnderChest.mapping @@ -10,6 +10,7 @@ CLASS aoy net/minecraft/block/BlockEnderChest METHOD a onPlaced (Lali;Ldx;Lave;Luk;Lahf;)V METHOD a getStateForPlacement (Lali;Ldx;Lee;FFFILuk;)Lave; METHOD a getRenderType (Lave;)Larx; + METHOD a randomDisplayTick (Lave;Lali;Ldx;Ljava/util/Random;)V METHOD a applyMirror (Lave;Laqm;)Lave; ARG 0 state ARG 1 mirror diff --git a/mappings/net/minecraft/block/BlockFalling.mapping b/mappings/net/minecraft/block/BlockFalling.mapping index bc11de47c0..cbd42bdf72 100644 --- a/mappings/net/minecraft/block/BlockFalling.mapping +++ b/mappings/net/minecraft/block/BlockFalling.mapping @@ -1,6 +1,7 @@ CLASS apa net/minecraft/block/BlockFalling FIELD f fallInstantly Z METHOD a update (Lave;Lali;Ldx;Lank;Ldx;)V + METHOD a randomDisplayTick (Lave;Lali;Ldx;Ljava/util/Random;)V METHOD b randomTick (Lali;Ldx;Lave;Ljava/util/Random;)V METHOD i canFallThrough (Lave;)Z METHOD z getColor (Lave;)I diff --git a/mappings/net/minecraft/block/BlockFire.mapping b/mappings/net/minecraft/block/BlockFire.mapping index 8e0a50e6e2..cac77ccd93 100644 --- a/mappings/net/minecraft/block/BlockFire.mapping +++ b/mappings/net/minecraft/block/BlockFire.mapping @@ -1,21 +1,35 @@ CLASS ape net/minecraft/block/BlockFire + FIELD B fireSpreadChance Ljava/util/Map; FIELD a AGE Lavt; FIELD b NORTH Lavq; FIELD c EAST Lavq; FIELD d SOUTH Lavq; FIELD e WEST Lavq; FIELD f UP Lavq; + FIELD g fireBurnChance Ljava/util/Map; METHOD a deserializeState (I)Lave; ARG 0 meta METHOD a canPlaceAt (Lali;Ldx;)Z + METHOD a trySpreadFire (Lali;Ldx;ILjava/util/Random;I)V METHOD a registerFlammable (Lank;II)V METHOD a update (Lave;Lali;Ldx;Lank;Ldx;)V + METHOD a randomDisplayTick (Lave;Lali;Ldx;Ljava/util/Random;)V METHOD a getCollisionBox (Lave;Lalm;Ldx;)Lbfm; METHOD a getDropAmount (Ljava/util/Random;)I METHOD b createStateFactory ()Lavf; METHOD b randomTick (Lali;Ldx;Lave;Ljava/util/Random;)V METHOD b isFullBoundsCubeForCulling (Lave;)Z + METHOD c isAnyNeighborFlammable (Lali;Ldx;)Z + ARG 0 world + ARG 1 pos + METHOD c isFlammable (Lalm;Ldx;)Z + ARG 0 view + ARG 1 pos + METHOD c getFireSpreadChance (Lank;)I + ARG 0 block METHOD c getRenderingState (Lave;Lalm;Ldx;)Lave; + METHOD d getFireBurnChance (Lank;)I + ARG 0 block METHOD e registerDefaultFlammables ()V METHOD e serializeState (Lave;)I METHOD f getRenderLayer ()Lala; diff --git a/mappings/net/minecraft/block/BlockFurnace.mapping b/mappings/net/minecraft/block/BlockFurnace.mapping index 280b7d4021..a60e277b74 100644 --- a/mappings/net/minecraft/block/BlockFurnace.mapping +++ b/mappings/net/minecraft/block/BlockFurnace.mapping @@ -1,5 +1,9 @@ CLASS apl net/minecraft/block/BlockFurnace FIELD a FACING Lavr; + FIELD b powered Z + FIELD c noItemDrops Z + METHOD (Z)V + ARG 0 powered METHOD a deserializeState (I)Lave; ARG 0 meta METHOD a createBlockEntity (Lali;I)Latu; @@ -10,6 +14,7 @@ CLASS apl net/minecraft/block/BlockFurnace METHOD a onPlaced (Lali;Ldx;Lave;Luk;Lahf;)V METHOD a getStateForPlacement (Lali;Ldx;Lee;FFFILuk;)Lave; METHOD a getRenderType (Lave;)Larx; + METHOD a randomDisplayTick (Lave;Lali;Ldx;Ljava/util/Random;)V METHOD a applyMirror (Lave;Laqm;)Lave; ARG 0 state ARG 1 mirror @@ -17,6 +22,10 @@ CLASS apl net/minecraft/block/BlockFurnace ARG 0 state ARG 1 rotation METHOD a getDropItem (Lave;Ljava/util/Random;I)Lahd; + METHOD a changeState (ZLali;Ldx;)V + ARG 0 powered + ARG 1 world + ARG 2 pos METHOD b createStateFactory ()Lavf; METHOD c getComparatorOutput (Lave;Lali;Ldx;)I METHOD e serializeState (Lave;)I diff --git a/mappings/net/minecraft/block/BlockLeavesBase.mapping b/mappings/net/minecraft/block/BlockLeavesBase.mapping index 23ebfbe161..23ba4d5284 100644 --- a/mappings/net/minecraft/block/BlockLeavesBase.mapping +++ b/mappings/net/minecraft/block/BlockLeavesBase.mapping @@ -3,6 +3,7 @@ CLASS aqf net/minecraft/block/BlockLeavesBase FIELD b CHECK_DECAY Lavq; FIELD c fancyRender Z METHOD a dropItems (Lali;Ldx;Lave;FI)V + METHOD a randomDisplayTick (Lave;Lali;Ldx;Ljava/util/Random;)V METHOD a shouldRenderSide (Lave;Lalm;Ldx;Lee;)Z METHOD a getDropItem (Lave;Ljava/util/Random;I)Lahd; METHOD a getDropAmount (Ljava/util/Random;)I diff --git a/mappings/net/minecraft/block/BlockLiquidBase.mapping b/mappings/net/minecraft/block/BlockLiquidBase.mapping index 4384958fac..c217c83663 100644 --- a/mappings/net/minecraft/block/BlockLiquidBase.mapping +++ b/mappings/net/minecraft/block/BlockLiquidBase.mapping @@ -4,6 +4,7 @@ CLASS aqi net/minecraft/block/BlockLiquidBase ARG 0 meta METHOD a getRenderType (Lave;)Larx; METHOD a update (Lave;Lali;Ldx;Lank;Ldx;)V + METHOD a randomDisplayTick (Lave;Lali;Ldx;Ljava/util/Random;)V METHOD a getCollisionBox (Lave;Lalm;Ldx;)Lbfm; METHOD a shouldRenderSide (Lave;Lalm;Ldx;Lee;)Z METHOD a getDropItem (Lave;Ljava/util/Random;I)Lahd; diff --git a/mappings/net/minecraft/block/BlockMycelium.mapping b/mappings/net/minecraft/block/BlockMycelium.mapping index 2ae2df3b90..7eefbb326f 100644 --- a/mappings/net/minecraft/block/BlockMycelium.mapping +++ b/mappings/net/minecraft/block/BlockMycelium.mapping @@ -1,4 +1,5 @@ CLASS aqq net/minecraft/block/BlockMycelium + METHOD a randomDisplayTick (Lave;Lali;Ldx;Ljava/util/Random;)V METHOD a getDropItem (Lave;Ljava/util/Random;I)Lahd; METHOD b createStateFactory ()Lavf; METHOD b randomTick (Lali;Ldx;Lave;Ljava/util/Random;)V diff --git a/mappings/net/minecraft/block/BlockPortal.mapping b/mappings/net/minecraft/block/BlockPortal.mapping index 168bbba6d6..73502f6fb5 100644 --- a/mappings/net/minecraft/block/BlockPortal.mapping +++ b/mappings/net/minecraft/block/BlockPortal.mapping @@ -7,6 +7,7 @@ CLASS arg net/minecraft/block/BlockPortal ARG 0 meta METHOD a getPickStack (Lali;Ldx;Lave;)Lahf; METHOD a update (Lave;Lali;Ldx;Lank;Ldx;)V + METHOD a randomDisplayTick (Lave;Lali;Ldx;Ljava/util/Random;)V METHOD a getCollisionBox (Lave;Lalm;Ldx;)Lbfm; METHOD a shouldRenderSide (Lave;Lalm;Ldx;Lee;)Z METHOD a applyRotation (Lave;Lasa;)Lave; diff --git a/mappings/net/minecraft/block/BlockRedstoneOre.mapping b/mappings/net/minecraft/block/BlockRedstoneOre.mapping index 3215c19205..15fd96cb27 100644 --- a/mappings/net/minecraft/block/BlockRedstoneOre.mapping +++ b/mappings/net/minecraft/block/BlockRedstoneOre.mapping @@ -4,6 +4,7 @@ CLASS ars net/minecraft/block/BlockRedstoneOre METHOD a getPickStack (Lali;Ldx;Lave;)Lahf; METHOD a dropItems (Lali;Ldx;Lave;FI)V METHOD a activate (Lali;Ldx;Lave;Lacu;Lsw;Lee;FFF)Z + METHOD a randomDisplayTick (Lave;Lali;Ldx;Ljava/util/Random;)V METHOD a getDropItem (Lave;Ljava/util/Random;I)Lahd; METHOD a getDropAmount (Ljava/util/Random;)I METHOD b randomTick (Lali;Ldx;Lave;Ljava/util/Random;)V diff --git a/mappings/net/minecraft/block/BlockRedstoneTorch.mapping b/mappings/net/minecraft/block/BlockRedstoneTorch.mapping index b8d6d8ad7e..e409928d2a 100644 --- a/mappings/net/minecraft/block/BlockRedstoneTorch.mapping +++ b/mappings/net/minecraft/block/BlockRedstoneTorch.mapping @@ -2,6 +2,7 @@ CLASS arv net/minecraft/block/BlockRedstoneTorch FIELD B powered Z METHOD a getPickStack (Lali;Ldx;Lave;)Lahf; METHOD a update (Lave;Lali;Ldx;Lank;Ldx;)V + METHOD a randomDisplayTick (Lave;Lali;Ldx;Ljava/util/Random;)V METHOD a getDropItem (Lave;Ljava/util/Random;I)Lahd; METHOD b randomTick (Lali;Ldx;Lave;Ljava/util/Random;)V METHOD b isEqual (Lank;)Z diff --git a/mappings/net/minecraft/block/BlockRedstoneWire.mapping b/mappings/net/minecraft/block/BlockRedstoneWire.mapping index 362a64f48d..1716727cbd 100644 --- a/mappings/net/minecraft/block/BlockRedstoneWire.mapping +++ b/mappings/net/minecraft/block/BlockRedstoneWire.mapping @@ -17,6 +17,7 @@ CLASS art net/minecraft/block/BlockRedstoneWire METHOD a canPlaceAt (Lali;Ldx;)Z METHOD a getPickStack (Lali;Ldx;Lave;)Lahf; METHOD a update (Lave;Lali;Ldx;Lank;Ldx;)V + METHOD a randomDisplayTick (Lave;Lali;Ldx;Ljava/util/Random;)V METHOD a getCollisionBox (Lave;Lalm;Ldx;)Lbfm; METHOD a applyMirror (Lave;Laqm;)Lave; ARG 0 state diff --git a/mappings/net/minecraft/block/BlockRepeater.mapping b/mappings/net/minecraft/block/BlockRepeater.mapping index 25a1bb9335..40a3d01441 100644 --- a/mappings/net/minecraft/block/BlockRepeater.mapping +++ b/mappings/net/minecraft/block/BlockRepeater.mapping @@ -7,6 +7,7 @@ CLASS ary net/minecraft/block/BlockRepeater ARG 0 meta METHOD a getPickStack (Lali;Ldx;Lave;)Lahf; METHOD a activate (Lali;Ldx;Lave;Lacu;Lsw;Lee;FFF)Z + METHOD a randomDisplayTick (Lave;Lali;Ldx;Ljava/util/Random;)V METHOD a applyMirror (Lave;Laqm;)Lave; ARG 0 state ARG 1 mirror diff --git a/mappings/net/minecraft/block/BlockSponge.mapping b/mappings/net/minecraft/block/BlockSponge.mapping index 4eec5a5aaf..4d83b713fd 100644 --- a/mappings/net/minecraft/block/BlockSponge.mapping +++ b/mappings/net/minecraft/block/BlockSponge.mapping @@ -4,6 +4,7 @@ CLASS asn net/minecraft/block/BlockSponge ARG 0 meta METHOD a addStacksForDisplay (Lahd;Lagf;Lem;)V METHOD a update (Lave;Lali;Ldx;Lank;Ldx;)V + METHOD a randomDisplayTick (Lave;Lali;Ldx;Ljava/util/Random;)V METHOD b createStateFactory ()Lavf; METHOD c getTranslatedName ()Ljava/lang/String; METHOD d getDropItemDamage (Lave;)I diff --git a/mappings/net/minecraft/block/BlockStairs.mapping b/mappings/net/minecraft/block/BlockStairs.mapping index ed13b3bf73..7edcd6ff8a 100644 --- a/mappings/net/minecraft/block/BlockStairs.mapping +++ b/mappings/net/minecraft/block/BlockStairs.mapping @@ -25,6 +25,7 @@ CLASS asq net/minecraft/block/BlockStairs METHOD a getStateForPlacement (Lali;Ldx;Lee;FFFILuk;)Lave; METHOD a addBoundingBoxes (Lave;Lali;Ldx;Lbfm;Ljava/util/List;Lub;Z)V METHOD a rayTrace (Lave;Lali;Ldx;Lbfp;Lbfp;)Lbfn; + METHOD a randomDisplayTick (Lave;Lali;Ldx;Ljava/util/Random;)V METHOD a applyMirror (Lave;Laqm;)Lave; ARG 0 state ARG 1 mirror diff --git a/mappings/net/minecraft/block/BlockTorch.mapping b/mappings/net/minecraft/block/BlockTorch.mapping index 10375b088d..302b37bf3a 100644 --- a/mappings/net/minecraft/block/BlockTorch.mapping +++ b/mappings/net/minecraft/block/BlockTorch.mapping @@ -10,6 +10,7 @@ CLASS atd net/minecraft/block/BlockTorch METHOD a canPlaceAt (Lali;Ldx;)Z METHOD a getStateForPlacement (Lali;Ldx;Lee;FFFILuk;)Lave; METHOD a update (Lave;Lali;Ldx;Lank;Ldx;)V + METHOD a randomDisplayTick (Lave;Lali;Ldx;Ljava/util/Random;)V METHOD a getCollisionBox (Lave;Lalm;Ldx;)Lbfm; METHOD a applyMirror (Lave;Laqm;)Lave; ARG 0 state diff --git a/mappings/net/minecraft/client/MinecraftGame.mapping b/mappings/net/minecraft/client/MinecraftGame.mapping index b0207d5c9b..fb80ec5841 100644 --- a/mappings/net/minecraft/client/MinecraftGame.mapping +++ b/mappings/net/minecraft/client/MinecraftGame.mapping @@ -52,6 +52,7 @@ CLASS bgm net/minecraft/client/MinecraftGame FIELD au is64Bit Z FIELD av isDemo Z FIELD az resourceManager Lcct; + FIELD c playerCapabilities Lbqj; FIELD d width I FIELD e height I FIELD f world Lbqk; diff --git a/mappings/net/minecraft/client/player/EntityPlayerClient.mapping b/mappings/net/minecraft/client/player/EntityPlayerClient.mapping index 884b9563b9..6bec294c74 100644 --- a/mappings/net/minecraft/client/player/EntityPlayerClient.mapping +++ b/mappings/net/minecraft/client/player/EntityPlayerClient.mapping @@ -1,11 +1,15 @@ CLASS bsm net/minecraft/client/player/EntityPlayerClient FIELD ca stats Lpq; + FIELD cb recipeBook Lpi; FIELD cc clientPermissionLevel I + FIELD cn serverBrand Ljava/lang/String; FIELD d networkHandler Lbqi; FIELD f game Lbgm; METHOD B openRidingInventory ()V METHOD B_ update ()V + METHOD C getServerBrand ()Ljava/lang/String; METHOD D getStats ()Lpq; + METHOD E getRecipeBook ()Lpi; METHOD G getClientPermissionLevel ()I METHOD a hasPermission (ILjava/lang/String;)Z METHOD a spawnEntityItem (Labf;)Lahf; @@ -38,6 +42,7 @@ CLASS bsm net/minecraft/client/player/EntityPlayerClient ARG 1 damage METHOD g getForwardVector (F)Lbfp; METHOD g sendChatMessage (Ljava/lang/String;)V + METHOD h setServerBrand (Ljava/lang/String;)V METHOD n updateMovement ()V METHOD n setClientPermissionLevel (I)V METHOD o stopRiding ()V diff --git a/mappings/net/minecraft/client/world/WorldClient.mapping b/mappings/net/minecraft/client/world/WorldClient.mapping index f5c1f6d9b9..6a48bae170 100644 --- a/mappings/net/minecraft/client/world/WorldClient.mapping +++ b/mappings/net/minecraft/client/world/WorldClient.mapping @@ -6,6 +6,14 @@ CLASS bqk net/minecraft/client/world/WorldClient METHOD N quitClient ()V METHOD a playSound (DDDLpb;Lpd;FFZ)V METHOD a getEntityById (I)Lub; + METHOD a randomBlockDisplayTick (IIIILjava/util/Random;ZLdx$a;)V + ARG 0 xCenter + ARG 1 yCenter + ARG 2 zCenter + ARG 3 radius + ARG 4 rand + ARG 5 spawnBarrierParticles + ARG 6 posMutable METHOD a isChunkLoaded (IIZ)Z ARG 0 chunkX ARG 1 chunkZ @@ -15,6 +23,10 @@ CLASS bqk net/minecraft/client/world/WorldClient METHOD a playSoundClient (Ldx;Lpb;Lpd;FFZ)V METHOD a sendPacket (Lgv;)V METHOD a spawnEntity (Lub;)Z + METHOD b doRandomBlockDisplayTicks (III)V + ARG 0 xCenter + ARG 1 yCenter + ARG 2 zCenter METHOD b setTimeOfDay (J)V ARG 0 time METHOD b onEntityAdded (Lub;)V diff --git a/mappings/net/minecraft/entity/player/EntityPlayerServer.mapping b/mappings/net/minecraft/entity/player/EntityPlayerServer.mapping index b60ade840c..48ffe1d410 100644 --- a/mappings/net/minecraft/entity/player/EntityPlayerServer.mapping +++ b/mappings/net/minecraft/entity/player/EntityPlayerServer.mapping @@ -28,6 +28,7 @@ CLASS nn net/minecraft/entity/player/EntityPlayerServer METHOD B_ update ()V METHOD C updateLastActionTime ()V METHOD D getStatManager ()Lpk; + METHOD E getRecipeBook ()Lpj; METHOD F updatePotionVisibility ()V METHOD G getCameraEntity ()Lub; METHOD H updatePortalCooldown ()V diff --git a/mappings/net/minecraft/network/handler/INetworkGameHandlerServer.mapping b/mappings/net/minecraft/network/handler/INetworkGameHandlerServer.mapping index 2c02434634..33e979393c 100644 --- a/mappings/net/minecraft/network/handler/INetworkGameHandlerServer.mapping +++ b/mappings/net/minecraft/network/handler/INetworkGameHandlerServer.mapping @@ -18,6 +18,7 @@ CLASS jx net/minecraft/network/handler/INetworkGameHandlerServer METHOD a onPlayerState (Lkp;)V METHOD a onEntityAction (Lkq;)V METHOD a onVehicleSteer (Lkr;)V + METHOD a (Lks;)V METHOD a onResourcePackStatus (Lkt;)V METHOD a onPlayerHeldItemUpdate (Lku;)V METHOD a onInventoryUpdateCreative (Lkv;)V diff --git a/mappings/net/minecraft/network/handler/NetworkGameHandlerServer.mapping b/mappings/net/minecraft/network/handler/NetworkGameHandlerServer.mapping index d0555f13e7..badc996751 100644 --- a/mappings/net/minecraft/network/handler/NetworkGameHandlerServer.mapping +++ b/mappings/net/minecraft/network/handler/NetworkGameHandlerServer.mapping @@ -3,6 +3,8 @@ CLASS nx net/minecraft/network/handler/NetworkGameHandlerServer FIELD b player Lnn; FIELD c LOGGER Lorg/apache/logging/log4j/Logger; FIELD d server Lnet/minecraft/server/MinecraftServer; + FIELD e ticks I + FIELD h prevKeepAliveTicks J FIELD r topmostRiddenEntity Lub; METHOD G_ update ()V METHOD a getConnection ()Lfz; @@ -27,6 +29,7 @@ CLASS nx net/minecraft/network/handler/NetworkGameHandlerServer METHOD a onPlayerState (Lkp;)V METHOD a onEntityAction (Lkq;)V METHOD a onVehicleSteer (Lkr;)V + METHOD a (Lks;)V METHOD a onResourcePackStatus (Lkt;)V METHOD a onPlayerHeldItemUpdate (Lku;)V METHOD a onInventoryUpdateCreative (Lkv;)V @@ -39,3 +42,4 @@ CLASS nx net/minecraft/network/handler/NetworkGameHandlerServer METHOD b isInvalidEntityVehicleMove (Lkm;)Z METHOD c kick (Ljava/lang/String;)V METHOD d executeCommand (Ljava/lang/String;)V + METHOD e getCurrentTimeMs ()J diff --git a/mappings/net/minecraft/recipe/Recipe.mapping b/mappings/net/minecraft/recipe/Recipe.mapping index 60074b9d22..c7c938f443 100644 --- a/mappings/net/minecraft/recipe/Recipe.mapping +++ b/mappings/net/minecraft/recipe/Recipe.mapping @@ -12,4 +12,5 @@ CLASS ajh net/minecraft/recipe/Recipe METHOD b getRemainingStacks (Laeo;)Lem; ARG 0 inv METHOD c getInputs ()Ljava/util/List; + METHOD d isIgnoredInRecipeBook ()Z METHOD e getId ()Lmd; diff --git a/mappings/net/minecraft/recipe/RecipeArmorDye.mapping b/mappings/net/minecraft/recipe/RecipeArmorDye.mapping index d2458cbf36..b9e0b64596 100644 --- a/mappings/net/minecraft/recipe/RecipeArmorDye.mapping +++ b/mappings/net/minecraft/recipe/RecipeArmorDye.mapping @@ -9,3 +9,4 @@ CLASS aja net/minecraft/recipe/RecipeArmorDye METHOD b getRemainingStacks (Laeo;)Lem; ARG 0 inv METHOD c getInputs ()Ljava/util/List; + METHOD d isIgnoredInRecipeBook ()Z diff --git a/mappings/net/minecraft/recipe/RecipeBookClone.mapping b/mappings/net/minecraft/recipe/RecipeBookClone.mapping index 6b044540f7..c37346f2a5 100644 --- a/mappings/net/minecraft/recipe/RecipeBookClone.mapping +++ b/mappings/net/minecraft/recipe/RecipeBookClone.mapping @@ -9,3 +9,4 @@ CLASS ajc net/minecraft/recipe/RecipeBookClone METHOD b getRemainingStacks (Laeo;)Lem; ARG 0 inv METHOD c getInputs ()Ljava/util/List; + METHOD d isIgnoredInRecipeBook ()Z diff --git a/mappings/net/minecraft/recipe/RecipeFireworks.mapping b/mappings/net/minecraft/recipe/RecipeFireworks.mapping index 7898961460..c4a4818709 100644 --- a/mappings/net/minecraft/recipe/RecipeFireworks.mapping +++ b/mappings/net/minecraft/recipe/RecipeFireworks.mapping @@ -10,3 +10,4 @@ CLASS ajd net/minecraft/recipe/RecipeFireworks METHOD b getRemainingStacks (Laeo;)Lem; ARG 0 inv METHOD c getInputs ()Ljava/util/List; + METHOD d isIgnoredInRecipeBook ()Z diff --git a/mappings/net/minecraft/recipe/RecipeMapClone.mapping b/mappings/net/minecraft/recipe/RecipeMapClone.mapping index 60ed50c259..646db37a4c 100644 --- a/mappings/net/minecraft/recipe/RecipeMapClone.mapping +++ b/mappings/net/minecraft/recipe/RecipeMapClone.mapping @@ -9,3 +9,4 @@ CLASS ajf net/minecraft/recipe/RecipeMapClone METHOD b getRemainingStacks (Laeo;)Lem; ARG 0 inv METHOD c getInputs ()Ljava/util/List; + METHOD d isIgnoredInRecipeBook ()Z diff --git a/mappings/net/minecraft/recipe/RecipeMapExtend.mapping b/mappings/net/minecraft/recipe/RecipeMapExtend.mapping index 8f7b352450..ccc6ff4801 100644 --- a/mappings/net/minecraft/recipe/RecipeMapExtend.mapping +++ b/mappings/net/minecraft/recipe/RecipeMapExtend.mapping @@ -4,3 +4,4 @@ CLASS ajg net/minecraft/recipe/RecipeMapExtend METHOD a matches (Laeo;Lali;)Z ARG 0 inv ARG 1 world + METHOD d isIgnoredInRecipeBook ()Z diff --git a/mappings/net/minecraft/recipe/RecipeRepair.mapping b/mappings/net/minecraft/recipe/RecipeRepair.mapping index 7c75a55e02..7d53fffb96 100644 --- a/mappings/net/minecraft/recipe/RecipeRepair.mapping +++ b/mappings/net/minecraft/recipe/RecipeRepair.mapping @@ -9,3 +9,4 @@ CLASS ajj net/minecraft/recipe/RecipeRepair METHOD b getRemainingStacks (Laeo;)Lem; ARG 0 inv METHOD c getInputs ()Ljava/util/List; + METHOD d isIgnoredInRecipeBook ()Z diff --git a/mappings/net/minecraft/recipe/RecipeShaped.mapping b/mappings/net/minecraft/recipe/RecipeShaped.mapping index 7a33534bb7..f38785a65d 100644 --- a/mappings/net/minecraft/recipe/RecipeShaped.mapping +++ b/mappings/net/minecraft/recipe/RecipeShaped.mapping @@ -3,6 +3,7 @@ CLASS ajk net/minecraft/recipe/RecipeShaped FIELD c height I FIELD d inputs [Lahf; FIELD e output Lahf; + FIELD f cloneStackTags Z METHOD (Lmd;II[Lahf;Lahf;)V ARG 0 id ARG 1 width @@ -16,6 +17,7 @@ CLASS ajk net/minecraft/recipe/RecipeShaped ARG 0 inv ARG 1 offsetX ARG 2 offsetY + ARG 3 mirrored METHOD a matches (Laeo;Lali;)Z ARG 0 inv ARG 1 world @@ -25,6 +27,7 @@ CLASS ajk net/minecraft/recipe/RecipeShaped ARG 0 obj METHOD a deserializeStack (Lcom/google/gson/JsonObject;Z)Lahf; ARG 0 obj + ARG 1 allowCount METHOD a deserialize (Lmd;Lcom/google/gson/JsonObject;)Lajk; ARG 0 id ARG 1 obj diff --git a/mappings/net/minecraft/recipe/RecipeTippedArrow.mapping b/mappings/net/minecraft/recipe/RecipeTippedArrow.mapping index c977a405bc..f07174538c 100644 --- a/mappings/net/minecraft/recipe/RecipeTippedArrow.mapping +++ b/mappings/net/minecraft/recipe/RecipeTippedArrow.mapping @@ -9,3 +9,4 @@ CLASS ajo net/minecraft/recipe/RecipeTippedArrow METHOD b getRemainingStacks (Laeo;)Lem; ARG 0 inv METHOD c getInputs ()Ljava/util/List; + METHOD d isIgnoredInRecipeBook ()Z diff --git a/mappings/net/minecraft/recipe/SmeltingRegistry.mapping b/mappings/net/minecraft/recipe/SmeltingRegistry.mapping index 76267ec2d5..69e69a7779 100644 --- a/mappings/net/minecraft/recipe/SmeltingRegistry.mapping +++ b/mappings/net/minecraft/recipe/SmeltingRegistry.mapping @@ -4,9 +4,18 @@ CLASS aje net/minecraft/recipe/SmeltingRegistry FIELD c itemExperienceMap Ljava/util/Map; METHOD a getRegistry ()Laje; METHOD a registerSmeltingRecipe (Lahd;Lahf;F)V + ARG 0 input + ARG 1 output + ARG 2 experience METHOD a getSmeltingResult (Lahf;)Lahf; METHOD a matches (Lahf;Lahf;)Z METHOD a registerSmeltingRecipe (Lahf;Lahf;F)V + ARG 0 input + ARG 1 output + ARG 2 experience METHOD a registerSmeltingRecipe (Lank;Lahf;F)V + ARG 0 input + ARG 1 output + ARG 2 experience METHOD b getInputOutputMap ()Ljava/util/Map; METHOD b getSmeltingExperience (Lahf;)F diff --git a/mappings/net/minecraft/reference/Items.mapping b/mappings/net/minecraft/reference/Items.mapping index 64b455cc0a..7c76036f2d 100644 --- a/mappings/net/minecraft/reference/Items.mapping +++ b/mappings/net/minecraft/reference/Items.mapping @@ -156,6 +156,8 @@ CLASS ahh net/minecraft/reference/Items FIELD cV BEETROOT_SEEDS Lahd; FIELD cW BEETROOT Lahd; FIELD cX BEETROOT_SOUP Lahd; + FIELD cY TOTEM_OF_UNDYING Lahd; + FIELD cZ SHULKER_SHELL Lahd; FIELD ca ITEM_FRAME Lahd; FIELD cb FLOWER_POT Lahd; FIELD cc CARROT Lahd; @@ -183,6 +185,8 @@ CLASS ahh net/minecraft/reference/Items FIELD cy LEAD Lahd; FIELD cz NAME_TG Lahd; FIELD d IRON_AXE Lahd; + FIELD da IRON_NUGGET Lahd; + FIELD db KNOWLEDGE_BOOK Lahd; FIELD e FLINT_AND_STEEL Lahd; FIELD f APPLE Lahd; FIELD g BOW Lafw;