Updated to tModLoader v0.11.5

blushiemagic · blushiemagic · commit e0ffeed9362b · 2019-10-24T17:29:40.000-07:00
diff --git a/BlockRecipes.cs b/BlockRecipes.cs
@@ -19,7 +19,7 @@ public override bool RecipeAvailable(Recipe recipe)
 			try
 			{
 				Player player = Main.player[Main.myPlayer];
-				StoragePlayer modPlayer = player.GetModPlayer<StoragePlayer>(mod);
+				StoragePlayer modPlayer = player.GetModPlayer<StoragePlayer>();
 				Point16 storageAccess = modPlayer.ViewingStorage();
 				return storageAccess.X < 0 || storageAccess.Y < 0;
 			}
diff --git a/Components/RemoteAccess.cs b/Components/RemoteAccess.cs
@@ -34,7 +34,7 @@ public override TEStorageHeart GetHeart(int i, int j)
 			return ((TERemoteAccess)ent).GetHeart();
 		}
 
-		public override void RightClick(int i, int j)
+		public override bool NewRightClick(int i, int j)
 		{
 			Player player = Main.player[Main.myPlayer];
 			Item item = player.inventory[player.selectedItem];
@@ -48,7 +48,6 @@ public override void RightClick(int i, int j)
 				{
 					j--;
 				}
-				player.tileInteractionHappened = true;
 				TERemoteAccess ent = (TERemoteAccess)TileEntity.ByPosition[new Point16(i, j)];
 				Locator locator = (Locator)item.modItem;
 				string message;
@@ -68,10 +67,11 @@ public override void RightClick(int i, int j)
 					Main.mouseItem = item.Clone();
 				}
 				Main.NewText(message);
+                return true;
 			}
 			else
 			{
-				base.RightClick(i, j);
+				return base.NewRightClick(i, j);
 			}
 		}
 	}
diff --git a/Components/StorageAccess.cs b/Components/StorageAccess.cs
@@ -48,7 +48,7 @@ public override void MouseOver(int i, int j)
 			player.noThrow = 2;
 		}
 
-		public override void RightClick(int i, int j)
+		public override bool NewRightClick(int i, int j)
 		{
 			if (Main.tile[i, j].frameX % 36 == 18)
 			{
@@ -61,12 +61,10 @@ public override void RightClick(int i, int j)
 			Player player = Main.player[Main.myPlayer];
 			if (GetHeart(i, j) == null)
 			{
-				player.tileInteractionHappened = true;
 				Main.NewText("This access is not connected to a Storage Heart!");
-				return;
+				return true;
 			}
-			StoragePlayer modPlayer = player.GetModPlayer<StoragePlayer>(mod);
-			player.tileInteractionHappened = true;
+			StoragePlayer modPlayer = player.GetModPlayer<StoragePlayer>();
 			Main.mouseRightRelease = false;
 			if (player.sign > -1)
 			{
@@ -117,6 +115,7 @@ public override void RightClick(int i, int j)
 				Main.PlaySound(hadChestOpen || hadOtherOpen ? 12 : 10, -1, -1, 1);
 				Recipe.FindRecipes();
 			}
+            return true;
 		}
 
 		public override void PostDraw(int i, int j, SpriteBatch spriteBatch)
diff --git a/Components/StorageHeart.cs b/Components/StorageHeart.cs
@@ -33,7 +33,7 @@ public override TEStorageHeart GetHeart(int i, int j)
 			return (TEStorageHeart)TileEntity.ByPosition[new Point16(i, j)];
 		}
 
-		public override void RightClick(int i, int j)
+		public override bool NewRightClick(int i, int j)
 		{
 			Player player = Main.player[Main.myPlayer];
 			Item item = player.inventory[player.selectedItem];
@@ -47,18 +47,18 @@ public override void RightClick(int i, int j)
 				{
 					j--;
 				}
-				player.tileInteractionHappened = true;
 				Locator locator = (Locator)item.modItem;
 				locator.location = new Point16(i, j);
 				if (player.selectedItem == 58)
 				{
 					Main.mouseItem = item.Clone();
 				}
 				Main.NewText("Locator successfully set to: X=" + i + ", Y=" + j);
+                return true;
 			}
 			else
 			{
-				base.RightClick(i, j);
+				return base.NewRightClick(i, j);
 			}
 		}
 	}
diff --git a/Components/StorageUnit.cs b/Components/StorageUnit.cs
@@ -78,7 +78,7 @@ public override void KillTile(int i, int j, ref bool fail, ref bool effectOnly,
 			}
 		}
 
-		public override void RightClick(int i, int j)
+		public override bool NewRightClick(int i, int j)
 		{
 			if (Main.tile[i, j].frameX % 36 == 18)
 			{
@@ -90,14 +90,14 @@ public override void RightClick(int i, int j)
 			}
 			if (TryUpgrade(i, j))
 			{
-				Main.player[Main.myPlayer].tileInteractionHappened = true;
-				return;
+				return true;
 			}
 			TEStorageUnit storageUnit = (TEStorageUnit)TileEntity.ByPosition[new Point16(i, j)];
 			Main.player[Main.myPlayer].tileInteractionHappened = true;
 			string activeString = storageUnit.Inactive ? "Inactive" : "Active";
 			string fullnessString = storageUnit.NumItems + " / " + storageUnit.Capacity + " Items";
 			Main.NewText(activeString + ", " + fullnessString);
+            return base.NewRightClick(i, j);
 		}
 
 		private bool TryUpgrade(int i, int j)
diff --git a/CraftingGUI.cs b/CraftingGUI.cs
@@ -425,7 +425,7 @@ public static void Update(GameTime gameTime)
 		{try{
 			oldMouse = StorageGUI.oldMouse;
 			curMouse = StorageGUI.curMouse;
-			if (Main.playerInventory && Main.player[Main.myPlayer].GetModPlayer<StoragePlayer>(MagicStorage.Instance).ViewingStorage().X >= 0 && StoragePlayer.IsStorageCrafting())
+			if (Main.playerInventory && Main.player[Main.myPlayer].GetModPlayer<StoragePlayer>().ViewingStorage().X >= 0 && StoragePlayer.IsStorageCrafting())
 			{
 				if (curMouse.RightButton == ButtonState.Released)
 				{
@@ -453,7 +453,7 @@ public static void Update(GameTime gameTime)
 		public static void Draw(TEStorageHeart heart)
 		{try{
 			Player player = Main.player[Main.myPlayer];
-			StoragePlayer modPlayer = player.GetModPlayer<StoragePlayer>(MagicStorage.Instance);
+			StoragePlayer modPlayer = player.GetModPlayer<StoragePlayer>();
 			Initialize();
 			if (Main.mouseX > panelLeft && Main.mouseX < recipeLeft + panelWidth && Main.mouseY > panelTop && Main.mouseY < panelTop + panelHeight)
 			{
diff --git a/InterfaceHelper.cs b/InterfaceHelper.cs
@@ -34,7 +34,7 @@ public static void ModifyInterfaceLayers(List<GameInterfaceLayer> layers)
 		public static bool DrawStorageGUI()
 		{
 			Player player = Main.player[Main.myPlayer];
-			StoragePlayer modPlayer = player.GetModPlayer<StoragePlayer>(MagicStorage.Instance);
+			StoragePlayer modPlayer = player.GetModPlayer<StoragePlayer>();
 			Point16 storageAccess = modPlayer.ViewingStorage();
 			if (!Main.playerInventory || storageAccess.X < 0 || storageAccess.Y < 0)
 			{
diff --git a/Items/PortableAccess.cs b/Items/PortableAccess.cs
@@ -67,7 +67,7 @@ public override bool UseItem(Player player)
 
 		private void OpenStorage(Player player)
 		{
-			StoragePlayer modPlayer = player.GetModPlayer<StoragePlayer>(mod);
+			StoragePlayer modPlayer = player.GetModPlayer<StoragePlayer>();
 			if (player.sign > -1)
 			{
 				Main.PlaySound(11, -1, -1, 1);
diff --git a/StorageGUI.cs b/StorageGUI.cs
@@ -241,7 +241,7 @@ public static void Update(GameTime gameTime)
 		{
 			oldMouse = curMouse;
 			curMouse = Mouse.GetState();
-			if (Main.playerInventory && Main.player[Main.myPlayer].GetModPlayer<StoragePlayer>(MagicStorage.Instance).ViewingStorage().X >= 0 && !StoragePlayer.IsStorageCrafting())
+			if (Main.playerInventory && Main.player[Main.myPlayer].GetModPlayer<StoragePlayer>().ViewingStorage().X >= 0 && !StoragePlayer.IsStorageCrafting())
 			{
 				if (StorageGUI.curMouse.RightButton == ButtonState.Released)
 				{
@@ -263,7 +263,7 @@ public static void Update(GameTime gameTime)
 		public static void Draw(TEStorageHeart heart)
 		{
 			Player player = Main.player[Main.myPlayer];
-			StoragePlayer modPlayer = player.GetModPlayer<StoragePlayer>(MagicStorage.Instance);
+			StoragePlayer modPlayer = player.GetModPlayer<StoragePlayer>();
 			Initialize();
 			if (Main.mouseX > panelLeft && Main.mouseX < panelLeft + panelWidth && Main.mouseY > panelTop && Main.mouseY < panelTop + panelHeight)
 			{

Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ public override bool RecipeAvailable(Recipe recipe)`
`19`	`19`	`try`
`20`	`20`	`{`
`21`	`21`	`Player player = Main.player[Main.myPlayer];`
`22`		`- StoragePlayer modPlayer = player.GetModPlayer<StoragePlayer>(mod);`
	`22`	`+ StoragePlayer modPlayer = player.GetModPlayer<StoragePlayer>();`
`23`	`23`	`Point16 storageAccess = modPlayer.ViewingStorage();`
`24`	`24`	`return storageAccess.X < 0 \|\| storageAccess.Y < 0;`
`25`	`25`	`}`
Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ public override TEStorageHeart GetHeart(int i, int j)`
`34`	`34`	`return ((TERemoteAccess)ent).GetHeart();`
`35`	`35`	`}`
`36`	`36`
`37`		`- public override void RightClick(int i, int j)`
	`37`	`+ public override bool NewRightClick(int i, int j)`
`38`	`38`	`{`
`39`	`39`	`Player player = Main.player[Main.myPlayer];`
`40`	`40`	`Item item = player.inventory[player.selectedItem];`
`@@ -48,7 +48,6 @@ public override void RightClick(int i, int j)`
`48`	`48`	`{`
`49`	`49`	`j--;`
`50`	`50`	`}`
`51`		`- player.tileInteractionHappened = true;`
`52`	`51`	`TERemoteAccess ent = (TERemoteAccess)TileEntity.ByPosition[new Point16(i, j)];`
`53`	`52`	`Locator locator = (Locator)item.modItem;`
`54`	`53`	`string message;`
`@@ -68,10 +67,11 @@ public override void RightClick(int i, int j)`
`68`	`67`	`Main.mouseItem = item.Clone();`
`69`	`68`	`}`
`70`	`69`	`Main.NewText(message);`
	`70`	`+ return true;`
`71`	`71`	`}`
`72`	`72`	`else`
`73`	`73`	`{`
`74`		`- base.RightClick(i, j);`
	`74`	`+ return base.NewRightClick(i, j);`
`75`	`75`	`}`
`76`	`76`	`}`
`77`	`77`	`}`
Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,7 @@ public override void MouseOver(int i, int j)`
`48`	`48`	`player.noThrow = 2;`
`49`	`49`	`}`
`50`	`50`
`51`		`- public override void RightClick(int i, int j)`
	`51`	`+ public override bool NewRightClick(int i, int j)`
`52`	`52`	`{`
`53`	`53`	`if (Main.tile[i, j].frameX % 36 == 18)`
`54`	`54`	`{`
`@@ -61,12 +61,10 @@ public override void RightClick(int i, int j)`
`61`	`61`	`Player player = Main.player[Main.myPlayer];`
`62`	`62`	`if (GetHeart(i, j) == null)`
`63`	`63`	`{`
`64`		`- player.tileInteractionHappened = true;`
`65`	`64`	`Main.NewText("This access is not connected to a Storage Heart!");`
`66`		`- return;`
	`65`	`+ return true;`
`67`	`66`	`}`
`68`		`- StoragePlayer modPlayer = player.GetModPlayer<StoragePlayer>(mod);`
`69`		`- player.tileInteractionHappened = true;`
	`67`	`+ StoragePlayer modPlayer = player.GetModPlayer<StoragePlayer>();`
`70`	`68`	`Main.mouseRightRelease = false;`
`71`	`69`	`if (player.sign > -1)`
`72`	`70`	`{`
`@@ -117,6 +115,7 @@ public override void RightClick(int i, int j)`
`117`	`115`	`Main.PlaySound(hadChestOpen \|\| hadOtherOpen ? 12 : 10, -1, -1, 1);`
`118`	`116`	`Recipe.FindRecipes();`
`119`	`117`	`}`
	`118`	`+ return true;`
`120`	`119`	`}`
`121`	`120`
`122`	`121`	`public override void PostDraw(int i, int j, SpriteBatch spriteBatch)`
Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@ public override TEStorageHeart GetHeart(int i, int j)`
`33`	`33`	`return (TEStorageHeart)TileEntity.ByPosition[new Point16(i, j)];`
`34`	`34`	`}`
`35`	`35`
`36`		`- public override void RightClick(int i, int j)`
	`36`	`+ public override bool NewRightClick(int i, int j)`
`37`	`37`	`{`
`38`	`38`	`Player player = Main.player[Main.myPlayer];`
`39`	`39`	`Item item = player.inventory[player.selectedItem];`
`@@ -47,18 +47,18 @@ public override void RightClick(int i, int j)`
`47`	`47`	`{`
`48`	`48`	`j--;`
`49`	`49`	`}`
`50`		`- player.tileInteractionHappened = true;`
`51`	`50`	`Locator locator = (Locator)item.modItem;`
`52`	`51`	`locator.location = new Point16(i, j);`
`53`	`52`	`if (player.selectedItem == 58)`
`54`	`53`	`{`
`55`	`54`	`Main.mouseItem = item.Clone();`
`56`	`55`	`}`
`57`	`56`	`Main.NewText("Locator successfully set to: X=" + i + ", Y=" + j);`
	`57`	`+ return true;`
`58`	`58`	`}`
`59`	`59`	`else`
`60`	`60`	`{`
`61`		`- base.RightClick(i, j);`
	`61`	`+ return base.NewRightClick(i, j);`
`62`	`62`	`}`
`63`	`63`	`}`
`64`	`64`	`}`
Original file line number	Diff line number	Diff line change
`@@ -78,7 +78,7 @@ public override void KillTile(int i, int j, ref bool fail, ref bool effectOnly,`
`78`	`78`	`}`
`79`	`79`	`}`
`80`	`80`
`81`		`- public override void RightClick(int i, int j)`
	`81`	`+ public override bool NewRightClick(int i, int j)`
`82`	`82`	`{`
`83`	`83`	`if (Main.tile[i, j].frameX % 36 == 18)`
`84`	`84`	`{`
`@@ -90,14 +90,14 @@ public override void RightClick(int i, int j)`
`90`	`90`	`}`
`91`	`91`	`if (TryUpgrade(i, j))`
`92`	`92`	`{`
`93`		`- Main.player[Main.myPlayer].tileInteractionHappened = true;`
`94`		`- return;`
	`93`	`+ return true;`
`95`	`94`	`}`
`96`	`95`	`TEStorageUnit storageUnit = (TEStorageUnit)TileEntity.ByPosition[new Point16(i, j)];`
`97`	`96`	`Main.player[Main.myPlayer].tileInteractionHappened = true;`
`98`	`97`	`string activeString = storageUnit.Inactive ? "Inactive" : "Active";`
`99`	`98`	`string fullnessString = storageUnit.NumItems + " / " + storageUnit.Capacity + " Items";`
`100`	`99`	`Main.NewText(activeString + ", " + fullnessString);`
	`100`	`+ return base.NewRightClick(i, j);`
`101`	`101`	`}`
`102`	`102`
`103`	`103`	`private bool TryUpgrade(int i, int j)`
Original file line number	Diff line number	Diff line change
`@@ -425,7 +425,7 @@ public static void Update(GameTime gameTime)`
`425`	`425`	`{try{`
`426`	`426`	`oldMouse = StorageGUI.oldMouse;`
`427`	`427`	`curMouse = StorageGUI.curMouse;`
`428`		`- if (Main.playerInventory && Main.player[Main.myPlayer].GetModPlayer<StoragePlayer>(MagicStorage.Instance).ViewingStorage().X >= 0 && StoragePlayer.IsStorageCrafting())`
	`428`	`+ if (Main.playerInventory && Main.player[Main.myPlayer].GetModPlayer<StoragePlayer>().ViewingStorage().X >= 0 && StoragePlayer.IsStorageCrafting())`
`429`	`429`	`{`
`430`	`430`	`if (curMouse.RightButton == ButtonState.Released)`
`431`	`431`	`{`
`@@ -453,7 +453,7 @@ public static void Update(GameTime gameTime)`
`453`	`453`	`public static void Draw(TEStorageHeart heart)`
`454`	`454`	`{try{`
`455`	`455`	`Player player = Main.player[Main.myPlayer];`
`456`		`- StoragePlayer modPlayer = player.GetModPlayer<StoragePlayer>(MagicStorage.Instance);`
	`456`	`+ StoragePlayer modPlayer = player.GetModPlayer<StoragePlayer>();`
`457`	`457`	`Initialize();`
`458`	`458`	`if (Main.mouseX > panelLeft && Main.mouseX < recipeLeft + panelWidth && Main.mouseY > panelTop && Main.mouseY < panelTop + panelHeight)`
`459`	`459`	`{`
Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ public static void ModifyInterfaceLayers(List<GameInterfaceLayer> layers)`
`34`	`34`	`public static bool DrawStorageGUI()`
`35`	`35`	`{`
`36`	`36`	`Player player = Main.player[Main.myPlayer];`
`37`		`- StoragePlayer modPlayer = player.GetModPlayer<StoragePlayer>(MagicStorage.Instance);`
	`37`	`+ StoragePlayer modPlayer = player.GetModPlayer<StoragePlayer>();`
`38`	`38`	`Point16 storageAccess = modPlayer.ViewingStorage();`
`39`	`39`	`if (!Main.playerInventory \|\| storageAccess.X < 0 \|\| storageAccess.Y < 0)`
`40`	`40`	`{`
Original file line number	Diff line number	Diff line change
`@@ -67,7 +67,7 @@ public override bool UseItem(Player player)`
`67`	`67`
`68`	`68`	`private void OpenStorage(Player player)`
`69`	`69`	`{`
`70`		`- StoragePlayer modPlayer = player.GetModPlayer<StoragePlayer>(mod);`
	`70`	`+ StoragePlayer modPlayer = player.GetModPlayer<StoragePlayer>();`
`71`	`71`	`if (player.sign > -1)`
`72`	`72`	`{`
`73`	`73`	`Main.PlaySound(11, -1, -1, 1);`
Original file line number	Diff line number	Diff line change
`@@ -241,7 +241,7 @@ public static void Update(GameTime gameTime)`
`241`	`241`	`{`
`242`	`242`	`oldMouse = curMouse;`
`243`	`243`	`curMouse = Mouse.GetState();`
`244`		`- if (Main.playerInventory && Main.player[Main.myPlayer].GetModPlayer<StoragePlayer>(MagicStorage.Instance).ViewingStorage().X >= 0 && !StoragePlayer.IsStorageCrafting())`
	`244`	`+ if (Main.playerInventory && Main.player[Main.myPlayer].GetModPlayer<StoragePlayer>().ViewingStorage().X >= 0 && !StoragePlayer.IsStorageCrafting())`
`245`	`245`	`{`
`246`	`246`	`if (StorageGUI.curMouse.RightButton == ButtonState.Released)`
`247`	`247`	`{`
`@@ -263,7 +263,7 @@ public static void Update(GameTime gameTime)`
`263`	`263`	`public static void Draw(TEStorageHeart heart)`
`264`	`264`	`{`
`265`	`265`	`Player player = Main.player[Main.myPlayer];`
`266`		`- StoragePlayer modPlayer = player.GetModPlayer<StoragePlayer>(MagicStorage.Instance);`
	`266`	`+ StoragePlayer modPlayer = player.GetModPlayer<StoragePlayer>();`
`267`	`267`	`Initialize();`
`268`	`268`	`if (Main.mouseX > panelLeft && Main.mouseX < panelLeft + panelWidth && Main.mouseY > panelTop && Main.mouseY < panelTop + panelHeight)`
`269`	`269`	`{`