Fix readonly PluginReferences and cleanup

Author: austinv900

src/CSharpPlugin.cs

@@ -224,51 +224,47 @@ public CSharpPlugin()
             Type type = GetType();
             foreach (MemberInfo member in type.GetMembers(BindingFlags.NonPublic | BindingFlags.Instance))
             {
-                if (member.MemberType != MemberTypes.Property && member.MemberType != MemberTypes.Field)
+                if (member.MemberType == MemberTypes.Property || member.MemberType == MemberTypes.Field)
                 {
-                    continue;
-                }
+                    if (member.MemberType == MemberTypes.Property)
+                    {
+                        PropertyInfo property = member as PropertyInfo;
+                        if (!property.CanWrite)
+                        {
+                            continue;
+                        }
+                    }
+                    else
+                    {
+                        FieldInfo field = member as FieldInfo;
+                    }
 
-                if (member.MemberType == MemberTypes.Property)
-                {
-                    PropertyInfo property = member as PropertyInfo;
-                    if (!property.CanWrite)
+                    object[] reference_attributes = member.GetCustomAttributes(typeof(PluginReferenceAttribute), true);
+
+                    if (reference_attributes.Length > 0)
                     {
-                        continue;
+                        PluginReferenceAttribute pluginReference = reference_attributes[0] as PluginReferenceAttribute;
+                        pluginReferenceMembers[pluginReference.Name ?? member.Name] = member;
                     }
                 }
-                else
+                else if (member.MemberType == MemberTypes.Method)
                 {
-                    FieldInfo field = member as FieldInfo;
-                    if (field.IsInitOnly)
+                    MethodInfo method = member as MethodInfo;
+                    object[] info_attributes = method.GetCustomAttributes(typeof(HookMethodAttribute), true);
+                    if (info_attributes.Length > 0)
                     {
                         continue;
                     }
-                }
 
-                object[] reference_attributes = member.GetCustomAttributes(typeof(PluginReferenceAttribute), true);
-                if (reference_attributes.Length > 0)
-                {
-                    PluginReferenceAttribute pluginReference = reference_attributes[0] as PluginReferenceAttribute;
-                    pluginReferenceMembers[pluginReference.Name ?? member.Name] = member;
-                }
-            }
-            foreach (MethodInfo method in type.GetMethods(BindingFlags.NonPublic | BindingFlags.Instance))
-            {
-                object[] info_attributes = method.GetCustomAttributes(typeof(HookMethodAttribute), true);
-                if (info_attributes.Length > 0)
-                {
-                    continue;
-                }
-
-                if (method.Name.Equals("OnFrame"))
-                {
-                    HookedOnFrame = true;
-                }
-                // Assume all private instance methods which are not explicitly hooked could be hooks
-                if (method.DeclaringType.Name == type.Name)
-                {
-                    AddHookMethod(method.Name, method);
+                    if (method.Name.Equals("OnFrame"))
+                    {
+                        HookedOnFrame = true;
+                    }
+                    // Assume all private instance methods which are not explicitly hooked could be hooks
+                    if (method.DeclaringType.Name == type.Name)
+                    {
+                        AddHookMethod(method.Name, method);
+                    }
                 }
             }
         }