backups/4jcraft
1
0
Fork 0
mirror of https://github.com/4jcraft/4jcraft.git synced 2026-04-25 13:53:37 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix UI include issues

Browse source
This commit is contained in:
Tropical 2026-03-31 14:11:47 -05:00
parent 2ea30f3ae2
commit 1a2cfd5199
9 changed files with 17 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Help & Options/UIScene_Credits.cpp
View file

@ -1,5 +1,6 @@
#include "Minecraft.Client/Header Files/stdafx.h"
#include "Minecraft.Client/Common/Source Files/UI/UI.h"
#include "Minecraft.World/ConsoleHelpers/StringHelpers.h"
#include "UIScene_Credits.h"
#define CREDIT_ICON -2

3
minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/Containers/UIScene_AbstractContainerMenu.h
View file

@ -2,6 +2,9 @@
#include "Minecraft.Client/Common/Source Files/UI/UIScene.h"
#include "Minecraft.Client/Common/Source Files/UI/All Platforms/IUIScene_AbstractContainerMenu.h"
#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl_SlotList.h"
#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl_Cursor.h"
#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl_Label.h"
class AbstractContainerMenu;

1
minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/Containers/UIScene_EnchantingMenu.h
View file

@ -2,6 +2,7 @@
#include "UIScene_AbstractContainerMenu.h"
#include "Minecraft.Client/Common/Source Files/UI/All Platforms/IUIScene_EnchantingMenu.h"
#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl_EnchantmentButton.h"
class InventoryMenu;

2
minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/Containers/UIScene_InventoryMenu.cpp
View file

@ -15,6 +15,8 @@
#include "Minecraft.Client/Common/Source Files/Tutorial/TutorialMode.h"
#include "Minecraft.Client/Common/Source Files/Tutorial/TutorialEnum.h"
#include "Minecraft.World/ConsoleHelpers/StringHelpers.h"
#define INVENTORY_UPDATE_EFFECTS_TIMER_ID (10)
#define INVENTORY_UPDATE_EFFECTS_TIMER_TIME (1000) // 1 second

1
minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/UIScene_CraftingMenu.h
View file

@ -3,6 +3,7 @@
#include "Minecraft.Client/Common/Source Files/UI/UIScene.h"
#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl_SlotList.h"
#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl_Label.h"
#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl_HTMLLabel.h"
#include "Minecraft.Client/Common/Source Files/UI/All Platforms/IUIScene_CraftingMenu.h"
#define CRAFTING_INVENTORY_SLOT_START 0

26
minecraft/Minecraft.Client/Common/Source Files/UI/UIScene.h
View file

@ -13,33 +13,8 @@
#include <vector>
#include "Minecraft.Client/Common/Source Files/UI/All Platforms/UIEnums.h"
#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl_Base.h"
#include "4J.Render/4J_Render.h"
#include "Minecraft.Client/Common/Source Files/UI/All Platforms/UIStructs.h"
#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl_BeaconEffectButton.h"
#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl_BitmapIcon.h"
#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl_Button.h"
#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl_ButtonList.h"
#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl_CheckBox.h"
#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl_Cursor.h"
#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl_DLCList.h"
#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl_DynamicLabel.h"
#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl_EnchantmentBook.h"
#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl_EnchantmentButton.h"
#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl_HTMLLabel.h"
#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl_Label.h"
#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl_LeaderboardList.h"
#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl_MinecraftHorse.h"
#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl_MinecraftPlayer.h"
#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl_PlayerList.h"
#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl_PlayerSkinPreview.h"
#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl_Progress.h"
#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl_SaveList.h"
#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl_Slider.h"
#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl_SlotList.h"
#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl_TextInput.h"
#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl_TexturePackList.h"
#include "Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/Containers/UIScene_TradingMenu.h"
#include "Minecraft.Client/Linux/Iggy/include/iggy.h"
#include "Minecraft.Client/Linux/Iggy/include/rrCore.h"
@ -47,6 +22,7 @@ class ItemRenderer;
class UILayer;
class ItemInstance;
class UIControl;
class UIControl_Base;
// 4J Stu - Setup some defines for quickly mapping elements in the scene

8
minecraft/Minecraft.Client/Linux/Iggy/gdraw/gdraw.c
View file

@ -1,5 +1,7 @@
#define GDRAW_ASSERTS
#include <stdbool.h>
#include "gdraw.h"
#include <GL/gl.h>
@ -9,14 +11,10 @@
#include <dlfcn.h>
#include <stddef.h>
#include "Minecraft.Client/Windows64/Iggy/include/gdraw.h"
#include "SDL_video.h"
#include "Minecraft.Client/Windows64/Iggy/gdraw/gdraw_shared.inl"
#include "Minecraft.Client/Linux/Iggy/gdraw/gdraw.h"
#include "Minecraft.Client/Linux/Iggy/include/iggy.h"
#define true 1
#define false 0
#ifndef _ENABLEIGGY
void* IggyGDrawMallocAnnotated(SINTa size, const char* file, int line) {
(void)file;

6
minecraft/Minecraft.Client/Windows64/Iggy/gdraw/gdraw_d3d11.cpp
View file

@ -1,4 +1,4 @@
#include "Minecraft.Client/Header Files/stdafx.h" // 4J
#include "Minecraft.World/Header Files/stdafx.h" // 4J
// gdraw_d3d11.cpp - author: Fabian Giesen - copyright 2011 RAD Game Tools
//
@ -43,8 +43,8 @@
#include <windows.h>
#include <d3d11.h>
#include "Minecraft.Client/Windows64/Iggy/include/gdraw.h"
#include "Minecraft.Client/Windows64/Iggy/include/iggy.h"
#include "../include/gdraw.h"
#include "../include/iggy.h"
#include <string.h>
#include <math.h>

2
minecraft/Minecraft.Client/Windows64/Iggy/gdraw/gdraw_shared.inl
View file

@ -9,6 +9,8 @@
#include <assert.h>
#endif
#include <stdbool.h>
#if !defined(GDRAW_MAYBE_UNUSED)
#define GDRAW_MAYBE_UNUSED
#endif