Merge branch 'dev' into dev

Minecraft.Client/Build/CMakeLists.txt

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

Minecraft.Client/Build/Common/Audio/SoundEngine.cpp

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

Minecraft.Client/Platform/Linux/LinuxGL.cpp

@@ -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()
 {

Minecraft.Client/Platform/Linux/Stubs/iggy_stubs.h

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

Minecraft.Client/Platform/Linux/linux_game_stubs.cpp

@@ -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, ...) {}
 

Minecraft.Client/Rendering/glWrapper.cpp

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