Disable anything related to user.json for now. Will be re-enabled once we have a gui for it.
This commit is contained in:
parent
983a40698c
commit
790402bdce
@ -109,26 +109,6 @@ void OneSixModEditDialog::disableVersionControls()
|
||||
ui->mainClassEdit->setText("");
|
||||
}
|
||||
|
||||
void OneSixModEditDialog::on_userEditorBtn_clicked()
|
||||
{
|
||||
QDir root(m_inst->instanceRoot());
|
||||
if (!root.exists("user.json"))
|
||||
{
|
||||
QFile file(root.absoluteFilePath("user.json"));
|
||||
if (!file.open(QFile::WriteOnly))
|
||||
{
|
||||
QMessageBox::critical(this, tr("Error"), tr("Couldn't write a skeletion user.json file: %1").arg(file.errorString()));
|
||||
return;
|
||||
}
|
||||
file.write("{\n}");
|
||||
file.close();
|
||||
}
|
||||
if (!MMC->openJsonEditor(root.absoluteFilePath("user.json")))
|
||||
{
|
||||
QMessageBox::warning(this, tr("Error"), tr("Unable to open user.json, check the settings"));
|
||||
}
|
||||
}
|
||||
|
||||
void OneSixModEditDialog::on_reloadLibrariesBtn_clicked()
|
||||
{
|
||||
m_inst->reloadVersion(this);
|
||||
|
@ -45,7 +45,6 @@ slots:
|
||||
void on_buttonBox_rejected();
|
||||
void on_forgeBtn_clicked();
|
||||
void on_liteloaderBtn_clicked();
|
||||
void on_userEditorBtn_clicked();
|
||||
void on_reloadLibrariesBtn_clicked();
|
||||
void on_removeLibraryBtn_clicked();
|
||||
void updateVersionControls();
|
||||
|
@ -44,7 +44,7 @@
|
||||
<enum>Qt::ScrollBarAlwaysOff</enum>
|
||||
</property>
|
||||
<attribute name="headerVisible">
|
||||
<bool>true</bool>
|
||||
<bool>false</bool>
|
||||
</attribute>
|
||||
</widget>
|
||||
</item>
|
||||
@ -108,20 +108,6 @@
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="Line" name="line_2">
|
||||
<property name="orientation">
|
||||
<enum>Qt::Horizontal</enum>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="QPushButton" name="userEditorBtn">
|
||||
<property name="text">
|
||||
<string>Open user.json</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<spacer name="verticalSpacer_7">
|
||||
<property name="orientation">
|
||||
|
@ -750,7 +750,7 @@ bool OneSixVersionBuilder::build(const bool excludeCustom)
|
||||
}
|
||||
else
|
||||
{
|
||||
// version.json -> patches/*.json -> instance.json
|
||||
// version.json -> patches/*.json -> user.json
|
||||
|
||||
// version.json
|
||||
{
|
||||
@ -810,6 +810,7 @@ bool OneSixVersionBuilder::build(const bool excludeCustom)
|
||||
}
|
||||
}
|
||||
|
||||
#if 0
|
||||
// user.json
|
||||
if (!excludeCustom)
|
||||
{
|
||||
@ -838,6 +839,7 @@ bool OneSixVersionBuilder::build(const bool excludeCustom)
|
||||
}
|
||||
}
|
||||
}
|
||||
#endif
|
||||
}
|
||||
|
||||
// some final touches
|
||||
|
Loading…
Reference in New Issue
Block a user