diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/multiblocks/miner/ActiveMiner.java b/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/multiblocks/miner/ActiveMiner.java index 958e43578..a74fb86de 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/multiblocks/miner/ActiveMiner.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/multiblocks/miner/ActiveMiner.java @@ -32,6 +32,7 @@ import me.mrCookieSlime.Slimefun.api.Slimefun; * @author TheBusyBiscuit * * @see IndustrialMiner + * @see AdvancedIndustrialMiner * */ class ActiveMiner implements Runnable { diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/multiblocks/miner/AdvancedIndustrialMiner.java b/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/multiblocks/miner/AdvancedIndustrialMiner.java new file mode 100644 index 000000000..ee5cc9416 --- /dev/null +++ b/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/multiblocks/miner/AdvancedIndustrialMiner.java @@ -0,0 +1,34 @@ +package io.github.thebusybiscuit.slimefun4.implementation.items.multiblocks.miner; + +import org.bukkit.Material; +import org.bukkit.inventory.ItemStack; + +import me.mrCookieSlime.Slimefun.Lists.SlimefunItems; +import me.mrCookieSlime.Slimefun.Objects.Category; +import me.mrCookieSlime.Slimefun.Objects.SlimefunItem.abstractItems.MachineFuel; +import me.mrCookieSlime.Slimefun.api.SlimefunItemStack; + +/** + * The {@link AdvancedIndustrialMiner} is a more advanced version of the {@link IndustrialMiner}. + * It uses Silk Touch and has a bigger range. + * + * @author TheBusyBiscuit + * + * @see IndustrialMiner + * @see ActiveMiner + * + */ +public class AdvancedIndustrialMiner extends IndustrialMiner { + + public AdvancedIndustrialMiner(Category category, SlimefunItemStack item) { + super(category, item, Material.DIAMOND_BLOCK, true, 5); + } + + @Override + protected void registerDefaultFuelTypes() { + fuelTypes.add(new MachineFuel(32, new ItemStack(Material.LAVA_BUCKET))); + fuelTypes.add(new MachineFuel(48, SlimefunItems.BUCKET_OF_OIL)); + fuelTypes.add(new MachineFuel(96, SlimefunItems.BUCKET_OF_FUEL)); + } + +} diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/multiblocks/miner/IndustrialMiner.java b/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/multiblocks/miner/IndustrialMiner.java index 40d8bade7..eb0687738 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/multiblocks/miner/IndustrialMiner.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/multiblocks/miner/IndustrialMiner.java @@ -36,6 +36,7 @@ import me.mrCookieSlime.Slimefun.api.SlimefunItemStack; * * @author TheBusyBiscuit * + * @see AdvancedIndustrialMiner * @see ActiveMiner * */ diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/setup/SlimefunItemSetup.java b/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/setup/SlimefunItemSetup.java index 23e2bb2b2..224dd4977 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/setup/SlimefunItemSetup.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/setup/SlimefunItemSetup.java @@ -143,6 +143,7 @@ import io.github.thebusybiscuit.slimefun4.implementation.items.multiblocks.OreWa import io.github.thebusybiscuit.slimefun4.implementation.items.multiblocks.PressureChamber; import io.github.thebusybiscuit.slimefun4.implementation.items.multiblocks.Smeltery; import io.github.thebusybiscuit.slimefun4.implementation.items.multiblocks.TableSaw; +import io.github.thebusybiscuit.slimefun4.implementation.items.multiblocks.miner.AdvancedIndustrialMiner; import io.github.thebusybiscuit.slimefun4.implementation.items.multiblocks.miner.IndustrialMiner; import io.github.thebusybiscuit.slimefun4.implementation.items.seasonal.ChristmasPresent; import io.github.thebusybiscuit.slimefun4.implementation.items.seasonal.EasterEgg; @@ -1024,6 +1025,7 @@ public final class SlimefunItemSetup { new AutomatedPanningMachine(categories.basicMachines).register(plugin); new IndustrialMiner(categories.basicMachines, SlimefunItems.INDUSTRIAL_MINER, Material.IRON_BLOCK, false, 3).register(plugin); + new AdvancedIndustrialMiner(categories.basicMachines, SlimefunItems.ADVANCED_INDUSTRIAL_MINER).register(plugin); new SlimefunItem(categories.magicalArmor, SlimefunItems.BOOTS_OF_THE_STOMPER, RecipeType.ARMOR_FORGE, new ItemStack[] {null, null, null, new ItemStack(Material.YELLOW_WOOL), null, new ItemStack(Material.YELLOW_WOOL), new ItemStack(Material.PISTON), null, new ItemStack(Material.PISTON)})