Fix reload and build issues

JavidPack · Jul 3, 2019 · efc4b13 · efc4b13
1 parent 3d9a081
commit efc4b13
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/ModdersToolkit.cs b/ModdersToolkit.cs
@@ -1,6 +1,7 @@
 using Microsoft.Xna.Framework;
 using Microsoft.Xna.Framework.Graphics;
 using ModdersToolkit.Tools;
+using ReLogic.OS;
 using System.Collections.Generic;
 using Terraria;
 using Terraria.DataStructures;
@@ -33,7 +34,7 @@ public override void Load()
 			instance = this;
 
 			tools = new List<Tool>();
-			if (ModLoader.windows) // REPL tool not working non-windows yet. Is this the attribute problem?
+			if (Platform.IsWindows) // REPL tool not working non-windows yet. Is this the attribute problem?
 			{
 				tools.Add(new Tools.REPL.REPLTool());
 			}

diff --git a/Tools/REPL/REPLBackend.cs b/Tools/REPL/REPLBackend.cs
@@ -45,7 +45,7 @@ public void Reset()
 				}
 				try
 				{
-					if (assembly.FullName.Contains("mscorlib") || assembly.FullName.Contains("System.Core,") || assembly.FullName.Contains("System,") || assembly.FullName.Contains("System"))
+					if (assembly.IsDynamic || assembly.FullName.Contains("mscorlib") || assembly.FullName.Contains("System.Core,") || assembly.FullName.Contains("System,") || assembly.FullName.Contains("System") || (!string.IsNullOrEmpty(assembly.Location) && Path.GetFileName(Path.GetDirectoryName(assembly.Location)) == "ModCompile"))
 					{
 
 					}
@@ -76,7 +76,7 @@ public void Reset()
 			}
 			try
 			{
-				evaluator.Run("using Terraria");
+				evaluator.Run("using Terraria;");
 			}
 			catch (Exception)
 			{

diff --git a/Tools/Textures/TextureUI.cs b/Tools/Textures/TextureUI.cs
@@ -47,7 +47,7 @@ public TextureUI(UserInterface userInterface)
 		static string folder = Path.Combine(Main.SavePath, "Mods", "Cache");
 		static string path = Path.Combine(folder, filename);
 
-		static string ModSourcePath = Path.Combine(Program.SavePath, "Mod Sources");
+		static string ModSourcePath = Path.Combine(Main.SavePath, "Mod Sources");
 
 		public override void OnInitialize()
 		{