warrentyexpired/ModernUO
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

chore: Use var everywhere (#2294)

Browse source
This commit is contained in:
Kamron Batman 2025-12-27 16:47:28 -08:00 • committed by GitHub
parent 0b34cc4417
commit ebaf104935
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
267 changed files with 873 additions and 873 deletions
Download patch file Download diff file Expand all files Collapse all files

80
Projects/UOContent/Commands/AddonGenerator.cs
View file

@ -113,41 +113,41 @@ public class AddonGenerator
(start.Y, end.Y) = (end.Y, start.Y);
}
Point2D startPoint2D = new Point2D(start.X, start.Y);
Point2D endPoint2D = new Point2D(end.X, end.Y);
Rectangle2D bounds = new Rectangle2D(startPoint2D, endPoint2D);
var startPoint2D = new Point2D(start.X, start.Y);
var endPoint2D = new Point2D(end.X, end.Y);
var bounds = new Rectangle2D(startPoint2D, endPoint2D);
string name = pickerState.Name;
string ns = pickerState.Namespace;
bool items = pickerState.Items;
bool statics = pickerState.Statics;
bool range = pickerState.Range;
sbyte min = pickerState.Min;
sbyte max = pickerState.Max;
var name = pickerState.Name;
var ns = pickerState.Namespace;
var items = pickerState.Items;
var statics = pickerState.Statics;
var range = pickerState.Range;
var min = pickerState.Min;
var max = pickerState.Max;
// Get center
Point3D center = new Point3D();
var center = new Point3D();
center.Z = 127;
int x1 = bounds.End.X;
int y1 = bounds.End.Y;
int x2 = bounds.Start.X;
int y2 = bounds.Start.Y;
var x1 = bounds.End.X;
var y1 = bounds.End.Y;
var x2 = bounds.Start.X;
var y2 = bounds.Start.Y;
Dictionary<Point2D, List<StaticTile>> tiles = new Dictionary<Point2D, List<StaticTile>>();
var tiles = new Dictionary<Point2D, List<StaticTile>>();
if (statics)
{
for (int x = start.X; x <= end.X; x++)
for (var x = start.X; x <= end.X; x++)
{
for (int y = start.Y; y <= end.Y; y++)
for (var y = start.Y; y <= end.Y; y++)
{
TileMatrix tileMatrix = map.Tiles;
var tileMatrix = map.Tiles;
List<StaticTile> list = [];
if (items)
{
foreach (Item item in map.GetItemsAt(x, y))
foreach (var item in map.GetItemsAt(x, y))
{
if (range && item.Z >= min && item.Z <= max)
{
@ -174,7 +174,7 @@ public class AddonGenerator
using var target = PooledRefList<Item>.Create();
foreach (Static s in map.GetItemsInBounds<Static>(bounds))
foreach (var s in map.GetItemsInBounds<Static>(bounds))
{
if (!range || s.Z >= min && s.Z <= max)
{
@ -189,7 +189,7 @@ public class AddonGenerator
}
// Get correct bounds
foreach (Item item in target)
foreach (var item in target)
{
if (item.Z < center.Z)
{
@ -202,11 +202,11 @@ public class AddonGenerator
y2 = Math.Max(y2, item.Y);
}
foreach (Point2D p in tiles.Keys)
foreach (var p in tiles.Keys)
{
List<StaticTile> list = tiles[p];
var list = tiles[p];
foreach (StaticTile t in list)
foreach (var t in list)
{
if (t.Z < center.Z)
{
@ -225,27 +225,27 @@ public class AddonGenerator
using var sb = ValueStringBuilder.Create();
foreach (Point2D p in tiles.Keys)
foreach (var p in tiles.Keys)
{
List<StaticTile> list = tiles[p];
var list = tiles[p];
int xOffset = p.X - center.X;
int yOffset = p.Y - center.Y;
var xOffset = p.X - center.X;
var yOffset = p.Y - center.Y;
foreach (StaticTile t in list)
foreach (var t in list)
{
int zOffset = t.Z - center.Z;
int id = t.ID - 16384;
var zOffset = t.Z - center.Z;
var id = t.ID - 16384;
sb.Append($" AddComponent(new AddonComponent({id}), {xOffset}, {yOffset}, {zOffset});\n");
}
}
foreach (Item item in target)
foreach (var item in target)
{
int xOffset = item.X - center.X;
int yOffset = item.Y - center.Y;
int zOffset = item.Z - center.Z;
var xOffset = item.X - center.X;
var yOffset = item.Y - center.Y;
var zOffset = item.Z - center.Z;
var light = (item.ItemData.Flags & TileFlag.LightSource) == TileFlag.LightSource ? item.Light : LightType.Empty;
var hue = item.Hue;
@ -275,13 +275,13 @@ public class AddonGenerator
sb.Append(" )\n");
}
string output = _template.Replace("{name}", name);
var output = _template.Replace("{name}", name);
output = output.Replace("{namespace}", ns);
output = output.Replace("{components}", sb.ToString());
var path = Path.Combine(_outputDirectory, $"{name}Addon.cs");
string folder = Path.GetDirectoryName(path);
var folder = Path.GetDirectoryName(path);
PathUtility.EnsureDirectory(folder);
using var writer = new StreamWriter(path, false);
@ -374,13 +374,13 @@ public class AddonGenerator
var fail = !_state.Items && !_state.Statics;
if (!sbyte.TryParse(info.GetTextEntry(2), out sbyte min))
if (!sbyte.TryParse(info.GetTextEntry(2), out var min))
{
min = sbyte.MinValue;
fail = true;
}
if (!sbyte.TryParse(info.GetTextEntry(3), out sbyte max))
if (!sbyte.TryParse(info.GetTextEntry(3), out var max))
{
max = sbyte.MaxValue;
fail = true;