diff --git a/src/main/java/dev/zxq5/fantasysmp/Fantasysmp.java b/src/main/java/dev/zxq5/fantasysmp/Fantasysmp.java index fdc2b73..ec5fdda 100644 --- a/src/main/java/dev/zxq5/fantasysmp/Fantasysmp.java +++ b/src/main/java/dev/zxq5/fantasysmp/Fantasysmp.java @@ -3,9 +3,6 @@ package dev.zxq5.fantasysmp; import dev.zxq5.fantasysmp.events.HereticWarner; import dev.zxq5.fantasysmp.events.StevenKillCheck; import dev.zxq5.fantasysmp.items.*; -import dev.zxq5.fantasysmp.items.gear.LightningSword; -import dev.zxq5.fantasysmp.items.gear.StevensWrath; -import dev.zxq5.fantasysmp.items.gear.WitheriteGear; import dev.zxq5.fantasysmp.warps.Warp; import dev.zxq5.fantasysmp.warps.Warper; import org.bukkit.plugin.java.JavaPlugin; diff --git a/src/main/java/dev/zxq5/fantasysmp/items/Items.java b/src/main/java/dev/zxq5/fantasysmp/items/Items.java index 9e7badd..67f007e 100644 --- a/src/main/java/dev/zxq5/fantasysmp/items/Items.java +++ b/src/main/java/dev/zxq5/fantasysmp/items/Items.java @@ -5,8 +5,6 @@ import org.bukkit.command.CommandExecutor; import org.bukkit.entity.Player; import org.bukkit.plugin.java.JavaPlugin; -import static org.bukkit.Bukkit.getServer; - public class Items implements CommandExecutor { @Override @@ -33,7 +31,7 @@ public class Items implements CommandExecutor { CommandExecutor handler; switch (args[0]) { - case "witherite" -> handler = new WitheriteGear(); + case "witherite" -> handler = new Witherite(); case "lightning" -> handler = new LightningSword(); case "steven" -> handler = new StevensWrath(); case "blazing" -> handler = new BlazingGear(); @@ -49,7 +47,7 @@ public class Items implements CommandExecutor { public Items(JavaPlugin plugin) { - WitheriteGear witherite = new WitheriteGear(); + Witherite witherite = new Witherite(); witherite.registerRecipes(); witherite.registerEvents(plugin); diff --git a/src/main/java/dev/zxq5/fantasysmp/items/gear/WitheriteGear.java b/src/main/java/dev/zxq5/fantasysmp/items/gear/Witherite.java similarity index 97% rename from src/main/java/dev/zxq5/fantasysmp/items/gear/WitheriteGear.java rename to src/main/java/dev/zxq5/fantasysmp/items/gear/Witherite.java index 0e03f95..a3394ce 100644 --- a/src/main/java/dev/zxq5/fantasysmp/items/gear/WitheriteGear.java +++ b/src/main/java/dev/zxq5/fantasysmp/items/gear/Witherite.java @@ -4,7 +4,6 @@ import dev.zxq5.fantasysmp.items.GenericGearSet; import dev.zxq5.fantasysmp.util.LoreChecker; import org.bukkit.*; import org.bukkit.command.CommandExecutor; -import org.bukkit.entity.Fireball; import org.bukkit.entity.LivingEntity; import org.bukkit.entity.Player; import org.bukkit.entity.WitherSkull; @@ -22,7 +21,7 @@ import java.util.Objects; import static org.bukkit.Bukkit.getServer; -public class WitheriteGear extends GenericGearSet implements Listener, CommandExecutor { +public class Witherite extends GenericGearSet implements Listener, CommandExecutor { private ArrayList cooldown = new ArrayList<>(); @Override @@ -142,7 +141,7 @@ public class WitheriteGear extends GenericGearSet implements Listener, CommandEx public static void init() {} - public WitheriteGear() { + public Witherite() { this.setTier5(); this.sword.name = "Witherite Sword"; this.sword.customItemModel = "witherite_sword";