diff --git a/TShockAPI/Bouncer.cs b/TShockAPI/Bouncer.cs
index 395bfddd..fda85267 100644
--- a/TShockAPI/Bouncer.cs
+++ b/TShockAPI/Bouncer.cs
@@ -43,7 +43,7 @@ namespace TShockAPI
internal Bouncer()
{
STSHandler = new Handlers.SendTileSquareHandler();
- GetDataHandlers.SendTileSquare += STSHandler.OnReceiveSendTileSquare;
+ GetDataHandlers.SendTileSquare += STSHandler.OnReceive;
// Setup hooks
GetDataHandlers.GetSection += OnGetSection;
diff --git a/TShockAPI/Handlers/IPacketHandler.cs b/TShockAPI/Handlers/IPacketHandler.cs
new file mode 100644
index 00000000..9b2e0444
--- /dev/null
+++ b/TShockAPI/Handlers/IPacketHandler.cs
@@ -0,0 +1,16 @@
+namespace TShockAPI.Handlers
+{
+ ///
+ /// Describes a packet handler that receives a packet from a GetDataHandler
+ ///
+ ///
+ public interface IPacketHandler where TEventArgs : GetDataHandledEventArgs
+ {
+ ///
+ /// Invoked when the packet is received
+ ///
+ ///
+ ///
+ void OnReceive(object sender, TEventArgs args);
+ }
+}
diff --git a/TShockAPI/Handlers/SendTileSquareHandler.cs b/TShockAPI/Handlers/SendTileSquareHandler.cs
index 48462a03..fc252256 100644
--- a/TShockAPI/Handlers/SendTileSquareHandler.cs
+++ b/TShockAPI/Handlers/SendTileSquareHandler.cs
@@ -14,12 +14,12 @@ namespace TShockAPI.Handlers
///
/// Provides processors for handling Tile Square packets
///
- public class SendTileSquareHandler
+ public class SendTileSquareHandler : IPacketHandler
{
///
/// Maps grass-type blocks to flowers that can be grown on them with flower boots
///
- Dictionary> _grassToPlantMap = new Dictionary>
+ public static Dictionary> GrassToPlantMap = new Dictionary>
{
{ TileID.Grass, new List { TileID.Plants, TileID.Plants2 } },
{ TileID.HallowedGrass, new List { TileID.HallowedPlants, TileID.HallowedPlants2 } },
@@ -29,7 +29,7 @@ namespace TShockAPI.Handlers
///
/// Item IDs that can spawn flowers while you walk
///
- List _flowerBootItems = new List
+ public static List FlowerBootItems = new List
{
ItemID.FlowerBoots,
ItemID.FairyBoots
@@ -40,7 +40,7 @@ namespace TShockAPI.Handlers
/// Note: is empty at the time of writing, but entities are dynamically assigned their ID at initialize time
/// which is why we can use the _myEntityId field on each entity type
///
- Dictionary _tileEntityIdToTileIdMap = new Dictionary
+ public static Dictionary TileEntityIdToTileIdMap = new Dictionary
{
{ TileID.TargetDummy, TETrainingDummy._myEntityID },
{ TileID.ItemFrame, TEItemFrame._myEntityID },
@@ -57,7 +57,7 @@ namespace TShockAPI.Handlers
///
///
///
- public void OnReceiveSendTileSquare(object sender, GetDataHandlers.SendTileSquareEventArgs args)
+ public void OnReceive(object sender, GetDataHandlers.SendTileSquareEventArgs args)
{
// By default, we'll handle everything
args.Handled = true;
@@ -196,9 +196,9 @@ namespace TShockAPI.Handlers
UpdateMultipleServerTileStates(realX, realY, width, height, newTiles);
// Tile entities have special placements that we should let the game deal with
- if (_tileEntityIdToTileIdMap.ContainsKey(tileType))
+ if (TileEntityIdToTileIdMap.ContainsKey(tileType))
{
- TileEntity.PlaceEntityNet(realX, realY, _tileEntityIdToTileIdMap[tileType]);
+ TileEntity.PlaceEntityNet(realX, realY, TileEntityIdToTileIdMap[tileType]);
}
}
@@ -214,7 +214,7 @@ namespace TShockAPI.Handlers
{
// Some boots allow growing flowers on grass. This process sends a 1x1 tile square to grow the flowers
// The square size must be 1 and the player must have an accessory that allows growing flowers in order for this square to be valid
- if (squareSize == 1 && args.Player.Accessories.Any(a => a != null && _flowerBootItems.Contains(a.type)))
+ if (squareSize == 1 && args.Player.Accessories.Any(a => a != null && FlowerBootItems.Contains(a.type)))
{
ProcessFlowerBoots(realX, realY, newTile, args);
return;
@@ -254,7 +254,7 @@ namespace TShockAPI.Handlers
}
ITile tile = Main.tile[realX, realY + 1];
- if (!_grassToPlantMap.TryGetValue(tile.type, out List plantTiles) && !plantTiles.Contains(newTile.Type))
+ if (!GrassToPlantMap.TryGetValue(tile.type, out List plantTiles) && !plantTiles.Contains(newTile.Type))
{
// If the tile below the tile square isn't a valid plant tile (eg grass) then we don't update the server tile state
return;
diff --git a/TShockAPI/TShockAPI.csproj b/TShockAPI/TShockAPI.csproj
index ea6f4f48..af383252 100644
--- a/TShockAPI/TShockAPI.csproj
+++ b/TShockAPI/TShockAPI.csproj
@@ -88,6 +88,7 @@
+
@@ -212,7 +213,7 @@
-
+