1.20.5 Support

.gitmodules

@@ -1,3 +1,4 @@
 [submodule "skript-aliases"]
 	path = skript-aliases
 	url = https://github.com/SkriptLang/skript-aliases
+	branch = patch/1.20.5-support

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

@@ -1159,7 +1159,9 @@ public void onPluginDisable(PluginDisableEvent event) {
 				// 1.19 mapping is u and 1.18 is v
 				String isRunningMethod = "isRunning";
 
-				if (Skript.isRunningMinecraft(1, 20)) {
+				if (Skript.isRunningMinecraft(1, 20, 5)) {
+					isRunningMethod = "x";
+				} else if (Skript.isRunningMinecraft(1, 20)) {
 					isRunningMethod = "v";
 				} else if (Skript.isRunningMinecraft(1, 19)) {
 					isRunningMethod = "u";

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

@@ -58,6 +58,8 @@
 
 public abstract class Aliases {
 
+	static final boolean USING_ITEM_COMPONENTS = Skript.isRunningMinecraft(1, 20, 5);
+
 	private static final AliasesProvider provider = createProvider(10000, null);
 	private static final AliasesParser parser = createParser(provider);
 

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

@@ -218,9 +218,20 @@ protected Variation parseVariation(String item) {
 				throw new AssertionError("missing space between id and tags in " + item);
 			}
 			id = item.substring(0, firstBracket - 1);
-			String json = item.substring(firstBracket);
-			assert json != null;
-			tags = provider.parseMojangson(json);
+			String json;
+			int jsonEndIndex = item.indexOf("} ["); // may also have block states/data
+			if (jsonEndIndex == -1) {
+				json = item.substring(firstBracket);
+			} else {
+				json = item.substring(firstBracket, jsonEndIndex + 1);
+				id = id + item.substring(jsonEndIndex + 2); // essentially rips out json part
+			}
+			if (Aliases.USING_ITEM_COMPONENTS) {
+				json = "[" + json.substring(1, json.length() - 1) + "]"; // replace brackets (not json :))
+				tags = Collections.singletonMap("components", json);
+			} else {
+				tags = provider.parseMojangson(json);
+			}
 		}
 
 		// Separate block state from id

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

@@ -218,9 +218,18 @@ public int applyTags(ItemStack stack, Map<String, Object> tags) {
 			return flags;
 
 		// Apply random tags using JSON
-		String json = gson.toJson(tags);
-		assert json != null;
-		BukkitUnsafe.modifyItemStack(stack, json);
+		if (Aliases.USING_ITEM_COMPONENTS) {
+			String components = (String) tags.get("components"); // only components are supported for modifying a stack
+			assert components != null;
+			// for modifyItemStack to work, you have to include an item id ... e.g. "minecraft:dirt[<components>]"
+			// just to be safe we use the same one as the provided stack
+			components = stack.getType().getKey() + components;
+			BukkitUnsafe.modifyItemStack(stack, components);
+		} else {
+			String json = gson.toJson(tags);
+			assert json != null;
+			BukkitUnsafe.modifyItemStack(stack, json);
+		}
 		flags |= ItemFlags.CHANGED_TAGS;
 
 		return flags;
@@ -269,6 +278,14 @@ public void addAlias(AliasName name, String id, @Nullable Map<String, Object> ta
 		ItemType typeOfId = getAlias(id);
 		EntityData<?> related = null;
 		List<ItemData> datas;
+
+		// check whether deduplication will occur
+		boolean deduplicate = true;
+		String deduplicateFlag = blockStates.remove("deduplicate");
+		if (deduplicateFlag != null) {
+			deduplicate = !deduplicateFlag.equals("false");
+		}
+
 		if (typeOfId != null) { // If it exists, use datas from it
 			datas = typeOfId.getTypes();
 		} else { // ... but quite often, we just got Vanilla id
@@ -301,11 +318,13 @@ public void addAlias(AliasName name, String id, @Nullable Map<String, Object> ta
 			data.itemFlags = itemFlags;
 
 			// Deduplicate item data if this has been loaded before
-			AliasesMap.Match canonical = aliasesMap.exactMatch(data);
-			if (canonical.getQuality().isAtLeast(MatchQuality.EXACT)) {
-				AliasesMap.AliasData aliasData = canonical.getData();
-				assert aliasData != null; // Match quality guarantees this
-				data = aliasData.getItem();
+			if (deduplicate) {
+				AliasesMap.Match canonical = aliasesMap.exactMatch(data);
+				if (canonical.getQuality().isAtLeast(MatchQuality.EXACT)) {
+					AliasesMap.AliasData aliasData = canonical.getData();
+					assert aliasData != null; // Match quality guarantees this
+					data = aliasData.getItem();
+				}
 			}
 
 			datas = Collections.singletonList(data);