Merge pull request #4865 from AyhamAl-Ali/dev-2.6

🚀 Update Dev 2.6

Author: Moderocky

build.gradle

@@ -27,7 +27,7 @@ allprojects {
 
 dependencies {
 	shadow group: 'io.papermc', name: 'paperlib', version: '1.0.6'
-	implementation group: 'io.papermc.paper', name: 'paper-api', version: '1.17.1-R0.1-SNAPSHOT'
+	implementation group: 'io.papermc.paper', name: 'paper-api', version: '1.19-R0.1-SNAPSHOT'
 	implementation group: 'org.eclipse.jdt', name: 'org.eclipse.jdt.annotation', version: '2.2.600'
 	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'
@@ -142,7 +142,7 @@ tasks.create('testNaming') {
 		// Regression tests
 		for (def file : project.file('src/test/skript/tests/regressions').listFiles()) {
 			def name = file.getName()
-			if (name.toLowerCase() != name) {
+			if (name.toLowerCase(Locale.ENGLISH) != name) {
 				throw new InvalidUserDataException('invalid test name: ' + name)
 			}
 		}

gradle.properties

@@ -1,5 +1,5 @@
 groupid=ch.njol
 name=skript
-version=2.6.2
+version=2.6.3
 jarName=Skript.jar
 testEnv=paper-1.16.5

skript-aliases

@@ -701,7 +701,7 @@ private static ScriptInfo loadScript(@Nullable Config config) {
 					if (!SkriptParser.validateLine(event))
 						continue;
 
-					if (event.toLowerCase().startsWith("command ")) {
+					if (event.toLowerCase(Locale.ENGLISH).startsWith("command ")) {
 
 						getParser().setCurrentEvent("command", CommandEvent.class);
 
@@ -715,7 +715,7 @@ private static ScriptInfo loadScript(@Nullable Config config) {
 						getParser().deleteCurrentEvent();
 
 						continue;
-					} else if (event.toLowerCase().startsWith("function ")) {
+					} else if (event.toLowerCase(Locale.ENGLISH).startsWith("function ")) {
 
 						getParser().setCurrentEvent("function", FunctionEvent.class);
 
@@ -964,7 +964,7 @@ public static Config loadStructure(Config config) {
 				if (!SkriptParser.validateLine(event))
 					continue;
 
-				if (event.toLowerCase().startsWith("function ")) {
+				if (event.toLowerCase(Locale.ENGLISH).startsWith("function ")) {
 
 					getParser().setCurrentEvent("function", FunctionEvent.class);
 
@@ -1163,7 +1163,7 @@ static Trigger loadTrigger(SectionNode node) {
 			assert false : node;
 			return null;
 		}
-		if (event.toLowerCase().startsWith("on "))
+		if (event.toLowerCase(Locale.ENGLISH).startsWith("on "))
 			event = "" + event.substring("on ".length());
 
 		NonNullPair<SkriptEventInfo<?>, SkriptEvent> parsedEvent =

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

@@ -1090,7 +1090,8 @@ public void onPluginDisable(PluginDisableEvent event) {
 
 			try {
 				// Spigot removed the mapping for this method in 1.18, so its back to obfuscated method
-				String isRunningMethod = Skript.isRunningMinecraft(1, 18) ? "v" : "isRunning";
+				// 1.19 mapping is u and 1.18 is v
+				String isRunningMethod = Skript.isRunningMinecraft(1, 19) ? "u" : Skript.isRunningMinecraft(1, 18) ? "v" :"isRunning";
 				IS_RUNNING = MC_SERVER.getClass().getMethod(isRunningMethod);
 			} catch (NoSuchMethodException e) {
 				throw new RuntimeException(e);

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

@@ -184,7 +184,7 @@ public boolean onCommand(@Nullable CommandSender sender, @Nullable Command comma
 					}
 				}
 			} else if (args[0].equalsIgnoreCase("enable")) {
-				if (args[1].equals("all")) {
+				if (args[1].equalsIgnoreCase("all")) {
 					try {
 						info(sender, "enable.all.enabling");
 						File[] files = toggleScripts(new File(Skript.getInstance().getDataFolder(), Skript.SCRIPTSFOLDER), true).toArray(new File[0]);
@@ -264,7 +264,7 @@ public boolean onCommand(@Nullable CommandSender sender, @Nullable Command comma
 					}
 				}
 			} else if (args[0].equalsIgnoreCase("disable")) {
-				if (args[1].equals("all")) {
+				if (args[1].equalsIgnoreCase("all")) {
 					ScriptLoader.disableScripts();
 					try {
 						toggleScripts(new File(Skript.getInstance().getDataFolder(), Skript.SCRIPTSFOLDER), false);
@@ -318,7 +318,7 @@ public boolean onCommand(@Nullable CommandSender sender, @Nullable Command comma
 					Skript.info(sender, "" + SkriptUpdater.m_internal_error);
 					return true;
 				}
-				if (args[1].equals("check")) {
+				if (args[1].equalsIgnoreCase("check")) {
 					updater.updateCheck(sender);
 				} else if (args[1].equalsIgnoreCase("changes")) {
 					updater.changesCheck(sender);
@@ -328,6 +328,7 @@ public boolean onCommand(@Nullable CommandSender sender, @Nullable Command comma
 			} else if (args[0].equalsIgnoreCase("info")) {
 				info(sender, "info.aliases");
 				info(sender, "info.documentation");
+				info(sender, "info.tutorials");
 				info(sender, "info.server", Bukkit.getVersion());
 				info(sender, "info.version", Skript.getVersion());
 				info(sender, "info.addons", Skript.getAddons().isEmpty() ? "None" : "");

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

@@ -56,7 +56,7 @@ public List<String> onTabComplete(CommandSender sender, Command command, String
 				// Live update, this will get all old and new (even not loaded) scripts
 				Files.walk(scripts.toPath())
 					.map(Path::toFile)
-					.filter(f -> (!f.isDirectory() && f.getName().toLowerCase().endsWith(".sk")) ||
+					.filter(f -> (!f.isDirectory() && StringUtils.endsWithIgnoreCase(f.getName(), ".sk")) ||
 						f.isDirectory()) // filter folders and skript files only
 					.filter(f -> { // Filtration for enable, disable and reload
 						if (args[0].equalsIgnoreCase("enable"))

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

@@ -28,6 +28,7 @@
 import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.util.HashMap;
+import java.util.Locale;
 import java.util.Map;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
@@ -269,7 +270,7 @@ public static ItemType parseItemType(String s) {
 				t.setAmount(1);
 		}
 
-		String lc = s.toLowerCase();
+		String lc = s.toLowerCase(Locale.ENGLISH);
 		String of = Language.getSpaced("enchantments.of").toLowerCase();
 		int c = -1;
 		outer: while ((c = lc.indexOf(of, c + 1)) != -1) {
@@ -335,7 +336,7 @@ private static ItemType parseType(final String s, final ItemType t, final boolea
 	@Nullable
 	private static ItemType getAlias(final String s) {
 		ItemType i;
-		String lc = "" + s.toLowerCase();
+		String lc = "" + s.toLowerCase(Locale.ENGLISH);
 		final Matcher m = p_any.matcher(lc);
 		if (m.matches()) {
 			lc = "" + m.group(m.groupCount());

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

@@ -23,6 +23,7 @@
 import java.util.HashMap;
 import java.util.LinkedHashMap;
 import java.util.List;
+import java.util.Locale;
 import java.util.Map;
 import java.util.function.Function;
 
@@ -682,7 +683,7 @@ protected void loadSingleAlias(Map<String, Variation> variations, String item) {
 				Skript.warning(m_empty_alias.toString());
 			} else {
 				// Intern id to save some memory
-				id = id.toLowerCase().intern();
+				id = id.toLowerCase(Locale.ENGLISH).intern();
 				assert id != null;
 				try {
 					// Create singular and plural forms of the alias

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

@@ -18,8 +18,24 @@
  */
 package ch.njol.skript.classes.data;
 
-import java.util.List;
-
+import ch.njol.skript.Skript;
+import ch.njol.skript.aliases.Aliases;
+import ch.njol.skript.aliases.ItemType;
+import ch.njol.skript.command.CommandEvent;
+import ch.njol.skript.events.EvtMoveOn;
+import ch.njol.skript.events.bukkit.ScriptEvent;
+import ch.njol.skript.events.bukkit.SkriptStartEvent;
+import ch.njol.skript.events.bukkit.SkriptStopEvent;
+import ch.njol.skript.registrations.EventValues;
+import ch.njol.skript.util.BlockStateBlock;
+import ch.njol.skript.util.BlockUtils;
+import ch.njol.skript.util.DelayedChangeBlock;
+import ch.njol.skript.util.Direction;
+import ch.njol.skript.util.Getter;
+import ch.njol.skript.util.slot.InventorySlot;
+import ch.njol.skript.util.slot.Slot;
+import com.destroystokyo.paper.event.entity.ProjectileCollideEvent;
+import com.destroystokyo.paper.event.player.PlayerArmorChangeEvent;
 import org.bukkit.Bukkit;
 import org.bukkit.Chunk;
 import org.bukkit.FireworkEffect;
@@ -126,25 +142,7 @@
 import org.bukkit.potion.PotionEffectType;
 import org.eclipse.jdt.annotation.Nullable;
 
-import com.destroystokyo.paper.event.entity.ProjectileCollideEvent;
-import com.destroystokyo.paper.event.player.PlayerArmorChangeEvent;
-
-import ch.njol.skript.Skript;
-import ch.njol.skript.aliases.Aliases;
-import ch.njol.skript.aliases.ItemType;
-import ch.njol.skript.command.CommandEvent;
-import ch.njol.skript.events.EvtMoveOn;
-import ch.njol.skript.events.bukkit.ScriptEvent;
-import ch.njol.skript.events.bukkit.SkriptStartEvent;
-import ch.njol.skript.events.bukkit.SkriptStopEvent;
-import ch.njol.skript.registrations.EventValues;
-import ch.njol.skript.util.BlockStateBlock;
-import ch.njol.skript.util.BlockUtils;
-import ch.njol.skript.util.DelayedChangeBlock;
-import ch.njol.skript.util.Direction;
-import ch.njol.skript.util.Getter;
-import ch.njol.skript.util.slot.InventorySlot;
-import ch.njol.skript.util.slot.Slot;
+import java.util.List;
 
 /**
  * @author Peter Güttinger
@@ -156,7 +154,8 @@ public BukkitEventValues() {}
 
 	private static final boolean offHandSupport = Skript.isRunningMinecraft(1, 9);
 	private static final boolean NAMESPACE_SUPPORT = Skript.classExists("org.bukkit.NamespacedKey");
-	
+	private static final ItemStack AIR_IS = new ItemStack(Material.AIR);
+
 	static {
 
 		// === WorldEvents ===
@@ -1040,20 +1039,24 @@ public Player get(BlockFertilizeEvent event) {
 				}
 			}, 0);
 		}
-		// CraftItemEvent REMIND maybe re-add this when Skript parser is reworked?
-//		EventValues.registerEventValue(CraftItemEvent.class, ItemStack.class, new Getter<ItemStack, CraftItemEvent>() {
-//			@Override
-//			@Nullable
-//			public ItemStack get(final CraftItemEvent e) {
-//				return e.getRecipe().getResult();
-//			}
-//		}, 0);
 		// PrepareItemCraftEvent
 		EventValues.registerEventValue(PrepareItemCraftEvent.class, Slot.class, new Getter<Slot, PrepareItemCraftEvent>() {
 			@Override
-			@Nullable
 			public Slot get(final PrepareItemCraftEvent e) {
-				return new InventorySlot(e.getInventory(), 9);
+				return new InventorySlot(e.getInventory(), 0);
+			}
+		}, 0);
+		EventValues.registerEventValue(PrepareItemCraftEvent.class, ItemStack.class, new Getter<ItemStack, PrepareItemCraftEvent>() {
+			@Override
+			public ItemStack get(PrepareItemCraftEvent e) {
+				ItemStack item = e.getInventory().getResult();
+				return item != null ? item : AIR_IS;
+			}
+		}, 0);
+		EventValues.registerEventValue(PrepareItemCraftEvent.class, Inventory.class, new Getter<Inventory, PrepareItemCraftEvent>() {
+			@Override
+			public Inventory get(PrepareItemCraftEvent e) {
+				return e.getInventory();
 			}
 		}, 0);
 		EventValues.registerEventValue(PrepareItemCraftEvent.class, Player.class, new Getter<Player, PrepareItemCraftEvent>() {
@@ -1092,6 +1095,14 @@ public String get(PrepareItemCraftEvent e) {
 				}
 			}, 0);
 		}
+		// CraftItemEvent
+		EventValues.registerEventValue(CraftItemEvent.class, ItemStack.class, new Getter<ItemStack, CraftItemEvent>() {
+			@Override
+			@Nullable
+			public ItemStack get(CraftItemEvent e) {
+				return e.getRecipe().getResult();
+			}
+		}, 0);
 		//InventoryOpenEvent
 		EventValues.registerEventValue(InventoryOpenEvent.class, Player.class, new Getter<Player, InventoryOpenEvent>() {
 			@Override