AriasCreations/ConanServerManager
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Change libac package name, and integrate rcon into libac

Browse source
This commit is contained in:
zontreck 2024-05-24 14:52:01 -07:00
parent ca57807ccb
commit 68130285bc
15 changed files with 58 additions and 48 deletions
Download patch file Download diff file Expand all files Collapse all files

4
bin/server.dart
View file

@ -1,7 +1,7 @@
import 'dart:io'; import 'dart:io';
import 'package:libac_flutter/packets/packets.dart'; import 'package:libac_dart/packets/packets.dart';
import 'package:libac_flutter/utils/IOTools.dart'; import 'package:libac_dart/utils/IOTools.dart';
import 'package:servermanager/game.dart'; import 'package:servermanager/game.dart';
import 'package:servermanager/packets/ClientPackets.dart'; import 'package:servermanager/packets/ClientPackets.dart';
import 'package:servermanager/structs/settings.dart'; import 'package:servermanager/structs/settings.dart';

2
lib/game.dart
View file

@ -1,7 +1,7 @@
import 'dart:io'; import 'dart:io';
import 'package:crypto/crypto.dart'; import 'package:crypto/crypto.dart';
import 'package:libac_flutter/utils/IOTools.dart'; import 'package:libac_dart/utils/IOTools.dart';
import 'package:servermanager/structs/mod.dart'; import 'package:servermanager/structs/mod.dart';
import 'package:servermanager/structs/settings.dart'; import 'package:servermanager/structs/settings.dart';

2
lib/main.dart
View file

@ -1,5 +1,5 @@
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:libac_flutter/packets/packets.dart'; import 'package:libac_dart/packets/packets.dart';
import 'package:servermanager/packets/ClientPackets.dart'; import 'package:servermanager/packets/ClientPackets.dart';
import 'package:servermanager/pages/Constants.dart'; import 'package:servermanager/pages/Constants.dart';
import 'package:servermanager/pages/GameServerPage.dart'; import 'package:servermanager/pages/GameServerPage.dart';

18
lib/packets/ClientPackets.dart
View file

@ -1,14 +1,14 @@
import 'dart:convert'; import 'dart:convert';
import 'package:libac_flutter/nbt/NbtUtils.dart'; import 'package:libac_dart/nbt/NbtUtils.dart';
import 'package:libac_flutter/nbt/Stream.dart'; import 'package:libac_dart/nbt/Stream.dart';
import 'package:libac_flutter/nbt/Tag.dart'; import 'package:libac_dart/nbt/Tag.dart';
import 'package:libac_flutter/nbt/impl/CompoundTag.dart'; import 'package:libac_dart/nbt/impl/CompoundTag.dart';
import 'package:libac_flutter/nbt/impl/StringTag.dart'; import 'package:libac_dart/nbt/impl/StringTag.dart';
import 'package:libac_flutter/packets/packets.dart'; import 'package:libac_dart/packets/packets.dart';
import 'package:libac_flutter/utils/Hashing.dart'; import 'package:libac_dart/utils/Hashing.dart';
import 'package:libac_flutter/utils/uuid/NbtUUID.dart'; import 'package:libac_dart/utils/uuid/NbtUUID.dart';
import 'package:libac_flutter/utils/uuid/UUID.dart'; import 'package:libac_dart/utils/uuid/UUID.dart';
import 'package:servermanager/statemachine.dart'; import 'package:servermanager/statemachine.dart';
import 'package:servermanager/structs/SessionData.dart'; import 'package:servermanager/structs/SessionData.dart';
import 'package:servermanager/structs/settings.dart'; import 'package:servermanager/structs/settings.dart';

2
lib/pages/autorestart.dart
View file

@ -1,5 +1,5 @@
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:libac_flutter/utils/TimeUtils.dart'; import 'package:libac_dart/utils/TimeUtils.dart';
import 'package:servermanager/structs/autorestarts.dart'; import 'package:servermanager/structs/autorestarts.dart';
import 'package:servermanager/structs/settings.dart'; import 'package:servermanager/structs/settings.dart';

2
lib/proton.dart
View file

@ -1,6 +1,6 @@
import 'dart:io'; import 'dart:io';
import 'package:libac_flutter/utils/IOTools.dart'; import 'package:libac_dart/utils/IOTools.dart';
import 'package:servermanager/statemachine.dart'; import 'package:servermanager/statemachine.dart';
import 'package:servermanager/structs/settings.dart'; import 'package:servermanager/structs/settings.dart';

15
lib/statemachine.dart
View file

@ -1,8 +1,9 @@
import 'dart:async'; import 'dart:async';
import 'dart:io'; import 'dart:io';
import 'package:libac_flutter/packets/packets.dart'; import 'package:libac_dart/nbt/Stream.dart';
import 'package:libac_flutter/utils/IOTools.dart'; import 'package:libac_dart/packets/packets.dart';
import 'package:libac_dart/utils/IOTools.dart';
import 'package:servermanager/game.dart'; import 'package:servermanager/game.dart';
import 'package:servermanager/proton.dart'; import 'package:servermanager/proton.dart';
import 'package:servermanager/structs/SessionData.dart'; import 'package:servermanager/structs/SessionData.dart';
@ -79,7 +80,17 @@ class StateMachine {
DeadProcKillswitch = Completer(); DeadProcKillswitch = Completer();
} }
static void onStdOutData(List<int> stdOutData) {
StringBuilder builder = StringBuilder();
for (int i in stdOutData) {
builder.append(String.fromCharCode(i));
}
print(builder.toString());
}
static Future<void> monitorProcess() async { static Future<void> monitorProcess() async {
PROC!.stdout.listen(onStdOutData);
try { try {
int code = await PROC!.exitCode; int code = await PROC!.exitCode;
DeadProcKillswitch.complete(); DeadProcKillswitch.complete();

2
lib/structs/SessionData.dart
View file

@ -1,4 +1,4 @@
import 'package:libac_flutter/utils/TimeUtils.dart'; import 'package:libac_dart/utils/TimeUtils.dart';
import 'package:servermanager/statemachine.dart'; import 'package:servermanager/statemachine.dart';
class SessionData { class SessionData {

8
lib/structs/autorestarts.dart
View file

@ -1,7 +1,7 @@
import 'package:libac_flutter/nbt/NbtUtils.dart'; import 'package:libac_dart/nbt/NbtUtils.dart';
import 'package:libac_flutter/nbt/impl/CompoundTag.dart'; import 'package:libac_dart/nbt/impl/CompoundTag.dart';
import 'package:libac_flutter/nbt/impl/IntTag.dart'; import 'package:libac_dart/nbt/impl/IntTag.dart';
import 'package:libac_flutter/utils/TimeUtils.dart'; import 'package:libac_dart/utils/TimeUtils.dart';
class AutomaticRestartInfo { class AutomaticRestartInfo {
Time time = Time(hours: 0, minutes: 0, seconds: 0); Time time = Time(hours: 0, minutes: 0, seconds: 0);

4
lib/structs/credentials.dart
View file

@ -1,5 +1,5 @@
import 'package:libac_flutter/nbt/impl/CompoundTag.dart'; import 'package:libac_dart/nbt/impl/CompoundTag.dart';
import 'package:libac_flutter/nbt/impl/StringTag.dart'; import 'package:libac_dart/nbt/impl/StringTag.dart';
class Credentials { class Credentials {
String username; String username;

8
lib/structs/mod.dart
View file

@ -1,7 +1,7 @@
import 'package:libac_flutter/nbt/impl/CompoundTag.dart'; import 'package:libac_dart/nbt/impl/CompoundTag.dart';
import 'package:libac_flutter/nbt/impl/LongTag.dart'; import 'package:libac_dart/nbt/impl/LongTag.dart';
import 'package:libac_flutter/nbt/impl/StringTag.dart'; import 'package:libac_dart/nbt/impl/StringTag.dart';
import 'package:libac_flutter/utils/uuid/UUID.dart'; import 'package:libac_dart/utils/uuid/UUID.dart';
class Mod { class Mod {
String mod_name = ""; String mod_name = "";

6
lib/structs/serversettings.dart
View file

@ -1,6 +1,6 @@
import 'package:libac_flutter/nbt/impl/CompoundTag.dart'; import 'package:libac_dart/nbt/impl/CompoundTag.dart';
import 'package:libac_flutter/nbt/impl/IntTag.dart'; import 'package:libac_dart/nbt/impl/IntTag.dart';
import 'package:libac_flutter/nbt/impl/StringTag.dart'; import 'package:libac_dart/nbt/impl/StringTag.dart';
class ServerSettings { class ServerSettings {
final String RconPassword; final String RconPassword;

18
lib/structs/settings.dart
View file

@ -2,15 +2,15 @@ import 'dart:io';
import 'package:archive/archive.dart'; import 'package:archive/archive.dart';
import 'package:dio/dio.dart'; import 'package:dio/dio.dart';
import 'package:libac_flutter/nbt/NbtIo.dart'; import 'package:libac_dart/nbt/NbtIo.dart';
import 'package:libac_flutter/nbt/NbtUtils.dart'; import 'package:libac_dart/nbt/NbtUtils.dart';
import 'package:libac_flutter/nbt/impl/CompoundTag.dart'; import 'package:libac_dart/nbt/impl/CompoundTag.dart';
import 'package:libac_flutter/nbt/impl/StringTag.dart'; import 'package:libac_dart/nbt/impl/StringTag.dart';
import 'package:libac_flutter/packets/packets.dart'; import 'package:libac_dart/packets/packets.dart';
import 'package:libac_flutter/utils/IOTools.dart'; import 'package:libac_dart/utils/IOTools.dart';
import 'package:libac_flutter/utils/uuid/NbtUUID.dart'; import 'package:libac_dart/utils/rcon/rcon_api.dart';
import 'package:libac_flutter/utils/uuid/UUID.dart'; import 'package:libac_dart/utils/uuid/NbtUUID.dart';
import 'package:mc_rcon_dart/mc_rcon_dart.dart'; import 'package:libac_dart/utils/uuid/UUID.dart';
import 'package:servermanager/statemachine.dart'; import 'package:servermanager/statemachine.dart';
import 'package:servermanager/structs/credentials.dart'; import 'package:servermanager/structs/credentials.dart';
import 'package:servermanager/structs/mod.dart'; import 'package:servermanager/structs/mod.dart';

10
lib/structs/settingsEntry.dart
View file

@ -1,8 +1,8 @@
import 'package:libac_flutter/nbt/NbtUtils.dart'; import 'package:libac_dart/nbt/NbtUtils.dart';
import 'package:libac_flutter/nbt/Tag.dart'; import 'package:libac_dart/nbt/Tag.dart';
import 'package:libac_flutter/nbt/impl/CompoundTag.dart'; import 'package:libac_dart/nbt/impl/CompoundTag.dart';
import 'package:libac_flutter/nbt/impl/ListTag.dart'; import 'package:libac_dart/nbt/impl/ListTag.dart';
import 'package:libac_flutter/utils/TimeUtils.dart'; import 'package:libac_dart/utils/TimeUtils.dart';
import 'package:servermanager/structs/autorestarts.dart'; import 'package:servermanager/structs/autorestarts.dart';
import 'package:servermanager/structs/credentials.dart'; import 'package:servermanager/structs/credentials.dart';
import 'package:servermanager/structs/mod.dart'; import 'package:servermanager/structs/mod.dart';

5
pubspec.yaml
View file

@ -38,10 +38,9 @@ dependencies:
archive: archive:
dio: dio:
crypto: crypto:
libac_flutter: libac_dart:
hosted: https://git.zontreck.com/api/packages/AriasCreations/pub/ hosted: https://git.zontreck.com/api/packages/AriasCreations/pub/
version: 1.0.20 version: 1.0.21
mc_rcon_dart: ^1.1.0
dev_dependencies: dev_dependencies:
flutter_test: flutter_test: