diff --git a/src/main/java/WayofTime/alchemicalWizardry/AlchemicalWizardry.java b/src/main/java/WayofTime/alchemicalWizardry/AlchemicalWizardry.java index 86496076..a76b1bad 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/AlchemicalWizardry.java +++ b/src/main/java/WayofTime/alchemicalWizardry/AlchemicalWizardry.java @@ -11,6 +11,7 @@ import java.util.List; import java.util.zip.ZipEntry; import java.util.zip.ZipInputStream; +import WayofTime.alchemicalWizardry.common.potion.*; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.init.Blocks; import net.minecraft.init.Items; @@ -129,23 +130,6 @@ import WayofTime.alchemicalWizardry.common.omega.OmegaParadigmFire; import WayofTime.alchemicalWizardry.common.omega.OmegaParadigmWater; import WayofTime.alchemicalWizardry.common.omega.OmegaParadigmWind; import WayofTime.alchemicalWizardry.common.omega.OmegaRegistry; -import WayofTime.alchemicalWizardry.common.potion.PotionAmphibian; -import WayofTime.alchemicalWizardry.common.potion.PotionBoost; -import WayofTime.alchemicalWizardry.common.potion.PotionDeaf; -import WayofTime.alchemicalWizardry.common.potion.PotionDemonCloak; -import WayofTime.alchemicalWizardry.common.potion.PotionDrowning; -import WayofTime.alchemicalWizardry.common.potion.PotionFeatherFall; -import WayofTime.alchemicalWizardry.common.potion.PotionFireFuse; -import WayofTime.alchemicalWizardry.common.potion.PotionFlameCloak; -import WayofTime.alchemicalWizardry.common.potion.PotionFlight; -import WayofTime.alchemicalWizardry.common.potion.PotionHeavyHeart; -import WayofTime.alchemicalWizardry.common.potion.PotionIceCloak; -import WayofTime.alchemicalWizardry.common.potion.PotionInhibit; -import WayofTime.alchemicalWizardry.common.potion.PotionPlanarBinding; -import WayofTime.alchemicalWizardry.common.potion.PotionProjectileProtect; -import WayofTime.alchemicalWizardry.common.potion.PotionReciprocation; -import WayofTime.alchemicalWizardry.common.potion.PotionSoulFray; -import WayofTime.alchemicalWizardry.common.potion.PotionSoulHarden; import WayofTime.alchemicalWizardry.common.renderer.AlchemyCircleRenderer; import WayofTime.alchemicalWizardry.common.rituals.RitualEffectAnimalGrowth; import WayofTime.alchemicalWizardry.common.rituals.RitualEffectAutoAlchemy; @@ -731,23 +715,23 @@ public class AlchemicalWizardry GameRegistry.addRecipe(new ShapedBloodOrbRecipe(new ItemStack(ModItems.itemBloodLightSigil), "btb", "sss", "bob", 'o', magicianBloodOrbStack, 'b', glowstoneBlockStack, 't', new ItemStack(Blocks.torch), 's', imbuedSlateStack)); GameRegistry.addRecipe(new ItemStack(ModItems.itemKeyOfDiablo), " gw", "gdg", "wg ", 'w', weakBloodShardStack, 'g', goldIngotStack, 'd', diamondStack); GameRegistry.addRecipe(new ItemStack(ModItems.itemBloodPack), "gbg","flf","gsg",'s', blankSlateStack,'g', glassStack,'f',new ItemStack(Items.flint,1,craftingConstant),'b', emptyBucketStack, 'l', new ItemStack(Items.leather_chestplate)); - customPotionDrowning = (new PotionDrowning(customPotionDrowningID, true, 0)).setIconIndex(0, 0).setPotionName("Drowning"); - customPotionBoost = (new PotionBoost(customPotionBoostID, false, 0)).setIconIndex(0, 0).setPotionName("Boost"); - customPotionProjProt = (new PotionProjectileProtect(customPotionProjProtID, false, 0)).setIconIndex(0, 0).setPotionName("Whirlwind"); - customPotionInhibit = (new PotionInhibit(customPotionInhibitID, false, 0)).setIconIndex(0, 0).setPotionName("Inhibit"); - customPotionFlight = (new PotionFlight(customPotionFlightID, false, 0)).setIconIndex(0, 0).setPotionName("Flight"); - customPotionReciprocation = (new PotionReciprocation(customPotionReciprocationID, false, 0xFFFFFF)).setIconIndex(0, 0).setPotionName("Reciprocation"); - customPotionFlameCloak = (new PotionFlameCloak(customPotionFlameCloakID, false, 0).setIconIndex(0, 0).setPotionName("Flame Cloak")); - customPotionIceCloak = (new PotionIceCloak(customPotionIceCloakID, false, 0).setIconIndex(0, 0).setPotionName("Ice Cloak")); - customPotionHeavyHeart = (new PotionHeavyHeart(customPotionHeavyHeartID, true, 0).setIconIndex(0, 0).setPotionName("Heavy Heart")); - customPotionFireFuse = (new PotionFireFuse(customPotionFireFuseID, true, 0).setIconIndex(0, 0).setPotionName("Fire Fuse")); - customPotionPlanarBinding = (new PotionPlanarBinding(customPotionPlanarBindingID, true, 0).setIconIndex(0, 0).setPotionName("Planar Binding")); - customPotionSoulFray = (new PotionSoulFray(customPotionSoulFrayID, true, 0).setIconIndex(0, 0).setPotionName("Soul Fray")); - customPotionSoulHarden = (new PotionSoulHarden(customPotionSoulHardenID, false, 0).setIconIndex(0, 0).setPotionName("Soul Harden")); - customPotionDeaf = (new PotionDeaf(customPotionDeafID, true, 0).setIconIndex(0, 0).setPotionName("Deafness")); - customPotionFeatherFall = (new PotionFeatherFall(customPotionFeatherFallID, false, 0).setIconIndex(0, 0).setPotionName("Feather Fall")); - customPotionDemonCloak = (new PotionDemonCloak(customPotionDemonCloakID, false, 0).setIconIndex(0, 0).setPotionName("Demon Cloaking")); - customPotionAmphibian = (new PotionAmphibian(customPotionAmphibianID, false, 0).setIconIndex(0, 0).setPotionName("Amphibian")); + customPotionDrowning = (new PotionBloodMagic(customPotionDrowningID, true, 0)).setIconIndex(0, 0).setPotionName("Drowning"); + customPotionBoost = (new PotionBloodMagic(customPotionBoostID, false, 0)).setIconIndex(0, 0).setPotionName("Boost"); + customPotionProjProt = (new PotionBloodMagic(customPotionProjProtID, false, 0)).setIconIndex(0, 0).setPotionName("Whirlwind"); + customPotionInhibit = (new PotionBloodMagic(customPotionInhibitID, false, 0)).setIconIndex(0, 0).setPotionName("Inhibit"); + customPotionFlight = (new PotionBloodMagic(customPotionFlightID, false, 0)).setIconIndex(0, 0).setPotionName("Flight"); + customPotionReciprocation = (new PotionBloodMagic(customPotionReciprocationID, false, 0xFFFFFF)).setIconIndex(0, 0).setPotionName("Reciprocation"); + customPotionFlameCloak = (new PotionBloodMagic(customPotionFlameCloakID, false, 0).setIconIndex(0, 0).setPotionName("Flame Cloak")); + customPotionIceCloak = (new PotionBloodMagic(customPotionIceCloakID, false, 0).setIconIndex(0, 0).setPotionName("Ice Cloak")); + customPotionHeavyHeart = (new PotionBloodMagic(customPotionHeavyHeartID, true, 0).setIconIndex(0, 0).setPotionName("Heavy Heart")); + customPotionFireFuse = (new PotionBloodMagic(customPotionFireFuseID, true, 0).setIconIndex(0, 0).setPotionName("Fire Fuse")); + customPotionPlanarBinding = (new PotionBloodMagic(customPotionPlanarBindingID, true, 0).setIconIndex(0, 0).setPotionName("Planar Binding")); + customPotionSoulFray = (new PotionBloodMagic(customPotionSoulFrayID, true, 0).setIconIndex(0, 0).setPotionName("Soul Fray")); + customPotionSoulHarden = (new PotionBloodMagic(customPotionSoulHardenID, false, 0).setIconIndex(0, 0).setPotionName("Soul Harden")); + customPotionDeaf = (new PotionBloodMagic(customPotionDeafID, true, 0).setIconIndex(0, 0).setPotionName("Deafness")); + customPotionFeatherFall = (new PotionBloodMagic(customPotionFeatherFallID, false, 0).setIconIndex(0, 0).setPotionName("Feather Fall")); + customPotionDemonCloak = (new PotionBloodMagic(customPotionDemonCloakID, false, 0).setIconIndex(0, 0).setPotionName("Demon Cloaking")); + customPotionAmphibian = (new PotionBloodMagic(customPotionAmphibianID, false, 0).setIconIndex(0, 0).setPotionName("Amphibian")); ItemStack masterBloodOrbStack = new ItemStack(ModItems.masterBloodOrb); ItemStack transcendentBloodOrbStack = new ItemStack(ModItems.transcendentBloodOrb); diff --git a/src/main/java/WayofTime/alchemicalWizardry/ModItems.java b/src/main/java/WayofTime/alchemicalWizardry/ModItems.java index 4b6cf98b..97f51174 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/ModItems.java +++ b/src/main/java/WayofTime/alchemicalWizardry/ModItems.java @@ -6,7 +6,7 @@ import net.minecraft.item.Item; import net.minecraftforge.fml.common.registry.GameRegistry; import WayofTime.alchemicalWizardry.api.items.ItemSpellMultiTool; import WayofTime.alchemicalWizardry.api.spell.SpellParadigmTool; -import WayofTime.alchemicalWizardry.common.items.AWBaseItems; +import WayofTime.alchemicalWizardry.common.items.BaseItems; import WayofTime.alchemicalWizardry.common.items.ActivationCrystal; import WayofTime.alchemicalWizardry.common.items.AirScribeTool; import WayofTime.alchemicalWizardry.common.items.ApprenticeBloodOrb; @@ -17,17 +17,17 @@ import WayofTime.alchemicalWizardry.common.items.BloodShard; import WayofTime.alchemicalWizardry.common.items.BoundAxe; import WayofTime.alchemicalWizardry.common.items.BoundPickaxe; import WayofTime.alchemicalWizardry.common.items.BoundShovel; -import WayofTime.alchemicalWizardry.common.items.CheatyItem; +import WayofTime.alchemicalWizardry.common.items.CreativeOrb; import WayofTime.alchemicalWizardry.common.items.CreativeDagger; import WayofTime.alchemicalWizardry.common.items.DaggerOfSacrifice; import WayofTime.alchemicalWizardry.common.items.DawnScribeTool; -import WayofTime.alchemicalWizardry.common.items.DemonPlacer; +import WayofTime.alchemicalWizardry.common.items.DemonCrystal; import WayofTime.alchemicalWizardry.common.items.DemonicTelepositionFocus; import WayofTime.alchemicalWizardry.common.items.DuskScribeTool; import WayofTime.alchemicalWizardry.common.items.EarthScribeTool; -import WayofTime.alchemicalWizardry.common.items.EnergyBattery; +import WayofTime.alchemicalWizardry.common.items.Orb; import WayofTime.alchemicalWizardry.common.items.EnergyBazooka; -import WayofTime.alchemicalWizardry.common.items.EnergyBlast; +import WayofTime.alchemicalWizardry.common.items.EnergyBlaster; import WayofTime.alchemicalWizardry.common.items.BoundBlade; import WayofTime.alchemicalWizardry.common.items.EnhancedTelepositionFocus; import WayofTime.alchemicalWizardry.common.items.FireScribeTool; @@ -35,7 +35,7 @@ import WayofTime.alchemicalWizardry.common.items.ItemAlchemyBase; import WayofTime.alchemicalWizardry.common.items.ItemBloodLetterPack; import WayofTime.alchemicalWizardry.common.items.ItemComplexSpellCrystal; import WayofTime.alchemicalWizardry.common.items.ItemComponents; -import WayofTime.alchemicalWizardry.common.items.ItemDiabloKey; +import WayofTime.alchemicalWizardry.common.items.KeyOfBinding; import WayofTime.alchemicalWizardry.common.items.ItemIncense; import WayofTime.alchemicalWizardry.common.items.ItemRitualDismantler; import WayofTime.alchemicalWizardry.common.items.ItemRitualDiviner; @@ -53,9 +53,9 @@ import WayofTime.alchemicalWizardry.common.items.armour.OmegaArmourEarth; import WayofTime.alchemicalWizardry.common.items.armour.OmegaArmourFire; import WayofTime.alchemicalWizardry.common.items.armour.OmegaArmourWater; import WayofTime.alchemicalWizardry.common.items.armour.OmegaArmourWind; -import WayofTime.alchemicalWizardry.common.items.energy.ItemAttunedCrystal; -import WayofTime.alchemicalWizardry.common.items.energy.ItemDestinationClearer; -import WayofTime.alchemicalWizardry.common.items.energy.ItemTankSegmenter; +import WayofTime.alchemicalWizardry.common.items.energy.AlchemicalRouter; +import WayofTime.alchemicalWizardry.common.items.energy.AlchemicalCleanser; +import WayofTime.alchemicalWizardry.common.items.energy.AlchemicalSegmenter; import WayofTime.alchemicalWizardry.common.items.potion.AlchemyFlask; import WayofTime.alchemicalWizardry.common.items.potion.AlchemyReagent; import WayofTime.alchemicalWizardry.common.items.potion.AverageLengtheningCatalyst; @@ -250,20 +250,20 @@ public class ModItems public static void init() { - weakBloodOrb = registerItem(new EnergyBattery(5000), "weak_blood_orb"); + weakBloodOrb = registerItem(new Orb(5000), "weak_blood_orb"); apprenticeBloodOrb = registerItem(new ApprenticeBloodOrb(25000), "apprentice_blood_orb"); magicianBloodOrb = registerItem(new MagicianBloodOrb(150000), "magician_blood_orb"); masterBloodOrb = registerItem(new MasterBloodOrb(1000000), "master_blood_orb"); archmageBloodOrb = registerItem(new ArchmageBloodOrb(10000000), "archmage_blood_orb"); transcendentBloodOrb = registerItem(new TranscendentBloodOrb(30000000), "transcendent_blood_orb"); - energyBlaster = registerItem(new EnergyBlast(), "energy_blaster"); + energyBlaster = registerItem(new EnergyBlaster(), "energy_blaster"); energySword = registerItem(new BoundBlade(), "bound_blade"); lavaCrystal = registerItem(new LavaCrystal(), "lava_crystal"); waterSigil = registerItem(new SigilWater(), "water_sigil"); lavaSigil = registerItem(new SigilLava(), "lava_sigil"); voidSigil = registerItem(new SigilVoid(), "void_sigil"); - blankSlate = registerItem(new AWBaseItems(), "blank_slate"); - reinforcedSlate = registerItem(new AWBaseItems(), "reinforced_slate"); + blankSlate = registerItem(new BaseItems(), "blank_slate"); + reinforcedSlate = registerItem(new BaseItems(), "reinforced_slate"); sacrificialDagger = registerItem(new SacrificialDagger(), "sacrificial_agger"); daggerOfSacrifice = registerItem(new DaggerOfSacrifice(), "dagger_of_sacrifice"); airSigil = registerItem(new SigilAir(), "air_sigil"); @@ -311,13 +311,13 @@ public class ModItems enhancedTelepositionFocus = registerItem(new EnhancedTelepositionFocus(), "enhanced_teleposition_focus"); reinforcedTelepositionFocus = registerItem(new ReinforcedTelepositionFocus(), "reinforced_teleposition_focus"); demonicTelepositionFocus = registerItem(new DemonicTelepositionFocus(), "demonic_teleposition_focus"); - imbuedSlate = registerItem(new AWBaseItems(), "imbued_slate"); - demonicSlate = registerItem(new AWBaseItems(), "demonic_slate"); + imbuedSlate = registerItem(new BaseItems(), "imbued_slate"); + demonicSlate = registerItem(new BaseItems(), "demonic_slate"); duskScribeTool = registerItem(new DuskScribeTool(), "dusk_scribe_tool"); sigilOfTheBridge = registerItem(new SigilOfTheBridge(), "sigil_of_the_bridge"); armourInhibitor = registerItem(new ArmourInhibitor(), "armour_inhibitor"); - creativeFiller = registerItem(new CheatyItem(), "creative_orb"); - demonPlacer = registerItem(new DemonPlacer(), "demon_placer"); + creativeFiller = registerItem(new CreativeOrb(), "creative_orb"); + demonPlacer = registerItem(new DemonCrystal(), "demon_crystal"); creativeDagger = registerItem(new CreativeDagger(), "creative_dagger"); weakFillingAgent = registerItem(new WeakFillingAgent(), "weak_filling_agent"); standardFillingAgent = registerItem(new StandardFillingAgent(), "standard_filling_agent"); @@ -325,7 +325,7 @@ public class ModItems weakBindingAgent = registerItem(new WeakBindingAgent(), "weak_binding_agent"); itemRitualDiviner = registerItem(new ItemRitualDiviner(), "ritual_diviner"); sigilOfMagnetism = registerItem(new SigilOfMagnetism(), "sigil_of_magnetism"); - itemKeyOfDiablo = registerItem(new ItemDiabloKey(), "key_of_binding"); + itemKeyOfDiablo = registerItem(new KeyOfBinding(), "key_of_binding"); energyBazooka = registerItem(new EnergyBazooka(), "energy_bazooka"); itemBloodLightSigil = registerItem(new SigilBloodLight(), "blood_light_sigil"); itemComplexSpellCrystal = registerItem(new ItemComplexSpellCrystal(), "complex_spell_crystal"); @@ -341,9 +341,9 @@ public class ModItems SpellParadigmTool.customTool = customTool; itemCombinationalCatalyst = registerItem(new CombinationalCatalyst(), "combinational_catalyst"); - itemAttunedCrystal = registerItem(new ItemAttunedCrystal(), "attuned_crystal"); - itemTankSegmenter = registerItem(new ItemTankSegmenter(), "tank_segmenter"); - itemDestinationClearer = registerItem(new ItemDestinationClearer(), "destination_clearer"); + itemAttunedCrystal = registerItem(new AlchemicalRouter(), "alchemical_router"); + itemTankSegmenter = registerItem(new AlchemicalSegmenter(), "alchemical_segmenter"); + itemDestinationClearer = registerItem(new AlchemicalCleanser(), "alchemical_cleanser"); dawnScribeTool = registerItem(new DawnScribeTool(), "dawn_scribe_tool"); diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/block/BlockAltar.java b/src/main/java/WayofTime/alchemicalWizardry/common/block/BlockAltar.java index 736658bd..9397611b 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/block/BlockAltar.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/block/BlockAltar.java @@ -16,7 +16,7 @@ import net.minecraft.util.EnumFacing; import net.minecraft.world.World; import WayofTime.alchemicalWizardry.ModItems; import WayofTime.alchemicalWizardry.api.items.IAltarManipulator; -import WayofTime.alchemicalWizardry.common.items.EnergyBattery; +import WayofTime.alchemicalWizardry.common.items.Orb; import WayofTime.alchemicalWizardry.common.items.sigil.holding.SigilOfHolding; import WayofTime.alchemicalWizardry.common.tileEntity.TEAltar; import net.minecraftforge.fml.relauncher.Side; @@ -46,9 +46,9 @@ public class BlockAltar extends BlockContainer { ItemStack stack = ((TEAltar) tile).getStackInSlot(0); - if (stack != null && stack.getItem() instanceof EnergyBattery) + if (stack != null && stack.getItem() instanceof Orb) { - EnergyBattery bloodOrb = (EnergyBattery) stack.getItem(); + Orb bloodOrb = (Orb) stack.getItem(); int maxEssence = bloodOrb.getMaxEssence(); int currentEssence = bloodOrb.getCurrentEssence(stack); int level = currentEssence * 15 / maxEssence; diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/entity/mob/EntityDemon.java b/src/main/java/WayofTime/alchemicalWizardry/common/entity/mob/EntityDemon.java index ad095378..e87ee5a8 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/entity/mob/EntityDemon.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/entity/mob/EntityDemon.java @@ -19,7 +19,7 @@ import net.minecraft.util.DamageSource; import net.minecraft.world.World; import WayofTime.alchemicalWizardry.ModItems; import WayofTime.alchemicalWizardry.common.IDemon; -import WayofTime.alchemicalWizardry.common.items.DemonPlacer; +import WayofTime.alchemicalWizardry.common.items.DemonCrystal; import WayofTime.alchemicalWizardry.common.spell.complex.effect.SpellHelper; public class EntityDemon extends EntityTameable implements IDemon @@ -103,11 +103,11 @@ public class EntityDemon extends EntityTameable implements IDemon { ItemStack drop = new ItemStack(ModItems.demonPlacer); - DemonPlacer.setDemonString(drop, this.getDemonID()); + DemonCrystal.setDemonString(drop, this.getDemonID()); if ((this.getOwner() instanceof EntityPlayer)) { - DemonPlacer.setOwnerName(drop, SpellHelper.getUsername((EntityPlayer) this.getOwner())); + DemonCrystal.setOwnerName(drop, SpellHelper.getUsername((EntityPlayer) this.getOwner())); } if (this.hasCustomName()) diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/ActivationCrystal.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/ActivationCrystal.java index 53825022..f38bce26 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/ActivationCrystal.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/ActivationCrystal.java @@ -15,12 +15,11 @@ import net.minecraftforge.fml.relauncher.SideOnly; import org.lwjgl.input.Keyboard; -import WayofTime.alchemicalWizardry.AlchemicalWizardry; import WayofTime.alchemicalWizardry.api.alchemy.AlchemyRecipeRegistry; -public class ActivationCrystal extends EnergyItems +public class ActivationCrystal extends BindableItems { - private static final String[] ACTIVATION_CRYSTAL_NAMES = new String[]{"weak", "awakened", "creative"}; + private final String[] ACTIVATION_CRYSTAL_NAMES = new String[]{"weak", "awakened", "creative"}; public ActivationCrystal() { @@ -86,7 +85,7 @@ public class ActivationCrystal extends EnergyItems @Override public ItemStack onItemRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer) { - EnergyItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer); + BindableItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer); return par1ItemStack; } diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/AirScribeTool.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/AirScribeTool.java index d3332bbc..6934b94d 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/AirScribeTool.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/AirScribeTool.java @@ -1,6 +1,5 @@ package WayofTime.alchemicalWizardry.common.items; - public class AirScribeTool extends ScribeTool { public AirScribeTool() diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/ApprenticeBloodOrb.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/ApprenticeBloodOrb.java index 64432cd8..bef0d188 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/ApprenticeBloodOrb.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/ApprenticeBloodOrb.java @@ -1,7 +1,6 @@ package WayofTime.alchemicalWizardry.common.items; - -public class ApprenticeBloodOrb extends EnergyBattery +public class ApprenticeBloodOrb extends Orb { public ApprenticeBloodOrb(int damage) { diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/ArchmageBloodOrb.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/ArchmageBloodOrb.java index ae0ef586..01a53cd3 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/ArchmageBloodOrb.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/ArchmageBloodOrb.java @@ -1,7 +1,6 @@ package WayofTime.alchemicalWizardry.common.items; - -public class ArchmageBloodOrb extends EnergyBattery +public class ArchmageBloodOrb extends Orb { public ArchmageBloodOrb(int damage) { diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/ArmourInhibitor.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/ArmourInhibitor.java index 20fd9f0c..5c9ffbd4 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/ArmourInhibitor.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/ArmourInhibitor.java @@ -11,16 +11,13 @@ import net.minecraft.util.StatCollector; import net.minecraft.world.World; import WayofTime.alchemicalWizardry.AlchemicalWizardry; -public class ArmourInhibitor extends EnergyItems +public class ArmourInhibitor extends BindableItems { - private int tickDelay = 200; - public ArmourInhibitor() { super(); this.maxStackSize = 1; setEnergyUsed(0); - setCreativeTab(AlchemicalWizardry.tabBloodMagic); } @Override @@ -46,7 +43,9 @@ public class ArmourInhibitor extends EnergyItems @Override public ItemStack onItemRightClick(ItemStack stack, World world, EntityPlayer player) { - if (!EnergyItems.checkAndSetItemOwner(stack, player) || player.isSneaking()) + int tickDelay = 200; + + if (!BindableItems.checkAndSetItemOwner(stack, player) || player.isSneaking()) { return stack; } @@ -88,7 +87,7 @@ public class ArmourInhibitor extends EnergyItems if (stack.getTagCompound().getBoolean("isActive")) { - if (world.getWorldTime() % tickDelay == stack.getTagCompound().getInteger("worldTimeDelay")) +// if (world.getWorldTime() % tickDelay == stack.getTagCompound().getInteger("worldTimeDelay")) { } diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/AWBaseItems.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/BaseItems.java similarity index 73% rename from src/main/java/WayofTime/alchemicalWizardry/common/items/AWBaseItems.java rename to src/main/java/WayofTime/alchemicalWizardry/common/items/BaseItems.java index f45f9ae2..943734d1 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/AWBaseItems.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/BaseItems.java @@ -6,15 +6,12 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.StatCollector; -import WayofTime.alchemicalWizardry.AlchemicalWizardry; -public class AWBaseItems extends Item +public class BaseItems extends Item { - public AWBaseItems() + public BaseItems() { super(); - setMaxStackSize(64); - setCreativeTab(AlchemicalWizardry.tabBloodMagic); } @Override diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/EnergyItems.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/BindableItems.java similarity index 97% rename from src/main/java/WayofTime/alchemicalWizardry/common/items/EnergyItems.java rename to src/main/java/WayofTime/alchemicalWizardry/common/items/BindableItems.java index 5f487513..2ccd7c81 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/EnergyItems.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/BindableItems.java @@ -1,6 +1,5 @@ package WayofTime.alchemicalWizardry.common.items; -import WayofTime.alchemicalWizardry.AlchemicalWizardry; import WayofTime.alchemicalWizardry.api.items.interfaces.IBindable; import WayofTime.alchemicalWizardry.api.soulNetwork.LifeEssenceNetwork; import WayofTime.alchemicalWizardry.api.soulNetwork.SoulNetworkHandler; @@ -14,14 +13,13 @@ import net.minecraft.util.DamageSource; import net.minecraft.util.EnumParticleTypes; import net.minecraft.world.World; -public class EnergyItems extends Item implements IBindable +public class BindableItems extends Item implements IBindable { private int energyUsed; - public EnergyItems() + public BindableItems() { super(); - setCreativeTab(AlchemicalWizardry.tabBloodMagic); } protected void setEnergyUsed(int par1int) diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/BlankSpell.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/BlankSpell.java index 6c73547c..c0cbf1e6 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/BlankSpell.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/BlankSpell.java @@ -2,6 +2,7 @@ package WayofTime.alchemicalWizardry.common.items; import java.util.List; +import WayofTime.alchemicalWizardry.common.tileEntity.TESpellTable; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; @@ -10,16 +11,13 @@ import net.minecraft.util.BlockPos; import net.minecraft.util.StatCollector; import net.minecraft.world.World; import net.minecraftforge.common.DimensionManager; -import WayofTime.alchemicalWizardry.AlchemicalWizardry; -import WayofTime.alchemicalWizardry.common.tileEntity.TEHomHeart; -public class BlankSpell extends EnergyItems +public class BlankSpell extends BindableItems { public BlankSpell() { super(); this.setMaxStackSize(1); - setCreativeTab(AlchemicalWizardry.tabBloodMagic); } @Override @@ -44,7 +42,7 @@ public class BlankSpell extends EnergyItems @Override public ItemStack onItemRightClick(ItemStack stack, World world, EntityPlayer player) { - if (!EnergyItems.checkAndSetItemOwner(stack, player) || player.isSneaking()) + if (!BindableItems.checkAndSetItemOwner(stack, player) || player.isSneaking()) { return stack; } @@ -58,15 +56,15 @@ public class BlankSpell extends EnergyItems NBTTagCompound itemTag = stack.getTagCompound(); TileEntity tileEntity = newWorld.getTileEntity(new BlockPos(itemTag.getInteger("xCoord"), itemTag.getInteger("yCoord"), itemTag.getInteger("zCoord"))); - if (tileEntity instanceof TEHomHeart) + if (tileEntity instanceof TESpellTable) { - TEHomHeart homHeart = (TEHomHeart) tileEntity; + TESpellTable homHeart = (TESpellTable) tileEntity; - if (homHeart.canCastSpell(stack, world, player)) + if (homHeart.canCastSpell()) { - if(EnergyItems.syphonBatteries(stack, player, homHeart.getCostForSpell())) + if(BindableItems.syphonBatteries(stack, player, homHeart.getCostForSpell())) { - EnergyItems.syphonBatteries(stack, player, homHeart.castSpell(stack, world, player)); + BindableItems.syphonBatteries(stack, player, homHeart.castSpell(stack, world, player)); } } else { diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/BloodShard.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/BloodShard.java index ab74e4cb..1c1adf9e 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/BloodShard.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/BloodShard.java @@ -4,7 +4,6 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.world.World; -import WayofTime.alchemicalWizardry.AlchemicalWizardry; import WayofTime.alchemicalWizardry.ModItems; import WayofTime.alchemicalWizardry.api.items.interfaces.ArmourUpgrade; @@ -13,8 +12,6 @@ public class BloodShard extends Item implements ArmourUpgrade public BloodShard() { super(); - this.maxStackSize = 64; - setCreativeTab(AlchemicalWizardry.tabBloodMagic); } public int getBloodShardLevel() @@ -31,9 +28,7 @@ public class BloodShard extends Item implements ArmourUpgrade } @Override - public void onArmourUpdate(World world, EntityPlayer player, ItemStack thisItemStack) - { - } + public void onArmourUpdate(World world, EntityPlayer player, ItemStack thisItemStack) {} @Override public boolean isUpgrade() diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/BoundAxe.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/BoundAxe.java index f5ab984c..cbeefaef 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/BoundAxe.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/BoundAxe.java @@ -33,10 +33,9 @@ public class BoundAxe extends ItemAxe implements IBindable public BoundAxe() { super(AlchemicalWizardry.bloodBoundToolMaterial); - this.maxStackSize = 1; + setMaxStackSize(1); this.efficiencyOnProperMaterial = 12.0F; this.damageVsEntity = 5; - setCreativeTab(AlchemicalWizardry.tabBloodMagic); setEnergyUsed(5); } @@ -75,7 +74,7 @@ public class BoundAxe extends ItemAxe implements IBindable @Override public ItemStack onItemRightClick(ItemStack par1ItemStack, World world, EntityPlayer par3EntityPlayer) { - if (!EnergyItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer) || par3EntityPlayer.isSneaking()) + if (!BindableItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer) || par3EntityPlayer.isSneaking()) { this.setActivated(par1ItemStack, !getActivated(par1ItemStack)); par1ItemStack.getTagCompound().setInteger("worldTimeDelay", (int) (world.getWorldTime() - 1) % 200); @@ -97,7 +96,7 @@ public class BoundAxe extends ItemAxe implements IBindable return par1ItemStack; } - if(!EnergyItems.syphonBatteries(par1ItemStack, par3EntityPlayer, 10000)) + if(!BindableItems.syphonBatteries(par1ItemStack, par3EntityPlayer, 10000)) { return par1ItemStack; } @@ -168,7 +167,7 @@ public class BoundAxe extends ItemAxe implements IBindable { if (!par3EntityPlayer.capabilities.isCreativeMode) { - if(!EnergyItems.syphonBatteries(par1ItemStack, par3EntityPlayer, 20)) + if(!BindableItems.syphonBatteries(par1ItemStack, par3EntityPlayer, 20)) { this.setActivated(par1ItemStack, false); } @@ -203,6 +202,7 @@ public class BoundAxe extends ItemAxe implements IBindable return super.getStrVsBlock(par1ItemStack, par2Block); } + @Override /** * Current implementations of this method in child classes do not use the entry argument beside ev. They just raise * the damage on the stack. @@ -217,8 +217,8 @@ public class BoundAxe extends ItemAxe implements IBindable return true; } + @Override @SideOnly(Side.CLIENT) - /** * Returns True is the item is renderer in full 3D when hold. */ diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/BoundBlade.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/BoundBlade.java index a049c65a..90ab85e9 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/BoundBlade.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/BoundBlade.java @@ -26,8 +26,7 @@ public class BoundBlade extends ItemSword public BoundBlade() { super(AlchemicalWizardry.bloodBoundToolMaterial); - this.maxStackSize = 1; - setCreativeTab(AlchemicalWizardry.tabBloodMagic); + setMaxStackSize(1); setEnergyUsed(50); setFull3D(); setMaxDamage(100); @@ -72,7 +71,7 @@ public class BoundBlade extends ItemSword { if (par3EntityLivingBase instanceof EntityPlayer) { - if (!EnergyItems.checkAndSetItemOwner(par1ItemStack, (EntityPlayer) par3EntityLivingBase) || !EnergyItems.syphonBatteries(par1ItemStack, (EntityPlayer) par3EntityLivingBase, this.getEnergyUsed())) + if (!BindableItems.checkAndSetItemOwner(par1ItemStack, (EntityPlayer) par3EntityLivingBase) || !BindableItems.syphonBatteries(par1ItemStack, (EntityPlayer) par3EntityLivingBase, this.getEnergyUsed())) { return false; } @@ -85,7 +84,7 @@ public class BoundBlade extends ItemSword @Override public ItemStack onItemRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer) { - if (!EnergyItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer) || par3EntityPlayer.isSneaking()) + if (!BindableItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer) || par3EntityPlayer.isSneaking()) { this.setActivated(par1ItemStack, !getActivated(par1ItemStack)); par1ItemStack.getTagCompound().setInteger("worldTimeDelay", (int) (par2World.getWorldTime() - 1) % 100); @@ -125,7 +124,7 @@ public class BoundBlade extends ItemSword { if (!par3EntityPlayer.capabilities.isCreativeMode) { - if(!EnergyItems.syphonBatteries(par1ItemStack, par3EntityPlayer, 50)) + if(!BindableItems.syphonBatteries(par1ItemStack, par3EntityPlayer, 50)) { this.setActivated(par1ItemStack, false); } diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/BoundPickaxe.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/BoundPickaxe.java index 70b6eba4..70d8bc36 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/BoundPickaxe.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/BoundPickaxe.java @@ -35,10 +35,9 @@ public class BoundPickaxe extends ItemPickaxe implements IBindable public BoundPickaxe() { super(AlchemicalWizardry.bloodBoundToolMaterial); - this.maxStackSize = 1; + setMaxStackSize(1); this.efficiencyOnProperMaterial = 12.0F; this.damageVsEntity = 5; - setCreativeTab(AlchemicalWizardry.tabBloodMagic); this.setEnergyUsed(5); } @@ -78,7 +77,7 @@ public class BoundPickaxe extends ItemPickaxe implements IBindable @Override public ItemStack onItemRightClick(ItemStack stack, World world, EntityPlayer par3EntityPlayer) { - if (!EnergyItems.checkAndSetItemOwner(stack, par3EntityPlayer) || par3EntityPlayer.isSneaking()) + if (!BindableItems.checkAndSetItemOwner(stack, par3EntityPlayer) || par3EntityPlayer.isSneaking()) { this.setActivated(stack, !getActivated(stack)); stack.getTagCompound().setInteger("worldTimeDelay", (int) (world.getWorldTime() - 1) % 200); @@ -100,7 +99,7 @@ public class BoundPickaxe extends ItemPickaxe implements IBindable return stack; } - if(!EnergyItems.syphonBatteries(stack, par3EntityPlayer, 10000)) + if(!BindableItems.syphonBatteries(stack, par3EntityPlayer, 10000)) { return stack; } @@ -192,7 +191,7 @@ public class BoundPickaxe extends ItemPickaxe implements IBindable { if (!par3EntityPlayer.capabilities.isCreativeMode) { - if(!EnergyItems.syphonBatteries(stack, par3EntityPlayer, 20)) + if(!BindableItems.syphonBatteries(stack, par3EntityPlayer, 20)) { this.setActivated(stack, false); } diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/BoundShovel.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/BoundShovel.java index fc43ba2d..aaa46ea5 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/BoundShovel.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/BoundShovel.java @@ -33,10 +33,9 @@ public class BoundShovel extends ItemSpade implements IBindable public BoundShovel() { super(AlchemicalWizardry.bloodBoundToolMaterial); - this.maxStackSize = 1; + setMaxStackSize(1); this.efficiencyOnProperMaterial = 12.0F; this.damageVsEntity = 5; - setCreativeTab(AlchemicalWizardry.tabBloodMagic); setEnergyUsed(5); } @@ -75,7 +74,7 @@ public class BoundShovel extends ItemSpade implements IBindable @Override public ItemStack onItemRightClick(ItemStack stack, World world, EntityPlayer par3EntityPlayer) { - if (!EnergyItems.checkAndSetItemOwner(stack, par3EntityPlayer) || par3EntityPlayer.isSneaking()) + if (!BindableItems.checkAndSetItemOwner(stack, par3EntityPlayer) || par3EntityPlayer.isSneaking()) { this.setActivated(stack, !getActivated(stack)); stack.getTagCompound().setInteger("worldTimeDelay", (int) (world.getWorldTime() - 1) % 200); @@ -97,7 +96,7 @@ public class BoundShovel extends ItemSpade implements IBindable return stack; } - if(!EnergyItems.syphonBatteries(stack, par3EntityPlayer, 10000)) + if(!BindableItems.syphonBatteries(stack, par3EntityPlayer, 10000)) { return stack; } @@ -168,7 +167,7 @@ public class BoundShovel extends ItemSpade implements IBindable { if (!par3EntityPlayer.capabilities.isCreativeMode) { - if(!EnergyItems.syphonBatteries(par1ItemStack, par3EntityPlayer, 20)) + if(!BindableItems.syphonBatteries(par1ItemStack, par3EntityPlayer, 20)) { this.setActivated(par1ItemStack, false); } diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/CreativeDagger.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/CreativeDagger.java index a15a6f00..f962d785 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/CreativeDagger.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/CreativeDagger.java @@ -11,7 +11,6 @@ import net.minecraft.util.EnumParticleTypes; import net.minecraft.world.World; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.common.util.FakePlayer; -import WayofTime.alchemicalWizardry.AlchemicalWizardry; import WayofTime.alchemicalWizardry.api.event.SacrificeKnifeUsedEvent; import WayofTime.alchemicalWizardry.api.sacrifice.PlayerSacrificeHandler; import WayofTime.alchemicalWizardry.api.tile.IBloodAltar; @@ -23,7 +22,6 @@ public class CreativeDagger extends Item { super(); setMaxStackSize(1); - setCreativeTab(AlchemicalWizardry.tabBloodMagic); setFull3D(); } diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/CheatyItem.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/CreativeOrb.java similarity index 65% rename from src/main/java/WayofTime/alchemicalWizardry/common/items/CheatyItem.java rename to src/main/java/WayofTime/alchemicalWizardry/common/items/CreativeOrb.java index 3629b6c7..9fa2cb2c 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/CheatyItem.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/CreativeOrb.java @@ -11,19 +11,17 @@ import net.minecraft.util.EnumParticleTypes; import net.minecraft.util.StatCollector; import net.minecraft.world.World; import net.minecraftforge.common.util.FakePlayer; -import WayofTime.alchemicalWizardry.AlchemicalWizardry; import WayofTime.alchemicalWizardry.api.items.interfaces.IBindable; import WayofTime.alchemicalWizardry.api.soulNetwork.LifeEssenceNetwork; import WayofTime.alchemicalWizardry.api.soulNetwork.SoulNetworkHandler; import WayofTime.alchemicalWizardry.common.spell.complex.effect.SpellHelper; -public class CheatyItem extends Item implements IBindable +public class CreativeOrb extends Item implements IBindable { - public CheatyItem() + public CreativeOrb() { super(); setMaxStackSize(1); - setCreativeTab(AlchemicalWizardry.tabBloodMagic); } @Override @@ -43,7 +41,7 @@ public class CheatyItem extends Item implements IBindable { World world = par3EntityPlayer.worldObj; - if (!EnergyItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer) || par3EntityPlayer instanceof FakePlayer) + if (!BindableItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer) || par3EntityPlayer instanceof FakePlayer) { return par1ItemStack; } @@ -79,54 +77,6 @@ public class CheatyItem extends Item implements IBindable return par1ItemStack; } - /* - * @return the damage that was not deducted - */ - public int damageItem(ItemStack par1ItemStack, int par2int) - { - if (par2int == 0) - { - return 0; - } - - int before = this.getDamage(par1ItemStack); - this.setDamage(par1ItemStack, this.getDamage(par1ItemStack) + par2int); - return par2int - (this.getDamage(par1ItemStack) - before); - } - - protected void damagePlayer(World world, EntityPlayer player, int damage) - { - if (world != null) - { - double posX = player.posX; - double posY = player.posY; - double posZ = player.posZ; - world.playSoundEffect((double) ((float) posX + 0.5F), (double) ((float) posY + 0.5F), (double) ((float) posZ + 0.5F), "random.fizz", 0.5F, 2.6F + (world.rand.nextFloat() - world.rand.nextFloat()) * 0.8F); - float f = 1.0F; - float f1 = f * 0.6F + 0.4F; - float f2 = f * f * 0.7F - 0.5F; - float f3 = f * f * 0.6F - 0.7F; - - for (int l = 0; l < 8; ++l) - { - world.spawnParticle(EnumParticleTypes.REDSTONE, posX + Math.random() - Math.random(), posY + Math.random() - Math.random(), posZ + Math.random() - Math.random(), f1, f2, f3); - } - } - - if (!player.capabilities.isCreativeMode) - { - for (int i = 0; i < damage; i++) - { - player.setHealth((player.getHealth() - 1)); - } - } - - if (player.getHealth() <= 0) - { - player.inventory.dropAllItems(); - } - } - @Override public ItemStack getContainerItem(ItemStack itemStack) { @@ -163,7 +113,6 @@ public class CheatyItem extends Item implements IBindable worldSave.setItemData(owner, data); } - int currentEssence = data.currentEssence; - return (currentEssence); + return data.currentEssence; } } diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/DaggerOfSacrifice.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/DaggerOfSacrifice.java index 2b87a8ca..72140cd4 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/DaggerOfSacrifice.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/DaggerOfSacrifice.java @@ -21,7 +21,6 @@ import net.minecraft.util.BlockPos; import net.minecraft.util.DamageSource; import net.minecraft.util.StatCollector; import net.minecraft.world.World; -import WayofTime.alchemicalWizardry.AlchemicalWizardry; import WayofTime.alchemicalWizardry.api.tile.IBloodAltar; import WayofTime.alchemicalWizardry.common.IDemon; import WayofTime.alchemicalWizardry.common.demonVillage.demonHoard.demon.IHoardDemon; @@ -29,13 +28,12 @@ import WayofTime.alchemicalWizardry.common.spell.complex.effect.SpellHelper; import com.google.common.collect.Multimap; -public class DaggerOfSacrifice extends EnergyItems +public class DaggerOfSacrifice extends BindableItems { public DaggerOfSacrifice() { super(); - this.maxStackSize = 1; - setCreativeTab(AlchemicalWizardry.tabBloodMagic); + setMaxStackSize(1); setEnergyUsed(100); setFull3D(); setMaxDamage(100); @@ -128,9 +126,9 @@ public class DaggerOfSacrifice extends EnergyItems } @Override - public Multimap getItemAttributeModifiers() + public Multimap getAttributeModifiers(ItemStack itemStack) { - Multimap multimap = super.getItemAttributeModifiers(); + Multimap multimap = super.getAttributeModifiers(itemStack); multimap.put(SharedMonsterAttributes.attackDamage.getAttributeUnlocalizedName(), new AttributeModifier(new UUID(4186465, 46565), "Tool modifier", 1.0d, 0)); return multimap; } diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/DawnScribeTool.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/DawnScribeTool.java index 61814e22..f54f5615 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/DawnScribeTool.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/DawnScribeTool.java @@ -1,6 +1,5 @@ package WayofTime.alchemicalWizardry.common.items; - public class DawnScribeTool extends ScribeTool { public DawnScribeTool() diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/DemonPlacer.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/DemonCrystal.java similarity index 93% rename from src/main/java/WayofTime/alchemicalWizardry/common/items/DemonPlacer.java rename to src/main/java/WayofTime/alchemicalWizardry/common/items/DemonCrystal.java index f9caf63f..504d7527 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/DemonPlacer.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/DemonCrystal.java @@ -20,14 +20,14 @@ import net.minecraft.world.World; import WayofTime.alchemicalWizardry.api.summoningRegistry.SummoningRegistry; import WayofTime.alchemicalWizardry.common.entity.mob.EntityDemon; -public class DemonPlacer extends Item +public class DemonCrystal extends Item { - public DemonPlacer() + public DemonCrystal() { super(); this.setHasSubtypes(true); this.setCreativeTab(CreativeTabs.tabMisc); - this.maxStackSize = 1; + setMaxStackSize(1); } /** @@ -56,7 +56,7 @@ public class DemonPlacer extends Item d0 = 0.5D; } - String demonName = DemonPlacer.getDemonString(stack); + String demonName = DemonCrystal.getDemonString(stack); Entity entity = spawnCreature(world, demonName, (double)pos.getX() + 0.5D, (double)pos.getY() + d0, (double)pos.getZ() + 0.5D, stack); if (entity != null) @@ -88,7 +88,7 @@ public class DemonPlacer extends Item { entity = SummoningRegistry.getEntityWithID(par0World, par1); - if (entity != null && entity instanceof EntityLivingBase) + if (entity != null) { EntityLiving entityliving = (EntityLiving) entity; entity.setLocationAndAngles(par2, par4, par6, MathHelper.wrapAngleTo180_float(par0World.rand.nextFloat() * 360.0F), 0.0F); @@ -96,9 +96,9 @@ public class DemonPlacer extends Item entityliving.renderYawOffset = entityliving.rotationYaw; if (entityliving instanceof EntityDemon) { - ((EntityDemon) entityliving).func_152115_b(DemonPlacer.getOwnerName(itemStack)); + ((EntityDemon) entityliving).func_152115_b(DemonCrystal.getOwnerName(itemStack)); - if (!DemonPlacer.getOwnerName(itemStack).equals("")) + if (!DemonCrystal.getOwnerName(itemStack).equals("")) { ((EntityDemon) entityliving).setTamed(true); } diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/DuskScribeTool.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/DuskScribeTool.java index 600cb2da..53db87f3 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/DuskScribeTool.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/DuskScribeTool.java @@ -1,6 +1,5 @@ package WayofTime.alchemicalWizardry.common.items; - public class DuskScribeTool extends ScribeTool { public DuskScribeTool() diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/EarthScribeTool.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/EarthScribeTool.java index 530fce10..9a33f1e8 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/EarthScribeTool.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/EarthScribeTool.java @@ -1,6 +1,5 @@ package WayofTime.alchemicalWizardry.common.items; - public class EarthScribeTool extends ScribeTool { public EarthScribeTool() diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/EnergyBazooka.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/EnergyBazooka.java index c9e44de7..13b03ab3 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/EnergyBazooka.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/EnergyBazooka.java @@ -9,10 +9,9 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.StatCollector; import net.minecraft.util.Vec3; import net.minecraft.world.World; -import WayofTime.alchemicalWizardry.AlchemicalWizardry; import WayofTime.alchemicalWizardry.common.entity.projectile.EntityEnergyBazookaMainProjectile; -public class EnergyBazooka extends EnergyItems +public class EnergyBazooka extends BindableItems { private int damage; @@ -20,7 +19,6 @@ public class EnergyBazooka extends EnergyItems { super(); setMaxStackSize(1); - setCreativeTab(AlchemicalWizardry.tabBloodMagic); setFull3D(); setMaxDamage(250); this.setEnergyUsed(20000); @@ -32,7 +30,7 @@ public class EnergyBazooka extends EnergyItems { final int maxDelay = 150; - if (!EnergyItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer) || par3EntityPlayer.isSneaking()) + if (!BindableItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer) || par3EntityPlayer.isSneaking()) { this.setActivated(par1ItemStack, !getActivated(par1ItemStack)); par1ItemStack.getTagCompound().setInteger("worldTimeDelay", (int) (par2World.getWorldTime() - 1) % 100); @@ -100,7 +98,7 @@ public class EnergyBazooka extends EnergyItems { if (!par3EntityPlayer.capabilities.isCreativeMode) { - if(!EnergyItems.syphonBatteries(par1ItemStack, par3EntityPlayer, 50)) + if(!BindableItems.syphonBatteries(par1ItemStack, par3EntityPlayer, 50)) { this.setActivated(par1ItemStack, false); } diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/EnergyBlast.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/EnergyBlaster.java similarity index 91% rename from src/main/java/WayofTime/alchemicalWizardry/common/items/EnergyBlast.java rename to src/main/java/WayofTime/alchemicalWizardry/common/items/EnergyBlaster.java index f1103f4f..6f896545 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/EnergyBlast.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/EnergyBlaster.java @@ -8,19 +8,16 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.StatCollector; import net.minecraft.world.World; -import WayofTime.alchemicalWizardry.AlchemicalWizardry; import WayofTime.alchemicalWizardry.common.entity.projectile.EnergyBlastProjectile; -public class EnergyBlast extends EnergyItems +public class EnergyBlaster extends BindableItems { private int damage; - public EnergyBlast() + public EnergyBlaster() { super(); setMaxStackSize(1); - setCreativeTab(AlchemicalWizardry.tabBloodMagic); - setUnlocalizedName("energyBlaster"); setFull3D(); setMaxDamage(250); this.setEnergyUsed(150); @@ -32,7 +29,7 @@ public class EnergyBlast extends EnergyItems { final int maxDelay = 15; - if (!EnergyItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer) || par3EntityPlayer.isSneaking()) + if (!BindableItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer) || par3EntityPlayer.isSneaking()) { this.setActivated(par1ItemStack, !getActivated(par1ItemStack)); par1ItemStack.getTagCompound().setInteger("worldTimeDelay", (int) (par2World.getWorldTime() - 1) % 100); @@ -92,7 +89,7 @@ public class EnergyBlast extends EnergyItems { if (!par3EntityPlayer.capabilities.isCreativeMode) { - if(!EnergyItems.syphonBatteries(par1ItemStack, par3EntityPlayer, 50)) + if(!BindableItems.syphonBatteries(par1ItemStack, par3EntityPlayer, 50)) { this.setActivated(par1ItemStack, false); } diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/FireScribeTool.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/FireScribeTool.java index 8b3a55f9..204cb63e 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/FireScribeTool.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/FireScribeTool.java @@ -1,6 +1,5 @@ package WayofTime.alchemicalWizardry.common.items; - public class FireScribeTool extends ScribeTool { public FireScribeTool() diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/ItemAlchemyBase.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/ItemAlchemyBase.java index 29a9148d..92019075 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/ItemAlchemyBase.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/ItemAlchemyBase.java @@ -15,18 +15,15 @@ import net.minecraftforge.fml.relauncher.SideOnly; import org.lwjgl.input.Keyboard; -import WayofTime.alchemicalWizardry.AlchemicalWizardry; import WayofTime.alchemicalWizardry.api.alchemy.AlchemyRecipeRegistry; public class ItemAlchemyBase extends Item { - private static final String[] ITEM_NAMES = new String[]{"Offensa", "Praesidium", "OrbisTerrae", "StrengthenedCatalyst", "ConcentratedCatalyst", "FracturedBone", "Virtus", "Reductus", "Potentia"}; + private final String[] ITEM_NAMES = new String[]{"offensa", "praesidium", "orbis_terrae", "strengthened_catalyst", "concentrated_catalyst", "fractured_bone", "virtus", "reductus", "potentia"}; public ItemAlchemyBase() { super(); - this.maxStackSize = 64; - this.setCreativeTab(AlchemicalWizardry.tabBloodMagic); this.hasSubtypes = true; } @@ -67,7 +64,7 @@ public class ItemAlchemyBase extends Item public String getUnlocalizedName(ItemStack itemStack) { int meta = MathHelper.clamp_int(itemStack.getItemDamage(), 0, ITEM_NAMES.length - 1); - return ("" + "item.bloodMagicAlchemyItem." + ITEM_NAMES[meta]); + return (getUnlocalizedName() + "." + ITEM_NAMES[meta]); } @Override diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/ItemBlockCrystalBelljar.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/ItemBlockCrystalBelljar.java index 5e10c4a1..790362e5 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/ItemBlockCrystalBelljar.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/ItemBlockCrystalBelljar.java @@ -27,6 +27,7 @@ public class ItemBlockCrystalBelljar extends ItemBlock this.setMaxStackSize(16); } + @Override public int getMetadata(int par1) { return par1; diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/ItemBloodLetterPack.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/ItemBloodLetterPack.java index c223d9de..fa709bfa 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/ItemBloodLetterPack.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/ItemBloodLetterPack.java @@ -12,7 +12,6 @@ import net.minecraft.util.BlockPos; import net.minecraft.util.MovingObjectPosition; import net.minecraft.util.StatCollector; import net.minecraft.world.World; -import WayofTime.alchemicalWizardry.AlchemicalWizardry; import WayofTime.alchemicalWizardry.api.items.IAltarManipulator; import WayofTime.alchemicalWizardry.api.items.interfaces.ArmourUpgrade; import WayofTime.alchemicalWizardry.api.soulNetwork.SoulNetworkHandler; @@ -28,7 +27,6 @@ public class ItemBloodLetterPack extends ItemArmor implements ArmourUpgrade, IAl public ItemBloodLetterPack() { super(ArmorMaterial.CHAIN, 0, 1); - setCreativeTab(AlchemicalWizardry.tabBloodMagic); } @Override @@ -140,10 +138,7 @@ public class ItemBloodLetterPack extends ItemArmor implements ArmourUpgrade, IAl } @Override - public void onArmourUpdate(World world, EntityPlayer player, ItemStack thisItemStack) - { - - } + public void onArmourUpdate(World world, EntityPlayer player, ItemStack thisItemStack) {} @Override public boolean isUpgrade() diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/ItemBloodRuneBlock.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/ItemBloodRuneBlock.java index 7932014c..00f46b90 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/ItemBloodRuneBlock.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/ItemBloodRuneBlock.java @@ -10,9 +10,9 @@ public class ItemBloodRuneBlock extends ItemBlock { super(block); setHasSubtypes(true); - } + @Override public String getUnlocalizedName(ItemStack itemstack) { String name; @@ -20,16 +20,12 @@ public class ItemBloodRuneBlock extends ItemBlock switch (itemstack.getItemDamage()) { case 0: - { name = "blank"; break; - } case 1: - { name = "fill"; break; - } case 2: name = "empty"; @@ -54,6 +50,7 @@ public class ItemBloodRuneBlock extends ItemBlock return getUnlocalizedName() + "." + name; } + @Override public int getMetadata(int par1) { diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/ItemComplexSpellCrystal.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/ItemComplexSpellCrystal.java index c6830b10..81550c21 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/ItemComplexSpellCrystal.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/ItemComplexSpellCrystal.java @@ -10,16 +10,14 @@ import net.minecraft.util.BlockPos; import net.minecraft.util.StatCollector; import net.minecraft.world.World; import net.minecraftforge.common.DimensionManager; -import WayofTime.alchemicalWizardry.AlchemicalWizardry; import WayofTime.alchemicalWizardry.common.tileEntity.TESpellParadigmBlock; -public class ItemComplexSpellCrystal extends EnergyItems +public class ItemComplexSpellCrystal extends BindableItems { public ItemComplexSpellCrystal() { super(); - this.setMaxStackSize(1); - setCreativeTab(AlchemicalWizardry.tabBloodMagic); + setMaxStackSize(1); } @Override @@ -44,7 +42,7 @@ public class ItemComplexSpellCrystal extends EnergyItems @Override public ItemStack onItemRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer) { - if (!EnergyItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer) || par3EntityPlayer.isSneaking()) + if (!BindableItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer) || par3EntityPlayer.isSneaking()) { return par1ItemStack; } diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/ItemComponents.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/ItemComponents.java index 7ccfc9d3..78fd031c 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/ItemComponents.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/ItemComponents.java @@ -10,17 +10,14 @@ import net.minecraft.util.MathHelper; import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import WayofTime.alchemicalWizardry.AlchemicalWizardry; public class ItemComponents extends Item { - private static final String[] ITEM_NAMES = new String[]{"QuartzRod", "EmptyCore", "MagicalesCable", "WoodBrace", "StoneBrace", "ProjectileCore", "SelfCore", "MeleeCore", "ParadigmBackPlate", "OutputCable", "FlameCore", "IcyCore", "GustCore", "EarthenCore", "InputCable", "CrackedRunicPlate", "RunicPlate", "ScribedRunicPlate", "DefaultCore", "OffensiveCore", "DefensiveCore", "EnvironmentalCore", "PowerCore", "CostCore", "PotencyCore", "ObsidianBrace", "ToolCore", "EtherealSlate", "LifeShard", "SoulShard", "SoulRunicPlate", "LifeBrace", "EnderShard"}; + private final String[] ITEM_NAMES = new String[]{"quartz_rod", "empty_core", "magicales_cable", "wood_brace", "stone_brace", "projectile_core", "self_core", "melee_core", "paradigm_back_plate", "output_cable", "flame_core", "icy_core", "gust_core", "earthen_core", "input_cable", "cracked_runic_plate", "runic_plate", "scribed_runic_plate", "default_core", "offensive_core", "defensive_core", "environmental_core", "power_core", "cost_core", "potency_core", "obsidian_brace", "tool_core", "ethereal_slate", "life_shard", "soul_shard", "soul_runic_plate", "life_brace", "ender_shard"}; public ItemComponents() { super(); - this.maxStackSize = 64; - this.setCreativeTab(AlchemicalWizardry.tabBloodMagic); this.hasSubtypes = true; } @@ -35,7 +32,7 @@ public class ItemComponents extends Item { //This is what will do all the localisation things on the alchemy components so you dont have to set it :D int meta = MathHelper.clamp_int(itemStack.getItemDamage(), 0, ITEM_NAMES.length - 1); - return ("" + "item.bloodMagicBaseItem." + ITEM_NAMES[meta]); + return (getUnlocalizedName() + "." + ITEM_NAMES[meta]); } @Override diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/ItemCrystalBlock.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/ItemCrystalBlock.java index 75c7ae92..8b496da3 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/ItemCrystalBlock.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/ItemCrystalBlock.java @@ -10,9 +10,9 @@ public class ItemCrystalBlock extends ItemBlock { super(par1); setHasSubtypes(true); - } + @Override public String getUnlocalizedName(ItemStack itemstack) { String name; @@ -20,16 +20,12 @@ public class ItemCrystalBlock extends ItemBlock switch (itemstack.getItemDamage()) { case 0: - { name = "fullCrystal"; break; - } case 1: - { name = "crystalBrick"; break; - } default: name = "broken"; @@ -38,6 +34,7 @@ public class ItemCrystalBlock extends ItemBlock return getUnlocalizedName() + "." + name; } + @Override public int getMetadata(int par1) { diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/ItemEnchantmentGlyphBlock.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/ItemEnchantmentGlyphBlock.java index 4dfc459b..3b1063e1 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/ItemEnchantmentGlyphBlock.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/ItemEnchantmentGlyphBlock.java @@ -19,16 +19,16 @@ public class ItemEnchantmentGlyphBlock extends ItemBlock switch (itemstack.getItemDamage()) { - case 0: - name = "enchantability"; - break; + case 0: + name = "enchantability"; + break; - case 1: - name = "enchantmentLevel"; - break; + case 1: + name = "enchantmentLevel"; + break; - default: - name = "broken"; + default: + name = "broken"; } return getUnlocalizedName() + "." + name; diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/ItemIncense.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/ItemIncense.java index 3788f9da..2e48ba20 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/ItemIncense.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/ItemIncense.java @@ -14,20 +14,17 @@ import net.minecraftforge.fml.common.registry.GameRegistry; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import net.minecraftforge.oredict.OreDictionary; -import WayofTime.alchemicalWizardry.AlchemicalWizardry; import WayofTime.alchemicalWizardry.ModItems; import WayofTime.alchemicalWizardry.api.items.ShapelessBloodOrbRecipe; import WayofTime.alchemicalWizardry.api.sacrifice.IIncense; public class ItemIncense extends Item implements IIncense { - private static final String[] ITEM_NAMES = new String[]{"Woodash", "Byrrus", "Livens", "Viridis", "Purpura"}; + private final String[] ITEM_NAMES = new String[]{"wood_ash", "byrrus", "livens", "viridis", "purpura"}; public ItemIncense() { super(); - this.maxStackSize = 64; - this.setCreativeTab(AlchemicalWizardry.tabBloodMagic); this.hasSubtypes = true; } @@ -41,7 +38,7 @@ public class ItemIncense extends Item implements IIncense public String getUnlocalizedName(ItemStack itemStack) { int meta = MathHelper.clamp_int(itemStack.getItemDamage(), 0, ITEM_NAMES.length - 1); - return ("" + "item.bloodMagicIncenseItem." + ITEM_NAMES[meta]); + return (getUnlocalizedName() + "." + ITEM_NAMES[meta]); } @Override diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/ItemMailOrderCatalogue.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/ItemMailOrderCatalogue.java index be16d5c9..e2916f15 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/ItemMailOrderCatalogue.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/ItemMailOrderCatalogue.java @@ -12,7 +12,6 @@ public class ItemMailOrderCatalogue extends Item public ItemMailOrderCatalogue() { super(); - this.setCreativeTab(AlchemicalWizardry.tabBloodMagic); } @Override diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/ItemRitualDismantler.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/ItemRitualDismantler.java index 6f74f440..a62bb184 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/ItemRitualDismantler.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/ItemRitualDismantler.java @@ -9,20 +9,18 @@ import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.util.StatCollector; import net.minecraft.world.World; -import WayofTime.alchemicalWizardry.AlchemicalWizardry; import WayofTime.alchemicalWizardry.ModBlocks; import WayofTime.alchemicalWizardry.api.rituals.RitualComponent; import WayofTime.alchemicalWizardry.api.rituals.Rituals; import WayofTime.alchemicalWizardry.common.block.BlockRitualStone; import WayofTime.alchemicalWizardry.common.tileEntity.TEMasterStone; -public class ItemRitualDismantler extends EnergyItems +public class ItemRitualDismantler extends BindableItems { public ItemRitualDismantler() { super(); setMaxStackSize(1); - setCreativeTab(AlchemicalWizardry.tabBloodMagic); } @Override @@ -36,7 +34,7 @@ public class ItemRitualDismantler extends EnergyItems @Override public boolean onItemUse(ItemStack stack, EntityPlayer player, World world, BlockPos pos, EnumFacing side, float hitX, float hitY, float hitZ) { - return EnergyItems.checkAndSetItemOwner(stack, player) && breakRitualStoneAtMasterStone(stack, player, world, pos); + return BindableItems.checkAndSetItemOwner(stack, player) && breakRitualStoneAtMasterStone(stack, player, world, pos); } public boolean breakRitualStoneAtMasterStone(ItemStack stack, EntityPlayer player, World world, BlockPos pos) @@ -72,7 +70,7 @@ public class ItemRitualDismantler extends EnergyItems { if (freeSpace >= 0) { - if (EnergyItems.syphonBatteries(stack, player, getEnergyUsed()) || player.capabilities.isCreativeMode) + if (BindableItems.syphonBatteries(stack, player, getEnergyUsed()) || player.capabilities.isCreativeMode) { world.setBlockToAir(newPos); player.inventory.addItemStackToInventory(new ItemStack(ModBlocks.ritualStone)); diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/ItemRitualDiviner.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/ItemRitualDiviner.java index c101711a..f34e5283 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/ItemRitualDiviner.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/ItemRitualDiviner.java @@ -24,7 +24,6 @@ import net.minecraftforge.fml.relauncher.SideOnly; import org.lwjgl.input.Keyboard; -import WayofTime.alchemicalWizardry.AlchemicalWizardry; import WayofTime.alchemicalWizardry.ModBlocks; import WayofTime.alchemicalWizardry.api.Int3; import WayofTime.alchemicalWizardry.api.items.interfaces.IRitualDiviner; @@ -34,17 +33,16 @@ import WayofTime.alchemicalWizardry.api.rituals.RitualComponent; import WayofTime.alchemicalWizardry.api.rituals.Rituals; import WayofTime.alchemicalWizardry.common.tileEntity.TEMasterStone; -public class ItemRitualDiviner extends EnergyItems implements IRitualDiviner +public class ItemRitualDiviner extends BindableItems implements IRitualDiviner { private int maxMetaData; public ItemRitualDiviner() { super(); - this.maxStackSize = 1; + setMaxStackSize(1); setEnergyUsed(100); - this.setCreativeTab(AlchemicalWizardry.tabBloodMagic); - this.maxMetaData = 4; + setMaxDamage(4); this.hasSubtypes = true; } @@ -163,7 +161,7 @@ public class ItemRitualDiviner extends EnergyItems implements IRitualDiviner @Override public boolean onItemUse(ItemStack stack, EntityPlayer player, World world, BlockPos pos, EnumFacing side, float hitX, float hitY, float hitZ) { - if (!EnergyItems.checkAndSetItemOwner(stack, player)) return false; + if (!BindableItems.checkAndSetItemOwner(stack, player)) return false; if(placeRitualStoneAtMasterStone(stack, player, world, pos)) { @@ -233,7 +231,7 @@ public class ItemRitualDiviner extends EnergyItems implements IRitualDiviner player.inventory.decrStackSize(playerInvRitualStoneLocation, 1); } - if(EnergyItems.syphonBatteries(stack, player, getEnergyUsed())) + if(BindableItems.syphonBatteries(stack, player, getEnergyUsed())) { world.setBlockState(newPos, ModBlocks.ritualStone.getStateFromMeta(rc.getStoneType()), 3); @@ -257,7 +255,7 @@ public class ItemRitualDiviner extends EnergyItems implements IRitualDiviner int metadata = block.getMetaFromState(state); if (metadata != rc.getStoneType()) { - if(EnergyItems.syphonBatteries(stack, player, getEnergyUsed())) + if(BindableItems.syphonBatteries(stack, player, getEnergyUsed())) { if (rc.getStoneType() > this.maxMetaData + this.getMaxRuneDisplacement(stack)) { @@ -361,7 +359,7 @@ public class ItemRitualDiviner extends EnergyItems implements IRitualDiviner @Override public ItemStack onItemRightClick(ItemStack stack, World par2World, EntityPlayer par3EntityPlayer) { - if (EnergyItems.checkAndSetItemOwner(stack, par3EntityPlayer) && par3EntityPlayer.isSneaking()) + if (BindableItems.checkAndSetItemOwner(stack, par3EntityPlayer) && par3EntityPlayer.isSneaking()) { rotateRituals(par2World,par3EntityPlayer, stack, true); } @@ -376,7 +374,7 @@ public class ItemRitualDiviner extends EnergyItems implements IRitualDiviner { EntityPlayer player = (EntityPlayer) entityLiving; - if (!EnergyItems.checkAndSetItemOwner(stack,player)) return true; + if (!BindableItems.checkAndSetItemOwner(stack, player)) return true; if (!player.isSwingInProgress) { diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/ItemSpellEffectBlock.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/ItemSpellEffectBlock.java index e9ec4502..8a33e9af 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/ItemSpellEffectBlock.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/ItemSpellEffectBlock.java @@ -12,6 +12,7 @@ public class ItemSpellEffectBlock extends ItemBlock setHasSubtypes(true); } + @Override public String getUnlocalizedName(ItemStack itemstack) { String name; @@ -19,16 +20,12 @@ public class ItemSpellEffectBlock extends ItemBlock switch (itemstack.getItemDamage()) { case 0: - { name = "fire"; break; - } case 1: - { name = "ice"; break; - } case 2: name = "wind"; @@ -45,6 +42,7 @@ public class ItemSpellEffectBlock extends ItemBlock return getUnlocalizedName() + "." + name; } + @Override public int getMetadata(int par1) { diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/ItemSpellEnhancementBlock.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/ItemSpellEnhancementBlock.java index 5c515c3f..0e121a16 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/ItemSpellEnhancementBlock.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/ItemSpellEnhancementBlock.java @@ -10,9 +10,9 @@ public class ItemSpellEnhancementBlock extends ItemBlock { super(par1); setHasSubtypes(true); - } + @Override public String getUnlocalizedName(ItemStack itemstack) { String name; @@ -86,6 +86,7 @@ public class ItemSpellEnhancementBlock extends ItemBlock return getUnlocalizedName() + "." + name; } + @Override public int getMetadata(int par1) { diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/ItemSpellModifierBlock.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/ItemSpellModifierBlock.java index 44e02d7b..99cfebc6 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/ItemSpellModifierBlock.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/ItemSpellModifierBlock.java @@ -10,9 +10,9 @@ public class ItemSpellModifierBlock extends ItemBlock { super(par1); setHasSubtypes(true); - } + @Override public String getUnlocalizedName(ItemStack itemstack) { String name; @@ -20,16 +20,12 @@ public class ItemSpellModifierBlock extends ItemBlock switch (itemstack.getItemDamage()) { case 0: - { name = "default"; break; - } case 1: - { name = "offensive"; break; - } case 2: name = "defensive"; @@ -46,6 +42,7 @@ public class ItemSpellModifierBlock extends ItemBlock return getUnlocalizedName() + "." + name; } + @Override public int getMetadata(int par1) { diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/ItemSpellParadigmBlock.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/ItemSpellParadigmBlock.java index 2984cdb7..1868c9dc 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/ItemSpellParadigmBlock.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/ItemSpellParadigmBlock.java @@ -20,16 +20,12 @@ public class ItemSpellParadigmBlock extends ItemBlock switch (itemstack.getItemDamage()) { case 0: - { name = "projectile"; break; - } case 1: - { name = "self"; break; - } case 2: name = "melee"; diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/ItemStabilityGlyphBlock.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/ItemStabilityGlyphBlock.java index 289fe3ec..45a0b90a 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/ItemStabilityGlyphBlock.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/ItemStabilityGlyphBlock.java @@ -19,12 +19,12 @@ public class ItemStabilityGlyphBlock extends ItemBlock switch (itemstack.getItemDamage()) { - case 0: - name = "stability1"; - break; + case 0: + name = "stability1"; + break; - default: - name = "broken"; + default: + name = "broken"; } return getUnlocalizedName() + "." + name; diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/ItemDiabloKey.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/KeyOfBinding.java similarity index 85% rename from src/main/java/WayofTime/alchemicalWizardry/common/items/ItemDiabloKey.java rename to src/main/java/WayofTime/alchemicalWizardry/common/items/KeyOfBinding.java index 98079478..16c07641 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/ItemDiabloKey.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/KeyOfBinding.java @@ -13,18 +13,16 @@ import net.minecraft.world.World; import net.minecraftforge.common.util.FakePlayer; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import WayofTime.alchemicalWizardry.AlchemicalWizardry; import WayofTime.alchemicalWizardry.ModItems; import WayofTime.alchemicalWizardry.api.items.interfaces.IBindable; import WayofTime.alchemicalWizardry.common.spell.complex.effect.SpellHelper; -public class ItemDiabloKey extends EnergyItems +public class KeyOfBinding extends BindableItems { - public ItemDiabloKey() + public KeyOfBinding() { super(); setMaxStackSize(1); - setCreativeTab(AlchemicalWizardry.tabBloodMagic); this.setEnergyUsed(1000); this.hasSubtypes = true; } @@ -42,7 +40,7 @@ public class ItemDiabloKey extends EnergyItems public ItemStack onItemRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer) { World world = par3EntityPlayer.worldObj; - if (!EnergyItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer) || par3EntityPlayer instanceof FakePlayer || par3EntityPlayer instanceof EntityPlayerMP) + if (!BindableItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer) || par3EntityPlayer instanceof FakePlayer || par3EntityPlayer instanceof EntityPlayerMP) { return par1ItemStack; } @@ -85,14 +83,14 @@ public class ItemDiabloKey extends EnergyItems Item item = itemStack.getItem(); - if (item instanceof ItemDiabloKey) + if (item instanceof KeyOfBinding) { continue; } if (item instanceof IBindable) { - EnergyItems.checkAndSetItemOwner(itemStack, ownerName); + BindableItems.checkAndSetItemOwner(itemStack, ownerName); } } @@ -105,7 +103,7 @@ public class ItemDiabloKey extends EnergyItems { list.add(new ItemStack(ModItems.itemKeyOfDiablo)); ItemStack boundKey = new ItemStack(ModItems.itemKeyOfDiablo); - EnergyItems.checkAndSetItemOwner(boundKey, "Server-wide Soul Network"); + BindableItems.checkAndSetItemOwner(boundKey, "Server-wide Soul Network"); list.add(boundKey); } } diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/LavaCrystal.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/LavaCrystal.java index c813115f..5cac4a71 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/LavaCrystal.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/LavaCrystal.java @@ -7,17 +7,14 @@ import net.minecraft.item.ItemStack; import net.minecraft.server.MinecraftServer; import net.minecraft.util.StatCollector; import net.minecraft.world.World; -import WayofTime.alchemicalWizardry.AlchemicalWizardry; import WayofTime.alchemicalWizardry.api.soulNetwork.SoulNetworkHandler; -public class LavaCrystal extends EnergyItems +public class LavaCrystal extends BindableItems { public LavaCrystal() { super(); setMaxStackSize(1); - setCreativeTab(AlchemicalWizardry.tabBloodMagic); - setUnlocalizedName("lavaCrystal"); setEnergyUsed(25); } @@ -27,24 +24,22 @@ public class LavaCrystal extends EnergyItems @Override public ItemStack getContainerItem(ItemStack itemStack) { - { - syphonWhileInContainer(itemStack, this.getEnergyUsed()); - ItemStack copiedStack = itemStack.copy(); - copiedStack.setItemDamage(copiedStack.getItemDamage()); - copiedStack.stackSize = 1; - return copiedStack; - } + SoulNetworkHandler.syphonFromNetwork(itemStack, this.getEnergyUsed()); + ItemStack copiedStack = itemStack.copy(); + copiedStack.setItemDamage(copiedStack.getItemDamage()); + copiedStack.stackSize = 1; + return copiedStack; } @Override - public boolean hasContainerItem() + public boolean hasContainerItem(ItemStack itemStack) { return true; } public ItemStack onItemRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer) { - EnergyItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer); + BindableItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer); return par1ItemStack; } diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/MagicianBloodOrb.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/MagicianBloodOrb.java index 0bfa4a49..26795324 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/MagicianBloodOrb.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/MagicianBloodOrb.java @@ -1,7 +1,6 @@ package WayofTime.alchemicalWizardry.common.items; - -public class MagicianBloodOrb extends EnergyBattery +public class MagicianBloodOrb extends Orb { public MagicianBloodOrb(int damage) { diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/MasterBloodOrb.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/MasterBloodOrb.java index 64021b33..f7b15ab0 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/MasterBloodOrb.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/MasterBloodOrb.java @@ -1,7 +1,6 @@ package WayofTime.alchemicalWizardry.common.items; - -public class MasterBloodOrb extends EnergyBattery +public class MasterBloodOrb extends Orb { public MasterBloodOrb(int damage) { diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/EnergyBattery.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/Orb.java similarity index 93% rename from src/main/java/WayofTime/alchemicalWizardry/common/items/EnergyBattery.java rename to src/main/java/WayofTime/alchemicalWizardry/common/items/Orb.java index a713fe7c..42a6a3b1 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/EnergyBattery.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/Orb.java @@ -10,7 +10,6 @@ import net.minecraft.server.MinecraftServer; import net.minecraft.util.EnumParticleTypes; import net.minecraft.util.StatCollector; import net.minecraft.world.World; -import WayofTime.alchemicalWizardry.AlchemicalWizardry; import WayofTime.alchemicalWizardry.api.items.interfaces.ArmourUpgrade; import WayofTime.alchemicalWizardry.api.items.interfaces.IBindable; import WayofTime.alchemicalWizardry.api.items.interfaces.IBloodOrb; @@ -18,16 +17,15 @@ import WayofTime.alchemicalWizardry.api.soulNetwork.LifeEssenceNetwork; import WayofTime.alchemicalWizardry.api.soulNetwork.SoulNetworkHandler; import WayofTime.alchemicalWizardry.common.spell.complex.effect.SpellHelper; -public class EnergyBattery extends Item implements ArmourUpgrade, IBindable, IBloodOrb +public class Orb extends Item implements ArmourUpgrade, IBindable, IBloodOrb { private int maxEssence; protected int orbLevel; - public EnergyBattery(int damage) + public Orb(int damage) { super(); setMaxStackSize(1); - setCreativeTab(AlchemicalWizardry.tabBloodMagic); maxEssence = damage; orbLevel = 1; } @@ -42,9 +40,10 @@ public class EnergyBattery extends Item implements ArmourUpgrade, IBindable, IBl } } + @Override public ItemStack onItemRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer) { - if (!EnergyItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer)) + if (!BindableItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer)) { return par1ItemStack; } @@ -82,7 +81,7 @@ public class EnergyBattery extends Item implements ArmourUpgrade, IBindable, IBl } SoulNetworkHandler.addCurrentEssenceToMaximum(itemTag.getString("ownerName"), 200, this.getMaxEssence()); - EnergyItems.hurtPlayer(par3EntityPlayer, 200); + BindableItems.hurtPlayer(par3EntityPlayer, 200); return par1ItemStack; } @@ -145,9 +144,7 @@ public class EnergyBattery extends Item implements ArmourUpgrade, IBindable, IBl } @Override - public void onArmourUpdate(World world, EntityPlayer player, ItemStack thisItemStack) - { - } + public void onArmourUpdate(World world, EntityPlayer player, ItemStack thisItemStack) {} @Override public boolean isUpgrade() diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/OrbOfTesting.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/OrbOfTesting.java deleted file mode 100644 index 1afe84a4..00000000 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/OrbOfTesting.java +++ /dev/null @@ -1,35 +0,0 @@ -package WayofTime.alchemicalWizardry.common.items; - -import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; -import net.minecraft.world.World; - -public class OrbOfTesting extends EnergyItems -{ - public OrbOfTesting() - { - super(); - setMaxStackSize(1); - setCreativeTab(CreativeTabs.tabMisc); - setUnlocalizedName("orbOfTesting"); - setMaxDamage(100); - setFull3D(); - this.setEnergyUsed(100); - } - - public ItemStack onItemRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer) - { - if (!par3EntityPlayer.shouldHeal()) - { - return par1ItemStack; - } - - if (syphonBatteries(par1ItemStack, par3EntityPlayer, this.getEnergyUsed())) - { - par3EntityPlayer.heal(1); - } - - return par1ItemStack; - } -} diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/SacrificialDagger.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/SacrificialDagger.java index a3b7b28b..2ad4253e 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/SacrificialDagger.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/SacrificialDagger.java @@ -29,8 +29,7 @@ public class SacrificialDagger extends Item public SacrificialDagger() { super(); - this.maxStackSize = 1; - setCreativeTab(AlchemicalWizardry.tabBloodMagic); + setMaxStackSize(1); setFull3D(); } diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/ScribeTool.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/ScribeTool.java index 7714e676..57fd29fc 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/ScribeTool.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/ScribeTool.java @@ -1,6 +1,5 @@ package WayofTime.alchemicalWizardry.common.items; -import WayofTime.alchemicalWizardry.AlchemicalWizardry; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.util.StatCollector; @@ -8,7 +7,7 @@ import net.minecraft.world.World; import java.util.List; -public class ScribeTool extends EnergyItems +public class ScribeTool extends BindableItems { private int meta; @@ -16,7 +15,6 @@ public class ScribeTool extends EnergyItems { super(); setMaxStackSize(1); - setCreativeTab(AlchemicalWizardry.tabBloodMagic); setMaxDamage(10); setEnergyUsed(10); this.meta = inkType; @@ -36,7 +34,7 @@ public class ScribeTool extends EnergyItems @Override public ItemStack onItemRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer) { - if (EnergyItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer)) + if (BindableItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer)) { if (par1ItemStack.getItemDamage() > 0) { diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/TelepositionFocus.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/TelepositionFocus.java index 156dca5a..503643e0 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/TelepositionFocus.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/TelepositionFocus.java @@ -11,7 +11,7 @@ import net.minecraft.world.World; import net.minecraftforge.common.DimensionManager; import WayofTime.alchemicalWizardry.AlchemicalWizardry; -public class TelepositionFocus extends EnergyItems +public class TelepositionFocus extends BindableItems { private int focusLevel; @@ -45,7 +45,7 @@ public class TelepositionFocus extends EnergyItems @Override public ItemStack onItemRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer) { - if (EnergyItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer)) + if (BindableItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer)) { if (par3EntityPlayer.isSneaking()) { diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/TranscendentBloodOrb.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/TranscendentBloodOrb.java index 665f8d88..d8535662 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/TranscendentBloodOrb.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/TranscendentBloodOrb.java @@ -1,7 +1,6 @@ package WayofTime.alchemicalWizardry.common.items; - -public class TranscendentBloodOrb extends EnergyBattery +public class TranscendentBloodOrb extends Orb { public TranscendentBloodOrb(int damage) { diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/WaterScribeTool.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/WaterScribeTool.java index cec691aa..06d18615 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/WaterScribeTool.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/WaterScribeTool.java @@ -1,12 +1,9 @@ package WayofTime.alchemicalWizardry.common.items; -import WayofTime.alchemicalWizardry.AlchemicalWizardry; - public class WaterScribeTool extends ScribeTool { public WaterScribeTool() { super(1); - setCreativeTab(AlchemicalWizardry.tabBloodMagic); } } diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/armour/BoundArmour.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/armour/BoundArmour.java index fc61d289..b26cccab 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/armour/BoundArmour.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/armour/BoundArmour.java @@ -27,7 +27,7 @@ import WayofTime.alchemicalWizardry.api.alchemy.energy.IAlchemyGoggles; import WayofTime.alchemicalWizardry.api.items.interfaces.ArmourUpgrade; import WayofTime.alchemicalWizardry.api.items.interfaces.IBindable; import WayofTime.alchemicalWizardry.api.items.interfaces.ILPGauge; -import WayofTime.alchemicalWizardry.common.items.EnergyItems; +import WayofTime.alchemicalWizardry.common.items.BindableItems; import WayofTime.alchemicalWizardry.common.items.sigil.SigilDivination; import WayofTime.alchemicalWizardry.common.renderer.model.ModelOmegaArmour; @@ -43,7 +43,6 @@ public class BoundArmour extends ItemArmor implements IAlchemyGoggles, ISpecialA { super(ItemArmor.ArmorMaterial.GOLD, 0, armorType); setMaxDamage(1000); - setCreativeTab(AlchemicalWizardry.tabBloodMagic); } ModelBiped model1 = null; @@ -139,7 +138,7 @@ public class BoundArmour extends ItemArmor implements IAlchemyGoggles, ISpecialA @Override public ArmorProperties getProperties(EntityLivingBase player, ItemStack armor, DamageSource source, double damage, int slot) { - double armourReduction = 0.0; + double armourReduction; int f = 0; int h = 0; @@ -232,7 +231,7 @@ public class BoundArmour extends ItemArmor implements IAlchemyGoggles, ISpecialA { if (entity instanceof EntityPlayer) { - EnergyItems.checkAndSetItemOwner(stack, (EntityPlayer) entity); + BindableItems.checkAndSetItemOwner(stack, (EntityPlayer) entity); if (((EntityPlayer) entity).capabilities.isCreativeMode) { @@ -313,7 +312,7 @@ public class BoundArmour extends ItemArmor implements IAlchemyGoggles, ISpecialA @Override public ItemStack onItemRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer) { - EnergyItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer); + BindableItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer); return super.onItemRightClick(par1ItemStack, par2World, par3EntityPlayer); } @@ -339,11 +338,11 @@ public class BoundArmour extends ItemArmor implements IAlchemyGoggles, ISpecialA { if (itemStack.getItemDamage() > 0) { - EnergyItems.checkAndSetItemOwner(itemStack, player); + BindableItems.checkAndSetItemOwner(itemStack, player); if (!player.capabilities.isCreativeMode) { - if(EnergyItems.syphonBatteries(itemStack, player, itemStack.getItemDamage() * 75)) + if(BindableItems.syphonBatteries(itemStack, player, itemStack.getItemDamage() * 75)) { itemStack.setItemDamage(0); } @@ -380,7 +379,7 @@ public class BoundArmour extends ItemArmor implements IAlchemyGoggles, ISpecialA { if (getUpgradeCostMultiplier(par1ItemStack) > 0.02f) { - EnergyItems.syphonBatteries(par1ItemStack, par3Entity, (int) (((ArmourUpgrade) inv[i].getItem()).getEnergyForTenSeconds() * getUpgradeCostMultiplier(par1ItemStack))); + BindableItems.syphonBatteries(par1ItemStack, par3Entity, (int) (((ArmourUpgrade) inv[i].getItem()).getEnergyForTenSeconds() * getUpgradeCostMultiplier(par1ItemStack))); } } } @@ -442,7 +441,6 @@ public class BoundArmour extends ItemArmor implements IAlchemyGoggles, ISpecialA if (nextItem == null) { candidateSlot = i; - continue; } } diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/armour/OmegaArmour.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/armour/OmegaArmour.java index fb8bdc9c..14d756b0 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/armour/OmegaArmour.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/armour/OmegaArmour.java @@ -28,7 +28,7 @@ import net.minecraftforge.fml.relauncher.SideOnly; import WayofTime.alchemicalWizardry.api.alchemy.energy.Reagent; import WayofTime.alchemicalWizardry.api.soulNetwork.SoulNetworkHandler; import WayofTime.alchemicalWizardry.api.spell.APISpellHelper; -import WayofTime.alchemicalWizardry.common.items.EnergyItems; +import WayofTime.alchemicalWizardry.common.items.BindableItems; import WayofTime.alchemicalWizardry.common.omega.OmegaParadigm; public abstract class OmegaArmour extends BoundArmour @@ -40,7 +40,7 @@ public abstract class OmegaArmour extends BoundArmour protected boolean storeYLevel = false; protected boolean storeSeesSky = false; - protected List illegalEnchantmentList = new LinkedList(); + protected List illegalEnchantmentList = new LinkedList(); public float reagentDrainPerDamage = 0.1f; @@ -129,7 +129,7 @@ public abstract class OmegaArmour extends BoundArmour { if (!player.capabilities.isCreativeMode) { - if(EnergyItems.syphonBatteries(itemStack, player, itemStack.getItemDamage() * 75)) + if(BindableItems.syphonBatteries(itemStack, player, itemStack.getItemDamage() * 75)) { float reagentAmount = APISpellHelper.getPlayerCurrentReagentAmount(player); @@ -176,7 +176,7 @@ public abstract class OmegaArmour extends BoundArmour } } - Map> map = new HashMap(); + Map> map = new HashMap>(); for(Object obj : enchantList) { @@ -184,7 +184,7 @@ public abstract class OmegaArmour extends BoundArmour if(!map.containsKey(enchantmentdata.enchantmentobj)) { - map.put(enchantmentdata.enchantmentobj, new HashMap()); + map.put(enchantmentdata.enchantmentobj, new HashMap()); } Map numMap = map.get(enchantmentdata.enchantmentobj); @@ -308,9 +308,8 @@ public abstract class OmegaArmour extends BoundArmour } NBTTagCompound tag = omegaTag.getCompoundTag("armour"); - ItemStack armourStack = ItemStack.loadItemStackFromNBT(tag); - - return armourStack; + + return ItemStack.loadItemStackFromNBT(tag); } @Override diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/energy/ItemDestinationClearer.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/energy/AlchemicalCleanser.java similarity index 88% rename from src/main/java/WayofTime/alchemicalWizardry/common/items/energy/ItemDestinationClearer.java rename to src/main/java/WayofTime/alchemicalWizardry/common/items/energy/AlchemicalCleanser.java index 5ea4e85c..985a8f23 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/energy/ItemDestinationClearer.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/energy/AlchemicalCleanser.java @@ -11,17 +11,15 @@ import net.minecraft.util.ChatComponentTranslation; import net.minecraft.util.MovingObjectPosition; import net.minecraft.util.StatCollector; import net.minecraft.world.World; -import WayofTime.alchemicalWizardry.AlchemicalWizardry; import WayofTime.alchemicalWizardry.api.items.interfaces.IReagentManipulator; import WayofTime.alchemicalWizardry.common.tileEntity.TEReagentConduit; -public class ItemDestinationClearer extends Item implements IReagentManipulator +public class AlchemicalCleanser extends Item implements IReagentManipulator { - public ItemDestinationClearer() + public AlchemicalCleanser() { super(); - this.setCreativeTab(AlchemicalWizardry.tabBloodMagic); - this.maxStackSize = 1; + setMaxStackSize(1); } @Override diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/energy/ItemAttunedCrystal.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/energy/AlchemicalRouter.java similarity index 97% rename from src/main/java/WayofTime/alchemicalWizardry/common/items/energy/ItemAttunedCrystal.java rename to src/main/java/WayofTime/alchemicalWizardry/common/items/energy/AlchemicalRouter.java index fed941e1..eaa27a2b 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/energy/ItemAttunedCrystal.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/energy/AlchemicalRouter.java @@ -15,7 +15,6 @@ import net.minecraft.util.EnumFacing; import net.minecraft.util.MovingObjectPosition; import net.minecraft.util.StatCollector; import net.minecraft.world.World; -import WayofTime.alchemicalWizardry.AlchemicalWizardry; import WayofTime.alchemicalWizardry.api.Int3; import WayofTime.alchemicalWizardry.api.alchemy.energy.IReagentHandler; import WayofTime.alchemicalWizardry.api.alchemy.energy.Reagent; @@ -25,16 +24,13 @@ import WayofTime.alchemicalWizardry.api.alchemy.energy.ReagentStack; import WayofTime.alchemicalWizardry.api.items.interfaces.IReagentManipulator; import WayofTime.alchemicalWizardry.common.tileEntity.TEReagentConduit; -public class ItemAttunedCrystal extends Item implements IReagentManipulator +public class AlchemicalRouter extends Item implements IReagentManipulator { - public static final int maxDistance = 6; - - public ItemAttunedCrystal() + public AlchemicalRouter() { super(); - this.setCreativeTab(AlchemicalWizardry.tabBloodMagic); this.hasSubtypes = true; - this.maxStackSize = 1; + setMaxStackSize(1); } @Override @@ -115,7 +111,7 @@ public class ItemAttunedCrystal extends Item implements IReagentManipulator ReagentContainerInfo[] infos = relay.getContainerInfo(EnumFacing.UP); if (infos != null) { - List reagentList = new LinkedList(); + List reagentList = new LinkedList(); for (ReagentContainerInfo info : infos) { if (info != null) @@ -163,6 +159,8 @@ public class ItemAttunedCrystal extends Item implements IReagentManipulator return itemStack; } + final int maxDistance = 6; + if (dimension != world.provider.getDimensionId() || Math.abs(coords.xCoord - pos.getX()) > maxDistance || Math.abs(coords.yCoord - pos.getY()) > maxDistance || Math.abs(coords.zCoord - pos.getZ()) > maxDistance) { player.addChatComponentMessage(new ChatComponentTranslation("message.attunedcrystal.error.toofar")); diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/energy/ItemTankSegmenter.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/energy/AlchemicalSegmenter.java similarity index 96% rename from src/main/java/WayofTime/alchemicalWizardry/common/items/energy/ItemTankSegmenter.java rename to src/main/java/WayofTime/alchemicalWizardry/common/items/energy/AlchemicalSegmenter.java index 19e02a18..fe20f238 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/energy/ItemTankSegmenter.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/energy/AlchemicalSegmenter.java @@ -14,7 +14,6 @@ import net.minecraft.util.EnumFacing; import net.minecraft.util.MovingObjectPosition; import net.minecraft.util.StatCollector; import net.minecraft.world.World; -import WayofTime.alchemicalWizardry.AlchemicalWizardry; import WayofTime.alchemicalWizardry.api.alchemy.energy.ISegmentedReagentHandler; import WayofTime.alchemicalWizardry.api.alchemy.energy.Reagent; import WayofTime.alchemicalWizardry.api.alchemy.energy.ReagentContainerInfo; @@ -22,14 +21,13 @@ import WayofTime.alchemicalWizardry.api.alchemy.energy.ReagentRegistry; import WayofTime.alchemicalWizardry.api.alchemy.energy.ReagentStack; import WayofTime.alchemicalWizardry.api.items.interfaces.IReagentManipulator; -public class ItemTankSegmenter extends Item implements IReagentManipulator +public class AlchemicalSegmenter extends Item implements IReagentManipulator { - public ItemTankSegmenter() + public AlchemicalSegmenter() { super(); - this.setCreativeTab(AlchemicalWizardry.tabBloodMagic); this.hasSubtypes = true; - this.maxStackSize = 1; + setMaxStackSize(1); } @Override diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/potion/AlchemyFlask.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/potion/AlchemyFlask.java index 520db9fd..013a085a 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/potion/AlchemyFlask.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/potion/AlchemyFlask.java @@ -23,7 +23,6 @@ import net.minecraft.util.EnumChatFormatting; import net.minecraft.util.StatCollector; import net.minecraft.world.World; import net.minecraftforge.common.util.Constants; -import WayofTime.alchemicalWizardry.AlchemicalWizardry; import WayofTime.alchemicalWizardry.api.alchemy.AlchemyPotionHelper; import com.google.common.collect.HashMultimap; @@ -33,16 +32,15 @@ public class AlchemyFlask extends Item public AlchemyFlask() { super(); - this.setMaxDamage(8); - this.setMaxStackSize(1); - setCreativeTab(AlchemicalWizardry.tabBloodMagic); + setMaxDamage(8); + setMaxStackSize(1); } public static ArrayList getEffects(ItemStack par1ItemStack) { if (par1ItemStack.hasTagCompound() && par1ItemStack.getTagCompound().hasKey("CustomFlaskEffects")) { - ArrayList arraylist = new ArrayList(); + ArrayList arraylist = new ArrayList(); NBTTagList nbttaglist = par1ItemStack.getTagCompound().getTagList("CustomFlaskEffects", Constants.NBT.TAG_COMPOUND); for (int i = 0; i < nbttaglist.tagCount(); ++i) @@ -63,7 +61,7 @@ public class AlchemyFlask extends Item if (list != null) { - ArrayList newList = new ArrayList(); + ArrayList newList = new ArrayList(); for (AlchemyPotionHelper aph : list) { diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/potion/AlchemyReagent.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/potion/AlchemyReagent.java index 4b856a08..fe205e3d 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/potion/AlchemyReagent.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/potion/AlchemyReagent.java @@ -10,7 +10,6 @@ import net.minecraft.util.StatCollector; import org.lwjgl.input.Keyboard; -import WayofTime.alchemicalWizardry.AlchemicalWizardry; import WayofTime.alchemicalWizardry.api.alchemy.AlchemyRecipeRegistry; public class AlchemyReagent extends Item @@ -18,8 +17,7 @@ public class AlchemyReagent extends Item public AlchemyReagent() { super(); - setCreativeTab(AlchemicalWizardry.tabBloodMagic); - this.setMaxStackSize(64); + setMaxStackSize(64); } @Override diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/potion/AverageLengtheningCatalyst.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/potion/AverageLengtheningCatalyst.java index 168c4897..594fce54 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/potion/AverageLengtheningCatalyst.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/potion/AverageLengtheningCatalyst.java @@ -1,6 +1,5 @@ package WayofTime.alchemicalWizardry.common.items.potion; - public class AverageLengtheningCatalyst extends LengtheningCatalyst { public AverageLengtheningCatalyst() diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/potion/AveragePowerCatalyst.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/potion/AveragePowerCatalyst.java index 7ec8f7d6..8f6143b4 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/potion/AveragePowerCatalyst.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/potion/AveragePowerCatalyst.java @@ -1,6 +1,5 @@ package WayofTime.alchemicalWizardry.common.items.potion; - public class AveragePowerCatalyst extends PowerCatalyst { public AveragePowerCatalyst() diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/potion/CombinationalCatalyst.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/potion/CombinationalCatalyst.java index 543b313f..d61144f7 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/potion/CombinationalCatalyst.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/potion/CombinationalCatalyst.java @@ -1,7 +1,6 @@ package WayofTime.alchemicalWizardry.common.items.potion; import net.minecraft.item.Item; -import WayofTime.alchemicalWizardry.AlchemicalWizardry; import WayofTime.alchemicalWizardry.common.alchemy.ICombinationalCatalyst; public class CombinationalCatalyst extends Item implements ICombinationalCatalyst @@ -9,7 +8,5 @@ public class CombinationalCatalyst extends Item implements ICombinationalCatalys public CombinationalCatalyst() { super(); - this.setCreativeTab(AlchemicalWizardry.tabBloodMagic); } - } diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/potion/EnhancedFillingAgent.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/potion/EnhancedFillingAgent.java index 8d02cf07..4a870991 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/potion/EnhancedFillingAgent.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/potion/EnhancedFillingAgent.java @@ -1,13 +1,10 @@ package WayofTime.alchemicalWizardry.common.items.potion; -import WayofTime.alchemicalWizardry.AlchemicalWizardry; - public class EnhancedFillingAgent extends WeakFillingAgent { public EnhancedFillingAgent() { super(); - setCreativeTab(AlchemicalWizardry.tabBloodMagic); } @Override diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/potion/GreaterLengtheningCatalyst.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/potion/GreaterLengtheningCatalyst.java index ccafc906..f0e63816 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/potion/GreaterLengtheningCatalyst.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/potion/GreaterLengtheningCatalyst.java @@ -1,6 +1,5 @@ package WayofTime.alchemicalWizardry.common.items.potion; - public class GreaterLengtheningCatalyst extends LengtheningCatalyst { public GreaterLengtheningCatalyst() diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/potion/GreaterPowerCatalyst.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/potion/GreaterPowerCatalyst.java index c1967cb2..779d4d76 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/potion/GreaterPowerCatalyst.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/potion/GreaterPowerCatalyst.java @@ -1,6 +1,5 @@ package WayofTime.alchemicalWizardry.common.items.potion; - public class GreaterPowerCatalyst extends PowerCatalyst { public GreaterPowerCatalyst() diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/potion/LengtheningCatalyst.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/potion/LengtheningCatalyst.java index 628ff26e..66bf2586 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/potion/LengtheningCatalyst.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/potion/LengtheningCatalyst.java @@ -1,6 +1,5 @@ package WayofTime.alchemicalWizardry.common.items.potion; -import WayofTime.alchemicalWizardry.AlchemicalWizardry; import WayofTime.alchemicalWizardry.api.alchemy.AlchemyRecipeRegistry; import WayofTime.alchemicalWizardry.common.ICatalyst; import net.minecraft.entity.player.EntityPlayer; @@ -19,7 +18,6 @@ public class LengtheningCatalyst extends Item implements ICatalyst public LengtheningCatalyst(int catalystStrength) { this.catalystStrength = catalystStrength; - setCreativeTab(AlchemicalWizardry.tabBloodMagic); } @Override diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/potion/MundaneLengtheningCatalyst.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/potion/MundaneLengtheningCatalyst.java index ddfe0d02..aa78b151 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/potion/MundaneLengtheningCatalyst.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/potion/MundaneLengtheningCatalyst.java @@ -1,6 +1,5 @@ package WayofTime.alchemicalWizardry.common.items.potion; - public class MundaneLengtheningCatalyst extends LengtheningCatalyst { public MundaneLengtheningCatalyst() diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/potion/MundanePowerCatalyst.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/potion/MundanePowerCatalyst.java index e25e8878..958b0013 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/potion/MundanePowerCatalyst.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/potion/MundanePowerCatalyst.java @@ -1,6 +1,5 @@ package WayofTime.alchemicalWizardry.common.items.potion; - public class MundanePowerCatalyst extends PowerCatalyst { public MundanePowerCatalyst() diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/potion/PowerCatalyst.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/potion/PowerCatalyst.java index fc965408..967a0d34 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/potion/PowerCatalyst.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/potion/PowerCatalyst.java @@ -1,6 +1,5 @@ package WayofTime.alchemicalWizardry.common.items.potion; -import WayofTime.alchemicalWizardry.AlchemicalWizardry; import WayofTime.alchemicalWizardry.api.alchemy.AlchemyRecipeRegistry; import WayofTime.alchemicalWizardry.common.ICatalyst; import net.minecraft.entity.player.EntityPlayer; @@ -21,7 +20,6 @@ public class PowerCatalyst extends Item implements ICatalyst { super(); this.catalystStrength = catalystStrength; - setCreativeTab(AlchemicalWizardry.tabBloodMagic); } @Override diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/potion/StandardBindingAgent.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/potion/StandardBindingAgent.java index d3953953..8e70f9ea 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/potion/StandardBindingAgent.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/potion/StandardBindingAgent.java @@ -10,7 +10,6 @@ import net.minecraft.util.StatCollector; import org.lwjgl.input.Keyboard; -import WayofTime.alchemicalWizardry.AlchemicalWizardry; import WayofTime.alchemicalWizardry.api.alchemy.AlchemyRecipeRegistry; import WayofTime.alchemicalWizardry.common.IBindingAgent; @@ -19,7 +18,6 @@ public class StandardBindingAgent extends Item implements IBindingAgent public StandardBindingAgent() { super(); - setCreativeTab(AlchemicalWizardry.tabBloodMagic); } @Override diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/potion/StandardFillingAgent.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/potion/StandardFillingAgent.java index 44d8bc4a..21854904 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/potion/StandardFillingAgent.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/potion/StandardFillingAgent.java @@ -1,13 +1,10 @@ package WayofTime.alchemicalWizardry.common.items.potion; -import WayofTime.alchemicalWizardry.AlchemicalWizardry; - public class StandardFillingAgent extends WeakFillingAgent { public StandardFillingAgent() { super(); - setCreativeTab(AlchemicalWizardry.tabBloodMagic); } @Override diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/potion/WeakBindingAgent.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/potion/WeakBindingAgent.java index b95591c6..bc755dc1 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/potion/WeakBindingAgent.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/potion/WeakBindingAgent.java @@ -1,6 +1,5 @@ package WayofTime.alchemicalWizardry.common.items.potion; - public class WeakBindingAgent extends StandardBindingAgent { public WeakBindingAgent() diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/potion/WeakFillingAgent.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/potion/WeakFillingAgent.java index 04155e3a..8203572a 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/potion/WeakFillingAgent.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/potion/WeakFillingAgent.java @@ -11,7 +11,6 @@ import net.minecraft.util.StatCollector; import org.lwjgl.input.Keyboard; -import WayofTime.alchemicalWizardry.AlchemicalWizardry; import WayofTime.alchemicalWizardry.api.alchemy.AlchemyRecipeRegistry; import WayofTime.alchemicalWizardry.common.IFillingAgent; @@ -20,7 +19,6 @@ public class WeakFillingAgent extends Item implements IFillingAgent public WeakFillingAgent() { super(); - setCreativeTab(AlchemicalWizardry.tabBloodMagic); } @Override diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/routing/InputRoutingFocus.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/routing/InputRoutingFocus.java index 96ee3421..74ce08b8 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/routing/InputRoutingFocus.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/routing/InputRoutingFocus.java @@ -1,6 +1,5 @@ package WayofTime.alchemicalWizardry.common.items.routing; - public class InputRoutingFocus extends RoutingFocus { public InputRoutingFocus() diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/routing/OutputRoutingFocus.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/routing/OutputRoutingFocus.java index 4c2e323f..b8a5f0fc 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/routing/OutputRoutingFocus.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/routing/OutputRoutingFocus.java @@ -44,23 +44,23 @@ public class OutputRoutingFocus extends RoutingFocus implements ILimitedRoutingF { String addedString = ""; - switch(itemStack.getItemDamage()) + switch (itemStack.getItemDamage()) { - case 0: - addedString = "default"; - break; - case 1: - addedString = "modItem"; - break; - case 2: - addedString = "ignMeta"; - break; - case 3: - addedString = "matchNBT"; - break; - case 4: - addedString = "global"; - break; + case 0: + addedString = "default"; + break; + case 1: + addedString = "modItem"; + break; + case 2: + addedString = "ignMeta"; + break; + case 3: + addedString = "matchNBT"; + break; + case 4: + addedString = "global"; + break; } return super.getUnlocalizedName() + "." + addedString; diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilAir.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilAir.java index 61b14e09..eacefd8b 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilAir.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilAir.java @@ -13,10 +13,10 @@ import net.minecraftforge.fml.relauncher.SideOnly; import WayofTime.alchemicalWizardry.AlchemicalWizardry; import WayofTime.alchemicalWizardry.api.items.interfaces.ArmourUpgrade; import WayofTime.alchemicalWizardry.api.items.interfaces.ISigil; -import WayofTime.alchemicalWizardry.common.items.EnergyItems; +import WayofTime.alchemicalWizardry.common.items.BindableItems; import codechicken.lib.render.TextureUtils.IIconRegister; -public class SigilAir extends EnergyItems implements ArmourUpgrade, ISigil +public class SigilAir extends BindableItems implements ArmourUpgrade, ISigil { public SigilAir() { @@ -48,7 +48,7 @@ public class SigilAir extends EnergyItems implements ArmourUpgrade, ISigil @Override public ItemStack onItemRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer) { - if (!EnergyItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer) || par3EntityPlayer.isSneaking()) + if (!BindableItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer) || par3EntityPlayer.isSneaking()) { return par1ItemStack; } @@ -75,7 +75,7 @@ public class SigilAir extends EnergyItems implements ArmourUpgrade, ISigil if (!par3EntityPlayer.capabilities.isCreativeMode) { - if (!EnergyItems.syphonBatteries(par1ItemStack, par3EntityPlayer, getEnergyUsed())) + if (!BindableItems.syphonBatteries(par1ItemStack, par3EntityPlayer, getEnergyUsed())) { if(!par2World.isRemote) { diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilBloodLight.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilBloodLight.java index eeb69c9e..767ef64b 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilBloodLight.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilBloodLight.java @@ -16,11 +16,11 @@ import WayofTime.alchemicalWizardry.ModBlocks; import WayofTime.alchemicalWizardry.api.items.interfaces.ArmourUpgrade; import WayofTime.alchemicalWizardry.api.items.interfaces.IHolding; import WayofTime.alchemicalWizardry.common.entity.projectile.EntityBloodLightProjectile; -import WayofTime.alchemicalWizardry.common.items.EnergyItems; +import WayofTime.alchemicalWizardry.common.items.BindableItems; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -public class SigilBloodLight extends EnergyItems implements IHolding, ArmourUpgrade, ISigil +public class SigilBloodLight extends BindableItems implements IHolding, ArmourUpgrade, ISigil { public SigilBloodLight() { @@ -51,7 +51,7 @@ public class SigilBloodLight extends EnergyItems implements IHolding, ArmourUpgr @Override public boolean onItemUse(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, World par3World, int par4, int par5, int par6, int par7, float par8, float par9, float par10) { - if(!EnergyItems.checkAndSetItemOwner(par1ItemStack, par2EntityPlayer) || !EnergyItems.syphonBatteries(par1ItemStack, par2EntityPlayer, getEnergyUsed())) + if(!BindableItems.checkAndSetItemOwner(par1ItemStack, par2EntityPlayer) || !BindableItems.syphonBatteries(par1ItemStack, par2EntityPlayer, getEnergyUsed())) { return true; } @@ -97,7 +97,7 @@ public class SigilBloodLight extends EnergyItems implements IHolding, ArmourUpgr @Override public ItemStack onItemRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer) { - if (!EnergyItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer) || par3EntityPlayer.isSneaking()) + if (!BindableItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer) || par3EntityPlayer.isSneaking()) { return par1ItemStack; } @@ -107,7 +107,7 @@ public class SigilBloodLight extends EnergyItems implements IHolding, ArmourUpgr par1ItemStack.setTagCompound(new NBTTagCompound()); } - if(!EnergyItems.syphonBatteries(par1ItemStack, par3EntityPlayer, getEnergyUsed() * 5)) + if(!BindableItems.syphonBatteries(par1ItemStack, par3EntityPlayer, getEnergyUsed() * 5)) { return par1ItemStack; } diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilDivination.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilDivination.java index 26f59fae..f713efd9 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilDivination.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilDivination.java @@ -22,7 +22,7 @@ import WayofTime.alchemicalWizardry.api.alchemy.energy.ReagentRegistry; import WayofTime.alchemicalWizardry.api.items.interfaces.ArmourUpgrade; import WayofTime.alchemicalWizardry.api.items.interfaces.IBindable; import WayofTime.alchemicalWizardry.api.items.interfaces.IReagentManipulator; -import WayofTime.alchemicalWizardry.common.items.EnergyItems; +import WayofTime.alchemicalWizardry.common.items.BindableItems; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -57,14 +57,14 @@ public class SigilDivination extends Item implements ArmourUpgrade, IReagentMani @Override public ItemStack onItemRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer) { - EnergyItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer); + BindableItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer); - if (!EnergyItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer) || par3EntityPlayer.worldObj.isRemote) + if (!BindableItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer) || par3EntityPlayer.worldObj.isRemote) { return par1ItemStack; } - if(!EnergyItems.syphonBatteries(par1ItemStack, par3EntityPlayer, 0)) + if(!BindableItems.syphonBatteries(par1ItemStack, par3EntityPlayer, 0)) { return par1ItemStack; } diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilHarvest.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilHarvest.java index 08db2402..535c5ff4 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilHarvest.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilHarvest.java @@ -15,11 +15,11 @@ import WayofTime.alchemicalWizardry.AlchemicalWizardry; import WayofTime.alchemicalWizardry.api.harvest.HarvestRegistry; import WayofTime.alchemicalWizardry.api.items.interfaces.ArmourUpgrade; import WayofTime.alchemicalWizardry.api.items.interfaces.IHolding; -import WayofTime.alchemicalWizardry.common.items.EnergyItems; +import WayofTime.alchemicalWizardry.common.items.BindableItems; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -public class SigilHarvest extends EnergyItems implements IHolding, ArmourUpgrade, ISigil +public class SigilHarvest extends BindableItems implements IHolding, ArmourUpgrade, ISigil { @SideOnly(Side.CLIENT) private IIcon activeIcon; @@ -97,7 +97,7 @@ public class SigilHarvest extends EnergyItems implements IHolding, ArmourUpgrade @Override public ItemStack onItemRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer) { - if (!EnergyItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer) || par3EntityPlayer.isSneaking()) + if (!BindableItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer) || par3EntityPlayer.isSneaking()) { return par1ItemStack; } @@ -117,7 +117,7 @@ public class SigilHarvest extends EnergyItems implements IHolding, ArmourUpgrade if (!par3EntityPlayer.capabilities.isCreativeMode) { - if (!EnergyItems.syphonBatteries(par1ItemStack, par3EntityPlayer, getEnergyUsed())) + if (!BindableItems.syphonBatteries(par1ItemStack, par3EntityPlayer, getEnergyUsed())) { tag.setBoolean("isActive", false); } @@ -168,7 +168,7 @@ public class SigilHarvest extends EnergyItems implements IHolding, ArmourUpgrade { if (!par3EntityPlayer.capabilities.isCreativeMode) { - if(!EnergyItems.syphonBatteries(par1ItemStack, par3EntityPlayer, getEnergyUsed())) + if(!BindableItems.syphonBatteries(par1ItemStack, par3EntityPlayer, getEnergyUsed())) { par1ItemStack.getTagCompound().setBoolean("isActive", false); } diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilLava.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilLava.java index cbc7dc86..0bdcef3a 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilLava.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilLava.java @@ -22,8 +22,8 @@ import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.IFluidHandler; import WayofTime.alchemicalWizardry.AlchemicalWizardry; import WayofTime.alchemicalWizardry.api.items.interfaces.ArmourUpgrade; -import WayofTime.alchemicalWizardry.common.items.EnergyBattery; -import WayofTime.alchemicalWizardry.common.items.EnergyItems; +import WayofTime.alchemicalWizardry.common.items.Orb; +import WayofTime.alchemicalWizardry.common.items.BindableItems; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -82,7 +82,7 @@ public class SigilLava extends ItemBucket implements ArmourUpgrade, ISigil @Override public boolean onItemUseFirst(ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int side, float hitX, float hitY, float hitZ) { - if (world.isRemote || !EnergyItems.checkAndSetItemOwner(stack, player) || player.isSneaking()) + if (world.isRemote || !BindableItems.checkAndSetItemOwner(stack, player) || player.isSneaking()) { return false; } @@ -98,7 +98,7 @@ public class SigilLava extends ItemBucket implements ArmourUpgrade, ISigil FluidStack fluid = new FluidStack(FluidRegistry.LAVA, 1000); int amount = ((IFluidHandler) tile).fill(ForgeDirection.getOrientation(side), fluid, false); - if (amount > 0 && EnergyItems.syphonBatteries(stack, player, getEnergyUsed())) + if (amount > 0 && BindableItems.syphonBatteries(stack, player, getEnergyUsed())) { ((IFluidHandler) tile).fill(ForgeDirection.getOrientation(side), fluid, true); } @@ -146,7 +146,7 @@ public class SigilLava extends ItemBucket implements ArmourUpgrade, ISigil return false; } - if(this.canPlaceContainedLiquid(world, x, y, z, x, y, z) && EnergyItems.syphonBatteries(stack, player, getEnergyUsed())) + if(this.canPlaceContainedLiquid(world, x, y, z, x, y, z) && BindableItems.syphonBatteries(stack, player, getEnergyUsed())) { return this.tryPlaceContainedLiquid(world, x, y, z, x, y, z); } @@ -212,7 +212,7 @@ public class SigilLava extends ItemBucket implements ArmourUpgrade, ISigil { continue; } - if (stack.getItem() instanceof EnergyBattery && !usedBattery) + if (stack.getItem() instanceof Orb && !usedBattery) { if (stack.getItemDamage() <= stack.getMaxDamage() - damageToBeDone) { diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilOfElementalAffinity.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilOfElementalAffinity.java index 7d636c01..770cb4ce 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilOfElementalAffinity.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilOfElementalAffinity.java @@ -2,7 +2,7 @@ package WayofTime.alchemicalWizardry.common.items.sigil; import WayofTime.alchemicalWizardry.AlchemicalWizardry; import WayofTime.alchemicalWizardry.api.items.interfaces.ISigil; -import WayofTime.alchemicalWizardry.common.items.EnergyItems; +import WayofTime.alchemicalWizardry.common.items.BindableItems; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.client.renderer.texture.IIconRegister; @@ -18,7 +18,7 @@ import net.minecraft.world.World; import java.util.List; -public class SigilOfElementalAffinity extends EnergyItems implements ISigil +public class SigilOfElementalAffinity extends BindableItems implements ISigil { @SideOnly(Side.CLIENT) private IIcon activeIcon; @@ -97,7 +97,7 @@ public class SigilOfElementalAffinity extends EnergyItems implements ISigil @Override public ItemStack onItemRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer) { - if (!EnergyItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer) || par3EntityPlayer.isSneaking()) + if (!BindableItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer) || par3EntityPlayer.isSneaking()) { return par1ItemStack; } @@ -110,7 +110,7 @@ public class SigilOfElementalAffinity extends EnergyItems implements ISigil NBTTagCompound tag = par1ItemStack.getTagCompound(); tag.setBoolean("isActive", !(tag.getBoolean("isActive"))); - if (tag.getBoolean("isActive") && EnergyItems.syphonBatteries(par1ItemStack, par3EntityPlayer, getEnergyUsed())) + if (tag.getBoolean("isActive") && BindableItems.syphonBatteries(par1ItemStack, par3EntityPlayer, getEnergyUsed())) { par1ItemStack.setItemDamage(1); tag.setInteger("worldTimeDelay", (int) (par2World.getWorldTime() - 1) % 200); @@ -150,7 +150,7 @@ public class SigilOfElementalAffinity extends EnergyItems implements ISigil { if (!par3EntityPlayer.capabilities.isCreativeMode) { - if (!EnergyItems.syphonBatteries(par1ItemStack, par3EntityPlayer, getEnergyUsed())) + if (!BindableItems.syphonBatteries(par1ItemStack, par3EntityPlayer, getEnergyUsed())) { par1ItemStack.getTagCompound().setBoolean("isActive", false); } diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilOfEnderSeverance.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilOfEnderSeverance.java index 5ed0ea63..d8d262a0 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilOfEnderSeverance.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilOfEnderSeverance.java @@ -3,7 +3,7 @@ package WayofTime.alchemicalWizardry.common.items.sigil; import WayofTime.alchemicalWizardry.AlchemicalWizardry; import WayofTime.alchemicalWizardry.api.items.interfaces.IHolding; import WayofTime.alchemicalWizardry.api.items.interfaces.ISigil; -import WayofTime.alchemicalWizardry.common.items.EnergyItems; +import WayofTime.alchemicalWizardry.common.items.BindableItems; import WayofTime.alchemicalWizardry.common.spell.complex.effect.SpellHelper; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -20,7 +20,7 @@ import net.minecraft.world.World; import java.util.List; -public class SigilOfEnderSeverance extends EnergyItems implements IHolding, ISigil +public class SigilOfEnderSeverance extends BindableItems implements IHolding, ISigil { @SideOnly(Side.CLIENT) private IIcon activeIcon; @@ -98,7 +98,7 @@ public class SigilOfEnderSeverance extends EnergyItems implements IHolding, ISig @Override public ItemStack onItemRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer) { - if (!EnergyItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer) || par3EntityPlayer.isSneaking()) + if (!BindableItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer) || par3EntityPlayer.isSneaking()) { return par1ItemStack; } @@ -118,7 +118,7 @@ public class SigilOfEnderSeverance extends EnergyItems implements IHolding, ISig if (!par3EntityPlayer.capabilities.isCreativeMode) { - if (!EnergyItems.syphonBatteries(par1ItemStack, par3EntityPlayer, getEnergyUsed())) + if (!BindableItems.syphonBatteries(par1ItemStack, par3EntityPlayer, getEnergyUsed())) { tag.setBoolean("isActive", false); } @@ -161,7 +161,7 @@ public class SigilOfEnderSeverance extends EnergyItems implements IHolding, ISig { if (!par3EntityPlayer.capabilities.isCreativeMode) { - if(!EnergyItems.syphonBatteries(par1ItemStack, par3EntityPlayer, getEnergyUsed())) + if(!BindableItems.syphonBatteries(par1ItemStack, par3EntityPlayer, getEnergyUsed())) { par1ItemStack.getTagCompound().setBoolean("isActive", false); } diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilOfGrowth.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilOfGrowth.java index f888d5a2..d5687613 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilOfGrowth.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilOfGrowth.java @@ -3,7 +3,7 @@ package WayofTime.alchemicalWizardry.common.items.sigil; import WayofTime.alchemicalWizardry.AlchemicalWizardry; import WayofTime.alchemicalWizardry.api.items.interfaces.ArmourUpgrade; import WayofTime.alchemicalWizardry.api.items.interfaces.ISigil; -import WayofTime.alchemicalWizardry.common.items.EnergyItems; +import WayofTime.alchemicalWizardry.common.items.BindableItems; import cpw.mods.fml.common.eventhandler.Event.Result; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -24,7 +24,7 @@ import net.minecraftforge.event.entity.player.BonemealEvent; import java.util.List; -public class SigilOfGrowth extends EnergyItems implements ArmourUpgrade, ISigil +public class SigilOfGrowth extends BindableItems implements ArmourUpgrade, ISigil { @SideOnly(Side.CLIENT) private IIcon activeIcon; @@ -104,11 +104,11 @@ public class SigilOfGrowth extends EnergyItems implements ArmourUpgrade, ISigil @Override public boolean onItemUse(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, World par3World, int par4, int par5, int par6, int par7, float par8, float par9, float par10) { - if (EnergyItems.checkAndSetItemOwner(par1ItemStack, par2EntityPlayer)) + if (BindableItems.checkAndSetItemOwner(par1ItemStack, par2EntityPlayer)) { if (applyBonemeal(par1ItemStack, par3World, par4, par5, par6, par2EntityPlayer)) { - EnergyItems.syphonBatteries(par1ItemStack, par2EntityPlayer, getEnergyUsed()); + BindableItems.syphonBatteries(par1ItemStack, par2EntityPlayer, getEnergyUsed()); if (par3World.isRemote) { @@ -125,7 +125,7 @@ public class SigilOfGrowth extends EnergyItems implements ArmourUpgrade, ISigil @Override public ItemStack onItemRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer) { - if (!EnergyItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer) || par3EntityPlayer.isSneaking()) + if (!BindableItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer) || par3EntityPlayer.isSneaking()) { return par1ItemStack; } @@ -143,7 +143,7 @@ public class SigilOfGrowth extends EnergyItems implements ArmourUpgrade, ISigil NBTTagCompound tag = par1ItemStack.getTagCompound(); tag.setBoolean("isActive", !(tag.getBoolean("isActive"))); - if (tag.getBoolean("isActive") && EnergyItems.syphonBatteries(par1ItemStack, par3EntityPlayer, getEnergyUsed())) + if (tag.getBoolean("isActive") && BindableItems.syphonBatteries(par1ItemStack, par3EntityPlayer, getEnergyUsed())) { par1ItemStack.setItemDamage(1); tag.setInteger("worldTimeDelay", (int) (par2World.getWorldTime() - 1) % tickDelay); @@ -172,7 +172,7 @@ public class SigilOfGrowth extends EnergyItems implements ArmourUpgrade, ISigil { if (par2World.getWorldTime() % tickDelay == par1ItemStack.getTagCompound().getInteger("worldTimeDelay")) { - if(!EnergyItems.syphonBatteries(par1ItemStack, (EntityPlayer) par3Entity, getEnergyUsed())) + if(!BindableItems.syphonBatteries(par1ItemStack, (EntityPlayer) par3Entity, getEnergyUsed())) { par1ItemStack.getTagCompound().setBoolean("isActive", false); } diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilOfHaste.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilOfHaste.java index 12b772ca..ed103ecf 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilOfHaste.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilOfHaste.java @@ -3,7 +3,7 @@ package WayofTime.alchemicalWizardry.common.items.sigil; import WayofTime.alchemicalWizardry.AlchemicalWizardry; import WayofTime.alchemicalWizardry.api.items.interfaces.ArmourUpgrade; import WayofTime.alchemicalWizardry.api.items.interfaces.ISigil; -import WayofTime.alchemicalWizardry.common.items.EnergyItems; +import WayofTime.alchemicalWizardry.common.items.BindableItems; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.client.renderer.texture.IIconRegister; @@ -18,7 +18,7 @@ import net.minecraft.world.World; import java.util.List; -public class SigilOfHaste extends EnergyItems implements ArmourUpgrade, ISigil +public class SigilOfHaste extends BindableItems implements ArmourUpgrade, ISigil { @SideOnly(Side.CLIENT) private IIcon activeIcon; @@ -96,7 +96,7 @@ public class SigilOfHaste extends EnergyItems implements ArmourUpgrade, ISigil @Override public ItemStack onItemRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer) { - if (!EnergyItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer) || par3EntityPlayer.isSneaking()) + if (!BindableItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer) || par3EntityPlayer.isSneaking()) { return par1ItemStack; } @@ -109,7 +109,7 @@ public class SigilOfHaste extends EnergyItems implements ArmourUpgrade, ISigil NBTTagCompound tag = par1ItemStack.getTagCompound(); tag.setBoolean("isActive", !(tag.getBoolean("isActive"))); - if (tag.getBoolean("isActive") && EnergyItems.syphonBatteries(par1ItemStack, par3EntityPlayer, getEnergyUsed())) + if (tag.getBoolean("isActive") && BindableItems.syphonBatteries(par1ItemStack, par3EntityPlayer, getEnergyUsed())) { par1ItemStack.setItemDamage(1); tag.setInteger("worldTimeDelay", (int) (par2World.getWorldTime() - 1) % 200); @@ -146,7 +146,7 @@ public class SigilOfHaste extends EnergyItems implements ArmourUpgrade, ISigil { if (!par3EntityPlayer.capabilities.isCreativeMode) { - if (!EnergyItems.syphonBatteries(par1ItemStack, par3EntityPlayer, getEnergyUsed())) + if (!BindableItems.syphonBatteries(par1ItemStack, par3EntityPlayer, getEnergyUsed())) { par1ItemStack.getTagCompound().setBoolean("isActive", false); } diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilOfMagnetism.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilOfMagnetism.java index 34725eb3..1d7346b7 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilOfMagnetism.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilOfMagnetism.java @@ -17,11 +17,11 @@ import net.minecraft.world.World; import WayofTime.alchemicalWizardry.AlchemicalWizardry; import WayofTime.alchemicalWizardry.api.items.interfaces.ArmourUpgrade; import WayofTime.alchemicalWizardry.api.items.interfaces.IHolding; -import WayofTime.alchemicalWizardry.common.items.EnergyItems; +import WayofTime.alchemicalWizardry.common.items.BindableItems; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -public class SigilOfMagnetism extends EnergyItems implements ArmourUpgrade, IHolding, ISigil +public class SigilOfMagnetism extends BindableItems implements ArmourUpgrade, IHolding, ISigil { @SideOnly(Side.CLIENT) private IIcon activeIcon; @@ -100,7 +100,7 @@ public class SigilOfMagnetism extends EnergyItems implements ArmourUpgrade, IHol @Override public ItemStack onItemRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer) { - if (!EnergyItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer) || par3EntityPlayer.isSneaking()) + if (!BindableItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer) || par3EntityPlayer.isSneaking()) { return par1ItemStack; } @@ -113,7 +113,7 @@ public class SigilOfMagnetism extends EnergyItems implements ArmourUpgrade, IHol NBTTagCompound tag = par1ItemStack.getTagCompound(); tag.setBoolean("isActive", !(tag.getBoolean("isActive"))); - if (tag.getBoolean("isActive") && EnergyItems.syphonBatteries(par1ItemStack, par3EntityPlayer, getEnergyUsed())) + if (tag.getBoolean("isActive") && BindableItems.syphonBatteries(par1ItemStack, par3EntityPlayer, getEnergyUsed())) { par1ItemStack.setItemDamage(1); tag.setInteger("worldTimeDelay", (int) (par2World.getWorldTime() - 1) % tickDelay); @@ -144,7 +144,7 @@ public class SigilOfMagnetism extends EnergyItems implements ArmourUpgrade, IHol { if (par2World.getWorldTime() % tickDelay == par1ItemStack.getTagCompound().getInteger("worldTimeDelay")) { - if(!EnergyItems.syphonBatteries(par1ItemStack, (EntityPlayer) par3Entity, getEnergyUsed())) + if(!BindableItems.syphonBatteries(par1ItemStack, (EntityPlayer) par3Entity, getEnergyUsed())) { par1ItemStack.getTagCompound().setBoolean("isActive", false); } diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilOfSupression.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilOfSupression.java index 370ef3af..8506987a 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilOfSupression.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilOfSupression.java @@ -3,7 +3,7 @@ package WayofTime.alchemicalWizardry.common.items.sigil; import WayofTime.alchemicalWizardry.AlchemicalWizardry; import WayofTime.alchemicalWizardry.api.items.interfaces.ArmourUpgrade; import WayofTime.alchemicalWizardry.api.items.interfaces.ISigil; -import WayofTime.alchemicalWizardry.common.items.EnergyItems; +import WayofTime.alchemicalWizardry.common.items.BindableItems; import WayofTime.alchemicalWizardry.common.spell.complex.effect.SpellHelper; import WayofTime.alchemicalWizardry.common.tileEntity.TESpectralContainer; import cpw.mods.fml.relauncher.Side; @@ -22,7 +22,7 @@ import net.minecraft.world.World; import java.util.List; -public class SigilOfSupression extends EnergyItems implements ArmourUpgrade, ISigil +public class SigilOfSupression extends BindableItems implements ArmourUpgrade, ISigil { @SideOnly(Side.CLIENT) private IIcon activeIcon; @@ -104,7 +104,7 @@ public class SigilOfSupression extends EnergyItems implements ArmourUpgrade, ISi { int tickDelay = 200; - if (!EnergyItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer) || SpellHelper.isFakePlayer(par2World, par3EntityPlayer)) + if (!BindableItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer) || SpellHelper.isFakePlayer(par2World, par3EntityPlayer)) { return par1ItemStack; } @@ -129,7 +129,7 @@ public class SigilOfSupression extends EnergyItems implements ArmourUpgrade, ISi if (!par3EntityPlayer.capabilities.isCreativeMode) { - if(!EnergyItems.syphonBatteries(par1ItemStack, par3EntityPlayer, getEnergyUsed())) + if(!BindableItems.syphonBatteries(par1ItemStack, par3EntityPlayer, getEnergyUsed())) { tag.setBoolean("isActive", false); } @@ -206,7 +206,7 @@ public class SigilOfSupression extends EnergyItems implements ArmourUpgrade, ISi { if (!par3EntityPlayer.capabilities.isCreativeMode) { - if(!EnergyItems.syphonBatteries(par1ItemStack, par3EntityPlayer, getEnergyUsed())) + if(!BindableItems.syphonBatteries(par1ItemStack, par3EntityPlayer, getEnergyUsed())) { par1ItemStack.getTagCompound().setBoolean("isActive", false); } diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilOfTheAssassin.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilOfTheAssassin.java index 4bfa7e8d..c2361c91 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilOfTheAssassin.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilOfTheAssassin.java @@ -22,13 +22,13 @@ import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.entity.living.EnderTeleportEvent; import WayofTime.alchemicalWizardry.AlchemicalWizardry; import WayofTime.alchemicalWizardry.api.items.interfaces.ArmourUpgrade; -import WayofTime.alchemicalWizardry.common.items.EnergyItems; +import WayofTime.alchemicalWizardry.common.items.BindableItems; import WayofTime.alchemicalWizardry.common.spell.complex.effect.SpellHelper; import WayofTime.alchemicalWizardry.common.spell.simple.SpellTeleport; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -public class SigilOfTheAssassin extends EnergyItems implements ArmourUpgrade, ISigil +public class SigilOfTheAssassin extends BindableItems implements ArmourUpgrade, ISigil { public SigilOfTheAssassin() { @@ -79,7 +79,7 @@ public class SigilOfTheAssassin extends EnergyItems implements ArmourUpgrade, IS */ public ItemStack onItemRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer) { - if (!EnergyItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer) || par3EntityPlayer.isSneaking()) + if (!BindableItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer) || par3EntityPlayer.isSneaking()) { return par1ItemStack; } diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilOfTheBridge.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilOfTheBridge.java index 7b023b8b..facb1c68 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilOfTheBridge.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilOfTheBridge.java @@ -4,7 +4,7 @@ import WayofTime.alchemicalWizardry.AlchemicalWizardry; import WayofTime.alchemicalWizardry.ModBlocks; import WayofTime.alchemicalWizardry.api.items.interfaces.ArmourUpgrade; import WayofTime.alchemicalWizardry.api.items.interfaces.ISigil; -import WayofTime.alchemicalWizardry.common.items.EnergyItems; +import WayofTime.alchemicalWizardry.common.items.BindableItems; import WayofTime.alchemicalWizardry.common.tileEntity.TESpectralBlock; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -21,7 +21,7 @@ import net.minecraft.world.World; import java.util.List; -public class SigilOfTheBridge extends EnergyItems implements ArmourUpgrade, ISigil +public class SigilOfTheBridge extends BindableItems implements ArmourUpgrade, ISigil { @SideOnly(Side.CLIENT) private IIcon activeIcon; @@ -101,7 +101,7 @@ public class SigilOfTheBridge extends EnergyItems implements ArmourUpgrade, ISig @Override public ItemStack onItemRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer) { - if (!EnergyItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer) || par3EntityPlayer.isSneaking()) + if (!BindableItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer) || par3EntityPlayer.isSneaking()) { return par1ItemStack; } @@ -114,7 +114,7 @@ public class SigilOfTheBridge extends EnergyItems implements ArmourUpgrade, ISig NBTTagCompound tag = par1ItemStack.getTagCompound(); tag.setBoolean("isActive", !(tag.getBoolean("isActive"))); - if (tag.getBoolean("isActive") && EnergyItems.syphonBatteries(par1ItemStack, par3EntityPlayer, getEnergyUsed())) + if (tag.getBoolean("isActive") && BindableItems.syphonBatteries(par1ItemStack, par3EntityPlayer, getEnergyUsed())) { par1ItemStack.setItemDamage(1); tag.setInteger("worldTimeDelay", (int) (par2World.getWorldTime() - 1) % tickDelay); @@ -145,7 +145,7 @@ public class SigilOfTheBridge extends EnergyItems implements ArmourUpgrade, ISig { if (par2World.getWorldTime() % tickDelay == par1ItemStack.getTagCompound().getInteger("worldTimeDelay")) { - if(EnergyItems.syphonBatteries(par1ItemStack, (EntityPlayer) par3Entity, this.getLPUsed(par1ItemStack))) + if(BindableItems.syphonBatteries(par1ItemStack, (EntityPlayer) par3Entity, this.getLPUsed(par1ItemStack))) { this.setLPUsed(par1ItemStack, 0); }else diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilOfTheFastMiner.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilOfTheFastMiner.java index 37755b9f..f4054fbc 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilOfTheFastMiner.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilOfTheFastMiner.java @@ -3,7 +3,7 @@ package WayofTime.alchemicalWizardry.common.items.sigil; import WayofTime.alchemicalWizardry.AlchemicalWizardry; import WayofTime.alchemicalWizardry.api.items.interfaces.ArmourUpgrade; import WayofTime.alchemicalWizardry.api.items.interfaces.ISigil; -import WayofTime.alchemicalWizardry.common.items.EnergyItems; +import WayofTime.alchemicalWizardry.common.items.BindableItems; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.client.renderer.texture.IIconRegister; @@ -19,7 +19,7 @@ import net.minecraft.world.World; import java.util.List; -public class SigilOfTheFastMiner extends EnergyItems implements ArmourUpgrade, ISigil +public class SigilOfTheFastMiner extends BindableItems implements ArmourUpgrade, ISigil { @SideOnly(Side.CLIENT) private IIcon activeIcon; @@ -97,7 +97,7 @@ public class SigilOfTheFastMiner extends EnergyItems implements ArmourUpgrade, I @Override public ItemStack onItemRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer) { - if (!EnergyItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer) || par3EntityPlayer.isSneaking()) + if (!BindableItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer) || par3EntityPlayer.isSneaking()) { return par1ItemStack; } @@ -110,7 +110,7 @@ public class SigilOfTheFastMiner extends EnergyItems implements ArmourUpgrade, I NBTTagCompound tag = par1ItemStack.getTagCompound(); tag.setBoolean("isActive", !(tag.getBoolean("isActive"))); - if (tag.getBoolean("isActive") && EnergyItems.syphonBatteries(par1ItemStack, par3EntityPlayer, getEnergyUsed())) + if (tag.getBoolean("isActive") && BindableItems.syphonBatteries(par1ItemStack, par3EntityPlayer, getEnergyUsed())) { par1ItemStack.setItemDamage(1); tag.setInteger("worldTimeDelay", (int) (par2World.getWorldTime() - 1) % 200); @@ -147,7 +147,7 @@ public class SigilOfTheFastMiner extends EnergyItems implements ArmourUpgrade, I { if (!par3EntityPlayer.capabilities.isCreativeMode) { - if (!EnergyItems.syphonBatteries(par1ItemStack, par3EntityPlayer, getEnergyUsed())) + if (!BindableItems.syphonBatteries(par1ItemStack, par3EntityPlayer, getEnergyUsed())) { par1ItemStack.getTagCompound().setBoolean("isActive", false); } diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilOfWind.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilOfWind.java index 729cc171..aee7a0ba 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilOfWind.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilOfWind.java @@ -12,7 +12,7 @@ import net.minecraft.world.World; import WayofTime.alchemicalWizardry.AlchemicalWizardry; import WayofTime.alchemicalWizardry.api.items.interfaces.ArmourUpgrade; import WayofTime.alchemicalWizardry.api.items.interfaces.ISigil; -import WayofTime.alchemicalWizardry.common.items.EnergyItems; +import WayofTime.alchemicalWizardry.common.items.BindableItems; public class SigilOfWind extends SigilToggleable implements ArmourUpgrade, ISigil { @@ -46,7 +46,7 @@ public class SigilOfWind extends SigilToggleable implements ArmourUpgrade, ISigi @Override public ItemStack onItemRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer) { - if (!EnergyItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer) || par3EntityPlayer.isSneaking()) + if (!BindableItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer) || par3EntityPlayer.isSneaking()) { return par1ItemStack; } @@ -59,7 +59,7 @@ public class SigilOfWind extends SigilToggleable implements ArmourUpgrade, ISigi NBTTagCompound tag = par1ItemStack.getTagCompound(); this.setActivated(par1ItemStack, !(this.getActivated(par1ItemStack))); - if (this.getActivated(par1ItemStack) && EnergyItems.syphonBatteries(par1ItemStack, par3EntityPlayer, getEnergyUsed())) + if (this.getActivated(par1ItemStack) && BindableItems.syphonBatteries(par1ItemStack, par3EntityPlayer, getEnergyUsed())) { par1ItemStack.setItemDamage(1); tag.setInteger("worldTimeDelay", (int) (par2World.getWorldTime() - 1) % 200); @@ -96,7 +96,7 @@ public class SigilOfWind extends SigilToggleable implements ArmourUpgrade, ISigi { if (!par3EntityPlayer.capabilities.isCreativeMode) { - if (!EnergyItems.syphonBatteries(par1ItemStack, par3EntityPlayer, getEnergyUsed())) + if (!BindableItems.syphonBatteries(par1ItemStack, par3EntityPlayer, getEnergyUsed())) { this.setActivated(par1ItemStack, false); } diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilPackRat.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilPackRat.java index 1014041e..7303bfd6 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilPackRat.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilPackRat.java @@ -16,11 +16,11 @@ import WayofTime.alchemicalWizardry.AlchemicalWizardry; import WayofTime.alchemicalWizardry.api.compress.CompressionRegistry; import WayofTime.alchemicalWizardry.api.items.interfaces.ArmourUpgrade; import WayofTime.alchemicalWizardry.api.items.interfaces.IHolding; -import WayofTime.alchemicalWizardry.common.items.EnergyItems; +import WayofTime.alchemicalWizardry.common.items.BindableItems; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -public class SigilPackRat extends EnergyItems implements IHolding, ArmourUpgrade, ISigil +public class SigilPackRat extends BindableItems implements IHolding, ArmourUpgrade, ISigil { @SideOnly(Side.CLIENT) private IIcon activeIcon; @@ -98,7 +98,7 @@ public class SigilPackRat extends EnergyItems implements IHolding, ArmourUpgrade @Override public ItemStack onItemRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer) { - if (!EnergyItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer) || par3EntityPlayer.isSneaking()) + if (!BindableItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer) || par3EntityPlayer.isSneaking()) { return par1ItemStack; } @@ -118,7 +118,7 @@ public class SigilPackRat extends EnergyItems implements IHolding, ArmourUpgrade if (!par3EntityPlayer.capabilities.isCreativeMode) { - if (!EnergyItems.syphonBatteries(par1ItemStack, par3EntityPlayer, getEnergyUsed())) + if (!BindableItems.syphonBatteries(par1ItemStack, par3EntityPlayer, getEnergyUsed())) { tag.setBoolean("isActive", false); } @@ -159,7 +159,7 @@ public class SigilPackRat extends EnergyItems implements IHolding, ArmourUpgrade { if (!par3EntityPlayer.capabilities.isCreativeMode) { - if(!EnergyItems.syphonBatteries(par1ItemStack, par3EntityPlayer, getEnergyUsed())) + if(!BindableItems.syphonBatteries(par1ItemStack, par3EntityPlayer, getEnergyUsed())) { par1ItemStack.getTagCompound().setBoolean("isActive", false); } diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilSeer.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilSeer.java index cdca8941..22261ae0 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilSeer.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilSeer.java @@ -4,7 +4,7 @@ import WayofTime.alchemicalWizardry.AlchemicalWizardry; import WayofTime.alchemicalWizardry.api.items.interfaces.ArmourUpgrade; import WayofTime.alchemicalWizardry.api.items.interfaces.IHolding; import WayofTime.alchemicalWizardry.api.items.interfaces.ISigil; -import WayofTime.alchemicalWizardry.common.items.EnergyItems; +import WayofTime.alchemicalWizardry.common.items.BindableItems; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.client.renderer.texture.IIconRegister; @@ -47,7 +47,7 @@ public class SigilSeer extends Item implements IHolding, ArmourUpgrade, ISigil @Override public ItemStack onItemRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer) { - if (!EnergyItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer) || par3EntityPlayer.worldObj.isRemote) + if (!BindableItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer) || par3EntityPlayer.worldObj.isRemote) { return par1ItemStack; } diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilToggleable.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilToggleable.java index 2c5b9f53..ae698659 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilToggleable.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilToggleable.java @@ -1,9 +1,9 @@ package WayofTime.alchemicalWizardry.common.items.sigil; import net.minecraft.item.ItemStack; -import WayofTime.alchemicalWizardry.common.items.EnergyItems; +import WayofTime.alchemicalWizardry.common.items.BindableItems; -public class SigilToggleable extends EnergyItems +public class SigilToggleable extends BindableItems { public void setActivated(ItemStack stack, boolean newActivated) { diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilVoid.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilVoid.java index c62ee182..a3238858 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilVoid.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilVoid.java @@ -15,7 +15,7 @@ import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.IFluidHandler; import WayofTime.alchemicalWizardry.AlchemicalWizardry; import WayofTime.alchemicalWizardry.api.items.interfaces.ArmourUpgrade; -import WayofTime.alchemicalWizardry.common.items.EnergyItems; +import WayofTime.alchemicalWizardry.common.items.BindableItems; import WayofTime.alchemicalWizardry.common.spell.complex.effect.SpellHelper; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -79,7 +79,7 @@ public class SigilVoid extends ItemBucket implements ArmourUpgrade, ISigil @Override public boolean onItemUseFirst(ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int side, float hitX, float hitY, float hitZ) { - if (world.isRemote || !EnergyItems.checkAndSetItemOwner(stack, player) || player.isSneaking()) + if (world.isRemote || !BindableItems.checkAndSetItemOwner(stack, player) || player.isSneaking()) { return false; } @@ -96,7 +96,7 @@ public class SigilVoid extends ItemBucket implements ArmourUpgrade, ISigil { FluidStack amount = ((IFluidHandler) tile).drain(ForgeDirection.getOrientation(side), 1000, false); - if (amount != null && amount.amount > 0 && EnergyItems.syphonBatteries(stack, player, getEnergyUsed())) + if (amount != null && amount.amount > 0 && BindableItems.syphonBatteries(stack, player, getEnergyUsed())) { ((IFluidHandler) tile).drain(ForgeDirection.getOrientation(side), 1000, true); return true; @@ -140,7 +140,7 @@ public class SigilVoid extends ItemBucket implements ArmourUpgrade, ISigil return false; } - if (SpellHelper.isBlockFluid(world.getBlock(x, y, z)) && EnergyItems.syphonBatteries(stack, player, getEnergyUsed())) + if (SpellHelper.isBlockFluid(world.getBlock(x, y, z)) && BindableItems.syphonBatteries(stack, player, getEnergyUsed())) { world.setBlockToAir(x, y, z); return true; diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilWater.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilWater.java index d9bf86a6..02d5db2b 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilWater.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilWater.java @@ -22,7 +22,7 @@ import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.IFluidHandler; import WayofTime.alchemicalWizardry.AlchemicalWizardry; import WayofTime.alchemicalWizardry.api.items.interfaces.ArmourUpgrade; -import WayofTime.alchemicalWizardry.common.items.EnergyItems; +import WayofTime.alchemicalWizardry.common.items.BindableItems; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -83,7 +83,7 @@ public class SigilWater extends ItemBucket implements ArmourUpgrade, ISigil @Override public boolean onItemUseFirst(ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int side, float hitX, float hitY, float hitZ) { - if (world.isRemote || !EnergyItems.checkAndSetItemOwner(stack, player) || player.isSneaking()) + if (world.isRemote || !BindableItems.checkAndSetItemOwner(stack, player) || player.isSneaking()) { return false; } @@ -99,7 +99,7 @@ public class SigilWater extends ItemBucket implements ArmourUpgrade, ISigil FluidStack fluid = new FluidStack(FluidRegistry.WATER, 1000); int amount = ((IFluidHandler) tile).fill(ForgeDirection.getOrientation(side), fluid, false); - if (amount > 0 && EnergyItems.syphonBatteries(stack, player, getEnergyUsed())) + if (amount > 0 && BindableItems.syphonBatteries(stack, player, getEnergyUsed())) { ((IFluidHandler) tile).fill(ForgeDirection.getOrientation(side), fluid, true); } @@ -147,7 +147,7 @@ public class SigilWater extends ItemBucket implements ArmourUpgrade, ISigil return false; } - if(this.canPlaceContainedLiquid(world, x, y, z, x, y, z) && EnergyItems.syphonBatteries(stack, player, getEnergyUsed())) + if(this.canPlaceContainedLiquid(world, x, y, z, x, y, z) && BindableItems.syphonBatteries(stack, player, getEnergyUsed())) { return this.tryPlaceContainedLiquid(world, x, y, z, x, y, z); } diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/holding/SigilOfHolding.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/holding/SigilOfHolding.java index b512434d..6f038c94 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/holding/SigilOfHolding.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/holding/SigilOfHolding.java @@ -13,9 +13,9 @@ import net.minecraft.util.MathHelper; import net.minecraft.util.StatCollector; import net.minecraft.world.World; import WayofTime.alchemicalWizardry.AlchemicalWizardry; -import WayofTime.alchemicalWizardry.common.items.EnergyItems; +import WayofTime.alchemicalWizardry.common.items.BindableItems; -public class SigilOfHolding extends EnergyItems +public class SigilOfHolding extends BindableItems { private static int invSize = 4; diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/potion/PotionAmphibian.java b/src/main/java/WayofTime/alchemicalWizardry/common/potion/PotionAmphibian.java deleted file mode 100644 index 910fa201..00000000 --- a/src/main/java/WayofTime/alchemicalWizardry/common/potion/PotionAmphibian.java +++ /dev/null @@ -1,19 +0,0 @@ -package WayofTime.alchemicalWizardry.common.potion; - -import net.minecraft.potion.Potion; -import net.minecraft.util.ResourceLocation; - -public class PotionAmphibian extends Potion -{ - public PotionAmphibian(int par1, boolean par2, int par3) - { - super(par1, new ResourceLocation("speed"), par2, par3); - } - - @Override - public Potion setIconIndex(int par1, int par2) - { - super.setIconIndex(par1, par2); - return this; - } -} diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/potion/PotionDemonCloak.java b/src/main/java/WayofTime/alchemicalWizardry/common/potion/PotionBloodMagic.java similarity index 76% rename from src/main/java/WayofTime/alchemicalWizardry/common/potion/PotionDemonCloak.java rename to src/main/java/WayofTime/alchemicalWizardry/common/potion/PotionBloodMagic.java index f227139e..4b86628d 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/potion/PotionDemonCloak.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/potion/PotionBloodMagic.java @@ -3,9 +3,9 @@ package WayofTime.alchemicalWizardry.common.potion; import net.minecraft.potion.Potion; import net.minecraft.util.ResourceLocation; -public class PotionDemonCloak extends Potion +public class PotionBloodMagic extends Potion { - public PotionDemonCloak(int par1, boolean par2, int par3) + public PotionBloodMagic(int par1, boolean par2, int par3) { super(par1, new ResourceLocation("speed"),par2, par3); } diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/potion/PotionBoost.java b/src/main/java/WayofTime/alchemicalWizardry/common/potion/PotionBoost.java deleted file mode 100644 index 829a64a6..00000000 --- a/src/main/java/WayofTime/alchemicalWizardry/common/potion/PotionBoost.java +++ /dev/null @@ -1,19 +0,0 @@ -package WayofTime.alchemicalWizardry.common.potion; - -import net.minecraft.potion.Potion; -import net.minecraft.util.ResourceLocation; - -public class PotionBoost extends Potion -{ - public PotionBoost(int par1, boolean par2, int par3) - { - super(par1, new ResourceLocation("speed"),par2, par3); - } - - @Override - public Potion setIconIndex(int par1, int par2) - { - super.setIconIndex(par1, par2); - return this; - } -} diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/potion/PotionDeaf.java b/src/main/java/WayofTime/alchemicalWizardry/common/potion/PotionDeaf.java deleted file mode 100644 index ef3f6d8c..00000000 --- a/src/main/java/WayofTime/alchemicalWizardry/common/potion/PotionDeaf.java +++ /dev/null @@ -1,19 +0,0 @@ -package WayofTime.alchemicalWizardry.common.potion; - -import net.minecraft.potion.Potion; -import net.minecraft.util.ResourceLocation; - -public class PotionDeaf extends Potion -{ - public PotionDeaf(int par1, boolean par2, int par3) - { - super(par1, new ResourceLocation("speed"),par2, par3); - } - - @Override - public Potion setIconIndex(int par1, int par2) - { - super.setIconIndex(par1, par2); - return this; - } -} diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/potion/PotionDrowning.java b/src/main/java/WayofTime/alchemicalWizardry/common/potion/PotionDrowning.java deleted file mode 100644 index e93d897e..00000000 --- a/src/main/java/WayofTime/alchemicalWizardry/common/potion/PotionDrowning.java +++ /dev/null @@ -1,19 +0,0 @@ -package WayofTime.alchemicalWizardry.common.potion; - -import net.minecraft.potion.Potion; -import net.minecraft.util.ResourceLocation; - -public class PotionDrowning extends Potion -{ - public PotionDrowning(int par1, boolean par2, int par3) - { - super(par1, new ResourceLocation("speed"),par2, par3); - } - - @Override - public Potion setIconIndex(int par1, int par2) - { - super.setIconIndex(par1, par2); - return this; - } -} diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/potion/PotionFeatherFall.java b/src/main/java/WayofTime/alchemicalWizardry/common/potion/PotionFeatherFall.java deleted file mode 100644 index 241eda04..00000000 --- a/src/main/java/WayofTime/alchemicalWizardry/common/potion/PotionFeatherFall.java +++ /dev/null @@ -1,19 +0,0 @@ -package WayofTime.alchemicalWizardry.common.potion; - -import net.minecraft.potion.Potion; -import net.minecraft.util.ResourceLocation; - -public class PotionFeatherFall extends Potion -{ - public PotionFeatherFall(int par1, boolean par2, int par3) - { - super(par1, new ResourceLocation("speed"),par2, par3); - } - - @Override - public Potion setIconIndex(int par1, int par2) - { - super.setIconIndex(par1, par2); - return this; - } -} diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/potion/PotionFireFuse.java b/src/main/java/WayofTime/alchemicalWizardry/common/potion/PotionFireFuse.java deleted file mode 100644 index 2d044f6c..00000000 --- a/src/main/java/WayofTime/alchemicalWizardry/common/potion/PotionFireFuse.java +++ /dev/null @@ -1,19 +0,0 @@ -package WayofTime.alchemicalWizardry.common.potion; - -import net.minecraft.potion.Potion; -import net.minecraft.util.ResourceLocation; - -public class PotionFireFuse extends Potion -{ - public PotionFireFuse(int par1, boolean par2, int par3) - { - super(par1, new ResourceLocation("speed"),par2, par3); - } - - @Override - public Potion setIconIndex(int par1, int par2) - { - super.setIconIndex(par1, par2); - return this; - } -} diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/potion/PotionFlameCloak.java b/src/main/java/WayofTime/alchemicalWizardry/common/potion/PotionFlameCloak.java deleted file mode 100644 index ff7e0727..00000000 --- a/src/main/java/WayofTime/alchemicalWizardry/common/potion/PotionFlameCloak.java +++ /dev/null @@ -1,19 +0,0 @@ -package WayofTime.alchemicalWizardry.common.potion; - -import net.minecraft.potion.Potion; -import net.minecraft.util.ResourceLocation; - -public class PotionFlameCloak extends Potion -{ - public PotionFlameCloak(int par1, boolean par2, int par3) - { - super(par1, new ResourceLocation("speed"),par2, par3); - } - - @Override - public Potion setIconIndex(int par1, int par2) - { - super.setIconIndex(par1, par2); - return this; - } -} diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/potion/PotionFlight.java b/src/main/java/WayofTime/alchemicalWizardry/common/potion/PotionFlight.java deleted file mode 100644 index be96423e..00000000 --- a/src/main/java/WayofTime/alchemicalWizardry/common/potion/PotionFlight.java +++ /dev/null @@ -1,19 +0,0 @@ -package WayofTime.alchemicalWizardry.common.potion; - -import net.minecraft.potion.Potion; -import net.minecraft.util.ResourceLocation; - -public class PotionFlight extends Potion -{ - public PotionFlight(int par1, boolean par2, int par3) - { - super(par1, new ResourceLocation("speed"),par2, par3); - } - - @Override - public Potion setIconIndex(int par1, int par2) - { - super.setIconIndex(par1, par2); - return this; - } -} diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/potion/PotionHeavyHeart.java b/src/main/java/WayofTime/alchemicalWizardry/common/potion/PotionHeavyHeart.java deleted file mode 100644 index e2111686..00000000 --- a/src/main/java/WayofTime/alchemicalWizardry/common/potion/PotionHeavyHeart.java +++ /dev/null @@ -1,19 +0,0 @@ -package WayofTime.alchemicalWizardry.common.potion; - -import net.minecraft.potion.Potion; -import net.minecraft.util.ResourceLocation; - -public class PotionHeavyHeart extends Potion -{ - public PotionHeavyHeart(int par1, boolean par2, int par3) - { - super(par1, new ResourceLocation("speed"),par2, par3); - } - - @Override - public Potion setIconIndex(int par1, int par2) - { - super.setIconIndex(par1, par2); - return this; - } -} diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/potion/PotionIceCloak.java b/src/main/java/WayofTime/alchemicalWizardry/common/potion/PotionIceCloak.java deleted file mode 100644 index 64b588ad..00000000 --- a/src/main/java/WayofTime/alchemicalWizardry/common/potion/PotionIceCloak.java +++ /dev/null @@ -1,19 +0,0 @@ -package WayofTime.alchemicalWizardry.common.potion; - -import net.minecraft.potion.Potion; -import net.minecraft.util.ResourceLocation; - -public class PotionIceCloak extends Potion -{ - public PotionIceCloak(int par1, boolean par2, int par3) - { - super(par1, new ResourceLocation("speed"),par2, par3); - } - - @Override - public Potion setIconIndex(int par1, int par2) - { - super.setIconIndex(par1, par2); - return this; - } -} diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/potion/PotionInhibit.java b/src/main/java/WayofTime/alchemicalWizardry/common/potion/PotionInhibit.java deleted file mode 100644 index 42164497..00000000 --- a/src/main/java/WayofTime/alchemicalWizardry/common/potion/PotionInhibit.java +++ /dev/null @@ -1,19 +0,0 @@ -package WayofTime.alchemicalWizardry.common.potion; - -import net.minecraft.potion.Potion; -import net.minecraft.util.ResourceLocation; - -public class PotionInhibit extends Potion -{ - public PotionInhibit(int par1, boolean par2, int par3) - { - super(par1, new ResourceLocation("speed"),par2, par3); - } - - @Override - public Potion setIconIndex(int par1, int par2) - { - super.setIconIndex(par1, par2); - return this; - } -} diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/potion/PotionPlanarBinding.java b/src/main/java/WayofTime/alchemicalWizardry/common/potion/PotionPlanarBinding.java deleted file mode 100644 index 35165db5..00000000 --- a/src/main/java/WayofTime/alchemicalWizardry/common/potion/PotionPlanarBinding.java +++ /dev/null @@ -1,19 +0,0 @@ -package WayofTime.alchemicalWizardry.common.potion; - -import net.minecraft.potion.Potion; -import net.minecraft.util.ResourceLocation; - -public class PotionPlanarBinding extends Potion -{ - public PotionPlanarBinding(int par1, boolean par2, int par3) - { - super(par1, new ResourceLocation("speed"),par2, par3); - } - - @Override - public Potion setIconIndex(int par1, int par2) - { - super.setIconIndex(par1, par2); - return this; - } -} diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/potion/PotionProjectileProtect.java b/src/main/java/WayofTime/alchemicalWizardry/common/potion/PotionProjectileProtect.java deleted file mode 100644 index e6dd1a9d..00000000 --- a/src/main/java/WayofTime/alchemicalWizardry/common/potion/PotionProjectileProtect.java +++ /dev/null @@ -1,19 +0,0 @@ -package WayofTime.alchemicalWizardry.common.potion; - -import net.minecraft.potion.Potion; -import net.minecraft.util.ResourceLocation; - -public class PotionProjectileProtect extends Potion -{ - public PotionProjectileProtect(int par1, boolean par2, int par3) - { - super(par1, new ResourceLocation("speed"),par2, par3); - } - - @Override - public Potion setIconIndex(int par1, int par2) - { - super.setIconIndex(par1, par2); - return this; - } -} diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/potion/PotionReciprocation.java b/src/main/java/WayofTime/alchemicalWizardry/common/potion/PotionReciprocation.java deleted file mode 100644 index e152a45a..00000000 --- a/src/main/java/WayofTime/alchemicalWizardry/common/potion/PotionReciprocation.java +++ /dev/null @@ -1,19 +0,0 @@ -package WayofTime.alchemicalWizardry.common.potion; - -import net.minecraft.potion.Potion; -import net.minecraft.util.ResourceLocation; - -public class PotionReciprocation extends Potion -{ - public PotionReciprocation(int par1, boolean par2, int par3) - { - super(par1, new ResourceLocation("speed"),par2, par3); - } - - @Override - public Potion setIconIndex(int par1, int par2) - { - super.setIconIndex(par1, par2); - return this; - } -} diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/potion/PotionSoulFray.java b/src/main/java/WayofTime/alchemicalWizardry/common/potion/PotionSoulFray.java deleted file mode 100644 index 03c2323e..00000000 --- a/src/main/java/WayofTime/alchemicalWizardry/common/potion/PotionSoulFray.java +++ /dev/null @@ -1,35 +0,0 @@ -package WayofTime.alchemicalWizardry.common.potion; - -import net.minecraft.entity.EntityLivingBase; -import net.minecraft.item.ItemStack; -import net.minecraft.potion.Potion; -import net.minecraft.util.ResourceLocation; - -import java.util.ArrayList; - -public class PotionSoulFray extends Potion -{ - public PotionSoulFray(int par1, boolean par2, int par3) - { - super(par1, new ResourceLocation("speed"),par2, par3); - } - - @Override - public Potion setIconIndex(int par1, int par2) - { - super.setIconIndex(par1, par2); - return this; - } - - @Override - public void performEffect(EntityLivingBase entityLivingBase, int level) - { - entityLivingBase.getActivePotionEffect(this).setCurativeItems(new ArrayList()); - } - - @Override - public boolean isReady(int duration, int level) - { - return true; - } -} diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/potion/PotionSoulHarden.java b/src/main/java/WayofTime/alchemicalWizardry/common/potion/PotionSoulHarden.java deleted file mode 100644 index e78da4d9..00000000 --- a/src/main/java/WayofTime/alchemicalWizardry/common/potion/PotionSoulHarden.java +++ /dev/null @@ -1,19 +0,0 @@ -package WayofTime.alchemicalWizardry.common.potion; - -import net.minecraft.potion.Potion; -import net.minecraft.util.ResourceLocation; - -public class PotionSoulHarden extends Potion -{ - public PotionSoulHarden(int par1, boolean par2, int par3) - { - super(par1, new ResourceLocation("speed"),par2, par3); - } - - @Override - public Potion setIconIndex(int par1, int par2) - { - super.setIconIndex(par1, par2); - return this; - } -} diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/rituals/RitualEffectExpulsion.java b/src/main/java/WayofTime/alchemicalWizardry/common/rituals/RitualEffectExpulsion.java index 74d0926b..0ee1c57e 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/rituals/RitualEffectExpulsion.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/rituals/RitualEffectExpulsion.java @@ -6,7 +6,6 @@ import java.util.Random; import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; -import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; @@ -25,7 +24,7 @@ import WayofTime.alchemicalWizardry.api.rituals.IMasterRitualStone; import WayofTime.alchemicalWizardry.api.rituals.RitualComponent; import WayofTime.alchemicalWizardry.api.rituals.RitualEffect; import WayofTime.alchemicalWizardry.api.soulNetwork.SoulNetworkHandler; -import WayofTime.alchemicalWizardry.common.items.EnergyItems; +import WayofTime.alchemicalWizardry.common.items.BindableItems; import WayofTime.alchemicalWizardry.common.spell.complex.effect.SpellHelper; import WayofTime.alchemicalWizardry.common.spell.simple.SpellTeleport; @@ -79,7 +78,7 @@ public class RitualEffectExpulsion extends RitualEffect for (int i = 0; i < inventoryTile.getSizeInventory(); i++) { ItemStack stack = inventoryTile.getStackInSlot(i); - if (stack != null && stack.getItem() instanceof IBindable && EnergyItems.getOwnerName(stack).equals(playerString)) + if (stack != null && stack.getItem() instanceof IBindable && BindableItems.getOwnerName(stack).equals(playerString)) { test = true; } diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/rituals/RitualEffectUnbinding.java b/src/main/java/WayofTime/alchemicalWizardry/common/rituals/RitualEffectUnbinding.java index 4caeaf44..18badc5d 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/rituals/RitualEffectUnbinding.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/rituals/RitualEffectUnbinding.java @@ -9,7 +9,7 @@ import WayofTime.alchemicalWizardry.api.rituals.IMasterRitualStone; import WayofTime.alchemicalWizardry.api.rituals.RitualComponent; import WayofTime.alchemicalWizardry.api.rituals.RitualEffect; import WayofTime.alchemicalWizardry.api.soulNetwork.SoulNetworkHandler; -import WayofTime.alchemicalWizardry.common.items.EnergyItems; +import WayofTime.alchemicalWizardry.common.items.BindableItems; import WayofTime.alchemicalWizardry.common.items.armour.BoundArmour; import WayofTime.alchemicalWizardry.common.spell.complex.effect.SpellHelper; import net.minecraft.entity.effect.EntityLightningBolt; @@ -66,14 +66,14 @@ public class RitualEffectUnbinding extends RitualEffect boolean hasSanctus = this.canDrainReagent(ritualStone, ReagentRegistry.sanctusReagent, sanctusDrain, false); if (hasSanctus) { - if (itemStack.getItem() instanceof IBindable && !EnergyItems.getOwnerName(itemStack).equals("")) + if (itemStack.getItem() instanceof IBindable && !BindableItems.getOwnerName(itemStack).equals("")) { world.addWeatherEffect(new EntityLightningBolt(world, x, y + 1, z - 5)); world.addWeatherEffect(new EntityLightningBolt(world, x, y + 1, z + 5)); world.addWeatherEffect(new EntityLightningBolt(world, x - 5, y + 1, z)); world.addWeatherEffect(new EntityLightningBolt(world, x + 5, y + 1, z)); - EnergyItems.setItemOwner(itemStack, ""); + BindableItems.setItemOwner(itemStack, ""); this.canDrainReagent(ritualStone, ReagentRegistry.sanctusReagent, sanctusDrain, true); drain = true; ritualStone.setActive(false); diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/spell/simple/SpellEarthBender.java b/src/main/java/WayofTime/alchemicalWizardry/common/spell/simple/SpellEarthBender.java index 0891c0f3..e4c6f282 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/spell/simple/SpellEarthBender.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/spell/simple/SpellEarthBender.java @@ -11,7 +11,7 @@ import net.minecraft.util.BlockPos; import net.minecraft.util.EnumParticleTypes; import net.minecraft.world.World; import WayofTime.alchemicalWizardry.common.entity.projectile.MudProjectile; -import WayofTime.alchemicalWizardry.common.items.EnergyItems; +import WayofTime.alchemicalWizardry.common.items.BindableItems; import WayofTime.alchemicalWizardry.common.spell.complex.effect.SpellHelper; public class SpellEarthBender extends HomSpell @@ -27,14 +27,14 @@ public class SpellEarthBender extends HomSpell @Override public ItemStack onOffensiveRangedRightClick(ItemStack stack, World world, EntityPlayer player) { - if (!EnergyItems.checkAndSetItemOwner(stack, player) || player.isSneaking()) + if (!BindableItems.checkAndSetItemOwner(stack, player) || player.isSneaking()) { return stack; } if (!player.capabilities.isCreativeMode) { - EnergyItems.syphonAndDamageWhileInContainer(stack, player, this.getOffensiveRangedEnergy()); + BindableItems.syphonAndDamageWhileInContainer(stack, player, this.getOffensiveRangedEnergy()); } world.spawnEntityInWorld(new MudProjectile(world, player, 8, false)); @@ -45,14 +45,14 @@ public class SpellEarthBender extends HomSpell @Override public ItemStack onOffensiveMeleeRightClick(ItemStack stack, World world, EntityPlayer player) { - if (!EnergyItems.checkAndSetItemOwner(stack, player) || player.isSneaking()) + if (!BindableItems.checkAndSetItemOwner(stack, player) || player.isSneaking()) { return stack; } if (!player.capabilities.isCreativeMode) { - EnergyItems.syphonAndDamageWhileInContainer(stack, player, this.getOffensiveMeleeEnergy()); + BindableItems.syphonAndDamageWhileInContainer(stack, player, this.getOffensiveMeleeEnergy()); } if (!world.isRemote) @@ -72,7 +72,7 @@ public class SpellEarthBender extends HomSpell @Override public ItemStack onDefensiveRightClick(ItemStack stack, World world, EntityPlayer player) { - if (!EnergyItems.checkAndSetItemOwner(stack, player) || player.isSneaking()) + if (!BindableItems.checkAndSetItemOwner(stack, player) || player.isSneaking()) { return stack; } @@ -138,7 +138,7 @@ public class SpellEarthBender extends HomSpell @Override public ItemStack onEnvironmentalRightClick(ItemStack stack, World world, EntityPlayer player) { - if (!EnergyItems.checkAndSetItemOwner(stack, player) || player.isSneaking()) + if (!BindableItems.checkAndSetItemOwner(stack, player) || player.isSneaking()) { return stack; } diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/spell/simple/SpellExplosions.java b/src/main/java/WayofTime/alchemicalWizardry/common/spell/simple/SpellExplosions.java index 4bf48cf2..e5c4a333 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/spell/simple/SpellExplosions.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/spell/simple/SpellExplosions.java @@ -1,7 +1,7 @@ package WayofTime.alchemicalWizardry.common.spell.simple; import WayofTime.alchemicalWizardry.common.entity.projectile.ExplosionProjectile; -import WayofTime.alchemicalWizardry.common.items.EnergyItems; +import WayofTime.alchemicalWizardry.common.items.BindableItems; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.world.World; @@ -21,14 +21,14 @@ public class SpellExplosions extends HomSpell @Override public ItemStack onOffensiveRangedRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer) { - if (!EnergyItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer) || par3EntityPlayer.isSneaking()) + if (!BindableItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer) || par3EntityPlayer.isSneaking()) { return par1ItemStack; } if (!par3EntityPlayer.capabilities.isCreativeMode) { - EnergyItems.syphonAndDamageWhileInContainer(par1ItemStack, par3EntityPlayer, this.getOffensiveRangedEnergy()); + BindableItems.syphonAndDamageWhileInContainer(par1ItemStack, par3EntityPlayer, this.getOffensiveRangedEnergy()); } par2World.playSoundAtEntity(par3EntityPlayer, "random.fizz", 0.5F, 0.4F / (itemRand.nextFloat() * 0.4F + 0.8F)); @@ -44,14 +44,14 @@ public class SpellExplosions extends HomSpell @Override public ItemStack onOffensiveMeleeRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer) { - if (!EnergyItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer) || par3EntityPlayer.isSneaking()) + if (!BindableItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer) || par3EntityPlayer.isSneaking()) { return par1ItemStack; } if (!par3EntityPlayer.capabilities.isCreativeMode) { - EnergyItems.syphonAndDamageWhileInContainer(par1ItemStack, par3EntityPlayer, this.getOffensiveMeleeEnergy()); + BindableItems.syphonAndDamageWhileInContainer(par1ItemStack, par3EntityPlayer, this.getOffensiveMeleeEnergy()); } int distance = 4; @@ -64,14 +64,14 @@ public class SpellExplosions extends HomSpell @Override public ItemStack onDefensiveRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer) { - if (!EnergyItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer) || par3EntityPlayer.isSneaking()) + if (!BindableItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer) || par3EntityPlayer.isSneaking()) { return par1ItemStack; } if (!par3EntityPlayer.capabilities.isCreativeMode) { - EnergyItems.syphonAndDamageWhileInContainer(par1ItemStack, par3EntityPlayer, this.getDefensiveEnergy()); + BindableItems.syphonAndDamageWhileInContainer(par1ItemStack, par3EntityPlayer, this.getDefensiveEnergy()); } int distance = 4; @@ -82,14 +82,14 @@ public class SpellExplosions extends HomSpell @Override public ItemStack onEnvironmentalRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer) { - if (!EnergyItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer) || par3EntityPlayer.isSneaking()) + if (!BindableItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer) || par3EntityPlayer.isSneaking()) { return par1ItemStack; } if (!par3EntityPlayer.capabilities.isCreativeMode) { - EnergyItems.syphonAndDamageWhileInContainer(par1ItemStack, par3EntityPlayer, this.getEnvironmentalEnergy()); + BindableItems.syphonAndDamageWhileInContainer(par1ItemStack, par3EntityPlayer, this.getEnvironmentalEnergy()); } int radius = 3; diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/spell/simple/SpellFireBurst.java b/src/main/java/WayofTime/alchemicalWizardry/common/spell/simple/SpellFireBurst.java index aad3367c..f8b23fdc 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/spell/simple/SpellFireBurst.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/spell/simple/SpellFireBurst.java @@ -13,7 +13,7 @@ import net.minecraft.util.BlockPos; import net.minecraft.util.DamageSource; import net.minecraft.world.World; import WayofTime.alchemicalWizardry.common.entity.projectile.FireProjectile; -import WayofTime.alchemicalWizardry.common.items.EnergyItems; +import WayofTime.alchemicalWizardry.common.items.BindableItems; public class SpellFireBurst extends HomSpell { @@ -28,14 +28,14 @@ public class SpellFireBurst extends HomSpell @Override public ItemStack onOffensiveRangedRightClick(ItemStack stack, World world, EntityPlayer player) { - if (!EnergyItems.checkAndSetItemOwner(stack, player) || player.isSneaking()) + if (!BindableItems.checkAndSetItemOwner(stack, player) || player.isSneaking()) { return stack; } if (!player.capabilities.isCreativeMode) { - EnergyItems.syphonAndDamageWhileInContainer(stack, player, this.getOffensiveRangedEnergy()); + BindableItems.syphonAndDamageWhileInContainer(stack, player, this.getOffensiveRangedEnergy()); } world.playSoundAtEntity(player, "random.fizz", 0.5F, 0.4F / (itemRand.nextFloat() * 0.4F + 0.8F)); @@ -52,14 +52,14 @@ public class SpellFireBurst extends HomSpell @Override public ItemStack onOffensiveMeleeRightClick(ItemStack stack, World world, EntityPlayer player) { - if (!EnergyItems.checkAndSetItemOwner(stack, player) || player.isSneaking()) + if (!BindableItems.checkAndSetItemOwner(stack, player) || player.isSneaking()) { return stack; } if (!player.capabilities.isCreativeMode) { - EnergyItems.syphonAndDamageWhileInContainer(stack, player, this.getOffensiveMeleeEnergy()); + BindableItems.syphonAndDamageWhileInContainer(stack, player, this.getOffensiveMeleeEnergy()); } world.playSoundAtEntity(player, "random.fizz", 0.5F, 0.4F / (itemRand.nextFloat() * 0.4F + 0.8F)); @@ -81,14 +81,14 @@ public class SpellFireBurst extends HomSpell @Override public ItemStack onDefensiveRightClick(ItemStack stack, World world, EntityPlayer player) { - if (!EnergyItems.checkAndSetItemOwner(stack, player) || player.isSneaking()) + if (!BindableItems.checkAndSetItemOwner(stack, player) || player.isSneaking()) { return stack; } if (!player.capabilities.isCreativeMode) { - EnergyItems.syphonAndDamageWhileInContainer(stack, player, this.getDefensiveEnergy()); + BindableItems.syphonAndDamageWhileInContainer(stack, player, this.getDefensiveEnergy()); } world.playSoundAtEntity(player, "random.fizz", 0.5F, 0.4F / (itemRand.nextFloat() * 0.4F + 0.8F)); @@ -118,14 +118,14 @@ public class SpellFireBurst extends HomSpell @Override public ItemStack onEnvironmentalRightClick(ItemStack stack, World world, EntityPlayer player) { - if (!EnergyItems.checkAndSetItemOwner(stack, player) || player.isSneaking()) + if (!BindableItems.checkAndSetItemOwner(stack, player) || player.isSneaking()) { return stack; } if (!player.capabilities.isCreativeMode) { - EnergyItems.syphonAndDamageWhileInContainer(stack, player, this.getEnvironmentalEnergy()); + BindableItems.syphonAndDamageWhileInContainer(stack, player, this.getEnvironmentalEnergy()); } world.playSoundAtEntity(player, "random.fizz", 0.5F, 0.4F / (itemRand.nextFloat() * 0.4F + 0.8F)); diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/spell/simple/SpellFrozenWater.java b/src/main/java/WayofTime/alchemicalWizardry/common/spell/simple/SpellFrozenWater.java index 85615bb9..10cf5ccb 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/spell/simple/SpellFrozenWater.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/spell/simple/SpellFrozenWater.java @@ -9,7 +9,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.BlockPos; import net.minecraft.world.World; import WayofTime.alchemicalWizardry.common.entity.projectile.IceProjectile; -import WayofTime.alchemicalWizardry.common.items.EnergyItems; +import WayofTime.alchemicalWizardry.common.items.BindableItems; public class SpellFrozenWater extends HomSpell { @@ -24,14 +24,14 @@ public class SpellFrozenWater extends HomSpell @Override public ItemStack onOffensiveRangedRightClick(ItemStack stack, World world, EntityPlayer player) { - if (!EnergyItems.checkAndSetItemOwner(stack, player) || player.isSneaking()) + if (!BindableItems.checkAndSetItemOwner(stack, player) || player.isSneaking()) { return stack; } if (!player.capabilities.isCreativeMode) { - EnergyItems.syphonAndDamageWhileInContainer(stack, player, this.getOffensiveRangedEnergy()); + BindableItems.syphonAndDamageWhileInContainer(stack, player, this.getOffensiveRangedEnergy()); } world.playSoundAtEntity(player, "random.fizz", 0.5F, 0.4F / (itemRand.nextFloat() * 0.4F + 0.8F)); @@ -47,14 +47,14 @@ public class SpellFrozenWater extends HomSpell @Override public ItemStack onOffensiveMeleeRightClick(ItemStack stack, World world, EntityPlayer player) { - if (!EnergyItems.checkAndSetItemOwner(stack, player) || player.isSneaking()) + if (!BindableItems.checkAndSetItemOwner(stack, player) || player.isSneaking()) { return stack; } if (!player.capabilities.isCreativeMode) { - EnergyItems.syphonAndDamageWhileInContainer(stack, player, this.getOffensiveMeleeEnergy()); + BindableItems.syphonAndDamageWhileInContainer(stack, player, this.getOffensiveMeleeEnergy()); } for (int i = -2; i <= 2; i++) @@ -70,7 +70,7 @@ public class SpellFrozenWater extends HomSpell { if (!player.capabilities.isCreativeMode) { - EnergyItems.syphonAndDamageWhileInContainer(stack, player, getDefensiveEnergy()); + BindableItems.syphonAndDamageWhileInContainer(stack, player, getDefensiveEnergy()); } float yaw = player.rotationYaw; @@ -178,7 +178,7 @@ public class SpellFrozenWater extends HomSpell @Override public ItemStack onEnvironmentalRightClick(ItemStack stack, World world, EntityPlayer player) { - if (!EnergyItems.checkAndSetItemOwner(stack, player) || player.isSneaking()) + if (!BindableItems.checkAndSetItemOwner(stack, player) || player.isSneaking()) { return stack; } diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/spell/simple/SpellHolyBlast.java b/src/main/java/WayofTime/alchemicalWizardry/common/spell/simple/SpellHolyBlast.java index 8e05809c..f837d538 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/spell/simple/SpellHolyBlast.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/spell/simple/SpellHolyBlast.java @@ -1,7 +1,7 @@ package WayofTime.alchemicalWizardry.common.spell.simple; import WayofTime.alchemicalWizardry.common.entity.projectile.HolyProjectile; -import WayofTime.alchemicalWizardry.common.items.EnergyItems; +import WayofTime.alchemicalWizardry.common.items.BindableItems; import WayofTime.alchemicalWizardry.common.spell.complex.effect.SpellHelper; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; @@ -28,14 +28,14 @@ public class SpellHolyBlast extends HomSpell @Override public ItemStack onOffensiveRangedRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer) { - if (!EnergyItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer) || par3EntityPlayer.isSneaking()) + if (!BindableItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer) || par3EntityPlayer.isSneaking()) { return par1ItemStack; } if (!par3EntityPlayer.capabilities.isCreativeMode) { - EnergyItems.syphonAndDamageWhileInContainer(par1ItemStack, par3EntityPlayer, this.getOffensiveRangedEnergy()); + BindableItems.syphonAndDamageWhileInContainer(par1ItemStack, par3EntityPlayer, this.getOffensiveRangedEnergy()); } par2World.playSoundAtEntity(par3EntityPlayer, "random.fizz", 0.5F, 0.4F / (itemRand.nextFloat() * 0.4F + 0.8F)); @@ -51,14 +51,14 @@ public class SpellHolyBlast extends HomSpell @Override public ItemStack onOffensiveMeleeRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer) { - if (!EnergyItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer) || par3EntityPlayer.isSneaking()) + if (!BindableItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer) || par3EntityPlayer.isSneaking()) { return par1ItemStack; } if (!par3EntityPlayer.capabilities.isCreativeMode) { - EnergyItems.syphonAndDamageWhileInContainer(par1ItemStack, par3EntityPlayer, this.getOffensiveMeleeEnergy()); + BindableItems.syphonAndDamageWhileInContainer(par1ItemStack, par3EntityPlayer, this.getOffensiveMeleeEnergy()); } int distance = 2; @@ -106,14 +106,14 @@ public class SpellHolyBlast extends HomSpell @Override public ItemStack onDefensiveRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer) { - if (!EnergyItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer) || par3EntityPlayer.isSneaking()) + if (!BindableItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer) || par3EntityPlayer.isSneaking()) { return par1ItemStack; } if (!par3EntityPlayer.capabilities.isCreativeMode) { - EnergyItems.syphonAndDamageWhileInContainer(par1ItemStack, par3EntityPlayer, this.getDefensiveEnergy()); + BindableItems.syphonAndDamageWhileInContainer(par1ItemStack, par3EntityPlayer, this.getDefensiveEnergy()); } if (!par2World.isRemote) @@ -130,14 +130,14 @@ public class SpellHolyBlast extends HomSpell @Override public ItemStack onEnvironmentalRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer) { - if (!EnergyItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer) || par3EntityPlayer.isSneaking()) + if (!BindableItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer) || par3EntityPlayer.isSneaking()) { return par1ItemStack; } if (!par3EntityPlayer.capabilities.isCreativeMode) { - EnergyItems.syphonAndDamageWhileInContainer(par1ItemStack, par3EntityPlayer, this.getEnvironmentalEnergy()); + BindableItems.syphonAndDamageWhileInContainer(par1ItemStack, par3EntityPlayer, this.getEnvironmentalEnergy()); } int d0 = 3; diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/spell/simple/SpellLightningBolt.java b/src/main/java/WayofTime/alchemicalWizardry/common/spell/simple/SpellLightningBolt.java index 1ec3912d..e2f4cb5c 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/spell/simple/SpellLightningBolt.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/spell/simple/SpellLightningBolt.java @@ -1,7 +1,7 @@ package WayofTime.alchemicalWizardry.common.spell.simple; import WayofTime.alchemicalWizardry.common.entity.projectile.LightningBoltProjectile; -import WayofTime.alchemicalWizardry.common.items.EnergyItems; +import WayofTime.alchemicalWizardry.common.items.BindableItems; import WayofTime.alchemicalWizardry.common.spell.complex.effect.SpellHelper; import net.minecraft.entity.effect.EntityLightningBolt; import net.minecraft.entity.player.EntityPlayer; @@ -24,14 +24,14 @@ public class SpellLightningBolt extends HomSpell @Override public ItemStack onOffensiveRangedRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer) { - if (EnergyItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer) || par3EntityPlayer.isSneaking()) + if (BindableItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer) || par3EntityPlayer.isSneaking()) { return par1ItemStack; } if (!par3EntityPlayer.capabilities.isCreativeMode) { - EnergyItems.syphonAndDamageWhileInContainer(par1ItemStack, par3EntityPlayer, this.getOffensiveRangedEnergy()); + BindableItems.syphonAndDamageWhileInContainer(par1ItemStack, par3EntityPlayer, this.getOffensiveRangedEnergy()); } par2World.playSoundAtEntity(par3EntityPlayer, "random.fizz", 0.5F, 0.4F / (itemRand.nextFloat() * 0.4F + 0.8F)); @@ -48,14 +48,14 @@ public class SpellLightningBolt extends HomSpell public ItemStack onOffensiveMeleeRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer) { //TODO Make it work better...? - if (EnergyItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer) || par3EntityPlayer.isSneaking()) + if (BindableItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer) || par3EntityPlayer.isSneaking()) { return par1ItemStack; } if (!par3EntityPlayer.capabilities.isCreativeMode) { - EnergyItems.syphonAndDamageWhileInContainer(par1ItemStack, par3EntityPlayer, this.getOffensiveMeleeEnergy()); + BindableItems.syphonAndDamageWhileInContainer(par1ItemStack, par3EntityPlayer, this.getOffensiveMeleeEnergy()); } double xCoord = par3EntityPlayer.posX; @@ -82,14 +82,14 @@ public class SpellLightningBolt extends HomSpell @Override public ItemStack onDefensiveRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer) { - if (!EnergyItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer) || par3EntityPlayer.isSneaking()) + if (!BindableItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer) || par3EntityPlayer.isSneaking()) { return par1ItemStack; } if (!par3EntityPlayer.capabilities.isCreativeMode) { - EnergyItems.syphonAndDamageWhileInContainer(par1ItemStack, par3EntityPlayer, this.getDefensiveEnergy()); + BindableItems.syphonAndDamageWhileInContainer(par1ItemStack, par3EntityPlayer, this.getDefensiveEnergy()); } double xCoord = par3EntityPlayer.posX; @@ -112,14 +112,14 @@ public class SpellLightningBolt extends HomSpell @Override public ItemStack onEnvironmentalRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer) { - if (!EnergyItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer) || par3EntityPlayer.isSneaking()) + if (!BindableItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer) || par3EntityPlayer.isSneaking()) { return par1ItemStack; } if (!par3EntityPlayer.capabilities.isCreativeMode) { - EnergyItems.syphonAndDamageWhileInContainer(par1ItemStack, par3EntityPlayer, this.getEnvironmentalEnergy()); + BindableItems.syphonAndDamageWhileInContainer(par1ItemStack, par3EntityPlayer, this.getEnvironmentalEnergy()); } if (!par2World.isRemote) diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/spell/simple/SpellTeleport.java b/src/main/java/WayofTime/alchemicalWizardry/common/spell/simple/SpellTeleport.java index 219da278..a4158eaf 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/spell/simple/SpellTeleport.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/spell/simple/SpellTeleport.java @@ -18,7 +18,7 @@ import net.minecraft.world.World; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.entity.living.EnderTeleportEvent; import WayofTime.alchemicalWizardry.common.entity.projectile.TeleportProjectile; -import WayofTime.alchemicalWizardry.common.items.EnergyItems; +import WayofTime.alchemicalWizardry.common.items.BindableItems; import WayofTime.alchemicalWizardry.common.spell.complex.effect.SpellHelper; public class SpellTeleport extends HomSpell @@ -34,14 +34,14 @@ public class SpellTeleport extends HomSpell @Override public ItemStack onOffensiveRangedRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer) { - if (EnergyItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer) || par3EntityPlayer.isSneaking()) + if (BindableItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer) || par3EntityPlayer.isSneaking()) { return par1ItemStack; } if (!par3EntityPlayer.capabilities.isCreativeMode) { - EnergyItems.syphonAndDamageWhileInContainer(par1ItemStack, par3EntityPlayer, this.getOffensiveRangedEnergy()); + BindableItems.syphonAndDamageWhileInContainer(par1ItemStack, par3EntityPlayer, this.getOffensiveRangedEnergy()); } par2World.spawnEntityInWorld(new TeleportProjectile(par2World, par3EntityPlayer, 8, true)); @@ -53,14 +53,14 @@ public class SpellTeleport extends HomSpell @Override public ItemStack onOffensiveMeleeRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer) { - if (EnergyItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer) || par3EntityPlayer.isSneaking()) + if (BindableItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer) || par3EntityPlayer.isSneaking()) { return par1ItemStack; } if (!par3EntityPlayer.capabilities.isCreativeMode) { - EnergyItems.syphonAndDamageWhileInContainer(par1ItemStack, par3EntityPlayer, this.getOffensiveMeleeEnergy()); + BindableItems.syphonAndDamageWhileInContainer(par1ItemStack, par3EntityPlayer, this.getOffensiveMeleeEnergy()); } par2World.spawnEntityInWorld(new TeleportProjectile(par2World, par3EntityPlayer, 8, false)); @@ -70,14 +70,14 @@ public class SpellTeleport extends HomSpell @Override public ItemStack onDefensiveRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer) { - if (EnergyItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer) || par3EntityPlayer.isSneaking()) + if (BindableItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer) || par3EntityPlayer.isSneaking()) { return par1ItemStack; } if (!par3EntityPlayer.capabilities.isCreativeMode) { - EnergyItems.syphonAndDamageWhileInContainer(par1ItemStack, par3EntityPlayer, this.getDefensiveEnergy()); + BindableItems.syphonAndDamageWhileInContainer(par1ItemStack, par3EntityPlayer, this.getDefensiveEnergy()); } double xCoord = par3EntityPlayer.posX; @@ -96,14 +96,14 @@ public class SpellTeleport extends HomSpell @Override public ItemStack onEnvironmentalRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer) { - if (EnergyItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer) || par3EntityPlayer.isSneaking()) + if (BindableItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer) || par3EntityPlayer.isSneaking()) { return par1ItemStack; } if (!par3EntityPlayer.capabilities.isCreativeMode) { - EnergyItems.syphonAndDamageWhileInContainer(par1ItemStack, par3EntityPlayer, this.getEnvironmentalEnergy()); + BindableItems.syphonAndDamageWhileInContainer(par1ItemStack, par3EntityPlayer, this.getEnvironmentalEnergy()); } if (!par2World.isRemote) diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/spell/simple/SpellWateryGrave.java b/src/main/java/WayofTime/alchemicalWizardry/common/spell/simple/SpellWateryGrave.java index 32c701f3..054538fe 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/spell/simple/SpellWateryGrave.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/spell/simple/SpellWateryGrave.java @@ -16,7 +16,7 @@ import net.minecraft.util.EnumParticleTypes; import net.minecraft.world.World; import WayofTime.alchemicalWizardry.AlchemicalWizardry; import WayofTime.alchemicalWizardry.common.entity.projectile.WaterProjectile; -import WayofTime.alchemicalWizardry.common.items.EnergyItems; +import WayofTime.alchemicalWizardry.common.items.BindableItems; import WayofTime.alchemicalWizardry.common.spell.complex.effect.SpellHelper; public class SpellWateryGrave extends HomSpell @@ -32,14 +32,14 @@ public class SpellWateryGrave extends HomSpell @Override public ItemStack onOffensiveRangedRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer) { - if (EnergyItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer) || par3EntityPlayer.isSneaking()) + if (BindableItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer) || par3EntityPlayer.isSneaking()) { return par1ItemStack; } if (!par3EntityPlayer.capabilities.isCreativeMode) { - EnergyItems.syphonAndDamageWhileInContainer(par1ItemStack, par3EntityPlayer, this.getOffensiveRangedEnergy()); + BindableItems.syphonAndDamageWhileInContainer(par1ItemStack, par3EntityPlayer, this.getOffensiveRangedEnergy()); } par2World.spawnEntityInWorld(new WaterProjectile(par2World, par3EntityPlayer, 8)); @@ -50,14 +50,14 @@ public class SpellWateryGrave extends HomSpell @Override public ItemStack onOffensiveMeleeRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer) { - if (EnergyItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer) || par3EntityPlayer.isSneaking()) + if (BindableItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer) || par3EntityPlayer.isSneaking()) { return par1ItemStack; } if (!par3EntityPlayer.capabilities.isCreativeMode) { - EnergyItems.syphonAndDamageWhileInContainer(par1ItemStack, par3EntityPlayer, this.getOffensiveMeleeEnergy()); + BindableItems.syphonAndDamageWhileInContainer(par1ItemStack, par3EntityPlayer, this.getOffensiveMeleeEnergy()); } if (!par2World.isRemote) @@ -77,14 +77,14 @@ public class SpellWateryGrave extends HomSpell @Override public ItemStack onDefensiveRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer) { - if (EnergyItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer) || par3EntityPlayer.isSneaking()) + if (BindableItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer) || par3EntityPlayer.isSneaking()) { return par1ItemStack; } if (!par3EntityPlayer.capabilities.isCreativeMode) { - EnergyItems.syphonAndDamageWhileInContainer(par1ItemStack, par3EntityPlayer, this.getDefensiveEnergy()); + BindableItems.syphonAndDamageWhileInContainer(par1ItemStack, par3EntityPlayer, this.getDefensiveEnergy()); } int d0 = 3; @@ -130,14 +130,14 @@ public class SpellWateryGrave extends HomSpell @Override public ItemStack onEnvironmentalRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer) { - if (EnergyItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer) || par3EntityPlayer.isSneaking()) + if (BindableItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer) || par3EntityPlayer.isSneaking()) { return par1ItemStack; } if (!par3EntityPlayer.capabilities.isCreativeMode) { - EnergyItems.syphonAndDamageWhileInContainer(par1ItemStack, par3EntityPlayer, this.getEnvironmentalEnergy()); + BindableItems.syphonAndDamageWhileInContainer(par1ItemStack, par3EntityPlayer, this.getEnvironmentalEnergy()); } int range = 2; diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/spell/simple/SpellWindGust.java b/src/main/java/WayofTime/alchemicalWizardry/common/spell/simple/SpellWindGust.java index ea359f44..2bbfd322 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/spell/simple/SpellWindGust.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/spell/simple/SpellWindGust.java @@ -1,7 +1,7 @@ package WayofTime.alchemicalWizardry.common.spell.simple; import WayofTime.alchemicalWizardry.common.entity.projectile.WindGustProjectile; -import WayofTime.alchemicalWizardry.common.items.EnergyItems; +import WayofTime.alchemicalWizardry.common.items.BindableItems; import WayofTime.alchemicalWizardry.common.spell.complex.effect.SpellHelper; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; @@ -28,14 +28,14 @@ public class SpellWindGust extends HomSpell @Override public ItemStack onOffensiveRangedRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer) { - if (!EnergyItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer) || par3EntityPlayer.isSneaking()) + if (!BindableItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer) || par3EntityPlayer.isSneaking()) { return par1ItemStack; } if (!par3EntityPlayer.capabilities.isCreativeMode) { - EnergyItems.syphonAndDamageWhileInContainer(par1ItemStack, par3EntityPlayer, this.getOffensiveRangedEnergy()); + BindableItems.syphonAndDamageWhileInContainer(par1ItemStack, par3EntityPlayer, this.getOffensiveRangedEnergy()); } par2World.playSoundAtEntity(par3EntityPlayer, "random.fizz", 0.5F, 0.4F / (itemRand.nextFloat() * 0.4F + 0.8F)); @@ -51,14 +51,14 @@ public class SpellWindGust extends HomSpell @Override public ItemStack onOffensiveMeleeRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer) { - if (!EnergyItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer) || par3EntityPlayer.isSneaking()) + if (!BindableItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer) || par3EntityPlayer.isSneaking()) { return par1ItemStack; } if (!par3EntityPlayer.capabilities.isCreativeMode) { - EnergyItems.syphonAndDamageWhileInContainer(par1ItemStack, par3EntityPlayer, this.getOffensiveMeleeEnergy()); + BindableItems.syphonAndDamageWhileInContainer(par1ItemStack, par3EntityPlayer, this.getOffensiveMeleeEnergy()); } int distance = 3; @@ -98,14 +98,14 @@ public class SpellWindGust extends HomSpell @Override public ItemStack onDefensiveRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer) { - if (!EnergyItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer) || par3EntityPlayer.isSneaking()) + if (!BindableItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer) || par3EntityPlayer.isSneaking()) { return par1ItemStack; } if (!par3EntityPlayer.capabilities.isCreativeMode) { - EnergyItems.syphonAndDamageWhileInContainer(par1ItemStack, par3EntityPlayer, this.getDefensiveEnergy()); + BindableItems.syphonAndDamageWhileInContainer(par1ItemStack, par3EntityPlayer, this.getDefensiveEnergy()); } int distance = 3; @@ -137,14 +137,14 @@ public class SpellWindGust extends HomSpell @Override public ItemStack onEnvironmentalRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer) { - if (!EnergyItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer) || par3EntityPlayer.isSneaking()) + if (!BindableItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer) || par3EntityPlayer.isSneaking()) { return par1ItemStack; } if (!par3EntityPlayer.capabilities.isCreativeMode) { - EnergyItems.syphonAndDamageWhileInContainer(par1ItemStack, par3EntityPlayer, this.getEnvironmentalEnergy()); + BindableItems.syphonAndDamageWhileInContainer(par1ItemStack, par3EntityPlayer, this.getEnvironmentalEnergy()); } int d0 = 3; diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/tileEntity/TEPlinth.java b/src/main/java/WayofTime/alchemicalWizardry/common/tileEntity/TEPlinth.java index 579581ae..05be629f 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/tileEntity/TEPlinth.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/tileEntity/TEPlinth.java @@ -20,7 +20,7 @@ import WayofTime.alchemicalWizardry.api.summoningRegistry.SummoningRegistryCompo import WayofTime.alchemicalWizardry.common.IDemon; import WayofTime.alchemicalWizardry.common.NewPacketHandler; import WayofTime.alchemicalWizardry.common.PlinthComponent; -import WayofTime.alchemicalWizardry.common.items.EnergyBattery; +import WayofTime.alchemicalWizardry.common.items.Orb; public class TEPlinth extends TEInventory implements IUpdatePlayerListBox { @@ -173,9 +173,9 @@ public class TEPlinth extends TEInventory implements IUpdatePlayerListBox if (!isActive()) { - if (getStackInSlot(0) != null && getStackInSlot(0).getItem() instanceof EnergyBattery) + if (getStackInSlot(0) != null && getStackInSlot(0).getItem() instanceof Orb) { - int bloodOrbLevel = ((EnergyBattery) getStackInSlot(0).getItem()).getOrbLevel(); + int bloodOrbLevel = ((Orb) getStackInSlot(0).getItem()).getOrbLevel(); if (SummoningRegistry.isRecipeValid(bloodOrbLevel, composeItemsForRingAndParadigm(1, true), composeItemsForRingAndParadigm(2, true), composeItemsForRingAndParadigm(3, true))) { @@ -203,7 +203,7 @@ public class TEPlinth extends TEInventory implements IUpdatePlayerListBox } } else { - if (getStackInSlot(0) != null && getStackInSlot(0).getItem() instanceof EnergyBattery) + if (getStackInSlot(0) != null && getStackInSlot(0).getItem() instanceof Orb) { if (progress % progressInterval == 0) { @@ -246,7 +246,7 @@ public class TEPlinth extends TEInventory implements IUpdatePlayerListBox if (progress >= progressInterval * 18) { - int bloodOrbLevel = ((EnergyBattery) getStackInSlot(0).getItem()).getOrbLevel(); + int bloodOrbLevel = ((Orb) getStackInSlot(0).getItem()).getOrbLevel(); EntityLivingBase entity = SummoningRegistry.getEntity(worldObj, bloodOrbLevel, ring1Inv, ring2Inv, ring3Inv); if (entity != null) diff --git a/src/main/resources/assets/alchemicalwizardry/lang/en_US.lang b/src/main/resources/assets/alchemicalwizardry/lang/en_US.lang index 93b52d6c..d8485d0e 100644 --- a/src/main/resources/assets/alchemicalwizardry/lang/en_US.lang +++ b/src/main/resources/assets/alchemicalwizardry/lang/en_US.lang @@ -70,178 +70,178 @@ tile.spectral_block.name=Spectral Block tile.incense_crucible.name=Incense Crucible #Item Localization -item.weakBloodOrb.name=Weak Blood Orb -item.apprenticeBloodOrb.name=Apprentice Blood Orb -item.magicianBloodOrb.name=Magician's Blood Orb -item.masterBloodOrb.name=Master Blood Orb -item.archmageBloodOrb.name=Archmage's Blood Orb -item.energyBlast.name=Energy Blaster -item.energySword.name=Bound Blade -item.lavaCrystal.name=Lava Crystal -item.waterSigil.name=Water Sigil -item.lavaSigil.name=Lava Sigil -item.voidSigil.name=Void Sigil -item.blankSlate.name=Blank Slate -item.reinforcedSlate.name=Reinforced Slate -item.sacrificialDagger.name=Sacrificial Knife -item.daggerOfSacrifice.name=Dagger of Sacrifice -item.airSigil.name=Air Sigil -item.sigilOfTheFastMiner.name=Sigil of the Fast Miner -item.sigilOfElementalAffinity.name=Sigil of Elemental Affinity -item.sigilOfHaste.name=Sigil of Haste -item.sigilOfHolding.name=Sigil of Holding -item.divinationSigil.name=Divination Sigil -item.waterScribeTool.name=Elemental Inscription Tool: Water -item.fireScribeTool.name=Elemental Inscription Tool: Fire -item.earthScribeTool.name=Elemental Inscription Tool: Earth -item.airScribeTool.name=Elemental Inscription Tool: Air -item.duskScribeTool.name=Elemental Inscription Tool: Dusk -item.activationCrystalWeak.name=Weak Activation Crystal -item.activationCrystalAwakened.name=Awakened Activation Crystal -item.activationCrystalCreative.name=Creative Activation Crystal -item.boundPickaxe.name=Bound Pickaxe -item.boundAxe.name=Bound Axe -item.boundShovel.name=Bound Shovel -item.boundHelmet.name=Bound Helmet -item.boundPlate.name=Bound Plate -item.boundLeggings.name=Bound Leggings -item.boundBoots.name=Bound Boots -item.weakBloodShard.name=Weak Blood Shard -item.growthSigil.name=Sigil of the Green Grove -item.blankSpell.name=Unbound Crystal -item.alchemyFlask.name=Potion Flask -item.standardBindingAgent.name=Standard Binding Agent -item.mundanePowerCatalyst.name=Mundane Power Catalyst -item.averagePowerCatalyst.name=Average Power Catalyst -item.greaterPowerCatalyst.name=Greater Power Catalyst -item.mundaneLengtheningCatalyst.name=Mundane Lengthening Catalyst -item.averageLengtheningCatalyst.name=Average Lengthening Catalyst -item.greaterLengtheningCatalyst.name=Greater Lengthening Catalyst +item.weak_blood_orb.name=Weak Blood Orb +item.apprentice_blood_orb.name=Apprentice Blood Orb +item.magician_blood_orb.name=Magician's Blood Orb +item.master_blood_orb.name=Master Blood Orb +item.archmage_blood_orb.name=Archmage's Blood Orb +item.energy_blast.name=Energy Blaster +item.energy_sword.name=Bound Blade +item.lava_crystal.name=Lava Crystal +item.water_sigil.name=Water Sigil +item.lava_sigil.name=Lava Sigil +item.void_sigil.name=Void Sigil +item.blank_slate.name=Blank Slate +item.reinforced_slate.name=Reinforced Slate +item.sacrificial_dagger.name=Sacrificial Knife +item.dagger_of_sacrifice.name=Dagger of Sacrifice +item.air_sigil.name=Air Sigil +item.sigil_of_the_fast_miner.name=Sigil of the Fast Miner +item.sigil_of_elemental_affinity.name=Sigil of Elemental Affinity +item.sigil_of_haste.name=Sigil of Haste +item.sigil_of_holding.name=Sigil of Holding +item.divination_sigil.name=Divination Sigil +item.water_scribe_tool.name=Elemental Inscription Tool: Water +item.fire_scribe_tool.name=Elemental Inscription Tool: Fire +item.earth_scribe_tool.name=Elemental Inscription Tool: Earth +item.air_scribe_tool.name=Elemental Inscription Tool: Air +item.dusk_scribe_tool.name=Elemental Inscription Tool: Dusk +item.activation_crystal_weak.name=Weak Activation Crystal +item.activation_crystal_awakened.name=Awakened Activation Crystal +item.activation_crystal_creative.name=Creative Activation Crystal +item.bound_pickaxe.name=Bound Pickaxe +item.bound_axe.name=Bound Axe +item.bound_shovel.name=Bound Shovel +item.bound_helmet.name=Bound Helmet +item.bound_chestplate.name=Bound Chestplate +item.bound_leggings.name=Bound Leggings +item.bound_boots.name=Bound Boots +item.weak_blood_shard.name=Weak Blood Shard +item.growth_sigil.name=Sigil of the Green Grove +item.blank_spell.name=Unbound Crystal +item.alchemy_flask.name=Potion Flask +item.standard_binding_agent.name=Standard Binding Agent +item.mundane_power_catalyst.name=Mundane Power Catalyst +item.average_power_catalyst.name=Average Power Catalyst +item.greater_power_catalyst.name=Greater Power Catalyst +item.mundane_lengthening_catalyst.name=Mundane Lengthening Catalyst +item.average_lengthening_catalyst.name=Average Lengthening Catalyst +item.greater_lengthening_catalyst.name=Greater Lengthening Catalyst item.incendium.name=Incendium item.magicales.name=Magicales item.sanctus.name=Sanctus item.aether.name=Aether -item.simpleCatalyst.name=Simple Catalyst +item.simple_catalyst.name=Simple Catalyst item.crepitous.name=Crepitous item.crystallos.name=Crystallos item.terrae.name=Terrae item.aquasalus.name=Aquasalus item.tennebrae.name=Tenebrae -item.demonBloodShard.name=Demon Blood Shard -item.sigilOfWind.name=Sigil of the Whirlwind -item.telepositionFocus.name=Teleposition Focus -item.enhancedTelepositionFocus.name=Enhanced Teleposition Focus -item.reinforcedTelepositionFocus.name=Reinforced Teleposition Focus -item.demonicTelepositionFocus.name=Demonic Teleposition Focus -item.imbuedSlate.name=Imbued Slate -item.demonicSlate.name=Demonic Slate -item.sigilOfTheBridge.name=Sigil of the Phantom Bridge -item.armourInhibitor.name=Armour Inhibitor -item.cheatyItem.name=Orb of Testing -item.weakFillingAgent.name=Weak Filling Agent -item.standardFillingAgent.name=Standard Filling Agent -item.enhancedFillingAgent.name=Enhanced Filling Agent -item.weakBindingAgent.name=Weak Binding Agent -item.ritualDiviner.name=Ritual Diviner -item.ritualDismantler.name=Ritual Dismantler -item.sigilOfMagnetism.name=Sigil of Magnetism -item.itemDiabloKey.name=Key of Binding -item.energyBazooka.name=Energy Bazooka -item.bloodLightSigil.name=Sigil of the Blood Lamp -item.itemComplexSpellCrystal.name=Complex Spell Crystal -item.itemSigilOfSupression.name=Sigil of Supression -item.itemSigilOfEnderSeverance.name=Sigil of Ender Severance -item.bucketLife.name=Bucket of Life -item.bloodMagicBaseItem.QuartzRod.name=Quartz Rod -item.bloodMagicBaseItem.EmptyCore.name=Empty Core -item.bloodMagicBaseItem.MagicalesCable.name=Magicales Cable -item.bloodMagicBaseItem.WoodBrace.name=Wooden Brace -item.bloodMagicBaseItem.StoneBrace.name=Stone Brace -item.bloodMagicBaseItem.ProjectileCore.name=Projectile Core -item.bloodMagicBaseItem.SelfCore.name=Self Core -item.bloodMagicBaseItem.MeleeCore.name=Melee Core -item.bloodMagicBaseItem.ToolCore.name=Tool Core -item.bloodMagicBaseItem.ParadigmBackPlate.name=Paradigm Plate -item.bloodMagicBaseItem.OutputCable.name=Output Spell Cable -item.bloodMagicBaseItem.InputCable.name=Input Spell Cable -item.bloodMagicBaseItem.FlameCore.name=Fire Core -item.bloodMagicBaseItem.IcyCore.name=Icy Core -item.bloodMagicBaseItem.GustCore.name=Gusty Core -item.bloodMagicBaseItem.EarthenCore.name=Earthen Core -item.bloodMagicBaseItem.CrackedRunicPlate.name=Cracked Runic Plate -item.bloodMagicBaseItem.RunicPlate.name=Runic Plate -item.bloodMagicBaseItem.ScribedRunicPlate.name=Imbued Runic Plate -item.bloodMagicBaseItem.DefaultCore.name=Unattuned Core -item.bloodMagicBaseItem.OffensiveCore.name=Offensive Core -item.bloodMagicBaseItem.DefensiveCore.name=Defensive Core -item.bloodMagicBaseItem.EnvironmentalCore.name=Environmental Core -item.bloodMagicBaseItem.PowerCore.name=Power Core -item.bloodMagicBaseItem.CostCore.name=Reduction Core -item.bloodMagicBaseItem.PotencyCore.name=Potency Core -item.bloodMagicBaseItem.ObsidianBrace.name=Obsidian Brace -item.bloodMagicBaseItem.EtherealSlate.name=Ethereal Slate -item.bloodMagicBaseItem.LifeShard.name=Life Shard -item.bloodMagicBaseItem.SoulShard.name=Soul Shard -item.bloodMagicBaseItem.LifeBrace.name=Living Brace -item.bloodMagicBaseItem.SoulRunicPlate.name=Soul Runic Plate -item.bloodMagicAlchemyItem.Offensa.name=Offensa -item.bloodMagicAlchemyItem.Praesidium.name=Praesidium -item.bloodMagicAlchemyItem.OrbisTerrae.name=Orbis Terrae -item.bloodMagicAlchemyItem.StrengthenedCatalyst.name=Strengthened Catalyst -item.bloodMagicAlchemyItem.ConcentratedCatalyst.name=Concentrated Catalyst -item.bloodMagicAlchemyItem.FracturedBone.name=Fractured Bone -item.bloodMagicAlchemyItem.Virtus.name=Virtus -item.bloodMagicAlchemyItem.Reductus.name=Reductus -item.bloodMagicAlchemyItem.Potentia.name=Potentia -item.sanguineHelmet.name=Sanguine Helmet -item.itemSeerSigil.name=Sigil of Sight -item.itemFluidSigil.name= -item.multiTool.name=Dynamic Mace -item.itemCombinationalCatalyst.name=Combinational Catalyst -item.sanguineRobe.name=Sanguine Robes -item.sanguinePants.name=Sanguine Leggings -item.sanguineBoots.name=Sanguine Boots -item.itemAttunedCrystal.name=Alchemic Router -item.itemTankSegmenter.name=Alchemic Segmenter -item.destinationClearer.name=Alchemic Cleanser -item.demonPlacer.name=Demon Crystal -item.creativeDagger.name=Creative Sacrificial Knife -item.itemBloodPack.name=Blood Letter's Pack -item.itemHarvestSigil.name=Harvest Goddess Sigil -item.itemCompressionSigil.name=Sigil of Compression -item.itemAssassinSigil.name=Sigil of the Assassin -item.transcendentBloodOrb.name=Transcendent Blood Orb -item.itemMailCatalogue.name=Mail Order Catalogue -item.inputRoutingFocus.name=Input Routing Focus -item.bloodMagicBaseItem.EnderShard.name=Ender Shard -item.outputRoutingFocus.default.name=Default Output Routing Focus -item.outputRoutingFocus.modItem.name=Output Routing Focus (ModItem) -item.outputRoutingFocus.ignMeta.name=Output Routing Focus (Ignore Meta) -item.outputRoutingFocus.matchNBT.name=Output Routing Focus (MatchNBT) -item.outputRoutingFocus.global.name=Output Routing Focus (Global) -item.dawnScribeTool.name=Elemental Inscription Tool: Dawn -item.boundHelmetEarth.name=Earth Omega Helmet -item.boundPlateEarth.name=Earth Omega Plate -item.boundLeggingsEarth.name=Earth Omega Leggings -item.boundBootsEarth.name=Earth Omega Boots -item.boundHelmetWind.name=Wind Omega Helmet -item.boundPlateWind.name=Wind Omega Plate -item.boundLeggingsWind.name=Wind Omega Leggings -item.boundBootsWind.name=Wind Omega Boots -item.boundHelmetFire.name=Fire Omega Helmet -item.boundPlateFire.name=Fire Omega Plate -item.boundLeggingsFire.name=Fire Omega Leggings -item.boundBootsFire.name=Fire Omega Boots -item.boundHelmetWater.name=Water Omega Helmet -item.boundPlateWater.name=Water Omega Plate -item.boundLeggingsWater.name=Water Omega Leggings -item.boundBootsWater.name=Water Omega Boots +item.demon_blood_shard.name=Demon Blood Shard +item.sigil_of_wind.name=Sigil of the Whirlwind +item.teleposition_focus.name=Teleposition Focus +item.enhanced_teleposition_focus.name=Enhanced Teleposition Focus +item.reinforced_teleposition_focus.name=Reinforced Teleposition Focus +item.demonic_teleposition_focus.name=Demonic Teleposition Focus +item.imbued_slate.name=Imbued Slate +item.demonic_slate.name=Demonic Slate +item.sigil_of_the_bridge.name=Sigil of the Phantom Bridge +item.armour_inhibitor.name=Armour Inhibitor +item.creative_orb.name=Orb of Testing +item.weak_filling_agent.name=Weak Filling Agent +item.standard_filling_agent.name=Standard Filling Agent +item.enhanced_filling_agent.name=Enhanced Filling Agent +item.weak_binding_agent.name=Weak Binding Agent +item.ritual_diviner.name=Ritual Diviner +item.ritual_dismantler.name=Ritual Dismantler +item.sigil_of_magnetism.name=Sigil of Magnetism +item.key_of_binding.name=Key of Binding +item.energy_bazooka.name=Energy Bazooka +item.blood_light_sigil.name=Sigil of the Blood Lamp +item.complex_spell_crystal.name=Complex Spell Crystal +item.sigil_of_supression.name=Sigil of Supression +item.sigil_of_ender_severance.name=Sigil of Ender Severance +item.bucket_life.name=Bucket of Life +item.base_items.quartz_rod.name=Quartz Rod +item.base_items.empty_core.name=Empty Core +item.base_items.magicales_cable.name=Magicales Cable +item.base_items.wood_brace.name=Wooden Brace +item.base_items.stone_brace.name=Stone Brace +item.base_items.projectile_core.name=Projectile Core +item.base_items.self_core.name=Self Core +item.base_items.melee_core.name=Melee Core +item.base_items.tool_core.name=Tool Core +item.base_items.paradigm_back_plate.name=Paradigm Plate +item.base_items.output_cable.name=Output Spell Cable +item.base_items.input_cable.name=Input Spell Cable +item.base_items.flame_core.name=Fire Core +item.base_items.icy_core.name=Icy Core +item.base_items.gust_core.name=Gusty Core +item.base_items.earthen_core.name=Earthen Core +item.base_items.cracked_runic_plate.name=Cracked Runic Plate +item.base_items.runic_plate.name=Runic Plate +item.base_items.scribed_runic_plate.name=Imbued Runic Plate +item.base_items.default_core.name=Unattuned Core +item.base_items.offensive_core.name=Offensive Core +item.base_items.defensive_core.name=Defensive Core +item.base_items.environmental_core.name=Environmental Core +item.base_items.power_core.name=Power Core +item.base_items.cost_core.name=Reduction Core +item.base_items.potency_core.name=Potency Core +item.base_items.obsidian_brace.name=Obsidian Brace +item.base_items.ethereal_slate.name=Ethereal Slate +item.base_items.life_shard.name=Life Shard +item.base_items.soul_shard.name=Soul Shard +item.base_items.life_brace.name=Living Brace +item.base_items.soul_runic_plate.name=Soul Runic Plate +item.base_items.ender_shard.name=Ender Shard +item.base_alchemy_items.offensa.name=Offensa +item.base_alchemy_items.praesidium.name=Praesidium +item.base_alchemy_items.orbis_terrae.name=Orbis Terrae +item.base_alchemy_items.strengthened_catalyst.name=Strengthened Catalyst +item.base_alchemy_items.concentrated_catalyst.name=Concentrated Catalyst +item.base_alchemy_items.fractured_bone.name=Fractured Bone +item.base_alchemy_items.virtus.name=Virtus +item.base_alchemy_items.reductus.name=Reductus +item.base_alchemy_items.potentia.name=Potentia +item.sanguine_helmet.name=Sanguine Helmet +item.seer_sigil.name=Sigil of Sight +item.fluid_sigil.name=Sigil of Fluidity +item.multi_tool.name=Dynamic Mace +item.combinational_catalyst.name=Combinational Catalyst +item.sanguine_robe.name=Sanguine Robes +item.sanguine_pants.name=Sanguine Leggings +item.sanguine_boots.name=Sanguine Boots +item.alchemical_router.name=Alchemic Router +item.alchemical_segmenter.name=Alchemic Segmenter +item.alchemical_cleanser.name=Alchemic Cleanser +item.demon_crystal.name=Demon Crystal +item.creative_dagger.name=Creative Sacrificial Knife +item.blood_pack.name=Blood Letter's Pack +item.harvest_sigil.name=Harvest Goddess Sigil +item.compression_sigil.name=Sigil of Compression +item.assassin_sigil.name=Sigil of the Assassin +item.transcendent_blood_orb.name=Transcendent Blood Orb +item.mail_catalogue.name=Mail Order Catalogue +item.input_routing_focus.name=Input Routing Focus +item.output_routing_focus.default.name=Default Output Routing Focus +item.output_routing_focus.modItem.name=Output Routing Focus (ModItem) +item.output_routing_focus.ignMeta.name=Output Routing Focus (Ignore Meta) +item.output_routing_focus.matchNBT.name=Output Routing Focus (MatchNBT) +item.output_routing_focus.global.name=Output Routing Focus (Global) +item.dawn_scribe_tool.name=Elemental Inscription Tool: Dawn +item.bound_helmet_earth.name=Earth Omega Helmet +item.bound_chestplate_earth.name=Earth Omega Chestplate +item.bound_leggings_earth.name=Earth Omega Leggings +item.bound_boots_earth.name=Earth Omega Boots +item.bound_helmet_wind.name=Wind Omega Helmet +item.bound_chestplate_wind.name=Wind Omega Chestplate +item.bound_leggings_wind.name=Wind Omega Leggings +item.bound_boots_wind.name=Wind Omega Boots +item.bound_helmet_fire.name=Fire Omega Helmet +item.bound_chestplate_fire.name=Fire Omega Chestplate +item.bound_leggings_fire.name=Fire Omega Leggings +item.bound_boots_fire.name=Fire Omega Boots +item.bound_helmet_water.name=Water Omega Helmet +item.bound_chestplate_water.name=Water Omega Chestplate +item.bound_leggings_water.name=Water Omega Leggings +item.bound_boots_water.name=Water Omega Boots -item.bloodMagicIncenseItem.Woodash.name=Wood Ash -item.bloodMagicIncenseItem.Byrrus.name=Byrrus -item.bloodMagicIncenseItem.Livens.name=Livens -item.bloodMagicIncenseItem.Viridis.name=Viridis -item.bloodMagicIncenseItem.Purpura.name=Purpura +item.incense.wood_ash.name=Wood Ash +item.incense.byrrus.name=Byrrus +item.incense.livens.name=Livens +item.incense.viridis.name=Viridis +item.incense.purpura.name=Purpura #Creative Tab itemGroup.tabBloodMagic=Blood Magic @@ -400,27 +400,27 @@ tooltip.sacrificialdagger.desc3=finger will suffice... tooltip.sanguinearmor.desc1=A pair of goggles imbued with power tooltip.sanguinearmor.desc2=Robes imbued with forbidden power tooltip.sanguinearmor.visdisc=Vis discount: -tooltip.scribetool.desc=The writing is on the wall... +tooltip._scribe_tool.desc=The writing is on the wall... tooltip.seersigil.desc=When seeing all is not enough -tooltip.sigilofelementalaffinity.desc1=Perfect for a fire-breathing fish -tooltip.sigilofelementalaffinity.desc2=who is afraid of heights! -tooltip.sigilofenderseverance.desc=Put those endermen in a Dire situation! -tooltip.sigilofgrowth.desc1=Who needs a green thumb when -tooltip.sigilofgrowth.desc2=you have a green slate? -tooltip.sigilofhaste.desc=One dose of caffeine later... -tooltip.sigilofholding.desc=Used to hold several Sigils! -tooltip.sigilofmagnetism.desc=I have a very magnetic personality! -tooltip.sigilofsupression.desc=Better than telekinesis -tooltip.sigiloftheassassin.desc=Time to stay stealthy... -tooltip.sigilofthebridge.desc1=Activate to create a bridge -tooltip.sigilofthebridge.desc2=beneath your feet. -tooltip.sigilofthefastminer.desc=Keep going and going and going... -tooltip.sigilofwind.desc=Best not to wear a skirt. +tooltip.sigil_ofelementalaffinity.desc1=Perfect for a fire-breathing fish +tooltip.sigil_ofelementalaffinity.desc2=who is afraid of heights! +tooltip.sigil_ofenderseverance.desc=Put those endermen in a Dire situation! +tooltip.sigil_ofgrowth.desc1=Who needs a green thumb when +tooltip.sigil_ofgrowth.desc2=you have a green slate? +tooltip.sigil_ofhaste.desc=One dose of caffeine later... +tooltip.sigil_ofholding.desc=Used to hold several Sigils! +tooltip.sigil_ofmagnetism.desc=I have a very magnetic personality! +tooltip.sigil_ofsupression.desc=Better than telekinesis +tooltip.sigil_oftheassassin.desc=Time to stay stealthy... +tooltip.sigil_ofthebridge.desc1=Activate to create a bridge +tooltip.sigil_ofthebridge.desc2=beneath your feet. +tooltip.sigil_ofthefastminer.desc=Keep going and going and going... +tooltip.sigil_ofwind.desc=Best not to wear a skirt. tooltip.sigil.state.activated=Activated tooltip.sigil.state.deactivated=Deactivated tooltip.tanksegmenter.desc1=Used to designate which tooltip.tanksegmenter.desc2=reagents can go into a container -tooltip.telepositionfocus.desc=An Enderpearl imbued with blood +tooltip._teleposition_focus.desc=An Enderpearl imbued with blood tooltip.voidsigil.desc=Better than a Swiffer! tooltip.watersigil.desc=Infinite water, anyone? tooltip.routingFocus.limit=Limit: