[v2.0.0-alpha.4] Merge pull request #17 from bridge-core/dev

data/preset/entity/bee/manifest.json

@@ -67,7 +67,7 @@
 		],
 		[
 			"textureNectar.png",
-			"RP/textures/entity/{{IDENTIFIER}}.png",
+			"RP/textures/entity/{{IDENTIFIER}}_nectar.png",
 			{ "inject": ["IDENTIFIER"] }
 		]
 	],

package.json

@@ -1,6 +1,6 @@
 {
 	"name": "bridge",
-	"version": "2.0.0-alpha.3",
+	"version": "2.0.0-alpha.4",
 	"private": true,
 	"scripts": {
 		"build:data": "node ./scripts/build.mjs",

src/appVersion.json

@@ -1,3 +1,3 @@
 {
-	"version": "2.0.0-alpha.3"
+	"version": "2.0.0-alpha.4"
 }

src/components/Projects/CreateProject/CreateProject.vue

@@ -108,9 +108,7 @@
 			<v-btn
 				color="primary"
 				:disabled="!currentWindow.hasRequiredData"
-				:loading="
-					isCreatingProject || !isCompilerReady || !isPackIndexerReady
-				"
+				:loading="shouldLoad"
 				@click="createProject"
 			>
 				<v-icon class="pr-2">mdi-plus</v-icon>
@@ -139,6 +137,18 @@ export default {
 	data() {
 		return this.currentWindow
 	},
+	computed: {
+		shouldLoad() {
+			// If this is the first project, only show a spinner while creating the spinner
+			if (this.isFirstProject) return this.isCreatingProject
+			// Otherwise check that the compiler & pack indexer are done too
+			return (
+				this.isCreatingProject ||
+				!this.isCompilerReady ||
+				!this.isPackIndexerReady
+			)
+		},
+	},
 	methods: {
 		close() {
 			this.currentWindow.close()

src/components/Windows/Project/CreatePreset/CreatePreset.ts

@@ -229,19 +229,18 @@ export class CreatePresetWindow extends BaseWindow {
 
 					let destFileText: string
 					try {
-						destFileText = this.transformString(
-							await (await fs.readFile(fullDestPath)).text(),
-							inject
-						)
+						destFileText = await (await fs.readFile(fullDestPath)).text()
 					} catch {
 						destFileText = ''
 					}
 
+					const outputFileText = this.transformString(fileText, inject)
+
 					await fs.writeFile(
 						fullDestPath,
 						`${destFileText}${
 							destFileText !== '' ? '\n' : ''
-						}${fileText}`
+						}${outputFileText}`
 					)
 				}
 			})