Bug fixes for alpha 1

Author: sovdeeth

README.md

@@ -34,6 +34,8 @@ Note that this means default values need to be re-evaluated and therefore will n
 Removing a template will 'orphan' existing structs, who will function as if the template still existed, though it may be impossible to access their information as the field access expression may not recognize the field names. If a new template is added with the same name, these existing structs will be updated to match the new template.
 If you remove a template, you should take care to remove structs that depended on it.
 
+**I recommend putting your templates in a separate script file, so you can limit the chances of them being accidentally modified or disabled.**
+
 ## Roadmap
 Alpha 2:
 - `constant` modifier for fields

src/main/java/com/sovdee/oopsk/elements/expressions/ExprFieldAccess.java

@@ -21,6 +21,7 @@
 import java.lang.reflect.Array;
 import java.util.Arrays;
 import java.util.Collections;
+import java.util.Locale;
 import java.util.Map;
 import java.util.Set;
 import java.util.WeakHashMap;
@@ -37,9 +38,9 @@ public static void updateAll() {
 
     static {
         Skript.registerExpression(ExprFieldAccess.class, Object.class, ExpressionType.PROPERTY,
-                "[the] field <\\w+> [of] %struct%",
-                "%struct%'[s] <\\w+> field",
-                "%struct%[ ]->[ ]<\\w+>");
+                "[the] field <[\\w ]+> [of] %struct%",
+                "%struct%'[s] <[\\w ]+> field",
+                "%struct%[ ]->[ ]<[\\w ]+>");
     }
 
     String fieldName;
@@ -57,6 +58,11 @@ public boolean init(Expression<?>[] expressions, int matchedPattern, Kleenean is
         setExpr((Expression<Struct>) expressions[0]);
         node = getParser().getNode();
         fieldName = parseResult.regexes.get(0).group(0);
+        if (fieldName == null) {
+            Skript.error("Field name cannot be null.");
+            return false;
+        }
+        fieldName = fieldName.trim().toLowerCase(Locale.ENGLISH);
         if (!updateFieldGuesses()) {
             Skript.error("No field with name '" + fieldName + "' found.");
             return false;

src/main/java/com/sovdee/oopsk/elements/expressions/ExprStructInstance.java

@@ -14,11 +14,13 @@
 import org.jetbrains.annotations.Nullable;
 import org.skriptlang.skript.log.runtime.SyntaxRuntimeErrorProducer;
 
+import java.util.Locale;
+
 public class ExprStructInstance extends SimpleExpression<Struct> implements SyntaxRuntimeErrorProducer {
 
     static {
         Skript.registerExpression(ExprStructInstance.class, Struct.class, ExpressionType.SIMPLE,
-                "[a[n]] <(\\w+)> struct [instance]");
+                "[a[n]] <([\\w ]+)> struct [instance]");
     }
 
     private String name;
@@ -29,6 +31,7 @@ public boolean init(Expression<?>[] expressions, int matchedPattern, Kleenean is
         name = parseResult.regexes.get(0).group(1);
         if (name == null)
             return false;
+        name = name.trim().toLowerCase(Locale.ENGLISH);
         if (Oopsk.getTemplateManager().getTemplate(name) == null) {
             Skript.error("A struct by the name of '" + name + "' does not exist.");
             return false;

src/main/java/com/sovdee/oopsk/elements/structures/StructStructTemplate.java

@@ -24,6 +24,7 @@
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Locale;
 import java.util.regex.MatchResult;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
@@ -41,7 +42,7 @@ public class StructStructTemplate extends Structure {
     @Override
     public boolean init(Literal<?>[] args, int matchedPattern, SkriptParser.ParseResult parseResult, @Nullable EntryContainer entryContainer) {
         MatchResult regex = parseResult.regexes.get(0);
-        name = regex.group(1);
+        name = regex.group(1).trim().toLowerCase(Locale.ENGLISH);
         this.entryContainer = entryContainer;
 
         return entryContainer != null;
@@ -67,7 +68,7 @@ public boolean preLoad() {
     }
 
 
-    private static final Pattern fieldPattern = Pattern.compile("(\\w+): ([\\w ]+?)(?: ?= ?(.+))?");
+    private static final Pattern fieldPattern = Pattern.compile("([\\w ]+): ([\\w ]+?)(?: ?= ?(.+))?");
 
     private List<Field<?>> getFields(@NotNull SectionNode node) {
         List<Field<?>> fields = new ArrayList<>();
@@ -80,8 +81,19 @@ private List<Field<?>> getFields(@NotNull SectionNode node) {
                     Skript.error("invalid field: " + key);
                     return null;
                 }
+                // parse the field name
+                String fieldName = matcher.group(1).trim().toLowerCase(Locale.ENGLISH);
+                if (fieldName.isEmpty()) {
+                    Skript.error("Field name cannot be empty.");
+                    return null;
+                }
+                // check if the field name is already taken
+                if (fields.stream().anyMatch(field -> field.name().equalsIgnoreCase(fieldName))) {
+                    Skript.error("Field name '" + fieldName + "' is already taken.");
+                    return null;
+                }
+
                 // parse the field type
-                String fieldName = matcher.group(1);
                 var pair = Utils.getEnglishPlural(matcher.group(2).trim());
                 boolean isPlural = pair.getValue();
                 ClassInfo<?> fieldType = Classes.getClassInfoFromUserInput(pair.getKey());