Merge branch 'main' into dev1.3

Author: Artemis21

PolyMod.csproj

@@ -19,8 +19,8 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="BepInEx.Unity.IL2CPP" Version="6.0.0-be.733" />
-        <PackageReference Include="TheBattleOfPolytopia" Version="$(PolytopiaVersion)" />
+        <PackageReference Include="BepInEx.Unity.IL2CPP" Version="6.0.0-be.738" />
+        <PackageReference Include="TheBattleOfPolytopia" Version="$(PolytopiaVersion)-738" />
         <EmbeddedResource Include="resources\*.*" />
     </ItemGroup>
 

installer/main.py

@@ -15,8 +15,8 @@
     "win32": "win",
     "darwin": "macos",
 }[sys.platform]
-BEPINEX = f"733/BepInEx-Unity.IL2CPP-{OS}-x64-6.0.0-be.733%2B995f049"
-POLYMOD = "https://github.com/PolyModdingTeam/PolyMod/releases/latest/download/PolyMod.dll"
+BEPINEX = "https://polymod.dev/data/bepinex.txt"
+POLYMOD = "https://api.github.com/repos/PolyModdingTeam/PolyMod/releases"
 
 
 def resource_path(path):
@@ -54,6 +54,7 @@ def prepare(target):
         return
     path_entry.configure(state=customtkinter.DISABLED)
     browse_button.configure(state=customtkinter.DISABLED)
+    prerelease_checkbox.destroy()
     install_button.destroy()
     uninstall_button.destroy()
     progress_bar = customtkinter.CTkProgressBar(app, determinate_speed=50 / 2)
@@ -65,13 +66,17 @@ def prepare(target):
 def install(path):
     to_zip(
         requests.get(
-            f"https://builds.bepinex.dev/projects/bepinex_be/{BEPINEX}.zip"
+            requests.get(BEPINEX).text.strip().replace("{os}", OS)
         )
     ).extractall(path)
     progress_bar.step()
 
+    for release in requests.get(POLYMOD).json():
+        if release["prerelease"] and not prerelease_checkbox.get(): continue
+        latest = release
+        break
     open(path + "/BepInEx/plugins/PolyMod.dll", "wb").write(
-        requests.get(POLYMOD).content
+        requests.get(latest["assets"][0]["browser_download_url"]).content
     )
     progress_bar.step()
 
@@ -133,14 +138,17 @@ def quit():
     app, placeholder_text="Game path", width=228)
 browse_button = customtkinter.CTkButton(
     app, text="Browse", command=browse, width=1)
+prerelease_checkbox = customtkinter.CTkCheckBox(
+    app, text="Prerelease", width=1)
 install_button = customtkinter.CTkButton(
     app, text="Install", command=lambda: prepare(install))
 uninstall_button = customtkinter.CTkButton(
     app, text="Uninstall", command=lambda: prepare(uninstall))
 
 path_entry.grid(column=0, row=0, padx=5, pady=5)
 browse_button.grid(column=1, row=0, padx=(0, 5), pady=5)
-install_button.grid(column=0, row=1, columnspan=2, padx=5, pady=5)
-uninstall_button.grid(column=0, row=2, columnspan=2, padx=5, pady=5)
+prerelease_checkbox.grid(column=0, row=1, columnspan=2, padx=5, pady=5)
+install_button.grid(column=0, row=2, columnspan=2, padx=5, pady=5)
+uninstall_button.grid(column=0, row=3, columnspan=2, padx=5, pady=5)
 
 app.mainloop()

resources/localization.json

@@ -44,8 +44,8 @@
 		"German (Germany)": "{0} Willkommen! {1}\nDiese Mods sind gerade eben geladen:"
 	},
 	"polymod_hub_mod": {
-		"English": "Name: {0}\nStatus: {1}\nAuthors: {2}\nVersion: {3}",
-		"Russian": "Имя: {0}\nСтатус: {1}\nАвторы: {2}\nВерсия: {3}",
+		"English": "Name: {0}\nStatus: {1}\nAuthors: {2}\nVersion: {3}\nDescription: {4}",
+		"Russian": "Имя: {0}\nСтатус: {1}\nАвторы: {2}\nВерсия: {3}\nОписание: {4}",
 		"Turkish": "İsim: {0}\nDurum: {1}\nYaratıcılar: {2}\nSürüm: {3}",
 		"Spanish (Mexico)": "Titulo: {0}\nEstado: {1}\nPublicador: {2}\nVersion: {3}",
 		"French (France)": "Titre: {0}\nEtat: {1}\nAuteurs: {2}\nVersion: {3}",
@@ -160,5 +160,53 @@
 		"Portuguese (Brazil)": "Essa versão do PolyMod não foi desenvolvida para a versão atual do aplicativo e pode não funcionar corretamente!",
 		"Elyrion": "πȱ∫ỹmȱδ ƒƒƒƒƒƒƒ ŋȱŧ ȱrrȱ #₺rr∑ŋŧ ƒƒƒƒƒƒƒ ỹ maỹ ŋȱŧ ~ȱr§ #ȱrr∑#ŧ∫ỹ!",
 		"German (Germany)": "Diese Version von PolyMod ist nicht für die aktuelle Version der Anwendung ausgelegt und könnte nicht funktionieren!"
+	},
+	"polymod_debug": {
+		"English": "Debug",
+		"Russian": "Дебаг"
+	},
+	"polymod_autoupdate": {
+		"English": "Auto-update",
+		"Russian": "Автообновление"
+	},
+	"polymod_autoupdate_alpha": {
+		"English": "Include alphas",
+		"Russian": "Include alphas"
+	},
+	"polymod_autoupdate_description": {
+		"English": "New update available!",
+		"Russian": "Доступно новое обновление!"
+	},
+	"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)