diff --git a/build.gradle b/build.gradle index 0ec9456..bc60231 100755 --- a/build.gradle +++ b/build.gradle @@ -20,6 +20,7 @@ apply plugin: 'GradleRIO' //Apply the GradleRIO apply plugin: 'java' apply plugin: 'idea' apply plugin: 'eclipse' +apply plugin: 'groovy' apply plugin: BuildGradle apply plugin: 'maven' diff --git a/build.settings b/build.settings index 2abe7ea..5cfd2c1 100644 --- a/build.settings +++ b/build.settings @@ -1 +1 @@ -toast.version=0.2.0 +toast.version=0.3.0 diff --git a/src/main/java/jaci/openrio/toast/core/command/cmd/CommandGroovyScript.groovy b/src/main/java/jaci/openrio/toast/core/command/cmd/CommandGroovyScript.groovy deleted file mode 100644 index 3c38ef0..0000000 --- a/src/main/java/jaci/openrio/toast/core/command/cmd/CommandGroovyScript.groovy +++ /dev/null @@ -1,23 +0,0 @@ -package jaci.openrio.toast.core.command.cmd - -import jaci.openrio.toast.core.Toast -import jaci.openrio.toast.core.command.FuzzyCommand -import jaci.openrio.toast.core.shared.GlobalBlackboard - -class CommandGroovyScript extends FuzzyCommand { - - @Override - boolean shouldInvoke(String message) { - return message.startsWith("script") - } - - @Override - void invokeCommand(String message) { - String groovy = message.replaceFirst("script", "") - Binding binding = new Binding(); - binding.setVariable("_global", GlobalBlackboard.INSTANCE) - binding.setVariable("_toast", Toast.getToast()) - GroovyShell shell = new GroovyShell(binding) - shell.evaluate(groovy) - } -} diff --git a/src/main/java/jaci/openrio/toast/core/command/cmd/CommandGroovyScript.java b/src/main/java/jaci/openrio/toast/core/command/cmd/CommandGroovyScript.java new file mode 100644 index 0000000..8fbed50 --- /dev/null +++ b/src/main/java/jaci/openrio/toast/core/command/cmd/CommandGroovyScript.java @@ -0,0 +1,25 @@ +package jaci.openrio.toast.core.command.cmd; + +import groovy.lang.Binding; +import groovy.lang.GroovyShell; +import jaci.openrio.toast.core.Toast; +import jaci.openrio.toast.core.command.FuzzyCommand; +import jaci.openrio.toast.core.shared.GlobalBlackboard; + +public class CommandGroovyScript extends FuzzyCommand { + @Override + public boolean shouldInvoke(String message) { + return message.startsWith("script"); + } + + @Override + public void invokeCommand(String message) { + String groovy = message.replaceFirst("script", ""); + Binding binding = new Binding(); + binding.setVariable("_global", GlobalBlackboard.INSTANCE); + binding.setVariable("_toast", Toast.getToast()); + GroovyShell shell = new GroovyShell(binding); + shell.evaluate(groovy); + } + +}