From 2ff24c2889601dbfc7ef12e1d5cc0ee98cd5fbba Mon Sep 17 00:00:00 2001 From: TheBusyBiscuit Date: Thu, 17 Dec 2020 19:45:43 +0100 Subject: [PATCH] Fixed compilation --- .../implementation/handlers/SimpleBlockBreakHandler.java | 8 ++++---- .../implementation/items/altar/AncientPedestal.java | 2 +- .../implementation/items/blocks/HologramProjector.java | 7 ++----- .../implementation/items/cargo/AbstractFilterNode.java | 2 +- .../implementation/items/cargo/CargoManager.java | 2 +- .../implementation/items/cargo/ReactorAccessPort.java | 2 +- .../implementation/items/electric/EnergyRegulator.java | 2 +- .../implementation/items/electric/reactors/Reactor.java | 2 +- .../slimefun4/implementation/items/geo/GEOMiner.java | 2 +- 9 files changed, 13 insertions(+), 16 deletions(-) diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/handlers/SimpleBlockBreakHandler.java b/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/handlers/SimpleBlockBreakHandler.java index 0deb75a90..4ea8cefd0 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/handlers/SimpleBlockBreakHandler.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/handlers/SimpleBlockBreakHandler.java @@ -39,21 +39,21 @@ public abstract class SimpleBlockBreakHandler extends BlockBreakHandler { * @param b * The broken {@link Block} */ - public abstract void onBlockBreaking(@Nonnull Block b); + public abstract void onBlockBreak(@Nonnull Block b); @Override public void onPlayerBreak(BlockBreakEvent e, ItemStack item, List drops) { - onBlockBreaking(e.getBlock()); + onBlockBreak(e.getBlock()); } @Override public void onAndroidBreak(AndroidMineEvent e) { - onBlockBreaking(e.getBlock()); + onBlockBreak(e.getBlock()); } @Override public void onExplode(Block b, List drops) { - onBlockBreaking(b); + onBlockBreak(b); } } diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/altar/AncientPedestal.java b/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/altar/AncientPedestal.java index 2797e6834..a302e2dae 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/altar/AncientPedestal.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/altar/AncientPedestal.java @@ -62,7 +62,7 @@ public class AncientPedestal extends SimpleSlimefunItem { return new SimpleBlockBreakHandler() { @Override - public void onBlockBreaking(@Nonnull Block b) { + public void onBlockBreak(@Nonnull Block b) { Optional entity = getPlacedItem(b); if (entity.isPresent()) { diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/blocks/HologramProjector.java b/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/blocks/HologramProjector.java index 5312e4b4e..a467c1324 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/blocks/HologramProjector.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/blocks/HologramProjector.java @@ -1,7 +1,5 @@ package io.github.thebusybiscuit.slimefun4.implementation.items.blocks; -import java.util.List; - import javax.annotation.Nonnull; import javax.annotation.ParametersAreNonnullByDefault; @@ -11,18 +9,17 @@ import org.bukkit.block.Block; import org.bukkit.entity.ArmorStand; import org.bukkit.entity.Entity; import org.bukkit.entity.Player; -import org.bukkit.event.block.BlockBreakEvent; import org.bukkit.event.block.BlockPlaceEvent; import org.bukkit.inventory.ItemStack; import io.github.thebusybiscuit.cscorelib2.chat.ChatColors; import io.github.thebusybiscuit.cscorelib2.item.CustomItem; import io.github.thebusybiscuit.cscorelib2.math.DoubleHandler; -import io.github.thebusybiscuit.slimefun4.api.events.AndroidMineEvent; import io.github.thebusybiscuit.slimefun4.core.handlers.BlockBreakHandler; import io.github.thebusybiscuit.slimefun4.core.handlers.BlockPlaceHandler; import io.github.thebusybiscuit.slimefun4.core.handlers.BlockUseHandler; import io.github.thebusybiscuit.slimefun4.implementation.SlimefunPlugin; +import io.github.thebusybiscuit.slimefun4.implementation.handlers.SimpleBlockBreakHandler; import io.github.thebusybiscuit.slimefun4.utils.ChatUtils; import io.github.thebusybiscuit.slimefun4.utils.holograms.SimpleHologram; import me.mrCookieSlime.CSCoreLibPlugin.general.Inventory.ChestMenu; @@ -65,7 +62,7 @@ public class HologramProjector extends SlimefunItem { return new SimpleBlockBreakHandler() { @Override - public void onBlockBreaking(@Nonnull Block b) { + public void onBlockBreak(@Nonnull Block b) { remove(b); } }; diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/cargo/AbstractFilterNode.java b/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/cargo/AbstractFilterNode.java index 79a54c85d..c8f09c4ef 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/cargo/AbstractFilterNode.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/cargo/AbstractFilterNode.java @@ -48,7 +48,7 @@ abstract class AbstractFilterNode extends AbstractCargoNode { return new SimpleBlockBreakHandler() { @Override - public void onBlockBreaking(@Nonnull Block b) { + public void onBlockBreak(@Nonnull Block b) { BlockMenu inv = BlockStorage.getInventory(b); if (inv != null) { diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/cargo/CargoManager.java b/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/cargo/CargoManager.java index 8b72794cf..fdb0a4768 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/cargo/CargoManager.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/cargo/CargoManager.java @@ -38,7 +38,7 @@ public class CargoManager extends SlimefunItem { return new SimpleBlockBreakHandler() { @Override - public void onBlockBreaking(@Nonnull Block b) { + public void onBlockBreak(@Nonnull Block b) { SimpleHologram.remove(b); } }; diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/cargo/ReactorAccessPort.java b/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/cargo/ReactorAccessPort.java index f74a5889b..65f620613 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/cargo/ReactorAccessPort.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/cargo/ReactorAccessPort.java @@ -108,7 +108,7 @@ public class ReactorAccessPort extends SlimefunItem { return new SimpleBlockBreakHandler() { @Override - public void onBlockBreaking(@Nonnull Block b) { + public void onBlockBreak(@Nonnull Block b) { BlockMenu inv = BlockStorage.getInventory(b); if (inv != null) { diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/electric/EnergyRegulator.java b/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/electric/EnergyRegulator.java index b326566b0..d5486022d 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/electric/EnergyRegulator.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/electric/EnergyRegulator.java @@ -44,7 +44,7 @@ public class EnergyRegulator extends SlimefunItem { return new SimpleBlockBreakHandler() { @Override - public void onBlockBreaking(@Nonnull Block b) { + public void onBlockBreak(@Nonnull Block b) { SimpleHologram.remove(b); } }; diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/electric/reactors/Reactor.java b/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/electric/reactors/Reactor.java index 537608fe1..08ec6208f 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/electric/reactors/Reactor.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/electric/reactors/Reactor.java @@ -118,7 +118,7 @@ public abstract class Reactor extends AbstractEnergyProvider { return new SimpleBlockBreakHandler() { @Override - public void onBlockBreaking(@Nonnull Block b) { + public void onBlockBreak(@Nonnull Block b) { BlockMenu inv = BlockStorage.getInventory(b); if (inv != null) { diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/geo/GEOMiner.java b/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/geo/GEOMiner.java index c1cc25af8..2a018a12c 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/geo/GEOMiner.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/geo/GEOMiner.java @@ -66,7 +66,7 @@ public class GEOMiner extends AContainer implements RecipeDisplayItem { return new SimpleBlockBreakHandler() { @Override - public void onBlockBreaking(@Nonnull Block b) { + public void onBlockBreak(@Nonnull Block b) { SimpleHologram.remove(b); BlockMenu inv = BlockStorage.getInventory(b);