0xf8/pollymc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #54 from Samisafool/develop

Browse Source
This commit is contained in:
DioEgizio 2022-10-19 12:13:13 +02:00 committed by GitHub
commit c6515c1dad
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
27 changed files with 89 additions and 89 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
launcher/java/JavaUtils.cpp
View File

@ -441,7 +441,7 @@ QList<QString> JavaUtils::FindJavaPaths()
scanJavaDir("/usr/lib/jvm");
scanJavaDir("/usr/lib64/jvm");
scanJavaDir("/usr/lib32/jvm");
// javas stored in PolyMC's folder
// javas stored in Prism Launcher's folder
scanJavaDir("java");
// manually installed JDKs in /opt
scanJavaDir("/opt/jdk");

14
launcher/minecraft/Library.h
View File

@ -194,7 +194,7 @@ public: /* methods */
QString getCompatibleNative(const RuntimeContext & runtimeContext) const;
private: /* methods */
/// the default storage prefix used by PolyMC
/// the default storage prefix used by Prism Launcher
static QString defaultStoragePrefix();
/// 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
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;
/// PolyMC extension - filename override
/// Prism Launcher extension - filename override
QString m_filename;
/// DEPRECATED PolyMC extension - display name
/// DEPRECATED Prism Launcher extension - display name
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;
/**
* storage - by default the local libraries folder in polymc, but could be elsewhere
* PolyMC specific, because of FTB.
* storage - by default the local libraries folder in Prism Launcher, but could be elsewhere
* Prism Launcher specific, because of FTB.
*/
QString m_storagePrefix;

30
launcher/minecraft/VersionFile.h
View File

@ -62,19 +62,19 @@ public: /* methods */
void applyTo(LaunchProfile* profile, const RuntimeContext & runtimeContext);
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;
/// PolyMC: human readable name of this package
/// Prism Launcher: human readable name of this package
QString name;
/// PolyMC: package ID of this package
/// Prism Launcher: package ID of this package
QString uid;
/// PolyMC: version of this package
/// Prism Launcher: version of this package
QString version;
/// PolyMC: DEPRECATED dependency on a Minecraft version
/// Prism Launcher: DEPRECATED dependency on a Minecraft version
QString dependsOnMinecraftVersion;
/// Mojang: DEPRECATED used to version the Mojang version format
@ -86,13 +86,13 @@ public: /* data */
/// Mojang: class to launch Minecraft with
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;
/// Mojang: Minecraft launch arguments (may contain placeholders for variable substitution)
QString minecraftArguments;
/// PolyMC: Additional JVM launch arguments
/// Prism Launcher: Additional JVM launch arguments
QStringList addnJvmArguments;
/// Mojang: list of compatible java majors
@ -110,38 +110,38 @@ public: /* data */
/// Mojang: DEPRECATED asset group to be used with Minecraft
QString assets;
/// PolyMC: list of tweaker mod arguments for launchwrapper
/// Prism Launcher: list of tweaker mod arguments for launchwrapper
QStringList addTweakers;
/// Mojang: list of libraries to add to the version
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;
/// PolyMC: list of agents to add to JVM arguments
/// Prism Launcher: list of agents to add to JVM arguments
QList<AgentPtr> agents;
/// The main jar (Minecraft version library, normally)
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;
/// PolyMC: list of jar mods added to this version
/// Prism Launcher: list of jar mods added to this version
QList<LibraryPtr> jarMods;
/// PolyMC: list of mods added to this version
/// Prism Launcher: list of mods added to this version
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!!!
*/
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!!!
*/
Meta::RequireSet conflicts;

2
launcher/minecraft/auth/AccountList.h
View File

@ -44,7 +44,7 @@
/*!
* 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
{

2
launcher/minecraft/auth/MinecraftAccount.h
View File

@ -61,7 +61,7 @@ Q_DECLARE_METATYPE(MinecraftAccountPtr)
* A profile within someone's Mojang account.
*
* 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.
*/
struct AccountProfile

2
launcher/minecraft/launch/LauncherPartLaunch.cpp
View File

@ -154,7 +154,7 @@ void LauncherPartLaunch::executeTask()
#else
args << classPath.join(':');
#endif
args << "org.polymc.EntryPoint";
args << "org.prismlauncher.EntryPoint";
qDebug() << args.join(' ');

2
launcher/minecraft/launch/MinecraftServerTarget.cpp
View File

@ -23,7 +23,7 @@ MinecraftServerTarget MinecraftServerTarget::parse(const QString &fullAddress) {
// 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
// within Minecraft and PolyMC when entering server addresses.
// within Minecraft and Prism Launcher when entering server addresses.
if (fullAddress.startsWith("["))
{
int bracket = fullAddress.indexOf("]");

2
launcher/settings/Setting.h
View File

@ -33,7 +33,7 @@ public:
* Construct a Setting
*
* 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
* doesn't have any value for this setting.

2
launcher/ui/MainWindow.cpp
View File

@ -1860,7 +1860,7 @@ void MainWindow::globalSettingsClosed()
updateToolsMenu();
updateStatusCenter();
// 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());
update();
}

8
launcher/ui/dialogs/AboutDialog.cpp
View File

@ -69,7 +69,7 @@ QString getCreditsHtml()
#endif
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 << QString("<p>Sefa Eyeoglu (Scrumplex) %1</p>\n") .arg(getWebsite("https://scrumplex.net"));
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 << "<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 << QString("<p>DioEgizio %1</p>\n") .arg(getGitHub("DioEgizio"));
stream << QString("<p>flowln %1</p>\n") .arg(getGitHub("flowln"));
@ -87,7 +87,7 @@ QString getCreditsHtml()
stream << "<br />\n";
// 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 << "<p>Andrew Okin &lt;<a href='mailto:forkk@forkk.net'>forkk@forkk.net</a>&gt;</p>\n";
stream << QString("<p>Petr Mrázek &lt;<a href='mailto:peterix@gmail.com'>peterix@gmail.com</a>&gt;</p>\n");
@ -102,7 +102,7 @@ QString getCreditsHtml()
stream << "<p>Kilobyte &lt;<a href='mailto:stiepen22@gmx.de'>stiepen22@gmx.de</a>&gt;</p>\n";
stream << "<p>Rootbear75 &lt;<a href='https://twitter.com/rootbear75'>@rootbear75</a>&gt;</p>\n";
stream << "<p>Zeker Zhayard &lt;<a href='https://twitter.com/zeker_zhayard'>@Zeker_Zhayard</a>&gt;</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 << "</center>\n";

8
launcher/ui/dialogs/UpdateDialog.cpp
View File

@ -73,12 +73,12 @@ void UpdateDialog::loadChangelog()
QString url;
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;
}
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;
}
dljob->addNetAction(Net::Download::makeByteArray(QUrl(url), &changelogData));
@ -93,7 +93,7 @@ QString reprocessMarkdown(QByteArray markdown)
QString output = hoedown.process(markdown);
// 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;
return output;
}
@ -135,7 +135,7 @@ QString reprocessCommits(QByteArray json)
result += "<tr><td>";
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())
{

2
launcher/updater/DownloadTask.h
View File

@ -54,7 +54,7 @@ protected:
/*!
* 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.
* 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.
* 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.

2
launcher/updater/GoUpdate.cpp
View File

@ -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)
{
// TODO: Let's not MD5sum a ton of files on the GUI thread. We should probably find a

4
libraries/README.md
View File

@ -173,7 +173,7 @@ Available either under LGPL version 2.1 or later.
## systeminfo
A PolyMC-specific library for probing system information.
A Prism Launcher-specific library for probing system information.
Apache 2.0
@ -183,4 +183,4 @@ A TOML language parser. Used by Forge 1.14+ to store mod metadata.
See [github repo](https://github.com/marzer/tomlplusplus).
Licenced under the MIT licence.
Licenced under the MIT licence.

2
libraries/katabasis/README.md
View File

@ -10,7 +10,7 @@ Notes to contributors:
* 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
* 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

20
libraries/launcher/CMakeLists.txt
View File

@ -3,19 +3,19 @@ project(launcher Java)
find_package(Java 1.7 REQUIRED COMPONENTS Development)
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(SRC
org/polymc/EntryPoint.java
org/polymc/Launcher.java
org/polymc/LauncherFactory.java
org/polymc/impl/OneSixLauncher.java
org/polymc/applet/LegacyFrame.java
org/polymc/exception/ParameterNotFoundException.java
org/polymc/exception/ParseException.java
org/polymc/utils/Parameters.java
org/polymc/utils/Utils.java
org/prismlauncher/EntryPoint.java
org/prismlauncher/Launcher.java
org/prismlauncher/LauncherFactory.java
org/prismlauncher/impl/OneSixLauncher.java
org/prismlauncher/applet/LegacyFrame.java
org/prismlauncher/exception/ParameterNotFoundException.java
org/prismlauncher/exception/ParseException.java
org/prismlauncher/utils/Parameters.java
org/prismlauncher/utils/Utils.java
net/minecraft/Launcher.java
)
add_jar(NewLaunch ${SRC})

6
libraries/launcher/org/polymc/EntryPoint.java → libraries/launcher/org/prismlauncher/EntryPoint.java
View File

@ -50,10 +50,10 @@
* limitations under the License.
*/
package org.polymc;
package org.prismlauncher;
import org.polymc.exception.ParseException;
import org.polymc.utils.Parameters;
import org.prismlauncher.exception.ParseException;
import org.prismlauncher.utils.Parameters;
import java.io.BufferedReader;
import java.io.IOException;

2
libraries/launcher/org/polymc/Launcher.java → libraries/launcher/org/prismlauncher/Launcher.java
View File

@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.polymc;
package org.prismlauncher;
public interface Launcher {

6
libraries/launcher/org/polymc/LauncherFactory.java → libraries/launcher/org/prismlauncher/LauncherFactory.java
View File

@ -33,10 +33,10 @@
* 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.polymc.utils.Parameters;
import org.prismlauncher.impl.OneSixLauncher;
import org.prismlauncher.utils.Parameters;
import java.util.HashMap;
import java.util.Map;

2
libraries/launcher/org/polymc/applet/LegacyFrame.java → libraries/launcher/org/prismlauncher/applet/LegacyFrame.java
View File

@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.polymc.applet;
package org.prismlauncher.applet;
import net.minecraft.Launcher;

2
libraries/launcher/org/polymc/exception/ParameterNotFoundException.java → libraries/launcher/org/prismlauncher/exception/ParameterNotFoundException.java
View File

@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.polymc.exception;
package org.prismlauncher.exception;
public final class ParameterNotFoundException extends IllegalArgumentException {

2
libraries/launcher/org/polymc/exception/ParseException.java → libraries/launcher/org/prismlauncher/exception/ParseException.java
View File

@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.polymc.exception;
package org.prismlauncher.exception;
public final class ParseException extends IllegalArgumentException {

10
libraries/launcher/org/polymc/impl/OneSixLauncher.java → libraries/launcher/org/prismlauncher/impl/OneSixLauncher.java
View File

@ -13,12 +13,12 @@
* limitations under the License.
*/
package org.polymc.impl;
package org.prismlauncher.impl;
import org.polymc.Launcher;
import org.polymc.applet.LegacyFrame;
import org.polymc.utils.Parameters;
import org.polymc.utils.Utils;
import org.prismlauncher.Launcher;
import org.prismlauncher.applet.LegacyFrame;
import org.prismlauncher.utils.Parameters;
import org.prismlauncher.utils.Utils;
import java.applet.Applet;
import java.io.File;

4
libraries/launcher/org/polymc/utils/Parameters.java → libraries/launcher/org/prismlauncher/utils/Parameters.java
View File

@ -14,9 +14,9 @@
* 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.HashMap;

2
libraries/launcher/org/polymc/utils/Utils.java → libraries/launcher/org/prismlauncher/utils/Utils.java
View File

@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.polymc.utils;
package org.prismlauncher.utils;
import java.io.File;
import java.lang.reflect.Field;

16
nix/NIX.md
View File

@ -5,22 +5,22 @@ To import with flakes use
```nix
{
inputs = {
polymc.url = "github:PolyMC/PolyMC";
prismlauncher.url = "github:PrismLauncher/PrismLauncher";
};
...
nixpkgs.overlays = [ inputs.polymc.overlay ]; ## Within configuration.nix
environment.systemPackages = with pkgs; [ polymc ]; ##
nixpkgs.overlays = [ inputs.prismlauncher.overlay ]; ## Within configuration.nix
environment.systemPackages = with pkgs; [ prismlauncher ]; ##
}
```
To import without flakes use channels:
```sh
nix-channel --add https://github.com/PolyMC/PolyMC/archive/master.tar.gz polymc
nix-channel --update polymc
nix-env -iA polymc
nix-channel --add https://github.com/PrismLauncher/PrismLauncher/archive/master.tar.gz prismlauncher
nix-channel --update prismlauncher
nix-env -iA prismlauncher
```
or alternatively you can use
@ -28,9 +28,9 @@ or alternatively you can use
```nix
{
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 ];
}
```

22
program_info/prismlauncher.6.scd
View File

@ -1,33 +1,33 @@
polymc(6)
prismlauncher(6)
# NAME
polymc - a launcher and instance manager for Minecraft.
prismlauncher - a launcher and instance manager for Minecraft.
# SYNOPSIS
*polymc* [OPTIONS...]
*prismlauncher* [OPTIONS...]
# 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
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
*-d, --dir*=DIRECTORY
Use DIRECTORY as the PolyMC root.
Use DIRECTORY as the Prism Launcher root.
*-l, --launch*=INSTANCE_ID
Launch the instance specified by INSTANCE_ID.
*--alive*
Write a small 'live.check' file after PolyMC starts.
Write a small 'live.check' file after Prism Launcher starts.
*-h, --help*
Display help text and exit.
@ -48,14 +48,14 @@ Here are the current features of PolyMC.
# BUGS
https://github.com/PolyMC/PolyMC/issues
https://github.com/PrismLauncher/PrismLauncher/issues
# RESOURCES
GitHub: https://github.com/PolyMC/PolyMC
GitHub: https://github.com/PrismLauncher/PrismLauncher
Main website: https://polymc.org
Main website: https://prismlauncher.org
# AUTHORS
PolyMC Contributors
Prism Launcher Contributors