diff --git a/mappings/net/minecraft/container/AbstractFurnaceContainer.mapping b/mappings/net/minecraft/container/AbstractFurnaceContainer.mapping index 7e569d2a52..0e53bad3db 100644 --- a/mappings/net/minecraft/container/AbstractFurnaceContainer.mapping +++ b/mappings/net/minecraft/container/AbstractFurnaceContainer.mapping @@ -2,8 +2,15 @@ CLASS atk net/minecraft/container/AbstractFurnaceContainer FIELD c world Lbcq; FIELD d inventory Laft; FIELD e propertyDelegate Lats; + FIELD f recipeType Lazv; + METHOD (Lauk;Lazv;ILarn;)V + ARG 3 syncId + METHOD (Lauk;Lazv;ILarn;Laft;Lats;)V + ARG 3 syncId METHOD a isSmeltable (Laxi;)Z ARG 1 itemStack METHOD b isFuel (Laxi;)Z ARG 1 itemStack + METHOD j getCookProgress ()I + METHOD k getFuelProgress ()I METHOD l isBurning ()Z diff --git a/mappings/net/minecraft/container/ArrayPropertyDelegate.mapping b/mappings/net/minecraft/container/ArrayPropertyDelegate.mapping index fe8a2e76ae..1d7452e5c3 100644 --- a/mappings/net/minecraft/container/ArrayPropertyDelegate.mapping +++ b/mappings/net/minecraft/container/ArrayPropertyDelegate.mapping @@ -1,2 +1,4 @@ CLASS auv net/minecraft/container/ArrayPropertyDelegate FIELD a data [I + METHOD (I)V + ARG 1 size diff --git a/mappings/net/minecraft/container/BeaconContainer.mapping b/mappings/net/minecraft/container/BeaconContainer.mapping index 2a0fefb56e..ef57317aee 100644 --- a/mappings/net/minecraft/container/BeaconContainer.mapping +++ b/mappings/net/minecraft/container/BeaconContainer.mapping @@ -1,3 +1,7 @@ CLASS atm net/minecraft/container/BeaconContainer CLASS atm$a SlotPayment FIELD f propertyDelegate Lats; + METHOD (ILaft;)V + ARG 1 syncId + METHOD (ILaft;Lats;Latt;)V + ARG 1 syncId diff --git a/mappings/net/minecraft/container/BlastFurnaceContainer.mapping b/mappings/net/minecraft/container/BlastFurnaceContainer.mapping index 7aed147f90..a6d3e36400 100644 --- a/mappings/net/minecraft/container/BlastFurnaceContainer.mapping +++ b/mappings/net/minecraft/container/BlastFurnaceContainer.mapping @@ -1 +1,5 @@ CLASS atn net/minecraft/container/BlastFurnaceContainer + METHOD (ILarn;)V + ARG 1 syncId + METHOD (ILarn;Laft;Lats;)V + ARG 1 syncId diff --git a/mappings/net/minecraft/container/BrewingStandContainer.mapping b/mappings/net/minecraft/container/BrewingStandContainer.mapping index fdf9ad2abc..8423181b41 100644 --- a/mappings/net/minecraft/container/BrewingStandContainer.mapping +++ b/mappings/net/minecraft/container/BrewingStandContainer.mapping @@ -19,3 +19,5 @@ CLASS ato net/minecraft/container/BrewingStandContainer FIELD c inventory Laft; FIELD d propertyDelegate Lats; FIELD e slotIngredient Lauw; + METHOD (ILarn;)V + ARG 1 syncId diff --git a/mappings/net/minecraft/container/CartographyTableContainer.mapping b/mappings/net/minecraft/container/CartographyTableContainer.mapping index ea53b2b0a8..a9b25390af 100644 --- a/mappings/net/minecraft/container/CartographyTableContainer.mapping +++ b/mappings/net/minecraft/container/CartographyTableContainer.mapping @@ -1 +1,5 @@ CLASS atp net/minecraft/container/CartographyTableContainer + METHOD (ILarn;)V + ARG 1 syncId + METHOD (ILarn;Latt;)V + ARG 1 syncId diff --git a/mappings/net/minecraft/container/Container.mapping b/mappings/net/minecraft/container/Container.mapping index 9c62887ebd..173ed79431 100644 --- a/mappings/net/minecraft/container/Container.mapping +++ b/mappings/net/minecraft/container/Container.mapping @@ -2,10 +2,16 @@ CLASS atj net/minecraft/container/Container FIELD a slotList Ljava/util/List; FIELD b syncId I FIELD c stackList Lfh; + FIELD d properties Ljava/util/List; FIELD e type Lauk; FIELD f actionId S + FIELD g quickCraftStage I + FIELD h quickCraftButton I + FIELD i quickCraftSlots Ljava/util/Set; FIELD j listeners Ljava/util/List; + FIELD k restrictedPlayers Ljava/util/Set; METHOD (Lauk;I)V + ARG 1 type ARG 2 syncId METHOD a getType ()Lauk; METHOD a getSlot (I)Lauw; @@ -14,8 +20,9 @@ CLASS atj net/minecraft/container/Container ARG 2 propertyId METHOD a onSlotClick (IILatr;Laro;)Laxi; ARG 1 slotId - ARG 2 buttonId + ARG 2 clickData ARG 3 actionType + ARG 5 resultStack METHOD a setStackInSlot (ILaxi;)V ARG 1 slot METHOD a onContentChanged (Laft;)V @@ -27,14 +34,16 @@ CLASS atj net/minecraft/container/Container ARG 1 player ARG 2 id METHOD a dropInventory (Laro;Lbcq;Laft;)V - METHOD a readData (Lats;)V - ARG 1 data + METHOD a setPlayerRestriction (Laro;Z)V + ARG 2 unrestricted + METHOD a addProperties (Lats;)V METHOD a checkContainerDataCount (Lats;I)V ARG 0 data ARG 1 expectedCount METHOD a canUse (Latt;Laro;Lbhs;)Z METHOD a addListener (Latu;)V ARG 1 listener + METHOD a addProperty (Latx;)Latx; METHOD a addSlot (Lauw;)Lauw; ARG 1 slot METHOD a canInsertItemIntoSlot (Lauw;Laxi;Z)Z @@ -44,15 +53,22 @@ CLASS atj net/minecraft/container/Container ARG 1 stack ARG 2 startIndex ARG 3 endIndex + METHOD a canStacksCombine (Laxi;Laxi;)Z METHOD a calculateComparatorOutput (Lbot;)I ARG 0 entity METHOD a updateSlotStacks (Ljava/util/List;)V + ARG 1 stacks METHOD a calculateStackSize (Ljava/util/Set;ILaxi;I)V ARG 0 slots ARG 1 rmode ARG 2 stack ARG 3 stackSize METHOD b getStacks ()Lfh; + METHOD b unpackQuickCraftStage (I)I + ARG 0 clickData + METHOD b packClickData (II)I + ARG 0 buttonId + ARG 1 quickCraftStage METHOD b calculateComparatorOutput (Laft;)I ARG 0 inventory METHOD b close (Laro;)V @@ -61,4 +77,9 @@ CLASS atj net/minecraft/container/Container ARG 2 invSlot METHOD b removeListener (Latu;)V ARG 1 listener + METHOD b canInsertIntoSlot (Lauw;)Z METHOD c sendContentUpdates ()V + METHOD c unpackButtonId (I)I + ARG 0 clickData + METHOD c isRestricted (Laro;)Z + METHOD d quickCraftEnd ()V diff --git a/mappings/net/minecraft/container/ContainerProvider.mapping b/mappings/net/minecraft/container/ContainerProvider.mapping index 53df506b6a..bbe7445d01 100644 --- a/mappings/net/minecraft/container/ContainerProvider.mapping +++ b/mappings/net/minecraft/container/ContainerProvider.mapping @@ -1 +1,3 @@ CLASS auj net/minecraft/container/ContainerProvider + METHOD createMenu (ILarn;Laro;)Latj; + ARG 1 syncId diff --git a/mappings/net/minecraft/container/ContainerType.mapping b/mappings/net/minecraft/container/ContainerType.mapping index 6773df2f0e..a58f81b133 100644 --- a/mappings/net/minecraft/container/ContainerType.mapping +++ b/mappings/net/minecraft/container/ContainerType.mapping @@ -22,6 +22,8 @@ CLASS auk net/minecraft/container/ContainerType FIELD q SMOKER Lauk; FIELD r CARTOGRAPHY Lauk; FIELD t factory Lauk$a; + METHOD ()V + ARG 0 syncId METHOD (Lauk$a;)V ARG 1 factory METHOD a create (ILarn;)Latj; diff --git a/mappings/net/minecraft/container/CraftingContainer.mapping b/mappings/net/minecraft/container/CraftingContainer.mapping index b2c496c8ca..1d2408dc7c 100644 --- a/mappings/net/minecraft/container/CraftingContainer.mapping +++ b/mappings/net/minecraft/container/CraftingContainer.mapping @@ -1,6 +1,7 @@ CLASS aup net/minecraft/container/CraftingContainer METHOD a populateRecipeFinder (Larq;)V METHOD a matches (Lazs;)Z + METHOD a fillInputSlots (ZLazs;Lut;)V METHOD e clearCraftingSlots ()V METHOD f getCraftingResultSlotIndex ()I METHOD g getCraftingWidth ()I diff --git a/mappings/net/minecraft/container/CraftingResultSlot.mapping b/mappings/net/minecraft/container/CraftingResultSlot.mapping index 2d9ae98bdf..f624aa615b 100644 --- a/mappings/net/minecraft/container/CraftingResultSlot.mapping +++ b/mappings/net/minecraft/container/CraftingResultSlot.mapping @@ -6,4 +6,11 @@ CLASS aus net/minecraft/container/CraftingResultSlot ARG 2 craftingInv ARG 3 inventory ARG 4 invSlot - ARG 5 x + ARG 5 xPosition + ARG 6 yPosition + METHOD a (I)Laxi; + ARG 1 arg1 + METHOD a (Laxi;I)V + ARG 2 arg2 + METHOD b (I)V + ARG 1 arg1 diff --git a/mappings/net/minecraft/container/CraftingTableContainer.mapping b/mappings/net/minecraft/container/CraftingTableContainer.mapping index 730ffad783..2d64682cd8 100644 --- a/mappings/net/minecraft/container/CraftingTableContainer.mapping +++ b/mappings/net/minecraft/container/CraftingTableContainer.mapping @@ -3,3 +3,7 @@ CLASS atw net/minecraft/container/CraftingTableContainer FIELD d resultInv Laur; FIELD e world Latt; FIELD f player Laro; + METHOD (ILarn;)V + ARG 1 syncId + METHOD (ILarn;Latt;)V + ARG 1 syncId diff --git a/mappings/net/minecraft/container/EnchantingTableContainer.mapping b/mappings/net/minecraft/container/EnchantingTableContainer.mapping index 62571d2cdd..ca6b5e50dc 100644 --- a/mappings/net/minecraft/container/EnchantingTableContainer.mapping +++ b/mappings/net/minecraft/container/EnchantingTableContainer.mapping @@ -6,5 +6,9 @@ CLASS atz net/minecraft/container/EnchantingTableContainer FIELD g pos Latt; FIELD h random Ljava/util/Random; FIELD i world Latx; + METHOD (ILarn;)V + ARG 1 syncId + METHOD (ILarn;Latt;)V + ARG 1 syncId METHOD a getRandomEnchantments (Laxi;II)Ljava/util/List; ARG 1 stack diff --git a/mappings/net/minecraft/container/FurnaceContainer.mapping b/mappings/net/minecraft/container/FurnaceContainer.mapping index 82778464c0..d7b03fda68 100644 --- a/mappings/net/minecraft/container/FurnaceContainer.mapping +++ b/mappings/net/minecraft/container/FurnaceContainer.mapping @@ -1 +1,5 @@ CLASS aub net/minecraft/container/FurnaceContainer + METHOD (ILarn;)V + ARG 1 syncId + METHOD (ILarn;Laft;Lats;)V + ARG 1 syncId diff --git a/mappings/net/minecraft/container/FurnaceFuelSlot.mapping b/mappings/net/minecraft/container/FurnaceFuelSlot.mapping index 3ae68f2d42..039d33c711 100644 --- a/mappings/net/minecraft/container/FurnaceFuelSlot.mapping +++ b/mappings/net/minecraft/container/FurnaceFuelSlot.mapping @@ -1,5 +1,8 @@ CLASS aua net/minecraft/container/FurnaceFuelSlot + FIELD a container Latk; METHOD (Latk;Laft;III)V - ARG 3 xPosition + ARG 3 invSlot + ARG 4 xPosition + ARG 5 yPosition METHOD c_ isBucket (Laxi;)Z ARG 0 stack diff --git a/mappings/net/minecraft/container/FurnaceOutputSlot.mapping b/mappings/net/minecraft/container/FurnaceOutputSlot.mapping index 47b764eaa4..47fdbb3acb 100644 --- a/mappings/net/minecraft/container/FurnaceOutputSlot.mapping +++ b/mappings/net/minecraft/container/FurnaceOutputSlot.mapping @@ -5,4 +5,9 @@ CLASS auc net/minecraft/container/FurnaceOutputSlot ARG 1 player ARG 2 inventory ARG 3 invSlot - ARG 4 x + ARG 4 xPosition + ARG 5 yPosition + METHOD a (I)Laxi; + ARG 1 arg1 + METHOD a (Laxi;I)V + ARG 2 arg2 diff --git a/mappings/net/minecraft/container/Generic3x3Container.mapping b/mappings/net/minecraft/container/Generic3x3Container.mapping index 783b791174..fc09d2a34f 100644 --- a/mappings/net/minecraft/container/Generic3x3Container.mapping +++ b/mappings/net/minecraft/container/Generic3x3Container.mapping @@ -1,2 +1,6 @@ CLASS aty net/minecraft/container/Generic3x3Container FIELD c inventory Laft; + METHOD (ILarn;)V + ARG 1 syncId + METHOD (ILarn;Laft;)V + ARG 1 syncId diff --git a/mappings/net/minecraft/container/GenericContainer.mapping b/mappings/net/minecraft/container/GenericContainer.mapping index 153f44b5bc..7390c93ecb 100644 --- a/mappings/net/minecraft/container/GenericContainer.mapping +++ b/mappings/net/minecraft/container/GenericContainer.mapping @@ -1,4 +1,18 @@ CLASS atq net/minecraft/container/GenericContainer CLASS atq$a Generic9x6 + METHOD (ILarn;)V + ARG 1 syncId + METHOD (ILarn;Laft;)V + ARG 1 syncId CLASS atq$b Generic9x3 + METHOD (ILarn;)V + ARG 1 syncId + METHOD (ILarn;Laft;)V + ARG 1 syncId + FIELD c inventory Laft; + FIELD d rows I + METHOD (Lauk;ILarn;Laft;I)V + ARG 2 syncId + ARG 5 rows METHOD e getInventory ()Laft; + METHOD f getRows ()I diff --git a/mappings/net/minecraft/container/GrindstoneContainer.mapping b/mappings/net/minecraft/container/GrindstoneContainer.mapping index 4549711725..228e1fbc33 100644 --- a/mappings/net/minecraft/container/GrindstoneContainer.mapping +++ b/mappings/net/minecraft/container/GrindstoneContainer.mapping @@ -2,3 +2,7 @@ CLASS aud net/minecraft/container/GrindstoneContainer FIELD c resultInventory Laft; FIELD d craftingInventory Laft; FIELD e world Latt; + METHOD (ILarn;)V + ARG 1 syncId + METHOD (ILarn;Latt;)V + ARG 1 syncId diff --git a/mappings/net/minecraft/container/HopperContainer.mapping b/mappings/net/minecraft/container/HopperContainer.mapping index d7f34265d0..9d0a1b19c0 100644 --- a/mappings/net/minecraft/container/HopperContainer.mapping +++ b/mappings/net/minecraft/container/HopperContainer.mapping @@ -1,2 +1,6 @@ CLASS aue net/minecraft/container/HopperContainer FIELD c inventory Laft; + METHOD (ILarn;)V + ARG 1 syncId + METHOD (ILarn;Laft;)V + ARG 1 syncId diff --git a/mappings/net/minecraft/container/HorseContainer.mapping b/mappings/net/minecraft/container/HorseContainer.mapping index 7ac7bb1b13..63b3594dcb 100644 --- a/mappings/net/minecraft/container/HorseContainer.mapping +++ b/mappings/net/minecraft/container/HorseContainer.mapping @@ -1,3 +1,5 @@ CLASS auf net/minecraft/container/HorseContainer FIELD c playerInv Laft; FIELD d entity Lank; + METHOD (ILarn;Laft;Lank;)V + ARG 1 syncId diff --git a/mappings/net/minecraft/container/LecternContainer.mapping b/mappings/net/minecraft/container/LecternContainer.mapping index 29e69dcf4e..bf559a9167 100644 --- a/mappings/net/minecraft/container/LecternContainer.mapping +++ b/mappings/net/minecraft/container/LecternContainer.mapping @@ -1,4 +1,8 @@ CLASS auh net/minecraft/container/LecternContainer FIELD c inventory Laft; FIELD d propertyDelegate Lats; + METHOD (I)V + ARG 1 syncId + METHOD (ILaft;Lats;)V + ARG 1 syncId METHOD e getBookItem ()Laxi; diff --git a/mappings/net/minecraft/container/LoomContainer.mapping b/mappings/net/minecraft/container/LoomContainer.mapping index 25cc046a9c..56f370f72a 100644 --- a/mappings/net/minecraft/container/LoomContainer.mapping +++ b/mappings/net/minecraft/container/LoomContainer.mapping @@ -1,2 +1,6 @@ CLASS aui net/minecraft/container/LoomContainer FIELD j inv Laft; + METHOD (ILarn;)V + ARG 1 syncId + METHOD (ILarn;Latt;)V + ARG 1 syncId diff --git a/mappings/net/minecraft/container/MerchantContainer.mapping b/mappings/net/minecraft/container/MerchantContainer.mapping index f8cc13a04c..f2ac42091c 100644 --- a/mappings/net/minecraft/container/MerchantContainer.mapping +++ b/mappings/net/minecraft/container/MerchantContainer.mapping @@ -1,4 +1,8 @@ CLASS aum net/minecraft/container/MerchantContainer FIELD c villager Lbbt; FIELD d villagerInventory Laul; + METHOD (ILarn;)V + ARG 1 syncId + METHOD (ILarn;Lbbt;)V + ARG 1 syncId METHOD d setRecipeIndex (I)V diff --git a/mappings/net/minecraft/container/Property.mapping b/mappings/net/minecraft/container/Property.mapping index 8533bcf14e..6ed73ac44d 100644 --- a/mappings/net/minecraft/container/Property.mapping +++ b/mappings/net/minecraft/container/Property.mapping @@ -1,8 +1,15 @@ CLASS atx net/minecraft/container/Property - FIELD a id I + CLASS atx$3 + FIELD a value I + FIELD a oldValue I METHOD a create ()Latx; METHOD a set (I)V ARG 1 value METHOD a create (Lats;I)Latx; + ARG 1 key METHOD a create ([II)Latx; + ARG 1 key METHOD b get ()I + METHOD c detectChanges ()Z + ARG 1 newValue + ARG 2 changed diff --git a/mappings/net/minecraft/container/ShulkerBoxContainer.mapping b/mappings/net/minecraft/container/ShulkerBoxContainer.mapping index 62aff224ec..369c61675d 100644 --- a/mappings/net/minecraft/container/ShulkerBoxContainer.mapping +++ b/mappings/net/minecraft/container/ShulkerBoxContainer.mapping @@ -1,2 +1,6 @@ CLASS aut net/minecraft/container/ShulkerBoxContainer FIELD c inventory Laft; + METHOD (ILarn;)V + ARG 1 syncId + METHOD (ILarn;Laft;)V + ARG 1 syncId diff --git a/mappings/net/minecraft/container/Slot.mapping b/mappings/net/minecraft/container/Slot.mapping index 39569445ab..691f7f0055 100644 --- a/mappings/net/minecraft/container/Slot.mapping +++ b/mappings/net/minecraft/container/Slot.mapping @@ -4,17 +4,25 @@ CLASS auw net/minecraft/container/Slot FIELD e id I FIELD f xPosition I FIELD g yPosition I + METHOD (Laft;III)V + ARG 2 invSlot + ARG 3 xPosition + ARG 4 yPosition METHOD a getMaxStackAmount ()I METHOD a takeStack (I)Laxi; + ARG 1 amount METHOD a canTakeItems (Laro;)Z METHOD a onTakeItem (Laro;Laxi;)Laxi; ARG 1 stack METHOD a canInsert (Laxi;)Z METHOD a onCrafted (Laxi;I)V ARG 1 stack + ARG 2 amount METHOD a onStackChanged (Laxi;Laxi;)V ARG 1 originalItem METHOD b doDrawHoveringEffect ()Z + METHOD b onTake (I)V + ARG 1 amount METHOD b getMaxStackAmount (Laxi;)I METHOD c getBackgroundSprite ()Ljava/lang/String; METHOD c onCrafted (Laxi;)V diff --git a/mappings/net/minecraft/container/SmokerContainer.mapping b/mappings/net/minecraft/container/SmokerContainer.mapping index 0ae58148d0..28e06f92aa 100644 --- a/mappings/net/minecraft/container/SmokerContainer.mapping +++ b/mappings/net/minecraft/container/SmokerContainer.mapping @@ -1 +1,5 @@ CLASS auy net/minecraft/container/SmokerContainer + METHOD (ILarn;)V + ARG 1 syncId + METHOD (ILarn;Laft;Lats;)V + ARG 1 syncId diff --git a/mappings/net/minecraft/container/VillagerOutputSlot.mapping b/mappings/net/minecraft/container/VillagerOutputSlot.mapping index b08c787d55..dac08d9af8 100644 --- a/mappings/net/minecraft/container/VillagerOutputSlot.mapping +++ b/mappings/net/minecraft/container/VillagerOutputSlot.mapping @@ -9,3 +9,8 @@ CLASS aun net/minecraft/container/VillagerOutputSlot ARG 3 VillagerInventory ARG 4 index ARG 5 xPosition + ARG 6 yPosition + METHOD a (I)Laxi; + ARG 1 arg1 + METHOD a (Laxi;I)V + ARG 2 arg2 diff --git a/mappings/net/minecraft/container/DoubleLockableContainer.mapping b/mappings/net/minecraft/inventory/DoubleInventory.mapping similarity index 54% rename from mappings/net/minecraft/container/DoubleLockableContainer.mapping rename to mappings/net/minecraft/inventory/DoubleInventory.mapping index 6621b71cff..5350aafe5f 100644 --- a/mappings/net/minecraft/container/DoubleLockableContainer.mapping +++ b/mappings/net/minecraft/inventory/DoubleInventory.mapping @@ -1,4 +1,4 @@ -CLASS afs net/minecraft/container/DoubleLockableContainer +CLASS afs net/minecraft/inventory/DoubleInventory FIELD a first Laft; FIELD b second Laft; METHOD a isPart (Laft;)Z diff --git a/mappings/net/minecraft/world/EntityContainer.mapping b/mappings/net/minecraft/world/EntityContainer.mapping index dc8d3dcc17..27cec67a41 100644 --- a/mappings/net/minecraft/world/EntityContainer.mapping +++ b/mappings/net/minecraft/world/EntityContainer.mapping @@ -3,3 +3,4 @@ CLASS bci net/minecraft/world/EntityContainer METHOD a getEntities (Lahe;Lcmr;Ljava/util/function/Predicate;)Ljava/util/List; ARG 1 entity ARG 2 boundingBox + METHOD a getCollidingEntityBoundingBoxesForEntity (Lahe;Lcnq;Ljava/util/Set;)Ljava/util/stream/Stream;