PvE/Torch
3
0
Fork 0
Code Issues 1 Pull Requests Actions Releases 21 Wiki Activity

Merge branch 'master' into Patron

Browse Source
This commit is contained in:
Brant Martin
2019-04-10 16:31:19 -04:00
parent f44bf935d3 5c8a1f3677
commit aaabfa2d01
13 changed files with 115 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Torch.API/ITorchConfig.cs
View File

@@ -18,6 +18,8 @@ namespace Torch
bool ShouldUpdateTorch { get; }
int TickTimeout { get; set; }
string WaitForPID { get; set; }
string ChatName { get; set; }
string ChatColor { get; set; }
bool Save(string path = null);
}

10
Torch.API/WebAPI/PluginQuery.cs
View File

@@ -95,6 +95,10 @@ namespace Torch.API.WebAPI
try
{
path = path ?? $"Plugins\\{item.Name}.zip";
string relpath = Path.GetDirectoryName(path);
Directory.CreateDirectory(relpath);
var h = await _client.GetAsync(string.Format(PLUGIN_QUERY, item.ID));
string res = await h.Content.ReadAsStringAsync();
var response = JsonConvert.DeserializeObject<PluginFullItem>(res);
@@ -110,7 +114,11 @@ namespace Torch.API.WebAPI
return false;
}
var s = await _client.GetStreamAsync(version.URL);
using (var f = new FileStream(path, FileMode.Create))
if(File.Exists(path))
File.Delete(path);
using (var f = File.Create(path))
{
await s.CopyToAsync(f);
await f.FlushAsync();

5
Torch.Server/TorchConfig.cs
View File

@@ -5,6 +5,7 @@ using System.Windows;
using System.Xml.Serialization;
using Newtonsoft.Json;
using NLog;
using VRage.Game;
namespace Torch.Server
{
@@ -60,6 +61,10 @@ namespace Torch.Server
/// <inheritdoc />
public List<string> Plugins { get; set; } = new List<string>();
public string ChatName { get; set; } = "Server";
public string ChatColor { get; set; } = "Red";
public bool EnableWhitelist { get; set; } = false;
public HashSet<ulong> Whitelist { get; set; } = new HashSet<ulong>();

4
Torch.Server/Views/ChatControl.xaml
View File

@@ -17,8 +17,8 @@
<ColumnDefinition/>
<ColumnDefinition Width="Auto"/>
</Grid.ColumnDefinitions>
<Button Grid.Column="1" x:Name="Send" Content="Send" DockPanel.Dock="Right" Width="50" Margin="5,5,5,5" Click="SendButton_Click"></Button>
<TextBox Grid.Column="0" x:Name="Message" DockPanel.Dock="Left" Margin="5,5,5,5" KeyDown="Message_OnKeyDown"></TextBox>
<Button Grid.Column="1" Content="Send" DockPanel.Dock="Right" Width="50" Margin="5" Click="SendButton_Click"></Button>
<TextBox Grid.Column="0" x:Name="Message" Margin="5" KeyDown="Message_OnKeyDown"></TextBox>
</Grid>
</Grid>
</UserControl>

13
Torch/Commands/CommandContext.cs
View File

@@ -55,10 +55,17 @@ namespace Torch.Commands
Args = args ?? new List<string>();
}
public virtual void Respond(string message, string sender = "Server", string font = MyFontEnum.Blue)
public virtual void Respond(string message, string sender = null, string font = MyFontEnum.Blue)
{
Torch.CurrentSession.Managers.GetManager<IChatManagerServer>()
?.SendMessageAsOther(sender, message, font, _steamIdSender);
var chat = Torch.CurrentSession.Managers.GetManager<IChatManagerServer>();
if (sender != null)
{
chat?.SendMessageAsOther(sender, message, font, _steamIdSender);
}
else
{
chat?.SendMessageAsSelf(message);
}
}
}
}

12
Torch/Managers/ChatManager/ChatManagerClient.cs
View File

@@ -38,10 +38,18 @@ namespace Torch.Managers.ChatManager
{
if (Sandbox.Engine.Platform.Game.IsDedicated)
{
// Sending invalid color to clients will crash them. KEEEN
var color = Torch.Config.ChatColor;
if (!StringUtils.IsFontEnum(Torch.Config.ChatColor))
{
_log.Warn("Invalid chat font color! Defaulting to 'Red'");
color = MyFontEnum.Red;
}
var scripted = new ScriptedChatMsg()
{
Author = "Server",
Font = MyFontEnum.Red,
Author = Torch.Config.ChatName,
Font = color,
Text = message,
Target = 0
};

7
Torch/Managers/NetworkManager/NetworkManager_Deprecated.cs
View File

@@ -68,6 +68,10 @@ namespace Torch.Managers
/// <inheritdoc/>
public override void Attach()
{
//disable all this for now
_log.Warn("Network intercept disabled. Some plugins may not work correctly.");
return;
if (_init)
return;
@@ -362,6 +366,9 @@ namespace Torch.Managers
/// <inheritdoc />
public void RegisterNetworkHandler(INetworkHandler handler)
{
_log.Warn($"Plugin {handler.GetType().Assembly.FullName} registered a network handler. This system no longer works. Please alert the plugin author.");
return;
var handlerType = handler.GetType().FullName;
var toRemove = new List<INetworkHandler>();
foreach (var item in _networkHandlers)

54
Torch/Patches/PhysicsMemoryPatch.cs Normal file
View File

@@ -0,0 +1,54 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Reflection;
using System.Text;
using System.Threading;
using System.Threading.Tasks;
using Havok;
using Sandbox;
using Sandbox.Engine.Physics;
using Sandbox.Game.World;
using Torch.Managers.PatchManager;
using Torch.Mod;
using Torch.Mod.Messages;
using VRage.Game;
namespace Torch.Patches
{
[PatchShim]
public static class PhysicsMemoryPatch
{
public static void Patch(PatchContext ctx)
{
ctx.GetPattern(typeof(MyPhysics).GetMethod("StepWorldsInternal", BindingFlags.NonPublic | BindingFlags.Instance)).Prefixes.Add(typeof(PhysicsMemoryPatch).GetMethod(nameof(PrefixPhysics)));
}
public static bool NotifiedFailure { get; private set; }
public static bool PrefixPhysics()
{
if (!HkBaseSystem.IsOutOfMemory)
return true;
if (NotifiedFailure)
return false;
NotifiedFailure = true;
ModCommunication.SendMessageToClients(new NotificationMessage("Havok has run out of memory. Server will restart in 30 seconds!", 60000, MyFontEnum.Red));
//save the session NOW before anything moves due to weird physics.
MySession.Static.Save();
//pause the game, for funsies
MySandboxGame.IsPaused = true;
//nasty hack
Task.Run(() =>
{
Thread.Sleep(TimeSpan.FromSeconds(30));
TorchBase.Instance.Restart();
});
return false;
}
}
}

2
Torch/Patches/TorchAsyncSaving.cs
View File

@@ -66,7 +66,7 @@ namespace Torch.Patches
{
if (!Game.IsDedicated && MySession.Static != null)
ShowWorldSaveResult(tmpSnapshot.SavingSuccess);
saveTaskSource.SetResult(tmpSnapshot.SavingSuccess ? GameSaveResult.Success : GameSaveResult.FailedToSaveToDisk);
saveTaskSource.TrySetResult(tmpSnapshot.SavingSuccess ? GameSaveResult.Success : GameSaveResult.FailedToSaveToDisk);
});
});
return saveTaskSource.Task;

4
Torch/Plugins/PluginManifest.cs
View File

@@ -23,8 +23,12 @@ namespace Torch
/// <summary>
/// A GitHub repository in the format of Author/Repository to retrieve plugin updates.
/// </summary>
[Obsolete("Updates no longer check git. Updates are hosted only on torchapi.net")]
public string Repository { get; set; }
//xml tomfoolery
public bool ShouldSerializeRepository() => false;
/// <summary>
/// The plugin version. This must include a string in the format of #[.#[.#]] for update checking purposes.
/// </summary>

1
Torch/Torch.csproj
View File

@@ -224,6 +224,7 @@
<Compile Include="Patches\GameAnalyticsPatch.cs" />
<Compile Include="Patches\GameStatePatchShim.cs" />
<Compile Include="Patches\ObjectFactoryInitPatch.cs" />
<Compile Include="Patches\PhysicsMemoryPatch.cs" />
<Compile Include="Patches\SessionDownloadPatch.cs" />
<Compile Include="Patches\TorchAsyncSaving.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />

1
Torch/TorchBase.cs
View File

@@ -485,6 +485,7 @@ namespace Torch
if (_registeredAuxAssemblies.Add(asm))
{
ReflectedManager.Process(asm);
PatchManager.AddPatchShims(asm);
}
}
}

9
Torch/Utils/StringUtils.cs
View File

@@ -1,6 +1,7 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Reflection;
using System.Text;
using System.Threading.Tasks;
@@ -60,5 +61,13 @@ namespace Torch.Utils
}
return builder?.ToString() ?? "";
}
private static string[] FontEnumValues => _fontEnumValues ?? (_fontEnumValues = typeof(VRage.Game.MyFontEnum).GetFields(BindingFlags.Public | BindingFlags.Static).Where(x => x.IsLiteral && !x.IsInitOnly).Select(x => (string)x.GetValue(null)).ToArray());
private static string[] _fontEnumValues;
public static bool IsFontEnum(string str)
{
return FontEnumValues.Contains(str);
}
}
}