Sneederix/sneedmc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

more rebranding

Browse Source
This commit is contained in:
sneedium 2022-02-20 18:18:50 -05:00
parent 68243e78a0
commit 0af1e9c7da
Signed by: sneedium
GPG Key ID: 906F66490FBE722F
26 changed files with 64 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.github/ISSUE_TEMPLATE/bug_report.yml vendored
View File

@ -8,9 +8,9 @@ body:
If you need help with running Minecraft, please visit us on our Discord before making a bug report.
Before submitting a bug report, please make sure you have read this *entire* form, and that:
* You have read the [FAQ](https://github.com/PolyMC/PolyMC/wiki/FAQ) and it has not answered your question
* You have read the [FAQ](https://github.com/Sneederix/SneedMC/wiki/FAQ) and it has not answered your question
* Your bug is not caused by Minecraft or any mods you have installed.
* Your issue has not been reported before, [make sure to use the search function!](https://github.com/PolyMC/PolyMC/issues)
* Your issue has not been reported before, [make sure to use the search function!](https://github.com/Sneederix/SneedMC/issues)
**Do not forget to give your issue a descriptive title.** "Bug in the instance screen" makes it hard to distinguish issues at a glance.
- type: dropdown

2
.github/ISSUE_TEMPLATE/config.yml vendored
View File

@ -1,5 +1,5 @@
blank_issues_enabled: true
contact_links:
- name: PolyMC Matrix Support Room
- name: SneedMC Matrix Support Room
url: https://matrix.to/#/#support:polymc.org
about: Please ask for support here before opening an issue.

6
.github/ISSUE_TEMPLATE/suggestion.yml vendored
View File

@ -9,21 +9,21 @@ body:
- type: input
attributes:
label: Role
description: In what way do you use PolyMC that needs this feature?
description: In what way do you use SneedMC that needs this feature?
placeholder: I play modded Minecraft.
validations:
required: true
- type: input
attributes:
label: Suggestion
description: What do you want PolyMC to do?
description: What do you want SneedMC to do?
placeholder: I want the cat button to meow.
validations:
required: true
- type: input
attributes:
label: Benefit
description: Why do you need PolyMC to do this?
description: Why do you need SneedMC to do this?
placeholder: so that I can always hear a cat when I need to.
validations:
required: true

16
flake.nix
View File

@ -1,5 +1,5 @@
{
description = "PolyMC flake";
description = "SneedMC flake";
inputs.nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
inputs.flake-utils.url = "github:numtide/flake-utils";
inputs.flake-compat = {
@ -26,25 +26,25 @@
];
in {
overlay = final: prev: {
inherit (self.packages.${final.system}) polymc;
inherit (self.packages.${final.system}) sneedmc;
};
} // flake-utils.lib.eachSystem systems (system:
let pkgs = import nixpkgs { inherit system; };
in {
packages = {
polymc = pkgs.libsForQt5.callPackage ./packages/nix/polymc {
sneedmc = pkgs.libsForQt5.callPackage ./packages/nix/sneedmc {
inherit self;
submoduleQuazip = quazip;
submoduleNbt = libnbtplusplus;
};
};
apps = {
polymc = flake-utils.lib.mkApp {
name = "polymc";
drv = self.packages.${system}.polymc;
sneedmc = flake-utils.lib.mkApp {
name = "sneedmc";
drv = self.packages.${system}.sneedmc;
};
};
defaultPackage = self.packages.${system}.polymc;
defaultApp = self.apps.${system}.polymc;
defaultPackage = self.packages.${system}.sneedmc;
defaultApp = self.apps.${system}.sneedmc;
});
}

2
launcher/Application.cpp
View File

@ -391,7 +391,7 @@ Application::Application(int &argc, char **argv) : QApplication(argc, argv)
#endif
/*
* Establish the mechanism for communication with an already running PolyMC that uses the same data path.
* Establish the mechanism for communication with an already running SneedMC that uses the same data path.
* If there is one, tell it what the user actually wanted to do and exit.
* We want to initialize this before logging to avoid messing with the log of a potential already running copy.
*/

8
launcher/java/JavaUtils.cpp
View File

@ -77,14 +77,14 @@ QProcessEnvironment CleanEnviroment()
qDebug() << "Env: ignoring" << key << value;
continue;
}
// filter PolyMC-related things
// filter SneedMC-related things
if(key.startsWith("QT_"))
{
qDebug() << "Env: ignoring" << key << value;
continue;
}
#if defined(Q_OS_LINUX) || defined(Q_OS_FREEBSD)
// Do not pass LD_* variables to java. They were intended for PolyMC
// Do not pass LD_* variables to java. They were intended for SneedMC
if(key.startsWith("LD_"))
{
qDebug() << "Env: ignoring" << key << value;
@ -151,7 +151,7 @@ JavaInstallPtr JavaUtils::GetDefaultJava()
QStringList addJavasFromEnv(QList<QString> javas)
{
QByteArray env = qgetenv("POLYMC_JAVA_PATHS");
QByteArray env = qgetenv("SNEEDMC_JAVA_PATHS");
#if defined(Q_OS_WIN32)
QList<QString> javaPaths = QString::fromLocal8Bit(env).split(QLatin1String(";"));
#else
@ -417,7 +417,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 SneedMC's folder
scanJavaDir("java");
// manually installed JDKs in /opt
scanJavaDir("/opt/jdk");

2
launcher/launch/LaunchTask.cpp
View File

@ -212,7 +212,7 @@ shared_qobject_ptr<LogModel> LaunchTask::getLogModel()
m_logModel->setMaxLines(m_instance->getConsoleMaxLines());
m_logModel->setStopOnOverflow(m_instance->shouldStopOnConsoleOverflow());
// FIXME: should this really be here?
m_logModel->setOverflowMessage(tr("PolyMC stopped watching the game log because the log length surpassed %1 lines.\n"
m_logModel->setOverflowMessage(tr("SneedMC stopped watching the game log because the log length surpassed %1 lines.\n"
"You may have to fix your mods because the game is still logging to files and"
" likely wasting harddrive space at an alarming rate!").arg(m_logModel->getMaxLines()));
}

4
launcher/launch/steps/CheckJava.cpp
View File

@ -87,14 +87,14 @@ void CheckJava::checkJavaFinished(JavaCheckResult result)
// Error message displayed if java can't start
emit logLine(QString("Could not start java:"), MessageLevel::Error);
emit logLines(result.errorLog.split('\n'), MessageLevel::Error);
emit logLine("\nCheck your PolyMC Java settings.", MessageLevel::Launcher);
emit logLine("\nCheck your SneedMC Java settings.", MessageLevel::Launcher);
printSystemInfo(false, false);
emitFailed(QString("Could not start java!"));
return;
}
case JavaCheckResult::Validity::ReturnedInvalidData:
{
emit logLine(QString("Java checker returned some invalid data PolyMC doesn't understand:"), MessageLevel::Error);
emit logLine(QString("Java checker returned some invalid data SneedMC doesn't understand:"), MessageLevel::Error);
emit logLines(result.outLog.split('\n'), MessageLevel::Warning);
emit logLine("\nMinecraft might not start properly.", MessageLevel::Launcher);
printSystemInfo(false, false);

14
launcher/minecraft/Library.h
View File

@ -156,7 +156,7 @@ public: /* methods */
QStringList & failedLocalFiles, const QString & overridePath) const;
private: /* methods */
/// the default storage prefix used by PolyMC
/// the default storage prefix used by SneedMC
static QString defaultStoragePrefix();
/// Get the prefix - root of the storage to be used
@ -177,23 +177,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: SneedMC-specific absolute URL. takes precedence over the implicit maven repo URL, if defined
QString m_absoluteURL;
/// PolyMC extension - filename override
/// SneedMC extension - filename override
QString m_filename;
/// DEPRECATED PolyMC extension - display name
/// DEPRECATED SneedMC extension - display name
QString m_displayname;
/**
* PolyMC-specific type hint - modifies how the library is treated
* SneedMC-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 SneedMC, but could be elsewhere
* SneedMC specific, because of FTB.
*/
QString m_storagePrefix;

2
launcher/minecraft/MinecraftInstance.cpp
View File

@ -445,7 +445,7 @@ QStringList MinecraftInstance::processMinecraftArgs(
}
// blatant self-promotion.
token_mapping["profile_name"] = token_mapping["version_name"] = "PolyMC";
token_mapping["profile_name"] = token_mapping["version_name"] = "SneedMC";
token_mapping["version_type"] = profile->getMinecraftVersionType();

26
launcher/minecraft/VersionFile.h
View File

@ -27,19 +27,19 @@ public: /* methods */
void applyTo(LaunchProfile* profile);
public: /* data */
/// PolyMC: order hint for this version file if no explicit order is set
/// SneedMC: order hint for this version file if no explicit order is set
int order = 0;
/// PolyMC: human readable name of this package
/// SneedMC: human readable name of this package
QString name;
/// PolyMC: package ID of this package
/// SneedMC: package ID of this package
QString uid;
/// PolyMC: version of this package
/// SneedMC: version of this package
QString version;
/// PolyMC: DEPRECATED dependency on a Minecraft version
/// SneedMC: DEPRECATED dependency on a Minecraft version
QString dependsOnMinecraftVersion;
/// Mojang: DEPRECATED used to version the Mojang version format
@ -51,7 +51,7 @@ public: /* data */
/// Mojang: class to launch Minecraft with
QString mainClass;
/// PolyMC: class to launch legacy Minecraft with (embed in a custom window)
/// SneedMC: class to launch legacy Minecraft with (embed in a custom window)
QString appletClass;
/// Mojang: Minecraft launch arguments (may contain placeholders for variable substitution)
@ -69,35 +69,35 @@ public: /* data */
/// Mojang: DEPRECATED asset group to be used with Minecraft
QString assets;
/// PolyMC: list of tweaker mod arguments for launchwrapper
/// SneedMC: 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
/// SneedMC: list of maven files to put in the libraries folder, but not in classpath
QList<LibraryPtr> mavenFiles;
/// The main jar (Minecraft version library, normally)
LibraryPtr mainJar;
/// PolyMC: list of attached traits of this version file - used to enable features
/// SneedMC: list of attached traits of this version file - used to enable features
QSet<QString> traits;
/// PolyMC: list of jar mods added to this version
/// SneedMC: list of jar mods added to this version
QList<LibraryPtr> jarMods;
/// PolyMC: list of mods added to this version
/// SneedMC: list of mods added to this version
QList<LibraryPtr> mods;
/**
* PolyMC: set of packages this depends on
* SneedMC: set of packages this depends on
* NOTE: this is shared with the meta format!!!
*/
Meta::RequireSet requires;
/**
* PolyMC: set of packages this conflicts with
* SneedMC: 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

@ -24,7 +24,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 SneedMC on startup.
*/
class AccountList : public QAbstractListModel
{

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

@ -41,7 +41,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 SneedMC right now so
* we don't have to rip the code to pieces to add it later.
*/
struct AccountProfile

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 SneedMC when entering server addresses.
if (fullAddress.startsWith("["))
{
int bracket = fullAddress.indexOf("]");

2
launcher/notifications/NotificationChecker.cpp
View File

@ -44,7 +44,7 @@ void NotificationChecker::checkForNotifications()
if (!m_notificationsUrl.isValid())
{
qCritical() << "Failed to check for notifications. No notifications URL set."
<< "If you'd like to use PolyMC's notification system, please pass the "
<< "If you'd like to use SneedMC's notification system, please pass the "
"URL to CMake at compile time.";
return;
}

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 SneedMC.
*
* defVal is the default value that will be returned when the settings object
* doesn't have any value for this setting.

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

@ -33,6 +33,10 @@ QString getCreditsHtml()
stream.setCodec(QTextCodec::codecForName("UTF-8"));
stream << "<center>\n";
stream << "<h3>" << QObject::tr("SneedMC Developers", "About Credits") << "</h3>\n";
stream << "<p>sneedium &lt;<a href='mailto:sneed@sneedmc.org'>sneed@sneedmc.org </a>&gt;</p>\n";
stream << "<br />\n";
stream << "<h3>" << QObject::tr("PolyMC Developers", "About Credits") << "</h3>\n";
stream << "<p>swirl &lt;<a href='mailto:swurl@swurl.xyz'>swurl@swurl.xyz </a>&gt;</p>\n";
stream << "<p>LennyMcLennington &lt;<a href='mailto:lenny@sneed.church'>lenny@sneed.church</a>&gt;</p>\n";

2
launcher/ui/dialogs/AboutDialog.ui
View File

@ -80,7 +80,7 @@
</font>
</property>
<property name="text">
<string notr="true">PolyMC</string>
<string notr="true">SneedMC</string>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>

4
launcher/ui/pages/global/AccountListPage.cpp
View File

@ -136,8 +136,8 @@ void AccountListPage::on_actionAddMicrosoft_triggered()
this,
tr("Microsoft Accounts not available"),
tr(
"Microsoft accounts are only usable on macOS 10.13 or newer, with fully updated PolyMC.\n\n"
"Please update both your operating system and PolyMC."
"Microsoft accounts are only usable on macOS 10.13 or newer, with fully updated SneedMC.\n\n"
"Please update both your operating system and SneedMC."
),
QMessageBox::Warning
)->exec();

4
launcher/ui/pages/global/MinecraftPage.ui
View File

@ -173,10 +173,10 @@
<item>
<widget class="QCheckBox" name="closeAfterLaunchCheck">
<property name="toolTip">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;PolyMC will automatically reopen when the game crashes or exits.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;SneedMC will automatically reopen when the game crashes or exits.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
<property name="text">
<string>Close PolyMC after game window opens</string>
<string>Close SneedMC after game window opens</string>
</property>
</widget>
</item>

4
launcher/ui/pages/instance/LegacyUpgradePage.ui
View File

@ -31,9 +31,9 @@
p, li { white-space: pre-wrap; }
&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Noto Sans'; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt;
&lt;h1 style=&quot; margin-top:18px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:xx-large; font-weight:600;&quot;&gt;Upgrade is required&lt;/span&gt;&lt;/h1&gt;
&lt;p style=&quot; margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;PolyMC now supports old Minecraft versions and all the required features in the new (OneSix) instance format. As a consequence, the old (Legacy) format has been entirely disabled and old instances need to be upgraded.&lt;/p&gt;
&lt;p style=&quot; margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;SneedMC now supports old Minecraft versions and all the required features in the new (OneSix) instance format. As a consequence, the old (Legacy) format has been entirely disabled and old instances need to be upgraded.&lt;/p&gt;
&lt;p style=&quot; margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;The upgrade will create a new instance with the same contents as the current one, in the new format. The original instance will remain untouched, in case anything goes wrong in the process.&lt;/p&gt;
&lt;p style=&quot; margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Please report any issues on our &lt;a href=&quot;https://github.com/PolyMC/PolyMC/issues&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#3584e4;&quot;&gt;github issues page&lt;/span&gt;&lt;/a&gt;.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
&lt;p style=&quot; margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Please report any issues on our &lt;a href=&quot;https://github.com/Sneederix/SneedMC/issues&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#3584e4;&quot;&gt;github issues page&lt;/span&gt;&lt;/a&gt;.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
<property name="openExternalLinks">
<bool>true</bool>

2
launcher/ui/pages/instance/VersionPage.cpp
View File

@ -395,7 +395,7 @@ void VersionPage::on_actionDownload_All_triggered()
{
CustomMessageBox::selectable(
this, tr("Error"),
tr("PolyMC cannot download Minecraft or update instances unless you have at least "
tr("SneedMC cannot download Minecraft or update instances unless you have at least "
"one account added.\nPlease add your Mojang or Minecraft account."),
QMessageBox::Warning)->show();
return;

3
launcher/ui/pages/modplatform/modrinth/ModrinthModel.cpp
View File

@ -254,7 +254,7 @@ void Modrinth::ListModel::searchRequestFailed(QString reason)
{
if(jobPtr->first()->m_reply->attribute(QNetworkRequest::HttpStatusCodeAttribute).toInt() == 409){
//409 Gone, notify user to update
QMessageBox::critical(nullptr, tr("Error"), tr("Modrinth API version too old!\nPlease update PolyMC!"));
QMessageBox::critical(nullptr, tr("Error"), tr("Modrinth API version too old!\nPlease update SneedMC!"));
//self-destruct
((ModDownloadDialog *)((ModrinthPage *)parent())->parentWidget())->reject();
}
@ -273,4 +273,3 @@ void Modrinth::ListModel::searchRequestFailed(QString reason)
}
}

2
launcher/ui/widgets/PageContainer.cpp
View File

@ -207,7 +207,7 @@ void PageContainer::help()
QString pageId = m_currentPage->helpPage();
if (pageId.isEmpty())
return;
DesktopServices::openUrl(QUrl("https://github.com/PolyMC/PolyMC/wiki/" + pageId));
DesktopServices::openUrl(QUrl("https://github.com/Sneederix/SneedMC/wiki/" + pageId));
}
}

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 SneedMC Discord server and talk first
## Installation

2
packages/nix/sneedmc/default.nix
View File

@ -81,7 +81,7 @@ mkDerivation rec {
'';
meta = with lib; {
homepage = "https://polymc.org/";
homepage = "https://sneedmc.org/";
description = "A free, open source launcher for Minecraft";
longDescription = ''
Allows you to have multiple, separate instances of Minecraft (each with