rewrite preprocessor

Author: Ecdcaeb

src/main/java/mods/Hileb/shotaasm/api/ScriptFile.java

@@ -17,40 +17,39 @@
 public record ScriptFile(String name, String text, Multimap<String, String> property, HashMap<String, Object> data) {
 
     @Nullable
-    public static ScriptFile create(String name, String rawText){
+    public static ScriptFile create(String name, String rawText) {
         try (BufferedReader reader = new BufferedReader(new StringReader(rawText))) {
-            List<String> lines = new ArrayList<>();
+            List<String> commentLines = new ArrayList<>();
+            StringBuilder nonCommentText = new StringBuilder();
             String line;
+
             while ((line = reader.readLine()) != null) {
                 line = line.trim();
                 if (StringUtils.startsWith(line, "#")) {
-                    lines.add(line.substring(1));
+                    commentLines.add(line.substring(1));
                 } else {
-                    Multimap<String, String> map = HashMultimap.create();
-                    for (String s : lines) {
-                        int i = s.indexOf(' ');
-                        if (i > 0) {
-                            map.put(s.substring(0, i), s.substring(i + 1));
-                        }
-                    }
-                    if (!map.containsKey("compiler")) map.put("compiler", "javaShota");
-
-                    byte[] b1 = IOUtils.toByteArray(reader, StandardCharsets.UTF_8);
-                    byte[] b2 = new byte[line.length() + 1 + b1.length];
-                    System.arraycopy(line.getBytes(), 0, b2, 0, line.length());
-                    b2[line.length()] = '\n';
-                    System.arraycopy(b1, line.length(), b2, 0, b1.length);
-
-                    return new ScriptFile(
-                            name,
-                            new String(b2),
-                            map, new HashMap<>()
-                    );
+                    nonCommentText.append(line).append("\n");
                 }
             }
-            return null;
+
+            if(nonCommentText.length() > 0 && nonCommentText.charAt(nonCommentText.length()-1) == '\n'){
+                nonCommentText.deleteCharAt(nonCommentText.length()-1);
+            }
+
+            Multimap<String, String> map = HashMultimap.create();
+            for (String s : commentLines) {
+                int i = s.indexOf(' ');
+                if (i > 0) {
+                    map.put(s.substring(0, i), s.substring(i + 1));
+                }
+            }
+            if (!map.containsKey("compiler")) {
+                map.put("compiler", "javaShota");
+            }
+
+            return new ScriptFile(name, nonCommentText.toString(), map, new HashMap<>());
         } catch (Exception e) {
-            ShotaASM.LOGGER.error("error when locate script with", e);
+            ShotaASM.LOGGER.error("Error creating ScriptFile for '{}': {}", name, e.getMessage(), e);
             return null;
         }
     }