Merge branch 'smartcmd:main' into main

1 files changed, 17 insertions, 5 deletions

diff --git a/Minecraft.Client/ChatScreen.h b/Minecraft.Client/ChatScreen.h
index d7158478..c4e37a93 100644
--- a/Minecraft.Client/ChatScreen.h
+++ b/Minecraft.Client/ChatScreen.h
@@ -1,21 +1,33 @@
 #pragma once
 #include "Screen.h"
+#include <vector>
 using namespace std;
 
 class ChatScreen : public Screen
 {
 protected:
 	wstring message;
+	int cursorIndex;
+	void applyHistoryMessage();
+
 private:
 	int frame;
+	static const size_t CHAT_HISTORY_MAX = 100;
+	static std::vector<wstring> s_chatHistory;
+	static int s_historyIndex;
+	static wstring s_historyDraft;
+	static const wstring allowedChars;
+	static bool isAllowedChatChar(wchar_t c);
 
 public:
-	ChatScreen();	//4J added
+	ChatScreen();
 	virtual void init();
-    virtual void removed();
-    virtual void tick();
-private:
-	static const wstring allowedChars;
+	virtual void removed();
+	virtual void tick();
+	virtual void handlePasteRequest();
+	virtual void handleHistoryUp();
+	virtual void handleHistoryDown();
+
 protected:
 	void keyPressed(wchar_t ch, int eventKey);
 public: