Skip to content

Commit

Permalink
[Enhancement] Init & VeryFuniState update.
Browse files Browse the repository at this point in the history
  • Loading branch information
Hackx2 committed Feb 3, 2025
1 parent 173acb5 commit c67774a
Show file tree
Hide file tree
Showing 9 changed files with 123 additions and 138 deletions.
Binary file added assets/fonts/Futura-CondensedExtraBold.otf
Binary file not shown.
2 changes: 0 additions & 2 deletions source/funkin/backend/funkinLua/HScript.hx
Original file line number Diff line number Diff line change
Expand Up @@ -184,8 +184,6 @@ class HScript extends Iris
set('FlxAnimate', FlxAnimate);
#end
set('osName', OsAPI.username);
// MD5
set('osNameHash', OsAPI.hashUsernameMD5);

// Functions & Variables
set('setVar', function(name:String, value:Dynamic)
Expand Down
10 changes: 7 additions & 3 deletions source/funkin/backend/utils/ClientPrefs.hx
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ import funkin.game.Init.Volume;
public var scoreZoom:Bool = true;
public var noReset:Bool = false;
public var healthBarAlpha:Float = 1;
public var fpsCounterAlpha:Float = 1;
public var controllerMode:Bool = false;
public var mouseEvents:Bool = false;
public var hitsoundVolume:Float = 0;
Expand Down Expand Up @@ -232,17 +233,20 @@ class ClientPrefs
reloadVolumeKeys();
}

public static function init()
public static function init():Bool
{
try
{
loadPrefs();
saveSettings();
#if windows WindowUtil.darkmode = data.darkmodeEnabled; #end
trace("Initialization Successful");
// #if windows WindowUtil.darkmode = data.darkmodeEnabled; #end
// #if !mobile Main.fpsVar.alpha = data.fpsCounterAlpha; #end
//trace("Initialization Successful");
return true;
}
catch (e)
trace("Initialization Unsuccessful : " + e);
return false;
}

inline public static function getGameplaySetting(name:String, defaultValue:Dynamic = null, ?customDefaultValue:Bool = false):Dynamic
Expand Down
6 changes: 0 additions & 6 deletions source/funkin/backend/utils/native/OsAPI.hx
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,6 @@ class OsAPI
return '???';
}

@:isVar
@:deprecated("useless, going soon. -orbl")
public static var hashUsernameMD5(get, null):String;
@:noCompletion private inline static function get_hashUsernameMD5()
return HashUtils.hash(username, MD5);

/**
* Os Version
*/
Expand Down
8 changes: 5 additions & 3 deletions source/funkin/game/FPS.hx
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ class FPS extends TextField
private var cacheCount:Int;
private var currentTime:Float;
private var times:Array<Float>;
var bgAlpha:Float = 1 / 3;

inline function addLine(str:String = "", ?lineDown:Bool = true):String
return text += '${lineDown ? '\n' : ''}$str';
Expand All @@ -57,7 +58,7 @@ class FPS extends TextField
bgSprite.graphics.beginFill(0xFF000000);
bgSprite.graphics.drawRect(0, 0, 1, 1);
bgSprite.graphics.endFill();
bgSprite.alpha = 1 / 3;
bgSprite.alpha = bgAlpha;
visible = active = bgSprite.visible = ClientPrefs.data.showFPS;

cacheCount = 0;
Expand Down Expand Up @@ -114,9 +115,10 @@ class FPS extends TextField
bgSprite.y = this.y - offset.y;
}

@:deprecated("DON@T USE NOT DONE!!!!")
@:noCompletion override function set_alpha(val:Float):Float{
return bgSprite.alpha = super.alpha = val;
if(val < bgAlpha)
bgSprite.alpha = val;
return super.alpha = val;
}

@:noCompletion override function set_visible(val:Bool):Bool
Expand Down
17 changes: 11 additions & 6 deletions source/funkin/game/Init.hx
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ class Init extends flixel.FlxState

Logs.init();
funkin.backend.Highscore.init();
funkin.backend.utils.ClientPrefs.init();
trace('ClientPrefs loaded: ${funkin.backend.utils.ClientPrefs.init()}');
this.init();

this.initFileThread();
Expand Down Expand Up @@ -57,18 +57,22 @@ class Init extends flixel.FlxState
loadingText.screenCenter();
add(loadingText);

hxvlc.util.Handle.initAsync(#if (hxvlc >= "1.8.0") ['--no-lua'] #end, _ -> {
hxvlc.util.Handle.initAsync(#if (hxvlc >= "1.8.0") ['--no-lua'] #end, _ ->
{
trace(_ ? "LibVLC initialized" : "Error on initializing LibVLC!");
clearState();
});
#else
clearState();
#end

// Extra stuff goes here :3
}

static function clearState() : Void {
static function clearState():Void
{
#if windows WindowUtil.darkmode = ClientPrefs.data.darkmodeEnabled; #end
#if !mobile Main.fpsVar.alpha = ClientPrefs.data.fpsCounterAlpha; #end

Main.fpsVar.visible = ClientPrefs.data.showFPS;
FlxG.switchState(new TitleState());
}
Expand Down Expand Up @@ -152,12 +156,13 @@ class Init extends flixel.FlxState
#end

#if WATERMARK
public static var watermark:openfl.text.TextField;
@:allow(funkin.backend.client.Discord.DiscordClient)
static var watermark:openfl.text.TextField;

private function owoWatermark():Void
{
// uhh tester text lmao
final watermarkText:String = '${OsAPI.username}\n${HashUtils.hash(OsAPI.username, MD5)}';
final watermarkText:String = '${OsAPI.username}}';

final format:openfl.text.TextFormat = new openfl.text.TextFormat("assets/fonts/OswaldMedium.ttf", 50, FlxColor.WHITE);
format.align = openfl.text.TextFormatAlign.CENTER;
Expand Down
1 change: 0 additions & 1 deletion source/funkin/game/objects/options/Option.hx
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,6 @@ class Option

var _name:String = null;
var _text:String = null;
var _translationKey:String = null;
private function get_text()
return _text;

Expand Down
Loading

0 comments on commit c67774a

Please sign in to comment.