11

core/message.py

@@ -234,7 +234,7 @@ class MessageBuilder:
                     return
 
                 try:
-                    data = await self.jx3api.zili(name, server, choice)
+                    data = await self.jx3api.achievement.zili(name, server, choice)
                     if data["code"] != 200:
                         await new_event.send(MessageChain().message(data.get("msg", "获取资历数据失败")))
                         controller.stop()
@@ -270,110 +270,110 @@ class MessageBuilder:
 
     async def jx3_helps(self, event: AstrMessageEvent):
         """剑三 功能"""
-        return await self.T2I_image_msg(event, self.jx3api.helps)
+        return await self.T2I_image_msg(event, self.jx3api.content.helps)
 
 
     async def jx3_richang(self, event: AstrMessageEvent,server: str = "" ,num: int = 0):
         """剑三 日常 服务器 天数"""
-        return await self.plain_msg(event, lambda: self.jx3api.richang(self.serverdefault(server),num))
+        return await self.plain_msg(event, lambda: self.jx3api.calendar.richang(self.serverdefault(server),num))
 
 
     async def jx3_richangyuche(self, event: AstrMessageEvent):
         """剑三 日常预测"""
-        return await self.T2I_image_msg(event, self.jx3api.richangyuche)
+        return await self.T2I_image_msg(event, self.jx3api.calendar.richangyuche)
 
 
     async def jx3_xingxiashijian(self, event: AstrMessageEvent,name: str = "穹野卫"):
         """剑三 名望"""
-        return await self.T2I_image_msg(event, lambda: self.jx3api.xingxiashijian(name))
+        return await self.T2I_image_msg(event, lambda: self.jx3api.calendar.xingxiashijian(name))
 
 
     async def jx3_keju(self, event: AstrMessageEvent,subject: str, limit: int = 5):
         """剑三 科举"""
-        return await self.plain_msg(event, lambda: self.jx3api.keju(subject,limit))
+        return await self.plain_msg(event, lambda: self.jx3api.information.keju(subject,limit))
 
 
     async def jx3_huajia(self, event: AstrMessageEvent,  name: str= "", server: str = "", map: str= ""):
         """剑三 花价 名称 服务器 地图"""
-        return await self.T2I_image_msg(event, lambda: self.jx3api.huajia(self.serverdefault(server),name,map))
+        return await self.T2I_image_msg(event, lambda: self.jx3api.information.huajia(self.serverdefault(server),name,map))
 
 
     async def jx3_zhuangshi(self, event: AstrMessageEvent,  name: str):
         """剑三 装饰 名称"""
-        return await self.T2I_image_msg(event, lambda: self.jx3api.zhuangshi(name))
+        return await self.T2I_image_msg(event, lambda: self.jx3api.information.zhuangshi(name))
 
 
     async def jx3_qiwu(self, event: AstrMessageEvent,  name: str):
         """剑三 器物 地图名称"""
-        return await self.T2I_image_msg(event, lambda: self.jx3api.qiwu(name))
+        return await self.T2I_image_msg(event, lambda: self.jx3api.information.qiwu(name))
 
 
     async def jx3_xinwen(self, event: AstrMessageEvent,num:int = 5):
         """剑三 新闻"""
-        return await self.plain_msg(event, lambda: self.jx3api.xinwen(num))
+        return await self.plain_msg(event, lambda: self.jx3api.information.xinwen(num))
 
 
     async def jx3_weihu(self, event: AstrMessageEvent,num:int = 5):
         """剑三 维护"""
-        return await self.plain_msg(event, lambda: self.jx3api.weihu(num))
+        return await self.plain_msg(event, lambda: self.jx3api.information.weihu(num))
     
 
     async def jx3_qufu(self, event: AstrMessageEvent,name: str = "双梦镇"):
         """剑三 区服"""
-        return await self.plain_msg(event, lambda: self.jx3api.qufu(name))
+        return await self.plain_msg(event, lambda: self.jx3api.information.qufu(name))
 
 
     async def jx3_kaifu(self, event: AstrMessageEvent,server: str = ""):
         """剑三 开服 服务器"""
-        return await self.plain_msg(event, lambda: self.jx3api.kaifu(self.serverdefault(server)))
+        return await self.plain_msg(event, lambda: self.jx3api.information.kaifu(self.serverdefault(server)))
 
 
     async def jx3_zhuangtai(self, event: AstrMessageEvent):
         """剑三 状态"""
-        return await self.T2I_image_msg(event, self.jx3api.zhuangtai)
+        return await self.T2I_image_msg(event, self.jx3api.information.zhuangtai)
 
 
     async def jx3_jigai(self, event: AstrMessageEvent,):
         """剑三 技改"""
-        return await self.plain_msg(event, self.jx3api.jigai)
+        return await self.plain_msg(event, self.jx3api.information.jigai)
 
 
     async def jx3_xiaoyao(self, event: AstrMessageEvent):
         """剑三 小药"""
-        return await self.T2I_image_msg(event, self.jx3api.xiaoyao)
+        return await self.T2I_image_msg(event, self.jx3api.information.xiaoyao)
 
 
     async def jx3_zhenyan(self, event: AstrMessageEvent, name: str):
         """剑三 阵眼 心法"""
-        return await self.plain_msg(event, lambda: self.jx3api.zhenyan(name))
+        return await self.plain_msg(event, lambda: self.jx3api.character.zhenyan(name))
 
 
     async def jx3_qixue(self, event: AstrMessageEvent, name: str):
         """剑三 奇穴 心法"""
-        return await self.T2I_image_msg(event, lambda: self.jx3api.qixue(name))
+        return await self.T2I_image_msg(event, lambda: self.jx3api.character.qixue(name))
 
 
     async def jx3_jineng(self, event: AstrMessageEvent, name: str):
         """剑三 技能 心法"""
-        return await self.T2I_image_msg(event, lambda: self.jx3api.jineng(name))
+        return await self.T2I_image_msg(event, lambda: self.jx3api.character.jineng(name))
 
 
     async def jx3_zilipaixing(self, event: AstrMessageEvent, school: str, server: str = ""):
         """剑三 资历排行 职业 服务器"""
-        return await self.T2I_image_msg(event, lambda: self.jx3api.zilipaixing(school, self.serverdefault(server)))
+        return await self.T2I_image_msg(event, lambda: self.jx3api.faction.zilipaixing(school, self.serverdefault(server)))
 
     async def jx3_zilipaihang(self, event: AstrMessageEvent):
         """剑三 资历排行  """
-        return await self.T2I_image_msg(event, lambda: self.jx3api.zilipaixing("", ""))
+        return await self.T2I_image_msg(event, lambda: self.jx3api.faction.zilipaixing("", ""))
 
     async def jx3_shilianpaixing(self, event: AstrMessageEvent, name: str, server: str = ""):
         """剑三 试炼排行 心法 服务器"""
-        return await self.T2I_image_msg(event, lambda: self.jx3api.shilianpaixing(name, self.serverdefault(server)))
+        return await self.T2I_image_msg(event, lambda: self.jx3api.faction.shilianpaixing(name, self.serverdefault(server)))
 
 
     async def jx3_shaohua(self, event: AstrMessageEvent,):
         """剑三 骚话"""
-        return await self.plain_msg(event, self.jx3api.shaohua)
+        return await self.plain_msg(event, self.jx3api.calendar.shaohua)
 
 
     async def jx3_zili(self, event: AstrMessageEvent, name: str, server: str = ""):
@@ -383,97 +383,103 @@ class MessageBuilder:
 
     async def jx3_jiemi(self, event: AstrMessageEvent):
         """剑三 解密"""
-        return await self.plain_msg(event, self.jx3api.jiemi)
+        return await self.plain_msg(event, self.jx3api.calendar.jiemi)
 
 
     async def jx3_shapan(self, event: AstrMessageEvent,server: str = ""):
         """剑三 沙盘 服务器"""
-        return await self.image_msg(event, lambda: self.jx3api.shapan(self.serverdefault(server)))  
+        return await self.image_msg(event, lambda: self.jx3api.faction.shapan(self.serverdefault(server)))
 
 
     async def jx3_baizhan(self, event: AstrMessageEvent):
         """剑三 百战"""
-        return await self.T2I_image_msg(event, self.jx3api.baizhan)
+        return await self.T2I_image_msg(event, self.jx3api.calendar.baizhan)
 
 
     async def jx3_fuyaojjiutian(self, event: AstrMessageEvent,server: str = ""):
         """剑三 扶摇九天 服务器"""
-        return await self.plain_msg(event, lambda: self.jx3api.fuyaojjiutian( self.serverdefault(server)))
+        return await self.plain_msg(event, lambda: self.jx3api.calendar.fuyaojjiutian( self.serverdefault(server)))
     
 
     async def jx3_zhueevent(self, event: AstrMessageEvent):
         """剑三 诛恶事件"""
-        return await self.T2I_image_msg(event, self.jx3api.zhueevent)
+        return await self.T2I_image_msg(event, self.jx3api.calendar.zhueevent)
 
 
     async def jx3_benrichitu(self, event: AstrMessageEvent):
         """剑三 本日赤兔"""
-        return await self.plain_msg(event, self.jx3api.benrichitu)
+        return await self.plain_msg(event, self.jx3api.calendar.benrichitu)
 
 
     async def jx3_benzhouchitu(self, event: AstrMessageEvent):
         """剑三 本周赤兔"""
-        return await self.plain_msg(event, self.jx3api.benzhouchitu)
+        return await self.plain_msg(event, self.jx3api.calendar.benzhouchitu)
 
 
     async def jx3_zhengyingpaimai(self, event: AstrMessageEvent,name: str = "玄晶", server: str = ""):
         """剑三 阵营拍卖 物品名称 服务器"""
-        return await self.T2I_image_msg(event, lambda: self.jx3api.zhengyingpaimai( self.serverdefault(server), name))
+        return await self.T2I_image_msg(event, lambda: self.jx3api.faction.zhengyingpaimai( self.serverdefault(server), name))
 
 
     async def jx3_zhenyingevent(self, event: AstrMessageEvent):
         """剑三 阵营事件"""
-        return await self.T2I_image_msg(event, self.jx3api.zhenyingevent)
+        return await self.T2I_image_msg(event, self.jx3api.calendar.zhenyingevent)
 
 
     async def jx3_guanaishouling(self, event: AstrMessageEvent):
         """剑三 关隘首领"""
-        return await self.T2I_image_msg(event, self.jx3api.guanaishouling)
+        return await self.T2I_image_msg(event, self.jx3api.calendar.guanaishouling)
 
 
     async def jx3_bangzhanjilu(self, event: AstrMessageEvent, server: str = ""):
         """剑三 帮战记录 服务器"""
-        return await self.T2I_image_msg(event, lambda: self.jx3api.bangzhanjilu(self.serverdefault(server)))
+        return await self.T2I_image_msg(event, lambda: self.jx3api.faction.bangzhanjilu(self.serverdefault(server)))
 
 
     async def jx3_tongzhanyy(self, event: AstrMessageEvent, server: str = ""):
         """剑三 统战歪歪 服务器"""
-        return await self.plain_msg(event, lambda: self.jx3api.tongzhanyy(self.serverdefault(server)))
+        return await self.plain_msg(event, lambda: self.jx3api.faction.tongzhanyy(self.serverdefault(server)))
 
 
     async def jx3_dilujilu(self, event: AstrMessageEvent,server: str = ""):
         """剑三 的卢 服务器"""
-        return await self.T2I_image_msg(event, lambda: self.jx3api.dilujilu( self.serverdefault(server)))
+        return await self.T2I_image_msg(event, lambda: self.jx3api.faction.dilujilu( self.serverdefault(server)))
 
 
     async def jx3_yanhuachaxun(self, event: AstrMessageEvent,name: str = "飞翔大野猪", server: str = ""):
         """剑三 烟花 角色 服务器"""
-        return await self.T2I_image_msg(event, lambda: self.jx3api.yanhuachaxun( self.serverdefault(server),name))
+        return await self.T2I_image_msg(event, lambda: self.jx3api.adventure.yanhuachaxun( self.serverdefault(server),name))
 
 
     async def jx3_pianzhi(self, event: AstrMessageEvent,qq: str):
         """剑三 骗子 QQ"""
-        return await self.plain_msg(event, lambda: self.jx3api.pianzhi(qq))
+        return await self.plain_msg(event, lambda: self.jx3api.adventure.pianzhi(qq))
 
 
     async def jx3_juesheqiyu(self, event: AstrMessageEvent,name: str = "飞翔大野猪", server: str = ""):
         """剑三 奇遇 角色名称 服务器"""
-        return await self.T2I_image_msg(event, lambda: self.jx3api.juesheqiyu(name, self.serverdefault(server)))
+        return await self.T2I_image_msg(
+            event,
+            lambda: self.jx3api.adventure.juesheqiyu(
+                name,
+                self.serverdefault(server),
+            ),
+        )
     
 
     async def jx3_weizuoqiyu(self, event: AstrMessageEvent,name: str = "飞翔大野猪", server: str = ""):
         """剑三 未做奇遇 角色名称 服务器"""
-        return await self.T2I_image_msg(event, lambda: self.jx3api.weizuoqiyu(name, self.serverdefault(server)))
+        return await self.T2I_image_msg(event, lambda: self.jx3api.adventure.weizuoqiyu(name, self.serverdefault(server)))
     
 
     async def jx3_qiyutongji(self, event: AstrMessageEvent,adventureName: str = "阴阳两界", server: str = ""):
         """剑三 奇遇统计 奇遇名称 服务器"""
-        return await self.T2I_image_msg(event, lambda: self.jx3api.qiyutongji(adventureName,self.serverdefault(server)))
+        return await self.T2I_image_msg(event, lambda: self.jx3api.adventure.qiyutongji(adventureName,self.serverdefault(server)))
 
 
     async def jx3_jinqiqiyu(self, event: AstrMessageEvent,server: str = ""):
         """剑三 近期奇遇 服务器"""
-        return await self.T2I_image_msg(event, lambda: self.jx3api.jinqiqiyu(self.serverdefault(server)))
+        return await self.T2I_image_msg(event, lambda: self.jx3api.adventure.jinqiqiyu(self.serverdefault(server)))
 
 
     async def jx3_qiyuhuizong(self, event: AstrMessageEvent,num_or_server: str = "7", server: str = ""):
@@ -486,42 +492,42 @@ class MessageBuilder:
         else:
             target_server = num_or_server
 
-        return await self.T2I_image_msg(event, lambda: self.jx3api.qiyuhuizong(self.serverdefault(target_server), num))
+        return await self.T2I_image_msg(event, lambda: self.jx3api.adventure.qiyuhuizong(self.serverdefault(target_server), num))
 
 
     async def jx3_zhanji(self, event: AstrMessageEvent,name: str = "飞翔大野猪", server: str = "", mode:str = "33"):
         """剑三 战绩 角色 服务器 类型"""
-        return await self.T2I_image_msg(event, lambda: self.jx3api.zhanji(name, self.serverdefault(server),mode))
+        return await self.T2I_image_msg(event, lambda: self.jx3api.arena.zhanji(name, self.serverdefault(server),mode))
 
 
     async def jx3_mingjianpaihang(self, event: AstrMessageEvent,limit: str = "50", mode:str = "33"):
         """剑三 排行 数量 类型"""
-        return await self.T2I_image_msg(event, lambda: self.jx3api.mingjianpaihang(limit,mode))
+        return await self.T2I_image_msg(event, lambda: self.jx3api.arena.mingjianpaihang(limit,mode))
 
 
     async def jx3_mingjiantongji(self, event: AstrMessageEvent,mode: str = "33"):
         """剑三 名剑统计 模式"""
-        return await self.T2I_image_msg(event, lambda: self.jx3api.mingjiantongji(mode))
+        return await self.T2I_image_msg(event, lambda: self.jx3api.arena.mingjiantongji(mode))
 
 
     async def jx3_tuanduizhaomu(self, event: AstrMessageEvent,keyword: str = "25人普通会战弓月城", server: str = ""):
         """剑三 招募 副本 服务器"""
-        return await self.T2I_image_msg(event, lambda: self.jx3api.tuanduizhaomu( self.serverdefault(server),keyword))
+        return await self.T2I_image_msg(event, lambda: self.jx3api.arena.tuanduizhaomu( self.serverdefault(server),keyword))
 
 
     async def jx3_baishi(self, event: AstrMessageEvent,keyword: str = "", server: str = ""):
         """剑三 拜师 搜索关键词 服务器"""
-        return await self.T2I_image_msg(event, lambda: self.jx3api.shitu(2, keyword, self.serverdefault(server)))
+        return await self.T2I_image_msg(event, lambda: self.jx3api.arena.shitu(2, keyword, self.serverdefault(server)))
 
 
     async def jx3_shoutu(self, event: AstrMessageEvent,keyword: str = "", server: str = ""):
         """剑三 收徒 搜索关键词 服务器"""
-        return await self.T2I_image_msg(event, lambda: self.jx3api.shitu(1, keyword, self.serverdefault(server)))
+        return await self.T2I_image_msg(event, lambda: self.jx3api.arena.shitu(1, keyword, self.serverdefault(server)))
 
 
     async def jx3_rank_statistical(self, event: AstrMessageEvent, rank_name: str, server: str = ""):
         """剑三 各类榜单 榜单名称 服务器"""
-        return await self.T2I_image_msg(event, lambda: self.jx3api.rank_statistical(rank_name, self.serverdefault(server)))
+        return await self.T2I_image_msg(event, lambda: self.jx3api.faction.rank_statistical(rank_name, self.serverdefault(server)))
 
 
     async def jx3_mingshiwushiqiang(self, event: AstrMessageEvent, server: str = ""):
@@ -611,47 +617,52 @@ class MessageBuilder:
 
     async def jx3_jueshe(self, event: AstrMessageEvent,name: str, server: str = ""):
         """剑三 角色 名称 服务器"""
-        return await self.plain_msg(event, lambda: self.jx3api.jueshe(name, self.serverdefault(server)))
+        return await self.plain_msg(event, lambda: self.jx3api.character.jueshe(name, self.serverdefault(server)))
 
 
     async def jx3_jueshemingpian(self, event: AstrMessageEvent, name: str = "飞翔大野猪", server: str = ""):
         """剑三 名片 角色 服务器"""
-        return await self.plain_chain(event, lambda: self.jx3api.jueshemingpian(self.serverdefault(server), name)) 
+        return await self.plain_chain(event, lambda: self.jx3api.character.jueshemingpian(self.serverdefault(server), name))
 
 
     async def jx3_jingnai(self, event: AstrMessageEvent, name: str = "飞翔大野猪", server: str = ""):
         """剑三 精耐 角色 服务器"""
-        return await self.T2I_image_msg(event, lambda: self.jx3api.jingnai(name, self.serverdefault(server)))
+        return await self.T2I_image_msg(event, lambda: self.jx3api.character.jingnai(name, self.serverdefault(server)))
 
 
     async def jx3_shuoyoumingpian(self, event: AstrMessageEvent, name: str = "飞翔大野猪", server: str = ""):
         """剑三 所有名片 角色 服务器"""
-        return await self.plain_chain(event, lambda: self.jx3api.shuoyoumingpian( self.serverdefault(server),name)) 
+        return await self.plain_chain(
+            event,
+            lambda: self.jx3api.character.shuoyoumingpian(self.serverdefault(server), name),
+        )
 
 
     async def jx3_shuijimingpian(self, event: AstrMessageEvent,force: str = "万花", body: str = "萝莉", server: str = ""):
         """剑三 随机名片 职业 体型 服务器"""
-        return await self.image_msg(event, lambda: self.jx3api.shuijimingpian(force,body, self.serverdefault(server)))
+        return await self.image_msg(event, lambda: self.jx3api.character.shuijimingpian(force,body, self.serverdefault(server)))
 
 
     async def jx3_shuma(self, event: AstrMessageEvent,server: str = ""): 
         """剑三 刷马 服务器"""
-        return await self.plain_msg(event, lambda: self.jx3api.shuma( self.serverdefault(server)))
+        return await self.plain_msg(event, lambda: self.jx3api.calendar.shuma( self.serverdefault(server)))
 
 
     async def jx3_jinjia(self, event: AstrMessageEvent,server: str = "", limit:str = "15"):
         """剑三 金价 服务器"""
-        return await self.T2I_image_msg(event, lambda: self.jx3api.jinjia( self.serverdefault(server),limit))
+        return await self.T2I_image_msg(event, lambda: self.jx3api.trade.jinjia( self.serverdefault(server),limit))
 
 
     async def jx3_wujia(self, event: AstrMessageEvent,Name: str = "秃盒", server: str = ""):
         """剑三 物价 外观名称"""    
-        return await self.T2I_image_msg(event, lambda: self.jx3api.wujia(Name, self.serverdefault(server))) 
+        return await self.T2I_image_msg(
+            event, lambda: self.jx3api.trade.wujia(Name, self.serverdefault(server))
+        )
 
 
     async def jx3_jiaoyihang(self, event: AstrMessageEvent,Name: str = "守缺式",server: str = ""):
         """剑三 交易行 物品名称 服务器"""     
-        return await self.T2I_image_msg(event, lambda: self.jx3api.jiaoyihang(Name, self.serverdefault(server)))
+        return await self.T2I_image_msg(event, lambda: self.jx3api.trade.jiaoyihang(Name, self.serverdefault(server)))
 
 
     async def jx3_tiebawujia(self, event: AstrMessageEvent, name: str = "狐金", limit_or_server: str = "5", server: str = ""):
@@ -664,7 +675,7 @@ class MessageBuilder:
         else:
             target_server = limit_or_server
 
-        return await self.plain_msg(event, lambda: self.jx3api.tiebawujia(name, limit, self.serverdefault(target_server)))
+        return await self.plain_msg(event, lambda: self.jx3api.trade.tiebawujia(name, limit, self.serverdefault(target_server)))
 
 
     async def jx3_diaoluo(self, event: AstrMessageEvent, name: str = "玄晶", limit_or_server: str = "20", server: str = ""):
@@ -677,27 +688,27 @@ class MessageBuilder:
         else:
             target_server = limit_or_server
 
-        return await self.T2I_image_msg(event, lambda: self.jx3api.diaoluo(name, limit, self.serverdefault(target_server)))
+        return await self.T2I_image_msg(event, lambda: self.jx3api.trade.diaoluo(name, limit, self.serverdefault(target_server)))
 
 
     async def jx3_bagua(self, event: AstrMessageEvent,name: str = "818"):
         """剑三 八卦 类型"""
-        return await self.plain_msg(event, lambda: self.jx3api.bagua(name))
+        return await self.plain_msg(event, lambda: self.jx3api.content.bagua(name))
 
 
     async def jx3_qiyugonglue(self, event: AstrMessageEvent,name: str):
         """剑三 奇遇攻略 奇遇名称"""
-        return await self.T2I_image_msg(event, lambda: self.jx3api.qiyugonglue(name))
+        return await self.T2I_image_msg(event, lambda: self.jx3api.adventure.qiyugonglue(name))
 
 
     async def jx3_hong(self, event: AstrMessageEvent,name: str = "易筋经"):
         """剑三 宏 心法"""
-        return await self.handler_plain_image_msg(event, lambda: self.jx3api.hong1(name), self.jx3api.hong2)
+        return await self.handler_plain_image_msg(event, lambda: self.jx3api.content.hong1(name), self.jx3api.content.hong2)
 
 
     async def jx3_peizhuang(self, event: AstrMessageEvent,name: str = "易筋经", tags: str = ""):
         """剑三 配装 心法"""
-        return await self.plain_msg(event, lambda: self.jx3api.peizhuang( name,tags))
+        return await self.plain_msg(event, lambda: self.jx3api.content.peizhuang( name,tags))
 
     
     async def bilei_add(self, event: AstrMessageEvent,name: str, text: str):