Merge origin/dev into reapply/dev-on-upstream-202603082259 - auto-resolved conflicts preferring origin/dev

.gitignore

@@ -33,9 +33,7 @@ meson-logs/
 *.d
 compile_commands.json
 
-# ----- Runtime-created symlinks / scratch -----
-# Asset symlink created at runtime for working directory resolution
-Common
+
 
 # ----- Scratch / legacy -----
 oldimpl/

4J.Input/4J_Input.cpp

@@ -4,7 +4,7 @@
 // avoiding a coupling dependency on 4J_Render.h.
 
 #include "4J_Input.h"
-#include "../Minecraft.Client/Build/Common/App_enums.h"
+#include "../Common/App_enums.h"
 #include <GLFW/glfw3.h>
 #include <math.h>
 #include <string.h>

4J.Render/4J_Render.cpp

@@ -1,3 +1,5 @@
+
+// TODO: ADD BETTER COMMENTS.
 #include "4J_Render.h"
 #include <cstring>
 #include <cstdlib>  // getenv
@@ -32,7 +34,11 @@ static pthread_once_t s_glCtxKeyOnce = PTHREAD_ONCE_INIT;
 static void makeGLCtxKey() { pthread_key_create(&s_glCtxKey, nullptr); }
 
 // Pre-created pool of shared contexts for worker threads
-static const int MAX_SHARED_CONTEXTS = 8;
+
+// AMD drivers (especially on Linux/Mesa) can be very sensitive to the number of shared contexts
+// and concurrent display list compilation. 8 was original, 4 was an attempt to fix it.
+// 6 covers the 5 concurrent worker threads (update + 3x rebuild + main thread).
+static const int MAX_SHARED_CONTEXTS = 6;
 static GLFWwindow *s_sharedContexts[MAX_SHARED_CONTEXTS] = {};
 static int s_sharedContextCount = 0;
 static int s_nextSharedContext = 0;
@@ -42,26 +48,22 @@ static pthread_mutex_t s_sharedCtxMutex = PTHREAD_MUTEX_INITIALIZER;
 static pthread_t s_mainThread;
 static bool s_mainThreadSet = false;
 
+// viewport go brr
+static void onFramebufferResize(GLFWwindow * /*win*/, int w, int h)
+{
+    if (w < 1) w = 1;
+    if (h < 1) h = 1;
+    s_windowWidth  = w;
+    s_windowHeight = h;
+    ::glViewport(0, 0, w, h);
+}
+
 void C4JRender::Initialise()
 {
-#if defined(__linux__) && (GLFW_VERSION_MAJOR > 3 || (GLFW_VERSION_MAJOR == 3 && GLFW_VERSION_MINOR >= 4))
-    // If the session is a native Wayland session, tell GLFW to use the Wayland
-    // backend instead of falling back to XWayland.  This enables proper cursor
-    // confine-and-hide (zwp_confined_pointer_v1 + zwp_relative_pointer_v1) which
-    // is required for correct first-person mouse input on Wayland compositors.
-    if (getenv("WAYLAND_DISPLAY")) {
-        glfwInitHint(GLFW_PLATFORM, GLFW_PLATFORM_WAYLAND);
-        fprintf(stderr, "[4J_Render] Wayland session detected — requesting native Wayland backend\n");
-    }
-#endif
-
     if (!glfwInit()) {
         fprintf(stderr, "[4J_Render] Failed to initialise GLFW\n");
         return;
     }
-
-    // Resolve window dimensions: use caller-requested size, or fall back to
-    // the primary monitor's native resolution so the window fits any display.
     GLFWmonitor *primaryMonitor = glfwGetPrimaryMonitor();
     const GLFWvidmode *mode = primaryMonitor ? glfwGetVideoMode(primaryMonitor) : nullptr;
 
@@ -79,6 +81,8 @@ void C4JRender::Initialise()
     // opengl 2.1!!!
     glfwWindowHint(GLFW_CONTEXT_VERSION_MAJOR, 2);
     glfwWindowHint(GLFW_CONTEXT_VERSION_MINOR, 1);
+    glfwWindowHint(GLFW_DEPTH_BITS, 24);
+    glfwWindowHint(GLFW_STENCIL_BITS, 8);
 
     GLFWmonitor *fsMonitor = s_fullscreen ? primaryMonitor : nullptr;
     s_window = glfwCreateWindow(s_windowWidth, s_windowHeight,
@@ -92,6 +96,9 @@ void C4JRender::Initialise()
     glfwMakeContextCurrent(s_window);
     glfwSwapInterval(1);  // vsync
 
+    // Keep viewport in sync with OS-driven window resizes.
+    glfwSetFramebufferSizeCallback(s_window, onFramebufferResize);
+
     // init opengl
     ::glEnable(GL_TEXTURE_2D);
     ::glEnable(GL_DEPTH_TEST);
@@ -123,10 +130,10 @@ void C4JRender::Initialise()
 
     // Pre-create shared GL contexts for worker threads (chunk builders etc.)
     // Must be done on the main thread because GLFW requires it.
+    // Ensure they are invisible so they don't interfere with the window manager.
+    glfwWindowHint(GLFW_VISIBLE, GLFW_FALSE);
     for (int i = 0; i < MAX_SHARED_CONTEXTS; i++) {
-        glfwWindowHint(GLFW_VISIBLE, GLFW_FALSE);
         s_sharedContexts[i] = glfwCreateWindow(1, 1, "", nullptr, s_window);
-        glfwWindowHint(GLFW_VISIBLE, GLFW_TRUE);
         if (s_sharedContexts[i]) {
             s_sharedContextCount++;
         } else {
@@ -134,6 +141,8 @@ void C4JRender::Initialise()
             break;
         }
     }
+    glfwWindowHint(GLFW_VISIBLE, GLFW_TRUE);
+
     // Ensure main thread still has the context
     glfwMakeContextCurrent(s_window);
     fprintf(stderr, "[4J_Render] Created %d shared GL contexts for worker threads\n", s_sharedContextCount);
@@ -168,12 +177,25 @@ void C4JRender::InitialiseContext()
     pthread_mutex_unlock(&s_sharedCtxMutex);
 
     if (!shared) {
-        fprintf(stderr, "[4J_Render] ERROR: no shared GL contexts left for worker thread!\n");
+        fprintf(stderr, "[4J_Render] ERROR: no shared GL contexts left for worker thread %lu!\n", (unsigned long)pthread_self());
+        fflush(stderr);
         return;
     }
     glfwMakeContextCurrent(shared);
+
+    // Initialize some basic state for this context to ensure consistent display list recording
+    ::glEnable(GL_TEXTURE_2D);
+    ::glEnable(GL_DEPTH_TEST);
+    ::glDepthFunc(GL_LEQUAL);
+    ::glAlphaFunc(GL_GREATER, 0.1f);
+    ::glEnable(GL_BLEND);
+    ::glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
+    ::glShadeModel(GL_SMOOTH);
+    ::glEnable(GL_COLOR_MATERIAL);
+    ::glColorMaterial(GL_FRONT_AND_BACK, GL_AMBIENT_AND_DIFFUSE);
+
     pthread_setspecific(s_glCtxKey, shared);
-    fprintf(stderr, "[4J_Render] Assigned shared GL context %p to worker thread\n", (void*)shared);
+    fprintf(stderr, "[4J_Render] Assigned shared GL context %p to worker thread %lu\n", (void*)shared, (unsigned long)pthread_self());
     fflush(stderr);
 }
 
@@ -282,15 +304,23 @@ void C4JRender::Set_matrixDirty() {} // immediate-mode
 
 static GLenum mapPrimType(int pt)
 {
+    // Handle GL constants first
+    if (pt == GL_QUADS) return GL_QUADS;
+    if (pt == GL_TRIANGLES) return GL_TRIANGLES;
+    if (pt == GL_LINES) return GL_LINES;
+    if (pt == GL_LINE_STRIP) return GL_LINE_STRIP;
+    if (pt == GL_TRIANGLE_STRIP) return GL_TRIANGLE_STRIP;
+    if (pt == GL_TRIANGLE_FAN) return GL_TRIANGLE_FAN;
+
+    // Map from ePrimitiveType enum
     switch (pt) {
-    case 0:  return GL_TRIANGLES;      // C4JRender::PRIMITIVE_TYPE_TRIANGLE_LIST
-    case GL_LINES:          return GL_LINES;
-    case GL_LINE_STRIP:     return GL_LINE_STRIP;
-    case GL_TRIANGLES:      return GL_TRIANGLES;
-    case GL_TRIANGLE_STRIP: return GL_TRIANGLE_STRIP;
-    case GL_TRIANGLE_FAN:   return GL_TRIANGLE_FAN;
-    case GL_QUADS:          return GL_QUADS;
-    default:                return GL_TRIANGLES;
+    case C4JRender::PRIMITIVE_TYPE_TRIANGLE_LIST:  return GL_TRIANGLES;
+    case C4JRender::PRIMITIVE_TYPE_TRIANGLE_STRIP: return GL_TRIANGLE_STRIP;
+    case C4JRender::PRIMITIVE_TYPE_TRIANGLE_FAN:   return GL_TRIANGLE_FAN;
+    case C4JRender::PRIMITIVE_TYPE_QUAD_LIST:      return GL_QUADS;
+    case C4JRender::PRIMITIVE_TYPE_LINE_LIST:      return GL_LINES;
+    case C4JRender::PRIMITIVE_TYPE_LINE_STRIP:     return GL_LINE_STRIP;
+    default:                                       return GL_TRIANGLES;
     }
 }
 
@@ -304,9 +334,7 @@ void C4JRender::DrawVertices(ePrimitiveType PrimitiveType, int count,
     GLenum mode = mapPrimType((int)PrimitiveType);
 
     if (vType == VERTEX_TYPE_COMPRESSED) {
-        // Compact terrain vertex: 8 × int16_t = 16 bytes per vertex
-        // Layout: [x*1024, y*1024, z*1024, RGB565-32768, u*8192, v*8192, tex2u, tex2v]
-        // Always use glBegin/glEnd — works correctly both inside and outside display lists.
+        // NO NEED TO REWRITE IT ALL YAY
         int16_t *sdata = (int16_t *)dataIn;
         ::glBegin(mode);
         for (int i = 0; i < count; i++) {
@@ -327,20 +355,17 @@ void C4JRender::DrawVertices(ePrimitiveType PrimitiveType, int count,
             // Strip mipmap-disable flag: Tesselator adds +1.0 (= +8192) to u when mipmaps off
             if (fu >= 1.0f) fu -= 1.0f;
 
+            // Unit 1 (lightmap) UVs
+            float fu2 = (float)vert[6] / 256.0f;
+            float fv2 = (float)vert[7] / 256.0f;
+
             ::glColor3f(r, g, b);
             ::glTexCoord2f(fu, fv);
+            ::glMultiTexCoord2f(GL_TEXTURE1, fu2, fv2);
             ::glVertex3f(x, y, z);
         }
         ::glEnd();
     } else {
-        // Standard (non-compact) vertex: 8 × int32 = 32 bytes per vertex
-        // Layout: [x(f), y(f), z(f), u(f), v(f), color(RGBA packed), normal, tex2]
-        // Color byte-order fix for little-endian (x86/x64):
-        //   Console code stores color as int col = (r<<24)|(g<<16)|(b<<8)|a
-        //   In little-endian memory the bytes are: [a, b, g, r] at increasing addresses.
-        //   Read as: col[3]=r, col[2]=g, col[1]=b, col[0]=a.
-        // Always use glBegin/glEnd — safe for both display-list compilation and immediate mode.
-        // (glVertexPointer/glDrawArrays inside glNewList record a stale pointer, not the data.)
         unsigned int *idata = (unsigned int *)dataIn;
         ::glBegin(mode);
         for (int i = 0; i < count; i++) {
@@ -357,19 +382,32 @@ void C4JRender::DrawVertices(ePrimitiveType PrimitiveType, int count,
             int8_t ny = (int8_t)((normalInt >>  8) & 0xFF);
             int8_t nz = (int8_t)((normalInt >> 16) & 0xFF);
 
-            ::glNormal3f(nx / 127.0f, ny / 127.0f, nz / 127.0f);
+            unsigned int tex2Int = idata[i * 8 + 7];
+
+            if (nx != 0 || ny != 0 || nz != 0) {
+                ::glNormal3f(nx / 127.0f, ny / 127.0f, nz / 127.0f);
+            }
+
             // Only override current GL color when the vertex actually carries one.
             // colorInt == 0 is the Tesselator sentinel for "no colour set"
-            // (alpha=0 with all channels zero).  Skipping glColor4ub here lets
-            // sky/fog colour set before glCallList() pass through unchanged.
             if (colorInt != 0) {
                 ::glColor4ub(cr, cg, cb, ca);
             }
+
             ::glTexCoord2f(fdata[3], fdata[4]);
+
+            // Unit 1 (lightmap) UVs - 0xfe00fe00 is sentinel for "no Unit 1 UVs"
+            if (tex2Int != 0xfe00fe00) {
+                float u2 = (float)(short)(tex2Int & 0xFFFF) / 256.0f;
+                float v2 = (float)(short)((tex2Int >> 16) & 0xFFFF) / 256.0f;
+                ::glMultiTexCoord2f(GL_TEXTURE1, u2, v2);
+            }
+
             ::glVertex3f(fdata[0], fdata[1], fdata[2]);
         }
         ::glEnd();
     }
+    ::glFlush();
 }
 
 
@@ -377,22 +415,34 @@ void C4JRender::CBuffLockStaticCreations() {}
 
 int C4JRender::CBuffCreate(int count)
 {
-    return (int)::glGenLists(count);
+    int id = (int)::glGenLists(count);
+    ::glFlush();
+    return id;
 }
 
 void C4JRender::CBuffDelete(int first, int count)
 {
-    if (first > 0 && count > 0) ::glDeleteLists(first, count);
+    if (first > 0 && count > 0) {
+        ::glDeleteLists(first, count);
+        ::glFlush();
+    }
 }
 
 void C4JRender::CBuffStart(int index, bool /*full*/)
 {
-    if (index > 0) ::glNewList(index, GL_COMPILE);
+    if (index > 0) {
+        ::glNewList(index, GL_COMPILE);
+        ::glFlush();
+    }
 }
 
 void C4JRender::CBuffClear(int index)
 {
-    if (index > 0) { ::glNewList(index, GL_COMPILE); ::glEndList(); }
+    if (index > 0) { 
+        ::glNewList(index, GL_COMPILE); 
+        ::glEndList(); 
+        ::glFlush();
+    }
 }
 
 int  C4JRender::CBuffSize(int /*index*/) { return 0; }
@@ -400,6 +450,7 @@ int  C4JRender::CBuffSize(int /*index*/) { return 0; }
 void C4JRender::CBuffEnd()
 {
     ::glEndList();
+    ::glFlush();
 }
 
 bool C4JRender::CBuffCall(int index, bool /*full*/)
@@ -438,13 +489,21 @@ void C4JRender::TextureBind(int idx)
 
 void C4JRender::TextureBindVertex(int idx)
 {
-    // No-op on desktop OpenGL. On consoles this binds a lightmap to the vertex shader
-    // sampler. On desktop GL 2.1 fixed-function there is no vertex texture concept;
-    // lighting is handled via vertex colors. Binding anything here OVERRIDES GL_TEXTURE0
-    // after the call (because the game calls glTexParameteri on whatever is active),
-    // causing the terrain atlas filter params to be corrupted or the lightmap to appear
-    // on terrain instead of the atlas. Leave it as a no-op.
-    (void)idx;
+    // Unit 1 used for lightmapping in fixed-function or standard shaders
+    ::glActiveTexture(GL_TEXTURE1);
+    if (idx < 0) {
+        ::glBindTexture(GL_TEXTURE_2D, 0);
+        ::glDisable(GL_TEXTURE_2D);
+    } else {
+        ::glEnable(GL_TEXTURE_2D);
+        ::glBindTexture(GL_TEXTURE_2D, (GLuint)idx);
+        ::glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
+        ::glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
+        ::glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP);
+        ::glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP);
+    }
+    ::glActiveTexture(GL_TEXTURE0);
+    ::glFlush();
 }
 
 void C4JRender::TextureSetTextureLevels(int levels)
@@ -466,13 +525,8 @@ void C4JRender::TextureData(int width, int height, void *data, int level,
                    width, height, 0,
                    GL_RGBA, GL_UNSIGNED_BYTE, data);
 
-    // For the base level (0), force the texture to be non-mipmapped and pixel-crisp.
-    // glGenerateMipmap() was previously called here as a "safety net", but on Mesa/Nvidia
-    // drivers it silently resets GL_TEXTURE_MIN_FILTER to the OpenGL spec default
-    // (GL_NEAREST_MIPMAP_LINEAR), overriding the GL_NEAREST set before this call.
-    // Fix: set GL_TEXTURE_MAX_LEVEL=0 (only sample level 0) and re-enforce GL_NEAREST.
-    // The game manually uploads explicit mip levels 1..N-1 after this call anyway,
-    // so we don't need glGenerateMipmap() as a completeness safety net.
+    ::glFlush();
+
     if (level == 0) {
         ::glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAX_LEVEL, 0);
         ::glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
@@ -486,6 +540,7 @@ void C4JRender::TextureDataUpdate(int xoffset, int yoffset,
 {
     ::glTexSubImage2D(GL_TEXTURE_2D, level, xoffset, yoffset,
                       width, height, GL_RGBA, GL_UNSIGNED_BYTE, data);
+    ::glFlush();
 }
 
 void C4JRender::TextureSetParam(int param, int value)

4J.Render/4J_Render.h

@@ -218,97 +218,97 @@ public:
 };
 
 
-const int GL_MODELVIEW_MATRIX = 0;
-const int GL_PROJECTION_MATRIX = 1;
-const int GL_MODELVIEW = 0;
-const int GL_PROJECTION = 1;
-const int GL_TEXTURE = 2;
+const int GL_MODELVIEW_MATRIX = 0x0BA6;
+const int GL_PROJECTION_MATRIX = 0x0BA7;
+const int GL_MODELVIEW = 0x1700;
+const int GL_PROJECTION = 0x1701;
+const int GL_TEXTURE = 0x1702;
 
 // These things required for tex gen
 
-const int GL_S = 0;
-const int GL_T = 1;
-const int GL_R = 2;
-const int GL_Q = 3;
+const int GL_S = 0x2000;
+const int GL_T = 0x2001;
+const int GL_R = 0x2002;
+const int GL_Q = 0x2003;
 
-const int GL_TEXTURE_GEN_S = 0;
-const int GL_TEXTURE_GEN_T = 1;
-const int GL_TEXTURE_GEN_Q = 2;
-const int GL_TEXTURE_GEN_R = 3;
+const int GL_TEXTURE_GEN_S = 0x0C60;
+const int GL_TEXTURE_GEN_T = 0x0C61;
+const int GL_TEXTURE_GEN_Q = 0x0C63;
+const int GL_TEXTURE_GEN_R = 0x0C62;
 
-const int GL_TEXTURE_GEN_MODE = 0;
-const int GL_OBJECT_LINEAR = 0;
-const int GL_EYE_LINEAR = 1;
-const int GL_OBJECT_PLANE = 0;
-const int GL_EYE_PLANE = 1;
+const int GL_TEXTURE_GEN_MODE = 0x2500;
+const int GL_OBJECT_LINEAR = 0x2401;
+const int GL_EYE_LINEAR = 0x2400;
+const int GL_OBJECT_PLANE = 0x2501;
+const int GL_EYE_PLANE = 0x2502;
 
 
 // These things are used by glEnable/glDisable so must be different and non-zero (zero is used by things we haven't assigned yet)
-const int GL_TEXTURE_2D = 1;
-const int GL_BLEND = 2;
-const int GL_CULL_FACE = 3;
-const int GL_ALPHA_TEST = 4;
-const int GL_DEPTH_TEST = 5;
-const int GL_FOG = 6;
-const int GL_LIGHTING = 7;
-const int GL_LIGHT0 = 8;
-const int GL_LIGHT1 = 9;
+const int GL_TEXTURE_2D = 0x0DE1;
+const int GL_BLEND = 0x0BE2;
+const int GL_CULL_FACE = 0x0B44;
+const int GL_ALPHA_TEST = 0x0BC0;
+const int GL_DEPTH_TEST = 0x0B71;
+const int GL_FOG = 0x0B60;
+const int GL_LIGHTING = 0x0B50;
+const int GL_LIGHT0 = 0x4000;
+const int GL_LIGHT1 = 0x4001;
 
-const int CLEAR_DEPTH_FLAG = 1;
-const int CLEAR_COLOUR_FLAG = 2;
+const int CLEAR_DEPTH_FLAG = 0x00000100;
+const int CLEAR_COLOUR_FLAG = 0x00004000;
 
 const int GL_DEPTH_BUFFER_BIT = CLEAR_DEPTH_FLAG;
 const int GL_COLOR_BUFFER_BIT = CLEAR_COLOUR_FLAG;
 
-const int GL_SRC_ALPHA = D3D11_BLEND_SRC_ALPHA;
-const int GL_ONE_MINUS_SRC_ALPHA = D3D11_BLEND_INV_SRC_ALPHA;
-const int GL_ONE = D3D11_BLEND_ONE;
-const int GL_ZERO = D3D11_BLEND_ZERO;
-const int GL_DST_ALPHA = D3D11_BLEND_DEST_ALPHA;
-const int GL_SRC_COLOR = D3D11_BLEND_SRC_COLOR;
-const int GL_DST_COLOR = D3D11_BLEND_DEST_COLOR;
-const int GL_ONE_MINUS_DST_COLOR = D3D11_BLEND_INV_DEST_COLOR;
-const int GL_ONE_MINUS_SRC_COLOR = D3D11_BLEND_INV_SRC_COLOR;
-const int GL_CONSTANT_ALPHA = D3D11_BLEND_BLEND_FACTOR;
-const int GL_ONE_MINUS_CONSTANT_ALPHA = D3D11_BLEND_INV_BLEND_FACTOR;
+const int GL_SRC_ALPHA = 0x0302;
+const int GL_ONE_MINUS_SRC_ALPHA = 0x0303;
+const int GL_ONE = 1;
+const int GL_ZERO = 0;
+const int GL_DST_ALPHA = 0x0304;
+const int GL_SRC_COLOR = 0x0300;
+const int GL_DST_COLOR = 0x0306;
+const int GL_ONE_MINUS_DST_COLOR = 0x0307;
+const int GL_ONE_MINUS_SRC_COLOR = 0x0301;
+const int GL_CONSTANT_ALPHA = 0x8003;
+const int GL_ONE_MINUS_CONSTANT_ALPHA = 0x8004;
 
-const int GL_GREATER = D3D11_COMPARISON_GREATER;
-const int GL_EQUAL = D3D11_COMPARISON_EQUAL;
-const int GL_LEQUAL = D3D11_COMPARISON_LESS_EQUAL;
-const int GL_GEQUAL = D3D11_COMPARISON_GREATER_EQUAL;
-const int GL_ALWAYS = D3D11_COMPARISON_ALWAYS;
+const int GL_GREATER = 0x0204;
+const int GL_EQUAL = 0x0202;
+const int GL_LEQUAL = 0x0203;
+const int GL_GEQUAL = 0x0206;
+const int GL_ALWAYS = 0x0207;
 
-const int GL_TEXTURE_MIN_FILTER = 1;
-const int GL_TEXTURE_MAG_FILTER = 2;
-const int GL_TEXTURE_WRAP_S = 3;
-const int GL_TEXTURE_WRAP_T = 4;
+const int GL_TEXTURE_MIN_FILTER = 0x2801;
+const int GL_TEXTURE_MAG_FILTER = 0x2800;
+const int GL_TEXTURE_WRAP_S = 0x2802;
+const int GL_TEXTURE_WRAP_T = 0x2803;
 
-const int GL_NEAREST = 0;
-const int GL_LINEAR = 1;
-const int GL_EXP = 2;
-const int GL_NEAREST_MIPMAP_LINEAR = 0;	// TODO - mipmapping bit of this
+const int GL_NEAREST = 0x2600;
+const int GL_LINEAR = 0x2601;
+const int GL_EXP = 0x0800;
+const int GL_NEAREST_MIPMAP_LINEAR = 0x2702;	// TODO - mipmapping bit of this
 
-const int GL_CLAMP = 0;
-const int GL_REPEAT = 1;
+const int GL_CLAMP = 0x2900;
+const int GL_REPEAT = 0x2901;
 
-const int GL_FOG_START = 1;
-const int GL_FOG_END = 2;
-const int GL_FOG_MODE = 3;
-const int GL_FOG_DENSITY = 4;
-const int GL_FOG_COLOR = 5;
+const int GL_FOG_START = 0x0B63;
+const int GL_FOG_END = 0x0B64;
+const int GL_FOG_MODE = 0x0B65;
+const int GL_FOG_DENSITY = 0x0B62;
+const int GL_FOG_COLOR = 0x0B66;
 
-const int GL_POSITION = 1;
-const int GL_AMBIENT = 2;
-const int GL_DIFFUSE = 3;
-const int GL_SPECULAR = 4;
+const int GL_POSITION = 0x1203;
+const int GL_AMBIENT = 0x1200;
+const int GL_DIFFUSE = 0x1201;
+const int GL_SPECULAR = 0x1202;
 
-const int GL_LIGHT_MODEL_AMBIENT = 1;
+const int GL_LIGHT_MODEL_AMBIENT = 0x0B53;
 
-const int GL_LINES = C4JRender::PRIMITIVE_TYPE_LINE_LIST;
-const int GL_LINE_STRIP = C4JRender::PRIMITIVE_TYPE_LINE_STRIP;
-const int GL_QUADS = C4JRender::PRIMITIVE_TYPE_QUAD_LIST;
-const int GL_TRIANGLE_FAN = C4JRender::PRIMITIVE_TYPE_TRIANGLE_FAN;
-const int GL_TRIANGLE_STRIP = C4JRender::PRIMITIVE_TYPE_TRIANGLE_STRIP;
+const int GL_LINES = 0x0001;
+const int GL_LINE_STRIP = 0x0003;
+const int GL_QUADS = 0x0007;
+const int GL_TRIANGLE_FAN = 0x0006;
+const int GL_TRIANGLE_STRIP = 0x0005;
 
 // Singleton
 extern C4JRender RenderManager;

4J.Render/meson.build

@@ -1,11 +1,5 @@
 render_sources = files(
   '4J_Render.cpp',
-  'RendererCbuff.cpp',
-  'RendererCore.cpp',
-  'RendererMatrix.cpp',
-  'RendererState.cpp',
-  'RendererTexture.cpp',
-  'RendererVertex.cpp',
   'stdafx.cpp',
 )
 

Common/Audio/Consoles_SoundEngine.cpp

@@ -1,4 +1,4 @@
-#include "../../../../Minecraft.World/Build/stdafx.h"
+#include "../../Minecraft.World/Build/stdafx.h"
 #include "Consoles_SoundEngine.h"
 
 

Common/Audio/Consoles_SoundEngine.h

@@ -1,28 +1,28 @@
 #pragma once
 
-#include "../../../../Minecraft.World/Util/SoundTypes.h"
+#include "../../Minecraft.World/Util/SoundTypes.h"
 
 #ifdef _XBOX
 
 #elif defined (__PS3__)
 #undef __in
 #undef __out
-#include "../../../Platform/PS3/Miles/include/mss.h"
+#include "../../Minecraft.Client/Platform/PS3/Miles/include/mss.h"
 #elif defined (__PSVITA__)
 #include "../../PSVITA/Miles/include/mss.h"
 #elif defined _DURANGO
 // 4J Stu - Temp define to get Miles to link, can likely be removed when we get a new version of Miles
 #define _SEKRIT
-#include "../../../Platform/Durango/Miles/include/mss.h"
+#include "../../Minecraft.Client/Platform/Durango/Miles/include/mss.h"
 #elif defined _WINDOWS64
 #include "../../windows64/Miles/include/mss.h"
 #elif defined(__linux__)
 // (DecalOverdose)HACK + TODO: Find native Linux headers and libs for this, but for now I'm using Win64 ones
-#include "../../../Platform/Windows64/Miles/include/mss.h"
+#include "../../Minecraft.Client/Platform/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
-#include "../../../Platform/Orbis/Miles/include/mss.h"
+#include "../../Minecraft.Client/Platform/Orbis/Miles/include/mss.h"
 #endif
 
 typedef struct

Common/Audio/SoundEngine.cpp

@@ -1,13 +1,13 @@
-#include "../../../../Minecraft.World/Build/stdafx.h"
+#include "../../Minecraft.World/Build/stdafx.h"
 
 #include "SoundEngine.h"
 #include "../Consoles_App.h"
-#include "../../../Player/MultiPlayerLocalPlayer.h"
-#include "../../../../Minecraft.World/Headers/net.minecraft.world.level.h"
-#include "../../../../Minecraft.World/Level/LevelData.h"
+#include "../../Minecraft.Client/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 "../../../Textures/Packs/TexturePackRepository.h"
-#include "../../../Textures/Packs/DLCTexturePack.h"
+#include "../../Minecraft.Client/Textures/Packs/TexturePackRepository.h"
+#include "../../Minecraft.Client/Textures/Packs/DLCTexturePack.h"
 #include "../DLC/DLCAudioFile.h"
 
 #ifdef __PSVITA__
@@ -15,8 +15,8 @@
 #endif
 
 #ifdef _WINDOWS64
-#include "../../../Platform/Windows64/Windows64_App.h"
-#include "../../../Platform/Windows64/Miles/include/imssapi.h"
+#include "../../Minecraft.Client/Platform/Windows64/Windows64_App.h"
+#include "../../Minecraft.Client/Platform/Windows64/Miles/include/imssapi.h"
 #endif
 
 #ifdef __ORBIS__

Common/Audio/SoundEngine.h

@@ -1,8 +1,8 @@
 #pragma once
 class Mob;
 class Options;
-//using namespace std;
-#include "../../../../Minecraft.World/Util/SoundTypes.h"
+using namespace std;
+#include "../../Minecraft.World/Util/SoundTypes.h"
 
 enum eMUSICFILES
 {

Common/Audio/SoundNames.cpp

@@ -1,4 +1,4 @@
-#include "../../../../Minecraft.World/Build/stdafx.h"
+#include "../../Minecraft.World/Build/stdafx.h"
 
 #include "Consoles_SoundEngine.h"
 

Common/Colours/ColourTable.cpp

@@ -1,6 +1,6 @@
-#include "../../../../Minecraft.World/Build/stdafx.h"
+#include "../../Minecraft.World/Build/stdafx.h"
 #include "ColourTable.h"
-#include "../../../../Minecraft.World/Util/StringHelpers.h"
+#include "../../Minecraft.World/Util/StringHelpers.h"
 
 std::unordered_map<std::wstring,eMinecraftColour> ColourTable::s_colourNamesMap;
 

Common/ConsoleGameMode.cpp

@@ -1,4 +1,4 @@
-#include "../../../Minecraft.World/Build/stdafx.h"
+#include "../Minecraft.World/Build/stdafx.h"
 #include "ConsoleGameMode.h"
 #include "Tutorial/Tutorial.h"
 

Common/Console_Utils.cpp

@@ -1,4 +1,4 @@
-#include "../../../Minecraft.World/Build/stdafx.h"
+#include "../Minecraft.World/Build/stdafx.h"
 
 #define CDECL
 

Common/Consoles_App.cpp

@@ -1,58 +1,58 @@
 
-#include "../../../Minecraft.World/Build/stdafx.h"
+#include "../Minecraft.World/Build/stdafx.h"
 
-#include "../../../Minecraft.World/Recipes/Recipy.h"
-#include "../../GameState/Options.h"
-#include "../../../Minecraft.World/Util/AABB.h"
-#include "../../../Minecraft.World/Util/Vec3.h"
-#include "../../MinecraftServer.h"
-#include "../../Level/MultiPlayerLevel.h"
-#include "../../Rendering/GameRenderer.h"
-#include "../../Rendering/EntityRenderers/ProgressRenderer.h"
-#include "../../Rendering/LevelRenderer.h"
-#include "../../Textures/MobSkinMemTextureProcessor.h"
-#include "../../Minecraft.h"
-#include "../../Network/ClientConnection.h"
-#include "../../Player/MultiPlayerLocalPlayer.h"
-#include "../../Player/LocalPlayer.h"
-#include "../../../Minecraft.World/Player/Player.h"
-#include "../../../Minecraft.World/Containers/Inventory.h"
-#include "../../../Minecraft.World/Level/Level.h"
-#include "../../../Minecraft.World/Blocks/TileEntities/FurnaceTileEntity.h"
-#include "../../../Minecraft.World/Containers/Container.h"
-#include "../../../Minecraft.World/Blocks/TileEntities/DispenserTileEntity.h"
-#include "../../../Minecraft.World/Blocks/TileEntities/SignTileEntity.h"
-#include "../../GameState/StatsCounter.h"
-#include "../../GameState/GameMode.h"
-#include "../../Platform/Xbox/Social/SocialManager.h"
+#include "../Minecraft.World/Recipes/Recipy.h"
+#include "../Minecraft.Client/GameState/Options.h"
+#include "../Minecraft.World/Util/AABB.h"
+#include "../Minecraft.World/Util/Vec3.h"
+#include "../Minecraft.Client/MinecraftServer.h"
+#include "../Minecraft.Client/Level/MultiPlayerLevel.h"
+#include "../Minecraft.Client/Rendering/GameRenderer.h"
+#include "../Minecraft.Client/Rendering/EntityRenderers/ProgressRenderer.h"
+#include "../Minecraft.Client/Rendering/LevelRenderer.h"
+#include "../Minecraft.Client/Textures/MobSkinMemTextureProcessor.h"
+#include "../Minecraft.Client/Minecraft.h"
+#include "../Minecraft.Client/Network/ClientConnection.h"
+#include "../Minecraft.Client/Player/MultiPlayerLocalPlayer.h"
+#include "../Minecraft.Client/Player/LocalPlayer.h"
+#include "../Minecraft.World/Player/Player.h"
+#include "../Minecraft.World/Containers/Inventory.h"
+#include "../Minecraft.World/Level/Level.h"
+#include "../Minecraft.World/Blocks/TileEntities/FurnaceTileEntity.h"
+#include "../Minecraft.World/Containers/Container.h"
+#include "../Minecraft.World/Blocks/TileEntities/DispenserTileEntity.h"
+#include "../Minecraft.World/Blocks/TileEntities/SignTileEntity.h"
+#include "../Minecraft.Client/GameState/StatsCounter.h"
+#include "../Minecraft.Client/GameState/GameMode.h"
+#include "../Minecraft.Client/Platform/Xbox/Social/SocialManager.h"
 #include "Tutorial/TutorialMode.h"
 #if defined _XBOX || defined _WINDOWS64
-#include "../../Platform/Xbox/XML/ATGXmlParser.h"
-#include "../../Platform/Xbox/XML/xmlFilesCallback.h"
+#include "../Minecraft.Client/Platform/Xbox/XML/ATGXmlParser.h"
+#include "../Minecraft.Client/Platform/Xbox/XML/xmlFilesCallback.h"
 #endif
 #include "Minecraft_Macros.h"
-#include "../../Network/PlayerList.h"
-#include "../../Player/ServerPlayer.h"
+#include "../Minecraft.Client/Network/PlayerList.h"
+#include "../Minecraft.Client/Player/ServerPlayer.h"
 #include "GameRules/ConsoleGameRules.h"
 #include "GameRules/ConsoleSchematicFile.h"
-#include "../../../Minecraft.World/IO/Streams/InputOutputStream.h"
-#include "../../../Minecraft.World/Level/Storage/LevelSettings.h"
-#include "../../Player/User.h"
-#include "../../../Minecraft.World/Level/LevelData.h"
-#include "../../../Minecraft.World/Headers/net.minecraft.world.entity.player.h"
-#include "../../Rendering/EntityRenderers/EntityRenderDispatcher.h"
-#include "../../../Minecraft.World/IO/Streams/Compression.h"
-#include "../../Textures/Packs/TexturePackRepository.h"
-#include "../../Textures/Packs/DLCTexturePack.h"
+#include "../Minecraft.World/IO/Streams/InputOutputStream.h"
+#include "../Minecraft.World/Level/Storage/LevelSettings.h"
+#include "../Minecraft.Client/Player/User.h"
+#include "../Minecraft.World/Level/LevelData.h"
+#include "../Minecraft.World/Headers/net.minecraft.world.entity.player.h"
+#include "../Minecraft.Client/Rendering/EntityRenderers/EntityRenderDispatcher.h"
+#include "../Minecraft.World/IO/Streams/Compression.h"
+#include "../Minecraft.Client/Textures/Packs/TexturePackRepository.h"
+#include "../Minecraft.Client/Textures/Packs/DLCTexturePack.h"
 #include "DLC/DLCPack.h"
-#include "../../Utils/StringTable.h"
+#include "../Minecraft.Client/Utils/StringTable.h"
 #ifndef _XBOX
-#include "../../Utils/ArchiveFile.h"
+#include "../Minecraft.Client/Utils/ArchiveFile.h"
 #endif
-#include "../../Minecraft.h"
+#include "../Minecraft.Client/Minecraft.h"
 #ifdef _XBOX
-#include "../../Platform/Xbox/GameConfig/Minecraft.spa.h"
-#include "../../Platform/Xbox/Network/NetworkPlayerXbox.h"
+#include "../Minecraft.Client/Platform/Xbox/GameConfig/Minecraft.spa.h"
+#include "../Minecraft.Client/Platform/Xbox/Network/NetworkPlayerXbox.h"
 #include "XUI/XUI_TextEntry.h"
 #include "XUI/XUI_XZP_Icons.h"
 #include "XUI/XUI_PauseMenu.h"

Common/Consoles_App.h

@@ -14,17 +14,17 @@
 #endif
 #include "UI/UIStructs.h"
 
-#include "../../../Minecraft.World/Network/Packets/DisconnectPacket.h"
+#include "../Minecraft.World/Network/Packets/DisconnectPacket.h"
 #ifndef __linux__
 #include <xsocialpost.h>
 #endif // __linux__
 
-#include "../../Utils/StringTable.h"
+#include "../Minecraft.Client/Utils/StringTable.h"
 #include "DLC/DLCManager.h"
 #include "GameRules/ConsoleGameRulesConstants.h"
 #include "GameRules/GameRuleManager.h"
-#include "../../Rendering/Models/SkinBox.h"
-#include "../../Utils/ArchiveFile.h"
+#include "../Minecraft.Client/Rendering/Models/SkinBox.h"
+#include "../Minecraft.Client/Utils/ArchiveFile.h"
 
 typedef struct _JoinFromInviteData
 {

Common/DLC/DLCAudioFile.cpp

@@ -1,9 +1,9 @@
-#include "../../../../Minecraft.World/Build/stdafx.h"
+#include "../../Minecraft.World/Build/stdafx.h"
 #include "DLCManager.h"
 #include "DLCAudioFile.h"
 #if defined _XBOX || defined _WINDOWS64
-#include "../../../Platform/Xbox/XML/ATGXmlParser.h"
-#include "../../../Platform/Xbox/XML/xmlFilesCallback.h"
+#include "../../Minecraft.Client/Platform/Xbox/XML/ATGXmlParser.h"
+#include "../../Minecraft.Client/Platform/Xbox/XML/xmlFilesCallback.h"
 #endif
 
 DLCAudioFile::DLCAudioFile(const std::wstring &path) : DLCFile(DLCManager::e_DLCType_Audio,path)

Common/DLC/DLCCapeFile.cpp

@@ -1,4 +1,4 @@
-#include "../../../../Minecraft.World/Build/stdafx.h"
+#include "../../Minecraft.World/Build/stdafx.h"
 #include "DLCManager.h"
 #include "DLCCapeFile.h"
 

Common/DLC/DLCColourTableFile.cpp

@@ -1,9 +1,9 @@
-#include "../../../../Minecraft.World/Build/stdafx.h"
+#include "../../Minecraft.World/Build/stdafx.h"
 #include "DLCManager.h"
 #include "DLCColourTableFile.h"
-#include "../../../Minecraft.h"
-#include "../../../Textures/Packs/TexturePackRepository.h"
-#include "../../../Textures/Packs/TexturePack.h"
+#include "../../Minecraft.Client/Minecraft.h"
+#include "../../Minecraft.Client/Textures/Packs/TexturePackRepository.h"
+#include "../../Minecraft.Client/Textures/Packs/TexturePack.h"
 
 DLCColourTableFile::DLCColourTableFile(const std::wstring &path) : DLCFile(DLCManager::e_DLCType_ColourTable,path)
 {	

Common/DLC/DLCFile.cpp

@@ -1,4 +1,4 @@
-#include "../../../../Minecraft.World/Build/stdafx.h"
+#include "../../Minecraft.World/Build/stdafx.h"
 #include "DLCFile.h"
 
 DLCFile::DLCFile(DLCManager::EDLCType type, const std::wstring &path)

Common/DLC/DLCGameRulesFile.cpp

@@ -1,4 +1,4 @@
-#include "../../../../Minecraft.World/Build/stdafx.h"
+#include "../../Minecraft.World/Build/stdafx.h"
 #include "DLCManager.h"
 #include "DLCGameRulesFile.h"
 

Common/DLC/DLCGameRulesHeader.cpp

@@ -1,10 +1,10 @@
-#include "../../../../Minecraft.World/Build/stdafx.h"
+#include "../../Minecraft.World/Build/stdafx.h"
 
 #include <string>
 
-#include "../../../../Minecraft.World/IO/Files/File.h"
-#include "../../../../Minecraft.World/Util/StringHelpers.h"
-#include "../../../../Minecraft.World/IO/Streams/InputOutputStream.h"
+#include "../../Minecraft.World/IO/Files/File.h"
+#include "../../Minecraft.World/Util/StringHelpers.h"
+#include "../../Minecraft.World/IO/Streams/InputOutputStream.h"
 
 #include "DLCManager.h"
 #include "DLCGameRulesHeader.h"

Common/DLC/DLCLocalisationFile.cpp

@@ -1,7 +1,7 @@
-#include "../../../../Minecraft.World/Build/stdafx.h"
+#include "../../Minecraft.World/Build/stdafx.h"
 #include "DLCManager.h"
 #include "DLCLocalisationFile.h"
-#include "../../../Utils/StringTable.h"
+#include "../../Minecraft.Client/Utils/StringTable.h"
 
 DLCLocalisationFile::DLCLocalisationFile(const std::wstring &path) : DLCFile(DLCManager::e_DLCType_LocalisationData,path)
 {	

Common/DLC/DLCManager.cpp

@@ -1,11 +1,11 @@
-#include "../../../../Minecraft.World/Build/stdafx.h"
+#include "../../Minecraft.World/Build/stdafx.h"
 #include <algorithm>
 #include "DLCManager.h"
 #include "DLCPack.h"
 #include "DLCFile.h"
-#include "../../../../Minecraft.World/Util/StringHelpers.h"
-#include "../../../Minecraft.h"
-#include "../../../Textures/Packs/TexturePackRepository.h"
+#include "../../Minecraft.World/Util/StringHelpers.h"
+#include "../../Minecraft.Client/Minecraft.h"
+#include "../../Minecraft.Client/Textures/Packs/TexturePackRepository.h"
 
 #ifdef __linux__
 #include <stdint.h>

Common/DLC/DLCPack.cpp

@@ -1,4 +1,4 @@
-#include "../../../../Minecraft.World/Build/stdafx.h"
+#include "../../Minecraft.World/Build/stdafx.h"
 #include "DLCPack.h"
 #include "DLCSkinFile.h"
 #include "DLCCapeFile.h"
@@ -9,7 +9,7 @@
 #include "DLCGameRulesHeader.h"
 #include "DLCAudioFile.h"
 #include "DLCColourTableFile.h"
-#include "../../../../Minecraft.World/Util/StringHelpers.h"
+#include "../../Minecraft.World/Util/StringHelpers.h"
 
 DLCPack::DLCPack(const std::wstring &name,DWORD dwLicenseMask)
 {

Common/DLC/DLCSkinFile.cpp

@@ -1,11 +1,11 @@
-#include "../../../../Minecraft.World/Build/stdafx.h"
+#include "../../Minecraft.World/Build/stdafx.h"
 #include "DLCManager.h"
 #include "DLCSkinFile.h"
-#include "../../../Rendering/Models/ModelPart.h"
-#include "../../../Rendering/EntityRenderers/EntityRenderer.h"
-#include "../../../Rendering/EntityRenderers/EntityRenderDispatcher.h"
-#include "../../../../Minecraft.World/Player/Player.h"
-#include "../../../../Minecraft.World/Util/StringHelpers.h"
+#include "../../Minecraft.Client/Rendering/Models/ModelPart.h"
+#include "../../Minecraft.Client/Rendering/EntityRenderers/EntityRenderer.h"
+#include "../../Minecraft.Client/Rendering/EntityRenderers/EntityRenderDispatcher.h"
+#include "../../Minecraft.World/Player/Player.h"
+#include "../../Minecraft.World/Util/StringHelpers.h"
 
 DLCSkinFile::DLCSkinFile(const std::wstring &path) : DLCFile(DLCManager::e_DLCType_Skin,path)
 {

Common/DLC/DLCSkinFile.h

@@ -1,6 +1,6 @@
 #pragma once
 #include "DLCFile.h"
-#include "../../../Rendering/Models/HumanoidModel.h"
+#include "../../Minecraft.Client/Rendering/Models/HumanoidModel.h"
 
 class DLCSkinFile : public DLCFile
 {

Common/DLC/DLCTextureFile.cpp

@@ -1,4 +1,4 @@
-#include "../../../../Minecraft.World/Build/stdafx.h"
+#include "../../Minecraft.World/Build/stdafx.h"
 #include "DLCManager.h"
 #include "DLCTextureFile.h"
 

Common/DLC/DLCUIDataFile.cpp

@@ -1,4 +1,4 @@
-#include "../../../../Minecraft.World/Build/stdafx.h"
+#include "../../Minecraft.World/Build/stdafx.h"
 #include "DLCManager.h"
 #include "DLCUIDataFile.h"
 

Common/GameRules/AddEnchantmentRuleDefinition.cpp

@@ -1,7 +1,7 @@
-#include "../../../../Minecraft.World/Build/stdafx.h"
-#include "../../../../Minecraft.World/Util/StringHelpers.h"
-#include "../../../../Minecraft.World/Headers/net.minecraft.world.item.h"
-#include "../../../../Minecraft.World/Headers/net.minecraft.world.item.enchantment.h"
+#include "../../Minecraft.World/Build/stdafx.h"
+#include "../../Minecraft.World/Util/StringHelpers.h"
+#include "../../Minecraft.World/Headers/net.minecraft.world.item.h"
+#include "../../Minecraft.World/Headers/net.minecraft.world.item.enchantment.h"
 #include "AddEnchantmentRuleDefinition.h"
 
 AddEnchantmentRuleDefinition::AddEnchantmentRuleDefinition()

Common/GameRules/AddItemRuleDefinition.cpp

@@ -1,8 +1,8 @@
-#include "../../../../Minecraft.World/Build/stdafx.h"
-#include "../../../../Minecraft.World/Util/StringHelpers.h"
-#include "../../../../Minecraft.World/Headers/net.minecraft.world.item.h"
-#include "../../../../Minecraft.World/Headers/net.minecraft.world.inventory.h"
-#include "../../../../Minecraft.World/Headers/net.minecraft.world.entity.player.h"
+#include "../../Minecraft.World/Build/stdafx.h"
+#include "../../Minecraft.World/Util/StringHelpers.h"
+#include "../../Minecraft.World/Headers/net.minecraft.world.item.h"
+#include "../../Minecraft.World/Headers/net.minecraft.world.inventory.h"
+#include "../../Minecraft.World/Headers/net.minecraft.world.entity.player.h"
 #include "AddItemRuleDefinition.h"
 #include "AddEnchantmentRuleDefinition.h"
 

Common/GameRules/ApplySchematicRuleDefinition.cpp

@@ -1,10 +1,10 @@
-#include "../../../../Minecraft.World/Build/stdafx.h"
-#include "../../../../Minecraft.World/Util/StringHelpers.h"
-#include "../../../../Minecraft.World/Headers/net.minecraft.world.phys.h"
-#include "../../../../Minecraft.World/Headers/net.minecraft.world.level.h"
-#include "../../../../Minecraft.World/Headers/net.minecraft.world.level.dimension.h"
-#include "../../../../Minecraft.World/Headers/net.minecraft.world.level.chunk.h"
-#include "../../../../Minecraft.World/Headers/net.minecraft.world.level.tile.entity.h"
+#include "../../Minecraft.World/Build/stdafx.h"
+#include "../../Minecraft.World/Util/StringHelpers.h"
+#include "../../Minecraft.World/Headers/net.minecraft.world.phys.h"
+#include "../../Minecraft.World/Headers/net.minecraft.world.level.h"
+#include "../../Minecraft.World/Headers/net.minecraft.world.level.dimension.h"
+#include "../../Minecraft.World/Headers/net.minecraft.world.level.chunk.h"
+#include "../../Minecraft.World/Headers/net.minecraft.world.level.tile.entity.h"
 #include "ApplySchematicRuleDefinition.h"
 #include "LevelGenerationOptions.h"
 #include "ConsoleSchematicFile.h"

Common/GameRules/BiomeOverride.cpp

@@ -1,5 +1,5 @@
-#include "../../../../Minecraft.World/Build/stdafx.h"
-#include "../../../../Minecraft.World/Util/StringHelpers.h"
+#include "../../Minecraft.World/Build/stdafx.h"
+#include "../../Minecraft.World/Util/StringHelpers.h"
 #include "BiomeOverride.h"
 
 BiomeOverride::BiomeOverride()

Common/GameRules/CollectItemRuleDefinition.cpp

@@ -1,10 +1,10 @@
-#include "../../../../Minecraft.World/Build/stdafx.h"
-#include "../../../Utils/WstringLookup.h"
-#include "../../../../Minecraft.World/Util/StringHelpers.h"
+#include "../../Minecraft.World/Build/stdafx.h"
+#include "../../Minecraft.Client/Utils/WstringLookup.h"
+#include "../../Minecraft.World/Util/StringHelpers.h"
 #include "CollectItemRuleDefinition.h"
-#include "../../../../Minecraft.World/Headers/net.minecraft.world.item.h"
-#include "../../../../Minecraft.World/Network/Connection.h"
-#include "../../../../Minecraft.World/Headers/net.minecraft.network.packet.h"
+#include "../../Minecraft.World/Headers/net.minecraft.world.item.h"
+#include "../../Minecraft.World/Network/Connection.h"
+#include "../../Minecraft.World/Headers/net.minecraft.network.packet.h"
 
 CollectItemRuleDefinition::CollectItemRuleDefinition()
 {

Common/GameRules/CompleteAllRuleDefinition.cpp

@@ -1,9 +1,9 @@
-#include "../../../../Minecraft.World/Build/stdafx.h"
+#include "../../Minecraft.World/Build/stdafx.h"
 #include "CompleteAllRuleDefinition.h"
 #include "ConsoleGameRules.h"
-#include "../../../../Minecraft.World/Util/StringHelpers.h"
-#include "../../../../Minecraft.World/Network/Connection.h"
-#include "../../../../Minecraft.World/Headers/net.minecraft.network.packet.h"
+#include "../../Minecraft.World/Util/StringHelpers.h"
+#include "../../Minecraft.World/Network/Connection.h"
+#include "../../Minecraft.World/Headers/net.minecraft.network.packet.h"
 
 void CompleteAllRuleDefinition::getChildren(std::vector<GameRuleDefinition *> *children)
 {

Common/GameRules/CompoundGameRuleDefinition.cpp

@@ -1,6 +1,6 @@
-#include "../../../../Minecraft.World/Build/stdafx.h"
-#include "../../../../Minecraft.World/Util/StringHelpers.h"
-#include "../../../../Minecraft.World/Headers/net.minecraft.world.item.h"
+#include "../../Minecraft.World/Build/stdafx.h"
+#include "../../Minecraft.World/Util/StringHelpers.h"
+#include "../../Minecraft.World/Headers/net.minecraft.world.item.h"
 #include "CompoundGameRuleDefinition.h"
 #include "ConsoleGameRules.h"
 

Common/GameRules/ConsoleGenerateStructure.cpp

@@ -1,11 +1,11 @@
-#include "../../../../Minecraft.World/Build/stdafx.h"
+#include "../../Minecraft.World/Build/stdafx.h"
 #include "ConsoleGenerateStructure.h"
 #include "ConsoleGameRules.h"
-#include "../../../../Minecraft.World/Headers/net.minecraft.world.level.h"
-#include "../../../../Minecraft.World/Headers/net.minecraft.world.level.dimension.h"
-#include "../../../../Minecraft.World/Headers/net.minecraft.world.level.levelgen.structure.h"
-#include "../../../../Minecraft.World/Util/StringHelpers.h"
-#include "../../../../Minecraft.World/Headers/net.minecraft.h"
+#include "../../Minecraft.World/Headers/net.minecraft.world.level.h"
+#include "../../Minecraft.World/Headers/net.minecraft.world.level.dimension.h"
+#include "../../Minecraft.World/Headers/net.minecraft.world.level.levelgen.structure.h"
+#include "../../Minecraft.World/Util/StringHelpers.h"
+#include "../../Minecraft.World/Headers/net.minecraft.h"
 
 ConsoleGenerateStructure::ConsoleGenerateStructure() : StructurePiece(0)
 {

Common/GameRules/ConsoleGenerateStructure.h

@@ -1,6 +1,6 @@
 #pragma once
 #include "GameRuleDefinition.h"
-#include "../../../../Minecraft.World/WorldGen/Structures/StructurePiece.h"
+#include "../../Minecraft.World/WorldGen/Structures/StructurePiece.h"
 
 class Level;
 class Random;

Common/GameRules/ConsoleSchematicFile.cpp

@@ -1,16 +1,16 @@
-#include "../../../../Minecraft.World/Build/stdafx.h"
+#include "../../Minecraft.World/Build/stdafx.h"
 #include <vector>
-#include "../../../../Minecraft.World/Headers/com.mojang.nbt.h"
-#include "../../../../Minecraft.World/Build/System.h"
+#include "../../Minecraft.World/Headers/com.mojang.nbt.h"
+#include "../../Minecraft.World/Build/System.h"
 #include "ConsoleSchematicFile.h"
-#include "../../../../Minecraft.World/IO/Streams/InputOutputStream.h"
-#include "../../../../Minecraft.World/Headers/net.minecraft.world.level.h"
-#include "../../../../Minecraft.World/Headers/net.minecraft.world.level.chunk.h"
-#include "../../../../Minecraft.World/Headers/net.minecraft.world.level.tile.entity.h"
-#include "../../../../Minecraft.World/Headers/net.minecraft.world.entity.h"
-#include "../../../../Minecraft.World/Headers/net.minecraft.world.entity.item.h"
-#include "../../../../Minecraft.World/Headers/net.minecraft.world.phys.h"
-#include "../../../../Minecraft.World/IO/Streams/Compression.h"
+#include "../../Minecraft.World/IO/Streams/InputOutputStream.h"
+#include "../../Minecraft.World/Headers/net.minecraft.world.level.h"
+#include "../../Minecraft.World/Headers/net.minecraft.world.level.chunk.h"
+#include "../../Minecraft.World/Headers/net.minecraft.world.level.tile.entity.h"
+#include "../../Minecraft.World/Headers/net.minecraft.world.entity.h"
+#include "../../Minecraft.World/Headers/net.minecraft.world.entity.item.h"
+#include "../../Minecraft.World/Headers/net.minecraft.world.phys.h"
+#include "../../Minecraft.World/IO/Streams/Compression.h"
 
 ConsoleSchematicFile::ConsoleSchematicFile()
 {

Common/GameRules/ConsoleSchematicFile.h

@@ -4,7 +4,7 @@
 #define XBOX_SCHEMATIC_ORIGINAL_VERSION 1
 #define XBOX_SCHEMATIC_CURRENT_VERSION 2
 
-#include "../../../../Minecraft.World/Util/ArrayWithLength.h"
+#include "../../Minecraft.World/Util/ArrayWithLength.h"
 
 class Level;
 class DataOutputStream;

Common/GameRules/GameRule.cpp

@@ -1,4 +1,4 @@
-#include "../../../../Minecraft.World/Build/stdafx.h"
+#include "../../Minecraft.World/Build/stdafx.h"
 #include "ConsoleGameRules.h"
 
 GameRule::GameRule(GameRuleDefinition *definition, Connection *connection)

Common/GameRules/GameRuleDefinition.cpp

@@ -1,6 +1,6 @@
-#include "../../../../Minecraft.World/Build/stdafx.h"
-#include "../../../Utils/WstringLookup.h"
-#include "../../../../Minecraft.World/Util/StringHelpers.h"
+#include "../../Minecraft.World/Build/stdafx.h"
+#include "../../Minecraft.Client/Utils/WstringLookup.h"
+#include "../../Minecraft.World/Util/StringHelpers.h"
 #include "ConsoleGameRules.h"
 
 GameRuleDefinition::GameRuleDefinition()

Common/GameRules/GameRuleDefinition.h

@@ -3,7 +3,7 @@
 #include <unordered_map>
 #include <string>
 
-#include "../../../../Minecraft.World/Items/ItemInstance.h"
+#include "../../Minecraft.World/Items/ItemInstance.h"
 #include "ConsoleGameRulesConstants.h"
 
 #include "GameRulesInstance.h"

Common/GameRules/GameRuleManager.cpp

@@ -1,14 +1,14 @@
-#include "../../../../Minecraft.World/Build/stdafx.h"
-#include "../../../../Minecraft.World/IO/Streams/Compression.h"
-#include "../../../../Minecraft.World/Util/StringHelpers.h"
-#include "../../../../Minecraft.World/IO/Files/File.h"
-#include "../../../../Minecraft.World/IO/Streams/Compression.h"
+#include "../../Minecraft.World/Build/stdafx.h"
+#include "../../Minecraft.World/IO/Streams/Compression.h"
+#include "../../Minecraft.World/Util/StringHelpers.h"
+#include "../../Minecraft.World/IO/Files/File.h"
+#include "../../Minecraft.World/IO/Streams/Compression.h"
 #include "../DLC/DLCPack.h"
 #include "../DLC/DLCLocalisationFile.h"
 #include "../DLC/DLCGameRulesFile.h"
 #include "../DLC/DLCGameRules.h"
 #include "../DLC/DLCGameRulesHeader.h"
-#include "../../../Utils/StringTable.h"
+#include "../../Minecraft.Client/Utils/StringTable.h"
 #include "ConsoleGameRules.h"
 #include "GameRuleManager.h"
 

Common/GameRules/LevelGenerationOptions.cpp

@@ -1,13 +1,13 @@
-#include "../../../../Minecraft.World/Build/stdafx.h"
+#include "../../Minecraft.World/Build/stdafx.h"
 
 #include <unordered_set>
 
-#include "../../../../Minecraft.World/Util/StringHelpers.h"
-#include "../../../../Minecraft.World/Util/Pos.h"
-#include "../../../../Minecraft.World/Headers/net.minecraft.world.phys.h"
-#include "../../../../Minecraft.World/Headers/net.minecraft.world.level.h"
-#include "../../../../Minecraft.World/Headers/net.minecraft.world.level.chunk.h"
-#include "../../../Utils/StringTable.h"
+#include "../../Minecraft.World/Util/StringHelpers.h"
+#include "../../Minecraft.World/Util/Pos.h"
+#include "../../Minecraft.World/Headers/net.minecraft.world.phys.h"
+#include "../../Minecraft.World/Headers/net.minecraft.world.level.h"
+#include "../../Minecraft.World/Headers/net.minecraft.world.level.chunk.h"
+#include "../../Minecraft.Client/Utils/StringTable.h"
 #include "LevelGenerationOptions.h"
 #include "ConsoleGameRules.h"
 

Common/GameRules/LevelGenerationOptions.h

@@ -4,7 +4,7 @@
 // #pragma message("LevelGenerationOptions.h ")
 
 #include "GameRuleDefinition.h"
-#include "../../../../Minecraft.World/WorldGen/Features/StructureFeature.h"
+#include "../../Minecraft.World/WorldGen/Features/StructureFeature.h"
 
 class ApplySchematicRuleDefinition;
 class LevelChunk;

Common/GameRules/LevelGenerators.cpp

@@ -1,4 +1,4 @@
-#include "../../../../Minecraft.World/Build/stdafx.h"
+#include "../../Minecraft.World/Build/stdafx.h"
 #include "LevelGenerationOptions.h"
 #include "LevelGenerators.h"
 

Common/GameRules/LevelRules.cpp

@@ -1,4 +1,4 @@
-#include "../../../../Minecraft.World/Build/stdafx.h"
+#include "../../Minecraft.World/Build/stdafx.h"
 #include "LevelRules.h"
 
 

Common/GameRules/LevelRuleset.cpp

@@ -1,6 +1,6 @@
-#include "../../../../Minecraft.World/Build/stdafx.h"
-#include "../../../../Minecraft.World/Util/StringHelpers.h"
-#include "../../../Utils/StringTable.h"
+#include "../../Minecraft.World/Build/stdafx.h"
+#include "../../Minecraft.World/Util/StringHelpers.h"
+#include "../../Minecraft.Client/Utils/StringTable.h"
 #include "ConsoleGameRules.h"
 #include "LevelRuleset.h"
 

Common/GameRules/NamedAreaRuleDefinition.cpp

@@ -1,7 +1,7 @@
-#include "../../../../Minecraft.World/Build/stdafx.h"
+#include "../../Minecraft.World/Build/stdafx.h"
 #include "NamedAreaRuleDefinition.h"
-#include "../../../../Minecraft.World/Util/StringHelpers.h"
-#include "../../../../Minecraft.World/Headers/net.minecraft.world.phys.h"
+#include "../../Minecraft.World/Util/StringHelpers.h"
+#include "../../Minecraft.World/Headers/net.minecraft.world.phys.h"
 
 NamedAreaRuleDefinition::NamedAreaRuleDefinition()
 {

Common/GameRules/StartFeature.cpp

@@ -1,5 +1,5 @@
-#include "../../../../Minecraft.World/Build/stdafx.h"
-#include "../../../../Minecraft.World/Util/StringHelpers.h"
+#include "../../Minecraft.World/Build/stdafx.h"
+#include "../../Minecraft.World/Util/StringHelpers.h"
 #include "StartFeature.h"
 
 StartFeature::StartFeature()

Common/GameRules/StartFeature.h

@@ -2,7 +2,7 @@
 //using namespace std;
 
 #include "GameRuleDefinition.h"
-#include "../../../../Minecraft.World/WorldGen/Features/StructureFeature.h"
+#include "../../Minecraft.World/WorldGen/Features/StructureFeature.h"
 
 class StartFeature : public GameRuleDefinition
 {

Common/GameRules/UpdatePlayerRuleDefinition.cpp

@@ -1,11 +1,11 @@
-#include "../../../../Minecraft.World/Build/stdafx.h"
+#include "../../Minecraft.World/Build/stdafx.h"
 #include "UpdatePlayerRuleDefinition.h"
 #include "ConsoleGameRules.h"
-#include "../../../../Minecraft.World/Util/Pos.h"
-#include "../../../../Minecraft.World/Util/StringHelpers.h"
-#include "../../../../Minecraft.World/Headers/net.minecraft.world.entity.player.h"
-#include "../../../../Minecraft.World/Headers/net.minecraft.world.food.h"
-#include "../../../../Minecraft.World/Headers/net.minecraft.world.item.h"
+#include "../../Minecraft.World/Util/Pos.h"
+#include "../../Minecraft.World/Util/StringHelpers.h"
+#include "../../Minecraft.World/Headers/net.minecraft.world.entity.player.h"
+#include "../../Minecraft.World/Headers/net.minecraft.world.food.h"
+#include "../../Minecraft.World/Headers/net.minecraft.world.item.h"
 
 UpdatePlayerRuleDefinition::UpdatePlayerRuleDefinition()
 {

Common/GameRules/UseTileRuleDefinition.cpp

@@ -1,5 +1,5 @@
-#include "../../../../Minecraft.World/Build/stdafx.h"
-#include "../../../../Minecraft.World/Util/StringHelpers.h"
+#include "../../Minecraft.World/Build/stdafx.h"
+#include "../../Minecraft.World/Util/StringHelpers.h"
 #include "UseTileRuleDefinition.h"
 
 UseTileRuleDefinition::UseTileRuleDefinition()