From 80fbe2cea7cf8735c8f12e404636f34b745ed63d Mon Sep 17 00:00:00 2001
From: yitzy299 <66269211+yitzy299@users.noreply.github.com>
Date: Wed, 9 Dec 2020 13:21:10 +0000
Subject: [PATCH] Mapped parts of ScreenHandler (#1910)

* Mapped some methods in ScreenHandler

- Mapped method_30010 as removeStack
- Mapped some variable related to these methods
- A few more mappings in ScreenHandler

* Complete requested changes from PR review

- Changed back unrelated methods
- Fixed an area of ambiguity in onSlotClick

* Changed slotid to slotIndex

Fixing issue raised by Juuxel
---
 mappings/net/minecraft/screen/ScreenHandler.mapping        | 7 ++++++-
 .../net/minecraft/util/collection/DefaultedList.mapping    | 2 +-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/mappings/net/minecraft/screen/ScreenHandler.mapping b/mappings/net/minecraft/screen/ScreenHandler.mapping
index ee4fea07de..aa6ac37d36 100644
--- a/mappings/net/minecraft/screen/ScreenHandler.mapping
+++ b/mappings/net/minecraft/screen/ScreenHandler.mapping
@@ -33,8 +33,11 @@ CLASS net/minecraft/class_1703 net/minecraft/screen/ScreenHandler
 		ARG 0 context
 		ARG 1 player
 		ARG 2 block
-	METHOD method_30010 (IILnet/minecraft/class_1713;Lnet/minecraft/class_1657;)Lnet/minecraft/class_1799;
+	METHOD method_30010 removeStack (IILnet/minecraft/class_1713;Lnet/minecraft/class_1657;)Lnet/minecraft/class_1799;
+		ARG 1 slotIndex
 		ARG 2 clickData
+		ARG 3 actionType
+		ARG 4 player
 	METHOD method_7590 setPlayerRestriction (Lnet/minecraft/class_1657;Z)V
 		ARG 1 player
 		ARG 2 unrestricted
@@ -48,9 +51,11 @@ CLASS net/minecraft/class_1703 net/minecraft/screen/ScreenHandler
 	METHOD method_7593 onSlotClick (IILnet/minecraft/class_1713;Lnet/minecraft/class_1657;)Lnet/minecraft/class_1799;
 		COMMENT Performs a slot click. This can behave in many different ways depending mainly on the action type.
 		COMMENT @return The stack that was clicked on before anything changed, used mostly for verifying that the client and server are in sync
+		ARG 1 slotIndex
 		ARG 2 clickData
 		ARG 3 actionType
 			COMMENT The type of slot click. Check the docs for each SlotActionType value for details
+		ARG 4 player
 	METHOD method_7594 unpackQuickCraftStage (I)I
 		ARG 0 quickCraftData
 	METHOD method_7595 close (Lnet/minecraft/class_1657;)V
diff --git a/mappings/net/minecraft/util/collection/DefaultedList.mapping b/mappings/net/minecraft/util/collection/DefaultedList.mapping
index 47d7609afd..0a6fc2682c 100644
--- a/mappings/net/minecraft/util/collection/DefaultedList.mapping
+++ b/mappings/net/minecraft/util/collection/DefaultedList.mapping
@@ -20,4 +20,4 @@ CLASS net/minecraft/class_2371 net/minecraft/util/collection/DefaultedList
 		ARG 1 index
 	METHOD set (ILjava/lang/Object;)Ljava/lang/Object;
 		ARG 1 index
-		ARG 2 element
+		ARG 2 element
\ No newline at end of file