Merge branch 'dev1.2' into autoupdate

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.14218</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
 
@@ -78,7 +79,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
     )
 
@@ -111,8 +112,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()
 
 

resources/localization.json

@@ -172,5 +172,33 @@
 	"polymod_autoupdate_update": {
 		"English": "Update",
 		"Russian": "Обновить"
+	},
+	"polymod_hub_config": {
+		"English": "CONFIG",
+		"Russian": "КОНФИГ"
+	},
+	"polymod_hub_config_enable": {
+		"English": "ENABLE {0}",
+		"Russian": "ВКЛЮЧИТЬ {0}"
+	},
+	"polymod_hub_config_disable": {
+		"English": "DISABLE {0}",
+		"Russian": "ВЫЛЮЧИТЬ {0}"
+	},
+	"polymod_config_setto": {
+		"English": "{0} is set to {1}!",
+		"Russian": "{0} задан на {1}!"
+	},
+	"polymod_hub_spriteinfo_update": {
+		"English": "UPDATE SPRITES",
+		"Russian": "ОБНОВИТЬ СПРАЙТЫ"
+	},
+	"polymod_spriteinfo_updated": {
+		"English": "Sprite info for mod {0} updated!",
+		"Russian": "Данные спрайтов обновлены для мода {0}!"
+	},
+	"polymod_spriteinfo_notupdated": {
+		"English": "No sprite infos were found!",
+		"Russian": "Данные спрайтов не найдены!"
 	}
 }

src/Json/EnumCacheJson.cs

@@ -2,6 +2,7 @@
 using System.Text.Json.Serialization;
 
 namespace PolyMod.Json;
+
 internal class EnumCacheJson<T> : JsonConverter<T> where T : struct, Enum
 {
     public override T Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)

src/Json/Vector2Json.cs

@@ -3,6 +3,7 @@
 using UnityEngine;
 
 namespace PolyMod.Json;
+
 internal class Vector2Json : JsonConverter<Vector2>
 {
     public override Vector2 Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)

src/Json/VersionJson.cs

@@ -2,6 +2,7 @@
 using System.Text.Json.Serialization;
 
 namespace PolyMod.Json;
+
 internal class VersionJson : JsonConverter<Version>
 {
     public override Version? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)