From de9d5b5e14af06c56a57d40e594a36cc24da7bfd Mon Sep 17 00:00:00 2001 From: Vincent Foulon Date: Sat, 10 Apr 2021 22:26:42 +0200 Subject: [PATCH] clean workspace clean workspace (2) clean workspace (2) --- list.txt | 554 -------------------------------------- search-item.sh | 7 - voxygen/src/ui/img_ids.rs | 5 +- 3 files changed, 1 insertion(+), 565 deletions(-) delete mode 100644 list.txt delete mode 100644 search-item.sh diff --git a/list.txt b/list.txt deleted file mode 100644 index d9e201656b..0000000000 --- a/list.txt +++ /dev/null @@ -1,554 +0,0 @@ -element.0_1_knight -element.animation.buff_frame.1 -element.animation.buff_frame.2 -element.animation.buff_frame.3 -element.animation.buff_frame.4 -element.animation.buff_frame.5 -element.animation.buff_frame.6 -element.animation.buff_frame.7 -element.animation.buff_frame.8 -element.animation.gears.1 -element.animation.gears.2 -element.animation.gears.3 -element.animation.gears.4 -element.animation.gears.5 -element.animation.loaders.cauldron1 -element.animation.loaders.cauldron2 -element.animation.loaders.cauldron3 -element.animation.loaders.cauldron4 -element.animation.loaders.cauldron5 -element.animation.loaders.cheese1 -element.animation.loaders.cheese2 -element.animation.loaders.cheese3 -element.animation.loaders.cheese4 -element.animation.loaders.cheese5 -element.animation.loaders.coins1 -element.animation.loaders.coins2 -element.animation.loaders.coins3 -element.animation.loaders.coins4 -element.animation.loaders.coins5 -element.animation.loaders.house1 -element.animation.loaders.house2 -element.animation.loaders.house3 -element.animation.loaders.house4 -element.animation.loaders.house5 -element.animation.loaders.ship1 -element.animation.loaders.ship2 -element.animation.loaders.ship3 -element.animation.loaders.ship4 -element.animation.loaders.ship5 -element.icons.character -element.icons.de_buffs.buff_campfire_heal_0 -element.icons.de_buffs.buff_damage_reduce_0 -element.icons.de_buffs.buff_energyplus_0 -element.icons.de_buffs.buff_healthplus_0 -element.icons.de_buffs.buff_invincibility_0 -element.icons.de_buffs.buff_plus_0 -element.icons.de_buffs.buff_potion_0 -element.icons.de_buffs.buff_saturation_0 -element.icons.de_buffs.debuff_bleed_0 -element.icons.de_buffs.debuff_skull_0 -element.icons.gem -element.icons.indicator_bubble -element.icons.m1 -element.icons.m2 -element.icons.missing_icon_grey -element.icons.m_move -element.icons.m_scroll -element.icons.skull -element.icons.skull_2 -element.icons.snake_arrow -element.items.coin -element.items.collar -element.items.head_leather-0 -element.items.item_apple -element.items.item_apple_curry -element.items.item_apple_stick -element.items.item_bag_blue -element.items.item_bag_blue_face -element.items.item_bag_brown_face -element.items.item_bag_green_large -element.items.item_bag_green_mid -element.items.item_bag_large -element.items.item_bag_leather_large -element.items.item_bag_leather_small -element.items.item_bag_med -element.items.item_bag_red_face -element.items.item_bag_skull -element.items.item_bag_small -element.items.item_bag_t1_purp -element.items.item_bag_tiny -element.items.item_cheese -element.items.item_cloth0 -element.items.item_cloth_red -element.items.item_coconut -element.items.item_flayer_soul -element.items.item_honey -element.items.item_ice_shard -element.items.item_leather0 -element.items.item_leather1 -element.items.item_leather_green -element.items.item_mortarpestlecoco -element.items.item_raptor_feather -element.items.item_shroom_stick -element.items.item_sunflower_tea -element.items.lantern_black-0 -element.items.lantern_blue-0 -element.items.lantern_green-0 -element.items.lantern_grey-0 -element.items.lantern_red-0 -element.items.neck-0 -element.items.neck-1 -element.items.neck-seashell -element.items.ring-0 -element.items.sewing_set -element.items.tabard_admin -element.not_found -element.skills.2haxe_m1 -element.skills.2hhammer_m1 -element.skills.2hsword_m1 -element.skills.2hsword_m2 -element.skills.bow_aoe -element.skills.bow_m1 -element.skills.bow_m2 -element.skills.debug_wand_m1 -element.skills.debug_wand_m2 -element.skills.heal_0 -element.skills.heal_bomb -element.skills.lifesteal -element.skills.sceptre_protection -element.skills.skilltree.buff_amount -element.skills.skilltree.buff_combo -element.skills.skilltree.buff_cost -element.skills.skilltree.buff_damage -element.skills.skilltree.buff_distance -element.skills.skilltree.buff_duration -element.skills.skilltree.buff_energy_drain -element.skills.skilltree.buff_energy_regen -element.skills.skilltree.buff_explosion -element.skills.skilltree.buff_heal -element.skills.skilltree.buff_helicopter -element.skills.skilltree.buff_infinite -element.skills.skilltree.buff_knockback -element.skills.skilltree.buff_lifesteal -element.skills.skilltree.buff_projectile_speed -element.skills.skilltree.buff_radius -element.skills.skilltree.buff_speed -element.skills.skilltree.debuff_amount -element.skills.skilltree.debuff_combo -element.skills.skilltree.debuff_cost -element.skills.skilltree.debuff_damage -element.skills.skilltree.debuff_distance -element.skills.skilltree.debuff_duration -element.skills.skilltree.debuff_energy_drain -element.skills.skilltree.debuff_energy_regen -element.skills.skilltree.debuff_explosion -element.skills.skilltree.debuff_heal -element.skills.skilltree.debuff_helicopter -element.skills.skilltree.debuff_infinite -element.skills.skilltree.debuff_knockback -element.skills.skilltree.debuff_lifesteal -element.skills.skilltree.debuff_projectile_speed -element.skills.skilltree.debuff_radius -element.skills.skilltree.debuff_speed -element.skills.skilltree.health_plus -element.skills.skilltree.heal_amount -element.skills.skilltree.heal_combo -element.skills.skilltree.heal_cost -element.skills.skilltree.heal_damage -element.skills.skilltree.heal_distance -element.skills.skilltree.heal_duration -element.skills.skilltree.heal_energy_drain -element.skills.skilltree.heal_energy_regen -element.skills.skilltree.heal_explosion -element.skills.skilltree.heal_heal -element.skills.skilltree.heal_helicopter -element.skills.skilltree.heal_infinite -element.skills.skilltree.heal_knockback -element.skills.skilltree.heal_lifesteal -element.skills.skilltree.heal_projectile_speed -element.skills.skilltree.heal_radius -element.skills.skilltree.heal_speed -element.skills.skilltree.magic_amount -element.skills.skilltree.magic_combo -element.skills.skilltree.magic_cost -element.skills.skilltree.magic_damage -element.skills.skilltree.magic_distance -element.skills.skilltree.magic_duration -element.skills.skilltree.magic_energy_drain -element.skills.skilltree.magic_energy_regen -element.skills.skilltree.magic_explosion -element.skills.skilltree.magic_heal -element.skills.skilltree.magic_helicopter -element.skills.skilltree.magic_infinite -element.skills.skilltree.magic_knockback -element.skills.skilltree.magic_lifesteal -element.skills.skilltree.magic_projectile_speed -element.skills.skilltree.magic_radius -element.skills.skilltree.magic_speed -element.skills.skilltree.physical_amount -element.skills.skilltree.physical_combo -element.skills.skilltree.physical_cost -element.skills.skilltree.physical_damage -element.skills.skilltree.physical_distance -element.skills.skilltree.physical_duration -element.skills.skilltree.physical_energy_drain -element.skills.skilltree.physical_energy_regen -element.skills.skilltree.physical_explosion -element.skills.skilltree.physical_heal -element.skills.skilltree.physical_helicopter -element.skills.skilltree.physical_infinite -element.skills.skilltree.physical_knockback -element.skills.skilltree.physical_lifesteal -element.skills.skilltree.physical_projectile_speed -element.skills.skilltree.physical_radius -element.skills.skilltree.physical_speed -element.skills.skilltree.skill_climbing -element.skills.skilltree.skill_dodge -element.skills.skilltree.skill_swim -element.skills.skilltree.stamina_plus -element.skills.skilltree.unlock_axe -element.skills.skilltree.unlock_bow -element.skills.skilltree.unlock_hammer -element.skills.skilltree.unlock_sceptre -element.skills.skilltree.unlock_staff-0 -element.skills.skilltree.unlock_sword -element.skills.skilltree.utility_amount -element.skills.skilltree.utility_combo -element.skills.skilltree.utility_cost -element.skills.skilltree.utility_damage -element.skills.skilltree.utility_distance -element.skills.skilltree.utility_duration -element.skills.skilltree.utility_energy_drain -element.skills.skilltree.utility_energy_regen -element.skills.skilltree.utility_explosion -element.skills.skilltree.utility_heal -element.skills.skilltree.utility_helicopter -element.skills.skilltree.utility_infinite -element.skills.skilltree.utility_knockback -element.skills.skilltree.utility_lifesteal -element.skills.skilltree.utility_projectile_speed -element.skills.skilltree.utility_radius -element.skills.skilltree.utility_speed -element.skills.skill_axespin -element.skills.skill_axe_leap_slash -element.skills.skill_bow_jump_burst -element.skills.skill_fire_aoe -element.skills.skill_flamethrower -element.skills.skill_hammergolf -element.skills.skill_hammerleap -element.skills.skill_slice_2 -element.skills.skill_sword_pierce -element.skills.snake -element.skills.snake_green -element.skills.staff_m1 -element.skills.staff_m2 -element.skills.sword_whirlwind -element.ui.bag.backgrounds.back -element.ui.bag.backgrounds.bag -element.ui.bag.backgrounds.belt -element.ui.bag.backgrounds.chest -element.ui.bag.backgrounds.feet -element.ui.bag.backgrounds.glider -element.ui.bag.backgrounds.hands -element.ui.bag.backgrounds.head -element.ui.bag.backgrounds.lantern -element.ui.bag.backgrounds.legs -element.ui.bag.backgrounds.mainhand -element.ui.bag.backgrounds.necklace -element.ui.bag.backgrounds.offhand -element.ui.bag.backgrounds.ring -element.ui.bag.backgrounds.shoulders -element.ui.bag.backgrounds.tabard -element.ui.bag.buttons.inv_collapse -element.ui.bag.buttons.inv_collapse_hover -element.ui.bag.buttons.inv_collapse_press -element.ui.bag.buttons.inv_expand -element.ui.bag.buttons.inv_expand_hover -element.ui.bag.buttons.inv_expand_press -element.ui.bag.buttons.inv_slot -element.ui.bag.buttons.inv_slot_blue -element.ui.bag.buttons.inv_slot_gold -element.ui.bag.buttons.inv_slot_green -element.ui.bag.buttons.inv_slot_grey -element.ui.bag.buttons.inv_slot_orange -element.ui.bag.buttons.inv_slot_purple -element.ui.bag.buttons.inv_slot_red -element.ui.bag.buttons.inv_slot_sel -element.ui.bag.buttons.inv_tab_active -element.ui.bag.buttons.inv_tab_inactive -element.ui.bag.buttons.inv_tab_inactive_hover -element.ui.bag.buttons.inv_tab_inactive_press -element.ui.bag.icons.combat_rating -element.ui.bag.icons.combat_rating_shadow -element.ui.bag.icons.health -element.ui.bag.icons.protection -element.ui.bag.icons.stamina -element.ui.bag.inv_bg_0 -element.ui.bag.inv_bg_1 -element.ui.bag.inv_bg_bag -element.ui.bag.inv_frame -element.ui.bag.inv_frame_bag -element.ui.char_select.icons.dice -element.ui.char_select.icons.dice_hover -element.ui.char_select.icons.dice_press -element.ui.char_select.portraits.danari_f -element.ui.char_select.portraits.danari_m -element.ui.char_select.portraits.dwarf_f -element.ui.char_select.portraits.dwarf_m -element.ui.char_select.portraits.elf_f -element.ui.char_select.portraits.elf_m -element.ui.char_select.portraits.human_f -element.ui.char_select.portraits.human_m -element.ui.char_select.portraits.orc_f -element.ui.char_select.portraits.orc_m -element.ui.char_select.portraits.ud_f -element.ui.char_select.portraits.ud_m -element.ui.chat.icons.command_error_small -element.ui.chat.icons.command_info_small -element.ui.chat.icons.faction -element.ui.chat.icons.faction_small -element.ui.chat.icons.group -element.ui.chat.icons.group_small -element.ui.chat.icons.kill_small -element.ui.chat.icons.loot_small -element.ui.chat.icons.offline_small -element.ui.chat.icons.online_small -element.ui.chat.icons.private_small -element.ui.chat.icons.region -element.ui.chat.icons.region_small -element.ui.chat.icons.say -element.ui.chat.icons.say_small -element.ui.chat.icons.tell -element.ui.chat.icons.tell_small -element.ui.chat.icons.world -element.ui.chat.icons.world_small -element.ui.crafting.crafting -element.ui.crafting.crafting_frame -element.ui.crafting.icons.armors -element.ui.crafting.icons.crafting_tools -element.ui.crafting.icons.dismantle -element.ui.crafting.icons.foods -element.ui.crafting.icons.gliders -element.ui.crafting.icons.globe -element.ui.crafting.icons.globe_2 -element.ui.crafting.icons.potions -element.ui.crafting.icons.utilities -element.ui.crafting.icons.weapons -element.ui.diary.buttons.border_skills -element.ui.diary.buttons.lock -element.ui.diary.buttons.slot_skilltree -element.ui.diary.diary_bg -element.ui.diary.diary_exp_bg -element.ui.diary.diary_exp_frame -element.ui.diary.diary_frame -element.ui.diary.pixel -element.ui.generic.buttons.anvil -element.ui.generic.buttons.anvil_hover -element.ui.generic.buttons.anvil_press -element.ui.generic.buttons.armor_slot -element.ui.generic.buttons.armor_slot_empty -element.ui.generic.buttons.armor_slot_selected -element.ui.generic.buttons.arrow_down -element.ui.generic.buttons.arrow_down_gold -element.ui.generic.buttons.arrow_down_hover -element.ui.generic.buttons.arrow_down_press -element.ui.generic.buttons.bag.closed -element.ui.generic.buttons.bag.closed_hover -element.ui.generic.buttons.bag.closed_press -element.ui.generic.buttons.bag.open -element.ui.generic.buttons.bag.open_hover -element.ui.generic.buttons.bag.open_press -element.ui.generic.buttons.border -element.ui.generic.buttons.border_mo -element.ui.generic.buttons.border_press -element.ui.generic.buttons.border_pressed -element.ui.generic.buttons.button -element.ui.generic.buttons.button_hover -element.ui.generic.buttons.button_press -element.ui.generic.buttons.checkbox.active -element.ui.generic.buttons.checkbox.hover -element.ui.generic.buttons.checkbox.inactive -element.ui.generic.buttons.checkbox.inactive_hover -element.ui.generic.buttons.checkbox.press -element.ui.generic.buttons.close_btn -element.ui.generic.buttons.close_btn_hover -element.ui.generic.buttons.close_btn_press -element.ui.generic.buttons.group -element.ui.generic.buttons.group_hover -element.ui.generic.buttons.group_press -element.ui.generic.buttons.key_button -element.ui.generic.buttons.key_button_press -element.ui.generic.buttons.map -element.ui.generic.buttons.map_hover -element.ui.generic.buttons.map_press -element.ui.generic.buttons.radio.active -element.ui.generic.buttons.radio.hover -element.ui.generic.buttons.radio.inactive -element.ui.generic.buttons.radio.inactive_hover -element.ui.generic.buttons.radio.press -element.ui.generic.buttons.search_btn -element.ui.generic.buttons.search_btn_hover -element.ui.generic.buttons.search_btn_press -element.ui.generic.buttons.settings -element.ui.generic.buttons.settings_hover -element.ui.generic.buttons.settings_press -element.ui.generic.buttons.social -element.ui.generic.buttons.social_hover -element.ui.generic.buttons.social_press -element.ui.generic.buttons.spellbook -element.ui.generic.buttons.spellbook_hover -element.ui.generic.buttons.spellbook_press -element.ui.generic.buttons.x_red -element.ui.generic.buttons.x_red_hover -element.ui.generic.buttons.x_red_press -element.ui.generic.fireplace -element.ui.generic.frames.banner_bot -element.ui.generic.frames.banner_gradient_bottom -element.ui.generic.frames.banner_small_top -element.ui.generic.frames.banner_top -element.ui.generic.frames.bubble.bottom -element.ui.generic.frames.bubble.bottom_left -element.ui.generic.frames.bubble.bottom_right -element.ui.generic.frames.bubble.left -element.ui.generic.frames.bubble.mid -element.ui.generic.frames.bubble.right -element.ui.generic.frames.bubble.tail -element.ui.generic.frames.bubble.top -element.ui.generic.frames.bubble.top_left -element.ui.generic.frames.bubble.top_right -element.ui.generic.frames.bubble_dark.bottom -element.ui.generic.frames.bubble_dark.bottom_left -element.ui.generic.frames.bubble_dark.bottom_right -element.ui.generic.frames.bubble_dark.icon_frame -element.ui.generic.frames.bubble_dark.left -element.ui.generic.frames.bubble_dark.mid -element.ui.generic.frames.bubble_dark.right -element.ui.generic.frames.bubble_dark.tail -element.ui.generic.frames.bubble_dark.top -element.ui.generic.frames.bubble_dark.top_left -element.ui.generic.frames.bubble_dark.top_right -element.ui.generic.frames.disclaimer -element.ui.generic.frames.enemybar -element.ui.generic.frames.enemybar_1 -element.ui.generic.frames.enemybar_bg -element.ui.generic.frames.enemybar_bg_1 -element.ui.generic.frames.esc_menu -element.ui.generic.frames.loading_screen.loading_bg -element.ui.generic.frames.loading_screen.loading_bg_l -element.ui.generic.frames.loading_screen.loading_bg_r -element.ui.generic.frames.prompt_dialog_bot -element.ui.generic.frames.prompt_dialog_mid -element.ui.generic.frames.prompt_dialog_top -element.ui.generic.frames.selection -element.ui.generic.frames.selection_frame -element.ui.generic.frames.selection_hover -element.ui.generic.frames.selection_press -element.ui.generic.frames.social_frame -element.ui.generic.frames.tooltip.corner -element.ui.generic.frames.tooltip.edge -element.ui.generic.frames.tt_test_corner_tr -element.ui.generic.frames.tt_test_edge -element.ui.generic.frames.window_3 -element.ui.generic.slider.indicator -element.ui.generic.slider.indicator_round -element.ui.generic.slider.scrollbar -element.ui.generic.slider.scrollbar_1 -element.ui.generic.slider.track -element.ui.generic.textbox -element.ui.groups.group_member_bg -element.ui.groups.group_member_frame -element.ui.invite.progress -element.ui.invite.progress_bar -element.ui.map.buttons.castle -element.ui.map.buttons.castle_bg -element.ui.map.buttons.castle_hover -element.ui.map.buttons.cave -element.ui.map.buttons.cave_bg -element.ui.map.buttons.cave_hover -element.ui.map.buttons.dungeon -element.ui.map.buttons.dungeon_bg -element.ui.map.buttons.dungeon_bg2 -element.ui.map.buttons.dungeon_hover -element.ui.map.buttons.excl -element.ui.map.buttons.group_indicator -element.ui.map.buttons.group_indicator_arrow_down -element.ui.map.buttons.group_indicator_arrow_up -element.ui.map.buttons.group_indicator_hover -element.ui.map.buttons.topographic -element.ui.map.buttons.town -element.ui.map.buttons.town_bg -element.ui.map.buttons.town_hover -element.ui.map.buttons.tree -element.ui.map.buttons.tree_hover -element.ui.map.icons.dif_1 -element.ui.map.icons.dif_2 -element.ui.map.icons.dif_3 -element.ui.map.icons.dif_4 -element.ui.map.icons.dif_5 -element.ui.map.icons.dif_6 -element.ui.map.map_bg -element.ui.map.map_frame -element.ui.map.map_frame_art -element.ui.minimap.buttons.button_mmap_closed -element.ui.minimap.buttons.button_mmap_closed_hover -element.ui.minimap.buttons.button_mmap_closed_press -element.ui.minimap.buttons.button_mmap_open -element.ui.minimap.buttons.button_mmap_open_hover -element.ui.minimap.buttons.button_mmap_open_press -element.ui.minimap.buttons.mmap_button-min -element.ui.minimap.buttons.mmap_button-min_hover -element.ui.minimap.buttons.mmap_button-min_press -element.ui.minimap.buttons.mmap_button-north -element.ui.minimap.buttons.mmap_button-north_hover -element.ui.minimap.buttons.mmap_button-north_press -element.ui.minimap.buttons.mmap_button-north_press_hover -element.ui.minimap.buttons.mmap_button-plus -element.ui.minimap.buttons.mmap_button-plus_hover -element.ui.minimap.buttons.mmap_button-plus_press -element.ui.minimap.icons.indicator_mmap -element.ui.minimap.icons.indicator_mmap_small -element.ui.minimap.mmap -element.ui.minimap.mmap_closed -element.ui.minimap.mmap_frame -element.ui.quests.temp_quest_bg -element.ui.settings.buttons.settings_button -element.ui.settings.buttons.settings_button_hover -element.ui.settings.buttons.settings_button_press -element.ui.settings.buttons.settings_button_pressed -element.ui.settings.icons.crosshair_bg -element.ui.settings.icons.crosshair_bg_hover -element.ui.settings.icons.crosshair_bg_press -element.ui.settings.icons.crosshair_bg_pressed -element.ui.settings.icons.crosshair_inner -element.ui.settings.icons.crosshair_outer_1 -element.ui.settings.icons.crosshair_outer_2 -element.ui.settings.icons.crosshair_outer_3 -element.ui.settings.settings_bg -element.ui.settings.settings_frame -element.ui.skillbar.bar_content -element.ui.skillbar.bg -element.ui.skillbar.decayed_bg -element.ui.skillbar.enemy_bar_content -element.ui.skillbar.frame -element.ui.skillbar.health_bg -element.ui.skillbar.health_frame -element.ui.skillbar.level_up -element.ui.skillbar.slot -element.ui.skillbar.stamina_bg -element.ui.skillbar.stamina_frame -element.ui.social.social_bg -element.ui.social.social_frame -element.ui.social.social_tab_active -element.ui.social.social_tab_inactive -element.ui.social.social_tab_online -element.v_logo -element.weapons.axe -element.weapons.bow -element.weapons.daggers -element.weapons.hammer -element.weapons.sceptre -element.weapons.staff -element.weapons.sword -element.weapons.swordshield -element.weapons.swords_crossed diff --git a/search-item.sh b/search-item.sh deleted file mode 100644 index b236ae724c..0000000000 --- a/search-item.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/bash - -for item in $(cat list.txt);do - if [ -z "$(grep -RIin --exclude-dir=\.git --exclude=list.txt $item)" ]; then - echo $item - fi -done diff --git a/voxygen/src/ui/img_ids.rs b/voxygen/src/ui/img_ids.rs index 7d18586782..660675dc07 100644 --- a/voxygen/src/ui/img_ids.rs +++ b/voxygen/src/ui/img_ids.rs @@ -157,10 +157,7 @@ macro_rules! image_ids { pub fn load(ui: &mut crate::ui::Ui) -> Result { use crate::ui::img_ids::GraphicCreator; Ok(Self { - $($( $name: { - dbg!($specifier); - ui.add_graphic(<$T as GraphicCreator>::new_graphic($specifier).unwrap()) - }, )*)* + $($( $name: ui.add_graphic(<$T as GraphicCreator>::new_graphic($specifier)?), )*)* }) } }