Skip to content

Commit 318ad06

Browse files
Banane9Banane9
committed
Adjust node name adjustments for vanilla fix
1 parent 7864172 commit 318ad06

File tree

6 files changed

+108
-81
lines changed

6 files changed

+108
-81
lines changed

‎CommunityBugFixCollection/CommunityBugFixCollection.csproj‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,23 +30,23 @@
3030
</ItemGroup>
3131

3232
<ItemGroup>
33-
<PackageReference Include="MicroUtils.HarmonyAnalyzers" Version="1.4.0">
33+
<PackageReference Include="MicroUtils.HarmonyAnalyzers" Version="1.6.0-beta1744347465">
3434
<PrivateAssets>all</PrivateAssets>
3535
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
3636
</PackageReference>
37-
<PackageReference Include="MonkeyLoader.GamePacks.Resonite" Version="0.22.1-beta" />
37+
<PackageReference Include="MonkeyLoader.GamePacks.Resonite" Version="0.23.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>
4242
<PackageReference Include="Resonite.Elements.Assets" Version="1.3.3" />
4343
<PackageReference Include="Resonite.Elements.Core" Version="1.4.3" />
4444
<PackageReference Include="Resonite.Elements.Quantity" Version="1.2.3" />
45-
<PackageReference Include="Resonite.FrooxEngine" Version="2025.5.14.23" />
45+
<PackageReference Include="Resonite.FrooxEngine" Version="2025.5.33.1285" />
4646
<PackageReference Include="Resonite.FrooxEngine.Store" Version="1.0.5" />
4747
<PackageReference Include="Resonite.ProtoFlux.Core" Version="1.3.1" />
4848
<PackageReference Include="Resonite.ProtoFlux.Nodes.Core" Version="1.3.1" />
49-
<PackageReference Include="Resonite.ProtoFluxBindings" Version="2025.5.18.24" />
49+
<PackageReference Include="Resonite.ProtoFluxBindings" Version="2025.5.29.1285" />
5050
<PackageReference Include="Resonite.SkyFrost.Base" Version="2.1.0" />
5151
<PackageReference Include="Resonite.SkyFrost.Base.Models" Version="2.1.5" />
5252
</ItemGroup>

‎CommunityBugFixCollection/ConstantNodeNameAdjustments.cs‎

Lines changed: 92 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,92 @@
1+
using FrooxEngine.ProtoFlux;
2+
using FrooxEngine.ProtoFlux.Runtimes.Execution.Nodes.Strings.Characters;
3+
using HarmonyLib;
4+
using MonkeyLoader.Resonite;
5+
using System;
6+
using System.Collections.Generic;
7+
using System.Text;
8+
9+
namespace CommunityBugFixCollection
10+
{
11+
[HarmonyPatchCategory(nameof(ConstantNodeNameAdjustments))]
12+
[HarmonyPatch(nameof(ProtoFluxNode.NodeName), MethodType.Getter)]
13+
internal sealed class ConstantNodeNameAdjustments : ResoniteMonkey<ConstantNodeNameAdjustments>
14+
{
15+
public override IEnumerable<string> Authors => Contributors.Banane9;
16+
17+
public override bool CanBeDisabled => true;
18+
19+
// Legacy Fix, so off by default
20+
protected override bool OnComputeDefaultEnabledState() => false;
21+
22+
[HarmonyPostfix]
23+
[HarmonyPatch(typeof(Backspace))]
24+
private static string BackspaceNamePostfix(string __result)
25+
{
26+
if (!Enabled)
27+
return __result;
28+
29+
return "Backspace (\\b)";
30+
}
31+
32+
[HarmonyPostfix]
33+
[HarmonyPatch(typeof(Bell))]
34+
private static string BellNamePostfix(string __result)
35+
{
36+
if (!Enabled)
37+
return __result;
38+
39+
return "Bell (\\a)";
40+
}
41+
42+
[HarmonyPostfix]
43+
[HarmonyPatch(typeof(CarriageReturn))]
44+
private static string CarriageReturnNamePostfix(string __result)
45+
{
46+
if (!Enabled)
47+
return __result;
48+
49+
return "Carriage Return (\\r)";
50+
}
51+
52+
[HarmonyPostfix]
53+
[HarmonyPatch(typeof(FormFeed))]
54+
private static string FormFeedNamePostfix(string __result)
55+
{
56+
if (!Enabled)
57+
return __result;
58+
59+
return "Form Feed (\\f)";
60+
}
61+
62+
[HarmonyPostfix]
63+
[HarmonyPatch(typeof(Space))]
64+
private static string SpaceNamePostfix(string __result)
65+
{
66+
if (!Enabled)
67+
return __result;
68+
69+
return "Space ( )";
70+
}
71+
72+
[HarmonyPostfix]
73+
[HarmonyPatch(typeof(Tab))]
74+
private static string TabNamePostfix(string __result)
75+
{
76+
if (!Enabled)
77+
return __result;
78+
79+
return "Tab (\\t)";
80+
}
81+
82+
[HarmonyPostfix]
83+
[HarmonyPatch(typeof(VerticalTab))]
84+
private static string VerticalTabNamePostfix(string __result)
85+
{
86+
if (!Enabled)
87+
return __result;
88+
89+
return "Vertical Tab (\\v)";
90+
}
91+
}
92+
}

‎CommunityBugFixCollection/Locale/de.json‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@
1616
"CommunityBugFixCollection.ColorDisplayValueProxy.Description": "Sorgt dafür, dass ValueDisplay<color> Nodes eine ValueProxySource Komponente haben.",
1717
"CommunityBugFixCollection.ColorXNodeNamesSpacing.Description": "Korrigiert die Schreibweise der Namen von ProtoFlux Nodes die ColorX enthalten.",
1818
"CommunityBugFixCollection.ConsistentContextMenuAngularSize.Description": "Sorgt dafür, dass das Kontextmenü im Desktopmodus immer die gleiche Größe auf dem Bildschirm hat, unabhängig vom Sichtfeld (FOV).",
19+
"CommunityBugFixCollection.ConstantNodeNameAdjustments.Name": "(Alt) Constant Nodenamen Anpassungen",
20+
"CommunityBugFixCollection.ConstantNodeNameAdjustments.Description": "(Alt) Ändert die Namen der ProtoFlux Nodes in Strings > Constants darauf, wie sie im ursprünglichen Fix waren.",
1921
"CommunityBugFixCollection.CopySyncMemberToClipboardAction.Description": "Fügt eine Kopieren Aktion zu Feldern in Inspektoren hinzu, die keine Referenzen sind.",
2022
"CommunityBugFixCollection.CorrectByteCasting.Description": "Korrigiert die Konvertierung von bytes in andere Werte mittels ProtoFlux Value Casts.",
2123
"CommunityBugFixCollection.CorrectMaterialGizmoScaling.Description": "Verhindert, dass das MaterialGizmo zweimal skaliert wird, wenn man Editieren auf dem Materialwerzeug nutzt.",
@@ -35,7 +37,7 @@
3537
"CommunityBugFixCollection.NaNtEqual.Description": "Sorgt dafür, dass NaN float / double Werte sich bei den == und != ProtoFlux Nodes sowie bei der ValueEqualityDriver Komponente niemals gleichen.",
3638
"CommunityBugFixCollection.NoLossOfColorProfile.Description": "Verhindert, dass Farbprofile nicht bei allen Berechnungen erhalten bleiben.",
3739
"CommunityBugFixCollection.NoZeroScaleToolRaycast.Description": "Verhinder einen Crash wenn (Multi-)Werkzeuge auf null skaliert werden.",
38-
"CommunityBugFixCollection.NodeNameAdjustments.Description": "Korrigiert, dass die Namen der meisten ProtoFlux Nodes in Strings > Constants unsichtbar sind.",
40+
"CommunityBugFixCollection.NodeNameAdjustments.Description": "Verbessert die verwirrenden Namen der Remap [-1; 1] zu [0; 1] ProtoFlux Nodes.",
3941
"CommunityBugFixCollection.NonHDRColorClamping.Description": "Korrigiert, dass die nicht-HDR Varianten der Color(X) Kanal-Additionen die Werte nicht limitieren.",
4042
"CommunityBugFixCollection.NonLinearColorXFromHexCode.Description": "Zwingt colorX From HexCode das sRGB statt dem Linearen Farbprofil zu nutzen.",
4143
"CommunityBugFixCollection.PauseAnimatorUpdates.Description": "Verhindert, dass Animatoren jeden Frame in alle assoziierten Felder schreiben, obwohl sie nicht am animieren sind.",

‎CommunityBugFixCollection/Locale/en.json‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,8 @@
2121
"CommunityBugFixCollection.ColorDisplayValueProxy.Description": "Fixes ValueDisplay<color> not having a ValueProxySource component.",
2222
"CommunityBugFixCollection.ColorXNodeNamesSpacing.Description": "Fixes ProtoFlux node names containing ColorX being spaced wrong.",
2323
"CommunityBugFixCollection.ConsistentContextMenuAngularSize.Description": "Makes the context menu stay a fixed on-screen size in desktop mode, regardless of FOV.",
24+
"CommunityBugFixCollection.ConstantNodeNameAdjustments.Name": "(Legacy) Constant Node Name Adjustments",
25+
"CommunityBugFixCollection.ConstantNodeNameAdjustments.Description": "(Legacy) Changes the names of the ProtoFlux nodes in Strings > Constants to be how they were with the original fix.",
2426
"CommunityBugFixCollection.CopySyncMemberToClipboardAction.Description": "Adds Copy to Clipboard action on any non-reference member fields in Inspectors.",
2527
"CommunityBugFixCollection.CorrectByteCasting.Description": "Fixes ProtoFlux value casts from byte to some other value converting incorrectly.",
2628
"CommunityBugFixCollection.CorrectMaterialGizmoScaling.Description": "Fixes the MaterialGizmo being scaled twice when using Edit on the Material Tool.",
@@ -41,7 +43,7 @@
4143
"CommunityBugFixCollection.NaNtEqual.Description": "Makes NaN floats / doubles never equal to each other for the ProtoFlux == and != nodes, as well as the ValueEqualityDriver component.",
4244
"CommunityBugFixCollection.NoLossOfColorProfile.Description": "Fixes Color Profile not being preserved on all operations.",
4345
"CommunityBugFixCollection.NoZeroScaleToolRaycast.Description": "Fixes a crash when a (multi)tool is scaled to zero.",
44-
"CommunityBugFixCollection.NodeNameAdjustments.Description": "Fixes most ProtoFlux nodes in Strings > Constants having invisible names.",
46+
"CommunityBugFixCollection.NodeNameAdjustments.Description": "Fixes the confusing names of the Remap [-1; 1] to [0; 1] ProtoFlux nodes.",
4547
"CommunityBugFixCollection.NonHDRColorClamping.Description": "Fixes non-HDR variants of Color(X) channel addition not clamping.",
4648
"CommunityBugFixCollection.NonLinearColorXFromHexCode.Description": "Forces colorX From HexCode to use the sRGB rather than Linear profile.",
4749
"CommunityBugFixCollection.PauseAnimatorUpdates.Description": "Fixes animators updating all associated fields every frame while enabled but not playing.",

‎CommunityBugFixCollection/NodeNameAdjustments.cs‎

Lines changed: 0 additions & 73 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
using FrooxEngine.ProtoFlux;
22
using FrooxEngine.ProtoFlux.Runtimes.Execution.Nodes.Math;
3-
using FrooxEngine.ProtoFlux.Runtimes.Execution.Nodes.Strings.Characters;
43
using HarmonyLib;
54
using System;
65
using System.Collections.Generic;
@@ -14,48 +13,6 @@ internal sealed class NodeNameAdjustments : ResoniteBugFixMonkey<NodeNameAdjustm
1413
{
1514
public override IEnumerable<string> Authors => Contributors.Banane9;
1615

17-
[HarmonyPostfix]
18-
[HarmonyPatch(typeof(Backspace))]
19-
private static string BackspaceNamePostfix(string __result)
20-
{
21-
if (!Enabled)
22-
return __result;
23-
24-
return "Backspace (\\b)";
25-
}
26-
27-
[HarmonyPostfix]
28-
[HarmonyPatch(typeof(Bell))]
29-
private static string BellNamePostfix(string __result)
30-
{
31-
if (!Enabled)
32-
return __result;
33-
34-
return "Bell (\\a)";
35-
}
36-
37-
[HarmonyPostfix]
38-
[HarmonyPatch(typeof(CarriageReturn))]
39-
private static string CarriageReturnNamePostfix(string __result)
40-
{
41-
if (!Enabled)
42-
return __result;
43-
44-
return "Carriage Return (\\r)";
45-
}
46-
47-
[HarmonyPostfix]
48-
[HarmonyPatch(typeof(FormFeed))]
49-
private static string FormFeedNamePostfix(string __result)
50-
{
51-
if (!Enabled)
52-
return __result;
53-
54-
return "Form Feed (\\f)";
55-
}
56-
57-
private static bool Prepare() => Enabled;
58-
5916
[HarmonyPostfix]
6017
[HarmonyPatch(typeof(Remap11_01_Double))]
6118
private static string Remap11_01_DoubleNamePostfix(string __result)
@@ -75,35 +32,5 @@ private static string Remap11_01_FloatNamePostfix(string __result)
7532

7633
return "Remap [-1; 1] to [0; 1]";
7734
}
78-
79-
[HarmonyPostfix]
80-
[HarmonyPatch(typeof(Space))]
81-
private static string SpaceNamePostfix(string __result)
82-
{
83-
if (!Enabled)
84-
return __result;
85-
86-
return "Space ( )";
87-
}
88-
89-
[HarmonyPostfix]
90-
[HarmonyPatch(typeof(Tab))]
91-
private static string TabNamePostfix(string __result)
92-
{
93-
if (!Enabled)
94-
return __result;
95-
96-
return "Tab (\\t)";
97-
}
98-
99-
[HarmonyPostfix]
100-
[HarmonyPatch(typeof(VerticalTab))]
101-
private static string VerticalTabNamePostfix(string __result)
102-
{
103-
if (!Enabled)
104-
return __result;
105-
106-
return "Vertical Tab (\\v)";
107-
}
10835
}
10936
}

‎README.md‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ just disable them in the settings in the meantime.
2525
* Duplicating Components breaking drives (https://github.com/Yellow-Dog-Man/Resonite-Issues/issues/92)
2626
* Selecting Copy Component when drag and dropping a Component onto an Inspector
2727
* Worlds crashing when a (multi)tool is scaled to zero (https://github.com/Yellow-Dog-Man/Resonite-Issues/issues/98)
28-
* Most ProtoFlux nodes in Strings > Constants having invisible names (https://github.com/Yellow-Dog-Man/Resonite-Issues/issues/177)
2928
* The `Remap -1 1 to 0 1` ProtoFlux node having a hard to understand name (https://github.com/Yellow-Dog-Man/Resonite-Issues/issues/245)
3029
* ColorX Luminance calculations being incorrect for non-linear color profiles (https://github.com/Yellow-Dog-Man/Resonite-Issues/issues/281)
3130
* Non-HDR variants of Color(X) channel addition not clamping (https://github.com/Yellow-Dog-Man/Resonite-Issues/issues/316)
@@ -92,9 +91,14 @@ just disable them in the settings in the meantime.
9291
## Closed Issues
9392

9493
The issues that were first closed in this mod but have officially been closed now will be linked in the following list.
95-
If they appear here, their implementation has been removed from the mod.
94+
If they appear here, their implementation has been removed from the mod,
95+
unless it is marked with `(Legacy)`.
96+
In that case, the original fix is left in but disabled by default.
97+
This is done for changes where the vanilla implementation is noticably different from the fix,
98+
but the exact implementation is inconsequential.
9699

97100
* Duplicating Components breaking drives (https://github.com/Yellow-Dog-Man/Resonite-Issues/issues/92)
98101
* Pressing Duplicate on the Component in an Inspector
99102
* Using the Component Clone Tool to duplicate them onto a slot
103+
* (Legacy) Most ProtoFlux nodes in Strings > Constants having invisible names (https://github.com/Yellow-Dog-Man/Resonite-Issues/issues/177)
100104
* UserInspectors not listing existing users in the session for non-host users (https://github.com/Yellow-Dog-Man/Resonite-Issues/issues/1964)

0 commit comments

Comments
 (0)