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

I am suffering

Browse source
This commit is contained in:
halogen 2026-03-03 16:21:43 -05:00
parent cbd8d4f73e
commit 0234a3d8b6
96 changed files with 7891 additions and 121 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
CMakeLists.txt
View file

@ -28,9 +28,10 @@ if(UNIX)
set(CMAKE_C_COMPILER clang-cl)
set(CMAKE_CXX_COMPILER clang-cl)
set(CMAKE_ASM_MASM_COMPILER llvm-ml)
set(CMAKE_LINKER lld-link)
add_compile_options(/winsysroot /opt/msvc --target=x86_64-pc-win32)
add_link_options(/winsysroot /opt/msvc --target=x86_64-pc-win32)
add_compile_options(/winsysroot /opt/msvc /clang:--target=x86_64-pc-windows-msvc)
add_link_options(/winsysroot /opt/msvc /clang:--target=x86_64-pc-windows-msvc)
set(MSVC True)
endif()

2
Minecraft.Client/AbstractContainerScreen.cpp
View file

@ -1,7 +1,7 @@
#include "stdafx.h"
#include "AbstractContainerScreen.h"
#include "ItemRenderer.h"
#include "MultiplayerLocalPlayer.h"
#include "MultiPlayerLocalPlayer.h"
#include "Lighting.h"
#include "GameMode.h"
#include "KeyMapping.h"

4
Minecraft.Client/ChatScreen.cpp
View file

@ -1,6 +1,6 @@
#include "stdafx.h"
#include "ChatScreen.h"
#include "MultiplayerLocalPlayer.h"
#include "MultiPlayerLocalPlayer.h"
#include "../Minecraft.World/SharedConstants.h"
#include "../Minecraft.World/StringHelpers.h"
@ -86,4 +86,4 @@ void ChatScreen::mouseClicked(int x, int y, int buttonNum)
}
}
}
}

4
Minecraft.Client/ClockTexture.cpp
View file

@ -2,7 +2,7 @@
#include "Minecraft.h"
#include "../Minecraft.World/net.minecraft.world.level.h"
#include "../Minecraft.World/net.minecraft.world.level.dimension.h"
#include "MultiplayerLocalPlayer.h"
#include "MultiPlayerLocalPlayer.h"
#include "../Minecraft.World/JavaMath.h"
#include "Texture.h"
#include "ClockTexture.h"
@ -116,4 +116,4 @@ void ClockTexture::freeFrameTextures()
bool ClockTexture::hasOwnData()
{
return m_dataTexture == NULL;
}
}

2
Minecraft.Client/Common/Audio/Consoles_SoundEngine.h
View file

@ -15,7 +15,7 @@
#define _SEKRIT
#include "../../Durango/Miles/include/mss.h"
#elif defined _WINDOWS64
#include "../../windows64/Miles/include/mss.h"
#include "../../Windows64/Miles/include/mss.h"
#else // PS4
// 4J Stu - Temp define to get Miles to link, can likely be removed when we get a new version of Miles
#define _SEKRIT2

6
Minecraft.Client/Common/Audio/SoundEngine.cpp
View file

@ -2,10 +2,10 @@
#include "SoundEngine.h"
#include "../Consoles_App.h"
#include "../../MultiplayerLocalPlayer.h"
#include "../../MultiPlayerLocalPlayer.h"
#include "../../../Minecraft.World/net.minecraft.world.level.h"
#include "../../Minecraft.World/leveldata.h"
#include "../../Minecraft.World/mth.h"
#include "../../Minecraft.World/LevelData.h"
#include "../../Minecraft.World/Mth.h"
#include "../../TexturePackRepository.h"
#include "../../DLCTexturePack.h"
#include "Common/DLC/DLCAudioFile.h"

2
Minecraft.Client/Common/Tutorial/AreaConstraint.cpp
View file

@ -1,7 +1,7 @@
#include "stdafx.h"
#include "../../Minecraft.h"
#include "../../MultiplayerLocalPlayer.h"
#include "../../MultiPlayerLocalPlayer.h"
#include "AreaConstraint.h"
#include "../../../Minecraft.World/AABB.h"

2
Minecraft.Client/Common/Tutorial/AreaHint.cpp
View file

@ -1,7 +1,7 @@
#include "stdafx.h"
#include "../../Minecraft.h"
#include "../../MultiplayerLocalPlayer.h"
#include "../../MultiPlayerLocalPlayer.h"
#include "AreaHint.h"
#include "../../../Minecraft.World/AABB.h"
#include "Tutorial.h"

2
Minecraft.Client/Common/Tutorial/ChangeStateConstraint.cpp
View file

@ -2,7 +2,7 @@
#include "Tutorial.h"
#include "../../Minecraft.h"
#include "../../MultiplayerLocalPlayer.h"
#include "../../MultiPlayerLocalPlayer.h"
#include "../../../Minecraft.World/net.minecraft.world.level.h"
#include "ChangeStateConstraint.h"
#include "../../../Minecraft.World/AABB.h"

2
Minecraft.Client/Common/Tutorial/ChoiceTask.cpp
View file

@ -2,7 +2,7 @@
#include <string>
#include <unordered_map>
#include "../../Minecraft.h"
#include "../../MultiplayerLocalPlayer.h"
#include "../../MultiPlayerLocalPlayer.h"
#include "Tutorial.h"
#include "TutorialConstraints.h"
#include "ChoiceTask.h"

2
Minecraft.Client/Common/Tutorial/ControllerTask.cpp
View file

@ -2,7 +2,7 @@
#include <string>
#include <unordered_map>
#include "../../Minecraft.h"
#include "../../MultiplayerLocalPlayer.h"
#include "../../MultiPlayerLocalPlayer.h"
#include "Tutorial.h"
#include "TutorialConstraints.h"
#include "ControllerTask.h"

2
Minecraft.Client/Common/Tutorial/InfoTask.cpp
View file

@ -2,7 +2,7 @@
#include <string>
#include <unordered_map>
#include "../../Minecraft.h"
#include "../../MultiplayerLocalPlayer.h"
#include "../../MultiPlayerLocalPlayer.h"
#include "Tutorial.h"
#include "TutorialConstraints.h"
#include "InfoTask.h"

2
Minecraft.Client/Common/Tutorial/TutorialHint.cpp
View file

@ -5,7 +5,7 @@
#include "Tutorial.h"
#include "TutorialHint.h"
#include "../../Minecraft.h"
#include "../../MultiplayerLocalPlayer.h"
#include "../../MultiPlayerLocalPlayer.h"
TutorialHint::TutorialHint(eTutorial_Hint id, Tutorial *tutorial, int descriptionId, eHintType type, bool allowFade /*= true*/)
: m_id( id ), m_tutorial(tutorial), m_descriptionId( descriptionId ), m_type( type ), m_counter( 0 ),

2
Minecraft.Client/Common/Tutorial/TutorialMode.cpp
View file

@ -1,7 +1,7 @@
#include "stdafx.h"
#include <memory>
#include "../../Minecraft.h"
#include "../../MultiplayerLocalPlayer.h"
#include "../../MultiPlayerLocalPlayer.h"
#include "../../MultiPlayerLevel.h"
#include "../../../Minecraft.World/Inventory.h"
#include "../../../Minecraft.World/net.minecraft.world.item.h"

2
Minecraft.Client/Common/UI/IUIScene_AbstractContainerMenu.cpp
View file

@ -6,7 +6,7 @@
#include "../../../Minecraft.World/net.minecraft.world.item.h"
#include "../../../Minecraft.World/net.minecraft.world.item.crafting.h"
#include "../../../Minecraft.World/net.minecraft.world.level.tile.entity.h"
#include "../../MultiplayerLocalPlayer.h"
#include "../../MultiPlayerLocalPlayer.h"
#include "../../Minecraft.h"
#ifdef __ORBIS__

2
Minecraft.Client/Common/UI/IUIScene_CreativeMenu.cpp
View file

@ -2,7 +2,7 @@
#include "IUIScene_CreativeMenu.h"
#include "../../Minecraft.h"
#include "../../MultiplayerLocalPlayer.h"
#include "../../MultiPlayerLocalPlayer.h"
#include "../../../Minecraft.World/net.minecraft.world.inventory.h"
#include "../../../Minecraft.World/net.minecraft.world.level.tile.h"
#include "../../../Minecraft.World/net.minecraft.world.level.tile.entity.h"

2
Minecraft.Client/Common/UI/IUIScene_EnchantingMenu.cpp
View file

@ -1,7 +1,7 @@
#include "stdafx.h"
#include "../../../Minecraft.World/net.minecraft.world.inventory.h"
#include "../../Minecraft.h"
#include "../../MultiplayerLocalPlayer.h"
#include "../../MultiPlayerLocalPlayer.h"
#include "IUIScene_EnchantingMenu.h"
IUIScene_AbstractContainerMenu::ESceneSection IUIScene_EnchantingMenu::GetSectionAndSlotInDirection( IUIScene_AbstractContainerMenu::ESceneSection eSection, ETapState eTapDirection, int *piTargetX, int *piTargetY )

2
Minecraft.Client/Common/UI/UIComponent_TutorialPopup.cpp
View file

@ -3,7 +3,7 @@
#include "UIComponent_TutorialPopup.h"
#include "../../Common/Tutorial/Tutorial.h"
#include "../../../Minecraft.World/StringHelpers.h"
#include "../../MultiplayerLocalPlayer.h"
#include "../../MultiPlayerLocalPlayer.h"
#include "../../Minecraft.h"
#include "../../../Minecraft.World/net.minecraft.world.level.tile.h"

2
Minecraft.Client/Common/UI/UIControl_EnchantmentButton.cpp
View file

@ -3,7 +3,7 @@
#include "UIControl_EnchantmentButton.h"
#include "../../../Minecraft.World/net.minecraft.world.inventory.h"
#include "../../Minecraft.h"
#include "../../MultiplayerLocalPlayer.h"
#include "../../MultiPlayerLocalPlayer.h"
#include "../../../Minecraft.World/StringHelpers.h"
UIControl_EnchantmentButton::UIControl_EnchantmentButton()

2
Minecraft.Client/Common/UI/UIControl_MinecraftHorse.cpp
View file

@ -16,7 +16,7 @@
#include "../../../Minecraft.World/net.minecraft.world.entity.player.h"
//#include "../../../Minecraft.World/net.minecraft.world.entity.animal.EntityHorse.h"
#include "../../MultiplayerLocalPlayer.h"
#include "../../MultiPlayerLocalPlayer.h"
#include "UI.h"
#include "UIControl_MinecraftHorse.h"

2
Minecraft.Client/Common/UI/UIControl_MinecraftPlayer.cpp
View file

@ -8,7 +8,7 @@
#include "../../ModelPart.h"
#include "../../Options.h"
#include "../../../Minecraft.World/net.minecraft.world.entity.player.h"
#include "../../MultiplayerLocalPlayer.h"
#include "../../MultiPlayerLocalPlayer.h"
#include "UI.h"
#include "UIControl_MinecraftPlayer.h"

2
Minecraft.Client/Common/UI/UIScene_AbstractContainerMenu.cpp
View file

@ -4,7 +4,7 @@
#include "../../../Minecraft.World/net.minecraft.world.inventory.h"
#include "../../../Minecraft.World/net.minecraft.world.item.h"
#include "../../MultiplayerLocalPlayer.h"
#include "../../MultiPlayerLocalPlayer.h"
#ifdef _WINDOWS64
#include "../../Windows64/KeyboardMouseInput.h"
#endif

2
Minecraft.Client/Common/UI/UIScene_ControlsMenu.cpp
View file

@ -2,7 +2,7 @@
#include "UI.h"
#include "UIScene_ControlsMenu.h"
#include "../../Minecraft.h"
#include "../../MultiplayerLocalPlayer.h"
#include "../../MultiPlayerLocalPlayer.h"
UIScene_ControlsMenu::UIScene_ControlsMenu(int iPad, void *initData, UILayer *parentLayer) : UIScene(iPad, parentLayer)
{

2
Minecraft.Client/Common/UI/UIScene_CraftingMenu.cpp
View file

@ -1,7 +1,7 @@
#include "stdafx.h"
#include "UI.h"
#include "../../Minecraft.h"
#include "../../MultiplayerLocalPlayer.h"
#include "../../MultiPlayerLocalPlayer.h"
#include "../../../Minecraft.World/net.minecraft.world.inventory.h"
#include "UIScene_CraftingMenu.h"

2
Minecraft.Client/Common/UI/UIScene_DeathMenu.cpp
View file

@ -3,7 +3,7 @@
#include "UIScene_DeathMenu.h"
#include "IUIScene_PauseMenu.h"
#include "../../Minecraft.h"
#include "../../MultiplayerLocalPlayer.h"
#include "../../MultiPlayerLocalPlayer.h"
UIScene_DeathMenu::UIScene_DeathMenu(int iPad, void *initData, UILayer *parentLayer) : UIScene(iPad, parentLayer)
{

2
Minecraft.Client/Common/UI/UIScene_EndPoem.cpp
View file

@ -3,7 +3,7 @@
#include "UIScene_EndPoem.h"
#include "UIBitmapFont.h"
#include "../../Minecraft.h"
#include "../../MultiplayerLocalPlayer.h"
#include "../../MultiPlayerLocalPlayer.h"
#include "../../../Minecraft.World/StringHelpers.h"
UIScene_EndPoem::UIScene_EndPoem(int iPad, void *initData, UILayer *parentLayer) : UIScene(iPad, parentLayer)

2
Minecraft.Client/Common/UI/UIScene_HUD.cpp
View file

@ -3,7 +3,7 @@
#include "UIScene_HUD.h"
#include "BossMobGuiInfo.h"
#include "../../Minecraft.h"
#include "../../MultiplayerLocalPlayer.h"
#include "../../MultiPlayerLocalPlayer.h"
#include "../../../Minecraft.World/net.minecraft.world.entity.boss.enderdragon.h"
#include "../../EnderDragonRenderer.h"
#include "../../../Minecraft.World/net.minecraft.world.inventory.h"

2
Minecraft.Client/Common/UI/UIScene_InventoryMenu.cpp
View file

@ -6,7 +6,7 @@
#include "../../../Minecraft.World/net.minecraft.world.item.h"
#include "../../../Minecraft.World/net.minecraft.stats.h"
#include "../../../Minecraft.World/net.minecraft.world.effect.h"
#include "../../MultiplayerLocalPlayer.h"
#include "../../MultiPlayerLocalPlayer.h"
#include "../../Minecraft.h"
#include "../../Options.h"
#include "../../EntityRenderDispatcher.h"

2
Minecraft.Client/Common/UI/UIScene_PauseMenu.cpp
View file

@ -2,7 +2,7 @@
#include "UI.h"
#include "UIScene_PauseMenu.h"
#include "../../MinecraftServer.h"
#include "../../MultiplayerLocalPlayer.h"
#include "../../MultiPlayerLocalPlayer.h"
#include "../../TexturePackRepository.h"
#include "../../TexturePack.h"
#include "../../DLCTexturePack.h"

2
Minecraft.Client/Common/XUI/XUI_Ctrl_MinecraftPlayer.cpp
View file

@ -3,7 +3,7 @@
#include "../../ScreenSizeCalculator.h"
#include "../../EntityRenderDispatcher.h"
#include "../../Lighting.h"
#include "../../MultiplayerLocalPlayer.h"
#include "../../MultiPlayerLocalPlayer.h"
#include "XUI_Ctrl_MinecraftPlayer.h"
#include "XUI_Scene_AbstractContainer.h"
#include "XUI_Scene_Inventory.h"

2
Minecraft.Client/Common/XUI/XUI_Death.cpp
View file

@ -9,7 +9,7 @@
#include "../../../Minecraft.World/net.minecraft.stats.h"
#include "../../../Minecraft.Client/StatsCounter.h"
#include "../../../Minecraft.World/Entity.h"
#include "../../../Minecraft.Client/MultiplayerLocalPlayer.h"
#include "../../../Minecraft.Client/MultiPlayerLocalPlayer.h"
#include "../../../Minecraft.World/Level.h"
#include "../../../Minecraft.World/ChunkSource.h"
#include "../../../Minecraft.Client/ProgressRenderer.h"

2
Minecraft.Client/Common/XUI/XUI_DebugOverlay.cpp
View file

@ -1,6 +1,6 @@
#include "stdafx.h"
#include "../../Minecraft.h"
#include "../../MultiplayerLocalPlayer.h"
#include "../../MultiPlayerLocalPlayer.h"
#include "../../MultiplayerLevel.h"
#include "../../GameMode.h"
#include "../../SurvivalMode.h"

2
Minecraft.Client/Common/XUI/XUI_DebugSetCamera.cpp
View file

@ -6,7 +6,7 @@
// #include "../../Xbox/4JLibs/inc/4J_Input.h"
#include "../../Minecraft.h"
#include "../../MultiplayerLocalPlayer.h"
#include "../../MultiPlayerLocalPlayer.h"
#ifndef _CONTENT_PACKAGE
HRESULT CScene_DebugSetCamera::OnInit( XUIMessageInit *pInitData, BOOL &bHandled )

2
Minecraft.Client/Common/XUI/XUI_HUD.cpp
View file

@ -2,7 +2,7 @@
#include "XUI_HUD.h"
#include "../../Minecraft.h"
#include "../../Gui.h"
#include "../../MultiplayerLocalPlayer.h"
#include "../../MultiPlayerLocalPlayer.h"
#include "../../../Minecraft.World/net.minecraft.world.inventory.h"
#include "../../../Minecraft.World/Random.h"
#include "../../../Minecraft.World/net.minecraft.world.effect.h"

2
Minecraft.Client/Common/XUI/XUI_HelpControls.cpp
View file

@ -6,7 +6,7 @@
#include "../../../Minecraft.World/net.minecraft.world.level.h"
#include "../../../Minecraft.World/LevelData.h"
#include "../../MultiplayerLocalPlayer.h"
#include "../../MultiPlayerLocalPlayer.h"
#define ALIGN_START 0
#define ALIGN_END 1

2
Minecraft.Client/Common/XUI/XUI_PauseMenu.cpp
View file

@ -10,7 +10,7 @@
#include "../../../Minecraft.Client/StatsCounter.h"
#include "../../../Minecraft.World/Entity.h"
#include "../../../Minecraft.World/Level.h"
#include "../../../Minecraft.Client/MultiplayerLocalPlayer.h"
#include "../../../Minecraft.Client/MultiPlayerLocalPlayer.h"
#include "../../MinecraftServer.h"
#include "../../MultiPlayerLevel.h"
#include "../../ProgressRenderer.h"

2
Minecraft.Client/Common/XUI/XUI_Scene_Base.cpp
View file

@ -2,7 +2,7 @@
#include <assert.h>
#include "../../MultiplayerLevel.h"
#include "../../MultiplayerLocalPlayer.h"
#include "../../MultiPlayerLocalPlayer.h"
#include "../../StatsCounter.h"
#include "../../../Minecraft.World/StringHelpers.h"
#include "../../../Minecraft.World/net.minecraft.stats.h"

2
Minecraft.Client/Common/XUI/XUI_Scene_Container.cpp
View file

@ -2,7 +2,7 @@
#include "../../../Minecraft.World/Container.h"
#include "../../../Minecraft.World/ContainerMenu.h"
#include "../../MultiplayerLocalPlayer.h"
#include "../../MultiPlayerLocalPlayer.h"
#include "XUI_Ctrl_SlotList.h"
#include "XUI_Scene_Container.h"
#include "XUI_Ctrl_SlotItemListItem.h"

2
Minecraft.Client/Common/XUI/XUI_Scene_CraftingPanel.cpp
View file

@ -4,7 +4,7 @@
#include "stdafx.h"
#include <assert.h>
#include "../../MultiplayerLocalPlayer.h"
#include "../../MultiPlayerLocalPlayer.h"
#include "../../../Minecraft.World/net.minecraft.world.item.h"
#include "../../../Minecraft.World/net.minecraft.world.item.crafting.h"
#include "../../../Minecraft.World/net.minecraft.world.inventory.h"

2
Minecraft.Client/Common/XUI/XUI_Scene_Enchant.cpp
View file

@ -6,7 +6,7 @@
#include "../../../Minecraft.World/net.minecraft.world.level.dimension.h"
//#include "../../../Minecraft.World/net.minecraft.stats.h"
#include "../../MultiplayerLocalPlayer.h"
#include "../../MultiPlayerLocalPlayer.h"
#include "../../Common/Tutorial/Tutorial.h"
#include "../../Common/Tutorial/TutorialMode.h"
#include "../../Common/Tutorial/TutorialEnum.h"

2
Minecraft.Client/Common/XUI/XUI_Scene_Furnace.cpp
View file

@ -1,7 +1,7 @@
#include "stdafx.h"
#include "../../../Minecraft.World/FurnaceMenu.h"
#include "../../MultiplayerLocalPlayer.h"
#include "../../MultiPlayerLocalPlayer.h"
#include "../../Common/Tutorial/Tutorial.h"
#include "../../Common/Tutorial/TutorialMode.h"
#include "../../Common/Tutorial/TutorialEnum.h"

2
Minecraft.Client/Common/XUI/XUI_Scene_Inventory.cpp
View file

@ -3,7 +3,7 @@
#include "../../../Minecraft.World/net.minecraft.world.inventory.h"
#include "../../../Minecraft.World/net.minecraft.stats.h"
#include "../../../Minecraft.World/net.minecraft.world.effect.h"
#include "../../MultiplayerLocalPlayer.h"
#include "../../MultiPlayerLocalPlayer.h"
#include "../../Common/Tutorial/Tutorial.h"
#include "../../Common/Tutorial/TutorialMode.h"
#include "../../Common/Tutorial/TutorialEnum.h"

2
Minecraft.Client/Common/XUI/XUI_Scene_Inventory_Creative.cpp
View file

@ -10,7 +10,7 @@
#include "../../../Minecraft.World/net.minecraft.world.entity.player.h"
#include "../../../Minecraft.World/net.minecraft.stats.h"
#include "../../MultiplayerLocalPlayer.h"
#include "../../MultiPlayerLocalPlayer.h"
#include "../../Common/Tutorial/Tutorial.h"
#include "../../Common/Tutorial/TutorialMode.h"
#include "../../Minecraft.h"

2
Minecraft.Client/Common/XUI/XUI_Scene_Trap.cpp
View file

@ -2,7 +2,7 @@
#include "../../../Minecraft.World/DispenserTileEntity.h"
#include "../../../Minecraft.World/TrapMenu.h"
#include "../../MultiplayerLocalPlayer.h"
#include "../../MultiPlayerLocalPlayer.h"
#include "XUI_Ctrl_SlotList.h"
#include "XUI_Scene_Trap.h"
#include "../../Common/Tutorial/Tutorial.h"

2
Minecraft.Client/Common/XUI/XUI_Scene_Win.cpp
View file

@ -8,7 +8,7 @@
#include "../../../Minecraft.World/Random.h"
#include "../../../Minecraft.World/SharedConstants.h"
#include "../../../Minecraft.World/StringHelpers.h"
#include "../../MultiplayerLocalPlayer.h"
#include "../../MultiPlayerLocalPlayer.h"
#include "XUI_Scene_Win.h"
BYTE CScene_Win::s_winUserIndex = 0;

2
Minecraft.Client/Common/XUI/XUI_TextEntry.cpp
View file

@ -1,6 +1,6 @@
#include "stdafx.h"
#include "XUI_TextEntry.h"
#include "../../MultiplayerLocalPlayer.h"
#include "../../MultiPlayerLocalPlayer.h"
CScene_TextEntry::CommandParams CScene_TextEntry::CommandA[CScene_TextEntry::eCommand_MAX]=

2
Minecraft.Client/Common/XUI/XUI_TutorialPopup.cpp
View file

@ -1,6 +1,6 @@
#include "stdafx.h"
#include "../../Common/Tutorial/Tutorial.h"
#include "../../MultiplayerLocalPlayer.h"
#include "../../MultiPlayerLocalPlayer.h"
#include "../../../Minecraft.World/StringHelpers.h"
#include "../../../Minecraft.World/Tile.h"
#include "../../../Minecraft.World/Item.h"

2
Minecraft.Client/CompassTexture.cpp
View file

@ -2,7 +2,7 @@
#include "Minecraft.h"
#include "../Minecraft.World/net.minecraft.world.level.h"
#include "../Minecraft.World/net.minecraft.world.level.dimension.h"
#include "MultiplayerLocalPlayer.h"
#include "MultiPlayerLocalPlayer.h"
#include "../Minecraft.World/JavaMath.h"
#include "Texture.h"
#include "CompassTexture.h"

2
Minecraft.Client/CraftingScreen.cpp
View file

@ -1,7 +1,7 @@
#include "stdafx.h"
#include "CraftingScreen.h"
#include "Textures.h"
#include "MultiplayerLocalPlayer.h"
#include "MultiPlayerLocalPlayer.h"
#include "../Minecraft.World/net.minecraft.world.inventory.h"
CraftingScreen::CraftingScreen(shared_ptr<Inventory> inventory, Level *level, int x, int y, int z) : AbstractContainerScreen(new CraftingMenu(inventory, level, x, y, z))

2
Minecraft.Client/DeathScreen.cpp
View file

@ -2,7 +2,7 @@
#include "../Minecraft.World/StringHelpers.h"
#include "DeathScreen.h"
#include "Button.h"
#include "MultiplayerLocalPlayer.h"
#include "MultiPlayerLocalPlayer.h"
#include "TitleScreen.h"
void DeathScreen::init()

4
Minecraft.Client/DragonModel.cpp
View file

@ -1,7 +1,7 @@
#include "stdafx.h"
#include "DragonModel.h"
#include "../Minecraft.World/Mth.h"
#include "../Minecraft.World/Enderdragon.h"
#include "../Minecraft.World/EnderDragon.h"
DragonModel::DragonModel(float g) : Model()
{
@ -245,4 +245,4 @@ float DragonModel::rotWrap(double d)
while (d < -180)
d += 360;
return (float) d;
}
}

4
Minecraft.Client/EntityRenderDispatcher.cpp
View file

@ -44,7 +44,7 @@
#include "ExperienceOrbRenderer.h"
#include "SilverfishRenderer.h"
#include "MushroomCowRenderer.h"
#include "SnowmanRenderer.h"
#include "SnowManRenderer.h"
#include "LavaSlimeRenderer.h"
#include "VillagerRenderer.h"
#include "EnderDragonRenderer.h"
@ -367,4 +367,4 @@ void EntityRenderDispatcher::renderHitbox(shared_ptr<Entity> entity, double x, d
glEnable(GL_CULL_FACE);
glDisable(GL_BLEND);
glDepthMask(true);
}
}

2
Minecraft.Client/GameRenderer.cpp
View file

@ -13,7 +13,7 @@
#include "CreativeMode.h"
#include "Lighting.h"
#include "Options.h"
#include "MultiplayerLocalPlayer.h"
#include "MultiPlayerLocalPlayer.h"
#include "GuiParticles.h"
#include "MultiPlayerLevel.h"
#include "Chunk.h"

2
Minecraft.Client/Gui.cpp
View file

@ -3,7 +3,7 @@
#include "ItemRenderer.h"
#include "GameRenderer.h"
#include "Options.h"
#include "MultiplayerLocalPlayer.h"
#include "MultiPlayerLocalPlayer.h"
#include "Textures.h"
#include "TextureAtlas.h"
#include "GameMode.h"

2
Minecraft.Client/InBedChatScreen.cpp
View file

@ -1,7 +1,7 @@
#include "stdafx.h"
#include "InBedChatScreen.h"
#include "Button.h"
#include "MultiplayerLocalPlayer.h"
#include "MultiPlayerLocalPlayer.h"
#include "../Minecraft.World/net.minecraft.locale.h"
#include "../Minecraft.World/StringHelpers.h"

2
Minecraft.Client/InventoryScreen.cpp
View file

@ -1,6 +1,6 @@
#include "stdafx.h"
#include "InventoryScreen.h"
#include "MultiplayerLocalPlayer.h"
#include "MultiPlayerLocalPlayer.h"
#include "Font.h"
#include "EntityRenderDispatcher.h"
#include "Lighting.h"

20
Minecraft.Client/IobShim.c Normal file
View file

@ -0,0 +1,20 @@
// Original file is iob_shim.asm
// Rewritten in C because the build system breaks on linux-windows crosscomp with this
#if 0
.code
EXTRN __acrt_iob_func:PROC
__iob_func PROC
mov ecx, 0
jmp __acrt_iob_func
__iob_func ENDP
END
#endif
extern void* __acrt_iob_func(unsigned int);
void* __iob_func(void)
{
return __acrt_iob_func(0);
}

10
Minecraft.Client/ItemFrameRenderer.cpp
View file

@ -1,15 +1,15 @@
#include "stdafx.h"
#include "ItemRenderer.h"
#include "tileRenderer.h"
#include "entityRenderDispatcher.h"
#include "TileRenderer.h"
#include "EntityRenderDispatcher.h"
//#include "ItemFrame"
#include "ItemFrameRenderer.h"
#include "TextureAtlas.h"
#include "../Minecraft.World/JavaMath.h"
#include "../Minecraft.World/net.minecraft.world.entity.Item.h"
#include "../Minecraft.World/net.minecraft.world.Item.h"
#include "../Minecraft.World/net.minecraft.world.Item.alchemy.h"
#include "../Minecraft.World/net.minecraft.world.entity.item.h"
#include "../Minecraft.World/net.minecraft.world.item.h"
#include "../Minecraft.World/net.minecraft.world.item.alchemy.h"
#include "../Minecraft.World/net.minecraft.world.level.tile.h"
#include "../Minecraft.World/StringHelpers.h"
#include "Minecraft.h"

2
Minecraft.Client/ItemInHandRenderer.cpp
View file

@ -8,7 +8,7 @@
#include "PlayerRenderer.h"
#include "EntityRenderDispatcher.h"
#include "Lighting.h"
#include "MultiplayerLocalPlayer.h"
#include "MultiPlayerLocalPlayer.h"
#include "Minimap.h"
#include "MultiPlayerLevel.h"
#include "../Minecraft.World/net.minecraft.world.item.h"

2
Minecraft.Client/ItemRenderer.cpp
View file

@ -1,7 +1,7 @@
#include "stdafx.h"
#include "ItemRenderer.h"
#include "TileRenderer.h"
#include "entityRenderDispatcher.h"
#include "EntityRenderDispatcher.h"
#include "../Minecraft.World/JavaMath.h"
#include "../Minecraft.World/net.minecraft.world.entity.item.h"
#include "../Minecraft.World/net.minecraft.world.item.h"

2
Minecraft.Client/LevelRenderer.cpp
View file

@ -56,7 +56,7 @@
#include "../Minecraft.World/net.minecraft.world.level.chunk.h"
#include "../Minecraft.World/net.minecraft.world.entity.projectile.h"
#include "../Minecraft.World/net.minecraft.world.h"
#include "MultiplayerLocalPlayer.h"
#include "MultiPlayerLocalPlayer.h"
#include "MultiPlayerLevel.h"
#include "../Minecraft.World/SoundTypes.h"
#include "FrustumCuller.h"

6
Minecraft.Client/LocalPlayer.cpp
View file

@ -37,9 +37,9 @@
#include "CritParticle.h"
// 4J : WESTY : Added for new achievements.
#include "../Minecraft.World/item.h"
#include "../Minecraft.World/mapitem.h"
#include "../Minecraft.World/tile.h"
#include "../Minecraft.World/Item.h"
#include "../Minecraft.World/MapItem.h"
#include "../Minecraft.World/Tile.h"
// 4J Stu - Added for tutorial callbacks
#include "Minecraft.h"

4
Minecraft.Client/MobRenderer.cpp
View file

@ -7,7 +7,7 @@
#include "../Minecraft.World/net.minecraft.world.entity.projectile.h"
#include "../Minecraft.World/StringHelpers.h"
#include "../Minecraft.World/Mth.h"
#include "entityRenderDispatcher.h"
#include "EntityRenderDispatcher.h"
MobRenderer::MobRenderer(Model *model, float shadow) : LivingEntityRenderer(model, shadow)
{
@ -124,4 +124,4 @@ void MobRenderer::renderLeash(shared_ptr<Mob> entity, double x, double y, double
double MobRenderer::lerp(double prev, double next, double a)
{
return prev + (next - prev) * a;
}
}

2
Minecraft.Client/MultiPlayerLocalPlayer.cpp
View file

@ -1,6 +1,6 @@
#include "stdafx.h"
//#include "../Minecraft.World/JavaMath.h"
#include "MultiplayerLocalPlayer.h"
#include "MultiPlayerLocalPlayer.h"
#include "ClientConnection.h"
#include "../Minecraft.World/net.minecraft.world.level.h"
#include "../Minecraft.World/net.minecraft.network.h"

4
Minecraft.Client/PaintingRenderer.cpp
View file

@ -1,6 +1,6 @@
#include "stdafx.h"
#include "PaintingRenderer.h"
#include "entityRenderDispatcher.h"
#include "EntityRenderDispatcher.h"
#include "../Minecraft.World/net.minecraft.world.entity.h"
#include "../Minecraft.World/net.minecraft.world.level.h"
#include "../Minecraft.World/Random.h"
@ -138,4 +138,4 @@ void PaintingRenderer::setBrightness(shared_ptr<Painting> painting, float ss, fl
ResourceLocation *PaintingRenderer::getTextureLocation(shared_ptr<Entity> mob)
{
return &PAINTING_LOCATION;
}
}

4
Minecraft.Client/PendingConnection.cpp
View file

@ -8,7 +8,7 @@
#include "PlayerList.h"
#include "MinecraftServer.h"
#include "../Minecraft.World/net.minecraft.network.h"
#include "../Minecraft.World/pos.h"
#include "../Minecraft.World/Pos.h"
#include "../Minecraft.World/net.minecraft.world.level.dimension.h"
#include "../Minecraft.World/net.minecraft.world.level.storage.h"
#include "../Minecraft.World/net.minecraft.world.item.h"
@ -271,4 +271,4 @@ bool PendingConnection::isServerPacketListener()
bool PendingConnection::isDisconnected()
{
return done;
}
}

4
Minecraft.Client/PlayerRenderer.cpp
View file

@ -6,7 +6,7 @@
#include "ModelPart.h"
#include "LocalPlayer.h"
#include "MultiPlayerLocalPlayer.h"
#include "entityRenderDispatcher.h"
#include "EntityRenderDispatcher.h"
#include "../Minecraft.World/net.minecraft.world.entity.h"
#include "../Minecraft.World/net.minecraft.world.entity.player.h"
#include "../Minecraft.World/net.minecraft.world.item.h"
@ -555,4 +555,4 @@ ResourceLocation *PlayerRenderer::getTextureLocation(shared_ptr<Entity> entity)
{
shared_ptr<Player> player = dynamic_pointer_cast<Player>(entity);
return new ResourceLocation((_TEXTURE_NAME)player->getTexture());
}
}

2
Minecraft.Client/SnowManModel.cpp
View file

@ -1,5 +1,5 @@
#include "stdafx.h"
#include "SnowmanModel.h"
#include "SnowManModel.h"
#include "../Minecraft.World/Mth.h"
#include "ModelPart.h"

2
Minecraft.Client/StringTable.cpp
View file

@ -1,4 +1,4 @@
#include "StdAfx.h"
#include "stdafx.h"
#include "StringTable.h"
StringTable::StringTable(void)

4
Minecraft.Client/Vertex.cpp
View file

@ -1,5 +1,5 @@
#include "stdafx.h"
#include "vertex.h"
#include "Vertex.h"
Vertex::Vertex(float x, float y, float z, float u, float v)
{
@ -25,4 +25,4 @@ Vertex::Vertex(Vec3 *pos, float u, float v)
this->pos = pos;
this->u = u;
this->v = v;
}
}

2
Minecraft.Client/ViewportCuller.h
View file

@ -1,6 +1,6 @@
#pragma once
#include "Culler.h"
#include "../Minecraft.World/mob.h"
#include "../Minecraft.World/Mob.h"
class Mob;
class ViewportCuller : public Culler

2
Minecraft.Client/Windows64/Iggy/include/gdraw.h
View file

@ -6,7 +6,7 @@
#ifndef __RAD_INCLUDE_GDRAW_H__
#define __RAD_INCLUDE_GDRAW_H__
#include "rrcore.h"
#include "rrCore.h"
#define IDOC

2
Minecraft.Client/Windows64/Iggy/include/iggy.h
View file

@ -8,7 +8,7 @@
#define IggyVersion "1.2.30"
#define IggyFlashVersion "9,1,2,30"
#include "rrcore.h" // base data types, macros
#include "rrCore.h" // base data types, macros
RADDEFSTART

2
Minecraft.Client/Windows64/Miles/include/mss.h
View file

@ -97,7 +97,7 @@ EXPGROUP(_RootGroup)
// IS_SPU for PS3 SPU
// IS_WII for Wii
#include "rrCore.h"
#include "rrcore.h"
//#define MILES_CHECK_OFFSETS
#ifdef MILES_CHECK_OFFSETS

4
Minecraft.Client/Windows64/Windows64_Minecraft.cpp
View file

@ -38,7 +38,7 @@
#include "../../Minecraft.World/compression.h"
#include "../../Minecraft.World/OldChunkStorage.h"
#include "Xbox/resource.h"
#include "Xbox/Resource.h"
#ifdef _MSC_VER
#pragma comment(lib, "legacy_stdio_definitions.lib")
@ -1538,4 +1538,4 @@ void MemPixStuff()
PIXAddNamedCounter(((float)allSectsTotal)/(4096.0f),"MemSect total pages");
}
#endif
#endif

2
Minecraft.Client/Xbox/Audio/SoundEngine.cpp
View file

@ -4,7 +4,7 @@
#include "../../../Minecraft.World/Random.h"
#include "../../../Minecraft.World/LevelData.h"
#include "../../Minecraft.h"
#include "../../MultiplayerLocalPlayer.h"
#include "../../MultiPlayerLocalPlayer.h"
#include "SoundEngine.h"
#include "../../TexturePackRepository.h"
#include "../../TexturePack.h"

2
Minecraft.Client/Xbox/Sentient/SentientManager.cpp
View file

@ -5,7 +5,7 @@
#include "../GameConfig/Minecraft.spa.h"
#include "../../Minecraft.h"
#include "../../MultiplayerLocalPlayer.h"
#include "../../MultiPlayerLocalPlayer.h"
#include "../../../Minecraft.World/Dimension.h"
#include "../../../Minecraft.World/net.minecraft.world.level.h"
#include "../../../Minecraft.World/net.minecraft.world.level.storage.h"

4
Minecraft.Client/stdafx.h
View file

@ -150,7 +150,7 @@ typedef XUID GameSessionUID;
#endif
#include "../Minecraft.World/Definitions.h"
#include "../Minecraft.World/class.h"
#include "../Minecraft.World/Class.h"
#include "../Minecraft.World/ArrayWithLength.h"
#include "../Minecraft.World/SharedConstants.h"
#include "../Minecraft.World/Random.h"
@ -211,7 +211,7 @@ typedef XUID GameSessionUID;
#include "Common/XUI/XUI_Scene_Base.h"
#endif
#include "Common/App_defines.h"
#include "Common/App_Defines.h"
#include "Common/UI/UIEnums.h"
#include "Common/UI/UIStructs.h"
// #ifdef _XBOX

2
Minecraft.World/ClothDyeRecipes.cpp
View file

@ -1,5 +1,5 @@
#include "stdafx.h"
#include "net.minecraft.world.Item.h"
#include "net.minecraft.world.item.h"
#include "net.minecraft.world.level.tile.h"
#include "Recipy.h"
#include "Recipes.h"

2
Minecraft.World/Dimension.cpp
View file

@ -3,7 +3,7 @@
#include "net.minecraft.world.level.levelgen.h"
#include "net.minecraft.world.level.h"
#include "net.minecraft.world.level.storage.h"
#include "dimension.h"
#include "Dimension.h"
#include "BiomeSource.h"
#include "FixedBiomeSource.h"
#include "OldChunkStorage.h"

6
Minecraft.World/Entity.cpp
View file

@ -18,10 +18,10 @@
#include "EntityPos.h"
#include "Entity.h"
#include "SoundTypes.h"
#include "../minecraft.Client/HumanoidModel.h"
#include "../Minecraft.Client/HumanoidModel.h"
#include "../Minecraft.Client/MinecraftServer.h"
#include "../Minecraft.Client/MultiPlayerLevel.h"
#include "../Minecraft.Client/MultiplayerLocalPlayer.h"
#include "../Minecraft.Client/MultiPlayerLocalPlayer.h"
#include "../Minecraft.Client/ServerLevel.h"
#include "../Minecraft.Client/PlayerList.h"
@ -2148,4 +2148,4 @@ unsigned int Entity::getAnimOverrideBitmask()
}
return m_uiAnimOverrideBitmask;
}
}

2
Minecraft.World/FireChargeItem.cpp
View file

@ -6,7 +6,7 @@
#include "net.minecraft.world.h"
#include "SoundTypes.h"
#include "FireChargeItem.h"
#include "tile.h"
#include "Tile.h"
FireChargeItem::FireChargeItem(int id) : Item(id)
{

4
Minecraft.World/GlowstoneTile.cpp
View file

@ -1,5 +1,5 @@
#include "stdafx.h"
#include "Glowstonetile.h"
#include "GlowstoneTile.h"
#include "net.minecraft.world.item.h"
Glowstonetile::Glowstonetile(int id, Material *material) : Tile(id, material)
@ -19,4 +19,4 @@ int Glowstonetile::getResourceCount(Random *random)
int Glowstonetile::getResource(int data, Random *random, int playerBonusLevel)
{
return Item::yellowDust->id;
}
}

2
Minecraft.World/HangingEntityItem.h
View file

@ -1,6 +1,6 @@
#pragma once
#include "item.h"
#include "Item.h"
class HangingEntity;

2
Minecraft.World/Level.h
View file

@ -7,7 +7,7 @@ using namespace std;
#include "SavedData.h"
#include "Definitions.h"
#include "ParticleTypes.h"
#include "biome.h"
#include "Biome.h"
#include "C4JThread.h"
#ifdef __PSVITA__

2
Minecraft.World/NetherBridgeFeature.h
View file

@ -1,7 +1,7 @@
#pragma once
#include "StructureFeature.h"
#include "StructureStart.h"
#include "biome.h"
#include "Biome.h"
class Random;
class NetherBridgeFeature : public StructureFeature

4
Minecraft.World/Path.cpp
View file

@ -1,7 +1,7 @@
#include "stdafx.h"
#include "net.minecraft.world.entity.h"
#include "net.minecraft.world.level.pathfinder.h"
#include "path.h"
#include "Path.h"
Path::~Path()
{
@ -113,4 +113,4 @@ bool Path::endsInXZ(Vec3 *pos)
Node *lastNode = last();
if (lastNode == NULL) return false;
return lastNode->x == (int) pos->x && lastNode->z == (int) pos->z;
}
}

2
Minecraft.World/PreLoginPacket.cpp
View file

@ -1,7 +1,7 @@
#include "stdafx.h"
#include <iostream>
#include "PacketListener.h"
#include "PreloginPacket.h"
#include "PreLoginPacket.h"
#include "InputOutputStream.h"

2
Minecraft.World/RedStoneItem.cpp
View file

@ -4,7 +4,7 @@
#include "net.minecraft.world.level.tile.h"
#include "ItemInstance.h"
#include "GenericStats.h"
#include "RedstoneItem.h"
#include "RedStoneItem.h"
RedStoneItem::RedStoneItem(int id) : Item(id)
{

2
Minecraft.World/TileItem.cpp
View file

@ -10,7 +10,7 @@ using namespace std;
#include "net.minecraft.world.h"
#include "net.minecraft.stats.h"
#include "TileItem.h"
#include "facing.h"
#include "Facing.h"
// 4J-PB - for the debug option of not removing items
#include <xuiresource.h>

6
Minecraft.World/WoodSlabTile.cpp
View file

@ -1,7 +1,7 @@
#include "stdafx.h"
#include "WoodSlabTile.h"
#include "woodtile.h"
#include "treetile.h"
#include "WoodTile.h"
#include "TreeTile.h"
#include "net.minecraft.world.level.h"
#include "net.minecraft.world.level.biome.h"
#include "net.minecraft.world.item.h"
@ -57,4 +57,4 @@ unsigned int WoodSlabTile::getDescriptionId(int iData)
iData = 0;
}
return SLAB_NAMES[iData];
}
}

4
Minecraft.World/net.minecraft.world.item.h
View file

@ -34,7 +34,7 @@
#include "ShearsItem.h"
#include "ShovelItem.h"
#include "SignItem.h"
#include "SnowBallItem.h"
#include "SnowballItem.h"
#include "StoneSlabTileItem.h"
#include "TileItem.h"
#include "TilePlanterItem.h"
@ -84,4 +84,4 @@
// 4J Added
#include "ClockItem.h"
#include "CompassItem.h"
#include "HtmlString.h"
#include "HtmlString.h"

2
Minecraft.World/net.minecraft.world.level.tile.h
View file

@ -44,7 +44,7 @@
#include "FlowerPotTile.h"
#include "FurnaceTile.h"
#include "GlassTile.h"
#include "Glowstonetile.h"
#include "GlowstoneTile.h"
#include "GrassTile.h"
#include "GravelTile.h"
#include "HalfSlabTile.h"

2
Minecraft.World/stdafx.h
View file

@ -183,7 +183,7 @@ void MemSect(int sect);
#include "../Minecraft.Client/Common/Network/GameNetworkManager.h"
// #ifdef _XBOX
#include "../Minecraft.Client/Common/App_defines.h"
#include "../Minecraft.Client/Common/App_Defines.h"
#include "../Minecraft.Client/Common/UI/UIEnums.h"
#include "../Minecraft.Client/Common/App_enums.h"
#include "../Minecraft.Client/Common/Tutorial/TutorialEnum.h"

3
cmake/ClientSources.cmake
View file

@ -321,7 +321,8 @@ set(MINECRAFT_CLIENT_SOURCES
"HumanoidModel.cpp"
"InBedChatScreen.cpp"
"Input.cpp"
"iob_shim.asm"
#"iob_shim.asm"
"IobShim.c"
"ItemFrameRenderer.cpp"
"ItemInHandRenderer.cpp"
"ItemRenderer.cpp"

7748
compile_commands.json Normal file
View file

File diff suppressed because it is too large Load diff