Merge branch 'dev/feature' into sound-syntax

SkriptLang · Sep 23, 2024 · d5e01a4 · d5e01a4
2 parents 1168504 + 45ce386
commit d5e01a4
Show file tree

Hide file tree

Showing 767 changed files with 1,663 additions and 1,095 deletions.
diff --git a/.github/workflows/github-issues/issues-labeled.yml b/.github/workflows/github-issues/issues-labeled.yml
@@ -0,0 +1,22 @@
+name: When labels are modified, run actions.
+
+on:
+    issues:
+        types: [labeled]
+
+jobs:
+    remove-good-first-issue-label:
+        if: ${{ github.event.label.name == 'completed' || github.event.label.name == 'PR available'}}
+        runs-on: ubuntu-latest
+        permissions:
+            issues: write
+        steps:
+            - uses: actions/github-script@v6
+                with:
+                    script: |
+                        github.rest.issues.removeLabel({
+                            issue_number: context.issue.number,
+                            owner: context.repo.owner,
+                            repo: context.repo.repo,
+                            name: ["good first issue"]
+                        })
diff --git a/build.gradle b/build.gradle
@@ -30,7 +30,6 @@ dependencies {
 	shadow group: 'net.kyori', name: 'adventure-text-serializer-bungeecord', version: '4.3.2'
 
 	implementation group: 'io.papermc.paper', name: 'paper-api', version: '1.21-R0.1-SNAPSHOT'
-	implementation group: 'org.eclipse.jdt', name: 'org.eclipse.jdt.annotation', version: '2.2.700'
 	implementation group: 'com.google.code.findbugs', name: 'findbugs', version: '3.0.1'
 	implementation group: 'com.sk89q.worldguard', name: 'worldguard-legacy', version: '7.0.0-SNAPSHOT'
 	implementation group: 'net.milkbowl.vault', name: 'Vault', version: '1.7.3', {

diff --git a/src/main/java/ch/njol/skript/ScriptLoader.java b/src/main/java/ch/njol/skript/ScriptLoader.java
@@ -46,7 +46,7 @@
 import ch.njol.util.StringUtils;
 import org.bukkit.Bukkit;
 import org.bukkit.event.Event;
-import org.eclipse.jdt.annotation.Nullable;
+import org.jetbrains.annotations.Nullable;
 import org.skriptlang.skript.lang.script.Script;
 import org.skriptlang.skript.lang.structure.Structure;
 

diff --git a/src/main/java/ch/njol/skript/SkriptAddon.java b/src/main/java/ch/njol/skript/SkriptAddon.java
@@ -24,7 +24,7 @@
 import java.util.regex.Pattern;
 
 import org.bukkit.plugin.java.JavaPlugin;
-import org.eclipse.jdt.annotation.Nullable;
+import org.jetbrains.annotations.Nullable;
 
 import ch.njol.skript.localization.Language;
 import ch.njol.skript.util.Utils;

diff --git a/src/main/java/ch/njol/skript/SkriptCommand.java b/src/main/java/ch/njol/skript/SkriptCommand.java
@@ -21,7 +21,9 @@
 import ch.njol.skript.aliases.Aliases;
 import ch.njol.skript.command.CommandHelp;
 import ch.njol.skript.doc.Documentation;
+import ch.njol.skript.doc.DocumentationIdProvider;
 import ch.njol.skript.doc.HTMLGenerator;
+import ch.njol.skript.doc.JSONGenerator;
 import ch.njol.skript.localization.ArgsMessage;
 import ch.njol.skript.localization.Language;
 import ch.njol.skript.localization.PluralizingArgsMessage;
@@ -42,7 +44,7 @@
 import org.bukkit.command.CommandSender;
 import org.bukkit.plugin.Plugin;
 import org.bukkit.plugin.PluginDescriptionFile;
-import org.eclipse.jdt.annotation.Nullable;
+import org.jetbrains.annotations.Nullable;
 import org.skriptlang.skript.lang.script.Script;
 
 import java.io.File;
@@ -403,9 +405,11 @@ public boolean onCommand(CommandSender sender, Command command, String label, St
 				}
 				File outputDir = Documentation.getDocsOutputDirectory();
 				outputDir.mkdirs();
-				HTMLGenerator generator = new HTMLGenerator(templateDir, outputDir);
+				HTMLGenerator htmlGenerator = new HTMLGenerator(templateDir, outputDir);
+				JSONGenerator jsonGenerator = new JSONGenerator(templateDir, outputDir);
 				Skript.info(sender, "Generating docs...");
-				generator.generate(); // Try to generate docs... hopefully
+				htmlGenerator.generate(); // Try to generate docs... hopefully
+				jsonGenerator.generate();
 				Skript.info(sender, "Documentation generated!");
 			} else if (args[0].equalsIgnoreCase("test") && TestMode.DEV_MODE) {
 				File scriptFile;

diff --git a/src/main/java/ch/njol/skript/SkriptEventHandler.java b/src/main/java/ch/njol/skript/SkriptEventHandler.java
@@ -35,7 +35,7 @@
 import org.bukkit.event.player.PlayerInteractEvent;
 import org.bukkit.plugin.EventExecutor;
 import org.bukkit.plugin.RegisteredListener;
-import org.eclipse.jdt.annotation.Nullable;
+import org.jetbrains.annotations.Nullable;
 
 import java.lang.ref.WeakReference;
 import java.lang.reflect.Method;

diff --git a/src/main/java/ch/njol/skript/aliases/Aliases.java b/src/main/java/ch/njol/skript/aliases/Aliases.java
@@ -40,7 +40,7 @@
 import org.bukkit.ChatColor;
 import org.bukkit.Material;
 import org.bukkit.NamespacedKey;
-import org.eclipse.jdt.annotation.Nullable;
+import org.jetbrains.annotations.Nullable;
 
 import java.io.IOException;
 import java.io.UncheckedIOException;

diff --git a/src/main/java/ch/njol/skript/aliases/AliasesMap.java b/src/main/java/ch/njol/skript/aliases/AliasesMap.java
@@ -22,7 +22,7 @@
 import java.util.List;
 
 import org.bukkit.Material;
-import org.eclipse.jdt.annotation.Nullable;
+import org.jetbrains.annotations.Nullable;
 
 import ch.njol.skript.entity.EntityData;
 

diff --git a/src/main/java/ch/njol/skript/aliases/AliasesParser.java b/src/main/java/ch/njol/skript/aliases/AliasesParser.java
@@ -27,7 +27,7 @@
 import java.util.Map;
 import java.util.function.Function;
 
-import org.eclipse.jdt.annotation.Nullable;
+import org.jetbrains.annotations.Nullable;
 
 import ch.njol.skript.Skript;
 import ch.njol.skript.aliases.AliasesProvider.Variation;

diff --git a/src/main/java/ch/njol/skript/aliases/AliasesProvider.java b/src/main/java/ch/njol/skript/aliases/AliasesProvider.java
@@ -30,7 +30,7 @@
 import it.unimi.dsi.fastutil.objects.ObjectOpenHashSet;
 import org.bukkit.Material;
 import org.bukkit.inventory.ItemStack;
-import org.eclipse.jdt.annotation.Nullable;
+import org.jetbrains.annotations.Nullable;
 
 import com.google.gson.Gson;
 

diff --git a/src/main/java/ch/njol/skript/aliases/ItemType.java b/src/main/java/ch/njol/skript/aliases/ItemType.java
@@ -52,7 +52,7 @@
 import org.bukkit.inventory.PlayerInventory;
 import org.bukkit.inventory.meta.ItemMeta;
 import org.bukkit.inventory.meta.SkullMeta;
-import org.eclipse.jdt.annotation.Nullable;
+import org.jetbrains.annotations.Nullable;
 
 import java.io.NotSerializableException;
 import java.io.StreamCorruptedException;

diff --git a/src/main/java/ch/njol/skript/aliases/package-info.java b/src/main/java/ch/njol/skript/aliases/package-info.java
@@ -21,9 +21,6 @@
  * 
  * @author Peter Güttinger
  */
-@NonNullByDefault({DefaultLocation.PARAMETER, DefaultLocation.RETURN_TYPE, DefaultLocation.FIELD})
 package ch.njol.skript.aliases;
 
-import org.eclipse.jdt.annotation.DefaultLocation;
-import org.eclipse.jdt.annotation.NonNullByDefault;
 
diff --git a/src/main/java/ch/njol/skript/bukkitutil/BukkitUnsafe.java b/src/main/java/ch/njol/skript/bukkitutil/BukkitUnsafe.java
@@ -32,7 +32,7 @@
 import org.bukkit.Material;
 import org.bukkit.UnsafeValues;
 import org.bukkit.inventory.ItemStack;
-import org.eclipse.jdt.annotation.Nullable;
+import org.jetbrains.annotations.Nullable;
 
 import com.google.common.io.ByteStreams;
 import com.google.gson.GsonBuilder;

diff --git a/src/main/java/ch/njol/skript/bukkitutil/CommandReloader.java b/src/main/java/ch/njol/skript/bukkitutil/CommandReloader.java
@@ -22,7 +22,7 @@
 
 import org.bukkit.Bukkit;
 import org.bukkit.Server;
-import org.eclipse.jdt.annotation.Nullable;
+import org.jetbrains.annotations.Nullable;
 
 import ch.njol.skript.Skript;
 

diff --git a/src/main/java/ch/njol/skript/bukkitutil/InventoryUtils.java b/src/main/java/ch/njol/skript/bukkitutil/InventoryUtils.java
@@ -3,7 +3,7 @@
 import ch.njol.skript.Skript;
 import org.bukkit.inventory.Inventory;
 import org.bukkit.inventory.InventoryView;
-import org.eclipse.jdt.annotation.Nullable;
+import org.jetbrains.annotations.Nullable;
 
 import java.lang.invoke.MethodHandle;
 import java.lang.invoke.MethodHandles;

diff --git a/src/main/java/ch/njol/skript/bukkitutil/ItemUtils.java b/src/main/java/ch/njol/skript/bukkitutil/ItemUtils.java
@@ -32,7 +32,7 @@
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.inventory.meta.Damageable;
 import org.bukkit.inventory.meta.ItemMeta;
-import org.eclipse.jdt.annotation.Nullable;
+import org.jetbrains.annotations.Nullable;
 
 import java.util.HashMap;
 

diff --git a/src/main/java/ch/njol/skript/bukkitutil/PaperEntityUtils.java b/src/main/java/ch/njol/skript/bukkitutil/PaperEntityUtils.java
@@ -28,7 +28,7 @@
 import org.bukkit.entity.Mob;
 import org.bukkit.entity.Player;
 import org.bukkit.util.Vector;
-import org.eclipse.jdt.annotation.Nullable;
+import org.jetbrains.annotations.Nullable;
 
 import com.destroystokyo.paper.entity.ai.Goal;
 import com.destroystokyo.paper.entity.ai.GoalKey;

diff --git a/src/main/java/ch/njol/skript/bukkitutil/PlayerUtils.java b/src/main/java/ch/njol/skript/bukkitutil/PlayerUtils.java
@@ -25,7 +25,7 @@
 import org.bukkit.GameMode;
 import org.bukkit.Material;
 import org.bukkit.entity.Player;
-import org.eclipse.jdt.annotation.Nullable;
+import org.jetbrains.annotations.Nullable;
 
 import java.util.Collection;
 import java.util.Collections;

diff --git a/src/main/java/ch/njol/skript/bukkitutil/block/BlockCompat.java b/src/main/java/ch/njol/skript/bukkitutil/block/BlockCompat.java
@@ -26,7 +26,7 @@
 import org.bukkit.block.data.BlockData;
 import org.bukkit.entity.FallingBlock;
 import org.bukkit.inventory.ItemStack;
-import org.eclipse.jdt.annotation.Nullable;
+import org.jetbrains.annotations.Nullable;
 
 import ch.njol.skript.aliases.ItemFlags;
 

diff --git a/src/main/java/ch/njol/skript/bukkitutil/block/BlockSetter.java b/src/main/java/ch/njol/skript/bukkitutil/block/BlockSetter.java
@@ -22,7 +22,7 @@
 import org.bukkit.Material;
 import org.bukkit.block.Block;
 import org.bukkit.entity.Player;
-import org.eclipse.jdt.annotation.Nullable;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Manages setting blocks.

diff --git a/src/main/java/ch/njol/skript/bukkitutil/block/BlockValues.java b/src/main/java/ch/njol/skript/bukkitutil/block/BlockValues.java
@@ -20,7 +20,7 @@
 
 import ch.njol.skript.aliases.MatchQuality;
 import ch.njol.yggdrasil.YggdrasilSerializable.YggdrasilExtendedSerializable;
-import org.eclipse.jdt.annotation.Nullable;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Contains all data block has that is needed for comparisions.

diff --git a/src/main/java/ch/njol/skript/bukkitutil/block/NewBlockCompat.java b/src/main/java/ch/njol/skript/bukkitutil/block/NewBlockCompat.java
@@ -41,8 +41,8 @@
 import org.bukkit.entity.FallingBlock;
 import org.bukkit.entity.Player;
 import org.bukkit.inventory.ItemStack;
-import org.eclipse.jdt.annotation.NonNull;
-import org.eclipse.jdt.annotation.Nullable;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 
 import java.io.StreamCorruptedException;
 import java.util.Map;
@@ -131,7 +131,7 @@ public Fields serialize() {
 		}
 
 		@Override
-		public void deserialize(@NonNull Fields fields) throws StreamCorruptedException {
+		public void deserialize(@NotNull Fields fields) throws StreamCorruptedException {
 			String data = fields.getObject("data", String.class);
 			boolean isDefault = fields.getPrimitive("isDefault", Boolean.class);
 			if (data == null)

diff --git a/src/main/java/ch/njol/skript/bukkitutil/block/package-info.java b/src/main/java/ch/njol/skript/bukkitutil/block/package-info.java
@@ -16,9 +16,6 @@
  *
  * Copyright Peter Güttinger, SkriptLang team and contributors
  */
-@NonNullByDefault({DefaultLocation.PARAMETER, DefaultLocation.RETURN_TYPE, DefaultLocation.FIELD})
 package ch.njol.skript.bukkitutil.block;
 
-import org.eclipse.jdt.annotation.DefaultLocation;
-import org.eclipse.jdt.annotation.NonNullByDefault;
 
diff --git a/src/main/java/ch/njol/skript/bukkitutil/package-info.java b/src/main/java/ch/njol/skript/bukkitutil/package-info.java
@@ -21,9 +21,6 @@
  * 
  * @author Peter Güttinger
  */
-@NonNullByDefault({DefaultLocation.PARAMETER, DefaultLocation.RETURN_TYPE, DefaultLocation.FIELD})
 package ch.njol.skript.bukkitutil;
 
-import org.eclipse.jdt.annotation.DefaultLocation;
-import org.eclipse.jdt.annotation.NonNullByDefault;
 
diff --git a/src/main/java/ch/njol/skript/bukkitutil/sounds/package-info.java b/src/main/java/ch/njol/skript/bukkitutil/sounds/package-info.java
@@ -16,9 +16,6 @@
  *
  * Copyright Peter Güttinger, SkriptLang team and contributors
  */
-@NonNullByDefault({DefaultLocation.PARAMETER, DefaultLocation.RETURN_TYPE, DefaultLocation.FIELD})
 package ch.njol.skript.bukkitutil.sounds;
 
-import org.eclipse.jdt.annotation.DefaultLocation;
-import org.eclipse.jdt.annotation.NonNullByDefault;
 
diff --git a/src/main/java/ch/njol/skript/classes/ChainedConverter.java b/src/main/java/ch/njol/skript/classes/ChainedConverter.java
@@ -18,7 +18,7 @@
  */
 package ch.njol.skript.classes;
 
-import org.eclipse.jdt.annotation.Nullable;
+import org.jetbrains.annotations.Nullable;
 
 import org.skriptlang.skript.lang.converter.Converters;
 

diff --git a/src/main/java/ch/njol/skript/classes/Changer.java b/src/main/java/ch/njol/skript/classes/Changer.java
@@ -19,7 +19,7 @@
 package ch.njol.skript.classes;
 
 import org.bukkit.event.Event;
-import org.eclipse.jdt.annotation.Nullable;
+import org.jetbrains.annotations.Nullable;
 
 import ch.njol.skript.classes.data.DefaultChangers;
 import ch.njol.skript.lang.Expression;

diff --git a/src/main/java/ch/njol/skript/classes/ClassInfo.java b/src/main/java/ch/njol/skript/classes/ClassInfo.java
@@ -27,8 +27,8 @@
 import ch.njol.util.coll.iterator.ArrayIterator;
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 import org.bukkit.event.Event;
-import org.eclipse.jdt.annotation.NonNull;
-import org.eclipse.jdt.annotation.Nullable;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 
 import java.util.Arrays;
 import java.util.HashSet;
@@ -516,7 +516,7 @@ public Set<String> after() {
 	// === GENERAL ===
 
 	@Override
-	@NonNull
+	@NotNull
 	public String toString() {
 		return getName().getSingular();
 	}
@@ -526,7 +526,7 @@ public String toString(final int flags) {
 	}
 
 	@Override
-	@NonNull
+	@NotNull
 	public String toString(final @Nullable Event event, final boolean debug) {
 		if (debug)
 			return codeName + " (" + c.getCanonicalName() + ")";

diff --git a/src/main/java/ch/njol/skript/classes/ConfigurationSerializer.java b/src/main/java/ch/njol/skript/classes/ConfigurationSerializer.java
@@ -24,7 +24,7 @@
 import org.bukkit.configuration.InvalidConfigurationException;
 import org.bukkit.configuration.file.YamlConfiguration;
 import org.bukkit.configuration.serialization.ConfigurationSerializable;
-import org.eclipse.jdt.annotation.Nullable;
+import org.jetbrains.annotations.Nullable;
 
 import ch.njol.yggdrasil.Fields;
 

diff --git a/src/main/java/ch/njol/skript/classes/Converter.java b/src/main/java/ch/njol/skript/classes/Converter.java
@@ -21,7 +21,7 @@
 import ch.njol.skript.lang.Debuggable;
 import ch.njol.skript.registrations.Classes;
 import org.bukkit.event.Event;
-import org.eclipse.jdt.annotation.Nullable;
+import org.jetbrains.annotations.Nullable;
 import org.skriptlang.skript.lang.converter.Converters;
 
 import java.util.Arrays;

diff --git a/src/main/java/ch/njol/skript/classes/EnumClassInfo.java b/src/main/java/ch/njol/skript/classes/EnumClassInfo.java
@@ -22,7 +22,7 @@
 import ch.njol.skript.lang.DefaultExpression;
 import ch.njol.skript.lang.ParseContext;
 import ch.njol.skript.util.EnumUtils;
-import org.eclipse.jdt.annotation.Nullable;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * This class can be used for an easier writing of ClassInfos that are enums,

diff --git a/src/main/java/ch/njol/skript/classes/EnumSerializer.java b/src/main/java/ch/njol/skript/classes/EnumSerializer.java
@@ -20,7 +20,7 @@
 
 import java.io.StreamCorruptedException;
 
-import org.eclipse.jdt.annotation.Nullable;
+import org.jetbrains.annotations.Nullable;
 
 import ch.njol.yggdrasil.ClassResolver;
 import ch.njol.yggdrasil.Fields;

diff --git a/src/main/java/ch/njol/skript/classes/Parser.java b/src/main/java/ch/njol/skript/classes/Parser.java
@@ -18,7 +18,7 @@
  */
 package ch.njol.skript.classes;
 
-import org.eclipse.jdt.annotation.Nullable;
+import org.jetbrains.annotations.Nullable;
 
 import ch.njol.skript.lang.ParseContext;
 import ch.njol.skript.lang.parser.ParserInstance;

diff --git a/src/main/java/ch/njol/skript/classes/Serializer.java b/src/main/java/ch/njol/skript/classes/Serializer.java
@@ -26,7 +26,7 @@
 
 import org.bukkit.Bukkit;
 import org.bukkit.World;
-import org.eclipse.jdt.annotation.Nullable;
+import org.jetbrains.annotations.Nullable;
 
 import ch.njol.skript.Skript;
 import ch.njol.skript.SkriptAPIException;

diff --git a/src/main/java/ch/njol/skript/classes/data/BukkitClasses.java b/src/main/java/ch/njol/skript/classes/data/BukkitClasses.java
@@ -61,6 +61,7 @@
 import org.bukkit.entity.Projectile;
 import org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason;
 import org.bukkit.event.entity.EntityDamageEvent.DamageCause;
+import org.bukkit.event.entity.EntityPotionEffectEvent;
 import org.bukkit.event.entity.EntityRegainHealthEvent.RegainReason;
 import org.bukkit.event.entity.EntityTransformEvent.TransformReason;
 import org.bukkit.event.inventory.ClickType;
@@ -1526,6 +1527,11 @@ public String toVariableNameString(EnchantmentOffer eo) {
 				.name("Transform Reason")
 				.description("Represents a transform reason of an <a href='events.html#entity transform'>entity transform event</a>.")
 				.since("2.8.0"));
+		Classes.registerClass(new EnumClassInfo<>(EntityPotionEffectEvent.Cause.class, "entitypotioncause", "entity potion causes")
+				.user("(entity )?potion ?effect ?cause")
+				.name("Entity Potion Cause")
+				.description("Represents the cause of the action of a potion effect on an entity, e.g. arrow, command")
+				.since("INSERT VERSION"));
 	}
 
 }