@@ -1,9 +1,6 @@
 #include "gamebuino.h"
 #include <fmt/format.h>
 
-namespace fs = std::filesystem;
-using namespace std::string_literals;
-
 struct Resource
 {
     std::string filename;
@@ -29,7 +26,7 @@ void build_gamebuino(std::string project_name, std::vector<ClassFile> files)
 
     for (auto & file : files)
     {
-        file.generate(project_name);
+        file.generate(files);
     }
 
     std::ofstream output_header("gamebuino-java.h");
@@ -45,6 +42,7 @@ namespace gamebuino {
 
         inline auto & display = ::gb.display;
         inline auto & buttons = ::gb.buttons;
+        inline auto & frameCount = ::gb.frameCount;
     }
 
     namespace Button {
@@ -64,7 +62,7 @@ namespace gamebuino {
 
     if (resources.size())
     {
-        std::ofstream output_res_header("resources.ino");
+        std::ofstream output_res_header(RESOURCES_FILE);
 
         for (auto & res : resources)
         {
@@ -80,13 +78,22 @@ namespace gamebuino {
         output_res_header.close();
     }
 
-    if (fs::exists(currentPath / "userdata.ino"))
+    if (fs::exists(currentPath / RESOURCES_FILE))
+    {
+        fs::copy_file(currentPath / RESOURCES_FILE, fs::current_path() / RESOURCES_FILE, fs::copy_options::overwrite_existing);
+    }
+    else
+    {
+        fs::remove(fs::current_path() / RESOURCES_FILE);
+    }
+
+    if (fs::exists(currentPath / USER_FILE))
     {
-        fs::copy_file(currentPath / "userdata.ino", fs::current_path() / "userdata.ino", fs::copy_options::overwrite_existing);
+        fs::copy_file(currentPath / USER_FILE, fs::current_path() / USER_FILE, fs::copy_options::overwrite_existing);
     }
     else
     {
-        fs::remove(fs::current_path() / "userdata.ino");
+        fs::remove(fs::current_path() / USER_FILE);
     }
 
     fs::current_path(tempPath / project_name);
Original file line number	Diff line number	Diff line change
`@@ -1,9 +1,6 @@`
`1`	`1`	`#include "gamebuino.h"`
`2`	`2`	`#include <fmt/format.h>`
`3`	`3`
`4`		`-namespace fs = std::filesystem;`
`5`		`-using namespace std::string_literals;`
`6`		`-`
`7`	`4`	`struct Resource`
`8`	`5`	`{`
`9`	`6`	`std::string filename;`
`@@ -29,7 +26,7 @@ void build_gamebuino(std::string project_name, std::vector<ClassFile> files)`
`29`	`26`
`30`	`27`	`for (auto & file : files)`
`31`	`28`	`{`
`32`		`- file.generate(project_name);`
	`29`	`+ file.generate(files);`
`33`	`30`	`}`
`34`	`31`
`35`	`32`	`std::ofstream output_header("gamebuino-java.h");`
`@@ -45,6 +42,7 @@ namespace gamebuino {`
`45`	`42`
`46`	`43`	`inline auto & display = ::gb.display;`
`47`	`44`	`inline auto & buttons = ::gb.buttons;`
	`45`	`+ inline auto & frameCount = ::gb.frameCount;`
`48`	`46`	`}`
`49`	`47`
`50`	`48`	`namespace Button {`
`@@ -64,7 +62,7 @@ namespace gamebuino {`
`64`	`62`
`65`	`63`	`if (resources.size())`
`66`	`64`	`{`
`67`		`- std::ofstream output_res_header("resources.ino");`
	`65`	`+ std::ofstream output_res_header(RESOURCES_FILE);`
`68`	`66`
`69`	`67`	`for (auto & res : resources)`
`70`	`68`	`{`
`@@ -80,13 +78,22 @@ namespace gamebuino {`
`80`	`78`	`output_res_header.close();`
`81`	`79`	`}`
`82`	`80`
`83`		`- if (fs::exists(currentPath / "userdata.ino"))`
	`81`	`+ if (fs::exists(currentPath / RESOURCES_FILE))`
	`82`	`+ {`
	`83`	`+ fs::copy_file(currentPath / RESOURCES_FILE, fs::current_path() / RESOURCES_FILE, fs::copy_options::overwrite_existing);`
	`84`	`+ }`
	`85`	`+ else`
	`86`	`+ {`
	`87`	`+ fs::remove(fs::current_path() / RESOURCES_FILE);`
	`88`	`+ }`
	`89`	`+`
	`90`	`+ if (fs::exists(currentPath / USER_FILE))`
`84`	`91`	`{`
`85`		`- fs::copy_file(currentPath / "userdata.ino", fs::current_path() / "userdata.ino", fs::copy_options::overwrite_existing);`
	`92`	`+ fs::copy_file(currentPath / USER_FILE, fs::current_path() / USER_FILE, fs::copy_options::overwrite_existing);`
`86`	`93`	`}`
`87`	`94`	`else`
`88`	`95`	`{`
`89`		`- fs::remove(fs::current_path() / "userdata.ino");`
	`96`	`+ fs::remove(fs::current_path() / USER_FILE);`
`90`	`97`	`}`
`91`	`98`
`92`	`99`	`fs::current_path(tempPath / project_name);`