helpy4/Minecraft-Console-Client
1
0
Fork 0
mirror of https://github.com/MCCTeam/Minecraft-Console-Client synced 2025-10-14 21:22:49 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Implement schedule main thread task with return value (#1579)

Browse source 
* Implement schedule main thread task with return value

* Revert change of TestBot.cs
This commit is contained in:
ReinforceZwei 2021-05-12 12:20:13 +08:00 • committed by GitHub
parent 073458f5f2
commit f848495243
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 88 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

58
MinecraftClient/ChatBot.cs
View file

@ -72,7 +72,7 @@ namespace MinecraftClient
{
if (delayTasks[i].Tick())
{
Handler.ScheduleTask(delayTasks[i].Task);
delayTasks[i].Task.DynamicInvoke();
tasksToRemove.Add(i);
}
}
@ -1390,37 +1390,44 @@ namespace MinecraftClient
}
/// <summary>
/// Schedule a task to run on main thread
/// Schedule a task to run on main thread. Returned value cannot be retrieved
/// </summary>
/// <param name="task">Task to run</param>
/// <param name="delayTicks">Run the task after X ticks (1 tick delay = ~100ms). 0 for no delay</param>
/// <example>
/// // Delay ~10 seconds
/// ScheduleTask(delegate ()
/// ScheduleTaskDelayed(new Action(() =>
/// {
/// /** Your code here **/
/// Console.WriteLine("10 seconds has passed");
/// }, 100);
/// }), 100);
/// </example>
protected void ScheduleTask(Action task, int delayTicks = 0)
protected void ScheduleTaskDelayed(Delegate task, int delayTicks = 0)
{
if (task != null)
if (delayTicks <= 0)
{
if (delayTicks <= 0)
// Immediately schedule to run on next update
Handler.ScheduleTask(task);
}
else
{
lock (delayTasksLock)
{
// Immediately schedule to run on next update
Handler.ScheduleTask(task);
}
else
{
lock (delayTasksLock)
{
delayTasks.Add(new DelayedTask(task, delayTicks));
}
delayTasks.Add(new DelayedTask(task, delayTicks));
}
}
}
/// <summary>
/// Schedule a task to run on main thread.
/// </summary>
/// <param name="task">Task to run</param>
/// <returns>Any value returned from the task</returns>
protected object ScheduleTask(Delegate task)
{
return Handler.ScheduleTask(task);
}
/// <summary>
/// Command runner definition.
/// Returned string will be the output of the command
@ -1468,16 +1475,16 @@ namespace MinecraftClient
private class DelayedTask
{
private Action task;
private Delegate task;
private int Counter;
public Action Task { get { return task; } }
public Delegate Task { get { return task; } }
public DelayedTask(Action task)
public DelayedTask(Delegate task)
: this(task, 0)
{ }
public DelayedTask(Action task, int delayTicks)
public DelayedTask(Delegate task, int delayTicks)
{
this.task = task;
Counter = delayTicks;
@ -1494,17 +1501,6 @@ namespace MinecraftClient
return true;
return false;
}
/// <summary>
/// Execute the task
/// </summary>
public void Execute()
{
if (task != null)
{
task();
}
}
}
}
}