From f2eeadb24bb5e507cfba7f7ff1f99b2e28c321ab Mon Sep 17 00:00:00 2001 From: TheBusyBiscuit Date: Wed, 9 Sep 2020 13:18:43 +0200 Subject: [PATCH] [CI skip] Some minor changes --- pom.xml | 1 + .../slimefun4/implementation/items/blocks/Composter.java | 6 +++--- .../slimefun4/implementation/items/blocks/Crucible.java | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/pom.xml b/pom.xml index 93ef224f4..a058ba564 100644 --- a/pom.xml +++ b/pom.xml @@ -30,6 +30,7 @@ thebusybiscuit-github https://sonarcloud.io DEBUG + src/main/java/me/mrCookieSlime/Slimefun/bstats/bukkit/Metrics.java target/site/jacoco/jacoco.xml diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/blocks/Composter.java b/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/blocks/Composter.java index 43ac95fc8..dfe498fca 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/blocks/Composter.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/blocks/Composter.java @@ -8,6 +8,7 @@ import org.bukkit.Effect; import org.bukkit.Location; 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.block.BlockState; @@ -17,7 +18,6 @@ import org.bukkit.inventory.Inventory; import org.bukkit.inventory.ItemStack; import io.github.thebusybiscuit.cscorelib2.inventory.InvUtils; -import io.github.thebusybiscuit.cscorelib2.materials.MaterialCollections; import io.github.thebusybiscuit.cscorelib2.protection.ProtectableAction; import io.github.thebusybiscuit.cscorelib2.scheduling.TaskQueue; import io.github.thebusybiscuit.slimefun4.core.attributes.RecipeDisplayItem; @@ -50,12 +50,12 @@ public class Composter extends SimpleSlimefunItem implements Re private List getMachineRecipes() { List items = new LinkedList<>(); - for (Material leave : MaterialCollections.getAllLeaves()) { + for (Material leave : Tag.LEAVES.getValues()) { items.add(new ItemStack(leave, 8)); items.add(new ItemStack(Material.DIRT)); } - for (Material sapling : MaterialCollections.getAllSaplings()) { + for (Material sapling : Tag.SAPLINGS.getValues()) { items.add(new ItemStack(sapling, 8)); items.add(new ItemStack(Material.DIRT)); } diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/blocks/Crucible.java b/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/blocks/Crucible.java index b87d1cfe6..b7e490b6a 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/blocks/Crucible.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/blocks/Crucible.java @@ -60,7 +60,7 @@ public class Crucible extends SimpleSlimefunItem implements Rec items.add(new ItemStack(Material.TERRACOTTA, 12)); items.add(new ItemStack(Material.LAVA_BUCKET)); - for (Material leave : MaterialCollections.getAllLeaves()) { + for (Material leave : Tag.LEAVES.getValues()) { items.add(new ItemStack(leave, 16)); items.add(new ItemStack(Material.WATER_BUCKET)); }