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

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

1 files changed, 40 insertions, 0 deletions

diff --git a/Minecraft.Client/Common/UI/UIScene_HopperMenu.h b/Minecraft.Client/Common/UI/UIScene_HopperMenu.h
new file mode 100644
index 00000000..ff058fe8
--- /dev/null
+++ b/Minecraft.Client/Common/UI/UIScene_HopperMenu.h
@@ -0,0 +1,40 @@
+#pragma once
+
+#include "UIScene_AbstractContainerMenu.h"
+#include "IUIScene_HopperMenu.h"
+
+class InventoryMenu;
+
+class UIScene_HopperMenu : public UIScene_AbstractContainerMenu, public IUIScene_HopperMenu
+{
+private:
+	int m_containerSize;
+
+public:
+	UIScene_HopperMenu(int iPad, void *initData, UILayer *parentLayer);
+
+	virtual EUIScene getSceneType() { return eUIScene_HopperMenu;}
+
+protected:
+	UIControl_SlotList m_slotListTrap;
+	UIControl_Label m_labelDispenser;
+
+	UI_BEGIN_MAP_ELEMENTS_AND_NAMES(UIScene_AbstractContainerMenu)
+		UI_BEGIN_MAP_CHILD_ELEMENTS( m_controlMainPanel )
+			UI_MAP_ELEMENT( m_slotListTrap, "Trap")
+			UI_MAP_ELEMENT( m_labelDispenser, "dispenserLabel")
+		UI_END_MAP_CHILD_ELEMENTS()
+	UI_END_MAP_ELEMENTS_AND_NAMES()
+
+	virtual wstring getMoviePath();
+	virtual void handleReload();
+
+	virtual int getSectionColumns(ESceneSection eSection);
+	virtual int getSectionRows(ESceneSection eSection);
+	virtual void GetPositionOfSection( ESceneSection eSection, UIVec2D* pPosition );
+	virtual void GetItemScreenData( ESceneSection eSection, int iItemIndex, UIVec2D* pPosition, UIVec2D* pSize );
+	virtual void handleSectionClick(ESceneSection eSection) {}
+	virtual void setSectionSelectedSlot(ESceneSection eSection, int x, int y);
+
+	virtual UIControl *getSection(ESceneSection eSection);
+};
\ No newline at end of file