mirror of
https://github.com/StarWishsama/Slimefun4.git
synced 2024-09-19 19:25:48 +00:00
[CI Skip] Merge pull request #2898 from svr333/AutoCrafterFollowUp
This commit is contained in:
commit
f6d4d20090
@ -217,6 +217,7 @@ public abstract class AbstractAutoCrafter extends SlimefunItem implements Energy
|
||||
* The {@link AbstractRecipe} to select
|
||||
*/
|
||||
protected void setSelectedRecipe(@Nonnull Block b, @Nullable AbstractRecipe recipe) {
|
||||
Validate.notNull(b, "The Block cannot be null!");
|
||||
BlockState state = PaperLib.getBlockState(b, false).getState();
|
||||
|
||||
if (state instanceof Skull) {
|
||||
@ -438,5 +439,4 @@ public abstract class AbstractAutoCrafter extends SlimefunItem implements Energy
|
||||
public final EnergyNetComponentType getEnergyComponentType() {
|
||||
return EnergyNetComponentType.CONSUMER;
|
||||
}
|
||||
|
||||
}
|
||||
|
@ -4,6 +4,7 @@ import javax.annotation.Nonnull;
|
||||
import javax.annotation.Nullable;
|
||||
import javax.annotation.ParametersAreNonnullByDefault;
|
||||
|
||||
import org.apache.commons.lang.Validate;
|
||||
import org.bukkit.ChatColor;
|
||||
import org.bukkit.Material;
|
||||
import org.bukkit.Sound;
|
||||
@ -53,6 +54,8 @@ public class SlimefunAutoCrafter extends AbstractAutoCrafter {
|
||||
@Override
|
||||
@Nullable
|
||||
public AbstractRecipe getSelectedRecipe(@Nonnull Block b) {
|
||||
Validate.notNull(b, "The Block cannot be null!");
|
||||
|
||||
BlockState state = PaperLib.getBlockState(b, false).getState();
|
||||
|
||||
if (state instanceof Skull) {
|
||||
@ -112,5 +115,4 @@ public class SlimefunAutoCrafter extends AbstractAutoCrafter {
|
||||
SlimefunPlugin.getLocalization().sendMessage(p, "messages.auto-crafting.no-recipes");
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
@ -7,6 +7,7 @@ import java.util.function.Predicate;
|
||||
|
||||
import javax.annotation.Nonnull;
|
||||
|
||||
import org.apache.commons.lang.Validate;
|
||||
import org.bukkit.inventory.ItemStack;
|
||||
|
||||
import io.github.thebusybiscuit.slimefun4.implementation.tasks.AsyncRecipeChoiceTask;
|
||||
@ -52,6 +53,8 @@ class SlimefunItemRecipe extends AbstractRecipe {
|
||||
|
||||
@Override
|
||||
public void show(@Nonnull ChestMenu menu, @Nonnull AsyncRecipeChoiceTask task) {
|
||||
Validate.notNull(menu, "The ChestMenu cannot be null!");
|
||||
Validate.notNull(task, "The RecipeChoiceTask cannot be null!");
|
||||
menu.addItem(24, getResult().clone(), ChestMenuUtils.getEmptyClickHandler());
|
||||
ItemStack[] recipe = item.getRecipe();
|
||||
|
||||
@ -64,5 +67,4 @@ class SlimefunItemRecipe extends AbstractRecipe {
|
||||
public String toString() {
|
||||
return item.getId();
|
||||
}
|
||||
|
||||
}
|
||||
|
@ -177,5 +177,4 @@ public class VanillaAutoCrafter extends AbstractAutoCrafter {
|
||||
|
||||
return recipes;
|
||||
}
|
||||
|
||||
}
|
||||
|
@ -7,6 +7,7 @@ import java.util.function.Predicate;
|
||||
|
||||
import javax.annotation.Nonnull;
|
||||
|
||||
import org.apache.commons.lang.Validate;
|
||||
import org.bukkit.Keyed;
|
||||
import org.bukkit.inventory.ItemStack;
|
||||
import org.bukkit.inventory.Recipe;
|
||||
@ -70,6 +71,9 @@ class VanillaRecipe extends AbstractRecipe {
|
||||
|
||||
@Override
|
||||
public void show(@Nonnull ChestMenu menu, @Nonnull AsyncRecipeChoiceTask task) {
|
||||
Validate.notNull(menu, "The ChestMenu cannot be null!");
|
||||
Validate.notNull(task, "The RecipeChoiceTask cannot be null!");
|
||||
|
||||
menu.replaceExistingItem(24, getResult().clone());
|
||||
menu.addMenuClickHandler(24, ChestMenuUtils.getEmptyClickHandler());
|
||||
|
||||
@ -108,5 +112,4 @@ class VanillaRecipe extends AbstractRecipe {
|
||||
return "invalid-recipe";
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user