Skip to content

Commit

Permalink
Add field / arg mappings for various things. Also map some some thing… (
Browse files Browse the repository at this point in the history 
FabricMC#393)

* Add field / arg mappings for various things. Also map some some things on `aud` -> `LecternContainer`.

* Add mapping for BlockEntityType.Builder#a -> BlockEntityType.Builder#build

* Add mapping for some Inventory parameter names. Also add mappings for CraftingInventory.f() -> CraftingInventory.getHeight() & CraftingInventory.g() -> CraftingInventory.getWidth()
  • Loading branch information
@Blayyke @asiekierka
Blayyke authored and asiekierka committed Jan 12, 2019
1 parent 5c6ba3d commit 9ecf444
Show file tree
Hide file tree
Showing 41 changed files with 97 additions and 1 deletion.
1 change: 1 addition & 0 deletions mappings/atl.mapping
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,3 +14,4 @@ CLASS atl
METHOD b close (Lark;)V
METHOD b transferSlot (Lark;I)Laxd;
ARG 1 player
ARG 2 invSlot
4 changes: 4 additions & 0 deletions mappings/net/minecraft/block/entity/AbstractFurnaceBlockEntity.mapping
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,14 +19,17 @@ CLASS bnz net/minecraft/block/entity/AbstractFurnaceBlockEntity
METHOD T_ clearInv ()V
METHOD U_ getInvSize ()I
METHOD a getInvStack (I)Laxd;
ARG 1 slot
METHOD a takeInvStack (II)Laxd;
ARG 1 slot
METHOD a setInvStack (ILaxd;)V
ARG 1 slot
ARG 2 itemStack
METHOD a canInsertInvStack (ILaxd;Ley;)Z
ARG 1 slot
ARG 2 stack
METHOD a canPlayerUseInv (Lark;)Z
ARG 1 playerEntity
METHOD a provideRecipeInputs (Larm;)V
METHOD a getItemBurnTime (Laxd;)I
METHOD a setLastRecipe (Lazm;)V
Expand All @@ -43,6 +46,7 @@ CLASS bnz net/minecraft/block/entity/AbstractFurnaceBlockEntity
METHOD ab_ getCookTime ()I
METHOD ac_ getLastRecipe ()Lazm;
METHOD b removeInvStack (I)Laxd;
ARG 1 slot
METHOD b isValidInvStack (ILaxd;)Z
ARG 1 slot
METHOD b canExtractInvStack (ILaxd;Ley;)Z
Expand Down
3 changes: 3 additions & 0 deletions mappings/net/minecraft/block/entity/BarrelBlockEntity.mapping
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,18 @@ CLASS boc net/minecraft/block/entity/BarrelBlockEntity
METHOD T_ clearInv ()V
METHOD U_ getInvSize ()I
METHOD a getInvStack (I)Laxd;
ARG 1 slot
METHOD a takeInvStack (II)Laxd;
ARG 1 slot
METHOD a createContainer (ILarj;)Latf;
METHOD a setInvStack (ILaxd;)V
ARG 1 slot
ARG 2 itemStack
METHOD a setInvStackList (Lfh;)V
ARG 1 list
METHOD a fromTag (Lhs;)V
METHOD b removeInvStack (I)Laxd;
ARG 1 slot
METHOD b toTag (Lhs;)Lhs;
METHOD c isInvEmpty ()Z
METHOD f getInvStackList ()Lfh;
Expand Down
1 change: 1 addition & 0 deletions mappings/net/minecraft/block/entity/BlastFurnaceBlockEntity.mapping
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
CLASS boh net/minecraft/block/entity/BlastFurnaceBlockEntity
METHOD a createContainer (ILarj;)Latf;
METHOD a canPlayerUseInv (Lark;)Z
ARG 1 playerEntity
METHOD a getItemBurnTime (Laxd;)I
METHOD ab_ getCookTime ()I
METHOD g getName ()Ljd;
1 change: 1 addition & 0 deletions mappings/net/minecraft/block/entity/BlockEntityType.mapping
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
CLASS boj net/minecraft/block/entity/BlockEntityType
CLASS boj$a Builder
FIELD a supplier Ljava/util/function/Supplier;
METHOD a build (Lcom/mojang/datafixers/types/Type;)Lboj;
METHOD a create (Ljava/util/function/Supplier;)Lboj$a;
ARG 0 supplier
FIELD A SMOKER Lboj;
Expand Down
4 changes: 4 additions & 0 deletions mappings/net/minecraft/block/entity/BrewingStandBlockEntity.mapping
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,19 +16,23 @@ CLASS bok net/minecraft/block/entity/BrewingStandBlockEntity
METHOD T_ clearInv ()V
METHOD U_ getInvSize ()I
METHOD a getInvStack (I)Laxd;
ARG 1 slot
METHOD a takeInvStack (II)Laxd;
ARG 1 slot
METHOD a createContainer (ILarj;)Latf;
METHOD a setInvStack (ILaxd;)V
ARG 1 slot
ARG 2 itemStack
METHOD a canInsertInvStack (ILaxd;Ley;)Z
ARG 1 slot
ARG 2 stack
METHOD a canPlayerUseInv (Lark;)Z
ARG 1 playerEntity
METHOD a getInvAvailableSlots (Ley;)[I
METHOD a fromTag (Lhs;)V
METHOD aa_ tick ()V
METHOD b removeInvStack (I)Laxd;
ARG 1 slot
METHOD b isValidInvStack (ILaxd;)Z
ARG 1 slot
METHOD b canExtractInvStack (ILaxd;Ley;)Z
Expand Down
1 change: 1 addition & 0 deletions mappings/net/minecraft/block/entity/FurnaceBlockEntity.mapping
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
CLASS bov net/minecraft/block/entity/FurnaceBlockEntity
METHOD a createContainer (ILarj;)Latf;
METHOD a canPlayerUseInv (Lark;)Z
ARG 1 playerEntity
METHOD ab_ getCookTime ()I
METHOD g getName ()Ljd;
1 change: 1 addition & 0 deletions mappings/net/minecraft/block/entity/HopperBlockEntity.mapping
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ CLASS box net/minecraft/block/entity/HopperBlockEntity
METHOD a createContainer (ILarj;)Latf;
METHOD a setInvStack (ILaxd;)V
ARG 1 slot
ARG 2 itemStack
METHOD a canInsert (Lafs;Laxd;ILey;)Z
ARG 0 inv
ARG 1 stack
Expand Down
4 changes: 4 additions & 0 deletions mappings/net/minecraft/block/entity/LecternBlockEntity.mapping
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,16 @@ CLASS bpa net/minecraft/block/entity/LecternBlockEntity
METHOD T_ clearInv ()V
METHOD U_ getInvSize ()I
METHOD a getInvStack (I)Laxd;
ARG 1 slot
METHOD a takeInvStack (II)Laxd;
ARG 1 slot
METHOD a setInvStack (ILaxd;)V
ARG 1 slot
ARG 2 itemStack
METHOD a canPlayerUseInv (Lark;)Z
ARG 1 playerEntity
METHOD b removeInvStack (I)Laxd;
ARG 1 slot
METHOD b isValidInvStack (ILaxd;)Z
ARG 1 slot
METHOD c isInvEmpty ()Z
Expand Down
4 changes: 4 additions & 0 deletions mappings/net/minecraft/block/entity/LootableContainerBlockEntity.mapping
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,20 @@ CLASS bpc net/minecraft/block/entity/LootableContainerBlockEntity
FIELD h lootTableSeed J
METHOD T_ clearInv ()V
METHOD a getInvStack (I)Laxd;
ARG 1 slot
METHOD a takeInvStack (II)Laxd;
ARG 1 slot
METHOD a setInvStack (ILaxd;)V
ARG 1 slot
ARG 2 itemStack
METHOD a canPlayerUseInv (Lark;)Z
ARG 1 playerEntity
METHOD a setInvStackList (Lfh;)V
ARG 1 list
METHOD a setLootTable (Lqe;J)V
ARG 1 id
METHOD b removeInvStack (I)Laxd;
ARG 1 slot
METHOD d deserializeLootTable (Lhs;)Z
METHOD e checkLootInteraction (Lark;)V
METHOD e serializeLootTable (Lhs;)Z
Expand Down
1 change: 1 addition & 0 deletions mappings/net/minecraft/block/entity/SmokerBlockEntity.mapping
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
CLASS bpg net/minecraft/block/entity/SmokerBlockEntity
METHOD a createContainer (ILarj;)Latf;
METHOD a canPlayerUseInv (Lark;)Z
ARG 1 playerEntity
METHOD a getItemBurnTime (Laxd;)I
METHOD ab_ getCookTime ()I
METHOD g getName ()Ljd;
1 change: 1 addition & 0 deletions mappings/net/minecraft/client/gui/ingame/CreativePlayerInventoryGui.mapping
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ CLASS cvo net/minecraft/client/gui/ingame/CreativePlayerInventoryGui
METHOD a canUse (Lark;)Z
METHOD b transferSlot (Lark;I)Laxd;
ARG 1 player
ARG 2 invSlot
CLASS cvo$c CreativeSlot
FIELD b slot Laus;
METHOD a getMaxStackAmount ()I
Expand Down
5 changes: 5 additions & 0 deletions mappings/net/minecraft/container/AbstractFurnaceContainer.mapping
View file
Original file line number Diff line number Diff line change
@@ -1,15 +1,20 @@
CLASS atg net/minecraft/container/AbstractFurnaceContainer
FIELD a world Lbcf;
FIELD d inventory Lafs;
FIELD e propertyDelegate Lato;
METHOD a canUse (Lark;)Z
METHOD a populateRecipeFinder (Larm;)V
METHOD a isSmeltable (Laxd;)Z
ARG 1 itemStack
METHOD a matches (Lazm;)Z
METHOD b transferSlot (Lark;I)Laxd;
ARG 1 player
ARG 2 invSlot
METHOD b isFuel (Laxd;)Z
ARG 1 itemStack
METHOD e clearCraftingSlots ()V
METHOD f getCraftingResultSlotIndex ()I
METHOD g getCraftingWidth ()I
METHOD h getCraftingHeight ()I
METHOD i getCraftingSlotCount ()I
METHOD l isBurning ()Z
1 change: 1 addition & 0 deletions mappings/net/minecraft/container/AnvilContainer.mapping
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,3 +19,4 @@ CLASS ath net/minecraft/container/AnvilContainer
METHOD b close (Lark;)V
METHOD b transferSlot (Lark;I)Laxd;
ARG 1 player
ARG 2 invSlot
3 changes: 3 additions & 0 deletions mappings/net/minecraft/container/BeaconContainer.mapping
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,12 @@ CLASS ati net/minecraft/container/BeaconContainer
CLASS ati$a SlotPayment
METHOD a getMaxStackAmount ()I
METHOD a canInsert (Laxd;)Z
FIELD f propertyDelegate Lato;
METHOD a setProperty (II)V
ARG 1 pos
ARG 2 propertyId
METHOD a canUse (Lark;)Z
METHOD b close (Lark;)V
METHOD b transferSlot (Lark;I)Laxd;
ARG 1 player
ARG 2 invSlot
2 changes: 2 additions & 0 deletions mappings/net/minecraft/container/BlastFurnaceContainer.mapping
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
CLASS atj net/minecraft/container/BlastFurnaceContainer
METHOD a isSmeltable (Laxd;)Z
ARG 1 itemStack
METHOD b isFuel (Laxd;)Z
ARG 1 itemStack
2 changes: 2 additions & 0 deletions mappings/net/minecraft/container/BrewingStandContainer.mapping
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,9 @@ CLASS atk net/minecraft/container/BrewingStandContainer
METHOD a canInsert (Laxd;)Z
METHOD c_ matches (Laxd;)Z
FIELD a inventory Lafs;
FIELD d propertyDelegate Lato;
FIELD e slotIngredient Laus;
METHOD a canUse (Lark;)Z
METHOD b transferSlot (Lark;I)Laxd;
ARG 1 player
ARG 2 invSlot
2 changes: 2 additions & 0 deletions mappings/net/minecraft/container/Container.mapping
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ CLASS atf net/minecraft/container/Container
METHOD a getSlot (I)Laus;
METHOD a setProperty (II)V
ARG 1 pos
ARG 2 propertyId
METHOD a onSlotClick (IILatn;Lark;)Laxd;
ARG 1 slotId
ARG 2 buttonId
Expand Down Expand Up @@ -49,6 +50,7 @@ CLASS atf net/minecraft/container/Container
METHOD b close (Lark;)V
METHOD b transferSlot (Lark;I)Laxd;
ARG 1 player
ARG 2 invSlot
METHOD b removeListener (Latq;)V
ARG 1 listener
METHOD c sendContentUpdates ()V
1 change: 1 addition & 0 deletions mappings/net/minecraft/container/CraftingTableContainer.mapping
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ CLASS ats net/minecraft/container/CraftingTableContainer
METHOD b close (Lark;)V
METHOD b transferSlot (Lark;I)Laxd;
ARG 1 player
ARG 2 invSlot
METHOD e clearCraftingSlots ()V
METHOD f getCraftingResultSlotIndex ()I
METHOD g getCraftingWidth ()I
Expand Down
1 change: 1 addition & 0 deletions mappings/net/minecraft/container/DispenserContainer.mapping
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,4 @@ CLASS atu net/minecraft/container/DispenserContainer
METHOD b close (Lark;)V
METHOD b transferSlot (Lark;I)Laxd;
ARG 1 player
ARG 2 invSlot
4 changes: 4 additions & 0 deletions mappings/net/minecraft/container/DoubleLockableContainer.mapping
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,17 @@ CLASS afr net/minecraft/container/DoubleLockableContainer
METHOD T_ clearInv ()V
METHOD U_ getInvSize ()I
METHOD a getInvStack (I)Laxd;
ARG 1 slot
METHOD a takeInvStack (II)Laxd;
ARG 1 slot
METHOD a setInvStack (ILaxd;)V
ARG 1 slot
ARG 2 itemStack
METHOD a isPart (Lafs;)Z
METHOD a canPlayerUseInv (Lark;)Z
ARG 1 playerEntity
METHOD b removeInvStack (I)Laxd;
ARG 1 slot
METHOD b isValidInvStack (ILaxd;)Z
ARG 1 slot
METHOD b_ onInvOpen (Lark;)V
Expand Down
1 change: 1 addition & 0 deletions mappings/net/minecraft/container/EnchantingTableContainer.mapping
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,3 +23,4 @@ CLASS atv net/minecraft/container/EnchantingTableContainer
METHOD b close (Lark;)V
METHOD b transferSlot (Lark;I)Laxd;
ARG 1 player
ARG 2 invSlot
2 changes: 2 additions & 0 deletions mappings/net/minecraft/container/FurnaceContainer.mapping
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
CLASS atx net/minecraft/container/FurnaceContainer
METHOD a isSmeltable (Laxd;)Z
ARG 1 itemStack
METHOD b isFuel (Laxd;)Z
ARG 1 itemStack
1 change: 1 addition & 0 deletions mappings/net/minecraft/container/GenericContainer.mapping
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,5 @@ CLASS atm net/minecraft/container/GenericContainer
METHOD b close (Lark;)V
METHOD b transferSlot (Lark;I)Laxd;
ARG 1 player
ARG 2 invSlot
METHOD e getInventory ()Lafs;
1 change: 1 addition & 0 deletions mappings/net/minecraft/container/GrindstoneContainer.mapping
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,3 +17,4 @@ CLASS atz net/minecraft/container/GrindstoneContainer
METHOD b close (Lark;)V
METHOD b transferSlot (Lark;I)Laxd;
ARG 1 player
ARG 2 invSlot
1 change: 1 addition & 0 deletions mappings/net/minecraft/container/HopperContainer.mapping
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,4 @@ CLASS aua net/minecraft/container/HopperContainer
METHOD b close (Lark;)V
METHOD b transferSlot (Lark;I)Laxd;
ARG 1 player
ARG 2 invSlot
1 change: 1 addition & 0 deletions mappings/net/minecraft/container/HorseContainer.mapping
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,3 +12,4 @@ CLASS aub net/minecraft/container/HorseContainer
METHOD b close (Lark;)V
METHOD b transferSlot (Lark;I)Laxd;
ARG 1 player
ARG 2 invSlot
6 changes: 5 additions & 1 deletion mappings/aud.mapping → ...ecraft/container/LecternContainer.mapping
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,13 @@
CLASS aud
CLASS aud net/minecraft/container/LecternContainer
CLASS aud$1
METHOD d markDirty ()V
FIELD a inventory Lafs;
FIELD d propertyDelegate Lato;
METHOD a setProperty (II)V
ARG 1 pos
ARG 2 propertyId
METHOD a canUse (Lark;)Z
METHOD a onButtonClick (Lark;I)Z
ARG 1 player
ARG 2 id
METHOD e getBookItem ()Laxd;
1 change: 1 addition & 0 deletions mappings/net/minecraft/container/LoomContainer.mapping
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ CLASS aue net/minecraft/container/LoomContainer
METHOD b close (Lark;)V
METHOD b transferSlot (Lark;I)Laxd;
ARG 1 player
ARG 2 invSlot
METHOD e clearCraftingSlots ()V
METHOD f getCraftingResultSlotIndex ()I
METHOD g getCraftingWidth ()I
Expand Down
1 change: 1 addition & 0 deletions mappings/net/minecraft/container/PlayerContainer.mapping
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ CLASS auc net/minecraft/container/PlayerContainer
METHOD b close (Lark;)V
METHOD b transferSlot (Lark;I)Laxd;
ARG 1 player
ARG 2 invSlot
METHOD e clearCraftingSlots ()V
METHOD f getCraftingResultSlotIndex ()I
METHOD g getCraftingWidth ()I
Expand Down
1 change: 1 addition & 0 deletions mappings/net/minecraft/container/ShulkerBoxContainer.mapping
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,4 @@ CLASS aup net/minecraft/container/ShulkerBoxContainer
METHOD b close (Lark;)V
METHOD b transferSlot (Lark;I)Laxd;
ARG 1 player
ARG 2 invSlot
2 changes: 2 additions & 0 deletions mappings/net/minecraft/container/SmokerContainer.mapping
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
CLASS aut net/minecraft/container/SmokerContainer
METHOD a isSmeltable (Laxd;)Z
ARG 1 itemStack
METHOD b isFuel (Laxd;)Z
ARG 1 itemStack
1 change: 1 addition & 0 deletions mappings/net/minecraft/container/VillagerContainer.mapping
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,5 @@ CLASS aui net/minecraft/container/VillagerContainer
METHOD b close (Lark;)V
METHOD b transferSlot (Lark;I)Laxd;
ARG 1 player
ARG 2 invSlot
METHOD d setRecipeIndex (I)V
4 changes: 4 additions & 0 deletions mappings/net/minecraft/entity/player/PlayerInventory.mapping
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,19 +10,23 @@ CLASS arj net/minecraft/entity/player/PlayerInventory
METHOD T_ clearInv ()V
METHOD U_ getInvSize ()I
METHOD a getInvStack (I)Laxd;
ARG 1 slot
METHOD a takeInvStack (II)Laxd;
ARG 1 slot
METHOD a setInvStack (ILaxd;)V
ARG 1 slot
ARG 2 itemStack
METHOD a clone (Larj;)V
METHOD a canPlayerUseInv (Lark;)Z
ARG 1 playerEntity
METHOD a populateRecipeFinder (Larm;)V
METHOD a addPickBlock (Laxd;)V
METHOD a canStackAddMore (Laxd;Laxd;)Z
ARG 1 existingStack
METHOD a getBlockBreakingSpeed (Lbqe;)F
METHOD a serialize (Lhy;)Lhy;
METHOD b removeInvStack (I)Laxd;
ARG 1 slot
METHOD b getSlotWithStack (Laxd;)I
METHOD b areItemsEqual (Laxd;Laxd;)Z
ARG 1 stack1
Expand Down
4 changes: 4 additions & 0 deletions mappings/net/minecraft/entity/vehicle/StorageMinecartEntity.mapping
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,17 +7,21 @@ CLASS ass net/minecraft/entity/vehicle/StorageMinecartEntity
METHOD T_ clearInv ()V
METHOD Y invalidate ()V
METHOD a getInvStack (I)Laxd;
ARG 1 slot
METHOD a takeInvStack (II)Laxd;
ARG 1 slot
METHOD a setInvStack (ILaxd;)V
ARG 1 slot
ARG 2 itemStack
METHOD a dropItems (Lagm;)V
METHOD a canPlayerUseInv (Lark;)Z
ARG 1 playerEntity
METHOD a changeDimension (Lbsy;)Lahd;
METHOD a readCustomDataFromTag (Lhs;)V
METHOD a setLootTable (Lqe;J)V
ARG 1 id
METHOD b removeInvStack (I)Laxd;
ARG 1 slot
METHOD b interact (Lark;Lafy;)Z
ARG 1 player
METHOD b writeCustomDataToTag (Lhs;)V
Expand Down
Loading

0 comments on commit 9ecf444

Please sign in to comment.