1.21 support

lijinhong11 · lijinhong11 · commit 6244125294cd · 2025-03-29T13:50:23.000+08:00
diff --git a/pom.xml b/pom.xml
@@ -166,10 +166,11 @@
 			<version>1.18.2-R0.1-SNAPSHOT</version>
 			<scope>provided</scope>
 		</dependency>
+
 		<dependency>
-			<groupId>com.github.Slimefun</groupId>
+			<groupId>.com.github.Slimefun</groupId>
 			<artifactId>Slimefun4</artifactId>
-			<version>RC-37</version>
+			<version>experimental-SNAPSHOT</version>
 			<scope>provided</scope>
 		</dependency>
 		<dependency>
diff --git a/src/main/java/org/lins/mmmjjkx/rykenslimefuncustomizer/listeners/SingleItemRecipeGuideListener.java b/src/main/java/org/lins/mmmjjkx/rykenslimefuncustomizer/listeners/SingleItemRecipeGuideListener.java
@@ -43,7 +43,6 @@
 import org.lins.mmmjjkx.rykenslimefuncustomizer.objects.slimefun.AsyncChanceRecipeTask;
 import org.lins.mmmjjkx.rykenslimefuncustomizer.utils.CommonUtils;
 
-@SuppressWarnings("deprecation")
 public class SingleItemRecipeGuideListener implements Listener {
     private static final NamespacedKey RECIPE_KEY = new NamespacedKey(RykenSlimefunCustomizer.INSTANCE, "rsc_recipe");
     private static final NamespacedKey RECIPE_INDEX_KEY =
@@ -296,7 +295,7 @@ public RecipeMenu(AContainer item, Player p, int index) {
                 rawName = rawName.concat("(" + CommonUtils.formatSeconds(seconds) + "&e)");
             }
 
-            progressBar = new CustomItemStack(progressBar, rawName);
+            progressBar = CustomItemStack.create(progressBar, rawName);
 
             addItem(progressSlot, progressBar, (pl, s, is, action) -> false);
         }
@@ -419,7 +418,7 @@ public TemplateRecipeMenu(CustomTemplateMachine ctm, Player p, int templateIndex
                     rawName = rawName.concat("(" + CommonUtils.formatSeconds(seconds) + "&e)");
                 }
 
-                progressBar = new CustomItemStack(progressBar, rawName);
+                progressBar = CustomItemStack.create(progressBar, rawName);
 
                 addItem(progressSlot, progressBar, (pl, s, is, action) -> false);
             }
@@ -591,7 +590,7 @@ public LinkedRecipeMenu(AContainer item, Player p, int index) {
                 rawName = rawName.concat("(" + CommonUtils.formatSeconds(seconds) + "&e)");
             }
 
-            progressBar = new CustomItemStack(progressBar, rawName);
+            progressBar = CustomItemStack.create(progressBar, rawName);
 
             addItem(progressSlot, progressBar, (pl, s, is, action) -> false);
         }
diff --git a/src/main/java/org/lins/mmmjjkx/rykenslimefuncustomizer/objects/customs/item/RSCItemStack.java b/src/main/java/org/lins/mmmjjkx/rykenslimefuncustomizer/objects/customs/item/RSCItemStack.java
@@ -1,13 +1,14 @@
 package org.lins.mmmjjkx.rykenslimefuncustomizer.objects.customs.item;
 
-import io.github.thebusybiscuit.slimefun4.libraries.dough.items.CustomItemStack;
 import java.util.List;
 import org.bukkit.inventory.ItemStack;
 
 @SuppressWarnings("deprecation")
-public class RSCItemStack extends CustomItemStack {
+public class RSCItemStack {
+    private final ItemStack item;
+
     public RSCItemStack(ItemStack item, String name, List<String> lore) {
-        super(item, meta -> {
+        item.editMeta(meta -> {
             if (name != null && !name.isBlank()) {
                 meta.setDisplayName(name);
             }
@@ -16,5 +17,11 @@ public RSCItemStack(ItemStack item, String name, List<String> lore) {
                 meta.setLore(lore);
             }
         });
+
+        this.item = item;
+    }
+
+    public ItemStack getItem() {
+        return item;
     }
 }
diff --git a/src/main/java/org/lins/mmmjjkx/rykenslimefuncustomizer/objects/customs/machine/CustomGenerator.java b/src/main/java/org/lins/mmmjjkx/rykenslimefuncustomizer/objects/customs/machine/CustomGenerator.java
@@ -151,8 +151,8 @@ private boolean isBucket(ItemStack item) {
         ItemStackWrapper wrapper = ItemStackWrapper.wrap(item);
         return item.getType() == Material.LAVA_BUCKET
                 || item.getType() == Material.WATER_BUCKET
-                || SlimefunUtils.isItemSimilar(wrapper, SlimefunItems.FUEL_BUCKET, true)
-                || SlimefunUtils.isItemSimilar(wrapper, SlimefunItems.OIL_BUCKET, true);
+                || SlimefunUtils.isItemSimilar(wrapper, SlimefunItems.FUEL_BUCKET.item(), true)
+                || SlimefunUtils.isItemSimilar(wrapper, SlimefunItems.OIL_BUCKET.item(), true);
     }
 
     private MachineFuel findRecipe(BlockMenu menu, Map<Integer, Integer> found) {
diff --git a/src/main/java/org/lins/mmmjjkx/rykenslimefuncustomizer/objects/customs/machine/CustomLinkedRecipeMachine.java b/src/main/java/org/lins/mmmjjkx/rykenslimefuncustomizer/objects/customs/machine/CustomLinkedRecipeMachine.java
@@ -48,9 +48,9 @@ public class CustomLinkedRecipeMachine extends AContainer implements RecipeDispl
     private final int saveAmount;
 
     public static final ItemStack RECIPE_INPUT =
-            new CustomItemStack(Material.GREEN_STAINED_GLASS_PANE, "&aMulti-Item Input", "", "&2> &aClick to view");
+            CustomItemStack.create(Material.GREEN_STAINED_GLASS_PANE, "&aMulti-Item Input", "", "&2> &aClick to view");
     public static final ItemStack RECIPE_OUTPUT =
-            new CustomItemStack(Material.GREEN_STAINED_GLASS_PANE, "&aMulti-Item Output", "", "&2> &aClick to view");
+            CustomItemStack.create(Material.GREEN_STAINED_GLASS_PANE, "&aMulti-Item Output", "", "&2> &aClick to view");
 
     @Getter
     @Nullable private final CustomMenu menu;
diff --git a/src/main/java/org/lins/mmmjjkx/rykenslimefuncustomizer/objects/customs/machine/CustomMaterialGenerator.java b/src/main/java/org/lins/mmmjjkx/rykenslimefuncustomizer/objects/customs/machine/CustomMaterialGenerator.java
@@ -99,7 +99,7 @@ private void tick(Block b) {
             } else {
                 if (statusSlot > -1) {
                     blockMenu.replaceExistingItem(
-                            statusSlot, new CustomItemStack(Material.RED_STAINED_GLASS_PANE, "&4No enough energy"));
+                            statusSlot, CustomItemStack.create(Material.RED_STAINED_GLASS_PANE, "&4No enough energy"));
                 }
             }
         }
@@ -166,7 +166,7 @@ public void tick(Block b, SlimefunItem item, Config data) {
 
     @NotNull @Override
     public List<ItemStack> getDisplayRecipes() {
-        ItemStack speed = new CustomItemStack(
+        ItemStack speed = CustomItemStack.create(
                 Material.KNOWLEDGE_BOOK,
                 "&a&lSpeed",
                 Collections.singletonList("&a&lGenerates per &b&l" + tickRate + " &a&lticks once"));
@@ -190,15 +190,15 @@ private void pushItems(BlockMenu blockMenu) {
             if (blockMenu.fits(item, getOutputSlots())) {
                 if (blockMenu.hasViewer() && statusSlot > -1) {
                     blockMenu.replaceExistingItem(
-                            statusSlot, new CustomItemStack(Material.LIME_STAINED_GLASS_PANE, "&aProducing"));
+                            statusSlot, CustomItemStack.create(Material.LIME_STAINED_GLASS_PANE, "&aProducing"));
                 }
                 blockMenu.pushItem(item.clone(), getOutputSlots());
                 removeCharge(b.getLocation(), per);
             } else {
                 if (blockMenu.hasViewer()) {
                     if (statusSlot > -1) {
                         blockMenu.replaceExistingItem(
-                                statusSlot, new CustomItemStack(Material.ORANGE_STAINED_GLASS_PANE, "&c空间不足"));
+                                statusSlot, CustomItemStack.create(Material.ORANGE_STAINED_GLASS_PANE, "&c空间不足"));
                     }
                 }
             }
diff --git a/src/main/java/org/lins/mmmjjkx/rykenslimefuncustomizer/objects/customs/machine/CustomRecipeMachine.java b/src/main/java/org/lins/mmmjjkx/rykenslimefuncustomizer/objects/customs/machine/CustomRecipeMachine.java
@@ -43,9 +43,9 @@ public class CustomRecipeMachine extends AContainer implements RecipeDisplayItem
     private final boolean hideAllRecipes;
 
     public static final ItemStack RECIPE_INPUT =
-            new CustomItemStack(Material.GREEN_STAINED_GLASS_PANE, "&aMulti-Item Input", "", "&2> &aClick to view");
+            CustomItemStack.create(Material.GREEN_STAINED_GLASS_PANE, "&aMulti-Item Input", "", "&2> &aClick to view");
     public static final ItemStack RECIPE_OUTPUT =
-            new CustomItemStack(Material.GREEN_STAINED_GLASS_PANE, "&aMulti-Item Output", "", "&2> &aClick to view");
+            CustomItemStack.create(Material.GREEN_STAINED_GLASS_PANE, "&aMulti-Item Output", "", "&2> &aClick to view");
 
     @Getter
     @Nullable private final CustomMenu menu;
diff --git a/src/main/java/org/lins/mmmjjkx/rykenslimefuncustomizer/objects/customs/machine/CustomWorkbench.java b/src/main/java/org/lins/mmmjjkx/rykenslimefuncustomizer/objects/customs/machine/CustomWorkbench.java
@@ -64,9 +64,9 @@ public void tick(Block block, SlimefunItem slimefunItem, Config config) {
     private final ScriptEval eval;
 
     public static final ItemStack RECIPE_INPUT =
-            new CustomItemStack(Material.GREEN_STAINED_GLASS_PANE, "&aMulti-Item Input", "", "&2> &aClick to view");
+            CustomItemStack.create(Material.GREEN_STAINED_GLASS_PANE, "&aMulti-Item Input", "", "&2> &aClick to view");
     public static final ItemStack RECIPE_OUTPUT =
-            new CustomItemStack(Material.GREEN_STAINED_GLASS_PANE, "&aMulti-Item Output", "", "&2> &aClick to view");
+            CustomItemStack.create(Material.GREEN_STAINED_GLASS_PANE, "&aMulti-Item Output", "", "&2> &aClick to view");
 
     @Getter
     @Nullable private final CustomMenu menu;
diff --git a/src/main/java/org/lins/mmmjjkx/rykenslimefuncustomizer/objects/customs/machine/sf/AdvancedAnimalGrowthAccelerator.java b/src/main/java/org/lins/mmmjjkx/rykenslimefuncustomizer/objects/customs/machine/sf/AdvancedAnimalGrowthAccelerator.java
@@ -17,7 +17,7 @@
 import org.bukkit.inventory.ItemStack;
 
 public class AdvancedAnimalGrowthAccelerator extends AbstractGrowthAccelerator {
-    private static final ItemStack organicFood = ItemStackWrapper.wrap(SlimefunItems.ORGANIC_FOOD);
+    private static final ItemStack organicFood = ItemStackWrapper.wrap(SlimefunItems.ORGANIC_FOOD.item());
 
     private final int capacity;
     private final int radius;
diff --git a/src/main/java/org/lins/mmmjjkx/rykenslimefuncustomizer/objects/customs/machine/sf/AdvancedAutoAnvil.java b/src/main/java/org/lins/mmmjjkx/rykenslimefuncustomizer/objects/customs/machine/sf/AdvancedAutoAnvil.java
@@ -28,7 +28,7 @@ protected MachineRecipe findNextRecipe(BlockMenu menu) {
             ItemStack ductTape = menu.getItemInSlot(slot == this.getInputSlots()[0] ? this.getInputSlots()[1] : this.getInputSlots()[0]);
             ItemStack item = menu.getItemInSlot(slot);
             if (item != null && item.getType().getMaxDurability() > 0 && ((Damageable)item.getItemMeta()).getDamage() > 0) {
-                if (SlimefunUtils.isItemSimilar(ductTape, SlimefunItems.DUCT_TAPE, true, false)) {
+                if (SlimefunUtils.isItemSimilar(ductTape, SlimefunItems.DUCT_TAPE.item(), true, false)) {
                     ItemStack repairedItem = this.repair(item);
                     if (!menu.fits(repairedItem, this.getOutputSlots())) {
                         return null;
diff --git a/src/main/java/org/lins/mmmjjkx/rykenslimefuncustomizer/objects/customs/machine/sf/AdvancedTreeGrowthAccelerator.java b/src/main/java/org/lins/mmmjjkx/rykenslimefuncustomizer/objects/customs/machine/sf/AdvancedTreeGrowthAccelerator.java
@@ -22,7 +22,7 @@
 import org.bukkit.inventory.ItemStack;
 
 public class AdvancedTreeGrowthAccelerator extends AbstractGrowthAccelerator {
-    private static final ItemStack organicFertilizer = ItemStackWrapper.wrap(SlimefunItems.FERTILIZER);
+    private static final ItemStack organicFertilizer = ItemStackWrapper.wrap(SlimefunItems.FERTILIZER.item());
 
     private final int capacity;
     private final int radius;
diff --git a/src/main/java/org/lins/mmmjjkx/rykenslimefuncustomizer/objects/slimefun/AdvancedNestedItemGroup.java b/src/main/java/org/lins/mmmjjkx/rykenslimefuncustomizer/objects/slimefun/AdvancedNestedItemGroup.java
@@ -9,7 +9,6 @@
 import io.github.thebusybiscuit.slimefun4.core.services.sounds.SoundEffect;
 import io.github.thebusybiscuit.slimefun4.implementation.Slimefun;
 import io.github.thebusybiscuit.slimefun4.implementation.guide.SurvivalSlimefunGuide;
-import io.github.thebusybiscuit.slimefun4.libraries.dough.items.CustomItemStack;
 import io.github.thebusybiscuit.slimefun4.utils.ChestMenuUtils;
 import java.util.ArrayList;
 import java.util.List;
@@ -29,7 +28,7 @@ public class AdvancedNestedItemGroup extends NestedItemGroup {
     public AdvancedNestedItemGroup(NamespacedKey key, ItemStack item, int tier) {
         super(key, item, tier);
 
-        ExceptionHandler.debugLog("创建物品组: " + key);
+        ExceptionHandler.debugLog("Creating AdvancedNestedItemGroup with key: " + key);
 
         subGroups = new ArrayList<>();
     }
@@ -51,7 +50,6 @@ public void removeSubGroup(@Nonnull SubItemGroup group) {
         this.subGroups.remove(group);
     }
 
-    @SuppressWarnings("deprecation")
     private void setup(Player p, PlayerProfile profile, SlimefunGuideMode mode, int page) {
         GuideHistory history = profile.getGuideHistory();
         if (mode == SlimefunGuideMode.SURVIVAL_MODE) {
@@ -68,8 +66,8 @@ private void setup(Player p, PlayerProfile profile, SlimefunGuideMode mode, int
         guide.createHeader(p, profile, menu);
         menu.addItem(
                 1,
-                new CustomItemStack(ChestMenuUtils.getBackButton(
-                        p, "", ChatColor.GRAY + Slimefun.getLocalization().getMessage(p, "guide.back.guide"))));
+                ChestMenuUtils.getBackButton(
+                        p, "", ChatColor.GRAY + Slimefun.getLocalization().getMessage(p, "guide.back.guide")));
         menu.addMenuClickHandler(1, (pl, s, is, action) -> {
             SlimefunGuide.openMainMenu(profile, mode, history.getMainMenuPage());
             return false;
diff --git a/src/main/java/org/lins/mmmjjkx/rykenslimefuncustomizer/objects/yaml/item/FoodReader.java b/src/main/java/org/lins/mmmjjkx/rykenslimefuncustomizer/objects/yaml/item/FoodReader.java
@@ -98,7 +98,7 @@ private void nbtApply(String s, ConfigurationSection section, SlimefunItemStack
         final float finalSaturation = saturation;
         final float finalEatSeconds = eatseconds;
 
-        NBT.modify(sfis, nbt -> {
+        NBT.modify((ItemStack) CommonUtils.DELEGATE.get(sfis), nbt -> {
             nbt.setInteger("nutrition", finalNutrition);
             nbt.setFloat("saturation", finalSaturation);
             nbt.setBoolean("can_always_eat", alwaysEatable);
diff --git a/src/main/java/org/lins/mmmjjkx/rykenslimefuncustomizer/objects/yaml/item/GeoResourceReader.java b/src/main/java/org/lins/mmmjjkx/rykenslimefuncustomizer/objects/yaml/item/GeoResourceReader.java
@@ -106,16 +106,16 @@ public GEOResource readEach(String s) {
                             if (split.length == 2) {
                                 int min = Integer.parseInt(split[0]);
                                 int max = Integer.parseInt(split[1]);
-                                DropFromBlock.addDrop(material, new DropFromBlock.Drop(sfis, chance, addon, min, max));
+                                DropFromBlock.addDrop(material, new DropFromBlock.Drop(sfis.item(), chance, addon, min, max));
                             } else {
                                 ExceptionHandler.handleError("Found an error while loading the geo resource " + s
                                         + " in addon " + addon.getAddonId()
                                         + ": Invalid drop amount range format! The amount will using 1 instead.");
-                                DropFromBlock.addDrop(material, new DropFromBlock.Drop(sfis, chance, addon));
+                                DropFromBlock.addDrop(material, new DropFromBlock.Drop(sfis.item(), chance, addon));
                             }
                         }
                     } else {
-                        DropFromBlock.addDrop(material, new DropFromBlock.Drop(sfis, chance, addon, amount, amount));
+                        DropFromBlock.addDrop(material, new DropFromBlock.Drop(sfis.item(), chance, addon, amount, amount));
                     }
                 } else {
                     ExceptionHandler.handleError("在附属" + addon.getAddonId() + "中加载自然资源" + s + "时遇到了问题: " + "指定掉落方块材料类型"
@@ -184,7 +184,7 @@ public String getName() {
 
             @NotNull @Override
             public ItemStack getItem() {
-                return item;
+                return item.item();
             }
 
             @Override
diff --git a/src/main/java/org/lins/mmmjjkx/rykenslimefuncustomizer/objects/yaml/item/ItemReader.java b/src/main/java/org/lins/mmmjjkx/rykenslimefuncustomizer/objects/yaml/item/ItemReader.java
@@ -109,7 +109,7 @@ public SlimefunItem readEach(String s) {
                 return null;
             }
 
-            CommonUtils.addLore(sfis, true, CMIChatColor.translate("&8⇨ &e⚡ &70 / " + energyCapacity + " J"));
+            CommonUtils.addLore((ItemStack) CommonUtils.DELEGATE.get(sfis), true, CMIChatColor.translate("&8⇨ &e⚡ &70 / " + energyCapacity + " J"));
 
             instance = new CustomEnergyItem(group.getSecondValue(), sfis, rt, itemStacks, (float) energyCapacity, eval);
         } else if (section.getBoolean("placeable", false)) {
@@ -229,16 +229,16 @@ public SlimefunItem readEach(String s) {
                         if (split.length == 2) {
                             int min = Integer.parseInt(split[0]);
                             int max = Integer.parseInt(split[1]);
-                            DropFromBlock.addDrop(material, new DropFromBlock.Drop(sfis, chance, addon, min, max));
+                            DropFromBlock.addDrop(material, new DropFromBlock.Drop(sfis.item(), chance, addon, min, max));
                         } else {
                             ExceptionHandler.handleError("Found an error while loading item " + s + " in addon "
                                     + addon.getAddonId() + ": " + "Invalid drop amount range '" + between
                                     + "' The drop amount will use 1 instead.");
-                            DropFromBlock.addDrop(material, new DropFromBlock.Drop(sfis, chance, addon));
+                            DropFromBlock.addDrop(material, new DropFromBlock.Drop(sfis.item(), chance, addon));
                         }
                     }
                 } else {
-                    DropFromBlock.addDrop(material, new DropFromBlock.Drop(sfis, chance, addon, amount, amount));
+                    DropFromBlock.addDrop(material, new DropFromBlock.Drop(sfis.item(), chance, addon, amount, amount));
                 }
             } else {
                 ExceptionHandler.handleError("Found an error while loading item " + s + " in addon "
@@ -295,7 +295,7 @@ private SlimefunItem setupRadiationItem(
 
         boolean energy = section.contains("energy_capacity");
 
-        CommonUtils.addLore(original, true, CMIChatColor.translate(radioactivity.getLore()));
+        CommonUtils.addLore((ItemStack) CommonUtils.DELEGATE.get(original), true, CMIChatColor.translate(radioactivity.getLore()));
 
         BaseRadiationItem instance;
 
@@ -379,16 +379,16 @@ private SlimefunItem setupRadiationItem(
                         if (split.length == 2) {
                             int min = Integer.parseInt(split[0]);
                             int max = Integer.parseInt(split[1]);
-                            DropFromBlock.addDrop(material, new DropFromBlock.Drop(original, chance, addon, min, max));
+                            DropFromBlock.addDrop(material, new DropFromBlock.Drop(original.item(), chance, addon, min, max));
                         } else {
                             ExceptionHandler.handleError("Found an error while loading item " + id + " in addon "
                                     + addon.getAddonId() + ": " + "Invalid drop amount range '" + between
                                     + "' The drop amount will use 1 instead.");
-                            DropFromBlock.addDrop(material, new DropFromBlock.Drop(original, chance, addon));
+                            DropFromBlock.addDrop(material, new DropFromBlock.Drop(original.item(), chance, addon));
                         }
                     }
                 } else {
-                    DropFromBlock.addDrop(material, new DropFromBlock.Drop(original, chance, addon, amount, amount));
+                    DropFromBlock.addDrop(material, new DropFromBlock.Drop(original.item(), chance, addon, amount, amount));
                 }
             } else {
                 ExceptionHandler.handleError("Found an error while loading item " + id + " in addon "
diff --git a/src/main/java/org/lins/mmmjjkx/rykenslimefuncustomizer/objects/yaml/item/MobDropsReader.java b/src/main/java/org/lins/mmmjjkx/rykenslimefuncustomizer/objects/yaml/item/MobDropsReader.java
@@ -3,7 +3,6 @@
 import io.github.thebusybiscuit.slimefun4.api.items.ItemGroup;
 import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItemStack;
 import io.github.thebusybiscuit.slimefun4.libraries.dough.collections.Pair;
-import io.github.thebusybiscuit.slimefun4.libraries.dough.items.CustomItemStack;
 import java.util.List;
 import net.kyori.adventure.text.Component;
 import net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer;
@@ -78,7 +77,8 @@ public CustomMobDrop readEach(String s) {
                     .append(LegacyComponentSerializer.legacyAmpersand()
                             .deserialize(" &awill have a chance of &b" + chance + "% &ato drop"));
 
-            ItemStack itemStack = new CustomItemStack(eggMaterial, meta -> {
+            ItemStack itemStack = new ItemStack(eggMaterial);
+            itemStack.editMeta(meta -> {
                 meta.setDisplayName(entityType.toString());
                 meta.lore(List.of(lore));
             });
diff --git a/src/main/java/org/lins/mmmjjkx/rykenslimefuncustomizer/objects/yaml/machine/TemplateMachineReader.java b/src/main/java/org/lins/mmmjjkx/rykenslimefuncustomizer/objects/yaml/machine/TemplateMachineReader.java
@@ -133,8 +133,7 @@ private List<MachineTemplate> readTemplates(
             SlimefunItemStack item = getPreloadItem(key) == null
                     ? SlimefunItem.getById(key) == null
                             ? null
-                            : ((SlimefunItemStack)
-                                    SlimefunItem.getById(key).getItem().clone())
+                            : new SlimefunItemStack(key, SlimefunItem.getById(key).getItem().clone())
                     : getPreloadItem(key);
 
             if (item == null) {
@@ -146,7 +145,7 @@ private List<MachineTemplate> readTemplates(
 
             List<CustomMachineRecipe> recipes =
                     readRecipes(s, inputSize, outputSize, section.getConfigurationSection(key), addon);
-            list.add(new MachineTemplate(item, recipes));
+            list.add(new MachineTemplate(item.item(), recipes));
         }
 
         return list;
diff --git a/src/main/java/org/lins/mmmjjkx/rykenslimefuncustomizer/utils/BlockMenuUtil.java b/src/main/java/org/lins/mmmjjkx/rykenslimefuncustomizer/utils/BlockMenuUtil.java
diff --git a/src/main/java/org/lins/mmmjjkx/rykenslimefuncustomizer/utils/CommonUtils.java b/src/main/java/org/lins/mmmjjkx/rykenslimefuncustomizer/utils/CommonUtils.java

Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,6 @@`
`43`	`43`	`import org.lins.mmmjjkx.rykenslimefuncustomizer.objects.slimefun.AsyncChanceRecipeTask;`
`44`	`44`	`import org.lins.mmmjjkx.rykenslimefuncustomizer.utils.CommonUtils;`
`45`	`45`
`46`		`-@SuppressWarnings("deprecation")`
`47`	`46`	`public class SingleItemRecipeGuideListener implements Listener {`
`48`	`47`	`private static final NamespacedKey RECIPE_KEY = new NamespacedKey(RykenSlimefunCustomizer.INSTANCE, "rsc_recipe");`
`49`	`48`	`private static final NamespacedKey RECIPE_INDEX_KEY =`
`@@ -296,7 +295,7 @@ public RecipeMenu(AContainer item, Player p, int index) {`
`296`	`295`	`rawName = rawName.concat("(" + CommonUtils.formatSeconds(seconds) + "&e)");`
`297`	`296`	`}`
`298`	`297`
`299`		`- progressBar = new CustomItemStack(progressBar, rawName);`
	`298`	`+ progressBar = CustomItemStack.create(progressBar, rawName);`
`300`	`299`
`301`	`300`	`addItem(progressSlot, progressBar, (pl, s, is, action) -> false);`
`302`	`301`	`}`
`@@ -419,7 +418,7 @@ public TemplateRecipeMenu(CustomTemplateMachine ctm, Player p, int templateIndex`
`419`	`418`	`rawName = rawName.concat("(" + CommonUtils.formatSeconds(seconds) + "&e)");`
`420`	`419`	`}`
`421`	`420`
`422`		`- progressBar = new CustomItemStack(progressBar, rawName);`
	`421`	`+ progressBar = CustomItemStack.create(progressBar, rawName);`
`423`	`422`
`424`	`423`	`addItem(progressSlot, progressBar, (pl, s, is, action) -> false);`
`425`	`424`	`}`
`@@ -591,7 +590,7 @@ public LinkedRecipeMenu(AContainer item, Player p, int index) {`
`591`	`590`	`rawName = rawName.concat("(" + CommonUtils.formatSeconds(seconds) + "&e)");`
`592`	`591`	`}`
`593`	`592`
`594`		`- progressBar = new CustomItemStack(progressBar, rawName);`
	`593`	`+ progressBar = CustomItemStack.create(progressBar, rawName);`
`595`	`594`
`596`	`595`	`addItem(progressSlot, progressBar, (pl, s, is, action) -> false);`
`597`	`596`	`}`
Original file line number	Diff line number	Diff line change
`@@ -99,7 +99,7 @@ private void tick(Block b) {`
`99`	`99`	`} else {`
`100`	`100`	`if (statusSlot > -1) {`
`101`	`101`	`blockMenu.replaceExistingItem(`
`102`		`- statusSlot, new CustomItemStack(Material.RED_STAINED_GLASS_PANE, "&4No enough energy"));`
	`102`	`+ statusSlot, CustomItemStack.create(Material.RED_STAINED_GLASS_PANE, "&4No enough energy"));`
`103`	`103`	`}`
`104`	`104`	`}`
`105`	`105`	`}`
`@@ -166,7 +166,7 @@ public void tick(Block b, SlimefunItem item, Config data) {`
`166`	`166`
`167`	`167`	`@NotNull @Override`
`168`	`168`	`public List<ItemStack> getDisplayRecipes() {`
`169`		`- ItemStack speed = new CustomItemStack(`
	`169`	`+ ItemStack speed = CustomItemStack.create(`
`170`	`170`	`Material.KNOWLEDGE_BOOK,`
`171`	`171`	`"&a&lSpeed",`
`172`	`172`	`Collections.singletonList("&a&lGenerates per &b&l" + tickRate + " &a&lticks once"));`
`@@ -190,15 +190,15 @@ private void pushItems(BlockMenu blockMenu) {`
`190`	`190`	`if (blockMenu.fits(item, getOutputSlots())) {`
`191`	`191`	`if (blockMenu.hasViewer() && statusSlot > -1) {`
`192`	`192`	`blockMenu.replaceExistingItem(`
`193`		`- statusSlot, new CustomItemStack(Material.LIME_STAINED_GLASS_PANE, "&aProducing"));`
	`193`	`+ statusSlot, CustomItemStack.create(Material.LIME_STAINED_GLASS_PANE, "&aProducing"));`
`194`	`194`	`}`
`195`	`195`	`blockMenu.pushItem(item.clone(), getOutputSlots());`
`196`	`196`	`removeCharge(b.getLocation(), per);`
`197`	`197`	`} else {`
`198`	`198`	`if (blockMenu.hasViewer()) {`
`199`	`199`	`if (statusSlot > -1) {`
`200`	`200`	`blockMenu.replaceExistingItem(`
`201`		`- statusSlot, new CustomItemStack(Material.ORANGE_STAINED_GLASS_PANE, "&c空间不足"));`
	`201`	`+ statusSlot, CustomItemStack.create(Material.ORANGE_STAINED_GLASS_PANE, "&c空间不足"));`
`202`	`202`	`}`
`203`	`203`	`}`
`204`	`204`	`}`