Skip to content

Commit d5e41ed

Browse files
committed
10.0.5
1 parent 9e20ec8 commit d5e41ed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

49 files changed

+635
-1067
lines changed

archive/move.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ def main():
5858
for future in as_completed(futures):
5959
try:
6060
uploaded_url, uploaded_key = future.result()
61-
print(f"Uploaded: {uploaded_url} -> s3://{bucket_name}/{uploaded_key}")
61+
print(f"Uploaded: {uploaded_url}")
6262
except Exception as e:
6363
print(f"Error uploading: {e}")
6464

archive/versions.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,4 +82,4 @@ https://builds.rebootfn.org/17.30.zip
8282
https://builds.rebootfn.org/17.50.zip
8383
https://builds.rebootfn.org/18.40.zip
8484
https://builds.rebootfn.org/19.10.rar
85-
https://builds.rebootfn.org/20.40.zip"
85+
https://builds.rebootfn.org/20.40.zip

common/lib/src/model/dll.dart

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
enum InjectableDll {
22
console,
3-
starfall,
4-
reboot,
3+
auth,
4+
gameServer,
5+
memoryLeak
56
}
67

78
extension InjectableDllVersionAware on InjectableDll {
8-
bool get isVersionDependent => this == InjectableDll.reboot;
9+
bool get isVersionDependent => this == InjectableDll.gameServer;
910
}

common/lib/src/util/backend.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ Future<Uri?> pingBackend(String host, int port, [bool https=false]) async {
6161
await request.close().timeout(const Duration(seconds: 10));
6262
log("[BACKEND] Ping successful");
6363
return uri;
64-
}catch(error){
64+
}catch(error) {
6565
log("[BACKEND] Cannot ping backend: $error");
6666
return https || declaredScheme != null || isLocalHost(host) ? null : await pingBackend(host, port, true);
6767
}

common/lib/src/util/dll.dart

Lines changed: 17 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ import 'package:http/http.dart' as http;
55
import 'package:path/path.dart' as path;
66
import 'package:reboot_common/common.dart';
77

8-
bool _watcher = false;
98
final File rebootBeforeS20DllFile = File("${dllsDirectory.path}\\reboot.dll");
109
final File rebootAboveS20DllFile = File("${dllsDirectory.path}\\rebootS20.dll");
1110
const String kRebootBelowS20DownloadUrl =
@@ -20,7 +19,22 @@ Future<bool> hasRebootDllUpdate(int? lastUpdateMs, {int hours = 24, bool force =
2019
return force || !exists || (hours > 0 && lastUpdate != null && now.difference(lastUpdate).inHours > hours);
2120
}
2221

23-
Future<void> downloadCriticalDll(String name, String outputPath) async {
22+
Future<void> downloadDependency(InjectableDll dll, String outputPath) async {
23+
String? name;
24+
switch(dll) {
25+
case InjectableDll.console:
26+
name = "console.dll";
27+
case InjectableDll.auth:
28+
name = "starfall.dll";
29+
case InjectableDll.memoryLeak:
30+
name = "memory.dll";
31+
case InjectableDll.gameServer:
32+
name = null;
33+
}
34+
if(name == null) {
35+
return;
36+
}
37+
2438
final response = await http.get(Uri.parse("https://github.com/Auties00/reboot_launcher/raw/master/gui/dependencies/dlls/$name"));
2539
if(response.statusCode != 200) {
2640
throw Exception("Cannot download $name: status code ${response.statusCode}");
@@ -56,17 +70,4 @@ Future<DateTime?> _getLastUpdate(int? lastUpdateMs) async {
5670
return lastUpdateMs != null
5771
? DateTime.fromMillisecondsSinceEpoch(lastUpdateMs)
5872
: null;
59-
}
60-
61-
Stream<String> watchDlls() async* {
62-
if(_watcher) {
63-
return;
64-
}
65-
66-
_watcher = true;
67-
await for(final event in dllsDirectory.watch(events: FileSystemEvent.delete | FileSystemEvent.move)) {
68-
if (event.path.endsWith(".dll")) {
69-
yield event.path;
70-
}
71-
}
72-
}
73+
}

gui/lib/main.dart

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ import 'package:reboot_launcher/src/controller/dll_controller.dart';
1515
import 'package:reboot_launcher/src/controller/game_controller.dart';
1616
import 'package:reboot_launcher/src/controller/hosting_controller.dart';
1717
import 'package:reboot_launcher/src/controller/settings_controller.dart';
18-
import 'package:reboot_launcher/src/messenger/implementation/error.dart';
19-
import 'package:reboot_launcher/src/page/implementation/home_page.dart';
18+
import 'package:reboot_launcher/src/widget/message/error.dart';
19+
import 'package:reboot_launcher/src/widget/page/home_page.dart';
2020
import 'package:reboot_launcher/src/util/os.dart';
2121
import 'package:reboot_launcher/src/util/url_protocol.dart';
2222
import 'package:supabase_flutter/supabase_flutter.dart';
@@ -82,9 +82,7 @@ Future<void> _startApp() async {
8282
errors.add(uncaughtError);
8383
} finally{
8484
log("[APP] Started applications with errors: $errors");
85-
runApp(RebootApplication(
86-
errors: errors,
87-
));
85+
runApp(RebootApplication(errors: errors));
8886
}
8987
}
9088

@@ -176,7 +174,7 @@ Future<void> _initWindow() async {
176174
if(isWin11) {
177175
await Window.setEffect(
178176
effect: WindowEffect.acrylic,
179-
color: Colors.transparent,
177+
color: Colors.green,
180178
dark: isDarkMode
181179
);
182180
}
@@ -232,7 +230,6 @@ Future<List<Object>> _initStorage() async {
232230
errors.add(error);
233231
}
234232

235-
236233
return errors;
237234
}
238235

@@ -254,7 +251,11 @@ class _RebootApplicationState extends State<RebootApplication> {
254251
}
255252

256253
void _handleErrors(List<Object?> errors) {
257-
errors.where((element) => element != null).forEach((element) => onError(element!, null, false));
254+
for(final error in errors) {
255+
if(error != null) {
256+
onError(error, null, false);
257+
}
258+
}
258259
}
259260

260261
@override

0 commit comments

Comments
 (0)