From e70e7e9e03e1d691924cc544f535dd262d03cbb0 Mon Sep 17 00:00:00 2001 From: MattiDragon <61198884+MattiDragon@users.noreply.github.com> Date: Thu, 3 Nov 2022 20:00:09 +0200 Subject: [PATCH] Map Bookshelf Inventory (#3375) * Map Bookshelf Inventory * Fix typo (hope this works from the web editor) * Update mappings/net/minecraft/block/entity/ChiseledBookshelfBlockEntity.mapping Co-authored-by: enbrain <69905075+enbrain@users.noreply.github.com> Co-authored-by: Shnupbups Co-authored-by: enbrain <69905075+enbrain@users.noreply.github.com> --- .../block/ChiseledBookshelfBlock.mapping | 11 +++++++ .../ChiseledBookshelfBlockEntity.mapping | 10 ++++++ .../inventory/StackMappingInventory.mapping | 31 +++++++++++++++++++ 3 files changed, 52 insertions(+) create mode 100644 mappings/net/minecraft/inventory/StackMappingInventory.mapping diff --git a/mappings/net/minecraft/block/ChiseledBookshelfBlock.mapping b/mappings/net/minecraft/block/ChiseledBookshelfBlock.mapping index e08bf2d3f7..45ecb68ee8 100644 --- a/mappings/net/minecraft/block/ChiseledBookshelfBlock.mapping +++ b/mappings/net/minecraft/block/ChiseledBookshelfBlock.mapping @@ -2,4 +2,15 @@ CLASS net/minecraft/class_7714 net/minecraft/block/ChiseledBookshelfBlock FIELD field_40305 BOOKS_STORED Lnet/minecraft/class_2758; FIELD field_40306 LAST_INTERACTION_BOOK_SLOT Lnet/minecraft/class_2758; METHOD method_45457 tryRemoveBook (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_1657;Lnet/minecraft/class_7716;)Lnet/minecraft/class_1269; + ARG 0 world + ARG 1 pos + ARG 2 player + ARG 3 blockEntity METHOD method_45458 tryAddBook (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_1657;Lnet/minecraft/class_7716;Lnet/minecraft/class_1799;)Lnet/minecraft/class_1269; + ARG 0 world + ARG 1 pos + ARG 2 player + ARG 3 blockEntity + ARG 4 stack + METHOD method_46681 (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_1799;)V + ARG 2 stack diff --git a/mappings/net/minecraft/block/entity/ChiseledBookshelfBlockEntity.mapping b/mappings/net/minecraft/block/entity/ChiseledBookshelfBlockEntity.mapping index 191c19aaad..d02b335aaf 100644 --- a/mappings/net/minecraft/block/entity/ChiseledBookshelfBlockEntity.mapping +++ b/mappings/net/minecraft/block/entity/ChiseledBookshelfBlockEntity.mapping @@ -1,10 +1,20 @@ CLASS net/minecraft/class_7716 net/minecraft/block/entity/ChiseledBookshelfBlockEntity FIELD field_40331 MAX_BOOKS I FIELD field_40332 books Lnet/minecraft/class_7865; + FIELD field_40898 LOGGER Lorg/slf4j/Logger; METHOD (Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;)V ARG 1 pos ARG 2 state METHOD method_45462 addBook (Lnet/minecraft/class_1799;)Z + ARG 1 stack METHOD method_45463 getBooksAsList (Lnet/minecraft/class_7865;)Lnet/minecraft/class_2371; + ARG 0 inventory METHOD method_45464 getLastBook ()Lnet/minecraft/class_1799; METHOD method_45466 getBookCount ()I + METHOD method_45468 isFull ()Z + METHOD method_46690 (Lnet/minecraft/class_1792;Lnet/minecraft/class_1799;)Z + ARG 1 stack + METHOD method_46691 (Ljava/util/Set;Lnet/minecraft/class_1799;)Z + ARG 1 stack + METHOD method_46692 getAndClearBooks ()Ljava/util/List; + METHOD method_46693 updateState ()V diff --git a/mappings/net/minecraft/inventory/StackMappingInventory.mapping b/mappings/net/minecraft/inventory/StackMappingInventory.mapping new file mode 100644 index 0000000000..c124200a79 --- /dev/null +++ b/mappings/net/minecraft/inventory/StackMappingInventory.mapping @@ -0,0 +1,31 @@ +CLASS net/minecraft/class_7865 net/minecraft/inventory/StackMappingInventory + FIELD field_40868 topSlot I + FIELD field_40869 emptySlots [Z + FIELD field_40870 slotMap [I + FIELD field_40871 stacks [Lnet/minecraft/class_1799; + FIELD field_40872 size I + METHOD (I)V + ARG 1 size + METHOD method_46652 removeTopStack ()Lnet/minecraft/class_1799; + METHOD method_46653 hasSlot (I)Z + ARG 1 slot + METHOD method_46654 addStack (Lnet/minecraft/class_1799;)Z + ARG 1 stack + METHOD method_46655 addStack (Lnet/minecraft/class_1799;I)Z + ARG 1 stack + ARG 2 slot + METHOD method_46656 getItemCount ()I + METHOD method_46657 getStack (I)Lnet/minecraft/class_1799; + ARG 1 slot + METHOD method_46658 setStack (Lnet/minecraft/class_1799;I)Z + ARG 1 stack + ARG 2 slot + METHOD method_46659 isFull ()Z + METHOD method_46660 removeStack (I)Lnet/minecraft/class_1799; + ARG 1 slot + METHOD method_46661 isEmpty ()Z + METHOD method_46662 getStacks ()Ljava/util/List; + METHOD method_46663 clear ()Ljava/util/List; + METHOD method_46664 flatten ()Lnet/minecraft/class_7865$class_7866; + METHOD method_46665 findEmptySlot ()I + CLASS class_7866 FlatteningType