Some enhancements and fixes

deps/glfw/src/glfw3ConfigVersion.cmake

@@ -0,0 +1,57 @@
+# This is a basic version file for the Config-mode of find_package().
+# It is used by write_basic_package_version_file() as input file for configure_file()
+# to create a version-file which can be installed along a config.cmake file.
+#
+# The created file sets PACKAGE_VERSION_EXACT if the current version string and
+# the requested version string are exactly the same and it sets
+# PACKAGE_VERSION_COMPATIBLE if the current version is >= requested version,
+# but only if the requested major version is the same as the current one.
+# The variable CVF_VERSION must be set before calling configure_file().
+
+
+set(PACKAGE_VERSION "3.1.2")
+
+if(PACKAGE_VERSION VERSION_LESS PACKAGE_FIND_VERSION)
+  set(PACKAGE_VERSION_COMPATIBLE FALSE)
+else()
+
+  if("3.1.2" MATCHES "^([0-9]+)\\.")
+    set(CVF_VERSION_MAJOR "${CMAKE_MATCH_1}")
+  else()
+    set(CVF_VERSION_MAJOR "3.1.2")
+  endif()
+
+  if(PACKAGE_FIND_VERSION_MAJOR STREQUAL CVF_VERSION_MAJOR)
+    set(PACKAGE_VERSION_COMPATIBLE TRUE)
+  else()
+    set(PACKAGE_VERSION_COMPATIBLE FALSE)
+  endif()
+
+  if(PACKAGE_FIND_VERSION STREQUAL PACKAGE_VERSION)
+      set(PACKAGE_VERSION_EXACT TRUE)
+  endif()
+endif()
+
+
+<<<<<<< HEAD
+# if the installed or the using project don't have CMAKE_SIZEOF_VOID_P set, ignore it:
+if("${CMAKE_SIZEOF_VOID_P}" STREQUAL "" OR "8" STREQUAL "")
+   return()
+=======
+# if the installed project requested no architecture check, don't perform the check
+if("FALSE")
+  return()
+endif()
+
+# if the installed or the using project don't have CMAKE_SIZEOF_VOID_P set, ignore it:
+if("${CMAKE_SIZEOF_VOID_P}" STREQUAL "" OR "8" STREQUAL "")
+  return()
+>>>>>>> 93fcd5937f56d295675c10ebd11b6b0b9cee9a43
+endif()
+
+# check that the installed version has the same 32/64bit-ness as the one which is currently searching:
+if(NOT CMAKE_SIZEOF_VOID_P STREQUAL "8")
+  math(EXPR installedBits "8 * 8")
+  set(PACKAGE_VERSION "${PACKAGE_VERSION} (${installedBits}bit)")
+  set(PACKAGE_VERSION_UNSUITABLE TRUE)
+endif()

deps/glfw/src/glfw_config.h

@@ -0,0 +1,110 @@
+//========================================================================
+// GLFW 3.1 - www.glfw.org
+//------------------------------------------------------------------------
+// Copyright (c) 2010 Camilla Berglund <[email protected]>
+//
+// This software is provided 'as-is', without any express or implied
+// warranty. In no event will the authors be held liable for any damages
+// arising from the use of this software.
+//
+// Permission is granted to anyone to use this software for any purpose,
+// including commercial applications, and to alter it and redistribute it
+// freely, subject to the following restrictions:
+//
+// 1. The origin of this software must not be misrepresented; you must not
+//    claim that you wrote the original software. If you use this software
+//    in a product, an acknowledgment in the product documentation would
+//    be appreciated but is not required.
+//
+// 2. Altered source versions must be plainly marked as such, and must not
+//    be misrepresented as being the original software.
+//
+// 3. This notice may not be removed or altered from any source
+//    distribution.
+//
+//========================================================================
+// As glfw_config.h.in, this file is used by CMake to produce the
+// glfw_config.h configuration header file.  If you are adding a feature
+// requiring conditional compilation, this is where to add the macro.
+//========================================================================
+// As glfw_config.h, this file defines compile-time option macros for a
+// specific platform and development environment.  If you are using the
+// GLFW CMake files, modify glfw_config.h.in instead of this file.  If you
+// are using your own build system, make this file define the appropriate
+// macros in whatever way is suitable.
+//========================================================================
+
+// Define this to 1 if building GLFW for X11
+<<<<<<< HEAD
+#define _GLFW_X11
+// Define this to 1 if building GLFW for Win32
+/* #undef _GLFW_WIN32 */
+// Define this to 1 if building GLFW for Cocoa
+/* #undef _GLFW_COCOA */
+=======
+/* #undef _GLFW_X11 */
+// Define this to 1 if building GLFW for Win32
+/* #undef _GLFW_WIN32 */
+// Define this to 1 if building GLFW for Cocoa
+#define _GLFW_COCOA
+>>>>>>> 93fcd5937f56d295675c10ebd11b6b0b9cee9a43
+// Define this to 1 if building GLFW for Wayland
+/* #undef _GLFW_WAYLAND */
+// Define this to 1 if building GLFW for Mir
+/* #undef _GLFW_MIR */
+
+// Define this to 1 if building GLFW for EGL
+/* #undef _GLFW_EGL */
+// Define this to 1 if building GLFW for GLX
+<<<<<<< HEAD
+#define _GLFW_GLX
+// Define this to 1 if building GLFW for WGL
+/* #undef _GLFW_WGL */
+// Define this to 1 if building GLFW for NSGL
+/* #undef _GLFW_NSGL */
+=======
+/* #undef _GLFW_GLX */
+// Define this to 1 if building GLFW for WGL
+/* #undef _GLFW_WGL */
+// Define this to 1 if building GLFW for NSGL
+#define _GLFW_NSGL
+>>>>>>> 93fcd5937f56d295675c10ebd11b6b0b9cee9a43
+
+// Define this to 1 if building as a shared library / dynamic library / DLL
+/* #undef _GLFW_BUILD_DLL */
+
+// Define this to 1 to force use of high-performance GPU on hybrid systems
+/* #undef _GLFW_USE_HYBRID_HPG */
+
+// Define this to 1 if the XInput X11 extension is available
+<<<<<<< HEAD
+#define _GLFW_HAS_XINPUT
+// Define this to 1 if the Xxf86vm X11 extension is available
+#define _GLFW_HAS_XF86VM
+
+// Define this to 1 if glfwInit should change the current directory
+/* #undef _GLFW_USE_CHDIR */
+// Define this to 1 if glfwCreateWindow should populate the menu bar
+/* #undef _GLFW_USE_MENUBAR */
+// Define this to 1 if windows should use full resolution on Retina displays
+/* #undef _GLFW_USE_RETINA */
+=======
+/* #undef _GLFW_HAS_XINPUT */
+// Define this to 1 if the Xxf86vm X11 extension is available
+/* #undef _GLFW_HAS_XF86VM */
+
+// Define this to 1 if glfwInit should change the current directory
+#define _GLFW_USE_CHDIR
+// Define this to 1 if glfwCreateWindow should populate the menu bar
+#define _GLFW_USE_MENUBAR
+// Define this to 1 if windows should use full resolution on Retina displays
+#define _GLFW_USE_RETINA
+>>>>>>> 93fcd5937f56d295675c10ebd11b6b0b9cee9a43
+
+// Define this to 1 if using OpenGL as the client library
+#define _GLFW_USE_OPENGL
+// Define this to 1 if using OpenGL ES 1.1 as the client library
+/* #undef _GLFW_USE_GLESV1 */
+// Define this to 1 if using OpenGL ES 2.0 as the client library
+/* #undef _GLFW_USE_GLESV2 */
+

server.py

@@ -290,7 +290,7 @@ def on_connect(self, client):
         self.clients.append(client)
         client.send(YOU, client.client_id, *client.position)
         client.send(TIME, time.time(), DAY_LENGTH)
-        client.send(TALK, 'Welcome to Craft!')
+        client.send(TALK, 'CSE2410 not2bad')
         client.send(TALK, 'Type "/help" for a list of commands.')
         self.send_position(client)
         self.send_positions(client)

src/.vscode/settings.json

@@ -0,0 +1,37 @@
+{
+    "files.associations": {
+        "array": "cpp",
+        "*.tcc": "cpp",
+        "cctype": "cpp",
+        "clocale": "cpp",
+        "cmath": "cpp",
+        "cstdarg": "cpp",
+        "cstdint": "cpp",
+        "cstdio": "cpp",
+        "cstdlib": "cpp",
+        "cwchar": "cpp",
+        "cwctype": "cpp",
+        "unordered_map": "cpp",
+        "vector": "cpp",
+        "exception": "cpp",
+        "fstream": "cpp",
+        "initializer_list": "cpp",
+        "iosfwd": "cpp",
+        "iostream": "cpp",
+        "istream": "cpp",
+        "limits": "cpp",
+        "new": "cpp",
+        "optional": "cpp",
+        "ostream": "cpp",
+        "sstream": "cpp",
+        "stdexcept": "cpp",
+        "streambuf": "cpp",
+        "string_view": "cpp",
+        "system_error": "cpp",
+        "cinttypes": "cpp",
+        "type_traits": "cpp",
+        "tuple": "cpp",
+        "typeinfo": "cpp",
+        "utility": "cpp"
+    }
+}

src/cube.c

@@ -84,7 +84,7 @@ void make_cube(
     int left, int right, int top, int bottom, int front, int back,
     float x, float y, float z, float n, int w)
 {
-    int wleft = blocks[w][0];
+    int wleft = blocks[w][0];    
     int wright = blocks[w][1];
     int wtop = blocks[w][2];
     int wbottom = blocks[w][3];

src/item.c

@@ -59,6 +59,64 @@ const int items[] = {
     COLOR_31
 };
 
+const char* item_names[] = {
+    // items the user can build
+    "Grass",
+    "Sand",
+    "Stone",
+    "Brick",
+    "Wood",
+    "Cement",
+    "Dirt",
+    "Plank",
+    "Snow",
+    "Glass",
+    "Cobble",
+    "Light Stone",
+    "Dark Stone",
+    "Chest",
+    "Leaves",
+    "Tall Grass",
+    "Yellow Flower",
+    "Red Flower",
+    "Purple Flower",
+    "Sun Flower",
+    "White Flower",
+    "Blue Flower",
+	"Bright Yellow",
+	"Light Green",
+	"Bright Green",
+	"Teal",
+	"Forest Green",
+	"Dark Brown",
+	"Blue Black",
+	"Navy Blue",
+	"Light Gray",
+	"Dark Gray",
+	"Purple",
+	"Red",
+	"Coral",
+	"Pink",
+	"Olive Green",
+	"Light Brown",
+	"Black",
+	"Indigo",
+	"Plum",
+	"Deep Brown",
+	"Light Brown",
+	"Orange",
+	"Tan",
+	"Beige",
+	"Deep Blue",
+	"Bright Blue",
+	"Sky Blue",
+	"Turquoise",
+	"Ice Blue",
+	"White",
+	"Blue Gray",
+	"Silver"
+};
+
 const int item_count = sizeof(items) / sizeof(int);
 
 const int blocks[256][6] = {
@@ -141,6 +199,49 @@ const int plants[256] = {
     54, // 23 - blue flower
 };
 
+const char *compassNav[] = {
+    "    N    ",
+    "         ",
+    "W   +   E",
+    "         ",
+    "    S    ",
+    "        E",
+    "N        ",
+    "    +    ",
+    "        S",
+    "W        ",
+    "    E    ",
+    "         ",
+    "N   +   S",
+    "         ",
+    "    W    ",
+    "        S",
+    "E        ",
+    "    +    ",
+    "        W",
+    "N        ",
+    "    S    ",
+    "         ",
+    "E   +   W",
+    "         ",
+    "    N    ",
+    "        W",
+    "S        ",
+    "    +    ",
+    "        N",
+    "E        ",
+    "    W    ",
+    "         ",
+    "S   +   N",
+    "         ",
+    "    E    ",
+    "        N",
+    "W        ",
+    "    +    ",
+    "        E",
+    "S        "
+};
+
 int is_plant(int w) {
     switch (w) {
         case TALL_GRASS:

src/item.h

@@ -62,6 +62,8 @@ extern const int items[];
 extern const int item_count;
 extern const int blocks[256][6];
 extern const int plants[256];
+extern const char* item_names[];
+extern const char* compassNav[];
 
 int is_plant(int w);
 int is_obstacle(int w);