Skip to content

Commit

Permalink
squashed commits
Browse files Browse the repository at this point in the history
  • Loading branch information
lemz1 committed Jan 23, 2025
1 parent a01bcc3 commit ef1624b
Show file tree
Hide file tree
Showing 3 changed files with 442 additions and 2 deletions.
9 changes: 9 additions & 0 deletions project.hxp
Original file line number Diff line number Diff line change
Expand Up @@ -588,6 +588,15 @@ class Project extends HXProject {
function configureCustomMacros() {
// This macro allows addition of new functionality to existing Flixel. -->
addHaxeMacro("addMetadata('@:build(funkin.util.macro.FlxMacro.buildFlxBasic())', 'flixel.FlxBasic')");

var abstracts:Array<String> = [
'.*',
'!thx.Set',
'!cpp.*',
'!lime.*',
'!openfl.*'
];
addHaxeMacro("funkin.util.macro.PolymodMacro.buildPolymodAbstracts(['" + abstracts.join("', '") + "'])");
}

function configureOutputDir() {
Expand Down
20 changes: 18 additions & 2 deletions source/funkin/modding/PolymodHandler.hx
Original file line number Diff line number Diff line change
Expand Up @@ -250,6 +250,11 @@ class PolymodHandler
Polymod.addImportAlias('lime.utils.Assets', funkin.Assets);
Polymod.addImportAlias('openfl.utils.Assets', funkin.Assets);

for (key => value in funkin.util.macro.PolymodMacro.aliases)
{
Polymod.addImportAlias(key, Type.resolveClass(value));
}

// Add blacklisting for prohibited classes and packages.

// `Sys`
Expand Down Expand Up @@ -335,8 +340,19 @@ class PolymodHandler
{
return {
assetLibraryPaths: [
'default' => 'preload', 'shared' => 'shared', 'songs' => 'songs', 'videos' => 'videos', 'tutorial' => 'tutorial', 'week1' => 'week1',
'week2' => 'week2', 'week3' => 'week3', 'week4' => 'week4', 'week5' => 'week5', 'week6' => 'week6', 'week7' => 'week7', 'weekend1' => 'weekend1',
'default' => 'preload',
'shared' => 'shared',
'songs' => 'songs',
'videos' => 'videos',
'tutorial' => 'tutorial',
'week1' => 'week1',
'week2' => 'week2',
'week3' => 'week3',
'week4' => 'week4',
'week5' => 'week5',
'week6' => 'week6',
'week7' => 'week7',
'weekend1' => 'weekend1',
],
coreAssetRedirect: CORE_FOLDER,
}
Expand Down
Loading

0 comments on commit ef1624b

Please sign in to comment.