Merge

Author: johnklipi

PolyMod.csproj

@@ -11,7 +11,7 @@
         </RestoreAdditionalProjectSources>
         <Configurations>IL2CPP</Configurations>
         <Version>1.2.0-pre</Version>
-        <PolytopiaVersion>2.12.3.14031</PolytopiaVersion>
+        <PolytopiaVersion>2.13.0.14200</PolytopiaVersion>
         <Authors>PolyModdingTeam</Authors>
         <Description>The Battle of Polytopia's mod loader.</Description>
         <NoWarn>IDE0130</NoWarn>

installer/main.py

@@ -5,6 +5,7 @@
 import zipfile
 import requests
 import threading
+import subprocess
 import customtkinter
 import CTkMessagebox as messagebox
 
@@ -74,7 +75,7 @@ def install(path):
     )
     progress_bar.step()
 
-    customtkinter.CTkButton(app, text="Launch", command=launch).grid(
+    customtkinter.CTkButton(app, text="Launch", command=lambda: launch(path)).grid(
         column=0, row=2, columnspan=2, padx=5, pady=5
     )
 
@@ -107,8 +108,13 @@ def uninstall(path):
     )
 
 
-def launch():
-    os.startfile("steam://rungameid/874390")
+def launch(path):
+    if sys.platform != "win32":
+        subprocess.check_call(f"chmod +x {path}/run_bepinex.sh", shell=True)
+        subprocess.check_call(f"{path}/run_bepinex.sh {path}/Polytopia.*", shell=True)
+        subprocess.check_call(f"xdg-open https://docs.bepinex.dev/articles/advanced/steam_interop.html", shell=True)
+    else:
+        subprocess.check_call(f"start steam://rungameid/874390", shell=True)
     quit()
 
 

src/Managers/Visual.cs

@@ -52,8 +52,8 @@ private static void StartScreen_Start()
 	}
 
 	[HarmonyPrefix]
-	[HarmonyPatch(typeof(SpriteAtlasManager), nameof(SpriteAtlasManager.LoadSprite), typeof(string), typeof(string), typeof(SpriteCallback))] // temporary fix
-	private static bool SpriteAtlasManager_LoadSprite_Postfix(SpriteAtlasManager __instance, string atlas, string sprite, SpriteCallback completion)
+	[HarmonyPatch(typeof(SpriteAtlasManager), nameof(SpriteAtlasManager.LoadSprite), typeof(string), typeof(string), typeof(SpriteCallback))]
+	private static bool SpriteAtlasManager_LoadSprite(SpriteAtlasManager __instance, string atlas, string sprite, SpriteCallback completion)
 	{
 		bool found = false;
 		__instance.LoadSpriteAtlas(atlas, (Il2CppSystem.Action<UnityEngine.U2D.SpriteAtlas>)GetAtlas);
@@ -64,47 +64,36 @@ void GetAtlas(SpriteAtlas spriteAtlas)
 		{
 			if (spriteAtlas != null)
 			{
-				Sprite foundSprite = __instance.GetSpriteFromAtlas(spriteAtlas, sprite);
-				if (foundSprite != null)
+				List<string> names = sprite.Split('_').ToList();
+				List<string> filteredNames = new List<string>(names);
+				string style = "";
+				foreach (string item in names)
 				{
-					completion?.Invoke(atlas, sprite, __instance.GetSpriteFromAtlas(spriteAtlas, sprite));
+					string upperitem = char.ToUpper(item[0]) + item.Substring(1);
+					if (EnumCache<TribeData.Type>.TryGetType(item, out TribeData.Type tribe) || EnumCache<SkinType>.TryGetType(item, out SkinType skin)
+					|| EnumCache<TribeData.Type>.TryGetType(upperitem, out TribeData.Type tribeUpper) || EnumCache<SkinType>.TryGetType(upperitem, out SkinType skinUpper))
+					{
+						filteredNames.Remove(item);
+						style = item;
+						continue;
+					}
+				}
+				string name = string.Join("_", filteredNames);
+				Sprite? newSprite = Registry.GetSprite(name, style);
+				if (newSprite != null)
+				{
+					completion?.Invoke(atlas, sprite, newSprite);
 					found = true;
 				}
 			}
 		}
 	}
 
-	[HarmonyPostfix]
-	[HarmonyPatch(typeof(SpriteAtlasManager), nameof(SpriteAtlasManager.GetSpriteFromAtlas), typeof(SpriteAtlas), typeof(string))]
-	private static void SpriteAtlasManager_GetSpriteFromAtlas(ref Sprite __result, SpriteAtlas spriteAtlas, string sprite)
-	{
-		List<string> names = sprite.Split('_').ToList();
-		List<string> filteredNames = new List<string>(names);
-		string style = "";
-		foreach (string item in names)
-		{
-			string upperitem = char.ToUpper(item[0]) + item.Substring(1);
-			if (EnumCache<TribeData.Type>.TryGetType(item, out TribeData.Type tribe) || EnumCache<SkinType>.TryGetType(item, out SkinType skin)
-			   || EnumCache<TribeData.Type>.TryGetType(upperitem, out TribeData.Type tribeUpper) || EnumCache<SkinType>.TryGetType(upperitem, out SkinType skinUpper))
-			{
-				filteredNames.Remove(item);
-				style = item;
-				continue;
-			}
-		}
-		string name = string.Join("_", filteredNames);
-		Sprite? newSprite = Registry.GetSprite(name, style);
-		if (newSprite != null)
-		{
-			__result = newSprite;
-		}
-	}
-
 	[HarmonyPostfix]
 	[HarmonyPatch(typeof(SpriteAtlasManager), nameof(SpriteAtlasManager.DoSpriteLookup))]
 	private static void SpriteAtlasManager_DoSpriteLookup(ref SpriteAtlasManager.SpriteLookupResult __result, SpriteAtlasManager __instance, string baseName, TribeData.Type tribe, SkinType skin, bool checkForOutline, int level)
 	{
-		baseName = Util.ReverseSpriteData(baseName);
+		baseName = Util.FormatSpriteName(baseName);
 
 		Sprite? sprite = Registry.GetSprite(baseName, Util.GetStyle(tribe, skin), level);
 		if (sprite != null)

src/NullableFix.cs

@@ -3,20 +3,20 @@
 namespace System.Runtime.CompilerServices
 {
     [System.AttributeUsage(System.AttributeTargets.All, AllowMultiple = true)]
-    internal sealed class NullableAttribute : System.Attribute
+    public sealed class NullableAttribute : System.Attribute
     {
         public NullableAttribute(byte b) { }
         public NullableAttribute(byte[] b) { }
     }
 
     [System.AttributeUsage(System.AttributeTargets.All, AllowMultiple = false)]
-    internal sealed class NullableContextAttribute : System.Attribute
+    public sealed class NullableContextAttribute : System.Attribute
     {
         public NullableContextAttribute(byte b) { }
     }
 
     [System.AttributeUsage(System.AttributeTargets.Module)]
-    internal sealed class NullablePublicOnlyAttribute : System.Attribute
+    public sealed class NullablePublicOnlyAttribute : System.Attribute
     {
         public NullablePublicOnlyAttribute(bool b) { }
     }

src/Util.cs

@@ -40,7 +40,7 @@ internal static string GetStyle(TribeData.Type tribe, SkinType skin)
         return skin != SkinType.Default ? EnumCache<SkinType>.GetName(skin) : EnumCache<TribeData.Type>.GetName(tribe);
     }
 
-    internal static string ReverseSpriteData(string baseName) // I cant believe i had to do this shit #MIDJIWANFIXYOURSHITCODE
+    internal static string FormatSpriteName(string baseName) // I cant believe i had to do this shit #MIDJIWANFIXYOURSHITCODE
     {
         baseName = baseName.Replace(SpriteData.IMPROVEMENT_AQUA_FARM, EnumCache<ImprovementData.Type>.GetName(ImprovementData.Type.Aquafarm));
         baseName = baseName.Replace(SpriteData.IMPROVEMENT_ATOLL, EnumCache<ImprovementData.Type>.GetName(ImprovementData.Type.Atoll));
@@ -85,6 +85,8 @@ internal static string GetStyle(TribeData.Type tribe, SkinType skin)
         baseName = baseName.Replace(SpriteData.TILE_UNKNOWN, EnumCache<TerrainData.Type>.GetName(TerrainData.Type.Field));
         baseName = baseName.Replace(SpriteData.TILE_WATER, EnumCache<TerrainData.Type>.GetName(TerrainData.Type.Water));
         baseName = baseName.Replace(SpriteData.TILE_WETLAND, EnumCache<TerrainData.Type>.GetName(TerrainData.Type.Field) + "_flooded");
+
+        baseName = baseName.Replace("UI_", "");
         return baseName;
     }
 }