From abab49760344419757047b56b2bc548730cf7bc2 Mon Sep 17 00:00:00 2001
From: Cyberarm <matthewlikesrobots@gmail.com>
Date: Tue, 9 Nov 2021 08:05:56 -0600
Subject: [PATCH] Stubbed server info, renamed trashcan to trashCan

---
 Gemfile.lock                                  |   3 ++
 lib/game.rb                                   |   2 +-
 lib/states/interface.rb                       |  49 +++++++++++++++++-
 media/ui_icons/{trashcan.png => trashCan.png} | Bin
 4 files changed, 52 insertions(+), 2 deletions(-)
 rename media/ui_icons/{trashcan.png => trashCan.png} (100%)

diff --git a/Gemfile.lock b/Gemfile.lock
index 2ffa7b1..5d15e1b 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -17,6 +17,8 @@ GEM
       addressable (~> 2.7)
     nokogiri (1.11.7-x64-mingw32)
       racc (~> 1.4)
+    nokogiri (1.11.7-x86_64-linux)
+      racc (~> 1.4)
     nokogumbo (2.0.5)
       nokogiri (~> 1.8, >= 1.8.4)
     public_suffix (4.0.6)
@@ -31,6 +33,7 @@ GEM
 
 PLATFORMS
   x64-mingw32
+  x86_64-linux
 
 DEPENDENCIES
   cyberarm_engine
diff --git a/lib/game.rb b/lib/game.rb
index 977b9d8..fc84307 100644
--- a/lib/game.rb
+++ b/lib/game.rb
@@ -24,7 +24,7 @@ class W3DHub
         @@games << i
       end
 
-      @@games.sort! { |g| g.slot }
+      @@games.sort_by! { |g| g.slot }
     end
 
     def self.games
diff --git a/lib/states/interface.rb b/lib/states/interface.rb
index 796b9e6..95a0eb7 100644
--- a/lib/states/interface.rb
+++ b/lib/states/interface.rb
@@ -435,6 +435,8 @@ class W3DHub
       end
 
       def populate_game_news(game)
+        return unless @focused_game == game
+
         if (feed = @game_news[game.slot])
           @game_news_container.clear do
             feed.items.sort_by { |i| i.pubDate }.reverse[0..9].each do |item|
@@ -464,7 +466,52 @@ class W3DHub
 
       def populate_server_info(server)
         @game_server_info_container.clear do
-          title "TODO"
+          stack(width: 1.0, height: 1.0, padding: 8) do
+            stack(width: 1.0, height: 0.2) do
+              tagline "[W3D Hub] GAME SERVER"
+              button "Join Server"
+            end
+
+            flow(width: 1.0, height: 0.05) do
+              stack(width: 0.5, height: 1.0) do
+                para "<b>GDI</b>", width: 1.0, text_align: :center
+              end
+
+              stack(width: 0.5, height: 1.0) do
+                para "<b>Nod</b>", width: 1.0, text_align: :center
+              end
+            end
+
+            flow(width: 1.0, height: 0.75) do
+              stack(width: 0.5, height: 1.0, scroll: true) do
+                15.times do |i|
+                  flow(width: 1.0, height: 18) do
+                    stack(width: 0.6, height: 1.0) do
+                      inscription "Player Name #{i}", text_size: 14
+                    end
+
+                    stack(width: 0.4, height: 1.0) do
+                      inscription "#{rand(1000..100000)}", text_size: 14, width: 1.0, text_align: :right
+                    end
+                  end
+                end
+              end
+
+              stack(width: 0.5, height: 1.0, scroll: true, border_thickness_left: 2, border_color_left: 0xff_000000) do
+                45.times do |i|
+                  flow(width: 1.0, height: 18) do
+                    stack(width: 0.6, height: 1.0) do
+                      inscription "Player Name #{i}", text_size: 14
+                    end
+
+                    stack(width: 0.4, height: 1.0) do
+                      inscription "#{rand(1000..100000)}", text_size: 14, width: 1.0, text_align: :right
+                    end
+                  end
+                end
+              end
+            end
+          end
         end
       end
     end
diff --git a/media/ui_icons/trashcan.png b/media/ui_icons/trashCan.png
similarity index 100%
rename from media/ui_icons/trashcan.png
rename to media/ui_icons/trashCan.png