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

fix: rebase issue with CreativeInventoryScreen

Browse source
This commit is contained in:
Tropical 2026-03-29 16:12:30 -05:00
parent 3653b7b465
commit a856a7e54e
3 changed files with 27 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Minecraft.Client/UI/Gui.h
View file

@ -2,9 +2,9 @@
#include <cstddef> #include <cstddef>
#include "GuiComponent.h" #include "GuiComponent.h"
#include "GuiMessage.h" #include "GuiMessage.h"
#include "../../../Minecraft.Client/Rendering/EntityRenderers/ItemRenderer.h"
class Random; class Random;
class Minecraft; class Minecraft;
class ItemRenderer;
class Gui : public GuiComponent { class Gui : public GuiComponent {
private: private:

8
Minecraft.Client/UI/Screens/CreativeInventoryScreen.cpp
View file

@ -70,7 +70,7 @@ CreativeInventoryScreen::ContainerCreative::ContainerCreative(
} }
// Add hotbar slots (9 slots at bottom) // Add hotbar slots (9 slots at bottom)
for (int k = 0; k < 9; k++) { for (int k = 0; k < 9; ++k) {
addSlot(new Slot(inventoryplayer, k, 9 + k * 18, 112)); addSlot(new Slot(inventoryplayer, k, 9 + k * 18, 112));
} }
@ -181,8 +181,8 @@ void CreativeInventoryScreen::ContainerCreative::scrollTo(float pos) {
j = 0; j = 0;
} }
for (int k = 0; k < ROWS; k++) { for (int k = 0; k < ROWS; ++k) {
for (int l = 0; l < COLUMNS; l++) { for (int l = 0; l < COLUMNS; ++l) {
int i1 = l + (k + j) * COLUMNS; int i1 = l + (k + j) * COLUMNS;
if (i1 >= 0 && i1 < (int)itemList.size()) { if (i1 >= 0 && i1 < (int)itemList.size()) {
@ -484,7 +484,7 @@ void CreativeInventoryScreen::setCurrentCreativeTab(int tab) {
IUIScene_CreativeMenu::specs[tab]; IUIScene_CreativeMenu::specs[tab];
// Add items from static groups // Add items from static groups
for (int i = 0; i < spec->m_staticGroupsCount; i++) { for (int i = 0; i < spec->m_staticGroupsCount; ++i) {
int groupIdx = spec->m_staticGroupsA[i]; int groupIdx = spec->m_staticGroupsA[i];
if (groupIdx >= 0 && if (groupIdx >= 0 &&
groupIdx < groupIdx <

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

@ -20,7 +20,8 @@ private:
static int selectedTabIndex; static int selectedTabIndex;
// Array of item ids for the tab icons // Array of item ids for the tab icons
static int tabIconIds[IUIScene_CreativeMenu::eCreativeInventoryTab_COUNT]; static const int
tabIconIds[IUIScene_CreativeMenu::eCreativeInventoryTab_COUNT];
// Temporary inventory for creative mode items // Temporary inventory for creative mode items
static std::shared_ptr<SimpleContainer> basicInventory; static std::shared_ptr<SimpleContainer> basicInventory;
@ -60,23 +61,29 @@ public:
}; };
public: public:
CreativeInventoryScreen(std::shared_ptr<Player> player); CreativeInventoryScreen(std::shared_ptr<Player> player);
virtual void removed() override; virtual void removed() override;
virtual void init() override; virtual void init() override;
virtual void containerTick(); virtual void containerTick();
virtual void tick() override; virtual void tick() override;
virtual void updateEvents() override; virtual void updateEvents() override;
virtual void keyPressed(wchar_t eventCharacter, int eventKey) override; virtual void keyPressed(wchar_t eventCharacter, int eventKey) override;
virtual void mouseClicked(int x, int y, int buttonNum) override; virtual void mouseClicked(int x, int y, int buttonNum) override;
virtual void mouseReleased(int x, int y, int buttonNum) override; virtual void mouseReleased(int x, int y, int buttonNum) override;
virtual void render(int xm, int ym, float a) override; virtual void render(int xm, int ym, float a) override;
protected: protected:
virtual void renderLabels() override; virtual void renderLabels() override;
virtual void renderBg(float a) override; virtual void renderBg(float a) override;
virtual bool isMouseOverInternal(int tab, int mouseX, int mouseY, int xo,
int yo, int w, int h);
private: private:
void setCurrentCreativeTab(int tab); void setCurrentCreativeTab(int tab);
void selectTab(int tab); void selectTab(int tab);
bool needsScrollBars(); bool needsScrollBars();
bool isMouseOverTab(int tab, int mouseX, int mouseY); bool isMouseOverTab(int tab, int mouseX, int mouseY);
void drawTab(int tab); bool isMouseOverIcon(int tab, int mouseX, int mouseY);
void renderTab(int tab);
bool renderIconTooltip(int tab, int mouseX, int mouseY);
}; };