Skip to content
Merged
Show file tree
Hide file tree
Changes from 23 commits
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
73402fd
Builders!!!!!
MelvinShwuaner May 3, 2025
d984a7f
Fixed "Errors"
MelvinShwuaner May 3, 2025
befb21b
Update SoundUtils.cs
MelvinShwuaner May 3, 2025
452bef3
Replaced itemassetcreator with itembuilder
MelvinShwuaner May 3, 2025
e238203
woops my bad
MelvinShwuaner May 3, 2025
1cdaf52
idk
MelvinShwuaner May 4, 2025
b0ad64a
group builders
MelvinShwuaner May 5, 2025
cf9ac14
nvm
MelvinShwuaner May 5, 2025
cc05601
hmm
MelvinShwuaner May 5, 2025
d65c5d6
Asset File Loading!!!!!!!!!!!!!!!
MelvinShwuaner May 12, 2025
a4e6491
Update DelegateExtentions.cs
MelvinShwuaner May 12, 2025
295a0db
fixed private delegates not being found
MelvinShwuaner May 13, 2025
6057458
?
MelvinShwuaner May 13, 2025
21746de
made the additional base stats method also serializable
MelvinShwuaner May 13, 2025
7b279b7
.
MelvinShwuaner May 15, 2025
56b4167
..
MelvinShwuaner May 15, 2025
5874f62
subspecies traits
MelvinShwuaner May 17, 2025
a86756d
drawing sounds
MelvinShwuaner May 17, 2025
05793c9
idk
MelvinShwuaner May 17, 2025
a338d44
no more functions! just getters and setters
MelvinShwuaner May 19, 2025
7530412
yipee!!!
MelvinShwuaner May 19, 2025
bb270c2
Update ResourcesPatch.cs
MelvinShwuaner May 19, 2025
4f6354c
Update SoundUtils.cs
MelvinShwuaner May 19, 2025
5e5c7fa
make sure that it is localized when loaded from file
MelvinShwuaner May 20, 2025
a80e0cc
just a small utility, nothing new
MelvinShwuaner May 21, 2025
2fd7f77
Update DelegateExtentions.cs
MelvinShwuaner May 21, 2025
af171a5
not anymore!
MelvinShwuaner May 21, 2025
5ec673f
allowed doubles, longs to be in assets
MelvinShwuaner May 22, 2025
bb17e64
generic asdelegate func
MelvinShwuaner May 25, 2025
df8c3f0
Update DelegateExtentions.cs
MelvinShwuaner May 26, 2025
33bda0b
made exceptions less vague
MelvinShwuaner May 27, 2025
f03011e
Update DelegateExtentions.cs
MelvinShwuaner May 27, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions NeoModLoader.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -217,14 +217,14 @@
<ItemGroup>
<None Include=".github\workflows\build.yml" />
</ItemGroup>
<Target Name="PostBuild" AfterTargets="PostBuildEvent">
<Exec Command="pwsh -File prepare_debug.ps1" Condition=" '$(OS)' == 'Windows_NT' " />

<Target Name="PostBuild" AfterTargets="PostBuildEvent">
<Exec Command="pwsh -File prepare_debug.ps1" Condition=" '$(OS)' == 'Windows_NT' " />
<Exec Command="sh ./prepare_debug.sh" Condition=" '$(OS)' != 'Windows_NT' " />
</Target>
<Target Name="PreBuild" BeforeTargets="PreBuildEvent">
<Exec Command="sh ./before_build.sh" Condition=" '$(OS)' != 'Windows_NT' " />
<Exec Command="pwsh -File before_build.ps1" Condition=" '$(OS)' == 'Windows_NT' " />
<Exec Command="pwsh -File before_build.ps1" Condition=" '$(OS)' == 'Windows_NT' " />
</Target>

</Project>
15 changes: 8 additions & 7 deletions WorldBoxMod.cs
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
using NeoModLoader.services;
using NeoModLoader.ui;
using NeoModLoader.utils;
using NeoModLoader.utils.Builders;
using UnityEngine;

namespace NeoModLoader;
Expand Down Expand Up @@ -63,7 +64,7 @@
Harmony.CreateAndPatchAll(typeof(LM), Others.harmony_id);
Harmony.CreateAndPatchAll(typeof(ResourcesPatch), Others.harmony_id);
Harmony.CreateAndPatchAll(typeof(CustomAudioManager), Others.harmony_id);

Harmony.CreateAndPatchAll(typeof(AssetPatches), Others.harmony_id);
if (!SmoothLoader.isLoading()) SmoothLoader.prepare();

SmoothLoader.add(() =>
Expand All @@ -90,8 +91,6 @@

ModCompileLoadService.prepareCompile(mod_nodes);
}, "Load Mods Info And Prepare Mods");


SmoothLoader.add(() =>
{
var mods_to_load = new List<ModDeclare>();
Expand All @@ -109,17 +108,19 @@
}
}, "Compile Mod " + mod.mod_decl.Name);
}

MasterBuilder Builder = new();
foreach (var mod in mod_nodes)
{
SmoothLoader.add(() =>
{
if (mods_to_load.Contains(mod.mod_decl))
{
ResourcesPatch.LoadResourceFromFolder(Path.Combine(mod.mod_decl.FolderPath,
Paths.ModResourceFolderName));
Paths.ModResourceFolderName), out List<Builder> builders);
Builder.AddBuilders(builders);
ResourcesPatch.LoadResourceFromFolder(Path.Combine(mod.mod_decl.FolderPath,
Paths.NCMSAdditionModResourceFolderName));
Paths.NCMSAdditionModResourceFolderName), out List<Builder> builders2);
Builder.AddBuilders(builders2);
ResourcesPatch.LoadAssetBundlesFromFolder(Path.Combine(mod.mod_decl.FolderPath,
Paths.ModAssetBundleFolderName));
}
Expand All @@ -129,6 +130,7 @@
SmoothLoader.add(() =>
{
ModCompileLoadService.loadMods(mods_to_load);
Builder.BuildAll();
ModInfoUtils.SaveModRecords();
NCMSCompatibleLayer.Init();
var successfulInit = new Dictionary<IMod, bool>();
Expand All @@ -150,7 +152,6 @@
}, "Post-Init Mod " + mod.GetDeclaration().Name);
}
}, "Load Mods");

SmoothLoader.add(ResourcesPatch.PatchSomeResources, "Patch part of Resources into game");

SmoothLoader.add(() =>
Expand Down Expand Up @@ -315,7 +316,7 @@
LogService.LogInfo($"NeoModLoader.dll is newer than AutoUpdate.dll, " +
$"re-extract AutoUpdate.dll from NeoModLoader.dll");
}
catch (Exception e)

Check warning on line 319 in WorldBoxMod.cs

View workflow job for this annotation

GitHub Actions / Windows

The variable 'e' is declared but never used
{
// ignored
}
Expand Down
Loading
Loading