Remove Java relay.

Author: Moderocky

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>org.byteskript</groupId>
     <artifactId>byteskript</artifactId>
-    <version>1.0.13</version>
+    <version>1.0.14</version>
     <name>ByteSkript</name>
     <description>A compiled JVM implementation of the Skript language.</description>
 
@@ -92,7 +92,7 @@
         <dependency>
             <groupId>mx.kenzie</groupId>
             <artifactId>autodocs</artifactId>
-            <version>1.0.1</version>
+            <version>1.0.2</version>
             <scope>provided</scope>
         </dependency>
         <dependency>

src/main/java/org/byteskript/skript/compiler/SkriptLangSpec.java

@@ -27,7 +27,10 @@
 import org.byteskript.skript.lang.syntax.dictionary.DictionaryMember;
 import org.byteskript.skript.lang.syntax.dictionary.ImportFunctionEffect;
 import org.byteskript.skript.lang.syntax.dictionary.ImportTypeEffect;
-import org.byteskript.skript.lang.syntax.entry.*;
+import org.byteskript.skript.lang.syntax.entry.ReturnType;
+import org.byteskript.skript.lang.syntax.entry.Template;
+import org.byteskript.skript.lang.syntax.entry.Trigger;
+import org.byteskript.skript.lang.syntax.entry.Verify;
 import org.byteskript.skript.lang.syntax.entry.syntax.*;
 import org.byteskript.skript.lang.syntax.event.AnyLoadEvent;
 import org.byteskript.skript.lang.syntax.event.CurrentEventExpression;
@@ -249,7 +252,6 @@ private SkriptLangSpec() {
             new AnyLoadEvent()
         );
         generateSyntaxFrom(IOHandlers.class);
-        generateSyntaxFrom(JavaRelay.class);
         try {
             registerProperty("keys", GET, DataMap.class.getMethod("getKeys", Map.class));
             registerProperty("values", GET, DataMap.class.getMethod("getValues", Map.class));

src/main/java/org/byteskript/skript/lang/syntax/comparison/GT.java

@@ -29,7 +29,7 @@
 public class GT extends RelationalExpression {
 
     public GT() {
-        super(SkriptLangSpec.LIBRARY, StandardElements.EXPRESSION, "%Object% (is greater than|>) ?%Object%");
+        super(SkriptLangSpec.LIBRARY, StandardElements.EXPRESSION, "%Object%( is greater than | ?> ?)%Object%");
         try {
             handlers.put(StandardHandlers.FIND, OperatorHandler.class.getMethod("gt", Object.class, Object.class));
             handlers.put(StandardHandlers.GET, OperatorHandler.class.getMethod("gt", Object.class, Object.class));

src/main/java/org/byteskript/skript/lang/syntax/comparison/GTEQ.java

@@ -29,7 +29,7 @@
 public class GTEQ extends RelationalExpression {
 
     public GTEQ() {
-        super(SkriptLangSpec.LIBRARY, StandardElements.EXPRESSION, "%Object% (is greater than or equal to|>=) ?%Object%");
+        super(SkriptLangSpec.LIBRARY, StandardElements.EXPRESSION, "%Object%( is greater than or equal to | ?>= ?)%Object%");
         try {
             handlers.put(StandardHandlers.FIND, OperatorHandler.class.getMethod("gteq", Object.class, Object.class));
             handlers.put(StandardHandlers.GET, OperatorHandler.class.getMethod("gteq", Object.class, Object.class));

src/main/java/org/byteskript/skript/lang/syntax/comparison/IsEqual.java

@@ -31,13 +31,14 @@
 public class IsEqual extends RelationalExpression {
 
     public IsEqual() {
-        super(SkriptLangSpec.LIBRARY, StandardElements.EXPRESSION, "%Object% (is|is equal to|are|=|==) %Object%");
+        super(SkriptLangSpec.LIBRARY, StandardElements.EXPRESSION, "%Object% (is|is equal to|are) %Object%",
+            "%Object% ?(=|==) ?%Object%");
     }
 
     @Override
     public Pattern.Match match(String thing, Context context) {
         if (!thing.contains(" is ")
-            && !thing.contains(" =")
+            && !thing.contains("=")
             && !thing.contains(" are ")
         ) return null;
         return super.match(thing, context);

src/main/java/org/byteskript/skript/lang/syntax/comparison/LT.java

@@ -29,7 +29,7 @@
 public class LT extends RelationalExpression {
 
     public LT() {
-        super(SkriptLangSpec.LIBRARY, StandardElements.EXPRESSION, "%Object% (is less than|<) ?%Object%");
+        super(SkriptLangSpec.LIBRARY, StandardElements.EXPRESSION, "%Object%( is less than | ?< ?)%Object%");
         try {
             handlers.put(StandardHandlers.FIND, OperatorHandler.class.getMethod("lt", Object.class, Object.class));
             handlers.put(StandardHandlers.GET, OperatorHandler.class.getMethod("lt", Object.class, Object.class));

src/main/java/org/byteskript/skript/lang/syntax/comparison/LTEQ.java

@@ -29,7 +29,7 @@
 public class LTEQ extends RelationalExpression {
 
     public LTEQ() {
-        super(SkriptLangSpec.LIBRARY, StandardElements.EXPRESSION, "%Object% (is less than or equal to|<=) ?%Object%");
+        super(SkriptLangSpec.LIBRARY, StandardElements.EXPRESSION, "%Object%( is less than or equal to | ?<= ?)%Object%");
         try {
             handlers.put(StandardHandlers.FIND, OperatorHandler.class.getMethod("lteq", Object.class, Object.class));
             handlers.put(StandardHandlers.GET, OperatorHandler.class.getMethod("lteq", Object.class, Object.class));

src/main/java/org/byteskript/skript/lang/syntax/comparison/NotEqual.java

@@ -31,15 +31,18 @@
 public class NotEqual extends RelationalExpression {
 
     public NotEqual() {
-        super(SkriptLangSpec.LIBRARY, StandardElements.EXPRESSION, "%Object% (isn't|is not|aren't|are not|≠|!=) %Object%");
+        super(SkriptLangSpec.LIBRARY, StandardElements.EXPRESSION,
+            "%Object% (isn't|is not|aren't|are not) %Object%",
+            "%Object% ?(≠|!=) ?%Object%"
+        );
     }
 
     @Override
     public Pattern.Match match(String thing, Context context) {
         if (!thing.contains(" is")
             && !thing.contains(" are")
-            && !thing.contains(" ≠ ")
-            && !thing.contains(" != ")
+            && !thing.contains("≠")
+            && !thing.contains("!=")
         ) return null;
         return super.match(thing, context);
     }

src/main/java/org/byteskript/skript/lang/syntax/entry/JavaRelay.java

@@ -1,11 +1,7 @@
 
-
-function relay:
-    java method target:
-        owner: "org/byteskript/skript/test/SectionsTest"
-        name: "blob"
-        descriptor: "(Ljava/lang/String;)Ljava/lang/Object;"
-
+function relay(thing):
+    trigger:
+        return "hello " + {thing}
 
 function relay_test:
     trigger: