Debundle Minetest Game #13818

rollerozxa · 2023-09-17T17:59:46Z

Closes #9509.

This PR debundles Minetest Game from the engine. The necessary preparations for improving UX with no game installed has already been resolved with #13550.

Requires:

To do

This PR is Ready for Review.

How to test

See that there are no mentions of it left in READMEs or buildscripts or such.

sfan5 · 2023-09-17T18:43:24Z

Note that merging this will make #13800 (and perhaps #13799) a blocker, is there a prospect of anyone working on it soon?

rubenwardy · 2023-09-17T18:49:25Z

I suggest making those two things prerequisites of this PR

grorp

I think games should be removed from here:

minetest/android/app/src/main/java/net/minetest/minetest/Utils.java

Lines 38 to 45 in 690506b

    
           public static boolean isInstallValid(@NonNull Context context) { 
        
           	File userDataDirectory = getUserDataDirectory(context); 
        
           	return userDataDirectory.isDirectory() && 
        
           		new File(userDataDirectory, "games").isDirectory() && 
        
           		new File(userDataDirectory, "builtin").isDirectory() && 
        
           		new File(userDataDirectory, "client").isDirectory() && 
        
           		new File(userDataDirectory, "textures").isDirectory(); 
        
           }

rubenwardy · 2023-10-01T15:21:37Z

Remaining things before debundling:

Android needs to uninstall MTG when updating
Handle the case where MTG is uninstalled with MTG worlds. This is Migration path once MTG is no longer preinstalled #13800
Handle the case where an old version remains installed. This would be the case on Windows if the user updates by extracting the zip over an existing install. Update detection only works when installed from CDB, so users won't receive update notifications in this case

rollerozxa · 2023-10-08T21:06:03Z

I think games should be removed from here:

yep, otherwise it will repeatedly extract the zip on android if you don't have any games installed...

sfan5 · 2023-10-08T21:07:56Z

3. This would be the case on Windows if the user updates by extracting the zip over an existing install.

Hopefully users don't actually do this because there's a bunch of things that could break in more or less subtle ways if done.

rollerozxa · 2023-10-08T21:32:00Z

This would be the case on Windows if the user updates by extracting the zip over an existing install.

Hopefully users don't actually do this because there's a bunch of things that could break in more or less subtle ways if done.

This was how I would update Minetest on Windows, by extracting bin and builtin over my existing Minetest install. That's what happens when user and share data are all mixed up in a mess like the Windows builds currently are.

rollerozxa · 2023-10-11T19:24:45Z

For cases where #13800 wouldn't be able to detect updating from an existing install containing MTG worlds, I feel like it should be important to inform users via Minetest community channels that MTG will be debundled in 5.8.0, and that if they want to continue playing with MTG it can be reinstalled from the content browser. (like this forum thread I made about it)

SmallJoker · 2023-10-15T16:03:51Z

Removed the label because #13799 is not too important and by the looks of it, the other dependencies were resolved too.

Relevant discussion: https://irc.minetest.net/minetest-dev/2023-10-15#i_6122535

rubenwardy · 2023-10-15T17:28:21Z

Still need to uninstall mtg when the Android app updates

grorp · 2023-10-21T13:08:41Z

Still need to uninstall mtg when the Android app updates

Since #13906 also works on Android, merging that PR would change this to-do from a hard requirement to a nice-to-have.

grorp

Found a leftover mention of MTG:

minetest/doc/lua_api.md

Line 1380 in 09dd49f

Look for examples in `games/devtest` or `games/minetest_game`.

I think we can just remove that line altogether.

rubenwardy

Works

rubenwardy · 2023-11-06T10:05:07Z

Found a leftover mention of MTG:

minetest/doc/lua_api.md

Line 1380 in 09dd49f

Look for examples in `games/devtest` or `games/minetest_game`.

I think we can just remove that line altogether.

I noticed this but felt like it didn't matter either way

srifqi · 2023-11-06T12:40:19Z

If we want to truly remove any references to Minetest Game,

minetest/doc/lua_api.md

Line 62 in 09dd49f

    
           * `title`: Required, a human-readable title to address the game, e.g. `title = Minetest Game`.

minetest/doc/texture_packs.md

Lines 43 to 45 in 09dd49f

    
           Any other PNG files will be interpreted as textures. They must have the same 
        
           names as the textures they are supposed to override. For example, to override 
        
           the apple texture of Minetest Game, add a PNG file named `default_apple.png`.

minetest/games/devtest/mods/initial_message/init.lua

Line 6 in 09dd49f

    
           minetest.chat_send_player(player:get_player_name(), "This is the \"Development Test\" [devtest], meant only for testing and development. Use Minetest Game for the real thing.")

rollerozxa · 2023-11-06T13:00:33Z

Referencing Minetest Game for examples in documentation sounds okay to me, but that devtest initial message could use being changed. Or even removed, since devtest isn't bundled with builds of the engine anymore and there are already warnings when creating a devtest world pointing you to the content browser, for if you're running in place inside of the source tree.

grorp · 2023-11-06T14:52:00Z

I noticed this but felt like it didn't matter either way

Referencing Minetest Game for examples in documentation sounds okay to me

👍 You're right, it doesn't matter.

However, I think the Devtest chat message still has value, as an additonal reminder. Removing the second sentence would be enough IMO.

srifqi

Except other references about Minetest Game (discussed before), this PR looks good to me.

PS The unpacking/unzipping in the Android version is faster, too, without MTG.

rollerozxa · 2023-11-06T15:07:14Z

However, I think the Devtest chat message still has value, as an additonal reminder. Removing the second sentence would be enough IMO.

Alright, I have done that, should be enough for now.

Merge time? ^_^

grorp

Let's do this! :)

grorp added @ Build CMake, build scripts, official builds, compiler and linker errors Feature ✨ PRs that add or enhance a feature @ Content / PkgMgr labels Sep 17, 2023

SmallJoker added this to the 5.8.0 milestone Sep 17, 2023

rubenwardy added the Roadmap The change matches an item on the current roadmap. label Sep 17, 2023

SmallJoker added the Waiting (on dependency) Waiting on another PR or external circumstances (not for rebases/changes requested) label Sep 17, 2023

rubenwardy mentioned this pull request Sep 20, 2023

rename MTG to something less confusing minetest/minetest_game#3068

Open

grorp mentioned this pull request Sep 27, 2023

Notify users that they need to reinstall MTG if they still want it #13850

Merged

grorp reviewed Sep 28, 2023

View reviewed changes

SmallJoker removed the Waiting (on dependency) Waiting on another PR or external circumstances (not for rebases/changes requested) label Oct 15, 2023

grorp mentioned this pull request Oct 21, 2023

Offer ContentDB updates for leftover bundled Minetest Game #13906

Merged

rubenwardy modified the milestones: 5.8.0, 5.9.0 Oct 27, 2023

rollerozxa added 2 commits November 5, 2023 18:08

Debundle Minetest Game

b118b6a

remove games folder from isInstallValid

09dd49f

rubenwardy force-pushed the debundle-mtg-fr branch from 42dae80 to 09dd49f Compare November 5, 2023 18:08

grorp reviewed Nov 5, 2023

View reviewed changes

rubenwardy approved these changes Nov 5, 2023

View reviewed changes

rubenwardy added the One approval ✅ ◻️ label Nov 5, 2023

srifqi approved these changes Nov 6, 2023

View reviewed changes

srifqi added >= Two approvals ✅ ✅ and removed One approval ✅ ◻️ labels Nov 6, 2023

remove reference to MTG in devtest initial_message

8c878a8

grorp approved these changes Nov 6, 2023

View reviewed changes

sfan5 approved these changes Nov 7, 2023

View reviewed changes

grorp merged commit 570fc90 into minetest:master Nov 7, 2023
15 checks passed

licaon-kter mentioned this pull request Dec 6, 2023

F-Droid - mark app as NonFreeNet #14078

Closed

cx384 pushed a commit to cx384/minetest that referenced this pull request Dec 9, 2023

Debundle Minetest Game (minetest#13818)

db5e9bf

kawogi pushed a commit to kawogi/minetest that referenced this pull request Dec 19, 2023

Debundle Minetest Game (minetest#13818)

824ceaf

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Debundle Minetest Game #13818

Debundle Minetest Game #13818

rollerozxa commented Sep 17, 2023 •

edited by rubenwardy

sfan5 commented Sep 17, 2023 •

edited

rubenwardy commented Sep 17, 2023

grorp left a comment

rubenwardy commented Oct 1, 2023 •

edited

rollerozxa commented Oct 8, 2023

sfan5 commented Oct 8, 2023

rollerozxa commented Oct 8, 2023

rollerozxa commented Oct 11, 2023

SmallJoker commented Oct 15, 2023

rubenwardy commented Oct 15, 2023

grorp commented Oct 21, 2023 •

edited

grorp left a comment

rubenwardy left a comment

rubenwardy commented Nov 6, 2023

srifqi commented Nov 6, 2023

rollerozxa commented Nov 6, 2023 •

edited

grorp commented Nov 6, 2023

srifqi left a comment

rollerozxa commented Nov 6, 2023 •

edited

grorp left a comment

	public static boolean isInstallValid(@NonNull Context context) {
	File userDataDirectory = getUserDataDirectory(context);
	return userDataDirectory.isDirectory() &&
	new File(userDataDirectory, "games").isDirectory() &&
	new File(userDataDirectory, "builtin").isDirectory() &&
	new File(userDataDirectory, "client").isDirectory() &&
	new File(userDataDirectory, "textures").isDirectory();
	}

Debundle Minetest Game #13818

Debundle Minetest Game #13818

Conversation

rollerozxa commented Sep 17, 2023 • edited by rubenwardy

To do

How to test

sfan5 commented Sep 17, 2023 • edited

rubenwardy commented Sep 17, 2023

grorp left a comment

Choose a reason for hiding this comment

rubenwardy commented Oct 1, 2023 • edited

rollerozxa commented Oct 8, 2023

sfan5 commented Oct 8, 2023

rollerozxa commented Oct 8, 2023

rollerozxa commented Oct 11, 2023

SmallJoker commented Oct 15, 2023

rubenwardy commented Oct 15, 2023

grorp commented Oct 21, 2023 • edited

grorp left a comment

Choose a reason for hiding this comment

rubenwardy left a comment

Choose a reason for hiding this comment

rubenwardy commented Nov 6, 2023

srifqi commented Nov 6, 2023

rollerozxa commented Nov 6, 2023 • edited

grorp commented Nov 6, 2023

srifqi left a comment

Choose a reason for hiding this comment

rollerozxa commented Nov 6, 2023 • edited

grorp left a comment

Choose a reason for hiding this comment

rollerozxa commented Sep 17, 2023 •

edited by rubenwardy

sfan5 commented Sep 17, 2023 •

edited

rubenwardy commented Oct 1, 2023 •

edited

grorp commented Oct 21, 2023 •

edited

rollerozxa commented Nov 6, 2023 •

edited

rollerozxa commented Nov 6, 2023 •

edited