backups/4jcraft
2
0
Fork 0
mirror of https://github.com/4jcraft/4jcraft.git synced 2026-08-20 09:57:10 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

refactor(jui): specify overrides, resourcelocations, and localization

Browse source
This commit is contained in:
Sally Knight 2026-03-27 20:33:41 +03:00 committed by Tropical
parent c512bcb19c
commit 1a478c8a5b
40 changed files with 218 additions and 201 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
Minecraft.Client/UI/Button.cpp
View file

@ -2,6 +2,10 @@
#include "Button.h" #include "Button.h"
#include "../Textures/Textures.h" #include "../Textures/Textures.h"
#ifdef ENABLE_JAVA_GUIS
ResourceLocation GUI_GUI_LOCATION = ResourceLocation(TN_GUI_GUI);
#endif
Button::Button(int id, int x, int y, const std::wstring& msg) { Button::Button(int id, int x, int y, const std::wstring& msg) {
init(id, x, y, 200, 20, msg); init(id, x, y, 200, 20, msg);
} }
@ -38,8 +42,9 @@ void Button::render(Minecraft* minecraft, int xm, int ym) {
Font* font = minecraft->font; Font* font = minecraft->font;
glBindTexture(GL_TEXTURE_2D, minecraft->textures->loadTexture( // glBindTexture(GL_TEXTURE_2D, minecraft->textures->loadTexture(
TN_GUI_GUI)); // 4J was L"/gui/gui.png" // TN_GUI_GUI)); // 4J was L"/gui/gui.png"
minecraft->textures->bindTexture(&GUI_GUI_LOCATION);
glColor4f(1, 1, 1, 1); glColor4f(1, 1, 1, 1);
bool hovered = xm >= x && ym >= y && xm < x + w && ym < y + h; bool hovered = xm >= x && ym >= y && xm < x + w && ym < y + h;

18
Minecraft.Client/UI/Screens/AbstractContainerScreen.h
View file

@ -17,8 +17,8 @@ public:
AbstractContainerMenu* menu; AbstractContainerMenu* menu;
AbstractContainerScreen(AbstractContainerMenu* menu); AbstractContainerScreen(AbstractContainerMenu* menu);
virtual void init(); virtual void init() override;
virtual void render(int xm, int ym, float a); virtual void render(int xm, int ym, float a) override;
protected: protected:
virtual void renderLabels(); virtual void renderLabels();
@ -33,13 +33,13 @@ private:
virtual void renderSlot(Slot* slot); virtual void renderSlot(Slot* slot);
protected: protected:
virtual void mouseClicked(int x, int y, int buttonNum); virtual void mouseClicked(int x, int y, int buttonNum) override;
virtual void mouseReleased(int x, int y, int buttonNum); virtual void mouseReleased(int x, int y, int buttonNum) override;
virtual void keyPressed(wchar_t eventCharacter, int eventKey); virtual void keyPressed(wchar_t eventCharacter, int eventKey) override;
public: public:
virtual void removed(); virtual void removed() override;
virtual void slotsChanged(std::shared_ptr<Container> container); virtual void slotsChanged(std::shared_ptr<Container> container);
virtual bool isPauseScreen(); virtual bool isPauseScreen() override;
virtual void tick(); virtual void tick() override;
}; };

10
Minecraft.Client/UI/Screens/AchievementScreen.h
View file

@ -43,20 +43,20 @@ public:
using Screen::keyPressed; using Screen::keyPressed;
AchievementScreen(StatsCounter* statsCounter); AchievementScreen(StatsCounter* statsCounter);
virtual void init(); virtual void init() override;
protected: protected:
virtual void buttonClicked(Button* button); virtual void buttonClicked(Button* button) override;
virtual void keyPressed(char eventCharacter, int eventKey); virtual void keyPressed(char eventCharacter, int eventKey);
public: public:
virtual void render(int mouseX, int mouseY, float a); virtual void render(int mouseX, int mouseY, float a) override;
virtual void tick(); virtual void tick() override;
protected: protected:
virtual void renderLabels(); virtual void renderLabels();
virtual void renderBg(int xm, int ym, float a); virtual void renderBg(int xm, int ym, float a);
public: public:
virtual bool isPauseScreen(); virtual bool isPauseScreen() override;
}; };

12
Minecraft.Client/UI/Screens/ChatScreen.h
View file

@ -10,19 +10,19 @@ private:
public: public:
ChatScreen(); // 4J added ChatScreen(); // 4J added
virtual void init(); virtual void init() override;
virtual void removed(); virtual void removed() override;
virtual void tick(); virtual void tick() override;
private: private:
static const std::wstring allowedChars; static const std::wstring allowedChars;
protected: protected:
void keyPressed(wchar_t ch, int eventKey); void keyPressed(wchar_t ch, int eventKey) override;
public: public:
void render(int xm, int ym, float a); void render(int xm, int ym, float a) override;
protected: protected:
void mouseClicked(int x, int y, int buttonNum); void mouseClicked(int x, int y, int buttonNum) override;
}; };

6
Minecraft.Client/UI/Screens/ConfirmScreen.h
View file

@ -16,11 +16,11 @@ public:
ConfirmScreen(Screen* parent, const std::wstring& title1, ConfirmScreen(Screen* parent, const std::wstring& title1,
const std::wstring& title2, const std::wstring& yesButton, const std::wstring& title2, const std::wstring& yesButton,
const std::wstring& noButton, int id); const std::wstring& noButton, int id);
virtual void init(); virtual void init() override;
protected: protected:
virtual void buttonClicked(Button* button); virtual void buttonClicked(Button* button) override;
public: public:
virtual void render(int xm, int ym, float a); virtual void render(int xm, int ym, float a) override;
}; };

8
Minecraft.Client/UI/Screens/ConnectScreen.h
View file

@ -10,17 +10,17 @@ private:
public: public:
ConnectScreen(Minecraft* minecraft, const std::wstring& ip, int port); ConnectScreen(Minecraft* minecraft, const std::wstring& ip, int port);
virtual void tick(); virtual void tick() override;
protected: protected:
virtual void keyPressed(char eventCharacter, int eventKey); virtual void keyPressed(char eventCharacter, int eventKey);
public: public:
virtual void init(); virtual void init() override;
protected: protected:
virtual void buttonClicked(Button* button); virtual void buttonClicked(Button* button) override;
public: public:
virtual void render(int xm, int ym, float a); virtual void render(int xm, int ym, float a) override;
}; };

4
Minecraft.Client/UI/Screens/ContainerScreen.h
View file

@ -14,6 +14,6 @@ public:
std::shared_ptr<Container> container); std::shared_ptr<Container> container);
protected: protected:
virtual void renderLabels(); virtual void renderLabels() override;
virtual void renderBg(float a); virtual void renderBg(float a) override;
}; };

8
Minecraft.Client/UI/Screens/ControlsScreen.h
View file

@ -25,12 +25,12 @@ private:
int getLeftScreenPosition(); int getLeftScreenPosition();
public: public:
void init(); void init() override;
protected: protected:
void buttonClicked(Button* button); void buttonClicked(Button* button) override;
void keyPressed(wchar_t eventCharacter, int eventKey); void keyPressed(wchar_t eventCharacter, int eventKey) override;
public: public:
void render(int xm, int ym, float a); void render(int xm, int ym, float a) override;
}; };

16
Minecraft.Client/UI/Screens/CraftingScreen.cpp
View file

@ -2,11 +2,18 @@
#include "CraftingScreen.h" #include "CraftingScreen.h"
#include "../../Textures/Textures.h" #include "../../Textures/Textures.h"
#include "../../Player/MultiPlayerLocalPlayer.h" #include "../../Player/MultiPlayerLocalPlayer.h"
#include "../../../Minecraft.World/Headers/net.minecraft.locale.h"
#include "../../../Minecraft.World/Headers/net.minecraft.world.inventory.h" #include "../../../Minecraft.World/Headers/net.minecraft.world.inventory.h"
#ifdef ENABLE_JAVA_GUIS
ResourceLocation GUI_CRAFTING_LOCATION = ResourceLocation(TN_GUI_CRAFTING);
#endif
CraftingScreen::CraftingScreen(std::shared_ptr<Inventory> inventory, CraftingScreen::CraftingScreen(std::shared_ptr<Inventory> inventory,
Level* level, int x, int y, int z) Level* level, int x, int y, int z)
: AbstractContainerScreen(new CraftingMenu(inventory, level, x, y, z)) {} : AbstractContainerScreen(new CraftingMenu(inventory, level, x, y, z)) {
this->inventory = inventory;
}
void CraftingScreen::removed() { void CraftingScreen::removed() {
AbstractContainerScreen::removed(); AbstractContainerScreen::removed();
@ -14,16 +21,15 @@ void CraftingScreen::removed() {
} }
void CraftingScreen::renderLabels() { void CraftingScreen::renderLabels() {
font->draw(L"Crafting", 8 + 16 + 4, 2 + 2 + 2, 0x404040); font->draw(Language::getInstance()->getElement(L"container.crafting"), 8 + 16 + 4, 2 + 2 + 2, 0x404040);
font->draw(L"Inventory", 8, imageHeight - 96 + 2, 0x404040); font->draw(inventory->getName(), 8, imageHeight - 96 + 2, 0x404040);
} }
void CraftingScreen::renderBg(float a) { void CraftingScreen::renderBg(float a) {
// 4J Unused // 4J Unused
#ifdef ENABLE_JAVA_GUIS #ifdef ENABLE_JAVA_GUIS
int tex = minecraft->textures->loadTexture(TN_GUI_CRAFTING);
glColor4f(1, 1, 1, 1); glColor4f(1, 1, 1, 1);
minecraft->textures->bind(tex); minecraft->textures->bindTexture(&GUI_CRAFTING_LOCATION);
int xo = (width - imageWidth) / 2; int xo = (width - imageWidth) / 2;
int yo = (height - imageHeight) / 2; int yo = (height - imageHeight) / 2;
this->blit(xo, yo, 0, 0, imageWidth, imageHeight); this->blit(xo, yo, 0, 0, imageWidth, imageHeight);

9
Minecraft.Client/UI/Screens/CraftingScreen.h
View file

@ -4,12 +4,15 @@ class Inventory;
class Level; class Level;
class CraftingScreen : public AbstractContainerScreen { class CraftingScreen : public AbstractContainerScreen {
private:
std::shared_ptr<Inventory> inventory;
public: public:
CraftingScreen(std::shared_ptr<Inventory> inventory, Level* level, int x, CraftingScreen(std::shared_ptr<Inventory> inventory, Level* level, int x,
int y, int z); int y, int z);
virtual void removed(); virtual void removed() override;
protected: protected:
virtual void renderLabels(); virtual void renderLabels() override;
virtual void renderBg(float a); virtual void renderBg(float a) override;
}; };

16
Minecraft.Client/UI/Screens/CreateWorldScreen.h
View file

@ -31,8 +31,8 @@ private:
public: public:
CreateWorldScreen(Screen* lastScreen); CreateWorldScreen(Screen* lastScreen);
virtual void tick(); virtual void tick() override;
virtual void init(); virtual void init() override;
private: private:
void updateResultFolder(); void updateResultFolder();
@ -41,16 +41,16 @@ private:
public: public:
static std::wstring findAvailableFolderName(LevelStorageSource* levelSource, static std::wstring findAvailableFolderName(LevelStorageSource* levelSource,
const std::wstring& folder); const std::wstring& folder);
virtual void removed(); virtual void removed() override;
protected: protected:
virtual void buttonClicked(Button* button); virtual void buttonClicked(Button* button) override;
virtual void keyPressed(wchar_t ch, int eventKey); virtual void keyPressed(wchar_t ch, int eventKey) override;
virtual void mouseClicked(int x, int y, int buttonNum); virtual void mouseClicked(int x, int y, int buttonNum) override;
public: public:
virtual void render(int xm, int ym, float a); virtual void render(int xm, int ym, float a) override;
virtual void tabPressed(); virtual void tabPressed() override;
private: private:
int m_iGameModeId; int m_iGameModeId;

26
Minecraft.Client/UI/Screens/CreativeInventoryScreen.h
View file

@ -60,21 +60,19 @@ public:
}; };
public: public:
CreativeInventoryScreen(std::shared_ptr<Player> player); CreativeInventoryScreen(std::shared_ptr<Player> player);
virtual void removed(); virtual void removed() override;
virtual void init(); virtual void init() override;
virtual void containerTick(); virtual void containerTick();
virtual void tick(); virtual void tick() override;
virtual void updateEvents(); virtual void updateEvents() override;
virtual void keyPressed(wchar_t eventCharacter, int eventKey); virtual void keyPressed(wchar_t eventCharacter, int eventKey) override;
virtual void mouseClicked(int x, int y, int buttonNum); virtual void mouseClicked(int x, int y, int buttonNum) override;
virtual void mouseReleased(int x, int y, int buttonNum); virtual void mouseReleased(int x, int y, int buttonNum) override;
virtual void render(int xm, int ym, float a); virtual void render(int xm, int ym, float a) override;
protected: protected:
virtual void renderLabels(); virtual void renderLabels() override;
virtual void renderBg(float a); virtual void renderBg(float a) override;
private: private:
void setCurrentCreativeTab(int tab); void setCurrentCreativeTab(int tab);
void selectTab(int tab); void selectTab(int tab);

8
Minecraft.Client/UI/Screens/DeathScreen.h
View file

@ -3,13 +3,13 @@
class DeathScreen : public Screen { class DeathScreen : public Screen {
public: public:
virtual void init(); virtual void init() override;
protected: protected:
virtual void keyPressed(char eventCharacter, int eventKey); virtual void keyPressed(char eventCharacter, int eventKey);
virtual void buttonClicked(Button* button); virtual void buttonClicked(Button* button) override;
public: public:
virtual void render(int xm, int ym, float a); virtual void render(int xm, int ym, float a) override;
virtual bool isPauseScreen(); virtual bool isPauseScreen() override;
}; };

8
Minecraft.Client/UI/Screens/DisconnectedScreen.h
View file

@ -8,7 +8,7 @@ private:
public: public:
DisconnectedScreen(const std::wstring& title, const std::wstring reason, DisconnectedScreen(const std::wstring& title, const std::wstring reason,
void* reasonObjects, ...); void* reasonObjects, ...);
virtual void tick(); virtual void tick() override;
protected: protected:
using Screen::keyPressed; using Screen::keyPressed;
@ -16,11 +16,11 @@ protected:
virtual void keyPressed(char eventCharacter, int eventKey); virtual void keyPressed(char eventCharacter, int eventKey);
public: public:
virtual void init(); virtual void init() override;
protected: protected:
virtual void buttonClicked(Button* button); virtual void buttonClicked(Button* button) override;
public: public:
virtual void render(int xm, int ym, float a); virtual void render(int xm, int ym, float a) override;
}; };

14
Minecraft.Client/UI/Screens/EnchantmentScreen.h
View file

@ -9,13 +9,13 @@ public:
int y, int z); int y, int z);
virtual ~EnchantmentScreen(); virtual ~EnchantmentScreen();
void init(); void init() override;
void removed(); void removed() override;
void tick(); void tick() override;
void mouseClicked(int mouseX, int mouseY, int buttonNum); void mouseClicked(int mouseX, int mouseY, int buttonNum) override;
void renderLabels(); void renderLabels() override;
void renderBg(float a); void renderBg(float a) override;
void render(int xm, int ym, float a); void render(int xm, int ym, float a) override;
private: private:
std::shared_ptr<Inventory> inventory; std::shared_ptr<Inventory> inventory;

6
Minecraft.Client/UI/Screens/ErrorScreen.h
View file

@ -7,9 +7,9 @@ private:
public: public:
ErrorScreen(const std::wstring& title, const std::wstring& message); ErrorScreen(const std::wstring& title, const std::wstring& message);
virtual void init(); virtual void init() override;
virtual void render(int xm, int ym, float a); virtual void render(int xm, int ym, float a) override;
protected: protected:
virtual void keyPressed(wchar_t eventCharacter, int eventKey); virtual void keyPressed(wchar_t eventCharacter, int eventKey) override;
}; };

12
Minecraft.Client/UI/Screens/FurnaceScreen.cpp
View file

@ -6,23 +6,27 @@
#include "../../../Minecraft.World/Headers/net.minecraft.world.inventory.h" #include "../../../Minecraft.World/Headers/net.minecraft.world.inventory.h"
#include "../../../Minecraft.World/Blocks/TileEntities/FurnaceTileEntity.h" #include "../../../Minecraft.World/Blocks/TileEntities/FurnaceTileEntity.h"
#ifdef ENABLE_JAVA_GUIS
ResourceLocation GUI_FURNACE_LOCATION = ResourceLocation(TN_GUI_FURNACE);
#endif
FurnaceScreen::FurnaceScreen(std::shared_ptr<Inventory> inventory, FurnaceScreen::FurnaceScreen(std::shared_ptr<Inventory> inventory,
std::shared_ptr<FurnaceTileEntity> furnace) std::shared_ptr<FurnaceTileEntity> furnace)
: AbstractContainerScreen(new FurnaceMenu(inventory, furnace)) { : AbstractContainerScreen(new FurnaceMenu(inventory, furnace)) {
this->inventory = inventory;
this->furnace = furnace; this->furnace = furnace;
} }
void FurnaceScreen::renderLabels() { void FurnaceScreen::renderLabels() {
font->draw(L"Furnace", 16 + 4 + 40, 2 + 2 + 2, 0x404040); font->draw(furnace->getName(), 16 + 4 + 40, 2 + 2 + 2, 0x404040);
font->draw(L"Inventory", 8, imageHeight - 96 + 2, 0x404040); font->draw(inventory->getName(), 8, imageHeight - 96 + 2, 0x404040);
} }
void FurnaceScreen::renderBg(float a) { void FurnaceScreen::renderBg(float a) {
// 4J Unused // 4J Unused
#ifdef ENABLE_JAVA_GUIS #ifdef ENABLE_JAVA_GUIS
int tex = minecraft->textures->loadTexture(TN_GUI_FURNACE);
glColor4f(1, 1, 1, 1); glColor4f(1, 1, 1, 1);
minecraft->textures->bind(tex); minecraft->textures->bindTexture(&GUI_FURNACE_LOCATION);
int xo = (width - imageWidth) / 2; int xo = (width - imageWidth) / 2;
int yo = (height - imageHeight) / 2; int yo = (height - imageHeight) / 2;
this->blit(xo, yo, 0, 0, imageWidth, imageHeight); this->blit(xo, yo, 0, 0, imageWidth, imageHeight);

5
Minecraft.Client/UI/Screens/FurnaceScreen.h
View file

@ -6,6 +6,7 @@ class Inventory;
class FurnaceScreen : public AbstractContainerScreen { class FurnaceScreen : public AbstractContainerScreen {
private: private:
std::shared_ptr<Inventory> inventory;
std::shared_ptr<FurnaceTileEntity> furnace; std::shared_ptr<FurnaceTileEntity> furnace;
public: public:
@ -13,6 +14,6 @@ public:
std::shared_ptr<FurnaceTileEntity> furnace); std::shared_ptr<FurnaceTileEntity> furnace);
protected: protected:
virtual void renderLabels(); virtual void renderLabels() override;
virtual void renderBg(float a); virtual void renderBg(float a) override;
}; };

4
Minecraft.Client/UI/Screens/HopperScreen.h
View file

@ -12,8 +12,8 @@ public:
std::shared_ptr<Container> hopper); std::shared_ptr<Container> hopper);
protected: protected:
virtual void renderLabels(); virtual void renderLabels() override;
virtual void renderBg(float a); virtual void renderBg(float a) override;
private: private:
std::shared_ptr<Inventory> inventory; std::shared_ptr<Inventory> inventory;

10
Minecraft.Client/UI/Screens/InBedChatScreen.h
View file

@ -7,17 +7,17 @@ private:
static const int WAKE_UP_BUTTON = 1; static const int WAKE_UP_BUTTON = 1;
public: public:
virtual void init(); virtual void init() override;
virtual void removed(); virtual void removed() override;
protected: protected:
virtual void keyPressed(wchar_t ch, int eventKey); virtual void keyPressed(wchar_t ch, int eventKey) override;
public: public:
virtual void render(int xm, int ym, float a); virtual void render(int xm, int ym, float a) override;
protected: protected:
virtual void buttonClicked(Button* button); virtual void buttonClicked(Button* button) override;
private: private:
void sendWakeUp(); void sendWakeUp();

10
Minecraft.Client/UI/Screens/InventoryScreen.h
View file

@ -6,18 +6,18 @@ class Button;
class InventoryScreen : public AbstractContainerScreen { class InventoryScreen : public AbstractContainerScreen {
public: public:
InventoryScreen(std::shared_ptr<Player> player); InventoryScreen(std::shared_ptr<Player> player);
virtual void init(); virtual void init() override;
protected: protected:
virtual void renderLabels(); virtual void renderLabels() override;
private: private:
float xMouse, yMouse; float xMouse, yMouse;
public: public:
virtual void render(int xm, int ym, float a); virtual void render(int xm, int ym, float a) override;
protected: protected:
virtual void renderBg(float a); virtual void renderBg(float a) override;
virtual void buttonClicked(Button* button); virtual void buttonClicked(Button* button) override;
}; };

14
Minecraft.Client/UI/Screens/JoinMultiplayerScreen.h
View file

@ -10,20 +10,20 @@ private:
public: public:
JoinMultiplayerScreen(Screen* lastScreen); JoinMultiplayerScreen(Screen* lastScreen);
virtual void tick(); virtual void tick() override;
virtual void init(); virtual void init() override;
virtual void removed(); virtual void removed() override;
protected: protected:
virtual void buttonClicked(Button* button); virtual void buttonClicked(Button* button) override;
private: private:
virtual int parseInt(const std::wstring& str, int def); virtual int parseInt(const std::wstring& str, int def);
protected: protected:
virtual void keyPressed(wchar_t ch, int eventKey); virtual void keyPressed(wchar_t ch, int eventKey) override;
virtual void mouseClicked(int x, int y, int buttonNum); virtual void mouseClicked(int x, int y, int buttonNum) override;
public: public:
virtual void render(int xm, int ym, float a); virtual void render(int xm, int ym, float a) override;
}; };

6
Minecraft.Client/UI/Screens/MessageScreen.h
View file

@ -14,11 +14,11 @@ protected:
virtual void keyPressed(char eventCharacter, int eventKey); virtual void keyPressed(char eventCharacter, int eventKey);
public: public:
virtual void init(); virtual void init() override;
protected: protected:
virtual void buttonClicked(Button* button); virtual void buttonClicked(Button* button) override;
public: public:
virtual void render(int xm, int ym, float a); virtual void render(int xm, int ym, float a) override;
}; };

10
Minecraft.Client/UI/Screens/NameEntryScreen.h
View file

@ -15,9 +15,9 @@ private:
public: public:
NameEntryScreen(Screen* lastScreen, const std::wstring& oldName, int slot); NameEntryScreen(Screen* lastScreen, const std::wstring& oldName, int slot);
virtual void init(); virtual void init() override;
virtual void removed(); virtual void removed() override;
virtual void tick(); virtual void tick() override;
protected: protected:
virtual void buttonClicked(Button button); virtual void buttonClicked(Button button);
@ -26,8 +26,8 @@ private:
static const std::wstring allowedChars; static const std::wstring allowedChars;
protected: protected:
virtual void keyPressed(wchar_t ch, int eventKey); virtual void keyPressed(wchar_t ch, int eventKey) override;
public: public:
virtual void render(int xm, int ym, float a); virtual void render(int xm, int ym, float a) override;
}; };

6
Minecraft.Client/UI/Screens/OptionsScreen.h
View file

@ -16,11 +16,11 @@ private:
public: public:
OptionsScreen(Screen* lastScreen, Options* options); OptionsScreen(Screen* lastScreen, Options* options);
virtual void init(); virtual void init() override;
protected: protected:
virtual void buttonClicked(Button* button); virtual void buttonClicked(Button* button) override;
public: public:
virtual void render(int xm, int ym, float a); virtual void render(int xm, int ym, float a) override;
}; };

8
Minecraft.Client/UI/Screens/PauseScreen.h
View file

@ -8,15 +8,15 @@ private:
public: public:
PauseScreen(); // 4J added PauseScreen(); // 4J added
virtual void init(); virtual void init() override;
static void exitWorld(Minecraft* minecraft, bool save); static void exitWorld(Minecraft* minecraft, bool save);
protected: protected:
using Screen::buttonClicked; using Screen::buttonClicked;
virtual void buttonClicked(Button* button); virtual void buttonClicked(Button* button) override;
public: public:
virtual void tick(); virtual void tick() override;
virtual void render(int xm, int ym, float a); virtual void render(int xm, int ym, float a) override;
}; };

8
Minecraft.Client/UI/Screens/ReceivingLevelScreen.h
View file

@ -16,12 +16,12 @@ protected:
virtual void keyPressed(char eventCharacter, int eventKey); virtual void keyPressed(char eventCharacter, int eventKey);
public: public:
virtual void init(); virtual void init() override;
virtual void tick(); virtual void tick() override;
protected: protected:
virtual void buttonClicked(Button* button); virtual void buttonClicked(Button* button) override;
public: public:
virtual void render(int xm, int ym, float a); virtual void render(int xm, int ym, float a) override;
}; };

14
Minecraft.Client/UI/Screens/RenameWorldScreen.h
View file

@ -11,15 +11,15 @@ private:
public: public:
RenameWorldScreen(Screen* lastScreen, const std::wstring& levelId); RenameWorldScreen(Screen* lastScreen, const std::wstring& levelId);
virtual void tick(); virtual void tick() override;
virtual void init(); virtual void init() override;
virtual void removed(); virtual void removed() override;
protected: protected:
virtual void buttonClicked(Button* button); virtual void buttonClicked(Button* button) override;
virtual void keyPressed(wchar_t ch, int eventKey); virtual void keyPressed(wchar_t ch, int eventKey) override;
virtual void mouseClicked(int x, int y, int buttonNum); virtual void mouseClicked(int x, int y, int buttonNum) override;
public: public:
virtual void render(int xm, int ym, float a); virtual void render(int xm, int ym, float a) override;
}; };

8
Minecraft.Client/UI/Screens/SelectWorldScreen.h
View file

@ -41,7 +41,7 @@ private:
public: public:
SelectWorldScreen(Screen* lastScreen); SelectWorldScreen(Screen* lastScreen);
virtual void init(); virtual void init() override;
private: private:
void loadLevelList(); void loadLevelList();
@ -54,12 +54,12 @@ public:
virtual void postInit(); virtual void postInit();
protected: protected:
virtual void buttonClicked(Button* button); virtual void buttonClicked(Button* button) override;
public: public:
void worldSelected(int id); void worldSelected(int id);
void confirmResult(bool result, int id); void confirmResult(bool result, int id) override;
virtual void render(int xm, int ym, float a); virtual void render(int xm, int ym, float a) override;
class WorldSelectionList : public ScrolledSelectionList { class WorldSelectionList : public ScrolledSelectionList {
public: public:

6
Minecraft.Client/UI/Screens/StatsScreen.h
View file

@ -31,14 +31,14 @@ private:
public: public:
StatsScreen(Screen* lastScreen, StatsCounter* stats); StatsScreen(Screen* lastScreen, StatsCounter* stats);
virtual void init(); virtual void init() override;
virtual void postInit(); virtual void postInit();
protected: protected:
virtual void buttonClicked(Button* button); virtual void buttonClicked(Button* button) override;
public: public:
virtual void render(int xm, int ym, float a); virtual void render(int xm, int ym, float a) override;
class GeneralStatisticsList : public ScrolledSelectionList { class GeneralStatisticsList : public ScrolledSelectionList {
protected: protected:

12
Minecraft.Client/UI/Screens/TextEditScreen.h
View file

@ -13,19 +13,19 @@ private:
public: public:
TextEditScreen(std::shared_ptr<SignTileEntity> sign); TextEditScreen(std::shared_ptr<SignTileEntity> sign);
virtual void init(); virtual void init() override;
virtual void removed(); virtual void removed() override;
virtual void tick(); virtual void tick() override;
protected: protected:
virtual void buttonClicked(Button* button); virtual void buttonClicked(Button* button) override;
private: private:
static const std::wstring allowedChars; static const std::wstring allowedChars;
protected: protected:
virtual void keyPressed(wchar_t ch, int eventKey); virtual void keyPressed(wchar_t ch, int eventKey) override;
public: public:
virtual void render(int xm, int ym, float a); virtual void render(int xm, int ym, float a) override;
}; };

10
Minecraft.Client/UI/Screens/TitleScreen.h
View file

@ -33,17 +33,17 @@ private:
public: public:
TitleScreen(); TitleScreen();
virtual void tick(); virtual void tick() override;
protected: protected:
virtual void keyPressed(wchar_t eventCharacter, int eventKey); virtual void keyPressed(wchar_t eventCharacter, int eventKey) override;
public: public:
virtual void init(); virtual void init() override;
protected: protected:
virtual void buttonClicked(Button* button); virtual void buttonClicked(Button* button) override;
public: public:
virtual void render(int xm, int ym, float a); virtual void render(int xm, int ym, float a) override;
}; };

6
Minecraft.Client/UI/Screens/VideoSettingsScreen.h
View file

@ -14,11 +14,11 @@ private:
public: public:
VideoSettingsScreen(Screen* lastScreen, Options* options); VideoSettingsScreen(Screen* lastScreen, Options* options);
virtual void init(); virtual void init() override;
protected: protected:
virtual void buttonClicked(Button* button); virtual void buttonClicked(Button* button) override;
public: public:
virtual void render(int xm, int ym, float a); virtual void render(int xm, int ym, float a) override;
}; };

8
Minecraft.Client/UI/SlideButton.h
View file

@ -16,10 +16,10 @@ public:
const std::wstring& msg, float value); const std::wstring& msg, float value);
protected: protected:
virtual int getYImage(bool hovered); virtual int getYImage(bool hovered) override;
virtual void renderBg(Minecraft* minecraft, int xm, int ym); virtual void renderBg(Minecraft* minecraft, int xm, int ym) override;
public: public:
virtual bool clicked(Minecraft* minecraft, int mx, int my); virtual bool clicked(Minecraft* minecraft, int mx, int my) override;
virtual void released(int mx, int my); virtual void released(int mx, int my) override;
}; };

4
Minecraft.World/Containers/RepairContainer.h
View file

@ -11,6 +11,6 @@ private:
public: public:
RepairContainer(AnvilMenu* menu, int name, bool customName, int size); RepairContainer(AnvilMenu* menu, int name, bool customName, int size);
void setChanged(); void setChanged() override;
bool canPlaceItem(int slot, std::shared_ptr<ItemInstance> item); bool canPlaceItem(int slot, std::shared_ptr<ItemInstance> item) override;
}; };

8
Minecraft.World/Containers/RepairResultSlot.h
View file

@ -14,9 +14,9 @@ public:
std::shared_ptr<Container> container, int slot, int x, std::shared_ptr<Container> container, int slot, int x,
int y); int y);
bool mayPlace(std::shared_ptr<ItemInstance> item); bool mayPlace(std::shared_ptr<ItemInstance> item) override;
bool mayPickup(std::shared_ptr<Player> player); bool mayPickup(std::shared_ptr<Player> player) override;
void onTake(std::shared_ptr<Player> player, void onTake(std::shared_ptr<Player> player,
std::shared_ptr<ItemInstance> carried); std::shared_ptr<ItemInstance> carried) override;
virtual bool mayCombine(std::shared_ptr<ItemInstance> item); // 4J Added virtual bool mayCombine(std::shared_ptr<ItemInstance> item) override; // 4J Added
}; };

28
Minecraft.World/Containers/ResultContainer.h
View file

@ -10,19 +10,19 @@ public:
// 4J Stu Added a ctor to init items // 4J Stu Added a ctor to init items
ResultContainer(); ResultContainer();
virtual unsigned int getContainerSize(); virtual unsigned int getContainerSize() override;
virtual std::shared_ptr<ItemInstance> getItem(unsigned int slot); virtual std::shared_ptr<ItemInstance> getItem(unsigned int slot) override;
virtual std::wstring getName(); virtual std::wstring getName() override;
virtual std::wstring getCustomName(); virtual std::wstring getCustomName() override;
virtual bool hasCustomName(); virtual bool hasCustomName() override;
virtual std::shared_ptr<ItemInstance> removeItem(unsigned int slot, virtual std::shared_ptr<ItemInstance> removeItem(unsigned int slot,
int count); int count) override;
virtual std::shared_ptr<ItemInstance> removeItemNoUpdate(int slot); virtual std::shared_ptr<ItemInstance> removeItemNoUpdate(int slot) override;
virtual void setItem(unsigned int slot, std::shared_ptr<ItemInstance> item); virtual void setItem(unsigned int slot, std::shared_ptr<ItemInstance> item) override;
virtual int getMaxStackSize(); virtual int getMaxStackSize() override;
virtual void setChanged(); virtual void setChanged() override;
virtual bool stillValid(std::shared_ptr<Player> player); virtual bool stillValid(std::shared_ptr<Player> player) override;
virtual void startOpen() {} // TODO Auto-generated method stub virtual void startOpen() override {} // TODO Auto-generated method stub
virtual void stopOpen() {} // TODO Auto-generated method stub virtual void stopOpen() override {} // TODO Auto-generated method stub
virtual bool canPlaceItem(int slot, std::shared_ptr<ItemInstance> item); virtual bool canPlaceItem(int slot, std::shared_ptr<ItemInstance> item) override;
}; };

12
Minecraft.World/Containers/ResultSlot.h
View file

@ -14,15 +14,15 @@ public:
std::shared_ptr<Container> container, int id, int x, int y); std::shared_ptr<Container> container, int id, int x, int y);
virtual ~ResultSlot() {} virtual ~ResultSlot() {}
virtual bool mayPlace(std::shared_ptr<ItemInstance> item); virtual bool mayPlace(std::shared_ptr<ItemInstance> item) override;
virtual std::shared_ptr<ItemInstance> remove(int c); virtual std::shared_ptr<ItemInstance> remove(int c) override;
protected: protected:
virtual void onQuickCraft(std::shared_ptr<ItemInstance> picked, int count); virtual void onQuickCraft(std::shared_ptr<ItemInstance> picked, int count) override;
virtual void checkTakeAchievements(std::shared_ptr<ItemInstance> carried); virtual void checkTakeAchievements(std::shared_ptr<ItemInstance> carried) override;
public: public:
virtual void onTake(std::shared_ptr<Player> player, virtual void onTake(std::shared_ptr<Player> player,
std::shared_ptr<ItemInstance> carried); std::shared_ptr<ItemInstance> carried) override;
virtual bool mayCombine(std::shared_ptr<ItemInstance> item); // 4J Added virtual bool mayCombine(std::shared_ptr<ItemInstance> item) override; // 4J Added
}; };

28
Minecraft.World/Containers/SimpleContainer.h
View file

@ -19,20 +19,20 @@ public:
virtual void addListener(net_minecraft_world::ContainerListener* listener); virtual void addListener(net_minecraft_world::ContainerListener* listener);
virtual void removeListener( virtual void removeListener(
net_minecraft_world::ContainerListener* listener); net_minecraft_world::ContainerListener* listener);
virtual std::shared_ptr<ItemInstance> getItem(unsigned int slot); virtual std::shared_ptr<ItemInstance> getItem(unsigned int slot) override;
virtual std::shared_ptr<ItemInstance> removeItem(unsigned int slot, virtual std::shared_ptr<ItemInstance> removeItem(unsigned int slot,
int count); int count) override;
virtual std::shared_ptr<ItemInstance> removeItemNoUpdate(int slot); virtual std::shared_ptr<ItemInstance> removeItemNoUpdate(int slot) override;
virtual void setItem(unsigned int slot, std::shared_ptr<ItemInstance> item); virtual void setItem(unsigned int slot, std::shared_ptr<ItemInstance> item) override;
virtual unsigned int getContainerSize(); virtual unsigned int getContainerSize() override;
virtual std::wstring getName(); virtual std::wstring getName() override;
virtual std::wstring getCustomName(); virtual std::wstring getCustomName() override;
virtual bool hasCustomName(); virtual bool hasCustomName() override;
virtual void setCustomName(const std::wstring& name); virtual void setCustomName(const std::wstring& name);
virtual int getMaxStackSize(); virtual int getMaxStackSize() override;
virtual void setChanged(); virtual void setChanged() override;
virtual bool stillValid(std::shared_ptr<Player> player); virtual bool stillValid(std::shared_ptr<Player> player) override;
virtual void startOpen() {} // TODO Auto-generated method stub virtual void startOpen() override {} // TODO Auto-generated method stub
virtual void stopOpen() {} // TODO Auto-generated method stub virtual void stopOpen() override {} // TODO Auto-generated method stub
virtual bool canPlaceItem(int slot, std::shared_ptr<ItemInstance> item); virtual bool canPlaceItem(int slot, std::shared_ptr<ItemInstance> item) override;
}; };

4
Minecraft.World/Containers/TrapMenu.h
View file

@ -18,7 +18,7 @@ public:
TrapMenu(std::shared_ptr<Container> inventory, TrapMenu(std::shared_ptr<Container> inventory,
std::shared_ptr<DispenserTileEntity> trap); std::shared_ptr<DispenserTileEntity> trap);
virtual bool stillValid(std::shared_ptr<Player> player); virtual bool stillValid(std::shared_ptr<Player> player) override;
virtual std::shared_ptr<ItemInstance> quickMoveStack( virtual std::shared_ptr<ItemInstance> quickMoveStack(
std::shared_ptr<Player> player, int slotIndex); std::shared_ptr<Player> player, int slotIndex) override;
}; };