Cleanup a bunch of files

EngineHub · Jan 7, 2023 · eb229f5 · eb229f5
1 parent cc7673d
commit eb229f5
Show file tree

Hide file tree

Showing 18 changed files with 46 additions and 73 deletions.
diff --git a/...tbook-bukkit/src/main/java/org/enginehub/craftbook/bukkit/commands/CraftBookCommands.java b/...tbook-bukkit/src/main/java/org/enginehub/craftbook/bukkit/commands/CraftBookCommands.java
@@ -30,21 +30,21 @@
 import com.sk89q.worldedit.util.paste.ActorCallbackPaste;
 import com.sk89q.worldedit.util.report.ReportList;
 import com.sk89q.worldedit.util.report.SystemInfoReport;
+import org.enginehub.craftbook.CraftBook;
+import org.enginehub.craftbook.CraftBookPlayer;
+import org.enginehub.craftbook.bukkit.CraftBookPlugin;
+import org.enginehub.craftbook.bukkit.report.LoadedICsReport;
+import org.enginehub.craftbook.bukkit.report.MechanicReport;
 import org.enginehub.craftbook.bukkit.report.PerformanceReport;
 import org.enginehub.craftbook.bukkit.report.PluginReport;
 import org.enginehub.craftbook.bukkit.report.SchedulerReport;
 import org.enginehub.craftbook.bukkit.report.ServerReport;
 import org.enginehub.craftbook.bukkit.report.ServicesReport;
 import org.enginehub.craftbook.bukkit.report.WorldReport;
-import org.enginehub.craftbook.CraftBook;
-import org.enginehub.craftbook.CraftBookPlayer;
-import org.enginehub.craftbook.bukkit.CraftBookPlugin;
-import org.enginehub.craftbook.util.report.GlobalConfigReport;
-import org.enginehub.craftbook.bukkit.report.LoadedICsReport;
-import org.enginehub.craftbook.bukkit.report.MechanicReport;
 import org.enginehub.craftbook.exception.CraftBookException;
 import org.enginehub.craftbook.mechanic.MechanicCommands;
 import org.enginehub.craftbook.util.ItemSyntax;
+import org.enginehub.craftbook.util.report.GlobalConfigReport;
 import org.enginehub.piston.CommandManager;
 import org.enginehub.piston.CommandManagerService;
 import org.enginehub.piston.annotation.Command;

diff --git a/craftbook-bukkit/src/main/java/org/enginehub/craftbook/mechanic/MechanicTypes.java b/craftbook-bukkit/src/main/java/org/enginehub/craftbook/mechanic/MechanicTypes.java
@@ -15,40 +15,37 @@
 
 package org.enginehub.craftbook.mechanic;
 
-import org.enginehub.craftbook.mechanics.betterai.BetterAI;
 import org.enginehub.craftbook.mechanics.Ammeter;
 import org.enginehub.craftbook.mechanics.BetterLeads;
 import org.enginehub.craftbook.mechanics.BetterPhysics;
-import org.enginehub.craftbook.mechanics.minecart.blocks.speed.CartBooster;
-import org.enginehub.craftbook.mechanics.minecart.blocks.speed.CartMaxBooster;
-import org.enginehub.craftbook.mechanics.piston.BetterPistons;
 import org.enginehub.craftbook.mechanics.BetterPlants;
-import org.enginehub.craftbook.mechanics.ReadableBookshelf;
+import org.enginehub.craftbook.mechanics.BetterSponge;
 import org.enginehub.craftbook.mechanics.BounceBlocks;
 import org.enginehub.craftbook.mechanics.Chairs;
 import org.enginehub.craftbook.mechanics.ChunkAnchor;
 import org.enginehub.craftbook.mechanics.CommandSigns;
 import org.enginehub.craftbook.mechanics.CookingPot;
 import org.enginehub.craftbook.mechanics.Elevator;
-import org.enginehub.craftbook.mechanics.RedstoneGlowstone;
 import org.enginehub.craftbook.mechanics.HiddenSwitch;
 import org.enginehub.craftbook.mechanics.JackOLantern;
 import org.enginehub.craftbook.mechanics.LightStone;
 import org.enginehub.craftbook.mechanics.LightSwitch;
 import org.enginehub.craftbook.mechanics.Marquee;
 import org.enginehub.craftbook.mechanics.PaintingSwitcher;
 import org.enginehub.craftbook.mechanics.Payment;
+import org.enginehub.craftbook.mechanics.ReadableBookshelf;
 import org.enginehub.craftbook.mechanics.RedstoneFire;
+import org.enginehub.craftbook.mechanics.RedstoneGlowstone;
 import org.enginehub.craftbook.mechanics.RedstoneJukebox;
 import org.enginehub.craftbook.mechanics.Snow;
-import org.enginehub.craftbook.mechanics.BetterSponge;
 import org.enginehub.craftbook.mechanics.Teleporter;
 import org.enginehub.craftbook.mechanics.TreeLopper;
 import org.enginehub.craftbook.mechanics.XPStorer;
-import org.enginehub.craftbook.mechanics.area.clipboard.Area;
 import org.enginehub.craftbook.mechanics.area.Bridge;
 import org.enginehub.craftbook.mechanics.area.Door;
 import org.enginehub.craftbook.mechanics.area.Gate;
+import org.enginehub.craftbook.mechanics.area.clipboard.Area;
+import org.enginehub.craftbook.mechanics.betterai.BetterAI;
 import org.enginehub.craftbook.mechanics.boat.BoatEmptyDecay;
 import org.enginehub.craftbook.mechanics.boat.BoatExitRemover;
 import org.enginehub.craftbook.mechanics.boat.BoatImpactDamage;
@@ -62,12 +59,12 @@
 import org.enginehub.craftbook.mechanics.minecart.MinecartCollisionEntry;
 import org.enginehub.craftbook.mechanics.minecart.MinecartEmptyDecay;
 import org.enginehub.craftbook.mechanics.minecart.MinecartExitRemover;
+import org.enginehub.craftbook.mechanics.minecart.MinecartImpactDamage;
 import org.enginehub.craftbook.mechanics.minecart.MinecartItemPickup;
-import org.enginehub.craftbook.mechanics.minecart.MinecartPhysicsControl;
-import org.enginehub.craftbook.mechanics.minecart.MoreRails;
 import org.enginehub.craftbook.mechanics.minecart.MinecartNoCollide;
+import org.enginehub.craftbook.mechanics.minecart.MinecartPhysicsControl;
 import org.enginehub.craftbook.mechanics.minecart.MinecartRailPlacer;
-import org.enginehub.craftbook.mechanics.minecart.MinecartImpactDamage;
+import org.enginehub.craftbook.mechanics.minecart.MoreRails;
 import org.enginehub.craftbook.mechanics.minecart.TemporaryCart;
 import org.enginehub.craftbook.mechanics.minecart.blocks.CartDeposit;
 import org.enginehub.craftbook.mechanics.minecart.blocks.CartDispenser;
@@ -77,9 +74,14 @@
 import org.enginehub.craftbook.mechanics.minecart.blocks.CartMessenger;
 import org.enginehub.craftbook.mechanics.minecart.blocks.CartReverser;
 import org.enginehub.craftbook.mechanics.minecart.blocks.CartSorter;
-import org.enginehub.craftbook.mechanics.minecart.blocks.station.CartStation;
 import org.enginehub.craftbook.mechanics.minecart.blocks.CartTeleporter;
+import org.enginehub.craftbook.mechanics.minecart.blocks.speed.CartBooster;
+import org.enginehub.craftbook.mechanics.minecart.blocks.speed.CartLightBraker;
+import org.enginehub.craftbook.mechanics.minecart.blocks.speed.CartMaxBooster;
+import org.enginehub.craftbook.mechanics.minecart.blocks.speed.CartStrongBraker;
+import org.enginehub.craftbook.mechanics.minecart.blocks.station.CartStation;
 import org.enginehub.craftbook.mechanics.pipe.Pipes;
+import org.enginehub.craftbook.mechanics.piston.BetterPistons;
 import org.enginehub.craftbook.mechanics.signcopier.SignCopier;
 import org.enginehub.craftbook.mechanics.variables.VariableManager;
 
@@ -155,8 +157,6 @@ public class MechanicTypes {
     @Nullable
     public static final MechanicType<MinecartCollisionEntry> MINECART_COLLISION_ENTRY = get("minecart_collision_entry");
     @Nullable
-    public static final MechanicType<MinecartEmptyDecay> MINECART_EMPTY_DECAY = get("minecart_empty_decay");
-    @Nullable
     public static final MechanicType<CartDeposit> MINECART_DEPOSIT = get("minecart_deposit");
     @Nullable
     public static final MechanicType<CartDispenser> MINECART_DISPENSER = get("minecart_dispenser");
@@ -165,35 +165,39 @@ public class MechanicTypes {
     @Nullable
     public static final MechanicType<CartLift> MINECART_ELEVATOR = get("minecart_elevator");
     @Nullable
+    public static final MechanicType<MinecartEmptyDecay> MINECART_EMPTY_DECAY = get("minecart_empty_decay");
+    @Nullable
     public static final MechanicType<MinecartExitRemover> MINECART_EXIT_REMOVER = get("minecart_exit_remover");
     @Nullable
-    public static final MechanicType<MinecartItemPickup> MINECART_ITEM_PICKUP = get("minecart_item_pickup");
+    public static final MechanicType<MinecartImpactDamage> MINECART_IMPACT_DAMAGE = get("minecart_impact_damage");
     @Nullable
-    public static final MechanicType<CartMaxBooster> MINECART_MAX_BOOSTER = get("minecart_max_booster");
+    public static final MechanicType<MinecartItemPickup> MINECART_ITEM_PICKUP = get("minecart_item_pickup");
     @Nullable
-    public static final MechanicType<CartMaxSpeed> MINECART_MAX_SPEED = get("minecart_max_speed");
+    public static final MechanicType<CartLightBraker> MINECART_LIGHT_BRAKER = get("minecart_light_braker");
     @Nullable
     public static final MechanicType<CartMessenger> MINECART_MESSENGER = get("minecart_messenger");
     @Nullable
-    public static final MechanicType<MoreRails> MINECART_MORE_RAILS = get("minecart_more_rails");
+    public static final MechanicType<CartMaxBooster> MINECART_MAX_BOOSTER = get("minecart_max_booster");
+    @Nullable
+    public static final MechanicType<CartMaxSpeed> MINECART_MAX_SPEED = get("minecart_max_speed");
     @Nullable
     public static final MechanicType<MinecartNoCollide> MINECART_NO_COLLIDE = get("minecart_no_collide");
     @Nullable
     public static final MechanicType<MinecartPhysicsControl> MINECART_PHYSICS_CONTROL = get("minecart_physics_control");
     @Nullable
     public static final MechanicType<MinecartRailPlacer> MINECART_RAIL_PLACER = get("minecart_rail_placer");
     @Nullable
-    public static final MechanicType<MinecartImpactDamage> MINECART_REMOVE_ENTITIES = get("minecart_remove_entities");
-    @Nullable
     public static final MechanicType<CartReverser> MINECART_REVERSER = get("minecart_reverser");
     @Nullable
-    public static final MechanicType<CartSorter> MINECART_SORTER = get("minecart_sorter");
+    public static final MechanicType<CartSorter> MINECART_SORTER = get("minecart_sorder");
     @Nullable
     public static final MechanicType<CartStation> MINECART_STATION = get("minecart_station");
     @Nullable
+    public static final MechanicType<CartStrongBraker> MINECART_STRONG_BRAKER = get("minecart_strong_braker");
+    @Nullable
     public static final MechanicType<CartTeleporter> MINECART_TELEPORTER = get("minecart_teleporter");
     @Nullable
-    public static final MechanicType<TemporaryCart> TEMPORARY_CART = get("temporary_cart");
+    public static final MechanicType<MoreRails> MORE_RAILS = get("more_rails");
     @Nullable
     public static final MechanicType<PaintingSwitcher> PAINTING_SWITCHER = get("painting_switcher");
     @Nullable
@@ -215,6 +219,8 @@ public class MechanicTypes {
     @Nullable
     public static final MechanicType<Teleporter> TELEPORTER = get("teleporter");
     @Nullable
+    public static final MechanicType<TemporaryCart> TEMPORARY_CART = get("temporary_cart");
+    @Nullable
     public static final MechanicType<Area> TOGGLE_AREA = get("toggle_area");
     @Nullable
     public static final MechanicType<TreeLopper> TREE_LOPPER = get("tree_lopper");

diff --git a/craftbook-bukkit/src/main/java/org/enginehub/craftbook/mechanics/BetterLeads.java b/craftbook-bukkit/src/main/java/org/enginehub/craftbook/mechanics/BetterLeads.java
@@ -104,13 +104,7 @@ public void onPlayerClick(final PlayerInteractEntityEvent event) {
                 return;
             }
 
-            if (event.getPlayer().getInventory().getItem(event.getHand()).getAmount() == 1) {
-                event.getPlayer().getInventory().setItem(event.getHand(), null);
-            } else {
-                ItemStack newStack = event.getPlayer().getInventory().getItem(event.getHand());
-                newStack.setAmount(newStack.getAmount() - 1);
-                event.getPlayer().getInventory().setItem(event.getHand(), newStack);
-            }
+            event.getPlayer().getInventory().getItem(event.getHand()).subtract(1);
         });
     }
 

diff --git a/craftbook-bukkit/src/main/java/org/enginehub/craftbook/mechanics/Snow.java b/craftbook-bukkit/src/main/java/org/enginehub/craftbook/mechanics/Snow.java
@@ -29,6 +29,7 @@
 import org.bukkit.block.Block;
 import org.bukkit.block.BlockFace;
 import org.bukkit.block.BlockState;
+import org.bukkit.block.data.BlockData;
 import org.bukkit.block.data.Levelled;
 import org.bukkit.entity.Player;
 import org.bukkit.entity.Snowball;
@@ -103,10 +104,11 @@ public void disable() {
     }
 
     private boolean isReplacable(Block block) {
-        Material type = block.getType();
+        BlockData data = block.getBlockData();
+        Material type = data.getMaterial();
         return !(type == Material.WATER || type == Material.LAVA)
             && (BlockUtil.isBlockReplacable(type)
-            || Blocks.containsFuzzy(dispersionReplacables, BukkitAdapter.adapt(block.getBlockData())));
+            || Blocks.containsFuzzy(dispersionReplacables, BukkitAdapter.adapt(data)));
     }
 
     private boolean canPlaceAt(Block block) {

diff --git a/craftbook-bukkit/src/main/java/org/enginehub/craftbook/mechanics/XPStorer.java b/craftbook-bukkit/src/main/java/org/enginehub/craftbook/mechanics/XPStorer.java
@@ -163,11 +163,7 @@ public void onRightClick(PlayerInteractEvent event) {
         int bottleCount = (int) Math.min(maxBottleCount, Math.floor(xp / (double) bottleXpRequirement));
 
         if (requireBottle) {
-            if (event.getItem().getAmount() - bottleCount <= 0) {
-                event.getPlayer().getInventory().setItem(event.getHand(), null);
-            } else {
-                event.getItem().setAmount(event.getItem().getAmount() - bottleCount);
-            }
+            event.getItem().subtract(bottleCount);
         }
 
         int tempBottles = bottleCount;
@@ -323,13 +319,8 @@ public void onThink(SelfTriggerThinkEvent event) {
                     }
                     ItemStack content = inventory.getContents()[i];
                     if (ItemUtil.isStackValid(content) && content.getType() == stack.getType()) {
-                        if (content.getAmount() - amount <= 0) {
-                            amount -= content.getAmount();
-                            inventory.setItem(i, null);
-                        } else {
-                            content.setAmount(content.getAmount() - amount);
-                            amount = 0;
-                        }
+                        content.subtract(amount);
+                        amount = Math.max(0, amount - content.getAmount());
                     }
                 }
             }

diff --git a/...t/src/main/java/org/enginehub/craftbook/mechanics/ic/gates/world/entity/EntityCannon.java b/...t/src/main/java/org/enginehub/craftbook/mechanics/ic/gates/world/entity/EntityCannon.java
@@ -15,7 +15,6 @@
 
 package org.enginehub.craftbook.mechanics.ic.gates.world.entity;
 
-import com.sk89q.worldedit.math.Vector3;
 import org.bukkit.Location;
 import org.bukkit.Server;
 import org.bukkit.entity.Entity;
@@ -29,7 +28,6 @@
 import org.enginehub.craftbook.mechanics.ic.ICFactory;
 import org.enginehub.craftbook.mechanics.ic.RestrictedIC;
 import org.enginehub.craftbook.util.EntityType;
-import org.enginehub.craftbook.util.LocationUtil;
 import org.enginehub.craftbook.util.RegexUtil;
 
 public class EntityCannon extends AbstractSelfTriggeredIC {

diff --git a/...ain/java/org/enginehub/craftbook/mechanics/ic/gates/world/entity/TeleportTransmitter.java b/...ain/java/org/enginehub/craftbook/mechanics/ic/gates/world/entity/TeleportTransmitter.java
@@ -28,7 +28,6 @@
 import org.enginehub.craftbook.mechanics.ic.ICFactory;
 import org.enginehub.craftbook.mechanics.ic.ICVerificationException;
 import org.enginehub.craftbook.util.HistoryHashMap;
-import org.enginehub.craftbook.util.LocationUtil;
 import org.enginehub.craftbook.util.PlayerType;
 import org.enginehub.craftbook.util.RegexUtil;
 import org.enginehub.craftbook.util.SearchArea;

diff --git a/...src/main/java/org/enginehub/craftbook/mechanics/ic/gates/world/items/RangedCollector.java b/...src/main/java/org/enginehub/craftbook/mechanics/ic/gates/world/items/RangedCollector.java
@@ -37,7 +37,6 @@
 import org.enginehub.craftbook.util.InventoryUtil;
 import org.enginehub.craftbook.util.ItemSyntax;
 import org.enginehub.craftbook.util.ItemUtil;
-import org.enginehub.craftbook.util.LocationUtil;
 import org.enginehub.craftbook.util.RegexUtil;
 import org.enginehub.craftbook.util.SignUtil;
 import org.enginehub.craftbook.util.events.RangedCollectEvent;

diff --git a/...k-bukkit/src/main/java/org/enginehub/craftbook/mechanics/minecart/MinecartEmptyDecay.java b/...k-bukkit/src/main/java/org/enginehub/craftbook/mechanics/minecart/MinecartEmptyDecay.java
@@ -18,7 +18,6 @@
 import com.sk89q.util.yaml.YAMLProcessor;
 import org.bukkit.Bukkit;
 import org.bukkit.entity.Entity;
-import org.bukkit.entity.Vehicle;
 import org.bukkit.entity.minecart.RideableMinecart;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;

diff --git a/...-bukkit/src/main/java/org/enginehub/craftbook/mechanics/minecart/MinecartExitRemover.java b/...-bukkit/src/main/java/org/enginehub/craftbook/mechanics/minecart/MinecartExitRemover.java
@@ -18,7 +18,6 @@
 import com.sk89q.util.yaml.YAMLProcessor;
 import org.bukkit.Bukkit;
 import org.bukkit.entity.LivingEntity;
-import org.bukkit.entity.Minecart;
 import org.bukkit.entity.Player;
 import org.bukkit.entity.Vehicle;
 import org.bukkit.entity.minecart.RideableMinecart;

diff --git a/...kkit/src/main/java/org/enginehub/craftbook/mechanics/minecart/MinecartPhysicsControl.java b/...kkit/src/main/java/org/enginehub/craftbook/mechanics/minecart/MinecartPhysicsControl.java
@@ -22,7 +22,6 @@
 import org.bukkit.event.vehicle.VehicleCreateEvent;
 import org.bukkit.util.Vector;
 import org.enginehub.craftbook.AbstractCraftBookMechanic;
-import org.enginehub.craftbook.mechanic.exception.MechanicInitializationException;
 import org.enginehub.craftbook.util.EventUtil;
 
 public class MinecartPhysicsControl extends AbstractCraftBookMechanic {

diff --git a/...k-bukkit/src/main/java/org/enginehub/craftbook/mechanics/minecart/MinecartRailPlacer.java b/...k-bukkit/src/main/java/org/enginehub/craftbook/mechanics/minecart/MinecartRailPlacer.java
@@ -23,7 +23,6 @@
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
 import org.bukkit.event.vehicle.VehicleMoveEvent;
-import org.bukkit.inventory.Inventory;
 import org.bukkit.inventory.InventoryHolder;
 import org.bukkit.inventory.ItemStack;
 import org.enginehub.craftbook.AbstractCraftBookMechanic;

diff --git a/craftbook-bukkit/src/main/java/org/enginehub/craftbook/mechanics/minecart/RailUtil.java b/craftbook-bukkit/src/main/java/org/enginehub/craftbook/mechanics/minecart/RailUtil.java
@@ -91,7 +91,7 @@ public static List<BlockInventoryHolder> getNearbyInventoryBlocks(CartMechanismB
     }
 
     public static boolean isTrack(Material id) {
-        if (CraftBook.getInstance().getPlatform().getMechanicManager().getMechanic(MechanicTypes.MINECART_MORE_RAILS)
+        if (CraftBook.getInstance().getPlatform().getMechanicManager().getMechanic(MechanicTypes.MORE_RAILS)
             .map(moreRails -> moreRails.isValidRail(id))
             .orElse(false)) {
             return true;

diff --git a/...k-bukkit/src/main/java/org/enginehub/craftbook/mechanics/minecart/blocks/CartDeposit.java b/...k-bukkit/src/main/java/org/enginehub/craftbook/mechanics/minecart/blocks/CartDeposit.java
@@ -24,11 +24,11 @@
 import org.bukkit.inventory.Inventory;
 import org.bukkit.inventory.ItemStack;
 import org.enginehub.craftbook.bukkit.CraftBookPlugin;
+import org.enginehub.craftbook.mechanics.minecart.RailUtil;
 import org.enginehub.craftbook.mechanics.minecart.events.CartBlockImpactEvent;
 import org.enginehub.craftbook.util.BlockParser;
 import org.enginehub.craftbook.util.ItemInfo;
 import org.enginehub.craftbook.util.ItemUtil;
-import org.enginehub.craftbook.mechanics.minecart.RailUtil;
 import org.enginehub.craftbook.util.RedstoneUtil.Power;
 import org.enginehub.craftbook.util.RegexUtil;
 import org.enginehub.craftbook.util.Tuple2;

diff --git a/...bukkit/src/main/java/org/enginehub/craftbook/mechanics/minecart/blocks/CartDispenser.java b/...bukkit/src/main/java/org/enginehub/craftbook/mechanics/minecart/blocks/CartDispenser.java
@@ -30,11 +30,11 @@
 import org.bukkit.inventory.ItemStack;
 import org.enginehub.craftbook.ChangedSign;
 import org.enginehub.craftbook.CraftBookPlayer;
+import org.enginehub.craftbook.mechanics.minecart.RailUtil;
 import org.enginehub.craftbook.mechanics.minecart.events.CartBlockImpactEvent;
 import org.enginehub.craftbook.mechanics.minecart.events.CartBlockRedstoneEvent;
 import org.enginehub.craftbook.util.BlockParser;
 import org.enginehub.craftbook.util.EntityUtil;
-import org.enginehub.craftbook.mechanics.minecart.RailUtil;
 import org.enginehub.craftbook.util.RedstoneUtil.Power;
 import org.enginehub.craftbook.util.SignUtil;
 

diff --git a/...k-bukkit/src/main/java/org/enginehub/craftbook/mechanics/minecart/blocks/CartEjector.java b/...k-bukkit/src/main/java/org/enginehub/craftbook/mechanics/minecart/blocks/CartEjector.java
@@ -23,7 +23,6 @@
 import org.bukkit.event.EventHandler;
 import org.enginehub.craftbook.mechanics.minecart.events.CartBlockImpactEvent;
 import org.enginehub.craftbook.util.BlockParser;
-import org.enginehub.craftbook.util.LocationUtil;
 import org.enginehub.craftbook.util.RedstoneUtil.Power;
 import org.enginehub.craftbook.util.SignUtil;
 

diff --git a/craftbook-bukkit/src/main/java/org/enginehub/craftbook/util/ItemUtil.java b/craftbook-bukkit/src/main/java/org/enginehub/craftbook/util/ItemUtil.java
@@ -30,7 +30,6 @@
 import org.bukkit.inventory.ShapedRecipe;
 import org.bukkit.inventory.ShapelessRecipe;
 import org.bukkit.inventory.meta.BookMeta;
-import org.bukkit.inventory.meta.Damageable;
 import org.bukkit.inventory.meta.EnchantmentStorageMeta;
 import org.bukkit.inventory.meta.ItemMeta;
 import org.bukkit.util.BoundingBox;
@@ -39,10 +38,8 @@
 import java.util.ArrayList;
 import java.util.HashSet;
 import java.util.List;
-import java.util.Map;
 import java.util.Map.Entry;
 import java.util.Set;
-import java.util.concurrent.ThreadLocalRandom;
 import java.util.regex.Pattern;
 
 public final class ItemUtil {
@@ -778,10 +775,8 @@ public static ItemStack getUsedItem(ItemStack item) {
             item.setType(Material.GLASS_BOTTLE); // Get your bottle back
         } else if (item.getType() == Material.LAVA_BUCKET || item.getType() == Material.WATER_BUCKET || item.getType() == Material.MILK_BUCKET) {
             item.setType(Material.BUCKET); // Get your bucket back
-        } else if (item.getAmount() == 1) {
-            item.setType(Material.AIR);
         } else {
-            item.setAmount(item.getAmount() - 1);
+            item.subtract();
         }
         return item;
     }

diff --git a/craftbook-bukkit/src/main/java/org/enginehub/craftbook/util/LocationUtil.java b/craftbook-bukkit/src/main/java/org/enginehub/craftbook/util/LocationUtil.java
@@ -20,13 +20,7 @@
 import org.bukkit.Material;
 import org.bukkit.block.Block;
 import org.bukkit.block.BlockFace;
-import org.bukkit.entity.Entity;
-import org.bukkit.entity.Player;
-import org.bukkit.scheduler.BukkitRunnable;
 import org.enginehub.craftbook.ChangedSign;
-import org.enginehub.craftbook.CraftBookPlayer;
-import org.enginehub.craftbook.bukkit.BukkitCraftBookPlayer;
-import org.enginehub.craftbook.bukkit.CraftBookPlugin;
 import org.enginehub.craftbook.bukkit.util.CraftBookBukkitUtil;
 
 public final class LocationUtil {