From e1c0b71548f648912b299f855faedba18ee6b4e0 Mon Sep 17 00:00:00 2001
From: Yoshman29 <yoshicrafter.mkpc@gmail.com>
Date: Tue, 18 Oct 2022 22:43:20 +0200
Subject: [PATCH] pushing cause imma try smth really cool

---
 buildnumber.txt                        | 2 +-
 source/funkin/mods/ModsAssetLibrary.hx | 4 +---
 source/funkin/options/Options.hx       | 2 +-
 source/funkin/options/OptionsScreen.hx | 4 ++++
 source/funkin/system/Conductor.hx      | 3 +--
 source/funkin/ui/Alphabet.hx           | 6 +++---
 6 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/buildnumber.txt b/buildnumber.txt
index c97fea13..40ca05e7 100644
--- a/buildnumber.txt
+++ b/buildnumber.txt
@@ -1 +1 @@
-533
\ No newline at end of file
+534
\ No newline at end of file
diff --git a/source/funkin/mods/ModsAssetLibrary.hx b/source/funkin/mods/ModsAssetLibrary.hx
index 953bb44c..11e7108c 100644
--- a/source/funkin/mods/ModsAssetLibrary.hx
+++ b/source/funkin/mods/ModsAssetLibrary.hx
@@ -139,9 +139,7 @@ class ModsAssetLibrary extends AssetLibrary {
     private function __isCacheValid(cache:Map<String, Dynamic>, asset:String) {
         if (!editedTimes.exists(asset))
             return false;
-        
-        
-        if (editedTimes[asset] == null) return true;
+        if (editedTimes[asset] == null) return false;
         if (editedTimes[asset] < FileSystem.stat(getPath(asset)).mtime.getTime()) return false;
         return true;
     }
diff --git a/source/funkin/options/Options.hx b/source/funkin/options/Options.hx
index cee075fd..62a791c2 100644
--- a/source/funkin/options/Options.hx
+++ b/source/funkin/options/Options.hx
@@ -143,7 +143,7 @@ class Options
 	}
 	#end
 	public static function load() {
-		__save = new FlxSave();
+		if (__save == null) __save = new FlxSave();
 		__save.bind("options");
 		for(field in Reflect.fields(__save.data)) {
 			var obj = Reflect.field(__save.data, field);
diff --git a/source/funkin/options/OptionsScreen.hx b/source/funkin/options/OptionsScreen.hx
index 60bcd164..af859e76 100644
--- a/source/funkin/options/OptionsScreen.hx
+++ b/source/funkin/options/OptionsScreen.hx
@@ -1,5 +1,8 @@
 package funkin.options;
 
+import flixel.util.FlxColor;
+import flixel.FlxSprite;
+import flixel.FlxG;
 /**
  * Direct replica from Week 7 lol
  */
@@ -12,5 +15,6 @@ class OptionsScreen extends MusicBeatState {
     public override function create() {
         super.create();
         
+        
     }
 }
\ No newline at end of file
diff --git a/source/funkin/system/Conductor.hx b/source/funkin/system/Conductor.hx
index a31418ac..7e16e6a4 100644
--- a/source/funkin/system/Conductor.hx
+++ b/source/funkin/system/Conductor.hx
@@ -40,8 +40,7 @@ class Conductor
 	@:dox(hide) public static var lastSongPos:Float;
 	@:dox(hide) public static var offset:Float = 0;
 
-	@:dox(hide) public static var safeFrames:Int = 10;
-	@:dox(hide) public static var safeZoneOffset:Float = (safeFrames / 60) * 1000; // is calculated in create(), is safeFrames in milliseconds
+	@:dox(hide) public static var safeZoneOffset:Float = 175; // is calculated in create(), is safeFrames in milliseconds
 
 	/**
 	 * Array of all BPM changes that have been mapped.
diff --git a/source/funkin/ui/Alphabet.hx b/source/funkin/ui/Alphabet.hx
index 533a2b56..8a61fedd 100644
--- a/source/funkin/ui/Alphabet.hx
+++ b/source/funkin/ui/Alphabet.hx
@@ -89,7 +89,8 @@ class Alphabet extends FlxSpriteGroup
 		var alphabetPath = Paths.xml("alphabet");
 		if (alphabetPath != AlphaCharacter.__alphaPath) {
 			refreshAlphabetXML(alphabetPath);
-		} else {
+		}
+		#if MOD_SUPPORT else {
 			var libThing = new LimeLibrarySymbol(alphabetPath);
 			if (libThing.library is AssetLibrary) {
 				var library = cast(libThing.library, AssetLibrary);
@@ -98,7 +99,6 @@ class Alphabet extends FlxSpriteGroup
 					@:privateAccess
 					library = cast(library.__proxy, AssetLibrary);
 				}
-				#if MOD_SUPPORT
 				if (library is ModsAssetLibrary) {
 					var modLib = cast(library, ModsAssetLibrary);
 					@:privateAccess
@@ -106,9 +106,9 @@ class Alphabet extends FlxSpriteGroup
 						refreshAlphabetXML(alphabetPath);
 					}
 				}
-				#end
 			}
 		}
+		#end
 
 		if (text != "")
 		{