From d769ee2d37a951df6d4a9803023135990ef1d2ae Mon Sep 17 00:00:00 2001 From: Nick Date: Thu, 28 Jan 2016 14:56:49 -0800 Subject: [PATCH] Repackage living armor upgrades and trackers all the organizations --- .../{ => tracker}/StatTrackerArrowShot.java | 4 +++- .../{ => tracker}/StatTrackerDigging.java | 4 +++- .../{ => tracker}/StatTrackerFood.java | 4 +++- .../{ => tracker}/StatTrackerHealthboost.java | 4 +++- .../{ => tracker}/StatTrackerMeleeDamage.java | 4 +++- .../{ => tracker}/StatTrackerMovement.java | 4 +++- .../StatTrackerPhysicalProtect.java | 4 +++- .../{ => tracker}/StatTrackerPoison.java | 4 +++- .../StatTrackerSelfSacrifice.java | 4 +++- .../LivingArmourUpgradeArrowShot.java | 2 +- .../LivingArmourUpgradeDigging.java | 3 ++- .../LivingArmourUpgradeHealthboost.java | 2 +- .../LivingArmourUpgradeKnockbackResist.java | 2 +- .../LivingArmourUpgradeMeleeDamage.java | 2 +- .../LivingArmourUpgradePhysicalProtect.java | 2 +- .../LivingArmourUpgradePoisonResist.java | 2 +- .../LivingArmourUpgradeSelfSacrifice.java | 2 +- .../LivingArmourUpgradeSpeed.java | 2 +- .../registry/ModArmourTrackers.java | 19 ++----------------- .../bloodmagic/util/handler/EventHandler.java | 18 +++++++++--------- 20 files changed, 48 insertions(+), 44 deletions(-) rename src/main/java/WayofTime/bloodmagic/livingArmour/{ => tracker}/StatTrackerArrowShot.java (92%) rename src/main/java/WayofTime/bloodmagic/livingArmour/{ => tracker}/StatTrackerDigging.java (92%) rename src/main/java/WayofTime/bloodmagic/livingArmour/{ => tracker}/StatTrackerFood.java (92%) rename src/main/java/WayofTime/bloodmagic/livingArmour/{ => tracker}/StatTrackerHealthboost.java (92%) rename src/main/java/WayofTime/bloodmagic/livingArmour/{ => tracker}/StatTrackerMeleeDamage.java (92%) rename src/main/java/WayofTime/bloodmagic/livingArmour/{ => tracker}/StatTrackerMovement.java (93%) rename src/main/java/WayofTime/bloodmagic/livingArmour/{ => tracker}/StatTrackerPhysicalProtect.java (92%) rename src/main/java/WayofTime/bloodmagic/livingArmour/{ => tracker}/StatTrackerPoison.java (90%) rename src/main/java/WayofTime/bloodmagic/livingArmour/{ => tracker}/StatTrackerSelfSacrifice.java (92%) rename src/main/java/WayofTime/bloodmagic/livingArmour/{ => upgrade}/LivingArmourUpgradeArrowShot.java (96%) rename src/main/java/WayofTime/bloodmagic/livingArmour/{ => upgrade}/LivingArmourUpgradeDigging.java (95%) rename src/main/java/WayofTime/bloodmagic/livingArmour/{ => upgrade}/LivingArmourUpgradeHealthboost.java (97%) rename src/main/java/WayofTime/bloodmagic/livingArmour/{ => upgrade}/LivingArmourUpgradeKnockbackResist.java (97%) rename src/main/java/WayofTime/bloodmagic/livingArmour/{ => upgrade}/LivingArmourUpgradeMeleeDamage.java (97%) rename src/main/java/WayofTime/bloodmagic/livingArmour/{ => upgrade}/LivingArmourUpgradePhysicalProtect.java (96%) rename src/main/java/WayofTime/bloodmagic/livingArmour/{ => upgrade}/LivingArmourUpgradePoisonResist.java (97%) rename src/main/java/WayofTime/bloodmagic/livingArmour/{ => upgrade}/LivingArmourUpgradeSelfSacrifice.java (96%) rename src/main/java/WayofTime/bloodmagic/livingArmour/{ => upgrade}/LivingArmourUpgradeSpeed.java (98%) diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/StatTrackerArrowShot.java b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerArrowShot.java similarity index 92% rename from src/main/java/WayofTime/bloodmagic/livingArmour/StatTrackerArrowShot.java rename to src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerArrowShot.java index 86399a52..a24da55b 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/StatTrackerArrowShot.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerArrowShot.java @@ -1,9 +1,11 @@ -package WayofTime.bloodmagic.livingArmour; +package WayofTime.bloodmagic.livingArmour.tracker; import java.util.ArrayList; import java.util.HashMap; import java.util.List; +import WayofTime.bloodmagic.livingArmour.LivingArmour; +import WayofTime.bloodmagic.livingArmour.upgrade.LivingArmourUpgradeArrowShot; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.world.World; diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/StatTrackerDigging.java b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerDigging.java similarity index 92% rename from src/main/java/WayofTime/bloodmagic/livingArmour/StatTrackerDigging.java rename to src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerDigging.java index 560aac82..36951563 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/StatTrackerDigging.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerDigging.java @@ -1,9 +1,11 @@ -package WayofTime.bloodmagic.livingArmour; +package WayofTime.bloodmagic.livingArmour.tracker; import java.util.ArrayList; import java.util.HashMap; import java.util.List; +import WayofTime.bloodmagic.livingArmour.LivingArmour; +import WayofTime.bloodmagic.livingArmour.upgrade.LivingArmourUpgradeDigging; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.world.World; diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/StatTrackerFood.java b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerFood.java similarity index 92% rename from src/main/java/WayofTime/bloodmagic/livingArmour/StatTrackerFood.java rename to src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerFood.java index 3ec4edd5..71a69e44 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/StatTrackerFood.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerFood.java @@ -1,10 +1,12 @@ -package WayofTime.bloodmagic.livingArmour; +package WayofTime.bloodmagic.livingArmour.tracker; import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; +import WayofTime.bloodmagic.livingArmour.LivingArmour; +import WayofTime.bloodmagic.livingArmour.upgrade.LivingArmourUpgradeKnockbackResist; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.world.World; diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/StatTrackerHealthboost.java b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerHealthboost.java similarity index 92% rename from src/main/java/WayofTime/bloodmagic/livingArmour/StatTrackerHealthboost.java rename to src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerHealthboost.java index 1327df97..ed4204b6 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/StatTrackerHealthboost.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerHealthboost.java @@ -1,9 +1,11 @@ -package WayofTime.bloodmagic.livingArmour; +package WayofTime.bloodmagic.livingArmour.tracker; import java.util.ArrayList; import java.util.HashMap; import java.util.List; +import WayofTime.bloodmagic.livingArmour.LivingArmour; +import WayofTime.bloodmagic.livingArmour.upgrade.LivingArmourUpgradeHealthboost; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.world.World; diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/StatTrackerMeleeDamage.java b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerMeleeDamage.java similarity index 92% rename from src/main/java/WayofTime/bloodmagic/livingArmour/StatTrackerMeleeDamage.java rename to src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerMeleeDamage.java index 861b7cbb..4454e879 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/StatTrackerMeleeDamage.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerMeleeDamage.java @@ -1,9 +1,11 @@ -package WayofTime.bloodmagic.livingArmour; +package WayofTime.bloodmagic.livingArmour.tracker; import java.util.ArrayList; import java.util.HashMap; import java.util.List; +import WayofTime.bloodmagic.livingArmour.LivingArmour; +import WayofTime.bloodmagic.livingArmour.upgrade.LivingArmourUpgradeMeleeDamage; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.world.World; diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/StatTrackerMovement.java b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerMovement.java similarity index 93% rename from src/main/java/WayofTime/bloodmagic/livingArmour/StatTrackerMovement.java rename to src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerMovement.java index ebb3d0ac..dc32e68e 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/StatTrackerMovement.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerMovement.java @@ -1,10 +1,12 @@ -package WayofTime.bloodmagic.livingArmour; +package WayofTime.bloodmagic.livingArmour.tracker; import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; +import WayofTime.bloodmagic.livingArmour.LivingArmour; +import WayofTime.bloodmagic.livingArmour.upgrade.LivingArmourUpgradeSpeed; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.world.World; diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/StatTrackerPhysicalProtect.java b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerPhysicalProtect.java similarity index 92% rename from src/main/java/WayofTime/bloodmagic/livingArmour/StatTrackerPhysicalProtect.java rename to src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerPhysicalProtect.java index 20ff18ec..80e61b20 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/StatTrackerPhysicalProtect.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerPhysicalProtect.java @@ -1,9 +1,11 @@ -package WayofTime.bloodmagic.livingArmour; +package WayofTime.bloodmagic.livingArmour.tracker; import java.util.ArrayList; import java.util.HashMap; import java.util.List; +import WayofTime.bloodmagic.livingArmour.LivingArmour; +import WayofTime.bloodmagic.livingArmour.upgrade.LivingArmourUpgradePhysicalProtect; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.world.World; diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/StatTrackerPoison.java b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerPoison.java similarity index 90% rename from src/main/java/WayofTime/bloodmagic/livingArmour/StatTrackerPoison.java rename to src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerPoison.java index 78e605cb..95d573f0 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/StatTrackerPoison.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerPoison.java @@ -1,8 +1,10 @@ -package WayofTime.bloodmagic.livingArmour; +package WayofTime.bloodmagic.livingArmour.tracker; import java.util.ArrayList; import java.util.List; +import WayofTime.bloodmagic.livingArmour.LivingArmour; +import WayofTime.bloodmagic.livingArmour.upgrade.LivingArmourUpgradePoisonResist; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.potion.Potion; diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/StatTrackerSelfSacrifice.java b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerSelfSacrifice.java similarity index 92% rename from src/main/java/WayofTime/bloodmagic/livingArmour/StatTrackerSelfSacrifice.java rename to src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerSelfSacrifice.java index d60f8e57..20ea9180 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/StatTrackerSelfSacrifice.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerSelfSacrifice.java @@ -1,9 +1,11 @@ -package WayofTime.bloodmagic.livingArmour; +package WayofTime.bloodmagic.livingArmour.tracker; import java.util.ArrayList; import java.util.HashMap; import java.util.List; +import WayofTime.bloodmagic.livingArmour.LivingArmour; +import WayofTime.bloodmagic.livingArmour.upgrade.LivingArmourUpgradeSelfSacrifice; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.world.World; diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/LivingArmourUpgradeArrowShot.java b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeArrowShot.java similarity index 96% rename from src/main/java/WayofTime/bloodmagic/livingArmour/LivingArmourUpgradeArrowShot.java rename to src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeArrowShot.java index 68f72e3e..c405b3f3 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/LivingArmourUpgradeArrowShot.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeArrowShot.java @@ -1,4 +1,4 @@ -package WayofTime.bloodmagic.livingArmour; +package WayofTime.bloodmagic.livingArmour.upgrade; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.nbt.NBTTagCompound; diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/LivingArmourUpgradeDigging.java b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeDigging.java similarity index 95% rename from src/main/java/WayofTime/bloodmagic/livingArmour/LivingArmourUpgradeDigging.java rename to src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeDigging.java index dfb008c0..8222128a 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/LivingArmourUpgradeDigging.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeDigging.java @@ -1,7 +1,8 @@ -package WayofTime.bloodmagic.livingArmour; +package WayofTime.bloodmagic.livingArmour.upgrade; import java.util.HashMap; +import WayofTime.bloodmagic.livingArmour.LivingArmour; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.potion.Potion; diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/LivingArmourUpgradeHealthboost.java b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeHealthboost.java similarity index 97% rename from src/main/java/WayofTime/bloodmagic/livingArmour/LivingArmourUpgradeHealthboost.java rename to src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeHealthboost.java index 321a866e..a1322403 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/LivingArmourUpgradeHealthboost.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeHealthboost.java @@ -1,4 +1,4 @@ -package WayofTime.bloodmagic.livingArmour; +package WayofTime.bloodmagic.livingArmour.upgrade; import java.util.UUID; diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/LivingArmourUpgradeKnockbackResist.java b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeKnockbackResist.java similarity index 97% rename from src/main/java/WayofTime/bloodmagic/livingArmour/LivingArmourUpgradeKnockbackResist.java rename to src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeKnockbackResist.java index cfcb606c..e895f9a5 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/LivingArmourUpgradeKnockbackResist.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeKnockbackResist.java @@ -1,4 +1,4 @@ -package WayofTime.bloodmagic.livingArmour; +package WayofTime.bloodmagic.livingArmour.upgrade; import java.util.UUID; diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/LivingArmourUpgradeMeleeDamage.java b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeMeleeDamage.java similarity index 97% rename from src/main/java/WayofTime/bloodmagic/livingArmour/LivingArmourUpgradeMeleeDamage.java rename to src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeMeleeDamage.java index 870c07cd..9b6d9cc1 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/LivingArmourUpgradeMeleeDamage.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeMeleeDamage.java @@ -1,4 +1,4 @@ -package WayofTime.bloodmagic.livingArmour; +package WayofTime.bloodmagic.livingArmour.upgrade; import java.util.UUID; diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/LivingArmourUpgradePhysicalProtect.java b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradePhysicalProtect.java similarity index 96% rename from src/main/java/WayofTime/bloodmagic/livingArmour/LivingArmourUpgradePhysicalProtect.java rename to src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradePhysicalProtect.java index 0be2b1b8..787d63c3 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/LivingArmourUpgradePhysicalProtect.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradePhysicalProtect.java @@ -1,4 +1,4 @@ -package WayofTime.bloodmagic.livingArmour; +package WayofTime.bloodmagic.livingArmour.upgrade; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.DamageSource; diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/LivingArmourUpgradePoisonResist.java b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradePoisonResist.java similarity index 97% rename from src/main/java/WayofTime/bloodmagic/livingArmour/LivingArmourUpgradePoisonResist.java rename to src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradePoisonResist.java index b44512ae..3f966c0a 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/LivingArmourUpgradePoisonResist.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradePoisonResist.java @@ -1,4 +1,4 @@ -package WayofTime.bloodmagic.livingArmour; +package WayofTime.bloodmagic.livingArmour.upgrade; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.nbt.NBTTagCompound; diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/LivingArmourUpgradeSelfSacrifice.java b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeSelfSacrifice.java similarity index 96% rename from src/main/java/WayofTime/bloodmagic/livingArmour/LivingArmourUpgradeSelfSacrifice.java rename to src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeSelfSacrifice.java index 9436eb8a..e45cf683 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/LivingArmourUpgradeSelfSacrifice.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeSelfSacrifice.java @@ -1,4 +1,4 @@ -package WayofTime.bloodmagic.livingArmour; +package WayofTime.bloodmagic.livingArmour.upgrade; import net.minecraft.nbt.NBTTagCompound; import WayofTime.bloodmagic.api.Constants; diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/LivingArmourUpgradeSpeed.java b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeSpeed.java similarity index 98% rename from src/main/java/WayofTime/bloodmagic/livingArmour/LivingArmourUpgradeSpeed.java rename to src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeSpeed.java index 4a429042..91d99beb 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/LivingArmourUpgradeSpeed.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeSpeed.java @@ -1,4 +1,4 @@ -package WayofTime.bloodmagic.livingArmour; +package WayofTime.bloodmagic.livingArmour.upgrade; import java.util.UUID; diff --git a/src/main/java/WayofTime/bloodmagic/registry/ModArmourTrackers.java b/src/main/java/WayofTime/bloodmagic/registry/ModArmourTrackers.java index 88075bcc..065f9f54 100644 --- a/src/main/java/WayofTime/bloodmagic/registry/ModArmourTrackers.java +++ b/src/main/java/WayofTime/bloodmagic/registry/ModArmourTrackers.java @@ -1,23 +1,8 @@ package WayofTime.bloodmagic.registry; import WayofTime.bloodmagic.api.livingArmour.LivingArmourHandler; -import WayofTime.bloodmagic.livingArmour.LivingArmourUpgradeArrowShot; -import WayofTime.bloodmagic.livingArmour.LivingArmourUpgradeDigging; -import WayofTime.bloodmagic.livingArmour.LivingArmourUpgradeHealthboost; -import WayofTime.bloodmagic.livingArmour.LivingArmourUpgradeKnockbackResist; -import WayofTime.bloodmagic.livingArmour.LivingArmourUpgradeMeleeDamage; -import WayofTime.bloodmagic.livingArmour.LivingArmourUpgradePhysicalProtect; -import WayofTime.bloodmagic.livingArmour.LivingArmourUpgradePoisonResist; -import WayofTime.bloodmagic.livingArmour.LivingArmourUpgradeSelfSacrifice; -import WayofTime.bloodmagic.livingArmour.LivingArmourUpgradeSpeed; -import WayofTime.bloodmagic.livingArmour.StatTrackerDigging; -import WayofTime.bloodmagic.livingArmour.StatTrackerFood; -import WayofTime.bloodmagic.livingArmour.StatTrackerHealthboost; -import WayofTime.bloodmagic.livingArmour.StatTrackerMeleeDamage; -import WayofTime.bloodmagic.livingArmour.StatTrackerMovement; -import WayofTime.bloodmagic.livingArmour.StatTrackerPhysicalProtect; -import WayofTime.bloodmagic.livingArmour.StatTrackerPoison; -import WayofTime.bloodmagic.livingArmour.StatTrackerSelfSacrifice; +import WayofTime.bloodmagic.livingArmour.upgrade.*; +import WayofTime.bloodmagic.livingArmour.tracker.*; public class ModArmourTrackers { diff --git a/src/main/java/WayofTime/bloodmagic/util/handler/EventHandler.java b/src/main/java/WayofTime/bloodmagic/util/handler/EventHandler.java index 61b08def..95ff5451 100644 --- a/src/main/java/WayofTime/bloodmagic/util/handler/EventHandler.java +++ b/src/main/java/WayofTime/bloodmagic/util/handler/EventHandler.java @@ -46,15 +46,15 @@ import WayofTime.bloodmagic.item.ItemAltarMaker; import WayofTime.bloodmagic.item.armour.ItemLivingArmour; import WayofTime.bloodmagic.item.gear.ItemPackSacrifice; import WayofTime.bloodmagic.livingArmour.LivingArmour; -import WayofTime.bloodmagic.livingArmour.LivingArmourUpgradeArrowShot; -import WayofTime.bloodmagic.livingArmour.LivingArmourUpgradeDigging; -import WayofTime.bloodmagic.livingArmour.LivingArmourUpgradeSelfSacrifice; -import WayofTime.bloodmagic.livingArmour.StatTrackerArrowShot; -import WayofTime.bloodmagic.livingArmour.StatTrackerDigging; -import WayofTime.bloodmagic.livingArmour.StatTrackerHealthboost; -import WayofTime.bloodmagic.livingArmour.StatTrackerMeleeDamage; -import WayofTime.bloodmagic.livingArmour.StatTrackerPhysicalProtect; -import WayofTime.bloodmagic.livingArmour.StatTrackerSelfSacrifice; +import WayofTime.bloodmagic.livingArmour.upgrade.LivingArmourUpgradeArrowShot; +import WayofTime.bloodmagic.livingArmour.upgrade.LivingArmourUpgradeDigging; +import WayofTime.bloodmagic.livingArmour.upgrade.LivingArmourUpgradeSelfSacrifice; +import WayofTime.bloodmagic.livingArmour.tracker.StatTrackerArrowShot; +import WayofTime.bloodmagic.livingArmour.tracker.StatTrackerDigging; +import WayofTime.bloodmagic.livingArmour.tracker.StatTrackerHealthboost; +import WayofTime.bloodmagic.livingArmour.tracker.StatTrackerMeleeDamage; +import WayofTime.bloodmagic.livingArmour.tracker.StatTrackerPhysicalProtect; +import WayofTime.bloodmagic.livingArmour.tracker.StatTrackerSelfSacrifice; import WayofTime.bloodmagic.registry.ModBlocks; import WayofTime.bloodmagic.registry.ModItems; import WayofTime.bloodmagic.registry.ModPotions;