mirror of
https://github.com/StarWishsama/Slimefun4.git
synced 2024-09-19 19:25:48 +00:00
Merge branch 'master' of https://github.com/Slimefun/Slimefun4.git
This commit is contained in:
commit
c099f0bed4
@ -73,6 +73,8 @@
|
||||
* Fixed #2412
|
||||
* Fixed #2238
|
||||
* Fixed #2439
|
||||
* Fixed #2420
|
||||
* Fixed #2422
|
||||
|
||||
## Release Candidate 16 (07 Sep 2020)
|
||||
https://thebusybiscuit.github.io/builds/TheBusyBiscuit/Slimefun4/stable/#16
|
||||
|
@ -0,0 +1,41 @@
|
||||
package io.github.thebusybiscuit.slimefun4.implementation.items.food;
|
||||
|
||||
import io.github.thebusybiscuit.slimefun4.core.handlers.ItemUseHandler;
|
||||
import io.github.thebusybiscuit.slimefun4.implementation.items.SimpleSlimefunItem;
|
||||
import me.mrCookieSlime.Slimefun.Lists.RecipeType;
|
||||
import me.mrCookieSlime.Slimefun.Objects.Category;
|
||||
import me.mrCookieSlime.Slimefun.Objects.SlimefunItem.SlimefunItem;
|
||||
import me.mrCookieSlime.Slimefun.api.SlimefunItemStack;
|
||||
import org.bukkit.block.Block;
|
||||
import org.bukkit.inventory.ItemStack;
|
||||
|
||||
import javax.annotation.Nonnull;
|
||||
import javax.annotation.ParametersAreNonnullByDefault;
|
||||
import java.util.Optional;
|
||||
|
||||
/**
|
||||
* This {@link SlimefunItem} can be obtained by crafting, it's
|
||||
* used for various foods and recipes
|
||||
*
|
||||
* @author TheSilentPro
|
||||
*/
|
||||
public class HeavyCream extends SimpleSlimefunItem<ItemUseHandler> {
|
||||
|
||||
@ParametersAreNonnullByDefault
|
||||
public HeavyCream(Category category, SlimefunItemStack item, RecipeType recipeType, ItemStack[] recipe, ItemStack recipeOutput) {
|
||||
super(category, item, recipeType, recipe, recipeOutput);
|
||||
}
|
||||
|
||||
@Nonnull
|
||||
@Override
|
||||
public ItemUseHandler getItemHandler() {
|
||||
return e -> {
|
||||
Optional<Block> block = e.getClickedBlock();
|
||||
|
||||
if (!block.isPresent() || !block.get().getType().isInteractable()) {
|
||||
e.cancel();
|
||||
}
|
||||
};
|
||||
}
|
||||
|
||||
}
|
@ -1,17 +1,24 @@
|
||||
package io.github.thebusybiscuit.slimefun4.implementation.items.misc;
|
||||
|
||||
import org.bukkit.Tag;
|
||||
import org.bukkit.block.Block;
|
||||
import org.bukkit.entity.Piglin;
|
||||
import org.bukkit.inventory.ItemStack;
|
||||
|
||||
import io.github.thebusybiscuit.slimefun4.api.items.ItemSetting;
|
||||
import io.github.thebusybiscuit.slimefun4.api.items.settings.IntRangeSetting;
|
||||
import io.github.thebusybiscuit.slimefun4.core.handlers.ItemUseHandler;
|
||||
import io.github.thebusybiscuit.slimefun4.core.attributes.PiglinBarterDrop;
|
||||
import io.github.thebusybiscuit.slimefun4.implementation.items.SimpleSlimefunItem;
|
||||
import io.github.thebusybiscuit.slimefun4.implementation.items.magical.VillagerRune;
|
||||
import me.mrCookieSlime.Slimefun.Lists.RecipeType;
|
||||
import me.mrCookieSlime.Slimefun.Objects.Category;
|
||||
import me.mrCookieSlime.Slimefun.Objects.SlimefunItem.SlimefunItem;
|
||||
import me.mrCookieSlime.Slimefun.api.SlimefunItemStack;
|
||||
|
||||
import javax.annotation.Nonnull;
|
||||
import java.util.Optional;
|
||||
|
||||
/**
|
||||
* This {@link SlimefunItem} can only be obtained via bartering with a {@link Piglin}, its
|
||||
* only current uses is the recipe for crafting the {@link VillagerRune}.
|
||||
@ -22,7 +29,7 @@ import me.mrCookieSlime.Slimefun.api.SlimefunItemStack;
|
||||
* @see PiglinBarterDrop
|
||||
*
|
||||
*/
|
||||
public class StrangeNetherGoo extends SlimefunItem implements PiglinBarterDrop {
|
||||
public class StrangeNetherGoo extends SimpleSlimefunItem<ItemUseHandler> implements PiglinBarterDrop {
|
||||
|
||||
private final ItemSetting<Integer> chance = new IntRangeSetting("barter-chance", 0, 7, 100);
|
||||
|
||||
@ -37,4 +44,16 @@ public class StrangeNetherGoo extends SlimefunItem implements PiglinBarterDrop {
|
||||
return chance.getValue();
|
||||
}
|
||||
|
||||
@Nonnull
|
||||
@Override
|
||||
public ItemUseHandler getItemHandler() {
|
||||
return e -> {
|
||||
Optional<Block> block = e.getClickedBlock();
|
||||
|
||||
if (block.isPresent() && Tag.SIGNS.isTagged(block.get().getType())) {
|
||||
e.cancel();
|
||||
}
|
||||
};
|
||||
}
|
||||
|
||||
}
|
||||
|
@ -114,6 +114,7 @@ import io.github.thebusybiscuit.slimefun4.implementation.items.food.Juice;
|
||||
import io.github.thebusybiscuit.slimefun4.implementation.items.food.MagicSugar;
|
||||
import io.github.thebusybiscuit.slimefun4.implementation.items.food.MeatJerky;
|
||||
import io.github.thebusybiscuit.slimefun4.implementation.items.food.MonsterJerky;
|
||||
import io.github.thebusybiscuit.slimefun4.implementation.items.food.HeavyCream;
|
||||
import io.github.thebusybiscuit.slimefun4.implementation.items.geo.GEOMiner;
|
||||
import io.github.thebusybiscuit.slimefun4.implementation.items.geo.GEOScanner;
|
||||
import io.github.thebusybiscuit.slimefun4.implementation.items.geo.OilPump;
|
||||
@ -907,7 +908,7 @@ public final class SlimefunItemSetup {
|
||||
new ItemStack[] {new ItemStack(Material.SAND, 2), null, null, null, null, null, null, null, null})
|
||||
.register(plugin);
|
||||
|
||||
new SlimefunItem(categories.misc, SlimefunItems.HEAVY_CREAM, RecipeType.ENHANCED_CRAFTING_TABLE,
|
||||
new HeavyCream(categories.misc, SlimefunItems.HEAVY_CREAM, RecipeType.ENHANCED_CRAFTING_TABLE,
|
||||
new ItemStack[] {new ItemStack(Material.MILK_BUCKET), null, null, null, null, null, null, null, null},
|
||||
new SlimefunItemStack(SlimefunItems.HEAVY_CREAM, 2))
|
||||
.register(plugin);
|
||||
|
Loading…
Reference in New Issue
Block a user