return of run configs

Author: TropheusJ

build.gradle.kts

@@ -19,6 +19,12 @@ repositories {
 val mc by minecraft.creating {
     version = "1.21.5"
     distribution = Distribution.CLIENT
+
+    runs {
+        register("client") {
+            client()
+        }
+    }
 }
 
 dependencies {
@@ -31,29 +37,6 @@ dependencies {
     cichlidRuntime(cichlid.runtime("0.3.2"))
 }
 
-cichlid {
-    runs {
-//        register("client") {
-//            version = mcVer
-//        }
-//        register("client 1.21.4") {
-//            version = "1.21.4"
-//            template = "client"
-//        }
-
-//        register("serverButCooler") {
-//            template = "server"
-//            programArgs.get().remove("nogui")
-//            jvmArg("-Dmixin.debug.export=true")
-//        }
-//
-//        configureEach {
-//            version = minecraftVersion
-//            jvmArg("-Dmixin.debug.export=true")
-//        }
-    }
-}
-
 tasks.register("resolveCompileSources") {
     val view = configurations.compileClasspath.get().incoming.artifactView {
        componentFilter {

plugin/src/main/java/fish/cichlidmc/cichlid_gradle/cache/storage/RunTemplateStorage.java

@@ -1,15 +1,13 @@
 package fish.cichlidmc.cichlid_gradle.cache.storage;
 
+import fish.cichlidmc.cichlid_gradle.run.RunConfiguration;
 import fish.cichlidmc.cichlid_gradle.run.RunTemplate;
 import fish.cichlidmc.tinyjson.TinyJson;
 import fish.cichlidmc.tinyjson.value.JsonValue;
 
 import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Path;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.stream.Stream;
 
 public class RunTemplateStorage {
 	private final Path root;
@@ -18,43 +16,19 @@ public class RunTemplateStorage {
 		this.root = root;
 	}
 
-	public Map<String, RunTemplate> getTemplates(String version) {
-		Path dir = this.dir(version);
-		if (!Files.exists(dir))
-			return Map.of();
-
-		try (Stream<Path> stream = Files.list(dir)) {
-			Map<String, RunTemplate> map = new HashMap<>();
-			stream.forEach(path -> {
-				String name = extractName(path);
-				RunTemplate config = readRun(path);
-				map.put(name, config);
-			});
-			return map;
-		} catch (IOException e) {
-			throw new RuntimeException(e);
+	public RunTemplate getOrThrow(RunConfiguration.Type type) {
+		Path path = this.root.resolve(type.name + ".json");
+		if (!Files.exists(path)) {
+			throw new IllegalStateException("RunTemplate for " + type + " is missing");
 		}
-	}
-
-	public void writeRun(String version, String name, RunTemplate run) throws IOException {
-		Path file = this.dir(version).resolve(name + ".json");
-		Files.createDirectories(file.getParent());
-		Files.writeString(file, run.encode().toString());
-	}
 
-	private Path dir(String version) {
-		return this.root.resolve(version);
-	}
-
-	private RunTemplate readRun(Path file) {
-		JsonValue json = TinyJson.parseOrThrow(file);
+		JsonValue json = TinyJson.parseOrThrow(path);
 		return RunTemplate.parse(json);
 	}
 
-	private static String extractName(Path path) {
-		String fileName = path.getFileName().toString();
-		int dot = fileName.indexOf(".");
-		return dot == -1 ? fileName : fileName.substring(0, dot);
+	public void writeTemplate(String name, RunTemplate run) throws IOException {
+		Path file = this.root.resolve(name + ".json");
+		Files.createDirectories(file.getParent());
+		Files.writeString(file, run.encode().toString());
 	}
-
 }

plugin/src/main/java/fish/cichlidmc/cichlid_gradle/cache/task/impl/GenerateClientRunTemplateTask.java

@@ -3,6 +3,8 @@
 import fish.cichlidmc.cichlid_gradle.cache.storage.VersionStorage;
 import fish.cichlidmc.cichlid_gradle.cache.task.CacheTask;
 import fish.cichlidmc.cichlid_gradle.cache.task.CacheTaskEnvironment;
+import fish.cichlidmc.cichlid_gradle.run.RunTemplate;
+import fish.cichlidmc.cichlid_gradle.run.RunTemplateGenerator;
 import fish.cichlidmc.cichlid_gradle.util.Distribution;
 import fish.cichlidmc.cichlid_gradle.util.io.DownloadBatch;
 import fish.cichlidmc.cichlid_gradle.util.io.FileUtils;
@@ -40,7 +42,6 @@ public SetupTask(CacheTaskEnvironment env) {
 	@Override
 	protected String run() throws IOException {
 		if (this.env.dist == Distribution.CLIENT) {
-			// this.context.submit(new GenerateClientRunTemplateTask(this.context, this.storage.runs, this.version));
 			if (ExtractNativesTask.shouldRun(this.env.version)) {
 				this.env.submit(ExtractNativesTask::new);
 			}
@@ -91,10 +92,14 @@ protected String run() throws IOException {
 		Files.writeString(logFile, String.join("\n", log));
 		Files.delete(tempJar);
 
-		if (this.env.dist == Distribution.SERVER) {
-			// do this after remapping, so the real jar is present
-			// this.context.submit(new GenerateServerRunTemplateTask(this.context, this.storage));
-		}
+		// do this after remapping, so the real server jar is present
+		RunTemplate template = switch (this.env.dist) {
+			case SERVER -> RunTemplateGenerator.generateServer(this.env.cache, this.env.version);
+			case CLIENT -> RunTemplateGenerator.generateClient(this.env.version);
+			case MERGED -> throw new IllegalStateException("Dist is merged?");
+		};
+
+		storage.runs.writeTemplate(this.env.dist.name, template);
 
 		return null;
 	}

plugin/src/main/java/fish/cichlidmc/cichlid_gradle/cache/task/impl/GenerateServerRunTemplateTask.java

@@ -1,12 +1,8 @@
 package fish.cichlidmc.cichlid_gradle.extension;
 
-import fish.cichlidmc.cichlid_gradle.run.RunConfiguration;
-import org.gradle.api.NamedDomainObjectContainer;
 import org.gradle.api.Project;
 
 public interface CichlidExtension {
-	NamedDomainObjectContainer<RunConfiguration> getRuns();
-
 	static void setup(Project project) {
 		project.getExtensions().create(CichlidExtension.class, "cichlid", CichlidExtensionImpl.class);
 	}

plugin/src/main/java/fish/cichlidmc/cichlid_gradle/cache/task/impl/SetupTask.java

@@ -1,5 +1,6 @@
 package fish.cichlidmc.cichlid_gradle.extension.def;
 
+import fish.cichlidmc.cichlid_gradle.run.RunConfiguration;
 import fish.cichlidmc.cichlid_gradle.util.Distribution;
 import org.gradle.api.Named;
 import org.gradle.api.NamedDomainObjectContainer;
@@ -15,6 +16,7 @@ public interface MinecraftDefinition extends Named {
 	Property<Distribution> getDistribution();
 	Provider<ExternalModuleDependency> getDependency();
 	Transformers getTransformers();
+	NamedDomainObjectContainer<? extends RunConfiguration> getRuns();
 
 	interface Transformers {
 		DependencyScopeConfiguration getMod();

plugin/src/main/java/fish/cichlidmc/cichlid_gradle/extension/CichlidExtension.java

@@ -1,11 +1,14 @@
 package fish.cichlidmc.cichlid_gradle.extension.def;
 
 import fish.cichlidmc.cichlid_gradle.cache.CichlidCache;
+import fish.cichlidmc.cichlid_gradle.run.RunConfiguration;
+import fish.cichlidmc.cichlid_gradle.run.RunConfigurationImpl;
 import fish.cichlidmc.cichlid_gradle.util.Distribution;
 import fish.cichlidmc.cichlid_gradle.util.Utils;
 import fish.cichlidmc.cichlid_gradle.util.hash.Encoding;
 import fish.cichlidmc.cichlid_gradle.util.hash.HashAlgorithm;
 import org.gradle.api.InvalidUserDataException;
+import org.gradle.api.NamedDomainObjectContainer;
 import org.gradle.api.Project;
 import org.gradle.api.artifacts.ExternalModuleDependency;
 import org.gradle.api.artifacts.dsl.DependencyFactory;
@@ -26,6 +29,7 @@ public final class MinecraftDefinitionImpl implements MinecraftDefinition {
 
 	private final Property<String> version;
 	private final Property<Distribution> distribution;
+	private final NamedDomainObjectContainer<RunConfigurationImpl> runs;
 	private final TransformersImpl transformers;
 
 	private final Provider<ExternalModuleDependency> dependency;
@@ -47,6 +51,8 @@ public MinecraftDefinitionImpl(String name, Project project) {
 		this.distribution = objects.property(Distribution.class).convention(Distribution.MERGED);
 		this.distribution.finalizeValueOnRead();
 
+		this.runs = objects.domainObjectContainer(RunConfigurationImpl.class, RunConfigurationImpl.factory(project));
+
 		this.transformers = TransformersImpl.of(name, project.getConfigurations());
 
 		DependencyFactory depFactory = project.getDependencyFactory();
@@ -80,6 +86,11 @@ public TransformersImpl getTransformers() {
 		return this.transformers;
 	}
 
+	@Override
+	public NamedDomainObjectContainer<? extends RunConfiguration> getRuns() {
+		return this.runs;
+	}
+
 	public String version() {
 		if (this.version.isPresent()) {
 			return this.version.get();

plugin/src/main/java/fish/cichlidmc/cichlid_gradle/extension/def/MinecraftDefinition.java

@@ -1,38 +1,51 @@
 package fish.cichlidmc.cichlid_gradle.run;
 
-import javax.inject.Inject;
-
+import fish.cichlidmc.cichlid_gradle.util.Distribution;
 import fish.cichlidmc.cichlid_gradle.util.ListPatch;
 import org.gradle.api.Named;
+import org.gradle.api.file.DirectoryProperty;
 import org.gradle.api.provider.Property;
 import org.gradle.api.tasks.SourceSet;
 
-public abstract class RunConfiguration implements Named {
-	public abstract Property<String> getVersion();
-	public abstract Property<String> getTemplate();
-	public abstract Property<String> getMainClass();
-	public abstract Property<String> getRunDir();
-	public abstract Property<String> getSourceSet();
-	public abstract Property<ListPatch<String>> getProgramArgs();
-	public abstract Property<ListPatch<String>> getJvmArgs();
-
-	@Inject // inject name
-	public RunConfiguration() {
-		this.getRunDir().convention("run");
-		this.getSourceSet().convention("main");
-		this.getProgramArgs().convention(new ListPatch<>());
-		this.getJvmArgs().convention(new ListPatch<>());
-	}
+import java.util.Locale;
 
-	public void jvmArg(String arg) {
-		this.getJvmArgs().get().add(arg);
-	}
+public interface RunConfiguration extends Named {
+	Property<Type> getType();
+	Property<String> getMainClass();
+	DirectoryProperty getRunDir();
+	Property<String> getSourceSet();
+	Property<ListPatch<String>> getProgramArgs();
+	Property<ListPatch<String>> getJvmArgs();
 
-	public void programArg(String arg) {
-		this.getProgramArgs().get().add(arg);
-	}
+	void client();
+
+	void server();
+
+	void jvmArg(String arg);
+
+	void programArg(String arg);
+
+	void sourceSet(SourceSet sourceSet);
+
+	enum Type {
+		CLIENT(Distribution.CLIENT),
+		SERVER(Distribution.SERVER);
+
+		public final String name;
+		public final Distribution asDist;
+
+		Type(Distribution asDist) {
+			this.name = this.name().toLowerCase(Locale.ROOT);
+			this.asDist = asDist;
+		}
+
+		public boolean isCompatibleWith(Distribution dist) {
+			return this.asDist == dist || dist == Distribution.MERGED;
+		}
 
-	public void sourceSet(SourceSet sourceSet) {
-		this.getSourceSet().set(sourceSet.getName());
+		@Override
+		public String toString() {
+			return this.name;
+		}
 	}
 }