Skip to content

Commit 02062e5

Browse files
committed
rename Run to DefaultRun
1 parent de291e9 commit 02062e5

File tree

2 files changed

+11
-11
lines changed

2 files changed

+11
-11
lines changed

plugin/src/main/java/io/github/cichlidmc/cichlid_gradle/cache/RunsStorage.java

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ public class RunsStorage {
2626
this.root = root;
2727
}
2828

29-
public List<Run> getRuns(String version) {
29+
public List<DefaultRun> getDefaultRuns(String version) {
3030
Path dir = this.dir(version);
3131
if (!Files.exists(dir))
3232
return List.of();
@@ -71,7 +71,7 @@ private void generateServerRun(FullVersion version, MinecraftMaven maven) throws
7171
throw new IllegalStateException("Main-Class attribute is missing");
7272
}
7373

74-
Run run = new Run("server", mainClass, List.of("nogui"), List.of("-Xmx1G"));
74+
DefaultRun run = new DefaultRun("server", mainClass, List.of("nogui"), List.of("-Xmx1G"));
7575
this.writeRun(version, run);
7676
}
7777
}
@@ -80,17 +80,17 @@ private Path dir(String version) {
8080
return this.root.resolve(version);
8181
}
8282

83-
private Run readRun(Path file) {
84-
return Run.parse(TinyJson.parseOrThrow(file));
83+
private DefaultRun readRun(Path file) {
84+
return DefaultRun.parse(TinyJson.parseOrThrow(file));
8585
}
8686

87-
private void writeRun(FullVersion version, Run run) throws IOException {
87+
private void writeRun(FullVersion version, DefaultRun run) throws IOException {
8888
Path file = this.dir(version.id).resolve(run.name + ".json");
8989
Files.createDirectories(file.getParent());
9090
Files.writeString(file, run.encode().toString());
9191
}
9292

93-
public record Run(String name, String mainClass, List<String> programArgs, List<String> jvmArgs) {
93+
public record DefaultRun(String name, String mainClass, List<String> programArgs, List<String> jvmArgs) {
9494
public JsonObject encode() {
9595
JsonObject json = new JsonObject();
9696
json.put("name", this.name);
@@ -100,7 +100,7 @@ public JsonObject encode() {
100100
return json;
101101
}
102102

103-
public static Run parse(JsonValue value) {
103+
public static DefaultRun parse(JsonValue value) {
104104
JsonObject json = value.asObject();
105105

106106
String name = json.get("name").asString().value();
@@ -112,7 +112,7 @@ public static Run parse(JsonValue value) {
112112
.map(arg -> arg.asString().value())
113113
.toList();
114114

115-
return new Run(name, mainClass, programArgs, jvmArgs);
115+
return new DefaultRun(name, mainClass, programArgs, jvmArgs);
116116
}
117117
}
118118
}

plugin/src/main/java/io/github/cichlidmc/cichlid_gradle/run/RunTaskGeneration.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ public static void run(String mcVer, RunsStorage runsStorage, Project project) {
2121
}
2222

2323
private static void addDefaultRuns(String mcVer, RunsStorage runsStorage, NamedDomainObjectContainer<RunConfiguration> runs) {
24-
runsStorage.getRuns(mcVer).forEach(run -> runs.register(run.name(), config -> {
24+
runsStorage.getDefaultRuns(mcVer).forEach(run -> runs.register(run.name(), config -> {
2525
config.getMainClass().set(run.mainClass());
2626
config.getProgramArgs().get().addAll(run.programArgs());
2727
config.getJvmArgs().get().addAll(run.jvmArgs());
@@ -60,6 +60,8 @@ private static String capitalizeFirstCharacter(String s) {
6060
return capital + s.substring(1);
6161
}
6262

63+
// from Application plugin
64+
6365
private record RuntimeClasspathProvider(JavaExec task, JvmFeatureInternal mainFeature) implements Callable<FileCollection> {
6466
@Override
6567
public FileCollection call() {
@@ -71,8 +73,6 @@ public FileCollection call() {
7173
}
7274
}
7375

74-
// from Application plugin
75-
7676
private static FileCollection runtimeClasspath(JvmFeatureInternal mainFeature) {
7777
return mainFeature.getSourceSet().getRuntimeClasspath();
7878
}

0 commit comments

Comments
 (0)