From 780d42067ea570eabfdd84f5e76ab3b3cc5b7046 Mon Sep 17 00:00:00 2001
From: CosminPerRam <cosmin.p@live.com>
Date: Fri, 28 Apr 2023 19:49:52 +0300
Subject: [PATCH] [Protocol] Moved GS1 under gamespy::one instead of gamespy

---
 CHANGELOG.md                                      | 1 +
 src/games/bf1942.rs                               | 7 +++----
 src/games/ss.rs                                   | 7 +++----
 src/games/ut.rs                                   | 7 +++----
 src/protocols/gamespy/protocols/mod.rs            | 3 ---
 src/protocols/gamespy/protocols/three/protocol.rs | 3 +--
 6 files changed, 11 insertions(+), 17 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1146981..4275f3f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -22,6 +22,7 @@ Services:
 Protocols:
 - Valve: Request type enums have been renamed from all caps to starting-only uppercase, ex: `INFO` to `Info`
 - GameSpy 1: `players_minimum` is now an `Option<u8>` instead of an `u8`
+- GameSpy 1: Is now under `protocols::gamespy::one` instead of `protocols::gamespy`
 
 # 0.2.1 - 03/03/2023
 ### Changes:
diff --git a/src/games/bf1942.rs b/src/games/bf1942.rs
index b813694..632db72 100644
--- a/src/games/bf1942.rs
+++ b/src/games/bf1942.rs
@@ -1,7 +1,6 @@
-use crate::{
-    protocols::gamespy::{self, Response},
-    GDResult,
-};
+use crate::protocols::gamespy;
+use crate::protocols::gamespy::one::Response;
+use crate::GDResult;
 
 pub fn query(address: &str, port: Option<u16>) -> GDResult<Response> {
     gamespy::one::query(address, port.unwrap_or(23000), None)
diff --git a/src/games/ss.rs b/src/games/ss.rs
index 77d5cd9..63463d7 100644
--- a/src/games/ss.rs
+++ b/src/games/ss.rs
@@ -1,7 +1,6 @@
-use crate::{
-    protocols::gamespy::{self, Response},
-    GDResult,
-};
+use crate::protocols::gamespy;
+use crate::protocols::gamespy::one::Response;
+use crate::GDResult;
 
 pub fn query(address: &str, port: Option<u16>) -> GDResult<Response> {
     gamespy::one::query(address, port.unwrap_or(25601), None)
diff --git a/src/games/ut.rs b/src/games/ut.rs
index a7f4ff1..27bfe68 100644
--- a/src/games/ut.rs
+++ b/src/games/ut.rs
@@ -1,7 +1,6 @@
-use crate::{
-    protocols::gamespy::{self, Response},
-    GDResult,
-};
+use crate::protocols::gamespy;
+use crate::protocols::gamespy::one::Response;
+use crate::GDResult;
 
 pub fn query(address: &str, port: Option<u16>) -> GDResult<Response> {
     gamespy::one::query(address, port.unwrap_or(7778), None)
diff --git a/src/protocols/gamespy/protocols/mod.rs b/src/protocols/gamespy/protocols/mod.rs
index c1d250c..c2a9530 100644
--- a/src/protocols/gamespy/protocols/mod.rs
+++ b/src/protocols/gamespy/protocols/mod.rs
@@ -1,5 +1,2 @@
 pub mod one;
 pub mod three;
-
-pub use one::*;
-pub use three::*;
diff --git a/src/protocols/gamespy/protocols/three/protocol.rs b/src/protocols/gamespy/protocols/three/protocol.rs
index fdd0305..1c78ada 100644
--- a/src/protocols/gamespy/protocols/three/protocol.rs
+++ b/src/protocols/gamespy/protocols/three/protocol.rs
@@ -1,7 +1,6 @@
 use crate::bufferer::{Bufferer, Endianess};
 use crate::protocols::gamespy::common::has_password;
-use crate::protocols::gamespy::three::{Player, Response};
-use crate::protocols::gamespy::Team;
+use crate::protocols::gamespy::three::{Player, Response, Team};
 use crate::protocols::types::TimeoutSettings;
 use crate::socket::{Socket, UdpSocket};
 use crate::{GDError, GDResult};