diff --git a/mappings/net/minecraft/block/tile/impl/TileEntityBeacon.mapping b/mappings/net/minecraft/block/tile/impl/TileEntityBeacon.mapping index cb01a93514..66f9b9fa22 100644 --- a/mappings/net/minecraft/block/tile/impl/TileEntityBeacon.mapping +++ b/mappings/net/minecraft/block/tile/impl/TileEntityBeacon.mapping @@ -18,11 +18,11 @@ CLASS none/ara net/minecraft/block/tile/impl/TileEntityBeacon METHOD a deserializeTag (Lnone/dt;)V METHOD b removeInvStack (I)Lnone/aeq; METHOD b isValidInvStack (ILnone/aeq;)Z - METHOD b (Lnone/aak;)V + METHOD b onInvOpen (Lnone/aak;)V ARG 0 player METHOD b serializeTag (Lnone/dt;)Lnone/dt; METHOD c writeToTag ()Lnone/dt; - METHOD c (Lnone/aak;)V + METHOD c onInvClose (Lnone/aak;)V ARG 0 player METHOD f getPotionEffectById (I)Lnone/rx; ARG 0 id diff --git a/mappings/net/minecraft/block/tile/impl/TileEntityBrewingStand.mapping b/mappings/net/minecraft/block/tile/impl/TileEntityBrewingStand.mapping index 56ac69a8df..28b10524ee 100644 --- a/mappings/net/minecraft/block/tile/impl/TileEntityBrewingStand.mapping +++ b/mappings/net/minecraft/block/tile/impl/TileEntityBrewingStand.mapping @@ -18,10 +18,10 @@ CLASS none/arc net/minecraft/block/tile/impl/TileEntityBrewingStand METHOD a deserializeTag (Lnone/dt;)V METHOD b removeInvStack (I)Lnone/aeq; METHOD b isValidInvStack (ILnone/aeq;)Z - METHOD b (Lnone/aak;)V + METHOD b onInvOpen (Lnone/aak;)V ARG 0 player METHOD b serializeTag (Lnone/dt;)Lnone/dt; - METHOD c (Lnone/aak;)V + METHOD c onInvClose (Lnone/aak;)V ARG 0 player METHOD h_ getName ()Ljava/lang/String; METHOD l clearInv ()V diff --git a/mappings/net/minecraft/block/tile/impl/TileEntityChest.mapping b/mappings/net/minecraft/block/tile/impl/TileEntityChest.mapping index 946771b284..f6ad7d5dc4 100644 --- a/mappings/net/minecraft/block/tile/impl/TileEntityChest.mapping +++ b/mappings/net/minecraft/block/tile/impl/TileEntityChest.mapping @@ -22,10 +22,10 @@ CLASS none/ard net/minecraft/block/tile/impl/TileEntityChest METHOD a deserializeTag (Lnone/dt;)V METHOD b removeInvStack (I)Lnone/aeq; METHOD b isValidInvStack (ILnone/aeq;)Z - METHOD b (Lnone/aak;)V + METHOD b onInvOpen (Lnone/aak;)V ARG 0 player METHOD b serializeTag (Lnone/dt;)Lnone/dt; - METHOD c (Lnone/aak;)V + METHOD c onInvClose (Lnone/aak;)V ARG 0 player METHOD h_ getName ()Ljava/lang/String; METHOD l clearInv ()V diff --git a/mappings/net/minecraft/block/tile/impl/TileEntityDispenser.mapping b/mappings/net/minecraft/block/tile/impl/TileEntityDispenser.mapping index 6d0e5341a5..c8a4a1b0cb 100644 --- a/mappings/net/minecraft/block/tile/impl/TileEntityDispenser.mapping +++ b/mappings/net/minecraft/block/tile/impl/TileEntityDispenser.mapping @@ -14,10 +14,10 @@ CLASS none/arh net/minecraft/block/tile/impl/TileEntityDispenser METHOD a deserializeTag (Lnone/dt;)V METHOD b removeInvStack (I)Lnone/aeq; METHOD b isValidInvStack (ILnone/aeq;)Z - METHOD b (Lnone/aak;)V + METHOD b onInvOpen (Lnone/aak;)V ARG 0 player METHOD b serializeTag (Lnone/dt;)Lnone/dt; - METHOD c (Lnone/aak;)V + METHOD c onInvClose (Lnone/aak;)V ARG 0 player METHOD h_ getName ()Ljava/lang/String; METHOD l clearInv ()V diff --git a/mappings/net/minecraft/block/tile/impl/TileEntityFurnace.mapping b/mappings/net/minecraft/block/tile/impl/TileEntityFurnace.mapping index fbc927369c..4542418eff 100644 --- a/mappings/net/minecraft/block/tile/impl/TileEntityFurnace.mapping +++ b/mappings/net/minecraft/block/tile/impl/TileEntityFurnace.mapping @@ -25,12 +25,12 @@ CLASS none/arm net/minecraft/block/tile/impl/TileEntityFurnace ARG 0 id ARG 1 value METHOD b isValidInvStack (ILnone/aeq;)Z - METHOD b (Lnone/aak;)V + METHOD b onInvOpen (Lnone/aak;)V ARG 0 player METHOD b getFuelTime (Lnone/aeq;)I ARG 0 stack METHOD b serializeTag (Lnone/dt;)Lnone/dt; - METHOD c (Lnone/aak;)V + METHOD c onInvClose (Lnone/aak;)V ARG 0 player METHOD c_ getField (I)I ARG 0 id diff --git a/mappings/net/minecraft/block/tile/impl/TileEntityHopper.mapping b/mappings/net/minecraft/block/tile/impl/TileEntityHopper.mapping index 11b9985a92..2e7f5536a4 100644 --- a/mappings/net/minecraft/block/tile/impl/TileEntityHopper.mapping +++ b/mappings/net/minecraft/block/tile/impl/TileEntityHopper.mapping @@ -15,10 +15,10 @@ CLASS none/aro net/minecraft/block/tile/impl/TileEntityHopper METHOD a deserializeTag (Lnone/dt;)V METHOD b removeInvStack (I)Lnone/aeq; METHOD b isValidInvStack (ILnone/aeq;)Z - METHOD b (Lnone/aak;)V + METHOD b onInvOpen (Lnone/aak;)V ARG 0 player METHOD b serializeTag (Lnone/dt;)Lnone/dt; - METHOD c (Lnone/aak;)V + METHOD c onInvClose (Lnone/aak;)V ARG 0 player METHOD h_ getName ()Ljava/lang/String; METHOD l clearInv ()V diff --git a/mappings/net/minecraft/client/network/handler/impl/NetworkGameHandlerClient.mapping b/mappings/net/minecraft/client/network/handler/impl/NetworkGameHandlerClient.mapping index 3986660620..8a264ee4b2 100644 --- a/mappings/net/minecraft/client/network/handler/impl/NetworkGameHandlerClient.mapping +++ b/mappings/net/minecraft/client/network/handler/impl/NetworkGameHandlerClient.mapping @@ -6,6 +6,7 @@ CLASS none/bmc net/minecraft/client/network/handler/impl/NetworkGameHandlerClien FIELD b LOGGER Lorg/apache/logging/log4j/Logger; FIELD c connection Lnone/eq; FIELD f mc Lnone/bdo; + FIELD g world Lnone/bme; FIELD k rand Ljava/util/Random; METHOD a onConnectionLost (Lnone/fa;)V ARG 0 reason diff --git a/mappings/net/minecraft/client/player/EntityPlayerClient.mapping b/mappings/net/minecraft/client/player/EntityPlayerClient.mapping index d793bbb1fe..7320dab7aa 100644 --- a/mappings/net/minecraft/client/player/EntityPlayerClient.mapping +++ b/mappings/net/minecraft/client/player/EntityPlayerClient.mapping @@ -12,8 +12,11 @@ CLASS none/boe net/minecraft/client/player/EntityPlayerClient ARG 0 component METHOD a addChatMsg (Lnone/fa;Z)V METHOD a onTrackedDataSet (Lnone/kj;)V + METHOD a (Lnone/qt;)V METHOD a swingHand (Lnone/qz;)V ARG 0 hand + METHOD a spawnEntityItem (Lnone/yy;)Lnone/aeq; + METHOD a dropSelectedItem (Z)Lnone/yy; METHOD c getBlockPos ()Lnone/cn; METHOD c setCurrentHand (Lnone/qz;)V METHOD g sendChatMessage (Ljava/lang/String;)V diff --git a/mappings/net/minecraft/container/Container.mapping b/mappings/net/minecraft/container/Container.mapping index 602b2df972..4252846529 100644 --- a/mappings/net/minecraft/container/Container.mapping +++ b/mappings/net/minecraft/container/Container.mapping @@ -1,5 +1,10 @@ CLASS none/abv net/minecraft/container/Container FIELD b stackList Lnone/dc; FIELD c slotList Ljava/util/List; + FIELD d guiId I METHOD a addSlot (Lnone/act;)Lnone/act; ARG 0 slot + METHOD a (Lnone/qt;)V + ARG 0 crafting + METHOD b close (Lnone/aak;)V + ARG 0 player diff --git a/mappings/net/minecraft/container/impl/ContainerAnvil.mapping b/mappings/net/minecraft/container/impl/ContainerAnvil.mapping new file mode 100644 index 0000000000..83e6e3cb9f --- /dev/null +++ b/mappings/net/minecraft/container/impl/ContainerAnvil.mapping @@ -0,0 +1,11 @@ +CLASS none/abw net/minecraft/container/impl/ContainerAnvil + CLASS none/abw$1 + METHOD u_ markDirty ()V + CLASS none/abw$2 + METHOD a (Lnone/aeq;)Z + ARG 0 stack + FIELD f LOGGER Lorg/apache/logging/log4j/Logger; + METHOD a (Lnone/qt;)V + ARG 0 crafting + METHOD b close (Lnone/aak;)V + ARG 0 player diff --git a/mappings/net/minecraft/container/impl/ContainerBeacon.mapping b/mappings/net/minecraft/container/impl/ContainerBeacon.mapping new file mode 100644 index 0000000000..7c3af73cba --- /dev/null +++ b/mappings/net/minecraft/container/impl/ContainerBeacon.mapping @@ -0,0 +1,11 @@ +CLASS none/abx net/minecraft/container/impl/ContainerBeacon + CLASS none/abx$a + METHOD a getMaxStackSize ()I + METHOD a (Lnone/aeq;)Z + ARG 0 stack + FIELD a inventory Lnone/qt; + METHOD (Lnone/qt;Lnone/qt;)V + ARG 0 invPlayer + ARG 1 invBeacon + METHOD b close (Lnone/aak;)V + ARG 0 player diff --git a/mappings/net/minecraft/container/impl/ContainerBrewingStand.mapping b/mappings/net/minecraft/container/impl/ContainerBrewingStand.mapping new file mode 100644 index 0000000000..e5705fdb2f --- /dev/null +++ b/mappings/net/minecraft/container/impl/ContainerBrewingStand.mapping @@ -0,0 +1,13 @@ +CLASS none/aby net/minecraft/container/impl/ContainerBrewingStand + CLASS none/aby$a + METHOD a getMaxStackSize ()I + METHOD a (Lnone/aeq;)Z + ARG 0 stack + CLASS none/aby$b + METHOD a getMaxStackSize ()I + METHOD a (Lnone/aeq;)Z + ARG 0 stack + CLASS none/aby$c + METHOD a getMaxStackSize ()I + METHOD a (Lnone/aeq;)Z + ARG 0 stack diff --git a/mappings/net/minecraft/container/impl/ContainerChest.mapping b/mappings/net/minecraft/container/impl/ContainerChest.mapping new file mode 100644 index 0000000000..4ef35a9e0d --- /dev/null +++ b/mappings/net/minecraft/container/impl/ContainerChest.mapping @@ -0,0 +1,10 @@ +CLASS none/acb net/minecraft/container/impl/ContainerChest + FIELD a inventory Lnone/qt; + FIELD f rows I + METHOD (Lnone/qt;Lnone/qt;Lnone/aak;)V + ARG 0 invPlayer + ARG 1 inv + ARG 2 player + METHOD b close (Lnone/aak;)V + ARG 0 player + METHOD e getInventory ()Lnone/qt; diff --git a/mappings/net/minecraft/container/impl/ContainerCraftingTable.mapping b/mappings/net/minecraft/container/impl/ContainerCraftingTable.mapping new file mode 100644 index 0000000000..5f6fe592f0 --- /dev/null +++ b/mappings/net/minecraft/container/impl/ContainerCraftingTable.mapping @@ -0,0 +1,13 @@ +CLASS none/acd net/minecraft/container/impl/ContainerCraftingTable + FIELD a invCrafting Lnone/acc; + FIELD f invCraftingResult Lnone/qt; + FIELD g world Lnone/aiu; + FIELD h pos Lnone/cn; + METHOD (Lnone/aaj;Lnone/aiu;Lnone/cn;)V + ARG 0 player + ARG 1 world + ARG 2 pos + METHOD a (Lnone/qt;)V + ARG 0 crafting + METHOD b close (Lnone/aak;)V + ARG 0 player diff --git a/mappings/net/minecraft/container/impl/ContainerDispenser.mapping b/mappings/net/minecraft/container/impl/ContainerDispenser.mapping new file mode 100644 index 0000000000..20341a8d53 --- /dev/null +++ b/mappings/net/minecraft/container/impl/ContainerDispenser.mapping @@ -0,0 +1,5 @@ +CLASS none/ace net/minecraft/container/impl/ContainerDispenser + FIELD a inventory Lnone/qt; + METHOD (Lnone/qt;Lnone/qt;)V + ARG 0 invPlayer + ARG 1 inv diff --git a/mappings/net/minecraft/container/impl/ContainerEnchantingTable.mapping b/mappings/net/minecraft/container/impl/ContainerEnchantingTable.mapping new file mode 100644 index 0000000000..c86755b760 --- /dev/null +++ b/mappings/net/minecraft/container/impl/ContainerEnchantingTable.mapping @@ -0,0 +1,15 @@ +CLASS none/acf net/minecraft/container/impl/ContainerEnchantingTable + CLASS none/acf$1 + METHOD u_ markDirty ()V + METHOD v_ getInvMaxStackSize ()I + CLASS none/acf$2 + METHOD a getMaxStackSize ()I + METHOD a (Lnone/aeq;)Z + ARG 0 stack + CLASS none/acf$3 + METHOD a (Lnone/aeq;)Z + ARG 0 stack + METHOD a (Lnone/qt;)V + ARG 0 crafting + METHOD b close (Lnone/aak;)V + ARG 0 player diff --git a/mappings/net/minecraft/container/impl/ContainerFurnace.mapping b/mappings/net/minecraft/container/impl/ContainerFurnace.mapping new file mode 100644 index 0000000000..fc3344eff0 --- /dev/null +++ b/mappings/net/minecraft/container/impl/ContainerFurnace.mapping @@ -0,0 +1 @@ +CLASS none/ach net/minecraft/container/impl/ContainerFurnace diff --git a/mappings/net/minecraft/container/impl/ContainerHopper.mapping b/mappings/net/minecraft/container/impl/ContainerHopper.mapping new file mode 100644 index 0000000000..64efb029c2 --- /dev/null +++ b/mappings/net/minecraft/container/impl/ContainerHopper.mapping @@ -0,0 +1,8 @@ +CLASS none/acj net/minecraft/container/impl/ContainerHopper + FIELD a inventory Lnone/qt; + METHOD (Lnone/aaj;Lnone/qt;Lnone/aak;)V + ARG 0 invPlayer + ARG 1 invHopper + ARG 2 player + METHOD b close (Lnone/aak;)V + ARG 0 player diff --git a/mappings/net/minecraft/container/impl/ContainerHorse.mapping b/mappings/net/minecraft/container/impl/ContainerHorse.mapping new file mode 100644 index 0000000000..d6648aa806 --- /dev/null +++ b/mappings/net/minecraft/container/impl/ContainerHorse.mapping @@ -0,0 +1,9 @@ +CLASS none/acl net/minecraft/container/impl/ContainerHorse + CLASS none/acl$1 + METHOD a (Lnone/aeq;)Z + ARG 0 stack + CLASS none/acl$2 + METHOD a (Lnone/aeq;)Z + ARG 0 stack + METHOD b close (Lnone/aak;)V + ARG 0 player diff --git a/mappings/net/minecraft/container/impl/ContainerPlayer.mapping b/mappings/net/minecraft/container/impl/ContainerPlayer.mapping new file mode 100644 index 0000000000..19dda4ff3c --- /dev/null +++ b/mappings/net/minecraft/container/impl/ContainerPlayer.mapping @@ -0,0 +1,18 @@ +CLASS none/acm net/minecraft/container/impl/ContainerPlayer + CLASS none/acm$1 + METHOD a getMaxStackSize ()I + METHOD a (Lnone/aeq;)Z + ARG 0 stack + METHOD c getBackgroundSprite ()Ljava/lang/String; + CLASS none/acm$2 + METHOD c getBackgroundSprite ()Ljava/lang/String; + FIELD a invCrafting Lnone/acc; + FIELD f invCraftingResult Lnone/qt; + FIELD h EQUIPMENT_SLOT_ORDER [Lnone/sj; + FIELD i owner Lnone/aak; + METHOD (Lnone/aaj;ZLnone/aak;)V + ARG 0 inventory + ARG 2 player + METHOD a (Lnone/qt;)V + METHOD b close (Lnone/aak;)V + ARG 0 player diff --git a/mappings/net/minecraft/container/impl/ContainerVillager.mapping b/mappings/net/minecraft/container/impl/ContainerVillager.mapping new file mode 100644 index 0000000000..170086fb5d --- /dev/null +++ b/mappings/net/minecraft/container/impl/ContainerVillager.mapping @@ -0,0 +1,5 @@ +CLASS none/aco net/minecraft/container/impl/ContainerVillager + METHOD a (Lnone/qt;)V + ARG 0 crafting + METHOD b close (Lnone/aak;)V + ARG 0 player diff --git a/mappings/net/minecraft/container/Slot.mapping b/mappings/net/minecraft/container/slot/Slot.mapping similarity index 54% rename from mappings/net/minecraft/container/Slot.mapping rename to mappings/net/minecraft/container/slot/Slot.mapping index fee4378fd1..4d7bb26bd0 100644 --- a/mappings/net/minecraft/container/Slot.mapping +++ b/mappings/net/minecraft/container/slot/Slot.mapping @@ -1,14 +1,21 @@ -CLASS none/act net/minecraft/container/Slot +CLASS none/act net/minecraft/container/slot/Slot FIELD a invSlot I FIELD d inventory Lnone/qt; FIELD e id I METHOD (Lnone/qt;III)V ARG 0 inventory ARG 1 invSlot + METHOD a getMaxStackSize ()I + METHOD a (Lnone/aeq;)Z + ARG 0 stack METHOD a matches (Lnone/qt;I)Z ARG 0 inventory ARG 1 invSlot + METHOD b getMaxStackSize (Lnone/aeq;)I + ARG 0 stack + METHOD c getBackgroundSprite ()Ljava/lang/String; METHOD d getStack ()Lnone/aeq; METHOD d setStack (Lnone/aeq;)V ARG 0 stack METHOD e hasStack ()Z + METHOD f markDirty ()V diff --git a/mappings/net/minecraft/container/slot/impl/SlotCraftingResult.mapping b/mappings/net/minecraft/container/slot/impl/SlotCraftingResult.mapping new file mode 100644 index 0000000000..86653c32cc --- /dev/null +++ b/mappings/net/minecraft/container/slot/impl/SlotCraftingResult.mapping @@ -0,0 +1,5 @@ +CLASS none/acs net/minecraft/container/slot/impl/SlotCraftingResult + FIELD a crafting Lnone/acc; + FIELD b player Lnone/aak; + METHOD a (Lnone/aeq;)Z + ARG 0 stack diff --git a/mappings/net/minecraft/entity/mob/EntityMob.mapping b/mappings/net/minecraft/entity/mob/EntityMob.mapping index e8dacdb988..f179db8766 100644 --- a/mappings/net/minecraft/entity/mob/EntityMob.mapping +++ b/mappings/net/minecraft/entity/mob/EntityMob.mapping @@ -16,6 +16,8 @@ CLASS none/so net/minecraft/entity/mob/EntityMob METHOD cR canPickUpLoot ()Z METHOD cU isLeashed ()Z METHOD cX isLeftHanded ()Z + METHOD d getPreferredEquipmentSlot (Lnone/aeq;)Lnone/sj; + ARG 0 stack METHOD m update ()V METHOD m setCanPickUpLoot (Z)V ARG 0 value diff --git a/mappings/net/minecraft/entity/player/EntityPlayer.mapping b/mappings/net/minecraft/entity/player/EntityPlayer.mapping index 5976e172bb..70d2344e27 100644 --- a/mappings/net/minecraft/entity/player/EntityPlayer.mapping +++ b/mappings/net/minecraft/entity/player/EntityPlayer.mapping @@ -22,6 +22,7 @@ CLASS none/aak net/minecraft/entity/player/EntityPlayer FIELD bO experienceBarProgress F FIELD bT gameProfile Lcom/mojang/authlib/GameProfile; FIELD bt inventory Lnone/aaj; + FIELD bu containerPlayer Lnone/abv; FIELD bv container Lnone/abv; FIELD d sleepTimer I FIELD e spawnPosition Lnone/cn; @@ -30,10 +31,18 @@ CLASS none/aak net/minecraft/entity/player/EntityPlayer METHOD T invalidate ()V METHOD a getUuidFromProfile (Lcom/mojang/authlib/GameProfile;)Ljava/util/UUID; ARG 0 profile + METHOD a dropItem (Lnone/aeq;Z)Lnone/yy; + ARG 0 stack + METHOD a dropItem (Lnone/aeq;ZZ)Lnone/yy; + ARG 0 stack METHOD a trySleep (Lnone/cn;)Lnone/aak$a; ARG 0 pos METHOD a deserializeEntityTag (Lnone/dt;)V METHOD a addChatMsg (Lnone/fa;Z)V + METHOD a (Lnone/qt;)V + ARG 0 inv + METHOD a spawnEntityItem (Lnone/yy;)Lnone/aeq; + METHOD a dropSelectedItem (Z)Lnone/yy; METHOD aG getItemsHand ()Ljava/lang/Iterable; METHOD aH getItemsArmor ()Ljava/lang/Iterable; METHOD ab getSoundSwim ()Lnone/nk; diff --git a/mappings/net/minecraft/entity/player/EntityPlayerServer.mapping b/mappings/net/minecraft/entity/player/EntityPlayerServer.mapping index 871aed7936..8996195045 100644 --- a/mappings/net/minecraft/entity/player/EntityPlayerServer.mapping +++ b/mappings/net/minecraft/entity/player/EntityPlayerServer.mapping @@ -1,11 +1,14 @@ CLASS none/lw net/minecraft/entity/player/EntityPlayerServer FIELD a networkHandler Lnone/mg; + METHOD C getChatVisibility ()Lnone/aak$b; METHOD a trySleep (Lnone/cn;)Lnone/aak$a; ARG 0 pos METHOD a deserializeEntityTag (Lnone/dt;)V METHOD a appendCommandFeedback (Lnone/fa;)V ARG 0 component METHOD a addChatMsg (Lnone/fa;Z)V + METHOD a (Lnone/qt;)V + ARG 0 inv METHOD a swingHand (Lnone/qz;)V ARG 0 hand METHOD b serializeEntityTag (Lnone/dt;)V @@ -14,3 +17,5 @@ CLASS none/lw net/minecraft/entity/player/EntityPlayerServer ARG 0 dimensionId METHOD m update ()V METHOD p dismountVehicle ()V + METHOD s closeGui ()V + METHOD x getWorldServer ()Lnone/lu; diff --git a/mappings/net/minecraft/entity/player/InventoryPlayer.mapping b/mappings/net/minecraft/entity/player/InventoryPlayer.mapping index 71bed6622d..edf994ad14 100644 --- a/mappings/net/minecraft/entity/player/InventoryPlayer.mapping +++ b/mappings/net/minecraft/entity/player/InventoryPlayer.mapping @@ -4,7 +4,8 @@ CLASS none/aaj net/minecraft/entity/player/InventoryPlayer FIELD c offHand Lnone/dc; FIELD d selectedSlot I FIELD e player Lnone/aak; - FIELD h nullStack Lnone/aeq; + FIELD f dirty Z + FIELD h heldStack Lnone/aeq; METHOD (Lnone/aak;)V ARG 0 player METHOD a getInvStack (I)Lnone/aeq; @@ -15,20 +16,23 @@ CLASS none/aaj net/minecraft/entity/player/InventoryPlayer ARG 0 tag METHOD b removeInvStack (I)Lnone/aeq; METHOD b isValidInvStack (ILnone/aeq;)Z - METHOD b (Lnone/aak;)V + METHOD b onInvOpen (Lnone/aak;)V ARG 0 player METHOD b deserializeTag (Lnone/dz;)V ARG 0 list - METHOD c (Lnone/aak;)V + METHOD c onInvClose (Lnone/aak;)V ARG 0 player METHOD c insertStack (Lnone/aeq;)Z ARG 0 stack + METHOD e setHeldStack (Lnone/aeq;)V + ARG 0 stack METHOD g getArmorStack (I)Lnone/aeq; ARG 0 slot METHOD h_ getName ()Ljava/lang/String; METHOD i_ getNameComponent ()Lnone/fa; METHOD l clearInv ()V METHOD n_ hasCustomName ()Z + METHOD o getHeldStack ()Lnone/aeq; METHOD t_ getInvSize ()I METHOD u_ markDirty ()V METHOD v_ getInvMaxStackSize ()I diff --git a/mappings/none/xb.mapping b/mappings/net/minecraft/entity/unsorted/EntityHorseBase.mapping similarity index 70% rename from mappings/none/xb.mapping rename to mappings/net/minecraft/entity/unsorted/EntityHorseBase.mapping index 35fa41cfff..7324d738ce 100644 --- a/mappings/none/xb.mapping +++ b/mappings/net/minecraft/entity/unsorted/EntityHorseBase.mapping @@ -1,4 +1,4 @@ -CLASS none/xb +CLASS none/xb net/minecraft/entity/unsorted/EntityHorseBase METHOD G getSoundDeath ()Lnone/nk; METHOD a deserializeEntityTag (Lnone/dt;)V METHOD b serializeEntityTag (Lnone/dt;)V diff --git a/mappings/net/minecraft/entity/vehicle/EntityStorageMinecart.mapping b/mappings/net/minecraft/entity/vehicle/EntityStorageMinecart.mapping index f4d1502399..e538fe4652 100644 --- a/mappings/net/minecraft/entity/vehicle/EntityStorageMinecart.mapping +++ b/mappings/net/minecraft/entity/vehicle/EntityStorageMinecart.mapping @@ -7,13 +7,13 @@ CLASS none/abl net/minecraft/entity/vehicle/EntityStorageMinecart METHOD a deserializeEntityTag (Lnone/dt;)V METHOD b removeInvStack (I)Lnone/aeq; METHOD b isValidInvStack (ILnone/aeq;)Z - METHOD b (Lnone/aak;)V + METHOD b onInvOpen (Lnone/aak;)V ARG 0 player METHOD b interact (Lnone/aak;Lnone/qz;)Z METHOD b serializeEntityTag (Lnone/dt;)V METHOD c changeDimension (I)Lnone/se; ARG 0 dimensionId - METHOD c (Lnone/aak;)V + METHOD c onInvClose (Lnone/aak;)V ARG 0 player METHOD l clearInv ()V METHOD u_ markDirty ()V diff --git a/mappings/net/minecraft/inventory/IInventory.mapping b/mappings/net/minecraft/inventory/IInventory.mapping index 3426d146f1..23aec0356d 100644 --- a/mappings/net/minecraft/inventory/IInventory.mapping +++ b/mappings/net/minecraft/inventory/IInventory.mapping @@ -9,9 +9,9 @@ CLASS none/qt net/minecraft/inventory/IInventory METHOD b isValidInvStack (ILnone/aeq;)Z ARG 0 slot ARG 1 stack - METHOD b (Lnone/aak;)V + METHOD b onInvOpen (Lnone/aak;)V ARG 0 player - METHOD c (Lnone/aak;)V + METHOD c onInvClose (Lnone/aak;)V ARG 0 player METHOD l clearInv ()V METHOD t_ getInvSize ()I diff --git a/mappings/net/minecraft/inventory/InventoryCrafting.mapping b/mappings/net/minecraft/inventory/InventoryCrafting.mapping index 50761ce751..7384039f91 100644 --- a/mappings/net/minecraft/inventory/InventoryCrafting.mapping +++ b/mappings/net/minecraft/inventory/InventoryCrafting.mapping @@ -14,12 +14,12 @@ CLASS none/acc net/minecraft/inventory/InventoryCrafting ARG 0 player METHOD b removeInvStack (I)Lnone/aeq; METHOD b isValidInvStack (ILnone/aeq;)Z - METHOD b (Lnone/aak;)V + METHOD b onInvOpen (Lnone/aak;)V ARG 0 player METHOD c getInventoryStack (II)Lnone/aeq; ARG 0 x ARG 1 y - METHOD c (Lnone/aak;)V + METHOD c onInvClose (Lnone/aak;)V ARG 0 player METHOD h_ getName ()Ljava/lang/String; METHOD i_ getNameComponent ()Lnone/fa; diff --git a/mappings/net/minecraft/inventory/InventoryCraftingResult.mapping b/mappings/net/minecraft/inventory/InventoryCraftingResult.mapping index 1c2cbc5831..f36d68a733 100644 --- a/mappings/net/minecraft/inventory/InventoryCraftingResult.mapping +++ b/mappings/net/minecraft/inventory/InventoryCraftingResult.mapping @@ -5,9 +5,9 @@ CLASS none/acr net/minecraft/inventory/InventoryCraftingResult ARG 0 player METHOD b removeInvStack (I)Lnone/aeq; METHOD b isValidInvStack (ILnone/aeq;)Z - METHOD b (Lnone/aak;)V + METHOD b onInvOpen (Lnone/aak;)V ARG 0 player - METHOD c (Lnone/aak;)V + METHOD c onInvClose (Lnone/aak;)V ARG 0 player METHOD h_ getName ()Ljava/lang/String; METHOD i_ getNameComponent ()Lnone/fa; diff --git a/mappings/net/minecraft/network/handler/impl/NetworkGameHandlerServer.mapping b/mappings/net/minecraft/network/handler/impl/NetworkGameHandlerServer.mapping index 164b9e8ab5..05a6e20b74 100644 --- a/mappings/net/minecraft/network/handler/impl/NetworkGameHandlerServer.mapping +++ b/mappings/net/minecraft/network/handler/impl/NetworkGameHandlerServer.mapping @@ -1,11 +1,18 @@ CLASS none/mg net/minecraft/network/handler/impl/NetworkGameHandlerServer + CLASS none/mg$1 + METHOD operationComplete (Lio/netty/util/concurrent/Future;)V + CLASS none/mg$2 + METHOD run ()V FIELD a connection Lnone/eq; FIELD b player Lnone/lw; FIELD c LOGGER Lorg/apache/logging/log4j/Logger; FIELD d server Lnet/minecraft/server/MinecraftServer; METHOD (Lnet/minecraft/server/MinecraftServer;Lnone/eq;Lnone/lw;)V ARG 0 server + ARG 1 connection + ARG 2 player METHOD D_ update ()V + METHOD a getConnection ()Lnone/eq; METHOD a onConnectionLost (Lnone/fa;)V ARG 0 reason METHOD a sendPacket (Lnone/fl;)V @@ -62,3 +69,7 @@ CLASS none/mg net/minecraft/network/handler/impl/NetworkGameHandlerServer ARG 0 packet METHOD a onPlayerBlockPlace (Lnone/jl;)V ARG 0 packet + METHOD b isInvalidPlayerUpdate (Lnone/iy;)Z + METHOD b isInvalidEntityVehicleMove (Lnone/iz;)Z + METHOD c kick (Ljava/lang/String;)V + ARG 0 reason diff --git a/mappings/net/minecraft/network/packet/server/SPacketVehicleSteer.mapping b/mappings/net/minecraft/network/packet/server/SPacketEntityVehicleSteer.mapping similarity index 63% rename from mappings/net/minecraft/network/packet/server/SPacketVehicleSteer.mapping rename to mappings/net/minecraft/network/packet/server/SPacketEntityVehicleSteer.mapping index 6552477205..5ad3f4334f 100644 --- a/mappings/net/minecraft/network/packet/server/SPacketVehicleSteer.mapping +++ b/mappings/net/minecraft/network/packet/server/SPacketEntityVehicleSteer.mapping @@ -1,4 +1,4 @@ -CLASS none/je net/minecraft/network/packet/server/SPacketVehicleSteer +CLASS none/je net/minecraft/network/packet/server/SPacketEntityVehicleSteer FIELD c jump Z FIELD d unmount Z METHOD a readPacket (Lnone/es;)V diff --git a/mappings/none/abw.mapping b/mappings/none/abw.mapping deleted file mode 100644 index 91af78f0a1..0000000000 --- a/mappings/none/abw.mapping +++ /dev/null @@ -1,3 +0,0 @@ -CLASS none/abw - CLASS none/abw$1 - METHOD u_ markDirty ()V diff --git a/mappings/none/abx.mapping b/mappings/none/abx.mapping deleted file mode 100644 index 9142fa9506..0000000000 --- a/mappings/none/abx.mapping +++ /dev/null @@ -1 +0,0 @@ -CLASS none/abx diff --git a/mappings/none/acf.mapping b/mappings/none/acf.mapping deleted file mode 100644 index 60ad07eebe..0000000000 --- a/mappings/none/acf.mapping +++ /dev/null @@ -1,4 +0,0 @@ -CLASS none/acf - CLASS none/acf$1 - METHOD u_ markDirty ()V - METHOD v_ getInvMaxStackSize ()I diff --git a/mappings/none/acg.mapping b/mappings/none/acg.mapping new file mode 100644 index 0000000000..f8d4c784ba --- /dev/null +++ b/mappings/none/acg.mapping @@ -0,0 +1,5 @@ +CLASS none/acg + METHOD a (Lnone/aeq;)Z + ARG 0 stack + METHOD b getMaxStackSize (Lnone/aeq;)I + ARG 0 stack diff --git a/mappings/none/aci.mapping b/mappings/none/aci.mapping new file mode 100644 index 0000000000..95aa82e3a8 --- /dev/null +++ b/mappings/none/aci.mapping @@ -0,0 +1,3 @@ +CLASS none/aci + METHOD a (Lnone/aeq;)Z + ARG 0 stack diff --git a/mappings/none/acn.mapping b/mappings/none/acn.mapping index a85d9e2276..3bd484a4f6 100644 --- a/mappings/none/acn.mapping +++ b/mappings/none/acn.mapping @@ -5,9 +5,9 @@ CLASS none/acn ARG 0 player METHOD b removeInvStack (I)Lnone/aeq; METHOD b isValidInvStack (ILnone/aeq;)Z - METHOD b (Lnone/aak;)V + METHOD b onInvOpen (Lnone/aak;)V ARG 0 player - METHOD c (Lnone/aak;)V + METHOD c onInvClose (Lnone/aak;)V ARG 0 player METHOD h_ getName ()Ljava/lang/String; METHOD i_ getNameComponent ()Lnone/fa; diff --git a/mappings/none/acp.mapping b/mappings/none/acp.mapping new file mode 100644 index 0000000000..428f2ac5c5 --- /dev/null +++ b/mappings/none/acp.mapping @@ -0,0 +1,3 @@ +CLASS none/acp + METHOD a (Lnone/aeq;)Z + ARG 0 stack diff --git a/mappings/none/acq.mapping b/mappings/none/acq.mapping index 93fd85b520..a270b26edb 100644 --- a/mappings/none/acq.mapping +++ b/mappings/none/acq.mapping @@ -3,8 +3,8 @@ CLASS none/acq ARG 0 player METHOD a readTags (Lnone/dz;)V ARG 0 tags - METHOD b (Lnone/aak;)V + METHOD b onInvOpen (Lnone/aak;)V ARG 0 player - METHOD c (Lnone/aak;)V + METHOD c onInvClose (Lnone/aak;)V ARG 0 player METHOD h getTags ()Lnone/dz; diff --git a/mappings/none/bhl.mapping b/mappings/none/bhl.mapping index a91c9e5e3f..f128338b90 100644 --- a/mappings/none/bhl.mapping +++ b/mappings/none/bhl.mapping @@ -1,11 +1,18 @@ CLASS none/bhl CLASS none/bhl$b + METHOD a getMaxStackSize ()I + METHOD a (Lnone/aeq;)Z + ARG 0 stack METHOD a matches (Lnone/qt;I)Z ARG 0 inventory ARG 1 invSlot + METHOD b getMaxStackSize (Lnone/aeq;)I + ARG 0 stack + METHOD c getBackgroundSprite ()Ljava/lang/String; METHOD d getStack ()Lnone/aeq; METHOD d setStack (Lnone/aeq;)V METHOD e hasStack ()Z + METHOD f markDirty ()V METHOD a handleKeyPress (CI)V METHOD a drawBackground (FII)V METHOD a drawScreen (IIF)V diff --git a/mappings/none/qs.mapping b/mappings/none/qs.mapping index 41d6773507..e864cd3e6e 100644 --- a/mappings/none/qs.mapping +++ b/mappings/none/qs.mapping @@ -5,9 +5,9 @@ CLASS none/qs ARG 0 player METHOD b removeInvStack (I)Lnone/aeq; METHOD b isValidInvStack (ILnone/aeq;)Z - METHOD b (Lnone/aak;)V + METHOD b onInvOpen (Lnone/aak;)V ARG 0 player - METHOD c (Lnone/aak;)V + METHOD c onInvClose (Lnone/aak;)V ARG 0 player METHOD h_ getName ()Ljava/lang/String; METHOD i_ getNameComponent ()Lnone/fa; diff --git a/mappings/none/ri.mapping b/mappings/none/ri.mapping index 4b58d74343..ae813c994f 100644 --- a/mappings/none/ri.mapping +++ b/mappings/none/ri.mapping @@ -5,9 +5,9 @@ CLASS none/ri ARG 0 player METHOD b removeInvStack (I)Lnone/aeq; METHOD b isValidInvStack (ILnone/aeq;)Z - METHOD b (Lnone/aak;)V + METHOD b onInvOpen (Lnone/aak;)V ARG 0 player - METHOD c (Lnone/aak;)V + METHOD c onInvClose (Lnone/aak;)V ARG 0 player METHOD h_ getName ()Ljava/lang/String; METHOD i_ getNameComponent ()Lnone/fa;