Drop support for legacy, pcl2ce typed rooms.

Author: burningtnt

src/controller/api.rs

@@ -1,6 +1,6 @@
 use std::sync::mpsc;
 use crate::controller::states::AppState;
-use crate::controller::{experimental, ConnectionDifficulty, ExceptionType, Room};
+use crate::controller::{scaffolding, ConnectionDifficulty, ExceptionType, Room};
 use crate::scaffolding::profile::Profile;
 use crate::mc::scanning::MinecraftScanner;
 use crate::MOTD;
@@ -131,7 +131,7 @@ pub fn set_scanning(room: Option<String>, player: Option<String>) {
             }
         };
 
-        experimental::start_host(room, port, player, capture, receiver.recv().unwrap())
+        scaffolding::start_host(room, port, player, capture, receiver.recv().unwrap())
     });
 }
 

src/controller/mod.rs

@@ -4,11 +4,11 @@ mod rooms;
 
 pub use rooms::*;
 
-use crate::scaffolding;
 pub use states::ExceptionType;
 pub use api::*;
+use crate::controller::rooms::scaffolding::protocols::HANDLERS;
 
 lazy_static::lazy_static! {
-    pub static ref SCAFFOLDING_PORT: u16 = scaffolding::server::start(experimental::HANDLERS, 13448)
-        .unwrap_or_else(|_| scaffolding::server::start(experimental::HANDLERS, 0).unwrap());
+    pub static ref SCAFFOLDING_PORT: u16 = crate::scaffolding::server::start(HANDLERS, 13448)
+        .unwrap_or_else(|_| crate::scaffolding::server::start(HANDLERS, 0).unwrap());
 }

src/controller/rooms/legacy.rs

@@ -1,6 +1,4 @@
-pub mod experimental;
-mod legacy;
-mod pcl2ce;
+pub mod scaffolding;
 
 use crate::controller::states::AppStateCapture;
 
@@ -10,14 +8,13 @@ pub struct Room {
 
     pub(crate) network_name: String,
     pub(crate) network_secret: String,
+    #[allow(dead_code)]
     pub(crate) kind: RoomKind,
 }
 
 #[derive(Debug, Clone)]
 pub(crate) enum RoomKind {
-    Experimental { seed: u128 },
-    TerracottaLegacy { mc_port: u16 },
-    PCL2CE { mc_port: u16 },
+    Scaffolding { #[allow(dead_code)] seed: u128 }
 }
 
 #[derive(Debug)]
@@ -27,23 +24,14 @@ pub enum ConnectionDifficulty {
 
 impl Room {
     pub fn create() -> Room {
-        experimental::create_room()
+        scaffolding::create_room()
     }
 
     pub fn from(code: &str) -> Option<Room> {
-        for parser in [experimental::parse, legacy::parse, pcl2ce::parse] {
-            if let Some(room) = parser(code) {
-                return Some(room);
-            }
-        }
-
-        None
+        scaffolding::parse(code)
     }
 
     pub fn start_guest(self, capture: AppStateCapture, player: Option<String>) {
-        match self.kind {
-            RoomKind::Experimental { .. } => experimental::start_guest(self, player, capture),
-            RoomKind::TerracottaLegacy { .. } | RoomKind::PCL2CE { .. } => legacy::start_guest(self, capture),
-        };
+        scaffolding::start_guest(self, player, capture)
     }
 }