Merge remote-tracking branch 'origin/patch'

# Conflicts:
#	pom.xml
#	src/main/java/org/lins/mmmjjkx/rykenslimefuncustomizer/RykenSlimefunCustomizer.java
#	src/main/java/org/lins/mmmjjkx/rykenslimefuncustomizer/bulit_in/JavaScriptEval.java
#	src/main/java/org/lins/mmmjjkx/rykenslimefuncustomizer/objects/ProjectAddonLoader.java
#	src/main/java/org/lins/mmmjjkx/rykenslimefuncustomizer/objects/customs/machine/CustomEnergyGenerator.java
#	src/main/java/org/lins/mmmjjkx/rykenslimefuncustomizer/objects/customs/machine/CustomMaterialGenerator.java
#	src/main/java/org/lins/mmmjjkx/rykenslimefuncustomizer/objects/customs/machine/CustomWorkbench.java
#	src/main/java/org/lins/mmmjjkx/rykenslimefuncustomizer/objects/yaml/YamlReader.java
#	src/main/java/org/lins/mmmjjkx/rykenslimefuncustomizer/objects/yaml/machine/MachineReader.java
#	src/main/java/org/lins/mmmjjkx/rykenslimefuncustomizer/objects/yaml/machine/SuperReader.java

Author: lijinhong11

src/main/java/org/lins/mmmjjkx/rykenslimefuncustomizer/ProjectAddonManager.java

@@ -61,6 +61,11 @@ public void setup(Plugin inst) {
         List<String> skip = new ArrayList<>();
 
         for (File folder : folders) {
+            if (folder.isFile()) {
+                ExceptionHandler.handleError(folder.getName() + " 不是文件夹！无法加载此附属！");
+                continue;
+            }
+
             File info = new File(folder, Constants.INFO_FILE);
             if (!info.exists()) {
                 ExceptionHandler.handleError("A folder called " + folder.getName()
@@ -107,10 +112,18 @@ public void setup(Plugin inst) {
                 continue;
             }
 
-            ProjectAddonLoader loader = new ProjectAddonLoader(folder, projectIds);
-            ProjectAddon addon = loader.load();
-            if (addon != null) {
-                projectAddons.put(addon.getAddonId(), addon);
+            try {
+                ProjectAddonLoader loader = new ProjectAddonLoader(folder, projectIds);
+                ProjectAddon addon = loader.load();
+                if (addon != null) {
+                    projectAddons.put(addon.getAddonId(), addon);
+                }
+            } catch (Exception e) {
+                if (folder.isFile()) {
+                    ExceptionHandler.handleError(folder.getName() + " 不是文件夹！无法加载此附属！");
+                    continue;
+                }
+                e.printStackTrace();
             }
         }
     }