diff --git a/assets/default-model-project/README.md b/assets/default-model-project/README.md index 1c1ad23c4..275b17298 100644 --- a/assets/default-model-project/README.md +++ b/assets/default-model-project/README.md @@ -2,10 +2,10 @@ Generated by [Rojo](https://github.com/rojo-rbx/rojo) {rojo_version}. ## Getting Started -To build this library, use: +To build this model, use: ```bash -rojo build -o "{project_name}.rbxmx" +rojo build -o "{project_name}.rbxm" ``` -For more help, check out [the Rojo documentation](https://rojo.space/docs). \ No newline at end of file +For more help, check out [the Rojo documentation](https://rojo.space/docs). diff --git a/assets/default-model-project/gitignore.txt b/assets/default-model-project/gitignore.txt index 0dfcd8386..3aa63bb45 100644 --- a/assets/default-model-project/gitignore.txt +++ b/assets/default-model-project/gitignore.txt @@ -1,3 +1,7 @@ +# Model files +/*.rbxmx +/*.rbxm + # Roblox Studio lock files -/*.rbxlx.lock -/*.rbxl.lock \ No newline at end of file +*.rbxlx.lock +*.rbxl.lock diff --git a/assets/default-model-project/src-init.lua b/assets/default-model-project/src-init.lua index 41faf217c..aacfcce91 100644 --- a/assets/default-model-project/src-init.lua +++ b/assets/default-model-project/src-init.lua @@ -2,4 +2,4 @@ return { hello = function() print("Hello world, from {project_name}!") end, -} \ No newline at end of file +} diff --git a/assets/default-place-project/README.md b/assets/default-place-project/README.md index 7908cf597..a6afab280 100644 --- a/assets/default-place-project/README.md +++ b/assets/default-place-project/README.md @@ -5,13 +5,13 @@ Generated by [Rojo](https://github.com/rojo-rbx/rojo) {rojo_version}. To build the place from scratch, use: ```bash -rojo build -o "{project_name}.rbxlx" +rojo build -o "{project_name}.rbxl" ``` -Next, open `{project_name}.rbxlx` in Roblox Studio and start the Rojo server: +Next, open `{project_name}.rbxl` in Roblox Studio and start the Rojo server: ```bash rojo serve ``` -For more help, check out [the Rojo documentation](https://rojo.space/docs). \ No newline at end of file +For more help, check out [the Rojo documentation](https://rojo.space/docs). diff --git a/assets/default-place-project/default.project.json b/assets/default-place-project/default.project.json index b6e6410a4..a103b977c 100644 --- a/assets/default-place-project/default.project.json +++ b/assets/default-place-project/default.project.json @@ -2,19 +2,34 @@ "name": "{project_name}", "tree": { "$className": "DataModel", - + "Lighting": { + "$properties": { + "Outlines": false, + "Ambient": [ + 0.0, + 0.0, + 0.0 + ], + "GlobalShadows": true, + "Brightness": 2.0, + "Technology": "Voxel" + } + }, "ReplicatedStorage": { "Shared": { "$path": "src/shared" } }, - "ServerScriptService": { "Server": { "$path": "src/server" } }, - + "SoundService": { + "$properties": { + "RespectFilteringEnabled": true + } + }, "StarterPlayer": { "StarterPlayerScripts": { "Client": { @@ -22,51 +37,29 @@ } } }, - "Workspace": { - "$properties": { - "FilteringEnabled": true - }, "Baseplate": { "$className": "Part", "$properties": { - "Anchored": true, "Color": [ 0.38823, 0.37254, 0.38823 ], - "Locked": true, "Position": [ - 0, - -10, - 0 + 0.0, + -10.0, + 0.0 ], "Size": [ - 512, - 20, - 512 - ] + 512.0, + 20.0, + 512.0 + ], + "Anchored": true, + "Locked": true } } - }, - "Lighting": { - "$properties": { - "Ambient": [ - 0, - 0, - 0 - ], - "Brightness": 2, - "GlobalShadows": true, - "Outlines": false, - "Technology": "Voxel" - } - }, - "SoundService": { - "$properties": { - "RespectFilteringEnabled": true - } } } } \ No newline at end of file diff --git a/assets/default-place-project/gitignore.txt b/assets/default-place-project/gitignore.txt index 41d6a8abf..724dbf255 100644 --- a/assets/default-place-project/gitignore.txt +++ b/assets/default-place-project/gitignore.txt @@ -1,6 +1,7 @@ -# Project place file -/{project_name}.rbxlx +# Place files +/*.rbxlx +/*.rbxl # Roblox Studio lock files -/*.rbxlx.lock -/*.rbxl.lock \ No newline at end of file +*.rbxlx.lock +*.rbxl.lock diff --git a/src/cli/init.rs b/src/cli/init.rs index 48d513b1e..7d09fa3be 100644 --- a/src/cli/init.rs +++ b/src/cli/init.rs @@ -117,17 +117,17 @@ fn init_place(base_path: &Path, project_params: ProjectParams) -> anyhow::Result write_if_not_exists( &src_shared.join("Hello.lua"), - "return function()\n\tprint(\"Hello, world!\")\nend", + "return function()\n\tprint(\"Hello, world!\")\nend\n", )?; write_if_not_exists( &src_server.join("init.server.lua"), - "print(\"Hello world, from server!\")", + "print(\"Hello world, from server!\")\n", )?; write_if_not_exists( &src_client.join("init.client.lua"), - "print(\"Hello world, from client!\")", + "print(\"Hello world, from client!\")\n", )?; let git_ignore = project_params.render_template(PLACE_GIT_IGNORE);