themaster1970sf/TShock
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

i18n most texts

Browse source
This commit is contained in:
SGKoishi 2022-10-24 21:16:28 -07:00
parent d1a6c293f2
commit f8c0f0ce15
No known key found for this signature in database
GPG key ID: 8FFC399070653828
7 changed files with 380 additions and 351 deletions
Download patch file Download diff file Expand all files Collapse all files

599
TShockAPI/Commands.cs
View file

File diff suppressed because it is too large Load diff

106
TShockAPI/GetDataHandlers.cs
View file

@ -1066,7 +1066,7 @@ namespace TShockAPI
/// The Terraria ID of the player talking to the NPC /// The Terraria ID of the player talking to the NPC
/// </summary> /// </summary>
public byte PlayerId { get; set; } public byte PlayerId { get; set; }
/// <summary> /// <summary>
/// The NPC ID of the NPC the player is talking to /// The NPC ID of the NPC the player is talking to
/// </summary> /// </summary>
@ -1089,8 +1089,8 @@ namespace TShockAPI
}; };
NpcTalk.Invoke(null, args); NpcTalk.Invoke(null, args);
return args.Handled; return args.Handled;
} }
/// <summary> /// <summary>
/// For use with a PlayerAnimation event /// For use with a PlayerAnimation event
/// </summary> /// </summary>
@ -1304,7 +1304,7 @@ namespace TShockAPI
TileX = tilex, TileX = tilex,
TileY = tiley, TileY = tiley,
Amount = amount, Amount = amount,
Type = (LiquidType) type, Type = (LiquidType)type,
}; };
LiquidSet.Invoke(null, args); LiquidSet.Invoke(null, args);
return args.Handled; return args.Handled;
@ -1496,7 +1496,7 @@ namespace TShockAPI
ID = id, ID = id,
X = x, X = x,
Y = y, Y = y,
HouseholdStatus = (HouseholdStatus) houseHoldStatus, HouseholdStatus = (HouseholdStatus)houseHoldStatus,
}; };
NPCHome.Invoke(null, args); NPCHome.Invoke(null, args);
return args.Handled; return args.Handled;
@ -1706,7 +1706,7 @@ namespace TShockAPI
var args = new ReleaseNpcEventArgs var args = new ReleaseNpcEventArgs
{ {
Player = player, Player = player,
Data = data, Data = data,
X = _x, X = _x,
Y = _y, Y = _y,
Type = _type, Type = _type,
@ -1714,8 +1714,8 @@ namespace TShockAPI
}; };
ReleaseNPC.Invoke(null, args); ReleaseNPC.Invoke(null, args);
return args.Handled; return args.Handled;
} }
/// <summary>The arguments to the PlaceObject hook.</summary> /// <summary>The arguments to the PlaceObject hook.</summary>
public class PlaceObjectEventArgs : GetDataHandledEventArgs public class PlaceObjectEventArgs : GetDataHandledEventArgs
{ {
@ -2254,7 +2254,7 @@ namespace TShockAPI
/// Called when a player lands a golf ball in a cup. /// Called when a player lands a golf ball in a cup.
/// </summary> /// </summary>
public static HandlerList<LandGolfBallInCupEventArgs> LandGolfBallInCup = new HandlerList<LandGolfBallInCupEventArgs>(); public static HandlerList<LandGolfBallInCupEventArgs> LandGolfBallInCup = new HandlerList<LandGolfBallInCupEventArgs>();
private static bool OnLandGolfBallInCup(TSPlayer player, MemoryStream data, byte playerIndex, ushort tileX, ushort tileY, ushort hits, ushort projectileType ) private static bool OnLandGolfBallInCup(TSPlayer player, MemoryStream data, byte playerIndex, ushort tileX, ushort tileY, ushort hits, ushort projectileType)
{ {
if (LandGolfBallInCup == null) if (LandGolfBallInCup == null)
return false; return false;
@ -2476,7 +2476,7 @@ namespace TShockAPI
for (int i = 0; i < 8; i++) for (int i = 0; i < 8; i++)
args.Player.TPlayer.hideVisibleAccessory[i] = hideVisual[i]; args.Player.TPlayer.hideVisibleAccessory[i] = hideVisual[i];
for (int i = 0; i < 2; i++) for (int i = 0; i < 2; i++)
args.Player.TPlayer.hideVisibleAccessory[i+8] = hideVisual2[i]; args.Player.TPlayer.hideVisibleAccessory[i + 8] = hideVisual2[i];
args.Player.TPlayer.hideMisc = hideMisc; args.Player.TPlayer.hideMisc = hideMisc;
args.Player.TPlayer.extraAccessory = extraSlot; args.Player.TPlayer.extraAccessory = extraSlot;
args.Player.TPlayer.UsingBiomeTorches = usingBiomeTorches; args.Player.TPlayer.UsingBiomeTorches = usingBiomeTorches;
@ -2528,7 +2528,7 @@ namespace TShockAPI
} }
if (OnPlayerSlot(args.Player, args.Data, plr, slot, stack, prefix, type) || plr != args.Player.Index || slot < 0 || if (OnPlayerSlot(args.Player, args.Data, plr, slot, stack, prefix, type) || plr != args.Player.Index || slot < 0 ||
slot > NetItem.MaxInventory) slot > NetItem.MaxInventory)
return true; return true;
if (args.Player.IgnoreSSCPackets) if (args.Player.IgnoreSSCPackets)
{ {
@ -2547,7 +2547,7 @@ namespace TShockAPI
args.Player.PlayerData.StoreSlot(slot, type, prefix, stack); args.Player.PlayerData.StoreSlot(slot, type, prefix, stack);
} }
else if (Main.ServerSideCharacter && TShock.Config.Settings.DisableLoginBeforeJoin && !bypassTrashCanCheck && else if (Main.ServerSideCharacter && TShock.Config.Settings.DisableLoginBeforeJoin && !bypassTrashCanCheck &&
args.Player.HasSentInventory && !args.Player.HasPermission(Permissions.bypassssc)) args.Player.HasSentInventory && !args.Player.HasPermission(Permissions.bypassssc))
{ {
// The player might have moved an item to their trash can before they performed a single login attempt yet. // The player might have moved an item to their trash can before they performed a single login attempt yet.
args.Player.IsDisabledPendingTrashRemoval = true; args.Player.IsDisabledPendingTrashRemoval = true;
@ -2597,7 +2597,7 @@ namespace TShockAPI
{ {
if (args.Player.PlayerData.exists && TShock.ServerSideCharacterConfig.Settings.WarnPlayersAboutBypassPermission) if (args.Player.PlayerData.exists && TShock.ServerSideCharacterConfig.Settings.WarnPlayersAboutBypassPermission)
{ {
args.Player.SendWarningMessage("Bypass SSC is enabled for your account. SSC data will not be loaded or saved."); args.Player.SendWarningMessage(GetString("Bypass SSC is enabled for your account. SSC data will not be loaded or saved."));
TShock.Log.ConsoleInfo(args.Player.Name + " has SSC data in the database, but has the tshock.ignore.ssc permission. This means their SSC data is being ignored."); TShock.Log.ConsoleInfo(args.Player.Name + " has SSC data in the database, but has the tshock.ignore.ssc permission. This means their SSC data is being ignored.");
TShock.Log.ConsoleInfo("You may wish to consider removing the tshock.ignore.ssc permission or negating it for this player."); TShock.Log.ConsoleInfo("You may wish to consider removing the tshock.ignore.ssc permission or negating it for this player.");
} }
@ -2614,8 +2614,8 @@ namespace TShockAPI
if (args.Player.HasPermission(Permissions.usebanneditem)) if (args.Player.HasPermission(Permissions.usebanneditem))
args.Player.IsDisabledForBannedWearable = false; args.Player.IsDisabledForBannedWearable = false;
args.Player.SendSuccessMessage("Authenticated as " + account.Name + " successfully."); args.Player.SendSuccessMessage(GetString($"Authenticated as {account.Name} successfully."));
TShock.Log.ConsoleInfo(args.Player.Name + " authenticated successfully as user " + args.Player.Name + "."); TShock.Log.ConsoleInfo($"{args.Player.Name} authenticated successfully as user {args.Player.Name}.");
Hooks.PlayerHooks.OnPlayerPostLogin(args.Player); Hooks.PlayerHooks.OnPlayerPostLogin(args.Player);
return true; return true;
} }
@ -2645,7 +2645,7 @@ namespace TShockAPI
return true; return true;
if (TShock.Utils.GetActivePlayerCount() + 1 > TShock.Config.Settings.MaxSlots && if (TShock.Utils.GetActivePlayerCount() + 1 > TShock.Config.Settings.MaxSlots &&
!args.Player.HasPermission(Permissions.reservedslot)) !args.Player.HasPermission(Permissions.reservedslot))
{ {
TShock.Log.ConsoleDebug("GetDataHandlers / HandleGetSection rejected reserve slot"); TShock.Log.ConsoleDebug("GetDataHandlers / HandleGetSection rejected reserve slot");
args.Player.Kick(TShock.Config.Settings.ServerFullReason, true, true); args.Player.Kick(TShock.Config.Settings.ServerFullReason, true, true);
@ -2777,7 +2777,7 @@ namespace TShockAPI
short tileY = args.Data.ReadInt16(); short tileY = args.Data.ReadInt16();
short editData = args.Data.ReadInt16(); short editData = args.Data.ReadInt16();
EditType type = (action == EditAction.KillTile || action == EditAction.KillWall || EditType type = (action == EditAction.KillTile || action == EditAction.KillWall ||
action == EditAction.KillTileNoItem || action == EditAction.TryKillTile) action == EditAction.KillTileNoItem || action == EditAction.TryKillTile)
? EditType.Fail ? EditType.Fail
: (action == EditAction.PlaceTile || action == EditAction.PlaceWall || action == EditAction.ReplaceTile || action == EditAction.ReplaceWall) : (action == EditAction.PlaceTile || action == EditAction.PlaceWall || action == EditAction.ReplaceTile || action == EditAction.ReplaceWall)
? EditType.Type ? EditType.Type
@ -2819,8 +2819,8 @@ namespace TShockAPI
if (tileType != TileID.ClosedDoor && tileType != TileID.OpenDoor if (tileType != TileID.ClosedDoor && tileType != TileID.OpenDoor
&& tileType != TileID.TallGateClosed && tileType != TileID.TallGateOpen && tileType != TileID.TallGateClosed && tileType != TileID.TallGateOpen
&& tileType != TileID.TrapdoorClosed && tileType != TileID.TrapdoorOpen) && tileType != TileID.TrapdoorClosed && tileType != TileID.TrapdoorOpen)
{ {
TShock.Log.ConsoleDebug("GetDataHandlers / HandleDoorUse rejected door gap check {0}", args.Player.Name); TShock.Log.ConsoleDebug("GetDataHandlers / HandleDoorUse rejected door gap check {0}", args.Player.Name);
return true; return true;
@ -2938,17 +2938,17 @@ namespace TShockAPI
if (Main.npc[id].townNPC && !args.Player.HasPermission(Permissions.hurttownnpc)) if (Main.npc[id].townNPC && !args.Player.HasPermission(Permissions.hurttownnpc))
{ {
args.Player.SendErrorMessage("You do not have permission to hurt Town NPCs."); args.Player.SendErrorMessage(GetString("You do not have permission to hurt Town NPCs."));
args.Player.SendData(PacketTypes.NpcUpdate, "", id); args.Player.SendData(PacketTypes.NpcUpdate, "", id);
TShock.Log.ConsoleDebug($"GetDataHandlers / HandleNpcStrike rejected npc strike {args.Player.Name}"); TShock.Log.ConsoleDebug($"GetDataHandlers / HandleNpcStrike rejected npc strike {args.Player.Name}");
return true; return true;
} }
if (Main.npc[id].netID == NPCID.EmpressButterfly) if (Main.npc[id].netID == NPCID.EmpressButterfly)
{ {
if (!args.Player.HasPermission(Permissions.summonboss)) if (!args.Player.HasPermission(Permissions.summonboss))
{ {
args.Player.SendErrorMessage("You do not have permission to summon the Empress of Light."); args.Player.SendErrorMessage(GetString("You do not have permission to summon the Empress of Light."));
args.Player.SendData(PacketTypes.NpcUpdate, "", id); args.Player.SendData(PacketTypes.NpcUpdate, "", id);
TShock.Log.ConsoleDebug($"GetDataHandlers / HandleNpcStrike rejected EoL summon from {args.Player.Name}"); TShock.Log.ConsoleDebug($"GetDataHandlers / HandleNpcStrike rejected EoL summon from {args.Player.Name}");
return true; return true;
@ -2960,12 +2960,12 @@ namespace TShockAPI
else else
TShock.Utils.SendLogs(GetString($"{args.Player.Name} summoned the Empress of Light!"), Color.PaleVioletRed, args.Player); TShock.Utils.SendLogs(GetString($"{args.Player.Name} summoned the Empress of Light!"), Color.PaleVioletRed, args.Player);
} }
if (Main.npc[id].netID == NPCID.CultistDevote || Main.npc[id].netID == NPCID.CultistArcherBlue) if (Main.npc[id].netID == NPCID.CultistDevote || Main.npc[id].netID == NPCID.CultistArcherBlue)
{ {
if (!args.Player.HasPermission(Permissions.summonboss)) if (!args.Player.HasPermission(Permissions.summonboss))
{ {
args.Player.SendErrorMessage("You do not have permission to summon the Lunatic Cultist!"); args.Player.SendErrorMessage(GetString("You do not have permission to summon the Lunatic Cultist!"));
args.Player.SendData(PacketTypes.NpcUpdate, "", id); args.Player.SendData(PacketTypes.NpcUpdate, "", id);
TShock.Log.ConsoleDebug($"GetDataHandlers / HandleNpcStrike rejected Cultist summon from {args.Player.Name}"); TShock.Log.ConsoleDebug($"GetDataHandlers / HandleNpcStrike rejected Cultist summon from {args.Player.Name}");
return true; return true;
@ -2986,7 +2986,7 @@ namespace TShockAPI
return true; return true;
} }
short type = (short) Main.projectile[index].type; short type = (short)Main.projectile[index].type;
// TODO: This needs to be moved somewhere else. // TODO: This needs to be moved somewhere else.
@ -3189,7 +3189,7 @@ namespace TShockAPI
args.Player.IsDisabledForBannedWearable = false; args.Player.IsDisabledForBannedWearable = false;
args.Player.SendMessage("Authenticated as " + args.Player.Name + " successfully.", Color.LimeGreen); args.Player.SendMessage(GetString("Authenticated as " + args.Player.Name + " successfully."), Color.LimeGreen);
TShock.Log.ConsoleInfo(args.Player.Name + " authenticated successfully as user " + args.Player.Name + "."); TShock.Log.ConsoleInfo(args.Player.Name + " authenticated successfully as user " + args.Player.Name + ".");
TShock.UserAccounts.SetUserAccountUUID(account, args.Player.UUID); TShock.UserAccounts.SetUserAccountUUID(account, args.Player.UUID);
Hooks.PlayerHooks.OnPlayerPostLogin(args.Player); Hooks.PlayerHooks.OnPlayerPostLogin(args.Player);
@ -3224,7 +3224,7 @@ namespace TShockAPI
if (OnNpcTalk(args.Player, args.Data, plr, npc)) if (OnNpcTalk(args.Player, args.Data, plr, npc))
return true; return true;
//Rejecting player who trying to talk to a npc if player were disabled, mainly for unregistered and logged out players. Preventing smuggling or duplicating their items if player put it in a npc's item slot //Rejecting player who trying to talk to a npc if player were disabled, mainly for unregistered and logged out players. Preventing smuggling or duplicating their items if player put it in a npc's item slot
if (args.Player.IsBeingDisabled()) if (args.Player.IsBeingDisabled())
{ {
@ -3405,7 +3405,7 @@ namespace TShockAPI
if (type == 1 && TShock.Config.Settings.DisableDungeonGuardian) if (type == 1 && TShock.Config.Settings.DisableDungeonGuardian)
{ {
TShock.Log.ConsoleDebug("GetDataHandlers / HandleSpecial rejected type 1 for {0}", args.Player.Name); TShock.Log.ConsoleDebug("GetDataHandlers / HandleSpecial rejected type 1 for {0}", args.Player.Name);
args.Player.SendMessage("The Dungeon Guardian returned you to your spawn point.", Color.Purple); args.Player.SendMessage(GetString("The Dungeon Guardian returned you to your spawn point."), Color.Purple);
args.Player.Spawn(PlayerSpawnContext.RecallFromItem); args.Player.Spawn(PlayerSpawnContext.RecallFromItem);
return true; return true;
} }
@ -3415,7 +3415,7 @@ namespace TShockAPI
if (!args.Player.HasPermission(Permissions.usesundial)) if (!args.Player.HasPermission(Permissions.usesundial))
{ {
TShock.Log.ConsoleDebug($"GetDataHandlers / HandleSpecial rejected enchanted sundial permission {args.Player.Name}"); TShock.Log.ConsoleDebug($"GetDataHandlers / HandleSpecial rejected enchanted sundial permission {args.Player.Name}");
args.Player.SendErrorMessage("You do not have permission to use the Enchanted Sundial."); args.Player.SendErrorMessage(GetString("You do not have permission to use the Enchanted Sundial."));
return true; return true;
} }
else if (TShock.Config.Settings.ForceTime != "normal") else if (TShock.Config.Settings.ForceTime != "normal")
@ -3423,10 +3423,10 @@ namespace TShockAPI
TShock.Log.ConsoleDebug($"GetDataHandlers / HandleSpecial rejected enchanted sundial permission (ForceTime) {args.Player.Name}"); TShock.Log.ConsoleDebug($"GetDataHandlers / HandleSpecial rejected enchanted sundial permission (ForceTime) {args.Player.Name}");
if (!args.Player.HasPermission(Permissions.cfgreload)) if (!args.Player.HasPermission(Permissions.cfgreload))
{ {
args.Player.SendErrorMessage("You cannot use the Enchanted Sundial because time is stopped."); args.Player.SendErrorMessage(GetString("You cannot use the Enchanted Sundial because time is stopped."));
} }
else else
args.Player.SendErrorMessage("You must set ForceTime to normal via config to use the Enchanted Sundial."); args.Player.SendErrorMessage(GetString("You must set ForceTime to normal via config to use the Enchanted Sundial."));
return true; return true;
} }
} }
@ -3471,7 +3471,7 @@ namespace TShockAPI
if (!args.Player.HasPermission(Permissions.movenpc)) if (!args.Player.HasPermission(Permissions.movenpc))
{ {
TShock.Log.ConsoleDebug("GetDataHandlers / UpdateNPCHome rejected no permission {0}", args.Player.Name); TShock.Log.ConsoleDebug("GetDataHandlers / UpdateNPCHome rejected no permission {0}", args.Player.Name);
args.Player.SendErrorMessage("You do not have permission to relocate Town NPCs."); args.Player.SendErrorMessage(GetString("You do not have permission to relocate Town NPCs."));
args.Player.SendData(PacketTypes.UpdateNPCHome, "", id, Main.npc[id].homeTileX, Main.npc[id].homeTileY, args.Player.SendData(PacketTypes.UpdateNPCHome, "", id, Main.npc[id].homeTileX, Main.npc[id].homeTileY,
Convert.ToByte(Main.npc[id].homeless)); Convert.ToByte(Main.npc[id].homeless));
return true; return true;
@ -3498,21 +3498,21 @@ namespace TShockAPI
if (bosses.Contains(thingType) && !args.Player.HasPermission(Permissions.summonboss)) if (bosses.Contains(thingType) && !args.Player.HasPermission(Permissions.summonboss))
{ {
TShock.Log.ConsoleDebug("GetDataHandlers / HandleSpawnBoss rejected boss {0} {1}", args.Player.Name, thingType); TShock.Log.ConsoleDebug("GetDataHandlers / HandleSpawnBoss rejected boss {0} {1}", args.Player.Name, thingType);
args.Player.SendErrorMessage("You do not have permission to summon bosses."); args.Player.SendErrorMessage(GetString("You do not have permission to summon bosses."));
return true; return true;
} }
if (invasions.Contains(thingType) && !args.Player.HasPermission(Permissions.startinvasion)) if (invasions.Contains(thingType) && !args.Player.HasPermission(Permissions.startinvasion))
{ {
TShock.Log.ConsoleDebug("GetDataHandlers / HandleSpawnBoss rejected invasion {0} {1}", args.Player.Name, thingType); TShock.Log.ConsoleDebug("GetDataHandlers / HandleSpawnBoss rejected invasion {0} {1}", args.Player.Name, thingType);
args.Player.SendErrorMessage("You do not have permission to start invasions."); args.Player.SendErrorMessage(GetString("You do not have permission to start invasions."));
return true; return true;
} }
if (pets.Contains(thingType) && !args.Player.HasPermission(Permissions.spawnpets)) if (pets.Contains(thingType) && !args.Player.HasPermission(Permissions.spawnpets))
{ {
TShock.Log.ConsoleDebug("GetDataHandlers / HandleSpawnBoss rejected pet {0} {1}", args.Player.Name, thingType); TShock.Log.ConsoleDebug("GetDataHandlers / HandleSpawnBoss rejected pet {0} {1}", args.Player.Name, thingType);
args.Player.SendErrorMessage("You do not have permission to spawn pets."); args.Player.SendErrorMessage(GetString("You do not have permission to spawn pets."));
return true; return true;
} }
@ -3709,7 +3709,7 @@ namespace TShockAPI
if (type == 0 && !args.Player.HasPermission(Permissions.rod)) if (type == 0 && !args.Player.HasPermission(Permissions.rod))
{ {
TShock.Log.ConsoleDebug("GetDataHandlers / HandleTeleport rejected rod type {0} {1}", args.Player.Name, type); TShock.Log.ConsoleDebug("GetDataHandlers / HandleTeleport rejected rod type {0} {1}", args.Player.Name, type);
args.Player.SendErrorMessage("You do not have permission to teleport using items."); // Was going to write using RoD but Hook of Disonnance and Potion of Return both use the same teleport packet as RoD. args.Player.SendErrorMessage(GetString("You do not have permission to teleport using items.")); // Was going to write using RoD but Hook of Disonnance and Potion of Return both use the same teleport packet as RoD.
args.Player.Teleport(args.TPlayer.position.X, args.TPlayer.position.Y); // Suggest renaming rod permission unless someone plans to add separate perms for the other 2 tp items. args.Player.Teleport(args.TPlayer.position.X, args.TPlayer.position.Y); // Suggest renaming rod permission unless someone plans to add separate perms for the other 2 tp items.
return true; return true;
} }
@ -3733,7 +3733,7 @@ namespace TShockAPI
if (!args.Player.HasPermission(Permissions.wormhole)) if (!args.Player.HasPermission(Permissions.wormhole))
{ {
TShock.Log.ConsoleDebug("GetDataHandlers / HandleTeleport rejected p2p wormhole permission {0} {1}", args.Player.Name, type); TShock.Log.ConsoleDebug("GetDataHandlers / HandleTeleport rejected p2p wormhole permission {0} {1}", args.Player.Name, type);
args.Player.SendErrorMessage("You do not have permission to teleport using Wormhole Potions."); args.Player.SendErrorMessage(GetString("You do not have permission to teleport using Wormhole Potions."));
args.Player.Teleport(args.TPlayer.position.X, args.TPlayer.position.Y); args.Player.Teleport(args.TPlayer.position.X, args.TPlayer.position.Y);
return true; return true;
} }
@ -3765,8 +3765,8 @@ namespace TShockAPI
NetMessage.SendData((int)PacketTypes.NpcUpdate, -1, -1, NetworkText.Empty, npcID); NetMessage.SendData((int)PacketTypes.NpcUpdate, -1, -1, NetworkText.Empty, npcID);
return true; return true;
} }
if(args.Player.IsBeingDisabled()) if (args.Player.IsBeingDisabled())
{ {
TShock.Log.ConsoleDebug("GetDataHandlers / HandleCatchNpc rejected catch npc {0}", args.Player.Name); TShock.Log.ConsoleDebug("GetDataHandlers / HandleCatchNpc rejected catch npc {0}", args.Player.Name);
return true; return true;
@ -3781,15 +3781,15 @@ namespace TShockAPI
var y = args.Data.ReadInt32(); var y = args.Data.ReadInt32();
var type = args.Data.ReadInt16(); var type = args.Data.ReadInt16();
var style = args.Data.ReadInt8(); var style = args.Data.ReadInt8();
if (OnReleaseNpc(args.Player, args.Data, x, y, type, style)) if (OnReleaseNpc(args.Player, args.Data, x, y, type, style))
{ {
return true; return true;
} }
return false; return false;
} }
private static bool HandleTeleportationPotion(GetDataHandlerArgs args) private static bool HandleTeleportationPotion(GetDataHandlerArgs args)
{ {
var type = args.Data.ReadByte(); var type = args.Data.ReadByte();
@ -3797,14 +3797,14 @@ namespace TShockAPI
void Fail(string tpItem) void Fail(string tpItem)
{ {
TShock.Log.ConsoleDebug("GetDataHandlers / HandleTeleportationPotion rejected permissions {0} {1}", args.Player.Name, type); TShock.Log.ConsoleDebug("GetDataHandlers / HandleTeleportationPotion rejected permissions {0} {1}", args.Player.Name, type);
args.Player.SendErrorMessage("You do not have permission to teleport using {0}.", tpItem); args.Player.SendErrorMessage(GetString("You do not have permission to teleport using {0}.", tpItem));
} }
switch (type) switch (type)
{ {
case 0: // Teleportation Potion case 0: // Teleportation Potion
if (args.Player.ItemInHand.type != ItemID.TeleportationPotion && if (args.Player.ItemInHand.type != ItemID.TeleportationPotion &&
args.Player.SelectedItem.type != ItemID.TeleportationPotion) args.Player.SelectedItem.type != ItemID.TeleportationPotion)
{ {
TShock.Log.ConsoleDebug("GetDataHandlers / HandleTeleportationPotion rejected not holding the correct item {0} {1}", args.Player.Name, type); TShock.Log.ConsoleDebug("GetDataHandlers / HandleTeleportationPotion rejected not holding the correct item {0} {1}", args.Player.Name, type);
return true; return true;
@ -3931,7 +3931,7 @@ namespace TShockAPI
if (TShock.TileBans.TileIsBanned((short)TileID.LogicSensor, args.Player)) if (TShock.TileBans.TileIsBanned((short)TileID.LogicSensor, args.Player))
{ {
args.Player.SendTileSquareCentered(x, y, 1); args.Player.SendTileSquareCentered(x, y, 1);
args.Player.SendErrorMessage("You do not have permission to place Logic Sensors."); args.Player.SendErrorMessage(GetString("You do not have permission to place Logic Sensors."));
return true; return true;
} }
@ -3987,7 +3987,7 @@ namespace TShockAPI
} }
var distanceFromCoinPacketToNpc = Utils.Distance(position, npc.position); var distanceFromCoinPacketToNpc = Utils.Distance(position, npc.position);
if (distanceFromCoinPacketToNpc >= (5*16f)) //5 tile range if (distanceFromCoinPacketToNpc >= (5 * 16f)) //5 tile range
{ {
TShock.Log.ConsoleDebug("GetDataHandlers / HandleSyncExtraValue rejected range check {0},{1} vs {2},{3} which is {4}", npc.position.X, npc.position.Y, position.X, position.Y, distanceFromCoinPacketToNpc); TShock.Log.ConsoleDebug("GetDataHandlers / HandleSyncExtraValue rejected range check {0},{1} vs {2},{3} which is {4}", npc.position.X, npc.position.Y, position.X, position.Y, distanceFromCoinPacketToNpc);
return true; return true;
@ -4043,7 +4043,7 @@ namespace TShockAPI
if (projectile == null || !projectile.active) if (projectile == null || !projectile.active)
{ {
TShock.Log.ConsoleDebug("GetDataHandlers / HandleNpcTeleportPortal rejected null check {0}", args.Player.Name); TShock.Log.ConsoleDebug("GetDataHandlers / HandleNpcTeleportPortal rejected null check {0}", args.Player.Name);
NetMessage.SendData((int)PacketTypes.NpcUpdate, -1, -1, NetworkText.Empty, npcIndex); NetMessage.SendData((int)PacketTypes.NpcUpdate, -1, -1, NetworkText.Empty, npcIndex);
return true; return true;
} }
@ -4091,7 +4091,7 @@ namespace TShockAPI
if (args.Player != null && !args.Player.HasPermission(Permissions.toggleparty)) if (args.Player != null && !args.Player.HasPermission(Permissions.toggleparty))
{ {
TShock.Log.ConsoleDebug("GetDataHandlers / HandleToggleParty rejected no party {0}", args.Player.Name); TShock.Log.ConsoleDebug("GetDataHandlers / HandleToggleParty rejected no party {0}", args.Player.Name);
args.Player.SendErrorMessage("You do not have permission to start a party."); args.Player.SendErrorMessage(GetString("You do not have permission to start a party."));
return true; return true;
} }
@ -4109,7 +4109,7 @@ namespace TShockAPI
if (!args.Player.HasPermission(Permissions.startdd2)) if (!args.Player.HasPermission(Permissions.startdd2))
{ {
TShock.Log.ConsoleDebug("GetDataHandlers / HandleOldOnesArmy rejected permissions {0}", args.Player.Name); TShock.Log.ConsoleDebug("GetDataHandlers / HandleOldOnesArmy rejected permissions {0}", args.Player.Name);
args.Player.SendErrorMessage("You do not have permission to start the Old One's Army."); args.Player.SendErrorMessage(GetString("You do not have permission to start the Old One's Army."));
return true; return true;
} }
@ -4190,14 +4190,14 @@ namespace TShockAPI
if (TShock.CharacterDB.RemovePlayer(args.Player.Account.ID)) if (TShock.CharacterDB.RemovePlayer(args.Player.Account.ID))
{ {
TShock.Log.ConsoleDebug("GetDataHandlers / HandlePlayerKillMeV2 ssc delete {0} {1}", args.Player.Name, args.TPlayer.difficulty); TShock.Log.ConsoleDebug("GetDataHandlers / HandlePlayerKillMeV2 ssc delete {0} {1}", args.Player.Name, args.TPlayer.difficulty);
args.Player.SendErrorMessage("You have fallen in hardcore mode, and your items have been lost forever."); args.Player.SendErrorMessage(GetString("You have fallen in hardcore mode, and your items have been lost forever."));
TShock.CharacterDB.SeedInitialData(args.Player.Account); TShock.CharacterDB.SeedInitialData(args.Player.Account);
} }
} }
return false; return false;
} }
private static bool HandleEmoji(GetDataHandlerArgs args) private static bool HandleEmoji(GetDataHandlerArgs args)
{ {
byte playerIndex = args.Data.ReadInt8(); byte playerIndex = args.Data.ReadInt8();
@ -4289,7 +4289,7 @@ namespace TShockAPI
int coinsValue = args.Data.ReadInt32(); int coinsValue = args.Data.ReadInt32();
float baseValue = args.Data.ReadSingle(); float baseValue = args.Data.ReadSingle();
bool spawnedFromStatus = args.Data.ReadBoolean(); bool spawnedFromStatus = args.Data.ReadBoolean();
return false; return false;
} }
@ -4594,7 +4594,7 @@ namespace TShockAPI
{TileID.Crystals, 17}, {TileID.Crystals, 17},
{TileID.MinecartTrack, 3} {TileID.MinecartTrack, 3}
}; };
/// <summary> /// <summary>
/// Contains brief information about a projectile /// Contains brief information about a projectile
/// </summary> /// </summary>

4
TShockAPI/ItemBans.cs
View file

@ -199,7 +199,7 @@ namespace TShockAPI
if (args.Player.TPlayer.autoActuator && DataModel.ItemIsBanned("Actuator", args.Player)) if (args.Player.TPlayer.autoActuator && DataModel.ItemIsBanned("Actuator", args.Player))
{ {
args.Player.SendTileSquareCentered(args.X, args.Y, 1); args.Player.SendTileSquareCentered(args.X, args.Y, 1);
args.Player.SendErrorMessage("You do not have permission to place actuators."); args.Player.SendErrorMessage(GetString("You do not have permission to place actuators."));
args.Handled = true; args.Handled = true;
return; return;
} }
@ -231,7 +231,7 @@ namespace TShockAPI
private void SendCorrectiveMessage(TSPlayer player, string itemName) private void SendCorrectiveMessage(TSPlayer player, string itemName)
{ {
player.SendErrorMessage("{0} is banned! Remove it!", itemName); player.SendErrorMessage(GetString("{0} is banned! Remove it!", itemName));
} }
} }
} }

2
TShockAPI/RegionHandler.cs
View file

@ -184,7 +184,7 @@ namespace TShockAPI
// Set temp point coordinates to current tile coordinates // Set temp point coordinates to current tile coordinates
player.TempPoints[player.AwaitingTempPoint - 1].X = e.X; player.TempPoints[player.AwaitingTempPoint - 1].X = e.X;
player.TempPoints[player.AwaitingTempPoint - 1].Y = e.Y; player.TempPoints[player.AwaitingTempPoint - 1].Y = e.Y;
player.SendInfoMessage($"Set temp point {player.AwaitingTempPoint}."); player.SendInfoMessage(GetString($"Set temp point {player.AwaitingTempPoint}."));
// Reset the awaiting temp point // Reset the awaiting temp point
player.AwaitingTempPoint = 0; player.AwaitingTempPoint = 0;

4
TShockAPI/SaveManager.cs
View file

@ -55,7 +55,7 @@ namespace TShockAPI
// These can be caused by an unexpected error such as a bad or out of date plugin // These can be caused by an unexpected error such as a bad or out of date plugin
try try
{ {
TShock.Utils.Broadcast("Saving world...", Color.Yellow); TShock.Utils.Broadcast(GetString("Saving world..."), Color.Yellow);
} }
catch (Exception ex) catch (Exception ex)
{ {
@ -132,7 +132,7 @@ namespace TShockAPI
WorldFile.SaveWorld(task.resetTime); WorldFile.SaveWorld(task.resetTime);
if (TShock.Config.Settings.AnnounceSave) if (TShock.Config.Settings.AnnounceSave)
TShock.Utils.Broadcast("World saved.", Color.Yellow); TShock.Utils.Broadcast(GetString("World saved."), Color.Yellow);
TShock.Log.Info(GetString("World saved at ({0})", Main.worldPathName)); TShock.Log.Info(GetString("World saved at ({0})", Main.worldPathName));
} }

10
TShockAPI/TSPlayer.cs
View file

@ -981,7 +981,7 @@ namespace TShockAPI
get get
{ {
return RealPlayer return RealPlayer
&& (Netplay.Clients[Index] != null && Netplay.Clients[Index].IsActive && !Netplay.Clients[Index].PendingTermination); && (Netplay.Clients[Index] != null && Netplay.Clients[Index].IsActive && !Netplay.Clients[Index].PendingTermination);
} }
} }
@ -1722,7 +1722,7 @@ namespace TShockAPI
Main.player[Index].team = team; Main.player[Index].team = team;
NetMessage.SendData((int)PacketTypes.PlayerTeam, -1, -1, NetworkText.Empty, Index); NetMessage.SendData((int)PacketTypes.PlayerTeam, -1, -1, NetworkText.Empty, Index);
} }
/// <summary> /// <summary>
/// Sets the player's pvp. /// Sets the player's pvp.
/// </summary> /// </summary>
@ -1838,12 +1838,12 @@ namespace TShockAPI
TShock.Bans.InsertBan($"{Identifier.Account}{Account.Name}", reason, adminUserName, DateTime.UtcNow, DateTime.MaxValue); TShock.Bans.InsertBan($"{Identifier.Account}{Account.Name}", reason, adminUserName, DateTime.UtcNow, DateTime.MaxValue);
} }
Disconnect(string.Format("Banned: {0}", reason)); Disconnect(GetString("Banned: {0}", reason));
if (string.IsNullOrWhiteSpace(adminUserName)) if (string.IsNullOrWhiteSpace(adminUserName))
TSPlayer.All.SendInfoMessage("{0} was banned for '{1}'.", Name, reason); TSPlayer.All.SendInfoMessage(GetString("{0} was banned for '{1}'.", Name, reason));
else else
TSPlayer.All.SendInfoMessage("{0} banned {1} for '{2}'.", adminUserName, Name, reason); TSPlayer.All.SendInfoMessage(GetString("{0} banned {1} for '{2}'.", adminUserName, Name, reason));
return true; return true;
} }

6
TShockAPI/UpdateManager.cs
View file

@ -129,13 +129,13 @@ namespace TShockAPI
{ {
return update; return update;
} }
return null; return null;
} }
private void NotifyAdministrators(Dictionary<string, string> update) private void NotifyAdministrators(Dictionary<string, string> update)
{ {
var changes = update["changes"].Split(new[] {'\n'}, StringSplitOptions.RemoveEmptyEntries); var changes = update["changes"].Split(new[] { '\n' }, StringSplitOptions.RemoveEmptyEntries);
NotifyAdministrator(TSPlayer.Server, changes); NotifyAdministrator(TSPlayer.Server, changes);
foreach (TSPlayer player in TShock.Players) foreach (TSPlayer player in TShock.Players)
{ {
@ -148,7 +148,7 @@ namespace TShockAPI
private void NotifyAdministrator(TSPlayer player, string[] changes) private void NotifyAdministrator(TSPlayer player, string[] changes)
{ {
player.SendMessage("The server is out of date. Latest version: ", Color.Red); player.SendMessage(GetString("The server is out of date. Latest version: "), Color.Red);
for (int j = 0; j < changes.Length; j++) for (int j = 0; j < changes.Length; j++)
{ {
player.SendMessage(changes[j], Color.Red); player.SendMessage(changes[j], Color.Red);