CMakeLists.txt

@@ -17,7 +17,7 @@ set(GCC_MINIMUM_VERSION "5.1")
 set(CLANG_MINIMUM_VERSION "3.5")
 
 # Also remember to set PROTOCOL_VERSION in network/networkprotocol.h when releasing
-set(VERSION_MAJOR 8)
+set(VERSION_MAJOR 6)
 set(VERSION_MINOR 0)
 set(VERSION_PATCH 0)
 set(VERSION_EXTRA "pre-release 1" CACHE STRING "Stuff to append to version string")
@@ -260,16 +260,16 @@ install(FILES "minetest.conf.example" DESTINATION "${EXAMPLE_CONF_DIR}")
 
 if(UNIX AND NOT APPLE)
 	install(FILES "doc/minetest.6" "doc/minetestserver.6" DESTINATION "${MANDIR}/man6")
-	install(FILES "misc/info.sovnat.xtreemtest.desktop" DESTINATION "${XDG_APPS_DIR}")
-	install(FILES "misc/info.sovnat.xtreemtest.appdata.xml" DESTINATION "${APPDATADIR}")
-	install(FILES "misc/xtreemtest.svg" DESTINATION "${ICONDIR}/hicolor/scalable/apps")
-	install(FILES "misc/xtreemtest-xorg-icon-128.png"
+	install(FILES "misc/net.minetest.minetest.desktop" DESTINATION "${XDG_APPS_DIR}")
+	install(FILES "misc/net.minetest.minetest.appdata.xml" DESTINATION "${APPDATADIR}")
+	install(FILES "misc/minetest.svg" DESTINATION "${ICONDIR}/hicolor/scalable/apps")
+	install(FILES "misc/minetest-xorg-icon-128.png"
 		DESTINATION "${ICONDIR}/hicolor/128x128/apps"
-		RENAME "xtreemtest.png")
+		RENAME "minetest.png")
 endif()
 
 if(APPLE)
-	install(FILES "misc/xtreemtest-icon.icns" DESTINATION "${SHAREDIR}")
+	install(FILES "misc/minetest-icon.icns" DESTINATION "${SHAREDIR}")
 	install(FILES "misc/Info.plist" DESTINATION "${BUNDLE_PATH}/Contents")
 endif()
 

README.MD

@@ -2,43 +2,45 @@
 ========
 
 
-### "It's like MineTest, but more XTREEM!"
+### "It's just not a game anymore!"
 
 Fork of Minetest, a free-as-in-freedom voxel game engine with easy modding and game creation.
 
 Copyright (C) 2010-2022 Perttu Ahola <celeron55@gmail.com>  
+
 Copyright (C) 2021-2022 Migdyn <xtreemsex@testing.cubesoftware.xyz>  
+
 and contributors (see source file comments and the version control log of the original Minetest repository, which can be found [here](https://github.com/minetest/minetest).
 
 
 ## IMPORTANT NOTE: This readme file and other documentation might be outdated or irrelevant, as it was taken directly from the original Minetest code.
 
 
+In case you downloaded the source code
+--------------------------------------
+If you downloaded the Minetest Engine source code in which this file is
+contained, you probably want to download the [Minetest Game](https://github.com/minetest/minetest_game/)
+project too. See its README.txt for more information.
+
 Table of Contents
 ------------------
 
-1. [Our goal](#our-goal)
-2. [Further Documentation](#further-documentation)
-3. [Default Controls](#default-controls)
-4. [Paths](#paths)
-5. [Configuration File](#configuration-file)
-6. [Command-line Options](#command-line-options)
-7. [Compiling](#compiling)
+1. [Further Documentation](#further-documentation)
+2. [Default Controls](#default-controls)
+3. [Paths](#paths)
+4. [Configuration File](#configuration-file)
+5. [Command-line Options](#command-line-options)
+6. [Compiling](#compiling)
+7. [Docker](#docker)
 8. [Version Scheme](#version-scheme)
 
 
-Our goal
----------
-Our goal is to create a positive and censorship-free community around MineTest, 
-improve upon the MineTest engine by adding new features to it, as well as provide
-a base for future Google Play games.
-
 Further documentation
 ----------------------
-- Website: https://mcl.sovnat.info
+- Website: https://minetest.net/
 - Wiki: https://wiki.minetest.net/
 - Developer wiki: https://dev.minetest.net/
-- phpBB forums: https://bb.cubesoftware.xyz
+- Forum: https://forum.minetest.net/
 - GitHub: https://github.com/minetest/minetest/
 - [doc/](doc/) directory of source distribution
 
@@ -100,17 +102,17 @@ Where each location is on each platform:
     * `share` = `.`
     * `user`  = `.`
 * Windows installed:
-    * `bin`   = `C:\Program Files\XtreemTest\bin (Depends on the install location)`
-    * `share` = `C:\Program Files\XtreemTest (Depends on the install location)`
-    * `user`  = `%APPDATA%\XtreemTest`
+    * `bin`   = `C:\Program Files\Minetest\bin (Depends on the install location)`
+    * `share` = `C:\Program Files\Minetest (Depends on the install location)`
+    * `user`  = `%APPDATA%\Minetest`
 * Linux installed:
     * `bin`   = `/usr/bin`
-    * `share` = `/usr/share/xtreemtest`
-    * `user`  = `~/.xtreemtest`
+    * `share` = `/usr/share/minetest`
+    * `user`  = `~/.minetest`
 * macOS:
     * `bin`   = `Contents/MacOS`
     * `share` = `Contents/Resources`
-    * `user`  = `Contents/User OR ~/Library/Application Support/xtreemtest`
+    * `user`  = `Contents/User OR ~/Library/Application Support/minetest`
 
 Worlds can be found as separate folders in: `user/worlds/`
 
@@ -118,7 +120,7 @@ Configuration file
 ------------------
 - Default location:
     `user/minetest.conf`
-- This file is created by closing XtreemTest for the first time.
+- This file is created by closing Minetest for the first time.
 - A specific file can be specified on the command line:
     `--config <path-to-file>`
 - A run-in-place build will look for the configuration file in
@@ -162,7 +164,7 @@ For Alpine users:
 
     sudo apk add build-base cmake libpng-dev jpeg-dev libxi-dev mesa-dev sqlite-dev libogg-dev libvorbis-dev openal-soft-dev curl-dev freetype-dev zlib-dev gmp-dev jsoncpp-dev luajit-dev zstd-dev
 
-#### Download w/ Git
+#### Download
 
 You can install Git for easily keeping your copy up to date.
 If you don’t want Git, read below on how to get the source without Git.
@@ -176,20 +178,30 @@ For Fedora users:
 
 Download source (this is the URL to the latest of source repository, which might not work at all times) using Git:
 
-    git clone --depth 1 https://github.com/MCLx86/xtreemtest.git
-    cd xtreemtest
+    git clone --depth 1 https://github.com/minetest/minetest.git
+    cd minetest
+
+Download minetest_game (otherwise only the "Development Test" game is available) using Git:
+
+    git clone --depth 1 https://github.com/minetest/minetest_game.git games/minetest_game
 
 Download IrrlichtMt to `lib/irrlichtmt`, it will be used to satisfy the IrrlichtMt dependency that way:
 
     git clone --depth 1 https://github.com/minetest/irrlicht.git lib/irrlichtmt
 
-#### Download w/out Git
 Download source, without using Git:
 
-    wget https://github.com/MCLx86/xtreemtest/archive/master.tar.gz
+    wget https://github.com/minetest/minetest/archive/master.tar.gz
     tar xf master.tar.gz
-    mv xtreemtest-master xtreemtest
-    cd xtreemtest
+    cd minetest-master
+
+Download minetest_game, without using Git:
+
+    cd games/
+    wget https://github.com/minetest/minetest_game/archive/master.tar.gz
+    tar xf master.tar.gz
+    mv minetest_game-master minetest_game
+    cd ..
 
 Download IrrlichtMt, without using Git:
 
@@ -220,7 +232,7 @@ Run it:
 - If you build a bare server you don't need to compile IrrlichtMt, just the headers suffice.
   - In that case use `-DIRRLICHT_INCLUDE_DIR=/some/where/irrlichtmt/include`.
 
-- XtreemTest will use the IrrlichtMt package that is found first, given by the following order:
+- Minetest will use the IrrlichtMt package that is found first, given by the following order:
   1. Specified `IRRLICHTMT_BUILD_DIR` CMake variable
   2. `${PROJECT_SOURCE_DIR}/lib/irrlichtmt` (if existent)
   3. Installation of IrrlichtMt in the system-specific library paths
@@ -231,8 +243,8 @@ Run it:
 
 General options and their default values:
 
-    BUILD_CLIENT=TRUE          - Build the XtreemTest client
-    BUILD_SERVER=FALSE         - Build the XtreemTest server
+    BUILD_CLIENT=TRUE          - Build Minetest client
+    BUILD_SERVER=FALSE         - Build Minetest server
     BUILD_UNITTESTS=TRUE       - Build unittest sources
     BUILD_BENCHMARKS=FALSE     - Build benchmark sources
     CMAKE_BUILD_TYPE=Release   - Type of build (Release vs. Debug)
@@ -308,17 +320,25 @@ Library specific options:
     ZSTD_INCLUDE_DIR                - Directory that contains zstd.h
     ZSTD_LIBRARY                    - Path to libzstd.a/libzstd.so/ztd.lib
 
-### Building on Windows with MSYS2
+### Compiling on Windows using MSVC
 
 ### Requirements
 
-- [MSYS2](https://visualstudio.microsoft.com)
+- [Visual Studio 2015 or newer](https://visualstudio.microsoft.com)
 - [CMake](https://cmake.org/download/)
+- [vcpkg](https://github.com/Microsoft/vcpkg)
+- [Git](https://git-scm.com/downloads)
 
-### Installing the dependencies
-Enter the MSYS2 MinGW-W64 CLI and use *pacman* to install the required libraries, as well as mingw32-make and gcc.
+### Compiling and installing the dependencies
 
-- **Don't forget about IrrlichtMt.** The easiest way is to clone it to `lib/irrlichtmt`.
+It is highly recommended to use vcpkg as package manager.
+
+After you successfully built vcpkg you can easily install the required libraries:
+```powershell
+vcpkg install zlib zstd curl[winssl] openal-soft libvorbis libogg libjpeg-turbo sqlite3 freetype luajit gmp jsoncpp opengl-registry --triplet x64-windows
+```
+
+- **Don't forget about IrrlichtMt.** The easiest way is to clone it to `lib/irrlichtmt` as described in the Linux section.
 - `curl` is optional, but required to read the serverlist, `curl[winssl]` is required to use the content store.
 - `openal-soft`, `libvorbis` and `libogg` are optional, but required to use sound.
 - `luajit` is optional, it replaces the integrated Lua interpreter with a faster just-in-time interpreter.
@@ -326,10 +346,35 @@ Enter the MSYS2 MinGW-W64 CLI and use *pacman* to install the required libraries
 
 There are other optional libraries, but they are not tested if they can build and link correctly.
 
-### Build XtreemTest
-Start up the CMake GUI and select the root XtreemTest directory and press *Configure*, select MinGW Makefiles,
-once it's done configuring click *Generate* and once that's finished go into the root directory and run mingw32-make -j[NUMBER_OF_PROCESSORS]
-(replace [NUMBER_OF_PROCESSORS] with the number of processor cores you have)
+Use `--triplet` to specify the target triplet, e.g. `x64-windows` or `x86-windows`.
+
+### Compile Minetest
+
+#### a) Using the vcpkg toolchain and CMake GUI
+1. Start up the CMake GUI
+2. Select **Browse Source...** and select DIR/minetest
+3. Select **Browse Build...** and select DIR/minetest-build
+4. Select **Configure**
+5. Choose the right visual Studio version and target platform. It has to match the version of the installed dependencies
+6. Choose **Specify toolchain file for cross-compiling**
+7. Click **Next**
+8. Select the vcpkg toolchain file e.g. `D:/vcpkg/scripts/buildsystems/vcpkg.cmake`
+9. Click Finish
+10. Wait until cmake have generated the cash file
+11. If there are any errors, solve them and hit **Configure**
+12. Click **Generate**
+13. Click **Open Project**
+14. Compile Minetest inside Visual studio.
+
+#### b) Using the vcpkg toolchain and the commandline
+
+Run the following script in PowerShell:
+
+```powershell
+cmake . -G"Visual Studio 15 2017 Win64" -DCMAKE_TOOLCHAIN_FILE=D:/vcpkg/scripts/buildsystems/vcpkg.cmake -DCMAKE_BUILD_TYPE=Release -DENABLE_GETTEXT=OFF -DENABLE_CURSES=OFF
+cmake --build . --config Release
+```
+Make sure that the right compiler is selected and the path to the vcpkg toolchain is correct.
 
 ### Windows Installer using WiX Toolset
 
@@ -361,8 +406,14 @@ brew install cmake freetype gettext gmp hiredis jpeg jsoncpp leveldb libogg libp
 Download source (this is the URL to the latest of source repository, which might not work at all times) using Git:
 
 ```bash
-git clone --depth 1 https://github.com/MCLx86/xtreemtest.git
-cd xtreemtest
+git clone --depth 1 https://github.com/minetest/minetest.git
+cd minetest
+```
+
+Download minetest_game (otherwise only the "Development Test" game is available) using Git:
+
+```
+git clone --depth 1 https://github.com/minetest/minetest_game.git games/minetest_game
 ```
 
 Download Minetest's fork of Irrlicht:
@@ -393,6 +444,32 @@ make install
 open ./build/macos/minetest.app
 ```
 
+Docker
+------
+We provide Minetest server Docker images using the GitLab mirror registry.
+
+Images are built on each commit and available using the following tag scheme:
+
+* `registry.gitlab.com/minetest/minetest/server:latest` (latest build)
+* `registry.gitlab.com/minetest/minetest/server:<branch/tag>` (current branch or current tag)
+* `registry.gitlab.com/minetest/minetest/server:<commit-id>` (current commit id)
+
+If you want to test it on a Docker server you can easily run:
+
+	sudo docker run registry.gitlab.com/minetest/minetest/server:<docker tag>
+
+If you want to use it in a production environment you should use volumes bound to the Docker host
+to persist data and modify the configuration:
+
+	sudo docker create -v /home/minetest/data/:/var/lib/minetest/ -v /home/minetest/conf/:/etc/minetest/ registry.gitlab.com/minetest/minetest/server:master
+
+Data will be written to `/home/minetest/data` on the host, and configuration will be read from `/home/minetest/conf/minetest.conf`.
+
+**Note:** If you don't understand the previous commands please read the official Docker documentation before use.
+
+You can also host your Minetest server inside a Kubernetes cluster. See our example implementation in [`misc/kubernetes.yml`](misc/kubernetes.yml).
+
+
 Version scheme
 --------------
 We use `major.minor.patch` since 5.0.0-dev. Prior to that we used `0.major.minor`.

builtin/mainmenu/dlg_contentstore.lua

@@ -39,7 +39,7 @@ local screenshot_downloaded = {}
 local search_string = ""
 local cur_page = 1
 local num_per_page = 5
-local filter_type = -1
+local filter_type = 1
 local filter_types_titles = {
 	fgettext("All packages"),
 	fgettext("Games"),
@@ -434,8 +434,6 @@ function install_dialog.get_formspec()
 end
 
 function install_dialog.handle_submit(this, fields)
-	store.filter_packages(search_string)
-	
 	if fields.cancel then
 		this:delete()
 		return true
@@ -715,13 +713,12 @@ function store.filter_packages(query)
 		for k = 1, #keywords do
 			local keyword = keywords[k]
 
-			if string.find(package.author:lower(), keyword, 1, true) then
+			if string.find(package.name:lower(), keyword, 1, true) or
+					string.find(package.title:lower(), keyword, 1, true) or
+					string.find(package.author:lower(), keyword, 1, true) or
+					string.find(package.short_description:lower(), keyword, 1, true) then
 				return true
 			end
-			
-			--if string.find(package.name:lower(), keyword, 1, true) or string.find(package.title:lower(), keyword, 1, true) or string.find(package.author:lower(), keyword, 1, true) or string.find(package.short_description:lower(), keyword, 1, true) then
-			--	return true
-			--end
 		end
 
 		return false
@@ -739,8 +736,6 @@ end
 function store.get_formspec(dlgdata)
 	store.update_paths()
 
-	
-
 	dlgdata.pagemax = math.max(math.ceil(#store.packages / num_per_page), 1)
 	if cur_page > dlgdata.pagemax then
 		cur_page = 1
@@ -904,15 +899,10 @@ function store.get_formspec(dlgdata)
 		formspec[#formspec + 1] = "container_end[]"
 	end
 
-	
-
 	return table.concat(formspec, "")
 end
 
 function store.handle_submit(this, fields)
-
-	
-
 	if fields.search or fields.key_enter_field == "search_string" then
 		search_string = fields.search_string:trim()
 		cur_page = 1
@@ -923,7 +913,7 @@ function store.handle_submit(this, fields)
 	if fields.clear then
 		search_string = ""
 		cur_page = 1
-		store.filter_packages(search_string)
+		store.filter_packages("")
 		return true
 	end
 

builtin/mainmenu/init.lua

@@ -15,13 +15,13 @@
 --with this program; if not, write to the Free Software Foundation, Inc.,
 --51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
-mt_color_grey  = "#AAAAFF"
+mt_color_grey  = "#AAAAAA"
 mt_color_blue  = "#6389FF"
 mt_color_lightblue  = "#99CCFF"
-mt_color_green = "#7264F3"
-mt_color_dark_green = "#25C1F1"
-mt_color_orange  = "#FF6600"
-mt_color_red = "#FF0000"
+mt_color_green = "#72FF63"
+mt_color_dark_green = "#25C191"
+mt_color_orange  = "#FF8800"
+mt_color_red = "#FF3300"
 
 local menupath = core.get_mainmenu_path()
 local basepath = core.get_builtin_path()
@@ -95,7 +95,7 @@ local function init_globals()
 	mm_game_theme.init()
 
 	-- Create main tabview
-	--[[local tv_main = tabview_create("maintab", {x = 12, y = 5.4}, {x = 0, y = 0})
+	local tv_main = tabview_create("maintab", {x = 12, y = 5.4}, {x = 0, y = 0})
 	-- note: size would be 15.5,7.1 in real coordinates mode
 
 	tv_main:set_autosave_tab(true)
@@ -123,11 +123,11 @@ local function init_globals()
 		if game == nil then
 			mm_game_theme.reset()
 		end
-	end]]
+	end
 
-	--ui.set_default("maintab")
+	ui.set_default("maintab")
 	check_new_version()
-	--tv_main:show()
+	tv_main:show()
 	ui.update()
 end
 

builtin/mainmenu/tab_about.lua

@@ -20,6 +20,7 @@
 local xtreemtest_developers = {
 "Migdyn (a.k.a. Mike) <xtreemsex@testing.cubesoftware.xyz> [XtreemTest founder]",
 "Looki2000",
+"Kacper Kostka <kacperks@cubesoftware.xyz>",
 }
 
 local core_developers = {
@@ -164,7 +165,7 @@ return {
 			"style[label_button;border=false]" ..
 			"button[0.1,3.4;5.3,0.5;label_button;" ..
 			core.formspec_escape(version.project .. " " .. version.string) .. "]" ..
-			"button[0.5,4.1;4.5,0.8;homepage;mcl.sovnat.info]" ..
+			"button[1.5,4.1;2.5,0.8;homepage;mcl.sovnat.info]" ..
 			"scroll_container[5.5,0.1;9.5,6.9;scroll_credits;vertical;" ..
 			tostring(scroll_height / 1000) .. "]" .. credit_fs ..
 			"scroll_container_end[]"..

misc/Info.plist

@@ -5,15 +5,15 @@
 	<key>CFBundleDevelopmentRegion</key>
 	<string>English</string>
 	<key>CFBundleExecutable</key>
-	<string>xtreemtest</string>
+	<string>minetest</string>
 	<key>CFBundleIconFile</key>
-	<string>xtreemtest-icon.icns</string>
+	<string>minetest-icon.icns</string>
 	<key>CFBundleName</key>
-	<string>XtreemTest</string>
+	<string>Minetest</string>
 	<key>CFBundleDisplayName</key>
-	<string>XtreemTest</string>
+	<string>Minetest</string>
 	<key>CFBundleIdentifier</key>
-	<string>info.sovnat.xtreemtest</string>
+	<string>net.minetest.minetest</string>
 	<key>NSHighResolutionCapable</key>
 	<false/>
 </dict>

misc/info.sovnat.xtreemtest.desktop

@@ -1,12 +0,0 @@
-[Desktop Entry]
-Name=XtreemTest
-GenericName=XtreemTest
-Comment=Multiplayer infinite-world block sandbox
-Exec=xtreemtest
-Icon=xtreemtest
-Terminal=false
-PrefersNonDefaultGPU=true
-Type=Application
-Categories=Game;Simulation;
-StartupNotify=false
-Keywords=sandbox;world;mining;crafting;blocks;nodes;multiplayer;roleplaying;

misc/net.minetest.minetest.desktop

@@ -0,0 +1,18 @@
+[Desktop Entry]
+Name=Minetest
+GenericName=Minetest
+Comment=Multiplayer infinite-world block sandbox
+Comment[de]=Mehrspieler-Sandkastenspiel mit unendlichen Blockwelten
+Comment[es]=Juego sandbox multijugador con mundos infinitos
+Comment[fr]=Jeu multijoueurs de type bac à sable avec des mondes infinis
+Comment[ja]=マルチプレイに対応した、無限の世界のブロック型サンドボックスゲームです
+Comment[ru]=Игра-песочница с безграничным миром, состоящим из блоков
+Comment[tr]=Tek-Çok oyuncuyla küplerden sonsuz dünyalar inşa et
+Exec=minetest
+Icon=minetest
+Terminal=false
+PrefersNonDefaultGPU=true
+Type=Application
+Categories=Game;Simulation;
+StartupNotify=false
+Keywords=sandbox;world;mining;crafting;blocks;nodes;multiplayer;roleplaying;

misc/winresource.rc

@@ -16,11 +16,11 @@
 #endif
 
 #ifdef __MINGW32__
-CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "xtreemtest.exe.manifest"
+CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "minetest.exe.manifest"
 #endif
 
 LANGUAGE 0, SUBLANG_NEUTRAL
-130        ICON         "xtreemtest-icon.ico"
+130        ICON         "minetest-icon.ico"
 
 /////////////////////////////////////////////////////////////////////////////
 //
@@ -49,8 +49,9 @@ BEGIN
         VALUE "FileDescription", PROJECT_NAME_C " engine"
         VALUE "FileVersion", VERSION_STRING
         VALUE "InternalName", PROJECT_NAME
-        VALUE "LegalCopyright", "(c) 2011-2022 celeron55"
-        VALUE "OriginalFilename", "xtreemtest.exe"
+        VALUE "LegalCopyright", "(c) 2011-2015 celeron55"
+        VALUE "LegalTrademarks", """Minetest"" is the property of the Minetest community, don't use it without permission!"
+        VALUE "OriginalFilename", "minetest.exe"
         VALUE "PrivateBuild", VERSION_EXTRA
         VALUE "ProductName", PROJECT_NAME_C
         VALUE "ProductVersion", PRODUCT_VERSION_STRING