Replace field references to SyntaxElementInfo#c with getters to avoid errors with 2.8

Author: sovdeeth

src/main/java/com/btk5h/skriptmirror/ParseOrderWorkarounds.java

@@ -38,11 +38,11 @@ public class ParseOrderWorkarounds {
 
   public static void reorderSyntax() {
     for (String c : PARSE_ORDER) {
-      ensureLast(Skript.getStatements(), o -> o.c.getName().equals(c));
-      ensureLast(Skript.getConditions(), o -> o.c.getName().equals(c));
-      ensureLast(Skript.getEffects(), o -> o.c.toString().equals(c));
-      ensureLast(SkriptReflection.getExpressions(), o -> o.c.getName().equals(c));
-      ensureLast(Skript.getEvents(), o -> o.c.getName().equals(c));
+      ensureLast(Skript.getStatements(), o -> o.getElementClass().getName().equals(c));
+      ensureLast(Skript.getConditions(), o -> o.getElementClass().getName().equals(c));
+      ensureLast(Skript.getEffects(), o -> o.getElementClass().toString().equals(c));
+      ensureLast(SkriptReflection.getExpressions(), o -> o.getElementClass().getName().equals(c));
+      ensureLast(Skript.getEvents(), o -> o.getElementClass().getName().equals(c));
     }
   }
 

src/main/java/org/skriptlang/reflect/syntax/condition/elements/StructCustomCondition.java

@@ -2,7 +2,6 @@
 
 import ch.njol.skript.Skript;
 import ch.njol.skript.classes.ClassInfo;
-import ch.njol.skript.config.Node;
 import ch.njol.skript.config.SectionNode;
 import ch.njol.skript.lang.Condition;
 import ch.njol.skript.lang.Literal;
@@ -13,9 +12,9 @@
 import ch.njol.skript.lang.util.SimpleEvent;
 import ch.njol.skript.log.SkriptLogger;
 import ch.njol.skript.util.Utils;
-import org.skriptlang.reflect.syntax.CustomSyntaxStructure;
 import com.btk5h.skriptmirror.skript.custom.SyntaxParseEvent;
 import com.btk5h.skriptmirror.util.SkriptUtil;
+import org.skriptlang.reflect.syntax.CustomSyntaxStructure;
 import org.skriptlang.reflect.syntax.condition.ConditionCheckEvent;
 import org.skriptlang.reflect.syntax.condition.ConditionSyntaxInfo;
 import org.skriptlang.skript.lang.entry.EntryContainer;
@@ -56,7 +55,7 @@ public class StructCustomCondition extends CustomSyntaxStructure<ConditionSyntax
   static {
     Skript.registerCondition(CustomCondition.class);
     Optional<SyntaxElementInfo<? extends Condition>> info = Skript.getConditions().stream()
-        .filter(i -> i.c == CustomCondition.class)
+        .filter(i -> i.getElementClass() == CustomCondition.class)
         .findFirst();
     info.ifPresent(dataTracker::setInfo);
 

src/main/java/org/skriptlang/reflect/syntax/effect/elements/StructCustomEffect.java

@@ -1,7 +1,6 @@
 package org.skriptlang.reflect.syntax.effect.elements;
 
 import ch.njol.skript.Skript;
-import ch.njol.skript.config.Node;
 import ch.njol.skript.config.SectionNode;
 import ch.njol.skript.lang.Effect;
 import ch.njol.skript.lang.Literal;
@@ -11,9 +10,9 @@
 import ch.njol.skript.lang.TriggerItem;
 import ch.njol.skript.lang.util.SimpleEvent;
 import ch.njol.skript.log.SkriptLogger;
-import org.skriptlang.reflect.syntax.CustomSyntaxStructure;
 import com.btk5h.skriptmirror.skript.custom.SyntaxParseEvent;
 import com.btk5h.skriptmirror.util.SkriptUtil;
+import org.skriptlang.reflect.syntax.CustomSyntaxStructure;
 import org.skriptlang.reflect.syntax.effect.EffectSyntaxInfo;
 import org.skriptlang.reflect.syntax.effect.EffectTriggerEvent;
 import org.skriptlang.skript.lang.entry.EntryContainer;
@@ -51,7 +50,7 @@ public class StructCustomEffect extends CustomSyntaxStructure<EffectSyntaxInfo>
   static {
     Skript.registerEffect(CustomEffect.class);
     Optional<SyntaxElementInfo<? extends Effect>> info = Skript.getEffects().stream()
-      .filter(i -> i.c == CustomEffect.class)
+      .filter(i -> i.getElementClass() == CustomEffect.class)
       .findFirst();
     info.ifPresent(dataTracker::setInfo);
 

src/main/java/org/skriptlang/reflect/syntax/event/elements/StructCustomEvent.java

@@ -57,7 +57,7 @@ public boolean canCreateWith(String node) {
   static {
     Skript.registerEvent("custom event", CustomEvent.class, BukkitCustomEvent.class);
     Optional<SkriptEventInfo<?>> info = Skript.getEvents().stream()
-      .filter(i -> i.c == CustomEvent.class)
+      .filter(i -> i.getElementClass() == CustomEvent.class)
       .findFirst();
     info.ifPresent(dataTracker::setInfo);
 

src/main/java/org/skriptlang/reflect/syntax/expression/elements/StructCustomConstant.java

@@ -44,7 +44,7 @@ public class StructCustomConstant extends CustomSyntaxStructure<ConstantSyntaxIn
     Skript.registerExpression(CustomExpression.class, Object.class, ExpressionType.SIMPLE);
     Optional<ExpressionInfo<?, ?>> info = StreamSupport.stream(
         Spliterators.spliteratorUnknownSize(Skript.getExpressions(), Spliterator.ORDERED), false)
-        .filter(i -> i.c == CustomExpression.class)
+        .filter(i -> i.getElementClass() == CustomExpression.class)
         .findFirst();
     info.ifPresent(dataTracker::setInfo);
   }

src/main/java/org/skriptlang/reflect/syntax/expression/elements/StructCustomExpression.java

@@ -93,7 +93,7 @@ protected Class<?> getValue(String value) {
     Skript.registerExpression(CustomExpression.class, Object.class, ExpressionType.PATTERN_MATCHES_EVERYTHING);
     Optional<ExpressionInfo<?, ?>> info = StreamSupport.stream(
         Spliterators.spliteratorUnknownSize(Skript.getExpressions(), Spliterator.ORDERED), false)
-        .filter(i -> i.c == CustomExpression.class)
+        .filter(i -> i.getElementClass() == CustomExpression.class)
         .findFirst();
     info.ifPresent(dataTracker::setInfo);