moved some more files

source/ButtonRemapSubstate.hx

@@ -1,11 +0,0 @@
-package;
-
-import flixel.FlxSubState;
-
-class ButtonRemapSubstate extends FlxSubState
-{
-	public function new()
-	{
-		super();
-	}
-}

source/ChartParser.hx

@@ -1,80 +0,0 @@
-package;
-
-import flixel.util.FlxStringUtil;
-
-using StringTools;
-
-class ChartParser
-{
-	static public function parse(songName:String, section:Int):Array<Dynamic>
-	{
-		var IMG_WIDTH:Int = 8;
-		var regex:EReg = new EReg("[ \t]*((\r\n)|\r|\n)[ \t]*", "g");
-
-		var csvData = FlxStringUtil.imageToCSV(Paths.file('data/' + songName + '/' + songName + '_section' + section + '.png'));
-
-		var lines:Array<String> = regex.split(csvData);
-		var rows:Array<String> = lines.filter(function(line) return line != "");
-		csvData.replace("\n", ',');
-
-		var heightInTiles = rows.length;
-		var widthInTiles = 0;
-
-		var row:Int = 0;
-
-		// LMAOOOO STOLE ALL THIS FROM FLXBASETILEMAP LOLOL
-
-		var dopeArray:Array<Int> = [];
-		while (row < heightInTiles)
-		{
-			var rowString = rows[row];
-			if (rowString.endsWith(","))
-				rowString = rowString.substr(0, rowString.length - 1);
-			var columns = rowString.split(",");
-
-			if (columns.length == 0)
-			{
-				heightInTiles--;
-				continue;
-			}
-			if (widthInTiles == 0)
-			{
-				widthInTiles = columns.length;
-			}
-
-			var column = 0;
-			var pushedInColumn:Bool = false;
-			while (column < widthInTiles)
-			{
-				// the current tile to be added:
-				var columnString = columns[column];
-				var curTile = Std.parseInt(columnString);
-
-				if (curTile == null)
-					throw 'String in row $row, column $column is not a valid integer: "$columnString"';
-
-				if (curTile == 1)
-				{
-					if (column < 4)
-						dopeArray.push(column + 1);
-					else
-					{
-						var tempCol = (column + 1) * -1;
-						tempCol += 4;
-						dopeArray.push(tempCol);
-					}
-
-					pushedInColumn = true;
-				}
-
-				column++;
-			}
-
-			if (!pushedInColumn)
-				dopeArray.push(0);
-
-			row++;
-		}
-		return dopeArray;
-	}
-}

source/Main.hx

@@ -1,6 +1,7 @@
 package;
 
 import funkin.menus.TitleState;
+import funkin.game.Highscore;
 import flixel.FlxGame;
 import flixel.FlxState;
 import openfl.Assets;

source/PlayerSettings.hx

@@ -1,6 +1,6 @@
 package;
 
-import Controls;
+import funkin.system.Controls;
 import flixel.FlxCamera;
 import flixel.FlxG;
 import flixel.util.FlxSignal;

source/funkin/debug/AnimationDebug.hx

@@ -1,4 +1,4 @@
-package;
+package funkin.debug;
 
 import funkin.game.Character;
 import flixel.FlxG;

source/funkin/editors/ChartingState.hx

@@ -1,4 +1,4 @@
-package;
+package funkin.editors;
 
 import funkin.system.Conductor.BPMChangeEvent;
 import Section.SwagSection;
@@ -35,6 +35,7 @@ import openfl.media.Sound;
 import openfl.net.FileReference;
 import openfl.utils.ByteArray;
 import funkin.system.Conductor;
+import funkin.game.HealthIcon;
 
 import funkin.game.Note;
 

source/funkin/game/HealthIcon.hx

@@ -1,4 +1,4 @@
-package;
+package funkin.game;
 
 import flixel.FlxSprite;
 import openfl.utils.Assets;

source/funkin/game/Highscore.hx

@@ -1,4 +1,4 @@
-package;
+package funkin.game;
 
 import flixel.FlxG;
 

source/funkin/game/PlayState.hx

@@ -3,7 +3,7 @@ package funkin.game;
 import funkin.scripting.Script;
 import flixel.util.FlxDestroyUtil;
 #if desktop
-import Discord.DiscordClient;
+import funkin.system.Discord.DiscordClient;
 #end
 import Section.SwagSection;
 import funkin.system.Song.SwagSong;
@@ -47,6 +47,8 @@ import openfl.display.StageQuality;
 import openfl.filters.ShaderFilter;
 import funkin.system.Conductor;
 import funkin.system.Song;
+import funkin.editors.ChartingState;
+import funkin.debug.AnimationDebug;
 
 import funkin.menus.*;
 import funkin.scripting.events.*;

source/funkin/menus/FreeplayState.hx

@@ -1,7 +1,7 @@
 package funkin.menus;
 
 #if desktop
-import Discord.DiscordClient;
+import funkin.system.Discord.DiscordClient;
 #end
 import flash.text.TextField;
 import flixel.FlxG;
@@ -15,6 +15,9 @@ import flixel.util.FlxColor;
 import lime.utils.Assets;
 import funkin.system.Song;
 import funkin.data.FreeplaySonglist;
+import funkin.ui.Alphabet;
+import funkin.game.HealthIcon;
+import funkin.game.Highscore;
 
 using StringTools;
 

source/funkin/menus/MainMenuState.hx

@@ -1,7 +1,7 @@
 package funkin.menus;
 
 #if desktop
-import Discord.DiscordClient;
+import funkin.system.Discord.DiscordClient;
 #end
 import flixel.FlxG;
 import flixel.FlxObject;

source/funkin/menus/PauseSubState.hx

@@ -1,6 +1,5 @@
 package funkin.menus;
 
-import Controls.Control;
 import flixel.FlxG;
 import flixel.FlxSprite;
 import flixel.FlxSubState;
@@ -12,6 +11,7 @@ import flixel.text.FlxText;
 import flixel.tweens.FlxEase;
 import flixel.tweens.FlxTween;
 import flixel.util.FlxColor;
+import funkin.ui.Alphabet;
 
 class PauseSubState extends MusicBeatSubstate
 {

source/funkin/menus/StoryMenuState.hx

@@ -1,7 +1,7 @@
 package funkin.menus;
 
 #if desktop
-import Discord.DiscordClient;
+import funkin.system.Discord.DiscordClient;
 #end
 import flixel.FlxG;
 import flixel.FlxSprite;
@@ -16,6 +16,7 @@ import flixel.util.FlxColor;
 import flixel.util.FlxTimer;
 import lime.net.curl.CURLCode;
 import funkin.system.Song;
+import funkin.game.Highscore;
 
 using StringTools;
 

source/funkin/menus/TitleState.hx

@@ -1,7 +1,7 @@
 package funkin.menus;
 
 #if desktop
-import Discord.DiscordClient;
+import funkin.system.Discord.DiscordClient;
 import sys.thread.Thread;
 #end
 import flixel.FlxG;
@@ -26,6 +26,7 @@ import flixel.util.FlxTimer;
 import funkin.system.Conductor;
 import lime.app.Application;
 import openfl.Assets;
+import funkin.ui.Alphabet;
 
 using StringTools;
 

source/funkin/system/Controls.hx

@@ -1,4 +1,4 @@
-package;
+package funkin.system;
 
 import flixel.FlxG;
 import flixel.input.FlxInput;

source/funkin/system/Discord.hx

@@ -1,4 +1,4 @@
-package;
+package funkin.system;
 
 import Sys.sleep;
 import discord_rpc.DiscordRpc;

source/funkin/ui/Alphabet.hx

@@ -1,4 +1,4 @@
-package;
+package funkin.ui;
 
 import flixel.FlxG;
 import flixel.FlxSprite;