backups/neoLegacy
2
0
Fork 0
mirror of https://github.com/neoStudiosLCE/neoLegacy.git synced 2026-07-03 18:07:03 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix: server builds

Browse source 
fixes #59
now with persistent directories!
This commit is contained in:
Fireblade 2026-05-06 20:57:40 -04:00
parent f8e4f6376e
commit 2490c235fa
5 changed files with 18 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
CMakeLists.txt
View file

@ -241,7 +241,9 @@ set(_item_map_inputs
"${CMAKE_CURRENT_SOURCE_DIR}/Minecraft.World/Tile.h"
)
string(REPLACE ";" "\\;" _item_map_inputs "${_item_map_inputs}")
if(CMAKE_CROSSCOMPILING AND CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
string(REPLACE ";" "\\;" _item_map_inputs "${_item_map_inputs}")
endif()
#neo: added ItemNameMap generation
add_custom_command(

2
Minecraft.Client/Common/Consoles_App.cpp
View file

@ -946,7 +946,9 @@ void CMinecraftApp::InitGameSettings()
memset(pProfileSettings,0,sizeof(C_4JProfile::PROFILESETTINGS));
SetDefaultOptions(pProfileSettings,i);
Win64_LoadSettings(GameSettingsA[i]);
#ifndef MINECRAFT_SERVER_BUILD
ApplyGameSettingsChanged(i);
#endif
#elif defined __PS3__ || defined __ORBIS__ || defined _DURANGO || defined __PSVITA__
C4JStorage::PROFILESETTINGS *pProfileSettings=StorageManager.GetDashboardProfileSettings(i);
// 4J-PB - don't cause an options write to happen here

6
Minecraft.Client/GameRenderer.cpp
View file

@ -147,6 +147,7 @@ GameRenderer::GameRenderer(Minecraft *mc)
this->mc = mc;
itemInHandRenderer = nullptr;
#ifndef MINECRAFT_SERVER_BUILD
// 4J-PB - set up the local players iteminhand renderers here - needs to be done with lighting enabled so that the render geometry gets compiled correctly
glEnable(GL_LIGHTING);
mc->localitemInHandRenderers[0] = new ItemInHandRenderer(mc);//itemInHandRenderer;
@ -162,6 +163,8 @@ GameRenderer::GameRenderer(Minecraft *mc)
lightTexture[i] = mc->textures->getTexture(img); // 4J - changed to one light texture per level to support split screen
}
delete img;
#endif
#ifndef MINECRAFT_SERVER_BUILD
#ifdef __PS3__
// we're using the RSX now to upload textures to vram, so we need the main ram textures allocated from io space
for(int i=0;i<NUM_LIGHT_TEXTURES;i++)
@ -170,7 +173,9 @@ GameRenderer::GameRenderer(Minecraft *mc)
for(int i=0;i<NUM_LIGHT_TEXTURES;i++)
lightPixels[i] = intArray(16*16);
#endif
#endif
#ifndef MINECRAFT_SERVER_BUILD
#ifdef MULTITHREAD_ENABLE
m_updateEvents = new C4JThread::EventArray(eUpdateEventCount, C4JThread::EventArray::e_modeAutoClear);
m_updateEvents->Set(eUpdateEventIsFinished);
@ -183,6 +188,7 @@ GameRenderer::GameRenderer(Minecraft *mc)
m_updateThread->SetProcessor(CPU_CORE_CHUNK_UPDATE);
m_updateThread->Run();
#endif
#endif
}
// 4J Stu Added to go with 1.8.2 change

4
Minecraft.Client/MinecraftServer.cpp
View file

@ -2017,7 +2017,11 @@ void MinecraftServer::run(int64_t seed, void *lpParameter)
QueryPerformanceCounter(&asAfterRules);
#endif
#ifdef MINECRAFT_SERVER_BUILD
levels[0]->saveToDisc(nullptr, true);
#else
levels[0]->saveToDisc(Minecraft::GetInstance()->progressRenderer, true);
#endif
#if defined(_WINDOWS64) && defined(MINECRAFT_SERVER_BUILD)
QueryPerformanceCounter(&asAfterFlush);

6
build-linux.sh
View file

@ -155,7 +155,7 @@ write_client_launcher() {
#!/usr/bin/env bash
set -euo pipefail
GAME_DIR="$INSTALL_DIR/client"
PERSIST_DIR="\${MC_DATA_DIR:-\$HOME/.local/share/minecraft-lce-client}"
PERSIST_DIR="\${MC_DATA_DIR:-\$HOME/.local/share/neoLegacy/client}"
export WINEARCH=win64
export WINEPREFIX="\${WINEPREFIX:-\$HOME/.local/share/minecraft-lce-client-prefix}"
export WINEDLLOVERRIDES="winemenubuilder.exe=d"
@ -183,7 +183,7 @@ set -euo pipefail
GAME_DIR="$INSTALL_DIR/server"
SERVER_PORT="\${MC_PORT:-25565}"
SERVER_BIND_IP="\${MC_BIND:-0.0.0.0}"
PERSIST_DIR="\${MC_DATA_DIR:-\$HOME/.local/share/minecraft-lce-server}"
PERSIST_DIR="\${MC_DATA_DIR:-\$HOME/.local/share/neoLegacy/server}"
export WINEARCH=win64
export WINEPREFIX="\${WINEPREFIX:-\$HOME/.local/share/minecraft-lce-server-prefix}"
export WINEDLLOVERRIDES="winemenubuilder.exe=d;winedbg.exe=d"
@ -226,7 +226,7 @@ set -euo pipefail
GAME_DIR="$INSTALL_DIR/fourkit"
SERVER_PORT="\${MC_PORT:-25565}"
SERVER_BIND_IP="\${MC_BIND:-0.0.0.0}"
PERSIST_DIR="\${MC_DATA_DIR:-\$HOME/.local/share/minecraft-lce-fourkit}"
PERSIST_DIR="\${MC_DATA_DIR:-\$HOME/.local/share/neoLegacy/fourkit}"
export WINEARCH=win64
export WINEPREFIX="\${WINEPREFIX:-\$HOME/.local/share/minecraft-lce-fourkit-prefix}"
export WINEDLLOVERRIDES="winemenubuilder.exe=d;winedbg.exe=d"