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

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

1 files changed, 45 insertions, 0 deletions

diff --git a/Minecraft.Client/Common/UI/UIScene_NewUpdateMessage.h b/Minecraft.Client/Common/UI/UIScene_NewUpdateMessage.h
new file mode 100644
index 00000000..1529187f
--- /dev/null
+++ b/Minecraft.Client/Common/UI/UIScene_NewUpdateMessage.h
@@ -0,0 +1,45 @@
+#pragma once
+
+#include "UIScene.h"
+
+class UIScene_NewUpdateMessage : public UIScene
+{
+private:
+	enum EControls
+	{
+		eControl_Confirm,
+	};
+
+	bool m_bIgnoreInput;
+
+	UIControl_Button m_buttonConfirm;
+	UIControl_DynamicLabel m_labelDescription;
+	UI_BEGIN_MAP_ELEMENTS_AND_NAMES(UIScene)
+		UI_MAP_ELEMENT(m_buttonConfirm, "AcceptButton")
+		UI_MAP_ELEMENT(m_labelDescription, "EULAtext")
+	UI_END_MAP_ELEMENTS_AND_NAMES()
+
+public:
+	UIScene_NewUpdateMessage(int iPad, void *initData, UILayer *parentLayer);
+	~UIScene_NewUpdateMessage();
+
+	virtual EUIScene getSceneType() { return eUIScene_EULA;}
+
+	// Returns true if this scene has focus for the pad passed in
+#ifndef __PS3__
+	virtual bool hasFocus(int iPad) { return bHasFocus; }
+#endif
+	virtual void updateTooltips();
+
+protected:
+	virtual wstring getMoviePath();
+
+public:
+	// INPUT
+	virtual void handleInput(int iPad, int key, bool repeat, bool pressed, bool released, bool &handled);
+
+protected:
+	void handlePress(F64 controlId, F64 childId);
+
+	virtual long long getDefaultGtcButtons() { return 0; }
+};