vistaslayer/LegacyRenouveau
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'main' of https://git.neolegacy.dev/neoStudiosLCE/neoLegacy

Browse Source
This commit is contained in:
Tranqlmao
2026-07-15 12:33:19 -04:00
parent c263d012e3 1399ff5a04
commit f3a4f21029
8 changed files with 91 additions and 125 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Minecraft.Client/CMakeLists.txt
+14 -36
View File
@@ -75,46 +75,25 @@ if(PLATFORM_NAME STREQUAL "Windows64")
target_link_options(Minecraft.Client PRIVATE $<$<CONFIG:Release>:/DEBUG /OPT:REF /OPT:ICF>)
endif()
set(MINECRAFT_CLIENT_USE_4J_DEBUG_LIBS TRUE)
if(CMAKE_CROSSCOMPILING AND CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
set(MINECRAFT_CLIENT_USE_4J_DEBUG_LIBS FALSE)
endif()
set_target_properties(Minecraft.Client PROPERTIES
OUTPUT_NAME "Minecraft.Client"
VS_DEBUGGER_WORKING_DIRECTORY "$<TARGET_FILE_DIR:Minecraft.Client>"
)
if(MINECRAFT_CLIENT_USE_4J_DEBUG_LIBS)
target_link_libraries(Minecraft.Client PRIVATE
Minecraft.World
d3d11
dxgi
d3dcompiler
XInput9_1_0
wsock32
dbghelp
legacy_stdio_definitions
4JLibs.${PLATFORM_NAME}.Input
4JLibs.${PLATFORM_NAME}.Profile
4JLibs.${PLATFORM_NAME}.Storage
4JLibs.${PLATFORM_NAME}.Render
)
else()
target_link_libraries(Minecraft.Client PRIVATE
Minecraft.World
d3d11
dxgi
d3dcompiler
XInput9_1_0
wsock32
dbghelp
legacy_stdio_definitions
"${CMAKE_CURRENT_SOURCE_DIR}/${PLATFORM_NAME}/4JLibs/libs/4J_Input.lib"
"${CMAKE_CURRENT_SOURCE_DIR}/${PLATFORM_NAME}/4JLibs/libs/4J_Storage.lib"
"${CMAKE_CURRENT_SOURCE_DIR}/${PLATFORM_NAME}/4JLibs/libs/4J_Render_PC.lib"
)
endif()
target_link_libraries(Minecraft.Client PRIVATE
Minecraft.World
d3d11
dxgi
d3dcompiler
XInput9_1_0
wsock32
dbghelp
legacy_stdio_definitions
4JLibs.${PLATFORM_NAME}.Input
4JLibs.${PLATFORM_NAME}.Profile
4JLibs.${PLATFORM_NAME}.Storage
4JLibs.${PLATFORM_NAME}.Render
)
# Iggy libs
foreach(lib IN LISTS IGGY_LIBS)
@@ -172,4 +151,3 @@ add_copyredist_target(Minecraft.Client)
if(PLATFORM_NAME STREQUAL "Windows64")
add_gamehdd_target(Minecraft.Client)
endif()
Minecraft.Client/Common/res/TitleUpdate/res/colours.xml
+1 -1
View File
@@ -309,7 +309,7 @@ if __name__=="__main__": notecolors()
<colour name="End_Fog_Colour" value="a080a0"/>
<colour name="Sign_Text" value="000000"/>
<colour name="Map_Text" value="ff000000"/>
<colour name="Map_Text" value="000000"/>
<colour name="Leash_Light_Colour" value="80664d"/>
<colour name="Leash_Dark_Colour" value="5a4736"/>
Minecraft.Client/ItemRenderer.cpp
+4 -1
View File
@@ -419,7 +419,7 @@ void ItemRenderer::renderGuiItem(Font *font, Textures *textures, shared_ptr<Item
BannerRenderer::instance->renderBannerForGui(x, y, fScaleX, fScaleY, fAlpha, baseColor);
return;
}
if ((item->getIconType() == Icon::TYPE_TERRAIN && TileRenderer::canRender(Tile::tiles[itemId]->getRenderShape())) && itemId != Tile::barrier_Id)
{
PIXBeginNamedEvent(0,"3D gui item render %d\n",itemId);
@@ -447,6 +447,9 @@ void ItemRenderer::renderGuiItem(Font *font, Textures *textures, shared_ptr<Item
// 0.55 comes from 1/(1+sqrt(2)/sqrt(3)) which is determined by the angles that the cube is rotated in an orthographic projection
glRotatef(180.0f + 30.0f, 1.0f, 0.0f, 0.0f); // Rotate round x axis (centre at origin)
glRotatef(45.0f, 0.0f, 1.0f, 0.0f); // Rotate round y axis (centre at origin)
if (item->id == Tile::crafting_table_Id) {
glRotatef(180, 0, 1, 0);
}
#endif
// 4J-PB - pass the alpha value in - the grass block render has the top surface coloured differently to the rest of the block
glRotatef(-90.0f, 0.0f, 1.0f, 0.0f);