From 65dd24b19bdabde074f30b71cfefbd8b133f62be Mon Sep 17 00:00:00 2001 From: Nick Date: Tue, 16 Feb 2016 15:45:44 -0800 Subject: [PATCH] Move Revealing upgrade to tc compat class/package --- .../compat/thaumcraft/CompatibilityThaumcraft.java | 3 +-- .../thaumcraft/LivingArmourUpgradeThaumRevealing.java} | 6 +++--- .../WayofTime/bloodmagic/registry/ModArmourTrackers.java | 2 -- 3 files changed, 4 insertions(+), 7 deletions(-) rename src/main/java/WayofTime/bloodmagic/{livingArmour/upgrade/LivingArmourUpgradeRevealing.java => compat/thaumcraft/LivingArmourUpgradeThaumRevealing.java} (79%) diff --git a/src/main/java/WayofTime/bloodmagic/compat/thaumcraft/CompatibilityThaumcraft.java b/src/main/java/WayofTime/bloodmagic/compat/thaumcraft/CompatibilityThaumcraft.java index 1fd11714..d385f2b1 100644 --- a/src/main/java/WayofTime/bloodmagic/compat/thaumcraft/CompatibilityThaumcraft.java +++ b/src/main/java/WayofTime/bloodmagic/compat/thaumcraft/CompatibilityThaumcraft.java @@ -2,8 +2,6 @@ package WayofTime.bloodmagic.compat.thaumcraft; import WayofTime.bloodmagic.api.livingArmour.LivingArmourHandler; import WayofTime.bloodmagic.compat.ICompatibility; -import WayofTime.bloodmagic.compat.thaumcraft.LivingArmourUpgradeThaumRunicShielding; -import WayofTime.bloodmagic.compat.thaumcraft.StatTrackerThaumRunicShielding; import WayofTime.bloodmagic.compat.thaumcraft.research.BloodMagicResearch; public class CompatibilityThaumcraft implements ICompatibility @@ -18,6 +16,7 @@ public class CompatibilityThaumcraft implements ICompatibility LivingArmourHandler.registerStatTracker(StatTrackerThaumRunicShielding.class); LivingArmourHandler.registerArmourUpgrade(new LivingArmourUpgradeThaumRunicShielding(0)); + LivingArmourHandler.registerArmourUpgrade(new LivingArmourUpgradeThaumRevealing(0)); } } diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeRevealing.java b/src/main/java/WayofTime/bloodmagic/compat/thaumcraft/LivingArmourUpgradeThaumRevealing.java similarity index 79% rename from src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeRevealing.java rename to src/main/java/WayofTime/bloodmagic/compat/thaumcraft/LivingArmourUpgradeThaumRevealing.java index b0e48348..1e511693 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeRevealing.java +++ b/src/main/java/WayofTime/bloodmagic/compat/thaumcraft/LivingArmourUpgradeThaumRevealing.java @@ -1,12 +1,12 @@ -package WayofTime.bloodmagic.livingArmour.upgrade; +package WayofTime.bloodmagic.compat.thaumcraft; import WayofTime.bloodmagic.api.Constants; import WayofTime.bloodmagic.api.livingArmour.LivingArmourUpgrade; import net.minecraft.nbt.NBTTagCompound; -public class LivingArmourUpgradeRevealing extends LivingArmourUpgrade { +public class LivingArmourUpgradeThaumRevealing extends LivingArmourUpgrade { - public LivingArmourUpgradeRevealing(int level) { + public LivingArmourUpgradeThaumRevealing(int level) { super(level); } diff --git a/src/main/java/WayofTime/bloodmagic/registry/ModArmourTrackers.java b/src/main/java/WayofTime/bloodmagic/registry/ModArmourTrackers.java index ada009ec..d04ad6ab 100644 --- a/src/main/java/WayofTime/bloodmagic/registry/ModArmourTrackers.java +++ b/src/main/java/WayofTime/bloodmagic/registry/ModArmourTrackers.java @@ -20,7 +20,6 @@ import WayofTime.bloodmagic.livingArmour.upgrade.LivingArmourUpgradeKnockbackRes import WayofTime.bloodmagic.livingArmour.upgrade.LivingArmourUpgradeMeleeDamage; import WayofTime.bloodmagic.livingArmour.upgrade.LivingArmourUpgradePhysicalProtect; import WayofTime.bloodmagic.livingArmour.upgrade.LivingArmourUpgradePoisonResist; -import WayofTime.bloodmagic.livingArmour.upgrade.LivingArmourUpgradeRevealing; import WayofTime.bloodmagic.livingArmour.upgrade.LivingArmourUpgradeSelfSacrifice; import WayofTime.bloodmagic.livingArmour.upgrade.LivingArmourUpgradeSolarPowered; import WayofTime.bloodmagic.livingArmour.upgrade.LivingArmourUpgradeSpeed; @@ -53,7 +52,6 @@ public class ModArmourTrackers LivingArmourHandler.registerArmourUpgrade(new LivingArmourUpgradeArrowShot(0)); LivingArmourHandler.registerArmourUpgrade(new LivingArmourUpgradeStepAssist(0)); LivingArmourHandler.registerArmourUpgrade(new LivingArmourUpgradeGrimReaperSprint(0)); - LivingArmourHandler.registerArmourUpgrade(new LivingArmourUpgradeRevealing(0)); LivingArmourHandler.registerArmourUpgrade(new LivingArmourUpgradeSolarPowered(0)); } }