backups/4jcraft
2
0
Fork 0
mirror of https://github.com/4jcraft/4jcraft.git synced 2026-06-03 19:02:57 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix: missing jui includes (and slight structure changes)

Browse source
This commit is contained in:
Sally Knight 2026-04-02 00:28:10 +03:00
parent dc4e2287ee
commit 729aad5f06
23 changed files with 75 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
targets/Minecraft.Client/Common/src/UI/Controls/UIControl.cpp
View file

@ -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;

4
targets/minecraft/client/gui/Button.cpp
View file

@ -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

2
targets/minecraft/client/gui/Gui.cpp
View file

@ -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"

2
targets/minecraft/client/gui/Screen.cpp
View file

@ -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"

4
targets/minecraft/client/gui/TradeSwitchButton.cpp
View file

@ -2,7 +2,11 @@
#include <string>
#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

3
targets/minecraft/client/gui/achievement/AchievementPopup.cpp
View file

@ -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);

3
targets/minecraft/client/gui/inventory/AbstractBeaconButton.cpp
View file

@ -2,7 +2,10 @@
#include <string>
#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

3
targets/minecraft/client/gui/inventory/AbstractContainerScreen.cpp
View file

@ -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;

2
targets/minecraft/client/gui/inventory/BeaconScreen.cpp
View file

@ -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

4
targets/minecraft/client/gui/inventory/CreativeInventoryScreen.cpp
View file

@ -5,13 +5,15 @@
#include <algorithm>
#include <string>
#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"

6
targets/minecraft/client/gui/EnchantmentScreen.cpp → targets/minecraft/client/gui/inventory/EnchantmentScreen.cpp
View file

@ -1,14 +1,18 @@
#include "EnchantmentScreen.h"
#include <algorithm>
#include <cmath>
#include <iterator>
#include <memory>
#include <sstream>
#include <string>
#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"

2
targets/minecraft/client/gui/EnchantmentScreen.h → targets/minecraft/client/gui/inventory/EnchantmentScreen.h
View file

@ -4,8 +4,8 @@
#include <string>
#include <vector>
#include "AbstractContainerScreen.h"
#include "java/Random.h"
#include "minecraft/client/gui/inventory/AbstractContainerScreen.h"
#include "minecraft/world/inventory/EnchantmentMenu.h"
class EnchantmentMenu;

2
targets/minecraft/client/gui/HopperScreen.cpp → targets/minecraft/client/gui/inventory/HopperScreen.cpp
View file

@ -2,7 +2,7 @@
#include <string>
#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"

0
targets/minecraft/client/gui/HopperScreen.h → targets/minecraft/client/gui/inventory/HopperScreen.h
View file

7
targets/minecraft/client/gui/inventory/HorseInventoryScreen.cpp
View file

@ -1,9 +1,16 @@
#include "HorseInventoryScreen.h"
#include <cmath>
#include <string>
#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"

6
targets/minecraft/client/gui/inventory/InventoryScreen.cpp
View file

@ -1,8 +1,11 @@
#include "InventoryScreen.h"
#include <cmath>
#include <string>
#include <vector>
#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"

8
targets/minecraft/client/gui/MerchantScreen.cpp → targets/minecraft/client/gui/inventory/MerchantScreen.cpp
View file

@ -4,17 +4,21 @@
#include <string>
#include <vector>
#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"

2
targets/minecraft/client/gui/MerchantScreen.h → targets/minecraft/client/gui/inventory/MerchantScreen.h
View file

@ -2,7 +2,7 @@
#include <memory>
#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"

2
targets/minecraft/client/gui/RepairScreen.cpp → targets/minecraft/client/gui/inventory/RepairScreen.cpp
View file

@ -6,10 +6,10 @@
#include <string>
#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"

0
targets/minecraft/client/gui/RepairScreen.h → targets/minecraft/client/gui/inventory/RepairScreen.h
View file

2
targets/minecraft/client/multiplayer/ClientConnection.cpp
View file

@ -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"

13
targets/minecraft/client/player/LocalPlayer.cpp
View file

@ -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"

7
targets/minecraft/client/title/TitleScreen.cpp
View file

@ -2,6 +2,7 @@
#include <stdint.h>
#include <cmath>
#include <vector>
#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);