Upstream/SKCraft-Launcher
1
0
Fork 0
mirror of https://github.com/SKCraft/Launcher.git synced 2024-11-30 13:13:58 +01:00
Code Issues Projects Releases Wiki Activity

Add creator tools plugin to Curse plugin

Browse Source
This commit is contained in:
Henry Le Grys 2021-03-28 15:38:56 +01:00
parent e0a242cedc
commit 87c0bb4a83
8 changed files with 46 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
builder-plugin-curse/build.gradle
View File

@ -1,11 +1,12 @@
plugins {
id 'application'
id "com.github.johnrengelman.shadow"
id 'io.freefair.lombok'
}
version = "1.0.0"
dependencies {
implementation project(':launcher-builder')
implementation project(':creator-tools')
}
build.dependsOn(jar)

6
builder-plugin-curse/src/main/java/com/skcraft/plugin/curse/CurseBuildPlugin.java
View File

@ -13,7 +13,9 @@ public class CurseBuildPlugin extends BuilderPlugin {
@Override
public void acceptOptions(BuilderOptions builderOptions, String[] args) {
new JCommander(this.options, args);
JCommander commander = new JCommander(this.options);
commander.setAcceptUnknownOptions(true);
commander.parse(args);
if (options.getCachePath() == null) {
builderOptions.requireInputPath("--cache");
@ -22,7 +24,7 @@ public class CurseBuildPlugin extends BuilderPlugin {
if (options.getCurseModsPath() == null) {
builderOptions.requireInputPath("--curse-mods");
options.setCachePath(new File(builderOptions.getInputPath(), "cursemods"));
options.setCurseModsPath(new File(builderOptions.getInputPath(), "cursemods"));
}
}

12
builder-plugin-curse/src/main/java/com/skcraft/plugin/curse/creator/CurseCreatorPlugin.java Normal file
View File

@ -0,0 +1,12 @@
package com.skcraft.plugin.curse.creator;
import com.skcraft.launcher.builder.plugin.BuilderPlugin;
import com.skcraft.launcher.creator.plugin.CreatorToolsPlugin;
import com.skcraft.plugin.curse.CurseBuildPlugin;
public class CurseCreatorPlugin extends CreatorToolsPlugin {
@Override
public Class<? extends BuilderPlugin> getBuilderPlugin() {
return CurseBuildPlugin.class;
}
}

4
builder-plugin-curse/src/main/resources/skcraftcreator.plugin.json Normal file
View File

@ -0,0 +1,4 @@
{
"id": "skcraft:plugin/curse",
"pluginClass": "com.skcraft.plugin.curse.creator.CurseCreatorPlugin"
}

2
creator-tools/src/main/java/com/skcraft/launcher/creator/controller/task/PackBuilder.java
View File

@ -63,7 +63,7 @@ public class PackBuilder implements Callable<PackBuilder>, ProgressObservable {
for (CreatorToolsPlugin plugin : creator.getPlugins()) {
if (plugin.getBuilderPlugin() != null) {
args.add("--plugin");
args.add("--plugin-class");
args.add(plugin.getBuilderPlugin().getCanonicalName());
}
}

4
creator-tools/src/main/java/com/skcraft/launcher/creator/plugin/CreatorPluginLoader.java
View File

@ -3,6 +3,7 @@ package com.skcraft.launcher.creator.plugin;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.skcraft.launcher.builder.BuilderUtils;
import com.skcraft.launcher.builder.DirectoryWalker;
import com.skcraft.launcher.builder.plugin.BuilderPluginLoader;
import lombok.Data;
import lombok.extern.java.Log;
@ -44,6 +45,9 @@ public class CreatorPluginLoader extends DirectoryWalker {
this.getClass().getClassLoader()
);
// Fun hack to make sure the builder can load plugins
BuilderPluginLoader.setClassLoader(pluginClassLoader);
return candidates.stream()
.map(candidate -> loadPlugin(pluginClassLoader, candidate))
.collect(Collectors.toList());

7
launcher-builder/src/main/java/com/skcraft/launcher/builder/PackageBuilder.java
View File

@ -372,7 +372,10 @@ public class PackageBuilder implements Builder {
private static BuilderOptions parseArgs(String[] args) {
BuilderOptions options = new BuilderOptions();
new JCommander(options, args);
JCommander commander = new JCommander(options);
commander.setAcceptUnknownOptions(true);
commander.parse(args);
options.choosePaths();
return options;
}
@ -444,6 +447,8 @@ public class PackageBuilder implements Builder {
builder.addLoaders(options.getLoadersDir(), options.getLibrariesDir());
builder.downloadLibraries(options.getLibrariesDir());
logSection("Applying plugins...");
pluginLoader.dispatchBuild(builder);
builder.writeManifest(options.getManifestPath());

13
launcher-builder/src/main/java/com/skcraft/launcher/builder/plugin/BuilderPluginLoader.java
View File

@ -11,6 +11,7 @@ import java.util.List;
@Log
public class BuilderPluginLoader {
private static ClassLoader pluginClassLoader;
private List<BuilderPlugin> loadedPlugins = Lists.newArrayList();
public void loadClasses(List<String> classNames) {
@ -29,7 +30,7 @@ public class BuilderPluginLoader {
private <T extends BuilderPlugin> T loadClass(String pluginClassName) throws ClassNotFoundException {
try {
Class<T> pluginClass = (Class<T>) getClass().getClassLoader().loadClass(pluginClassName);
Class<T> pluginClass = (Class<T>) getClassLoader().loadClass(pluginClassName);
return pluginClass.getConstructor().newInstance();
} catch (InstantiationException e) {
@ -50,6 +51,16 @@ public class BuilderPluginLoader {
return null;
}
private static ClassLoader getClassLoader() {
if (pluginClassLoader != null) return pluginClassLoader;
return BuilderPluginLoader.class.getClassLoader();
}
public static void setClassLoader(ClassLoader loader) {
pluginClassLoader = loader;
}
public void dispatchAcceptOptions(BuilderOptions options, String[] args) {
for (BuilderPlugin plugin : loadedPlugins) {
plugin.acceptOptions(options, args);