Skip to content

Commit 2f6c0d1

Browse files
committed
actually create the launcher profile
1 parent f7d0ab0 commit 2f6c0d1

File tree

2 files changed

+20
-25
lines changed

2 files changed

+20
-25
lines changed

src/main/java/io/github/ImpactDevelopment/installer/Installer.java

Lines changed: 0 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,6 @@
2121
import com.google.gson.GsonBuilder;
2222
import io.github.ImpactDevelopment.installer.gui.AppIcon;
2323
import io.github.ImpactDevelopment.installer.gui.AppWindow;
24-
import io.github.ImpactDevelopment.installer.impact.ImpactJsonVersion;
25-
import io.github.ImpactDevelopment.installer.profiles.VanillaProfiles;
26-
import io.github.ImpactDevelopment.installer.setting.InstallationConfig;
27-
import io.github.ImpactDevelopment.installer.setting.settings.ImpactVersionSetting;
28-
import io.github.ImpactDevelopment.installer.versions.Vanilla;
2924
import org.apache.commons.io.IOUtils;
3025

3126
import javax.swing.*;
@@ -64,26 +59,6 @@ public static void main(String... args) throws Throwable {
6459
SwingUtilities.invokeLater(AppWindow::new);
6560
}
6661

67-
public static void install(InstallationConfig config) throws Exception { // really anything can happen lol
68-
ImpactJsonVersion version = config.getSettingValue(ImpactVersionSetting.INSTANCE).fetchContents();
69-
Vanilla vanilla = new Vanilla(config);
70-
System.out.println("Installing impact " + vanilla.getId());
71-
System.out.println("Info:");
72-
version.printInfo();
73-
74-
System.out.println("Creating vanilla version");
75-
76-
vanilla.apply();
77-
78-
System.out.println("Loading existing vanilla profiles");
79-
VanillaProfiles profiles = new VanillaProfiles(config);
80-
System.out.println("Injecting impact version...");
81-
82-
profiles.addOrMutate(version.name + " " + version.version + " for " + version.mcVersion, vanilla.getId());
83-
System.out.println("Saving vanilla profiles");
84-
profiles.saveToDisk();
85-
}
86-
8762
public static String getTitle() {
8863
return project + " Installer";
8964
}

src/main/java/io/github/ImpactDevelopment/installer/versions/Vanilla.java

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
import io.github.ImpactDevelopment.installer.impact.ImpactJsonVersion;
2424
import io.github.ImpactDevelopment.installer.libraries.ILibrary;
2525
import io.github.ImpactDevelopment.installer.libraries.MavenResolver;
26+
import io.github.ImpactDevelopment.installer.profiles.VanillaProfiles;
2627
import io.github.ImpactDevelopment.installer.setting.InstallationConfig;
2728
import io.github.ImpactDevelopment.installer.setting.settings.ImpactVersionSetting;
2829
import io.github.ImpactDevelopment.installer.setting.settings.MinecraftDirectorySetting;
@@ -122,6 +123,15 @@ public static void populateLib(ILibrary lib, JsonArray libraries) {
122123

123124
@Override
124125
public void apply() throws IOException {
126+
System.out.println("Installing impact " + getId());
127+
System.out.println("Info:");
128+
version.printInfo();
129+
installVersionJson();
130+
installProfiles();
131+
}
132+
133+
private void installVersionJson() throws IOException {
134+
System.out.println("Creating vanilla version");
125135
Path directory = config.getSettingValue(MinecraftDirectorySetting.INSTANCE).resolve("versions").resolve(id);
126136
if (!Files.exists(directory)) {
127137
try {
@@ -134,6 +144,16 @@ public void apply() throws IOException {
134144
Files.write(directory.resolve(id + ".json"), Installer.gson.toJson(populate()).getBytes(StandardCharsets.UTF_8));
135145
}
136146

147+
private void installProfiles() throws IOException {
148+
System.out.println("Loading existing vanilla profiles");
149+
VanillaProfiles profiles = new VanillaProfiles(config);
150+
System.out.println("Injecting impact version...");
151+
152+
profiles.addOrMutate(version.name + " " + version.version + " for " + version.mcVersion, getId());
153+
System.out.println("Saving vanilla profiles");
154+
profiles.saveToDisk();
155+
}
156+
137157
public String getId() {
138158
return id;
139159
}

0 commit comments

Comments
 (0)