refactor: Replace delegate to action or func

Author: jcs090218

Assets/JCSUnity/Scripts/Actions/2D/Shooting/JCS_2DCursorShootAction.cs

@@ -45,7 +45,7 @@ public void SetShootCallback(Action func)
         /// Function to check if able to do this action.
         /// </summary>
         /// <param name="func"></param>
-        public void SetCheckAbleToShootFunction(CheckAbleToShoot func)
+        public void SetCheckAbleToShootFunction(Func<bool> func)
         {
             this.mShootAction.SetCheckAbleToShootFunction(func);
         }

Assets/JCSUnity/Scripts/Actions/2D/Shooting/JCS_2DSequenceShootActionNoDetection.cs

@@ -92,7 +92,7 @@ public void SetShootCallback(Action func)
             this.mShootAction.SetShootCallback(func);
         }
 
-        public void SetCheckAbleToShootFunction(CheckAbleToShoot func)
+        public void SetCheckAbleToShootFunction(Func<bool> func)
         {
             this.mShootAction.SetCheckAbleToShootFunction(func);
         }

Assets/JCSUnity/Scripts/Actions/2D/Shooting/JCS_ShootAction.cs

@@ -12,11 +12,6 @@
 
 namespace JCSUnity
 {
-    // If the function return
-    //              -> true, shoot the bullet.
-    //              -> false not able to shoot the bullet.
-    public delegate bool CheckAbleToShoot();
-
     /// <summary>
     /// Action that shoot bullets.
     /// </summary>
@@ -81,7 +76,7 @@ public class JCS_ShootAction : MonoBehaviour, JCS_IAction
         private Action mShootCallback = DefualtShootCallback;
 
         // Check we able to shoot or not
-        private CheckAbleToShoot mCheckAbleToShoot = DefualtCheckFunction;
+        private Func<bool> mCheckAbleToShoot = DefualtCheckFunction;
 
         [Header("- Action")]
 
@@ -244,8 +239,8 @@ public enum TrackType
         /// in order to check the shoot action.
         /// </summary>
         /// <param name="func"> functin to check able to do the shoot action. </param>
-        public void SetCheckAbleToShootFunction(CheckAbleToShoot func) { this.mCheckAbleToShoot = func; }
-        public CheckAbleToShoot GetCheckAbleToShootFunction() { return this.mCheckAbleToShoot; }
+        public void SetCheckAbleToShootFunction(Func<bool> func) { this.mCheckAbleToShoot = func; }
+        public Func<bool> GetCheckAbleToShootFunction() { return this.mCheckAbleToShoot; }
 
         /* Functions */
 

Assets/JCSUnity/Scripts/Input/JCS_ButtonSelection.cs

@@ -21,13 +21,11 @@ namespace JCSUnity
     /// </summary>
     public class JCS_ButtonSelection : MonoBehaviour
     {
-        public delegate void SelectionActiveEvent(bool act);
-
         /* Variables */
 
         public Action selectionEnable = SelectionEnable;
         public Action selectionDisable = SelectionDisable;
-        public SelectionActiveEvent selectionActive = SelectionActive;
+        public Action<bool> selectionActive = SelectionActive;
 
         private JCS_ButtonSelectionGroup mButtonSelectionGroup = null;
 

Assets/JCSUnity/Scripts/Input/JCS_Input.cs

@@ -79,9 +79,6 @@ public enum JCS_MouseButton
         MIDDLE = 2
     };
 
-    public delegate void JoystickPlugged();  // Callback when joystick is plugged.
-    public delegate void JoystickUnPlugged();  // Callback when joystick is unplugged.
-
     /// <summary>
     /// Unity's Input class re-wrapper.
     /// </summary>

Assets/JCSUnity/Scripts/Interactive/2D/Camera/JCS_2DSlideScreenCamera.cs

@@ -8,6 +8,7 @@
  */
 using UnityEngine;
 using MyBox;
+using System;
 
 namespace JCSUnity
 {
@@ -18,16 +19,13 @@ namespace JCSUnity
     /// </summary>
     public class JCS_2DSlideScreenCamera : MonoBehaviour
     {
-        public delegate void AfterSceneSwitchedCallback(Vector2 page);
-        public delegate void AfterSwipeCallback(Vector2 page);
-
         /* Variables */
 
         // Function call after the scene changed
-        public AfterSceneSwitchedCallback afterSceneSwitched = null;
+        public Action<Vector2> afterSceneSwitched = null;
 
         // Function call after the user has swiped
-        public AfterSwipeCallback afterSwiped = null;
+        public Action<Vector2> afterSwiped = null;
 
 #if UNITY_EDITOR
         [Separator("Helper Variables (JCS_2DSlideScreenCamera)")]

Assets/JCSUnity/Scripts/Loader/JCS_AudioLoader.cs

@@ -6,6 +6,7 @@
  * $Notice: See LICENSE.txt for modification and distribution information 
  *	                 Copyright © 2018 by Shen, Jen-Chieh $
  */
+using System;
 using System.IO;
 using System.Collections;
 using UnityEngine;
@@ -18,12 +19,6 @@ namespace JCSUnity
     /// </summary>
     public static class JCS_AudioLoader
     {
-        /// <summary>
-        /// Callback after the audio is loaded.
-        /// </summary>
-        /// <param name="tex"> The loaded audio. </param>
-        public delegate void AudioLoaded(AudioClip clip);
-
         /// <summary>
         /// Load the audio from path/url in runtime.
         /// </summary>
@@ -36,7 +31,7 @@ public static IEnumerator LoadAudio(
             string path,
             string filename,
             AudioType type = AudioType.OGGVORBIS,
-            AudioLoaded callback = null)
+            Action<AudioClip> callback = null)
         {
             string url = Path.Join(path, filename);
             return LoadAudio(url, type, callback);
@@ -52,7 +47,7 @@ public static IEnumerator LoadAudio(
         public static IEnumerator LoadAudio(
             string url,
             AudioType type = AudioType.OGGVORBIS,
-            AudioLoaded callback = null)
+            Action<AudioClip> callback = null)
         {
 #if UNITY_2018_1_OR_NEWER
             UnityWebRequest request = UnityWebRequestMultimedia.GetAudioClip(url, type);

Assets/JCSUnity/Scripts/Network/JCS_ServerRequestProcessor.cs

@@ -6,7 +6,9 @@
  * $Notice: See LICENSE.txt for modification and distribution information 
  *	                 Copyright (c) 2017 by Shen, Jen-Chieh $
  */
+using System;
 using System.Collections.Generic;
+using UnityEditor.PackageManager;
 using UnityEngine;
 
 namespace JCSUnity
@@ -17,13 +19,11 @@ namespace JCSUnity
     public class JCS_ServerRequestProcessor
         : JCS_Settings<JCS_ServerRequestProcessor>
     {
-        public delegate void ServerRequest(JCS_BinaryReader br, JCS_Client client);
-
         /* Variables */
 
-        private List<ServerRequest> mServerRequest = new List<ServerRequest>();
-        private List<JCS_Client> mClient = new List<JCS_Client>();
-        private List<JCS_BinaryReader> mBinaryReader = new List<JCS_BinaryReader>();
+        private List<Action<JCS_BinaryReader, JCS_Client>> mServerRequest = new();
+        private List<JCS_Client> mClient = new();
+        private List<JCS_BinaryReader> mBinaryReader = new();
 
         /* Setter & Getter */
 
@@ -42,7 +42,7 @@ private void Update()
         /// <summary>
         /// Register request from server.
         /// </summary>
-        public void RegisterRequest(ServerRequest request, JCS_BinaryReader br, JCS_Client client)
+        public void RegisterRequest(Action<JCS_BinaryReader, JCS_Client> request, JCS_BinaryReader br, JCS_Client client)
         {
             mServerRequest.Add(request);
             mBinaryReader.Add(br);
@@ -52,7 +52,7 @@ public void RegisterRequest(ServerRequest request, JCS_BinaryReader br, JCS_Clie
         /// <summary>
         /// Deregister the request from server.
         /// </summary>
-        public void DeresgisterRequest(ServerRequest request, JCS_BinaryReader br, JCS_Client client)
+        public void DeresgisterRequest(Action<JCS_BinaryReader, JCS_Client> request, JCS_BinaryReader br, JCS_Client client)
         {
             mServerRequest.Remove(request);
             mBinaryReader.Remove(br);

Assets/JCSUnity/Scripts/Util/JCS_UIUtil.cs

@@ -11,6 +11,7 @@
  */
 #define TMP_PRO
 
+using System;
 using UnityEngine;
 using UnityEngine.UI;
 using UnityEngine.EventSystems;
@@ -21,9 +22,6 @@
 
 namespace JCSUnity
 {
-    public delegate void EventTriggerEvent(PointerEventData data);
-    public delegate void EventTriggerEventButtonSelection(PointerEventData data, JCS_ButtonSelection selection);
-
     /// <summary>
     /// User interface related utilities functions.
     /// </summary>
@@ -61,7 +59,7 @@ public static bool IsUnityDefinedUI(Component comp)
         /// <param name="te"></param>
         /// <param name="type"></param>
         /// <param name="func"></param>
-        public static void AddEventTriggerEvent(EventTrigger te, EventTriggerType type, EventTriggerEvent func)
+        public static void AddEventTriggerEvent(EventTrigger te, EventTriggerType type, Action<PointerEventData> func)
         {
             EventTrigger.Entry entry = new EventTrigger.Entry();
             entry.eventID = type;
@@ -75,7 +73,7 @@ public static void AddEventTriggerEvent(EventTrigger te, EventTriggerType type,
         /// <param name="te"></param>
         /// <param name="type"></param>
         /// <param name="func"></param>
-        public static void AddEventTriggerEvent(EventTrigger te, EventTriggerType type, EventTriggerEventButtonSelection func, JCS_ButtonSelection selection)
+        public static void AddEventTriggerEvent(EventTrigger te, EventTriggerType type, Action<PointerEventData, JCS_ButtonSelection> func, JCS_ButtonSelection selection)
         {
             EventTrigger.Entry entry = new EventTrigger.Entry();
             entry.eventID = type;

Assets/_BossFight/Scripts/BF_Player.cs

@@ -24,7 +24,8 @@ public class BF_Player : JCS_2DSideScrollerPlayer
 
     private JCS_SequenceShootAction mSequenceShootAction = null;
 
-    [SerializeField] [Range(0, 100)]
+    [SerializeField]
+    [Range(0, 100)]
     private float mManaCastPerShoot = 1;
 
     /* Setter & Getter */