gabry/CodenameEngine
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

EMPTY SCRIPT FIX V2!!!

Browse Source
This commit is contained in:
lunarcleint
2024-02-03 00:15:39 -07:00
parent 159467de83
commit 3410399bba
2 changed files with 44 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/funkin/backend/assets/AssetsLibraryList.hx
+40 -13
View File
@@ -6,6 +6,9 @@ import lime.utils.AssetLibrary;
class AssetsLibraryList extends AssetLibrary {
public var libraries:Array<AssetLibrary> = [];
public var rootLibs:Array<AssetLibrary> = [];
public var assetsLibs:Array<AssetLibrary> = [];
@:allow(funkin.backend.system.Main)
@:allow(funkin.backend.system.MainState)
private var __defaultLibraries:Array<AssetLibrary> = [];
@@ -16,6 +19,7 @@ class AssetsLibraryList extends AssetLibrary {
libraries.remove(lib);
return lib;
}
public function existsSpecific(id:String, type:String, source:AssetSource = BOTH) {
if (!id.startsWith("assets/") && exists('assets/$id', type))
return true;
@@ -94,20 +98,31 @@ class AssetsLibraryList extends AssetLibrary {
return content;
}
public function getSpecificAsset(id:String, type:String, source:AssetSource = BOTH):Dynamic {
public function getSpecificAsset(id:String, type:String, source:AssetSource = BOTH, ?avoidRoot:Bool = false):Dynamic {
try {
if (!id.startsWith("assets/")) {
var ass = getSpecificAsset('assets/$id', type, source);
if (ass != null) {
return ass;
}
}
for(k=>e in libraries) {
if (shouldSkipLib(k, source)) continue;
var fileFromAssets:Bool = id.startsWith("assets/");
var asset = e.getAsset(id, type);
if (asset != null) {
return asset;
if (!fileFromAssets) {
var ass = getSpecificAsset('assets/$id', type, source);
if (ass != null)
return ass;
}
if (fileFromAssets) {
for (lib in assetsLibs) {
if (shouldSkipLib(libraries.indexOf(lib), source)) continue;
var asset = lib.getAsset(id, type);
if (asset != null)
return asset;
}
} else if (!avoidRoot) {
for (lib in rootLibs) {
if (shouldSkipLib(libraries.indexOf(lib), source)) continue;
var asset = lib.getAsset(id, type);
if (asset != null)
return asset;
}
}
return null;
@@ -127,6 +142,9 @@ class AssetsLibraryList extends AssetLibrary {
public override inline function getAsset(id:String, type:String):Dynamic
return getSpecificAsset(id, type, BOTH);
public inline function getAssetSafe(id:String, type:String):Dynamic
return getSpecificAsset(id, type, BOTH, true);
public override function isLocal(id:String, type:String) {
return true;
}
@@ -155,8 +173,17 @@ class AssetsLibraryList extends AssetLibrary {
addLibrary(d);
}
public function addLibrary(lib:AssetLibrary) {
public function addLibrary(lib:AssetLibrary) @:privateAccess {
libraries.insert(0, lib);
var finalLib:AssetLibrary = lib;
if (finalLib is openfl.utils.AssetLibrary)
finalLib = cast(finalLib, openfl.utils.AssetLibrary).__proxy;
if (finalLib is IModsAssetLibrary)
assetsLibs.push(finalLib);
else
rootLibs.push(finalLib);
return lib;
}
}