Stowage/noita_entangled_worlds
2
0
Fork 0
mirror of https://github.com/IntQuant/noita_entangled_worlds.git synced 2025-10-19 07:03:16 +00:00
Code Issues Projects Releases Packages Wiki Activity

Add a shortcut (Ctrl+R) to clear avatar cache.

Browse source
This commit is contained in:
IQuant 2024-10-26 13:37:36 +03:00
parent df5839a966
commit d5b71becae
2 changed files with 43 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

64
noita-proxy/src/lib.rs
View file

@ -6,8 +6,8 @@ use bookkeeping::{
use clipboard::{ClipboardContext, ClipboardProvider}; use clipboard::{ClipboardContext, ClipboardProvider};
use eframe::egui::{ use eframe::egui::{
self, Align2, Button, Color32, Context, DragValue, FontDefinitions, FontFamily, ImageButton, self, Align2, Button, Color32, Context, DragValue, FontDefinitions, FontFamily, ImageButton,
InnerResponse, Key, Margin, OpenUrl, Rect, RichText, ScrollArea, Slider, TextureOptions, InnerResponse, Key, KeyboardShortcut, Margin, Modifiers, OpenUrl, Rect, RichText, ScrollArea,
ThemePreference, Ui, UiBuilder, Vec2, Visuals, Window, Slider, TextureOptions, ThemePreference, Ui, UiBuilder, Vec2, Visuals, Window,
}; };
use egui_plot::{Plot, PlotPoint, PlotUi, Text}; use egui_plot::{Plot, PlotPoint, PlotUi, Text};
use image::DynamicImage::ImageRgba8; use image::DynamicImage::ImageRgba8;
@ -934,29 +934,7 @@ impl eframe::App for App {
let steam = self.steam_state.as_mut().expect( let steam = self.steam_state.as_mut().expect(
"steam should be available, as we are using steam networking", "steam should be available, as we are using steam networking",
); );
ScrollArea::vertical().auto_shrink(false).show(ui, |ui| { show_player_list_steam(ctx, steam, ui, netman);
for peer in netman.peer.iter_peer_ids() {
let role = peer_role(peer, netman);
let username = steam.get_user_name(peer.into());
let avatar = steam.get_avatar(ctx, peer.into());
if let Some(avatar) = avatar {
avatar.display_with_labels(ui, &username, &role);
} else {
ui.label(&username);
}
if netman.peer.is_host() && peer != netman.peer.my_id() {
if ui.button("kick").clicked() {
netman.kick_list.lock().unwrap().push(peer)
}
if ui.button("ban").clicked() {
netman.ban_list.lock().unwrap().push(peer)
}
}
if avatar.is_some() {
ui.add_space(5.0);
}
}
});
} else { } else {
for peer in netman.peer.iter_peer_ids() { for peer in netman.peer.iter_peer_ids() {
ui.label(peer.to_string()); ui.label(peer.to_string());
@ -1215,6 +1193,40 @@ impl eframe::App for App {
} }
} }
fn show_player_list_steam(
ctx: &Context,
steam: &mut steam_helper::SteamState,
ui: &mut Ui,
netman: &mut NetManStopOnDrop,
) {
if ctx.input_mut(|i| i.consume_shortcut(&KeyboardShortcut::new(Modifiers::CTRL, Key::R))) {
steam.reset_avatar_cache();
}
ScrollArea::vertical().auto_shrink(false).show(ui, |ui| {
for peer in netman.peer.iter_peer_ids() {
let role = peer_role(peer, netman);
let username = steam.get_user_name(peer.into());
let avatar = steam.get_avatar(ctx, peer.into());
if let Some(avatar) = avatar {
avatar.display_with_labels(ui, &username, &role);
} else {
ui.label(&username);
}
if netman.peer.is_host() && peer != netman.peer.my_id() {
if ui.button("kick").clicked() {
netman.kick_list.lock().unwrap().push(peer)
}
if ui.button("ban").clicked() {
netman.ban_list.lock().unwrap().push(peer)
}
}
if avatar.is_some() {
ui.add_space(5.0);
}
}
});
}
fn add_per_status_ui( fn add_per_status_ui(
report: &net::steam_networking::ConnectionStatusReport, report: &net::steam_networking::ConnectionStatusReport,
steam: &steam_helper::SteamState, steam: &steam_helper::SteamState,
@ -1367,4 +1379,4 @@ pub fn host_cli(port: u16) {
let player_path = netmaninit.player_path.clone(); let player_path = netmaninit.player_path.clone();
let netman = net::NetManager::new(varient, netmaninit); let netman = net::NetManager::new(varient, netmaninit);
netman.start_inner(player_path, true).unwrap(); netman.start_inner(player_path, true).unwrap();
} }

5
noita-proxy/src/util/steam_helper.rs
View file

@ -97,4 +97,9 @@ impl SteamState {
pub(crate) fn get_my_id(&self) -> SteamId { pub(crate) fn get_my_id(&self) -> SteamId {
self.client.user().steam_id() self.client.user().steam_id()
} }
pub(crate) fn reset_avatar_cache(&mut self) {
info!("Avatar cache reset");
self.avatar_cache.clear();
}
} }