From f6e042d2c948a2a2814ecbbcba08f661bc2afca5 Mon Sep 17 00:00:00 2001 From: Auxilor Date: Wed, 21 Jul 2021 22:27:11 +0100 Subject: [PATCH] Refactored package --- .../java/com/willfp/ecoweapons/commands/CommandGive.java | 4 ++-- .../java/com/willfp/ecoweapons/conditions/Condition.java | 2 +- .../conditions/conditions/ConditionAboveHealthPercent.java | 4 ++-- .../conditions/conditions/ConditionAboveHungerPercent.java | 4 ++-- .../conditions/conditions/ConditionAboveXPLevel.java | 4 ++-- .../ecoweapons/conditions/conditions/ConditionAboveY.java | 4 ++-- .../conditions/conditions/ConditionBelowHealthPercent.java | 4 ++-- .../conditions/conditions/ConditionBelowHungerPercent.java | 4 ++-- .../conditions/conditions/ConditionBelowXPLevel.java | 4 ++-- .../ecoweapons/conditions/conditions/ConditionBelowY.java | 4 ++-- .../conditions/conditions/ConditionHasPermission.java | 4 ++-- .../ecoweapons/conditions/conditions/ConditionInBiome.java | 4 ++-- .../ecoweapons/conditions/conditions/ConditionInWater.java | 4 ++-- .../ecoweapons/conditions/conditions/ConditionInWorld.java | 4 ++-- .../java/com/willfp/ecoweapons/display/WeaponsDisplay.java | 4 ++-- .../com/willfp/ecoweapons/effects/util/EffectWatcher.java | 4 ++-- .../com/willfp/ecoweapons/{sets => weapons}/Weapon.java | 4 ++-- .../com/willfp/ecoweapons/{sets => weapons}/Weapons.java | 2 +- .../ecoweapons/{sets => weapons}/util/WeaponUtils.java | 6 +++--- 19 files changed, 37 insertions(+), 37 deletions(-) rename eco-core/core-plugin/src/main/java/com/willfp/ecoweapons/{sets => weapons}/Weapon.java (98%) rename eco-core/core-plugin/src/main/java/com/willfp/ecoweapons/{sets => weapons}/Weapons.java (98%) rename eco-core/core-plugin/src/main/java/com/willfp/ecoweapons/{sets => weapons}/util/WeaponUtils.java (94%) diff --git a/eco-core/core-plugin/src/main/java/com/willfp/ecoweapons/commands/CommandGive.java b/eco-core/core-plugin/src/main/java/com/willfp/ecoweapons/commands/CommandGive.java index e3bc224..81275f5 100644 --- a/eco-core/core-plugin/src/main/java/com/willfp/ecoweapons/commands/CommandGive.java +++ b/eco-core/core-plugin/src/main/java/com/willfp/ecoweapons/commands/CommandGive.java @@ -5,8 +5,8 @@ import com.willfp.eco.core.command.CommandHandler; import com.willfp.eco.core.command.TabCompleteHandler; import com.willfp.eco.core.command.impl.Subcommand; import com.willfp.eco.core.config.updating.ConfigUpdater; -import com.willfp.ecoweapons.sets.Weapon; -import com.willfp.ecoweapons.sets.Weapons; +import com.willfp.ecoweapons.weapons.Weapon; +import com.willfp.ecoweapons.weapons.Weapons; import org.bukkit.Bukkit; import org.bukkit.entity.Player; import org.bukkit.inventory.ItemStack; diff --git a/eco-core/core-plugin/src/main/java/com/willfp/ecoweapons/conditions/Condition.java b/eco-core/core-plugin/src/main/java/com/willfp/ecoweapons/conditions/Condition.java index adb0bc6..5f1f8a8 100644 --- a/eco-core/core-plugin/src/main/java/com/willfp/ecoweapons/conditions/Condition.java +++ b/eco-core/core-plugin/src/main/java/com/willfp/ecoweapons/conditions/Condition.java @@ -2,7 +2,7 @@ package com.willfp.ecoweapons.conditions; import com.willfp.ecoweapons.EcoWeaponsPlugin; import com.willfp.ecoweapons.effects.Effect; -import com.willfp.ecoweapons.sets.Weapon; +import com.willfp.ecoweapons.weapons.Weapon; import lombok.AccessLevel; import lombok.Getter; import org.bukkit.entity.Player; diff --git a/eco-core/core-plugin/src/main/java/com/willfp/ecoweapons/conditions/conditions/ConditionAboveHealthPercent.java b/eco-core/core-plugin/src/main/java/com/willfp/ecoweapons/conditions/conditions/ConditionAboveHealthPercent.java index 2e35f3a..b7d888f 100644 --- a/eco-core/core-plugin/src/main/java/com/willfp/ecoweapons/conditions/conditions/ConditionAboveHealthPercent.java +++ b/eco-core/core-plugin/src/main/java/com/willfp/ecoweapons/conditions/conditions/ConditionAboveHealthPercent.java @@ -1,8 +1,8 @@ package com.willfp.ecoweapons.conditions.conditions; import com.willfp.ecoweapons.conditions.Condition; -import com.willfp.ecoweapons.sets.Weapon; -import com.willfp.ecoweapons.sets.util.WeaponUtils; +import com.willfp.ecoweapons.weapons.Weapon; +import com.willfp.ecoweapons.weapons.util.WeaponUtils; import org.bukkit.attribute.Attribute; import org.bukkit.entity.Player; import org.bukkit.event.EventHandler; diff --git a/eco-core/core-plugin/src/main/java/com/willfp/ecoweapons/conditions/conditions/ConditionAboveHungerPercent.java b/eco-core/core-plugin/src/main/java/com/willfp/ecoweapons/conditions/conditions/ConditionAboveHungerPercent.java index 1d48e17..58a8b85 100644 --- a/eco-core/core-plugin/src/main/java/com/willfp/ecoweapons/conditions/conditions/ConditionAboveHungerPercent.java +++ b/eco-core/core-plugin/src/main/java/com/willfp/ecoweapons/conditions/conditions/ConditionAboveHungerPercent.java @@ -1,8 +1,8 @@ package com.willfp.ecoweapons.conditions.conditions; import com.willfp.ecoweapons.conditions.Condition; -import com.willfp.ecoweapons.sets.Weapon; -import com.willfp.ecoweapons.sets.util.WeaponUtils; +import com.willfp.ecoweapons.weapons.Weapon; +import com.willfp.ecoweapons.weapons.util.WeaponUtils; import org.bukkit.entity.Player; import org.bukkit.event.EventHandler; import org.bukkit.event.EventPriority; diff --git a/eco-core/core-plugin/src/main/java/com/willfp/ecoweapons/conditions/conditions/ConditionAboveXPLevel.java b/eco-core/core-plugin/src/main/java/com/willfp/ecoweapons/conditions/conditions/ConditionAboveXPLevel.java index e7e1553..fdd9965 100644 --- a/eco-core/core-plugin/src/main/java/com/willfp/ecoweapons/conditions/conditions/ConditionAboveXPLevel.java +++ b/eco-core/core-plugin/src/main/java/com/willfp/ecoweapons/conditions/conditions/ConditionAboveXPLevel.java @@ -1,8 +1,8 @@ package com.willfp.ecoweapons.conditions.conditions; import com.willfp.ecoweapons.conditions.Condition; -import com.willfp.ecoweapons.sets.Weapon; -import com.willfp.ecoweapons.sets.util.WeaponUtils; +import com.willfp.ecoweapons.weapons.Weapon; +import com.willfp.ecoweapons.weapons.util.WeaponUtils; import org.bukkit.entity.Player; import org.bukkit.event.EventHandler; import org.bukkit.event.EventPriority; diff --git a/eco-core/core-plugin/src/main/java/com/willfp/ecoweapons/conditions/conditions/ConditionAboveY.java b/eco-core/core-plugin/src/main/java/com/willfp/ecoweapons/conditions/conditions/ConditionAboveY.java index d3ff206..41d6d10 100644 --- a/eco-core/core-plugin/src/main/java/com/willfp/ecoweapons/conditions/conditions/ConditionAboveY.java +++ b/eco-core/core-plugin/src/main/java/com/willfp/ecoweapons/conditions/conditions/ConditionAboveY.java @@ -1,8 +1,8 @@ package com.willfp.ecoweapons.conditions.conditions; import com.willfp.ecoweapons.conditions.Condition; -import com.willfp.ecoweapons.sets.Weapon; -import com.willfp.ecoweapons.sets.util.WeaponUtils; +import com.willfp.ecoweapons.weapons.Weapon; +import com.willfp.ecoweapons.weapons.util.WeaponUtils; import org.bukkit.entity.Player; import org.bukkit.event.EventHandler; import org.bukkit.event.EventPriority; diff --git a/eco-core/core-plugin/src/main/java/com/willfp/ecoweapons/conditions/conditions/ConditionBelowHealthPercent.java b/eco-core/core-plugin/src/main/java/com/willfp/ecoweapons/conditions/conditions/ConditionBelowHealthPercent.java index bca38e1..0bec422 100644 --- a/eco-core/core-plugin/src/main/java/com/willfp/ecoweapons/conditions/conditions/ConditionBelowHealthPercent.java +++ b/eco-core/core-plugin/src/main/java/com/willfp/ecoweapons/conditions/conditions/ConditionBelowHealthPercent.java @@ -1,8 +1,8 @@ package com.willfp.ecoweapons.conditions.conditions; import com.willfp.ecoweapons.conditions.Condition; -import com.willfp.ecoweapons.sets.Weapon; -import com.willfp.ecoweapons.sets.util.WeaponUtils; +import com.willfp.ecoweapons.weapons.Weapon; +import com.willfp.ecoweapons.weapons.util.WeaponUtils; import org.bukkit.attribute.Attribute; import org.bukkit.entity.Player; import org.bukkit.event.EventHandler; diff --git a/eco-core/core-plugin/src/main/java/com/willfp/ecoweapons/conditions/conditions/ConditionBelowHungerPercent.java b/eco-core/core-plugin/src/main/java/com/willfp/ecoweapons/conditions/conditions/ConditionBelowHungerPercent.java index a44ed3c..57ac43c 100644 --- a/eco-core/core-plugin/src/main/java/com/willfp/ecoweapons/conditions/conditions/ConditionBelowHungerPercent.java +++ b/eco-core/core-plugin/src/main/java/com/willfp/ecoweapons/conditions/conditions/ConditionBelowHungerPercent.java @@ -1,8 +1,8 @@ package com.willfp.ecoweapons.conditions.conditions; import com.willfp.ecoweapons.conditions.Condition; -import com.willfp.ecoweapons.sets.Weapon; -import com.willfp.ecoweapons.sets.util.WeaponUtils; +import com.willfp.ecoweapons.weapons.Weapon; +import com.willfp.ecoweapons.weapons.util.WeaponUtils; import org.bukkit.entity.Player; import org.bukkit.event.EventHandler; import org.bukkit.event.EventPriority; diff --git a/eco-core/core-plugin/src/main/java/com/willfp/ecoweapons/conditions/conditions/ConditionBelowXPLevel.java b/eco-core/core-plugin/src/main/java/com/willfp/ecoweapons/conditions/conditions/ConditionBelowXPLevel.java index 1e0d76d..b3e4621 100644 --- a/eco-core/core-plugin/src/main/java/com/willfp/ecoweapons/conditions/conditions/ConditionBelowXPLevel.java +++ b/eco-core/core-plugin/src/main/java/com/willfp/ecoweapons/conditions/conditions/ConditionBelowXPLevel.java @@ -1,8 +1,8 @@ package com.willfp.ecoweapons.conditions.conditions; import com.willfp.ecoweapons.conditions.Condition; -import com.willfp.ecoweapons.sets.Weapon; -import com.willfp.ecoweapons.sets.util.WeaponUtils; +import com.willfp.ecoweapons.weapons.Weapon; +import com.willfp.ecoweapons.weapons.util.WeaponUtils; import org.bukkit.entity.Player; import org.bukkit.event.EventHandler; import org.bukkit.event.EventPriority; diff --git a/eco-core/core-plugin/src/main/java/com/willfp/ecoweapons/conditions/conditions/ConditionBelowY.java b/eco-core/core-plugin/src/main/java/com/willfp/ecoweapons/conditions/conditions/ConditionBelowY.java index 56e73cb..569a5cf 100644 --- a/eco-core/core-plugin/src/main/java/com/willfp/ecoweapons/conditions/conditions/ConditionBelowY.java +++ b/eco-core/core-plugin/src/main/java/com/willfp/ecoweapons/conditions/conditions/ConditionBelowY.java @@ -1,8 +1,8 @@ package com.willfp.ecoweapons.conditions.conditions; import com.willfp.ecoweapons.conditions.Condition; -import com.willfp.ecoweapons.sets.Weapon; -import com.willfp.ecoweapons.sets.util.WeaponUtils; +import com.willfp.ecoweapons.weapons.Weapon; +import com.willfp.ecoweapons.weapons.util.WeaponUtils; import org.bukkit.entity.Player; import org.bukkit.event.EventHandler; import org.bukkit.event.EventPriority; diff --git a/eco-core/core-plugin/src/main/java/com/willfp/ecoweapons/conditions/conditions/ConditionHasPermission.java b/eco-core/core-plugin/src/main/java/com/willfp/ecoweapons/conditions/conditions/ConditionHasPermission.java index 718f0d4..98fe248 100644 --- a/eco-core/core-plugin/src/main/java/com/willfp/ecoweapons/conditions/conditions/ConditionHasPermission.java +++ b/eco-core/core-plugin/src/main/java/com/willfp/ecoweapons/conditions/conditions/ConditionHasPermission.java @@ -1,8 +1,8 @@ package com.willfp.ecoweapons.conditions.conditions; import com.willfp.ecoweapons.conditions.Condition; -import com.willfp.ecoweapons.sets.Weapon; -import com.willfp.ecoweapons.sets.util.WeaponUtils; +import com.willfp.ecoweapons.weapons.Weapon; +import com.willfp.ecoweapons.weapons.util.WeaponUtils; import org.bukkit.Bukkit; import org.bukkit.entity.Player; import org.jetbrains.annotations.NotNull; diff --git a/eco-core/core-plugin/src/main/java/com/willfp/ecoweapons/conditions/conditions/ConditionInBiome.java b/eco-core/core-plugin/src/main/java/com/willfp/ecoweapons/conditions/conditions/ConditionInBiome.java index c9ac479..78e1a40 100644 --- a/eco-core/core-plugin/src/main/java/com/willfp/ecoweapons/conditions/conditions/ConditionInBiome.java +++ b/eco-core/core-plugin/src/main/java/com/willfp/ecoweapons/conditions/conditions/ConditionInBiome.java @@ -1,8 +1,8 @@ package com.willfp.ecoweapons.conditions.conditions; import com.willfp.ecoweapons.conditions.Condition; -import com.willfp.ecoweapons.sets.Weapon; -import com.willfp.ecoweapons.sets.util.WeaponUtils; +import com.willfp.ecoweapons.weapons.Weapon; +import com.willfp.ecoweapons.weapons.util.WeaponUtils; import org.bukkit.block.Biome; import org.bukkit.entity.Player; import org.bukkit.event.EventHandler; diff --git a/eco-core/core-plugin/src/main/java/com/willfp/ecoweapons/conditions/conditions/ConditionInWater.java b/eco-core/core-plugin/src/main/java/com/willfp/ecoweapons/conditions/conditions/ConditionInWater.java index afc5ac9..f762437 100644 --- a/eco-core/core-plugin/src/main/java/com/willfp/ecoweapons/conditions/conditions/ConditionInWater.java +++ b/eco-core/core-plugin/src/main/java/com/willfp/ecoweapons/conditions/conditions/ConditionInWater.java @@ -1,8 +1,8 @@ package com.willfp.ecoweapons.conditions.conditions; import com.willfp.ecoweapons.conditions.Condition; -import com.willfp.ecoweapons.sets.Weapon; -import com.willfp.ecoweapons.sets.util.WeaponUtils; +import com.willfp.ecoweapons.weapons.Weapon; +import com.willfp.ecoweapons.weapons.util.WeaponUtils; import org.bukkit.Material; import org.bukkit.entity.Player; import org.bukkit.event.EventHandler; diff --git a/eco-core/core-plugin/src/main/java/com/willfp/ecoweapons/conditions/conditions/ConditionInWorld.java b/eco-core/core-plugin/src/main/java/com/willfp/ecoweapons/conditions/conditions/ConditionInWorld.java index 4d4473a..601f4df 100644 --- a/eco-core/core-plugin/src/main/java/com/willfp/ecoweapons/conditions/conditions/ConditionInWorld.java +++ b/eco-core/core-plugin/src/main/java/com/willfp/ecoweapons/conditions/conditions/ConditionInWorld.java @@ -1,8 +1,8 @@ package com.willfp.ecoweapons.conditions.conditions; import com.willfp.ecoweapons.conditions.Condition; -import com.willfp.ecoweapons.sets.Weapon; -import com.willfp.ecoweapons.sets.util.WeaponUtils; +import com.willfp.ecoweapons.weapons.Weapon; +import com.willfp.ecoweapons.weapons.util.WeaponUtils; import org.bukkit.World; import org.bukkit.entity.Player; import org.bukkit.event.EventHandler; diff --git a/eco-core/core-plugin/src/main/java/com/willfp/ecoweapons/display/WeaponsDisplay.java b/eco-core/core-plugin/src/main/java/com/willfp/ecoweapons/display/WeaponsDisplay.java index 8db0509..a7e907a 100644 --- a/eco-core/core-plugin/src/main/java/com/willfp/ecoweapons/display/WeaponsDisplay.java +++ b/eco-core/core-plugin/src/main/java/com/willfp/ecoweapons/display/WeaponsDisplay.java @@ -3,8 +3,8 @@ package com.willfp.ecoweapons.display; import com.willfp.eco.core.EcoPlugin; import com.willfp.eco.core.display.DisplayModule; import com.willfp.eco.core.display.DisplayPriority; -import com.willfp.ecoweapons.sets.Weapon; -import com.willfp.ecoweapons.sets.util.WeaponUtils; +import com.willfp.ecoweapons.weapons.Weapon; +import com.willfp.ecoweapons.weapons.util.WeaponUtils; import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.meta.ItemMeta; import org.jetbrains.annotations.NotNull; diff --git a/eco-core/core-plugin/src/main/java/com/willfp/ecoweapons/effects/util/EffectWatcher.java b/eco-core/core-plugin/src/main/java/com/willfp/ecoweapons/effects/util/EffectWatcher.java index b6ab98b..2e24af6 100644 --- a/eco-core/core-plugin/src/main/java/com/willfp/ecoweapons/effects/util/EffectWatcher.java +++ b/eco-core/core-plugin/src/main/java/com/willfp/ecoweapons/effects/util/EffectWatcher.java @@ -4,8 +4,8 @@ import com.willfp.eco.core.EcoPlugin; import com.willfp.eco.core.PluginDependent; import com.willfp.ecoweapons.effects.Effect; import com.willfp.ecoweapons.effects.Effects; -import com.willfp.ecoweapons.sets.Weapon; -import com.willfp.ecoweapons.sets.util.WeaponUtils; +import com.willfp.ecoweapons.weapons.Weapon; +import com.willfp.ecoweapons.weapons.util.WeaponUtils; import org.bukkit.entity.Player; import org.bukkit.event.EventHandler; import org.bukkit.event.Listener; diff --git a/eco-core/core-plugin/src/main/java/com/willfp/ecoweapons/sets/Weapon.java b/eco-core/core-plugin/src/main/java/com/willfp/ecoweapons/weapons/Weapon.java similarity index 98% rename from eco-core/core-plugin/src/main/java/com/willfp/ecoweapons/sets/Weapon.java rename to eco-core/core-plugin/src/main/java/com/willfp/ecoweapons/weapons/Weapon.java index f1d43e5..8300368 100644 --- a/eco-core/core-plugin/src/main/java/com/willfp/ecoweapons/sets/Weapon.java +++ b/eco-core/core-plugin/src/main/java/com/willfp/ecoweapons/weapons/Weapon.java @@ -1,4 +1,4 @@ -package com.willfp.ecoweapons.sets; +package com.willfp.ecoweapons.weapons; import com.willfp.eco.core.EcoPlugin; import com.willfp.eco.core.config.interfaces.JSONConfig; @@ -11,7 +11,7 @@ import com.willfp.ecoweapons.conditions.Condition; import com.willfp.ecoweapons.conditions.Conditions; import com.willfp.ecoweapons.effects.Effect; import com.willfp.ecoweapons.effects.Effects; -import com.willfp.ecoweapons.sets.util.WeaponUtils; +import com.willfp.ecoweapons.weapons.util.WeaponUtils; import lombok.AccessLevel; import lombok.Getter; import org.bukkit.Material; diff --git a/eco-core/core-plugin/src/main/java/com/willfp/ecoweapons/sets/Weapons.java b/eco-core/core-plugin/src/main/java/com/willfp/ecoweapons/weapons/Weapons.java similarity index 98% rename from eco-core/core-plugin/src/main/java/com/willfp/ecoweapons/sets/Weapons.java rename to eco-core/core-plugin/src/main/java/com/willfp/ecoweapons/weapons/Weapons.java index 60a367c..ad57f12 100644 --- a/eco-core/core-plugin/src/main/java/com/willfp/ecoweapons/sets/Weapons.java +++ b/eco-core/core-plugin/src/main/java/com/willfp/ecoweapons/weapons/Weapons.java @@ -1,4 +1,4 @@ -package com.willfp.ecoweapons.sets; +package com.willfp.ecoweapons.weapons; import com.google.common.collect.BiMap; diff --git a/eco-core/core-plugin/src/main/java/com/willfp/ecoweapons/sets/util/WeaponUtils.java b/eco-core/core-plugin/src/main/java/com/willfp/ecoweapons/weapons/util/WeaponUtils.java similarity index 94% rename from eco-core/core-plugin/src/main/java/com/willfp/ecoweapons/sets/util/WeaponUtils.java rename to eco-core/core-plugin/src/main/java/com/willfp/ecoweapons/weapons/util/WeaponUtils.java index 97aa9d8..9641017 100644 --- a/eco-core/core-plugin/src/main/java/com/willfp/ecoweapons/sets/util/WeaponUtils.java +++ b/eco-core/core-plugin/src/main/java/com/willfp/ecoweapons/weapons/util/WeaponUtils.java @@ -1,9 +1,9 @@ -package com.willfp.ecoweapons.sets.util; +package com.willfp.ecoweapons.weapons.util; import com.willfp.ecoweapons.EcoWeaponsPlugin; import com.willfp.ecoweapons.conditions.Condition; -import com.willfp.ecoweapons.sets.Weapon; -import com.willfp.ecoweapons.sets.Weapons; +import com.willfp.ecoweapons.weapons.Weapon; +import com.willfp.ecoweapons.weapons.Weapons; import lombok.experimental.UtilityClass; import org.bukkit.entity.Player; import org.bukkit.inventory.ItemStack;