v1.1.3.2 - Added tile section mapping for client to know if mirrors work

Author: hamstar0

MountedMagicMirrors/MyMod.cs

@@ -1,14 +1,16 @@
-using HamstarHelpers.Classes.Tiles.TilePattern;
-using HamstarHelpers.Helpers.Debug;
-using HamstarHelpers.Helpers.TModLoader.Mods;
-using Microsoft.Xna.Framework.Graphics;
-using MountedMagicMirrors.Tiles;
 using System;
 using System.Collections.Generic;
+using System.IO;
+using Microsoft.Xna.Framework.Graphics;
 using Terraria;
 using Terraria.ID;
 using Terraria.Localization;
 using Terraria.ModLoader;
+using HamstarHelpers.Classes.Tiles.TilePattern;
+using HamstarHelpers.Helpers.Debug;
+using HamstarHelpers.Helpers.TModLoader.Mods;
+using HamstarHelpers.Services.Network;
+using MountedMagicMirrors.Tiles;
 
 
 namespace MountedMagicMirrors {
@@ -56,6 +58,17 @@ public override void PostSetupContent() {
 			if( Main.netMode != 2 && !Main.dedServ ) {
 				this.MirrorTex = this.GetTexture( "Items/MountableMagicMirrorTileItem" );
 			}
+
+			//
+
+			void onTileSectionPacketGet( int tileX, int tileY, int width, int height, BinaryReader data ) {
+				var myworld = ModContent.GetInstance<MMMWorld>();
+				myworld.RegisterTileSectionTile( tileX, tileY );
+			}
+
+			//
+
+			Client.SubscribeToTileSectionPackets( onTileSectionPacketGet );
 		}
 
 		public override void Unload() {

MountedMagicMirrors/MyMod_Draw.cs

@@ -79,14 +79,10 @@ public void DrawMirrorOnFullscreenMap( int tileX, int tileY, bool isTarget ) {
 			int wldBaseY = ((tileY + 1) << 4) + 8;
 			var wldPos = new Vector2(wldBaseX, wldBaseY);
 
-			//var overMapData = HUDMapHelpers.GetFullMapPositionAsScreenPosition( wldPos );
-			//
-			//if( overMapData.IsOnScreen ) {
-			//	Vector2 scrPos = overMapData.ScreenPosition;
-			Tuple<Vector2, bool> overMapData = HUDMapHelpers.GetFullMapScreenPosition( wldPos );
-
-			if( overMapData.Item2 ) {
-				Vector2 scrPos = overMapData.Item1;
+			var overMapData = HUDMapHelpers.GetFullMapPositionAsScreenPosition( wldPos );
+
+			if( overMapData.IsOnScreen ) {
+				Vector2 scrPos = overMapData.ScreenPosition;
 
 				Main.spriteBatch.Draw(
 					texture: tex,

MountedMagicMirrors/MyPlayer_Mirrors.cs

@@ -1,9 +1,9 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using Microsoft.Xna.Framework;
 using Terraria.ModLoader;
 using Terraria;
-using Microsoft.Xna.Framework;
 using HamstarHelpers.Helpers.Debug;
 using HamstarHelpers.Helpers.DotNET.Extensions;
 using HamstarHelpers.Helpers.Players;
@@ -15,16 +15,17 @@ namespace MountedMagicMirrors {
 	partial class MMMPlayer : ModPlayer {
 		public static bool? IsMirrorTileInvalid( int tileX, int tileY ) {
 			if( Main.netMode == 1 ) {
-				if( !TileChunkHelpers.IsTileSyncedForCurrentClient( tileX, tileY ) ) {
-					Tile tile = Main.tile[tileX, tileY];
-					if( tile == null ) {
-						return null;
-					}
+				var myworld = ModContent.GetInstance<MMMWorld>();
+				if( !myworld.IsTileLoaded(tileX, tileY) ) {
+					return null;
+				}
 
-					if( TileHelpers.IsEqual( tile, new Tile() ) ) {
+				/*if( !TileChunkHelpers.IsTileSyncedForCurrentClient( tileX, tileY ) ) {
+					Tile tile = Main.tile[tileX, tileY];
+					if( tile == null || TileHelpers.IsEqual(tile, new Tile()) ) {
 						return null;
 					}
-				}
+				}*/
 			}
 
 			return !MountedMagicMirrorsMod.Instance.MMMTilePattern.Check( tileX, tileY );

MountedMagicMirrors/MyPlayer_Update.cs

@@ -1,7 +1,7 @@
 using System;
 using Microsoft.Xna.Framework;
-using Terraria.ModLoader;
 using Terraria;
+using Terraria.ModLoader;
 using HamstarHelpers.Helpers.Debug;
 using HamstarHelpers.Helpers.DotNET.Extensions;
 

MountedMagicMirrors/MyWorld_TileSectionMap.cs

@@ -0,0 +1,30 @@
+using System;
+using System.Collections.Generic;
+using Terraria;
+using Terraria.ModLoader;
+using HamstarHelpers.Helpers.Debug;
+using HamstarHelpers.Helpers.DotNET.Extensions;
+
+
+namespace MountedMagicMirrors {
+	partial class MMMWorld : ModWorld {
+		private IDictionary<int, ISet<int>> TileSectionMapByTile = new Dictionary<int, ISet<int>>();
+
+
+
+		////////////////
+
+		public void RegisterTileSectionTile( int tileX, int tileY ) {
+			this.TileSectionMapByTile.Set2D( tileX, tileY );
+		}
+
+		////
+
+		public bool IsTileLoaded( int tileX, int tileY ) {
+			int sectionX = Netplay.GetSectionX( tileX );
+			int sectionY = Netplay.GetSectionY( tileY );
+
+			return this.TileSectionMapByTile.Contains2D( sectionX, sectionY );
+		}
+	}
+}

MountedMagicMirrors/MyWorld.cs renamed to MountedMagicMirrors/MyWorld_WorldGen.cs

@@ -8,7 +8,7 @@
 
 
 namespace MountedMagicMirrors {
-	class MMMWorld : ModWorld {
+	partial class MMMWorld : ModWorld {
 		public override void ModifyWorldGenTasks( List<GenPass> tasks, ref float totalWeight ) {
 			if( !MMMConfig.Instance.GenerateMountedMirrorsForNewWorlds ) {
 				return;
@@ -35,7 +35,7 @@ public override void ModifyWorldGenTasks( List<GenPass> tasks, ref float totalWe
 				break;
 			}
 
-			tasks.Add( new MountedMirrorsGenPass(mirrors) );
+			tasks.Add( new MountedMirrorsGenPass( mirrors ) );
 		}
 	}
 }

MountedMagicMirrors/build.txt

@@ -1,6 +1,6 @@
 displayName = Mounted Magic Mirrors
 author = hamstar
-version = 1.1.3.1
-modReferences = HamstarHelpers@5.5.1
+version = 1.1.3.2
+modReferences = HamstarHelpers@5.6.1
 buildIgnore = *.csproj, *.user, *.bat, obj\*, bin\*, .vs\*, .git\*
 homepage = https://forums.terraria.org/index.php?threads/mounted-magic-mirrors-fast-travel.83296/