Merge pull request #266 from KizKizz/system-rework

System rework
KizKizz · Sep 2, 2024 · d92ca40 · d92ca40
2 parents 4dc70ca + e9061e1
commit d92ca40
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 10 deletions.
diff --git a/app_version_check/app_version.json b/app_version_check/app_version.json
@@ -1,10 +1,8 @@
 {
     "name": "PSO2NGS Mod Manager",
-    "version": "2.8.18",
+    "version": "2.8.19",
     "description": [
-        "Removed Gameguard anticheat option when launching PSO2 with Mod Manager (JP version only)",
         "More bug fixes",
-        "PSO2をMODマネージャーで起動する際、Gameguardのアンチヒートオプションを削除(JP版のみ)",
         "その他のバグ修正"
     ],
     "windows_file": "",

diff --git a/lib/itemsSwapper/items_swapper_la_homepage.dart b/lib/itemsSwapper/items_swapper_la_homepage.dart
@@ -570,7 +570,7 @@ class _ItemsSwapperEmotesHomePageState extends State<ItemsSwapperEmotesHomePage>
                                     height: 92,
                                     child: ListTile(
                                       minVerticalPadding: 15,
-                                      title: Text(curLangText!.uiChooseAnItemBellowToSwap),
+                                      title: Text(curLangText!.uiSelectAnItemToBeReplaced),
                                       subtitle: Padding(
                                         padding: const EdgeInsets.only(top: 10),
                                         child: SizedBox(

diff --git a/lib/itemsSwapper/items_swapper_wp_homepage.dart b/lib/itemsSwapper/items_swapper_wp_homepage.dart
@@ -550,7 +550,7 @@ class _ItemsSwapperWeaponHomePageState extends State<ItemsSwapperWeaponHomePage>
                                     height: 92,
                                     child: ListTile(
                                       minVerticalPadding: 15,
-                                      title: Text(curLangText!.uiChooseAnItemBellowToSwap),
+                                      title: Text(curLangText!.uiSelectAnItemToBeReplaced),
                                       subtitle: Padding(
                                         padding: const EdgeInsets.only(top: 10),
                                         child: SizedBox(
@@ -1394,11 +1394,12 @@ Future<String> modsSwapperWpSwap(context, SubMod fromSubmod, String fromItemAvai
   Directory(modManSwapperFromItemDirPath).createSync(recursive: true);
   Directory(modManSwapperToItemDirPath).createSync(recursive: true);
   Directory(modManSwapperOutputDirPath).createSync(recursive: true);
+  toItemName = toItemName.replaceAll(RegExp(charToReplace), '_').trim();
   String renamedItemPath = Uri.file('$modManSwapperOutputDirPath/$toItemName').toFilePath();
   for (var modFile in fromSubmod.modFiles) {
     File curFile = File(modFile.location);
     if (fromItemAvailableIce == modFile.modFileName && curFile.existsSync()) {
-      toItemName = toItemName.replaceAll(RegExp(charToReplace), '_').trim();
+      // toItemName = toItemName.replaceAll(RegExp(charToReplace), '_').trim();
       String packDirPath = '';
       if (fromSubmod.modName == fromSubmod.submodName) {
         packDirPath = Uri.file('$modManSwapperOutputDirPath/$toItemName/${fromSubmod.modName.replaceAll(RegExp(charToReplace), '_')}').toFilePath();

diff --git a/lib/pages/main_page.dart b/lib/pages/main_page.dart
@@ -2252,7 +2252,7 @@ class _MainPageState extends State<MainPage> {
                                           } else {
                                             if (File(Uri.file("$modManPso2binPath${p.separator}sub${p.separator}ucldr_PSO2_JP_loader_x64.exe").toFilePath()).existsSync()) {
                                               await startBatch.writeAsString(
-                                                  'cd "$modManPso2binPath${p.separator}sub"\nSET -pso2=+0x33aca2b9\nstart "" "$modManPso2binPath${p.separator}sub${p.separator}ucldr_PSO2_JP_loader_x64.exe" "$modManPso2binPath${p.separator}sub${p.separator}pso2.exe" +0x33aca2b9 -reboot -optimize');
+                                                  'cd "$modManPso2binPath${p.separator}sub"\nSET -pso2=+0x33aca2b9\nstart "" "$modManPso2binPath${p.separator}sub${p.separator}ucldr_PSO2_JP_loader_x64.exe" "$modManPso2binPath${p.separator}sub${p.separator}pso2.exe" +0x33aca2b9 -reboot -optimize"');
                                               await Process.run(startBatch.path, []);
                                               startBatch.deleteSync();
                                             } else {

diff --git a/pubspec.yaml b/pubspec.yaml
@@ -15,7 +15,7 @@ publish_to: 'none' # Remove this line if you wish to publish to pub.dev
 # In iOS, build-name is used as CFBundleShortVersionString while build-number used as CFBundleVersion.
 # Read more about iOS versioning at
 # https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html
-version: 2.8.16
+version: 2.8.19
 
 environment:
   sdk: ">=3.0.0"

diff --git a/windows/runner/Runner.rc b/windows/runner/Runner.rc
@@ -63,13 +63,13 @@ IDI_APP_ICON            ICON                    "resources\\app_icon.ico"
 #ifdef FLUTTER_BUILD_NUMBER
 #define VERSION_AS_NUMBER FLUTTER_BUILD_NUMBER
 #else
-#define VERSION_AS_NUMBER 2,8,18
+#define VERSION_AS_NUMBER 2,8,19
 #endif
 
 #ifdef FLUTTER_BUILD_NAME
 #define VERSION_AS_STRING #FLUTTER_BUILD_NAME
 #else
-#define VERSION_AS_STRING "2.8.18"
+#define VERSION_AS_STRING "2.8.19"
 #endif
 
 VS_VERSION_INFO VERSIONINFO