Folder Movearounds + Structure -> Data

Signed-off-by: CrusherNotDrip <crushernotdrip@tilnotdrip.org>

Author: CrusherNotDrip

project.hxp

@@ -183,8 +183,8 @@ class Project extends HXProject
 		addHaxeFlag('-dce no');
 		addHaxeFlag("--macro include('funkin')");
 		addHaxeFlag("--macro include('flixel', true, ['flixel.addons.editors.spine.*', 'flixel.addons.nape.*', 'flixel.system.macros.*', 'flixel.addons.tile.FlxRayCastTilemap'])");
-		addHaxeFlag("--macro addMetadata('@:build(funkin.macros.ZProperty.buildZProperty())', 'flixel.FlxBasic')");
-		addHaxeFlag("--macro addMetadata('@:build(funkin.macros.ZProperty.buildRearrangeFunction())', 'flixel.group.FlxTypedGroup')");
+		addHaxeFlag("--macro addMetadata('@:build(funkin.util.macro.ZProperty.buildZProperty())', 'flixel.FlxBasic')");
+		addHaxeFlag("--macro addMetadata('@:build(funkin.util.macro.ZProperty.buildRearrangeFunction())', 'flixel.group.FlxTypedGroup')");
 		addHaxeFlag('--no-output', FUNKIN_DOX_GENERATION.isEnabled(this));
 		addHaxeFlag('-xml docs/dox/' + Std.string(target).toLowerCase() + '.xml', FUNKIN_DOX_GENERATION.isEnabled(this));
 	}

src/funkin/Constants.hx

@@ -1,7 +1,7 @@
 package funkin;
 
 #if FUNKIN_GIT_DETAILS
-import funkin.macros.GitDefines;
+import funkin.util.macro.GitDefines;
 #end
 
 class Constants
@@ -14,7 +14,7 @@ class Constants
   /**
    * The version of Friday Night Funkin' that TechNotDrip Engine is based off of.
    */
-  public static final FNF_VERSION:String = '0.8.1';
+  public static final FNF_VERSION:String = '0.8.5';
 
   #if FUNKIN_GIT_DETAILS
   /**

src/funkin/FunkinGame.hx

@@ -3,12 +3,12 @@ package funkin;
 import flixel.FlxBasic;
 import flixel.FlxGame;
 import flixel.util.typeLimit.NextState;
-import funkin.objects.ui.PerformanceStats;
-import funkin.states.ui.TitleState;
+import funkin.ui.PerformanceStats;
+import funkin.ui.title.TitleState;
 import lime.utils.Assets as LimeAssets;
 import openfl.utils.Assets as OpenFlAssets;
 #if FUNKIN_DISCORD_RPC
-import funkin.api.DiscordRPC;
+import funkin.api.discord.DiscordRPC;
 #end
 
 class FunkinGame extends FlxGame

src/funkin/objects/FunkinSprite.hx src/funkin/FunkinSprite.hxsrc/funkin/objects/FunkinSprite.hx renamed to src/funkin/FunkinSprite.hx

@@ -1,12 +1,11 @@
-package funkin.objects;
+package funkin;
 
 import animate.FlxAnimate;
 import animate.FlxAnimateFrames;
 import flixel.animation.FlxAnimation;
 import flixel.graphics.FlxGraphic;
 import flixel.group.FlxSpriteGroup.FlxTypedSpriteGroup;
 import flixel.util.FlxSignal.FlxTypedSignal;
-import funkin.structures.ObjectStructure;
 
 using funkin.util.FlxAnimateUtil;
 

src/funkin/structures/DiscordStructure.hx src/funkin/api/discord/DiscordData.hxsrc/funkin/structures/DiscordStructure.hx renamed to src/funkin/api/discord/DiscordData.hx

@@ -1,10 +1,10 @@
-package funkin.structures;
+package funkin.api.discord;
 
 #if FUNKIN_DISCORD_RPC
 /**
  * Discord Configuration.
  */
-typedef DiscordStructure =
+typedef DiscordData =
 {
   var id:String;
 

src/funkin/api/DiscordRPC.hx src/funkin/api/discord/DiscordRPC.hxsrc/funkin/api/DiscordRPC.hx renamed to src/funkin/api/discord/DiscordRPC.hx

@@ -1,7 +1,6 @@
-package funkin.api;
+package funkin.api.discord;
 
 #if FUNKIN_DISCORD_RPC
-import funkin.structures.DiscordStructure;
 import haxe.Json;
 import hxdiscord_rpc.Discord;
 import hxdiscord_rpc.Types;
@@ -238,7 +237,7 @@ class DiscordRPC
    */
   public static function loadDiscordConfig():Void
   {
-    var discordConfig:DiscordStructure = cast Json.parse(Paths.content.json('config/discord'));
+    var discordConfig:DiscordData = cast Json.parse(Paths.content.json('config/discord'));
 
     clientID = discordConfig.id;
     largeImageKey = discordConfig.iconKey;

src/funkin/data/alphabet/AlphabetData.hx

@@ -0,0 +1,14 @@
+package funkin.data.alphabet;
+
+import funkin.data.object.ObjectData;
+
+typedef AlphabetData =
+{
+  var offsets:Array<AlphabetDataOffsets>;
+}
+
+typedef AlphabetDataOffsets =
+{
+  > PointData,
+  var character:String;
+}

src/funkin/structures/IconStructure.hx src/funkin/data/icon/IconData.hxsrc/funkin/structures/IconStructure.hx renamed to src/funkin/data/icon/IconData.hx

@@ -1,9 +1,8 @@
-package funkin.structures;
+package funkin.data.icon;
 
-import funkin.structures.ObjectStructure.AnimationArrayStructure;
-import funkin.structures.ObjectStructure.PointStructure;
+import funkin.data.object.ObjectData;
 
-typedef IconStructure =
+typedef IconData =
 {
   /**
    * Used for split animations, basically icons normally.
@@ -28,9 +27,9 @@ typedef IconStructure =
   /**
    * The scale to use for this icon.
    */
-  var scale:PointStructure;
+  var scale:PointData;
 
-  var animations:Array<AnimationArrayStructure>;
+  var animations:Array<AnimationDataArray>;
   var healthAnimations:Array<HealthAnimation>;
 }
 

src/funkin/structures/ObjectStructure.hx src/funkin/data/object/ObjectData.hxsrc/funkin/structures/ObjectStructure.hx renamed to src/funkin/data/object/ObjectData.hx

@@ -1,11 +1,11 @@
-package funkin.structures;
+package funkin.data.object;
 
 /**
  * The base structure for an object for use with Flixel.
  *
  * An system for converting this to an object is implimented inside of funkin.objects.FunkinSprite
  */
-typedef ObjectStructure =
+typedef ObjectData =
 {
   /**
    * The identifier for this object.
@@ -32,10 +32,10 @@ typedef ObjectStructure =
    * The placement of where this object should be.
    */
   @:optional
-  var ?position:PositionStructure;
+  var ?position:PositionData;
 
   @:optional
-  var ?animation:AnimationStructure;
+  var ?animation:AnimationData;
 
   @:optional
   var ?alpha:Float;
@@ -50,14 +50,14 @@ typedef ObjectStructure =
   var ?flipY:Bool;
 
   @:optional
-  var ?scale:PointStructure;
+  var ?scale:PointData;
 
   @:optional
-  var ?scrollFactor:PointStructure;
+  var ?scrollFactor:PointData;
 }
 
 // TODO: when we make a custom json parser, make it so you can use an array or dis
-typedef PointStructure =
+typedef PointData =
 {
   @:optional
   var ?x:Float;
@@ -66,23 +66,23 @@ typedef PointStructure =
   var ?y:Float;
 }
 
-typedef PositionStructure =
+typedef PositionData =
 {
-  > PointStructure,
+  > PointData,
 
   @:optional
   var ?z:Int;
 }
 
-typedef AnimationStructure =
+typedef AnimationData =
 {
   @:optional
   var ?type:String;
 
-  var anims:Array<AnimationArrayStructure>;
+  var anims:Array<AnimationDataArray>;
 }
 
-typedef AnimationArrayStructure =
+typedef AnimationDataArray =
 {
   var name:String;
 
@@ -104,5 +104,5 @@ typedef AnimationArrayStructure =
   var ?flipY:Bool;
 
   @:optional
-  var ?offsets:PointStructure;
+  var ?offsets:PositionData;
 }

src/funkin/data/save/Save.hx

@@ -1,25 +1,25 @@
 package funkin.data.save;
 
 import flixel.util.FlxSave;
-import funkin.structures.SaveStructure;
-import funkin.util.FunkinControls;
+import funkin.data.save.SaveData;
+import funkin.input.FunkinControls;
 
 class Save
 {
   /**
    * The path of which saves are loaded from. Usually the company name.
    */
-  public static final SAVE_PATH:String = 'TilNotDrip';
+  public static final SAVE_PATH:String = 'TilNotDrip' #if debug + '_DEBUG' #end;
 
   /**
    * The name of which saves are loaded from. Usually the name of the application.
    */
-  public static final SAVE_NAME:String = 'TechNotDrip';
+  public static final SAVE_NAME:String = 'TechNotDrip' #if debug + '_DEBUG' #end;
 
   /**
    * The current version of save file.
    */
-  public static final SAVE_VERSION:Version = '1.1.0';
+  public static final SAVE_VERSION:Version = '1.0.0';
 
   /**
    * The version rule for save files, means that they are compatible with this version.
@@ -36,9 +36,9 @@ class Save
   /**
    * The recently loaded save data.
    */
-  public var data:SaveStructure = null;
+  public var data:SaveData = null;
 
-  public function new(?data:SaveStructure)
+  public function new(?data:SaveData)
   {
     if (data == null)
     {
@@ -91,16 +91,16 @@ class Save
   /**
    * Options for the game
    */
-  public var options(get, set):OptionStructure;
+  public var options(get, set):SaveOptionData;
 
-  function set_options(value:OptionStructure):OptionStructure
+  function set_options(value:SaveOptionData):SaveOptionData
   {
     data.options = value;
     flush();
     return data.options;
   }
 
-  function get_options():OptionStructure
+  function get_options():SaveOptionData
   {
     return data.options;
   }
@@ -151,7 +151,7 @@ class Save
   /**
    * @return Returns the default save options
    */
-  public static function getDefault():SaveStructure
+  public static function getDefault():SaveData
   {
     return {
       version: SAVE_VERSION,