From 3b7bdb059d5af59ccc89d860e87518bfd3823a81 Mon Sep 17 00:00:00 2001
From: Jeffrey Kosse <j3fftw@gmail.com>
Date: Tue, 18 Oct 2022 17:55:23 +0200
Subject: [PATCH] suggested changes

---
 .../slimefun4/core/networks/cargo/CargoUtils.java        | 2 +-
 .../implementation/guide/SurvivalSlimefunGuide.java      | 2 +-
 .../items/autocrafters/AbstractAutoCrafter.java          | 2 +-
 .../thebusybiscuit/slimefun4/utils/tags/SlimefunTag.java | 9 +++++----
 4 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/core/networks/cargo/CargoUtils.java b/src/main/java/io/github/thebusybiscuit/slimefun4/core/networks/cargo/CargoUtils.java
index 2f77837ef..ff8da96d0 100644
--- a/src/main/java/io/github/thebusybiscuit/slimefun4/core/networks/cargo/CargoUtils.java
+++ b/src/main/java/io/github/thebusybiscuit/slimefun4/core/networks/cargo/CargoUtils.java
@@ -69,7 +69,7 @@ final class CargoUtils {
         }
 
         Material type = block.getType();
-        return SlimefunTag.CARGO_SUPPORTED_storage_blocks.isTagged(type);
+        return SlimefunTag.CARGO_SUPPORTED_STORAGE_BLOCKS.isTagged(type);
     }
 
     @Nonnull
diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/guide/SurvivalSlimefunGuide.java b/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/guide/SurvivalSlimefunGuide.java
index 2ed6c4530..f8df9ffd2 100644
--- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/guide/SurvivalSlimefunGuide.java
+++ b/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/guide/SurvivalSlimefunGuide.java
@@ -667,7 +667,7 @@ public class SurvivalSlimefunGuide implements SlimefunGuideImplementation {
     private void displayRecipes(Player p, PlayerProfile profile, ChestMenu menu, RecipeDisplayItem sfItem, int page) {
         List<ItemStack> recipes = sfItem.getDisplayRecipes();
 
-        if (!recipes.isEmpty()) {
+        if (recipes != null && !recipes.isEmpty()) {
             menu.addItem(53, null);
 
             if (page == 0) {
diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/autocrafters/AbstractAutoCrafter.java b/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/autocrafters/AbstractAutoCrafter.java
index 16eccc9b5..b09886918 100644
--- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/autocrafters/AbstractAutoCrafter.java
+++ b/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/autocrafters/AbstractAutoCrafter.java
@@ -202,7 +202,7 @@ public abstract class AbstractAutoCrafter extends SlimefunItem implements Energy
     protected boolean isValidInventory(@Nonnull Block block) {
         Material type = block.getType();
 
-        return SlimefunTag.AUTO_CRAFTER_SUPPORTED_STORAGE_blocks.isTagged(type);
+        return SlimefunTag.AUTO_CRAFTER_SUPPORTED_STORAGE_BLOCKS.isTagged(type);
     }
 
     /**
diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/utils/tags/SlimefunTag.java b/src/main/java/io/github/thebusybiscuit/slimefun4/utils/tags/SlimefunTag.java
index 69e0322ae..7962c7b02 100644
--- a/src/main/java/io/github/thebusybiscuit/slimefun4/utils/tags/SlimefunTag.java
+++ b/src/main/java/io/github/thebusybiscuit/slimefun4/utils/tags/SlimefunTag.java
@@ -12,6 +12,7 @@ import java.util.stream.Stream;
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 
+import io.github.thebusybiscuit.slimefun4.implementation.items.autocrafters.AbstractAutoCrafter;
 import org.apache.commons.lang.Validate;
 import org.bukkit.Material;
 import org.bukkit.NamespacedKey;
@@ -265,14 +266,14 @@ public enum SlimefunTag implements Tag<Material> {
     WOOL_CARPETS,
 
     /**
-     * All storage blocks.
+     * All supported storage blocks for the {@link AbstractAutoCrafter}
      */
-    AUTO_CRAFTER_SUPPORTED_STORAGE_blocks,
+    AUTO_CRAFTER_SUPPORTED_STORAGE_BLOCKS,
 
     /**
-     * All blocks with an inventory.
+     * All supported storage blocks for cargo.
      */
-    CARGO_SUPPORTED_storage_blocks,
+    CARGO_SUPPORTED_STORAGE_BLOCKS,
 
     /**
      * All tile entities.