Rename
Signed-off-by: Samisafool <thenerdiestguy@gmail.com>
This commit is contained in:
parent
ddf168c536
commit
8201d1df02
@ -441,7 +441,7 @@ QList<QString> JavaUtils::FindJavaPaths()
|
|||||||
scanJavaDir("/usr/lib/jvm");
|
scanJavaDir("/usr/lib/jvm");
|
||||||
scanJavaDir("/usr/lib64/jvm");
|
scanJavaDir("/usr/lib64/jvm");
|
||||||
scanJavaDir("/usr/lib32/jvm");
|
scanJavaDir("/usr/lib32/jvm");
|
||||||
// javas stored in PolyMC's folder
|
// javas stored in Prism Launcher's folder
|
||||||
scanJavaDir("java");
|
scanJavaDir("java");
|
||||||
// manually installed JDKs in /opt
|
// manually installed JDKs in /opt
|
||||||
scanJavaDir("/opt/jdk");
|
scanJavaDir("/opt/jdk");
|
||||||
|
@ -194,7 +194,7 @@ public: /* methods */
|
|||||||
QString getCompatibleNative(const RuntimeContext & runtimeContext) const;
|
QString getCompatibleNative(const RuntimeContext & runtimeContext) const;
|
||||||
|
|
||||||
private: /* methods */
|
private: /* methods */
|
||||||
/// the default storage prefix used by PolyMC
|
/// the default storage prefix used by Prism Launcher
|
||||||
static QString defaultStoragePrefix();
|
static QString defaultStoragePrefix();
|
||||||
|
|
||||||
/// Get the prefix - root of the storage to be used
|
/// Get the prefix - root of the storage to be used
|
||||||
@ -215,23 +215,23 @@ protected: /* data */
|
|||||||
/// DEPRECATED URL prefix of the maven repo where the file can be downloaded
|
/// DEPRECATED URL prefix of the maven repo where the file can be downloaded
|
||||||
QString m_repositoryURL;
|
QString m_repositoryURL;
|
||||||
|
|
||||||
/// DEPRECATED: PolyMC-specific absolute URL. takes precedence over the implicit maven repo URL, if defined
|
/// DEPRECATED: Prism Launcher-specific absolute URL. takes precedence over the implicit maven repo URL, if defined
|
||||||
QString m_absoluteURL;
|
QString m_absoluteURL;
|
||||||
|
|
||||||
/// PolyMC extension - filename override
|
/// Prism Launcher extension - filename override
|
||||||
QString m_filename;
|
QString m_filename;
|
||||||
|
|
||||||
/// DEPRECATED PolyMC extension - display name
|
/// DEPRECATED Prism Launcher extension - display name
|
||||||
QString m_displayname;
|
QString m_displayname;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* PolyMC-specific type hint - modifies how the library is treated
|
* Prism Launcher-specific type hint - modifies how the library is treated
|
||||||
*/
|
*/
|
||||||
QString m_hint;
|
QString m_hint;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* storage - by default the local libraries folder in polymc, but could be elsewhere
|
* storage - by default the local libraries folder in Prism Launcher, but could be elsewhere
|
||||||
* PolyMC specific, because of FTB.
|
* Prism Launcher specific, because of FTB.
|
||||||
*/
|
*/
|
||||||
QString m_storagePrefix;
|
QString m_storagePrefix;
|
||||||
|
|
||||||
|
@ -62,19 +62,19 @@ public: /* methods */
|
|||||||
void applyTo(LaunchProfile* profile, const RuntimeContext & runtimeContext);
|
void applyTo(LaunchProfile* profile, const RuntimeContext & runtimeContext);
|
||||||
|
|
||||||
public: /* data */
|
public: /* data */
|
||||||
/// PolyMC: order hint for this version file if no explicit order is set
|
/// Prism Launcher: order hint for this version file if no explicit order is set
|
||||||
int order = 0;
|
int order = 0;
|
||||||
|
|
||||||
/// PolyMC: human readable name of this package
|
/// Prism Launcher: human readable name of this package
|
||||||
QString name;
|
QString name;
|
||||||
|
|
||||||
/// PolyMC: package ID of this package
|
/// Prism Launcher: package ID of this package
|
||||||
QString uid;
|
QString uid;
|
||||||
|
|
||||||
/// PolyMC: version of this package
|
/// Prism Launcher: version of this package
|
||||||
QString version;
|
QString version;
|
||||||
|
|
||||||
/// PolyMC: DEPRECATED dependency on a Minecraft version
|
/// Prism Launcher: DEPRECATED dependency on a Minecraft version
|
||||||
QString dependsOnMinecraftVersion;
|
QString dependsOnMinecraftVersion;
|
||||||
|
|
||||||
/// Mojang: DEPRECATED used to version the Mojang version format
|
/// Mojang: DEPRECATED used to version the Mojang version format
|
||||||
@ -86,13 +86,13 @@ public: /* data */
|
|||||||
/// Mojang: class to launch Minecraft with
|
/// Mojang: class to launch Minecraft with
|
||||||
QString mainClass;
|
QString mainClass;
|
||||||
|
|
||||||
/// PolyMC: class to launch legacy Minecraft with (embed in a custom window)
|
/// Prism Launcher: class to launch legacy Minecraft with (embed in a custom window)
|
||||||
QString appletClass;
|
QString appletClass;
|
||||||
|
|
||||||
/// Mojang: Minecraft launch arguments (may contain placeholders for variable substitution)
|
/// Mojang: Minecraft launch arguments (may contain placeholders for variable substitution)
|
||||||
QString minecraftArguments;
|
QString minecraftArguments;
|
||||||
|
|
||||||
/// PolyMC: Additional JVM launch arguments
|
/// Prism Launcher: Additional JVM launch arguments
|
||||||
QStringList addnJvmArguments;
|
QStringList addnJvmArguments;
|
||||||
|
|
||||||
/// Mojang: list of compatible java majors
|
/// Mojang: list of compatible java majors
|
||||||
@ -110,38 +110,38 @@ public: /* data */
|
|||||||
/// Mojang: DEPRECATED asset group to be used with Minecraft
|
/// Mojang: DEPRECATED asset group to be used with Minecraft
|
||||||
QString assets;
|
QString assets;
|
||||||
|
|
||||||
/// PolyMC: list of tweaker mod arguments for launchwrapper
|
/// Prism Launcher: list of tweaker mod arguments for launchwrapper
|
||||||
QStringList addTweakers;
|
QStringList addTweakers;
|
||||||
|
|
||||||
/// Mojang: list of libraries to add to the version
|
/// Mojang: list of libraries to add to the version
|
||||||
QList<LibraryPtr> libraries;
|
QList<LibraryPtr> libraries;
|
||||||
|
|
||||||
/// PolyMC: list of maven files to put in the libraries folder, but not in classpath
|
/// Prism Launcher: list of maven files to put in the libraries folder, but not in classpath
|
||||||
QList<LibraryPtr> mavenFiles;
|
QList<LibraryPtr> mavenFiles;
|
||||||
|
|
||||||
/// PolyMC: list of agents to add to JVM arguments
|
/// Prism Launcher: list of agents to add to JVM arguments
|
||||||
QList<AgentPtr> agents;
|
QList<AgentPtr> agents;
|
||||||
|
|
||||||
/// The main jar (Minecraft version library, normally)
|
/// The main jar (Minecraft version library, normally)
|
||||||
LibraryPtr mainJar;
|
LibraryPtr mainJar;
|
||||||
|
|
||||||
/// PolyMC: list of attached traits of this version file - used to enable features
|
/// Prism Launcher: list of attached traits of this version file - used to enable features
|
||||||
QSet<QString> traits;
|
QSet<QString> traits;
|
||||||
|
|
||||||
/// PolyMC: list of jar mods added to this version
|
/// Prism Launcher: list of jar mods added to this version
|
||||||
QList<LibraryPtr> jarMods;
|
QList<LibraryPtr> jarMods;
|
||||||
|
|
||||||
/// PolyMC: list of mods added to this version
|
/// Prism Launcher: list of mods added to this version
|
||||||
QList<LibraryPtr> mods;
|
QList<LibraryPtr> mods;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* PolyMC: set of packages this depends on
|
* Prism Launcher: set of packages this depends on
|
||||||
* NOTE: this is shared with the meta format!!!
|
* NOTE: this is shared with the meta format!!!
|
||||||
*/
|
*/
|
||||||
Meta::RequireSet requires;
|
Meta::RequireSet requires;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* PolyMC: set of packages this conflicts with
|
* Prism Launcher: set of packages this conflicts with
|
||||||
* NOTE: this is shared with the meta format!!!
|
* NOTE: this is shared with the meta format!!!
|
||||||
*/
|
*/
|
||||||
Meta::RequireSet conflicts;
|
Meta::RequireSet conflicts;
|
||||||
|
@ -44,7 +44,7 @@
|
|||||||
|
|
||||||
/*!
|
/*!
|
||||||
* List of available Mojang accounts.
|
* List of available Mojang accounts.
|
||||||
* This should be loaded in the background by PolyMC on startup.
|
* This should be loaded in the background by Prism Launcher on startup.
|
||||||
*/
|
*/
|
||||||
class AccountList : public QAbstractListModel
|
class AccountList : public QAbstractListModel
|
||||||
{
|
{
|
||||||
|
@ -61,7 +61,7 @@ Q_DECLARE_METATYPE(MinecraftAccountPtr)
|
|||||||
* A profile within someone's Mojang account.
|
* A profile within someone's Mojang account.
|
||||||
*
|
*
|
||||||
* Currently, the profile system has not been implemented by Mojang yet,
|
* Currently, the profile system has not been implemented by Mojang yet,
|
||||||
* but we might as well add some things for it in PolyMC right now so
|
* but we might as well add some things for it in Prism Launcher right now so
|
||||||
* we don't have to rip the code to pieces to add it later.
|
* we don't have to rip the code to pieces to add it later.
|
||||||
*/
|
*/
|
||||||
struct AccountProfile
|
struct AccountProfile
|
||||||
|
@ -154,7 +154,7 @@ void LauncherPartLaunch::executeTask()
|
|||||||
#else
|
#else
|
||||||
args << classPath.join(':');
|
args << classPath.join(':');
|
||||||
#endif
|
#endif
|
||||||
args << "org.polymc.EntryPoint";
|
args << "org.prismlauncher.EntryPoint";
|
||||||
|
|
||||||
qDebug() << args.join(' ');
|
qDebug() << args.join(' ');
|
||||||
|
|
||||||
|
@ -23,7 +23,7 @@ MinecraftServerTarget MinecraftServerTarget::parse(const QString &fullAddress) {
|
|||||||
|
|
||||||
// The logic below replicates the exact logic minecraft uses for parsing server addresses.
|
// The logic below replicates the exact logic minecraft uses for parsing server addresses.
|
||||||
// While the conversion is not lossless and eats errors, it ensures the same behavior
|
// While the conversion is not lossless and eats errors, it ensures the same behavior
|
||||||
// within Minecraft and PolyMC when entering server addresses.
|
// within Minecraft and Prism Launcher when entering server addresses.
|
||||||
if (fullAddress.startsWith("["))
|
if (fullAddress.startsWith("["))
|
||||||
{
|
{
|
||||||
int bracket = fullAddress.indexOf("]");
|
int bracket = fullAddress.indexOf("]");
|
||||||
|
@ -33,7 +33,7 @@ public:
|
|||||||
* Construct a Setting
|
* Construct a Setting
|
||||||
*
|
*
|
||||||
* Synonyms are all the possible names used in the settings object, in order of preference.
|
* Synonyms are all the possible names used in the settings object, in order of preference.
|
||||||
* First synonym is the ID, which identifies the setting in PolyMC.
|
* First synonym is the ID, which identifies the setting in Prism Launcher.
|
||||||
*
|
*
|
||||||
* defVal is the default value that will be returned when the settings object
|
* defVal is the default value that will be returned when the settings object
|
||||||
* doesn't have any value for this setting.
|
* doesn't have any value for this setting.
|
||||||
|
@ -1860,7 +1860,7 @@ void MainWindow::globalSettingsClosed()
|
|||||||
updateToolsMenu();
|
updateToolsMenu();
|
||||||
updateStatusCenter();
|
updateStatusCenter();
|
||||||
// This needs to be done to prevent UI elements disappearing in the event the config is changed
|
// This needs to be done to prevent UI elements disappearing in the event the config is changed
|
||||||
// but PolyMC exits abnormally, causing the window state to never be saved:
|
// but Prism Launcher exits abnormally, causing the window state to never be saved:
|
||||||
APPLICATION->settings()->set("MainWindowState", saveState().toBase64());
|
APPLICATION->settings()->set("MainWindowState", saveState().toBase64());
|
||||||
update();
|
update();
|
||||||
}
|
}
|
||||||
|
@ -69,7 +69,7 @@ QString getCreditsHtml()
|
|||||||
#endif
|
#endif
|
||||||
stream << "<center>\n";
|
stream << "<center>\n";
|
||||||
|
|
||||||
//: %1 is the name of the launcher, determined at build time, e.g. "PolyMC Developers"
|
//: %1 is the name of the launcher, determined at build time, e.g. "Prism Launcher Developers"
|
||||||
stream << "<h3>" << QObject::tr("%1 Developers", "About Credits").arg(BuildConfig.LAUNCHER_DISPLAYNAME) << "</h3>\n";
|
stream << "<h3>" << QObject::tr("%1 Developers", "About Credits").arg(BuildConfig.LAUNCHER_DISPLAYNAME) << "</h3>\n";
|
||||||
stream << QString("<p>Sefa Eyeoglu (Scrumplex) %1</p>\n") .arg(getWebsite("https://scrumplex.net"));
|
stream << QString("<p>Sefa Eyeoglu (Scrumplex) %1</p>\n") .arg(getWebsite("https://scrumplex.net"));
|
||||||
stream << QString("<p>dada513 %1</p>\n") .arg(getGitHub("dada513"));
|
stream << QString("<p>dada513 %1</p>\n") .arg(getGitHub("dada513"));
|
||||||
@ -79,7 +79,7 @@ QString getCreditsHtml()
|
|||||||
stream << QString("<p>cozyGalvinism %1</p>\n") .arg(getGitHub("cozyGalvinism"));
|
stream << QString("<p>cozyGalvinism %1</p>\n") .arg(getGitHub("cozyGalvinism"));
|
||||||
stream << "<br />\n";
|
stream << "<br />\n";
|
||||||
|
|
||||||
//: %1 is the name of the launcher, determined at build time, e.g. "PolyMC Contributors"
|
//: %1 is the name of the launcher, determined at build time, e.g. "Prism Launcher Contributors"
|
||||||
stream << "<h3>" << QObject::tr("%1 Contributors", "About Credits").arg(BuildConfig.LAUNCHER_DISPLAYNAME) << "</h3>\n";
|
stream << "<h3>" << QObject::tr("%1 Contributors", "About Credits").arg(BuildConfig.LAUNCHER_DISPLAYNAME) << "</h3>\n";
|
||||||
stream << QString("<p>DioEgizio %1</p>\n") .arg(getGitHub("DioEgizio"));
|
stream << QString("<p>DioEgizio %1</p>\n") .arg(getGitHub("DioEgizio"));
|
||||||
stream << QString("<p>flowln %1</p>\n") .arg(getGitHub("flowln"));
|
stream << QString("<p>flowln %1</p>\n") .arg(getGitHub("flowln"));
|
||||||
@ -87,7 +87,7 @@ QString getCreditsHtml()
|
|||||||
stream << "<br />\n";
|
stream << "<br />\n";
|
||||||
|
|
||||||
// TODO: possibly retrieve from git history at build time?
|
// TODO: possibly retrieve from git history at build time?
|
||||||
//: %1 is the name of the launcher, determined at build time, e.g. "PolyMC Developers"
|
//: %1 is the name of the launcher, determined at build time, e.g. "Prism Launcher Developers"
|
||||||
stream << "<h3>" << QObject::tr("%1 Developers", "About Credits").arg("MultiMC") << "</h3>\n";
|
stream << "<h3>" << QObject::tr("%1 Developers", "About Credits").arg("MultiMC") << "</h3>\n";
|
||||||
stream << "<p>Andrew Okin <<a href='mailto:forkk@forkk.net'>forkk@forkk.net</a>></p>\n";
|
stream << "<p>Andrew Okin <<a href='mailto:forkk@forkk.net'>forkk@forkk.net</a>></p>\n";
|
||||||
stream << QString("<p>Petr Mrázek <<a href='mailto:peterix@gmail.com'>peterix@gmail.com</a>></p>\n");
|
stream << QString("<p>Petr Mrázek <<a href='mailto:peterix@gmail.com'>peterix@gmail.com</a>></p>\n");
|
||||||
@ -102,7 +102,7 @@ QString getCreditsHtml()
|
|||||||
stream << "<p>Kilobyte <<a href='mailto:stiepen22@gmx.de'>stiepen22@gmx.de</a>></p>\n";
|
stream << "<p>Kilobyte <<a href='mailto:stiepen22@gmx.de'>stiepen22@gmx.de</a>></p>\n";
|
||||||
stream << "<p>Rootbear75 <<a href='https://twitter.com/rootbear75'>@rootbear75</a>></p>\n";
|
stream << "<p>Rootbear75 <<a href='https://twitter.com/rootbear75'>@rootbear75</a>></p>\n";
|
||||||
stream << "<p>Zeker Zhayard <<a href='https://twitter.com/zeker_zhayard'>@Zeker_Zhayard</a>></p>\n";
|
stream << "<p>Zeker Zhayard <<a href='https://twitter.com/zeker_zhayard'>@Zeker_Zhayard</a>></p>\n";
|
||||||
stream << "<p>Everyone else who <a href='https://github.com/PolyMC/PolyMC/graphs/contributors'>contributed</a>!</p>\n";
|
stream << "<p>Everyone else who <a href='https://github.com/PrismLauncher/PrismLauncher/graphs/contributors'>contributed</a>!</p>\n";
|
||||||
stream << "<br />\n";
|
stream << "<br />\n";
|
||||||
|
|
||||||
stream << "</center>\n";
|
stream << "</center>\n";
|
||||||
|
@ -73,12 +73,12 @@ void UpdateDialog::loadChangelog()
|
|||||||
QString url;
|
QString url;
|
||||||
if(channel == "stable")
|
if(channel == "stable")
|
||||||
{
|
{
|
||||||
url = QString("https://raw.githubusercontent.com/PolyMC/PolyMC/%1/changelog.md").arg(channel);
|
url = QString("https://raw.githubusercontent.com/PrismLauncher/PrismLauncher/%1/changelog.md").arg(channel);
|
||||||
m_changelogType = CHANGELOG_MARKDOWN;
|
m_changelogType = CHANGELOG_MARKDOWN;
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
url = QString("https://api.github.com/repos/PolyMC/PolyMC/compare/%1...%2").arg(BuildConfig.GIT_COMMIT, channel);
|
url = QString("https://api.github.com/repos/PrismLauncher/PrismLauncher/compare/%1...%2").arg(BuildConfig.GIT_COMMIT, channel);
|
||||||
m_changelogType = CHANGELOG_COMMITS;
|
m_changelogType = CHANGELOG_COMMITS;
|
||||||
}
|
}
|
||||||
dljob->addNetAction(Net::Download::makeByteArray(QUrl(url), &changelogData));
|
dljob->addNetAction(Net::Download::makeByteArray(QUrl(url), &changelogData));
|
||||||
@ -93,7 +93,7 @@ QString reprocessMarkdown(QByteArray markdown)
|
|||||||
QString output = hoedown.process(markdown);
|
QString output = hoedown.process(markdown);
|
||||||
|
|
||||||
// HACK: easier than customizing hoedown
|
// HACK: easier than customizing hoedown
|
||||||
output.replace(QRegularExpression("GH-([0-9]+)"), "<a href=\"https://github.com/PolyMC/PolyMC/issues/\\1\">GH-\\1</a>");
|
output.replace(QRegularExpression("GH-([0-9]+)"), "<a href=\"https://github.com/PrismLauncher/PrismLauncher/issues/\\1\">GH-\\1</a>");
|
||||||
qDebug() << output;
|
qDebug() << output;
|
||||||
return output;
|
return output;
|
||||||
}
|
}
|
||||||
@ -135,7 +135,7 @@ QString reprocessCommits(QByteArray json)
|
|||||||
result += "<tr><td>";
|
result += "<tr><td>";
|
||||||
if(issuenr.length())
|
if(issuenr.length())
|
||||||
{
|
{
|
||||||
result += QString("<a href=\"https://github.com/PolyMC/PolyMC/issues/%1\">GH-%2</a>").arg(issuenr, issuenr);
|
result += QString("<a href=\"https://github.com/PrismLauncher/PrismLauncher/issues/%1\">GH-%2</a>").arg(issuenr, issuenr);
|
||||||
}
|
}
|
||||||
else if(prefix.length())
|
else if(prefix.length())
|
||||||
{
|
{
|
||||||
|
@ -54,7 +54,7 @@ protected:
|
|||||||
/*!
|
/*!
|
||||||
* Downloads the version info files from the repository.
|
* Downloads the version info files from the repository.
|
||||||
* The files for both the current build, and the build that we're updating to need to be downloaded.
|
* The files for both the current build, and the build that we're updating to need to be downloaded.
|
||||||
* If the current version's info file can't be found, PolyMC will not delete files that
|
* If the current version's info file can't be found, Prism Launcher will not delete files that
|
||||||
* were removed between versions. It will still replace files that have changed, however.
|
* were removed between versions. It will still replace files that have changed, however.
|
||||||
* Note that although the repository URL for the current version is not given to the update task,
|
* Note that although the repository URL for the current version is not given to the update task,
|
||||||
* the task will attempt to look it up in the UpdateChecker's channel list.
|
* the task will attempt to look it up in the UpdateChecker's channel list.
|
||||||
|
@ -104,7 +104,7 @@ bool processFileLists
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// Next, check each file in PolyMC's folder and see if we need to update them.
|
// Next, check each file in Prism Launcher's folder and see if we need to update them.
|
||||||
for (VersionFileEntry entry : newVersion)
|
for (VersionFileEntry entry : newVersion)
|
||||||
{
|
{
|
||||||
// TODO: Let's not MD5sum a ton of files on the GUI thread. We should probably find a
|
// TODO: Let's not MD5sum a ton of files on the GUI thread. We should probably find a
|
||||||
|
@ -173,7 +173,7 @@ Available either under LGPL version 2.1 or later.
|
|||||||
|
|
||||||
## systeminfo
|
## systeminfo
|
||||||
|
|
||||||
A PolyMC-specific library for probing system information.
|
A Prism Launcher-specific library for probing system information.
|
||||||
|
|
||||||
Apache 2.0
|
Apache 2.0
|
||||||
|
|
||||||
|
@ -10,7 +10,7 @@ Notes to contributors:
|
|||||||
|
|
||||||
* Please follow the coding style of the existing source, where reasonable
|
* Please follow the coding style of the existing source, where reasonable
|
||||||
* Code contributions are released under Simplified BSD License, as specified in LICENSE. Do not contribute if this license does not suit your code
|
* Code contributions are released under Simplified BSD License, as specified in LICENSE. Do not contribute if this license does not suit your code
|
||||||
* If you are interested in working on this, come to the PolyMC Discord server and talk first
|
* If you are interested in working on this, come to the Prism Launcher Discord server and talk first
|
||||||
|
|
||||||
## Installation
|
## Installation
|
||||||
|
|
||||||
|
@ -3,19 +3,19 @@ project(launcher Java)
|
|||||||
find_package(Java 1.7 REQUIRED COMPONENTS Development)
|
find_package(Java 1.7 REQUIRED COMPONENTS Development)
|
||||||
|
|
||||||
include(UseJava)
|
include(UseJava)
|
||||||
set(CMAKE_JAVA_JAR_ENTRY_POINT org.polymc.EntryPoint)
|
set(CMAKE_JAVA_JAR_ENTRY_POINT org.prismlauncher.EntryPoint)
|
||||||
set(CMAKE_JAVA_COMPILE_FLAGS -target 7 -source 7 -Xlint:deprecation -Xlint:unchecked)
|
set(CMAKE_JAVA_COMPILE_FLAGS -target 7 -source 7 -Xlint:deprecation -Xlint:unchecked)
|
||||||
|
|
||||||
set(SRC
|
set(SRC
|
||||||
org/polymc/EntryPoint.java
|
org/prismlauncher/EntryPoint.java
|
||||||
org/polymc/Launcher.java
|
org/prismlauncher/Launcher.java
|
||||||
org/polymc/LauncherFactory.java
|
org/prismlauncher/LauncherFactory.java
|
||||||
org/polymc/impl/OneSixLauncher.java
|
org/prismlauncher/impl/OneSixLauncher.java
|
||||||
org/polymc/applet/LegacyFrame.java
|
org/prismlauncher/applet/LegacyFrame.java
|
||||||
org/polymc/exception/ParameterNotFoundException.java
|
org/prismlauncher/exception/ParameterNotFoundException.java
|
||||||
org/polymc/exception/ParseException.java
|
org/prismlauncher/exception/ParseException.java
|
||||||
org/polymc/utils/Parameters.java
|
org/prismlauncher/utils/Parameters.java
|
||||||
org/polymc/utils/Utils.java
|
org/prismlauncher/utils/Utils.java
|
||||||
net/minecraft/Launcher.java
|
net/minecraft/Launcher.java
|
||||||
)
|
)
|
||||||
add_jar(NewLaunch ${SRC})
|
add_jar(NewLaunch ${SRC})
|
||||||
|
@ -50,10 +50,10 @@
|
|||||||
* limitations under the License.
|
* limitations under the License.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
package org.polymc;
|
package org.prismlauncher;
|
||||||
|
|
||||||
import org.polymc.exception.ParseException;
|
import org.prismlauncher.exception.ParseException;
|
||||||
import org.polymc.utils.Parameters;
|
import org.prismlauncher.utils.Parameters;
|
||||||
|
|
||||||
import java.io.BufferedReader;
|
import java.io.BufferedReader;
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
@ -14,7 +14,7 @@
|
|||||||
* limitations under the License.
|
* limitations under the License.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
package org.polymc;
|
package org.prismlauncher;
|
||||||
|
|
||||||
public interface Launcher {
|
public interface Launcher {
|
||||||
|
|
@ -33,10 +33,10 @@
|
|||||||
* along with this program. If not, see <https://www.gnu.org/licenses/>.
|
* along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
package org.polymc;
|
package org.prismlauncher;
|
||||||
|
|
||||||
import org.polymc.impl.OneSixLauncher;
|
import org.prismlauncher.impl.OneSixLauncher;
|
||||||
import org.polymc.utils.Parameters;
|
import org.prismlauncher.utils.Parameters;
|
||||||
|
|
||||||
import java.util.HashMap;
|
import java.util.HashMap;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
@ -14,7 +14,7 @@
|
|||||||
* limitations under the License.
|
* limitations under the License.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
package org.polymc.applet;
|
package org.prismlauncher.applet;
|
||||||
|
|
||||||
import net.minecraft.Launcher;
|
import net.minecraft.Launcher;
|
||||||
|
|
@ -14,7 +14,7 @@
|
|||||||
* limitations under the License.
|
* limitations under the License.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
package org.polymc.exception;
|
package org.prismlauncher.exception;
|
||||||
|
|
||||||
public final class ParameterNotFoundException extends IllegalArgumentException {
|
public final class ParameterNotFoundException extends IllegalArgumentException {
|
||||||
|
|
@ -14,7 +14,7 @@
|
|||||||
* limitations under the License.
|
* limitations under the License.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
package org.polymc.exception;
|
package org.prismlauncher.exception;
|
||||||
|
|
||||||
public final class ParseException extends IllegalArgumentException {
|
public final class ParseException extends IllegalArgumentException {
|
||||||
|
|
@ -13,12 +13,12 @@
|
|||||||
* limitations under the License.
|
* limitations under the License.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
package org.polymc.impl;
|
package org.prismlauncher.impl;
|
||||||
|
|
||||||
import org.polymc.Launcher;
|
import org.prismlauncher.Launcher;
|
||||||
import org.polymc.applet.LegacyFrame;
|
import org.prismlauncher.applet.LegacyFrame;
|
||||||
import org.polymc.utils.Parameters;
|
import org.prismlauncher.utils.Parameters;
|
||||||
import org.polymc.utils.Utils;
|
import org.prismlauncher.utils.Utils;
|
||||||
|
|
||||||
import java.applet.Applet;
|
import java.applet.Applet;
|
||||||
import java.io.File;
|
import java.io.File;
|
@ -14,9 +14,9 @@
|
|||||||
* limitations under the License.
|
* limitations under the License.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
package org.polymc.utils;
|
package org.prismlauncher.utils;
|
||||||
|
|
||||||
import org.polymc.exception.ParameterNotFoundException;
|
import org.prismlauncher.exception.ParameterNotFoundException;
|
||||||
|
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
import java.util.HashMap;
|
import java.util.HashMap;
|
@ -14,7 +14,7 @@
|
|||||||
* limitations under the License.
|
* limitations under the License.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
package org.polymc.utils;
|
package org.prismlauncher.utils;
|
||||||
|
|
||||||
import java.io.File;
|
import java.io.File;
|
||||||
import java.lang.reflect.Field;
|
import java.lang.reflect.Field;
|
16
nix/NIX.md
16
nix/NIX.md
@ -5,22 +5,22 @@ To import with flakes use
|
|||||||
```nix
|
```nix
|
||||||
{
|
{
|
||||||
inputs = {
|
inputs = {
|
||||||
polymc.url = "github:PolyMC/PolyMC";
|
prismlauncher.url = "github:PrismLauncher/PrismLauncher";
|
||||||
};
|
};
|
||||||
|
|
||||||
...
|
...
|
||||||
|
|
||||||
nixpkgs.overlays = [ inputs.polymc.overlay ]; ## Within configuration.nix
|
nixpkgs.overlays = [ inputs.prismlauncher.overlay ]; ## Within configuration.nix
|
||||||
environment.systemPackages = with pkgs; [ polymc ]; ##
|
environment.systemPackages = with pkgs; [ prismlauncher ]; ##
|
||||||
}
|
}
|
||||||
```
|
```
|
||||||
|
|
||||||
To import without flakes use channels:
|
To import without flakes use channels:
|
||||||
|
|
||||||
```sh
|
```sh
|
||||||
nix-channel --add https://github.com/PolyMC/PolyMC/archive/master.tar.gz polymc
|
nix-channel --add https://github.com/PrismLauncher/PrismLauncher/archive/master.tar.gz prismlauncher
|
||||||
nix-channel --update polymc
|
nix-channel --update prismlauncher
|
||||||
nix-env -iA polymc
|
nix-env -iA prismlauncher
|
||||||
```
|
```
|
||||||
|
|
||||||
or alternatively you can use
|
or alternatively you can use
|
||||||
@ -28,9 +28,9 @@ or alternatively you can use
|
|||||||
```nix
|
```nix
|
||||||
{
|
{
|
||||||
nixpkgs.overlays = [
|
nixpkgs.overlays = [
|
||||||
(import (builtins.fetchTarball "https://github.com/PolyMC/PolyMC/archive/develop.tar.gz")).overlay
|
(import (builtins.fetchTarball "https://github.com/PrismLauncher/PrismLauncher/archive/develop.tar.gz")).overlay
|
||||||
];
|
];
|
||||||
|
|
||||||
environment.systemPackages = with pkgs; [ polymc ];
|
environment.systemPackages = with pkgs; [ prismlauncher ];
|
||||||
}
|
}
|
||||||
```
|
```
|
||||||
|
@ -1,33 +1,33 @@
|
|||||||
polymc(6)
|
prismlauncher(6)
|
||||||
|
|
||||||
|
|
||||||
# NAME
|
# NAME
|
||||||
|
|
||||||
polymc - a launcher and instance manager for Minecraft.
|
prismlauncher - a launcher and instance manager for Minecraft.
|
||||||
|
|
||||||
|
|
||||||
# SYNOPSIS
|
# SYNOPSIS
|
||||||
|
|
||||||
*polymc* [OPTIONS...]
|
*prismlauncher* [OPTIONS...]
|
||||||
|
|
||||||
|
|
||||||
# DESCRIPTION
|
# DESCRIPTION
|
||||||
|
|
||||||
PolyMC is a custom launcher for Minecraft that allows you to easily manage
|
Prism Launcher is a custom launcher for Minecraft that allows you to easily manage
|
||||||
multiple installations of Minecraft at once. It also allows you to easily
|
multiple installations of Minecraft at once. It also allows you to easily
|
||||||
install and remove mods by simply dragging and dropping.
|
install and remove mods by simply dragging and dropping.
|
||||||
Here are the current features of PolyMC.
|
Here are the current features of Prism Launcher.
|
||||||
|
|
||||||
# OPTIONS
|
# OPTIONS
|
||||||
|
|
||||||
*-d, --dir*=DIRECTORY
|
*-d, --dir*=DIRECTORY
|
||||||
Use DIRECTORY as the PolyMC root.
|
Use DIRECTORY as the Prism Launcher root.
|
||||||
|
|
||||||
*-l, --launch*=INSTANCE_ID
|
*-l, --launch*=INSTANCE_ID
|
||||||
Launch the instance specified by INSTANCE_ID.
|
Launch the instance specified by INSTANCE_ID.
|
||||||
|
|
||||||
*--alive*
|
*--alive*
|
||||||
Write a small 'live.check' file after PolyMC starts.
|
Write a small 'live.check' file after Prism Launcher starts.
|
||||||
|
|
||||||
*-h, --help*
|
*-h, --help*
|
||||||
Display help text and exit.
|
Display help text and exit.
|
||||||
@ -48,14 +48,14 @@ Here are the current features of PolyMC.
|
|||||||
|
|
||||||
# BUGS
|
# BUGS
|
||||||
|
|
||||||
https://github.com/PolyMC/PolyMC/issues
|
https://github.com/PrismLauncher/PrismLauncher/issues
|
||||||
|
|
||||||
# RESOURCES
|
# RESOURCES
|
||||||
|
|
||||||
GitHub: https://github.com/PolyMC/PolyMC
|
GitHub: https://github.com/PrismLauncher/PrismLauncher
|
||||||
|
|
||||||
Main website: https://polymc.org
|
Main website: https://prismlauncher.org
|
||||||
|
|
||||||
# AUTHORS
|
# AUTHORS
|
||||||
|
|
||||||
PolyMC Contributors
|
Prism Launcher Contributors
|
||||||
|
Loading…
Reference in New Issue
Block a user