diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index 51a7eae63..dab491ad8 100644 --- a/.github/CONTRIBUTING.md +++ b/.github/CONTRIBUTING.md @@ -37,7 +37,7 @@ Contributions are welcome! Here's how you can help: [Lua](http://dev.minetest.net/Lua_code_style_guidelines) code style guidelines. - Check your code works as expected and document any changes to the Lua API. - To avoid conflicting changes between contributions, do not do the following manually. They will be done before each release. - - Run `updatepo.sh` or update `minetest.po{,t}` even if your code adds new translatable strings. + - Run `updatepo.sh` or update `luanti.po{,t}` even if your code adds new translatable strings. - Update `minetest.conf.example` and `settings_translation_file.cpp` even if your code adds new core settings. 4. Commit & [push](https://help.github.com/articles/pushing-to-a-remote/) your changes to a new branch (not `master`, one change per branch) diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml index 34db1a662..ab68274b4 100644 --- a/.github/workflows/android.yml +++ b/.github/workflows/android.yml @@ -50,25 +50,25 @@ jobs: - name: Save AAB artifact uses: actions/upload-artifact@v4 with: - name: Minetest-release.aab + name: Luanti-release.aab path: android/app/build/outputs/bundle/release/app-release.aab - name: Save armeabi artifact uses: actions/upload-artifact@v4 with: - name: Minetest-armeabi-v7a.apk + name: Luanti-armeabi-v7a.apk path: android/app/build/outputs/apk/release/app-armeabi-v7a-release-unsigned.apk - name: Save arm64 artifact uses: actions/upload-artifact@v4 with: - name: Minetest-arm64-v8a.apk + name: Luanti-arm64-v8a.apk path: android/app/build/outputs/apk/release/app-arm64-v8a-release-unsigned.apk - name: Save x86 artifact uses: actions/upload-artifact@v4 with: - name: Minetest-x86.apk + name: Luanti-x86.apk path: android/app/build/outputs/apk/release/app-x86-release-unsigned.apk - name: Save x86_64 artifact uses: actions/upload-artifact@v4 with: - name: Minetest-x86_64.apk + name: Luanti-x86_64.apk path: android/app/build/outputs/apk/release/app-x86_64-release-unsigned.apk diff --git a/.github/workflows/docker_image.yml b/.github/workflows/docker_image.yml index 1a2805e22..0ea0ad6ca 100644 --- a/.github/workflows/docker_image.yml +++ b/.github/workflows/docker_image.yml @@ -72,8 +72,8 @@ jobs: with: images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }} labels: | - org.opencontainers.image.title=Minetest - org.opencontainers.image.vendor=Minetest + org.opencontainers.image.title=Luanti + org.opencontainers.image.vendor=Luanti org.opencontainers.image.licenses=LGPL-2.1-only # Build and push Docker image @@ -94,5 +94,5 @@ jobs: - name: Test Docker Image run: | - docker run --rm $(cut -d, -f1 <<<"$DOCKER_METADATA_OUTPUT_TAGS") minetestserver --version + docker run --rm $(cut -d, -f1 <<<"$DOCKER_METADATA_OUTPUT_TAGS") luantiserver --version shell: bash diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index a2ec10a0a..7b478693e 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -54,7 +54,7 @@ jobs: - name: Test run: | - ./bin/minetest --run-unittests + ./bin/luanti --run-unittests # Current gcc version gcc_14: @@ -78,7 +78,7 @@ jobs: mkdir nowrite chmod a-w nowrite cd nowrite - ../bin/minetest --run-unittests + ../bin/luanti --run-unittests # Older clang version (should be close to our minimum supported version) clang_7: @@ -100,7 +100,7 @@ jobs: - name: Unittest run: | - ./bin/minetest --run-unittests + ./bin/luanti --run-unittests # Do this here because we have ASan and error paths are sensitive to dangling pointers - name: Test error cases @@ -126,7 +126,7 @@ jobs: - name: Test run: | - ./bin/minetest --run-unittests + ./bin/luanti --run-unittests - name: Integration test + devtest run: | @@ -156,4 +156,4 @@ jobs: - name: Test run: | - ./bin/minetestserver --run-unittests + ./bin/luantiserver --run-unittests diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index 731d7d719..05315f06e 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -53,7 +53,7 @@ jobs: - name: Test run: | - ./build/macos/minetest.app/Contents/MacOS/minetest --run-unittests + ./build/macos/luanti.app/Contents/MacOS/luanti --run-unittests # Zipping the built .app preserves permissions on the contained files, # which the GitHub artifact pipeline would otherwise strip away. @@ -66,5 +66,5 @@ jobs: - uses: actions/upload-artifact@v4 with: - name: minetest-macos + name: luanti-macos path: ./build/macos/*.zip diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 4b937e80e..30d682ad8 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -56,8 +56,8 @@ jobs: run: | dest=$(mktemp -d) unzip -q -d "$dest" B/build/*.zip - cd "$dest"/minetest-*-win* - wine bin/minetest.exe --version + cd "$dest"/luanti-*-win* + wine bin/luanti.exe --version - uses: actions/upload-artifact@v4 with: @@ -103,7 +103,7 @@ jobs: vcpkgGitCommitId: ${{ env.VCPKG_VERSION }} vcpkgTriplet: ${{ matrix.config.vcpkg_triplet }} - - name: Minetest CMake + - name: CMake run: | cmake ${{matrix.config.generator}} ` -DCMAKE_TOOLCHAIN_FILE="${{ github.workspace }}\vcpkg\scripts\buildsystems\vcpkg.cmake" ` @@ -113,13 +113,13 @@ jobs: -DREQUIRE_LUAJIT=TRUE ` -DRUN_IN_PLACE=${{ contains(matrix.type, 'portable') }} . - - name: Build Minetest + - name: Build run: cmake --build . --config Release - name: Unittests # need this workaround for stdout to work run: | - $proc = start .\bin\Release\minetest.exe --run-unittests -NoNewWindow -Wait -PassThru + $proc = start .\bin\Release\luanti.exe --run-unittests -NoNewWindow -Wait -PassThru exit $proc.ExitCode continue-on-error: true # FIXME!! diff --git a/CMakeLists.txt b/CMakeLists.txt index a9a0ef000..df45fb9d8 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,8 +1,8 @@ cmake_minimum_required(VERSION 3.12) # This can be read from ${PROJECT_NAME} after project() is called -project(minetest) -set(PROJECT_NAME_CAPITALIZED "Minetest") +project(luanti) +set(PROJECT_NAME_CAPITALIZED "Luanti") set(CMAKE_CXX_STANDARD 17) set(CMAKE_CXX_STANDARD_REQUIRED TRUE) @@ -92,7 +92,7 @@ set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/Modules/") # Load default options for Android if(ANDROID) cmake_minimum_required(VERSION 3.20) - include(MinetestAndroidLibs) + include(AndroidLibs) endif() @@ -261,17 +261,17 @@ install(FILES "doc/world_format.md" DESTINATION "${DOCDIR}" COMPONENT "Docs") 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 "doc/luanti.6" "doc/luantiserver.6" DESTINATION "${MANDIR}/man6") install(FILES "misc/net.minetest.minetest.desktop" DESTINATION "${XDG_APPS_DIR}") install(FILES "misc/net.minetest.minetest.metainfo.xml" DESTINATION "${METAINFODIR}") - install(FILES "misc/minetest.svg" DESTINATION "${ICONDIR}/hicolor/scalable/apps") - install(FILES "misc/minetest-xorg-icon-128.png" + install(FILES "misc/luanti.svg" DESTINATION "${ICONDIR}/hicolor/scalable/apps") + install(FILES "misc/luanti-xorg-icon-128.png" DESTINATION "${ICONDIR}/hicolor/128x128/apps" - RENAME "minetest.png") + RENAME "luanti.png") endif() if(APPLE) - install(FILES "misc/minetest-icon.icns" DESTINATION "${SHAREDIR}") + install(FILES "misc/luanti-icon.icns" DESTINATION "${SHAREDIR}") install(FILES "misc/Info.plist" DESTINATION "${BUNDLE_PATH}/Contents") endif() @@ -307,7 +307,7 @@ include(CPackComponent) cpack_add_component(Docs DISPLAY_NAME "Documentation" - DESCRIPTION "Documentation about Minetest and Minetest modding" + DESCRIPTION "Documentation about ${PROJECT_NAME_CAPITALIZED} and ${PROJECT_NAME_CAPITALIZED} modding" ) if(WIN32) @@ -331,7 +331,7 @@ if(WIN32) set(CPACK_CREATE_DESKTOP_LINKS ${PROJECT_NAME}) set(CPACK_PACKAGING_INSTALL_PREFIX "/${PROJECT_NAME_CAPITALIZED}") - set(CPACK_WIX_PRODUCT_ICON "${CMAKE_CURRENT_SOURCE_DIR}/misc/minetest-icon.ico") + set(CPACK_WIX_PRODUCT_ICON "${CMAKE_CURRENT_SOURCE_DIR}/misc/luanti-icon.ico") # Supported languages can be found at # http://wixtoolset.org/documentation/manual/v3/wixui/wixui_localization.html #set(CPACK_WIX_CULTURES "ar-SA,bg-BG,ca-ES,hr-HR,cs-CZ,da-DK,nl-NL,en-US,et-EE,fi-FI,fr-FR,de-DE") diff --git a/Dockerfile b/Dockerfile index 39974a1c3..c9a9848c5 100644 --- a/Dockerfile +++ b/Dockerfile @@ -32,22 +32,22 @@ RUN git clone --recursive https://github.com/jupp0r/prometheus-cpp && \ FROM dev as builder -COPY .git /usr/src/minetest/.git -COPY CMakeLists.txt /usr/src/minetest/CMakeLists.txt -COPY README.md /usr/src/minetest/README.md -COPY minetest.conf.example /usr/src/minetest/minetest.conf.example -COPY builtin /usr/src/minetest/builtin -COPY cmake /usr/src/minetest/cmake -COPY doc /usr/src/minetest/doc -COPY fonts /usr/src/minetest/fonts -COPY lib /usr/src/minetest/lib -COPY misc /usr/src/minetest/misc -COPY po /usr/src/minetest/po -COPY src /usr/src/minetest/src -COPY irr /usr/src/minetest/irr -COPY textures /usr/src/minetest/textures +COPY .git /usr/src/luanti/.git +COPY CMakeLists.txt /usr/src/luanti/CMakeLists.txt +COPY README.md /usr/src/luanti/README.md +COPY minetest.conf.example /usr/src/luanti/minetest.conf.example +COPY builtin /usr/src/luanti/builtin +COPY cmake /usr/src/luanti/cmake +COPY doc /usr/src/luanti/doc +COPY fonts /usr/src/luanti/fonts +COPY lib /usr/src/luanti/lib +COPY misc /usr/src/luanti/misc +COPY po /usr/src/luanti/po +COPY src /usr/src/luanti/src +COPY irr /usr/src/luanti/irr +COPY textures /usr/src/luanti/textures -WORKDIR /usr/src/minetest +WORKDIR /usr/src/luanti RUN cmake -B build \ -DCMAKE_INSTALL_PREFIX=/usr/local \ -DCMAKE_BUILD_TYPE=Release \ @@ -68,9 +68,9 @@ RUN apk add --no-cache curl gmp libstdc++ libgcc libpq jsoncpp zstd-libs \ WORKDIR /var/lib/minetest -COPY --from=builder /usr/local/share/minetest /usr/local/share/minetest -COPY --from=builder /usr/local/bin/minetestserver /usr/local/bin/minetestserver -COPY --from=builder /usr/local/share/doc/minetest/minetest.conf.example /etc/minetest/minetest.conf +COPY --from=builder /usr/local/share/luanti /usr/local/share/luanti +COPY --from=builder /usr/local/bin/luantiserver /usr/local/bin/luantiserver +COPY --from=builder /usr/local/share/doc/luanti/minetest.conf.example /etc/minetest/minetest.conf COPY --from=builder /usr/local/lib/libspatialindex* /usr/local/lib/ COPY --from=builder /usr/local/lib/libluajit* /usr/local/lib/ USER minetest:minetest @@ -78,5 +78,5 @@ USER minetest:minetest EXPOSE 30000/udp 30000/tcp VOLUME /var/lib/minetest/ /etc/minetest/ -ENTRYPOINT ["/usr/local/bin/minetestserver"] +ENTRYPOINT ["/usr/local/bin/luantiserver"] CMD ["--config", "/etc/minetest/minetest.conf"] diff --git a/LICENSE.txt b/LICENSE.txt index 2308f8d16..7ac216a0d 100644 --- a/LICENSE.txt +++ b/LICENSE.txt @@ -1,8 +1,8 @@ -License of Minetest textures and sounds +License of Luanti textures and sounds --------------------------------------- -This applies to textures and sounds contained in the main Minetest +This applies to textures and sounds contained in the main Luanti distribution. Attribution-ShareAlike 3.0 Unported (CC BY-SA 3.0) @@ -29,7 +29,6 @@ ShadowNinja: textures/base/pack/smoke_puff.png paramat: - textures/base/pack/menu_header.png textures/base/pack/next_icon.png textures/base/pack/prev_icon.png textures/base/pack/clear.png @@ -40,9 +39,9 @@ rubenwardy, paramat: textures/base/pack/end_icon.png erle: - misc/minetest-icon-24x24.png - misc/minetest-icon.ico - misc/minetest.svg + misc/luanti-icon-24x24.png + misc/luanti-icon.ico + misc/luanti.svg textures/base/pack/logo.png JRottm: @@ -88,12 +87,16 @@ DS: grorp: textures/base/pack/exit_btn.png + textures/base/pack/menu_header.png + using the font "undefined medium" (https://undefined-medium.com/), + which is licensed under the SIL Open Font License, Version 1.1 -License of Minetest source code +License of Luanti source code ------------------------------- -Minetest -Copyright (C) 2010-2018 celeron55, Perttu Ahola +Luanti +Copyright (C) 2010-2024 celeron55, Perttu Ahola +and contributors (see source file comments and the version control log) This program is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by @@ -112,7 +115,7 @@ with this program; if not, write to the Free Software Foundation, Inc., Irrlicht --------------- -This program uses IrrlichtMt, Minetest's fork of +This program uses IrrlichtMt, Luanti's fork of the Irrlicht Engine. http://irrlicht.sourceforge.net/ The Irrlicht Engine License diff --git a/android/app/build.gradle b/android/app/build.gradle index cefc473af..eaf1e3571 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -95,7 +95,7 @@ task prepareAssets() { def moPath = "${assetsFolder}/locale/${poFile.parentFile.name}/LC_MESSAGES/" file(moPath).mkdirs() exec { - commandLine 'msgfmt', '-o', "${moPath}/minetest.mo", poFile + commandLine 'msgfmt', '-o', "${moPath}/luanti.mo", poFile } } @@ -103,7 +103,7 @@ task prepareAssets() { } task zipAssets(dependsOn: prepareAssets, type: Zip) { - archiveFileName = "Minetest.zip" + archiveFileName = "assets.zip" from assetsFolder destinationDirectory = file("src/main/assets") } @@ -113,7 +113,7 @@ preBuild.dependsOn zipAssets prepareAssets.dependsOn ':native:getDeps' clean { - delete new File("src/main/assets", "Minetest.zip") + delete new File("src/main/assets", "assets.zip") } dependencies { diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml index 9197b9131..2e900ec53 100644 --- a/android/app/src/main/AndroidManifest.xml +++ b/android/app/src/main/AndroidManifest.xml @@ -43,9 +43,6 @@ - - Minetest + Luanti Loading… General notification - Notifications from Minetest - Loading Minetest + Notifications from Luanti + Loading Luanti Less than 1 minute… Done No web browser found diff --git a/android/settings.gradle b/android/settings.gradle index b048fca7c..b9ac343a9 100644 --- a/android/settings.gradle +++ b/android/settings.gradle @@ -1,2 +1,2 @@ -rootProject.name = "Minetest" +rootProject.name = "Luanti" include ':app', ':native' diff --git a/builtin/mainmenu/content/dlg_contentdb.lua b/builtin/mainmenu/content/dlg_contentdb.lua index 8f232e490..7e17ed315 100644 --- a/builtin/mainmenu/content/dlg_contentdb.lua +++ b/builtin/mainmenu/content/dlg_contentdb.lua @@ -18,7 +18,7 @@ if not core.get_http_api then function create_contentdb_dlg() return messagebox("contentdb", - fgettext("ContentDB is not available when Minetest was compiled without cURL")) + fgettext("ContentDB is not available when Luanti was compiled without cURL")) end return end diff --git a/builtin/mainmenu/credits.json b/builtin/mainmenu/credits.json index f128d3695..1e35cc6b3 100644 --- a/builtin/mainmenu/credits.json +++ b/builtin/mainmenu/credits.json @@ -64,7 +64,7 @@ "superfloh247" ], "previous_contributors": [ - "Ælla Chiana Moskopp (erle) [Minetest logo]", + "Ælla Chiana Moskopp (erle) [Logo]", "red-001 ", "Giuseppe Bilotta", "HybridDog", diff --git a/builtin/mainmenu/tab_about.lua b/builtin/mainmenu/tab_about.lua index ab3edbddc..627ccb4ca 100644 --- a/builtin/mainmenu/tab_about.lua +++ b/builtin/mainmenu/tab_about.lua @@ -78,7 +78,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_url[1.5,4.1;2.5,0.8;homepage;minetest.net;https://www.minetest.net/]" .. + "button_url[1.5,4.1;2.5,0.8;homepage;luanti.org;https://www.luanti.org/]" .. "hypertext[5.5,0.25;9.75,6.6;credits;" .. minetest.formspec_escape(hypertext) .. "]" -- Render information diff --git a/builtin/mainmenu/tab_local.lua b/builtin/mainmenu/tab_local.lua index 8d807cc79..2789431b9 100644 --- a/builtin/mainmenu/tab_local.lua +++ b/builtin/mainmenu/tab_local.lua @@ -166,8 +166,8 @@ local function get_formspec(tabview, name, tabdata) local H = tabview.height local hypertext = "" .. - fgettext_ne("Minetest is a game-creation platform that allows you to play many different games.") .. "\n" .. - fgettext_ne("Minetest doesn't come with a game by default.") .. " " .. + fgettext_ne("Luanti is a game-creation platform that allows you to play many different games.") .. "\n" .. + fgettext_ne("Luanti doesn't come with a game by default.") .. " " .. fgettext_ne("You need to install a game before you can create a world.") local button_y = H * 2/3 - 0.6 diff --git a/cmake/Modules/MinetestAndroidLibs.cmake b/cmake/Modules/AndroidLibs.cmake similarity index 100% rename from cmake/Modules/MinetestAndroidLibs.cmake rename to cmake/Modules/AndroidLibs.cmake diff --git a/cmake/Modules/FindGettextLib.cmake b/cmake/Modules/FindGettextLib.cmake index 0052d6578..77e384646 100644 --- a/cmake/Modules/FindGettextLib.cmake +++ b/cmake/Modules/FindGettextLib.cmake @@ -41,7 +41,7 @@ if(GETTEXTLIB_FOUND) endif() set(GETTEXT_MO_DEST_PATH ${LOCALEDIR}//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 ${PROJECT_NAME}.pot) list(REMOVE_ITEM GETTEXT_AVAILABLE_LOCALES timestamp) macro(SET_MO_PATHS _buildvar _destvar _locale) string(REPLACE "" ${_locale} ${_buildvar} ${GETTEXT_MO_BUILD_PATH}) diff --git a/doc/minetest.6 b/doc/luanti.6 similarity index 83% rename from doc/minetest.6 rename to doc/luanti.6 index dcd38501f..0eb5b630e 100644 --- a/doc/minetest.6 +++ b/doc/luanti.6 @@ -1,26 +1,21 @@ -.TH minetest 6 "2 February 2019" "" "" +.TH luanti 6 "2 February 2019" "" "" .SH NAME -minetest, minetestserver \- Multiplayer infinite-world block sandbox +luanti, luantiserver \- voxel game engine .SH SYNOPSIS -.B minetest +.B luanti [\fB--server SERVER OPTIONS\fR | \fBCLIENT OPTIONS\fR] [\fBCOMMON OPTIONS\fR] [\fBWORLD PATH\fR] -.B minetestserver +.B luantiserver [\fBSERVER OPTIONS\fR] [\fBCOMMON OPTIONS\fR] [\fBWORLD PATH\fR] .SH DESCRIPTION -.B Minetest is one of the first InfiniMiner/Minecraft(/whatever) inspired games -(started October 2010), with a goal of taking the survival multiplayer gameplay -in a slightly different direction. -.PP -The main design philosophy is to keep it technically simple, stable and -portable. It will be kept lightweight enough to run on fairly old hardware. +.B Luanti (formerly Minetest) is a voxel game engine with easy modding and game creation. .SH COMMON OPTIONS .TP @@ -126,7 +121,7 @@ Colon delimited list of directories to search for games. Colon delimited list of directories to search for mods. .TP .B MINETEST_USER_PATH -Path to Minetest user data directory. +Path to Luanti user data directory. .SH BUGS Please report all bugs at https://github.com/minetest/minetest/issues. diff --git a/doc/luantiserver.6 b/doc/luantiserver.6 new file mode 100644 index 000000000..54b16fc83 --- /dev/null +++ b/doc/luantiserver.6 @@ -0,0 +1,2 @@ +.so man6/luanti.6 + diff --git a/doc/minetestserver.6 b/doc/minetestserver.6 deleted file mode 100644 index db5330d3c..000000000 --- a/doc/minetestserver.6 +++ /dev/null @@ -1,2 +0,0 @@ -.so man6/minetest.6 - diff --git a/doc/mkdocs/docs/img/favicon.ico b/doc/mkdocs/docs/img/favicon.ico index cac34a30c..ddecbc68e 120000 --- a/doc/mkdocs/docs/img/favicon.ico +++ b/doc/mkdocs/docs/img/favicon.ico @@ -1 +1 @@ -../../../../misc/minetest-icon.ico \ No newline at end of file +../../../../misc/luanti-icon.ico \ No newline at end of file diff --git a/irr/src/CIrrDeviceLinux.cpp b/irr/src/CIrrDeviceLinux.cpp index c00f52380..8538c05d1 100644 --- a/irr/src/CIrrDeviceLinux.cpp +++ b/irr/src/CIrrDeviceLinux.cpp @@ -286,10 +286,10 @@ void CIrrDeviceLinux::setupTopLevelXorgWindow() os::Printer::log("Configuring X11-specific top level window properties", ELL_DEBUG); // Set application name and class hints. For now name and class are the same. - // Note: SDL uses the executable name here (i.e. "minetest"). + // Note: SDL uses the executable name here (i.e. "luanti"). XClassHint *classhint = XAllocClassHint(); - classhint->res_name = const_cast("Minetest"); - classhint->res_class = const_cast("Minetest"); + classhint->res_name = const_cast("Luanti"); + classhint->res_class = const_cast("Luanti"); XSetClassHint(XDisplay, XWindow, classhint); XFree(classhint); diff --git a/irr/src/CIrrDeviceSDL.cpp b/irr/src/CIrrDeviceSDL.cpp index 0db598c74..60cf54d04 100644 --- a/irr/src/CIrrDeviceSDL.cpp +++ b/irr/src/CIrrDeviceSDL.cpp @@ -341,7 +341,7 @@ CIrrDeviceSDL::CIrrDeviceSDL(const SIrrlichtCreationParameters ¶m) : SDL_SetHint(SDL_HINT_MOUSE_TOUCH_EVENTS, "0"); #if defined(SDL_HINT_APP_NAME) - SDL_SetHint(SDL_HINT_APP_NAME, "Minetest"); + SDL_SetHint(SDL_HINT_APP_NAME, "Luanti"); #endif // Set IME hints diff --git a/irr/src/CMakeLists.txt b/irr/src/CMakeLists.txt index 768ee8d37..41d6645e9 100644 --- a/irr/src/CMakeLists.txt +++ b/irr/src/CMakeLists.txt @@ -219,7 +219,7 @@ if(USE_SDL2) if(NOT ANDROID) find_package(SDL2 REQUIRED) else() - # provided by MinetestAndroidLibs.cmake + # provided by AndroidLibs.cmake endif() message(STATUS "Found SDL2: ${SDL2_LIBRARIES}") diff --git a/misc/AppImageBuilder.yml b/misc/AppImageBuilder.yml index 39dfd9e48..6bd9edd2a 100644 --- a/misc/AppImageBuilder.yml +++ b/misc/AppImageBuilder.yml @@ -4,10 +4,10 @@ AppDir: path: AppDir app_info: id: net.minetest.minetest - name: Minetest - icon: minetest + name: Luanti + icon: luanti version: !ENV ${VERSION} - exec: usr/bin/minetest + exec: usr/bin/luanti exec_args: $@ files: include: [] @@ -54,7 +54,7 @@ script: | cmake --install appimage-build # Is a backup icon location in case - mkdir -p AppDir/usr/share/minetest/misc - cp AppDir/usr/share/icons/hicolor/128x128/apps/minetest.png AppDir/usr/share/minetest/misc/minetest-xorg-icon-128.png + mkdir -p AppDir/usr/share/luanti/misc + cp AppDir/usr/share/icons/hicolor/128x128/apps/luanti.png AppDir/usr/share/luanti/misc/luanti-xorg-icon-128.png # Validation issues sed -i '/PrefersNonDefaultGPU/d' AppDir/usr/share/applications/net.minetest.minetest.desktop diff --git a/misc/Info.plist b/misc/Info.plist index 0491d2fc1..74ed6fe5c 100644 --- a/misc/Info.plist +++ b/misc/Info.plist @@ -5,15 +5,15 @@ CFBundleDevelopmentRegion English CFBundleExecutable - minetest + luanti CFBundleIconFile - minetest-icon.icns + luanti-icon.icns CFBundleName - Minetest + Luanti CFBundleDisplayName - Minetest + Luanti CFBundleIdentifier - net.minetest.minetest + org.luanti.luanti NSHighResolutionCapable diff --git a/misc/minetest-icon-24x24.png b/misc/luanti-icon-24x24.png similarity index 100% rename from misc/minetest-icon-24x24.png rename to misc/luanti-icon-24x24.png diff --git a/misc/minetest-icon.icns b/misc/luanti-icon.icns similarity index 100% rename from misc/minetest-icon.icns rename to misc/luanti-icon.icns diff --git a/misc/minetest-icon.ico b/misc/luanti-icon.ico similarity index 100% rename from misc/minetest-icon.ico rename to misc/luanti-icon.ico diff --git a/misc/minetest-xorg-icon-128.png b/misc/luanti-xorg-icon-128.png similarity index 100% rename from misc/minetest-xorg-icon-128.png rename to misc/luanti-xorg-icon-128.png diff --git a/misc/minetest.exe.manifest b/misc/luanti.exe.manifest similarity index 94% rename from misc/minetest.exe.manifest rename to misc/luanti.exe.manifest index 1b8c3ba7b..6b5f751e9 100644 --- a/misc/minetest.exe.manifest +++ b/misc/luanti.exe.manifest @@ -1,6 +1,6 @@ - + diff --git a/misc/minetest.svg b/misc/luanti.svg similarity index 100% rename from misc/minetest.svg rename to misc/luanti.svg diff --git a/misc/net.minetest.minetest.desktop b/misc/net.minetest.minetest.desktop index 312e70f40..c6c99c469 100644 --- a/misc/net.minetest.minetest.desktop +++ b/misc/net.minetest.minetest.desktop @@ -1,11 +1,11 @@ [Desktop Entry] -Name=Minetest -GenericName=Minetest +Name=Luanti +GenericName=Luanti Comment=Block-based multiplayer game platform Comment[de]=Blockbasierte Mehrspieler-Spieleplattform Comment[fr]=Plate-forme de jeu multijoueurs à base de blocs -Exec=minetest -Icon=minetest +Exec=luanti +Icon=luanti Terminal=false PrefersNonDefaultGPU=true Type=Application diff --git a/misc/net.minetest.minetest.metainfo.xml b/misc/net.minetest.minetest.metainfo.xml index 4045b8f23..92f8a80ef 100644 --- a/misc/net.minetest.minetest.metainfo.xml +++ b/misc/net.minetest.minetest.metainfo.xml @@ -2,7 +2,7 @@ net.minetest.minetest - Minetest + Luanti Block-based multiplayer game platform Blockbasierte Mehrspieler-Spieleplattform Plate-forme de jeu multijoueurs à base de blocs @@ -11,7 +11,7 @@ LGPL-2.1+ AND CC-BY-SA-3.0 AND MIT AND Apache-2.0 - Minetest Team + Luanti Team @@ -34,13 +34,13 @@

- Minetest is a block-based sandbox game platform. + Luanti is a block-based sandbox game platform.

- Minetest ist eine blockbasierte Sandbox-Spielplattform. + Luanti ist eine blockbasierte Sandbox-Spielplattform.

- Minetest est une plateforme de jeu de type bac à sable à base de blocs. + Luanti est une plateforme de jeu de type bac à sable à base de blocs.

Players can create and destroy various types of blocks in a @@ -58,25 +58,25 @@ formes possibles, sur des serveurs multijoueurs ou en solo.

- Minetest is designed to be simple, stable, and portable. + Luanti is designed to be simple, stable, and portable. It is lightweight enough to run on fairly old hardware.

- Minetest wurde entworfen, um einfach, stabil und portabel zu sein. + Luanti wurde entworfen, um einfach, stabil und portabel zu sein. Es ist leichtgewichtig genug, um auf relativ alter Hardware zu laufen.

- Minetest est conçu pour être simple, stable et portable. + Luanti est conçu pour être simple, stable et portable. Il est suffisamment léger pour fonctionner sur du matériel relativement ancien.

- Minetest has many features, including: + Luanti has many features, including:

- Minetest besitzt viele Features, unter anderem: + Luanti besitzt viele Features, unter anderem:

- Minetest offre de nombreuses fonctionnalités, notamment : + Luanti offre de nombreuses fonctionnalités, notamment :

  • Ability to walk around, dig, and build in a near-infinite voxel world
    • @@ -113,7 +113,7 @@ - minetest + luanti Game @@ -141,10 +141,10 @@ https://www.minetest.net/get-involved - minetest + luanti - minetest + luanti celeron55@gmail.com diff --git a/misc/winresource.rc b/misc/winresource.rc index d5a71797a..1988b1928 100644 --- a/misc/winresource.rc +++ b/misc/winresource.rc @@ -16,11 +16,11 @@ #endif #ifdef __MINGW32__ -CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "minetest.exe.manifest" +CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "luanti.exe.manifest" #endif LANGUAGE 0, SUBLANG_NEUTRAL -130 ICON "minetest-icon.ico" +130 ICON "luanti-icon.ico" ///////////////////////////////////////////////////////////////////////////// // @@ -49,9 +49,8 @@ BEGIN VALUE "FileDescription", PROJECT_NAME_C " engine" 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 "LegalCopyright", "(c) 2010-2024 Perttu Ahola (celeron55) and contributors" + VALUE "OriginalFilename", PROJECT_NAME ".exe" VALUE "PrivateBuild", VERSION_EXTRA VALUE "ProductName", PROJECT_NAME_C VALUE "ProductVersion", PRODUCT_VERSION_STRING diff --git a/po/ar/minetest.po b/po/ar/luanti.po similarity index 100% rename from po/ar/minetest.po rename to po/ar/luanti.po diff --git a/po/be/minetest.po b/po/be/luanti.po similarity index 100% rename from po/be/minetest.po rename to po/be/luanti.po diff --git a/po/bg/minetest.po b/po/bg/luanti.po similarity index 100% rename from po/bg/minetest.po rename to po/bg/luanti.po diff --git a/po/ca/minetest.po b/po/ca/luanti.po similarity index 100% rename from po/ca/minetest.po rename to po/ca/luanti.po diff --git a/po/cs/minetest.po b/po/cs/luanti.po similarity index 100% rename from po/cs/minetest.po rename to po/cs/luanti.po diff --git a/po/cy/minetest.po b/po/cy/luanti.po similarity index 100% rename from po/cy/minetest.po rename to po/cy/luanti.po diff --git a/po/da/minetest.po b/po/da/luanti.po similarity index 100% rename from po/da/minetest.po rename to po/da/luanti.po diff --git a/po/de/minetest.po b/po/de/luanti.po similarity index 100% rename from po/de/minetest.po rename to po/de/luanti.po diff --git a/po/dv/minetest.po b/po/dv/luanti.po similarity index 100% rename from po/dv/minetest.po rename to po/dv/luanti.po diff --git a/po/el/minetest.po b/po/el/luanti.po similarity index 100% rename from po/el/minetest.po rename to po/el/luanti.po diff --git a/po/eo/minetest.po b/po/eo/luanti.po similarity index 100% rename from po/eo/minetest.po rename to po/eo/luanti.po diff --git a/po/es/minetest.po b/po/es/luanti.po similarity index 100% rename from po/es/minetest.po rename to po/es/luanti.po diff --git a/po/et/minetest.po b/po/et/luanti.po similarity index 100% rename from po/et/minetest.po rename to po/et/luanti.po diff --git a/po/eu/minetest.po b/po/eu/luanti.po similarity index 100% rename from po/eu/minetest.po rename to po/eu/luanti.po diff --git a/po/fa/minetest.po b/po/fa/luanti.po similarity index 100% rename from po/fa/minetest.po rename to po/fa/luanti.po diff --git a/po/fi/minetest.po b/po/fi/luanti.po similarity index 100% rename from po/fi/minetest.po rename to po/fi/luanti.po diff --git a/po/fil/minetest.po b/po/fil/luanti.po similarity index 100% rename from po/fil/minetest.po rename to po/fil/luanti.po diff --git a/po/fr/minetest.po b/po/fr/luanti.po similarity index 100% rename from po/fr/minetest.po rename to po/fr/luanti.po diff --git a/po/ga/minetest.po b/po/ga/luanti.po similarity index 100% rename from po/ga/minetest.po rename to po/ga/luanti.po diff --git a/po/gd/minetest.po b/po/gd/luanti.po similarity index 100% rename from po/gd/minetest.po rename to po/gd/luanti.po diff --git a/po/gl/minetest.po b/po/gl/luanti.po similarity index 100% rename from po/gl/minetest.po rename to po/gl/luanti.po diff --git a/po/he/minetest.po b/po/he/luanti.po similarity index 100% rename from po/he/minetest.po rename to po/he/luanti.po diff --git a/po/hi/minetest.po b/po/hi/luanti.po similarity index 100% rename from po/hi/minetest.po rename to po/hi/luanti.po diff --git a/po/hu/minetest.po b/po/hu/luanti.po similarity index 100% rename from po/hu/minetest.po rename to po/hu/luanti.po diff --git a/po/ia/minetest.po b/po/ia/luanti.po similarity index 100% rename from po/ia/minetest.po rename to po/ia/luanti.po diff --git a/po/id/minetest.po b/po/id/luanti.po similarity index 100% rename from po/id/minetest.po rename to po/id/luanti.po diff --git a/po/it/minetest.po b/po/it/luanti.po similarity index 100% rename from po/it/minetest.po rename to po/it/luanti.po diff --git a/po/ja/minetest.po b/po/ja/luanti.po similarity index 100% rename from po/ja/minetest.po rename to po/ja/luanti.po diff --git a/po/jbo/minetest.po b/po/jbo/luanti.po similarity index 100% rename from po/jbo/minetest.po rename to po/jbo/luanti.po diff --git a/po/jv/minetest.po b/po/jv/luanti.po similarity index 100% rename from po/jv/minetest.po rename to po/jv/luanti.po diff --git a/po/kk/minetest.po b/po/kk/luanti.po similarity index 100% rename from po/kk/minetest.po rename to po/kk/luanti.po diff --git a/po/kn/minetest.po b/po/kn/luanti.po similarity index 100% rename from po/kn/minetest.po rename to po/kn/luanti.po diff --git a/po/ko/minetest.po b/po/ko/luanti.po similarity index 100% rename from po/ko/minetest.po rename to po/ko/luanti.po diff --git a/po/kv/minetest.po b/po/kv/luanti.po similarity index 100% rename from po/kv/minetest.po rename to po/kv/luanti.po diff --git a/po/ky/minetest.po b/po/ky/luanti.po similarity index 100% rename from po/ky/minetest.po rename to po/ky/luanti.po diff --git a/po/lt/minetest.po b/po/lt/luanti.po similarity index 100% rename from po/lt/minetest.po rename to po/lt/luanti.po diff --git a/po/minetest.pot b/po/luanti.pot similarity index 100% rename from po/minetest.pot rename to po/luanti.pot diff --git a/po/lv/minetest.po b/po/lv/luanti.po similarity index 100% rename from po/lv/minetest.po rename to po/lv/luanti.po diff --git a/po/lzh/minetest.po b/po/lzh/luanti.po similarity index 100% rename from po/lzh/minetest.po rename to po/lzh/luanti.po diff --git a/po/mi/minetest.po b/po/mi/luanti.po similarity index 100% rename from po/mi/minetest.po rename to po/mi/luanti.po diff --git a/po/mn/minetest.po b/po/mn/luanti.po similarity index 100% rename from po/mn/minetest.po rename to po/mn/luanti.po diff --git a/po/mr/minetest.po b/po/mr/luanti.po similarity index 100% rename from po/mr/minetest.po rename to po/mr/luanti.po diff --git a/po/ms/minetest.po b/po/ms/luanti.po similarity index 100% rename from po/ms/minetest.po rename to po/ms/luanti.po diff --git a/po/ms_Arab/minetest.po b/po/ms_Arab/luanti.po similarity index 100% rename from po/ms_Arab/minetest.po rename to po/ms_Arab/luanti.po diff --git a/po/nb/minetest.po b/po/nb/luanti.po similarity index 100% rename from po/nb/minetest.po rename to po/nb/luanti.po diff --git a/po/nl/minetest.po b/po/nl/luanti.po similarity index 100% rename from po/nl/minetest.po rename to po/nl/luanti.po diff --git a/po/nn/minetest.po b/po/nn/luanti.po similarity index 100% rename from po/nn/minetest.po rename to po/nn/luanti.po diff --git a/po/oc/minetest.po b/po/oc/luanti.po similarity index 100% rename from po/oc/minetest.po rename to po/oc/luanti.po diff --git a/po/pl/minetest.po b/po/pl/luanti.po similarity index 100% rename from po/pl/minetest.po rename to po/pl/luanti.po diff --git a/po/pt/minetest.po b/po/pt/luanti.po similarity index 100% rename from po/pt/minetest.po rename to po/pt/luanti.po diff --git a/po/pt_BR/minetest.po b/po/pt_BR/luanti.po similarity index 100% rename from po/pt_BR/minetest.po rename to po/pt_BR/luanti.po diff --git a/po/ro/minetest.po b/po/ro/luanti.po similarity index 100% rename from po/ro/minetest.po rename to po/ro/luanti.po diff --git a/po/ru/minetest.po b/po/ru/luanti.po similarity index 100% rename from po/ru/minetest.po rename to po/ru/luanti.po diff --git a/po/sk/minetest.po b/po/sk/luanti.po similarity index 100% rename from po/sk/minetest.po rename to po/sk/luanti.po diff --git a/po/sl/minetest.po b/po/sl/luanti.po similarity index 100% rename from po/sl/minetest.po rename to po/sl/luanti.po diff --git a/po/sr_Cyrl/minetest.po b/po/sr_Cyrl/luanti.po similarity index 100% rename from po/sr_Cyrl/minetest.po rename to po/sr_Cyrl/luanti.po diff --git a/po/sr_Latn/minetest.po b/po/sr_Latn/luanti.po similarity index 100% rename from po/sr_Latn/minetest.po rename to po/sr_Latn/luanti.po diff --git a/po/sv/minetest.po b/po/sv/luanti.po similarity index 100% rename from po/sv/minetest.po rename to po/sv/luanti.po diff --git a/po/sw/minetest.po b/po/sw/luanti.po similarity index 100% rename from po/sw/minetest.po rename to po/sw/luanti.po diff --git a/po/th/minetest.po b/po/th/luanti.po similarity index 100% rename from po/th/minetest.po rename to po/th/luanti.po diff --git a/po/tok/minetest.po b/po/tok/luanti.po similarity index 100% rename from po/tok/minetest.po rename to po/tok/luanti.po diff --git a/po/tr/minetest.po b/po/tr/luanti.po similarity index 100% rename from po/tr/minetest.po rename to po/tr/luanti.po diff --git a/po/tt/minetest.po b/po/tt/luanti.po similarity index 100% rename from po/tt/minetest.po rename to po/tt/luanti.po diff --git a/po/uk/minetest.po b/po/uk/luanti.po similarity index 100% rename from po/uk/minetest.po rename to po/uk/luanti.po diff --git a/po/vi/minetest.po b/po/vi/luanti.po similarity index 100% rename from po/vi/minetest.po rename to po/vi/luanti.po diff --git a/po/yue/minetest.po b/po/yue/luanti.po similarity index 100% rename from po/yue/minetest.po rename to po/yue/luanti.po diff --git a/po/zh_CN/minetest.po b/po/zh_CN/luanti.po similarity index 100% rename from po/zh_CN/minetest.po rename to po/zh_CN/luanti.po diff --git a/po/zh_TW/minetest.po b/po/zh_TW/luanti.po similarity index 100% rename from po/zh_TW/minetest.po rename to po/zh_TW/luanti.po diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 2056bdd3d..4005fc14b 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -1,4 +1,4 @@ -project(minetest) +project(luanti) INCLUDE(CheckTypeSize) INCLUDE(CheckIncludeFiles) @@ -6,12 +6,12 @@ INCLUDE(CheckLibraryExists) check_type_size(int SIZEOF_INT BUILTIN_TYPES_ONLY LANGUAGE CXX) if(SIZEOF_INT LESS 4) - message(FATAL_ERROR "Minetest will not work with int less than 32 bits wide.") + message(FATAL_ERROR "${PROJECT_NAME_CAPITALIZED} will not work with int less than 32 bits wide.") endif() check_type_size(size_t SIZEOF_SIZE_T LANGUAGE CXX) if(SIZEOF_SIZE_T LESS 4) - message(FATAL_ERROR "Minetest will not work with size_t less than 32 bits wide.") + message(FATAL_ERROR "${PROJECT_NAME_CAPITALIZED} will not work with size_t less than 32 bits wide.") endif() # Add custom SemiDebug build mode @@ -488,7 +488,7 @@ endif() # This gives us the icon and file version information if(WIN32) set(WINRESOURCE_FILE "${CMAKE_CURRENT_SOURCE_DIR}/../misc/winresource.rc") - set(MINETEST_EXE_MANIFEST_FILE "${CMAKE_CURRENT_SOURCE_DIR}/../misc/minetest.exe.manifest") + set(EXE_MANIFEST_FILE "${CMAKE_CURRENT_SOURCE_DIR}/../misc/luanti.exe.manifest") if(MINGW) if(NOT CMAKE_RC_COMPILER) set(CMAKE_RC_COMPILER "windres.exe") @@ -498,10 +498,10 @@ if(WIN32) -i${WINRESOURCE_FILE} -o ${CMAKE_CURRENT_BINARY_DIR}/winresource_rc.o WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} - DEPENDS ${WINRESOURCE_FILE} ${MINETEST_EXE_MANIFEST_FILE}) + DEPENDS ${WINRESOURCE_FILE} ${EXE_MANIFEST_FILE}) SET(extra_windows_SRCS ${CMAKE_CURRENT_BINARY_DIR}/winresource_rc.o) else(MINGW) # Probably MSVC - set(extra_windows_SRCS ${WINRESOURCE_FILE} ${MINETEST_EXE_MANIFEST_FILE}) + set(extra_windows_SRCS ${WINRESOURCE_FILE} ${EXE_MANIFEST_FILE}) endif(MINGW) endif() @@ -556,7 +556,7 @@ include_directories(SYSTEM ${GMP_INCLUDE_DIR} ${JSON_INCLUDE_DIR} ${LUA_BIT_INCLUDE_DIR} - # on Android, Minetest depends on SDL2 directly + # on Android, Luanti depends on SDL2 directly # on other platforms, only IrrlichtMt depends on SDL2 "$<$:${SDL2_INCLUDE_DIRS}>" ) @@ -578,7 +578,7 @@ endif() # When cross-compiling assume the user doesn't want to run the executable anyway, -# otherwise place it in /bin/ since Minetest can only run from there. +# otherwise place it in /bin/ since Luanti can only run from there. if(NOT CMAKE_CROSSCOMPILING) set(EXECUTABLE_OUTPUT_PATH "${CMAKE_SOURCE_DIR}/bin") endif() @@ -626,7 +626,7 @@ if(BUILD_CLIENT) sha256 ${FREETYPE_LIBRARY} ${PLATFORM_LIBS} - # on Android, Minetest depends on SDL2 directly + # on Android, Luanti depends on SDL2 directly # on other platforms, only IrrlichtMt depends on SDL2 "$<$:${SDL2_LIBRARIES}>" ) @@ -812,7 +812,7 @@ elseif(NOT MSVC) check_c_source_compiles("#include \nint main(){return sizeof(lua_atccall);}" HAVE_ATCCALL) if(NOT HAVE_ATCCALL) string(CONCAT explanation_msg - "It looks like you're trying to build Minetest using a system-wide " + "It looks like you're trying to build ${PROJECT_NAME_CAPITALIZED} using a system-wide " "Lua installation. This is no longer supported because PUC Lua " "cannot interoperate with C++ correctly. Read src/unittest/test_lua.cpp " " for technical details.") @@ -986,6 +986,14 @@ if(WIN32) endif() endif() +macro(CreateLegacyAlias _cmake_target _old_path _new_name) + add_custom_target("${_cmake_target}" ALL + COMMAND "${CMAKE_COMMAND}" -E create_symlink "${_new_name}" "${_old_path}" + WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}") + add_dependencies("${_cmake_target}" "${_new_name}") + install(PROGRAMS "${_old_path}" DESTINATION ${BINDIR}) +endmacro() + if(BUILD_CLIENT AND NOT ANDROID) install(TARGETS ${PROJECT_NAME} RUNTIME DESTINATION ${BINDIR} @@ -993,6 +1001,9 @@ if(BUILD_CLIENT AND NOT ANDROID) ARCHIVE DESTINATION ${BINDIR} BUNDLE DESTINATION . ) + if(UNIX) + CreateLegacyAlias(minetest_alias "${EXECUTABLE_OUTPUT_PATH}/minetest" ${PROJECT_NAME}) + endif() if(APPLE) install(CODE " @@ -1016,6 +1027,9 @@ endif() if(BUILD_SERVER) install(TARGETS ${PROJECT_NAME}server DESTINATION ${BINDIR}) + if(UNIX) + CreateLegacyAlias(minetestserver_alias "${EXECUTABLE_OUTPUT_PATH}/minetestserver" ${PROJECT_NAME}server) + endif() endif() if (ANDROID) diff --git a/src/main.cpp b/src/main.cpp index 6928b5c74..b400249ed 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -61,7 +61,7 @@ extern "C" { } #if !defined(__cpp_rtti) || !defined(__cpp_exceptions) -#error Minetest cannot be built without exceptions or RTTI +#error Luanti cannot be built without exceptions or RTTI #endif #if defined(__MINGW32__) && !defined(__clang__) @@ -69,7 +69,7 @@ extern "C" { // https://github.com/minetest/minetest/issues/10137 for one of the various issues we had #error ================================== #error MinGW gcc has a broken TLS implementation and is not supported for building \ - Minetest. Look at testTLS() in test_threading.cpp and see for yourself. \ + Luanti. Look at testTLS() in test_threading.cpp and see for yourself. \ Please use a clang-based compiler or alternatively MSVC. #error ================================== #endif @@ -174,6 +174,19 @@ int main(int argc, char *argv[]) warningstream << "Continuing without debugger" << std::endl; } + { + auto exe_name = argc > 0 ? lowercase(fs::GetFilenameFromPath(argv[0])) : ""; + if (str_starts_with(exe_name, "minetest")) { +#if CHECK_CLIENT_BUILD() + const char *new_ = PROJECT_NAME; +#else + const char *new_ = PROJECT_NAME "server"; +#endif + warningstream << "The executable " << exe_name + << " is a deprecated alias, please use " << new_ << " instead." << std::endl; + } + } + porting::signal_handler_init(); porting::initializePaths(); @@ -366,15 +379,15 @@ static void set_allowed_options(OptionList *allowed_options) allowed_options->insert(std::make_pair("gameid", ValueSpec(VALUETYPE_STRING, _("Set gameid (\"--gameid list\" prints available ones)")))); allowed_options->insert(std::make_pair("migrate", ValueSpec(VALUETYPE_STRING, - _("Migrate from current map backend to another (Only works when using minetestserver or with --server)")))); + _("Migrate from current map backend to another (Only works when using " PROJECT_NAME "server or with --server)")))); allowed_options->insert(std::make_pair("migrate-players", ValueSpec(VALUETYPE_STRING, - _("Migrate from current players backend to another (Only works when using minetestserver or with --server)")))); + _("Migrate from current players backend to another (Only works when using " PROJECT_NAME "server or with --server)")))); allowed_options->insert(std::make_pair("migrate-auth", ValueSpec(VALUETYPE_STRING, - _("Migrate from current auth backend to another (Only works when using minetestserver or with --server)")))); + _("Migrate from current auth backend to another (Only works when using " PROJECT_NAME "server or with --server)")))); allowed_options->insert(std::make_pair("migrate-mod-storage", ValueSpec(VALUETYPE_STRING, - _("Migrate from current mod storage backend to another (Only works when using minetestserver or with --server)")))); + _("Migrate from current mod storage backend to another (Only works when using " PROJECT_NAME "server or with --server)")))); allowed_options->insert(std::make_pair("terminal", ValueSpec(VALUETYPE_FLAG, - _("Feature an interactive terminal (Only works when using minetestserver or with --server)")))); + _("Feature an interactive terminal (Only works when using " PROJECT_NAME "server or with --server)")))); allowed_options->insert(std::make_pair("recompress", ValueSpec(VALUETYPE_FLAG, _("Recompress the blocks of the given map database.")))); #if CHECK_CLIENT_BUILD() diff --git a/src/porting.cpp b/src/porting.cpp index 6b7952836..81e9afa01 100644 --- a/src/porting.cpp +++ b/src/porting.cpp @@ -464,7 +464,8 @@ bool setSystemPaths() // Use "C:\Users\\AppData\Roaming\" len = GetEnvironmentVariable("APPDATA", buf, sizeof(buf)); FATAL_ERROR_IF(len == 0 || len > sizeof(buf), "Failed to get APPDATA"); - path_user = std::string(buf) + DIR_DELIM + PROJECT_NAME_C; + // TODO: Luanti with migration + path_user = std::string(buf) + DIR_DELIM + "Minetest"; } else { path_user = std::string(buf); } @@ -529,8 +530,9 @@ bool setSystemPaths() if (minetest_user_path && minetest_user_path[0] != '\0') { path_user = std::string(minetest_user_path); } else { + // TODO: luanti with migration path_user = std::string(getHomeOrFail()) + DIR_DELIM "." - + PROJECT_NAME; + + "minetest"; } return true; @@ -557,9 +559,10 @@ bool setSystemPaths() if (minetest_user_path && minetest_user_path[0] != '\0') { path_user = std::string(minetest_user_path); } else { + // TODO: luanti with migration path_user = std::string(getHomeOrFail()) + "/Library/Application Support/" - + PROJECT_NAME; + + "minetest"; } return true; } @@ -574,8 +577,9 @@ bool setSystemPaths() if (minetest_user_path && minetest_user_path[0] != '\0') { path_user = std::string(minetest_user_path); } else { + // TODO: luanti with migration path_user = std::string(getHomeOrFail()) + DIR_DELIM "." - + lowercase(PROJECT_NAME); + + "minetest"; } return true; } @@ -681,11 +685,13 @@ void initializePaths() const char *cache_dir = getenv("XDG_CACHE_HOME"); const char *home_dir = getenv("HOME"); if (cache_dir && cache_dir[0] != '\0') { - path_cache = std::string(cache_dir) + DIR_DELIM + PROJECT_NAME; + // TODO: luanti with migration + path_cache = std::string(cache_dir) + DIR_DELIM + "minetest"; } else if (home_dir) { // Then try $HOME/.cache/PROJECT_NAME + // TODO: luanti with migration path_cache = std::string(home_dir) + DIR_DELIM + ".cache" - + DIR_DELIM + PROJECT_NAME; + + DIR_DELIM + "minetest"; } else { // If neither works, use $PATH_USER/cache path_cache = path_user + DIR_DELIM + "cache"; diff --git a/src/porting_android.cpp b/src/porting_android.cpp index 142aeb652..49f279c2b 100644 --- a/src/porting_android.cpp +++ b/src/porting_android.cpp @@ -90,7 +90,7 @@ void osSpecificInit() #ifdef GPROF // in the start-up code warningstream << "Initializing GPROF profiler" << std::endl; - monstartup("libMinetest.so"); + monstartup("libluanti.so"); #endif } diff --git a/src/server.cpp b/src/server.cpp index ab219043e..6b1dfffac 100644 --- a/src/server.cpp +++ b/src/server.cpp @@ -586,12 +586,12 @@ void Server::start() // ASCII art for the win! const char *art[] = { - " __. __. __. ", - " _____ |__| ____ _____ / |_ _____ _____ / |_ ", - " / \\| |/ \\ / __ \\ _\\/ __ \\/ __> _\\", - "| Y Y \\ | | \\ ___/| | | ___/\\___ \\| | ", - "|__|_| / |___| /\\______> | \\______>_____/| | ", - " \\/ \\/ \\/ \\/ \\/ " + R"(.__ __ .__ )", + R"(| | __ _______ _____/ |_|__|)", + R"(| | | | \__ \ / \ __\ |)", + R"(| |_| | // __ \| | \ | | |)", + R"(|____/____/(____ /___| /__| |__|)", + R"( \/ \/ )", }; if (!m_admin_chat) { diff --git a/textures/base/pack/menu_header.png b/textures/base/pack/menu_header.png index 49b9f6ea9..cdc6d4edf 100644 Binary files a/textures/base/pack/menu_header.png and b/textures/base/pack/menu_header.png differ diff --git a/util/bump_version.sh b/util/bump_version.sh index 5e920dc70..77b4e603b 100755 --- a/util/bump_version.sh +++ b/util/bump_version.sh @@ -36,7 +36,7 @@ read_versions() { fi CURRENT_VERSION="$VERSION_MAJOR.$VERSION_MINOR.$VERSION_PATCH" - echo "Current Minetest version: $CURRENT_VERSION" + echo "Current Luanti version: $CURRENT_VERSION" } # Retrieves protocol version from header @@ -148,7 +148,7 @@ back_to_devel() { # Start of main logic: ####################### -# Switch to top minetest directory +# Switch to top luanti directory cd ${0%/*}/.. # Determine old versions diff --git a/util/stress_mapgen.sh b/util/stress_mapgen.sh index 6bbe57483..e39f6c26a 100755 --- a/util/stress_mapgen.sh +++ b/util/stress_mapgen.sh @@ -1,7 +1,7 @@ #!/bin/bash dir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" gameid=${gameid:-devtest} -minetest=$dir/../bin/minetest +executable=$dir/../bin/luanti testspath=$dir/../tests conf_server=$testspath/server.conf worldpath=$testspath/world @@ -14,7 +14,7 @@ run () { fi } -[ -e "$minetest" ] || { echo "executable $minetest missing"; exit 1; } +[ -e "$executable" ] || { echo "executable $executable missing"; exit 1; } rm -rf "$worldpath" mkdir -p "$worldpath/worldmods" @@ -27,4 +27,4 @@ ln -s "$dir/helper_mod" "$worldpath/worldmods/" args=(--config "$conf_server" --world "$worldpath" --gameid $gameid) [ -n "$PROFILER" ] && args+=(--verbose) -run "$minetest" --server "${args[@]}" +run "$executable" --server "${args[@]}" diff --git a/util/test_error_cases.sh b/util/test_error_cases.sh index 801e097a3..8c968ca57 100755 --- a/util/test_error_cases.sh +++ b/util/test_error_cases.sh @@ -1,12 +1,12 @@ #!/bin/bash dir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" gameid=${gameid:-devtest} -minetest=$dir/../bin/minetest +executable=$dir/../bin/luanti testspath=$dir/../tests conf_server=$testspath/server.conf worldpath=$testspath/world -[ -e "$minetest" ] || { echo "executable $minetest missing"; exit 1; } +[ -e "$executable" ] || { echo "executable $executable missing"; exit 1; } write_config () { printf '%s\n' >"$conf_server" \ @@ -31,14 +31,14 @@ ln -s "$dir/helper_mod" "$worldpath/worldmods/" args=(--server --config "$conf_server" --world "$worldpath" --gameid $gameid) -# make sure we can tell apart sanitizer and minetest errors +# make sure we can tell apart sanitizer and luanti errors export ASAN_OPTIONS="exitcode=42" export MSAN_OPTIONS="exitcode=42" # see helper_mod/init.lua for the different types for n in $(seq 1 4); do write_config error_type=$n - run "$minetest" "${args[@]}" + run "$executable" "${args[@]}" echo "---------------" done diff --git a/util/test_multiplayer.sh b/util/test_multiplayer.sh index b12908423..5c0e6bfaa 100755 --- a/util/test_multiplayer.sh +++ b/util/test_multiplayer.sh @@ -3,7 +3,7 @@ dir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" gameid=${gameid:-devtest} -minetest=$dir/../bin/minetest +executable=$dir/../bin/luanti testspath=$dir/../tests conf_client1=$testspath/client1.conf conf_server=$testspath/server.conf @@ -21,7 +21,7 @@ waitfor () { exit 1 } -[ -e "$minetest" ] || { echo "executable $minetest missing"; exit 1; } +[ -e "$executable" ] || { echo "executable $executable missing"; exit 1; } rm -f "$testspath/log.txt" rm -rf "$worldpath" @@ -39,12 +39,12 @@ printf '%s\n' >"$testspath/server.conf" \ ln -s "$dir/helper_mod" "$worldpath/worldmods/" echo "Starting server" -"$minetest" --debugger --server --config "$conf_server" --world "$worldpath" --gameid $gameid 2>&1 \ +"$executable" --debugger --server --config "$conf_server" --world "$worldpath" --gameid $gameid 2>&1 \ | sed -u 's/^/(server) /' | tee -a "$testspath/log.txt" & waitfor "$worldpath/startup" echo "Starting client" -"$minetest" --debugger --config "$conf_client1" --go --address 127.0.0.1 2>&1 \ +"$executable" --debugger --config "$conf_client1" --go --address 127.0.0.1 2>&1 \ | sed -u 's/^/(client) /' | tee -a "$testspath/log.txt" & waitfor "$worldpath/done" diff --git a/util/updatepo.sh b/util/updatepo.sh index 22593a5dc..2b9f4a276 100755 --- a/util/updatepo.sh +++ b/util/updatepo.sh @@ -1,6 +1,6 @@ #!/bin/sh -# Update/create minetest po files +# Update/create luanti po files # an auxiliary function to abort processing with an optional error # message @@ -47,9 +47,9 @@ 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 +potfile=po/luanti.pot echo "updating pot" -xgettext --package-name=minetest \ +xgettext --package-name=luanti \ --add-comments='~' \ --sort-by-file \ --add-location=file \ @@ -75,7 +75,7 @@ sed '/^#\. ~.*relative_to/,/^#: /{ /^#: /!d; }' -i $potfile # 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/luanti.po if test -e $pofile; then echo "[$lang]: updating strings" msgmerge --update --sort-by-file $pofile $potfile