Aliases - load temp aliases, when aliases are missing

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

@@ -32,7 +32,9 @@
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
+import org.bukkit.ChatColor;
 import org.bukkit.Material;
+import org.bukkit.NamespacedKey;
 import org.eclipse.jdt.annotation.Nullable;
 
 import ch.njol.skript.Skript;
@@ -396,6 +398,22 @@ public static void load() {
 			Skript.exception(e);
 		}
 	}
+
+	/**
+	 * Temporarily create an alias for a material which may not have an alias yet.
+	 */
+	private static void loadMissingAliases() {
+		if (!Skript.methodExists(Material.class, "getKey"))
+			return;
+		for (Material material : Material.values()) {
+			if (!provider.hasAliasForMaterial(material)) {
+				NamespacedKey key = material.getKey();
+				String name = key.getKey().replace("_", " ");
+				parser.loadAlias(name + "¦s", key.toString());
+				Skript.debug(ChatColor.YELLOW + "Creating temporary alias for: " + key.toString());
+			}
+		}
+	}
 
 	private static void loadInternal() throws IOException {
 		Path dataFolder = Skript.getInstance().getDataFolder().toPath();
@@ -419,6 +437,7 @@ private static void loadInternal() throws IOException {
 					Path aliasesPath = zipFs.getPath("/", "aliases-english");
 					assert aliasesPath != null;
 					loadDirectory(aliasesPath);
+					loadMissingAliases();
 				}
 			} catch (URISyntaxException e) {
 				assert false;

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

@@ -52,6 +52,11 @@ public class AliasesProvider {
 	 * All aliases that are currently loaded by this provider.
 	 */
 	private final Map<String, ItemType> aliases;
+
+	/**
+	 * All materials that are currently loaded by this provider.
+	 */
+	private final List<Material> materials;
 
 	/**
 	 * Tags are in JSON format. We may need GSON when merging tags
@@ -166,6 +171,7 @@ public AliasesProvider(int expectedCount, @Nullable AliasesProvider parent) {
 		this.aliases = new HashMap<>(expectedCount);
 		this.variations = new HashMap<>(expectedCount / 20);
 		this.aliasesMap = new AliasesMap();
+		this.materials = new ArrayList<>();
 
 		this.gson = new Gson();
 	}
@@ -259,6 +265,8 @@ public void addAlias(AliasName name, String id, @Nullable Map<String, Object> ta
 			if (material == null) { // If server doesn't recognize id, do not proceed
 				throw new InvalidMinecraftIdException(id);
 			}
+			if (!materials.contains(material))
+				materials.add(material);
 
 			// Hacky: get related entity from block states
 			String entityName = blockStates.remove("relatedEntity");
@@ -378,4 +386,13 @@ public int getAliasCount() {
 		return aliases.size();
 	}
 
+	/**
+	 * Check if this provider has an alias for the given material.
+	 * @param material Material to check alias for
+	 * @return True if this material has an alias
+	 */
+	public boolean hasAliasForMaterial(Material material) {
+		return materials.contains(material);
+	}
+
 }