a9be52c41a
* Fixed boats falling and a TP glitch #266 * Replaced every C-style cast with C++ ones * Replaced every C-style cast with C++ ones * Fixed boats falling and a TP glitch #266 * Updated NULL to nullptr and fixing some type issues * Modernized and fixed a few bugs - Replaced most instances of `NULL` with `nullptr`. - Replaced most `shared_ptr(new ...)` with `make_shared`. - Removed the `nullptr` macro as it was interfering with the actual nullptr keyword in some instances. * Fixing more conflicts * Replace int loops with size_t and start work on overrides
95 lines
2.8 KiB
C++
95 lines
2.8 KiB
C++
#include "stdafx.h"
|
|
#include "ConnectScreen.h"
|
|
#include "ClientConnection.h"
|
|
#include "TitleScreen.h"
|
|
#include "Button.h"
|
|
#include "Minecraft.h"
|
|
#include "User.h"
|
|
#include "..\Minecraft.World\net.minecraft.locale.h"
|
|
|
|
|
|
ConnectScreen::ConnectScreen(Minecraft *minecraft, const wstring& ip, int port)
|
|
{
|
|
aborted = false;
|
|
// System.out.println("Connecting to " + ip + ", " + port);
|
|
minecraft->setLevel(nullptr);
|
|
#if 1
|
|
// 4J - removed from separate thread, but need to investigate what we actually need here
|
|
connection = new ClientConnection(minecraft, ip, port);
|
|
if (aborted) return;
|
|
connection->send(std::make_shared<PreLoginPacket>(minecraft->user->name));
|
|
#else
|
|
|
|
new Thread() {
|
|
public void run() {
|
|
|
|
try {
|
|
connection = new ClientConnection(minecraft, ip, port);
|
|
if (aborted) return;
|
|
connection.send(new PreLoginPacket(minecraft.user.name));
|
|
} catch (UnknownHostException e) {
|
|
if (aborted) return;
|
|
minecraft.setScreen(new DisconnectedScreen("connect.failed", "disconnect.genericReason", "Unknown host '" + ip + "'"));
|
|
} catch (ConnectException e) {
|
|
if (aborted) return;
|
|
minecraft.setScreen(new DisconnectedScreen("connect.failed", "disconnect.genericReason", e.getMessage()));
|
|
} catch (Exception e) {
|
|
if (aborted) return;
|
|
e.printStackTrace();
|
|
minecraft.setScreen(new DisconnectedScreen("connect.failed", "disconnect.genericReason", e.toString()));
|
|
}
|
|
}
|
|
}.start();
|
|
#endif
|
|
}
|
|
|
|
void ConnectScreen::tick()
|
|
{
|
|
if (connection != nullptr)
|
|
{
|
|
connection->tick();
|
|
}
|
|
}
|
|
|
|
void ConnectScreen::keyPressed(char eventCharacter, int eventKey)
|
|
{
|
|
}
|
|
|
|
void ConnectScreen::init()
|
|
{
|
|
Language *language = Language::getInstance();
|
|
|
|
buttons.clear();
|
|
buttons.push_back(new Button(0, width / 2 - 100, height / 4 + 24 * 5 + 12, language->getElement(L"gui.cancel")));
|
|
|
|
}
|
|
|
|
void ConnectScreen::buttonClicked(Button *button)
|
|
{
|
|
if (button->id == 0)
|
|
{
|
|
aborted = true;
|
|
if (connection != nullptr) connection->close();
|
|
minecraft->setScreen(new TitleScreen());
|
|
}
|
|
}
|
|
|
|
void ConnectScreen::render(int xm, int ym, float a)
|
|
{
|
|
renderBackground();
|
|
|
|
Language *language = Language::getInstance();
|
|
|
|
if (connection == nullptr)
|
|
{
|
|
drawCenteredString(font, language->getElement(L"connect.connecting"), width / 2, height / 2 - 50, 0xffffff);
|
|
drawCenteredString(font, L"", width / 2, height / 2 - 10, 0xffffff);
|
|
}
|
|
else
|
|
{
|
|
drawCenteredString(font, language->getElement(L"connect.authorizing"), width / 2, height / 2 - 50, 0xffffff);
|
|
drawCenteredString(font, connection->message, width / 2, height / 2 - 10, 0xffffff);
|
|
}
|
|
|
|
Screen::render(xm, ym, a);
|
|
} |