mirror of
https://github.com/StarWishsama/Slimefun4.git
synced 2024-09-20 03:35:51 +00:00
suggested changes
This commit is contained in:
parent
117a867071
commit
3b7bdb059d
@ -69,7 +69,7 @@ final class CargoUtils {
|
|||||||
}
|
}
|
||||||
|
|
||||||
Material type = block.getType();
|
Material type = block.getType();
|
||||||
return SlimefunTag.CARGO_SUPPORTED_storage_blocks.isTagged(type);
|
return SlimefunTag.CARGO_SUPPORTED_STORAGE_BLOCKS.isTagged(type);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Nonnull
|
@Nonnull
|
||||||
|
@ -667,7 +667,7 @@ public class SurvivalSlimefunGuide implements SlimefunGuideImplementation {
|
|||||||
private void displayRecipes(Player p, PlayerProfile profile, ChestMenu menu, RecipeDisplayItem sfItem, int page) {
|
private void displayRecipes(Player p, PlayerProfile profile, ChestMenu menu, RecipeDisplayItem sfItem, int page) {
|
||||||
List<ItemStack> recipes = sfItem.getDisplayRecipes();
|
List<ItemStack> recipes = sfItem.getDisplayRecipes();
|
||||||
|
|
||||||
if (!recipes.isEmpty()) {
|
if (recipes != null && !recipes.isEmpty()) {
|
||||||
menu.addItem(53, null);
|
menu.addItem(53, null);
|
||||||
|
|
||||||
if (page == 0) {
|
if (page == 0) {
|
||||||
|
@ -202,7 +202,7 @@ public abstract class AbstractAutoCrafter extends SlimefunItem implements Energy
|
|||||||
protected boolean isValidInventory(@Nonnull Block block) {
|
protected boolean isValidInventory(@Nonnull Block block) {
|
||||||
Material type = block.getType();
|
Material type = block.getType();
|
||||||
|
|
||||||
return SlimefunTag.AUTO_CRAFTER_SUPPORTED_STORAGE_blocks.isTagged(type);
|
return SlimefunTag.AUTO_CRAFTER_SUPPORTED_STORAGE_BLOCKS.isTagged(type);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -12,6 +12,7 @@ import java.util.stream.Stream;
|
|||||||
import javax.annotation.Nonnull;
|
import javax.annotation.Nonnull;
|
||||||
import javax.annotation.Nullable;
|
import javax.annotation.Nullable;
|
||||||
|
|
||||||
|
import io.github.thebusybiscuit.slimefun4.implementation.items.autocrafters.AbstractAutoCrafter;
|
||||||
import org.apache.commons.lang.Validate;
|
import org.apache.commons.lang.Validate;
|
||||||
import org.bukkit.Material;
|
import org.bukkit.Material;
|
||||||
import org.bukkit.NamespacedKey;
|
import org.bukkit.NamespacedKey;
|
||||||
@ -265,14 +266,14 @@ public enum SlimefunTag implements Tag<Material> {
|
|||||||
WOOL_CARPETS,
|
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.
|
* All tile entities.
|
||||||
|
Loading…
Reference in New Issue
Block a user