mc-in-work/PrismLauncher
1
0
Fork 0
mirror of https://github.com/PrismLauncher/PrismLauncher.git synced 2026-06-29 01:54:20 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Agent: Simplify and avoid unnecessary shared_ptr

Browse source 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
This commit is contained in:
TheKodeToad 2026-01-14 19:27:20 +00:00
parent 77ebf65c7d
commit 248eb13ab9
No known key found for this signature in database
GPG key ID: 5E39D70B4C93C38E
8 changed files with 21 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

22
launcher/minecraft/Agent.h
View file

@ -4,26 +4,10 @@
#include "Library.h" #include "Library.h"
class Agent; struct Agent {
using AgentPtr = std::shared_ptr<Agent>;
class Agent {
public:
Agent(LibraryPtr library, const QString& argument)
{
m_library = library;
m_argument = argument;
}
public: /* methods */
LibraryPtr library() { return m_library; }
QString argument() { return m_argument; }
protected: /* data */
/// The library pointing to the jar this Java agent is contained within /// The library pointing to the jar this Java agent is contained within
LibraryPtr m_library; LibraryPtr library;
/// The argument to the Java agent, passed after an = if present /// The argument to the Java agent, passed after an = if present
QString m_argument; QString argument;
}; };

6
launcher/minecraft/LaunchProfile.cpp
View file

@ -213,9 +213,9 @@ void LaunchProfile::applyMavenFile(LibraryPtr mavenFile, const RuntimeContext& r
m_mavenFiles.append(Library::limitedCopy(mavenFile)); m_mavenFiles.append(Library::limitedCopy(mavenFile));
} }
void LaunchProfile::applyAgent(AgentPtr agent, const RuntimeContext& runtimeContext) void LaunchProfile::applyAgent(const Agent& agent, const RuntimeContext& runtimeContext)
{ {
auto lib = agent->library(); auto lib = agent.library;
if (!lib->isActive(runtimeContext)) { if (!lib->isActive(runtimeContext)) {
return; return;
} }
@ -330,7 +330,7 @@ const QList<LibraryPtr>& LaunchProfile::getMavenFiles() const
return m_mavenFiles; return m_mavenFiles;
} }
const QList<AgentPtr>& LaunchProfile::getAgents() const const QList<Agent>& LaunchProfile::getAgents() const
{ {
return m_agents; return m_agents;
} }

6
launcher/minecraft/LaunchProfile.h
View file

@ -57,7 +57,7 @@ class LaunchProfile : public ProblemProvider {
void applyMods(const QList<LibraryPtr>& jarMods); void applyMods(const QList<LibraryPtr>& jarMods);
void applyLibrary(LibraryPtr library, const RuntimeContext& runtimeContext); void applyLibrary(LibraryPtr library, const RuntimeContext& runtimeContext);
void applyMavenFile(LibraryPtr library, const RuntimeContext& runtimeContext); void applyMavenFile(LibraryPtr library, const RuntimeContext& runtimeContext);
void applyAgent(AgentPtr agent, const RuntimeContext& runtimeContext); void applyAgent(const Agent& agent, const RuntimeContext& runtimeContext);
void applyCompatibleJavaMajors(QList<int>& javaMajor); void applyCompatibleJavaMajors(QList<int>& javaMajor);
void applyCompatibleJavaName(QString javaName); void applyCompatibleJavaName(QString javaName);
void applyMainJar(LibraryPtr jar); void applyMainJar(LibraryPtr jar);
@ -79,7 +79,7 @@ class LaunchProfile : public ProblemProvider {
const QList<LibraryPtr>& getLibraries() const; const QList<LibraryPtr>& getLibraries() const;
const QList<LibraryPtr>& getNativeLibraries() const; const QList<LibraryPtr>& getNativeLibraries() const;
const QList<LibraryPtr>& getMavenFiles() const; const QList<LibraryPtr>& getMavenFiles() const;
const QList<AgentPtr>& getAgents() const; const QList<Agent>& getAgents() const;
const QList<int>& getCompatibleJavaMajors() const; const QList<int>& getCompatibleJavaMajors() const;
const QString getCompatibleJavaName() const; const QString getCompatibleJavaName() const;
const LibraryPtr getMainJar() const; const LibraryPtr getMainJar() const;
@ -132,7 +132,7 @@ class LaunchProfile : public ProblemProvider {
QList<LibraryPtr> m_mavenFiles; QList<LibraryPtr> m_mavenFiles;
/// the list of java agents to add to JVM arguments /// the list of java agents to add to JVM arguments
QList<AgentPtr> m_agents; QList<Agent> m_agents;
/// the main jar /// the main jar
LibraryPtr m_mainJar; LibraryPtr m_mainJar;

6
launcher/minecraft/MinecraftInstance.cpp
View file

@ -529,10 +529,10 @@ QStringList MinecraftInstance::extraArguments()
} }
} }
auto agents = m_components->getProfile()->getAgents(); auto agents = m_components->getProfile()->getAgents();
for (auto agent : agents) { for (const auto& agent : agents) {
QStringList jar, temp1, temp2, temp3; QStringList jar, temp1, temp2, temp3;
agent->library()->getApplicableFiles(runtimeContext(), jar, temp1, temp2, temp3, getLocalLibraryPath()); agent.library->getApplicableFiles(runtimeContext(), jar, temp1, temp2, temp3, getLocalLibraryPath());
list.append("-javaagent:" + jar[0] + (agent->argument().isEmpty() ? "" : "=" + agent->argument())); list.append("-javaagent:" + jar[0] + (agent.argument.isEmpty() ? "" : "=" + agent.argument));
} }
{ {

11
launcher/minecraft/OneSixVersionFormat.cpp
View file

@ -209,8 +209,7 @@ VersionFilePtr OneSixVersionFormat::versionFileFromJson(const QJsonDocument& doc
QString arg = ""; QString arg = "";
readString(agentObj, "argument", arg); readString(agentObj, "argument", arg);
AgentPtr agent(new Agent(lib, arg)); out->agents.append(Agent{ lib, arg });
out->agents.append(agent);
} }
} }
@ -305,10 +304,10 @@ QJsonDocument OneSixVersionFormat::versionFileToJson(const VersionFilePtr& patch
writeStringList(root, "+jvmArgs", patch->addnJvmArguments); writeStringList(root, "+jvmArgs", patch->addnJvmArguments);
if (!patch->agents.isEmpty()) { if (!patch->agents.isEmpty()) {
QJsonArray array; QJsonArray array;
for (auto value : patch->agents) { for (const auto& value : patch->agents) {
QJsonObject agentOut = OneSixVersionFormat::libraryToJson(value->library().get()); QJsonObject agentOut = OneSixVersionFormat::libraryToJson(value.library.get());
if (!value->argument().isEmpty()) if (!value.argument.isEmpty())
agentOut.insert("argument", value->argument()); agentOut.insert("argument", value.argument);
array.append(agentOut); array.append(agentOut);
} }

2
launcher/minecraft/PackProfile.cpp
View file

@ -917,7 +917,7 @@ bool PackProfile::installAgents_internal(QStringList filepaths)
agent->setDisplayName(sourceInfo.completeBaseName()); agent->setDisplayName(sourceInfo.completeBaseName());
agent->setHint("local"); agent->setHint("local");
versionFile->agents.append(std::make_shared<Agent>(agent, QString())); versionFile->agents.append(Agent{agent, QString()});
versionFile->name = targetName; versionFile->name = targetName;
versionFile->uid = targetId; versionFile->uid = targetId;

2
launcher/minecraft/VersionFile.h
View file

@ -126,7 +126,7 @@ class VersionFile : public ProblemContainer {
QList<LibraryPtr> mavenFiles; QList<LibraryPtr> mavenFiles;
/// Prism Launcher: list of agents to add to JVM arguments /// Prism Launcher: list of agents to add to JVM arguments
QList<AgentPtr> agents; QList<Agent> agents;
/// The main jar (Minecraft version library, normally) /// The main jar (Minecraft version library, normally)
LibraryPtr mainJar; LibraryPtr mainJar;

4
launcher/minecraft/update/LibrariesTask.cpp
View file

@ -44,8 +44,8 @@ void LibrariesTask::executeTask()
libArtifactPool.append(profile->getLibraries()); libArtifactPool.append(profile->getLibraries());
libArtifactPool.append(profile->getNativeLibraries()); libArtifactPool.append(profile->getNativeLibraries());
libArtifactPool.append(profile->getMavenFiles()); libArtifactPool.append(profile->getMavenFiles());
for (auto agent : profile->getAgents()) { for (const auto& agent : profile->getAgents()) {
libArtifactPool.append(agent->library()); libArtifactPool.append(agent.library);
} }
libArtifactPool.append(profile->getMainJar()); libArtifactPool.append(profile->getMainJar());
processArtifactPool(libArtifactPool, failedLocalLibraries, inst->getLocalLibraryPath()); processArtifactPool(libArtifactPool, failedLocalLibraries, inst->getLocalLibraryPath());