From af5f39af44a6fbb28e86f942e4fcca33daaeac5e Mon Sep 17 00:00:00 2001
From: sirhamsteralot <sirhamsteralot@gmail.com>
Date: Thu, 3 Jan 2019 21:53:26 +0100
Subject: [PATCH 1/5] Jam this in a grid cuz rexxar didnt want to

---
 Torch.Server/Views/PlayerListControl.xaml | 20 ++++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

diff --git a/Torch.Server/Views/PlayerListControl.xaml b/Torch.Server/Views/PlayerListControl.xaml
index 943f2f5..5a67271 100644
--- a/Torch.Server/Views/PlayerListControl.xaml
+++ b/Torch.Server/Views/PlayerListControl.xaml
@@ -6,10 +6,22 @@
              mc:Ignorable="d">
     <DockPanel>
         <StackPanel DockPanel.Dock="Bottom">
-            <Button x:Name="KickButton" Content="Kick" Margin="5,5,5,5" Click="KickButton_Click"/>
-            <Button x:Name="BanButton" Content="Ban" Margin="5,5,5,5" Click="BanButton_Click"/>
-            <Button x:Name="PromoteButton" Content ="Promote" Margin="5,5,5,5" Click="PromoteButton_OnClick"/>
-            <Button x:Name="DemoteButton" Content ="Demote" Margin="5,5,5,5" Click="DemoteButton_OnClick"/>
+            <Grid>
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition Width="*"/>
+                    <ColumnDefinition Width="*"/>
+                </Grid.ColumnDefinitions>
+                <Grid.RowDefinitions>
+                    <RowDefinition Height="*"/>
+                    <RowDefinition Height="*"/>
+                </Grid.RowDefinitions>
+
+                <Button x:Name="KickButton" Grid.Column="0" Grid.Row="0" Content="Kick" Margin="5,5,5,5" Click="KickButton_Click"/>
+                <Button x:Name="BanButton" Grid.Column="1" Grid.Row="0" Content="Ban" Margin="5,5,5,5" Click="BanButton_Click"/>
+                <Button x:Name="PromoteButton" Grid.Column="0" Grid.Row="1" Content ="Promote" Margin="5,5,5,5" Click="PromoteButton_OnClick"/>
+                <Button x:Name="DemoteButton" Grid.Column="1" Grid.Row="1" Content ="Demote" Margin="5,5,5,5" Click="DemoteButton_OnClick"/>
+            </Grid>
+
         </StackPanel>
         <ListView x:Name="PlayerList" ItemsSource="{Binding Players}" DockPanel.Dock="Top" Margin="5,5,5,5">
             <ListView.ItemTemplate>

From 5d40cf373dcefdac51ea35d3e63251cc1887e57b Mon Sep 17 00:00:00 2001
From: sirhamsteralot <sirhamsteralot@gmail.com>
Date: Wed, 25 Dec 2019 23:22:22 +0100
Subject: [PATCH 2/5] injecting of fields -- equinox

---
 .../Managers/PatchManager/DecoratedMethod.cs  | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

diff --git a/Torch/Managers/PatchManager/DecoratedMethod.cs b/Torch/Managers/PatchManager/DecoratedMethod.cs
index 8c2e120..7166e6e 100644
--- a/Torch/Managers/PatchManager/DecoratedMethod.cs
+++ b/Torch/Managers/PatchManager/DecoratedMethod.cs
@@ -364,7 +364,24 @@ namespace Torch.Managers.PatchManager
                             break;
                         }
 
-                        ParameterInfo declParam = _method.GetParameters().FirstOrDefault(x => x.Name == param.Name);
+                        if (param.Name.StartsWith("__field_"))
+                        {
+                            var fieldName = param.Name.Substring(8);
+                            var fieldDef = _method.DeclaringType.GetFields().FirstOrDefault(x => x.Name == fieldName);
+                            if (fieldDef == null) throw new Exception($"Could not find field {fieldName}");
+                            if (fieldDef.IsStatic)
+                                yield return new MsilInstruction(param.ParameterType.IsByRef ? OpCodes.Ldsflda : OpCodes.Ldsfld)
+                        .InlineValue(fieldDef);
+                            else
+                            {
+                                yield return new MsilInstruction(OpCodes.Ldarg_0);
+                                yield return new MsilInstruction(param.ParameterType.IsByRef ? OpCodes.Ldflda : OpCodes.Ldfld)
+                        .InlineValue(fieldDef);
+                            }
+                            break;
+                        }
+
+                            ParameterInfo declParam = _method.GetParameters().FirstOrDefault(x => x.Name == param.Name);
                         if (declParam == null)
                             throw new Exception($"Parameter name {param.Name} not found");
                         int paramIdx = (_method.IsStatic ? 0 : 1) + declParam.Position;

From 92ae2522107150dd3d738e853be0f9d7e2758025 Mon Sep 17 00:00:00 2001
From: sirhamsteralot <sirhamsteralot@gmail.com>
Date: Thu, 26 Dec 2019 00:07:18 +0100
Subject: [PATCH 3/5] formatting

---
 Torch/Managers/PatchManager/DecoratedMethod.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Torch/Managers/PatchManager/DecoratedMethod.cs b/Torch/Managers/PatchManager/DecoratedMethod.cs
index 7166e6e..5eb1bc8 100644
--- a/Torch/Managers/PatchManager/DecoratedMethod.cs
+++ b/Torch/Managers/PatchManager/DecoratedMethod.cs
@@ -371,12 +371,12 @@ namespace Torch.Managers.PatchManager
                             if (fieldDef == null) throw new Exception($"Could not find field {fieldName}");
                             if (fieldDef.IsStatic)
                                 yield return new MsilInstruction(param.ParameterType.IsByRef ? OpCodes.Ldsflda : OpCodes.Ldsfld)
-                        .InlineValue(fieldDef);
+                                    .InlineValue(fieldDef);
                             else
                             {
                                 yield return new MsilInstruction(OpCodes.Ldarg_0);
                                 yield return new MsilInstruction(param.ParameterType.IsByRef ? OpCodes.Ldflda : OpCodes.Ldfld)
-                        .InlineValue(fieldDef);
+                                    .InlineValue(fieldDef);
                             }
                             break;
                         }

From 2395c339957443c14e2be7f405ebe9120fc9ca31 Mon Sep 17 00:00:00 2001
From: sirhamsteralot <sirhamsteralot@gmail.com>
Date: Thu, 26 Dec 2019 14:45:12 +0100
Subject: [PATCH 4/5] Formatting Part deux

---
 Torch/Managers/PatchManager/DecoratedMethod.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Torch/Managers/PatchManager/DecoratedMethod.cs b/Torch/Managers/PatchManager/DecoratedMethod.cs
index 5eb1bc8..9a5ba54 100644
--- a/Torch/Managers/PatchManager/DecoratedMethod.cs
+++ b/Torch/Managers/PatchManager/DecoratedMethod.cs
@@ -381,7 +381,8 @@ namespace Torch.Managers.PatchManager
                             break;
                         }
 
-                            ParameterInfo declParam = _method.GetParameters().FirstOrDefault(x => x.Name == param.Name);
+                        ParameterInfo declParam = _method.GetParameters().FirstOrDefault(x => x.Name == param.Name);
+
                         if (declParam == null)
                             throw new Exception($"Parameter name {param.Name} not found");
                         int paramIdx = (_method.IsStatic ? 0 : 1) + declParam.Position;

From d236fd9bd9f02be3c0a85b25d5f6a3612cd75585 Mon Sep 17 00:00:00 2001
From: sirhamsteralot <sirhamsteralot@gmail.com>
Date: Sat, 15 Feb 2020 22:52:38 +0100
Subject: [PATCH 5/5] Bind to anything

---
 Torch/Managers/PatchManager/DecoratedMethod.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Torch/Managers/PatchManager/DecoratedMethod.cs b/Torch/Managers/PatchManager/DecoratedMethod.cs
index 9a5ba54..10e4745 100644
--- a/Torch/Managers/PatchManager/DecoratedMethod.cs
+++ b/Torch/Managers/PatchManager/DecoratedMethod.cs
@@ -367,7 +367,7 @@ namespace Torch.Managers.PatchManager
                         if (param.Name.StartsWith("__field_"))
                         {
                             var fieldName = param.Name.Substring(8);
-                            var fieldDef = _method.DeclaringType.GetFields().FirstOrDefault(x => x.Name == fieldName);
+                            var fieldDef = _method.DeclaringType.GetFields(BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.Static).FirstOrDefault(x => x.Name == fieldName);
                             if (fieldDef == null) throw new Exception($"Could not find field {fieldName}");
                             if (fieldDef.IsStatic)
                                 yield return new MsilInstruction(param.ParameterType.IsByRef ? OpCodes.Ldsflda : OpCodes.Ldsfld)