diff --git a/.gitignore b/.gitignore index 9489d6f3f..c0c98c324 100644 --- a/.gitignore +++ b/.gitignore @@ -35,6 +35,7 @@ gtags.files /bin/ /games/* !/games/minimal/ +!/games/minetest/ /cache /textures/* !/textures/base/ diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 000000000..f697e8fe7 --- /dev/null +++ b/.gitmodules @@ -0,0 +1,3 @@ +[submodule "games/minetest"] + path = games/minetest + url = https://codeberg.org/minenux/minetest-game-minetest.git diff --git a/README.txt b/README.txt index 646385335..49740b01d 100644 --- a/README.txt +++ b/README.txt @@ -1,17 +1,21 @@ -Minetest +Minetest5 ======== An InfiniMiner/Minecraft inspired game. +this source is minetest modified up to 4.0.18 with namespace execution for distros integration with OS's +also features the client identification patch to property get rid of cheaters. Copyright (c) 2010-2017 Perttu Ahola and contributors (see source file comments and the version control log) -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 project too: - https://github.com/minetest/minetest_game/ -See the README.txt in it. +In case you downloaded the source code +-------------------------------------- + +If you downloaded the **Minetest4 Engine** source code from git, in which this file is +contained, you probably want to download the Minetest4 Game at https://codeberg.org/minenux/minetest-game-minetest/src/branch/stable-4.0 +project too. See its README.md information. Those sources are a little modification of original Minetest. + +For Minetest5 series of same engine please use the respective branch. Further documentation ---------------------- @@ -22,10 +26,19 @@ Further documentation - Github: https://github.com/minetest/minetest/ - doc/ directory of source distribution -This game is not finished --------------------------- -- Don't expect it to work as well as a finished game will. -- Please report any bugs. When doing that, debug.txt is useful. +Generals of game +---------------- + +This is **an engine that can acts as server and client**, it has **two main components**: + +1. the **games** (that contains the mods and definition of how to play) and +2. the **world** (that contains the creeated and playable data). + +Paths places of those are in the [Paths](#paths) sections of this file. + +Players used the client role of the program, that joins to a server that can be the same invoked +or a remote server, currently many phone clients (apps like minetest that stolen its name) +just used those remote servers to play. Default controls ----------------- @@ -76,7 +89,7 @@ $bin - Compiled binaries $share - Distributed read-only data $user - User-created modifiable data -Windows .zip / RUN_IN_PLACE source: +Other's OS: .zip / RUN_IN_PLACE source: $bin = bin $share = . $user = . @@ -104,7 +117,7 @@ Configuration file: - A specific file can be specified on the command line: --config - A run-in-place build will look for the configuration file in - $location_of_exe/../minetest.conf and also $location_of_exe/../../minetest.conf + $location_of_bin/../minetest.conf and also $location_of_bin/../../minetest.conf Command-line options: --------------------- @@ -128,23 +141,27 @@ For Fedora users: $ sudo dnf install git 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/minetest/minetest.git -$ cd minetest + + $ git clone --recursive https://codeberg.org/minenux/minetest-engine.git minetest + $ cd minetest Download minetest_game (otherwise only the "Minimal development test" game is available) using git: -$ git clone --depth 1 https://github.com/minetest/minetest_game.git games/minetest_game + + $ git submodule init && git submodule update --recursive Download source, without using git: -$ wget https://github.com/minetest/minetest/archive/master.tar.gz -$ tar xf master.tar.gz -$ cd minetest-master + + $ wget https://codeberg.org/minenux/minetest-engine/archive/stable-4.0.tar.gz + $ tar xf stable-4.0.tar.gz + $ cd stable-4.0 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 .. + + $ cd games/ + $ wget https://codeberg.org/minenux/minetest-game-minetest/archive/stable-4.0.tar.gz + $ tar xf stable-4.0.tar.gz + $ mv minetest-game-minetest_stable-4.0 minetest + $ cd .. Build a version that runs directly from the source directory: $ cmake . -DRUN_IN_PLACE=TRUE diff --git a/games/minetest b/games/minetest new file mode 160000 index 000000000..0e0ea932e --- /dev/null +++ b/games/minetest @@ -0,0 +1 @@ +Subproject commit 0e0ea932efc47ec4658b601445b7520e410ec727 diff --git a/src/defaultsettings.cpp b/src/defaultsettings.cpp index 05e57359d..b8685ded3 100644 --- a/src/defaultsettings.cpp +++ b/src/defaultsettings.cpp @@ -269,7 +269,7 @@ void set_default_settings(Settings *settings) settings->setDefault("max_simultaneous_block_sends_server_total", "40"); settings->setDefault("time_send_interval", "5"); - settings->setDefault("default_game", PROJECT_NAME); + settings->setDefault("default_game", PROJECT_NAME);// use minetest as game name not mientest4 settings->setDefault("motd", "minetest 4 server"); settings->setDefault("max_users", "32"); settings->setDefault("creative_mode", "false");