Rename to Luanti (minetest#15294)

The new header intentionally isn't in MTG stone design (or any other MTG-esque design), since we want to distance Luanti and MTG from each other. The font "undefined medium" (https://undefined-medium.com/) was used. ASCII art generated by https://patorjk.com/software/taag/#p=display&f=Graffiti&t=luanti minetest#11952 (comment) --------- Co-authored-by: sfan5 <[email protected]>
Wuzzy2 · Oct 27, 2024 · 4b90e58 · 4b90e58
1 parent b7073df
commit 4b90e58
Show file tree

Hide file tree

Showing 118 changed files with 206 additions and 179 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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,15 +68,15 @@ 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
 
 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
@@ -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 <[email protected]>
+Luanti
+Copyright (C) 2010-2024 celeron55, Perttu Ahola <[email protected]>
+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
@@ -95,15 +95,15 @@ 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
 			}
 		}
 
 		file("${assetsFolder}/.nomedia").text = ""
 	}
 
 	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
@@ -43,9 +43,6 @@
 			<intent-filter>
 				<action android:name="android.intent.action.MAIN" />
 			</intent-filter>
-			<meta-data
-				android:name="android.app.lib_name"
-				android:value="minetest" />
 		</activity>
 
 		<service

diff --git a/android/app/src/main/java/net/minetest/minetest/GameActivity.java b/android/app/src/main/java/net/minetest/minetest/GameActivity.java
@@ -52,7 +52,7 @@
 public class GameActivity extends SDLActivity {
 	@Override
 	protected String getMainSharedObject() {
-		return getContext().getApplicationInfo().nativeLibraryDir + "/libminetest.so";
+		return getContext().getApplicationInfo().nativeLibraryDir + "/libluanti.so";
 	}
 
 	@Override
@@ -63,7 +63,7 @@ protected String getMainFunction() {
 	@Override
 	protected String[] getLibraries() {
 		return new String[] {
-			"minetest"
+			"luanti"
 		};
 	}
 

diff --git a/android/app/src/main/java/net/minetest/minetest/UnzipService.java b/android/app/src/main/java/net/minetest/minetest/UnzipService.java
@@ -73,7 +73,7 @@ public UnzipService() {
 	@Override
 	protected void onHandleIntent(Intent intent) {
 		Notification.Builder notificationBuilder = createNotification();
-		final File zipFile = new File(getCacheDir(), "Minetest.zip");
+		final File zipFile = new File(getCacheDir(), "assets.zip");
 		try {
 			setIsRunning(true);
 			File userDataDirectory = Utils.getUserDataDirectory(this);