diff --git a/core/tyrbot.py b/core/igncore.py similarity index 99% rename from core/tyrbot.py rename to core/igncore.py index 74edcc4..aa4705a 100644 --- a/core/tyrbot.py +++ b/core/igncore.py @@ -41,8 +41,8 @@ class Tyrbot: self.dimension = None self.last_timer_event = 0 self.start_time = int(time.time()) - self.major_version = "IGNCore v2.5" - self.minor_version = "2" + self.major_version = "IGNCore v2.6" + self.minor_version = "1" self.incoming_queue = FifoQueue() self.mass_message_queue = None self.conns = DictObject() diff --git a/core/translation_service.py b/core/translation_service.py index dbccc9b..a894ff4 100644 --- a/core/translation_service.py +++ b/core/translation_service.py @@ -7,7 +7,7 @@ from core.event_service import EventService from core.logger import Logger from core.setting_service import SettingService from core.setting_types import TextSettingType -from core.tyrbot import Tyrbot +from core.igncore import Tyrbot from core.util import Util diff --git a/modules/core/accounting/alts_controller.py b/modules/core/accounting/alts_controller.py index dcfde5d..4cc37f2 100644 --- a/modules/core/accounting/alts_controller.py +++ b/modules/core/accounting/alts_controller.py @@ -9,7 +9,7 @@ from core.dict_object import DictObject from core.setting_service import SettingService from core.text import Text from core.translation_service import TranslationService -from core.tyrbot import Tyrbot +from core.igncore import Tyrbot from modules.core.accounting.register_controller import RegisterController from modules.core.accounting.services.account_service import AccountService diff --git a/modules/core/accounting/preference_controller.py b/modules/core/accounting/preference_controller.py index 8f53a0b..f95b6a7 100644 --- a/modules/core/accounting/preference_controller.py +++ b/modules/core/accounting/preference_controller.py @@ -9,7 +9,7 @@ from core.lookup.pork_service import PorkService from core.setting_service import SettingService from core.text import Text from core.translation_service import TranslationService -from core.tyrbot import Tyrbot +from core.igncore import Tyrbot from core.util import Util from modules.core.accounting.services.account_service import AccountService from modules.core.discord.discord_controller import DiscordController diff --git a/modules/core/accounting/register_controller.py b/modules/core/accounting/register_controller.py index 60499ed..393c190 100644 --- a/modules/core/accounting/register_controller.py +++ b/modules/core/accounting/register_controller.py @@ -12,7 +12,7 @@ from core.lookup.pork_service import PorkService from core.message_hub_service import MessageHubService from core.setting_service import SettingService from core.text import Text -from core.tyrbot import Tyrbot +from core.igncore import Tyrbot from core.util import Util from modules.core.accounting.services.account_service import AccountService diff --git a/modules/core/accounting/services/account_service.py b/modules/core/accounting/services/account_service.py index 9b099f0..580dd14 100644 --- a/modules/core/accounting/services/account_service.py +++ b/modules/core/accounting/services/account_service.py @@ -11,7 +11,7 @@ from core.lookup.pork_service import PorkService from core.setting_service import SettingService from core.setting_types import BooleanSettingType from core.text import Text -from core.tyrbot import Tyrbot +from core.igncore import Tyrbot from modules.core.accounting.services.access_service import AccessService diff --git a/modules/core/ban/ban_controller.py b/modules/core/ban/ban_controller.py index cf2a1ed..d207b5b 100644 --- a/modules/core/ban/ban_controller.py +++ b/modules/core/ban/ban_controller.py @@ -7,7 +7,7 @@ from core.db import DB from core.decorators import instance, command from core.lookup.character_service import CharacterService from core.translation_service import TranslationService -from core.tyrbot import Tyrbot +from core.igncore import Tyrbot from modules.core.ban.ban_service import BanService diff --git a/modules/core/ban/orgban_controller.py b/modules/core/ban/orgban_controller.py index d59669c..ea2d831 100644 --- a/modules/core/ban/orgban_controller.py +++ b/modules/core/ban/orgban_controller.py @@ -13,7 +13,7 @@ from core.lookup.character_service import CharacterService from core.lookup.org_pork_service import OrgPorkService from core.private_channel_service import PrivateChannelService from core.translation_service import TranslationService -from core.tyrbot import Tyrbot +from core.igncore import Tyrbot from modules.core.accounting.services.account_service import AccountService from modules.core.ban.ban_service import BanService diff --git a/modules/core/colors/color_controller.py b/modules/core/colors/color_controller.py index a91fe2b..5676282 100644 --- a/modules/core/colors/color_controller.py +++ b/modules/core/colors/color_controller.py @@ -2,7 +2,7 @@ from core.aochat.BaseModule import BaseModule from core.decorators import instance from core.setting_service import SettingService from core.setting_types import ColorSettingType -from core.tyrbot import Tyrbot +from core.igncore import Tyrbot @instance() diff --git a/modules/core/discord/discord_controller.py b/modules/core/discord/discord_controller.py index e467bb5..5a7393e 100644 --- a/modules/core/discord/discord_controller.py +++ b/modules/core/discord/discord_controller.py @@ -25,7 +25,7 @@ from core.message_hub_service import MessageHubService from core.setting_service import SettingService from core.setting_types import HiddenSettingType from core.text import Text -from core.tyrbot import Tyrbot +from core.igncore import Tyrbot from core.util import Util from modules.core.accounting.services.access_service import AccessService from modules.core.accounting.services.account_service import AccountService diff --git a/modules/core/private_channel/private_channel_controller.py b/modules/core/private_channel/private_channel_controller.py index 6d1e011..3345da2 100644 --- a/modules/core/private_channel/private_channel_controller.py +++ b/modules/core/private_channel/private_channel_controller.py @@ -12,7 +12,7 @@ from core.private_channel_service import PrivateChannelService from core.setting_service import SettingService from core.text import Text from core.translation_service import TranslationService -from core.tyrbot import Tyrbot +from core.igncore import Tyrbot from core.util import Util from modules.core.accounting.services.account_service import AccountService from modules.core.ban.ban_service import BanService diff --git a/modules/core/riadmin/riadmin_controller.py b/modules/core/riadmin/riadmin_controller.py index d0e86f3..1199c7d 100644 --- a/modules/core/riadmin/riadmin_controller.py +++ b/modules/core/riadmin/riadmin_controller.py @@ -13,7 +13,7 @@ from core.setting_service import SettingService from core.setting_types import TextSettingType from core.text import Text from core.translation_service import TranslationService -from core.tyrbot import Tyrbot +from core.igncore import Tyrbot # noinspection SqlCaseVsIf,SqlCaseVsCoalesce diff --git a/modules/onlinebot/Darknet/darknet_controller.py b/modules/onlinebot/Darknet/darknet_controller.py index f72097d..83c3bb0 100644 --- a/modules/onlinebot/Darknet/darknet_controller.py +++ b/modules/onlinebot/Darknet/darknet_controller.py @@ -8,7 +8,7 @@ from core.lookup.character_service import CharacterService from core.setting_service import SettingService from core.setting_types import BooleanSettingType from core.text import Text -from core.tyrbot import Tyrbot +from core.igncore import Tyrbot @instance("Darknet") diff --git a/modules/onlinebot/alliance/alliance_relay_controller.py b/modules/onlinebot/alliance/alliance_relay_controller.py index f33af55..f269b2b 100644 --- a/modules/onlinebot/alliance/alliance_relay_controller.py +++ b/modules/onlinebot/alliance/alliance_relay_controller.py @@ -6,7 +6,7 @@ from core.lookup.character_service import CharacterService from core.setting_service import SettingService from core.setting_types import TextSettingType, BooleanSettingType, ColorSettingType from core.text import Text -from core.tyrbot import Tyrbot +from core.igncore import Tyrbot @instance("AllianceRelayController") diff --git a/modules/onlinebot/ding/ding_controller.py b/modules/onlinebot/ding/ding_controller.py index e11ec5b..e149ff2 100644 --- a/modules/onlinebot/ding/ding_controller.py +++ b/modules/onlinebot/ding/ding_controller.py @@ -8,7 +8,7 @@ from core.logger import Logger from core.lookup.character_service import CharacterService from core.setting_service import SettingService from core.text import Text -from core.tyrbot import Tyrbot +from core.igncore import Tyrbot @instance("DingController") diff --git a/modules/onlinebot/online/bot_controller.py b/modules/onlinebot/online/bot_controller.py index 309e539..79a8382 100644 --- a/modules/onlinebot/online/bot_controller.py +++ b/modules/onlinebot/online/bot_controller.py @@ -11,7 +11,7 @@ from core.decorators import instance, command from core.logger import Logger from core.lookup.pork_service import PorkService from core.text import Text -from core.tyrbot import Tyrbot +from core.igncore import Tyrbot from core.util import Util diff --git a/modules/onlinebot/online/org_alias_controller.py b/modules/onlinebot/online/org_alias_controller.py index c2552c6..2293a52 100644 --- a/modules/onlinebot/online/org_alias_controller.py +++ b/modules/onlinebot/online/org_alias_controller.py @@ -5,7 +5,7 @@ from core.decorators import instance from core.logger import Logger from core.lookup.pork_service import PorkService from core.text import Text -from core.tyrbot import Tyrbot +from core.igncore import Tyrbot from core.util import Util from modules.core.accounting.services.access_service import AccessService diff --git a/modules/onlinebot/online/org_controller.py b/modules/onlinebot/online/org_controller.py index e62970e..678e93a 100644 --- a/modules/onlinebot/online/org_controller.py +++ b/modules/onlinebot/online/org_controller.py @@ -20,7 +20,7 @@ from core.lookup.org_pork_service import OrgPorkService from core.lookup.pork_service import PorkService from core.message_hub_service import MessageHubService from core.text import Text -from core.tyrbot import Tyrbot +from core.igncore import Tyrbot from core.util import Util from modules.core.accounting.services.access_service import AccessService # noinspection PyAttributeOutsideInit,SpellCheckingInspection,DuplicatedCode diff --git a/modules/onlinebot/raids/raid_controller.py b/modules/onlinebot/raids/raid_controller.py index 0094006..7ba5686 100644 --- a/modules/onlinebot/raids/raid_controller.py +++ b/modules/onlinebot/raids/raid_controller.py @@ -13,7 +13,7 @@ from core.lookup.pork_service import PorkService from core.private_channel_service import PrivateChannelService from core.setting_service import SettingService from core.text import Text -from core.tyrbot import Tyrbot +from core.igncore import Tyrbot from core.util import Util from modules.core.accounting.services.account_service import AccountService from modules.core.ban.ban_service import BanService diff --git a/modules/onlinebot/stats/stats_controller.py b/modules/onlinebot/stats/stats_controller.py index 8b9ef25..611e3c1 100644 --- a/modules/onlinebot/stats/stats_controller.py +++ b/modules/onlinebot/stats/stats_controller.py @@ -15,7 +15,7 @@ from core.decorators import instance, command from core.lookup.pork_service import PorkService from core.message_hub_service import MessageHubService from core.text import Text -from core.tyrbot import Tyrbot +from core.igncore import Tyrbot from core.util import Util from modules.core.accounting.services.access_service import AccessService diff --git a/modules/orgbot/alliance/alliance_relay.py b/modules/orgbot/alliance/alliance_relay.py index f10c875..71d130e 100644 --- a/modules/orgbot/alliance/alliance_relay.py +++ b/modules/orgbot/alliance/alliance_relay.py @@ -11,7 +11,7 @@ from core.lookup.character_service import CharacterService from core.setting_service import SettingService from core.setting_types import DictionarySettingType from core.text import Text -from core.tyrbot import Tyrbot +from core.igncore import Tyrbot # noinspection DuplicatedCode diff --git a/modules/orgbot/notify/notify_controller.py b/modules/orgbot/notify/notify_controller.py index 23aa7b9..40e1ba7 100644 --- a/modules/orgbot/notify/notify_controller.py +++ b/modules/orgbot/notify/notify_controller.py @@ -7,7 +7,7 @@ from core.logger import Logger from core.lookup.character_service import CharacterService from core.text import Text from core.translation_service import TranslationService -from core.tyrbot import Tyrbot +from core.igncore import Tyrbot from modules.core.accounting.services.account_service import AccountService diff --git a/modules/orgbot/org/org_controller.py b/modules/orgbot/org/org_controller.py index ca22e71..ce95d47 100644 --- a/modules/orgbot/org/org_controller.py +++ b/modules/orgbot/org/org_controller.py @@ -7,7 +7,7 @@ from core.public_channel_service import PublicChannelService from core.setting_service import SettingService from core.setting_types import BooleanSettingType from core.text import Text -from core.tyrbot import Tyrbot +from core.igncore import Tyrbot from core.util import Util from modules.core.accounting.services.account_service import AccountService from modules.orgbot.org.org_roster_controller import OrgRosterController diff --git a/modules/orgbot/org/org_roster_controller.py b/modules/orgbot/org/org_roster_controller.py index 2288d2b..0bd56e8 100644 --- a/modules/orgbot/org/org_roster_controller.py +++ b/modules/orgbot/org/org_roster_controller.py @@ -17,7 +17,7 @@ from core.lookup.character_service import CharacterService from core.lookup.org_pork_service import OrgPorkService from core.lookup.pork_service import PorkService from core.public_channel_service import PublicChannelService -from core.tyrbot import Tyrbot +from core.igncore import Tyrbot from core.util import Util from modules.core.accounting.services.account_service import AccountService diff --git a/modules/orgbot/raidspy/raidspy_controller.py b/modules/orgbot/raidspy/raidspy_controller.py index d550d21..0fab7ad 100644 --- a/modules/orgbot/raidspy/raidspy_controller.py +++ b/modules/orgbot/raidspy/raidspy_controller.py @@ -10,7 +10,7 @@ from core.public_channel_service import PublicChannelService from core.setting_service import SettingService from core.setting_types import TextSettingType from core.text import Text -from core.tyrbot import Tyrbot +from core.igncore import Tyrbot from core.util import Util diff --git a/modules/raidbot/raid/preset_controller.py b/modules/raidbot/raid/preset_controller.py index 0cba911..9110928 100644 --- a/modules/raidbot/raid/preset_controller.py +++ b/modules/raidbot/raid/preset_controller.py @@ -6,7 +6,7 @@ from core.decorators import command, instance from core.lookup.character_service import CharacterService from core.setting_service import SettingService from core.text import Text -from core.tyrbot import Tyrbot +from core.igncore import Tyrbot from core.util import Util from modules.core.accounting.services.account_service import AccountService diff --git a/modules/raidbot/raid/raidbot_controller.py b/modules/raidbot/raid/raidbot_controller.py index fcc7f3b..25eb1fd 100644 --- a/modules/raidbot/raid/raidbot_controller.py +++ b/modules/raidbot/raid/raidbot_controller.py @@ -16,7 +16,7 @@ from core.private_channel_service import PrivateChannelService from core.sender_obj import SenderObj from core.setting_service import SettingService from core.text import Text -from core.tyrbot import Tyrbot +from core.igncore import Tyrbot from core.util import Util from modules.core.accounting.services.account_service import AccountService from modules.raidbot.raid.preset_controller import PresetController diff --git a/modules/raidbot/spam/massinvite_controller.py b/modules/raidbot/spam/massinvite_controller.py index e781b95..55c8722 100644 --- a/modules/raidbot/spam/massinvite_controller.py +++ b/modules/raidbot/spam/massinvite_controller.py @@ -8,7 +8,7 @@ from core.lookup.pork_service import PorkService from core.private_channel_service import PrivateChannelService from core.setting_service import SettingService from core.text import Text -from core.tyrbot import Tyrbot +from core.igncore import Tyrbot from core.util import Util from modules.core.accounting.services.account_service import AccountService diff --git a/modules/raidbot/tower/contract_controller.py b/modules/raidbot/tower/contract_controller.py index 4ab402c..07e6bde 100644 --- a/modules/raidbot/tower/contract_controller.py +++ b/modules/raidbot/tower/contract_controller.py @@ -10,7 +10,7 @@ from core.event_service import EventService from core.lookup.pork_service import PorkService from core.public_channel_service import PublicChannelService from core.text import Text -from core.tyrbot import Tyrbot +from core.igncore import Tyrbot from core.util import Util from modules.raidbot.tower.tower_service import TowerService from modules.standard.helpbot.playfield_controller import PlayfieldController diff --git a/modules/raidbot/tower/plant_controller.py b/modules/raidbot/tower/plant_controller.py index 4ec7685..037bcd6 100644 --- a/modules/raidbot/tower/plant_controller.py +++ b/modules/raidbot/tower/plant_controller.py @@ -9,7 +9,7 @@ from core.event_service import EventService from core.lookup.pork_service import PorkService from core.public_channel_service import PublicChannelService from core.text import Text -from core.tyrbot import Tyrbot +from core.igncore import Tyrbot from core.util import Util from modules.raidbot.tower.tower_service import TowerService from modules.standard.helpbot.playfield_controller import PlayfieldController diff --git a/modules/raidbot/tower/tower_attack_controller.py b/modules/raidbot/tower/tower_attack_controller.py index d411051..7de7c83 100644 --- a/modules/raidbot/tower/tower_attack_controller.py +++ b/modules/raidbot/tower/tower_attack_controller.py @@ -8,7 +8,7 @@ from core.logger import Logger from core.public_channel_service import PublicChannelService from core.setting_service import SettingService from core.text import Text -from core.tyrbot import Tyrbot +from core.igncore import Tyrbot from modules.core.accounting.services.account_service import AccountService from modules.raidbot.tower.tower_controller import TowerController from modules.raidbot.tower.tower_service import TowerService diff --git a/modules/raidbot/tower/tower_controller.py b/modules/raidbot/tower/tower_controller.py index 5cc1e47..0ec6a77 100644 --- a/modules/raidbot/tower/tower_controller.py +++ b/modules/raidbot/tower/tower_controller.py @@ -10,7 +10,7 @@ from core.logger import Logger from core.lookup.pork_service import PorkService from core.public_channel_service import PublicChannelService from core.text import Text -from core.tyrbot import Tyrbot +from core.igncore import Tyrbot from modules.standard.helpbot.playfield_controller import PlayfieldController diff --git a/modules/raidbot/tower/tower_hot_controller.py b/modules/raidbot/tower/tower_hot_controller.py index 10c1a33..700b705 100644 --- a/modules/raidbot/tower/tower_hot_controller.py +++ b/modules/raidbot/tower/tower_hot_controller.py @@ -9,7 +9,7 @@ from core.event_service import EventService from core.lookup.pork_service import PorkService from core.public_channel_service import PublicChannelService from core.text import Text -from core.tyrbot import Tyrbot +from core.igncore import Tyrbot from core.util import Util from modules.raidbot.tower.tower_service import TowerService from modules.standard.helpbot.playfield_controller import PlayfieldController diff --git a/modules/raidbot/tower/tower_service.py b/modules/raidbot/tower/tower_service.py index 6839fad..151c531 100644 --- a/modules/raidbot/tower/tower_service.py +++ b/modules/raidbot/tower/tower_service.py @@ -10,7 +10,7 @@ from core.db import DB from core.decorators import instance, timerevent, event from core.job_scheduler import JobScheduler from core.text import Text -from core.tyrbot import Tyrbot +from core.igncore import Tyrbot from core.util import Util from modules.raidbot.tower.tower_controller import TowerController from modules.standard.helpbot.playfield_controller import PlayfieldController diff --git a/modules/standard/MessageDistributor/message_distributor.py b/modules/standard/MessageDistributor/message_distributor.py index ac57bed..f5224f3 100644 --- a/modules/standard/MessageDistributor/message_distributor.py +++ b/modules/standard/MessageDistributor/message_distributor.py @@ -15,7 +15,7 @@ from core.message_hub_service import MessageHubService from core.setting_service import SettingService from core.setting_types import NumberSettingType from core.text import Text -from core.tyrbot import Tyrbot +from core.igncore import Tyrbot from modules.core.accounting.services.access_service import AccessService from modules.core.discord.discord_controller import DiscordController diff --git a/modules/standard/aou/aou_controller.py b/modules/standard/aou/aou_controller.py index f714e96..51c7ae1 100644 --- a/modules/standard/aou/aou_controller.py +++ b/modules/standard/aou/aou_controller.py @@ -11,7 +11,7 @@ from core.command_param_types import Any, Const, Int from core.decorators import instance, command from core.dict_object import DictObject from core.translation_service import TranslationService -from core.tyrbot import Tyrbot +from core.igncore import Tyrbot # noinspection PyUnusedLocal diff --git a/modules/standard/loot/auction_controller.py b/modules/standard/loot/auction_controller.py index 0c16c3f..570ec11 100644 --- a/modules/standard/loot/auction_controller.py +++ b/modules/standard/loot/auction_controller.py @@ -4,7 +4,7 @@ from core.command_param_types import Const, Options, Int, Any, Time from core.db import DB from core.decorators import command, instance, setting from core.setting_types import TimeSettingType -from core.tyrbot import Tyrbot +from core.igncore import Tyrbot from modules.standard.loot.auction_strategy.auction_strategy import AuctionStrategy diff --git a/modules/standard/loot/loot_controller.py b/modules/standard/loot/loot_controller.py index d43d9a3..01e12a8 100644 --- a/modules/standard/loot/loot_controller.py +++ b/modules/standard/loot/loot_controller.py @@ -10,7 +10,7 @@ from core.db import DB from core.decorators import instance, command, timerevent from core.setting_service import SettingService from core.text import Text -from core.tyrbot import Tyrbot +from core.igncore import Tyrbot from modules.core.accounting.services.account_service import AccountService from modules.raidbot.raid.raidbot_controller import Raider from modules.standard.items.items_controller import ItemsController diff --git a/modules/standard/news/mail_controller.py b/modules/standard/news/mail_controller.py index a4f6c50..408f637 100644 --- a/modules/standard/news/mail_controller.py +++ b/modules/standard/news/mail_controller.py @@ -10,7 +10,7 @@ from core.dict_object import DictObject from core.job_scheduler import JobScheduler from core.logger import Logger from core.text import Text -from core.tyrbot import Tyrbot +from core.igncore import Tyrbot from modules.core.accounting.services.account_service import AccountService from modules.core.ban.ban_service import BanService diff --git a/modules/standard/news/news_controller.py b/modules/standard/news/news_controller.py index 8ff661e..21a6318 100644 --- a/modules/standard/news/news_controller.py +++ b/modules/standard/news/news_controller.py @@ -15,7 +15,7 @@ from core.logger import Logger from core.lookup.pork_service import PorkService from core.setting_service import SettingService from core.text import Text -from core.tyrbot import Tyrbot +from core.igncore import Tyrbot from core.util import Util from modules.core.accounting.preference_controller import PreferenceController from modules.core.accounting.services.account_service import AccountService diff --git a/modules/standard/news/weekly_controller.py b/modules/standard/news/weekly_controller.py index 3fbe4c3..af21699 100644 --- a/modules/standard/news/weekly_controller.py +++ b/modules/standard/news/weekly_controller.py @@ -11,7 +11,7 @@ from core.logger import Logger from core.lookup.pork_service import PorkService from core.setting_service import SettingService from core.text import Text -from core.tyrbot import Tyrbot +from core.igncore import Tyrbot from core.util import Util from modules.core.accounting.preference_controller import PreferenceController from modules.core.accounting.services.account_service import AccountService diff --git a/modules/standard/news/worldboss_controller.py b/modules/standard/news/worldboss_controller.py index 5d52c72..2b9674c 100644 --- a/modules/standard/news/worldboss_controller.py +++ b/modules/standard/news/worldboss_controller.py @@ -8,7 +8,7 @@ from core.logger import Logger from core.setting_service import SettingService from core.setting_types import BooleanSettingType from core.text import Text -from core.tyrbot import Tyrbot +from core.igncore import Tyrbot from core.util import Util from modules.standard.datanet.ws_controller import WebsocketRelayController diff --git a/modules/standard/online/online_controller.py b/modules/standard/online/online_controller.py index a981c59..68cc766 100644 --- a/modules/standard/online/online_controller.py +++ b/modules/standard/online/online_controller.py @@ -12,7 +12,7 @@ from core.logger import Logger from core.private_channel_service import PrivateChannelService from core.setting_service import SettingService from core.text import Text -from core.tyrbot import Tyrbot +from core.igncore import Tyrbot from core.util import Util from modules.standard.online.online_display import OnlineDisplay diff --git a/modules/standard/raid/chat_controller.py b/modules/standard/raid/chat_controller.py index a2453a9..5a5a3e6 100644 --- a/modules/standard/raid/chat_controller.py +++ b/modules/standard/raid/chat_controller.py @@ -1,6 +1,6 @@ from core.command_param_types import Any from core.decorators import instance, command -from core.tyrbot import Tyrbot +from core.igncore import Tyrbot @instance() diff --git a/modules/standard/raid/leader_controller.py b/modules/standard/raid/leader_controller.py index b8d8c80..832721c 100644 --- a/modules/standard/raid/leader_controller.py +++ b/modules/standard/raid/leader_controller.py @@ -9,7 +9,7 @@ from core.private_channel_service import PrivateChannelService from core.setting_service import SettingService from core.setting_types import ColorSettingType, BooleanSettingType from core.text import Text -from core.tyrbot import Tyrbot +from core.igncore import Tyrbot from modules.core.accounting.services.access_service import AccessService diff --git a/modules/standard/track/track_controller.py b/modules/standard/track/track_controller.py index e03a744..e85275b 100644 --- a/modules/standard/track/track_controller.py +++ b/modules/standard/track/track_controller.py @@ -16,7 +16,7 @@ from core.private_channel_service import PrivateChannelService from core.setting_service import SettingService from core.setting_types import TextSettingType, ColorSettingType from core.text import Text -from core.tyrbot import Tyrbot +from core.igncore import Tyrbot from core.util import Util from modules.core.accounting.services.account_service import AccountService from modules.raidbot.tower.tower_controller import TowerController diff --git a/modules/standard/whois/character_history_controller.py b/modules/standard/whois/character_history_controller.py index 83601bb..150fa56 100644 --- a/modules/standard/whois/character_history_controller.py +++ b/modules/standard/whois/character_history_controller.py @@ -2,7 +2,7 @@ from core.command_param_types import Int, Character, NamedParameters from core.decorators import instance, command from core.lookup.character_history_service import CharacterHistoryService from core.text import Text -from core.tyrbot import Tyrbot +from core.igncore import Tyrbot @instance() diff --git a/modules/standard/whois/character_info_controller.py b/modules/standard/whois/character_info_controller.py index 7b8e5ce..e689b72 100644 --- a/modules/standard/whois/character_info_controller.py +++ b/modules/standard/whois/character_info_controller.py @@ -10,7 +10,7 @@ from core.decorators import instance, command, timerevent from core.dict_object import DictObject from core.lookup.pork_service import PorkService from core.text import Text -from core.tyrbot import Tyrbot +from core.igncore import Tyrbot @instance()