Skip to content

Commit

Permalink
More restrictive access rights.
Browse files Browse the repository at this point in the history
  • Loading branch information
@v1ld
v1ld committed Jul 30, 2019
1 parent e3cc7a0 commit 69ab00f
Show file tree
Hide file tree
Showing 4 changed files with 52 additions and 51 deletions.
22 changes: 11 additions & 11 deletions CustomGlobalMapLocations.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -63,24 +63,24 @@ class ModGlobalMapLocation
private static HashSet<ModGlobalMapLocation> GlobalMapLocations { get { return StateManager.CurrentState.GlobalMapLocations; } }

[DataMember]
public string Name { get; set; }
internal string Name;
[DataMember]
public string Notes { get; set; }
internal string Notes;
[DataMember]
public Color Color { get; set; }
internal Color Color;
[DataMember]
public bool IsVisible { get; set; }
internal bool IsVisible;
[DataMember]
private string AssetGuid;

private GlobalMapLocation mapLocation;
public bool IsDeleted = false;
public bool IsBeingDeleted = false;
internal bool IsDeleted = false;
internal bool IsBeingDeleted = false;

private ModGlobalMapLocation(GlobalMapLocation location)
{
this.mapLocation = location;
this.AssetGuid = location.Blueprint.AssetGuid;
this.mapLocation = location;
this.AssetGuid = location.Blueprint.AssetGuid;

this.Name = mapLocation.Blueprint.GetName(false);
this.Notes = $"Custom location #{StateManager.CurrentState.MarkerNumber++}";
Expand All @@ -90,7 +90,7 @@ private ModGlobalMapLocation(GlobalMapLocation location)
GlobalMapLocations.Add(this);
}

public static ModGlobalMapLocation FindOrCreateByAssetGuid(string assetGuid)
internal static ModGlobalMapLocation FindOrCreateByAssetGuid(string assetGuid)
{
var modLocation = GlobalMapLocations.FirstOrDefault(location => location.AssetGuid == assetGuid);
if (modLocation == null)
Expand All @@ -108,7 +108,7 @@ public static ModGlobalMapLocation FindOrCreateByAssetGuid(string assetGuid)
return modLocation;
}

public static ModGlobalMapLocation FindByAssetGuid(string assetGuid)
internal static ModGlobalMapLocation FindByAssetGuid(string assetGuid)
=> GlobalMapLocations.FirstOrDefault(location => location.AssetGuid == assetGuid);

internal static string GetModifiedDescription(BlueprintLocation bpLocation, string result)
Expand All @@ -124,7 +124,7 @@ internal static string GetModifiedDescription(BlueprintLocation bpLocation, stri
}
}

public bool UpdateGlobalMapLocation()
internal bool UpdateGlobalMapLocation()
{
if (this.mapLocation == null)
{
Expand Down
17 changes: 9 additions & 8 deletions CustomMapMarkers.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ internal static void OnShowLocalMap()

private static FastInvoke LocalMap_Set = Helpers.CreateInvoker<LocalMap>("Set");

public static void CreateMarker(LocalMap map, PointerEventData eventData)
internal static void CreateMarker(LocalMap map, PointerEventData eventData)
{
ModMapMarker marker = NewMarker(map, eventData);
LocalMap.Markers.Add(marker);
Expand Down Expand Up @@ -112,18 +112,18 @@ internal static void RemoveMarkersFromLocalMap()
class ModMapMarker : ILocalMapMarker
{
[DataMember]
public string Description { get; set; }
internal string Description;
[DataMember]
private SerializableVector3 Position;
[DataMember]
public LocalMap.MarkType Type { get; set; }
internal LocalMap.MarkType Type;
[DataMember]
public bool IsVisible { get; set; } = true;
internal bool IsVisible = true;

public bool IsDeleted = false;
public bool IsBeingDeleted = false;
internal bool IsDeleted = false;
internal bool IsBeingDeleted = false;

public ModMapMarker(Vector3 position)
internal ModMapMarker(Vector3 position)
{
Description = $"Custom marker #{StateManager.CurrentState.MarkerNumber++}";
Position = position;
Expand All @@ -145,10 +145,11 @@ bool ILocalMapMarker.IsVisible()

class CustomMapMarkersMenu {
private static Dictionary<string, List<ModMapMarker>> AreaMarkers { get { return StateManager.CurrentState.AreaMarkers; } }
internal static int lastAreaMenu = 0;
private static int lastAreaMenu = 0;
private static string[] MarkTypeNames = { "Point of Interest", "Very Important Thing", "Loot", "Exit" };
private static LocalMap.MarkType[] MarkTypes = { LocalMap.MarkType.Poi, LocalMap.MarkType.VeryImportantThing, LocalMap.MarkType.Loot, LocalMap.MarkType.Exit };


internal static void Layout()
{
var fixedWidth = new GUILayoutOption[1] { GUILayout.ExpandWidth(false) };
Expand Down
34 changes: 17 additions & 17 deletions Main.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ static void Postfix(LibraryScriptableObject __instance)
}

[Harmony12.HarmonyPatch(typeof(LocalMap), "OnPointerClick")]
internal static class LocalMap_OnPointerClick_Patch
static class LocalMap_OnPointerClick_Patch
{
private static bool Prefix(LocalMap __instance, PointerEventData eventData)
{
Expand All @@ -62,7 +62,7 @@ private static bool Prefix(LocalMap __instance, PointerEventData eventData)
}

[Harmony12.HarmonyPatch(typeof(LocalMap), "OnShow")]
internal static class LocalMap_OnShow_Patch
static class LocalMap_OnShow_Patch
{
private static bool Prefix(LocalMap __instance)
{
Expand All @@ -73,7 +73,7 @@ private static bool Prefix(LocalMap __instance)
}

[Harmony12.HarmonyPatch(typeof(LocalMap), "OnHide")]
internal static class LocalMap_OnHide_Patch
static class LocalMap_OnHide_Patch
{
private static void Postfix()
{
Expand All @@ -82,7 +82,7 @@ private static void Postfix()
}

[Harmony12.HarmonyPatch(typeof(GlobalMapLocation), "HandleClick")]
internal static class GlobalMapLocation_HandleClick_Patch
static class GlobalMapLocation_HandleClick_Patch
{
private static bool Prefix(GlobalMapLocation __instance)
{
Expand All @@ -96,7 +96,7 @@ private static bool Prefix(GlobalMapLocation __instance)
}

[Harmony12.HarmonyPatch(typeof(GlobalMapLocation), "HandleHoverChange")]
internal static class GlobalMapLocation_HandleHoverChange_Patch
static class GlobalMapLocation_HandleHoverChange_Patch
{
private static void Postfix(GlobalMapLocation __instance, bool isHover)
{
Expand All @@ -105,7 +105,7 @@ private static void Postfix(GlobalMapLocation __instance, bool isHover)
}

[Harmony12.HarmonyPatch(typeof(BlueprintLocation), "GetDescription")]
internal static class BlueprintLocation_GetDescription_Patch
static class BlueprintLocation_GetDescription_Patch
{
private static void Postfix(BlueprintLocation __instance, ref string __result)
{
Expand All @@ -114,7 +114,7 @@ private static void Postfix(BlueprintLocation __instance, ref string __result)
}

[Harmony12.HarmonyPatch(typeof(UnityModManager.UI), "Update")]
internal static class UnityModManager_UI_Update_Patch
static class UnityModManager_UI_Update_Patch
{
private static void Postfix()
{
Expand All @@ -133,17 +133,17 @@ private static void Postfix()
}
}

internal static bool IsLocalMapActive = false;
internal static bool IsControlPressed = false;
internal static bool IsShiftPressed = false;
private static bool IsLocalMapActive = false;
private static bool IsControlPressed = false;
private static bool IsShiftPressed = false;

internal static LibraryScriptableObject library;
static LibraryScriptableObject library;

public static bool enabled;

public static UnityModManager.ModEntry.ModLogger logger;

internal static Settings settings;
static Settings settings;

static Harmony12.HarmonyInstance harmonyInstance;

Expand Down Expand Up @@ -173,7 +173,7 @@ static void EnableGameLogging()
UberLogger.Logger.Enabled = true;
}

public static void NotifyPlayer(string message, bool warning = false)
internal static void NotifyPlayer(string message, bool warning = false)
{
if (warning)
{
Expand All @@ -189,7 +189,7 @@ public static void NotifyPlayer(string message, bool warning = false)
//
// Also, in general the return value should be ignored. If a patch fails, we still want to create
// blueprints, otherwise the save won't load. Better to have something be non-functional.
internal static bool ApplyPatch(Type type, String featureName)
static bool ApplyPatch(Type type, String featureName)
{
try
{
Expand Down Expand Up @@ -359,7 +359,7 @@ static void OnSaveGUI(UnityModManager.ModEntry modEntry)
StateManager.SaveState();
}

internal static void SafeLoad(Action load, String name)
static void SafeLoad(Action load, String name)
{
try
{
Expand All @@ -372,7 +372,7 @@ internal static void SafeLoad(Action load, String name)
}
}

internal static T SafeLoad<T>(Func<T> load, String name)
static T SafeLoad<T>(Func<T> load, String name)
{
try
{
Expand All @@ -386,7 +386,7 @@ internal static T SafeLoad<T>(Func<T> load, String name)
}
}

internal static Exception Error(String message)
static Exception Error(String message)
{
logger?.Log(message);
return new InvalidOperationException(message);
Expand Down
30 changes: 15 additions & 15 deletions StateManager.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,37 +19,37 @@ namespace CustomMapMarkers
class StateManager : IWarningNotificationUIHandler, ISceneHandler
{
[DataContract]
public class SavedState
internal class SavedState
{
[DataMember(Order=1)]
public readonly uint Version = 1; // Data version for serialization
internal readonly uint Version = 1; // Data version for serialization
[DataMember(Order=2)]
public uint MarkerNumber = 1; // Used in creating marker names
internal uint MarkerNumber = 1; // Used in creating marker names
[DataMember(Order=100)]
public HashSet<ModGlobalMapLocation> GlobalMapLocations { get; private set; }
internal HashSet<ModGlobalMapLocation> GlobalMapLocations { get; private set; }
[DataMember(Order=101)]
public Dictionary<string, List<ModMapMarker>> AreaMarkers { get; private set; }
internal Dictionary<string, List<ModMapMarker>> AreaMarkers { get; private set; }

public string CharacterName { get; private set; }
public bool IsLocalMapInitialized { get; set; } = false;
internal string CharacterName { get; private set; }
internal bool IsLocalMapInitialized = false;

public SavedState()
internal SavedState()
{
GlobalMapLocations = new HashSet<ModGlobalMapLocation>();
AreaMarkers = new Dictionary<string, List<ModMapMarker>>();

ValidateAfterLoad();
}

public void ValidateAfterLoad()
internal void ValidateAfterLoad()
{
if (GlobalMapLocations == null) { GlobalMapLocations = new HashSet<ModGlobalMapLocation>(); }
if (AreaMarkers == null) { AreaMarkers = new Dictionary<string, List<ModMapMarker>>(); }
CharacterName = Game.Instance.Player.MainCharacter.Value?.CharacterName;
IsLocalMapInitialized = false;
}

public SavedState CleanCopyForSave()
internal SavedState CleanCopyForSave()
{
var clone = (SavedState)this.MemberwiseClone();
clone.GlobalMapLocations = StateHelpers.PurgeDeletedGlobalMapLocations(this.GlobalMapLocations);
Expand All @@ -58,14 +58,14 @@ public SavedState CleanCopyForSave()
}
}

public static SavedState CurrentState;
internal static SavedState CurrentState;

internal static void Load()
{
EventBus.Subscribe(new StateManager());
}

public static void LoadState()
internal static void LoadState()
{
Log.Write($"Load request for current=[{CurrentState?.CharacterName}] game=[{Game.Instance.Player.MainCharacter.Value?.CharacterName}]");

Expand Down Expand Up @@ -105,7 +105,7 @@ public static void LoadState()
CurrentState = new SavedState();
}

public static void SaveState()
internal static void SaveState()
{
Log.Write($"Save request for current=[{CurrentState?.CharacterName}] game=[{Game.Instance.Player.MainCharacter.Value?.CharacterName}]");

Expand Down Expand Up @@ -230,7 +230,7 @@ private static void UpdateStateFileName()
}
}

static private Dictionary<string, string> FileNameForChar = new Dictionary<string, string>();
private static Dictionary<string, string> FileNameForChar = new Dictionary<string, string>();

private static string GetCharacterFileName(string prefix)
{
Expand All @@ -256,7 +256,7 @@ private static string GetCharacterFileName(string prefix)

class StateHelpers
{
public static Dictionary<string, List<ModMapMarker>> PurgeDeletedAreaMarkers(Dictionary<string, List<ModMapMarker>> oldMarkers)
internal static Dictionary<string, List<ModMapMarker>> PurgeDeletedAreaMarkers(Dictionary<string, List<ModMapMarker>> oldMarkers)
{
Dictionary<string, List<ModMapMarker>> newMarkers = new Dictionary<string, List<ModMapMarker>>();
foreach (var area in oldMarkers.Keys)
Expand Down

0 comments on commit 69ab00f

Please sign in to comment.