Refactored package

2021-07-21 22:27:11 +01:00
parent acdf90be95
commit f6e042d2c9
19 changed files with 37 additions and 37 deletions
--- 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;
--- 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;
--- 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;
--- 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;
--- 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;
--- 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;
--- 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;
--- 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;
--- 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;
--- 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;
--- 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;
--- 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;
--- 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;
--- 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;
--- 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;
--- 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;
--- a/eco-core/core-plugin/src/main/java/com/willfp/ecoweapons/weapons/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;
--- a/eco-core/core-plugin/src/main/java/com/willfp/ecoweapons/weapons/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;
--- a/eco-core/core-plugin/src/main/java/com/willfp/ecoweapons/weapons/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;