Merge branch 'main' into pr/win64-world-saves

# Conflicts:
#	Minecraft.Client/MinecraftServer.cpp
#	README.md

1 files changed, 77 insertions, 0 deletions

diff --git a/Minecraft.Client/Common/UI/IUIScene_HopperMenu.cpp b/Minecraft.Client/Common/UI/IUIScene_HopperMenu.cpp
new file mode 100644
index 00000000..392c12d4
--- /dev/null
+++ b/Minecraft.Client/Common/UI/IUIScene_HopperMenu.cpp
@@ -0,0 +1,77 @@
+#include "stdafx.h"
+#include "IUIScene_HopperMenu.h"
+#include "../Minecraft.World/net.minecraft.world.inventory.h"
+
+IUIScene_AbstractContainerMenu::ESceneSection IUIScene_HopperMenu::GetSectionAndSlotInDirection( ESceneSection eSection, ETapState eTapDirection, int *piTargetX, int *piTargetY )
+{
+	ESceneSection newSection = eSection;
+
+	int xOffset = 0;
+
+	// Find the new section if there is one
+	switch( eSection )
+	{
+		case eSectionHopperContents:
+			if(eTapDirection == eTapStateDown)
+			{
+				newSection = eSectionHopperInventory;
+				xOffset  = -2;
+			}
+			else if(eTapDirection == eTapStateUp)
+			{
+				xOffset = -2;
+				newSection = eSectionHopperUsing;
+			}
+			break;
+		case eSectionHopperInventory:
+			if(eTapDirection == eTapStateDown)
+			{
+				newSection = eSectionHopperUsing;
+			}
+			else if(eTapDirection == eTapStateUp)
+			{
+				xOffset = 2;
+				newSection = eSectionHopperContents;
+			}
+			break;
+		case eSectionHopperUsing:
+			if(eTapDirection == eTapStateDown)
+			{
+				xOffset = 2;
+				newSection = eSectionHopperContents;
+			}
+			else if(eTapDirection == eTapStateUp)
+			{
+				newSection = eSectionHopperInventory;
+			}
+			break;
+		default:
+			assert(false);
+			break;
+	}
+
+	updateSlotPosition(eSection, newSection, eTapDirection, piTargetX, piTargetY, xOffset);
+
+	return newSection;
+}
+
+int IUIScene_HopperMenu::getSectionStartOffset(ESceneSection eSection)
+{
+	int offset = 0;
+	switch( eSection )
+	{
+		case eSectionHopperContents:
+			offset = HopperMenu::CONTENTS_SLOT_START;
+			break;
+		case eSectionHopperInventory:
+			offset = HopperMenu::INV_SLOT_START;
+			break;
+		case eSectionHopperUsing:
+			offset = HopperMenu::USE_ROW_SLOT_START;
+			break;
+		default:
+			assert( false );
+			break;
+	}
+	return offset;
+}
\ No newline at end of file