From 729aad5f061b18b4e0306279383564b57a861f2b Mon Sep 17 00:00:00 2001 From: Sally Knight Date: Thu, 2 Apr 2026 00:28:10 +0300 Subject: [PATCH] fix: missing jui includes (and slight structure changes) --- .../Common/src/UI/Controls/UIControl.cpp | 3 +++ targets/minecraft/client/gui/Button.cpp | 4 ++++ targets/minecraft/client/gui/Gui.cpp | 2 ++ targets/minecraft/client/gui/Screen.cpp | 2 ++ targets/minecraft/client/gui/TradeSwitchButton.cpp | 4 ++++ .../client/gui/achievement/AchievementPopup.cpp | 3 ++- .../client/gui/inventory/AbstractBeaconButton.cpp | 3 +++ .../gui/inventory/AbstractContainerScreen.cpp | 3 ++- .../minecraft/client/gui/inventory/BeaconScreen.cpp | 2 ++ .../gui/inventory/CreativeInventoryScreen.cpp | 4 +++- .../gui/{ => inventory}/EnchantmentScreen.cpp | 6 +++++- .../client/gui/{ => inventory}/EnchantmentScreen.h | 2 +- .../client/gui/{ => inventory}/HopperScreen.cpp | 2 +- .../client/gui/{ => inventory}/HopperScreen.h | 0 .../client/gui/inventory/HorseInventoryScreen.cpp | 7 +++++++ .../client/gui/inventory/InventoryScreen.cpp | 6 ++++++ .../client/gui/{ => inventory}/MerchantScreen.cpp | 8 ++++++-- .../client/gui/{ => inventory}/MerchantScreen.h | 2 +- .../client/gui/{ => inventory}/RepairScreen.cpp | 2 +- .../client/gui/{ => inventory}/RepairScreen.h | 0 .../client/multiplayer/ClientConnection.cpp | 2 +- targets/minecraft/client/player/LocalPlayer.cpp | 13 +++++++++++++ targets/minecraft/client/title/TitleScreen.cpp | 7 ++++++- 23 files changed, 75 insertions(+), 12 deletions(-) rename targets/minecraft/client/gui/{ => inventory}/EnchantmentScreen.cpp (98%) rename targets/minecraft/client/gui/{ => inventory}/EnchantmentScreen.h (95%) rename targets/minecraft/client/gui/{ => inventory}/HopperScreen.cpp (96%) rename targets/minecraft/client/gui/{ => inventory}/HopperScreen.h (100%) rename targets/minecraft/client/gui/{ => inventory}/MerchantScreen.cpp (96%) rename targets/minecraft/client/gui/{ => inventory}/MerchantScreen.h (93%) rename targets/minecraft/client/gui/{ => inventory}/RepairScreen.cpp (99%) rename targets/minecraft/client/gui/{ => inventory}/RepairScreen.h (100%) diff --git a/targets/Minecraft.Client/Common/src/UI/Controls/UIControl.cpp b/targets/Minecraft.Client/Common/src/UI/Controls/UIControl.cpp index 8489ca392..cd722706b 100644 --- a/targets/Minecraft.Client/Common/src/UI/Controls/UIControl.cpp +++ b/targets/Minecraft.Client/Common/src/UI/Controls/UIControl.cpp @@ -3,6 +3,9 @@ #include "Minecraft.Client/Common/src/UI/UIScene.h" #include "Minecraft.Client/Linux/Linux_App.h" #include "java/JavaMath.h" +#ifndef _ENABLESHIGGY +#include "Minecraft.Client/Linux/Stubs/iggy_stubs.h" +#endif UIControl::UIControl() { m_parentScene = nullptr; diff --git a/targets/minecraft/client/gui/Button.cpp b/targets/minecraft/client/gui/Button.cpp index 2eaa85ae4..676bf34dd 100644 --- a/targets/minecraft/client/gui/Button.cpp +++ b/targets/minecraft/client/gui/Button.cpp @@ -1,5 +1,9 @@ #include "Button.h" +#include "4J.Render/4J_Render.h" +#include "minecraft/client/Minecraft.h" +#include "minecraft/client/renderer/Textures.h" +#include "minecraft/client/resources/ResourceLocation.h" class Minecraft; #ifdef ENABLE_JAVA_GUIS diff --git a/targets/minecraft/client/gui/Gui.cpp b/targets/minecraft/client/gui/Gui.cpp index 5a995558f..d54ee8550 100644 --- a/targets/minecraft/client/gui/Gui.cpp +++ b/targets/minecraft/client/gui/Gui.cpp @@ -1,8 +1,10 @@ #include "Gui.h" #include "4J.Common/4J_Compat.h" +#include "4J.Input/4J_Input.h" #include "ChatScreen.h" #include "Minecraft.Client/include/stdafx.h" +#include "Minecraft.Client/include/stubs.h" #include "console_helpers/StringHelpers.h" #include "java/JavaMath.h" #include "java/System.h" diff --git a/targets/minecraft/client/gui/Screen.cpp b/targets/minecraft/client/gui/Screen.cpp index 78eba4fba..6cc6c9d91 100644 --- a/targets/minecraft/client/gui/Screen.cpp +++ b/targets/minecraft/client/gui/Screen.cpp @@ -1,5 +1,6 @@ #include "Screen.h" +#include "4J.Common/4J_InputActions.h" #include "4J_Input.h" #include "4J_Profile.h" #include "Button.h" @@ -8,6 +9,7 @@ #include "Minecraft.Client/Common/src/Network/GameNetworkManager.h" #include "Minecraft.Client/Linux/Linux_App.h" #include "Minecraft.Client/include/stubs.h" +#include "ScreenSizeCalculator.h" #include "minecraft/client/Minecraft.h" #include "minecraft/client/gui/Screen.h" #include "minecraft/client/gui/particle/GuiParticles.h" diff --git a/targets/minecraft/client/gui/TradeSwitchButton.cpp b/targets/minecraft/client/gui/TradeSwitchButton.cpp index 08f86186e..d34308263 100644 --- a/targets/minecraft/client/gui/TradeSwitchButton.cpp +++ b/targets/minecraft/client/gui/TradeSwitchButton.cpp @@ -2,7 +2,11 @@ #include +#include "4J.Render/4J_Render.h" +#include "minecraft/client/Minecraft.h" #include "minecraft/client/gui/Button.h" +#include "minecraft/client/renderer/Textures.h" +#include "minecraft/client/resources/ResourceLocation.h" // 4jcraft: referenced from MCP 8.11 (JE 1.6.4) #ifdef ENABLE_JAVA_GUIS diff --git a/targets/minecraft/client/gui/achievement/AchievementPopup.cpp b/targets/minecraft/client/gui/achievement/AchievementPopup.cpp index 0ee9e6d83..33e4cff43 100644 --- a/targets/minecraft/client/gui/achievement/AchievementPopup.cpp +++ b/targets/minecraft/client/gui/achievement/AchievementPopup.cpp @@ -5,6 +5,7 @@ #include "4J.Render/4J_Render.h" #include "java/System.h" #include "minecraft/client/Minecraft.h" +#include "minecraft/client/gui/Font.h" #include "minecraft/client/gui/ScreenSizeCalculator.h" #include "minecraft/client/renderer/entity/ItemRenderer.h" #include "minecraft/locale/I18n.h" @@ -67,7 +68,7 @@ void AchievementPopup::prepareWindow() { } void AchievementPopup::render() { -#if ENABLE_JAVA_GUIS +#ifdef ENABLE_JAVA_GUIS if (Minecraft::warezTime > 0) { glDisable(GL_DEPTH_TEST); glDepthMask(false); diff --git a/targets/minecraft/client/gui/inventory/AbstractBeaconButton.cpp b/targets/minecraft/client/gui/inventory/AbstractBeaconButton.cpp index 8cfb77247..0873c0475 100644 --- a/targets/minecraft/client/gui/inventory/AbstractBeaconButton.cpp +++ b/targets/minecraft/client/gui/inventory/AbstractBeaconButton.cpp @@ -2,7 +2,10 @@ #include +#include "4J.Render/4J_Render.h" #include "minecraft/client/gui/Button.h" +#include "minecraft/client/renderer/Textures.h" +#include "minecraft/client/resources/ResourceLocation.h" // 4jcraft: referenced from MCP 8.11 (JE 1.6.4) #ifdef ENABLE_JAVA_GUIS diff --git a/targets/minecraft/client/gui/inventory/AbstractContainerScreen.cpp b/targets/minecraft/client/gui/inventory/AbstractContainerScreen.cpp index bf55e7ce0..198607127 100644 --- a/targets/minecraft/client/gui/inventory/AbstractContainerScreen.cpp +++ b/targets/minecraft/client/gui/inventory/AbstractContainerScreen.cpp @@ -7,6 +7,7 @@ #include "Minecraft.Client/Linux/Linux_App.h" #include "Minecraft.Client/include/stubs.h" #include "minecraft/client/KeyMapping.h" +#include "minecraft/client/Lighting.h" #include "minecraft/client/Minecraft.h" #include "minecraft/client/Options.h" #include "minecraft/client/gui/Font.h" @@ -38,7 +39,7 @@ void AbstractContainerScreen::init() { void AbstractContainerScreen::render(int xm, int ym, float a) { // 4J Stu - Not used -#if ENABLE_JAVA_GUIS +#ifdef ENABLE_JAVA_GUIS renderBackground(); int xo = (width - imageWidth) / 2; int yo = (height - imageHeight) / 2; diff --git a/targets/minecraft/client/gui/inventory/BeaconScreen.cpp b/targets/minecraft/client/gui/inventory/BeaconScreen.cpp index a4510ca8c..a02f576ef 100644 --- a/targets/minecraft/client/gui/inventory/BeaconScreen.cpp +++ b/targets/minecraft/client/gui/inventory/BeaconScreen.cpp @@ -19,11 +19,13 @@ #include "minecraft/client/gui/inventory/AbstractContainerScreen.h" #include "minecraft/client/multiplayer/ClientConnection.h" #include "minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" +#include "minecraft/client/renderer/entity/ItemRenderer.h" #include "minecraft/locale/Language.h" #include "minecraft/network/packet/CustomPayloadPacket.h" #include "minecraft/world/effect/MobEffect.h" #include "minecraft/world/entity/player/Inventory.h" #include "minecraft/world/inventory/BeaconMenu.h" +#include "minecraft/world/item/Item.h" #include "minecraft/world/level/tile/entity/BeaconTileEntity.h" // 4jcraft: referenced from MCP 8.11 (JE 1.6.4) and the existing diff --git a/targets/minecraft/client/gui/inventory/CreativeInventoryScreen.cpp b/targets/minecraft/client/gui/inventory/CreativeInventoryScreen.cpp index b9eae28dd..e522a6308 100644 --- a/targets/minecraft/client/gui/inventory/CreativeInventoryScreen.cpp +++ b/targets/minecraft/client/gui/inventory/CreativeInventoryScreen.cpp @@ -5,13 +5,15 @@ #include #include +#include "4J.Common/4J_InputActions.h" +#include "4J.Input/4J_Input.h" #include "4J.Render/4J_Render.h" +#include "AbstractContainerScreen.h" #include "Minecraft.Client/Common/src/UI/All Platforms/IUIScene_CreativeMenu.h" #include "Minecraft.Client/Linux/Linux_App.h" #include "Minecraft.Client/include/stubs.h" #include "minecraft/client/Minecraft.h" #include "minecraft/client/gui/Screen.h" -#include "minecraft/client/gui/inventory/AbstractContainerScreen.h" #include "minecraft/client/multiplayer/MultiPlayerGameMode.h" #include "minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" #include "minecraft/client/renderer/entity/ItemRenderer.h" diff --git a/targets/minecraft/client/gui/EnchantmentScreen.cpp b/targets/minecraft/client/gui/inventory/EnchantmentScreen.cpp similarity index 98% rename from targets/minecraft/client/gui/EnchantmentScreen.cpp rename to targets/minecraft/client/gui/inventory/EnchantmentScreen.cpp index 17082c13f..e6fdec577 100644 --- a/targets/minecraft/client/gui/EnchantmentScreen.cpp +++ b/targets/minecraft/client/gui/inventory/EnchantmentScreen.cpp @@ -1,14 +1,18 @@ #include "EnchantmentScreen.h" #include +#include #include #include #include #include +#include "AbstractContainerScreen.h" +#include "minecraft/client/Lighting.h" #include "minecraft/client/Minecraft.h" #include "minecraft/client/gui/Font.h" -#include "minecraft/client/gui/inventory/AbstractContainerScreen.h" +#include "minecraft/client/gui/ScreenSizeCalculator.h" +#include "minecraft/client/model/BookModel.h" #include "minecraft/client/multiplayer/MultiPlayerGameMode.h" #include "minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" #include "minecraft/locale/Language.h" diff --git a/targets/minecraft/client/gui/EnchantmentScreen.h b/targets/minecraft/client/gui/inventory/EnchantmentScreen.h similarity index 95% rename from targets/minecraft/client/gui/EnchantmentScreen.h rename to targets/minecraft/client/gui/inventory/EnchantmentScreen.h index 565885fbd..e9d50e8ae 100644 --- a/targets/minecraft/client/gui/EnchantmentScreen.h +++ b/targets/minecraft/client/gui/inventory/EnchantmentScreen.h @@ -4,8 +4,8 @@ #include #include +#include "AbstractContainerScreen.h" #include "java/Random.h" -#include "minecraft/client/gui/inventory/AbstractContainerScreen.h" #include "minecraft/world/inventory/EnchantmentMenu.h" class EnchantmentMenu; diff --git a/targets/minecraft/client/gui/HopperScreen.cpp b/targets/minecraft/client/gui/inventory/HopperScreen.cpp similarity index 96% rename from targets/minecraft/client/gui/HopperScreen.cpp rename to targets/minecraft/client/gui/inventory/HopperScreen.cpp index d8fb9c23e..4e2241668 100644 --- a/targets/minecraft/client/gui/HopperScreen.cpp +++ b/targets/minecraft/client/gui/inventory/HopperScreen.cpp @@ -2,7 +2,7 @@ #include -#include "Font.h" +#include "minecraft/client/gui/Font.h" #include "minecraft/client/gui/inventory/AbstractContainerScreen.h" #include "minecraft/world/Container.h" #include "minecraft/world/entity/player/Inventory.h" diff --git a/targets/minecraft/client/gui/HopperScreen.h b/targets/minecraft/client/gui/inventory/HopperScreen.h similarity index 100% rename from targets/minecraft/client/gui/HopperScreen.h rename to targets/minecraft/client/gui/inventory/HopperScreen.h diff --git a/targets/minecraft/client/gui/inventory/HorseInventoryScreen.cpp b/targets/minecraft/client/gui/inventory/HorseInventoryScreen.cpp index 19b57cd8e..431e09afc 100644 --- a/targets/minecraft/client/gui/inventory/HorseInventoryScreen.cpp +++ b/targets/minecraft/client/gui/inventory/HorseInventoryScreen.cpp @@ -1,9 +1,16 @@ #include "HorseInventoryScreen.h" +#include #include +#include "4J.Render/4J_Render.h" +#include "minecraft/client/Lighting.h" +#include "minecraft/client/Minecraft.h" #include "minecraft/client/gui/Font.h" #include "minecraft/client/gui/inventory/AbstractContainerScreen.h" +#include "minecraft/client/renderer/Textures.h" +#include "minecraft/client/renderer/entity/EntityRenderDispatcher.h" +#include "minecraft/client/resources/ResourceLocation.h" #include "minecraft/world/Container.h" #include "minecraft/world/entity/player/Inventory.h" #include "minecraft/world/inventory/HorseInventoryMenu.h" diff --git a/targets/minecraft/client/gui/inventory/InventoryScreen.cpp b/targets/minecraft/client/gui/inventory/InventoryScreen.cpp index 736f6e179..220f491e4 100644 --- a/targets/minecraft/client/gui/inventory/InventoryScreen.cpp +++ b/targets/minecraft/client/gui/inventory/InventoryScreen.cpp @@ -1,8 +1,11 @@ #include "InventoryScreen.h" +#include #include #include +#include "4J.Render/4J_Render.h" +#include "minecraft/client/Lighting.h" #include "minecraft/client/Minecraft.h" #include "minecraft/client/gui/Button.h" #include "minecraft/client/gui/Font.h" @@ -10,6 +13,9 @@ #include "minecraft/client/gui/achievement/StatsScreen.h" #include "minecraft/client/gui/inventory/AbstractContainerScreen.h" #include "minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" +#include "minecraft/client/renderer/Textures.h" +#include "minecraft/client/renderer/entity/EntityRenderDispatcher.h" +#include "minecraft/client/resources/ResourceLocation.h" #include "minecraft/stats/GenericStats.h" #include "minecraft/world/entity/player/Player.h" diff --git a/targets/minecraft/client/gui/MerchantScreen.cpp b/targets/minecraft/client/gui/inventory/MerchantScreen.cpp similarity index 96% rename from targets/minecraft/client/gui/MerchantScreen.cpp rename to targets/minecraft/client/gui/inventory/MerchantScreen.cpp index 37a520934..e5a077a4c 100644 --- a/targets/minecraft/client/gui/MerchantScreen.cpp +++ b/targets/minecraft/client/gui/inventory/MerchantScreen.cpp @@ -4,17 +4,21 @@ #include #include -#include "TradeSwitchButton.h" +#include "AbstractContainerScreen.h" #include "java/InputOutputStream/ByteArrayOutputStream.h" #include "java/InputOutputStream/DataOutputStream.h" +#include "minecraft/client/Lighting.h" #include "minecraft/client/Minecraft.h" #include "minecraft/client/gui/Font.h" -#include "minecraft/client/gui/inventory/AbstractContainerScreen.h" +#include "minecraft/client/gui/TradeSwitchButton.h" #include "minecraft/client/multiplayer/ClientConnection.h" #include "minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" +#include "minecraft/client/renderer/entity/ItemRenderer.h" +#include "minecraft/client/resources/ResourceLocation.h" #include "minecraft/network/packet/CustomPayloadPacket.h" #include "minecraft/world/entity/player/Inventory.h" #include "minecraft/world/entity/player/Player.h" +#include "minecraft/world/inventory/MerchantContainer.h" #include "minecraft/world/inventory/MerchantMenu.h" #include "minecraft/world/item/trading/Merchant.h" #include "minecraft/world/item/trading/MerchantRecipeList.h" diff --git a/targets/minecraft/client/gui/MerchantScreen.h b/targets/minecraft/client/gui/inventory/MerchantScreen.h similarity index 93% rename from targets/minecraft/client/gui/MerchantScreen.h rename to targets/minecraft/client/gui/inventory/MerchantScreen.h index 03f0f1934..3dca14de4 100644 --- a/targets/minecraft/client/gui/MerchantScreen.h +++ b/targets/minecraft/client/gui/inventory/MerchantScreen.h @@ -2,7 +2,7 @@ #include -#include "minecraft/client/gui/inventory/AbstractContainerScreen.h" +#include "AbstractContainerScreen.h" #include "minecraft/world/inventory/MerchantMenu.h" #include "minecraft/world/item/trading/net.minecraft.world.item.trading.h" diff --git a/targets/minecraft/client/gui/RepairScreen.cpp b/targets/minecraft/client/gui/inventory/RepairScreen.cpp similarity index 99% rename from targets/minecraft/client/gui/RepairScreen.cpp rename to targets/minecraft/client/gui/inventory/RepairScreen.cpp index c0265f861..060fee4df 100644 --- a/targets/minecraft/client/gui/RepairScreen.cpp +++ b/targets/minecraft/client/gui/inventory/RepairScreen.cpp @@ -6,10 +6,10 @@ #include #include "4J.Render/4J_Render.h" -#include "EditBox.h" #include "java/InputOutputStream/ByteArrayOutputStream.h" #include "java/InputOutputStream/DataOutputStream.h" #include "minecraft/client/Minecraft.h" +#include "minecraft/client/gui/EditBox.h" #include "minecraft/client/gui/Font.h" #include "minecraft/client/gui/inventory/AbstractContainerScreen.h" #include "minecraft/client/multiplayer/ClientConnection.h" diff --git a/targets/minecraft/client/gui/RepairScreen.h b/targets/minecraft/client/gui/inventory/RepairScreen.h similarity index 100% rename from targets/minecraft/client/gui/RepairScreen.h rename to targets/minecraft/client/gui/inventory/RepairScreen.h diff --git a/targets/minecraft/client/multiplayer/ClientConnection.cpp b/targets/minecraft/client/multiplayer/ClientConnection.cpp index 0eaa2e98c..2ede8d433 100644 --- a/targets/minecraft/client/multiplayer/ClientConnection.cpp +++ b/targets/minecraft/client/multiplayer/ClientConnection.cpp @@ -25,7 +25,7 @@ #include "minecraft/client/ProgressRenderer.h" #include "minecraft/client/User.h" #include "minecraft/client/gui/Gui.h" -#include "minecraft/client/gui/MerchantScreen.h" +#include "minecraft/client/gui/inventory/MerchantScreen.h" #include "minecraft/client/particle/CritParticle.h" #include "minecraft/client/particle/TakeAnimationParticle.h" #include "minecraft/client/player/RemotePlayer.h" diff --git a/targets/minecraft/client/player/LocalPlayer.cpp b/targets/minecraft/client/player/LocalPlayer.cpp index c8d8093df..c60f227d6 100644 --- a/targets/minecraft/client/player/LocalPlayer.cpp +++ b/targets/minecraft/client/player/LocalPlayer.cpp @@ -42,6 +42,19 @@ #include "minecraft/SharedConstants.h" #include "minecraft/client/Minecraft.h" #include "minecraft/client/gui/Gui.h" +#include "minecraft/client/gui/achievement/AchievementPopup.h" +#include "minecraft/client/gui/inventory/BeaconScreen.h" +#include "minecraft/client/gui/inventory/BrewingStandScreen.h" +#include "minecraft/client/gui/inventory/ContainerScreen.h" +#include "minecraft/client/gui/inventory/CraftingScreen.h" +#include "minecraft/client/gui/inventory/EnchantmentScreen.h" +#include "minecraft/client/gui/inventory/FurnaceScreen.h" +#include "minecraft/client/gui/inventory/HopperScreen.h" +#include "minecraft/client/gui/inventory/HorseInventoryScreen.h" +#include "minecraft/client/gui/inventory/MerchantScreen.h" +#include "minecraft/client/gui/inventory/RepairScreen.h" +#include "minecraft/client/gui/inventory/TextEditScreen.h" +#include "minecraft/client/gui/inventory/TrapScreen.h" #include "minecraft/client/multiplayer/MultiPlayerGameMode.h" #include "minecraft/core/particles/ParticleTypes.h" #include "minecraft/sounds/SoundTypes.h" diff --git a/targets/minecraft/client/title/TitleScreen.cpp b/targets/minecraft/client/title/TitleScreen.cpp index 51f30ccea..f0408fbd3 100644 --- a/targets/minecraft/client/title/TitleScreen.cpp +++ b/targets/minecraft/client/title/TitleScreen.cpp @@ -2,6 +2,7 @@ #include +#include #include #include "4J.Render/4J_Render.h" @@ -13,12 +14,16 @@ #include "java/InputOutputStream/ByteArrayInputStream.h" #include "java/InputOutputStream/InputStreamReader.h" #include "java/Random.h" +#include "minecraft/client/ClientConstants.h" #include "minecraft/client/Minecraft.h" #include "minecraft/client/gui/Button.h" +#include "minecraft/client/gui/Font.h" #include "minecraft/client/gui/JoinMultiplayerScreen.h" #include "minecraft/client/gui/OptionsScreen.h" #include "minecraft/client/gui/SelectWorldScreen.h" +#include "minecraft/client/renderer/Tesselator.h" #include "minecraft/client/renderer/Textures.h" +#include "minecraft/client/resources/ResourceLocation.h" #include "minecraft/locale/Language.h" Random* TitleScreen::random = new Random(); @@ -410,7 +415,7 @@ void TitleScreen::render(int xm, int ym, float a) { drawString( font, ClientConstants::VERSION_STRING, 2, height - 10, 0xffffff); // 4jcraft: use the same height as the copyright message - wstring msg = L"Copyright Mojang AB. Do not distribute."; + std::wstring msg = L"Copyright Mojang AB. Do not distribute."; drawString(font, msg, width - font->width(msg) - 2, height - 10, 0xffffff); Screen::render(xm, ym, a);