Commit d9655c9
authored
Network multiplayer optimization (UI improvements) (#9671)
- Connection errors display detailed messages instead of generic failure
- Waiting timer shows player name and elapsed time
- Add volatile to timer fields for thread safety
- 1-second reschedule loop for network games only
* Add lobby chat enhancements extracted from NetworkPlay/main
These server-side chat features were missed during the earlier extraction
to NetworkPlay/chat (since merged to master). Moving here as UI-focused.
- Broadcast ready state with player count when toggling ready
- Show (Host) indicator next to host's chat messages
- Distinguish host login ('Lobby hosted by') vs player join ('joined the lobby')
- Detect and announce player name changes
- Fix duplicate message display by removing MessageEvent from LobbyInputHandler
- Use 'left the lobby' instead of 'left the room' for consistency
Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
* Refactor GuiBase.isNetworkplay to support per-instance query (PR 9671 feedback)
Adds an overloaded isNetworkplay(IGuiGame) that checks whether a
specific game instance is networked, rather than relying solely on the
global static boolean which reflects whichever lobby last called
setNetworkplay().
Unmigrated call sites (no-arg fallback, no IGuiGame in scope):
- FThreads (utility class, no game context)
Co-authored-by: tool4EvEr <tool4EvEr@>1 parent 9274f70 commit d9655c9
File tree
27 files changed
+298
-46
lines changed- forge-gui-desktop/src/main/java/forge
- screens
- home
- online
- match
- view
- forge-gui-mobile/src/forge
- screens
- constructed
- match
- views
- online
- forge-gui
- res/languages
- src/main/java/forge
- gamemodes
- match
- input
- net
- client
- server
- gui
- control
- interfaces
- localinstance/properties
- player
27 files changed
+298
-46
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
94 | 94 | | |
95 | 95 | | |
96 | 96 | | |
| 97 | + | |
| 98 | + | |
| 99 | + | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
368 | 368 | | |
369 | 369 | | |
370 | 370 | | |
| 371 | + | |
| 372 | + | |
| 373 | + | |
| 374 | + | |
| 375 | + | |
| 376 | + | |
| 377 | + | |
| 378 | + | |
371 | 379 | | |
372 | 380 | | |
373 | 381 | | |
| |||
Lines changed: 0 additions & 3 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
33 | 33 | | |
34 | 34 | | |
35 | 35 | | |
36 | | - | |
37 | 36 | | |
38 | 37 | | |
39 | 38 | | |
| |||
247 | 246 | | |
248 | 247 | | |
249 | 248 | | |
250 | | - | |
251 | | - | |
252 | 249 | | |
253 | 250 | | |
254 | 251 | | |
| |||
Lines changed: 8 additions & 2 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
86 | 86 | | |
87 | 87 | | |
88 | 88 | | |
89 | | - | |
| 89 | + | |
| 90 | + | |
90 | 91 | | |
91 | 92 | | |
92 | | - | |
| 93 | + | |
| 94 | + | |
| 95 | + | |
| 96 | + | |
| 97 | + | |
| 98 | + | |
93 | 99 | | |
94 | 100 | | |
95 | 101 | | |
| |||
Lines changed: 6 additions & 0 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
963 | 963 | | |
964 | 964 | | |
965 | 965 | | |
| 966 | + | |
| 967 | + | |
| 968 | + | |
| 969 | + | |
966 | 970 | | |
967 | 971 | | |
968 | 972 | | |
969 | 973 | | |
970 | 974 | | |
| 975 | + | |
971 | 976 | | |
972 | 977 | | |
973 | 978 | | |
974 | 979 | | |
975 | 980 | | |
| 981 | + | |
976 | 982 | | |
977 | 983 | | |
978 | 984 | | |
| |||
Lines changed: 10 additions & 0 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
24 | 24 | | |
25 | 25 | | |
26 | 26 | | |
| 27 | + | |
27 | 28 | | |
28 | 29 | | |
29 | 30 | | |
| |||
185 | 186 | | |
186 | 187 | | |
187 | 188 | | |
| 189 | + | |
| 190 | + | |
| 191 | + | |
| 192 | + | |
| 193 | + | |
188 | 194 | | |
189 | 195 | | |
190 | 196 | | |
| |||
475 | 481 | | |
476 | 482 | | |
477 | 483 | | |
| 484 | + | |
| 485 | + | |
| 486 | + | |
| 487 | + | |
478 | 488 | | |
479 | 489 | | |
480 | 490 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
362 | 362 | | |
363 | 363 | | |
364 | 364 | | |
| 365 | + | |
| 366 | + | |
| 367 | + | |
| 368 | + | |
| 369 | + | |
365 | 370 | | |
366 | 371 | | |
367 | 372 | | |
| |||
Lines changed: 0 additions & 2 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
602 | 602 | | |
603 | 603 | | |
604 | 604 | | |
605 | | - | |
606 | | - | |
607 | 605 | | |
608 | 606 | | |
609 | 607 | | |
| |||
Lines changed: 10 additions & 5 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
143 | 143 | | |
144 | 144 | | |
145 | 145 | | |
146 | | - | |
| 146 | + | |
147 | 147 | | |
148 | 148 | | |
149 | 149 | | |
| |||
182 | 182 | | |
183 | 183 | | |
184 | 184 | | |
185 | | - | |
| 185 | + | |
186 | 186 | | |
187 | 187 | | |
188 | 188 | | |
| |||
211 | 211 | | |
212 | 212 | | |
213 | 213 | | |
| 214 | + | |
| 215 | + | |
| 216 | + | |
| 217 | + | |
214 | 218 | | |
215 | 219 | | |
216 | 220 | | |
217 | 221 | | |
218 | 222 | | |
| 223 | + | |
219 | 224 | | |
220 | 225 | | |
221 | 226 | | |
| |||
251 | 256 | | |
252 | 257 | | |
253 | 258 | | |
254 | | - | |
| 259 | + | |
255 | 260 | | |
256 | 261 | | |
257 | 262 | | |
258 | 263 | | |
259 | 264 | | |
260 | 265 | | |
261 | | - | |
| 266 | + | |
262 | 267 | | |
263 | 268 | | |
264 | 269 | | |
265 | 270 | | |
266 | | - | |
| 271 | + | |
267 | 272 | | |
268 | 273 | | |
269 | 274 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
126 | 126 | | |
127 | 127 | | |
128 | 128 | | |
129 | | - | |
| 129 | + | |
130 | 130 | | |
131 | 131 | | |
132 | 132 | | |
| |||
378 | 378 | | |
379 | 379 | | |
380 | 380 | | |
381 | | - | |
| 381 | + | |
382 | 382 | | |
383 | 383 | | |
384 | 384 | | |
| |||
0 commit comments