Skip to content

Commit 14f9256

Browse files
committed
Revert "Rip out auto-downloading deps"
This reverts commit ba0ccdb.
1 parent 6cea998 commit 14f9256

File tree

3 files changed

+31
-3
lines changed

3 files changed

+31
-3
lines changed

apps/oneclient/frontend/src/components/Bundle/DownloadModButton.tsx

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,14 @@ export function DownloadModButton({ cluster, file }: { cluster: ClusterModel; fi
1010
const download = useCommandMut(async () => {
1111
if ('Managed' in file.kind) {
1212
const [pkg, version] = file.kind.Managed;
13+
if (version.dependencies.length > 0)
14+
for (const dependency of version.dependencies)
15+
if (dependency.dependency_type === "required") {
16+
const slug = dependency.project_id ?? '';
17+
const versions = await bindings.core.getPackageVersions(pkg.provider, slug, cluster.mc_version, cluster.mc_loader, 0, 1);
18+
await bindings.core.downloadPackage(pkg.provider, slug, versions.items[0].version_id, cluster.id, null);
19+
}
20+
1321
await bindings.core.downloadPackage(pkg.provider, pkg.id, version.version_id, cluster.id, null);
1422
}
1523
else {

apps/oneclient/frontend/src/components/Bundle/ModCard.tsx

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -135,6 +135,14 @@ export function ModCard({ file, cluster }: ModCardProps) {
135135
const download = useCommandMut(async () => {
136136
if ('Managed' in kind) {
137137
const [pkg, version] = kind.Managed;
138+
if (version.dependencies.length > 0)
139+
for (const dependency of version.dependencies)
140+
if (dependency.dependency_type === "required") {
141+
const slug = dependency.project_id ?? '';
142+
const versions = await bindings.core.getPackageVersions(pkg.provider, slug, cluster.mc_version, cluster.mc_loader, 0, 1);
143+
await bindings.core.downloadPackage(pkg.provider, slug, versions.items[0].version_id, cluster.id, null);
144+
}
145+
138146
await bindings.core.downloadPackage(pkg.provider, pkg.id, version.version_id, cluster.id, null);
139147
}
140148
else {

apps/oneclient/frontend/src/components/DownloadMods.tsx

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -111,10 +111,22 @@ function DownloadingMods({ mods, setOpen, nextPath }: { mods: ModDataArray; setO
111111
const [downloadedMods, setDownloadedMods] = useState(0);
112112
const [modName, setModName] = useState<string | null>(null);
113113
const download = useCommandMut(async (mod: ModData) => {
114-
if (isManagedMod(mod))
114+
if (isManagedMod(mod)) {
115+
if (mod.dependencies.length > 0)
116+
for (const dependency of mod.dependencies) {
117+
const cluster = await bindings.core.getClusterById(mod.clusterId);
118+
if (!cluster)
119+
continue;
120+
if (dependency.dependency_type === "required") {
121+
const slug = dependency.project_id ?? '';
122+
const versions = await bindings.core.getPackageVersions(mod.provider, slug, cluster.mc_version, cluster.mc_loader, 0, 1);
123+
if (versions.items.length !== 0)
124+
await bindings.core.downloadPackage(mod.provider, slug, versions.items[0].version_id, cluster.id, null);
125+
}
126+
}
115127
await bindings.core.downloadPackage(mod.provider, mod.id, mod.versionId, mod.clusterId, true);
116-
else
117-
await bindings.core.downloadExternalPackage(mod.package, mod.clusterId, null, null);
128+
}
129+
else { await bindings.core.downloadExternalPackage(mod.package, mod.clusterId, null, null); }
118130
});
119131

120132
const { setting } = useSettings();

0 commit comments

Comments
 (0)