From 9ba030a2d06c5617be4373dd0244c960a16fefde Mon Sep 17 00:00:00 2001
From: HackDev <80620538+Hackx2@users.noreply.github.com>
Date: Tue, 18 Jun 2024 21:53:24 +0100
Subject: [PATCH] ProjectXML layout change + remove old stuff

---
 Project.xml | 45 ++++++++++++++++++++++-----------------------
 1 file changed, 22 insertions(+), 23 deletions(-)

diff --git a/Project.xml b/Project.xml
index a98768c..dd71e61 100644
--- a/Project.xml
+++ b/Project.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <project>
 	<!-- _________________________ Application Settings _________________________ -->
-
 	<app
 		title="Friday Night Funkin' Astro Engine" 
 		file="Astro Engine" 
@@ -49,9 +48,14 @@
 	<define name="LUA_ALLOWED" if="desktop" />
 	<define name="DISCORD_ALLOWED"  if="desktop"/>
 	<define name="ACHIEVEMENTS_ALLOWED" />
+
+	<!-- Preload Assets -->
 	<define name="PRELOAD_ALL" unless="web" />
 	<define name="NO_PRELOAD_ALL" unless="PRELOAD_ALL"/>
 
+	<!-- Enables a terminal log prompt on debug builds -->
+	<define name="DEBUG_SERVER_ALLOWED" if="debug"/>
+
 	<!-- Remove "officialBuild" to use videos on source mod -->
 	<define name="VIDEOS_ALLOWED" if="(windows || linux || android) officialBuild" unless="32bits"/>
 
@@ -61,6 +65,9 @@
 	<!-- Style of the logs | classic, indent, pretty -->
 	<define name="message.reporting" value="pretty"/>
 
+	<!-- DONT ENABLE THIS -->
+	<define name="CHECK_FOR_UPDATES" if="desktop officialBuild"/>
+
 	<!--Place custom nodes like icons here (higher priority to override the HaxeFlixel icon)-->
 	<section embed="true">
 		<icon path="art/icons/icon16.png" size='16'/>
@@ -71,21 +78,19 @@
 
 	<!-- _____________________________ Path Settings ____________________________ -->
 
+	<classpath name="source" />
+
 	<set name="BUILD_DIR" value="export/debug" if="debug" />
 	<set name="BUILD_DIR" value="export/release" unless="debug" />
 	<set name="BUILD_DIR" value="export/32bit" if="32bits" />
 
-	<classpath name="source" />
-
 	<assets path="assets/preload" rename="assets" exclude="*.ogg" if="web"/>
 	<assets path="assets/preload" rename="assets" exclude="*.mp3" unless="web"/>
 
-	<!-- DONT ENABLE THIS -->
-	<define name="CHECK_FOR_UPDATES" if="desktop officialBuild"/>
-
 	<!-- <define name="PRELOAD_ALL" /> -->
 
 	<library name="videos" preload="true" />
+	
 	<section if="PRELOAD_ALL">
 		<library name="songs" preload="true" />
 		<library name="shared" preload="true" />
@@ -113,6 +118,7 @@
 	<assets path="assets/songs" library="songs" exclude="*.mp3" unless="web"/>
 	<assets path="assets/shared" library="shared" exclude="*.ogg" if="web"/>
 	<assets path="assets/shared" library="shared" exclude="*.mp3" unless="web"/>
+	<!-- NOTE: UM REDUCE THIS AND CREATE A WEEK_ASSETS FOLDER WHICH MANAGES THESE :3 -->
 	<assets path="assets/week2" library="week2" exclude="*.ogg" if="web"/>
 	<assets path="assets/week2" library="week2" exclude="*.mp3" unless="web"/>
 	<assets path="assets/week3" library="week3" exclude="*.ogg" if="web"/>
@@ -126,9 +132,9 @@
 	<assets path="assets/week7" library="week7" exclude="*.ogg" if="web"/>
 	<assets path="assets/week7" library="week7" exclude="*.mp3" unless="web"/>
 
-	<section if="MODS_ALLOWED">
-		<assets path='mods' embed='false'/>
-	</section>
+	<assets path='mods' if="MODS_ALLOWED" embed='false'/>
+
+
 	<assets path='art/readme.txt' rename='do NOT readme.txt' />
 
 	<!-- Font Paths -->
@@ -141,24 +147,17 @@
 	<haxelib name="lime" />
 	<haxelib name="openfl" />
 	<haxelib name="flixel" version="5.5.0"/>
-
-	<!--In case you want to use the addons package-->
 	<haxelib name="flixel-addons"/>
-	<haxelib name="hscript" />
-	<define name="hscriptPos" />
-
-	<!--In case you want to use the ui package-->
 	<haxelib name="flixel-ui" />
+
+	<define name="hscriptPos" />
+	<haxelib name="hscript" />
+	
 	<haxelib name="linc_luajit" if="LUA_ALLOWED"/>
 	<haxelib name="hxCodec" if="VIDEOS_ALLOWED"/>
+	<haxelib name="hxdiscord_rpc" if="DISCORD_ALLOWED"/>
 	<haxelib name="faxe" if='switch'/>
-	<haxelib name="hxdiscord_rpc" if="desktop"/>
-
-	<!-- Disable Discord Thread -->
-	<haxedef name="DISCORD_DISABLE_THREAD" if="hxdiscord_rpc" />
-
-	<!-- Enables a terminal log prompt on debug builds -->
-	<haxelib name="hxcpp-debug-server" if="debug"/>
+	<haxelib name="hxcpp-debug-server" if="DEBUG_SERVER_ALLOWED"/>
 
 	<!-- ______________________________ Haxedefines _____________________________ -->
 	
@@ -177,7 +176,7 @@
 	<!--Enable this for Nape release builds for a serious peformance improvement-->
 	<haxedef name="NAPE_RELEASE_BUILD" unless="debug" />
 
-	<!-- Crash Handle -->
+	<!-- Crash Handler -->
 	<haxedef name="HXCPP_CHECK_POINTER" if="CRASH_HANDLER" />
 	<haxedef name="HXCPP_STACK_LINE" if="CRASH_HANDLER" />
 </project>