Skip to content
This repository has been archived by the owner on Nov 7, 2022. It is now read-only.

Commit

Permalink
Melonloader 0.4.0, VRC 1105 support.
Browse files Browse the repository at this point in the history
  • Loading branch information
@Kiokuu
Kiokuu committed Jun 16, 2021
1 parent 17f7a5c commit 1ef2961
Show file tree
Hide file tree
Showing 3 changed files with 17 additions and 16 deletions.
7 changes: 4 additions & 3 deletions SafetyPresets/Properties/AssemblyInfo.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,9 @@
using MelonLoader;

// MelonLoader
[assembly: MelonInfo(typeof(SafetyPresets.Main), "Safety-Presets", "0.0.5", "Yato#4499", "https://github.com/Kiokuu/SafetyPresets")]
[assembly: MelonInfo(typeof(SafetyPresets.Main), "Safety-Presets", "0.0.6", "Yato#4499", "https://github.com/Kiokuu/SafetyPresets")]
[assembly: MelonGame("VRChat", "VRChat")]
[assembly: MelonColor(System.ConsoleColor.DarkGreen)]

// General Information about an assembly is controlled through the following
// set of attributes. Change these attribute values to modify the information
Expand Down Expand Up @@ -37,5 +38,5 @@
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("1.0.0.5")]
[assembly: AssemblyFileVersion("1.0.0.5")]
[assembly: AssemblyVersion("1.0.0.6")]
[assembly: AssemblyFileVersion("1.0.0.6")]
24 changes: 12 additions & 12 deletions SafetyPresets/SafetyHelpers.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -59,30 +59,30 @@ public static void DoXrefMagic()

public static IEnumerator ChangeOnInstance()
{
while(RoomManager.field_Internal_Static_ApiWorldInstance_0?.InstanceType==null)
while(RoomManager.field_Internal_Static_ApiWorldInstance_0?.type == null)
{
yield return new WaitForSeconds(0.5f);
}

var instanceType = RoomManager.field_Internal_Static_ApiWorldInstance_0?.InstanceType;
var instanceType = RoomManager.field_Internal_Static_ApiWorldInstance_0?.type;
yield return new WaitForSeconds(0.5f);

MelonLogger.Msg($"Current Instance Type -> {instanceType.Value}");

if(instanceType == ApiWorldInstance.AccessType.Public && Prefs.DoChangeInPublics)
if(instanceType == InstanceAccessType.Public && Prefs.DoChangeInPublics)
{
LoadSafetySettings(Prefs.DoChangeInPublicsPreset());
MelonLoader.MelonLogger.Msg("Public instance -> changing safety preset.");
MelonLogger.Msg("Public instance -> changing safety preset.");
}
if(instanceType==ApiWorldInstance.AccessType.FriendsOfGuests && Prefs.DoChangeInFriends)
if(instanceType==InstanceAccessType.FriendsOfGuests && Prefs.DoChangeInFriends)
{
LoadSafetySettings(Prefs.DoChangeInFriendsPreset());
MelonLoader.MelonLogger.Msg("Friends instance -> changing safety preset.");
MelonLogger.Msg("Friends instance -> changing safety preset.");
}
if((instanceType == ApiWorldInstance.AccessType.FriendsOnly || instanceType == ApiWorldInstance.AccessType.InviteOnly || instanceType == ApiWorldInstance.AccessType.InvitePlus) && Prefs.DoChangeInPrivates)
if((instanceType == InstanceAccessType.FriendsOnly || instanceType == InstanceAccessType.InviteOnly || instanceType == InstanceAccessType.InvitePlus) && Prefs.DoChangeInPrivates)
{
LoadSafetySettings(Prefs.DoChangeInPrivatesPreset());
MelonLoader.MelonLogger.Msg("Private instance -> changing safety preset.");
MelonLogger.Msg("Private instance -> changing safety preset.");
}
}

Expand Down Expand Up @@ -119,7 +119,7 @@ public static void SaveSafetySettings(int presetNum,string name)

Helpers.SaveSafetyJSON();

MelonLoader.MelonLogger.Msg($"Saved safety preset -> \"{name}\" ({presetNum})");
MelonLogger.Msg($"Saved safety preset -> \"{name}\" ({presetNum})");

Settings.UpdateSelectablePresets();
}
Expand All @@ -138,13 +138,13 @@ public static void LoadSafetySettings(int presetNum)
}
catch
{
MelonLoader.MelonLogger.Msg("No saved safety settings could be loaded.");
MelonLogger.Msg("No saved safety settings could be loaded.");
return;
}

if(!IsPresetValid(toLoadPreset.settingsPresetNum))
{
MelonLoader.MelonLogger.Msg("This preset is an empty default. Nothing to load here.");
MelonLogger.Msg("This preset is an empty default. Nothing to load here.");
return;
}

Expand All @@ -169,7 +169,7 @@ public static void LoadSafetySettings(int presetNum)
}
}
}
MelonLoader.MelonLogger.Msg($"Loaded safety preset -> \"{toLoadPreset.settingsPresetName}\" ({toLoadPreset.settingsPresetNum})");
MelonLogger.Msg($"Loaded safety preset -> \"{toLoadPreset.settingsPresetName}\" ({toLoadPreset.settingsPresetNum})");
applySafety.Invoke(FeaturePermissionManager.prop_FeaturePermissionManager_0, new object[] { });
}
catch (Exception e)
Expand Down
2 changes: 1 addition & 1 deletion SafetyPresets/SafetyUI.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ public static void OpenSavePresetMenu(int presetNumber)
{
var savePresetMenu = ExpansionKitApi.CreateCustomFullMenuPopup(LayoutDescription.WideSlimList);
string defaultText = Helpers.GetPresetName(presetNumber);
savePresetMenu.AddSimpleButton("Save this preset",()=>{savePresetMenu.Hide(); UIExpansionKit.API.BuiltinUiUtils.ShowInputPopup("Enter a preset name",defaultText,InputField.InputType.Standard,false,"Save",(x, kc, txt)=>Helpers.SaveSafetySettings(presetNumber,x));});
savePresetMenu.AddSimpleButton("Save this preset",()=>{savePresetMenu.Hide(); BuiltinUiUtils.ShowInputPopup("Enter a preset name",defaultText,InputField.InputType.Standard,false,"Save",(x, kc, txt)=>Helpers.SaveSafetySettings(presetNumber,x));});

savePresetMenu.Show();
}
Expand Down

0 comments on commit 1ef2961

Please sign in to comment.