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

Merge pull request #1659 from 62832/neoforge

Browse Source 
Add NeoForge support
This commit is contained in:
Lenny McLennington 2024-07-10 23:42:08 +01:00 committed by GitHub
commit 4f5422e069
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
15 changed files with 85 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
launcher/minecraft/PackProfile.cpp
View File

@ -60,6 +60,7 @@
static const QMap<QString, ModAPI::ModLoaderType> modloaderMapping{
{"net.minecraftforge", ModAPI::Forge},
{"net.neoforged.neoforge", ModAPI::NeoForge},
{"net.fabricmc.fabric-loader", ModAPI::Fabric},
{"org.quiltmc.quilt-loader", ModAPI::Quilt}
};

2
launcher/minecraft/mod/tasks/LocalModParseTask.cpp
View File

@ -297,7 +297,7 @@ void LocalModParseTask::processAsZip()
QuaZipFile file(&zip);
if (zip.setCurrentFile("META-INF/mods.toml")) {
if (zip.setCurrentFile("META-INF/neoforge.mods.toml") || zip.setCurrentFile("META-INF/mods.toml")) {
if (!file.open(QIODevice::ReadOnly)) {
zip.close();
return;

5
launcher/modplatform/ModAPI.h
View File

@ -60,7 +60,8 @@ class ModAPI {
Cauldron = 1 << 1,
LiteLoader = 1 << 2,
Fabric = 1 << 3,
Quilt = 1 << 4
Quilt = 1 << 4,
NeoForge = 1 << 5
};
Q_DECLARE_FLAGS(ModLoaderTypes, ModLoaderType)
@ -93,6 +94,8 @@ class ModAPI {
break;
case Forge:
return "forge";
case NeoForge:
return "neoforge";
case Cauldron:
return "cauldron";
case LiteLoader:

2
launcher/modplatform/flame/FlameAPI.h
View File

@ -79,6 +79,8 @@ class FlameAPI : public NetworkModAPI {
// TODO: remove this once Quilt drops official Fabric support
if (loaders & Quilt) // NOTE: Most if not all Fabric mods should work *currently*
return 4; // Quilt would probably be 5
if (loaders & NeoForge)
return 6;
return 0;
}
};

8
launcher/modplatform/flame/FlameInstanceCreationTask.cpp
View File

@ -257,6 +257,7 @@ bool FlameCreationTask::createInstance()
QString forgeVersion;
QString fabricVersion;
QString neoforgeVersion;
// TODO: is Quilt relevant here?
for (auto& loader : m_pack.minecraft.modLoaders) {
auto id = loader.id;
@ -270,6 +271,11 @@ bool FlameCreationTask::createInstance()
fabricVersion = id;
continue;
}
if (id.startsWith("neoforge-")) {
id.remove("neoforge-");
neoforgeVersion = id;
continue;
}
logWarning(tr("Unknown mod loader in manifest: %1").arg(id));
}
@ -300,6 +306,8 @@ bool FlameCreationTask::createInstance()
}
if (!fabricVersion.isEmpty())
components->setComponentVersion("net.fabricmc.fabric-loader", fabricVersion);
if (!neoforgeVersion.isEmpty())
components->setComponentVersion("net.neoforged.neoforge", neoforgeVersion);
if (m_instIcon != "default") {
instance.setIconKey(m_instIcon);

2
launcher/modplatform/modpacksch/FTBPackInstallTask.cpp
View File

@ -313,6 +313,8 @@ void PackInstallTask::install()
components->setComponentVersion("net.minecraftforge", target.version);
} else if (target.name == "fabric") {
components->setComponentVersion("net.fabricmc.fabric-loader", target.version);
} else if (target.name == "neoforge") {
components->setComponentVersion("net.neoforged.neoforge", target.version);
}
}

6
launcher/modplatform/modrinth/ModrinthAPI.h
View File

@ -55,7 +55,7 @@ class ModrinthAPI : public NetworkModAPI {
static auto getModLoaderStrings(const ModLoaderTypes types) -> const QStringList
{
QStringList l;
for (auto loader : {Forge, Fabric, Quilt})
for (auto loader : {Forge, NeoForge, Fabric, Quilt})
{
if ((types & loader) || types == Unspecified)
{
@ -81,7 +81,7 @@ class ModrinthAPI : public NetworkModAPI {
inline auto getModSearchURL(SearchArgs& args) const -> QString override
{
if (!validateModLoaders(args.loaders)) {
qWarning() << "Modrinth only have Forge and Fabric-compatible mods!";
qWarning() << "Modrinth only have Forge, NeoForge and Fabric-compatible mods!";
return "";
}
@ -132,7 +132,7 @@ class ModrinthAPI : public NetworkModAPI {
inline auto validateModLoaders(ModLoaderTypes loaders) const -> bool
{
return (loaders == Unspecified) || (loaders & (Forge | Fabric | Quilt));
return (loaders == Unspecified) || (loaders & (Forge | NeoForge | Fabric | Quilt));
}
};

2
launcher/modplatform/modrinth/ModrinthCheckUpdate.cpp
View File

@ -108,7 +108,7 @@ void ModrinthCheckUpdate::executeTask()
// Sometimes a version may have multiple files, one with "forge" and one with "fabric",
// so we may want to filter it
QString loader_filter;
static auto flags = { ModAPI::ModLoaderType::Forge, ModAPI::ModLoaderType::Fabric, ModAPI::ModLoaderType::Quilt };
static auto flags = { ModAPI::ModLoaderType::Forge, ModAPI::ModLoaderType::NeoForge, ModAPI::ModLoaderType::Fabric, ModAPI::ModLoaderType::Quilt };
for (auto flag : flags) {
if (m_loaders.testFlag(flag)) {
loader_filter = api.getModLoaderString(flag);

4
launcher/modplatform/modrinth/ModrinthInstanceCreationTask.cpp
View File

@ -215,6 +215,8 @@ bool ModrinthCreationTask::createInstance()
components->setComponentVersion("org.quiltmc.quilt-loader", quiltVersion);
if (!forgeVersion.isEmpty())
components->setComponentVersion("net.minecraftforge", forgeVersion);
if (!neoforgeVersion.isEmpty())
components->setComponentVersion("net.neoforged.neoforge", neoforgeVersion);
if (m_instIcon != "default") {
instance.setIconKey(m_instIcon);
@ -385,6 +387,8 @@ bool ModrinthCreationTask::parseManifest(const QString& index_path, std::vector<
quiltVersion = Json::requireString(*it, "Quilt Loader version");
} else if (name == "forge") {
forgeVersion = Json::requireString(*it, "Forge version");
} else if (name == "neoforge") {
neoforgeVersion = Json::requireString(*it, "NeoForge version");
} else {
throw JSONValidationError("Unknown dependency type: " + name);
}

2
launcher/modplatform/modrinth/ModrinthInstanceCreationTask.h
View File

@ -33,7 +33,7 @@ class ModrinthCreationTask final : public InstanceCreationTask {
private:
QWidget* m_parent = nullptr;
QString minecraftVersion, fabricVersion, quiltVersion, forgeVersion;
QString minecraftVersion, fabricVersion, quiltVersion, forgeVersion, neoforgeVersion;
QString m_managed_id, m_managed_version_id, m_managed_name;
QString m_source_url;

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

@ -240,6 +240,9 @@ void VersionPage::updateVersionControls()
ui->actionInstall_Forge->setEnabled(controlsEnabled);
bool supportsNeoForge = minecraftVersion >= Version("1.20.1");
ui->actionInstall_NeoForge->setEnabled(controlsEnabled && supportsNeoForge);
bool supportsFabric = minecraftVersion >= Version("1.14");
ui->actionInstall_Fabric->setEnabled(controlsEnabled && supportsFabric);
@ -473,6 +476,35 @@ void VersionPage::on_actionInstall_Forge_triggered()
}
}
void VersionPage::on_actionInstall_NeoForge_triggered()
{
auto vlist = APPLICATION->metadataIndex()->get("net.neoforged.neoforge");
if(!vlist)
{
return;
}
VersionSelectDialog vselect(vlist.get(), tr("Select NeoForge version"), this);
vselect.setExactFilter(BaseVersionList::ParentVersionRole, m_profile->getComponentVersion("net.minecraft"));
vselect.setEmptyString(tr("No NeoForge versions are currently available for Minecraft ") + m_profile->getComponentVersion("net.minecraft"));
vselect.setEmptyErrorString(tr("Couldn't load or download the NeoForge version lists!"));
auto currentVersion = m_profile->getComponentVersion("net.neoforged.neoforge");
if(!currentVersion.isEmpty())
{
vselect.setCurrentVersion(currentVersion);
}
if (vselect.exec() && vselect.selectedVersion())
{
auto vsn = vselect.selectedVersion();
m_profile->setComponentVersion("net.neoforged.neoforge", vsn->descriptor());
m_profile->resolve(Net::Mode::Online);
// m_profile->installVersion();
preselect(m_profile->rowCount(QModelIndex())-1);
m_container->refreshContainer();
}
}
void VersionPage::on_actionInstall_Fabric_triggered()
{
auto vlist = APPLICATION->metadataIndex()->get("net.fabricmc.fabric-loader");

1
launcher/ui/pages/instance/VersionPage.h
View File

@ -72,6 +72,7 @@ public:
private slots:
void on_actionChange_version_triggered();
void on_actionInstall_Forge_triggered();
void on_actionInstall_NeoForge_triggered();
void on_actionInstall_Fabric_triggered();
void on_actionInstall_Quilt_triggered();
void on_actionAdd_Empty_triggered();

9
launcher/ui/pages/instance/VersionPage.ui
View File

@ -106,6 +106,7 @@
<addaction name="actionRevert"/>
<addaction name="separator"/>
<addaction name="actionInstall_Forge"/>
<addaction name="actionInstall_NeoForge"/>
<addaction name="actionInstall_Fabric"/>
<addaction name="actionInstall_Quilt"/>
<addaction name="actionInstall_LiteLoader"/>
@ -185,6 +186,14 @@
<string>Install the Minecraft Forge package.</string>
</property>
</action>
<action name="actionInstall_NeoForge">
<property name="text">
<string>Install NeoForge</string>
</property>
<property name="toolTip">
<string>Install the NeoForge package.</string>
</property>
</action>
<action name="actionInstall_Fabric">
<property name="text">
<string>Install Fabric</string>

6
launcher/ui/pages/modplatform/VanillaPage.cpp
View File

@ -64,6 +64,7 @@ VanillaPage::VanillaPage(NewInstanceDialog *dialog, QWidget *parent)
connect(ui->loaderVersionList, &VersionSelectWidget::selectedVersionChanged, this, &VanillaPage::setSelectedLoaderVersion);
connect(ui->noneFilter, &QRadioButton::toggled, this, &VanillaPage::loaderFilterChanged);
connect(ui->forgeFilter, &QRadioButton::toggled, this, &VanillaPage::loaderFilterChanged);
connect(ui->neoForgeFilter, &QRadioButton::toggled, this, &VanillaPage::loaderFilterChanged);
connect(ui->fabricFilter, &QRadioButton::toggled, this, &VanillaPage::loaderFilterChanged);
connect(ui->quiltFilter, &QRadioButton::toggled, this, &VanillaPage::loaderFilterChanged);
connect(ui->liteLoaderFilter, &QRadioButton::toggled, this, &VanillaPage::loaderFilterChanged);
@ -142,6 +143,11 @@ void VanillaPage::loaderFilterChanged()
ui->loaderVersionList->setExactFilter(BaseVersionList::ParentVersionRole, minecraftVersion);
m_selectedLoader = "net.minecraftforge";
}
else if(ui->neoForgeFilter->isChecked())
{
ui->loaderVersionList->setExactFilter(BaseVersionList::ParentVersionRole, minecraftVersion);
m_selectedLoader = "net.neoforged.neoforge";
}
else if(ui->fabricFilter->isChecked())
{
// FIXME: dirty hack because the launcher is unaware of Fabric's dependencies

10
launcher/ui/pages/modplatform/VanillaPage.ui
View File

@ -204,6 +204,16 @@
</attribute>
</widget>
</item>
<item>
<widget class="QRadioButton" name="neoForgeFilter">
<property name="text">
<string>NeoForge</string>
</property>
<attribute name="buttonGroup">
<string notr="true">loaderBtnGroup</string>
</attribute>
</widget>
</item>
<item>
<widget class="QRadioButton" name="fabricFilter">
<property name="text">