diff --git a/build.gradle.kts b/build.gradle.kts
index e411972f..4d9adf15 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -1,5 +1,5 @@
 import java.text.SimpleDateFormat
-version = "1.9.3"
+version = "1.9.4-dev1"
 
 plugins {
     `java-library`
@@ -40,7 +40,7 @@ dependencies {
     compileOnly("io.lumine:Mythic-Dist:5.3.5")
     compileOnly("io.lumine:MythicLib-dist:1.6.2-SNAPSHOT")
     compileOnly("net.Indyuce:MMOItems-API:6.9.5-SNAPSHOT")
-    implementation("com.crypticlib:CrypticLib:0.16.1")
+    implementation("com.crypticlib:CrypticLib:0.16.9")
 }
 
 group = "com.github.yufiriamazenta"
diff --git a/src/main/java/com/github/yufiriamazenta/craftorithm/cmd/sub/item/GiveItemCommand.java b/src/main/java/com/github/yufiriamazenta/craftorithm/cmd/sub/item/GiveItemCommand.java
index b20336fc..3e2bc1cd 100644
--- a/src/main/java/com/github/yufiriamazenta/craftorithm/cmd/sub/item/GiveItemCommand.java
+++ b/src/main/java/com/github/yufiriamazenta/craftorithm/cmd/sub/item/GiveItemCommand.java
@@ -1,10 +1,13 @@
 package com.github.yufiriamazenta.craftorithm.cmd.sub.item;
 
+import com.github.yufiriamazenta.craftorithm.Craftorithm;
 import com.github.yufiriamazenta.craftorithm.cmd.sub.AbstractSubCommand;
 import com.github.yufiriamazenta.craftorithm.config.Languages;
 import com.github.yufiriamazenta.craftorithm.item.impl.CraftorithmItemProvider;
 import com.github.yufiriamazenta.craftorithm.util.CollectionsUtil;
 import com.github.yufiriamazenta.craftorithm.util.LangUtil;
+import crypticlib.CrypticLib;
+import crypticlib.platform.IPlatform;
 import org.bukkit.Bukkit;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
@@ -52,8 +55,17 @@ public boolean execute(CommandSender sender, List<String> args) {
 
         HashMap<Integer, ItemStack> failedItems = player.getInventory().addItem(itemStack);
         if (!failedItems.isEmpty()) {
-            for (ItemStack stack : failedItems.values()) {
-                player.getWorld().dropItem(player.getLocation(), stack);
+            if (!CrypticLib.platform().platform().equals(IPlatform.Platform.FOLIA)) {
+                for (ItemStack stack : failedItems.values()) {
+                    player.getWorld().dropItem(player.getLocation(), stack);
+                }
+            } else {
+                Runnable dropTask = () -> {
+                    for (ItemStack stack : failedItems.values()) {
+                        player.getWorld().dropItem(player.getLocation(), stack);
+                    }
+                };
+                CrypticLib.platform().scheduler().runTaskOnEntity(Craftorithm.instance(), player, dropTask, dropTask);
             }
         }
         LangUtil.sendLang(sender, Languages.COMMAND_ITEM_GIVE_SUCCESS);
@@ -63,9 +75,7 @@ public boolean execute(CommandSender sender, List<String> args) {
     @Override
     public List<String> tab(CommandSender sender, List<String> args) {
         if (args.size() < 2) {
-            List<String> tabList = new ArrayList<>(CraftorithmItemProvider.INSTANCE.itemMap().keySet());
-            filterTabList(tabList, args.get(0));
-            return tabList;
+            return new ArrayList<>(CraftorithmItemProvider.INSTANCE.itemMap().keySet());
         }
         else
             return getOnlinePlayerNameList();
diff --git a/src/main/java/com/github/yufiriamazenta/craftorithm/cmd/sub/item/SaveItemCommand.java b/src/main/java/com/github/yufiriamazenta/craftorithm/cmd/sub/item/SaveItemCommand.java
index e88466cd..04773aea 100644
--- a/src/main/java/com/github/yufiriamazenta/craftorithm/cmd/sub/item/SaveItemCommand.java
+++ b/src/main/java/com/github/yufiriamazenta/craftorithm/cmd/sub/item/SaveItemCommand.java
@@ -45,9 +45,7 @@ public boolean execute(CommandSender sender, List<String> args) {
     @Override
     public List<String> tab(CommandSender sender, List<String> args) {
         if (args.size() < 2) {
-            List<String> tabList = new ArrayList<>(CraftorithmItemProvider.INSTANCE.itemConfigFileMap().keySet());
-            filterTabList(tabList, args.get(0));
-            return tabList;
+            return new ArrayList<>(CraftorithmItemProvider.INSTANCE.itemConfigFileMap().keySet());
         } else {
             return Collections.singletonList("");
         }
diff --git a/src/main/java/com/github/yufiriamazenta/craftorithm/cmd/sub/recipe/CreateRecipeCommand.java b/src/main/java/com/github/yufiriamazenta/craftorithm/cmd/sub/recipe/CreateRecipeCommand.java
index 482a669a..57911def 100644
--- a/src/main/java/com/github/yufiriamazenta/craftorithm/cmd/sub/recipe/CreateRecipeCommand.java
+++ b/src/main/java/com/github/yufiriamazenta/craftorithm/cmd/sub/recipe/CreateRecipeCommand.java
@@ -101,9 +101,7 @@ public boolean execute(CommandSender sender, List<String> args) {
     @Override
     public List<String> tab(CommandSender sender, List<String> args) {
         if (args.size() <= 1) {
-            List<String> tabList = new ArrayList<>(recipeTypeList);
-            filterTabList(tabList, args.get(0));
-            return tabList;
+            return new ArrayList<>(recipeTypeList);
         }
         return Collections.singletonList("<recipe_name>");
     }
diff --git a/src/main/java/com/github/yufiriamazenta/craftorithm/cmd/sub/recipe/DisableRecipeCommand.java b/src/main/java/com/github/yufiriamazenta/craftorithm/cmd/sub/recipe/DisableRecipeCommand.java
index 0159b3c9..5c3c3bec 100644
--- a/src/main/java/com/github/yufiriamazenta/craftorithm/cmd/sub/recipe/DisableRecipeCommand.java
+++ b/src/main/java/com/github/yufiriamazenta/craftorithm/cmd/sub/recipe/DisableRecipeCommand.java
@@ -48,7 +48,6 @@ public List<String> tab(CommandSender sender, List<String> args) {
                 if (str.contains(args.get(0)))
                     tabList.add(key.toString());
             }
-            filterTabList(tabList, args.get(0));
             return tabList;
         }
         return super.onTabComplete(sender, args);
diff --git a/src/main/java/com/github/yufiriamazenta/craftorithm/cmd/sub/recipe/RemoveRecipeCommand.java b/src/main/java/com/github/yufiriamazenta/craftorithm/cmd/sub/recipe/RemoveRecipeCommand.java
index e9fc248d..a4c975e8 100644
--- a/src/main/java/com/github/yufiriamazenta/craftorithm/cmd/sub/recipe/RemoveRecipeCommand.java
+++ b/src/main/java/com/github/yufiriamazenta/craftorithm/cmd/sub/recipe/RemoveRecipeCommand.java
@@ -44,7 +44,6 @@ public List<String> tab(CommandSender sender, List<String> args) {
             for (Map<String, RecipeGroup> recipeGroupMap : RecipeManager.INSTANCE.recipeMap().values()) {
                 tabList.addAll(recipeGroupMap.keySet());
             }
-            filterTabList(tabList, args.get(0));
             return tabList;
         }
         return super.onTabComplete(sender, args);
diff --git a/src/main/java/com/github/yufiriamazenta/craftorithm/menu/creator/AnvilRecipeCreator.java b/src/main/java/com/github/yufiriamazenta/craftorithm/menu/creator/AnvilRecipeCreator.java
index f19a362d..91ab7a55 100644
--- a/src/main/java/com/github/yufiriamazenta/craftorithm/menu/creator/AnvilRecipeCreator.java
+++ b/src/main/java/com/github/yufiriamazenta/craftorithm/menu/creator/AnvilRecipeCreator.java
@@ -56,37 +56,37 @@ public AnvilRecipeCreator(@NotNull Player player, @NotNull String recipeName) {
                     layoutMap.put('*', new Icon(Material.CYAN_STAINED_GLASS_PANE, Languages.MENU_RECIPE_CREATOR_ICON_ANVIL_FRAME.value(player)));
                     layoutMap.put('B', getCopyNbtIcon());
                     layoutMap.put('C', getCostLevelIcon());
-                    layoutMap.put('A', new Icon(Material.ANVIL, Languages.MENU_RECIPE_CREATOR_ICON_CONFIRM.value(player),
-                        event -> {
-                            StoredMenu creator = (StoredMenu) event.getClickedInventory().getHolder();
-                            ItemStack result = Objects.requireNonNull(creator).storedItems().get(24);
-                            ItemStack base = creator.storedItems().get(19);
-                            ItemStack addition = creator.storedItems().get(21);
-                            if (ItemUtil.isAir(result)) {
-                                LangUtil.sendLang(event.getWhoClicked(), Languages.COMMAND_CREATE_NULL_RESULT);
-                                return;
-                            }
-                            if (ItemUtil.isAir(addition) || ItemUtil.isAir(base)) {
-                                LangUtil.sendLang(event.getWhoClicked(), Languages.COMMAND_CREATE_NULL_SOURCE);
-                                return;
-                            }
-                            String resultName = ItemUtils.matchItemNameOrCreate(result, false);
-                            String inputName = ItemUtils.matchItemNameOrCreate(base, false);
-                            String ingredientName = ItemUtils.matchItemNameOrCreate(addition, false);
-                            ConfigWrapper recipeConfig = createRecipeConfig(recipeName);
-                            recipeConfig.set("source.copy_nbt", event.getInventory().getItem(40).getItemMeta().hasEnchants());
-                            recipeConfig.set("type", "anvil");
-                            recipeConfig.set("source.base", inputName);
-                            recipeConfig.set("source.addition", ingredientName);
-                            recipeConfig.set("source.cost_level", costLevel);
-                            recipeConfig.set("result", resultName);
-                            recipeConfig.saveConfig();
-                            recipeConfig.reloadConfig();
-                            regRecipeGroup(recipeConfig);
-                            event.getWhoClicked().closeInventory();
-                            sendSuccessMsg(player, recipeName);
-                        })
-                    );
+                    layoutMap.put('A', new Icon(Material.ANVIL, Languages.MENU_RECIPE_CREATOR_ICON_CONFIRM.value(player))
+                        .setClickAction(
+                            event -> {
+                                StoredMenu creator = (StoredMenu) event.getClickedInventory().getHolder();
+                                ItemStack result = Objects.requireNonNull(creator).storedItems().get(24);
+                                ItemStack base = creator.storedItems().get(19);
+                                ItemStack addition = creator.storedItems().get(21);
+                                if (ItemUtil.isAir(result)) {
+                                    LangUtil.sendLang(event.getWhoClicked(), Languages.COMMAND_CREATE_NULL_RESULT);
+                                    return;
+                                }
+                                if (ItemUtil.isAir(addition) || ItemUtil.isAir(base)) {
+                                    LangUtil.sendLang(event.getWhoClicked(), Languages.COMMAND_CREATE_NULL_SOURCE);
+                                    return;
+                                }
+                                String resultName = ItemUtils.matchItemNameOrCreate(result, false);
+                                String inputName = ItemUtils.matchItemNameOrCreate(base, false);
+                                String ingredientName = ItemUtils.matchItemNameOrCreate(addition, false);
+                                ConfigWrapper recipeConfig = createRecipeConfig(recipeName);
+                                recipeConfig.set("source.copy_nbt", event.getInventory().getItem(40).getItemMeta().hasEnchants());
+                                recipeConfig.set("type", "anvil");
+                                recipeConfig.set("source.base", inputName);
+                                recipeConfig.set("source.addition", ingredientName);
+                                recipeConfig.set("source.cost_level", costLevel);
+                                recipeConfig.set("result", resultName);
+                                recipeConfig.saveConfig();
+                                recipeConfig.reloadConfig();
+                                regRecipeGroup(recipeConfig);
+                                event.getWhoClicked().closeInventory();
+                                sendSuccessMsg(player, recipeName);
+                            }));
                     return layoutMap;
                 })
             )
@@ -107,7 +107,8 @@ protected Icon getCopyNbtIcon() {
             Material.NAME_TAG,
             Languages.MENU_RECIPE_CREATOR_ICON_ANVIL_COPY_NBT_TOGGLE
                 .value(player)
-                .replace("<enable>", String.valueOf(copyNbt)),
+                .replace("<enable>", String.valueOf(copyNbt))
+        ).setClickAction(
             event -> toggleCopyNbt(event.getSlot(), event)
         );
         if (copyNbt)
@@ -132,13 +133,14 @@ protected Icon getCostLevelIcon() {
             Material.EXPERIENCE_BOTTLE,
             Languages.MENU_RECIPE_CREATOR_ICON_ANVIL_COST_LEVEL_NAME.value(player)
                 .replace("<level>", String.valueOf(costLevel)),
-            Languages.MENU_RECIPE_CREATOR_ICON_ANVIL_COST_LEVEL_LORE.value(player),
+            Languages.MENU_RECIPE_CREATOR_ICON_ANVIL_COST_LEVEL_LORE.value(player)
+        ).setClickAction(
             event -> {
                 Conversation conversation = new Conversation(
                     Craftorithm.instance(),
                     player,
                     new CostLevelInputPrompt(),
-                    data -> player.openInventory(openedInventory)
+                    data -> player.openInventory(inventoryCache)
                 );
                 inConversation = true;
                 conversation.start();
@@ -148,7 +150,7 @@ protected Icon getCostLevelIcon() {
     }
 
     public void updateCostLevelIcon() {
-        ItemStack costLevelIcon = this.openedInventory().getItem(4);
+        ItemStack costLevelIcon = this.inventoryCache.getItem(4);
         if (costLevelIcon == null)
             return;
         ItemUtil.setDisplayName(
@@ -164,7 +166,7 @@ class CostLevelInputPrompt implements NumberPrompt {
         @Nullable
         public Prompt acceptValidatedInput(@NotNull Map<Object, Object> data, @NotNull Number number) {
             costLevel = number.intValue();
-            player.openInventory(openedInventory());
+            player.openInventory(inventoryCache);
             updateCostLevelIcon();
             inConversation = false;
             return null;
diff --git a/src/main/java/com/github/yufiriamazenta/craftorithm/menu/creator/CookingRecipeCreator.java b/src/main/java/com/github/yufiriamazenta/craftorithm/menu/creator/CookingRecipeCreator.java
index ad6e2ec8..44a583ef 100644
--- a/src/main/java/com/github/yufiriamazenta/craftorithm/menu/creator/CookingRecipeCreator.java
+++ b/src/main/java/com/github/yufiriamazenta/craftorithm/menu/creator/CookingRecipeCreator.java
@@ -67,8 +67,8 @@ public CookingRecipeCreator(@NotNull Player player, @NotNull String recipeName)
                     layoutMap.put('G', getCookingTimeIcon());
                     layoutMap.put('H', getExpIcon());
                     layoutMap.put('A', new Icon(
-                        Material.FURNACE,
-                        Languages.MENU_RECIPE_CREATOR_ICON_CONFIRM.value(player),
+                        Material.FURNACE, Languages.MENU_RECIPE_CREATOR_ICON_CONFIRM.value(player)
+                        ).setClickAction(
                         event -> {
                             StoredMenu creator = (StoredMenu) Objects.requireNonNull(event.getClickedInventory()).getHolder();
                             ItemStack source = Objects.requireNonNull(creator).storedItems().get(20);
@@ -107,7 +107,8 @@ public CookingRecipeCreator(@NotNull Player player, @NotNull String recipeName)
                             regRecipeGroup(recipeConfig);
                             event.getWhoClicked().closeInventory();
                             sendSuccessMsg(event.getWhoClicked(), recipeName);
-                        })
+                        }
+                        )
                     );
                     return layoutMap;
                 })
@@ -145,7 +146,8 @@ protected Icon getCookingToggleIcon(Material material) {
         displayName = displayName.replace("<enable>", String.valueOf(enable));
         Icon icon = new Icon(
             material,
-            displayName,
+            displayName
+        ).setClickAction(
             event -> toggleCookingIcon(event.getSlot(), event)
         );
         if (enable) {
@@ -184,13 +186,14 @@ protected Icon getCookingTimeIcon() {
             Material.CLOCK,
             Languages.MENU_RECIPE_CREATOR_ICON_COOKING_TIME_NAME.value(player)
                 .replace("<time>", String.valueOf(cookingTime)),
-            Languages.MENU_RECIPE_CREATOR_ICON_COOKING_TIME_LORE.value(player),
+            Languages.MENU_RECIPE_CREATOR_ICON_COOKING_TIME_LORE.value(player)
+        ).setClickAction(
             event -> {
                 Conversation timeInputConversation = new Conversation(
                     Craftorithm.instance(),
                     player,
                     new TimeInputPrompt(),
-                    data -> player.openInventory(openedInventory())
+                    data -> player.openInventory(inventoryCache)
                 );
                 inConversation = true;
                 timeInputConversation.start();
@@ -204,13 +207,14 @@ protected Icon getExpIcon() {
             Material.EXPERIENCE_BOTTLE,
             Languages.MENU_RECIPE_CREATOR_ICON_COOKING_EXP_NAME.value(player)
                 .replace("<exp>", String.valueOf(exp)),
-            Languages.MENU_RECIPE_CREATOR_ICON_COOKING_EXP_LORE.value(player),
+            Languages.MENU_RECIPE_CREATOR_ICON_COOKING_EXP_LORE.value(player)
+        ).setClickAction(
             event -> {
                 Conversation conversation = new Conversation(
                     Craftorithm.instance(),
                     player,
                     new ExpInputPrompt(),
-                    data -> player.openInventory(openedInventory)
+                    data -> player.openInventory(inventoryCache)
                 );
                 inConversation = true;
                 conversation.start();
@@ -220,7 +224,7 @@ protected Icon getExpIcon() {
     }
 
     protected void updateCookingTimeIcon() {
-        ItemStack cookingTimeIcon = this.openedInventory().getItem(3);
+        ItemStack cookingTimeIcon = this.inventoryCache.getItem(3);
         if (cookingTimeIcon == null)
             return;
         ItemUtil.setDisplayName(
@@ -232,7 +236,7 @@ protected void updateCookingTimeIcon() {
     }
 
     protected void updateExpIcon() {
-        ItemStack expIcon = this.openedInventory().getItem(5);
+        ItemStack expIcon = this.inventoryCache.getItem(5);
         if (expIcon == null)
             return;
         ItemUtil.setDisplayName(
diff --git a/src/main/java/com/github/yufiriamazenta/craftorithm/menu/creator/CraftingRecipeCreator.java b/src/main/java/com/github/yufiriamazenta/craftorithm/menu/creator/CraftingRecipeCreator.java
index 90708751..5108af8c 100644
--- a/src/main/java/com/github/yufiriamazenta/craftorithm/menu/creator/CraftingRecipeCreator.java
+++ b/src/main/java/com/github/yufiriamazenta/craftorithm/menu/creator/CraftingRecipeCreator.java
@@ -41,8 +41,8 @@ public CraftingRecipeCreator(@NotNull Player player, RecipeType recipeType, @Not
                 layoutMap.put('F', getUnlockIcon());
                 layoutMap.put('A', new Icon(
                     Material.CRAFTING_TABLE,
-                    Languages.MENU_RECIPE_CREATOR_ICON_CONFIRM.value(player),
-                    event -> {
+                    Languages.MENU_RECIPE_CREATOR_ICON_CONFIRM.value(player)
+                    ).setClickAction(event -> {
                         StoredMenu creator = (StoredMenu) Objects.requireNonNull(event.getClickedInventory()).getHolder();
                         Map<Integer, ItemStack> storedItems = Objects.requireNonNull(creator).storedItems();
                         ItemStack result = storedItems.get(24);
diff --git a/src/main/java/com/github/yufiriamazenta/craftorithm/menu/creator/PotionMixCreator.java b/src/main/java/com/github/yufiriamazenta/craftorithm/menu/creator/PotionMixCreator.java
index 7c338b0d..e7df4fb1 100644
--- a/src/main/java/com/github/yufiriamazenta/craftorithm/menu/creator/PotionMixCreator.java
+++ b/src/main/java/com/github/yufiriamazenta/craftorithm/menu/creator/PotionMixCreator.java
@@ -43,7 +43,8 @@ public PotionMixCreator(@NotNull Player player, @NotNull String recipeName) {
                     ));
                     layoutMap.put('A', new Icon(
                         Material.BREWING_STAND,
-                        Languages.MENU_RECIPE_CREATOR_ICON_CONFIRM.value(player),
+                        Languages.MENU_RECIPE_CREATOR_ICON_CONFIRM.value(player)
+                        ).setClickAction(
                         event -> {
                             StoredMenu creator = (StoredMenu) event.getClickedInventory().getHolder();
                             ItemStack result = Objects.requireNonNull(creator).storedItems().get(24);
@@ -70,7 +71,8 @@ public PotionMixCreator(@NotNull Player player, @NotNull String recipeName) {
                             regRecipeGroup(recipeConfig);
                             event.getWhoClicked().closeInventory();
                             sendSuccessMsg(player, recipeName);
-                        })
+                        }
+                        )
                     );
                     return layoutMap;
                 })
diff --git a/src/main/java/com/github/yufiriamazenta/craftorithm/menu/creator/SmithingRecipeCreator.java b/src/main/java/com/github/yufiriamazenta/craftorithm/menu/creator/SmithingRecipeCreator.java
index 6c357917..75699ee7 100644
--- a/src/main/java/com/github/yufiriamazenta/craftorithm/menu/creator/SmithingRecipeCreator.java
+++ b/src/main/java/com/github/yufiriamazenta/craftorithm/menu/creator/SmithingRecipeCreator.java
@@ -63,7 +63,8 @@ public SmithingRecipeCreator(@NotNull Player player, @NotNull String recipeName)
                         layoutMap.put('B', getCopyNbtIcon());
                         layoutMap.put('A', new Icon(
                             Material.SMITHING_TABLE,
-                            Languages.MENU_RECIPE_CREATOR_ICON_CONFIRM.value(player),
+                            Languages.MENU_RECIPE_CREATOR_ICON_CONFIRM.value(player)
+                            ).setClickAction(
                             event -> {
                                 StoredMenu creator = (StoredMenu) Objects.requireNonNull(event.getClickedInventory()).getHolder();
                                 ItemStack result = Objects.requireNonNull(creator).storedItems().get(24);
@@ -109,7 +110,8 @@ public SmithingRecipeCreator(@NotNull Player player, @NotNull String recipeName)
                                 regRecipeGroup(recipeConfig);
                                 event.getWhoClicked().closeInventory();
                                 sendSuccessMsg(event.getWhoClicked(), recipeName);
-                            })
+                            }
+                            )
                         );
                         return layoutMap;
                     }
@@ -122,9 +124,8 @@ protected Icon getCopyNbtIcon() {
             Material.NAME_TAG,
             Languages.MENU_RECIPE_CREATOR_ICON_SMITHING_COPY_NBT_TOGGLE
                 .value(player)
-                .replace("<enable>", String.valueOf(copyNbt)),
-            event -> toggleCopyNbt(event.getSlot(), event)
-        );
+                .replace("<enable>", String.valueOf(copyNbt))
+        ).setClickAction(event -> toggleCopyNbt(event.getSlot(), event));
         if (copyNbt)
             ItemUtils.toggleItemGlowing(icon.display());
         return icon;
diff --git a/src/main/java/com/github/yufiriamazenta/craftorithm/menu/creator/StoneCuttingRecipeCreator.java b/src/main/java/com/github/yufiriamazenta/craftorithm/menu/creator/StoneCuttingRecipeCreator.java
index 1daaa399..6b3b310b 100644
--- a/src/main/java/com/github/yufiriamazenta/craftorithm/menu/creator/StoneCuttingRecipeCreator.java
+++ b/src/main/java/com/github/yufiriamazenta/craftorithm/menu/creator/StoneCuttingRecipeCreator.java
@@ -36,7 +36,8 @@ public StoneCuttingRecipeCreator(@NotNull Player player, @NotNull String recipeN
                     layoutMap.put('F', getUnlockIcon());
                     layoutMap.put('A', new Icon(
                         Material.STONECUTTER,
-                        Languages.MENU_RECIPE_CREATOR_ICON_CONFIRM.value(player),
+                        Languages.MENU_RECIPE_CREATOR_ICON_CONFIRM.value(player)
+                        ).setClickAction(
                         event -> {
                             StoredMenu creator = (StoredMenu) event.getClickedInventory().getHolder();
                             List<String> sourceList = new ArrayList<>();
@@ -72,7 +73,8 @@ public StoneCuttingRecipeCreator(@NotNull Player player, @NotNull String recipeN
                             regRecipeGroup(recipeConfig);
                             event.getWhoClicked().closeInventory();
                             sendSuccessMsg(event.getWhoClicked(), recipeName);
-                        })
+                        }
+                        )
                     );
                     return layoutMap;
                 })
diff --git a/src/main/java/com/github/yufiriamazenta/craftorithm/menu/creator/UnlockableRecipeCreator.java b/src/main/java/com/github/yufiriamazenta/craftorithm/menu/creator/UnlockableRecipeCreator.java
index a488cd22..8120da74 100644
--- a/src/main/java/com/github/yufiriamazenta/craftorithm/menu/creator/UnlockableRecipeCreator.java
+++ b/src/main/java/com/github/yufiriamazenta/craftorithm/menu/creator/UnlockableRecipeCreator.java
@@ -24,9 +24,8 @@ public UnlockableRecipeCreator(@NotNull Player player, @NotNull RecipeType recip
     protected Icon getUnlockIcon() {
         Icon icon = new Icon(
             Material.KNOWLEDGE_BOOK,
-            Languages.MENU_RECIPE_CREATOR_ICON_UNLOCK.value(player).replace("<unlock>", String.valueOf(unlock)),
-            event -> toggleUnlockIcon(event.getSlot(), event)
-        );
+            Languages.MENU_RECIPE_CREATOR_ICON_UNLOCK.value(player).replace("<unlock>", String.valueOf(unlock))
+        ).setClickAction(event -> toggleUnlockIcon(event.getSlot(), event));
         if (unlock) {
             ItemUtils.toggleItemGlowing(icon.display());
         }
diff --git a/src/main/java/com/github/yufiriamazenta/craftorithm/menu/display/RecipeGroupListMenu.java b/src/main/java/com/github/yufiriamazenta/craftorithm/menu/display/RecipeGroupListMenu.java
index 21413475..d8eb1b87 100644
--- a/src/main/java/com/github/yufiriamazenta/craftorithm/menu/display/RecipeGroupListMenu.java
+++ b/src/main/java/com/github/yufiriamazenta/craftorithm/menu/display/RecipeGroupListMenu.java
@@ -53,8 +53,8 @@ public RecipeGroupListMenu(Player player) {
     @Override
     public Inventory getInventory() {
         resetIcons();
-        if (openedInventory == null) {
-            openedInventory = Bukkit.createInventory(
+        if (inventoryCache == null) {
+            inventoryCache = Bukkit.createInventory(
                 this,
                 54,
                 TextProcessor.color(Languages.MENU_NEW_RECIPE_LIST_TITLE.value(player))
@@ -62,7 +62,7 @@ public Inventory getInventory() {
         }
         refreshInventory();
 
-        return openedInventory;
+        return inventoryCache;
     }
 
     public void nextPage() {
@@ -115,14 +115,12 @@ public RecipeGroupListMenu resetIcons() {
         }
         slotMap.put(46, new Icon(
             Material.PAPER,
-            TextProcessor.color(Languages.MENU_NEW_RECIPE_LIST_ICON_PREVIOUS.value(player)),
-            event -> previousPage()
-        ));
+            TextProcessor.color(Languages.MENU_NEW_RECIPE_LIST_ICON_PREVIOUS.value(player))
+        ).setClickAction(event -> previousPage()));
         slotMap.put(52, new Icon(
             Material.PAPER,
-            TextProcessor.color(Languages.MENU_NEW_RECIPE_LIST_ICON_NEXT.value(player)),
-            event -> nextPage()
-        ));
+            TextProcessor.color(Languages.MENU_NEW_RECIPE_LIST_ICON_NEXT.value(player))
+        ).setClickAction(event -> nextPage()));
         int recipeSlot = page * 45;
         for (int invSlot = 0; invSlot < 45 && recipeSlot < recipeGroupResultList.size(); invSlot++, recipeSlot++) {
             slotMap.put(invSlot, wrapIcon(recipeSlot));
@@ -136,9 +134,9 @@ public RecipeGroupListMenu resetIcons() {
     }
 
     public RecipeGroupListMenu refreshInventory() {
-        openedInventory.clear();
+        inventoryCache.clear();
         for (Integer slot : slotMap.keySet()) {
-            openedInventory.setItem(slot, slotMap.get(slot).display());
+            inventoryCache.setItem(slot, slotMap.get(slot).display());
         }
         return this;
     }
@@ -147,44 +145,46 @@ public RecipeGroupListMenu refreshInventory() {
     private Icon wrapIcon(int recipeSlot) {
         ItemStack display = recipeGroupResultList.get(recipeSlot).getValue();
         String recipeGroupName = recipeGroupResultList.get(recipeSlot).getKey();
-        Icon icon = new Icon(display, event -> {
-            switch (event.getClick()) {
-                case RIGHT:
-                case SHIFT_RIGHT:
-                    if (!player.hasPermission("craftorithm.edit_recipe")) {
-                        return;
-                    }
-                    RecipeGroup recipeGroup = RecipeManager.INSTANCE.getRecipeGroup(recipeGroupName);
-                    if (recipeGroup == null) {
-                        throw new IllegalArgumentException("Can not find recipe group " + recipeGroupName);
-                    }
-                    recipeGroupEditorMap.getOrDefault(recipeGroup.recipeType(), (player, group, parent) -> {
-                        throw new RuntimeException("Unknown recipe type editor");
-                    }).apply(player, recipeGroup, this).openMenu();
-                    break;
-                case LEFT:
-                case SHIFT_LEFT:
-                default:
-                    RecipeGroup recipeGroup1 = RecipeManager.INSTANCE.getRecipeGroup(recipeGroupName);
-                    if (recipeGroup1 == null) {
-                        throw new IllegalArgumentException("Can not find recipe group " + recipeGroupName);
-                    }
-                    if (recipeGroup1.groupRecipeKeys().size() < 2) {
-                        new RecipeDisplayMenu(
-                            player,
-                            RecipeManager.INSTANCE.getRecipe(recipeGroup1.groupRecipeKeys().get(0)),
-                            this
-                        ).openMenu();
-                    } else {
-                        new RecipeListMenu(
-                            player,
-                            recipeGroup1.groupRecipeKeys(),
-                            this
-                        ).openMenu();
-                    }
-                    break;
+        Icon icon = new Icon(display).setClickAction(
+            event -> {
+                switch (event.getClick()) {
+                    case RIGHT:
+                    case SHIFT_RIGHT:
+                        if (!player.hasPermission("craftorithm.edit_recipe")) {
+                            return;
+                        }
+                        RecipeGroup recipeGroup = RecipeManager.INSTANCE.getRecipeGroup(recipeGroupName);
+                        if (recipeGroup == null) {
+                            throw new IllegalArgumentException("Can not find recipe group " + recipeGroupName);
+                        }
+                        recipeGroupEditorMap.getOrDefault(recipeGroup.recipeType(), (player, group, parent) -> {
+                            throw new RuntimeException("Unknown recipe type editor");
+                        }).apply(player, recipeGroup, this).openMenu();
+                        break;
+                    case LEFT:
+                    case SHIFT_LEFT:
+                    default:
+                        RecipeGroup recipeGroup1 = RecipeManager.INSTANCE.getRecipeGroup(recipeGroupName);
+                        if (recipeGroup1 == null) {
+                            throw new IllegalArgumentException("Can not find recipe group " + recipeGroupName);
+                        }
+                        if (recipeGroup1.groupRecipeKeys().size() < 2) {
+                            new RecipeDisplayMenu(
+                                player,
+                                RecipeManager.INSTANCE.getRecipe(recipeGroup1.groupRecipeKeys().get(0)),
+                                this
+                            ).openMenu();
+                        } else {
+                            new RecipeListMenu(
+                                player,
+                                recipeGroup1.groupRecipeKeys(),
+                                this
+                            ).openMenu();
+                        }
+                        break;
+                }
             }
-        });
+        );
         ItemUtil.setLore(icon.display(), Languages.MENU_NEW_RECIPE_LIST_ICON_ELEMENTS_LORE.value(player));
         return icon;
     }
diff --git a/src/main/java/com/github/yufiriamazenta/craftorithm/menu/display/RecipeListMenu.java b/src/main/java/com/github/yufiriamazenta/craftorithm/menu/display/RecipeListMenu.java
index 0780914b..ad9a6f6a 100644
--- a/src/main/java/com/github/yufiriamazenta/craftorithm/menu/display/RecipeListMenu.java
+++ b/src/main/java/com/github/yufiriamazenta/craftorithm/menu/display/RecipeListMenu.java
@@ -66,17 +66,17 @@ public RecipeListMenu(Player player, Collection<NamespacedKey> recipeKeys, Menu
 
     public void nextPage() {
         setPage(Math.min(page + 1, maxPage - 1)).resetIcons();
-        openedInventory.clear();
+        inventoryCache.clear();
         for (Integer slot : slotMap.keySet()) {
-            openedInventory.setItem(slot, slotMap.get(slot).display());
+            inventoryCache.setItem(slot, slotMap.get(slot).display());
         }
     }
 
     public void previousPage() {
         setPage(Math.max(page - 1, 0)).resetIcons();
-        openedInventory.clear();
+        inventoryCache.clear();
         for (Integer slot : slotMap.keySet()) {
-            openedInventory.setItem(slot, slotMap.get(slot).display());
+            inventoryCache.setItem(slot, slotMap.get(slot).display());
         }
     }
 
@@ -92,21 +92,19 @@ private void resetIcons() {
         }
         slotMap.put(46, new Icon(
             Material.PAPER,
-            TextProcessor.color(Languages.MENU_RECIPE_LIST_ICON_PREVIOUS.value(player)),
-            event -> previousPage()
-        ));
+            TextProcessor.color(Languages.MENU_RECIPE_LIST_ICON_PREVIOUS.value(player))
+        ).setClickAction(event -> previousPage()));
         slotMap.put(52, new Icon(
             Material.PAPER,
-            TextProcessor.color(Languages.MENU_RECIPE_LIST_ICON_NEXT.value(player)),
-            event -> nextPage()
-        ));
+            TextProcessor.color(Languages.MENU_RECIPE_LIST_ICON_NEXT.value(player))
+        ).setClickAction(event -> nextPage()));
         int recipeSlot = page * 45;
         for (int i = 0; i < 45 && recipeSlot < recipeList.size(); i++, recipeSlot ++) {
             Recipe recipe = recipeList.get(recipeSlot);
             if (recipe == null)
                 continue;
             ItemStack display = recipe.getResult();
-            slotMap.put(i, new Icon(display, (event -> new RecipeDisplayMenu(player, recipe, this).openMenu())));
+            slotMap.put(i, new Icon(display).setClickAction(event -> new RecipeDisplayMenu(player, recipe, this).openMenu()));
         }
         for (int i = 0; i < 45; i++) {
             if (slotMap.containsKey(i))
diff --git a/src/main/java/com/github/yufiriamazenta/craftorithm/menu/editor/AnvilRecipeGroupEditor.java b/src/main/java/com/github/yufiriamazenta/craftorithm/menu/editor/AnvilRecipeGroupEditor.java
index 75ccf380..d363f942 100644
--- a/src/main/java/com/github/yufiriamazenta/craftorithm/menu/editor/AnvilRecipeGroupEditor.java
+++ b/src/main/java/com/github/yufiriamazenta/craftorithm/menu/editor/AnvilRecipeGroupEditor.java
@@ -135,7 +135,7 @@ public AnvilSourceIcon(int sourceIndex, @NotNull AnvilRecipeSource anvilRecipeSo
                        configWrapper.saveConfig();
                        reloadRecipeGroup();
                        refreshIconLore();
-                       draw(openedInventory);
+                       draw(inventoryCache);
                        break;
                }
             });
@@ -196,7 +196,7 @@ public CostLevelInputPrompt(int sourceIndex, AnvilSourceIcon anvilSourceIcon) {
             anvilRecipeSourceList.get(sourceIndex).costLevel = costLevel;
             anvilSourceIcon.refreshIconLore();
             reloadRecipeGroup();
-            draw(openedInventory);
+            draw(inventoryCache);
             openMenu();
             inConversation = false;
             return null;
diff --git a/src/main/java/com/github/yufiriamazenta/craftorithm/menu/editor/CookingRecipeGroupEditor.java b/src/main/java/com/github/yufiriamazenta/craftorithm/menu/editor/CookingRecipeGroupEditor.java
index 0f0bc9ef..b7e5c65b 100644
--- a/src/main/java/com/github/yufiriamazenta/craftorithm/menu/editor/CookingRecipeGroupEditor.java
+++ b/src/main/java/com/github/yufiriamazenta/craftorithm/menu/editor/CookingRecipeGroupEditor.java
@@ -206,7 +206,7 @@ public TimeInputPrompt(int sourceIndex, CookingSourceIcon cookingRecipeIcon) {
             reloadRecipeGroup();
             cookingRecipeSourceList.get(sourceIndex).cookingTime = cookingTime;
             updateCookingIcon(cookingRecipeIcon, cookingRecipeSourceList.get(sourceIndex));
-            draw(openedInventory);
+            draw(inventoryCache);
             openMenu();
             inConversation = false;
             return null;
@@ -247,7 +247,7 @@ public ExpInputPrompt(int sourceIndex, CookingSourceIcon cookingRecipeIcon) {
             reloadRecipeGroup();
             cookingRecipeSourceList.get(sourceIndex).exp = exp;
             updateCookingIcon(cookingRecipeIcon, cookingRecipeSourceList.get(sourceIndex));
-            draw(openedInventory);
+            draw(inventoryCache);
             openMenu();
             inConversation = false;
             return null;
diff --git a/src/main/java/com/github/yufiriamazenta/craftorithm/menu/editor/RecipeGroupEditor.java b/src/main/java/com/github/yufiriamazenta/craftorithm/menu/editor/RecipeGroupEditor.java
index fc31a4e2..b62da830 100644
--- a/src/main/java/com/github/yufiriamazenta/craftorithm/menu/editor/RecipeGroupEditor.java
+++ b/src/main/java/com/github/yufiriamazenta/craftorithm/menu/editor/RecipeGroupEditor.java
@@ -8,7 +8,6 @@
 import com.github.yufiriamazenta.craftorithm.util.CollectionsUtil;
 import com.github.yufiriamazenta.craftorithm.util.LangUtil;
 import crypticlib.CrypticLib;
-import crypticlib.chat.MessageSender;
 import crypticlib.chat.TextProcessor;
 import crypticlib.config.ConfigWrapper;
 import crypticlib.conversation.Conversation;
@@ -83,7 +82,8 @@ protected Icon getSortIdEditIcon(int slot) {
             Material.OAK_SIGN,
             Languages.MENU_RECIPE_EDITOR_ICON_SORT_ID_NAME.value(player)
                 .replace("<id>", RecipeManager.INSTANCE.getRecipeGroupSortId(recipeGroup.groupName()) + ""),
-            Languages.MENU_RECIPE_EDITOR_ICON_SORT_ID_LORE.value(player),
+            Languages.MENU_RECIPE_EDITOR_ICON_SORT_ID_LORE.value(player)
+        ).setClickAction(
             event -> {
                 new Conversation(
                     Craftorithm.instance(),
@@ -100,7 +100,8 @@ protected Icon getSortIdEditIcon(int slot) {
     protected Icon getRemoveIcon() {
         return new Icon(
             Material.BARRIER,
-            Languages.MENU_RECIPE_EDITOR_ICON_REMOVE_NAME.value(player),
+            Languages.MENU_RECIPE_EDITOR_ICON_REMOVE_NAME.value(player)
+        ).setClickAction(
             event -> {
                 RecipeManager.INSTANCE.removeCraftorithmRecipe(recipeGroup().groupName(), true);
                 player.closeInventory();
@@ -197,11 +198,15 @@ public Icon getFrameIcon() {
     }
 
     public Icon getNextIcon() {
-        return new Icon(Material.PAPER, Languages.MENU_RECIPE_EDITOR_ICON_NEXT.value(player), event -> nextPage());
+        return new Icon(Material.PAPER, Languages.MENU_RECIPE_EDITOR_ICON_NEXT.value(player)).setClickAction(
+            event -> nextPage()
+        );
     }
 
     public Icon getPreviousIcon() {
-        return new Icon(Material.PAPER, Languages.MENU_RECIPE_EDITOR_ICON_PREVIOUS.value(player), event -> previousPage());
+        return new Icon(Material.PAPER, Languages.MENU_RECIPE_EDITOR_ICON_PREVIOUS.value(player)).setClickAction(
+            event -> previousPage()
+        );
     }
 
 }
diff --git a/src/main/java/com/github/yufiriamazenta/craftorithm/menu/editor/UnlockableRecipeGroupEditor.java b/src/main/java/com/github/yufiriamazenta/craftorithm/menu/editor/UnlockableRecipeGroupEditor.java
index 992ba3dd..c4d5f3d6 100644
--- a/src/main/java/com/github/yufiriamazenta/craftorithm/menu/editor/UnlockableRecipeGroupEditor.java
+++ b/src/main/java/com/github/yufiriamazenta/craftorithm/menu/editor/UnlockableRecipeGroupEditor.java
@@ -26,7 +26,8 @@ protected Icon getUnlockIcon() {
         Icon icon = new Icon(
             Material.KNOWLEDGE_BOOK,
             Languages.MENU_RECIPE_EDITOR_ICON_UNLOCK.value(player)
-                .replace("<unlock>", String.valueOf(unlock)),
+                .replace("<unlock>", String.valueOf(unlock))
+        ).setClickAction(
             event -> {
                 unlock = !unlock;
                 recipeGroup.setUnlock(unlock);
diff --git a/src/main/java/com/github/yufiriamazenta/craftorithm/util/LangUtil.java b/src/main/java/com/github/yufiriamazenta/craftorithm/util/LangUtil.java
index f46c398e..48c97d47 100644
--- a/src/main/java/com/github/yufiriamazenta/craftorithm/util/LangUtil.java
+++ b/src/main/java/com/github/yufiriamazenta/craftorithm/util/LangUtil.java
@@ -2,7 +2,7 @@
 
 import com.github.yufiriamazenta.craftorithm.Craftorithm;
 import com.github.yufiriamazenta.craftorithm.config.Languages;
-import crypticlib.chat.MessageSender;
+import crypticlib.chat.MsgSender;
 import crypticlib.lang.entry.StringLangEntry;
 import org.bukkit.Bukkit;
 import org.bukkit.command.CommandSender;
@@ -28,7 +28,7 @@ public static void sendLang(CommandSender receiver, StringLangEntry message, Map
             prefix = Languages.PREFIX.value();
         formatMap.put("<prefix>", prefix);
         formatMap.put("<version>", Craftorithm.instance().getDescription().getVersion());
-        MessageSender.sendMsg(receiver, message, formatMap);
+        MsgSender.sendMsg(receiver, message, formatMap);
     }
 
     public static void info(StringLangEntry message) {