-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
fixup! fixup! added internal install module method
- Loading branch information
Showing
7 changed files
with
177 additions
and
125 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
15 changes: 15 additions & 0 deletions
15
groovier-engine/src/main/java/com/ericlam/mc/groovier/GroovierAddon.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,15 @@ | ||
| package com.ericlam.mc.groovier; | ||
|
|
||
| import com.google.inject.Module; | ||
|
|
||
| /** | ||
| * groovier addon | ||
| */ | ||
| public interface GroovierAddon { | ||
|
|
||
| /** | ||
| * install guice module | ||
| * @param module module | ||
| */ | ||
| void installModule(Module module); | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
259 changes: 139 additions & 120 deletions
259
groovier-plugin/src/main/groovy/com/ericlam/mc/groovier/GroovierCore.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,161 +1,180 @@ | ||
| package com.ericlam.mc.groovier; | ||
|
|
||
| import com.ericlam.mc.groovier.providers.ArgumentParserProvider; | ||
| import com.ericlam.mc.groovier.providers.GroovierLifeCycleProvider; | ||
| import com.ericlam.mc.groovier.providers.ServiceInjectorProvider; | ||
| import com.ericlam.mc.groovier.scriptloaders.*; | ||
| import com.google.inject.Guice; | ||
| import com.google.inject.Injector; | ||
| import org.jetbrains.annotations.NotNull; | ||
|
|
||
| import javax.inject.Provider; | ||
| import java.io.IOException; | ||
| import java.net.URI; | ||
| import java.net.URISyntaxException; | ||
| import java.net.URL; | ||
| import java.nio.file.*; | ||
| import java.nio.file.FileSystem; | ||
| import java.nio.file.FileSystems; | ||
| import java.nio.file.FileVisitResult; | ||
| import java.nio.file.Files; | ||
| import java.nio.file.Path; | ||
| import java.nio.file.SimpleFileVisitor; | ||
| import java.nio.file.StandardCopyOption; | ||
| import java.nio.file.attribute.BasicFileAttributes; | ||
| import java.util.Collections; | ||
| import java.util.Optional; | ||
| import java.util.concurrent.CompletableFuture; | ||
| import java.util.logging.Level; | ||
|
|
||
| public class GroovierCore implements GroovierAPI { | ||
|
|
||
| private final GroovierModule groovierModule = new GroovierModule(); | ||
|
|
||
| private static GroovierAPI api; | ||
|
|
||
| public GroovierCore() { | ||
| api = this; | ||
|
|
||
| this.bindInstance(GroovierAPI.class, this); | ||
| this.addScriptLoader(ServiceScriptsManager.class); | ||
| this.addScriptLoader(CommandScriptsManager.class); | ||
| this.addScriptLoader(EventScriptsManager.class); | ||
| this.addScriptLoader(ArgumentScriptManager.class); | ||
| this.addScriptLoader(LifeCycleScriptsManager.class); | ||
| this.bindProvider(ArgumentParser.class, ArgumentParserProvider.class); | ||
| this.bindProvider(ServiceInjector.class, ServiceInjectorProvider.class); | ||
| this.bindProvider(GroovierLifeCycle.class, GroovierLifeCycleProvider.class); | ||
| } | ||
|
|
||
| public static GroovierAPI getApi() { | ||
| return Optional.ofNullable(api).orElseThrow(() -> new IllegalStateException("groovier not initialized")); | ||
| } | ||
|
|
||
| private Injector injector; | ||
| private GroovierScriptLoader loader; | ||
| import javax.inject.Provider; | ||
|
|
||
| private GroovierLifeCycle lifeCycle; | ||
| import org.jetbrains.annotations.NotNull; | ||
|
|
||
| import com.ericlam.mc.groovier.providers.ArgumentParserProvider; | ||
| import com.ericlam.mc.groovier.providers.GroovierLifeCycleProvider; | ||
| import com.ericlam.mc.groovier.providers.ServiceInjectorProvider; | ||
| import com.ericlam.mc.groovier.scriptloaders.ArgumentScriptManager; | ||
| import com.ericlam.mc.groovier.scriptloaders.CommandScriptsManager; | ||
| import com.ericlam.mc.groovier.scriptloaders.EventScriptsManager; | ||
| import com.ericlam.mc.groovier.scriptloaders.GroovierLifeCycle; | ||
| import com.ericlam.mc.groovier.scriptloaders.LifeCycleScriptsManager; | ||
| import com.ericlam.mc.groovier.scriptloaders.ServiceScriptsManager; | ||
| import com.google.inject.Guice; | ||
| import com.google.inject.Injector; | ||
| import com.google.inject.Module; | ||
|
|
||
| public class GroovierCore implements GroovierAPI, GroovierAddon { | ||
|
|
||
| private final GroovierModule groovierModule = new GroovierModule(); | ||
|
|
||
| private static GroovierAPI api; | ||
|
|
||
| public GroovierCore() { | ||
| api = this; | ||
|
|
||
| this.bindInstance(GroovierAPI.class, this); | ||
| this.addScriptLoader(ServiceScriptsManager.class); | ||
| this.addScriptLoader(CommandScriptsManager.class); | ||
| this.addScriptLoader(EventScriptsManager.class); | ||
| this.addScriptLoader(ArgumentScriptManager.class); | ||
| this.addScriptLoader(LifeCycleScriptsManager.class); | ||
| this.bindProvider(ArgumentParser.class, ArgumentParserProvider.class); | ||
| this.bindProvider(ServiceInjector.class, ServiceInjectorProvider.class); | ||
| this.bindProvider(GroovierLifeCycle.class, GroovierLifeCycleProvider.class); | ||
| } | ||
|
|
||
| public void onLoad(ScriptPlugin plugin) { | ||
| groovierModule.bindScriptPlugin(plugin); | ||
| plugin.copyResources(); | ||
| } | ||
| public static GroovierAPI getApi() { | ||
| return Optional.ofNullable(api).orElseThrow(() -> new IllegalStateException("groovier not initialized")); | ||
| } | ||
|
|
||
| private Injector injector; | ||
| private GroovierScriptLoader loader; | ||
|
|
||
| public void onEnable(ScriptPlugin plugin) { | ||
| injector = Guice.createInjector(groovierModule); | ||
| loader = injector.getInstance(GroovierScriptLoader.class); | ||
| loader.addClassPath(); | ||
| loader.loadAllScripts().whenComplete((v, e) -> { | ||
| if (e != null) { | ||
| plugin.getLogger().log(Level.SEVERE, e, () -> "error while loading scripts: " + e.getMessage()); | ||
| } | ||
| lifeCycle = injector.getInstance(GroovierLifeCycle.class); | ||
| plugin.runSyncTask(() -> lifeCycle.onEnable()); | ||
| }); | ||
| } | ||
| private GroovierLifeCycle lifeCycle; | ||
|
|
||
| public void onDisable(ScriptPlugin plugin) { | ||
| lifeCycle.onDisable(); | ||
| loader.unloadAllScripts(); | ||
| } | ||
|
|
||
| public CompletableFuture<Void> reloadAllScripts() { | ||
| return loader.reloadAllScripts(); | ||
| } | ||
| public void onLoad(ScriptPlugin plugin) { | ||
| groovierModule.bindScriptPlugin(plugin); | ||
| plugin.copyResources(); | ||
| } | ||
|
|
||
|
|
||
| public void onEnable(ScriptPlugin plugin) { | ||
| injector = Guice.createInjector(groovierModule); | ||
| loader = injector.getInstance(GroovierScriptLoader.class); | ||
| loader.addClassPath(); | ||
| loader.loadAllScripts().whenComplete((v, e) -> { | ||
| if (e != null) { | ||
| plugin.getLogger().log(Level.SEVERE, e, () -> "error while loading scripts: " + e.getMessage()); | ||
| } | ||
| lifeCycle = injector.getInstance(GroovierLifeCycle.class); | ||
| plugin.runSyncTask(() -> lifeCycle.onEnable()); | ||
| }); | ||
| } | ||
|
|
||
| @Override | ||
| public void addScriptLoader(Class<? extends ScriptLoader> scriptLoader) { | ||
| this.groovierModule.addReloadable(scriptLoader); | ||
| } | ||
| public void onDisable(ScriptPlugin plugin) { | ||
| lifeCycle.onDisable(); | ||
| loader.unloadAllScripts(); | ||
| } | ||
|
|
||
| @Override | ||
| public <T extends ScriptValidator> void bindRegisters(Class<T> validator, T ins) { | ||
| this.groovierModule.bindRegisters(validator, ins); | ||
| } | ||
| public CompletableFuture<Void> reloadAllScripts() { | ||
| return loader.reloadAllScripts(); | ||
| } | ||
|
|
||
| @Override | ||
| public <T> void bindInstance(Class<T> type, T ins) { | ||
| this.groovierModule.bindInstance(type, ins); | ||
| } | ||
| @Override | ||
| public void addScriptLoader(Class<? extends ScriptLoader> scriptLoader) { | ||
| this.groovierModule.addReloadable(scriptLoader); | ||
| } | ||
|
|
||
| @Override | ||
| public <T, V extends T> void bindType(Class<T> type, Class<V> clazz) { | ||
| this.groovierModule.bindType(type, clazz); | ||
| } | ||
| @Override | ||
| public <T extends ScriptValidator> void bindRegisters(Class<T> validator, T ins) { | ||
| this.groovierModule.bindRegisters(validator, ins); | ||
| } | ||
|
|
||
| @Override | ||
| public <T, P extends Provider<T>> void bindProvider(Class<T> type, Class<P> clazz) { | ||
| this.groovierModule.bindProvider(type, clazz); | ||
| } | ||
| @Override | ||
| public <T> void bindInstance(Class<T> type, T ins) { | ||
| this.groovierModule.bindInstance(type, ins); | ||
| } | ||
|
|
||
| @Override | ||
| public Injector getBaseInjector() { | ||
| return Optional.ofNullable(injector).orElseThrow(() -> new IllegalStateException("groovier not initialized")); | ||
| } | ||
| @Override | ||
| public <T, V extends T> void bindType(Class<T> type, Class<V> clazz) { | ||
| this.groovierModule.bindType(type, clazz); | ||
| } | ||
|
|
||
| @Override | ||
| public ServiceInjector getServiceInjector() { | ||
| return getBaseInjector().getInstance(ServiceInjector.class); | ||
| } | ||
| @Override | ||
| public <T, P extends Provider<T>> void bindProvider(Class<T> type, Class<P> clazz) { | ||
| this.groovierModule.bindProvider(type, clazz); | ||
| } | ||
|
|
||
| @Override | ||
| public ArgumentParser getArgumentParser() { | ||
| return getBaseInjector().getInstance(ArgumentParser.class); | ||
| } | ||
| @Override | ||
| public void installModule(Module module) { | ||
| this.groovierModule.installModule(module); | ||
| } | ||
|
|
||
| public void copyFromJar(String source, final Path target) throws URISyntaxException, IOException { | ||
| @Override | ||
| public Injector getBaseInjector() { | ||
| return Optional.ofNullable(injector).orElseThrow(() -> new IllegalStateException("groovier not initialized")); | ||
| } | ||
|
|
||
| URL url = getClass().getResource(""); | ||
| @Override | ||
| public ServiceInjector getServiceInjector() { | ||
| return getBaseInjector().getInstance(ServiceInjector.class); | ||
| } | ||
|
|
||
| if (url == null) { | ||
| throw new IllegalStateException("can't find resource inside jar"); | ||
| } | ||
| @Override | ||
| public ArgumentParser getArgumentParser() { | ||
| return getBaseInjector().getInstance(ArgumentParser.class); | ||
| } | ||
|
|
||
| URI resource = url.toURI(); | ||
| public void copyFromJar(String source, final Path target) throws URISyntaxException, IOException { | ||
|
|
||
| try (FileSystem fileSystem = FileSystems.newFileSystem( | ||
| resource, | ||
| Collections.<String, String>emptyMap() | ||
| )) { | ||
| URL url = getClass().getResource(""); | ||
|
|
||
| if (url == null) { | ||
| throw new IllegalStateException("can't find resource inside jar"); | ||
| } | ||
|
|
||
| URI resource = url.toURI(); | ||
|
|
||
| try (FileSystem fileSystem = FileSystems.newFileSystem( | ||
| resource, | ||
| Collections.<String, String>emptyMap() | ||
| )) { | ||
|
|
||
| final Path jarPath = fileSystem.getPath(source); | ||
|
|
||
| Files.walkFileTree(jarPath, new SimpleFileVisitor<>() { | ||
| final Path jarPath = fileSystem.getPath(source); | ||
|
|
||
| @Override | ||
| public @NotNull FileVisitResult preVisitDirectory(Path dir, BasicFileAttributes attrs) throws IOException { | ||
| Path currentTarget = target.resolve(jarPath.relativize(dir).toString()); | ||
| if (Files.notExists(currentTarget)) Files.createDirectories(currentTarget); | ||
| return FileVisitResult.CONTINUE; | ||
| } | ||
| Files.walkFileTree(jarPath, new SimpleFileVisitor<>() { | ||
|
|
||
| @Override | ||
| public @NotNull FileVisitResult visitFile(Path file, BasicFileAttributes attrs) throws IOException { | ||
| var targetPath = target.resolve(jarPath.relativize(file).toString()); | ||
| if (Files.notExists(targetPath)) Files.copy(file, targetPath, StandardCopyOption.REPLACE_EXISTING); | ||
| return FileVisitResult.CONTINUE; | ||
| } | ||
| @Override | ||
| public @NotNull FileVisitResult preVisitDirectory(Path dir, BasicFileAttributes attrs) throws IOException { | ||
| Path currentTarget = target.resolve(jarPath.relativize(dir).toString()); | ||
| if (Files.notExists(currentTarget)) Files.createDirectories(currentTarget); | ||
| return FileVisitResult.CONTINUE; | ||
| } | ||
|
|
||
| }); | ||
| @Override | ||
| public @NotNull FileVisitResult visitFile(Path file, BasicFileAttributes attrs) throws IOException { | ||
| var targetPath = target.resolve(jarPath.relativize(file).toString()); | ||
| if (Files.notExists(targetPath)) Files.copy(file, targetPath, StandardCopyOption.REPLACE_EXISTING); | ||
| return FileVisitResult.CONTINUE; | ||
| } | ||
|
|
||
| }); | ||
|
|
||
| } | ||
|
|
||
| } | ||
|
|
||
|
|
||
| } | ||
| } | ||
| } |
18 changes: 18 additions & 0 deletions
18
groovier-plugin/src/test/groovy/com/ericlam/mc/groovytest/TestApiCasting.groovy
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,18 @@ | ||
| package com.ericlam.mc.groovytest | ||
|
|
||
| import com.ericlam.mc.groovier.GroovierAddon | ||
| import com.ericlam.mc.groovier.GroovierCore | ||
| import org.junit.jupiter.api.Test | ||
|
|
||
| class TestApiCasting { | ||
|
|
||
| @Test | ||
| void testApiCast() { | ||
| try { | ||
| def api = new GroovierCore() | ||
| def addon = api as GroovierAddon | ||
| } catch (IllegalStateException ignored) { | ||
| println "passed" | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters