Merge branch 'dev/feature' into fix/bli-overshoot

Author: sovdeeth

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

@@ -10,16 +10,19 @@
 import ch.njol.skript.util.Utils;
 import ch.njol.skript.util.slot.Slot;
 import com.destroystokyo.paper.event.player.PlayerArmorChangeEvent;
+import com.destroystokyo.paper.event.player.PlayerArmorChangeEvent.SlotType;
 import org.bukkit.event.Event;
 import org.bukkit.inventory.EquipmentSlot;
 import org.bukkit.inventory.ItemStack;
 import org.jetbrains.annotations.Nullable;
+import org.skriptlang.skript.lang.converter.Converter;
 
-import java.util.concurrent.CompletionException;
+import java.util.Map;
 
 public class EvtPlayerArmorChange extends SkriptEvent {
 
-	private static boolean BODY_SLOT_EXISTS;
+	private static final boolean BODY_SLOT_EXISTS = Skript.fieldExists(EquipmentSlot.class, "BODY");
+	private static Converter<PlayerArmorChangeEvent, EquipmentSlot> GET_SLOT;
 
 	static {
 		if (Skript.classExists("com.destroystokyo.paper.event.player.PlayerArmorChangeEvent")) {
@@ -36,22 +39,30 @@ public class EvtPlayerArmorChange extends SkriptEvent {
 				)
 				.since("2.5, 2.11 (equipment slots)");
 
-			EquipmentSlot bodySlot = null;
-			try {
-				bodySlot = EquipmentSlot.valueOf("BODY");
-			} catch (IllegalArgumentException | NoSuchFieldError | CompletionException ignored) {};
-			BODY_SLOT_EXISTS = bodySlot != null;
+			// get slot function is dependent on version. 1.21.4+ has a new method.
+			if (Skript.methodExists(PlayerArmorChangeEvent.class, "getSlot")) {
+				GET_SLOT = PlayerArmorChangeEvent::getSlot;
+			} else {
+				//noinspection deprecation
+				Map<SlotType, EquipmentSlot> slotTypeMap = Map.of(
+					Enum.valueOf(SlotType.class, "HEAD"), EquipmentSlot.HEAD,
+					Enum.valueOf(SlotType.class, "CHEST"), EquipmentSlot.CHEST,
+					Enum.valueOf(SlotType.class, "LEGS"), EquipmentSlot.LEGS,
+					Enum.valueOf(SlotType.class, "FEET"), EquipmentSlot.FEET);
+				GET_SLOT = event -> {
+					//noinspection deprecation
+					return slotTypeMap.get(event.getSlotType());
+				};
+			}
 
-			EventValues.registerEventValue(PlayerArmorChangeEvent.class, EquipmentSlot.class,
-				event -> switch (event.getSlotType()) {
-					case HEAD -> EquipmentSlot.HEAD;
-					case CHEST -> EquipmentSlot.CHEST;
-					case LEGS -> EquipmentSlot.LEGS;
-					case FEET -> EquipmentSlot.FEET;
-				});
-			EventValues.registerEventValue(PlayerArmorChangeEvent.class, ItemStack.class, PlayerArmorChangeEvent::getOldItem, EventValues.TIME_PAST);
-			EventValues.registerEventValue(PlayerArmorChangeEvent.class, ItemStack.class, PlayerArmorChangeEvent::getNewItem, EventValues.TIME_FUTURE);
-			EventValues.registerEventValue(PlayerArmorChangeEvent.class, Slot.class, event -> new ch.njol.skript.util.slot.EquipmentSlot(event.getPlayer().getEquipment(), event.getSlot()));
+			// Register event values
+			EventValues.registerEventValue(PlayerArmorChangeEvent.class, EquipmentSlot.class, GET_SLOT);
+			EventValues.registerEventValue(PlayerArmorChangeEvent.class, ItemStack.class,
+					PlayerArmorChangeEvent::getOldItem, EventValues.TIME_PAST);
+			EventValues.registerEventValue(PlayerArmorChangeEvent.class, ItemStack.class,
+					PlayerArmorChangeEvent::getNewItem, EventValues.TIME_FUTURE);
+			EventValues.registerEventValue(PlayerArmorChangeEvent.class, Slot.class,
+					event -> new ch.njol.skript.util.slot.EquipmentSlot(event.getPlayer().getEquipment(), event.getSlot()));
 		}
 	}
 
@@ -76,13 +87,7 @@ public boolean check(Event event) {
 		PlayerArmorChangeEvent changeEvent = (PlayerArmorChangeEvent) event;
 		if (slot == null)
 			return true;
-		EquipmentSlot changedSlot = switch (changeEvent.getSlotType()) {
-			case HEAD -> EquipmentSlot.HEAD;
-			case CHEST -> EquipmentSlot.CHEST;
-			case LEGS -> EquipmentSlot.LEGS;
-			case FEET -> EquipmentSlot.FEET;
-		};
-		return slot == changedSlot;
+		return slot == GET_SLOT.convert(changeEvent);
 	}
 
 	@Override

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

@@ -48,8 +48,8 @@ public abstract class Statement extends TriggerItem implements SyntaxElement {
 			log.clear();
 
 			Statement statement;
+			Section.SectionContext sectionContext = ParserInstance.get().getData(Section.SectionContext.class);
 			if (node != null) {
-				Section.SectionContext sectionContext = ParserInstance.get().getData(Section.SectionContext.class);
 				statement = sectionContext.modify(node, items, () -> {
 						//noinspection unchecked,rawtypes
 						Statement parsed = (Statement) SkriptParser.parse(input, (Iterator) Skript.getStatements().iterator(), defaultError);
@@ -60,8 +60,10 @@ public abstract class Statement extends TriggerItem implements SyntaxElement {
 						return parsed;
 				});
 			} else {
-				//noinspection unchecked,rawtypes
-				statement = (Statement) SkriptParser.parse(input, (Iterator) Skript.getStatements().iterator(), defaultError);
+				statement = sectionContext.modify(null, null, () -> {
+					//noinspection unchecked,rawtypes
+					return (Statement) SkriptParser.parse(input, (Iterator) Skript.getStatements().iterator(), defaultError);
+				});
 			}
 
 			if (statement != null) {

src/main/resources/lang/default.lang

@@ -2085,6 +2085,12 @@ inventory actions:
 	clone_stack: clone stack
 	collect_to_cursor: collect to cursor, collect items to cursor
 	unknown: unknown, unsupported, custom
+	pickup_from_bundle: pickup from bundle, pickup items from bundle
+	pickup_all_into_bundle: pickup all into bundle, pickup all items into bundle
+	pickup_some_into_bundle: pickup some into bundle, pickup some items into bundle
+	place_from_bundle: place from bundle, place items from bundle
+	place_all_into_bundle: place all into bundle, place all items into bundle
+	place_some_into_bundle: place some into bundle, place some items into bundle
 
 # -- Inventory Click Types --
 click types:
@@ -2144,6 +2150,7 @@ spawn reasons:
 	bed: bed
 	beehive: beehive
 	breeding: breed, breeding
+	bucket: release from bucket # 'bucket' alone is problematic
 	build_irongolem: built iron golem, build iron golem
 	build_snowman: built snowman, build snowman
 	build_wither: built wither, build wither