From b8dbdb9ff4061577851e7ef87780c60b4bd4dab0 Mon Sep 17 00:00:00 2001 From: Lucas Nicodemus Date: Wed, 19 Apr 2017 17:41:15 -0600 Subject: [PATCH] Final batch of .name changes --- TShockAPI/GetDataHandlers.cs | 18 +++++++++--------- TShockAPI/Rest/RestManager.cs | 4 ++-- TShockAPI/TSPlayer.cs | 2 +- TShockAPI/Utils.cs | 22 +++++++++++----------- 4 files changed, 23 insertions(+), 23 deletions(-) diff --git a/TShockAPI/GetDataHandlers.cs b/TShockAPI/GetDataHandlers.cs index a1677ae3..62107f3b 100644 --- a/TShockAPI/GetDataHandlers.cs +++ b/TShockAPI/GetDataHandlers.cs @@ -2149,7 +2149,7 @@ namespace TShockAPI args.Player.SendErrorMessage("You do not have permission to place actuators."); return true; } - if (TShock.Itembans.ItemIsBanned(selectedItem.name, args.Player) || editData >= (action == EditAction.PlaceTile ? Main.maxTileSets : Main.maxWallTypes)) + if (TShock.Itembans.ItemIsBanned(selectedItem.Name, args.Player) || editData >= (action == EditAction.PlaceTile ? Main.maxTileSets : Main.maxWallTypes)) { args.Player.SendTileSquare(tileX, tileY, 4); return true; @@ -2608,7 +2608,7 @@ namespace TShockAPI if (control[5]) { - string itemName = args.TPlayer.inventory[item].name; + string itemName = args.TPlayer.inventory[item].Name; if (TShock.Itembans.ItemIsBanned(itemName, args.Player)) { control[5] = false; @@ -2616,19 +2616,19 @@ namespace TShockAPI args.Player.SendErrorMessage("You cannot use {0} on this server. Your actions are being ignored.", itemName); } - if (args.TPlayer.inventory[item].name == "Mana Crystal" && args.Player.TPlayer.statManaMax <= 180) + if (args.TPlayer.inventory[item].Name == "Mana Crystal" && args.Player.TPlayer.statManaMax <= 180) { args.Player.TPlayer.statMana += 20; args.Player.TPlayer.statManaMax += 20; args.Player.PlayerData.maxMana += 20; } - else if (args.TPlayer.inventory[item].name == "Life Crystal" && args.Player.TPlayer.statLifeMax <= 380) + else if (args.TPlayer.inventory[item].Name == "Life Crystal" && args.Player.TPlayer.statLifeMax <= 380) { args.TPlayer.statLife += 20; args.TPlayer.statLifeMax += 20; args.Player.PlayerData.maxHealth += 20; } - else if (args.TPlayer.inventory[item].name == "Life Fruit" && args.Player.TPlayer.statLifeMax >= 400 && args.Player.TPlayer.statLifeMax <= 495) + else if (args.TPlayer.inventory[item].Name == "Life Fruit" && args.Player.TPlayer.statLifeMax >= 400 && args.Player.TPlayer.statLifeMax <= 495) { args.TPlayer.statLife += 5; args.TPlayer.statLifeMax += 5; @@ -3330,7 +3330,7 @@ namespace TShockAPI Item item = new Item(); item.netDefaults(type); - if (stacks > item.maxStack || TShock.Itembans.ItemIsBanned(item.name, args.Player)) + if (stacks > item.maxStack || TShock.Itembans.ItemIsBanned(item.Name, args.Player)) { return false; } @@ -3510,7 +3510,7 @@ namespace TShockAPI Item item = new Item(); item.netDefaults(type); - if ((stacks > item.maxStack || stacks <= 0) || (TShock.Itembans.ItemIsBanned(item.name, args.Player) && !args.Player.HasPermission(Permissions.allowdroppingbanneditems))) + if ((stacks > item.maxStack || stacks <= 0) || (TShock.Itembans.ItemIsBanned(item.Name, args.Player) && !args.Player.HasPermission(Permissions.allowdroppingbanneditems))) { args.Player.SendData(PacketTypes.ItemDrop, "", id); return true; @@ -3518,7 +3518,7 @@ namespace TShockAPI if ((Main.ServerSideCharacter) && (DateTime.Now.Ticks / TimeSpan.TicksPerMillisecond - args.Player.LoginMS < TShock.ServerSideCharacterConfig.LogonDiscardThreshold)) { //Player is probably trying to sneak items onto the server in their hands!!! - TShock.Log.ConsoleInfo("Player {0} tried to sneak {1} onto the server!", args.Player.Name, item.name); + TShock.Log.ConsoleInfo("Player {0} tried to sneak {1} onto the server!", args.Player.Name, item.Name); args.Player.SendData(PacketTypes.ItemDrop, "", id); return true; @@ -3932,7 +3932,7 @@ namespace TShockAPI boss = "a Goblin Invasion"; break; default: - boss = String.Format("the {0}", npc.name); + boss = String.Format("the {0}", npc.FullName); break; } if (TShock.Config.AnonymousBossInvasions) diff --git a/TShockAPI/Rest/RestManager.cs b/TShockAPI/Rest/RestManager.cs index dfae9256..acc34661 100644 --- a/TShockAPI/Rest/RestManager.cs +++ b/TShockAPI/Rest/RestManager.cs @@ -940,9 +940,9 @@ namespace TShockAPI {"registered", player.User?.Registered}, {"muted", player.mute }, {"position", player.TileX + "," + player.TileY}, - {"inventory", string.Join(", ", inventory.Select(p => (p.name + ":" + p.stack)))}, + {"inventory", string.Join(", ", inventory.Select(p => (p.Name + ":" + p.stack)))}, {"armor", string.Join(", ", equipment.Select(p => (p.netID + ":" + p.prefix)))}, - {"dyes", string.Join(", ", dyes.Select(p => (p.name)))}, + {"dyes", string.Join(", ", dyes.Select(p => (p.Name)))}, {"buffs", string.Join(", ", player.TPlayer.buffType)} }; } diff --git a/TShockAPI/TSPlayer.cs b/TShockAPI/TSPlayer.cs index 01d7ca54..26aee199 100644 --- a/TShockAPI/TSPlayer.cs +++ b/TShockAPI/TSPlayer.cs @@ -565,7 +565,7 @@ namespace TShockAPI { for (int i = 0; i < 50; i++) //51 is trash can, 52-55 is coins, 56-59 is ammo { - if (TPlayer.inventory[i] == null || !TPlayer.inventory[i].active || TPlayer.inventory[i].name == "") + if (TPlayer.inventory[i] == null || !TPlayer.inventory[i].active || TPlayer.inventory[i].Name == "") { flag = true; break; diff --git a/TShockAPI/Utils.cs b/TShockAPI/Utils.cs index fd680370..3da5c92e 100644 --- a/TShockAPI/Utils.cs +++ b/TShockAPI/Utils.cs @@ -348,11 +348,11 @@ namespace TShockAPI for (int i = -48; i < Main.maxItemTypes; i++) { item.netDefaults(i); - if (String.IsNullOrWhiteSpace(item.name)) + if (String.IsNullOrWhiteSpace(item.Name)) continue; - if (item.name.ToLower() == nameLower) + if (item.Name.ToLower() == nameLower) return new List { item }; - if (item.name.ToLower().StartsWith(nameLower)) + if (item.Name.ToLower().StartsWith(nameLower)) found.Add(item.Clone()); } return found; @@ -420,9 +420,9 @@ namespace TShockAPI for (int i = -17; i < Main.maxNPCTypes; i++) { npc.netDefaults(i); - if (npc.name.ToLower() == nameLower || npc.displayName.ToLower() == nameLower) + if (npc.FullName.ToLower() == nameLower || npc.TypeName.ToLower() == nameLower) return new List { npc }; - if (npc.name.ToLower().StartsWith(nameLower) || npc.displayName.ToLower().StartsWith(nameLower)) + if (npc.FullName.ToLower().StartsWith(nameLower) || npc.TypeName.ToLower().StartsWith(nameLower)) found.Add((NPC)npc.Clone()); } return found; @@ -1248,10 +1248,10 @@ namespace TShockAPI { Item item = new Item(); item.netDefaults(i); - if (!String.IsNullOrEmpty(item.name)) + if (!String.IsNullOrEmpty(item.Name)) { object[] element = new object[] { i, - newLine.Replace(item.name, @" "), + newLine.Replace(item.Name, @" "), newLine.Replace(item.toolTip, @" "), newLine.Replace(item.toolTip2, @" ") }; @@ -1288,9 +1288,9 @@ namespace TShockAPI { NPC npc = new NPC(); npc.netDefaults(i); - if (!String.IsNullOrEmpty(npc.name)) + if (!String.IsNullOrEmpty(npc.FullName)) { - object[] element = new object[] { i, npc.name, npc.displayName }; + object[] element = new object[] { i, npc.FullName, npc.displayName }; elements.Add(element); } } @@ -1324,9 +1324,9 @@ namespace TShockAPI { Projectile projectile = new Projectile(); projectile.SetDefaults(i); - if (!String.IsNullOrEmpty(projectile.name)) + if (!String.IsNullOrEmpty(projectile.Name)) { - object[] element = new object[] { i, projectile.name }; + object[] element = new object[] { i, projectile.Name }; elements.Add(element); } }