Skip to content

Commit ae504c3

Browse files
hardcpphardcpp
committed
V6.1.0
1 parent 773a925 commit ae504c3

File tree

26 files changed

+155
-47
lines changed

26 files changed

+155
-47
lines changed

‎BeatSaberPlus/Properties/AssemblyInfo.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,5 +32,5 @@
3232
// You can specify all the values or you can default the Build and Revision Numbers
3333
// by using the '*' as shown below:
3434
// [assembly: AssemblyVersion("1.0.*")]
35-
[assembly: AssemblyVersion("6.0.9")]
36-
[assembly: AssemblyFileVersion("6.0.9")]
35+
[assembly: AssemblyVersion("6.1.0")]
36+
[assembly: AssemblyFileVersion("6.1.0")]

‎BeatSaberPlus/manifest.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"id": "BeatSaberPlusCORE",
44
"name": "BeatSaberPlus",
55
"author": "HardCPP#1985",
6-
"version": "6.0.9",
6+
"version": "6.1.0",
77
"description": "",
88
"gameVersion": "1.31.0",
99
"dependsOn": {

‎Modules/BeatSaberPlus_Chat/Properties/AssemblyInfo.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,5 +31,5 @@
3131
// You can specify all the values or you can default the Build and Revision Numbers
3232
// by using the '*' as shown below:
3333
// [assembly: AssemblyVersion("1.0.*")]
34-
[assembly: AssemblyVersion("6.0.9")]
35-
[assembly: AssemblyFileVersion("6.0.9")]
34+
[assembly: AssemblyVersion("6.1.0")]
35+
[assembly: AssemblyFileVersion("6.1.0")]

‎Modules/BeatSaberPlus_Chat/manifest.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@
33
"id": "BeatSaberPlus_Chat",
44
"name": "BeatSaberPlus_Chat",
55
"author": "HardCPP#1985",
6-
"version": "6.0.9",
6+
"version": "6.1.0",
77
"description": "",
88
"gameVersion": "1.31.0",
99
"dependsOn": {
1010
"BSIPA": "^4.3.0",
11-
"BeatSaberPlusCORE": "^6.0.9"
11+
"BeatSaberPlusCORE": "^6.1.0"
1212
},
1313
"links": {
1414
"project-home": "https://discord.chatplex.org",

‎Modules/BeatSaberPlus_ChatEmoteRain/ChatPlexMod_ChatEmoteRain/ChatEmoteRain.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -278,7 +278,7 @@ public void StartSubRain()
278278
/// <param name="p_Message">ID of the message</param>
279279
private void ChatCoreMutiplixer_OnTextMessageReceived(IChatService p_Service, IChatMessage p_Message)
280280
{
281-
if (p_Message.Channel.IsTemp || p_Message.Message.Length < 2 || p_Message.Message[0] != '!')
281+
if (p_Message.Channel.IsTemp)
282282
return;
283283

284284
if (!string.IsNullOrEmpty(p_Message.Message) && p_Message.Message.Length > 2 && p_Message.Message[0] == '!')

‎Modules/BeatSaberPlus_ChatEmoteRain/Properties/AssemblyInfo.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,5 +32,5 @@
3232
// You can specify all the values or you can default the Build and Revision Numbers
3333
// by using the '*' as shown below:
3434
// [assembly: AssemblyVersion("1.0.*")]
35-
[assembly: AssemblyVersion("6.0.9")]
36-
[assembly: AssemblyFileVersion("6.0.9")]
35+
[assembly: AssemblyVersion("6.1.0")]
36+
[assembly: AssemblyFileVersion("6.1.0")]

‎Modules/BeatSaberPlus_ChatEmoteRain/manifest.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@
33
"id": "BeatSaberPlus_ChatEmoteRain",
44
"name": "BeatSaberPlus_ChatEmoteRain",
55
"author": "HardCPP#1985",
6-
"version": "6.0.9",
6+
"version": "6.1.0",
77
"description": "",
88
"gameVersion": "1.31.0",
99
"dependsOn": {
1010
"BSIPA": "^4.3.0",
11-
"BeatSaberPlusCORE": "^6.0.9"
11+
"BeatSaberPlusCORE": "^6.1.0"
1212
},
1313
"links": {
1414
"project-home": "https://discord.chatplex.org",

‎Modules/BeatSaberPlus_ChatIntegrations/ChatPlexMod_ChatIntegrations/Actions/Misc.cs‎

Lines changed: 82 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -283,16 +283,55 @@ private IEnumerator PlayAudioClip(string p_File)
283283
////////////////////////////////////////////////////////////////////////////
284284

285285
public class Misc_WaitMenuScene
286-
: Interfaces.IAction<Misc_WaitMenuScene, Models.Action>
286+
: Interfaces.IAction<Misc_WaitMenuScene, Models.Actions.WaitMenuScene>
287287
{
288+
private XUIToggle m_PreventNextActionsFailure = null;
289+
290+
////////////////////////////////////////////////////////////////////////////
291+
////////////////////////////////////////////////////////////////////////////
292+
288293
public override string Description => "Wait for menu scene";
289-
public override string UIPlaceHolder => "Wait for menu scene";
294+
295+
////////////////////////////////////////////////////////////////////////////
296+
////////////////////////////////////////////////////////////////////////////
297+
298+
public override void BuildUI(Transform p_Parent)
299+
{
300+
XUIElements = new IXUIElement[]
301+
{
302+
Templates.SettingsHGroup("Prevent next actions failure",
303+
XUIToggle.Make()
304+
.SetValue(Model.PreventNextActionFailure)
305+
.OnValueChanged((_) => OnSettingChanged())
306+
.Bind(ref m_PreventNextActionsFailure)
307+
),
308+
309+
XUIVLayout.Make(
310+
XUIText.Make("This actions will delay next actions execution"),
311+
XUIText.Make("until we reach the menu scene")
312+
)
313+
.SetBackground(true),
314+
};
315+
316+
BuildUIAuto(p_Parent);
317+
}
318+
319+
////////////////////////////////////////////////////////////////////////////
320+
////////////////////////////////////////////////////////////////////////////
321+
322+
private void OnSettingChanged()
323+
{
324+
Model.PreventNextActionFailure = m_PreventNextActionsFailure.Element.GetValue();
325+
}
290326

291327
////////////////////////////////////////////////////////////////////////////
292328
////////////////////////////////////////////////////////////////////////////
293329

294330
public override IEnumerator Eval(EventContext p_Context)
295331
{
332+
if (Model.PreventNextActionFailure)
333+
p_Context.PreventNextActionFailure = true;
334+
296335
yield return new WaitUntil(() => CP_SDK.ChatPlexSDK.ActiveGenericScene == CP_SDK.ChatPlexSDK.EGenericScene.Menu);
297336
}
298337
}
@@ -301,16 +340,56 @@ public override IEnumerator Eval(EventContext p_Context)
301340
////////////////////////////////////////////////////////////////////////////
302341

303342
public class Misc_WaitPlayingScene
304-
: Interfaces.IAction<Misc_WaitPlayingScene, Models.Action>
343+
: Interfaces.IAction<Misc_WaitPlayingScene, Models.Actions.WaitPlayingScene>
305344
{
345+
private XUIToggle m_PreventNextActionsFailure = null;
346+
347+
////////////////////////////////////////////////////////////////////////////
348+
////////////////////////////////////////////////////////////////////////////
349+
306350
public override string Description => "Wait for playing scene";
307351
public override string UIPlaceHolder => "Wait for playing scene";
308352

309353
////////////////////////////////////////////////////////////////////////////
310354
////////////////////////////////////////////////////////////////////////////
311355

356+
public override void BuildUI(Transform p_Parent)
357+
{
358+
XUIElements = new IXUIElement[]
359+
{
360+
Templates.SettingsHGroup("Prevent next actions failure",
361+
XUIToggle.Make()
362+
.SetValue(Model.PreventNextActionFailure)
363+
.OnValueChanged((_) => OnSettingChanged())
364+
.Bind(ref m_PreventNextActionsFailure)
365+
),
366+
367+
XUIVLayout.Make(
368+
XUIText.Make("This actions will delay next actions execution"),
369+
XUIText.Make("until we reach the playing scene")
370+
)
371+
.SetBackground(true),
372+
};
373+
374+
BuildUIAuto(p_Parent);
375+
}
376+
377+
////////////////////////////////////////////////////////////////////////////
378+
////////////////////////////////////////////////////////////////////////////
379+
380+
private void OnSettingChanged()
381+
{
382+
Model.PreventNextActionFailure = m_PreventNextActionsFailure.Element.GetValue();
383+
}
384+
385+
////////////////////////////////////////////////////////////////////////////
386+
////////////////////////////////////////////////////////////////////////////
387+
312388
public override IEnumerator Eval(EventContext p_Context)
313389
{
390+
if (Model.PreventNextActionFailure)
391+
p_Context.PreventNextActionFailure = true;
392+
314393
yield return new WaitUntil(() => CP_SDK.ChatPlexSDK.ActiveGenericScene == CP_SDK.ChatPlexSDK.EGenericScene.Playing);
315394
}
316395
}

‎Modules/BeatSaberPlus_ChatIntegrations/ChatPlexMod_ChatIntegrations/Models/Actions/Misc.cs‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,4 +26,22 @@ public class Misc_PlaySound : Action
2626
[JsonProperty(DefaultValueHandling = DefaultValueHandling.Include)]
2727
public bool KillOnSceneSwitch = false;
2828
}
29+
30+
////////////////////////////////////////////////////////////////////////////
31+
////////////////////////////////////////////////////////////////////////////
32+
33+
public class WaitMenuScene : Action
34+
{
35+
[JsonProperty(DefaultValueHandling = DefaultValueHandling.Include)]
36+
public bool PreventNextActionFailure = true;
37+
}
38+
39+
////////////////////////////////////////////////////////////////////////////
40+
////////////////////////////////////////////////////////////////////////////
41+
42+
public class WaitPlayingScene : Action
43+
{
44+
[JsonProperty(DefaultValueHandling = DefaultValueHandling.Include)]
45+
public bool PreventNextActionFailure = true;
46+
}
2947
}

‎Modules/BeatSaberPlus_ChatIntegrations/Properties/AssemblyInfo.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,5 +32,5 @@
3232
// You can specify all the values or you can default the Build and Revision Numbers
3333
// by using the '*' as shown below:
3434
// [assembly: AssemblyVersion("1.0.*")]
35-
[assembly: AssemblyVersion("6.0.9")]
36-
[assembly: AssemblyFileVersion("6.0.9")]
35+
[assembly: AssemblyVersion("6.1.0")]
36+
[assembly: AssemblyFileVersion("6.1.0")]

0 commit comments

Comments
 (0)