Skip to content

Commit

Permalink
Simplify code
Browse files Browse the repository at this point in the history
  • Loading branch information
triphora committed Jul 16, 2023
1 parent d88762f commit 8d4468b
Showing 1 changed file with 3 additions and 5 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
import org.gradle.api.GradleException;
import org.jetbrains.annotations.ApiStatus;

import java.util.AbstractMap.SimpleEntry;
import java.util.Locale;
import java.util.Objects;

Expand Down Expand Up @@ -66,16 +65,15 @@ public ProjectDependency toNew(ModrinthAPI api) {
return new ProjectDependency(null, id, null, dep.getDependencyType());
} else if (this instanceof VersionDependency) {
VersionDependency dep = (VersionDependency) this;
SimpleEntry<String, String> projectInfo;
ProjectVersion version;
try {
ProjectVersion version = dep.getProjectId() == null
version = dep.getProjectId() == null
? api.versions().getVersion(dep.getVersionId()).join()
: api.versions().getVersionByNumber(dep.getProjectId(), dep.getVersionId()).join();
projectInfo = new SimpleEntry<>(version.getProjectId(), version.getId());
} catch (Exception e) {
throw new GradleException("Failed to resolve version \"" + dep.getVersionId() + "\"!", e);
}
return new ProjectDependency(projectInfo.getValue(), projectInfo.getKey(), null, dep.getDependencyType());
return new ProjectDependency(version.getId(), version.getProjectId(), null, dep.getDependencyType());
} else {
throw new GradleException("Dependency was not an instance of ModDependency or VersionDependency!");
}
Expand Down

0 comments on commit 8d4468b

Please sign in to comment.