Merge branch 'dev/patch' into dev/feature

Author: APickledWalrus

skript-aliases

@@ -21,11 +21,7 @@
 import ch.njol.yggdrasil.Fields;
 import ch.njol.yggdrasil.Fields.FieldContext;
 import ch.njol.yggdrasil.YggdrasilSerializable.YggdrasilExtendedSerializable;
-import org.bukkit.Location;
-import org.bukkit.Material;
-import org.bukkit.OfflinePlayer;
-import org.bukkit.Tag;
-import org.bukkit.Bukkit;
+import org.bukkit.*;
 import org.bukkit.block.Block;
 import org.bukkit.block.BlockState;
 import org.bukkit.block.Skull;
@@ -35,6 +31,7 @@
 import org.bukkit.inventory.Inventory;
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.inventory.PlayerInventory;
+import org.bukkit.inventory.meta.BlockStateMeta;
 import org.bukkit.inventory.meta.ItemMeta;
 import org.bukkit.inventory.meta.SkullMeta;
 import org.jetbrains.annotations.NotNull;
@@ -43,19 +40,8 @@
 import java.io.NotSerializableException;
 import java.io.StreamCorruptedException;
 import java.lang.reflect.Field;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.util.Map.Entry;
-import java.util.NoSuchElementException;
-import java.util.Random;
-import java.util.RandomAccess;
-import java.util.Set;
 import java.util.stream.Collectors;
 
 @ContainerType(ItemStack.class)
@@ -390,8 +376,8 @@ public boolean setBlock(Block block, boolean applyPhysics) {
 
 			ItemMeta itemMeta = getItemMeta();
 
-			if (itemMeta instanceof SkullMeta) {
-				OfflinePlayer offlinePlayer = ((SkullMeta) itemMeta).getOwningPlayer();
+			if (itemMeta instanceof SkullMeta skullMeta) {
+				OfflinePlayer offlinePlayer = skullMeta.getOwningPlayer();
 				if (offlinePlayer == null)
 					continue;
 				Skull skull = (Skull) block.getState();
@@ -407,11 +393,49 @@ public boolean setBlock(Block block, boolean applyPhysics) {
 				skull.update(false, applyPhysics);
 			}
 
+			// https://github.com/SkriptLang/Skript/issues/7735
+			// No method exists to copy general BlockStateMeta data to a block, so we have to do it manually for now
+			copyContainerState(block, itemMeta);
+
 			return true;
 		}
 		return false;
 	}
 
+	/**
+	 * Copies the container state from the item meta to the block state
+	 * @param block The block to copy the state to
+	 * @param itemMeta The item meta to copy the state from
+	 */
+	private void copyContainerState(@NotNull Block block, @NotNull ItemMeta itemMeta) {
+		// ensure the item has a block state
+		if (!(itemMeta instanceof BlockStateMeta blockStateMeta) || !blockStateMeta.hasBlockState())
+			return;
+
+		// only care about container -> container copying
+		if (!(blockStateMeta.getBlockState() instanceof org.bukkit.block.Container itemContainer)
+				|| !(block.getState() instanceof org.bukkit.block.Container blockContainer))
+			return;
+
+		// copy inventory from item to block
+		copyInventories(itemContainer.getSnapshotInventory(), blockContainer.getSnapshotInventory());
+		blockContainer.update();
+	}
+
+	/**
+	 * Copies the contents of one inventory to another, maintaining slot positions and making clones.
+	 * @param from The inventory to copy from
+	 * @param to The inventory to copy to
+	 */
+	private void copyInventories(@NotNull Inventory from, @NotNull Inventory to) {
+		for (int i = 0; i < from.getSize(); i++) {
+			ItemStack item = from.getItem(i);
+			if (item != null) {
+				to.setItem(i, item.clone());
+			}
+		}
+	}
+
 	/**
 	 * Send a block change to a player
 	 * <p>This will send a fake block change to the player, and will not change the block on the server.</p>

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

@@ -7,6 +7,7 @@
 /**
  * A syntax element that restricts the events it can be used in.
  */
+@FunctionalInterface
 public interface EventRestrictedSyntax {
 
 	/**

src/main/java/ch/njol/skript/lang/EventRestrictedSyntax.java

@@ -240,16 +240,7 @@ public boolean hasTag(String tag) {
 							if (element instanceof EventRestrictedSyntax eventRestrictedSyntax) {
 								Class<? extends Event>[] supportedEvents = eventRestrictedSyntax.supportedEvents();
 								if (!getParser().isCurrentEvent(supportedEvents)) {
-									Iterator<String> iterator = Arrays.stream(supportedEvents)
-										.map(it -> "the " + it.getSimpleName()
-											.replaceAll("([A-Z])", " $1")
-											.toLowerCase()
-											.trim())
-										.iterator();
-
-									String events = StringUtils.join(iterator, ", ", " or ");
-
-									Skript.error("'" + parseResult.expr + "' can only be used in " + events);
+									Skript.error("'" + parseResult.expr + "' can only be used in " + supportedEventsNames(supportedEvents));
 									continue;
 								}
 							}
@@ -276,6 +267,22 @@ public boolean hasTag(String tag) {
 		}
 	}
 
+	private static String supportedEventsNames(Class<? extends Event>[] supportedEvents) {
+		List<String> names = new ArrayList<>();
+
+		for (SkriptEventInfo<?> eventInfo : Skript.getEvents()) {
+			for (Class<? extends Event> eventClass : supportedEvents) {
+				for (Class<? extends Event> event : eventInfo.events) {
+					if (event.isAssignableFrom(eventClass)) {
+						names.add("the %s event".formatted(eventInfo.getName().toLowerCase()));
+					}
+				}
+			}
+		}
+
+		return StringUtils.join(names, ", ", " or ");
+	}
+
 	private static @NotNull DefaultExpression<?> getDefaultExpression(ExprInfo exprInfo, String pattern) {
 		DefaultExpression<?> expr = exprInfo.classes[0].getDefaultExpression();
 		if (expr == null)

src/main/java/ch/njol/skript/lang/SkriptParser.java

@@ -16,15 +16,15 @@
 import org.bukkit.event.Event;
 import org.jetbrains.annotations.Nullable;
 
-@Name("Display Teleport Delay/Duration")
+@Name("Display Teleport Duration")
 @Description({
 	"The teleport duration of displays is the amount of time it takes to get between locations.",
 	"0 means that updates are applied immediately.",
 	"1 means that the display entity will move from current position to the updated one over one tick.",
 	"Higher values spread the movement over multiple ticks. Max of 59 ticks."
 })
 @Examples({
-	"set teleport delay of the last spawned text display to 2 ticks",
+	"set teleport duration of the last spawned text display to 2 ticks",
 	"teleport last spawned text display to {_location}",
 	"wait 2 ticks",
 	"message \"display entity has arrived at %{_location}%\""

src/main/java/org/skriptlang/skript/bukkit/displays/generic/ExprDisplayTeleportDuration.java

@@ -18,10 +18,10 @@ public class EvtPlayerInput extends SkriptEvent {
 		if (Skript.classExists("org.bukkit.event.player.PlayerInputEvent")) {
 			Skript.registerEvent("Player Input", EvtPlayerInput.class, PlayerInputEvent.class,
 					"[player] (toggle|toggling|1:press[ing]|2:release|2:releasing) of (%-inputkeys%|(an|any) input key)",
-					"([player] %-inputkeys%|[an|any [player]] input key) (toggle|toggling|1:press[ing]|2:release|2:releasing)")
+					"([player] %-inputkeys%|[an|player] input key) (toggle|toggling|1:press[ing]|2:release|2:releasing)")
 				.description("Called when a player sends an updated input to the server.",
 					"Note: The input keys event value is the set of keys the player is currently pressing, not the keys that were pressed or released.")
-				.examples("on any input key press:",
+				.examples("on input key press:",
 					"\tsend \"You are pressing: %event-inputkeys%\" to player")
 				.since("2.10")
 				.requiredPlugins("Minecraft 1.21.3+");

src/main/java/org/skriptlang/skript/bukkit/input/elements/events/EvtPlayerInput.java

@@ -2,4 +2,4 @@ test "supported events":
 	parse:
 		set {_x} to the exploded blocks
 
-	assert last parse logs contain "'the exploded blocks' can only be used in the entity explode event" with "supported events message did not get sent correctly"
+	assert last parse logs contain "'the exploded blocks' can only be used in the on explode event" with "supported events message did not get sent correctly"