mirror of
https://github.com/StarWishsama/Slimefun4.git
synced 2024-09-20 11:45:51 +00:00
Implemented tags in more occurences
This commit is contained in:
parent
d63ff915ce
commit
035e35a067
@ -4,12 +4,12 @@ import java.util.concurrent.ThreadLocalRandom;
|
||||
|
||||
import org.bukkit.Material;
|
||||
import org.bukkit.Sound;
|
||||
import org.bukkit.Tag;
|
||||
import org.bukkit.block.Block;
|
||||
import org.bukkit.block.BlockFace;
|
||||
import org.bukkit.inventory.ItemStack;
|
||||
|
||||
import io.github.thebusybiscuit.cscorelib2.collections.RandomizedSet;
|
||||
import io.github.thebusybiscuit.cscorelib2.materials.MaterialCollections;
|
||||
import io.github.thebusybiscuit.slimefun4.api.MinecraftVersion;
|
||||
import io.github.thebusybiscuit.slimefun4.implementation.SlimefunPlugin;
|
||||
import me.mrCookieSlime.Slimefun.Lists.RecipeType;
|
||||
@ -25,7 +25,7 @@ public class FisherAndroid extends ProgrammableAndroid {
|
||||
super(category, tier, item, recipeType, recipe);
|
||||
|
||||
// Fish
|
||||
for (Material fish : MaterialCollections.getAllFishItems()) {
|
||||
for (Material fish : Tag.ITEMS_FISHES.getValues()) {
|
||||
fishingLoot.add(new ItemStack(fish), 25);
|
||||
}
|
||||
|
||||
|
@ -4,7 +4,7 @@ import org.bukkit.Material;
|
||||
import org.bukkit.Tag;
|
||||
import org.bukkit.inventory.ItemStack;
|
||||
|
||||
import io.github.thebusybiscuit.cscorelib2.materials.MaterialCollections;
|
||||
import io.github.thebusybiscuit.slimefun4.utils.tags.SlimefunTag;
|
||||
import me.mrCookieSlime.Slimefun.Lists.RecipeType;
|
||||
import me.mrCookieSlime.Slimefun.Objects.Category;
|
||||
import me.mrCookieSlime.Slimefun.Objects.SlimefunItem.abstractItems.AContainer;
|
||||
@ -22,7 +22,7 @@ public abstract class ElectrifiedCrucible extends AContainer {
|
||||
registerRecipe(8, new ItemStack[] { new ItemStack(Material.BUCKET), new ItemStack(Material.TERRACOTTA, 12) }, new ItemStack[] { new ItemStack(Material.LAVA_BUCKET) });
|
||||
registerRecipe(10, new ItemStack[] { new ItemStack(Material.BUCKET), new ItemStack(Material.OBSIDIAN) }, new ItemStack[] { new ItemStack(Material.LAVA_BUCKET) });
|
||||
|
||||
for (Material terracotta : MaterialCollections.getAllTerracottaColors().getAsArray()) {
|
||||
for (Material terracotta : SlimefunTag.TERRACOTTA.getValues()) {
|
||||
registerRecipe(8, new ItemStack[] { new ItemStack(Material.BUCKET), new ItemStack(terracotta, 12) }, new ItemStack[] { new ItemStack(Material.LAVA_BUCKET) });
|
||||
}
|
||||
|
||||
|
@ -12,7 +12,6 @@ import org.bukkit.block.data.Orientable;
|
||||
import org.bukkit.inventory.ItemStack;
|
||||
|
||||
import io.github.thebusybiscuit.cscorelib2.blocks.Vein;
|
||||
import io.github.thebusybiscuit.cscorelib2.materials.MaterialCollections;
|
||||
import io.github.thebusybiscuit.cscorelib2.protection.ProtectableAction;
|
||||
import io.github.thebusybiscuit.slimefun4.core.attributes.NotPlaceable;
|
||||
import io.github.thebusybiscuit.slimefun4.core.handlers.ItemUseHandler;
|
||||
@ -49,7 +48,7 @@ public class LumberAxe extends SimpleSlimefunItem<ItemUseHandler> implements Not
|
||||
|
||||
private ToolUseHandler onBlockBreak() {
|
||||
return (e, tool, fortune, drops) -> {
|
||||
if (MaterialCollections.getAllLogs().contains(e.getBlock().getType())) {
|
||||
if (Tag.LOGS.isTagged(e.getBlock().getType())) {
|
||||
List<Block> logs = Vein.find(e.getBlock(), MAX_BROKEN, b -> Tag.LOGS.isTagged(b.getType()));
|
||||
|
||||
if (logs.contains(e.getBlock())) {
|
||||
|
@ -4,6 +4,7 @@ import java.util.Collections;
|
||||
import java.util.HashSet;
|
||||
import java.util.Locale;
|
||||
import java.util.Set;
|
||||
import java.util.stream.Stream;
|
||||
|
||||
import javax.annotation.Nonnull;
|
||||
|
||||
@ -44,7 +45,7 @@ public enum SlimefunTag implements Tag<Material> {
|
||||
* Minecraft ores.
|
||||
*/
|
||||
ORES,
|
||||
|
||||
|
||||
/**
|
||||
* All variants of torches, normal, soulfire and redstone.
|
||||
*/
|
||||
@ -199,4 +200,14 @@ public enum SlimefunTag implements Tag<Material> {
|
||||
return getValues().toArray(new Material[0]);
|
||||
}
|
||||
|
||||
/**
|
||||
* This returns a {@link Stream} of {@link Material Materials} for this {@link SlimefunTag}.
|
||||
*
|
||||
* @return A {@link Stream} of {@link Material Materials}
|
||||
*/
|
||||
@Nonnull
|
||||
public Stream<Material> stream() {
|
||||
return getValues().stream();
|
||||
}
|
||||
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user