Major clean up... for the move to module (JPMS) support...

Author: RealMangorage

src/main/java/org/mangorage/mangobotgradle/Config.java

@@ -22,17 +22,20 @@
 
 package org.mangorage.mangobotgradle;
 
-import org.gradle.api.Task;
+import org.gradle.api.Action;
 import org.gradle.jvm.tasks.Jar;
 import org.mangorage.mangobotgradle.core.resolvers.Resolver;
 import org.mangorage.mangobotgradle.tasks.DatagenTask;
 
-import java.util.function.Supplier;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
 
 public final class Config {
-    private boolean pluginDevMode = true;
+    private final List<RunConfig> runConfigs = new ArrayList<>();
+    private final List<RunConfig> runConfigs_readOnly = Collections.unmodifiableList(runConfigs);
+    private final RunConfig defaultRunConfig = new RunConfig();
     private Jar jarTask;
-    private Supplier<Task> releaseTask = () -> null;
 
     public Config() {}
 
@@ -44,15 +47,21 @@ public Jar getJarTask() {
         return jarTask;
     }
 
-    public void disableCopyOverBot() {
-        this.pluginDevMode = false;
+    public void addResolver(Resolver resolver) {
+        DatagenTask.add(resolver);
     }
 
-    public boolean isPluginDevMode() {
-        return this.pluginDevMode;
+    public void addRunConfig(Action<RunConfig> action) {
+        RunConfig runConfig = new RunConfig(); // or however you're instantiating this garbage
+        action.execute(runConfig);
+        runConfigs.add(runConfig);
     }
 
-    public void addResolver(Resolver resolver) {
-        DatagenTask.add(resolver);
+    public void useDefaultRunConfig() {
+        runConfigs.add(defaultRunConfig);
+    }
+
+    public List<RunConfig> getRunConfigs() {
+        return runConfigs_readOnly;
     }
-}
+}

src/main/java/org/mangorage/mangobotgradle/MangoBotGradlePlugin.java

@@ -26,19 +26,20 @@
 import org.gradle.api.Project;
 import org.mangorage.mangobotgradle.core.Constants;
 import org.mangorage.mangobotgradle.core.TaskRegistry;
-import org.mangorage.mangobotgradle.tasks.CopyTask;
 import org.mangorage.mangobotgradle.tasks.DatagenTask;
-import org.mangorage.mangobotgradle.tasks.RunBotJPMSTask;
 import org.mangorage.mangobotgradle.tasks.RunBotTask;
 import org.mangorage.mangobotgradle.tasks.RunInstallerTask;
 import org.mangorage.mangobotgradle.tasks.SetupPluginsTask;
 
-import java.util.List;
 import java.util.Objects;
 
 public final class MangoBotGradlePlugin implements Plugin<Project> {
+
+
+    public static Config cfg = null;
+
     private final Config config = new Config();
-    private final TaskRegistry taskRegistry = new TaskRegistry(config);
+    private final TaskRegistry taskRegistry = new TaskRegistry();
 
     public TaskRegistry getTaskRegistry() {
         return taskRegistry;
@@ -50,16 +51,19 @@ public Config getConfig() {
 
     public MangoBotGradlePlugin() {
         taskRegistry.register(t -> {
-            t.register("copyTask", CopyTask.class, config, Constants.BOT_OTHER_TASKS_GROUP);
-            t.register("setupPlugins", SetupPluginsTask.class, Constants.BOT_OTHER_TASKS_GROUP);
-
-            t.register("runInstaller", RunInstallerTask.class, Constants.INSTALLER_TASKS_GROUP);
+            MangoBotGradlePlugin.cfg = config;
 
-            t.register("runBot", RunBotTask.class, config, Constants.BOT_TASKS_GROUP);
-            t.register("runDevBot", RunBotTask.class, config, Constants.BOT_TASKS_GROUP, List.of("--dev"));
+            t.register("setupPlugins", SetupPluginsTask.class, config, Constants.BOT_OTHER_TASKS_GROUP);
 
-            t.register("runJPMSBot", RunBotJPMSTask.class, config, Constants.BOT_TASKS_GROUP, List.of("--useModules --dev"));
+            t.register("runInstaller", RunInstallerTask.class, Constants.INSTALLER_TASKS_GROUP);
 
+            config.getRunConfigs().forEach(cfg -> {
+                t.register(
+                        cfg.getName(),
+                        RunBotTask.class,
+                        cfg
+                );
+            });
         });
     }
 
@@ -71,15 +75,9 @@ public void apply(Project project) {
             t.setVisible(true);
         });
 
-        var botCfg = project.getConfigurations().create("bot", t -> {
-            t.setVisible(true);
-            t.setTransitive(false);
-        });
-
-        project.getConfigurations().create("botInternal", t -> {
+        var botCfg = project.getConfigurations().create("bootstrap", t -> {
             t.setVisible(true);
             t.setTransitive(false);
-            t.extendsFrom(project.getConfigurations().getByName("implementation"));
         });
 
         var plugin = project.getConfigurations().create("plugin", t -> {

src/main/java/org/mangorage/mangobotgradle/RunConfig.java

@@ -0,0 +1,40 @@
+package org.mangorage.mangobotgradle;
+
+import org.mangorage.mangobotgradle.core.Constants;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class RunConfig {
+    private final List<String> arguments = new ArrayList<>();
+    private String group = Constants.BOT_TASKS_GROUP;
+    private String name = "runBot";
+
+    public RunConfig() {}
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public void addArgs(String... args) {
+        arguments.addAll(
+                List.of(args)
+        );
+    }
+
+    public void setGroup(String group) {
+        this.group = group;
+    }
+
+    public String getGroup() {
+        return group;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public List<String> getArgs() {
+        return List.copyOf(arguments);
+    }
+}

src/main/java/org/mangorage/mangobotgradle/core/TaskRegistry.java

@@ -23,17 +23,14 @@
 package org.mangorage.mangobotgradle.core;
 
 import org.gradle.api.Project;
-import org.mangorage.mangobotgradle.Config;
 
 import java.util.ArrayList;
 
 public final class TaskRegistry {
-    private final Config config;
+
     private final ArrayList<IRegisterSupplier> registerSuppliers = new ArrayList<>();
 
-    public TaskRegistry(Config config) {
-        this.config = config;
-    }
+    public TaskRegistry() {}
 
     public void register(IRegisterSupplier supplier) {
         registerSuppliers.add(supplier);

src/main/java/org/mangorage/mangobotgradle/tasks/CopyTask.java

@@ -29,6 +29,7 @@
 import org.gradle.api.artifacts.ResolvedDependency;
 import org.gradle.api.artifacts.repositories.MavenArtifactRepository;
 import org.mangorage.mangobotgradle.MangoBotGradlePlugin;
+import org.mangorage.mangobotgradle.core.Constants;
 import org.mangorage.mangobotgradle.core.resolvers.ResolveDependency;
 import org.mangorage.mangobotgradle.core.resolvers.Resolver;
 import org.mangorage.mangobotgradle.util.Dependencies;
@@ -158,7 +159,7 @@ private static boolean isLocalRepository(MavenArtifactRepository repo) {
 
     public static void apply(Project project, MangoBotGradlePlugin gradleUtilsPlugin) {
         var tp = project.getTasks().register("runDatagen", task -> {
-            task.setGroup("bot tasks");
+            task.setGroup(Constants.BOT_OTHER_TASKS_GROUP);
             task.doLast(action -> {
                 var repos = getAllRepositories(project);
                 var deps = new ArrayList<String>();

src/main/java/org/mangorage/mangobotgradle/tasks/DatagenTask.java

@@ -1,39 +1,17 @@
-/*
- * Copyright (c) 2023. MangoRage
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
- * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
- * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE
- * OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
 package org.mangorage.mangobotgradle.tasks;
 
 import org.gradle.api.Task;
+import org.gradle.api.file.FileCollection;
 import org.gradle.api.tasks.JavaExec;
-import org.mangorage.mangobotgradle.Config;
+import org.mangorage.mangobotgradle.RunConfig;
 
 import javax.inject.Inject;
 import java.util.ArrayList;
-import java.util.List;
 
 public abstract class RunBotTask extends JavaExec {
     @Inject
-    public RunBotTask(Config config, String group, List<String> args) {
-        setGroup(group);
+    public RunBotTask(RunConfig runConfig) {
+        setGroup(runConfig.getGroup());
         setDescription("Runs the bot");
 
         ArrayList<Task> deps = new ArrayList<>();
@@ -43,9 +21,16 @@ public RunBotTask(Config config, String group, List<String> args) {
         setDependsOn(deps);
         mustRunAfter(deps);
 
-        classpath(getProject().getConfigurations().getByName(config.isPluginDevMode() ? "bot" : "botInternal").getFiles());
-        getMainClass().set("org.mangorage.mangobot.loader.Loader");
         setWorkingDir(getProject().file("build/run/"));
-        setArgs(args);
+        setArgs(runConfig.getArgs());
+        getMainClass().set("");
+
+        // Create your module path from the config
+        FileCollection modulePath = getProject().getConfigurations().getByName("bootstrap");
+
+        setClasspath(modulePath); // EMPTY CLASSPATH, this is MODULE mode
+        getMainClass().set("org.mangorage.bootstrap.Bootstrap");
+        getMainModule().set("org.mangorage.bootstrap");
+        getModularity().getInferModulePath().set(true);
     }
 }