Skip to content

Commit 24702aa

Browse files
authored
Merge branch 'ResoniteModdingGroup:master' into master
2 parents e7e18de + 0c3e6bf commit 24702aa

24 files changed

Lines changed: 263 additions & 73 deletions

.github/workflows/build.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ jobs:
4343
- name: Setup Dotnet
4444
uses: actions/setup-dotnet@v4
4545
with:
46-
dotnet-version: 8.x
46+
dotnet-version: 9.x
4747
source-url: https://nuget.pkg.github.com/ResoniteModdingGroup/index.json
4848

4949
- name: Add MonkeyLoader NuGet Source
@@ -98,7 +98,7 @@ jobs:
9898
- name: Setup Dotnet
9999
uses: actions/setup-dotnet@v4
100100
with:
101-
dotnet-version: 8.x
101+
dotnet-version: 9.x
102102
source-url: https://nuget.pkg.github.com/ResoniteModdingGroup/index.json
103103

104104
- name: Add MonkeyLoader NuGet Source

.github/workflows/publish.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ jobs:
6868
- name: Setup Dotnet
6969
uses: actions/setup-dotnet@v4
7070
with:
71-
dotnet-version: 8.x
71+
dotnet-version: 9.x
7272
source-url: https://nuget.pkg.github.com/ResoniteModdingGroup/index.json
7373

7474
- name: Add MonkeyLoader NuGet Source

CommunityBugFixCollection/AnyProtocolHyperlinks.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ private static bool HyperlinkOpenDialogOpenPrefix(HyperlinkOpenDialog __instance
2727
if (__instance.URL.Value is not null)
2828
{
2929
Logger.Debug(() => $"Opening Hyperlink: {__instance.URL.Value}");
30-
__instance.RunInBackground(() => Process.Start(__instance.URL.Value.ToString()));
30+
__instance.RunInBackground(() => Process.Start(new ProcessStartInfo(__instance.URL.Value.ToString()) { UseShellExecute = true }));
3131
}
3232

3333
__instance.Slot.Destroy();

CommunityBugFixCollection/BetterGridWorldPreset.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
using Elements.Core;
22
using FrooxEngine;
33
using HarmonyLib;
4+
using Renderite.Shared;
45
using System;
56
using System.Collections.Generic;
67
using System.Text;

CommunityBugFixCollection/CaseInsensitiveCustomGenerics.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ protected override bool OnLoaded()
2626
if (!Enabled)
2727
return true;
2828

29-
if (Mod.Loader.Get<Mod>().ById("ComponentSelectorAdditions") is not null)
29+
if (Mod.Loader.TryGet<Mod>().ById("ComponentSelectorAdditions", out _))
3030
{
3131
Logger.Info(() => "Skipping in favor of the ComponentSelectorAdditions fix.");
3232
return false;

CommunityBugFixCollection/CommunityBugFixCollection.csproj

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFramework>netstandard2.0</TargetFramework>
3+
<TargetFramework>net9.0</TargetFramework>
44
<AssemblyTitle>CommunityBugFixCollection</AssemblyTitle>
55
<AssemblyFileName>$(AssemblyTitle).dll</AssemblyFileName>
66
<RootNamespace>CommunityBugFixCollection</RootNamespace>
@@ -11,7 +11,7 @@
1111
<PackageId>CommunityBugFixCollection</PackageId>
1212
<Title>Community Bug-Fix Collection</Title>
1313
<Authors>Banane9; Nytra; art0007i; LeCloutPanda; goat; __Choco__; LJ; 989onan</Authors>
14-
<Version>0.7.0-beta</Version>
14+
<Version>0.8.2-beta</Version>
1515
<Description>This MonkeyLoader mod for Resonite that fixes various small Resonite-issues that are still open.</Description>
1616
<PackageReadmeFile>README.md</PackageReadmeFile>
1717
<PackageLicenseExpression>LGPL-3.0-or-later</PackageLicenseExpression>
@@ -30,23 +30,24 @@
3030
</ItemGroup>
3131

3232
<ItemGroup>
33-
<PackageReference Include="MicroUtils.HarmonyAnalyzers" Version="1.6.0-beta1744347465">
33+
<PackageReference Include="MicroUtils.HarmonyAnalyzers" Version="1.6.1">
3434
<PrivateAssets>all</PrivateAssets>
3535
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
3636
</PackageReference>
37-
<PackageReference Include="MonkeyLoader.GamePacks.Resonite" Version="0.23.1-beta" />
37+
<PackageReference Include="MonkeyLoader.GamePacks.Resonite" Version="0.24.1-beta" />
3838
<PackageReference Include="PolySharp" Version="1.15.0">
3939
<PrivateAssets>all</PrivateAssets>
4040
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
4141
</PackageReference>
42+
<PackageReference Include="Renderite.Renderer.Renderite.Shared" Version="1.1.3" />
4243
<PackageReference Include="Resonite.Elements.Assets" Version="1.3.3" />
43-
<PackageReference Include="Resonite.Elements.Core" Version="1.4.3" />
44+
<PackageReference Include="Resonite.Elements.Core" Version="1.4.9.4" />
4445
<PackageReference Include="Resonite.Elements.Quantity" Version="1.2.3" />
45-
<PackageReference Include="Resonite.FrooxEngine" Version="2025.5.33.1285" />
46-
<PackageReference Include="Resonite.FrooxEngine.Store" Version="1.0.5" />
47-
<PackageReference Include="Resonite.ProtoFlux.Core" Version="1.3.1" />
48-
<PackageReference Include="Resonite.ProtoFlux.Nodes.Core" Version="1.3.1" />
49-
<PackageReference Include="Resonite.ProtoFluxBindings" Version="2025.5.29.1285" />
46+
<PackageReference Include="Resonite.FrooxEngine" Version="2025.8.28.607" />
47+
<PackageReference Include="Resonite.FrooxEngine.Store" Version="1.0.6" />
48+
<PackageReference Include="Resonite.ProtoFlux.Core" Version="1.3.2" />
49+
<PackageReference Include="Resonite.ProtoFlux.Nodes.Core" Version="1.3.2" />
50+
<PackageReference Include="Resonite.ProtoFluxBindings" Version="2025.8.24.607" />
5051
<PackageReference Include="Resonite.SkyFrost.Base" Version="2.1.0" />
5152
<PackageReference Include="Resonite.SkyFrost.Base.Models" Version="2.1.5" />
5253
</ItemGroup>

CommunityBugFixCollection/ConstantNodeNameAdjustments.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@ internal sealed class ConstantNodeNameAdjustments : ResoniteBugFixMonkey<Constan
1616
// Legacy Fix, so off by default
1717
protected override bool OnComputeDefaultEnabledState() => false;
1818

19+
protected override bool OnEngineReady() => base.OnEngineReady();
20+
1921
[HarmonyPostfix]
2022
[HarmonyPatch(typeof(Backspace))]
2123
private static string BackspaceNamePostfix(string __result)

CommunityBugFixCollection/CopySyncMemberToClipboardAction.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@ protected override Task Handle(InspectorMemberActionsMenuItemsGenerationEvent ev
2929
// Context Menu is local user only anyways, no need to use local action button
3030
menuItem.Button.LocalPressed += (button, _) =>
3131
{
32-
button.World.InputInterface.Clipboard.SetText(field.BoxedValue.ToString());
33-
button.World.LocalUser.CloseContextMenu(eventData.MemberActions);
32+
button.World.InputInterface.Clipboard?.SetText(field.BoxedValue.ToString()!);
33+
button.World.LocalUser.CloseContextMenu(eventData.Summoner);
3434
};
3535

3636
return Task.CompletedTask;

CommunityBugFixCollection/CorrectByteCasting.cs

Lines changed: 0 additions & 45 deletions
This file was deleted.

CommunityBugFixCollection/GammaCorrectedColorXLuminance.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
using Elements.Core;
22
using HarmonyLib;
3+
using Renderite.Shared;
34
using System;
45
using System.Collections.Generic;
56
using System.Text;

0 commit comments

Comments
 (0)