Merge branch 'dev/feature' into feature/eff-pull

Author: APickledWalrus

LICENSING.md

@@ -0,0 +1,48 @@
+Skript is licensed under the [GNU General Public License (Version 3)](LICENSE).
+
+However, to foster a better open-source community, and in the interest of further opening this project in the future,
+we ask that contributors release their code under the MIT License.
+Since it is less restrictive than GPLv3, it provides us and other developers
+with greater flexibility when making use of contributed code.
+
+To learn more about this license, you can visit [choosealicense.com](https://choosealicense.com/licenses/mit/).
+You can also view the full text of the license below:
+<details>
+<summary>MIT License</summary>
+
+```text
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+```
+</details>
+
+If you wish to release your contributions to this repository under the MIT License,
+please add your name below in your pull request.
+
+When adding your name, please follow the example format below:
+
+`<name> (<commit email address>)`
+> [!NOTE]
+> For name, you may choose to use your real name or GitHub account name. \
+> If you use more than one commit email address, please include all of them.
+
+```text
+APickledWalrus (apickledwalrus@icloud.com, apickledwalrus@gmail.com)
+Sovde (10354869+sovdeeth@users.noreply.github.com)
+UnderscoreTud (98935832+UnderscoreTud@users.noreply.github.com)
+```

README.md

@@ -191,5 +191,6 @@ contact us about any problems you might have with them.
 ## Developers
 You can find all contributors [here](https://github.com/SkriptLang/Skript/graphs/contributors).
 
-All code is owned by its writer, licensed for others under GPLv3 (see LICENSE)
-unless otherwise specified.
+All code is owned by its writer, licensed for others under GPLv3 (see [LICENSE](LICENSE)).
+Some contributors may choose to release their code under the MIT License.
+Further information can be found within [LICENSING.md](LICENSING.md).

build.gradle

@@ -29,7 +29,7 @@ dependencies {
 	shadow group: 'org.bstats', name: 'bstats-bukkit', version: '3.1.0'
 	shadow group: 'net.kyori', name: 'adventure-text-serializer-bungeecord', version: '4.4.0'
 
-	implementation group: 'io.papermc.paper', name: 'paper-api', version: '1.21.5-R0.1-SNAPSHOT'
+	implementation group: 'io.papermc.paper', name: 'paper-api', version: '1.21.6-R0.1-SNAPSHOT'
 	implementation group: 'com.google.code.findbugs', name: 'findbugs', version: '3.0.1'
 
 	// bundled with Minecraft 1.19.4+ for display entity transforms
@@ -246,7 +246,7 @@ void createTestTask(String name, String desc, String environments, int javaVersi
 def java21 = 21
 def java17 = 17
 
-def latestEnv = 'java21/paper-1.21.5.json'
+def latestEnv = 'java21/paper-1.21.6.json'
 def latestJava = java21
 def oldestJava = java17
 

code-conventions.md

@@ -64,6 +64,8 @@ With the exception of contacting our own resources (e.g. to check for updates) c
 ## Licensing
 
 Code contributed must be licensed under GPLv3, by **you**.
+Some contributors may choose to release their code under the MIT License.
+Further information can be found within [LICENSING.md](LICENSING.md).
 We expect that any code you contribute is either owned by you or you have explicit permission to provide and license it to us.
 
 Licenses do not need to be printed in individual files (or packages) unless the licence applying to the code in

gradle.properties

@@ -7,5 +7,5 @@ groupid=ch.njol
 name=skript
 version=2.11.2
 jarName=Skript.jar
-testEnv=java21/paper-1.21.5
+testEnv=java21/paper-1.21.6
 testEnvJavaVersion=21

settings.gradle

@@ -1,6 +1,6 @@
 
 plugins {
-    id 'org.gradle.toolchains.foojay-resolver-convention' version '0.8.0'
+    id 'org.gradle.toolchains.foojay-resolver-convention' version '1.0.0'
 }
 
 rootProject.name = 'Skript'

src/main/java/ch/njol/skript/aliases/AliasesProvider.java

@@ -1,6 +1,5 @@
 package ch.njol.skript.aliases;
 
-import ch.njol.skript.Skript;
 import ch.njol.skript.bukkitutil.BukkitUnsafe;
 import ch.njol.skript.bukkitutil.ItemUtils;
 import ch.njol.skript.bukkitutil.block.BlockCompat;
@@ -11,7 +10,6 @@
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashMap;
-import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
@@ -24,9 +22,6 @@
  */
 public class AliasesProvider {
 
-	// not supported on Spigot versions older than 1.18
-	private static final boolean FASTER_SET_SUPPORTED = Skript.classExists("it.unimi.dsi.fastutil.objects.ObjectOpenHashSet");
-
 	/**
 	 * When an alias is not found, it will requested from this provider.
 	 * Null when this is global aliases provider.
@@ -66,13 +61,7 @@ public AliasesProvider(int expectedCount, @Nullable AliasesProvider parent) {
 		this.aliases = new HashMap<>(expectedCount);
 		this.variations = new HashMap<>(expectedCount / 20);
 		this.aliasesMap = new AliasesMap();
-
-		if (FASTER_SET_SUPPORTED) {
-			this.materials = new ObjectOpenHashSet<>();
-		} else {
-			this.materials = new HashSet<>();
-		}
-
+		this.materials = new ObjectOpenHashSet<>();
 		this.gson = new Gson();
 	}
 

src/main/java/ch/njol/skript/aliases/ItemType.java

@@ -42,6 +42,8 @@
 import java.lang.reflect.Field;
 import java.util.*;
 import java.util.Map.Entry;
+import java.util.function.BiPredicate;
+import java.util.function.Predicate;
 import java.util.stream.Collectors;
 
 @ContainerType(ItemStack.class)
@@ -564,6 +566,30 @@ public Iterator<ItemStack> iterator() {
 		};
 	}
 
+	/**
+	 * Determines whether this ItemType satisfies the given predicate.
+	 * If {@link #isAll()} is true, this will return true if the predicate is satisfied by all ItemDatas.
+	 * If {@link #isAll()} is false, this will return true if the predicate is satisfied by any ItemData.
+	 * @param predicate A predicate to test items against
+	 * @return Whether this ItemType satisfies the predicate
+	 */
+	public boolean satisfies(Predicate<ItemStack> predicate) {
+		if (isAll()) {
+			for (Iterator<ItemStack> it = containerIterator(); it.hasNext(); ) {
+				ItemStack stack = it.next();
+				if (!predicate.test(stack))
+					return false;
+			}
+			return true;
+		}
+		for (Iterator<ItemStack> it = containerIterator(); it.hasNext(); ) {
+			ItemStack stack = it.next();
+			if (predicate.test(stack))
+				return true;
+		}
+		return false;
+	}
+
 	@Nullable
 	public ItemStack removeAll(@Nullable ItemStack item) {
 		boolean wasAll = all;
@@ -1262,7 +1288,7 @@ public Map<Enchantment,Integer> getEnchantments() {
 	public void addEnchantments(Map<Enchantment,Integer> enchantments) {
 		if (globalMeta == null)
 			globalMeta = ItemData.itemFactory.getItemMeta(Material.STONE);
-		for (Map.Entry<Enchantment,Integer> entry : enchantments.entrySet()) {
+		for (Entry<Enchantment,Integer> entry : enchantments.entrySet()) {
 			assert globalMeta != null;
 			globalMeta.addEnchant(entry.getKey(), entry.getValue(), true);
 		}
@@ -1339,23 +1365,111 @@ public boolean hasAnyEnchantments(Enchantment... enchantments) {
 	}
 
 	/**
-	 * Checks whether this item type contains the given enchantments.
-	 * Also checks the enchantment level.
+	 * Checks whether this item type contains all the given enchantments.
+	 * Also checks the enchantment level, where any level equal or lesser than the item's level is accepted.
 	 * @param enchantments The enchantments to be checked.
+	 * @deprecated Use {@link #hasEnchantmentsOrBetter(EnchantmentType...)}
 	 */
+	@Deprecated(since="INSERT VERSION")
 	public boolean hasEnchantments(EnchantmentType... enchantments) {
+		return hasEnchantmentsOrBetter(true, enchantments);
+	}
+
+	/**
+	 * Checks whether this item type contains the given enchantments.
+	 * Also checks the enchantment level, where any level equal or lesser than the item's level is accepted.
+	 * @param all Whether to check all enchantments or any enchantment.
+	 * @param enchantments The enchantments to be checked.
+	 * @deprecated Use {@link #hasEnchantmentsOrBetter(boolean, EnchantmentType...)}
+	 */
+	@Deprecated(since="INSERT VERSION")
+	public boolean hasEnchantments(boolean all, EnchantmentType... enchantments) {
+		return hasEnchantmentsOrBetter(all, enchantments);
+	}
+
+	/**
+	 * Checks whether this item type contains all the given enchantments.
+	 * Also checks the enchantment level, where any level equal or lesser than the item's level is accepted.
+	 * @param enchantments The enchantments to be checked.
+	 */
+	public boolean hasEnchantmentsOrBetter(EnchantmentType... enchantments) {
+		return hasEnchantmentsOrBetter(true, enchantments);
+	}
+
+	/**
+	 * Checks whether this item type contains the given enchantments.
+	 * Also checks the enchantment level, where any level equal or lesser than the item's level is accepted.
+	 * @param all Whether to check all enchantments or any enchantment.
+	 * @param enchantments The enchantments to be checked.
+	 */
+	public boolean hasEnchantmentsOrBetter(boolean all, EnchantmentType... enchantments) {
+		return hasEnchantments((itemLevel, typeLevel) -> itemLevel >= typeLevel, all, enchantments);
+	}
+
+	/**
+	 * Checks whether this item type contains all the given enchantments.
+	 * Also checks the enchantment level, where any level equal or greater than the item's level is accepted.
+	 * @param enchantments The enchantments to be checked.
+	 */
+	public boolean hasEnchantmentsOrWorse(EnchantmentType... enchantments) {
+		return hasEnchantmentsOrWorse(true, enchantments);
+	}
+
+	/**
+	 * Checks whether this item type contains the given enchantments.
+	 * Also checks the enchantment level, where any level equal or greater than the item's level is accepted.
+	 * @param all Whether to check all enchantments or any enchantment.
+	 * @param enchantments The enchantments to be checked.
+	 */
+	public boolean hasEnchantmentsOrWorse(boolean all, EnchantmentType... enchantments) {
+		return hasEnchantments((itemLevel, typeLevel) -> itemLevel <= typeLevel, all, enchantments);
+	}
+
+	/**
+	 * Checks whether this item type contains all the given enchantments with the given level.
+	 * EnchantmentTypes that do not specify a level match any level.
+	 * @param enchantments The enchantments to be checked.
+	 */
+	public boolean hasExactEnchantments(EnchantmentType... enchantments) {
+		return hasExactEnchantments(true, enchantments);
+	}
+
+	/**
+	 * Checks whether this item type contains the given enchantments with the given level.
+	 * EnchantmentTypes that do not specify a level match any level.
+	 * @param all Whether to check all enchantments or any enchantment.
+	 * @param enchantments The enchantments to be checked.
+	 */
+	public boolean hasExactEnchantments(boolean all, EnchantmentType... enchantments) {
+		return hasEnchantments(Integer::equals, all, enchantments);
+	}
+
+	/**
+	 * Checks whether this item type contains the given enchantments.
+	 * Also checks the enchantment level, with behavior depending on the {@code exact} parameter.
+	 * @param levelMatchingCondition A predicate used to tell whether the item's level (first param) matches a type's level (second param).
+	 *                               Types with no specified level will always match, regardless of this predicate.
+	 * @param all Whether to check all enchantments or any enchantment.
+	 * @param enchantments The enchantments to be checked.
+	 */
+	private boolean hasEnchantments(BiPredicate<@NotNull Integer, @NotNull Integer> levelMatchingCondition, boolean all, EnchantmentType... enchantments) {
 		if (!hasEnchantments())
 			return false;
 		ItemMeta meta = getItemMeta();
 		for (EnchantmentType enchantment : enchantments) {
 			Enchantment type = enchantment.getType();
 			assert type != null; // Bukkit working different than we expect
-			if (!meta.hasEnchant(type))
+			if (!meta.hasEnchant(type) && all)
 				return false;
-			if (enchantment.getInternalLevel() != -1 && meta.getEnchantLevel(type) < enchantment.getLevel())
+			if (enchantment.getInternalLevel() == -1 || levelMatchingCondition.test(meta.getEnchantLevel(type), enchantment.getLevel())) {
+				if (!all)
+					return true;
+			} else if (all) {
 				return false;
+			}
 		}
-		return true;
+		return all;
+
 	}
 
 	/**