Skript 2.8-pre1

DiSkyOrg · Jan 6, 2024 · 8c72d43 · 8c72d43
1 parent 2057693
commit 8c72d43
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 10 deletions.
diff --git a/build.gradle b/build.gradle
@@ -27,7 +27,7 @@ repositories {
 
 dependencies {
     shadow 'org.spigotmc:spigot-api:1.17.1-R0.1-SNAPSHOT'
-    shadow 'com.github.SkriptLang:Skript:2.7.0-beta2'
+    shadow 'com.github.SkriptLang:Skript:2.8.0-pre1'
     // Jetbrains Annotations
     shadow 'org.jetbrains:annotations:23.0.0'
 

diff --git a/src/main/java/info/itsthesky/disky/api/ReflectionUtils.java b/src/main/java/info/itsthesky/disky/api/ReflectionUtils.java
@@ -252,10 +252,10 @@ public static void removeElement(String clazz, String... fields) throws Exceptio
 
             if (f.equalsIgnoreCase("expressions")) {
                 ((Collection<ExpressionInfo<?, ?>>) field.get(null))
-                        .removeIf(info -> info.c.equals(clz));
+                        .removeIf(info -> info.getElementClass().equals(clz));
             } else {
                 ((Collection<SyntaxElementInfo<? extends Effect>>) field.get(null))
-                        .removeIf(info -> info.c.equals(clz));
+                        .removeIf(info -> info.getElementClass().equals(clz));
             }
 
             field.setAccessible(false);

diff --git a/src/main/java/info/itsthesky/disky/api/events/DiSkyEvent.java b/src/main/java/info/itsthesky/disky/api/events/DiSkyEvent.java
@@ -105,7 +105,7 @@ public boolean init(Literal<?> @NotNull [] exprs, int matchedPattern, @NotNull S
 
         String name = null;
         for (SkriptEventInfo<?> event : Skript.getEvents()) {
-            if (bukkitClass.equals(event.c)) {
+            if (bukkitClass.equals(event.getElementClass())) {
                 name = event.getName();
             }
         }

diff --git a/src/main/java/info/itsthesky/disky/api/generator/DocBuilder.java b/src/main/java/info/itsthesky/disky/api/generator/DocBuilder.java
@@ -390,7 +390,7 @@ public static class SimpleDocElement {
         private final @Nullable String module;
 
         public SimpleDocElement(SyntaxElementInfo<?> info) {
-            this.id = getAnnotationOr(info, DocumentationId.class, info.c.getSimpleName());
+            this.id = getAnnotationOr(info, DocumentationId.class, info.getElementClass().getSimpleName());
             this.name = getAnnotationOr(info, Name.class, null);
             this.description = getAnnotationOrs(info, Description.class, null);
             this.patterns = info.getPatterns();

diff --git a/src/main/java/info/itsthesky/disky/elements/commands/CommandFactory.java b/src/main/java/info/itsthesky/disky/elements/commands/CommandFactory.java
@@ -39,7 +39,7 @@ private CommandFactory() {
 
         Method _PARSE_I = null;
         try {
-            _PARSE_I = SkriptParser.class.getDeclaredMethod("parse_i", String.class, int.class, int.class);
+            _PARSE_I = SkriptParser.class.getDeclaredMethod("parse_i", String.class);
             _PARSE_I.setAccessible(true);
         } catch (NoSuchMethodException e) {
             e.printStackTrace();
@@ -61,7 +61,7 @@ public boolean parseArguments(String args, CommandObject command, Event event) {
         SkriptParser parser = new SkriptParser(args, SkriptParser.PARSE_LITERALS, ParseContext.COMMAND);
         SkriptParser.ParseResult res = null;
         try {
-            res = (SkriptParser.ParseResult) PARSE_I.invoke(parser, command.getPattern(), 0, 0);
+            res = (SkriptParser.ParseResult) PARSE_I.invoke(parser, command.getPattern());
         } catch (IllegalAccessException | InvocationTargetException e) {
             e.printStackTrace();
         }

diff --git a/src/main/java/info/itsthesky/disky/elements/events/interactions/SlashCompletionEvent.java b/src/main/java/info/itsthesky/disky/elements/events/interactions/SlashCompletionEvent.java
@@ -95,7 +95,7 @@ protected void execute(@NotNull Event e) {
 				if (parent instanceof SecLoop) {
 					((SecLoop) parent).exit(e);
 				} else if (parent instanceof SecWhile) {
-					((SecWhile) parent).reset();
+					((SecWhile) parent).exit(e);
 				}
 				parent = parent.getParent();
 			}

diff --git a/src/main/java/info/itsthesky/disky/structures/structure/StructBot.java b/src/main/java/info/itsthesky/disky/structures/structure/StructBot.java
@@ -85,7 +85,7 @@ public boolean preLoad() {
 				.toUpperCase().replace(" ", "_")));
 		options.setFlags(
 				Stream.of(container.getOptional("cache flags", String[].class, true))
-						.map(str -> CacheFlag.valueOf(str.toUpperCase().replace(" ", "_")))
+						.map(str -> CacheFlag.valueOf(str.toString().toUpperCase().replace(" ", "_")))
 						.toArray(CacheFlag[]::new)
 		);
 		options.setPolicy(parse(container.getOptional("policy", String.class, true)));
@@ -96,7 +96,7 @@ public boolean preLoad() {
 		options.setOnGuildReady(guildReady == null ? new ArrayList<>() : Collections.singletonList(guildReady));
 
 		options.setIntents(Stream.of(container.getOptional("intents", String[].class, true))
-				.map(str -> GatewayIntent.valueOf(str.toUpperCase().replace(" ", "_")))
+				.map(str -> GatewayIntent.valueOf(str.toString().toUpperCase().replace(" ", "_")))
 				.toArray(GatewayIntent[]::new));
 
 		return true;