From 8e80e86e32bcb250ce44984caf443cf55f6afbe1 Mon Sep 17 00:00:00 2001 From: Pim van der Loos Date: Mon, 23 Nov 2020 13:04:23 +0100 Subject: [PATCH] More cleanup --- pom.xml | 25 ++----------------- .../armoredElytra/handlers/EventHandlers.java | 8 +++--- .../lib}/armorequip/ArmorEquipEvent.java | 24 ++++++++---------- .../lib}/armorequip/ArmorListener.java | 4 +-- .../lib}/armorequip/ArmorType.java | 12 ++++----- .../armorequip/DispenserArmorListener.java | 2 +- 6 files changed, 25 insertions(+), 50 deletions(-) rename src/main/java/{com/codingforcookies => nl/pim16aap2/armoredElytra/lib}/armorequip/ArmorEquipEvent.java (91%) rename src/main/java/{com/codingforcookies => nl/pim16aap2/armoredElytra/lib}/armorequip/ArmorListener.java (98%) rename src/main/java/{com/codingforcookies => nl/pim16aap2/armoredElytra/lib}/armorequip/ArmorType.java (90%) rename src/main/java/{com/codingforcookies => nl/pim16aap2/armoredElytra/lib}/armorequip/DispenserArmorListener.java (95%) diff --git a/pom.xml b/pom.xml index 25324cd..ee5496b 100644 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - nl.pim16aap2 + nl.pim16aap2.armoredElytra ArmoredElytra 3.0 @@ -74,7 +74,7 @@ org.bstats - nl.pim16aap2.armoredElytra + nl.pim16aap2.armoredElytra.lib.bstats @@ -96,27 +96,6 @@ 8 - - org.apache.maven.plugins - maven-antrun-plugin - 1.8 - - - deploy-artifact - package - - run - - - - - - - - - - - diff --git a/src/main/java/nl/pim16aap2/armoredElytra/handlers/EventHandlers.java b/src/main/java/nl/pim16aap2/armoredElytra/handlers/EventHandlers.java index 5c51e42..768b9f5 100644 --- a/src/main/java/nl/pim16aap2/armoredElytra/handlers/EventHandlers.java +++ b/src/main/java/nl/pim16aap2/armoredElytra/handlers/EventHandlers.java @@ -1,11 +1,11 @@ package nl.pim16aap2.armoredElytra.handlers; -import com.codingforcookies.armorequip.ArmorEquipEvent; -import com.codingforcookies.armorequip.ArmorListener; -import com.codingforcookies.armorequip.ArmorType; -import com.codingforcookies.armorequip.DispenserArmorListener; import nl.pim16aap2.armoredElytra.ArmoredElytra; import nl.pim16aap2.armoredElytra.enchantment.EnchantmentManager; +import nl.pim16aap2.armoredElytra.lib.armorequip.ArmorEquipEvent; +import nl.pim16aap2.armoredElytra.lib.armorequip.ArmorListener; +import nl.pim16aap2.armoredElytra.lib.armorequip.ArmorType; +import nl.pim16aap2.armoredElytra.lib.armorequip.DispenserArmorListener; import nl.pim16aap2.armoredElytra.util.Action; import nl.pim16aap2.armoredElytra.util.AllowedToWearEnum; import nl.pim16aap2.armoredElytra.util.ArmorTier; diff --git a/src/main/java/com/codingforcookies/armorequip/ArmorEquipEvent.java b/src/main/java/nl/pim16aap2/armoredElytra/lib/armorequip/ArmorEquipEvent.java similarity index 91% rename from src/main/java/com/codingforcookies/armorequip/ArmorEquipEvent.java rename to src/main/java/nl/pim16aap2/armoredElytra/lib/armorequip/ArmorEquipEvent.java index 30720ba..5d18d00 100644 --- a/src/main/java/com/codingforcookies/armorequip/ArmorEquipEvent.java +++ b/src/main/java/nl/pim16aap2/armoredElytra/lib/armorequip/ArmorEquipEvent.java @@ -1,4 +1,4 @@ -package com.codingforcookies.armorequip; +package nl.pim16aap2.armoredElytra.lib.armorequip; import org.bukkit.Material; import org.bukkit.entity.Player; @@ -28,7 +28,7 @@ public final class ArmorEquipEvent extends PlayerEvent implements Cancellable * @param newArmorPiece The ItemStack of the armor added. */ public ArmorEquipEvent(final Player player, final EquipMethod equipType, final ArmorType type, - final ItemStack oldArmorPiece, final ItemStack newArmorPiece) + final ItemStack oldArmorPiece, final ItemStack newArmorPiece) { super(player); this.equipType = equipType; @@ -86,8 +86,7 @@ public final class ArmorEquipEvent extends PlayerEvent implements Cancellable } /** - * Returns the last equipped armor piece, could be a piece of armor, - * {@link Material#Air}, or null. + * Returns the last equipped armor piece, could be a piece of armor, {@link Material#Air}, or null. */ public final ItemStack getOldArmorPiece() { @@ -100,8 +99,7 @@ public final class ArmorEquipEvent extends PlayerEvent implements Cancellable } /** - * Returns the newly equipped armor, could be a piece of armor, - * {@link Material#Air}, or null. + * Returns the newly equipped armor, could be a piece of armor, {@link Material#Air}, or null. */ public final ItemStack getNewArmorPiece() { @@ -136,18 +134,15 @@ public final class ArmorEquipEvent extends PlayerEvent implements Cancellable */ PICK_DROP, /** - * When you right click an armor piece in the hotbar without the inventory open - * to equip. + * When you right click an armor piece in the hotbar without the inventory open to equip. */ HOTBAR, /** - * When you press the hotbar slot number while hovering over the armor slot to - * equip or unequip + * When you press the hotbar slot number while hovering over the armor slot to equip or unequip */ HOTBAR_SWAP, /** - * When in range of a dispenser that shoots an armor piece to equip.
- * Requires the spigot version to have + * When in range of a dispenser that shoots an armor piece to equip.
Requires the spigot version to have * {@link org.bukkit.event.block.BlockDispenseArmorEvent} implemented. */ DISPENSER, @@ -158,6 +153,7 @@ public final class ArmorEquipEvent extends PlayerEvent implements Cancellable /** * When you die causing all armor to unequip */ - DEATH,; + DEATH, + ; } -} \ No newline at end of file +} diff --git a/src/main/java/com/codingforcookies/armorequip/ArmorListener.java b/src/main/java/nl/pim16aap2/armoredElytra/lib/armorequip/ArmorListener.java similarity index 98% rename from src/main/java/com/codingforcookies/armorequip/ArmorListener.java rename to src/main/java/nl/pim16aap2/armoredElytra/lib/armorequip/ArmorListener.java index 725aeec..a98e101 100644 --- a/src/main/java/com/codingforcookies/armorequip/ArmorListener.java +++ b/src/main/java/nl/pim16aap2/armoredElytra/lib/armorequip/ArmorListener.java @@ -1,6 +1,6 @@ -package com.codingforcookies.armorequip; +package nl.pim16aap2.armoredElytra.lib.armorequip; -import com.codingforcookies.armorequip.ArmorEquipEvent.EquipMethod; +import nl.pim16aap2.armoredElytra.lib.armorequip.ArmorEquipEvent.EquipMethod; import org.bukkit.Bukkit; import org.bukkit.Material; import org.bukkit.entity.Player; diff --git a/src/main/java/com/codingforcookies/armorequip/ArmorType.java b/src/main/java/nl/pim16aap2/armoredElytra/lib/armorequip/ArmorType.java similarity index 90% rename from src/main/java/com/codingforcookies/armorequip/ArmorType.java rename to src/main/java/nl/pim16aap2/armoredElytra/lib/armorequip/ArmorType.java index 99d7653..43cb5fb 100644 --- a/src/main/java/com/codingforcookies/armorequip/ArmorType.java +++ b/src/main/java/nl/pim16aap2/armoredElytra/lib/armorequip/ArmorType.java @@ -1,4 +1,4 @@ -package com.codingforcookies.armorequip; +package nl.pim16aap2.armoredElytra.lib.armorequip; import org.bukkit.Material; import org.bukkit.inventory.ItemStack; @@ -9,10 +9,10 @@ import org.bukkit.inventory.ItemStack; */ public enum ArmorType { - HELMET (5), - CHESTPLATE (6), - LEGGINGS (7), - BOOTS (8); + HELMET(5), + CHESTPLATE(6), + LEGGINGS(7), + BOOTS(8); private final int slot; @@ -50,4 +50,4 @@ public enum ArmorType { return slot; } -} \ No newline at end of file +} diff --git a/src/main/java/com/codingforcookies/armorequip/DispenserArmorListener.java b/src/main/java/nl/pim16aap2/armoredElytra/lib/armorequip/DispenserArmorListener.java similarity index 95% rename from src/main/java/com/codingforcookies/armorequip/DispenserArmorListener.java rename to src/main/java/nl/pim16aap2/armoredElytra/lib/armorequip/DispenserArmorListener.java index 587c8f1..0f6d4e0 100644 --- a/src/main/java/com/codingforcookies/armorequip/DispenserArmorListener.java +++ b/src/main/java/nl/pim16aap2/armoredElytra/lib/armorequip/DispenserArmorListener.java @@ -1,4 +1,4 @@ -package com.codingforcookies.armorequip; +package nl.pim16aap2.armoredElytra.lib.armorequip; import org.bukkit.Bukkit; import org.bukkit.entity.Player;