backups/4jcraft
2
0
Fork 0
mirror of https://github.com/4jcraft/4jcraft.git synced 2026-05-21 18:43:00 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'dev' into dev

Browse source
This commit is contained in:
JuiceyDev 2026-03-05 22:33:38 +01:00 committed by GitHub
parent c43ccdf441 46b83ebe15
commit 06afba4d34
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
6 changed files with 12 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Minecraft.Client/Build/CMakeLists.txt
View file

@ -5225,6 +5225,7 @@ if(UNIX AND NOT APPLE)
find_package(OpenGL REQUIRED)
find_package(PkgConfig REQUIRED)
pkg_check_modules(GLFW3 REQUIRED glfw3)
pkg_check_modules(GLU REQUIRED glu)
target_include_directories(${PROJECT_NAME} PRIVATE
${GLFW3_INCLUDE_DIRS}

4
Minecraft.Client/Build/Common/Audio/SoundEngine.cpp
View file

@ -5,7 +5,7 @@
#include "../../../Player/MultiPlayerLocalPlayer.h"
#include "../../../../Minecraft.World/Headers/net.minecraft.world.level.h"
#include "../../../../Minecraft.World/Level/LevelData.h"
#include "../../../../Minecraft.World/Util/Mth.h"
#include "../../Minecraft.World/Util/Mth.h"
#include "../../../Textures/Packs/TexturePackRepository.h"
#include "../../../Textures/Packs/DLCTexturePack.h"
#include "../DLC/DLCAudioFile.h"
@ -1676,4 +1676,4 @@ F32 AILCALLBACK custom_falloff_function (HSAMPLE S,
return result;
}
#endif
#endif

8
Minecraft.Client/Platform/Linux/LinuxGL.cpp
View file

@ -4,9 +4,11 @@
#include <GL/glu.h>
#include <GL/glext.h>
#include <dlfcn.h>
#include "../../../Minecraft.World/IO/Streams/IntBuffer.h"
#include "../../../Minecraft.World/IO/Streams/FloatBuffer.h"
#include "../../../Minecraft.World/IO/Streams/ByteBuffer.h"
#include "../../Minecraft.World/IO/Streams/IntBuffer.h"
#include "../../Minecraft.World/IO/Streams/FloatBuffer.h"
#include "../../Minecraft.World/IO/Streams/ByteBuffer.h"
int glGenTextures()
{

2
Minecraft.Client/Platform/Linux/Stubs/iggy_stubs.h
View file

@ -148,7 +148,7 @@ RADEXPFUNC inline IggyResult RADEXPLINK IggyValueGetF64RS(IggyValuePath *var, Ig
}
RADEXPFUNC inline rrbool RADEXPLINK IggyValueSetBooleanRS(IggyValuePath *var, IggyName sub_name, char const *sub_name_utf8, rrbool value) {
STUBBED;
return false;
return true;
}
RADEXPFUNC inline void RADEXPLINK IggyInit(IggyAllocator *allocator) {
STUBBED;

4
Minecraft.Client/Platform/Linux/linux_game_stubs.cpp
View file

@ -5,14 +5,14 @@
#include <string>
#include <pthread.h>
#include "../../Build/stubs.h"
#include "Stubs/LinuxStubs.h"
#include "../../Build/Common/Consoles_App.h"
void Display::update() {}
int CMinecraftApp::GetTPConfigVal(WCHAR* pwchDataFile) { return 0; }
#include "../../../Minecraft.World/Build/x64headers/extraX64.h"
#include "../../Minecraft.World/Build/x64headers/extraX64.h"
void PIXSetMarkerDeprecated(int a, const char* b, ...) {}

2
Minecraft.Client/Rendering/glWrapper.cpp
View file

@ -391,4 +391,4 @@ void glCullFace(int dir)
RenderManager.StateSetFaceCullCW( dir == GL_BACK);
}
#endif
#endif