From d46f534533a72f1eedfbef8f542c6e266ddd04bf Mon Sep 17 00:00:00 2001
From: Chris <2648373+QuiCM@users.noreply.github.com>
Date: Tue, 2 Jun 2020 10:18:40 +0930
Subject: [PATCH 01/15] Standardize permission rejection messages

---
 TShockAPI/Commands.cs        |  8 ++++----
 TShockAPI/GetDataHandlers.cs | 32 ++++++++++++++++----------------
 TShockAPI/TSPlayer.cs        |  6 +++---
 3 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/TShockAPI/Commands.cs b/TShockAPI/Commands.cs
index 10d6f0da..4fc949b7 100644
--- a/TShockAPI/Commands.cs
+++ b/TShockAPI/Commands.cs
@@ -1987,7 +1987,7 @@ namespace TShockAPI
 
 			void FailedPermissionCheck()
 			{
-				args.Player.SendErrorMessage("You do not have sufficient permissions to start the {0} event.", eventType);
+				args.Player.SendErrorMessage("You do not have permission to start the {0} event.", eventType);
 				return;
 			}
 
@@ -4873,7 +4873,7 @@ namespace TShockAPI
 					{
 						if (!args.Player.HasPermission(Permissions.tp))
 						{
-							args.Player.SendErrorMessage("You don't have the necessary permission to do that.");
+							args.Player.SendErrorMessage("You do not have permission to teleport.");
 							break;
 						}
 						if (args.Parameters.Count <= 1)
@@ -5051,7 +5051,7 @@ namespace TShockAPI
 			}
 			if (displayIdsRequested && !args.Player.HasPermission(Permissions.seeids))
 			{
-				args.Player.SendErrorMessage("You don't have the required permission to list player ids.");
+				args.Player.SendErrorMessage("You do not have permission to list player ids.");
 				return;
 			}
 
@@ -6025,7 +6025,7 @@ namespace TShockAPI
 			{
 				if (!args.Player.HasPermission(Permissions.godmodeother))
 				{
-					args.Player.SendErrorMessage("You do not have permission to god mode another player!");
+					args.Player.SendErrorMessage("You do not have permission to god mode another player.");
 					return;
 				}
 				string plStr = String.Join(" ", args.Parameters);
diff --git a/TShockAPI/GetDataHandlers.cs b/TShockAPI/GetDataHandlers.cs
index b5c9bbb0..60d16b35 100644
--- a/TShockAPI/GetDataHandlers.cs
+++ b/TShockAPI/GetDataHandlers.cs
@@ -2928,21 +2928,21 @@ namespace TShockAPI
 			if (bosses.Contains(thingType) && !args.Player.HasPermission(Permissions.summonboss))
 			{
 				TShock.Log.ConsoleDebug("GetDataHandlers / HandleSpawnBoss rejected boss {0} {1}", args.Player.Name, thingType);
-				args.Player.SendErrorMessage("You don't have permission to summon a boss.");
+				args.Player.SendErrorMessage("You do not have permission to summon a boss.");
 				return true;
 			}
 
 			if (invasions.Contains(thingType) && !args.Player.HasPermission(Permissions.startinvasion))
 			{
 				TShock.Log.ConsoleDebug("GetDataHandlers / HandleSpawnBoss rejected invasion {0} {1}", args.Player.Name, thingType);
-				args.Player.SendErrorMessage("You don't have permission to start an invasion.");
+				args.Player.SendErrorMessage("You do not have permission to start an invasion.");
 				return true;
 			}
 
 			if (pets.Contains(thingType) && !args.Player.HasPermission(Permissions.spawnpets))
 			{
 				TShock.Log.ConsoleDebug("GetDataHandlers / HandleSpawnBoss rejected pet {0} {1}", args.Player.Name, thingType);
-				args.Player.SendErrorMessage("You don't have permission to spawn pets.");
+				args.Player.SendErrorMessage("You do not have permission to spawn pets.");
 				return true;
 			}
 
@@ -3234,7 +3234,7 @@ namespace TShockAPI
 						{
 							if (!args.Player.HasPermission(Permissions.journey_timefreeze))
 							{
-								args.Player.SendErrorMessage("You don't have permission to freeze the time of the server!");
+								args.Player.SendErrorMessage("You do not have permission to freeze the time of the server.");
 								return true;
 							}
 							break;
@@ -3246,7 +3246,7 @@ namespace TShockAPI
 						{
 							if (!args.Player.HasPermission(Permissions.journey_timeset))
 							{
-								args.Player.SendErrorMessage("You don't have permission to modify the time of the server!");
+								args.Player.SendErrorMessage("You don't have permission to modify the time of the server.");
 								return true;
 							}
 							break;
@@ -3255,7 +3255,7 @@ namespace TShockAPI
 						{
 							if (!args.Player.HasPermission(Permissions.journey_godmode))
 							{
-								args.Player.SendErrorMessage("You don't have permission to toggle godmode!");
+								args.Player.SendErrorMessage("You do not have permission to toggle godmode.");
 								return true;
 							}
 							break;
@@ -3264,7 +3264,7 @@ namespace TShockAPI
 						{
 							if (!args.Player.HasPermission(Permissions.journey_windstrength))
 							{
-								args.Player.SendErrorMessage("You don't have permission to modify the wind strength of the server!");
+								args.Player.SendErrorMessage("You do not have permission to modify the wind strength of the server.");
 								return true;
 							}
 							break;
@@ -3273,7 +3273,7 @@ namespace TShockAPI
 						{
 							if (!args.Player.HasPermission(Permissions.journey_rainstrength))
 							{
-								args.Player.SendErrorMessage("You don't have permission to modify the rain strength of the server!");
+								args.Player.SendErrorMessage("You do not have permission to modify the rain strength of the server.");
 								return true;
 							}
 							break;
@@ -3282,7 +3282,7 @@ namespace TShockAPI
 						{
 							if (!args.Player.HasPermission(Permissions.journey_timespeed))
 							{
-								args.Player.SendErrorMessage("You don't have permission to modify the time speed of the server!");
+								args.Player.SendErrorMessage("You do not have permission to modify the time speed of the server.");
 								return true;
 							}
 							break;
@@ -3291,7 +3291,7 @@ namespace TShockAPI
 						{
 							if (!args.Player.HasPermission(Permissions.journey_rainfreeze))
 							{
-								args.Player.SendErrorMessage("You don't have permission to freeze the rain strength of the server!");
+								args.Player.SendErrorMessage("You do not have permission to freeze the rain strength of the server.");
 								return true;
 							}
 							break;
@@ -3300,7 +3300,7 @@ namespace TShockAPI
 						{
 							if (!args.Player.HasPermission(Permissions.journey_windfreeze))
 							{
-								args.Player.SendErrorMessage("You don't have permission to freeze the wind strength of the server!");
+								args.Player.SendErrorMessage("You do not have permission to freeze the wind strength of the server.");
 								return true;
 							}
 							break;
@@ -3309,7 +3309,7 @@ namespace TShockAPI
 						{
 							if (!args.Player.HasPermission(Permissions.journey_placementrange))
 							{
-								args.Player.SendErrorMessage("You don't have permission to modify the tile placement range of your character!");
+								args.Player.SendErrorMessage("You do not have permission to modify the tile placement range of your character.");
 								return true;
 							}
 							break;
@@ -3318,7 +3318,7 @@ namespace TShockAPI
 						{
 							if (!args.Player.HasPermission(Permissions.journey_setdifficulty))
 							{
-								args.Player.SendErrorMessage("You don't have permission to modify the world difficulty of the server!");
+								args.Player.SendErrorMessage("You do not have permission to modify the world difficulty of the server.");
 								return true;
 							}
 							break;
@@ -3327,7 +3327,7 @@ namespace TShockAPI
 						{
 							if (!args.Player.HasPermission(Permissions.journey_biomespreadfreeze))
 							{
-								args.Player.SendErrorMessage("You don't have permission to freeze the biome spread of the server!");
+								args.Player.SendErrorMessage("You do not have permission to freeze the biome spread of the server.");
 								return true;
 							}
 							break;
@@ -3342,7 +3342,7 @@ namespace TShockAPI
 							}
 							if (!args.Player.HasPermission(Permissions.journey_setspawnrate))
 							{
-								args.Player.SendErrorMessage("You don't have permission to modify the NPC spawn rate of the server!");
+								args.Player.SendErrorMessage("You do not have permission to modify the NPC spawn rate of the server.");
 								return true;
 							}
 							break;
@@ -3576,7 +3576,7 @@ namespace TShockAPI
 			if (!args.Player.HasPermission(Permissions.startdd2))
 			{
 				TShock.Log.ConsoleDebug("GetDataHandlers / HandleOldOnesArmy rejected permissions {0}", args.Player.Name);
-				args.Player.SendErrorMessage("You don't have permission to start the Old One's Army event.");
+				args.Player.SendErrorMessage("You do not have permission to start the Old One's Army event.");
 				return true;
 			}
 
diff --git a/TShockAPI/TSPlayer.cs b/TShockAPI/TSPlayer.cs
index 54be5041..ade16234 100644
--- a/TShockAPI/TSPlayer.cs
+++ b/TShockAPI/TSPlayer.cs
@@ -664,13 +664,13 @@ namespace TShockAPI
 			switch (failure)
 			{
 				case BuildPermissionFailPoint.GeneralBuild:
-					SendErrorMessage("You lack permission to build on this server.");
+					SendErrorMessage("You do not have permission to build on this server.");
 					break;
 				case BuildPermissionFailPoint.SpawnProtect:
-					SendErrorMessage("You lack permission to build in the spawn point.");
+					SendErrorMessage("You do not have permission to build in the spawn point.");
 					break;
 				case BuildPermissionFailPoint.Regions:
-					SendErrorMessage("You lack permission to build in this region.");
+					SendErrorMessage("You do not have permission to build in this region.");
 					break;
 			}
 

From b5c3b430fa31c1a6c96fd0d8a772adf9b07d4752 Mon Sep 17 00:00:00 2001
From: Chris <2648373+QuiCM@users.noreply.github.com>
Date: Tue, 2 Jun 2020 10:20:13 +0930
Subject: [PATCH 02/15] Standardize permission rejection message again

---
 TShockAPI/GetDataHandlers.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/TShockAPI/GetDataHandlers.cs b/TShockAPI/GetDataHandlers.cs
index 60d16b35..65fe622f 100644
--- a/TShockAPI/GetDataHandlers.cs
+++ b/TShockAPI/GetDataHandlers.cs
@@ -3246,7 +3246,7 @@ namespace TShockAPI
 						{
 							if (!args.Player.HasPermission(Permissions.journey_timeset))
 							{
-								args.Player.SendErrorMessage("You don't have permission to modify the time of the server.");
+								args.Player.SendErrorMessage("You do not have permission to modify the time of the server.");
 								return true;
 							}
 							break;

From 5b72ff6c0a0e5e23ce706c82d19925baa70ff931 Mon Sep 17 00:00:00 2001
From: Chris <2648373+QuiCM@users.noreply.github.com>
Date: Tue, 2 Jun 2020 10:44:10 +0930
Subject: [PATCH 03/15] Add IPacketHandler

---
 TShockAPI/Bouncer.cs                        |  2 +-
 TShockAPI/Handlers/IPacketHandler.cs        | 16 ++++++++++++++++
 TShockAPI/Handlers/SendTileSquareHandler.cs | 18 +++++++++---------
 TShockAPI/TShockAPI.csproj                  |  3 ++-
 4 files changed, 28 insertions(+), 11 deletions(-)
 create mode 100644 TShockAPI/Handlers/IPacketHandler.cs

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
+{
+	/// <summary>
+	/// Describes a packet handler that receives a packet from a GetDataHandler
+	/// </summary>
+	/// <typeparam name="TEventArgs"></typeparam>
+	public interface IPacketHandler<TEventArgs> where TEventArgs : GetDataHandledEventArgs
+	{
+		/// <summary>
+		/// Invoked when the packet is received
+		/// </summary>
+		/// <param name="sender"></param>
+		/// <param name="args"></param>
+		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
 	/// <summary>
 	/// Provides processors for handling Tile Square packets
 	/// </summary>
-	public class SendTileSquareHandler
+	public class SendTileSquareHandler : IPacketHandler<GetDataHandlers.SendTileSquareEventArgs>
 	{
 		/// <summary>
 		/// Maps grass-type blocks to flowers that can be grown on them with flower boots
 		/// </summary>
-		Dictionary<ushort, List<ushort>> _grassToPlantMap = new Dictionary<ushort, List<ushort>>
+		public static Dictionary<ushort, List<ushort>> GrassToPlantMap = new Dictionary<ushort, List<ushort>>
 		{
 			{ TileID.Grass, new List<ushort>            { TileID.Plants,         TileID.Plants2 } },
 			{ TileID.HallowedGrass, new List<ushort>    { TileID.HallowedPlants, TileID.HallowedPlants2 } },
@@ -29,7 +29,7 @@ namespace TShockAPI.Handlers
 		/// <summary>
 		/// Item IDs that can spawn flowers while you walk
 		/// </summary>
-		List<int> _flowerBootItems = new List<int>
+		public static List<int> FlowerBootItems = new List<int>
 		{
 			ItemID.FlowerBoots,
 			ItemID.FairyBoots
@@ -40,7 +40,7 @@ namespace TShockAPI.Handlers
 		/// Note: <see cref="Terraria.ID.TileEntityID"/> 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
 		/// </summary>
-		Dictionary<int, int> _tileEntityIdToTileIdMap = new Dictionary<int, int>
+		public static Dictionary<int, int> TileEntityIdToTileIdMap = new Dictionary<int, int>
 		{
 			{ TileID.TargetDummy,        TETrainingDummy._myEntityID },
 			{ TileID.ItemFrame,          TEItemFrame._myEntityID },
@@ -57,7 +57,7 @@ namespace TShockAPI.Handlers
 		/// </summary>
 		/// <param name="sender"></param>
 		/// <param name="args"></param>
-		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<ushort> plantTiles) && !plantTiles.Contains(newTile.Type))
+			if (!GrassToPlantMap.TryGetValue(tile.type, out List<ushort> 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 @@
     <Compile Include="DB\ResearchDatastore.cs" />
     <Compile Include="DB\TileManager.cs" />
     <Compile Include="Extensions\ExceptionExt.cs" />
+    <Compile Include="Handlers\IPacketHandler.cs" />
     <Compile Include="Handlers\SendTileSquareHandler.cs" />
     <Compile Include="Hooks\AccountHooks.cs" />
     <Compile Include="Hooks\GeneralHooks.cs" />
@@ -212,7 +213,7 @@
   </PropertyGroup>
   <ProjectExtensions>
     <VisualStudio>
-      <UserProperties BuildVersion_IncrementBeforeBuild="False" BuildVersion_StartDate="2011/6/17" BuildVersion_BuildVersioningStyle="None.None.None.MonthAndDayStamp" BuildVersion_BuildAction="Both" BuildVersion_UpdateFileVersion="True" BuildVersion_UpdateAssemblyVersion="True" />
+      <UserProperties BuildVersion_UpdateAssemblyVersion="True" BuildVersion_UpdateFileVersion="True" BuildVersion_BuildAction="Both" BuildVersion_BuildVersioningStyle="None.None.None.MonthAndDayStamp" BuildVersion_StartDate="2011/6/17" BuildVersion_IncrementBeforeBuild="False" />
     </VisualStudio>
   </ProjectExtensions>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 

From 4d1fd54a7c531a51f1e290505e7e4763f405038b Mon Sep 17 00:00:00 2001
From: Chris <2648373+QuiCM@users.noreply.github.com>
Date: Tue, 2 Jun 2020 12:55:46 +0930
Subject: [PATCH 04/15] Respect tile bans for tile objects in send tile square
 handler

---
 TShockAPI/Handlers/SendTileSquareHandler.cs | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/TShockAPI/Handlers/SendTileSquareHandler.cs b/TShockAPI/Handlers/SendTileSquareHandler.cs
index fc252256..39a7e751 100644
--- a/TShockAPI/Handlers/SendTileSquareHandler.cs
+++ b/TShockAPI/Handlers/SendTileSquareHandler.cs
@@ -191,6 +191,12 @@ namespace TShockAPI.Handlers
 				TShock.Log.ConsoleDebug("Bouncer / SendTileSquare rejected from no permission for tile object from {0}", args.Player.Name);
 				return;
 			}
+			
+			if (TShock.TileBans.TileIsBanned((short)tileType))
+			{
+				TShock.Log.ConsoleDebug("Bouncer / SendTileSquare rejected for banned tile");
+				return;
+			}
 
 			// Update all tiles in the tile object. These will be sent back to the player later
 			UpdateMultipleServerTileStates(realX, realY, width, height, newTiles);

From 48d610d33f8df30b5da9c1eb797b23f6fd5a44ea Mon Sep 17 00:00:00 2001
From: Chris <2648373+QuiCM@users.noreply.github.com>
Date: Tue, 2 Jun 2020 12:59:14 +0930
Subject: [PATCH 05/15] Move netmodule handling into handlers namespace Add
 handler for teleport pylons, and permission for teleport pylons

---
 TShockAPI/Bouncer.cs                          |   4 +
 TShockAPI/GetDataHandlers.cs                  | 188 ++++--------------
 .../NetModules/CreativePowerHandler.cs        | 113 +++++++++++
 .../NetModules/CreativeUnlocksHandler.cs      |  75 +++++++
 .../Handlers/NetModules/INetModuleHandler.cs  |  23 +++
 .../NetModules/NetModulePacketHandler.cs      |  75 +++++++
 TShockAPI/Handlers/NetModules/PylonHandler.cs |  62 ++++++
 TShockAPI/Permissions.cs                      |   6 +
 TShockAPI/TShockAPI.csproj                    |   7 +-
 9 files changed, 401 insertions(+), 152 deletions(-)
 create mode 100644 TShockAPI/Handlers/NetModules/CreativePowerHandler.cs
 create mode 100644 TShockAPI/Handlers/NetModules/CreativeUnlocksHandler.cs
 create mode 100644 TShockAPI/Handlers/NetModules/INetModuleHandler.cs
 create mode 100644 TShockAPI/Handlers/NetModules/NetModulePacketHandler.cs
 create mode 100644 TShockAPI/Handlers/NetModules/PylonHandler.cs

diff --git a/TShockAPI/Bouncer.cs b/TShockAPI/Bouncer.cs
index fda85267..fa928eb4 100644
--- a/TShockAPI/Bouncer.cs
+++ b/TShockAPI/Bouncer.cs
@@ -37,6 +37,7 @@ namespace TShockAPI
 	internal sealed class Bouncer
 	{
 		internal Handlers.SendTileSquareHandler STSHandler { get; set; }
+		internal Handlers.NetModules.NetModulePacketHandler NetModuleHandler { get; set; }
 
 		/// <summary>Constructor call initializes Bouncer and related functionality.</summary>
 		/// <returns>A new Bouncer.</returns>
@@ -45,6 +46,9 @@ namespace TShockAPI
 			STSHandler = new Handlers.SendTileSquareHandler();
 			GetDataHandlers.SendTileSquare += STSHandler.OnReceive;
 
+			NetModuleHandler = new Handlers.NetModules.NetModulePacketHandler();
+			GetDataHandlers.LoadNetModule += NetModuleHandler.OnReceive;
+
 			// Setup hooks
 			GetDataHandlers.GetSection += OnGetSection;
 			GetDataHandlers.PlayerUpdate += OnPlayerUpdate;
diff --git a/TShockAPI/GetDataHandlers.cs b/TShockAPI/GetDataHandlers.cs
index 65fe622f..52394f38 100644
--- a/TShockAPI/GetDataHandlers.cs
+++ b/TShockAPI/GetDataHandlers.cs
@@ -1951,6 +1951,40 @@ namespace TShockAPI
 			return args.Handled;
 		}
 
+		/// <summary>
+		/// Used when a net module is loaded
+		/// </summary>
+		public class LoadNetModuleEventArgs : GetDataHandledEventArgs
+		{
+			/// <summary>
+			/// The type of net module being loaded
+			/// </summary>
+			public NetModulesTypes ModuleType { get; set; }
+		}
+
+		/// <summary>
+		/// Called when a net module is loaded
+		/// </summary>
+		public static HandlerList<LoadNetModuleEventArgs> LoadNetModule = new HandlerList<LoadNetModuleEventArgs>();
+
+		private static bool OnLoadNetModule(TSPlayer player, MemoryStream data, NetModulesTypes moduleType)
+		{
+			if (LoadNetModule == null)
+			{
+				return false;
+			}
+
+			var args = new LoadNetModuleEventArgs
+			{
+				Player = player,
+				Data = data,
+				ModuleType = moduleType
+			};
+
+			LoadNetModule.Invoke(null, args);
+			return args.Handled;
+		}
+
 		#endregion
 
 		private static bool HandlePlayerInfo(GetDataHandlerArgs args)
@@ -3225,160 +3259,12 @@ namespace TShockAPI
 		private static bool HandleLoadNetModule(GetDataHandlerArgs args)
 		{
 			short moduleId = args.Data.ReadInt16();
-			if (moduleId == (int)NetModulesTypes.CreativePowers)
+
+			if (OnLoadNetModule(args.Player, args.Data, (NetModulesTypes)moduleId))
 			{
-				CreativePowerTypes powerId = (CreativePowerTypes)args.Data.ReadInt16();
-				switch (powerId)
-				{
-					case CreativePowerTypes.FreezeTime:
-						{
-							if (!args.Player.HasPermission(Permissions.journey_timefreeze))
-							{
-								args.Player.SendErrorMessage("You do not have permission to freeze the time of the server.");
-								return true;
-							}
-							break;
-						}
-					case CreativePowerTypes.SetDawn:
-					case CreativePowerTypes.SetNoon:
-					case CreativePowerTypes.SetDusk:
-					case CreativePowerTypes.SetMidnight:
-						{
-							if (!args.Player.HasPermission(Permissions.journey_timeset))
-							{
-								args.Player.SendErrorMessage("You do not have permission to modify the time of the server.");
-								return true;
-							}
-							break;
-						}
-					case CreativePowerTypes.Godmode:
-						{
-							if (!args.Player.HasPermission(Permissions.journey_godmode))
-							{
-								args.Player.SendErrorMessage("You do not have permission to toggle godmode.");
-								return true;
-							}
-							break;
-						}
-					case CreativePowerTypes.WindStrength:
-						{
-							if (!args.Player.HasPermission(Permissions.journey_windstrength))
-							{
-								args.Player.SendErrorMessage("You do not have permission to modify the wind strength of the server.");
-								return true;
-							}
-							break;
-						}
-					case CreativePowerTypes.RainStrength:
-						{
-							if (!args.Player.HasPermission(Permissions.journey_rainstrength))
-							{
-								args.Player.SendErrorMessage("You do not have permission to modify the rain strength of the server.");
-								return true;
-							}
-							break;
-						}
-					case CreativePowerTypes.TimeSpeed:
-						{
-							if (!args.Player.HasPermission(Permissions.journey_timespeed))
-							{
-								args.Player.SendErrorMessage("You do not have permission to modify the time speed of the server.");
-								return true;
-							}
-							break;
-						}
-					case CreativePowerTypes.RainFreeze:
-						{
-							if (!args.Player.HasPermission(Permissions.journey_rainfreeze))
-							{
-								args.Player.SendErrorMessage("You do not have permission to freeze the rain strength of the server.");
-								return true;
-							}
-							break;
-						}
-					case CreativePowerTypes.WindFreeze:
-						{
-							if (!args.Player.HasPermission(Permissions.journey_windfreeze))
-							{
-								args.Player.SendErrorMessage("You do not have permission to freeze the wind strength of the server.");
-								return true;
-							}
-							break;
-						}
-					case CreativePowerTypes.IncreasePlacementRange:
-						{
-							if (!args.Player.HasPermission(Permissions.journey_placementrange))
-							{
-								args.Player.SendErrorMessage("You do not have permission to modify the tile placement range of your character.");
-								return true;
-							}
-							break;
-						}
-					case CreativePowerTypes.WorldDifficulty:
-						{
-							if (!args.Player.HasPermission(Permissions.journey_setdifficulty))
-							{
-								args.Player.SendErrorMessage("You do not have permission to modify the world difficulty of the server.");
-								return true;
-							}
-							break;
-						}
-					case CreativePowerTypes.BiomeSpreadFreeze:
-						{
-							if (!args.Player.HasPermission(Permissions.journey_biomespreadfreeze))
-							{
-								args.Player.SendErrorMessage("You do not have permission to freeze the biome spread of the server.");
-								return true;
-							}
-							break;
-						}
-					case CreativePowerTypes.SetSpawnRate:
-						{
-							// This is a monkeypatch because the 1.4.0.4 seemingly at random sends NPC spawn rate changes even outside of journey mode
-							// (with SSC on) -- particles, May 25, 2 Reiwa
-							if (!Main.GameModeInfo.IsJourneyMode)
-							{
-								return true;
-							}
-							if (!args.Player.HasPermission(Permissions.journey_setspawnrate))
-							{
-								args.Player.SendErrorMessage("You do not have permission to modify the NPC spawn rate of the server.");
-								return true;
-							}
-							break;
-						}
-					default:
-						{
-							return true;
-						}
-				}
-			} else if (moduleId == (int)NetModulesTypes.CreativeUnlocksPlayerReport && Main.GameModeInfo.IsJourneyMode)
-			{
-				var unknownField = args.Data.ReadByte();
-
-				if (unknownField == 0) //this is required or something???
-				{
-					var itemId = args.Data.ReadUInt16();
-					var amount = args.Data.ReadUInt16();
-
-					var totalSacrificed = TShock.ResearchDatastore.SacrificeItem(itemId, amount, args.Player);
-
-					var response = NetCreativeUnlocksModule.SerializeItemSacrifice(itemId, totalSacrificed);
-					NetManager.Instance.Broadcast(response);
-				}
+				return true;
 			}
 
-			// As of 1.4.x.x, this is now used for more things:
-			//	NetCreativePowersModule
-			//	NetCreativePowerPermissionsModule
-			//	NetLiquidModule
-			//	NetParticlesModule
-			//	NetPingModule
-			//	NetTeleportPylonModule
-			//	NetTextModule
-			// I (particles) have disabled the original return here, which means that we need to
-			// handle this more. In the interm, this unbreaks parts of vanilla. Originally
-			// we just blocked this because it was a liquid exploit.
 			return false;
 		}
 
diff --git a/TShockAPI/Handlers/NetModules/CreativePowerHandler.cs b/TShockAPI/Handlers/NetModules/CreativePowerHandler.cs
new file mode 100644
index 00000000..06e43107
--- /dev/null
+++ b/TShockAPI/Handlers/NetModules/CreativePowerHandler.cs
@@ -0,0 +1,113 @@
+using System.Collections.Generic;
+using System.IO;
+using System.IO.Streams;
+using static TShockAPI.GetDataHandlers;
+
+namespace TShockAPI.Handlers.NetModules
+{
+	/// <summary>
+	/// Provides handling for the Creative Power net module. Checks permissions on all creative powers
+	/// </summary>
+	public class CreativePowerHandler : INetModuleHandler
+	{
+		/// <summary>
+		/// The power type being activated
+		/// </summary>
+		public CreativePowerTypes PowerType { get; set; }
+
+		/// <summary>
+		/// Reads the power type from the stream
+		/// </summary>
+		/// <param name="data"></param>
+		public void Deserialize(MemoryStream data)
+		{
+			PowerType = (CreativePowerTypes)data.ReadInt16();
+		}
+
+		/// <summary>
+		/// Determines if the player has permission to use the power type
+		/// </summary>
+		/// <param name="player"></param>
+		/// <param name="rejectPacket"></param>
+		public void HandlePacket(TSPlayer player, out bool rejectPacket)
+		{
+			if (!CheckPermission(PowerType, player))
+			{
+				rejectPacket = true;
+				return;
+			}
+
+			rejectPacket = false;
+		}
+
+		/// <summary>
+		/// Determines if a player has permission to use a specific creative power
+		/// </summary>
+		/// <param name="powerType"></param>
+		/// <param name="player"></param>
+		/// <returns></returns>
+		public static bool CheckPermission(CreativePowerTypes powerType, TSPlayer player)
+		{
+			if (!PowerToPermissionMap.ContainsKey(powerType))
+			{
+				TShock.Log.ConsoleDebug("CreativePowerHandler received permission check request for unknown creative power");
+				return false;
+			}
+
+			string permission = PowerToPermissionMap[powerType];
+
+			if (!player.HasPermission(permission))
+			{
+				player.SendErrorMessage("You do not have permission to {0}.", PermissionToDescriptionMap[permission]);
+				return false;
+			}
+
+			return true;
+		}
+
+
+		/// <summary>
+		/// Maps creative powers to permission nodes
+		/// </summary>
+		public static Dictionary<CreativePowerTypes, string> PowerToPermissionMap = new Dictionary<CreativePowerTypes, string>
+		{
+			{ CreativePowerTypes.FreezeTime,              Permissions.journey_timefreeze		},
+			{ CreativePowerTypes.SetDawn,                 Permissions.journey_timeset			},
+			{ CreativePowerTypes.SetNoon,                 Permissions.journey_timeset			},
+			{ CreativePowerTypes.SetDusk,                 Permissions.journey_timeset			},
+			{ CreativePowerTypes.SetMidnight,             Permissions.journey_timeset			},
+			{ CreativePowerTypes.Godmode,                 Permissions.journey_godmode			},
+			{ CreativePowerTypes.WindStrength,            Permissions.journey_windstrength		},
+			{ CreativePowerTypes.RainStrength,            Permissions.journey_rainstrength		},
+			{ CreativePowerTypes.TimeSpeed,               Permissions.journey_timespeed			},
+			{ CreativePowerTypes.RainFreeze,              Permissions.journey_rainfreeze		},
+			{ CreativePowerTypes.WindFreeze,              Permissions.journey_windfreeze		},
+			{ CreativePowerTypes.IncreasePlacementRange,  Permissions.journey_placementrange	},
+			{ CreativePowerTypes.WorldDifficulty,         Permissions.journey_setdifficulty		},
+			{ CreativePowerTypes.BiomeSpreadFreeze,       Permissions.journey_biomespreadfreeze },
+			{ CreativePowerTypes.SetSpawnRate,            Permissions.journey_setspawnrate		},
+		};
+
+		/// <summary>
+		/// Maps journey mode permission nodes to descriptions of what the permission allows
+		/// </summary>
+		public static Dictionary<string, string> PermissionToDescriptionMap = new Dictionary<string, string>
+		{
+			{ Permissions.journey_timefreeze,			"freeze the time of the server"						},
+			{ Permissions.journey_timeset,				"modify the time of the server"						},
+			{ Permissions.journey_timeset,				"modify the time of the server"						},
+			{ Permissions.journey_timeset,				"modify the time of the server"						},
+			{ Permissions.journey_timeset,				"modify the time of the server"						},
+			{ Permissions.journey_godmode,				"toggle godmode"									},
+			{ Permissions.journey_windstrength,			"modify the wind strength of the server"			},
+			{ Permissions.journey_rainstrength,			"modify the rain strength of the server"			},
+			{ Permissions.journey_timespeed,			"modify the time speed of the server"				},
+			{ Permissions.journey_rainfreeze,			"freeze the rain strength of the server"			},
+			{ Permissions.journey_windfreeze,			"freeze the wind strength of the server"			},
+			{ Permissions.journey_placementrange,		"modify the tile placement range of your character" },
+			{ Permissions.journey_setdifficulty,		"modify the world difficulty of the server"			},
+			{ Permissions.journey_biomespreadfreeze,	"freeze the biome spread of the server"				},
+			{ Permissions.journey_setspawnrate,			"modify the NPC spawn rate of the server"			},
+		};
+	}
+}
diff --git a/TShockAPI/Handlers/NetModules/CreativeUnlocksHandler.cs b/TShockAPI/Handlers/NetModules/CreativeUnlocksHandler.cs
new file mode 100644
index 00000000..39f83d67
--- /dev/null
+++ b/TShockAPI/Handlers/NetModules/CreativeUnlocksHandler.cs
@@ -0,0 +1,75 @@
+using System.IO;
+using System.IO.Streams;
+using Terraria.GameContent.NetModules;
+using Terraria.Net;
+
+namespace TShockAPI.Handlers.NetModules
+{
+	/// <summary>
+	/// Handles creative unlock requests
+	/// </summary>
+	public class CreativeUnlocksHandler : INetModuleHandler
+	{
+		/// <summary>
+		/// An unknown field. If this does not have a value of '0' the packet should be rejected.
+		/// </summary>
+		public byte UnknownField { get; set; }
+		/// <summary>
+		/// ID of the item being sacrificed
+		/// </summary>
+		public ushort ItemId { get; set; }
+		/// <summary>
+		/// Stack size of the item being sacrificed
+		/// </summary>
+		public ushort Amount { get; set; }
+
+		/// <summary>
+		/// Reads the unlock data from the stream
+		/// </summary>
+		/// <param name="data"></param>
+		public void Deserialize(MemoryStream data)
+		{
+			UnknownField = data.ReadInt8();
+			if (UnknownField == 0)
+			{
+				ItemId = data.ReadUInt16();
+				Amount = data.ReadUInt16();
+			}
+		}
+
+		/// <summary>
+		/// Determines if the unlock is valid and the player has permission to perform the unlock.
+		/// Syncs unlock status if the packet is accepted
+		/// </summary>
+		/// <param name="player"></param>
+		/// <param name="rejectPacket"></param>
+		public void HandlePacket(TSPlayer player, out bool rejectPacket)
+		{
+			if (UnknownField != 0)
+			{
+				TShock.Log.ConsoleDebug(
+					"CreativeUnlocksNetModuleHandler received non-vanilla unlock request. Random field value: {0} from {1}",
+					UnknownField,
+					player.Name
+				);
+
+				rejectPacket = true;
+				return;
+			}
+
+			if (!player.HasPermission(Permissions.journey_contributeresearch))
+			{
+				player.SendErrorMessage("You do not have permission to contribute research.");
+				rejectPacket = true;
+				return;
+			}
+
+			var totalSacrificed = TShock.ResearchDatastore.SacrificeItem(ItemId, Amount, player);
+
+			var response = NetCreativeUnlocksModule.SerializeItemSacrifice(ItemId, totalSacrificed);
+			NetManager.Instance.Broadcast(response);
+
+			rejectPacket = false;
+		}
+	}
+}
diff --git a/TShockAPI/Handlers/NetModules/INetModuleHandler.cs b/TShockAPI/Handlers/NetModules/INetModuleHandler.cs
new file mode 100644
index 00000000..459d22f4
--- /dev/null
+++ b/TShockAPI/Handlers/NetModules/INetModuleHandler.cs
@@ -0,0 +1,23 @@
+using System.IO;
+
+namespace TShockAPI.Handlers.NetModules
+{
+	/// <summary>
+	/// Describes a handler for a net module
+	/// </summary>
+	public interface INetModuleHandler
+	{
+		/// <summary>
+		/// Reads the net module's data from the given stream
+		/// </summary>
+		/// <param name="data"></param>
+		void Deserialize(MemoryStream data);
+
+		/// <summary>
+		/// Provides handling for the packet and determines if it should be accepted or rejected
+		/// </summary>
+		/// <param name="player"></param>
+		/// <param name="rejectPacket"></param>
+		void HandlePacket(TSPlayer player, out bool rejectPacket);
+	}
+}
diff --git a/TShockAPI/Handlers/NetModules/NetModulePacketHandler.cs b/TShockAPI/Handlers/NetModules/NetModulePacketHandler.cs
new file mode 100644
index 00000000..f4d20bb4
--- /dev/null
+++ b/TShockAPI/Handlers/NetModules/NetModulePacketHandler.cs
@@ -0,0 +1,75 @@
+using System;
+using Terraria;
+using static TShockAPI.GetDataHandlers;
+
+namespace TShockAPI.Handlers.NetModules
+{
+	/// <summary>
+	/// Handles packet 82 - Load Net Module packets
+	/// </summary>
+	public class NetModulePacketHandler : IPacketHandler<LoadNetModuleEventArgs>
+	{
+		/// <summary>
+		/// Invoked when a load net module packet is received. This method picks a <see cref="INetModuleHandler"/> based on the
+		/// net module type being loaded, then forwards the data to the chosen handler to process
+		/// </summary>
+		/// <param name="sender"></param>
+		/// <param name="args"></param>
+		public void OnReceive(object sender, LoadNetModuleEventArgs args)
+		{
+			INetModuleHandler handler;
+
+			switch (args.ModuleType)
+			{
+				case NetModulesTypes.CreativePowers:
+					{
+						handler = new CreativePowerHandler();
+						break;
+					}
+
+				case NetModulesTypes.CreativeUnlocksPlayerReport:
+					{
+						if (!Main.GameModeInfo.IsJourneyMode)
+						{
+							TShock.Log.ConsoleDebug(
+								"NetModuleHandler received attempt to unlock sacrifice while not in journey mode from",
+								args.Player.Name
+							);
+
+							args.Handled = true;
+							return;
+						}
+
+						handler = new CreativeUnlocksHandler();
+						break;
+					}
+				case NetModulesTypes.TeleportPylon:
+					{
+						handler = new PylonHandler();
+						break;
+					}
+				default:
+					{
+						// As of 1.4.x.x, this is now used for more things:
+						//	NetCreativePowersModule
+						//	NetCreativePowerPermissionsModule
+						//	NetLiquidModule
+						//	NetParticlesModule
+						//	NetPingModule
+						//	NetTeleportPylonModule
+						//	NetTextModule
+						// I (particles) have disabled the original return here, which means that we need to
+						// handle this more. In the interm, this unbreaks parts of vanilla. Originally
+						// we just blocked this because it was a liquid exploit.
+						args.Handled = false;
+						return;
+					}
+			}
+
+			handler.Deserialize(args.Data);
+			handler.HandlePacket(args.Player, out bool rejectPacket);
+
+			args.Handled = rejectPacket;
+		}
+	}
+}
diff --git a/TShockAPI/Handlers/NetModules/PylonHandler.cs b/TShockAPI/Handlers/NetModules/PylonHandler.cs
new file mode 100644
index 00000000..75ca0c1d
--- /dev/null
+++ b/TShockAPI/Handlers/NetModules/PylonHandler.cs
@@ -0,0 +1,62 @@
+using System.IO;
+using System.IO.Streams;
+using Terraria.GameContent;
+using static Terraria.GameContent.NetModules.NetTeleportPylonModule;
+
+namespace TShockAPI.Handlers.NetModules
+{
+	/// <summary>
+	/// Handles a pylon net module
+	/// </summary>
+	public class PylonHandler : INetModuleHandler
+	{
+		/// <summary>
+		/// Event occuring
+		/// </summary>
+		public SubPacketType PylonEventType { get; set; }
+		/// <summary>
+		/// Tile X coordinate of the pylon
+		/// </summary>
+		public short TileX { get; set; }
+		/// <summary>
+		/// Tile Y coordinate of the pylon
+		/// </summary>
+		public short TileY { get; set; }
+		/// <summary>
+		/// Type of Pylon
+		/// </summary>
+		public TeleportPylonType PylonType { get; set; }
+
+		/// <summary>
+		/// Reads the pylon data from the net module
+		/// </summary>
+		/// <param name="data"></param>
+		public void Deserialize(MemoryStream data)
+		{
+			PylonEventType = (SubPacketType)data.ReadInt8();
+			TileX = data.ReadInt16();
+			TileY = data.ReadInt16();
+			PylonType = (TeleportPylonType)data.ReadInt8();
+		}
+
+		/// <summary>
+		/// Rejects a pylon teleport request if the player does not have permission
+		/// </summary>
+		/// <param name="player"></param>
+		/// <param name="rejectPacket"></param>
+		public void HandlePacket(TSPlayer player, out bool rejectPacket)
+		{
+			if (PylonEventType == SubPacketType.PlayerRequestsTeleport)
+			{
+				if (!player.HasPermission(Permissions.pylon))
+				{
+					rejectPacket = true;
+					player.SendErrorMessage("You do not have permission to teleport with pylons.");
+					return;
+				}
+			}
+
+			rejectPacket = false;
+		}
+	}
+}
diff --git a/TShockAPI/Permissions.cs b/TShockAPI/Permissions.cs
index baf21a73..3b401004 100644
--- a/TShockAPI/Permissions.cs
+++ b/TShockAPI/Permissions.cs
@@ -267,6 +267,9 @@ namespace TShockAPI
 
 		[Description("User can use wormhole potions.")]
 		public static readonly string wormhole = "tshock.tp.wormhole";
+
+		[Description("User can use pylons to teleport")]
+		public static readonly string pylon = "tshock.tp.pylon";
 		#endregion
 
 		#region tshock.world nodes
@@ -409,6 +412,9 @@ namespace TShockAPI
 
 		[Description("User can use Creative UI to set the NPC spawn rate of the world.")]
 		public static readonly string journey_setspawnrate = "tshock.journey.setspawnrate";
+
+		[Description("User can contribute research by sacrificing items")]
+		public static readonly string journey_contributeresearch = "tshock.journey.research";
 		#endregion
 
 		#region Non-grouped
diff --git a/TShockAPI/TShockAPI.csproj b/TShockAPI/TShockAPI.csproj
index af383252..b129837f 100644
--- a/TShockAPI/TShockAPI.csproj
+++ b/TShockAPI/TShockAPI.csproj
@@ -89,6 +89,11 @@
     <Compile Include="DB\TileManager.cs" />
     <Compile Include="Extensions\ExceptionExt.cs" />
     <Compile Include="Handlers\IPacketHandler.cs" />
+    <Compile Include="Handlers\NetModules\CreativePowerHandler.cs" />
+    <Compile Include="Handlers\NetModules\CreativeUnlocksHandler.cs" />
+    <Compile Include="Handlers\NetModules\INetModuleHandler.cs" />
+    <Compile Include="Handlers\NetModules\NetModulePacketHandler.cs" />
+    <Compile Include="Handlers\NetModules\PylonHandler.cs" />
     <Compile Include="Handlers\SendTileSquareHandler.cs" />
     <Compile Include="Hooks\AccountHooks.cs" />
     <Compile Include="Hooks\GeneralHooks.cs" />
@@ -213,7 +218,7 @@
   </PropertyGroup>
   <ProjectExtensions>
     <VisualStudio>
-      <UserProperties BuildVersion_UpdateAssemblyVersion="True" BuildVersion_UpdateFileVersion="True" BuildVersion_BuildAction="Both" BuildVersion_BuildVersioningStyle="None.None.None.MonthAndDayStamp" BuildVersion_StartDate="2011/6/17" BuildVersion_IncrementBeforeBuild="False" />
+      <UserProperties BuildVersion_IncrementBeforeBuild="False" BuildVersion_StartDate="2011/6/17" BuildVersion_BuildVersioningStyle="None.None.None.MonthAndDayStamp" BuildVersion_BuildAction="Both" BuildVersion_UpdateFileVersion="True" BuildVersion_UpdateAssemblyVersion="True" />
     </VisualStudio>
   </ProjectExtensions>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 

From 1c0a649a0cd3923aad6bf83f43a492dcea9ba4ec Mon Sep 17 00:00:00 2001
From: Chris <2648373+QuiCM@users.noreply.github.com>
Date: Tue, 2 Jun 2020 13:34:26 +0930
Subject: [PATCH 06/15] Add handling for liquid net module

---
 .../Handlers/NetModules/LiquidHandler.cs      | 29 +++++++++++++++++++
 .../NetModules/NetModulePacketHandler.cs      |  8 +++--
 TShockAPI/TShockAPI.csproj                    |  1 +
 3 files changed, 36 insertions(+), 2 deletions(-)
 create mode 100644 TShockAPI/Handlers/NetModules/LiquidHandler.cs

diff --git a/TShockAPI/Handlers/NetModules/LiquidHandler.cs b/TShockAPI/Handlers/NetModules/LiquidHandler.cs
new file mode 100644
index 00000000..e7fe647f
--- /dev/null
+++ b/TShockAPI/Handlers/NetModules/LiquidHandler.cs
@@ -0,0 +1,29 @@
+using System.IO;
+
+namespace TShockAPI.Handlers.NetModules
+{
+	/// <summary>
+	/// Handles the NetLiquidModule. Rejects all incoming net liquid requests, as clients should never send them
+	/// </summary>
+	public class LiquidHandler : INetModuleHandler
+	{
+		/// <summary>
+		/// Does nothing. We should not deserialize this data
+		/// </summary>
+		/// <param name="data"></param>
+		public void Deserialize(MemoryStream data)
+		{
+			// No need to deserialize
+		}
+
+		/// <summary>
+		/// Rejects the packet. Clients should not send this to us
+		/// </summary>
+		/// <param name="player"></param>
+		/// <param name="rejectPacket"></param>
+		public void HandlePacket(TSPlayer player, out bool rejectPacket)
+		{
+			rejectPacket = true;
+		}
+	}
+}
diff --git a/TShockAPI/Handlers/NetModules/NetModulePacketHandler.cs b/TShockAPI/Handlers/NetModules/NetModulePacketHandler.cs
index f4d20bb4..820d2fe2 100644
--- a/TShockAPI/Handlers/NetModules/NetModulePacketHandler.cs
+++ b/TShockAPI/Handlers/NetModules/NetModulePacketHandler.cs
@@ -1,5 +1,4 @@
-using System;
-using Terraria;
+using Terraria;
 using static TShockAPI.GetDataHandlers;
 
 namespace TShockAPI.Handlers.NetModules
@@ -48,6 +47,11 @@ namespace TShockAPI.Handlers.NetModules
 						handler = new PylonHandler();
 						break;
 					}
+				case NetModulesTypes.Liquid:
+					{
+						handler = new LiquidHandler();
+						break;
+					}
 				default:
 					{
 						// As of 1.4.x.x, this is now used for more things:
diff --git a/TShockAPI/TShockAPI.csproj b/TShockAPI/TShockAPI.csproj
index b129837f..2f4a406c 100644
--- a/TShockAPI/TShockAPI.csproj
+++ b/TShockAPI/TShockAPI.csproj
@@ -92,6 +92,7 @@
     <Compile Include="Handlers\NetModules\CreativePowerHandler.cs" />
     <Compile Include="Handlers\NetModules\CreativeUnlocksHandler.cs" />
     <Compile Include="Handlers\NetModules\INetModuleHandler.cs" />
+    <Compile Include="Handlers\NetModules\LiquidHandler.cs" />
     <Compile Include="Handlers\NetModules\NetModulePacketHandler.cs" />
     <Compile Include="Handlers\NetModules\PylonHandler.cs" />
     <Compile Include="Handlers\SendTileSquareHandler.cs" />

From 3b6a9ffcc27afc073788155ede756df1f8466539 Mon Sep 17 00:00:00 2001
From: Chris <2648373+QuiCM@users.noreply.github.com>
Date: Tue, 2 Jun 2020 14:06:18 +0930
Subject: [PATCH 07/15] Add bestiary handler

---
 .../Handlers/NetModules/BestiaryHandler.cs    | 28 +++++++++++++++++++
 .../NetModules/NetModulePacketHandler.cs      |  5 ++++
 TShockAPI/TShockAPI.csproj                    |  1 +
 3 files changed, 34 insertions(+)
 create mode 100644 TShockAPI/Handlers/NetModules/BestiaryHandler.cs

diff --git a/TShockAPI/Handlers/NetModules/BestiaryHandler.cs b/TShockAPI/Handlers/NetModules/BestiaryHandler.cs
new file mode 100644
index 00000000..372ce80f
--- /dev/null
+++ b/TShockAPI/Handlers/NetModules/BestiaryHandler.cs
@@ -0,0 +1,28 @@
+using System.IO;
+
+namespace TShockAPI.Handlers.NetModules
+{
+	/// <summary>
+	/// Rejects client->server bestiary net modules as the client should never send this to the server
+	/// </summary>
+	internal class BestiaryHandler : INetModuleHandler
+	{
+		/// <summary>
+		/// No deserialization needed. This should never be received by the server
+		/// </summary>
+		/// <param name="data"></param>
+		public void Deserialize(MemoryStream data)
+		{
+		}
+
+		/// <summary>
+		/// This should never be received by the server
+		/// </summary>
+		/// <param name="player"></param>
+		/// <param name="rejectPacket"></param>
+		public void HandlePacket(TSPlayer player, out bool rejectPacket)
+		{
+			rejectPacket = true;
+		}
+	}
+}
diff --git a/TShockAPI/Handlers/NetModules/NetModulePacketHandler.cs b/TShockAPI/Handlers/NetModules/NetModulePacketHandler.cs
index 820d2fe2..007c505b 100644
--- a/TShockAPI/Handlers/NetModules/NetModulePacketHandler.cs
+++ b/TShockAPI/Handlers/NetModules/NetModulePacketHandler.cs
@@ -52,6 +52,11 @@ namespace TShockAPI.Handlers.NetModules
 						handler = new LiquidHandler();
 						break;
 					}
+				case NetModulesTypes.Bestiary:
+					{
+						handler = new BestiaryHandler();
+						break;
+					}
 				default:
 					{
 						// As of 1.4.x.x, this is now used for more things:
diff --git a/TShockAPI/TShockAPI.csproj b/TShockAPI/TShockAPI.csproj
index 2f4a406c..83c31374 100644
--- a/TShockAPI/TShockAPI.csproj
+++ b/TShockAPI/TShockAPI.csproj
@@ -89,6 +89,7 @@
     <Compile Include="DB\TileManager.cs" />
     <Compile Include="Extensions\ExceptionExt.cs" />
     <Compile Include="Handlers\IPacketHandler.cs" />
+    <Compile Include="Handlers\NetModules\BestiaryHandler.cs" />
     <Compile Include="Handlers\NetModules\CreativePowerHandler.cs" />
     <Compile Include="Handlers\NetModules\CreativeUnlocksHandler.cs" />
     <Compile Include="Handlers\NetModules\INetModuleHandler.cs" />

From 77d04ca4ec003525f48c9e9bce8917eea5dce6b6 Mon Sep 17 00:00:00 2001
From: Chris <2648373+QuiCM@users.noreply.github.com>
Date: Tue, 2 Jun 2020 14:08:07 +0930
Subject: [PATCH 08/15] Message adjustment

---
 TShockAPI/Handlers/NetModules/CreativeUnlocksHandler.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/TShockAPI/Handlers/NetModules/CreativeUnlocksHandler.cs b/TShockAPI/Handlers/NetModules/CreativeUnlocksHandler.cs
index 39f83d67..97030945 100644
--- a/TShockAPI/Handlers/NetModules/CreativeUnlocksHandler.cs
+++ b/TShockAPI/Handlers/NetModules/CreativeUnlocksHandler.cs
@@ -48,7 +48,7 @@ namespace TShockAPI.Handlers.NetModules
 			if (UnknownField != 0)
 			{
 				TShock.Log.ConsoleDebug(
-					"CreativeUnlocksNetModuleHandler received non-vanilla unlock request. Random field value: {0} from {1}",
+					"CreativeUnlocksHandler received non-vanilla unlock request. Random field value: {0} but should be 0 from {1}",
 					UnknownField,
 					player.Name
 				);

From 0af69e2bf2a6f3c65f1f933bdfcbf3ec75c4ed5b Mon Sep 17 00:00:00 2001
From: Chris <2648373+QuiCM@users.noreply.github.com>
Date: Tue, 2 Jun 2020 14:17:13 +0930
Subject: [PATCH 09/15] Add ambience handler

---
 .../Handlers/NetModules/AmbienceHandler.cs    | 28 +++++++++++++++++++
 1 file changed, 28 insertions(+)
 create mode 100644 TShockAPI/Handlers/NetModules/AmbienceHandler.cs

diff --git a/TShockAPI/Handlers/NetModules/AmbienceHandler.cs b/TShockAPI/Handlers/NetModules/AmbienceHandler.cs
new file mode 100644
index 00000000..f4dd7420
--- /dev/null
+++ b/TShockAPI/Handlers/NetModules/AmbienceHandler.cs
@@ -0,0 +1,28 @@
+using System.IO;
+
+namespace TShockAPI.Handlers.NetModules
+{
+	/// <summary>
+	/// Rejects ambience new modules from clients
+	/// </summary>
+	internal class AmbienceHandler : INetModuleHandler
+	{
+		/// <summary>
+		/// No deserialization needed. This should never be received by the server
+		/// </summary>
+		/// <param name="data"></param>
+		public void Deserialize(MemoryStream data)
+		{
+		}
+
+		/// <summary>
+		/// This should never be received by the server
+		/// </summary>
+		/// <param name="player"></param>
+		/// <param name="rejectPacket"></param>
+		public void HandlePacket(TSPlayer player, out bool rejectPacket)
+		{
+			rejectPacket = true;
+		}
+	}
+}

From 961c6cd9bcdf4a8e7d04a996daccd3f65fea6ff9 Mon Sep 17 00:00:00 2001
From: Chris <2648373+QuiCM@users.noreply.github.com>
Date: Tue, 2 Jun 2020 14:18:22 +0930
Subject: [PATCH 10/15] Clean up NetModulePacketHandler a little

---
 .../NetModules/CreativeUnlocksHandler.cs      | 12 +++
 .../NetModules/NetModulePacketHandler.cs      | 89 +++++++------------
 TShockAPI/TShockAPI.csproj                    |  1 +
 3 files changed, 47 insertions(+), 55 deletions(-)

diff --git a/TShockAPI/Handlers/NetModules/CreativeUnlocksHandler.cs b/TShockAPI/Handlers/NetModules/CreativeUnlocksHandler.cs
index 97030945..77e9d6d2 100644
--- a/TShockAPI/Handlers/NetModules/CreativeUnlocksHandler.cs
+++ b/TShockAPI/Handlers/NetModules/CreativeUnlocksHandler.cs
@@ -1,5 +1,6 @@
 using System.IO;
 using System.IO.Streams;
+using Terraria;
 using Terraria.GameContent.NetModules;
 using Terraria.Net;
 
@@ -45,6 +46,17 @@ namespace TShockAPI.Handlers.NetModules
 		/// <param name="rejectPacket"></param>
 		public void HandlePacket(TSPlayer player, out bool rejectPacket)
 		{
+			if (!Main.GameModeInfo.IsJourneyMode)
+			{
+				TShock.Log.ConsoleDebug(
+					"NetModuleHandler received attempt to unlock sacrifice while not in journey mode from",
+					player.Name
+				);
+
+				rejectPacket = true;
+				return;
+			}
+
 			if (UnknownField != 0)
 			{
 				TShock.Log.ConsoleDebug(
diff --git a/TShockAPI/Handlers/NetModules/NetModulePacketHandler.cs b/TShockAPI/Handlers/NetModules/NetModulePacketHandler.cs
index 007c505b..8c1b2c8e 100644
--- a/TShockAPI/Handlers/NetModules/NetModulePacketHandler.cs
+++ b/TShockAPI/Handlers/NetModules/NetModulePacketHandler.cs
@@ -1,4 +1,6 @@
-using Terraria;
+using System;
+using System.Collections.Generic;
+using Terraria;
 using static TShockAPI.GetDataHandlers;
 
 namespace TShockAPI.Handlers.NetModules
@@ -8,6 +10,19 @@ namespace TShockAPI.Handlers.NetModules
 	/// </summary>
 	public class NetModulePacketHandler : IPacketHandler<LoadNetModuleEventArgs>
 	{
+		/// <summary>
+		/// Maps net module types to handlers for the net module type. Add to or edit this dictionary to customise handling
+		/// </summary>
+		public static Dictionary<NetModulesTypes, Type> NetModulesToHandlersMap = new Dictionary<NetModulesTypes, Type>
+		{
+			{ NetModulesTypes.CreativePowers,               typeof(CreativePowerHandler)    },
+			{ NetModulesTypes.CreativeUnlocksPlayerReport,  typeof(CreativeUnlocksHandler)  },
+			{ NetModulesTypes.TeleportPylon,                typeof(PylonHandler)            },
+			{ NetModulesTypes.Liquid,                       typeof(LiquidHandler)           },
+			{ NetModulesTypes.Bestiary,                     typeof(BestiaryHandler)         },
+			{ NetModulesTypes.Ambience,                     typeof(AmbienceHandler)         }
+		};
+
 		/// <summary>
 		/// Invoked when a load net module packet is received. This method picks a <see cref="INetModuleHandler"/> based on the
 		/// net module type being loaded, then forwards the data to the chosen handler to process
@@ -18,61 +33,25 @@ namespace TShockAPI.Handlers.NetModules
 		{
 			INetModuleHandler handler;
 
-			switch (args.ModuleType)
+			if (NetModulesToHandlersMap.ContainsKey(args.ModuleType))
 			{
-				case NetModulesTypes.CreativePowers:
-					{
-						handler = new CreativePowerHandler();
-						break;
-					}
-
-				case NetModulesTypes.CreativeUnlocksPlayerReport:
-					{
-						if (!Main.GameModeInfo.IsJourneyMode)
-						{
-							TShock.Log.ConsoleDebug(
-								"NetModuleHandler received attempt to unlock sacrifice while not in journey mode from",
-								args.Player.Name
-							);
-
-							args.Handled = true;
-							return;
-						}
-
-						handler = new CreativeUnlocksHandler();
-						break;
-					}
-				case NetModulesTypes.TeleportPylon:
-					{
-						handler = new PylonHandler();
-						break;
-					}
-				case NetModulesTypes.Liquid:
-					{
-						handler = new LiquidHandler();
-						break;
-					}
-				case NetModulesTypes.Bestiary:
-					{
-						handler = new BestiaryHandler();
-						break;
-					}
-				default:
-					{
-						// As of 1.4.x.x, this is now used for more things:
-						//	NetCreativePowersModule
-						//	NetCreativePowerPermissionsModule
-						//	NetLiquidModule
-						//	NetParticlesModule
-						//	NetPingModule
-						//	NetTeleportPylonModule
-						//	NetTextModule
-						// I (particles) have disabled the original return here, which means that we need to
-						// handle this more. In the interm, this unbreaks parts of vanilla. Originally
-						// we just blocked this because it was a liquid exploit.
-						args.Handled = false;
-						return;
-					}
+				handler = (INetModuleHandler)Activator.CreateInstance(NetModulesToHandlersMap[args.ModuleType]);
+			}
+			else
+			{
+				// As of 1.4.x.x, this is now used for more things:
+				//	NetCreativePowersModule
+				//	NetCreativePowerPermissionsModule
+				//	NetLiquidModule
+				//	NetParticlesModule
+				//	NetPingModule
+				//	NetTeleportPylonModule
+				//	NetTextModule
+				// I (particles) have disabled the original return here, which means that we need to
+				// handle this more. In the interm, this unbreaks parts of vanilla. Originally
+				// we just blocked this because it was a liquid exploit.
+				args.Handled = false;
+				return;
 			}
 
 			handler.Deserialize(args.Data);
diff --git a/TShockAPI/TShockAPI.csproj b/TShockAPI/TShockAPI.csproj
index 83c31374..bc26b96d 100644
--- a/TShockAPI/TShockAPI.csproj
+++ b/TShockAPI/TShockAPI.csproj
@@ -89,6 +89,7 @@
     <Compile Include="DB\TileManager.cs" />
     <Compile Include="Extensions\ExceptionExt.cs" />
     <Compile Include="Handlers\IPacketHandler.cs" />
+    <Compile Include="Handlers\NetModules\AmbienceHandler.cs" />
     <Compile Include="Handlers\NetModules\BestiaryHandler.cs" />
     <Compile Include="Handlers\NetModules\CreativePowerHandler.cs" />
     <Compile Include="Handlers\NetModules\CreativeUnlocksHandler.cs" />

From 292f310f692586c46daf8c9aa09e80faf8f8c1ea Mon Sep 17 00:00:00 2001
From: Chris <2648373+QuiCM@users.noreply.github.com>
Date: Tue, 2 Jun 2020 14:20:03 +0930
Subject: [PATCH 11/15] Publicise these handlers

---
 TShockAPI/Handlers/NetModules/AmbienceHandler.cs | 2 +-
 TShockAPI/Handlers/NetModules/BestiaryHandler.cs | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/TShockAPI/Handlers/NetModules/AmbienceHandler.cs b/TShockAPI/Handlers/NetModules/AmbienceHandler.cs
index f4dd7420..0252c0c3 100644
--- a/TShockAPI/Handlers/NetModules/AmbienceHandler.cs
+++ b/TShockAPI/Handlers/NetModules/AmbienceHandler.cs
@@ -5,7 +5,7 @@ namespace TShockAPI.Handlers.NetModules
 	/// <summary>
 	/// Rejects ambience new modules from clients
 	/// </summary>
-	internal class AmbienceHandler : INetModuleHandler
+	public class AmbienceHandler : INetModuleHandler
 	{
 		/// <summary>
 		/// No deserialization needed. This should never be received by the server
diff --git a/TShockAPI/Handlers/NetModules/BestiaryHandler.cs b/TShockAPI/Handlers/NetModules/BestiaryHandler.cs
index 372ce80f..6338b1ce 100644
--- a/TShockAPI/Handlers/NetModules/BestiaryHandler.cs
+++ b/TShockAPI/Handlers/NetModules/BestiaryHandler.cs
@@ -5,7 +5,7 @@ namespace TShockAPI.Handlers.NetModules
 	/// <summary>
 	/// Rejects client->server bestiary net modules as the client should never send this to the server
 	/// </summary>
-	internal class BestiaryHandler : INetModuleHandler
+	public class BestiaryHandler : INetModuleHandler
 	{
 		/// <summary>
 		/// No deserialization needed. This should never be received by the server

From c9b015027d409078869e4951b09dfe8078a5d30e Mon Sep 17 00:00:00 2001
From: Chris <2648373+QuiCM@users.noreply.github.com>
Date: Tue, 2 Jun 2020 14:20:49 +0930
Subject: [PATCH 12/15] Rename NetModulesTypes to NetModuleType

---
 TShockAPI/GetDataHandlers.cs                       |  8 ++++----
 .../Handlers/NetModules/NetModulePacketHandler.cs  | 14 +++++++-------
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/TShockAPI/GetDataHandlers.cs b/TShockAPI/GetDataHandlers.cs
index 52394f38..cc4174d0 100644
--- a/TShockAPI/GetDataHandlers.cs
+++ b/TShockAPI/GetDataHandlers.cs
@@ -1959,7 +1959,7 @@ namespace TShockAPI
 			/// <summary>
 			/// The type of net module being loaded
 			/// </summary>
-			public NetModulesTypes ModuleType { get; set; }
+			public NetModuleType ModuleType { get; set; }
 		}
 
 		/// <summary>
@@ -1967,7 +1967,7 @@ namespace TShockAPI
 		/// </summary>
 		public static HandlerList<LoadNetModuleEventArgs> LoadNetModule = new HandlerList<LoadNetModuleEventArgs>();
 
-		private static bool OnLoadNetModule(TSPlayer player, MemoryStream data, NetModulesTypes moduleType)
+		private static bool OnLoadNetModule(TSPlayer player, MemoryStream data, NetModuleType moduleType)
 		{
 			if (LoadNetModule == null)
 			{
@@ -3260,7 +3260,7 @@ namespace TShockAPI
 		{
 			short moduleId = args.Data.ReadInt16();
 
-			if (OnLoadNetModule(args.Player, args.Data, (NetModulesTypes)moduleId))
+			if (OnLoadNetModule(args.Player, args.Data, (NetModuleType)moduleId))
 			{
 				return true;
 			}
@@ -3779,7 +3779,7 @@ namespace TShockAPI
 			public bool Killed { get; internal set; }
 		}
 
-		public enum NetModulesTypes
+		public enum NetModuleType
 		{
 			Liquid,
 			Text,
diff --git a/TShockAPI/Handlers/NetModules/NetModulePacketHandler.cs b/TShockAPI/Handlers/NetModules/NetModulePacketHandler.cs
index 8c1b2c8e..9fe5c30f 100644
--- a/TShockAPI/Handlers/NetModules/NetModulePacketHandler.cs
+++ b/TShockAPI/Handlers/NetModules/NetModulePacketHandler.cs
@@ -13,14 +13,14 @@ namespace TShockAPI.Handlers.NetModules
 		/// <summary>
 		/// Maps net module types to handlers for the net module type. Add to or edit this dictionary to customise handling
 		/// </summary>
-		public static Dictionary<NetModulesTypes, Type> NetModulesToHandlersMap = new Dictionary<NetModulesTypes, Type>
+		public static Dictionary<NetModuleType, Type> NetModulesToHandlersMap = new Dictionary<NetModuleType, Type>
 		{
-			{ NetModulesTypes.CreativePowers,               typeof(CreativePowerHandler)    },
-			{ NetModulesTypes.CreativeUnlocksPlayerReport,  typeof(CreativeUnlocksHandler)  },
-			{ NetModulesTypes.TeleportPylon,                typeof(PylonHandler)            },
-			{ NetModulesTypes.Liquid,                       typeof(LiquidHandler)           },
-			{ NetModulesTypes.Bestiary,                     typeof(BestiaryHandler)         },
-			{ NetModulesTypes.Ambience,                     typeof(AmbienceHandler)         }
+			{ NetModuleType.CreativePowers,               typeof(CreativePowerHandler)    },
+			{ NetModuleType.CreativeUnlocksPlayerReport,  typeof(CreativeUnlocksHandler)  },
+			{ NetModuleType.TeleportPylon,                typeof(PylonHandler)            },
+			{ NetModuleType.Liquid,                       typeof(LiquidHandler)           },
+			{ NetModuleType.Bestiary,                     typeof(BestiaryHandler)         },
+			{ NetModuleType.Ambience,                     typeof(AmbienceHandler)         }
 		};
 
 		/// <summary>

From 93a7b0aafe8ebc8a7f73373b9d69c69c4a6fc34f Mon Sep 17 00:00:00 2001
From: Chris <2648373+QuiCM@users.noreply.github.com>
Date: Tue, 2 Jun 2020 17:05:36 +0930
Subject: [PATCH 13/15] Update changelog

---
 CHANGELOG.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 121cb25a..2b0c0914 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,7 +3,8 @@
 This is the rolling changelog for TShock for Terraria. Use past tense when adding new entries; sign your name off when you add or change something. This should primarily be things like user changes, not necessarily codebase changes unless it's really relevant or large.
 
 ## Upcoming Changes
-* Your change goes here!
+* New permission `tshock.tp.pylon` to enable teleporting via Teleportation Pylons (@QuiCM)
+* New permission `tshock.journey.research` to enable sharing research via item sacrifice (@QuiCM)
 
 ## TShock 4.4.0 (Pre-release 10)
 * Fix all rope coils. (@Olink)

From c7a6d044f4af28dcd7bdda88400979050f2d3464 Mon Sep 17 00:00:00 2001
From: Chris <2648373+QuiCM@users.noreply.github.com>
Date: Tue, 2 Jun 2020 17:19:00 +0930
Subject: [PATCH 14/15] Minor refactors

---
 TShockAPI/Bouncer.cs                            |  2 +-
 TShockAPI/GetDataHandlers.cs                    | 17 ++++++++---------
 .../Handlers/NetModules/CreativePowerHandler.cs |  4 ++--
 .../NetModules/CreativeUnlocksHandler.cs        |  3 +++
 .../NetModules/NetModulePacketHandler.cs        | 17 ++++-------------
 5 files changed, 18 insertions(+), 25 deletions(-)

diff --git a/TShockAPI/Bouncer.cs b/TShockAPI/Bouncer.cs
index fa928eb4..8bf5a11a 100644
--- a/TShockAPI/Bouncer.cs
+++ b/TShockAPI/Bouncer.cs
@@ -47,7 +47,7 @@ namespace TShockAPI
 			GetDataHandlers.SendTileSquare += STSHandler.OnReceive;
 
 			NetModuleHandler = new Handlers.NetModules.NetModulePacketHandler();
-			GetDataHandlers.LoadNetModule += NetModuleHandler.OnReceive;
+			GetDataHandlers.ReadNetModule += NetModuleHandler.OnReceive;
 
 			// Setup hooks
 			GetDataHandlers.GetSection += OnGetSection;
diff --git a/TShockAPI/GetDataHandlers.cs b/TShockAPI/GetDataHandlers.cs
index cc4174d0..a39c3aa6 100644
--- a/TShockAPI/GetDataHandlers.cs
+++ b/TShockAPI/GetDataHandlers.cs
@@ -1954,7 +1954,7 @@ namespace TShockAPI
 		/// <summary>
 		/// Used when a net module is loaded
 		/// </summary>
-		public class LoadNetModuleEventArgs : GetDataHandledEventArgs
+		public class ReadNetModuleEventArgs : GetDataHandledEventArgs
 		{
 			/// <summary>
 			/// The type of net module being loaded
@@ -1963,25 +1963,25 @@ namespace TShockAPI
 		}
 
 		/// <summary>
-		/// Called when a net module is loaded
+		/// Called when a net module is received
 		/// </summary>
-		public static HandlerList<LoadNetModuleEventArgs> LoadNetModule = new HandlerList<LoadNetModuleEventArgs>();
+		public static HandlerList<ReadNetModuleEventArgs> ReadNetModule = new HandlerList<ReadNetModuleEventArgs>();
 
 		private static bool OnLoadNetModule(TSPlayer player, MemoryStream data, NetModuleType moduleType)
 		{
-			if (LoadNetModule == null)
+			if (ReadNetModule == null)
 			{
 				return false;
 			}
 
-			var args = new LoadNetModuleEventArgs
+			var args = new ReadNetModuleEventArgs
 			{
 				Player = player,
 				Data = data,
 				ModuleType = moduleType
 			};
 
-			LoadNetModule.Invoke(null, args);
+			ReadNetModule.Invoke(null, args);
 			return args.Handled;
 		}
 
@@ -2242,11 +2242,10 @@ namespace TShockAPI
 
 			else if ((Main.ServerSideCharacter) && (args.Player.sX > 0) && (args.Player.sY > 0) && (args.TPlayer.SpawnX > 0) && ((args.TPlayer.SpawnX != args.Player.sX) && (args.TPlayer.SpawnY != args.Player.sY)))
 			{
-
 				args.Player.sX = args.TPlayer.SpawnX;
 				args.Player.sY = args.TPlayer.SpawnY;
 
-				if (((Main.tile[args.Player.sX, args.Player.sY - 1].active() && Main.tile[args.Player.sX, args.Player.sY - 1].type == 79)) && (WorldGen.StartRoomCheck(args.Player.sX, args.Player.sY - 1)))
+				if (((Main.tile[args.Player.sX, args.Player.sY - 1].active() && Main.tile[args.Player.sX, args.Player.sY - 1].type == TileID.Beds)) && (WorldGen.StartRoomCheck(args.Player.sX, args.Player.sY - 1)))
 				{
 					args.Player.Teleport(args.Player.sX * 16, (args.Player.sY * 16) - 48);
 					TShock.Log.ConsoleDebug("GetDataHandlers / HandleSpawn force teleport phase 1 {0}", args.Player.Name);
@@ -2255,7 +2254,7 @@ namespace TShockAPI
 
 			else if ((Main.ServerSideCharacter) && (args.Player.sX > 0) && (args.Player.sY > 0))
 			{
-				if (((Main.tile[args.Player.sX, args.Player.sY - 1].active() && Main.tile[args.Player.sX, args.Player.sY - 1].type == 79)) && (WorldGen.StartRoomCheck(args.Player.sX, args.Player.sY - 1)))
+				if (((Main.tile[args.Player.sX, args.Player.sY - 1].active() && Main.tile[args.Player.sX, args.Player.sY - 1].type == TileID.Beds)) && (WorldGen.StartRoomCheck(args.Player.sX, args.Player.sY - 1)))
 				{
 					args.Player.Teleport(args.Player.sX * 16, (args.Player.sY * 16) - 48);
 					TShock.Log.ConsoleDebug("GetDataHandlers / HandleSpawn force teleport phase 2 {0}", args.Player.Name);
diff --git a/TShockAPI/Handlers/NetModules/CreativePowerHandler.cs b/TShockAPI/Handlers/NetModules/CreativePowerHandler.cs
index 06e43107..470890d1 100644
--- a/TShockAPI/Handlers/NetModules/CreativePowerHandler.cs
+++ b/TShockAPI/Handlers/NetModules/CreativePowerHandler.cs
@@ -31,7 +31,7 @@ namespace TShockAPI.Handlers.NetModules
 		/// <param name="rejectPacket"></param>
 		public void HandlePacket(TSPlayer player, out bool rejectPacket)
 		{
-			if (!CheckPermission(PowerType, player))
+			if (!HasPermission(PowerType, player))
 			{
 				rejectPacket = true;
 				return;
@@ -46,7 +46,7 @@ namespace TShockAPI.Handlers.NetModules
 		/// <param name="powerType"></param>
 		/// <param name="player"></param>
 		/// <returns></returns>
-		public static bool CheckPermission(CreativePowerTypes powerType, TSPlayer player)
+		public static bool HasPermission(CreativePowerTypes powerType, TSPlayer player)
 		{
 			if (!PowerToPermissionMap.ContainsKey(powerType))
 			{
diff --git a/TShockAPI/Handlers/NetModules/CreativeUnlocksHandler.cs b/TShockAPI/Handlers/NetModules/CreativeUnlocksHandler.cs
index 77e9d6d2..68fe4f1a 100644
--- a/TShockAPI/Handlers/NetModules/CreativeUnlocksHandler.cs
+++ b/TShockAPI/Handlers/NetModules/CreativeUnlocksHandler.cs
@@ -30,6 +30,9 @@ namespace TShockAPI.Handlers.NetModules
 		/// <param name="data"></param>
 		public void Deserialize(MemoryStream data)
 		{
+			// For whatever reason Terraria writes '0' to the stream at the beginning of this packet.
+			// If this value is not 0 then its been crafted by a non-vanilla client.
+			// We don't actually know why the 0 is written, so we're just going to call this UnknownField for now
 			UnknownField = data.ReadInt8();
 			if (UnknownField == 0)
 			{
diff --git a/TShockAPI/Handlers/NetModules/NetModulePacketHandler.cs b/TShockAPI/Handlers/NetModules/NetModulePacketHandler.cs
index 9fe5c30f..16d58640 100644
--- a/TShockAPI/Handlers/NetModules/NetModulePacketHandler.cs
+++ b/TShockAPI/Handlers/NetModules/NetModulePacketHandler.cs
@@ -8,7 +8,7 @@ namespace TShockAPI.Handlers.NetModules
 	/// <summary>
 	/// Handles packet 82 - Load Net Module packets
 	/// </summary>
-	public class NetModulePacketHandler : IPacketHandler<LoadNetModuleEventArgs>
+	public class NetModulePacketHandler : IPacketHandler<ReadNetModuleEventArgs>
 	{
 		/// <summary>
 		/// Maps net module types to handlers for the net module type. Add to or edit this dictionary to customise handling
@@ -29,7 +29,7 @@ namespace TShockAPI.Handlers.NetModules
 		/// </summary>
 		/// <param name="sender"></param>
 		/// <param name="args"></param>
-		public void OnReceive(object sender, LoadNetModuleEventArgs args)
+		public void OnReceive(object sender, ReadNetModuleEventArgs args)
 		{
 			INetModuleHandler handler;
 
@@ -39,17 +39,8 @@ namespace TShockAPI.Handlers.NetModules
 			}
 			else
 			{
-				// As of 1.4.x.x, this is now used for more things:
-				//	NetCreativePowersModule
-				//	NetCreativePowerPermissionsModule
-				//	NetLiquidModule
-				//	NetParticlesModule
-				//	NetPingModule
-				//	NetTeleportPylonModule
-				//	NetTextModule
-				// I (particles) have disabled the original return here, which means that we need to
-				// handle this more. In the interm, this unbreaks parts of vanilla. Originally
-				// we just blocked this because it was a liquid exploit.
+				// We don't have handlers for NetModuleType.Ping and NetModuleType.Particles.
+				// These net modules are fairly innocuous and can be processed normally by the game
 				args.Handled = false;
 				return;
 			}

From 21b51c577c0fe3f12fd14d540c184ca1c82d9e01 Mon Sep 17 00:00:00 2001
From: Chris <2648373+QuiCM@users.noreply.github.com>
Date: Tue, 2 Jun 2020 17:26:32 +0930
Subject: [PATCH 15/15] This one should use 'Read' instead of 'Load' as well

---
 TShockAPI/GetDataHandlers.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/TShockAPI/GetDataHandlers.cs b/TShockAPI/GetDataHandlers.cs
index a39c3aa6..a6c08a50 100644
--- a/TShockAPI/GetDataHandlers.cs
+++ b/TShockAPI/GetDataHandlers.cs
@@ -1967,7 +1967,7 @@ namespace TShockAPI
 		/// </summary>
 		public static HandlerList<ReadNetModuleEventArgs> ReadNetModule = new HandlerList<ReadNetModuleEventArgs>();
 
-		private static bool OnLoadNetModule(TSPlayer player, MemoryStream data, NetModuleType moduleType)
+		private static bool OnReadNetModule(TSPlayer player, MemoryStream data, NetModuleType moduleType)
 		{
 			if (ReadNetModule == null)
 			{
@@ -3259,7 +3259,7 @@ namespace TShockAPI
 		{
 			short moduleId = args.Data.ReadInt16();
 
-			if (OnLoadNetModule(args.Player, args.Data, (NetModuleType)moduleId))
+			if (OnReadNetModule(args.Player, args.Data, (NetModuleType)moduleId))
 			{
 				return true;
 			}