v1.2.1 - Removed net code (wtf!)

Author: hamstar0

MountedMagicMirrors/MyCustomPlayer.cs

@@ -9,7 +9,6 @@
 using ModLibsCore.Libraries.DotNET.Extensions;
 using ModLibsCore.Libraries.TModLoader;
 using ModLibsCore.Libraries.World;
-using MountedMagicMirrors.Net;
 using MountedMagicMirrors.DataStructures;
 
 
@@ -51,97 +50,15 @@ public DiscoveredMirrors CurrentWorldDiscoveredMirrorTiles {
 
 
 
-		////////////////
-
-		internal void OnCurrentClientEnter() {
-			PlayerDataProtocol.Broadcast( this.DiscoveredMirrorTilesPerWorld );
-		}
-
-		/*public override void SyncPlayer( int toWho, int fromWho, bool newPlayer ) {
-			if( Main.netMode == 1 ) {
-				if( newPlayer ) {
-					//PlayerDataProtocol.SendToServer( this.DiscoveredMirrorTilesPerWorld );
-					PlayerDataProtocol.Broadcast( this.DiscoveredMirrorTilesPerWorld );
-				}
-			} else {
-				//PlayerDataProtocol.SendToClients( toWho, fromWho, this.DiscoveredMirrorTilesPerWorld );
-			}
-		}*/
-
-		public override void clientClone( ModPlayer clientClone ) {
-			var myclone = (MMMPlayer)clientClone;
-
-			myclone._CurrentWorldDiscoveredMirrorTiles = null;
-
-			foreach( (string worldUid, DiscoveredMirrors mirrors) in this.DiscoveredMirrorTilesPerWorld ) {
-				myclone.DiscoveredMirrorTilesPerWorld[worldUid] = new DiscoveredMirrors();
-
-				foreach( (int tileX, ISet<int> tileYs) in mirrors ) {
-					myclone.DiscoveredMirrorTilesPerWorld[worldUid][tileX] = new HashSet<int>( tileYs );
-				}
-			}
-		}
-
-		////////////////
-
-		public override void SendClientChanges( ModPlayer clientPlayer ) {
-			if( clientPlayer.player.whoAmI != Main.myPlayer ) {
-				return;
-			}
-
-			var myclone = (MMMPlayer)clientPlayer;
-			var thisDict = this.DiscoveredMirrorTilesPerWorld;
-			var thatDict = myclone.DiscoveredMirrorTilesPerWorld;
-
-			if( !DiscoveredMirrors.WorldMirrorsEquals(thisDict, thatDict) ) {
-				if( Main.netMode == NetmodeID.MultiplayerClient ) {
-					PlayerDataProtocol.Broadcast( this.DiscoveredMirrorTilesPerWorld );
-				}
-				else {
-					//PlayerDataProtocol.SendToClients( -1, -1, this.DiscoveredMirrorTilesPerWorld );
-				}
-			}
-		}
-
-
 		////////////////
 
 		public override void Load( TagCompound tag ) {
-			int count = 0;
+			this.DiscoveredMirrorTilesPerWorld.Clear();
 
 			if( !tag.ContainsKey("world_count") ) {
-				if( tag.ContainsKey( "discovery_count" ) ) {
-					this.DiscoveredMirrorTilesPerWorld.Clear();
-					count = this.LoadOld( tag );
-				}
-			} else {
-				this.DiscoveredMirrorTilesPerWorld.Clear();
-				count = this.LoadNew( tag );
-			}
-
-			LogLibraries.Log( "Loaded "+count+" discovered mirrors for "+this.player.name+" ("+this.player.whoAmI+")" );
-		}
-
-		private int LoadOld( TagCompound tag ) {
-			int count = tag.GetInt( "discovery_count" );
-
-			this.DiscoveredMirrorTilesPerWorld["_"] = new DiscoveredMirrors();
-
-			for( int i = 0; i < count; i++ ) {
-				int tileX = tag.GetInt( "discovery_x_" + i );
-				int tileY = tag.GetInt( "discovery_y_" + i );
-
-				this.DiscoveredMirrorTilesPerWorld["_"].Set2D( tileX, tileY );
-				
-				if( MMMConfig.Instance.DebugModeInfo ) {
-					LogLibraries.Log( "(Old) Loaded mirror at " + tileX + ", " + tileY );
-				}
+				return;
 			}
 
-			return count;
-		}
-
-		private int LoadNew( TagCompound tag ) {
 			int worldCount = tag.GetInt( "world_count" );
 			int totalMirrorCount = 0;
 
@@ -165,7 +82,7 @@ private int LoadNew( TagCompound tag ) {
 				totalMirrorCount += mirrorCount;
 			}
 
-			return totalMirrorCount;
+			LogLibraries.Log( "Loaded "+totalMirrorCount+" discovered mirrors for "+this.player.name+" ("+this.player.whoAmI+")" );
 		}
 
 
@@ -184,6 +101,7 @@ public override TagCompound Save() {
 				string myWorldUid = worldUid;
 				if( worldUid == "_" ) {
 					myWorldUid = WorldIdentityLibraries.GetUniqueIdForCurrentWorld( true );
+
 					if( MMMConfig.Instance.DebugModeInfo ) {
 						LogLibraries.Log( "Saving for world UID " + myWorldUid );
 					}

MountedMagicMirrors/MyPlayer.cs

@@ -1,6 +1,5 @@
 using System;
 using System.Collections.Generic;
-using System.Collections.Concurrent;
 using System.Linq;
 using Microsoft.Xna.Framework;
 using Terraria;
@@ -10,7 +9,6 @@
 using ModLibsGeneral.Libraries.Players;
 using ModLibsTiles.Libraries.Tiles;
 using MountedMagicMirrors.Tiles;
-using MountedMagicMirrors.DataStructures;
 
 
 namespace MountedMagicMirrors {
@@ -51,12 +49,6 @@ partial class MMMPlayer : ModPlayer {
 
 		////
 
-		internal void SetDiscoveredMirrorsFromNetwork( ConcurrentDictionary<string, DiscoveredMirrors> mirrors ) {
-			this.DiscoveredMirrorTilesPerWorld = mirrors;
-		}
-
-		////
-
 		public void ClearInvalidMirrorDiscoveries() {
 			if( this.CurrentWorldDiscoveredMirrorTiles == null ) {
 				return;

MountedMagicMirrors/MyPlayer_Mirrors.cs

@@ -1,6 +1,6 @@
 displayName = Mounted Magic Mirrors
 author = hamstar
-version = 1.2.0
+version = 1.2.1
 modReferences = ModLibsCore@1.0.0, ModLibsGeneral@1.0.0, ModLibsNet@1.0.0, ModLibsTiles@1.0.0
 buildIgnore = *.csproj, *.user, *.bat, obj\*, bin\*, .vs\*, .git\*
 homepage = https://forums.terraria.org/index.php?threads/mounted-magic-mirrors-fast-travel.83296/