Wuzzy
/
BlockColor-Engine
1
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Not Minetest, MultiCraft! 

Change Minetest on MultiCraft. =)
This commit is contained in:
Maksim Gamarnik 2016-02-12 05:52:43 +02:00
parent 4a1647fcf4
commit 9abdf23879
23 changed files with 58 additions and 87 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
CMakeLists.txt
View File

@ -6,8 +6,8 @@ if(${CMAKE_VERSION} STREQUAL "2.8.2")
endif()
# This can be read from ${PROJECT_NAME} after project() is called
project(minetest)
set(PROJECT_NAME_CAPITALIZED "Minetest")
project(MultiCraft)
set(PROJECT_NAME_CAPITALIZED "MultiCraft")
# Also remember to set PROTOCOL_VERSION in network/networkprotocol.h when releasing
@ -168,14 +168,14 @@ install(FILES "doc/world_format.txt" DESTINATION "${DOCDIR}")
install(FILES "multicraft.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/minetest.desktop" DESTINATION "${XDG_APPS_DIR}")
install(FILES "misc/minetest.appdata.xml" DESTINATION "${APPDATADIR}")
install(FILES "misc/minetest.svg" DESTINATION "${ICONDIR}/hicolor/scalable/apps")
install(FILES "doc/MultiCraft.6" "doc/MultiCraftServer.6" DESTINATION "${MANDIR}/man6")
install(FILES "misc/MultiCraft.desktop" DESTINATION "${XDG_APPS_DIR}")
install(FILES "misc/MultiCraft.appdata.xml" DESTINATION "${APPDATADIR}")
install(FILES "misc/MultiCraft.svg" DESTINATION "${ICONDIR}/hicolor/scalable/apps")
endif()
if(APPLE)
install(FILES "misc/minetest-icon.icns" DESTINATION "${SHAREDIR}")
install(FILES "misc/MultiCraft-icon.icns" DESTINATION "${SHAREDIR}")
install(FILES "misc/Info.plist" DESTINATION "${BUNDLE_PATH}/Contents")
endif()

6
build/android/Makefile
View File

@ -21,7 +21,7 @@ TARGET_HOST2 = arm-linux
TARGET_ABI = armeabi-v7a-hard
TARGET_LIBDIR = armeabi-v7a
TARGET_TOOLCHAIN = arm-linux-androideabi-
TARGET_CFLAGS_ADDON = -D_NDK_MATH_NO_SOFTFP=1 -mfloat-abi=hard -Ofast -march=armv7-a
TARGET_CFLAGS_ADDON = -D_NDK_MATH_NO_SOFTFP=1 -mfloat-abi=hard -O3 -march=armv7-a
TARGET_CXXFLAGS_ADDON = $(TARGET_CFLAGS_ADDON)
TARGET_LDFLAGS_ADDON = -Wl,--no-warn-mismatch -lm_hard
TARGET_ARCH = armv7
@ -38,7 +38,7 @@ HAVE_LEVELDB = 0
# TARGET_ABI = arm64-v8a
# TARGET_LIBDIR = arm64-v8a
# TARGET_TOOLCHAIN = aarch64-linux-android-
# TARGET_CFLAGS_ADDON = -Ofast
# TARGET_CFLAGS_ADDON = -O3
# TARGET_CXXFLAGS_ADDON = $(TARGET_CFLAGS_ADDON)
# TARGET_ARCH = arm64
# CROSS_PREFIX = aarch64-linux-android-
@ -54,7 +54,7 @@ HAVE_LEVELDB = 0
# TARGET_ABI = x86
# TARGET_LIBDIR = x86
# TARGET_TOOLCHAIN = x86-
# TARGET_CFLAGS_ADDON = -Ofast
# TARGET_CFLAGS_ADDON = -O3
# TARGET_CXXFLAGS_ADDON = $(TARGET_CFLAGS_ADDON)
# TARGET_ARCH = x86
# CROSS_PREFIX = i686-linux-android-

5
build/android/jni/Android.mk
View File

@ -60,7 +60,7 @@ LOCAL_SRC_FILES := deps/openssl/libcrypto.a
include $(PREBUILT_STATIC_LIBRARY)
include $(CLEAR_VARS)
LOCAL_MODULE := minetest
LOCAL_MODULE := multicraft
LOCAL_CPP_FEATURES += exceptions
@ -80,7 +80,8 @@ LOCAL_CFLAGS := -D_IRR_ANDROID_PLATFORM_ \
ifndef NDEBUG
LOCAL_CFLAGS += -g -D_DEBUG -O0 -fno-omit-frame-pointer
else
LOCAL_CFLAGS += -O3
LOCAL_CFLAGS += -D_NDK_MATH_NO_SOFTFP=1 -mfloat-abi=hard -O3 -march=armv7-a
# ToDo - disable for x86?
endif
ifdef GPROF

2
build/android/jni/Application.mk
View File

@ -1,7 +1,7 @@
# NDK_TOOLCHAIN_VERSION := clang3.3
APP_PLATFORM := android-16
APP_MODULES := minetest
APP_MODULES := multicraft
APP_STL := gnustl_static
APP_CPPFLAGS += -fexceptions

4
builtin/mainmenu/tab_credits.lua
View File

@ -22,8 +22,8 @@ tab_credits = {
caption = fgettext("Credits"),
cbf_formspec = function (tabview, name, tabdata)
local logofile = defaulttexturedir .. "smoke_puff.png"
return "label[0.5,3.2;Minetest " .. core.get_version() .. "]" ..
"label[0.5,3.5;http://minetest.net]" ..
return "label[0.5,3.2;MultiCraft " .. core.get_version() .. "]" ..
"label[0.5,3.5;Open Sourse Project]" ..
"image[0.5,1;" .. core.formspec_escape(logofile) .. "]" ..
"tablecolumns[color;text]" ..
"tableoptions[background=#00000000;highlight=#00000000;border=false]" ..

2
cmake/Modules/FindGettextLib.cmake
View File

@ -68,7 +68,7 @@ if(GETTEXT_FOUND)
set(GETTEXT_MO_BUILD_PATH ${CMAKE_BINARY_DIR}/locale/<locale>/LC_MESSAGES)
set(GETTEXT_MO_DEST_PATH ${LOCALEDIR}/<locale>/LC_MESSAGES)
file(GLOB GETTEXT_AVAILABLE_LOCALES RELATIVE ${GETTEXT_PO_PATH} "${GETTEXT_PO_PATH}/*")
list(REMOVE_ITEM GETTEXT_AVAILABLE_LOCALES minetest.pot)
list(REMOVE_ITEM GETTEXT_AVAILABLE_LOCALES MultiCraft.pot)
list(REMOVE_ITEM GETTEXT_AVAILABLE_LOCALES timestamp)
macro(SET_MO_PATHS _buildvar _destvar _locale)
string(REPLACE "<locale>" ${_locale} ${_buildvar} ${GETTEXT_MO_BUILD_PATH})

0
doc/minetest.6 → doc/MultiCraft.6
View File

0
doc/minetestserver.6 → doc/MultiCraftServer.6
View File

6
misc/Info.plist
View File

@ -5,10 +5,10 @@
<key>CFBundleDevelopmentRegion</key>
<string>English</string>
<key>CFBundleExecutable</key>
<string>minetest</string>
<string>MultiCraft</string>
<key>CFBundleIconFile</key>
<string>minetest-icon.icns</string>
<string>MultiCraft-icon.icns</string>
<key>CFBundleIdentifier</key>
<string>net.minetest.minetest</string>
<string>net.MultiCraft.Official</string>
</dict>
</plist>

2
misc/minetest.appdata.xml → misc/MultiCraft.appdata.xml
View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<application>
<id type="desktop">minetest.desktop</id>
<id type="desktop">MultiCraft.desktop</id>
<metadata_license>CC0-1.0</metadata_license>
<project_license>LGPL-3.0+ and CC-BY-SA-3.0 and MIT and Apache-2.0</project_license>
<name>MultiCraft</name>

0
misc/minetest.desktop → misc/MultiCraft.desktop
View File

2
misc/minetest.svg → misc/MultiCraft.svg
View File

@ -14,7 +14,7 @@
id="svg2856"
version="1.1"
inkscape:version="0.47 r22583"
sodipodi:docname="minetest.svg"
sodipodi:docname="MultiCraft.svg"
inkscape:export-filename="/home/erlehmann/pics/icons/minetest/minetest-icon-24x24.png"
inkscape:export-xdpi="45"
inkscape:export-ydpi="45">
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 8.1 KiB

After

Width:  |  Height:  |  Size: 8.1 KiB

4
misc/winresource.rc
View File

@ -42,8 +42,8 @@ BEGIN
VALUE "FileVersion", VERSION_STRING
VALUE "InternalName", PROJECT_NAME
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 "LegalTrademarks", """MultiCraft"" is the Minetest-based game, property of the MultiCraft community, don't use it without permission!"
VALUE "OriginalFilename", "MultiCraft.exe"
VALUE "PrivateBuild", VERSION_EXTRA
VALUE "ProductName", PROJECT_NAME_C
VALUE "ProductVersion", PRODUCT_VERSION_STRING

13
multicraft.conf
View File

@ -1 +1,12 @@
mainmenu_last_selected_world = 1
menu_last_game = default
name =
selected_world_path = /home/maksim/MultiCraft/bin/../worlds/World 1
server_dedicated = false
creative_mode = false
enable_damage = true
fixed_map_seed =
mainmenu_last_selected_world = 5
mg_name = v6
server_announce = false
wieldview_node_tiles = false
wieldview_update_time = 2

0
po/minetest.pot → po/MultiCraft.pot
View File

2
src/CMakeLists.txt
View File

@ -1,6 +1,6 @@
cmake_minimum_required(VERSION 2.6)
project(minetest)
project(MultiCraft)
INCLUDE(CheckIncludeFiles)

1
src/defaultsettings.cpp
View File

@ -329,6 +329,7 @@ void set_default_settings(Settings *settings)
settings->setDefault("high_precision_fpu", "true");
settings->setDefault("language", "");
settings->setDefault("mainmenu_last_selected_world", "1");
#ifdef __ANDROID__
settings->setDefault("screenW", "0");

62
src/game.cpp
View File

@ -1071,11 +1071,9 @@ static inline void create_formspec_menu(GUIFormSpecMenu **cur_formspec,
}
#ifdef __ANDROID__
# define SIZE_TAG "size[11,5.5]"
# define PAUSE_MENU_SIZE_TAG "size[5,3.5]"
#define SIZE_TAG "size[11,5.5]"
#else
# define SIZE_TAG "size[11,5.5,true]" // Fixed size on desktop
# define PAUSE_MENU_SIZE_TAG "size[11,5.5,true]" // Fixed size on desktop
#define SIZE_TAG "size[11,5.5,true]" // Fixed size on desktop
#endif
static void show_chat_menu(GUIFormSpecMenu **cur_formspec,
@ -1126,41 +1124,13 @@ static void show_pause_menu(GUIFormSpecMenu **cur_formspec,
IWritableTextureSource *tsrc, IrrlichtDevice *device,
bool singleplayermode)
{
#ifdef __ANDROID__
// std::string control_text = wide_to_narrow(wstrgettext("Default Controls:\n"
// "No menu visible:\n"
// "- single tap: button activate\n"
// "- double tap: place/use\n"
// "- slide finger: look around\n"
// "Menu/Inventory visible:\n"
// "- double tap (outside):\n"
// " -->close\n"
// "- touch stack, touch slot:\n"
// " --> move stack\n"
// "- touch&drag, tap 2nd finger\n"
// " --> place single item to slot\n"
// ));
#else
std::string control_text = strgettext("Default Controls:\n"
"- WASD: move\n"
"- Space: jump/climb\n"
"- Shift: sneak/go down\n"
"- Q: drop item\n"
"- I: inventory\n"
"- Mouse: turn/look\n"
"- Mouse left: dig/punch\n"
"- Mouse right: place/use\n"
"- Mouse wheel: select item\n"
"- T: chat\n"
);
#endif
float ypos = singleplayermode ? 0.5 : 0.1;
std::ostringstream os;
os << FORMSPEC_VERSION_STRING << PAUSE_MENU_SIZE_TAG
<< "button_exit[1," << (ypos++) << ";3,0.5;btn_continue;"
<< strgettext("Continue") << "]";
os << FORMSPEC_VERSION_STRING << SIZE_TAG
<< "bgcolor[#00000060;true]"
<< "button_exit[4," << (ypos++) << ";3,0.5;btn_continue;"
<< strgettext("Continue") << "]";
if (!singleplayermode) {
os << "button_exit[1," << (ypos++) << ";3,0.5;btn_change_password;"
@ -1168,21 +1138,15 @@ static void show_pause_menu(GUIFormSpecMenu **cur_formspec,
}
#ifndef __ANDROID__
os << "button_exit[1," << (ypos++) << ";3,0.5;btn_sound;"
os << "button_exit[4," << (ypos++) << ";3,0.5;btn_sound;"
<< strgettext("Sound Volume") << "]";
os << "button_exit[1," << (ypos++) << ";3,0.5;btn_key_config;"
os << "button_exit[4," << (ypos++) << ";3,0.5;btn_key_config;"
<< strgettext("Change Keys") << "]";
#endif
os << "button_exit[1," << (ypos++) << ";3,0.5;btn_exit_menu;"
os << "button_exit[4," << (ypos++) << ";3,0.5;btn_exit_menu;"
<< strgettext("Exit to Menu") << "]";
os << "button_exit[1," << (ypos++) << ";3,0.5;btn_exit_os;"
os << "button_exit[4," << (ypos++) << ";3,0.5;btn_exit_os;"
<< strgettext("Close game") << "]"
#ifndef __ANDROID__
<< "textarea[7.5,0.25;3.9,6.25;;" << control_text << ";]"
<< "textarea[0.4,0.25;3.5,6;;" << PROJECT_NAME_C "\n"
<< g_build_info << "\n"
<< "path_user = " << wrap_rows(porting::path_user, 20)
#endif
<< "\n;]";
/* Create menu */
@ -3700,17 +3664,11 @@ void Game::handlePointingAtNode(GameRunData *runData,
runData->noplace_delay_timer = 1.0;
}
#ifdef HAVE_TOUCHSCREENGUI
bool place = (input->getRightClicked() || input->getLeftReleased() ||
runData->repeat_rightclick_timer >= m_repeat_right_click_time) &&
client->checkPrivilege("interact");
place &= !digging;
place &= runData->noplace_delay_timer <= 0.0;
#else
bool place = (input->getRightClicked() ||
runData->repeat_rightclick_timer >= m_repeat_right_click_time) &&
client->checkPrivilege("interact");
#endif
if (place) {
runData->repeat_rightclick_timer = 0;

2
src/main.cpp
View File

@ -849,7 +849,7 @@ static bool run_dedicated_server(const GameParams &game_params, const Settings &
if (!name_ok) {
if (admin_nick.empty()) {
errorstream << "No name given for admin. "
<< "Please check your minetest.conf that it "
<< "Please check your MultiCraft.conf that it "
<< "contains a 'name = ' to your main admin account."
<< std::endl;
} else {

2
src/porting_android.cpp
View File

@ -147,7 +147,7 @@ void initAndroid()
/* in the start-up code */
__android_log_print(ANDROID_LOG_ERROR, PROJECT_NAME_C,
"Initializing GPROF profiler");
monstartup("libminetest.so");
monstartup("libmulticraft.so");
#endif
}

4
src/subgame.cpp
View File

@ -188,7 +188,7 @@ std::vector<SubgameSpec> getAvailableGames()
return specs;
}
#define LEGACY_GAMEID "minetest"
#define LEGACY_GAMEID "default"
bool getWorldExists(const std::string &world_path)
{
@ -213,7 +213,7 @@ std::string getWorldGameId(const std::string &world_path, bool can_be_legacy)
return "";
// The "mesetint" gameid has been discarded
if(conf.get("gameid") == "mesetint")
return "minetest";
return "default";
return conf.get("gameid");
}

4
util/bump_version.sh
View File

@ -18,7 +18,7 @@ prompt_for_number() {
##################################
# Switch to top minetest directory
# Switch to top MultiCraft directory
##################################
cd ${0%/*}/..
@ -39,7 +39,7 @@ VERSION_MINOR=$(grep -E '^set\(VERSION_MINOR [0-9]+\)$' CMakeLists.txt | tr -dC
VERSION_PATCH=$(grep -E '^set\(VERSION_PATCH [0-9]+\)$' CMakeLists.txt | tr -dC 0-9)
ANDROID_VERSION_CODE=$(grep -E '^ANDROID_VERSION_CODE = [0-9]+$' build/android/Makefile | tr -dC 0-9)
echo "Current Minetest version: $VERSION_MAJOR.$VERSION_MINOR.$VERSION_PATCH"
echo "Current MultiCraft version: $VERSION_MAJOR.$VERSION_MINOR.$VERSION_PATCH"
echo "Current Android version code: $ANDROID_VERSION_CODE"

8
util/updatepo.sh
View File

@ -1,6 +1,6 @@
#!/bin/sh
# Update/create minetest po files
# Update/create MultiCraft po files
# an auxiliary function to abort processing with an optional error
# message
@ -47,8 +47,8 @@ cd ..
# First thing first, update the .pot template. We place it in the po/
# directory at the top level. You a recent enough xgettext that supports
# --package-name
potfile=po/minetest.pot
xgettext --package-name=minetest \
potfile=po/MultiCraft.pot
xgettext --package-name=MultiCraft \
--sort-by-file \
--add-location=file \
--keyword=N_ \
@ -64,7 +64,7 @@ xgettext --package-name=minetest \
# Now iterate on all languages and create the po file if missing, or update it
# if it exists already
for lang in $langs ; do # note the missing quotes around $langs
pofile=po/$lang/minetest.po
pofile=po/$lang/MultiCraft.po
if test -e $pofile; then
echo "[$lang]: updating strings"
msgmerge --update --sort-by-file $pofile $potfile