mirror/Slimefun4
mirror/Slimefun4
1
Fork 0
mirror of https://github.com/StarWishsama/Slimefun4.git synced 2024-09-20 03:35:51 +00:00
Code Releases Activity

suggested changes

Browse Source
This commit is contained in:
Jeffrey Kosse 2022-10-18 17:55:23 +02:00
parent 117a867071
commit 3b7bdb059d
4 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/io/github/thebusybiscuit/slimefun4/core/networks/cargo/CargoUtils.java
View File

@ -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

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

@ -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) {

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

@ -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);
}
/**

9
src/main/java/io/github/thebusybiscuit/slimefun4/utils/tags/SlimefunTag.java
View File

@ -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.