diff --git a/common/lib/common.dart b/common/lib/common.dart index 4048085..72415e4 100644 --- a/common/lib/common.dart +++ b/common/lib/common.dart @@ -1,6 +1,8 @@ export 'package:reboot_common/src/constant/backend.dart'; export 'package:reboot_common/src/constant/game.dart'; export 'package:reboot_common/src/constant/supabase.dart'; +export 'package:reboot_common/src/extension/path.dart'; +export 'package:reboot_common/src/extension/process.dart'; export 'package:reboot_common/src/model/fortnite_build.dart'; export 'package:reboot_common/src/model/fortnite_version.dart'; export 'package:reboot_common/src/model/game_instance.dart'; @@ -14,6 +16,4 @@ export 'package:reboot_common/src/util/dll.dart'; export 'package:reboot_common/src/util/network.dart'; export 'package:reboot_common/src/util/patcher.dart'; export 'package:reboot_common/src/util/path.dart'; -export 'package:reboot_common/src/util/process.dart'; -export 'package:reboot_common/src/extension/path.dart'; -export 'package:reboot_common/src/extension/process.dart'; \ No newline at end of file +export 'package:reboot_common/src/util/process.dart'; \ No newline at end of file diff --git a/common/lib/src/extension/path.dart b/common/lib/src/extension/path.dart index 9f0b467..0d5d792 100644 --- a/common/lib/src/extension/path.dart +++ b/common/lib/src/extension/path.dart @@ -1,7 +1,7 @@ import 'dart:io'; import 'dart:isolate'; -import 'package:path/path.dart' as path; +import 'package:path/path.dart' as path; import 'package:reboot_common/common.dart'; extension FortniteVersionExtension on FortniteVersion { diff --git a/common/lib/src/util/build.dart b/common/lib/src/util/build.dart index 3756783..b2040a8 100644 --- a/common/lib/src/util/build.dart +++ b/common/lib/src/util/build.dart @@ -2,7 +2,6 @@ import 'dart:async'; import 'dart:convert'; import 'dart:io'; import 'dart:isolate'; -import 'dart:typed_data'; import 'package:dio/dio.dart'; import 'package:dio/io.dart'; diff --git a/common/lib/src/util/network.dart b/common/lib/src/util/network.dart index fefb60d..c2fa8c3 100644 --- a/common/lib/src/util/network.dart +++ b/common/lib/src/util/network.dart @@ -10,7 +10,7 @@ final _getExtendedTcpTable = DynamicLibrary.open('iphlpapi.dll').lookupFunction< Int32 Function(Pointer, Pointer, Int32, Int32, Int32, Int32), int Function(Pointer, Pointer, int, int, int, int)>('GetExtendedTcpTable'); -class _MIB_TCPROW_OWNER_PID extends Struct { +final class _MIB_TCPROW_OWNER_PID extends Struct { @Uint32() external int dwState; @@ -30,7 +30,7 @@ class _MIB_TCPROW_OWNER_PID extends Struct { external int dwOwningPid; } -class _MIB_TCPTABLE_OWNER_PID extends Struct { +final class _MIB_TCPTABLE_OWNER_PID extends Struct { @Uint32() external int dwNumEntries; diff --git a/common/lib/src/util/path.dart b/common/lib/src/util/path.dart index 5602ff1..25feede 100644 --- a/common/lib/src/util/path.dart +++ b/common/lib/src/util/path.dart @@ -1,8 +1,4 @@ import 'dart:io'; -import 'dart:isolate'; - -import 'package:path/path.dart' as path; -import 'package:reboot_common/common.dart'; Directory get installationDirectory => File(Platform.resolvedExecutable).parent; diff --git a/common/lib/src/util/process.dart b/common/lib/src/util/process.dart index 54b08ce..f116d04 100644 --- a/common/lib/src/util/process.dart +++ b/common/lib/src/util/process.dart @@ -1,16 +1,14 @@ // ignore_for_file: non_constant_identifier_names import 'dart:async'; -import 'dart:convert'; import 'dart:ffi'; import 'dart:io'; import 'dart:isolate'; import 'dart:math'; -import 'package:path/path.dart' as path; import 'package:ffi/ffi.dart'; +import 'package:path/path.dart' as path; import 'package:reboot_common/common.dart'; -import 'package:reboot_common/src/extension/process.dart'; import 'package:sync/semaphore.dart'; import 'package:win32/win32.dart'; @@ -242,7 +240,7 @@ String _parseUsername(String username, bool host) { return username; } -class _ExtendedProcess extends Process { +final class _ExtendedProcess implements Process { final Process _delegate; final Stream>? _stdout; final Stream>? _stderr; diff --git a/common/pubspec.yaml b/common/pubspec.yaml index 9314965..4f7601b 100644 --- a/common/pubspec.yaml +++ b/common/pubspec.yaml @@ -4,7 +4,7 @@ version: "1.0.0" publish_to: 'none' environment: - sdk: ">=2.19.0 <=3.3.4" + sdk: ">=3.0.0 <=4.0.0" dependencies: dio: ^5.3.2 diff --git a/gui/assets/images/backend.png b/gui/assets/images/backend.png deleted file mode 100644 index 0e484f1..0000000 Binary files a/gui/assets/images/backend.png and /dev/null differ diff --git a/gui/assets/info/en/10. Corrupted build(Failed to open descriptor file, Fortnite crash Reporter, Unreal Engine crash reporter) b/gui/assets/info/en/10. Corrupted build similarity index 100% rename from gui/assets/info/en/10. Corrupted build(Failed to open descriptor file, Fortnite crash Reporter, Unreal Engine crash reporter) rename to gui/assets/info/en/10. Corrupted build diff --git a/gui/pubspec.yaml b/gui/pubspec.yaml index 985372c..a7a8c82 100644 --- a/gui/pubspec.yaml +++ b/gui/pubspec.yaml @@ -1,11 +1,11 @@ name: reboot_launcher description: Graphical User Interface for Project Reboot -version: "9.0.8" +version: "9.1.0" publish_to: 'none' environment: - sdk: ">=3.0.0 <=3.3.4" + sdk: ">=3.0.0 <=4.0.0" dependencies: # The flutter SDK @@ -22,7 +22,10 @@ dependencies: path: ./dependencies/flutter_acrylic fluentui_system_icons: ^1.1.238 system_theme: ^2.0.0 - skeletons: ^0.0.3 + skeletons: + git: + url: https://github.com/talok/skeletons + ref: main # Window management bitsdojo_window: ^0.1.5 @@ -82,8 +85,6 @@ dev_dependencies: sdk: flutter flutter_lints: ^4.0.0 - msix: ^3.6.3 - flutter_distributor: ^0.4.0 flutter: uses-material-design: true @@ -99,14 +100,4 @@ flutter: - assets/backend/public/ - assets/backend/responses/ - assets/build/ - - assets/info/en/ - -msix_config: - display_name: Reboot Launcher - publisher_display_name: Auties00 - identity_name: 31868Auties00.RebootLauncher - msix_version: 9.0.0.8 - publisher: CN=E6CD08C6-DECF-4034-A3EB-2D5FA2CA8029 - logo_path: ./assets/icons/reboot.ico - architecture: x64 - capabilities: "internetClient" \ No newline at end of file + - assets/info/en/ \ No newline at end of file