Skip to content

Commit 1852f1a

Browse files
authored
移除对 TerracottaLegacy 和 PCL2CE 房间格式的支持 (#118)
* Drop legacy support and refector project structure. * Fix: Android.
1 parent 047fd34 commit 1852f1a

File tree

11 files changed

+141
-493
lines changed

11 files changed

+141
-493
lines changed

src/controller/api.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
use std::sync::mpsc;
22
use crate::controller::states::AppState;
3-
use crate::controller::{experimental, ConnectionDifficulty, ExceptionType, Room};
3+
use crate::controller::{scaffolding, ConnectionDifficulty, ExceptionType, Room};
44
use crate::scaffolding::profile::Profile;
55
use crate::mc::scanning::MinecraftScanner;
66
use crate::MOTD;
@@ -131,7 +131,7 @@ pub fn set_scanning(room: Option<String>, player: Option<String>) {
131131
}
132132
};
133133

134-
experimental::start_host(room, port, player, capture, receiver.recv().unwrap())
134+
scaffolding::start_host(room, port, player, capture, receiver.recv().unwrap())
135135
});
136136
}
137137

src/controller/mod.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@ mod states;
22
mod api;
33
mod rooms;
44

5-
use crate::scaffolding;
6-
75
pub use rooms::*;
86
pub use states::*;
97
pub use api::*;
108

9+
use crate::scaffolding::server::start as start;
10+
use scaffolding::protocols::HANDLERS as HANDLERS;
11+
1112
lazy_static::lazy_static! {
12-
pub static ref SCAFFOLDING_PORT: u16 = scaffolding::server::start(experimental::HANDLERS, 13448)
13-
.unwrap_or_else(|_| scaffolding::server::start(experimental::HANDLERS, 0).unwrap());
13+
pub static ref SCAFFOLDING_PORT: u16 = start(HANDLERS, 13448).unwrap_or_else(|_| start(HANDLERS, 0).unwrap());
1414
}

src/controller/rooms/legacy.rs

Lines changed: 0 additions & 288 deletions
This file was deleted.

src/controller/rooms/mod.rs

Lines changed: 6 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
1-
pub mod experimental;
2-
mod legacy;
3-
mod pcl2ce;
1+
pub mod scaffolding;
42

53
use crate::controller::states::AppStateCapture;
64

@@ -10,14 +8,13 @@ pub struct Room {
108

119
pub network_name: String,
1210
pub network_secret: String,
11+
#[allow(dead_code)]
1312
pub kind: RoomKind,
1413
}
1514

1615
#[derive(Debug, Clone)]
1716
pub enum RoomKind {
18-
Experimental { seed: u128 },
19-
TerracottaLegacy { mc_port: u16 },
20-
PCL2CE { mc_port: u16 },
17+
Scaffolding { #[allow(dead_code)] seed: u128 }
2118
}
2219

2320
#[derive(Debug)]
@@ -27,23 +24,14 @@ pub enum ConnectionDifficulty {
2724

2825
impl Room {
2926
pub fn create() -> Room {
30-
experimental::create_room()
27+
scaffolding::create_room()
3128
}
3229

3330
pub fn from(code: &str) -> Option<Room> {
34-
for parser in [experimental::parse, legacy::parse, pcl2ce::parse] {
35-
if let Some(room) = parser(code) {
36-
return Some(room);
37-
}
38-
}
39-
40-
None
31+
scaffolding::parse(code)
4132
}
4233

4334
pub fn start_guest(self, capture: AppStateCapture, player: Option<String>) {
44-
match self.kind {
45-
RoomKind::Experimental { .. } => experimental::start_guest(self, player, capture),
46-
RoomKind::TerracottaLegacy { .. } | RoomKind::PCL2CE { .. } => legacy::start_guest(self, capture),
47-
};
35+
scaffolding::start_guest(self, player, capture)
4836
}
4937
}

0 commit comments

Comments
 (0)