Merge e05d85c into 8f9f163

Author: rito528

src/main/scala/com/github/unchama/seichiassist/SeichiAssist.scala

@@ -810,7 +810,6 @@ class SeichiAssist extends JavaPlugin() {
       case (commandName, executor) => getCommand(commandName).setExecutor(executor)
     }
 
-    import menuRouter.ioCanOpenNickNameMenu
     // リスナーの登録
     val listeners = Seq(
       new PlayerJoinListener(),

src/main/scala/com/github/unchama/seichiassist/data/MenuInventoryData.java

@@ -2,14 +2,11 @@ package com.github.unchama.seichiassist.listener
 
 import cats.effect.IO
 import com.github.unchama.generic.effect.unsafe.EffectEnvironment
-import com.github.unchama.menuinventory.router.CanOpen
 import com.github.unchama.minecraft.actions.OnMinecraftServerThread
 import com.github.unchama.seichiassist._
 import com.github.unchama.seichiassist.data.MenuInventoryData
 import com.github.unchama.seichiassist.data.player.GiganticBerserk
-import com.github.unchama.seichiassist.listener.invlistener.OnClickTitleMenu
 import com.github.unchama.seichiassist.util.InventoryOperations
-import com.github.unchama.seichiassist.menus.nicknames.NickNameMenu
 import com.github.unchama.targetedeffect.commandsender.MessageEffect
 import com.github.unchama.targetedeffect.player.FocusedSoundEffect
 import org.bukkit.ChatColor._
@@ -22,7 +19,6 @@ import com.github.unchama.seichiassist.items.ExchangeTicket
 
 class PlayerInventoryListener(
   implicit effectEnvironment: EffectEnvironment,
-  ioCanOpenNicknameMenu: IO CanOpen NickNameMenu.type,
   ioOnMainThread: OnMinecraftServerThread[IO]
 ) extends Listener {
 
@@ -32,12 +28,6 @@ class PlayerInventoryListener(
 
   private val playerMap = SeichiAssist.playermap
 
-  // 実績メニューの処理
-  @EventHandler
-  def onPlayerClickTitleMenuEvent(event: InventoryClickEvent): Unit = {
-    OnClickTitleMenu.onPlayerClickTitleMenuEvent(event)
-  }
-
   // 鉱石・交換券変換システム
   @EventHandler
   def onOreTradeEvent(event: InventoryCloseEvent): Unit = {

src/main/scala/com/github/unchama/seichiassist/listener/PlayerInventoryListener.scala

@@ -60,6 +60,8 @@ import io.chrisdavenport.cats.effect.time.JavaTime
 import org.bukkit.{Location, World}
 import org.bukkit.entity.Player
 import org.bukkit.inventory.ItemStack
+import com.github.unchama.seichiassist.menus.nicknames.NicknameCombinationMenu
+import com.github.unchama.seichiassist.menus.nicknames.NicknameShopMenu
 
 trait TopLevelRouter[F[_]] {
 
@@ -71,8 +73,6 @@ trait TopLevelRouter[F[_]] {
 
   implicit val ioCanOpenCategorizedMineStackMenu: F CanOpen CategorizedMineStackMenu
 
-  implicit val ioCanOpenNickNameMenu: F CanOpen NickNameMenu.type
-
 }
 
 object TopLevelRouter {
@@ -125,6 +125,10 @@ object TopLevelRouter {
       new PremiumPointTransactionHistoryMenu.Environment
     implicit lazy val serverSwitchMenuEnv: ServerSwitchMenu.Environment =
       new ServerSwitchMenu.Environment
+    implicit lazy val nicknameCombinationMenuEnv: NicknameCombinationMenu.Environment =
+      new NicknameCombinationMenu.Environment
+    implicit lazy val achievementShopMenuEnv: NicknameShopMenu.Environment =
+      new NicknameShopMenu.Environment
     implicit lazy val nickNameMenuEnv: NickNameMenu.Environment =
       new NickNameMenu.Environment
     implicit lazy val achievementMenuEnv: AchievementMenu.Environment =
@@ -164,6 +168,11 @@ object TopLevelRouter {
 
     implicit lazy val ioCanOpenVoteMenu: IO CanOpen VoteMenu.type = _.open
 
+    implicit lazy val ioCanOpenNicknameShopMenu: IO CanOpen NicknameShopMenu = _.open
+
+    implicit lazy val ioCanOpenNicknameCombinationMenu: IO CanOpen NicknameCombinationMenu =
+      _.open
+
     implicit lazy val ioCanOpenNickNameMenu: IO CanOpen NickNameMenu.type = _.open
 
     implicit lazy val ioCanOpenSelectItemColorMenu: IO CanOpen MineStackSelectItemKindMenu =