Fix HTML Documentation Generation (SkriptLang#8341)

Fix Event ID resolution for HTMLGenerator

Author: APickledWalrus

src/main/java/ch/njol/skript/doc/HTMLGenerator.java

@@ -15,6 +15,7 @@
 import org.bukkit.event.block.BlockCanBuildEvent;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
+import org.skriptlang.skript.bukkit.registration.BukkitSyntaxInfos;
 import org.skriptlang.skript.lang.entry.EntryData;
 import org.skriptlang.skript.lang.entry.EntryValidator;
 import org.skriptlang.skript.lang.structure.StructureInfo;
@@ -97,24 +98,24 @@ private static <T> Iterator<SyntaxElementInfo<? extends T>> sortedAnnotatedItera
 	/**
 	 * Sorts events alphabetically.
 	 */
-	private static class EventComparator implements Comparator<SkriptEventInfo<?>> {
+	private static class EventComparator implements Comparator<BukkitSyntaxInfos.Event<?>> {
 
 		public EventComparator() {}
 
 		@Override
-		public int compare(@Nullable SkriptEventInfo<?> o1, @Nullable SkriptEventInfo<?> o2) {
+		public int compare(@Nullable BukkitSyntaxInfos.Event<?> o1, @Nullable BukkitSyntaxInfos.Event<?> o2) {
 			// Nullness check
 			if (o1 == null || o2 == null) {
 				assert false;
 				throw new NullPointerException();
 			}
 
-			if (o1.getElementClass().getAnnotation(NoDoc.class) != null)
+			if (o1.type().getAnnotation(NoDoc.class) != null)
 				return 1;
-			else if (o2.getElementClass().getAnnotation(NoDoc.class) != null)
+			else if (o2.type().getAnnotation(NoDoc.class) != null)
 				return -1;
 
-			return o1.name.compareTo(o2.name);
+			return o1.name().compareTo(o2.name());
 		}
 
 	}
@@ -311,11 +312,11 @@ else if (!filesInside.getName().matches("(?i)(.*)\\.(html?|js|css|json)")) {
 					}
 				}
 				if (genType.equals("events") || isDocsPage) {
-					List<SkriptEventInfo<?>> events = new ArrayList<>(Skript.getEvents());
+					List<BukkitSyntaxInfos.Event<?>> events = new ArrayList<>(Skript.instance().syntaxRegistry().syntaxes(BukkitSyntaxInfos.Event.KEY));
 					events.sort(eventComparator);
-					for (SkriptEventInfo<?> info : events) {
+					for (BukkitSyntaxInfos.Event<?> info : events) {
 						assert info != null;
-						if (info.getElementClass().getAnnotation(NoDoc.class) != null)
+						if (info.type().getAnnotation(NoDoc.class) != null)
 							continue;
 						generated.append(generateEvent(descTemp, info, generated.toString()));
 					}
@@ -584,7 +585,8 @@ private String generateAnnotated(String descTemp, SyntaxElementInfo<?> info, @Nu
 		return desc;
 	}
 
-	private String generateEvent(String descTemp, SkriptEventInfo<?> info, @Nullable String page) {
+	private String generateEvent(String descTemp, BukkitSyntaxInfos.Event<?> modernInfo, @Nullable String page) {
+		SkriptEventInfo<?> info = (SkriptEventInfo<?>) SyntaxElementInfo.fromModern(modernInfo);
 		Class<?> c = info.getElementClass();
 		String desc;
 
@@ -631,7 +633,7 @@ private String generateEvent(String descTemp, SkriptEventInfo<?> info, @Nullable
 		desc = desc.replace("${element.cancellable}", cancellable ? "Yes" : ""); // if not cancellable the section is hidden
 
 		// Documentation ID
-		desc = desc.replace("${element.id}", DocumentationIdProvider.getId(info));
+		desc = desc.replace("${element.id}", DocumentationIdProvider.getId(modernInfo));
 
 		// Events
 		Events events = c.getAnnotation(Events.class);