NOISSUE change behaviour of the +tweakers patch item

Patch application will either add tweakers, or move them
to the end if they are already present.

This allows fixing up tweaker order in subsequent version patches.

1 files changed, 11 insertions, 4 deletions

diff --git a/api/logic/minecraft/MinecraftProfile.cpp b/api/logic/minecraft/MinecraftProfile.cpp
index e6562230..a9552af2 100644
--- a/api/logic/minecraft/MinecraftProfile.cpp
+++ b/api/logic/minecraft/MinecraftProfile.cpp
@@ -428,12 +428,19 @@ void MinecraftProfile::applyTraits(const QSet<QString>& traits)
 
 void MinecraftProfile::applyTweakers(const QStringList& tweakers)
 {
-	// FIXME: check for dupes?
-	// FIXME: does order matter?
-	for (auto tweaker : tweakers)
+	// if the applied tweakers override an existing one, skip it. this effectively moves it later in the sequence
+	QStringList newTweakers;
+	for(auto & tweaker: m_tweakers)
 	{
-		this->m_tweakers += tweaker;
+		if (tweakers.contains(tweaker))
+		{
+			continue;
+		}
+		newTweakers.append(tweaker);
 	}
+	// then just append the new tweakers (or moved original ones)
+	newTweakers += tweakers;
+	m_tweakers = newTweakers;
 }
 
 void MinecraftProfile::applyJarMods(const QList<LibraryPtr>& jarMods)