Revert "Merge branch 'dev/feature' into dev/AdditionalJUnitMethods"

This reverts commit 42f0a5e, reversing
changes made to dbfddaf.

Author: sovdeeth

gradle.properties

@@ -5,7 +5,7 @@ org.gradle.parallel=true
 
 groupid=ch.njol
 name=skript
-version=2.11.0
+version=2.11.0-pre1
 jarName=Skript.jar
 testEnv=java21/paper-1.21.5
 testEnvJavaVersion=21

skript-aliases

@@ -1002,15 +1002,14 @@ public static ArrayList<TriggerItem> loadItems(SectionNode node) {
 						break find_section;
 					Collection<LogEntry> errors = handler.getErrors();
 
-					// restore the failure log if:
-					// 1. there are no errors from the statement parse
-					// 2. the error message is the default one from the statement parse
-					// 3. the backup log contains a message about the section being claimed
-					if (errors.isEmpty()
-						|| errors.iterator().next().getMessage().contains("Can't understand this condition/effect:")
-						|| backup.getErrors().iterator().next().getMessage().contains("tried to claim the current section, but it was already claimed by")
-					) {
+					// restore the failure log
+					if (errors.isEmpty()) {
 						handler.restore(backup);
+					} else { // We specifically want these two errors in preference to the section error!
+						String firstError = errors.iterator().next().getMessage();
+						if (!firstError.contains("is a valid statement but cannot function as a section (:)")
+							&& !firstError.contains("You cannot have two section-starters in the same line"))
+							handler.restore(backup);
 					}
 					continue;
 				} finally {

src/main/java/ch/njol/skript/ScriptLoader.java

@@ -564,7 +564,7 @@ public boolean matchPlain(ItemData other) {
 	@Override
 	public Fields serialize() throws NotSerializableException {
 		Fields fields = new Fields(this); // ItemStack is transient, will be ignored
-		fields.putObject("key", type.getKey().toString());
+		fields.putPrimitive("id", type.ordinal());
 		fields.putObject("meta", stack != null ? stack.getItemMeta() : null);
 		return fields;
 	}
@@ -573,16 +573,7 @@ public Fields serialize() throws NotSerializableException {
 
 	@Override
 	public void deserialize(Fields fields) throws StreamCorruptedException, NotSerializableException {
-		if (fields.hasField("key")) {
-			String key = fields.getAndRemoveObject("key", String.class);
-			if (key == null)
-				throw new StreamCorruptedException("Material key is null");
-			this.type = Material.matchMaterial(key);
-		} else {
-			// attempt back compat deserialization, though using ordinals is not reliable
-			this.type = materials[fields.getAndRemovePrimitive("id", int.class)];
-		}
-
+		this.type = materials[fields.getAndRemovePrimitive("id", int.class)];
 		ItemMeta meta = fields.getAndRemoveObject("meta", ItemMeta.class);
 
 		// Initialize ItemStack

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

@@ -1,10 +1,7 @@
 package ch.njol.skript.bukkitutil;
 
 import ch.njol.skript.Skript;
-import com.google.common.collect.BiMap;
-import com.google.common.collect.HashBiMap;
 import org.bukkit.Registry;
-import org.bukkit.inventory.EquipmentSlot;
 import org.bukkit.potion.PotionEffectType;
 import org.jetbrains.annotations.Nullable;
 
@@ -13,16 +10,6 @@
  */
 public class BukkitUtils {
 
-	private static final BiMap<EquipmentSlot, Integer> BUKKIT_EQUIPMENT_SLOT_INDICES = HashBiMap.create();
-
-	static {
-		BUKKIT_EQUIPMENT_SLOT_INDICES.put(EquipmentSlot.FEET, 36);
-		BUKKIT_EQUIPMENT_SLOT_INDICES.put(EquipmentSlot.LEGS, 37);
-		BUKKIT_EQUIPMENT_SLOT_INDICES.put(EquipmentSlot.CHEST, 38);
-		BUKKIT_EQUIPMENT_SLOT_INDICES.put(EquipmentSlot.HEAD, 39);
-		BUKKIT_EQUIPMENT_SLOT_INDICES.put(EquipmentSlot.OFF_HAND, 40);
-	}
-
 	/**
 	 * Check if a registry exists
 	 *
@@ -49,22 +36,4 @@ public static boolean registryExists(String registry) {
 		return null;
 	}
 
-	/**
-	 * Get the inventory slot index of the {@link EquipmentSlot}
-	 * @param equipmentSlot The equipment slot to get the index of
-	 * @return The equipment slot index of the provided slot, otherwise null if invalid
-	 */
-	public static Integer getEquipmentSlotIndex(EquipmentSlot equipmentSlot) {
-		return  BUKKIT_EQUIPMENT_SLOT_INDICES.get(equipmentSlot);
-	}
-
-	/**
-	 * Get the {@link EquipmentSlot} represented by the inventory slot index
-	 * @param slotIndex The index of the equipment slot
-	 * @return The equipment slot the provided slot index, otherwise null if invalid
-	 */
-	public static EquipmentSlot getEquipmentSlotFromIndex(int slotIndex) {
-		return BUKKIT_EQUIPMENT_SLOT_INDICES.inverse().get(slotIndex);
-	}
-
 }

src/main/java/ch/njol/skript/bukkitutil/BukkitUtils.java

@@ -1424,7 +1424,7 @@ public String toVariableNameString(EnchantmentOffer eo) {
 			.name("Wolf Variant")
 			.description("Represents the variant of a wolf entity.",
 				"NOTE: Minecraft namespaces are supported, ex: 'minecraft:ashen'.")
-			.since("2.10")
+			.since("@VERSION")
 			.requiredPlugins("Minecraft 1.21+")
 			.documentationId("WolfVariant"));
 

src/main/java/ch/njol/skript/classes/data/BukkitClasses.java

@@ -764,21 +764,6 @@ else if (hand == EquipmentSlot.OFF_HAND)
 			EventValues.registerEventValue(WorldBorderCenterChangeEvent.class, Location.class, WorldBorderCenterChangeEvent::getNewCenter);
 			EventValues.registerEventValue(WorldBorderCenterChangeEvent.class, Location.class, WorldBorderCenterChangeEvent::getOldCenter, EventValues.TIME_PAST);
 		}
-
-		if (Skript.classExists("org.bukkit.event.block.VaultDisplayItemEvent")) {
-			EventValues.registerEventValue(VaultDisplayItemEvent.class, ItemStack.class, new EventConverter<>() {
-				@Override
-				public void set(VaultDisplayItemEvent event, @Nullable ItemStack itemStack) {
-					event.setDisplayItem(itemStack);
-				}
-
-				@Override
-				public @Nullable ItemStack convert(VaultDisplayItemEvent event) {
-					return event.getDisplayItem();
-				}
-			});
-		}
-
 	}
 
 }

src/main/java/ch/njol/skript/classes/data/BukkitEventValues.java

@@ -772,20 +772,6 @@ public class SimpleEvents {
 				)
 				.since("2.11");
 		}
-
-		if (Skript.classExists("org.bukkit.event.block.VaultDisplayItemEvent")) {
-			Skript.registerEvent("Vault Display Item", SimpleEvent.class, VaultDisplayItemEvent.class,
-					"vault display[ing] item")
-				.description("Called when a vault in a trial chamber is about to display an item.")
-				.examples(
-					"""
-					on vault display item:
-						set event-item to a netherite ingot	
-					"""
-				)
-				.since("INSERT VERSION")
-				.requiredPlugins("Minecraft 1.21.1+");
-		}
 	}
 
 }

src/main/java/ch/njol/skript/events/SimpleEvents.java

@@ -24,7 +24,7 @@
 	"set {_item without entire tooltip} to diamond without entire tooltip"
 })
 @RequiredPlugins("Minecraft 1.20.5+")
-@Since("2.11")
+@Since("INSERT VERSION")
 public class ExprItemWithTooltip extends PropertyExpression<ItemType, ItemType> {
 
 	static {