diff --git a/src/main/scala/com/github/unchama/seichiassist/menus/minestack/CategorizedMineStackMenu.scala b/src/main/scala/com/github/unchama/seichiassist/menus/minestack/CategorizedMineStackMenu.scala index 3df3df405d..7feda5067d 100644 --- a/src/main/scala/com/github/unchama/seichiassist/menus/minestack/CategorizedMineStackMenu.scala +++ b/src/main/scala/com/github/unchama/seichiassist/menus/minestack/CategorizedMineStackMenu.scala @@ -145,6 +145,8 @@ case class CategorizedMineStackMenu(category: MineStackObjectCategory, pageIndex .++(categorizedItemSection) .++(autoMineStackToggleButtonSection) + println(s"combinedLayout: $combinedLayout") + MenuSlotLayout(combinedLayout: _*) } } diff --git a/src/main/scala/com/github/unchama/seichiassist/subsystems/minestack/bukkit/BukkitMineStackObjectList.scala b/src/main/scala/com/github/unchama/seichiassist/subsystems/minestack/bukkit/BukkitMineStackObjectList.scala index 791e5daa87..ea4375473c 100644 --- a/src/main/scala/com/github/unchama/seichiassist/subsystems/minestack/bukkit/BukkitMineStackObjectList.scala +++ b/src/main/scala/com/github/unchama/seichiassist/subsystems/minestack/bukkit/BukkitMineStackObjectList.scala @@ -232,23 +232,6 @@ class BukkitMineStackObjectList[F[_]: Sync]( MineStackObjectByMaterial(AGRICULTURAL, "tropical_fish_bucket", "熱帯魚入りバケツ", Material.TROPICAL_FISH_BUCKET), MineStackObjectByMaterial(AGRICULTURAL, "axolotl_bucket", "ウーパールーパー入りバケツ", Material.AXOLOTL_BUCKET), MineStackObjectByMaterial(AGRICULTURAL, "dried_kelp_block", "乾燥した昆布ブロック", Material.DRIED_KELP_BLOCK), - MineStackObjectByMaterial(AGRICULTURAL, "candle_cake", "ろうそくが立てられたケーキ", Material.CANDLE_CAKE), - MineStackObjectByMaterial(AGRICULTURAL, "white_candle_cake", "白色のろうそく付きケーキ", Material.WHITE_CANDLE_CAKE), - MineStackObjectByMaterial(AGRICULTURAL, "orange_candle_cake", "橙色のろうそく付きケーキ", Material.ORANGE_CANDLE_CAKE), - MineStackObjectByMaterial(AGRICULTURAL, "magenta_candle_cake", "赤紫色のろうそく付きケーキ", Material.MAGENTA_CANDLE_CAKE), - MineStackObjectByMaterial(AGRICULTURAL, "light_blue_candle_cake", "空色のろうそく付きケーキ", Material.LIGHT_BLUE_CANDLE_CAKE), - MineStackObjectByMaterial(AGRICULTURAL, "yellow_candle_cake", "黄色のろうそく付きケーキ", Material.YELLOW_CANDLE_CAKE), - MineStackObjectByMaterial(AGRICULTURAL, "lime_candle_cake", "黄緑色のろうそく付きケーキ", Material.LIME_CANDLE_CAKE), - MineStackObjectByMaterial(AGRICULTURAL, "pink_candle_cake", "桃色のろうそく付きケーキ", Material.PINK_CANDLE_CAKE), - MineStackObjectByMaterial(AGRICULTURAL, "gray_candle_cake", "灰色のろうそく付きケーキ", Material.GRAY_CANDLE_CAKE), - MineStackObjectByMaterial(AGRICULTURAL, "light_gray_candle_cake", "薄灰色のろうそく付きケーキ", Material.LIGHT_GRAY_CANDLE_CAKE), - MineStackObjectByMaterial(AGRICULTURAL, "cyan_candle_cake", "青緑色のろうそく付きケーキ", Material.CYAN_CANDLE_CAKE), - MineStackObjectByMaterial(AGRICULTURAL, "purple_candle_cake", "紫色のろうそく付きケーキ", Material.PURPLE_CANDLE_CAKE), - MineStackObjectByMaterial(AGRICULTURAL, "blue_candle_cake", "青色のろうそく付きケーキ", Material.BLUE_CANDLE_CAKE), - MineStackObjectByMaterial(AGRICULTURAL, "brown_candle_cake", "茶色のろうそく付きケーキ", Material.BROWN_CANDLE_CAKE), - MineStackObjectByMaterial(AGRICULTURAL, "green_candle_cake", "緑色のろうそく付きケーキ", Material.GREEN_CANDLE_CAKE), - MineStackObjectByMaterial(AGRICULTURAL, "red_candle_cake", "赤色のろうそく付きケーキ", Material.RED_CANDLE_CAKE), - MineStackObjectByMaterial(AGRICULTURAL, "black_candle_cake", "黒色のろうそく付きケーキ", Material.BLACK_CANDLE_CAKE), MineStackObjectByMaterial(AGRICULTURAL, "cocoa", "カカオの実", Material.COCOA), MineStackObjectByMaterial(AGRICULTURAL, "suspicious_stew", "怪しげなシチュー", Material.SUSPICIOUS_STEW), MineStackObjectByMaterial(AGRICULTURAL, "pumpkin_stem", "カボチャの茎", Material.PUMPKIN_STEM), @@ -687,29 +670,7 @@ class BukkitMineStackObjectList[F[_]: Sync]( MineStackObjectByMaterial(BUILDING, "red_candle", "赤色のろうそく", Material.RED_CANDLE), MineStackObjectByMaterial(BUILDING, "black_candle", "黒色のろうそく", Material.BLACK_CANDLE), MineStackObjectByMaterial(BUILDING, "pointed_dripstone", "鍾乳石", Material.POINTED_DRIPSTONE), - MineStackObjectByMaterial(BUILDING, "tall_seagrass", "背の高い海草", Material.TALL_SEAGRASS), - MineStackObjectByMaterial(BUILDING, "wall_torch", "壁に付けられた松明", Material.WALL_TORCH), - MineStackObjectByMaterial(BUILDING, "fire", "炎", Material.FIRE), - MineStackObjectByMaterial(BUILDING, "soul_fire", "魂の炎", Material.SOUL_FIRE), - MineStackObjectByMaterial(BUILDING, "bamboo_sapling", "タケノコ", Material.BAMBOO_SAPLING), - MineStackObjectByMaterial(BUILDING, "bubble_column", "気泡柱", Material.BUBBLE_COLUMN), - MineStackObjectByMaterial(BUILDING, "sweet_berry_bush", "スイートベリーの低木", Material.SWEET_BERRY_BUSH), - MineStackObjectByMaterial(BUILDING, "weeping_vines_plant", "しだれツタのつる", Material.WEEPING_VINES_PLANT), - MineStackObjectByMaterial(BUILDING, "twisting_vines_plant", "ねじれツタのつる", Material.TWISTING_VINES_PLANT), - MineStackObjectByMaterial(BUILDING, "crimson_wall_sign", "壁に付けられた真紅の看板", Material.CRIMSON_WALL_SIGN), - MineStackObjectByMaterial(BUILDING, "warped_wall_sign", "壁に付けられた歪んだ看板", Material.WARPED_WALL_SIGN), - MineStackObjectByMaterial(BUILDING, "potted_crimson_fungus", "植えられた真紅のキノコ", Material.POTTED_CRIMSON_FUNGUS), - MineStackObjectByMaterial(BUILDING, "potted_warped_fungus", "植えられた歪んだキノコ", Material.POTTED_WARPED_FUNGUS), - MineStackObjectByMaterial(BUILDING, "potted_crimson_roots", "植えられた真紅の根", Material.POTTED_CRIMSON_ROOTS), - MineStackObjectByMaterial(BUILDING, "potted_warped_roots", "植えられた歪んだ根", Material.POTTED_WARPED_ROOTS), - MineStackObjectByMaterial(BUILDING, "powder_snow", "粉雪", Material.POWDER_SNOW), - MineStackObjectByMaterial(BUILDING, "cave_vines", "洞窟のツタ", Material.CAVE_VINES), - MineStackObjectByMaterial(BUILDING, "cave_vines_plant", "洞窟のツタのつる", Material.CAVE_VINES_PLANT), - MineStackObjectByMaterial(BUILDING, "big_dripleaf_stem", "大きなドリップリーフの茎", Material.BIG_DRIPLEAF_STEM), - MineStackObjectByMaterial(BUILDING, "potted_azalea_bush", "植えられたツツジ", Material.POTTED_AZALEA_BUSH), - MineStackObjectByMaterial(BUILDING, "potted_flowering_azalea_bush", "植えられた開花したツツジ", Material.POTTED_FLOWERING_AZALEA_BUSH), MineStackObjectByMaterial(BUILDING, "warped_fungus_on_a_stick", "歪んだキノコ付きの棒", Material.WARPED_FUNGUS_ON_A_STICK), - MineStackObjectByMaterial(BUILDING, "structure_block", "ストラクチャーブロック", Material.STRUCTURE_BLOCK), MineStackObjectByMaterial(BUILDING, "jigsaw", "ジグソーブロック", Material.JIGSAW), MineStackObjectByMaterial(BUILDING, "powder_snow_bucket", "粉雪入りバケツ", Material.POWDER_SNOW_BUCKET), MineStackObjectByMaterial(BUILDING, "glow_ink_sac", "輝くイカスミ", Material.GLOW_INK_SAC), @@ -722,11 +683,6 @@ class BukkitMineStackObjectList[F[_]: Sync]( MineStackObjectByMaterial(BUILDING, "firework_star", "花火の星", Material.FIREWORK_STAR), MineStackObjectByMaterial(BUILDING, "leather_horse_armor", "革の馬鎧", Material.LEATHER_HORSE_ARMOR), MineStackObjectByMaterial(BUILDING, "knowledge_book", "知恵の本", Material.KNOWLEDGE_BOOK), - MineStackObjectByMaterial(BUILDING, "water_cauldron", "水入りの大釜", Material.WATER_CAULDRON), - MineStackObjectByMaterial(BUILDING, "lava_cauldron", "溶岩入りの大釜", Material.LAVA_CAULDRON), - MineStackObjectByMaterial(BUILDING, "powder_snow_cauldron", "粉雪入りの大釜", Material.POWDER_SNOW_CAULDRON), - MineStackObjectByMaterial(BUILDING, "tripwire", "トリップワイヤー", Material.TRIPWIRE), - MineStackObjectByMaterial(BUILDING, "frosted_ice", "薄氷", Material.FROSTED_ICE), ) ++ rightElems( MineStackObjectWithColorVariants( MineStackObjectByMaterial(BUILDING, "bed", "白色のベッド", Material.WHITE_BED),