更新

src/main/java/io/github/thebusybiscuit/slimefun4/implementation/Slimefun.java

@@ -2,7 +2,6 @@
 
 import city.norain.slimefun4.SlimefunExtended;
 import city.norain.slimefun4.timings.SQLProfiler;
-import city.norain.slimefun4.utils.LangUtil;
 import com.xzavier0722.mc.plugin.slimefun4.chat.PlayerChatCatcher;
 import com.xzavier0722.mc.plugin.slimefun4.storage.migrator.BlockStorageMigrator;
 import com.xzavier0722.mc.plugin.slimefun4.storage.migrator.PlayerProfileMigrator;
@@ -237,8 +236,6 @@ private void onPluginStart() {
         // Check if Paper (<3) is installed
         if (PaperLib.isPaper()) {
             logger.log(Level.INFO, "检测到你正在使用 Paper 服务端! 性能优化已应用.");
-        } else {
-            LangUtil.suggestPaper(this);
         }
 
         // Check if CS-CoreLib is installed (it is no longer needed)

src/main/java/io/github/thebusybiscuit/slimefun4/implementation/guide/CheatSheetSlimefunGuide.java

@@ -43,6 +43,7 @@ public CheatSheetSlimefunGuide() {
      *
      * @return a {@link List} of visible {@link ItemGroup} instances
      */
+    @Nonnull
     @Override
     protected List<ItemGroup> getVisibleItemGroups(@Nonnull Player p, @Nonnull PlayerProfile profile) {
         List<ItemGroup> groups = new LinkedList<>();

src/main/java/io/github/thebusybiscuit/slimefun4/implementation/guide/SurvivalSlimefunGuide.java

@@ -165,7 +165,7 @@ public void openMainMenu(PlayerProfile profile, int page) {
         menu.addMenuClickHandler(46, (pl, slot, item, action) -> {
             int next = page - 1;
 
-            if (next != page && next > 0) {
+            if (next > 0) {
                 openMainMenu(profile, next);
             }
 
@@ -176,7 +176,7 @@ public void openMainMenu(PlayerProfile profile, int page) {
         menu.addMenuClickHandler(52, (pl, slot, item, action) -> {
             int next = page + 1;
 
-            if (next != page && next <= pages) {
+            if (next <= pages) {
                 openMainMenu(profile, next);
             }
 
@@ -251,7 +251,7 @@ public void openItemGroup(PlayerProfile profile, ItemGroup itemGroup, int page)
         menu.addMenuClickHandler(46, (pl, slot, item, action) -> {
             int next = page - 1;
 
-            if (next != page && next > 0) {
+            if (next > 0) {
                 openItemGroup(profile, itemGroup, next);
             }
 
@@ -262,7 +262,7 @@ public void openItemGroup(PlayerProfile profile, ItemGroup itemGroup, int page)
         menu.addMenuClickHandler(52, (pl, slot, item, action) -> {
             int next = page + 1;
 
-            if (next != page && next <= pages) {
+            if (next <= pages) {
                 openItemGroup(profile, itemGroup, next);
             }
 
@@ -439,15 +439,15 @@ private boolean isItemGroupAccessible(Player p, SlimefunItem slimefunItem) {
     @ParametersAreNonnullByDefault
     private boolean isSearchFilterApplicable(SlimefunItem slimefunItem, String searchTerm) {
         String itemName = ChatColor.stripColor(slimefunItem.getItemName()).toLowerCase(Locale.ROOT);
-        return !itemName.isEmpty() && (itemName.equals(searchTerm) || itemName.contains(searchTerm));
+        return !itemName.isEmpty() && itemName.contains(searchTerm);
     }
 
     @Override
     @ParametersAreNonnullByDefault
     public void displayItem(PlayerProfile profile, ItemStack item, int index, boolean addToHistory) {
         Player p = profile.getPlayer();
 
-        if (p == null || item == null || item.getType() == Material.AIR) {
+        if (p == null || item.getType() == Material.AIR) {
             return;
         }
 

src/main/java/io/github/thebusybiscuit/slimefun4/implementation/handlers/SimpleBlockBreakHandler.java

@@ -39,7 +39,7 @@ protected SimpleBlockBreakHandler() {
     public abstract void onBlockBreak(@Nonnull Block b);
 
     @Override
-    public void onPlayerBreak(BlockBreakEvent e, ItemStack item, List<ItemStack> drops) {
+    public void onPlayerBreak(BlockBreakEvent e, @Nonnull ItemStack item, @Nonnull List<ItemStack> drops) {
         onBlockBreak(e.getBlock());
     }
 
@@ -49,7 +49,7 @@ public void onAndroidBreak(AndroidMineEvent e) {
     }
 
     @Override
-    public void onExplode(Block b, List<ItemStack> drops) {
+    public void onExplode(@Nonnull Block b, @Nonnull List<ItemStack> drops) {
         onBlockBreak(b);
     }
 }

src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/RadioactiveItem.java

@@ -18,7 +18,7 @@
  * A quick and easy implementation of {@link SlimefunItem} that also implements the
  * interface {@link Radioactive}.
  * This implementation is {@link NotPlaceable}!
- *
+ * <p>
  * Simply specify a level of {@link Radioactivity} in the constructor.
  *
  * @author TheBusyBiscuit

src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/SimpleSlimefunItem.java

@@ -14,7 +14,7 @@
 /**
  * This is basically a quickstart class for your very first {@link SlimefunItem}.
  * This class easily allows you to add one {@link ItemHandler} to your {@link SlimefunItem}.
- *
+ * <p>
  * You could use an {@link ItemUseHandler} for example to give your {@link SlimefunItem}
  * very basic right-click functionalities.
  *

src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/VanillaItem.java

@@ -14,7 +14,7 @@
  * When a {@link VanillaItem} gets disabled, its {@link ItemState} goes on {@code State.VANILLA} which
  * automatically
  * replace it in the recipes by its vanilla equivalent.
- *
+ * <p>
  * A {@link VanillaItem} is also automatically useable in workbenches.
  *
  * @author TheBusyBiscuit

src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/altar/AltarRecipe.java

@@ -2,8 +2,11 @@
 
 import java.util.ArrayList;
 import java.util.List;
+
+import lombok.Getter;
 import org.bukkit.inventory.ItemStack;
 
+@Getter
 public class AltarRecipe {
 
     private final ItemStack catalyst;
@@ -27,18 +30,6 @@ public AltarRecipe(List<ItemStack> input, ItemStack output) {
         this.output = output;
     }
 
-    public ItemStack getCatalyst() {
-        return this.catalyst;
-    }
-
-    public ItemStack getOutput() {
-        return this.output;
-    }
-
-    public List<ItemStack> getInput() {
-        return this.input;
-    }
-
     @Override
     public boolean equals(Object obj) {
         if (obj instanceof AltarRecipe ar) {

src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/androids/AndroidInstance.java

@@ -1,9 +1,11 @@
 package io.github.thebusybiscuit.slimefun4.implementation.items.androids;
 
+import lombok.Getter;
 import org.bukkit.block.Block;
 
 public class AndroidInstance {
 
+    @Getter
     private final ProgrammableAndroid android;
     private final Block b;
 
@@ -12,10 +14,6 @@ public AndroidInstance(ProgrammableAndroid android, Block b) {
         this.b = b;
     }
 
-    public ProgrammableAndroid getAndroid() {
-        return android;
-    }
-
     public Block getBlock() {
         return b;
     }

src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/androids/AndroidInterface.java

@@ -6,6 +6,8 @@
 import io.github.thebusybiscuit.slimefun4.core.handlers.BlockDispenseHandler;
 import io.github.thebusybiscuit.slimefun4.implementation.handlers.VanillaInventoryDropHandler;
 import io.github.thebusybiscuit.slimefun4.implementation.items.SimpleSlimefunItem;
+
+import javax.annotation.Nonnull;
 import javax.annotation.ParametersAreNonnullByDefault;
 import org.bukkit.block.Dispenser;
 import org.bukkit.inventory.ItemStack;
@@ -28,6 +30,7 @@ public AndroidInterface(ItemGroup itemGroup, SlimefunItemStack item, RecipeType
         addItemHandler(new VanillaInventoryDropHandler<>(Dispenser.class));
     }
 
+    @Nonnull
     @Override
     public BlockDispenseHandler getItemHandler() {
         return (e, d, block, machine) -> e.setCancelled(true);

src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/androids/AndroidType.java

@@ -26,10 +26,6 @@ public enum AndroidType {
      */
     FARMER,
 
-    /**
-     * The {@link AdvancedFarmerAndroid} is an extension of the {@link FarmerAndroid},
-     * it can also harvest plants from ExoticGarden.
-     */
     ADVANCED_FARMER,
 
     /**

src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/androids/WoodcutterAndroid.java

@@ -155,7 +155,7 @@ private void replant(@Nonnull Block block) {
             }
         }
 
-        if (saplingType != null && soilRequirement != null) {
+        if (saplingType != null) {
             if (soilRequirement.test(block.getRelative(BlockFace.DOWN).getType())) {
                 // Replant the block
                 block.setType(saplingType);

src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/androids/menu/AndroidShareMenu.java

@@ -209,7 +209,7 @@ private static void removePlayer(Player owner, OfflinePlayer p, Block android, L
         Optional<String> trustUsers = getSharedUserData(b.getState());
 
         // Checks for old Android
-        if (!trustUsers.isPresent()) {
+        if (trustUsers.isEmpty()) {
             List<String> emptyUsers = new ArrayList<>();
             setSharedUserData(b.getState(), String.valueOf(emptyUsers));
             return emptyUsers;

src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/autocrafters/AbstractAutoCrafter.java

@@ -71,8 +71,6 @@
  */
 public abstract class AbstractAutoCrafter extends SlimefunItem implements EnergyNetComponent {
 
-    private final String WIKI_PAGE = "Auto-Crafter";
-
     private final Map<Block, ItemStack> recipeCache;
 
     /**
@@ -142,6 +140,7 @@ public void onPlayerBreak(BlockBreakEvent e, ItemStack item, List<ItemStack> dro
 
     @Override
     public void postRegister() {
+        String WIKI_PAGE = "Auto-Crafter";
         addWikiPage(WIKI_PAGE);
     }
 

src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/autocrafters/AbstractRecipe.java

@@ -9,6 +9,8 @@
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 import javax.annotation.ParametersAreNonnullByDefault;
+
+import lombok.Getter;
 import me.mrCookieSlime.CSCoreLibPlugin.general.Inventory.ChestMenu;
 import org.apache.commons.lang.Validate;
 import org.bukkit.inventory.ItemStack;
@@ -43,7 +45,14 @@ public abstract class AbstractRecipe {
 
     /**
      * Whether this recipe is enabled.
+     * -- GETTER --
+     *  This returns whether or not this recipe has been enabled.
+     *  A disabled recipe will not be crafted.
+     *
+     * @return Whether this recipe is enabled
+
      */
+    @Getter
     private boolean enabled = true;
 
     /**
@@ -85,16 +94,6 @@ public ItemStack getResult() {
         return result;
     }
 
-    /**
-     * This returns whether or not this recipe has been enabled.
-     * A disabled recipe will not be crafted.
-     *
-     * @return Whether this recipe is enabled
-     */
-    public boolean isEnabled() {
-        return enabled;
-    }
-
     /**
      * This method enables or disables this recipe.
      * A disabled recipe will not be crafted.

src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/autocrafters/SlimefunAutoCrafter.java

@@ -116,7 +116,6 @@ protected void updateRecipe(@Nonnull Block b, @Nonnull Player p) {
                     menu.open(p);
 
                     SoundEffect.AUTO_CRAFTER_UPDATE_RECIPE.playAt(b);
-                    ;
 
                     if (!task.isEmpty()) {
                         task.start(menu.toInventory());

src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/autocrafters/VanillaRecipe.java

@@ -8,6 +8,8 @@
 import java.util.List;
 import java.util.function.Predicate;
 import javax.annotation.Nonnull;
+
+import lombok.Getter;
 import me.mrCookieSlime.CSCoreLibPlugin.general.Inventory.ChestMenu;
 import org.apache.commons.lang.Validate;
 import org.bukkit.Keyed;
@@ -30,6 +32,7 @@
 class VanillaRecipe extends AbstractRecipe {
 
     private final int[] slots = {11, 12, 13, 20, 21, 22, 29, 30, 31};
+    @Getter
     private final Recipe recipe;
 
     VanillaRecipe(@Nonnull ShapelessRecipe recipe) {
@@ -44,10 +47,6 @@ class VanillaRecipe extends AbstractRecipe {
         this.recipe = recipe;
     }
 
-    public Recipe getRecipe() {
-        return recipe;
-    }
-
     @Nonnull
     private static Collection<Predicate<ItemStack>> getChoices(@Nonnull ShapedRecipe recipe) {
         List<Predicate<ItemStack>> choices = new ArrayList<>();
@@ -65,11 +64,6 @@ private static Collection<Predicate<ItemStack>> getChoices(@Nonnull ShapedRecipe
         return choices;
     }
 
-    @Nonnull
-    private static RecipeChoice[] getShape(@Nonnull Recipe recipe) {
-        return Slimefun.getMinecraftRecipeService().getRecipeShape(recipe);
-    }
-
     @Override
     public void show(@Nonnull ChestMenu menu, @Nonnull AsyncRecipeChoiceTask task) {
         Validate.notNull(menu, "The ChestMenu cannot be null!");