lauchmelder/BloodMagic
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Merge pull request #410 from Arcaratus/bloodmagic1.8

Browse source 
All items !sigils
This commit is contained in:
WayofTime 2015-07-30 20:49:27 -04:00
parent f009d58f74 93e5e6cca6
commit b5d9e3ee58
129 changed files with 587 additions and 1134 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

52
src/main/java/WayofTime/alchemicalWizardry/AlchemicalWizardry.java
View file

@ -11,6 +11,7 @@ import java.util.List;
import java.util.zip.ZipEntry; import java.util.zip.ZipEntry;
import java.util.zip.ZipInputStream; import java.util.zip.ZipInputStream;
import WayofTime.alchemicalWizardry.common.potion.*;
import net.minecraft.creativetab.CreativeTabs; import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.init.Blocks; import net.minecraft.init.Blocks;
import net.minecraft.init.Items; 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.OmegaParadigmWater;
import WayofTime.alchemicalWizardry.common.omega.OmegaParadigmWind; import WayofTime.alchemicalWizardry.common.omega.OmegaParadigmWind;
import WayofTime.alchemicalWizardry.common.omega.OmegaRegistry; 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.renderer.AlchemyCircleRenderer;
import WayofTime.alchemicalWizardry.common.rituals.RitualEffectAnimalGrowth; import WayofTime.alchemicalWizardry.common.rituals.RitualEffectAnimalGrowth;
import WayofTime.alchemicalWizardry.common.rituals.RitualEffectAutoAlchemy; 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 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.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)); 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"); customPotionDrowning = (new PotionBloodMagic(customPotionDrowningID, true, 0)).setIconIndex(0, 0).setPotionName("Drowning");
customPotionBoost = (new PotionBoost(customPotionBoostID, false, 0)).setIconIndex(0, 0).setPotionName("Boost"); customPotionBoost = (new PotionBloodMagic(customPotionBoostID, false, 0)).setIconIndex(0, 0).setPotionName("Boost");
customPotionProjProt = (new PotionProjectileProtect(customPotionProjProtID, false, 0)).setIconIndex(0, 0).setPotionName("Whirlwind"); customPotionProjProt = (new PotionBloodMagic(customPotionProjProtID, false, 0)).setIconIndex(0, 0).setPotionName("Whirlwind");
customPotionInhibit = (new PotionInhibit(customPotionInhibitID, false, 0)).setIconIndex(0, 0).setPotionName("Inhibit"); customPotionInhibit = (new PotionBloodMagic(customPotionInhibitID, false, 0)).setIconIndex(0, 0).setPotionName("Inhibit");
customPotionFlight = (new PotionFlight(customPotionFlightID, false, 0)).setIconIndex(0, 0).setPotionName("Flight"); customPotionFlight = (new PotionBloodMagic(customPotionFlightID, false, 0)).setIconIndex(0, 0).setPotionName("Flight");
customPotionReciprocation = (new PotionReciprocation(customPotionReciprocationID, false, 0xFFFFFF)).setIconIndex(0, 0).setPotionName("Reciprocation"); customPotionReciprocation = (new PotionBloodMagic(customPotionReciprocationID, false, 0xFFFFFF)).setIconIndex(0, 0).setPotionName("Reciprocation");
customPotionFlameCloak = (new PotionFlameCloak(customPotionFlameCloakID, false, 0).setIconIndex(0, 0).setPotionName("Flame Cloak")); customPotionFlameCloak = (new PotionBloodMagic(customPotionFlameCloakID, false, 0).setIconIndex(0, 0).setPotionName("Flame Cloak"));
customPotionIceCloak = (new PotionIceCloak(customPotionIceCloakID, false, 0).setIconIndex(0, 0).setPotionName("Ice Cloak")); customPotionIceCloak = (new PotionBloodMagic(customPotionIceCloakID, false, 0).setIconIndex(0, 0).setPotionName("Ice Cloak"));
customPotionHeavyHeart = (new PotionHeavyHeart(customPotionHeavyHeartID, true, 0).setIconIndex(0, 0).setPotionName("Heavy Heart")); customPotionHeavyHeart = (new PotionBloodMagic(customPotionHeavyHeartID, true, 0).setIconIndex(0, 0).setPotionName("Heavy Heart"));
customPotionFireFuse = (new PotionFireFuse(customPotionFireFuseID, true, 0).setIconIndex(0, 0).setPotionName("Fire Fuse")); customPotionFireFuse = (new PotionBloodMagic(customPotionFireFuseID, true, 0).setIconIndex(0, 0).setPotionName("Fire Fuse"));
customPotionPlanarBinding = (new PotionPlanarBinding(customPotionPlanarBindingID, true, 0).setIconIndex(0, 0).setPotionName("Planar Binding")); customPotionPlanarBinding = (new PotionBloodMagic(customPotionPlanarBindingID, true, 0).setIconIndex(0, 0).setPotionName("Planar Binding"));
customPotionSoulFray = (new PotionSoulFray(customPotionSoulFrayID, true, 0).setIconIndex(0, 0).setPotionName("Soul Fray")); customPotionSoulFray = (new PotionBloodMagic(customPotionSoulFrayID, true, 0).setIconIndex(0, 0).setPotionName("Soul Fray"));
customPotionSoulHarden = (new PotionSoulHarden(customPotionSoulHardenID, false, 0).setIconIndex(0, 0).setPotionName("Soul Harden")); customPotionSoulHarden = (new PotionBloodMagic(customPotionSoulHardenID, false, 0).setIconIndex(0, 0).setPotionName("Soul Harden"));
customPotionDeaf = (new PotionDeaf(customPotionDeafID, true, 0).setIconIndex(0, 0).setPotionName("Deafness")); customPotionDeaf = (new PotionBloodMagic(customPotionDeafID, true, 0).setIconIndex(0, 0).setPotionName("Deafness"));
customPotionFeatherFall = (new PotionFeatherFall(customPotionFeatherFallID, false, 0).setIconIndex(0, 0).setPotionName("Feather Fall")); customPotionFeatherFall = (new PotionBloodMagic(customPotionFeatherFallID, false, 0).setIconIndex(0, 0).setPotionName("Feather Fall"));
customPotionDemonCloak = (new PotionDemonCloak(customPotionDemonCloakID, false, 0).setIconIndex(0, 0).setPotionName("Demon Cloaking")); customPotionDemonCloak = (new PotionBloodMagic(customPotionDemonCloakID, false, 0).setIconIndex(0, 0).setPotionName("Demon Cloaking"));
customPotionAmphibian = (new PotionAmphibian(customPotionAmphibianID, false, 0).setIconIndex(0, 0).setPotionName("Amphibian")); customPotionAmphibian = (new PotionBloodMagic(customPotionAmphibianID, false, 0).setIconIndex(0, 0).setPotionName("Amphibian"));
ItemStack masterBloodOrbStack = new ItemStack(ModItems.masterBloodOrb); ItemStack masterBloodOrbStack = new ItemStack(ModItems.masterBloodOrb);
ItemStack transcendentBloodOrbStack = new ItemStack(ModItems.transcendentBloodOrb); ItemStack transcendentBloodOrbStack = new ItemStack(ModItems.transcendentBloodOrb);

42
src/main/java/WayofTime/alchemicalWizardry/ModItems.java
View file

@ -6,7 +6,7 @@ import net.minecraft.item.Item;
import net.minecraftforge.fml.common.registry.GameRegistry; import net.minecraftforge.fml.common.registry.GameRegistry;
import WayofTime.alchemicalWizardry.api.items.ItemSpellMultiTool; import WayofTime.alchemicalWizardry.api.items.ItemSpellMultiTool;
import WayofTime.alchemicalWizardry.api.spell.SpellParadigmTool; 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.ActivationCrystal;
import WayofTime.alchemicalWizardry.common.items.AirScribeTool; import WayofTime.alchemicalWizardry.common.items.AirScribeTool;
import WayofTime.alchemicalWizardry.common.items.ApprenticeBloodOrb; 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.BoundAxe;
import WayofTime.alchemicalWizardry.common.items.BoundPickaxe; import WayofTime.alchemicalWizardry.common.items.BoundPickaxe;
import WayofTime.alchemicalWizardry.common.items.BoundShovel; 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.CreativeDagger;
import WayofTime.alchemicalWizardry.common.items.DaggerOfSacrifice; import WayofTime.alchemicalWizardry.common.items.DaggerOfSacrifice;
import WayofTime.alchemicalWizardry.common.items.DawnScribeTool; 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.DemonicTelepositionFocus;
import WayofTime.alchemicalWizardry.common.items.DuskScribeTool; import WayofTime.alchemicalWizardry.common.items.DuskScribeTool;
import WayofTime.alchemicalWizardry.common.items.EarthScribeTool; 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.EnergyBazooka;
import WayofTime.alchemicalWizardry.common.items.EnergyBlast; import WayofTime.alchemicalWizardry.common.items.EnergyBlaster;
import WayofTime.alchemicalWizardry.common.items.BoundBlade; import WayofTime.alchemicalWizardry.common.items.BoundBlade;
import WayofTime.alchemicalWizardry.common.items.EnhancedTelepositionFocus; import WayofTime.alchemicalWizardry.common.items.EnhancedTelepositionFocus;
import WayofTime.alchemicalWizardry.common.items.FireScribeTool; 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.ItemBloodLetterPack;
import WayofTime.alchemicalWizardry.common.items.ItemComplexSpellCrystal; import WayofTime.alchemicalWizardry.common.items.ItemComplexSpellCrystal;
import WayofTime.alchemicalWizardry.common.items.ItemComponents; 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.ItemIncense;
import WayofTime.alchemicalWizardry.common.items.ItemRitualDismantler; import WayofTime.alchemicalWizardry.common.items.ItemRitualDismantler;
import WayofTime.alchemicalWizardry.common.items.ItemRitualDiviner; 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.OmegaArmourFire;
import WayofTime.alchemicalWizardry.common.items.armour.OmegaArmourWater; import WayofTime.alchemicalWizardry.common.items.armour.OmegaArmourWater;
import WayofTime.alchemicalWizardry.common.items.armour.OmegaArmourWind; import WayofTime.alchemicalWizardry.common.items.armour.OmegaArmourWind;
import WayofTime.alchemicalWizardry.common.items.energy.ItemAttunedCrystal; import WayofTime.alchemicalWizardry.common.items.energy.AlchemicalRouter;
import WayofTime.alchemicalWizardry.common.items.energy.ItemDestinationClearer; import WayofTime.alchemicalWizardry.common.items.energy.AlchemicalCleanser;
import WayofTime.alchemicalWizardry.common.items.energy.ItemTankSegmenter; import WayofTime.alchemicalWizardry.common.items.energy.AlchemicalSegmenter;
import WayofTime.alchemicalWizardry.common.items.potion.AlchemyFlask; import WayofTime.alchemicalWizardry.common.items.potion.AlchemyFlask;
import WayofTime.alchemicalWizardry.common.items.potion.AlchemyReagent; import WayofTime.alchemicalWizardry.common.items.potion.AlchemyReagent;
import WayofTime.alchemicalWizardry.common.items.potion.AverageLengtheningCatalyst; import WayofTime.alchemicalWizardry.common.items.potion.AverageLengtheningCatalyst;
@ -250,20 +250,20 @@ public class ModItems
public static void init() 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"); apprenticeBloodOrb = registerItem(new ApprenticeBloodOrb(25000), "apprentice_blood_orb");
magicianBloodOrb = registerItem(new MagicianBloodOrb(150000), "magician_blood_orb"); magicianBloodOrb = registerItem(new MagicianBloodOrb(150000), "magician_blood_orb");
masterBloodOrb = registerItem(new MasterBloodOrb(1000000), "master_blood_orb"); masterBloodOrb = registerItem(new MasterBloodOrb(1000000), "master_blood_orb");
archmageBloodOrb = registerItem(new ArchmageBloodOrb(10000000), "archmage_blood_orb"); archmageBloodOrb = registerItem(new ArchmageBloodOrb(10000000), "archmage_blood_orb");
transcendentBloodOrb = registerItem(new TranscendentBloodOrb(30000000), "transcendent_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"); energySword = registerItem(new BoundBlade(), "bound_blade");
lavaCrystal = registerItem(new LavaCrystal(), "lava_crystal"); lavaCrystal = registerItem(new LavaCrystal(), "lava_crystal");
waterSigil = registerItem(new SigilWater(), "water_sigil"); waterSigil = registerItem(new SigilWater(), "water_sigil");
lavaSigil = registerItem(new SigilLava(), "lava_sigil"); lavaSigil = registerItem(new SigilLava(), "lava_sigil");
voidSigil = registerItem(new SigilVoid(), "void_sigil"); voidSigil = registerItem(new SigilVoid(), "void_sigil");
blankSlate = registerItem(new AWBaseItems(), "blank_slate"); blankSlate = registerItem(new BaseItems(), "blank_slate");
reinforcedSlate = registerItem(new AWBaseItems(), "reinforced_slate"); reinforcedSlate = registerItem(new BaseItems(), "reinforced_slate");
sacrificialDagger = registerItem(new SacrificialDagger(), "sacrificial_agger"); sacrificialDagger = registerItem(new SacrificialDagger(), "sacrificial_agger");
daggerOfSacrifice = registerItem(new DaggerOfSacrifice(), "dagger_of_sacrifice"); daggerOfSacrifice = registerItem(new DaggerOfSacrifice(), "dagger_of_sacrifice");
airSigil = registerItem(new SigilAir(), "air_sigil"); airSigil = registerItem(new SigilAir(), "air_sigil");
@ -311,13 +311,13 @@ public class ModItems
enhancedTelepositionFocus = registerItem(new EnhancedTelepositionFocus(), "enhanced_teleposition_focus"); enhancedTelepositionFocus = registerItem(new EnhancedTelepositionFocus(), "enhanced_teleposition_focus");
reinforcedTelepositionFocus = registerItem(new ReinforcedTelepositionFocus(), "reinforced_teleposition_focus"); reinforcedTelepositionFocus = registerItem(new ReinforcedTelepositionFocus(), "reinforced_teleposition_focus");
demonicTelepositionFocus = registerItem(new DemonicTelepositionFocus(), "demonic_teleposition_focus"); demonicTelepositionFocus = registerItem(new DemonicTelepositionFocus(), "demonic_teleposition_focus");
imbuedSlate = registerItem(new AWBaseItems(), "imbued_slate"); imbuedSlate = registerItem(new BaseItems(), "imbued_slate");
demonicSlate = registerItem(new AWBaseItems(), "demonic_slate"); demonicSlate = registerItem(new BaseItems(), "demonic_slate");
duskScribeTool = registerItem(new DuskScribeTool(), "dusk_scribe_tool"); duskScribeTool = registerItem(new DuskScribeTool(), "dusk_scribe_tool");
sigilOfTheBridge = registerItem(new SigilOfTheBridge(), "sigil_of_the_bridge"); sigilOfTheBridge = registerItem(new SigilOfTheBridge(), "sigil_of_the_bridge");
armourInhibitor = registerItem(new ArmourInhibitor(), "armour_inhibitor"); armourInhibitor = registerItem(new ArmourInhibitor(), "armour_inhibitor");
creativeFiller = registerItem(new CheatyItem(), "creative_orb"); creativeFiller = registerItem(new CreativeOrb(), "creative_orb");
demonPlacer = registerItem(new DemonPlacer(), "demon_placer"); demonPlacer = registerItem(new DemonCrystal(), "demon_crystal");
creativeDagger = registerItem(new CreativeDagger(), "creative_dagger"); creativeDagger = registerItem(new CreativeDagger(), "creative_dagger");
weakFillingAgent = registerItem(new WeakFillingAgent(), "weak_filling_agent"); weakFillingAgent = registerItem(new WeakFillingAgent(), "weak_filling_agent");
standardFillingAgent = registerItem(new StandardFillingAgent(), "standard_filling_agent"); standardFillingAgent = registerItem(new StandardFillingAgent(), "standard_filling_agent");
@ -325,7 +325,7 @@ public class ModItems
weakBindingAgent = registerItem(new WeakBindingAgent(), "weak_binding_agent"); weakBindingAgent = registerItem(new WeakBindingAgent(), "weak_binding_agent");
itemRitualDiviner = registerItem(new ItemRitualDiviner(), "ritual_diviner"); itemRitualDiviner = registerItem(new ItemRitualDiviner(), "ritual_diviner");
sigilOfMagnetism = registerItem(new SigilOfMagnetism(), "sigil_of_magnetism"); 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"); energyBazooka = registerItem(new EnergyBazooka(), "energy_bazooka");
itemBloodLightSigil = registerItem(new SigilBloodLight(), "blood_light_sigil"); itemBloodLightSigil = registerItem(new SigilBloodLight(), "blood_light_sigil");
itemComplexSpellCrystal = registerItem(new ItemComplexSpellCrystal(), "complex_spell_crystal"); itemComplexSpellCrystal = registerItem(new ItemComplexSpellCrystal(), "complex_spell_crystal");
@ -341,9 +341,9 @@ public class ModItems
SpellParadigmTool.customTool = customTool; SpellParadigmTool.customTool = customTool;
itemCombinationalCatalyst = registerItem(new CombinationalCatalyst(), "combinational_catalyst"); itemCombinationalCatalyst = registerItem(new CombinationalCatalyst(), "combinational_catalyst");
itemAttunedCrystal = registerItem(new ItemAttunedCrystal(), "attuned_crystal"); itemAttunedCrystal = registerItem(new AlchemicalRouter(), "alchemical_router");
itemTankSegmenter = registerItem(new ItemTankSegmenter(), "tank_segmenter"); itemTankSegmenter = registerItem(new AlchemicalSegmenter(), "alchemical_segmenter");
itemDestinationClearer = registerItem(new ItemDestinationClearer(), "destination_clearer"); itemDestinationClearer = registerItem(new AlchemicalCleanser(), "alchemical_cleanser");
dawnScribeTool = registerItem(new DawnScribeTool(), "dawn_scribe_tool"); dawnScribeTool = registerItem(new DawnScribeTool(), "dawn_scribe_tool");

6
src/main/java/WayofTime/alchemicalWizardry/common/block/BlockAltar.java
View file

@ -16,7 +16,7 @@ import net.minecraft.util.EnumFacing;
import net.minecraft.world.World; import net.minecraft.world.World;
import WayofTime.alchemicalWizardry.ModItems; import WayofTime.alchemicalWizardry.ModItems;
import WayofTime.alchemicalWizardry.api.items.IAltarManipulator; 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.items.sigil.holding.SigilOfHolding;
import WayofTime.alchemicalWizardry.common.tileEntity.TEAltar; import WayofTime.alchemicalWizardry.common.tileEntity.TEAltar;
import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.Side;
@ -46,9 +46,9 @@ public class BlockAltar extends BlockContainer
{ {
ItemStack stack = ((TEAltar) tile).getStackInSlot(0); 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 maxEssence = bloodOrb.getMaxEssence();
int currentEssence = bloodOrb.getCurrentEssence(stack); int currentEssence = bloodOrb.getCurrentEssence(stack);
int level = currentEssence * 15 / maxEssence; int level = currentEssence * 15 / maxEssence;

6
src/main/java/WayofTime/alchemicalWizardry/common/entity/mob/EntityDemon.java
View file

@ -19,7 +19,7 @@ import net.minecraft.util.DamageSource;
import net.minecraft.world.World; import net.minecraft.world.World;
import WayofTime.alchemicalWizardry.ModItems; import WayofTime.alchemicalWizardry.ModItems;
import WayofTime.alchemicalWizardry.common.IDemon; 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; import WayofTime.alchemicalWizardry.common.spell.complex.effect.SpellHelper;
public class EntityDemon extends EntityTameable implements IDemon public class EntityDemon extends EntityTameable implements IDemon
@ -103,11 +103,11 @@ public class EntityDemon extends EntityTameable implements IDemon
{ {
ItemStack drop = new ItemStack(ModItems.demonPlacer); ItemStack drop = new ItemStack(ModItems.demonPlacer);
DemonPlacer.setDemonString(drop, this.getDemonID()); DemonCrystal.setDemonString(drop, this.getDemonID());
if ((this.getOwner() instanceof EntityPlayer)) if ((this.getOwner() instanceof EntityPlayer))
{ {
DemonPlacer.setOwnerName(drop, SpellHelper.getUsername((EntityPlayer) this.getOwner())); DemonCrystal.setOwnerName(drop, SpellHelper.getUsername((EntityPlayer) this.getOwner()));
} }
if (this.hasCustomName()) if (this.hasCustomName())

7
src/main/java/WayofTime/alchemicalWizardry/common/items/ActivationCrystal.java
View file

@ -15,12 +15,11 @@ import net.minecraftforge.fml.relauncher.SideOnly;
import org.lwjgl.input.Keyboard; import org.lwjgl.input.Keyboard;
import WayofTime.alchemicalWizardry.AlchemicalWizardry;
import WayofTime.alchemicalWizardry.api.alchemy.AlchemyRecipeRegistry; 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() public ActivationCrystal()
{ {
@ -86,7 +85,7 @@ public class ActivationCrystal extends EnergyItems
@Override @Override
public ItemStack onItemRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer) public ItemStack onItemRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer)
{ {
EnergyItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer); BindableItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer);
return par1ItemStack; return par1ItemStack;
} }

1
src/main/java/WayofTime/alchemicalWizardry/common/items/AirScribeTool.java
View file

@ -1,6 +1,5 @@
package WayofTime.alchemicalWizardry.common.items; package WayofTime.alchemicalWizardry.common.items;
public class AirScribeTool extends ScribeTool public class AirScribeTool extends ScribeTool
{ {
public AirScribeTool() public AirScribeTool()

3
src/main/java/WayofTime/alchemicalWizardry/common/items/ApprenticeBloodOrb.java
View file

@ -1,7 +1,6 @@
package WayofTime.alchemicalWizardry.common.items; package WayofTime.alchemicalWizardry.common.items;
public class ApprenticeBloodOrb extends Orb
public class ApprenticeBloodOrb extends EnergyBattery
{ {
public ApprenticeBloodOrb(int damage) public ApprenticeBloodOrb(int damage)
{ {

3
src/main/java/WayofTime/alchemicalWizardry/common/items/ArchmageBloodOrb.java
View file

@ -1,7 +1,6 @@
package WayofTime.alchemicalWizardry.common.items; package WayofTime.alchemicalWizardry.common.items;
public class ArchmageBloodOrb extends Orb
public class ArchmageBloodOrb extends EnergyBattery
{ {
public ArchmageBloodOrb(int damage) public ArchmageBloodOrb(int damage)
{ {

11
src/main/java/WayofTime/alchemicalWizardry/common/items/ArmourInhibitor.java
View file

@ -11,16 +11,13 @@ import net.minecraft.util.StatCollector;
import net.minecraft.world.World; import net.minecraft.world.World;
import WayofTime.alchemicalWizardry.AlchemicalWizardry; import WayofTime.alchemicalWizardry.AlchemicalWizardry;
public class ArmourInhibitor extends EnergyItems public class ArmourInhibitor extends BindableItems
{ {
private int tickDelay = 200;
public ArmourInhibitor() public ArmourInhibitor()
{ {
super(); super();
this.maxStackSize = 1; this.maxStackSize = 1;
setEnergyUsed(0); setEnergyUsed(0);
setCreativeTab(AlchemicalWizardry.tabBloodMagic);
} }
@Override @Override
@ -46,7 +43,9 @@ public class ArmourInhibitor extends EnergyItems
@Override @Override
public ItemStack onItemRightClick(ItemStack stack, World world, EntityPlayer player) 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; return stack;
} }
@ -88,7 +87,7 @@ public class ArmourInhibitor extends EnergyItems
if (stack.getTagCompound().getBoolean("isActive")) if (stack.getTagCompound().getBoolean("isActive"))
{ {
if (world.getWorldTime() % tickDelay == stack.getTagCompound().getInteger("worldTimeDelay")) // if (world.getWorldTime() % tickDelay == stack.getTagCompound().getInteger("worldTimeDelay"))
{ {
} }

7
src/main/java/WayofTime/alchemicalWizardry/common/items/AWBaseItems.java → src/main/java/WayofTime/alchemicalWizardry/common/items/BaseItems.java
View file

@ -6,15 +6,12 @@ import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.Item; import net.minecraft.item.Item;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
import net.minecraft.util.StatCollector; import net.minecraft.util.StatCollector;
import WayofTime.alchemicalWizardry.AlchemicalWizardry;
public class AWBaseItems extends Item public class BaseItems extends Item
{ {
public AWBaseItems() public BaseItems()
{ {
super(); super();
setMaxStackSize(64);
setCreativeTab(AlchemicalWizardry.tabBloodMagic);
} }
@Override @Override

6
src/main/java/WayofTime/alchemicalWizardry/common/items/EnergyItems.java → src/main/java/WayofTime/alchemicalWizardry/common/items/BindableItems.java
View file

@ -1,6 +1,5 @@
package WayofTime.alchemicalWizardry.common.items; package WayofTime.alchemicalWizardry.common.items;
import WayofTime.alchemicalWizardry.AlchemicalWizardry;
import WayofTime.alchemicalWizardry.api.items.interfaces.IBindable; import WayofTime.alchemicalWizardry.api.items.interfaces.IBindable;
import WayofTime.alchemicalWizardry.api.soulNetwork.LifeEssenceNetwork; import WayofTime.alchemicalWizardry.api.soulNetwork.LifeEssenceNetwork;
import WayofTime.alchemicalWizardry.api.soulNetwork.SoulNetworkHandler; import WayofTime.alchemicalWizardry.api.soulNetwork.SoulNetworkHandler;
@ -14,14 +13,13 @@ import net.minecraft.util.DamageSource;
import net.minecraft.util.EnumParticleTypes; import net.minecraft.util.EnumParticleTypes;
import net.minecraft.world.World; import net.minecraft.world.World;
public class EnergyItems extends Item implements IBindable public class BindableItems extends Item implements IBindable
{ {
private int energyUsed; private int energyUsed;
public EnergyItems() public BindableItems()
{ {
super(); super();
setCreativeTab(AlchemicalWizardry.tabBloodMagic);
} }
protected void setEnergyUsed(int par1int) protected void setEnergyUsed(int par1int)

18
src/main/java/WayofTime/alchemicalWizardry/common/items/BlankSpell.java
View file

@ -2,6 +2,7 @@ package WayofTime.alchemicalWizardry.common.items;
import java.util.List; import java.util.List;
import WayofTime.alchemicalWizardry.common.tileEntity.TESpellTable;
import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagCompound;
@ -10,16 +11,13 @@ import net.minecraft.util.BlockPos;
import net.minecraft.util.StatCollector; import net.minecraft.util.StatCollector;
import net.minecraft.world.World; import net.minecraft.world.World;
import net.minecraftforge.common.DimensionManager; 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() public BlankSpell()
{ {
super(); super();
this.setMaxStackSize(1); this.setMaxStackSize(1);
setCreativeTab(AlchemicalWizardry.tabBloodMagic);
} }
@Override @Override
@ -44,7 +42,7 @@ public class BlankSpell extends EnergyItems
@Override @Override
public ItemStack onItemRightClick(ItemStack stack, World world, EntityPlayer player) 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; return stack;
} }
@ -58,15 +56,15 @@ public class BlankSpell extends EnergyItems
NBTTagCompound itemTag = stack.getTagCompound(); NBTTagCompound itemTag = stack.getTagCompound();
TileEntity tileEntity = newWorld.getTileEntity(new BlockPos(itemTag.getInteger("xCoord"), itemTag.getInteger("yCoord"), itemTag.getInteger("zCoord"))); 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 } else
{ {

7
src/main/java/WayofTime/alchemicalWizardry/common/items/BloodShard.java
View file

@ -4,7 +4,6 @@ import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.Item; import net.minecraft.item.Item;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
import net.minecraft.world.World; import net.minecraft.world.World;
import WayofTime.alchemicalWizardry.AlchemicalWizardry;
import WayofTime.alchemicalWizardry.ModItems; import WayofTime.alchemicalWizardry.ModItems;
import WayofTime.alchemicalWizardry.api.items.interfaces.ArmourUpgrade; import WayofTime.alchemicalWizardry.api.items.interfaces.ArmourUpgrade;
@ -13,8 +12,6 @@ public class BloodShard extends Item implements ArmourUpgrade
public BloodShard() public BloodShard()
{ {
super(); super();
this.maxStackSize = 64;
setCreativeTab(AlchemicalWizardry.tabBloodMagic);
} }
public int getBloodShardLevel() public int getBloodShardLevel()
@ -31,9 +28,7 @@ public class BloodShard extends Item implements ArmourUpgrade
} }
@Override @Override
public void onArmourUpdate(World world, EntityPlayer player, ItemStack thisItemStack) public void onArmourUpdate(World world, EntityPlayer player, ItemStack thisItemStack) {}
{
}
@Override @Override
public boolean isUpgrade() public boolean isUpgrade()

12
src/main/java/WayofTime/alchemicalWizardry/common/items/BoundAxe.java
View file

@ -33,10 +33,9 @@ public class BoundAxe extends ItemAxe implements IBindable
public BoundAxe() public BoundAxe()
{ {
super(AlchemicalWizardry.bloodBoundToolMaterial); super(AlchemicalWizardry.bloodBoundToolMaterial);
this.maxStackSize = 1; setMaxStackSize(1);
this.efficiencyOnProperMaterial = 12.0F; this.efficiencyOnProperMaterial = 12.0F;
this.damageVsEntity = 5; this.damageVsEntity = 5;
setCreativeTab(AlchemicalWizardry.tabBloodMagic);
setEnergyUsed(5); setEnergyUsed(5);
} }
@ -75,7 +74,7 @@ public class BoundAxe extends ItemAxe implements IBindable
@Override @Override
public ItemStack onItemRightClick(ItemStack par1ItemStack, World world, EntityPlayer par3EntityPlayer) 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)); this.setActivated(par1ItemStack, !getActivated(par1ItemStack));
par1ItemStack.getTagCompound().setInteger("worldTimeDelay", (int) (world.getWorldTime() - 1) % 200); par1ItemStack.getTagCompound().setInteger("worldTimeDelay", (int) (world.getWorldTime() - 1) % 200);
@ -97,7 +96,7 @@ public class BoundAxe extends ItemAxe implements IBindable
return par1ItemStack; return par1ItemStack;
} }
if(!EnergyItems.syphonBatteries(par1ItemStack, par3EntityPlayer, 10000)) if(!BindableItems.syphonBatteries(par1ItemStack, par3EntityPlayer, 10000))
{ {
return par1ItemStack; return par1ItemStack;
} }
@ -168,7 +167,7 @@ public class BoundAxe extends ItemAxe implements IBindable
{ {
if (!par3EntityPlayer.capabilities.isCreativeMode) if (!par3EntityPlayer.capabilities.isCreativeMode)
{ {
if(!EnergyItems.syphonBatteries(par1ItemStack, par3EntityPlayer, 20)) if(!BindableItems.syphonBatteries(par1ItemStack, par3EntityPlayer, 20))
{ {
this.setActivated(par1ItemStack, false); this.setActivated(par1ItemStack, false);
} }
@ -203,6 +202,7 @@ public class BoundAxe extends ItemAxe implements IBindable
return super.getStrVsBlock(par1ItemStack, par2Block); 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 * Current implementations of this method in child classes do not use the entry argument beside ev. They just raise
* the damage on the stack. * the damage on the stack.
@ -217,8 +217,8 @@ public class BoundAxe extends ItemAxe implements IBindable
return true; return true;
} }
@Override
@SideOnly(Side.CLIENT) @SideOnly(Side.CLIENT)
/** /**
* Returns True is the item is renderer in full 3D when hold. * Returns True is the item is renderer in full 3D when hold.
*/ */

9
src/main/java/WayofTime/alchemicalWizardry/common/items/BoundBlade.java
View file

@ -26,8 +26,7 @@ public class BoundBlade extends ItemSword
public BoundBlade() public BoundBlade()
{ {
super(AlchemicalWizardry.bloodBoundToolMaterial); super(AlchemicalWizardry.bloodBoundToolMaterial);
this.maxStackSize = 1; setMaxStackSize(1);
setCreativeTab(AlchemicalWizardry.tabBloodMagic);
setEnergyUsed(50); setEnergyUsed(50);
setFull3D(); setFull3D();
setMaxDamage(100); setMaxDamage(100);
@ -72,7 +71,7 @@ public class BoundBlade extends ItemSword
{ {
if (par3EntityLivingBase instanceof EntityPlayer) 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; return false;
} }
@ -85,7 +84,7 @@ public class BoundBlade extends ItemSword
@Override @Override
public ItemStack onItemRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer) 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)); this.setActivated(par1ItemStack, !getActivated(par1ItemStack));
par1ItemStack.getTagCompound().setInteger("worldTimeDelay", (int) (par2World.getWorldTime() - 1) % 100); par1ItemStack.getTagCompound().setInteger("worldTimeDelay", (int) (par2World.getWorldTime() - 1) % 100);
@ -125,7 +124,7 @@ public class BoundBlade extends ItemSword
{ {
if (!par3EntityPlayer.capabilities.isCreativeMode) if (!par3EntityPlayer.capabilities.isCreativeMode)
{ {
if(!EnergyItems.syphonBatteries(par1ItemStack, par3EntityPlayer, 50)) if(!BindableItems.syphonBatteries(par1ItemStack, par3EntityPlayer, 50))
{ {
this.setActivated(par1ItemStack, false); this.setActivated(par1ItemStack, false);
} }

9
src/main/java/WayofTime/alchemicalWizardry/common/items/BoundPickaxe.java
View file

@ -35,10 +35,9 @@ public class BoundPickaxe extends ItemPickaxe implements IBindable
public BoundPickaxe() public BoundPickaxe()
{ {
super(AlchemicalWizardry.bloodBoundToolMaterial); super(AlchemicalWizardry.bloodBoundToolMaterial);
this.maxStackSize = 1; setMaxStackSize(1);
this.efficiencyOnProperMaterial = 12.0F; this.efficiencyOnProperMaterial = 12.0F;
this.damageVsEntity = 5; this.damageVsEntity = 5;
setCreativeTab(AlchemicalWizardry.tabBloodMagic);
this.setEnergyUsed(5); this.setEnergyUsed(5);
} }
@ -78,7 +77,7 @@ public class BoundPickaxe extends ItemPickaxe implements IBindable
@Override @Override
public ItemStack onItemRightClick(ItemStack stack, World world, EntityPlayer par3EntityPlayer) 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)); this.setActivated(stack, !getActivated(stack));
stack.getTagCompound().setInteger("worldTimeDelay", (int) (world.getWorldTime() - 1) % 200); stack.getTagCompound().setInteger("worldTimeDelay", (int) (world.getWorldTime() - 1) % 200);
@ -100,7 +99,7 @@ public class BoundPickaxe extends ItemPickaxe implements IBindable
return stack; return stack;
} }
if(!EnergyItems.syphonBatteries(stack, par3EntityPlayer, 10000)) if(!BindableItems.syphonBatteries(stack, par3EntityPlayer, 10000))
{ {
return stack; return stack;
} }
@ -192,7 +191,7 @@ public class BoundPickaxe extends ItemPickaxe implements IBindable
{ {
if (!par3EntityPlayer.capabilities.isCreativeMode) if (!par3EntityPlayer.capabilities.isCreativeMode)
{ {
if(!EnergyItems.syphonBatteries(stack, par3EntityPlayer, 20)) if(!BindableItems.syphonBatteries(stack, par3EntityPlayer, 20))
{ {
this.setActivated(stack, false); this.setActivated(stack, false);
} }

9
src/main/java/WayofTime/alchemicalWizardry/common/items/BoundShovel.java
View file

@ -33,10 +33,9 @@ public class BoundShovel extends ItemSpade implements IBindable
public BoundShovel() public BoundShovel()
{ {
super(AlchemicalWizardry.bloodBoundToolMaterial); super(AlchemicalWizardry.bloodBoundToolMaterial);
this.maxStackSize = 1; setMaxStackSize(1);
this.efficiencyOnProperMaterial = 12.0F; this.efficiencyOnProperMaterial = 12.0F;
this.damageVsEntity = 5; this.damageVsEntity = 5;
setCreativeTab(AlchemicalWizardry.tabBloodMagic);
setEnergyUsed(5); setEnergyUsed(5);
} }
@ -75,7 +74,7 @@ public class BoundShovel extends ItemSpade implements IBindable
@Override @Override
public ItemStack onItemRightClick(ItemStack stack, World world, EntityPlayer par3EntityPlayer) 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)); this.setActivated(stack, !getActivated(stack));
stack.getTagCompound().setInteger("worldTimeDelay", (int) (world.getWorldTime() - 1) % 200); stack.getTagCompound().setInteger("worldTimeDelay", (int) (world.getWorldTime() - 1) % 200);
@ -97,7 +96,7 @@ public class BoundShovel extends ItemSpade implements IBindable
return stack; return stack;
} }
if(!EnergyItems.syphonBatteries(stack, par3EntityPlayer, 10000)) if(!BindableItems.syphonBatteries(stack, par3EntityPlayer, 10000))
{ {
return stack; return stack;
} }
@ -168,7 +167,7 @@ public class BoundShovel extends ItemSpade implements IBindable
{ {
if (!par3EntityPlayer.capabilities.isCreativeMode) if (!par3EntityPlayer.capabilities.isCreativeMode)
{ {
if(!EnergyItems.syphonBatteries(par1ItemStack, par3EntityPlayer, 20)) if(!BindableItems.syphonBatteries(par1ItemStack, par3EntityPlayer, 20))
{ {
this.setActivated(par1ItemStack, false); this.setActivated(par1ItemStack, false);
} }

2
src/main/java/WayofTime/alchemicalWizardry/common/items/CreativeDagger.java
View file

@ -11,7 +11,6 @@ import net.minecraft.util.EnumParticleTypes;
import net.minecraft.world.World; import net.minecraft.world.World;
import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.common.MinecraftForge;
import net.minecraftforge.common.util.FakePlayer; import net.minecraftforge.common.util.FakePlayer;
import WayofTime.alchemicalWizardry.AlchemicalWizardry;
import WayofTime.alchemicalWizardry.api.event.SacrificeKnifeUsedEvent; import WayofTime.alchemicalWizardry.api.event.SacrificeKnifeUsedEvent;
import WayofTime.alchemicalWizardry.api.sacrifice.PlayerSacrificeHandler; import WayofTime.alchemicalWizardry.api.sacrifice.PlayerSacrificeHandler;
import WayofTime.alchemicalWizardry.api.tile.IBloodAltar; import WayofTime.alchemicalWizardry.api.tile.IBloodAltar;
@ -23,7 +22,6 @@ public class CreativeDagger extends Item
{ {
super(); super();
setMaxStackSize(1); setMaxStackSize(1);
setCreativeTab(AlchemicalWizardry.tabBloodMagic);
setFull3D(); setFull3D();
} }

59
src/main/java/WayofTime/alchemicalWizardry/common/items/CheatyItem.java → src/main/java/WayofTime/alchemicalWizardry/common/items/CreativeOrb.java
View file

@ -11,19 +11,17 @@ import net.minecraft.util.EnumParticleTypes;
import net.minecraft.util.StatCollector; import net.minecraft.util.StatCollector;
import net.minecraft.world.World; import net.minecraft.world.World;
import net.minecraftforge.common.util.FakePlayer; import net.minecraftforge.common.util.FakePlayer;
import WayofTime.alchemicalWizardry.AlchemicalWizardry;
import WayofTime.alchemicalWizardry.api.items.interfaces.IBindable; import WayofTime.alchemicalWizardry.api.items.interfaces.IBindable;
import WayofTime.alchemicalWizardry.api.soulNetwork.LifeEssenceNetwork; import WayofTime.alchemicalWizardry.api.soulNetwork.LifeEssenceNetwork;
import WayofTime.alchemicalWizardry.api.soulNetwork.SoulNetworkHandler; import WayofTime.alchemicalWizardry.api.soulNetwork.SoulNetworkHandler;
import WayofTime.alchemicalWizardry.common.spell.complex.effect.SpellHelper; 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(); super();
setMaxStackSize(1); setMaxStackSize(1);
setCreativeTab(AlchemicalWizardry.tabBloodMagic);
} }
@Override @Override
@ -43,7 +41,7 @@ public class CheatyItem extends Item implements IBindable
{ {
World world = par3EntityPlayer.worldObj; World world = par3EntityPlayer.worldObj;
if (!EnergyItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer) || par3EntityPlayer instanceof FakePlayer) if (!BindableItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer) || par3EntityPlayer instanceof FakePlayer)
{ {
return par1ItemStack; return par1ItemStack;
} }
@ -79,54 +77,6 @@ public class CheatyItem extends Item implements IBindable
return par1ItemStack; 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 @Override
public ItemStack getContainerItem(ItemStack itemStack) public ItemStack getContainerItem(ItemStack itemStack)
{ {
@ -163,7 +113,6 @@ public class CheatyItem extends Item implements IBindable
worldSave.setItemData(owner, data); worldSave.setItemData(owner, data);
} }
int currentEssence = data.currentEssence; return data.currentEssence;
return (currentEssence);
} }
} }

10
src/main/java/WayofTime/alchemicalWizardry/common/items/DaggerOfSacrifice.java
View file

@ -21,7 +21,6 @@ import net.minecraft.util.BlockPos;
import net.minecraft.util.DamageSource; import net.minecraft.util.DamageSource;
import net.minecraft.util.StatCollector; import net.minecraft.util.StatCollector;
import net.minecraft.world.World; import net.minecraft.world.World;
import WayofTime.alchemicalWizardry.AlchemicalWizardry;
import WayofTime.alchemicalWizardry.api.tile.IBloodAltar; import WayofTime.alchemicalWizardry.api.tile.IBloodAltar;
import WayofTime.alchemicalWizardry.common.IDemon; import WayofTime.alchemicalWizardry.common.IDemon;
import WayofTime.alchemicalWizardry.common.demonVillage.demonHoard.demon.IHoardDemon; 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; import com.google.common.collect.Multimap;
public class DaggerOfSacrifice extends EnergyItems public class DaggerOfSacrifice extends BindableItems
{ {
public DaggerOfSacrifice() public DaggerOfSacrifice()
{ {
super(); super();
this.maxStackSize = 1; setMaxStackSize(1);
setCreativeTab(AlchemicalWizardry.tabBloodMagic);
setEnergyUsed(100); setEnergyUsed(100);
setFull3D(); setFull3D();
setMaxDamage(100); setMaxDamage(100);
@ -128,9 +126,9 @@ public class DaggerOfSacrifice extends EnergyItems
} }
@Override @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)); multimap.put(SharedMonsterAttributes.attackDamage.getAttributeUnlocalizedName(), new AttributeModifier(new UUID(4186465, 46565), "Tool modifier", 1.0d, 0));
return multimap; return multimap;
} }

1
src/main/java/WayofTime/alchemicalWizardry/common/items/DawnScribeTool.java
View file

@ -1,6 +1,5 @@
package WayofTime.alchemicalWizardry.common.items; package WayofTime.alchemicalWizardry.common.items;
public class DawnScribeTool extends ScribeTool public class DawnScribeTool extends ScribeTool
{ {
public DawnScribeTool() public DawnScribeTool()

14
src/main/java/WayofTime/alchemicalWizardry/common/items/DemonPlacer.java → src/main/java/WayofTime/alchemicalWizardry/common/items/DemonCrystal.java
View file

@ -20,14 +20,14 @@ import net.minecraft.world.World;
import WayofTime.alchemicalWizardry.api.summoningRegistry.SummoningRegistry; import WayofTime.alchemicalWizardry.api.summoningRegistry.SummoningRegistry;
import WayofTime.alchemicalWizardry.common.entity.mob.EntityDemon; import WayofTime.alchemicalWizardry.common.entity.mob.EntityDemon;
public class DemonPlacer extends Item public class DemonCrystal extends Item
{ {
public DemonPlacer() public DemonCrystal()
{ {
super(); super();
this.setHasSubtypes(true); this.setHasSubtypes(true);
this.setCreativeTab(CreativeTabs.tabMisc); this.setCreativeTab(CreativeTabs.tabMisc);
this.maxStackSize = 1; setMaxStackSize(1);
} }
/** /**
@ -56,7 +56,7 @@ public class DemonPlacer extends Item
d0 = 0.5D; 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); Entity entity = spawnCreature(world, demonName, (double)pos.getX() + 0.5D, (double)pos.getY() + d0, (double)pos.getZ() + 0.5D, stack);
if (entity != null) if (entity != null)
@ -88,7 +88,7 @@ public class DemonPlacer extends Item
{ {
entity = SummoningRegistry.getEntityWithID(par0World, par1); entity = SummoningRegistry.getEntityWithID(par0World, par1);
if (entity != null && entity instanceof EntityLivingBase) if (entity != null)
{ {
EntityLiving entityliving = (EntityLiving) entity; EntityLiving entityliving = (EntityLiving) entity;
entity.setLocationAndAngles(par2, par4, par6, MathHelper.wrapAngleTo180_float(par0World.rand.nextFloat() * 360.0F), 0.0F); 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; entityliving.renderYawOffset = entityliving.rotationYaw;
if (entityliving instanceof EntityDemon) 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); ((EntityDemon) entityliving).setTamed(true);
} }

1
src/main/java/WayofTime/alchemicalWizardry/common/items/DuskScribeTool.java
View file

@ -1,6 +1,5 @@
package WayofTime.alchemicalWizardry.common.items; package WayofTime.alchemicalWizardry.common.items;
public class DuskScribeTool extends ScribeTool public class DuskScribeTool extends ScribeTool
{ {
public DuskScribeTool() public DuskScribeTool()

1
src/main/java/WayofTime/alchemicalWizardry/common/items/EarthScribeTool.java
View file

@ -1,6 +1,5 @@
package WayofTime.alchemicalWizardry.common.items; package WayofTime.alchemicalWizardry.common.items;
public class EarthScribeTool extends ScribeTool public class EarthScribeTool extends ScribeTool
{ {
public EarthScribeTool() public EarthScribeTool()

8
src/main/java/WayofTime/alchemicalWizardry/common/items/EnergyBazooka.java
View file

@ -9,10 +9,9 @@ import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.util.StatCollector; import net.minecraft.util.StatCollector;
import net.minecraft.util.Vec3; import net.minecraft.util.Vec3;
import net.minecraft.world.World; import net.minecraft.world.World;
import WayofTime.alchemicalWizardry.AlchemicalWizardry;
import WayofTime.alchemicalWizardry.common.entity.projectile.EntityEnergyBazookaMainProjectile; import WayofTime.alchemicalWizardry.common.entity.projectile.EntityEnergyBazookaMainProjectile;
public class EnergyBazooka extends EnergyItems public class EnergyBazooka extends BindableItems
{ {
private int damage; private int damage;
@ -20,7 +19,6 @@ public class EnergyBazooka extends EnergyItems
{ {
super(); super();
setMaxStackSize(1); setMaxStackSize(1);
setCreativeTab(AlchemicalWizardry.tabBloodMagic);
setFull3D(); setFull3D();
setMaxDamage(250); setMaxDamage(250);
this.setEnergyUsed(20000); this.setEnergyUsed(20000);
@ -32,7 +30,7 @@ public class EnergyBazooka extends EnergyItems
{ {
final int maxDelay = 150; final int maxDelay = 150;
if (!EnergyItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer) || par3EntityPlayer.isSneaking()) if (!BindableItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer) || par3EntityPlayer.isSneaking())
{ {
this.setActivated(par1ItemStack, !getActivated(par1ItemStack)); this.setActivated(par1ItemStack, !getActivated(par1ItemStack));
par1ItemStack.getTagCompound().setInteger("worldTimeDelay", (int) (par2World.getWorldTime() - 1) % 100); par1ItemStack.getTagCompound().setInteger("worldTimeDelay", (int) (par2World.getWorldTime() - 1) % 100);
@ -100,7 +98,7 @@ public class EnergyBazooka extends EnergyItems
{ {
if (!par3EntityPlayer.capabilities.isCreativeMode) if (!par3EntityPlayer.capabilities.isCreativeMode)
{ {
if(!EnergyItems.syphonBatteries(par1ItemStack, par3EntityPlayer, 50)) if(!BindableItems.syphonBatteries(par1ItemStack, par3EntityPlayer, 50))
{ {
this.setActivated(par1ItemStack, false); this.setActivated(par1ItemStack, false);
} }

11
src/main/java/WayofTime/alchemicalWizardry/common/items/EnergyBlast.java → src/main/java/WayofTime/alchemicalWizardry/common/items/EnergyBlaster.java
View file

@ -8,19 +8,16 @@ import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.util.StatCollector; import net.minecraft.util.StatCollector;
import net.minecraft.world.World; import net.minecraft.world.World;
import WayofTime.alchemicalWizardry.AlchemicalWizardry;
import WayofTime.alchemicalWizardry.common.entity.projectile.EnergyBlastProjectile; import WayofTime.alchemicalWizardry.common.entity.projectile.EnergyBlastProjectile;
public class EnergyBlast extends EnergyItems public class EnergyBlaster extends BindableItems
{ {
private int damage; private int damage;
public EnergyBlast() public EnergyBlaster()
{ {
super(); super();
setMaxStackSize(1); setMaxStackSize(1);
setCreativeTab(AlchemicalWizardry.tabBloodMagic);
setUnlocalizedName("energyBlaster");
setFull3D(); setFull3D();
setMaxDamage(250); setMaxDamage(250);
this.setEnergyUsed(150); this.setEnergyUsed(150);
@ -32,7 +29,7 @@ public class EnergyBlast extends EnergyItems
{ {
final int maxDelay = 15; final int maxDelay = 15;
if (!EnergyItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer) || par3EntityPlayer.isSneaking()) if (!BindableItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer) || par3EntityPlayer.isSneaking())
{ {
this.setActivated(par1ItemStack, !getActivated(par1ItemStack)); this.setActivated(par1ItemStack, !getActivated(par1ItemStack));
par1ItemStack.getTagCompound().setInteger("worldTimeDelay", (int) (par2World.getWorldTime() - 1) % 100); par1ItemStack.getTagCompound().setInteger("worldTimeDelay", (int) (par2World.getWorldTime() - 1) % 100);
@ -92,7 +89,7 @@ public class EnergyBlast extends EnergyItems
{ {
if (!par3EntityPlayer.capabilities.isCreativeMode) if (!par3EntityPlayer.capabilities.isCreativeMode)
{ {
if(!EnergyItems.syphonBatteries(par1ItemStack, par3EntityPlayer, 50)) if(!BindableItems.syphonBatteries(par1ItemStack, par3EntityPlayer, 50))
{ {
this.setActivated(par1ItemStack, false); this.setActivated(par1ItemStack, false);
} }

1
src/main/java/WayofTime/alchemicalWizardry/common/items/FireScribeTool.java
View file

@ -1,6 +1,5 @@
package WayofTime.alchemicalWizardry.common.items; package WayofTime.alchemicalWizardry.common.items;
public class FireScribeTool extends ScribeTool public class FireScribeTool extends ScribeTool
{ {
public FireScribeTool() public FireScribeTool()

7
src/main/java/WayofTime/alchemicalWizardry/common/items/ItemAlchemyBase.java
View file

@ -15,18 +15,15 @@ import net.minecraftforge.fml.relauncher.SideOnly;
import org.lwjgl.input.Keyboard; import org.lwjgl.input.Keyboard;
import WayofTime.alchemicalWizardry.AlchemicalWizardry;
import WayofTime.alchemicalWizardry.api.alchemy.AlchemyRecipeRegistry; import WayofTime.alchemicalWizardry.api.alchemy.AlchemyRecipeRegistry;
public class ItemAlchemyBase extends Item 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() public ItemAlchemyBase()
{ {
super(); super();
this.maxStackSize = 64;
this.setCreativeTab(AlchemicalWizardry.tabBloodMagic);
this.hasSubtypes = true; this.hasSubtypes = true;
} }
@ -67,7 +64,7 @@ public class ItemAlchemyBase extends Item
public String getUnlocalizedName(ItemStack itemStack) public String getUnlocalizedName(ItemStack itemStack)
{ {
int meta = MathHelper.clamp_int(itemStack.getItemDamage(), 0, ITEM_NAMES.length - 1); int meta = MathHelper.clamp_int(itemStack.getItemDamage(), 0, ITEM_NAMES.length - 1);
return ("" + "item.bloodMagicAlchemyItem." + ITEM_NAMES[meta]); return (getUnlocalizedName() + "." + ITEM_NAMES[meta]);
} }
@Override @Override

1
src/main/java/WayofTime/alchemicalWizardry/common/items/ItemBlockCrystalBelljar.java
View file

@ -27,6 +27,7 @@ public class ItemBlockCrystalBelljar extends ItemBlock
this.setMaxStackSize(16); this.setMaxStackSize(16);
} }
@Override
public int getMetadata(int par1) public int getMetadata(int par1)
{ {
return par1; return par1;

7
src/main/java/WayofTime/alchemicalWizardry/common/items/ItemBloodLetterPack.java
View file

@ -12,7 +12,6 @@ import net.minecraft.util.BlockPos;
import net.minecraft.util.MovingObjectPosition; import net.minecraft.util.MovingObjectPosition;
import net.minecraft.util.StatCollector; import net.minecraft.util.StatCollector;
import net.minecraft.world.World; import net.minecraft.world.World;
import WayofTime.alchemicalWizardry.AlchemicalWizardry;
import WayofTime.alchemicalWizardry.api.items.IAltarManipulator; import WayofTime.alchemicalWizardry.api.items.IAltarManipulator;
import WayofTime.alchemicalWizardry.api.items.interfaces.ArmourUpgrade; import WayofTime.alchemicalWizardry.api.items.interfaces.ArmourUpgrade;
import WayofTime.alchemicalWizardry.api.soulNetwork.SoulNetworkHandler; import WayofTime.alchemicalWizardry.api.soulNetwork.SoulNetworkHandler;
@ -28,7 +27,6 @@ public class ItemBloodLetterPack extends ItemArmor implements ArmourUpgrade, IAl
public ItemBloodLetterPack() public ItemBloodLetterPack()
{ {
super(ArmorMaterial.CHAIN, 0, 1); super(ArmorMaterial.CHAIN, 0, 1);
setCreativeTab(AlchemicalWizardry.tabBloodMagic);
} }
@Override @Override
@ -140,10 +138,7 @@ public class ItemBloodLetterPack extends ItemArmor implements ArmourUpgrade, IAl
} }
@Override @Override
public void onArmourUpdate(World world, EntityPlayer player, ItemStack thisItemStack) public void onArmourUpdate(World world, EntityPlayer player, ItemStack thisItemStack) {}
{
}
@Override @Override
public boolean isUpgrade() public boolean isUpgrade()

7
src/main/java/WayofTime/alchemicalWizardry/common/items/ItemBloodRuneBlock.java
View file

@ -10,9 +10,9 @@ public class ItemBloodRuneBlock extends ItemBlock
{ {
super(block); super(block);
setHasSubtypes(true); setHasSubtypes(true);
} }
@Override
public String getUnlocalizedName(ItemStack itemstack) public String getUnlocalizedName(ItemStack itemstack)
{ {
String name; String name;
@ -20,16 +20,12 @@ public class ItemBloodRuneBlock extends ItemBlock
switch (itemstack.getItemDamage()) switch (itemstack.getItemDamage())
{ {
case 0: case 0:
{
name = "blank"; name = "blank";
break; break;
}
case 1: case 1:
{
name = "fill"; name = "fill";
break; break;
}
case 2: case 2:
name = "empty"; name = "empty";
@ -54,6 +50,7 @@ public class ItemBloodRuneBlock extends ItemBlock
return getUnlocalizedName() + "." + name; return getUnlocalizedName() + "." + name;
} }
@Override
public int getMetadata(int par1) public int getMetadata(int par1)
{ {

8
src/main/java/WayofTime/alchemicalWizardry/common/items/ItemComplexSpellCrystal.java
View file

@ -10,16 +10,14 @@ import net.minecraft.util.BlockPos;
import net.minecraft.util.StatCollector; import net.minecraft.util.StatCollector;
import net.minecraft.world.World; import net.minecraft.world.World;
import net.minecraftforge.common.DimensionManager; import net.minecraftforge.common.DimensionManager;
import WayofTime.alchemicalWizardry.AlchemicalWizardry;
import WayofTime.alchemicalWizardry.common.tileEntity.TESpellParadigmBlock; import WayofTime.alchemicalWizardry.common.tileEntity.TESpellParadigmBlock;
public class ItemComplexSpellCrystal extends EnergyItems public class ItemComplexSpellCrystal extends BindableItems
{ {
public ItemComplexSpellCrystal() public ItemComplexSpellCrystal()
{ {
super(); super();
this.setMaxStackSize(1); setMaxStackSize(1);
setCreativeTab(AlchemicalWizardry.tabBloodMagic);
} }
@Override @Override
@ -44,7 +42,7 @@ public class ItemComplexSpellCrystal extends EnergyItems
@Override @Override
public ItemStack onItemRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer) 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; return par1ItemStack;
} }

7
src/main/java/WayofTime/alchemicalWizardry/common/items/ItemComponents.java
View file

@ -10,17 +10,14 @@ import net.minecraft.util.MathHelper;
import net.minecraft.world.World; import net.minecraft.world.World;
import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly; import net.minecraftforge.fml.relauncher.SideOnly;
import WayofTime.alchemicalWizardry.AlchemicalWizardry;
public class ItemComponents extends Item 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() public ItemComponents()
{ {
super(); super();
this.maxStackSize = 64;
this.setCreativeTab(AlchemicalWizardry.tabBloodMagic);
this.hasSubtypes = true; 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 //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); int meta = MathHelper.clamp_int(itemStack.getItemDamage(), 0, ITEM_NAMES.length - 1);
return ("" + "item.bloodMagicBaseItem." + ITEM_NAMES[meta]); return (getUnlocalizedName() + "." + ITEM_NAMES[meta]);
} }
@Override @Override

7
src/main/java/WayofTime/alchemicalWizardry/common/items/ItemCrystalBlock.java
View file

@ -10,9 +10,9 @@ public class ItemCrystalBlock extends ItemBlock
{ {
super(par1); super(par1);
setHasSubtypes(true); setHasSubtypes(true);
} }
@Override
public String getUnlocalizedName(ItemStack itemstack) public String getUnlocalizedName(ItemStack itemstack)
{ {
String name; String name;
@ -20,16 +20,12 @@ public class ItemCrystalBlock extends ItemBlock
switch (itemstack.getItemDamage()) switch (itemstack.getItemDamage())
{ {
case 0: case 0:
{
name = "fullCrystal"; name = "fullCrystal";
break; break;
}
case 1: case 1:
{
name = "crystalBrick"; name = "crystalBrick";
break; break;
}
default: default:
name = "broken"; name = "broken";
@ -38,6 +34,7 @@ public class ItemCrystalBlock extends ItemBlock
return getUnlocalizedName() + "." + name; return getUnlocalizedName() + "." + name;
} }
@Override
public int getMetadata(int par1) public int getMetadata(int par1)
{ {

16
src/main/java/WayofTime/alchemicalWizardry/common/items/ItemEnchantmentGlyphBlock.java
View file

@ -19,16 +19,16 @@ public class ItemEnchantmentGlyphBlock extends ItemBlock
switch (itemstack.getItemDamage()) switch (itemstack.getItemDamage())
{ {
case 0: case 0:
name = "enchantability"; name = "enchantability";
break; break;
case 1: case 1:
name = "enchantmentLevel"; name = "enchantmentLevel";
break; break;
default: default:
name = "broken"; name = "broken";
} }
return getUnlocalizedName() + "." + name; return getUnlocalizedName() + "." + name;

7
src/main/java/WayofTime/alchemicalWizardry/common/items/ItemIncense.java
View file

@ -14,20 +14,17 @@ import net.minecraftforge.fml.common.registry.GameRegistry;
import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly; import net.minecraftforge.fml.relauncher.SideOnly;
import net.minecraftforge.oredict.OreDictionary; import net.minecraftforge.oredict.OreDictionary;
import WayofTime.alchemicalWizardry.AlchemicalWizardry;
import WayofTime.alchemicalWizardry.ModItems; import WayofTime.alchemicalWizardry.ModItems;
import WayofTime.alchemicalWizardry.api.items.ShapelessBloodOrbRecipe; import WayofTime.alchemicalWizardry.api.items.ShapelessBloodOrbRecipe;
import WayofTime.alchemicalWizardry.api.sacrifice.IIncense; import WayofTime.alchemicalWizardry.api.sacrifice.IIncense;
public class ItemIncense extends Item implements 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() public ItemIncense()
{ {
super(); super();
this.maxStackSize = 64;
this.setCreativeTab(AlchemicalWizardry.tabBloodMagic);
this.hasSubtypes = true; this.hasSubtypes = true;
} }
@ -41,7 +38,7 @@ public class ItemIncense extends Item implements IIncense
public String getUnlocalizedName(ItemStack itemStack) public String getUnlocalizedName(ItemStack itemStack)
{ {
int meta = MathHelper.clamp_int(itemStack.getItemDamage(), 0, ITEM_NAMES.length - 1); int meta = MathHelper.clamp_int(itemStack.getItemDamage(), 0, ITEM_NAMES.length - 1);
return ("" + "item.bloodMagicIncenseItem." + ITEM_NAMES[meta]); return (getUnlocalizedName() + "." + ITEM_NAMES[meta]);
} }
@Override @Override

1
src/main/java/WayofTime/alchemicalWizardry/common/items/ItemMailOrderCatalogue.java
View file

@ -12,7 +12,6 @@ public class ItemMailOrderCatalogue extends Item
public ItemMailOrderCatalogue() public ItemMailOrderCatalogue()
{ {
super(); super();
this.setCreativeTab(AlchemicalWizardry.tabBloodMagic);
} }
@Override @Override

8
src/main/java/WayofTime/alchemicalWizardry/common/items/ItemRitualDismantler.java
View file

@ -9,20 +9,18 @@ import net.minecraft.util.BlockPos;
import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumFacing;
import net.minecraft.util.StatCollector; import net.minecraft.util.StatCollector;
import net.minecraft.world.World; import net.minecraft.world.World;
import WayofTime.alchemicalWizardry.AlchemicalWizardry;
import WayofTime.alchemicalWizardry.ModBlocks; import WayofTime.alchemicalWizardry.ModBlocks;
import WayofTime.alchemicalWizardry.api.rituals.RitualComponent; import WayofTime.alchemicalWizardry.api.rituals.RitualComponent;
import WayofTime.alchemicalWizardry.api.rituals.Rituals; import WayofTime.alchemicalWizardry.api.rituals.Rituals;
import WayofTime.alchemicalWizardry.common.block.BlockRitualStone; import WayofTime.alchemicalWizardry.common.block.BlockRitualStone;
import WayofTime.alchemicalWizardry.common.tileEntity.TEMasterStone; import WayofTime.alchemicalWizardry.common.tileEntity.TEMasterStone;
public class ItemRitualDismantler extends EnergyItems public class ItemRitualDismantler extends BindableItems
{ {
public ItemRitualDismantler() public ItemRitualDismantler()
{ {
super(); super();
setMaxStackSize(1); setMaxStackSize(1);
setCreativeTab(AlchemicalWizardry.tabBloodMagic);
} }
@Override @Override
@ -36,7 +34,7 @@ public class ItemRitualDismantler extends EnergyItems
@Override @Override
public boolean onItemUse(ItemStack stack, EntityPlayer player, World world, BlockPos pos, EnumFacing side, float hitX, float hitY, float hitZ) 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) public boolean breakRitualStoneAtMasterStone(ItemStack stack, EntityPlayer player, World world, BlockPos pos)
@ -72,7 +70,7 @@ public class ItemRitualDismantler extends EnergyItems
{ {
if (freeSpace >= 0) if (freeSpace >= 0)
{ {
if (EnergyItems.syphonBatteries(stack, player, getEnergyUsed()) || player.capabilities.isCreativeMode) if (BindableItems.syphonBatteries(stack, player, getEnergyUsed()) || player.capabilities.isCreativeMode)
{ {
world.setBlockToAir(newPos); world.setBlockToAir(newPos);
player.inventory.addItemStackToInventory(new ItemStack(ModBlocks.ritualStone)); player.inventory.addItemStackToInventory(new ItemStack(ModBlocks.ritualStone));

18
src/main/java/WayofTime/alchemicalWizardry/common/items/ItemRitualDiviner.java
View file

@ -24,7 +24,6 @@ import net.minecraftforge.fml.relauncher.SideOnly;
import org.lwjgl.input.Keyboard; import org.lwjgl.input.Keyboard;
import WayofTime.alchemicalWizardry.AlchemicalWizardry;
import WayofTime.alchemicalWizardry.ModBlocks; import WayofTime.alchemicalWizardry.ModBlocks;
import WayofTime.alchemicalWizardry.api.Int3; import WayofTime.alchemicalWizardry.api.Int3;
import WayofTime.alchemicalWizardry.api.items.interfaces.IRitualDiviner; 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.api.rituals.Rituals;
import WayofTime.alchemicalWizardry.common.tileEntity.TEMasterStone; import WayofTime.alchemicalWizardry.common.tileEntity.TEMasterStone;
public class ItemRitualDiviner extends EnergyItems implements IRitualDiviner public class ItemRitualDiviner extends BindableItems implements IRitualDiviner
{ {
private int maxMetaData; private int maxMetaData;
public ItemRitualDiviner() public ItemRitualDiviner()
{ {
super(); super();
this.maxStackSize = 1; setMaxStackSize(1);
setEnergyUsed(100); setEnergyUsed(100);
this.setCreativeTab(AlchemicalWizardry.tabBloodMagic); setMaxDamage(4);
this.maxMetaData = 4;
this.hasSubtypes = true; this.hasSubtypes = true;
} }
@ -163,7 +161,7 @@ public class ItemRitualDiviner extends EnergyItems implements IRitualDiviner
@Override @Override
public boolean onItemUse(ItemStack stack, EntityPlayer player, World world, BlockPos pos, EnumFacing side, float hitX, float hitY, float hitZ) 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)) if(placeRitualStoneAtMasterStone(stack, player, world, pos))
{ {
@ -233,7 +231,7 @@ public class ItemRitualDiviner extends EnergyItems implements IRitualDiviner
player.inventory.decrStackSize(playerInvRitualStoneLocation, 1); 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); 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); int metadata = block.getMetaFromState(state);
if (metadata != rc.getStoneType()) if (metadata != rc.getStoneType())
{ {
if(EnergyItems.syphonBatteries(stack, player, getEnergyUsed())) if(BindableItems.syphonBatteries(stack, player, getEnergyUsed()))
{ {
if (rc.getStoneType() > this.maxMetaData + this.getMaxRuneDisplacement(stack)) if (rc.getStoneType() > this.maxMetaData + this.getMaxRuneDisplacement(stack))
{ {
@ -361,7 +359,7 @@ public class ItemRitualDiviner extends EnergyItems implements IRitualDiviner
@Override @Override
public ItemStack onItemRightClick(ItemStack stack, World par2World, EntityPlayer par3EntityPlayer) 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); rotateRituals(par2World,par3EntityPlayer, stack, true);
} }
@ -376,7 +374,7 @@ public class ItemRitualDiviner extends EnergyItems implements IRitualDiviner
{ {
EntityPlayer player = (EntityPlayer) entityLiving; EntityPlayer player = (EntityPlayer) entityLiving;
if (!EnergyItems.checkAndSetItemOwner(stack,player)) return true; if (!BindableItems.checkAndSetItemOwner(stack, player)) return true;
if (!player.isSwingInProgress) if (!player.isSwingInProgress)
{ {

6
src/main/java/WayofTime/alchemicalWizardry/common/items/ItemSpellEffectBlock.java
View file

@ -12,6 +12,7 @@ public class ItemSpellEffectBlock extends ItemBlock
setHasSubtypes(true); setHasSubtypes(true);
} }
@Override
public String getUnlocalizedName(ItemStack itemstack) public String getUnlocalizedName(ItemStack itemstack)
{ {
String name; String name;
@ -19,16 +20,12 @@ public class ItemSpellEffectBlock extends ItemBlock
switch (itemstack.getItemDamage()) switch (itemstack.getItemDamage())
{ {
case 0: case 0:
{
name = "fire"; name = "fire";
break; break;
}
case 1: case 1:
{
name = "ice"; name = "ice";
break; break;
}
case 2: case 2:
name = "wind"; name = "wind";
@ -45,6 +42,7 @@ public class ItemSpellEffectBlock extends ItemBlock
return getUnlocalizedName() + "." + name; return getUnlocalizedName() + "." + name;
} }
@Override
public int getMetadata(int par1) public int getMetadata(int par1)
{ {

3
src/main/java/WayofTime/alchemicalWizardry/common/items/ItemSpellEnhancementBlock.java
View file

@ -10,9 +10,9 @@ public class ItemSpellEnhancementBlock extends ItemBlock
{ {
super(par1); super(par1);
setHasSubtypes(true); setHasSubtypes(true);
} }
@Override
public String getUnlocalizedName(ItemStack itemstack) public String getUnlocalizedName(ItemStack itemstack)
{ {
String name; String name;
@ -86,6 +86,7 @@ public class ItemSpellEnhancementBlock extends ItemBlock
return getUnlocalizedName() + "." + name; return getUnlocalizedName() + "." + name;
} }
@Override
public int getMetadata(int par1) public int getMetadata(int par1)
{ {

7
src/main/java/WayofTime/alchemicalWizardry/common/items/ItemSpellModifierBlock.java
View file

@ -10,9 +10,9 @@ public class ItemSpellModifierBlock extends ItemBlock
{ {
super(par1); super(par1);
setHasSubtypes(true); setHasSubtypes(true);
} }
@Override
public String getUnlocalizedName(ItemStack itemstack) public String getUnlocalizedName(ItemStack itemstack)
{ {
String name; String name;
@ -20,16 +20,12 @@ public class ItemSpellModifierBlock extends ItemBlock
switch (itemstack.getItemDamage()) switch (itemstack.getItemDamage())
{ {
case 0: case 0:
{
name = "default"; name = "default";
break; break;
}
case 1: case 1:
{
name = "offensive"; name = "offensive";
break; break;
}
case 2: case 2:
name = "defensive"; name = "defensive";
@ -46,6 +42,7 @@ public class ItemSpellModifierBlock extends ItemBlock
return getUnlocalizedName() + "." + name; return getUnlocalizedName() + "." + name;
} }
@Override
public int getMetadata(int par1) public int getMetadata(int par1)
{ {

4
src/main/java/WayofTime/alchemicalWizardry/common/items/ItemSpellParadigmBlock.java
View file

@ -20,16 +20,12 @@ public class ItemSpellParadigmBlock extends ItemBlock
switch (itemstack.getItemDamage()) switch (itemstack.getItemDamage())
{ {
case 0: case 0:
{
name = "projectile"; name = "projectile";
break; break;
}
case 1: case 1:
{
name = "self"; name = "self";
break; break;
}
case 2: case 2:
name = "melee"; name = "melee";

10
src/main/java/WayofTime/alchemicalWizardry/common/items/ItemStabilityGlyphBlock.java
View file

@ -19,12 +19,12 @@ public class ItemStabilityGlyphBlock extends ItemBlock
switch (itemstack.getItemDamage()) switch (itemstack.getItemDamage())
{ {
case 0: case 0:
name = "stability1"; name = "stability1";
break; break;
default: default:
name = "broken"; name = "broken";
} }
return getUnlocalizedName() + "." + name; return getUnlocalizedName() + "." + name;

14
src/main/java/WayofTime/alchemicalWizardry/common/items/ItemDiabloKey.java → src/main/java/WayofTime/alchemicalWizardry/common/items/KeyOfBinding.java
View file

@ -13,18 +13,16 @@ import net.minecraft.world.World;
import net.minecraftforge.common.util.FakePlayer; import net.minecraftforge.common.util.FakePlayer;
import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly; import net.minecraftforge.fml.relauncher.SideOnly;
import WayofTime.alchemicalWizardry.AlchemicalWizardry;
import WayofTime.alchemicalWizardry.ModItems; import WayofTime.alchemicalWizardry.ModItems;
import WayofTime.alchemicalWizardry.api.items.interfaces.IBindable; import WayofTime.alchemicalWizardry.api.items.interfaces.IBindable;
import WayofTime.alchemicalWizardry.common.spell.complex.effect.SpellHelper; import WayofTime.alchemicalWizardry.common.spell.complex.effect.SpellHelper;
public class ItemDiabloKey extends EnergyItems public class KeyOfBinding extends BindableItems
{ {
public ItemDiabloKey() public KeyOfBinding()
{ {
super(); super();
setMaxStackSize(1); setMaxStackSize(1);
setCreativeTab(AlchemicalWizardry.tabBloodMagic);
this.setEnergyUsed(1000); this.setEnergyUsed(1000);
this.hasSubtypes = true; this.hasSubtypes = true;
} }
@ -42,7 +40,7 @@ public class ItemDiabloKey extends EnergyItems
public ItemStack onItemRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer) public ItemStack onItemRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer)
{ {
World world = par3EntityPlayer.worldObj; 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; return par1ItemStack;
} }
@ -85,14 +83,14 @@ public class ItemDiabloKey extends EnergyItems
Item item = itemStack.getItem(); Item item = itemStack.getItem();
if (item instanceof ItemDiabloKey) if (item instanceof KeyOfBinding)
{ {
continue; continue;
} }
if (item instanceof IBindable) 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)); list.add(new ItemStack(ModItems.itemKeyOfDiablo));
ItemStack boundKey = 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); list.add(boundKey);
} }
} }

21
src/main/java/WayofTime/alchemicalWizardry/common/items/LavaCrystal.java
View file

@ -7,17 +7,14 @@ import net.minecraft.item.ItemStack;
import net.minecraft.server.MinecraftServer; import net.minecraft.server.MinecraftServer;
import net.minecraft.util.StatCollector; import net.minecraft.util.StatCollector;
import net.minecraft.world.World; import net.minecraft.world.World;
import WayofTime.alchemicalWizardry.AlchemicalWizardry;
import WayofTime.alchemicalWizardry.api.soulNetwork.SoulNetworkHandler; import WayofTime.alchemicalWizardry.api.soulNetwork.SoulNetworkHandler;
public class LavaCrystal extends EnergyItems public class LavaCrystal extends BindableItems
{ {
public LavaCrystal() public LavaCrystal()
{ {
super(); super();
setMaxStackSize(1); setMaxStackSize(1);
setCreativeTab(AlchemicalWizardry.tabBloodMagic);
setUnlocalizedName("lavaCrystal");
setEnergyUsed(25); setEnergyUsed(25);
} }
@ -27,24 +24,22 @@ public class LavaCrystal extends EnergyItems
@Override @Override
public ItemStack getContainerItem(ItemStack itemStack) public ItemStack getContainerItem(ItemStack itemStack)
{ {
{ SoulNetworkHandler.syphonFromNetwork(itemStack, this.getEnergyUsed());
syphonWhileInContainer(itemStack, this.getEnergyUsed()); ItemStack copiedStack = itemStack.copy();
ItemStack copiedStack = itemStack.copy(); copiedStack.setItemDamage(copiedStack.getItemDamage());
copiedStack.setItemDamage(copiedStack.getItemDamage()); copiedStack.stackSize = 1;
copiedStack.stackSize = 1; return copiedStack;
return copiedStack;
}
} }
@Override @Override
public boolean hasContainerItem() public boolean hasContainerItem(ItemStack itemStack)
{ {
return true; return true;
} }
public ItemStack onItemRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer) public ItemStack onItemRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer)
{ {
EnergyItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer); BindableItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer);
return par1ItemStack; return par1ItemStack;
} }

3
src/main/java/WayofTime/alchemicalWizardry/common/items/MagicianBloodOrb.java
View file

@ -1,7 +1,6 @@
package WayofTime.alchemicalWizardry.common.items; package WayofTime.alchemicalWizardry.common.items;
public class MagicianBloodOrb extends Orb
public class MagicianBloodOrb extends EnergyBattery
{ {
public MagicianBloodOrb(int damage) public MagicianBloodOrb(int damage)
{ {

3
src/main/java/WayofTime/alchemicalWizardry/common/items/MasterBloodOrb.java
View file

@ -1,7 +1,6 @@
package WayofTime.alchemicalWizardry.common.items; package WayofTime.alchemicalWizardry.common.items;
public class MasterBloodOrb extends Orb
public class MasterBloodOrb extends EnergyBattery
{ {
public MasterBloodOrb(int damage) public MasterBloodOrb(int damage)
{ {

15
src/main/java/WayofTime/alchemicalWizardry/common/items/EnergyBattery.java → src/main/java/WayofTime/alchemicalWizardry/common/items/Orb.java
View file

@ -10,7 +10,6 @@ import net.minecraft.server.MinecraftServer;
import net.minecraft.util.EnumParticleTypes; import net.minecraft.util.EnumParticleTypes;
import net.minecraft.util.StatCollector; import net.minecraft.util.StatCollector;
import net.minecraft.world.World; import net.minecraft.world.World;
import WayofTime.alchemicalWizardry.AlchemicalWizardry;
import WayofTime.alchemicalWizardry.api.items.interfaces.ArmourUpgrade; import WayofTime.alchemicalWizardry.api.items.interfaces.ArmourUpgrade;
import WayofTime.alchemicalWizardry.api.items.interfaces.IBindable; import WayofTime.alchemicalWizardry.api.items.interfaces.IBindable;
import WayofTime.alchemicalWizardry.api.items.interfaces.IBloodOrb; 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.api.soulNetwork.SoulNetworkHandler;
import WayofTime.alchemicalWizardry.common.spell.complex.effect.SpellHelper; 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; private int maxEssence;
protected int orbLevel; protected int orbLevel;
public EnergyBattery(int damage) public Orb(int damage)
{ {
super(); super();
setMaxStackSize(1); setMaxStackSize(1);
setCreativeTab(AlchemicalWizardry.tabBloodMagic);
maxEssence = damage; maxEssence = damage;
orbLevel = 1; 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) public ItemStack onItemRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer)
{ {
if (!EnergyItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer)) if (!BindableItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer))
{ {
return par1ItemStack; return par1ItemStack;
} }
@ -82,7 +81,7 @@ public class EnergyBattery extends Item implements ArmourUpgrade, IBindable, IBl
} }
SoulNetworkHandler.addCurrentEssenceToMaximum(itemTag.getString("ownerName"), 200, this.getMaxEssence()); SoulNetworkHandler.addCurrentEssenceToMaximum(itemTag.getString("ownerName"), 200, this.getMaxEssence());
EnergyItems.hurtPlayer(par3EntityPlayer, 200); BindableItems.hurtPlayer(par3EntityPlayer, 200);
return par1ItemStack; return par1ItemStack;
} }
@ -145,9 +144,7 @@ public class EnergyBattery extends Item implements ArmourUpgrade, IBindable, IBl
} }
@Override @Override
public void onArmourUpdate(World world, EntityPlayer player, ItemStack thisItemStack) public void onArmourUpdate(World world, EntityPlayer player, ItemStack thisItemStack) {}
{
}
@Override @Override
public boolean isUpgrade() public boolean isUpgrade()

35
src/main/java/WayofTime/alchemicalWizardry/common/items/OrbOfTesting.java
View file

@ -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;
}
}

3
src/main/java/WayofTime/alchemicalWizardry/common/items/SacrificialDagger.java
View file

@ -29,8 +29,7 @@ public class SacrificialDagger extends Item
public SacrificialDagger() public SacrificialDagger()
{ {
super(); super();
this.maxStackSize = 1; setMaxStackSize(1);
setCreativeTab(AlchemicalWizardry.tabBloodMagic);
setFull3D(); setFull3D();
} }

6
src/main/java/WayofTime/alchemicalWizardry/common/items/ScribeTool.java
View file

@ -1,6 +1,5 @@
package WayofTime.alchemicalWizardry.common.items; package WayofTime.alchemicalWizardry.common.items;
import WayofTime.alchemicalWizardry.AlchemicalWizardry;
import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
import net.minecraft.util.StatCollector; import net.minecraft.util.StatCollector;
@ -8,7 +7,7 @@ import net.minecraft.world.World;
import java.util.List; import java.util.List;
public class ScribeTool extends EnergyItems public class ScribeTool extends BindableItems
{ {
private int meta; private int meta;
@ -16,7 +15,6 @@ public class ScribeTool extends EnergyItems
{ {
super(); super();
setMaxStackSize(1); setMaxStackSize(1);
setCreativeTab(AlchemicalWizardry.tabBloodMagic);
setMaxDamage(10); setMaxDamage(10);
setEnergyUsed(10); setEnergyUsed(10);
this.meta = inkType; this.meta = inkType;
@ -36,7 +34,7 @@ public class ScribeTool extends EnergyItems
@Override @Override
public ItemStack onItemRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer) public ItemStack onItemRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer)
{ {
if (EnergyItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer)) if (BindableItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer))
{ {
if (par1ItemStack.getItemDamage() > 0) if (par1ItemStack.getItemDamage() > 0)
{ {

4
src/main/java/WayofTime/alchemicalWizardry/common/items/TelepositionFocus.java
View file

@ -11,7 +11,7 @@ import net.minecraft.world.World;
import net.minecraftforge.common.DimensionManager; import net.minecraftforge.common.DimensionManager;
import WayofTime.alchemicalWizardry.AlchemicalWizardry; import WayofTime.alchemicalWizardry.AlchemicalWizardry;
public class TelepositionFocus extends EnergyItems public class TelepositionFocus extends BindableItems
{ {
private int focusLevel; private int focusLevel;
@ -45,7 +45,7 @@ public class TelepositionFocus extends EnergyItems
@Override @Override
public ItemStack onItemRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer) public ItemStack onItemRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer)
{ {
if (EnergyItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer)) if (BindableItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer))
{ {
if (par3EntityPlayer.isSneaking()) if (par3EntityPlayer.isSneaking())
{ {

3
src/main/java/WayofTime/alchemicalWizardry/common/items/TranscendentBloodOrb.java
View file

@ -1,7 +1,6 @@
package WayofTime.alchemicalWizardry.common.items; package WayofTime.alchemicalWizardry.common.items;
public class TranscendentBloodOrb extends Orb
public class TranscendentBloodOrb extends EnergyBattery
{ {
public TranscendentBloodOrb(int damage) public TranscendentBloodOrb(int damage)
{ {

3
src/main/java/WayofTime/alchemicalWizardry/common/items/WaterScribeTool.java
View file

@ -1,12 +1,9 @@
package WayofTime.alchemicalWizardry.common.items; package WayofTime.alchemicalWizardry.common.items;
import WayofTime.alchemicalWizardry.AlchemicalWizardry;
public class WaterScribeTool extends ScribeTool public class WaterScribeTool extends ScribeTool
{ {
public WaterScribeTool() public WaterScribeTool()
{ {
super(1); super(1);
setCreativeTab(AlchemicalWizardry.tabBloodMagic);
} }
} }

16
src/main/java/WayofTime/alchemicalWizardry/common/items/armour/BoundArmour.java
View file

@ -27,7 +27,7 @@ import WayofTime.alchemicalWizardry.api.alchemy.energy.IAlchemyGoggles;
import WayofTime.alchemicalWizardry.api.items.interfaces.ArmourUpgrade; import WayofTime.alchemicalWizardry.api.items.interfaces.ArmourUpgrade;
import WayofTime.alchemicalWizardry.api.items.interfaces.IBindable; import WayofTime.alchemicalWizardry.api.items.interfaces.IBindable;
import WayofTime.alchemicalWizardry.api.items.interfaces.ILPGauge; 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.items.sigil.SigilDivination;
import WayofTime.alchemicalWizardry.common.renderer.model.ModelOmegaArmour; 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); super(ItemArmor.ArmorMaterial.GOLD, 0, armorType);
setMaxDamage(1000); setMaxDamage(1000);
setCreativeTab(AlchemicalWizardry.tabBloodMagic);
} }
ModelBiped model1 = null; ModelBiped model1 = null;
@ -139,7 +138,7 @@ public class BoundArmour extends ItemArmor implements IAlchemyGoggles, ISpecialA
@Override @Override
public ArmorProperties getProperties(EntityLivingBase player, ItemStack armor, DamageSource source, double damage, int slot) public ArmorProperties getProperties(EntityLivingBase player, ItemStack armor, DamageSource source, double damage, int slot)
{ {
double armourReduction = 0.0; double armourReduction;
int f = 0; int f = 0;
int h = 0; int h = 0;
@ -232,7 +231,7 @@ public class BoundArmour extends ItemArmor implements IAlchemyGoggles, ISpecialA
{ {
if (entity instanceof EntityPlayer) if (entity instanceof EntityPlayer)
{ {
EnergyItems.checkAndSetItemOwner(stack, (EntityPlayer) entity); BindableItems.checkAndSetItemOwner(stack, (EntityPlayer) entity);
if (((EntityPlayer) entity).capabilities.isCreativeMode) if (((EntityPlayer) entity).capabilities.isCreativeMode)
{ {
@ -313,7 +312,7 @@ public class BoundArmour extends ItemArmor implements IAlchemyGoggles, ISpecialA
@Override @Override
public ItemStack onItemRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer) public ItemStack onItemRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer)
{ {
EnergyItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer); BindableItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer);
return super.onItemRightClick(par1ItemStack, par2World, par3EntityPlayer); return super.onItemRightClick(par1ItemStack, par2World, par3EntityPlayer);
} }
@ -339,11 +338,11 @@ public class BoundArmour extends ItemArmor implements IAlchemyGoggles, ISpecialA
{ {
if (itemStack.getItemDamage() > 0) if (itemStack.getItemDamage() > 0)
{ {
EnergyItems.checkAndSetItemOwner(itemStack, player); BindableItems.checkAndSetItemOwner(itemStack, player);
if (!player.capabilities.isCreativeMode) if (!player.capabilities.isCreativeMode)
{ {
if(EnergyItems.syphonBatteries(itemStack, player, itemStack.getItemDamage() * 75)) if(BindableItems.syphonBatteries(itemStack, player, itemStack.getItemDamage() * 75))
{ {
itemStack.setItemDamage(0); itemStack.setItemDamage(0);
} }
@ -380,7 +379,7 @@ public class BoundArmour extends ItemArmor implements IAlchemyGoggles, ISpecialA
{ {
if (getUpgradeCostMultiplier(par1ItemStack) > 0.02f) 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) if (nextItem == null)
{ {
candidateSlot = i; candidateSlot = i;
continue;
} }
} }

15
src/main/java/WayofTime/alchemicalWizardry/common/items/armour/OmegaArmour.java
View file

@ -28,7 +28,7 @@ import net.minecraftforge.fml.relauncher.SideOnly;
import WayofTime.alchemicalWizardry.api.alchemy.energy.Reagent; import WayofTime.alchemicalWizardry.api.alchemy.energy.Reagent;
import WayofTime.alchemicalWizardry.api.soulNetwork.SoulNetworkHandler; import WayofTime.alchemicalWizardry.api.soulNetwork.SoulNetworkHandler;
import WayofTime.alchemicalWizardry.api.spell.APISpellHelper; import WayofTime.alchemicalWizardry.api.spell.APISpellHelper;
import WayofTime.alchemicalWizardry.common.items.EnergyItems; import WayofTime.alchemicalWizardry.common.items.BindableItems;
import WayofTime.alchemicalWizardry.common.omega.OmegaParadigm; import WayofTime.alchemicalWizardry.common.omega.OmegaParadigm;
public abstract class OmegaArmour extends BoundArmour public abstract class OmegaArmour extends BoundArmour
@ -40,7 +40,7 @@ public abstract class OmegaArmour extends BoundArmour
protected boolean storeYLevel = false; protected boolean storeYLevel = false;
protected boolean storeSeesSky = false; protected boolean storeSeesSky = false;
protected List<Enchantment> illegalEnchantmentList = new LinkedList(); protected List<Enchantment> illegalEnchantmentList = new LinkedList<Enchantment>();
public float reagentDrainPerDamage = 0.1f; public float reagentDrainPerDamage = 0.1f;
@ -129,7 +129,7 @@ public abstract class OmegaArmour extends BoundArmour
{ {
if (!player.capabilities.isCreativeMode) 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); float reagentAmount = APISpellHelper.getPlayerCurrentReagentAmount(player);
@ -176,7 +176,7 @@ public abstract class OmegaArmour extends BoundArmour
} }
} }
Map<Enchantment, Map<Integer, Integer>> map = new HashMap(); Map<Enchantment, Map<Integer, Integer>> map = new HashMap<Enchantment, Map<Integer, Integer>>();
for(Object obj : enchantList) for(Object obj : enchantList)
{ {
@ -184,7 +184,7 @@ public abstract class OmegaArmour extends BoundArmour
if(!map.containsKey(enchantmentdata.enchantmentobj)) if(!map.containsKey(enchantmentdata.enchantmentobj))
{ {
map.put(enchantmentdata.enchantmentobj, new HashMap()); map.put(enchantmentdata.enchantmentobj, new HashMap<Integer, Integer>());
} }
Map<Integer, Integer> numMap = map.get(enchantmentdata.enchantmentobj); Map<Integer, Integer> numMap = map.get(enchantmentdata.enchantmentobj);
@ -308,9 +308,8 @@ public abstract class OmegaArmour extends BoundArmour
} }
NBTTagCompound tag = omegaTag.getCompoundTag("armour"); NBTTagCompound tag = omegaTag.getCompoundTag("armour");
ItemStack armourStack = ItemStack.loadItemStackFromNBT(tag);
return ItemStack.loadItemStackFromNBT(tag);
return armourStack;
} }
@Override @Override

8
src/main/java/WayofTime/alchemicalWizardry/common/items/energy/ItemDestinationClearer.java → src/main/java/WayofTime/alchemicalWizardry/common/items/energy/AlchemicalCleanser.java
View file

@ -11,17 +11,15 @@ import net.minecraft.util.ChatComponentTranslation;
import net.minecraft.util.MovingObjectPosition; import net.minecraft.util.MovingObjectPosition;
import net.minecraft.util.StatCollector; import net.minecraft.util.StatCollector;
import net.minecraft.world.World; import net.minecraft.world.World;
import WayofTime.alchemicalWizardry.AlchemicalWizardry;
import WayofTime.alchemicalWizardry.api.items.interfaces.IReagentManipulator; import WayofTime.alchemicalWizardry.api.items.interfaces.IReagentManipulator;
import WayofTime.alchemicalWizardry.common.tileEntity.TEReagentConduit; 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(); super();
this.setCreativeTab(AlchemicalWizardry.tabBloodMagic); setMaxStackSize(1);
this.maxStackSize = 1;
} }
@Override @Override

14
src/main/java/WayofTime/alchemicalWizardry/common/items/energy/ItemAttunedCrystal.java → src/main/java/WayofTime/alchemicalWizardry/common/items/energy/AlchemicalRouter.java
View file

@ -15,7 +15,6 @@ import net.minecraft.util.EnumFacing;
import net.minecraft.util.MovingObjectPosition; import net.minecraft.util.MovingObjectPosition;
import net.minecraft.util.StatCollector; import net.minecraft.util.StatCollector;
import net.minecraft.world.World; import net.minecraft.world.World;
import WayofTime.alchemicalWizardry.AlchemicalWizardry;
import WayofTime.alchemicalWizardry.api.Int3; import WayofTime.alchemicalWizardry.api.Int3;
import WayofTime.alchemicalWizardry.api.alchemy.energy.IReagentHandler; import WayofTime.alchemicalWizardry.api.alchemy.energy.IReagentHandler;
import WayofTime.alchemicalWizardry.api.alchemy.energy.Reagent; 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.api.items.interfaces.IReagentManipulator;
import WayofTime.alchemicalWizardry.common.tileEntity.TEReagentConduit; 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 AlchemicalRouter()
public ItemAttunedCrystal()
{ {
super(); super();
this.setCreativeTab(AlchemicalWizardry.tabBloodMagic);
this.hasSubtypes = true; this.hasSubtypes = true;
this.maxStackSize = 1; setMaxStackSize(1);
} }
@Override @Override
@ -115,7 +111,7 @@ public class ItemAttunedCrystal extends Item implements IReagentManipulator
ReagentContainerInfo[] infos = relay.getContainerInfo(EnumFacing.UP); ReagentContainerInfo[] infos = relay.getContainerInfo(EnumFacing.UP);
if (infos != null) if (infos != null)
{ {
List<Reagent> reagentList = new LinkedList(); List<Reagent> reagentList = new LinkedList<Reagent>();
for (ReagentContainerInfo info : infos) for (ReagentContainerInfo info : infos)
{ {
if (info != null) if (info != null)
@ -163,6 +159,8 @@ public class ItemAttunedCrystal extends Item implements IReagentManipulator
return itemStack; 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) 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")); player.addChatComponentMessage(new ChatComponentTranslation("message.attunedcrystal.error.toofar"));

8
src/main/java/WayofTime/alchemicalWizardry/common/items/energy/ItemTankSegmenter.java → src/main/java/WayofTime/alchemicalWizardry/common/items/energy/AlchemicalSegmenter.java
View file

@ -14,7 +14,6 @@ import net.minecraft.util.EnumFacing;
import net.minecraft.util.MovingObjectPosition; import net.minecraft.util.MovingObjectPosition;
import net.minecraft.util.StatCollector; import net.minecraft.util.StatCollector;
import net.minecraft.world.World; import net.minecraft.world.World;
import WayofTime.alchemicalWizardry.AlchemicalWizardry;
import WayofTime.alchemicalWizardry.api.alchemy.energy.ISegmentedReagentHandler; import WayofTime.alchemicalWizardry.api.alchemy.energy.ISegmentedReagentHandler;
import WayofTime.alchemicalWizardry.api.alchemy.energy.Reagent; import WayofTime.alchemicalWizardry.api.alchemy.energy.Reagent;
import WayofTime.alchemicalWizardry.api.alchemy.energy.ReagentContainerInfo; 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.alchemy.energy.ReagentStack;
import WayofTime.alchemicalWizardry.api.items.interfaces.IReagentManipulator; 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(); super();
this.setCreativeTab(AlchemicalWizardry.tabBloodMagic);
this.hasSubtypes = true; this.hasSubtypes = true;
this.maxStackSize = 1; setMaxStackSize(1);
} }
@Override @Override

10
src/main/java/WayofTime/alchemicalWizardry/common/items/potion/AlchemyFlask.java
View file

@ -23,7 +23,6 @@ import net.minecraft.util.EnumChatFormatting;
import net.minecraft.util.StatCollector; import net.minecraft.util.StatCollector;
import net.minecraft.world.World; import net.minecraft.world.World;
import net.minecraftforge.common.util.Constants; import net.minecraftforge.common.util.Constants;
import WayofTime.alchemicalWizardry.AlchemicalWizardry;
import WayofTime.alchemicalWizardry.api.alchemy.AlchemyPotionHelper; import WayofTime.alchemicalWizardry.api.alchemy.AlchemyPotionHelper;
import com.google.common.collect.HashMultimap; import com.google.common.collect.HashMultimap;
@ -33,16 +32,15 @@ public class AlchemyFlask extends Item
public AlchemyFlask() public AlchemyFlask()
{ {
super(); super();
this.setMaxDamage(8); setMaxDamage(8);
this.setMaxStackSize(1); setMaxStackSize(1);
setCreativeTab(AlchemicalWizardry.tabBloodMagic);
} }
public static ArrayList<AlchemyPotionHelper> getEffects(ItemStack par1ItemStack) public static ArrayList<AlchemyPotionHelper> getEffects(ItemStack par1ItemStack)
{ {
if (par1ItemStack.hasTagCompound() && par1ItemStack.getTagCompound().hasKey("CustomFlaskEffects")) if (par1ItemStack.hasTagCompound() && par1ItemStack.getTagCompound().hasKey("CustomFlaskEffects"))
{ {
ArrayList<AlchemyPotionHelper> arraylist = new ArrayList(); ArrayList<AlchemyPotionHelper> arraylist = new ArrayList<AlchemyPotionHelper>();
NBTTagList nbttaglist = par1ItemStack.getTagCompound().getTagList("CustomFlaskEffects", Constants.NBT.TAG_COMPOUND); NBTTagList nbttaglist = par1ItemStack.getTagCompound().getTagList("CustomFlaskEffects", Constants.NBT.TAG_COMPOUND);
for (int i = 0; i < nbttaglist.tagCount(); ++i) for (int i = 0; i < nbttaglist.tagCount(); ++i)
@ -63,7 +61,7 @@ public class AlchemyFlask extends Item
if (list != null) if (list != null)
{ {
ArrayList<PotionEffect> newList = new ArrayList(); ArrayList<PotionEffect> newList = new ArrayList<PotionEffect>();
for (AlchemyPotionHelper aph : list) for (AlchemyPotionHelper aph : list)
{ {

4
src/main/java/WayofTime/alchemicalWizardry/common/items/potion/AlchemyReagent.java
View file

@ -10,7 +10,6 @@ import net.minecraft.util.StatCollector;
import org.lwjgl.input.Keyboard; import org.lwjgl.input.Keyboard;
import WayofTime.alchemicalWizardry.AlchemicalWizardry;
import WayofTime.alchemicalWizardry.api.alchemy.AlchemyRecipeRegistry; import WayofTime.alchemicalWizardry.api.alchemy.AlchemyRecipeRegistry;
public class AlchemyReagent extends Item public class AlchemyReagent extends Item
@ -18,8 +17,7 @@ public class AlchemyReagent extends Item
public AlchemyReagent() public AlchemyReagent()
{ {
super(); super();
setCreativeTab(AlchemicalWizardry.tabBloodMagic); setMaxStackSize(64);
this.setMaxStackSize(64);
} }
@Override @Override

1
src/main/java/WayofTime/alchemicalWizardry/common/items/potion/AverageLengtheningCatalyst.java
View file

@ -1,6 +1,5 @@
package WayofTime.alchemicalWizardry.common.items.potion; package WayofTime.alchemicalWizardry.common.items.potion;
public class AverageLengtheningCatalyst extends LengtheningCatalyst public class AverageLengtheningCatalyst extends LengtheningCatalyst
{ {
public AverageLengtheningCatalyst() public AverageLengtheningCatalyst()

1
src/main/java/WayofTime/alchemicalWizardry/common/items/potion/AveragePowerCatalyst.java
View file

@ -1,6 +1,5 @@
package WayofTime.alchemicalWizardry.common.items.potion; package WayofTime.alchemicalWizardry.common.items.potion;
public class AveragePowerCatalyst extends PowerCatalyst public class AveragePowerCatalyst extends PowerCatalyst
{ {
public AveragePowerCatalyst() public AveragePowerCatalyst()

3
src/main/java/WayofTime/alchemicalWizardry/common/items/potion/CombinationalCatalyst.java
View file

@ -1,7 +1,6 @@
package WayofTime.alchemicalWizardry.common.items.potion; package WayofTime.alchemicalWizardry.common.items.potion;
import net.minecraft.item.Item; import net.minecraft.item.Item;
import WayofTime.alchemicalWizardry.AlchemicalWizardry;
import WayofTime.alchemicalWizardry.common.alchemy.ICombinationalCatalyst; import WayofTime.alchemicalWizardry.common.alchemy.ICombinationalCatalyst;
public class CombinationalCatalyst extends Item implements ICombinationalCatalyst public class CombinationalCatalyst extends Item implements ICombinationalCatalyst
@ -9,7 +8,5 @@ public class CombinationalCatalyst extends Item implements ICombinationalCatalys
public CombinationalCatalyst() public CombinationalCatalyst()
{ {
super(); super();
this.setCreativeTab(AlchemicalWizardry.tabBloodMagic);
} }
} }

3
src/main/java/WayofTime/alchemicalWizardry/common/items/potion/EnhancedFillingAgent.java
View file

@ -1,13 +1,10 @@
package WayofTime.alchemicalWizardry.common.items.potion; package WayofTime.alchemicalWizardry.common.items.potion;
import WayofTime.alchemicalWizardry.AlchemicalWizardry;
public class EnhancedFillingAgent extends WeakFillingAgent public class EnhancedFillingAgent extends WeakFillingAgent
{ {
public EnhancedFillingAgent() public EnhancedFillingAgent()
{ {
super(); super();
setCreativeTab(AlchemicalWizardry.tabBloodMagic);
} }
@Override @Override

1
src/main/java/WayofTime/alchemicalWizardry/common/items/potion/GreaterLengtheningCatalyst.java
View file

@ -1,6 +1,5 @@
package WayofTime.alchemicalWizardry.common.items.potion; package WayofTime.alchemicalWizardry.common.items.potion;
public class GreaterLengtheningCatalyst extends LengtheningCatalyst public class GreaterLengtheningCatalyst extends LengtheningCatalyst
{ {
public GreaterLengtheningCatalyst() public GreaterLengtheningCatalyst()

1
src/main/java/WayofTime/alchemicalWizardry/common/items/potion/GreaterPowerCatalyst.java
View file

@ -1,6 +1,5 @@
package WayofTime.alchemicalWizardry.common.items.potion; package WayofTime.alchemicalWizardry.common.items.potion;
public class GreaterPowerCatalyst extends PowerCatalyst public class GreaterPowerCatalyst extends PowerCatalyst
{ {
public GreaterPowerCatalyst() public GreaterPowerCatalyst()

2
src/main/java/WayofTime/alchemicalWizardry/common/items/potion/LengtheningCatalyst.java
View file

@ -1,6 +1,5 @@
package WayofTime.alchemicalWizardry.common.items.potion; package WayofTime.alchemicalWizardry.common.items.potion;
import WayofTime.alchemicalWizardry.AlchemicalWizardry;
import WayofTime.alchemicalWizardry.api.alchemy.AlchemyRecipeRegistry; import WayofTime.alchemicalWizardry.api.alchemy.AlchemyRecipeRegistry;
import WayofTime.alchemicalWizardry.common.ICatalyst; import WayofTime.alchemicalWizardry.common.ICatalyst;
import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayer;
@ -19,7 +18,6 @@ public class LengtheningCatalyst extends Item implements ICatalyst
public LengtheningCatalyst(int catalystStrength) public LengtheningCatalyst(int catalystStrength)
{ {
this.catalystStrength = catalystStrength; this.catalystStrength = catalystStrength;
setCreativeTab(AlchemicalWizardry.tabBloodMagic);
} }
@Override @Override

1
src/main/java/WayofTime/alchemicalWizardry/common/items/potion/MundaneLengtheningCatalyst.java
View file

@ -1,6 +1,5 @@
package WayofTime.alchemicalWizardry.common.items.potion; package WayofTime.alchemicalWizardry.common.items.potion;
public class MundaneLengtheningCatalyst extends LengtheningCatalyst public class MundaneLengtheningCatalyst extends LengtheningCatalyst
{ {
public MundaneLengtheningCatalyst() public MundaneLengtheningCatalyst()

1
src/main/java/WayofTime/alchemicalWizardry/common/items/potion/MundanePowerCatalyst.java
View file

@ -1,6 +1,5 @@
package WayofTime.alchemicalWizardry.common.items.potion; package WayofTime.alchemicalWizardry.common.items.potion;
public class MundanePowerCatalyst extends PowerCatalyst public class MundanePowerCatalyst extends PowerCatalyst
{ {
public MundanePowerCatalyst() public MundanePowerCatalyst()

2
src/main/java/WayofTime/alchemicalWizardry/common/items/potion/PowerCatalyst.java
View file

@ -1,6 +1,5 @@
package WayofTime.alchemicalWizardry.common.items.potion; package WayofTime.alchemicalWizardry.common.items.potion;
import WayofTime.alchemicalWizardry.AlchemicalWizardry;
import WayofTime.alchemicalWizardry.api.alchemy.AlchemyRecipeRegistry; import WayofTime.alchemicalWizardry.api.alchemy.AlchemyRecipeRegistry;
import WayofTime.alchemicalWizardry.common.ICatalyst; import WayofTime.alchemicalWizardry.common.ICatalyst;
import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayer;
@ -21,7 +20,6 @@ public class PowerCatalyst extends Item implements ICatalyst
{ {
super(); super();
this.catalystStrength = catalystStrength; this.catalystStrength = catalystStrength;
setCreativeTab(AlchemicalWizardry.tabBloodMagic);
} }
@Override @Override

2
src/main/java/WayofTime/alchemicalWizardry/common/items/potion/StandardBindingAgent.java
View file

@ -10,7 +10,6 @@ import net.minecraft.util.StatCollector;
import org.lwjgl.input.Keyboard; import org.lwjgl.input.Keyboard;
import WayofTime.alchemicalWizardry.AlchemicalWizardry;
import WayofTime.alchemicalWizardry.api.alchemy.AlchemyRecipeRegistry; import WayofTime.alchemicalWizardry.api.alchemy.AlchemyRecipeRegistry;
import WayofTime.alchemicalWizardry.common.IBindingAgent; import WayofTime.alchemicalWizardry.common.IBindingAgent;
@ -19,7 +18,6 @@ public class StandardBindingAgent extends Item implements IBindingAgent
public StandardBindingAgent() public StandardBindingAgent()
{ {
super(); super();
setCreativeTab(AlchemicalWizardry.tabBloodMagic);
} }
@Override @Override

3
src/main/java/WayofTime/alchemicalWizardry/common/items/potion/StandardFillingAgent.java
View file

@ -1,13 +1,10 @@
package WayofTime.alchemicalWizardry.common.items.potion; package WayofTime.alchemicalWizardry.common.items.potion;
import WayofTime.alchemicalWizardry.AlchemicalWizardry;
public class StandardFillingAgent extends WeakFillingAgent public class StandardFillingAgent extends WeakFillingAgent
{ {
public StandardFillingAgent() public StandardFillingAgent()
{ {
super(); super();
setCreativeTab(AlchemicalWizardry.tabBloodMagic);
} }
@Override @Override

1
src/main/java/WayofTime/alchemicalWizardry/common/items/potion/WeakBindingAgent.java
View file

@ -1,6 +1,5 @@
package WayofTime.alchemicalWizardry.common.items.potion; package WayofTime.alchemicalWizardry.common.items.potion;
public class WeakBindingAgent extends StandardBindingAgent public class WeakBindingAgent extends StandardBindingAgent
{ {
public WeakBindingAgent() public WeakBindingAgent()

2
src/main/java/WayofTime/alchemicalWizardry/common/items/potion/WeakFillingAgent.java
View file

@ -11,7 +11,6 @@ import net.minecraft.util.StatCollector;
import org.lwjgl.input.Keyboard; import org.lwjgl.input.Keyboard;
import WayofTime.alchemicalWizardry.AlchemicalWizardry;
import WayofTime.alchemicalWizardry.api.alchemy.AlchemyRecipeRegistry; import WayofTime.alchemicalWizardry.api.alchemy.AlchemyRecipeRegistry;
import WayofTime.alchemicalWizardry.common.IFillingAgent; import WayofTime.alchemicalWizardry.common.IFillingAgent;
@ -20,7 +19,6 @@ public class WeakFillingAgent extends Item implements IFillingAgent
public WeakFillingAgent() public WeakFillingAgent()
{ {
super(); super();
setCreativeTab(AlchemicalWizardry.tabBloodMagic);
} }
@Override @Override

1
src/main/java/WayofTime/alchemicalWizardry/common/items/routing/InputRoutingFocus.java
View file

@ -1,6 +1,5 @@
package WayofTime.alchemicalWizardry.common.items.routing; package WayofTime.alchemicalWizardry.common.items.routing;
public class InputRoutingFocus extends RoutingFocus public class InputRoutingFocus extends RoutingFocus
{ {
public InputRoutingFocus() public InputRoutingFocus()

32
src/main/java/WayofTime/alchemicalWizardry/common/items/routing/OutputRoutingFocus.java
View file

@ -44,23 +44,23 @@ public class OutputRoutingFocus extends RoutingFocus implements ILimitedRoutingF
{ {
String addedString = ""; String addedString = "";
switch(itemStack.getItemDamage()) switch (itemStack.getItemDamage())
{ {
case 0: case 0:
addedString = "default"; addedString = "default";
break; break;
case 1: case 1:
addedString = "modItem"; addedString = "modItem";
break; break;
case 2: case 2:
addedString = "ignMeta"; addedString = "ignMeta";
break; break;
case 3: case 3:
addedString = "matchNBT"; addedString = "matchNBT";
break; break;
case 4: case 4:
addedString = "global"; addedString = "global";
break; break;
} }
return super.getUnlocalizedName() + "." + addedString; return super.getUnlocalizedName() + "." + addedString;

8
src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilAir.java
View file

@ -13,10 +13,10 @@ import net.minecraftforge.fml.relauncher.SideOnly;
import WayofTime.alchemicalWizardry.AlchemicalWizardry; import WayofTime.alchemicalWizardry.AlchemicalWizardry;
import WayofTime.alchemicalWizardry.api.items.interfaces.ArmourUpgrade; import WayofTime.alchemicalWizardry.api.items.interfaces.ArmourUpgrade;
import WayofTime.alchemicalWizardry.api.items.interfaces.ISigil; 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; import codechicken.lib.render.TextureUtils.IIconRegister;
public class SigilAir extends EnergyItems implements ArmourUpgrade, ISigil public class SigilAir extends BindableItems implements ArmourUpgrade, ISigil
{ {
public SigilAir() public SigilAir()
{ {
@ -48,7 +48,7 @@ public class SigilAir extends EnergyItems implements ArmourUpgrade, ISigil
@Override @Override
public ItemStack onItemRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer) 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; return par1ItemStack;
} }
@ -75,7 +75,7 @@ public class SigilAir extends EnergyItems implements ArmourUpgrade, ISigil
if (!par3EntityPlayer.capabilities.isCreativeMode) if (!par3EntityPlayer.capabilities.isCreativeMode)
{ {
if (!EnergyItems.syphonBatteries(par1ItemStack, par3EntityPlayer, getEnergyUsed())) if (!BindableItems.syphonBatteries(par1ItemStack, par3EntityPlayer, getEnergyUsed()))
{ {
if(!par2World.isRemote) if(!par2World.isRemote)
{ {

10
src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilBloodLight.java
View file

@ -16,11 +16,11 @@ import WayofTime.alchemicalWizardry.ModBlocks;
import WayofTime.alchemicalWizardry.api.items.interfaces.ArmourUpgrade; import WayofTime.alchemicalWizardry.api.items.interfaces.ArmourUpgrade;
import WayofTime.alchemicalWizardry.api.items.interfaces.IHolding; import WayofTime.alchemicalWizardry.api.items.interfaces.IHolding;
import WayofTime.alchemicalWizardry.common.entity.projectile.EntityBloodLightProjectile; 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.Side;
import cpw.mods.fml.relauncher.SideOnly; 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() public SigilBloodLight()
{ {
@ -51,7 +51,7 @@ public class SigilBloodLight extends EnergyItems implements IHolding, ArmourUpgr
@Override @Override
public boolean onItemUse(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, World par3World, int par4, int par5, int par6, int par7, float par8, float par9, float par10) 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; return true;
} }
@ -97,7 +97,7 @@ public class SigilBloodLight extends EnergyItems implements IHolding, ArmourUpgr
@Override @Override
public ItemStack onItemRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer) 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; return par1ItemStack;
} }
@ -107,7 +107,7 @@ public class SigilBloodLight extends EnergyItems implements IHolding, ArmourUpgr
par1ItemStack.setTagCompound(new NBTTagCompound()); par1ItemStack.setTagCompound(new NBTTagCompound());
} }
if(!EnergyItems.syphonBatteries(par1ItemStack, par3EntityPlayer, getEnergyUsed() * 5)) if(!BindableItems.syphonBatteries(par1ItemStack, par3EntityPlayer, getEnergyUsed() * 5))
{ {
return par1ItemStack; return par1ItemStack;
} }

8
src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilDivination.java
View file

@ -22,7 +22,7 @@ import WayofTime.alchemicalWizardry.api.alchemy.energy.ReagentRegistry;
import WayofTime.alchemicalWizardry.api.items.interfaces.ArmourUpgrade; import WayofTime.alchemicalWizardry.api.items.interfaces.ArmourUpgrade;
import WayofTime.alchemicalWizardry.api.items.interfaces.IBindable; import WayofTime.alchemicalWizardry.api.items.interfaces.IBindable;
import WayofTime.alchemicalWizardry.api.items.interfaces.IReagentManipulator; 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.Side;
import cpw.mods.fml.relauncher.SideOnly; import cpw.mods.fml.relauncher.SideOnly;
@ -57,14 +57,14 @@ public class SigilDivination extends Item implements ArmourUpgrade, IReagentMani
@Override @Override
public ItemStack onItemRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer) 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; return par1ItemStack;
} }
if(!EnergyItems.syphonBatteries(par1ItemStack, par3EntityPlayer, 0)) if(!BindableItems.syphonBatteries(par1ItemStack, par3EntityPlayer, 0))
{ {
return par1ItemStack; return par1ItemStack;
} }

10
src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilHarvest.java
View file

@ -15,11 +15,11 @@ import WayofTime.alchemicalWizardry.AlchemicalWizardry;
import WayofTime.alchemicalWizardry.api.harvest.HarvestRegistry; import WayofTime.alchemicalWizardry.api.harvest.HarvestRegistry;
import WayofTime.alchemicalWizardry.api.items.interfaces.ArmourUpgrade; import WayofTime.alchemicalWizardry.api.items.interfaces.ArmourUpgrade;
import WayofTime.alchemicalWizardry.api.items.interfaces.IHolding; 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.Side;
import cpw.mods.fml.relauncher.SideOnly; 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) @SideOnly(Side.CLIENT)
private IIcon activeIcon; private IIcon activeIcon;
@ -97,7 +97,7 @@ public class SigilHarvest extends EnergyItems implements IHolding, ArmourUpgrade
@Override @Override
public ItemStack onItemRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer) 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; return par1ItemStack;
} }
@ -117,7 +117,7 @@ public class SigilHarvest extends EnergyItems implements IHolding, ArmourUpgrade
if (!par3EntityPlayer.capabilities.isCreativeMode) if (!par3EntityPlayer.capabilities.isCreativeMode)
{ {
if (!EnergyItems.syphonBatteries(par1ItemStack, par3EntityPlayer, getEnergyUsed())) if (!BindableItems.syphonBatteries(par1ItemStack, par3EntityPlayer, getEnergyUsed()))
{ {
tag.setBoolean("isActive", false); tag.setBoolean("isActive", false);
} }
@ -168,7 +168,7 @@ public class SigilHarvest extends EnergyItems implements IHolding, ArmourUpgrade
{ {
if (!par3EntityPlayer.capabilities.isCreativeMode) if (!par3EntityPlayer.capabilities.isCreativeMode)
{ {
if(!EnergyItems.syphonBatteries(par1ItemStack, par3EntityPlayer, getEnergyUsed())) if(!BindableItems.syphonBatteries(par1ItemStack, par3EntityPlayer, getEnergyUsed()))
{ {
par1ItemStack.getTagCompound().setBoolean("isActive", false); par1ItemStack.getTagCompound().setBoolean("isActive", false);
} }

12
src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilLava.java
View file

@ -22,8 +22,8 @@ import net.minecraftforge.fluids.FluidStack;
import net.minecraftforge.fluids.IFluidHandler; import net.minecraftforge.fluids.IFluidHandler;
import WayofTime.alchemicalWizardry.AlchemicalWizardry; import WayofTime.alchemicalWizardry.AlchemicalWizardry;
import WayofTime.alchemicalWizardry.api.items.interfaces.ArmourUpgrade; import WayofTime.alchemicalWizardry.api.items.interfaces.ArmourUpgrade;
import WayofTime.alchemicalWizardry.common.items.EnergyBattery; import WayofTime.alchemicalWizardry.common.items.Orb;
import WayofTime.alchemicalWizardry.common.items.EnergyItems; import WayofTime.alchemicalWizardry.common.items.BindableItems;
import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly; import cpw.mods.fml.relauncher.SideOnly;
@ -82,7 +82,7 @@ public class SigilLava extends ItemBucket implements ArmourUpgrade, ISigil
@Override @Override
public boolean onItemUseFirst(ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int side, float hitX, float hitY, float hitZ) 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; return false;
} }
@ -98,7 +98,7 @@ public class SigilLava extends ItemBucket implements ArmourUpgrade, ISigil
FluidStack fluid = new FluidStack(FluidRegistry.LAVA, 1000); FluidStack fluid = new FluidStack(FluidRegistry.LAVA, 1000);
int amount = ((IFluidHandler) tile).fill(ForgeDirection.getOrientation(side), fluid, false); 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); ((IFluidHandler) tile).fill(ForgeDirection.getOrientation(side), fluid, true);
} }
@ -146,7 +146,7 @@ public class SigilLava extends ItemBucket implements ArmourUpgrade, ISigil
return false; 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); return this.tryPlaceContainedLiquid(world, x, y, z, x, y, z);
} }
@ -212,7 +212,7 @@ public class SigilLava extends ItemBucket implements ArmourUpgrade, ISigil
{ {
continue; continue;
} }
if (stack.getItem() instanceof EnergyBattery && !usedBattery) if (stack.getItem() instanceof Orb && !usedBattery)
{ {
if (stack.getItemDamage() <= stack.getMaxDamage() - damageToBeDone) if (stack.getItemDamage() <= stack.getMaxDamage() - damageToBeDone)
{ {

10
src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilOfElementalAffinity.java
View file

@ -2,7 +2,7 @@ package WayofTime.alchemicalWizardry.common.items.sigil;
import WayofTime.alchemicalWizardry.AlchemicalWizardry; import WayofTime.alchemicalWizardry.AlchemicalWizardry;
import WayofTime.alchemicalWizardry.api.items.interfaces.ISigil; 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.Side;
import cpw.mods.fml.relauncher.SideOnly; import cpw.mods.fml.relauncher.SideOnly;
import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.client.renderer.texture.IIconRegister;
@ -18,7 +18,7 @@ import net.minecraft.world.World;
import java.util.List; import java.util.List;
public class SigilOfElementalAffinity extends EnergyItems implements ISigil public class SigilOfElementalAffinity extends BindableItems implements ISigil
{ {
@SideOnly(Side.CLIENT) @SideOnly(Side.CLIENT)
private IIcon activeIcon; private IIcon activeIcon;
@ -97,7 +97,7 @@ public class SigilOfElementalAffinity extends EnergyItems implements ISigil
@Override @Override
public ItemStack onItemRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer) 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; return par1ItemStack;
} }
@ -110,7 +110,7 @@ public class SigilOfElementalAffinity extends EnergyItems implements ISigil
NBTTagCompound tag = par1ItemStack.getTagCompound(); NBTTagCompound tag = par1ItemStack.getTagCompound();
tag.setBoolean("isActive", !(tag.getBoolean("isActive"))); 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); par1ItemStack.setItemDamage(1);
tag.setInteger("worldTimeDelay", (int) (par2World.getWorldTime() - 1) % 200); tag.setInteger("worldTimeDelay", (int) (par2World.getWorldTime() - 1) % 200);
@ -150,7 +150,7 @@ public class SigilOfElementalAffinity extends EnergyItems implements ISigil
{ {
if (!par3EntityPlayer.capabilities.isCreativeMode) if (!par3EntityPlayer.capabilities.isCreativeMode)
{ {
if (!EnergyItems.syphonBatteries(par1ItemStack, par3EntityPlayer, getEnergyUsed())) if (!BindableItems.syphonBatteries(par1ItemStack, par3EntityPlayer, getEnergyUsed()))
{ {
par1ItemStack.getTagCompound().setBoolean("isActive", false); par1ItemStack.getTagCompound().setBoolean("isActive", false);
} }

10
src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilOfEnderSeverance.java
View file

@ -3,7 +3,7 @@ package WayofTime.alchemicalWizardry.common.items.sigil;
import WayofTime.alchemicalWizardry.AlchemicalWizardry; import WayofTime.alchemicalWizardry.AlchemicalWizardry;
import WayofTime.alchemicalWizardry.api.items.interfaces.IHolding; import WayofTime.alchemicalWizardry.api.items.interfaces.IHolding;
import WayofTime.alchemicalWizardry.api.items.interfaces.ISigil; 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.spell.complex.effect.SpellHelper;
import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly; import cpw.mods.fml.relauncher.SideOnly;
@ -20,7 +20,7 @@ import net.minecraft.world.World;
import java.util.List; import java.util.List;
public class SigilOfEnderSeverance extends EnergyItems implements IHolding, ISigil public class SigilOfEnderSeverance extends BindableItems implements IHolding, ISigil
{ {
@SideOnly(Side.CLIENT) @SideOnly(Side.CLIENT)
private IIcon activeIcon; private IIcon activeIcon;
@ -98,7 +98,7 @@ public class SigilOfEnderSeverance extends EnergyItems implements IHolding, ISig
@Override @Override
public ItemStack onItemRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer) 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; return par1ItemStack;
} }
@ -118,7 +118,7 @@ public class SigilOfEnderSeverance extends EnergyItems implements IHolding, ISig
if (!par3EntityPlayer.capabilities.isCreativeMode) if (!par3EntityPlayer.capabilities.isCreativeMode)
{ {
if (!EnergyItems.syphonBatteries(par1ItemStack, par3EntityPlayer, getEnergyUsed())) if (!BindableItems.syphonBatteries(par1ItemStack, par3EntityPlayer, getEnergyUsed()))
{ {
tag.setBoolean("isActive", false); tag.setBoolean("isActive", false);
} }
@ -161,7 +161,7 @@ public class SigilOfEnderSeverance extends EnergyItems implements IHolding, ISig
{ {
if (!par3EntityPlayer.capabilities.isCreativeMode) if (!par3EntityPlayer.capabilities.isCreativeMode)
{ {
if(!EnergyItems.syphonBatteries(par1ItemStack, par3EntityPlayer, getEnergyUsed())) if(!BindableItems.syphonBatteries(par1ItemStack, par3EntityPlayer, getEnergyUsed()))
{ {
par1ItemStack.getTagCompound().setBoolean("isActive", false); par1ItemStack.getTagCompound().setBoolean("isActive", false);
} }

14
src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilOfGrowth.java
View file

@ -3,7 +3,7 @@ package WayofTime.alchemicalWizardry.common.items.sigil;
import WayofTime.alchemicalWizardry.AlchemicalWizardry; import WayofTime.alchemicalWizardry.AlchemicalWizardry;
import WayofTime.alchemicalWizardry.api.items.interfaces.ArmourUpgrade; import WayofTime.alchemicalWizardry.api.items.interfaces.ArmourUpgrade;
import WayofTime.alchemicalWizardry.api.items.interfaces.ISigil; 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.common.eventhandler.Event.Result;
import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly; import cpw.mods.fml.relauncher.SideOnly;
@ -24,7 +24,7 @@ import net.minecraftforge.event.entity.player.BonemealEvent;
import java.util.List; import java.util.List;
public class SigilOfGrowth extends EnergyItems implements ArmourUpgrade, ISigil public class SigilOfGrowth extends BindableItems implements ArmourUpgrade, ISigil
{ {
@SideOnly(Side.CLIENT) @SideOnly(Side.CLIENT)
private IIcon activeIcon; private IIcon activeIcon;
@ -104,11 +104,11 @@ public class SigilOfGrowth extends EnergyItems implements ArmourUpgrade, ISigil
@Override @Override
public boolean onItemUse(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, World par3World, int par4, int par5, int par6, int par7, float par8, float par9, float par10) 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)) if (applyBonemeal(par1ItemStack, par3World, par4, par5, par6, par2EntityPlayer))
{ {
EnergyItems.syphonBatteries(par1ItemStack, par2EntityPlayer, getEnergyUsed()); BindableItems.syphonBatteries(par1ItemStack, par2EntityPlayer, getEnergyUsed());
if (par3World.isRemote) if (par3World.isRemote)
{ {
@ -125,7 +125,7 @@ public class SigilOfGrowth extends EnergyItems implements ArmourUpgrade, ISigil
@Override @Override
public ItemStack onItemRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer) 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; return par1ItemStack;
} }
@ -143,7 +143,7 @@ public class SigilOfGrowth extends EnergyItems implements ArmourUpgrade, ISigil
NBTTagCompound tag = par1ItemStack.getTagCompound(); NBTTagCompound tag = par1ItemStack.getTagCompound();
tag.setBoolean("isActive", !(tag.getBoolean("isActive"))); 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); par1ItemStack.setItemDamage(1);
tag.setInteger("worldTimeDelay", (int) (par2World.getWorldTime() - 1) % tickDelay); 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 (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); par1ItemStack.getTagCompound().setBoolean("isActive", false);
} }

10
src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilOfHaste.java
View file

@ -3,7 +3,7 @@ package WayofTime.alchemicalWizardry.common.items.sigil;
import WayofTime.alchemicalWizardry.AlchemicalWizardry; import WayofTime.alchemicalWizardry.AlchemicalWizardry;
import WayofTime.alchemicalWizardry.api.items.interfaces.ArmourUpgrade; import WayofTime.alchemicalWizardry.api.items.interfaces.ArmourUpgrade;
import WayofTime.alchemicalWizardry.api.items.interfaces.ISigil; 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.Side;
import cpw.mods.fml.relauncher.SideOnly; import cpw.mods.fml.relauncher.SideOnly;
import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.client.renderer.texture.IIconRegister;
@ -18,7 +18,7 @@ import net.minecraft.world.World;
import java.util.List; import java.util.List;
public class SigilOfHaste extends EnergyItems implements ArmourUpgrade, ISigil public class SigilOfHaste extends BindableItems implements ArmourUpgrade, ISigil
{ {
@SideOnly(Side.CLIENT) @SideOnly(Side.CLIENT)
private IIcon activeIcon; private IIcon activeIcon;
@ -96,7 +96,7 @@ public class SigilOfHaste extends EnergyItems implements ArmourUpgrade, ISigil
@Override @Override
public ItemStack onItemRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer) 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; return par1ItemStack;
} }
@ -109,7 +109,7 @@ public class SigilOfHaste extends EnergyItems implements ArmourUpgrade, ISigil
NBTTagCompound tag = par1ItemStack.getTagCompound(); NBTTagCompound tag = par1ItemStack.getTagCompound();
tag.setBoolean("isActive", !(tag.getBoolean("isActive"))); 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); par1ItemStack.setItemDamage(1);
tag.setInteger("worldTimeDelay", (int) (par2World.getWorldTime() - 1) % 200); 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 (!par3EntityPlayer.capabilities.isCreativeMode)
{ {
if (!EnergyItems.syphonBatteries(par1ItemStack, par3EntityPlayer, getEnergyUsed())) if (!BindableItems.syphonBatteries(par1ItemStack, par3EntityPlayer, getEnergyUsed()))
{ {
par1ItemStack.getTagCompound().setBoolean("isActive", false); par1ItemStack.getTagCompound().setBoolean("isActive", false);
} }

10
src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilOfMagnetism.java
View file

@ -17,11 +17,11 @@ import net.minecraft.world.World;
import WayofTime.alchemicalWizardry.AlchemicalWizardry; import WayofTime.alchemicalWizardry.AlchemicalWizardry;
import WayofTime.alchemicalWizardry.api.items.interfaces.ArmourUpgrade; import WayofTime.alchemicalWizardry.api.items.interfaces.ArmourUpgrade;
import WayofTime.alchemicalWizardry.api.items.interfaces.IHolding; 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.Side;
import cpw.mods.fml.relauncher.SideOnly; 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) @SideOnly(Side.CLIENT)
private IIcon activeIcon; private IIcon activeIcon;
@ -100,7 +100,7 @@ public class SigilOfMagnetism extends EnergyItems implements ArmourUpgrade, IHol
@Override @Override
public ItemStack onItemRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer) 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; return par1ItemStack;
} }
@ -113,7 +113,7 @@ public class SigilOfMagnetism extends EnergyItems implements ArmourUpgrade, IHol
NBTTagCompound tag = par1ItemStack.getTagCompound(); NBTTagCompound tag = par1ItemStack.getTagCompound();
tag.setBoolean("isActive", !(tag.getBoolean("isActive"))); 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); par1ItemStack.setItemDamage(1);
tag.setInteger("worldTimeDelay", (int) (par2World.getWorldTime() - 1) % tickDelay); 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 (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); par1ItemStack.getTagCompound().setBoolean("isActive", false);
} }

10
src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilOfSupression.java
View file

@ -3,7 +3,7 @@ package WayofTime.alchemicalWizardry.common.items.sigil;
import WayofTime.alchemicalWizardry.AlchemicalWizardry; import WayofTime.alchemicalWizardry.AlchemicalWizardry;
import WayofTime.alchemicalWizardry.api.items.interfaces.ArmourUpgrade; import WayofTime.alchemicalWizardry.api.items.interfaces.ArmourUpgrade;
import WayofTime.alchemicalWizardry.api.items.interfaces.ISigil; 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.spell.complex.effect.SpellHelper;
import WayofTime.alchemicalWizardry.common.tileEntity.TESpectralContainer; import WayofTime.alchemicalWizardry.common.tileEntity.TESpectralContainer;
import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.Side;
@ -22,7 +22,7 @@ import net.minecraft.world.World;
import java.util.List; import java.util.List;
public class SigilOfSupression extends EnergyItems implements ArmourUpgrade, ISigil public class SigilOfSupression extends BindableItems implements ArmourUpgrade, ISigil
{ {
@SideOnly(Side.CLIENT) @SideOnly(Side.CLIENT)
private IIcon activeIcon; private IIcon activeIcon;
@ -104,7 +104,7 @@ public class SigilOfSupression extends EnergyItems implements ArmourUpgrade, ISi
{ {
int tickDelay = 200; int tickDelay = 200;
if (!EnergyItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer) || SpellHelper.isFakePlayer(par2World, par3EntityPlayer)) if (!BindableItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer) || SpellHelper.isFakePlayer(par2World, par3EntityPlayer))
{ {
return par1ItemStack; return par1ItemStack;
} }
@ -129,7 +129,7 @@ public class SigilOfSupression extends EnergyItems implements ArmourUpgrade, ISi
if (!par3EntityPlayer.capabilities.isCreativeMode) if (!par3EntityPlayer.capabilities.isCreativeMode)
{ {
if(!EnergyItems.syphonBatteries(par1ItemStack, par3EntityPlayer, getEnergyUsed())) if(!BindableItems.syphonBatteries(par1ItemStack, par3EntityPlayer, getEnergyUsed()))
{ {
tag.setBoolean("isActive", false); tag.setBoolean("isActive", false);
} }
@ -206,7 +206,7 @@ public class SigilOfSupression extends EnergyItems implements ArmourUpgrade, ISi
{ {
if (!par3EntityPlayer.capabilities.isCreativeMode) if (!par3EntityPlayer.capabilities.isCreativeMode)
{ {
if(!EnergyItems.syphonBatteries(par1ItemStack, par3EntityPlayer, getEnergyUsed())) if(!BindableItems.syphonBatteries(par1ItemStack, par3EntityPlayer, getEnergyUsed()))
{ {
par1ItemStack.getTagCompound().setBoolean("isActive", false); par1ItemStack.getTagCompound().setBoolean("isActive", false);
} }

6
src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilOfTheAssassin.java
View file

@ -22,13 +22,13 @@ import net.minecraftforge.common.MinecraftForge;
import net.minecraftforge.event.entity.living.EnderTeleportEvent; import net.minecraftforge.event.entity.living.EnderTeleportEvent;
import WayofTime.alchemicalWizardry.AlchemicalWizardry; import WayofTime.alchemicalWizardry.AlchemicalWizardry;
import WayofTime.alchemicalWizardry.api.items.interfaces.ArmourUpgrade; 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.complex.effect.SpellHelper;
import WayofTime.alchemicalWizardry.common.spell.simple.SpellTeleport; import WayofTime.alchemicalWizardry.common.spell.simple.SpellTeleport;
import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly; import cpw.mods.fml.relauncher.SideOnly;
public class SigilOfTheAssassin extends EnergyItems implements ArmourUpgrade, ISigil public class SigilOfTheAssassin extends BindableItems implements ArmourUpgrade, ISigil
{ {
public SigilOfTheAssassin() public SigilOfTheAssassin()
{ {
@ -79,7 +79,7 @@ public class SigilOfTheAssassin extends EnergyItems implements ArmourUpgrade, IS
*/ */
public ItemStack onItemRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer) 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; return par1ItemStack;
} }

10
src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilOfTheBridge.java
View file

@ -4,7 +4,7 @@ import WayofTime.alchemicalWizardry.AlchemicalWizardry;
import WayofTime.alchemicalWizardry.ModBlocks; import WayofTime.alchemicalWizardry.ModBlocks;
import WayofTime.alchemicalWizardry.api.items.interfaces.ArmourUpgrade; import WayofTime.alchemicalWizardry.api.items.interfaces.ArmourUpgrade;
import WayofTime.alchemicalWizardry.api.items.interfaces.ISigil; 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 WayofTime.alchemicalWizardry.common.tileEntity.TESpectralBlock;
import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly; import cpw.mods.fml.relauncher.SideOnly;
@ -21,7 +21,7 @@ import net.minecraft.world.World;
import java.util.List; import java.util.List;
public class SigilOfTheBridge extends EnergyItems implements ArmourUpgrade, ISigil public class SigilOfTheBridge extends BindableItems implements ArmourUpgrade, ISigil
{ {
@SideOnly(Side.CLIENT) @SideOnly(Side.CLIENT)
private IIcon activeIcon; private IIcon activeIcon;
@ -101,7 +101,7 @@ public class SigilOfTheBridge extends EnergyItems implements ArmourUpgrade, ISig
@Override @Override
public ItemStack onItemRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer) 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; return par1ItemStack;
} }
@ -114,7 +114,7 @@ public class SigilOfTheBridge extends EnergyItems implements ArmourUpgrade, ISig
NBTTagCompound tag = par1ItemStack.getTagCompound(); NBTTagCompound tag = par1ItemStack.getTagCompound();
tag.setBoolean("isActive", !(tag.getBoolean("isActive"))); 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); par1ItemStack.setItemDamage(1);
tag.setInteger("worldTimeDelay", (int) (par2World.getWorldTime() - 1) % tickDelay); 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 (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); this.setLPUsed(par1ItemStack, 0);
}else }else

10
src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilOfTheFastMiner.java
View file

@ -3,7 +3,7 @@ package WayofTime.alchemicalWizardry.common.items.sigil;
import WayofTime.alchemicalWizardry.AlchemicalWizardry; import WayofTime.alchemicalWizardry.AlchemicalWizardry;
import WayofTime.alchemicalWizardry.api.items.interfaces.ArmourUpgrade; import WayofTime.alchemicalWizardry.api.items.interfaces.ArmourUpgrade;
import WayofTime.alchemicalWizardry.api.items.interfaces.ISigil; 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.Side;
import cpw.mods.fml.relauncher.SideOnly; import cpw.mods.fml.relauncher.SideOnly;
import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.client.renderer.texture.IIconRegister;
@ -19,7 +19,7 @@ import net.minecraft.world.World;
import java.util.List; import java.util.List;
public class SigilOfTheFastMiner extends EnergyItems implements ArmourUpgrade, ISigil public class SigilOfTheFastMiner extends BindableItems implements ArmourUpgrade, ISigil
{ {
@SideOnly(Side.CLIENT) @SideOnly(Side.CLIENT)
private IIcon activeIcon; private IIcon activeIcon;
@ -97,7 +97,7 @@ public class SigilOfTheFastMiner extends EnergyItems implements ArmourUpgrade, I
@Override @Override
public ItemStack onItemRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer) 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; return par1ItemStack;
} }
@ -110,7 +110,7 @@ public class SigilOfTheFastMiner extends EnergyItems implements ArmourUpgrade, I
NBTTagCompound tag = par1ItemStack.getTagCompound(); NBTTagCompound tag = par1ItemStack.getTagCompound();
tag.setBoolean("isActive", !(tag.getBoolean("isActive"))); 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); par1ItemStack.setItemDamage(1);
tag.setInteger("worldTimeDelay", (int) (par2World.getWorldTime() - 1) % 200); 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 (!par3EntityPlayer.capabilities.isCreativeMode)
{ {
if (!EnergyItems.syphonBatteries(par1ItemStack, par3EntityPlayer, getEnergyUsed())) if (!BindableItems.syphonBatteries(par1ItemStack, par3EntityPlayer, getEnergyUsed()))
{ {
par1ItemStack.getTagCompound().setBoolean("isActive", false); par1ItemStack.getTagCompound().setBoolean("isActive", false);
} }

8
src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilOfWind.java
View file

@ -12,7 +12,7 @@ import net.minecraft.world.World;
import WayofTime.alchemicalWizardry.AlchemicalWizardry; import WayofTime.alchemicalWizardry.AlchemicalWizardry;
import WayofTime.alchemicalWizardry.api.items.interfaces.ArmourUpgrade; import WayofTime.alchemicalWizardry.api.items.interfaces.ArmourUpgrade;
import WayofTime.alchemicalWizardry.api.items.interfaces.ISigil; 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 public class SigilOfWind extends SigilToggleable implements ArmourUpgrade, ISigil
{ {
@ -46,7 +46,7 @@ public class SigilOfWind extends SigilToggleable implements ArmourUpgrade, ISigi
@Override @Override
public ItemStack onItemRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer) 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; return par1ItemStack;
} }
@ -59,7 +59,7 @@ public class SigilOfWind extends SigilToggleable implements ArmourUpgrade, ISigi
NBTTagCompound tag = par1ItemStack.getTagCompound(); NBTTagCompound tag = par1ItemStack.getTagCompound();
this.setActivated(par1ItemStack, !(this.getActivated(par1ItemStack))); 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); par1ItemStack.setItemDamage(1);
tag.setInteger("worldTimeDelay", (int) (par2World.getWorldTime() - 1) % 200); 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 (!par3EntityPlayer.capabilities.isCreativeMode)
{ {
if (!EnergyItems.syphonBatteries(par1ItemStack, par3EntityPlayer, getEnergyUsed())) if (!BindableItems.syphonBatteries(par1ItemStack, par3EntityPlayer, getEnergyUsed()))
{ {
this.setActivated(par1ItemStack, false); this.setActivated(par1ItemStack, false);
} }

10
src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilPackRat.java
View file

@ -16,11 +16,11 @@ import WayofTime.alchemicalWizardry.AlchemicalWizardry;
import WayofTime.alchemicalWizardry.api.compress.CompressionRegistry; import WayofTime.alchemicalWizardry.api.compress.CompressionRegistry;
import WayofTime.alchemicalWizardry.api.items.interfaces.ArmourUpgrade; import WayofTime.alchemicalWizardry.api.items.interfaces.ArmourUpgrade;
import WayofTime.alchemicalWizardry.api.items.interfaces.IHolding; 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.Side;
import cpw.mods.fml.relauncher.SideOnly; 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) @SideOnly(Side.CLIENT)
private IIcon activeIcon; private IIcon activeIcon;
@ -98,7 +98,7 @@ public class SigilPackRat extends EnergyItems implements IHolding, ArmourUpgrade
@Override @Override
public ItemStack onItemRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer) 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; return par1ItemStack;
} }
@ -118,7 +118,7 @@ public class SigilPackRat extends EnergyItems implements IHolding, ArmourUpgrade
if (!par3EntityPlayer.capabilities.isCreativeMode) if (!par3EntityPlayer.capabilities.isCreativeMode)
{ {
if (!EnergyItems.syphonBatteries(par1ItemStack, par3EntityPlayer, getEnergyUsed())) if (!BindableItems.syphonBatteries(par1ItemStack, par3EntityPlayer, getEnergyUsed()))
{ {
tag.setBoolean("isActive", false); tag.setBoolean("isActive", false);
} }
@ -159,7 +159,7 @@ public class SigilPackRat extends EnergyItems implements IHolding, ArmourUpgrade
{ {
if (!par3EntityPlayer.capabilities.isCreativeMode) if (!par3EntityPlayer.capabilities.isCreativeMode)
{ {
if(!EnergyItems.syphonBatteries(par1ItemStack, par3EntityPlayer, getEnergyUsed())) if(!BindableItems.syphonBatteries(par1ItemStack, par3EntityPlayer, getEnergyUsed()))
{ {
par1ItemStack.getTagCompound().setBoolean("isActive", false); par1ItemStack.getTagCompound().setBoolean("isActive", false);
} }

4
src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilSeer.java
View file

@ -4,7 +4,7 @@ import WayofTime.alchemicalWizardry.AlchemicalWizardry;
import WayofTime.alchemicalWizardry.api.items.interfaces.ArmourUpgrade; import WayofTime.alchemicalWizardry.api.items.interfaces.ArmourUpgrade;
import WayofTime.alchemicalWizardry.api.items.interfaces.IHolding; import WayofTime.alchemicalWizardry.api.items.interfaces.IHolding;
import WayofTime.alchemicalWizardry.api.items.interfaces.ISigil; 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.Side;
import cpw.mods.fml.relauncher.SideOnly; import cpw.mods.fml.relauncher.SideOnly;
import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.client.renderer.texture.IIconRegister;
@ -47,7 +47,7 @@ public class SigilSeer extends Item implements IHolding, ArmourUpgrade, ISigil
@Override @Override
public ItemStack onItemRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer) 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; return par1ItemStack;
} }

4
src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilToggleable.java
View file

@ -1,9 +1,9 @@
package WayofTime.alchemicalWizardry.common.items.sigil; package WayofTime.alchemicalWizardry.common.items.sigil;
import net.minecraft.item.ItemStack; 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) public void setActivated(ItemStack stack, boolean newActivated)
{ {

8
src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilVoid.java
View file

@ -15,7 +15,7 @@ import net.minecraftforge.fluids.FluidStack;
import net.minecraftforge.fluids.IFluidHandler; import net.minecraftforge.fluids.IFluidHandler;
import WayofTime.alchemicalWizardry.AlchemicalWizardry; import WayofTime.alchemicalWizardry.AlchemicalWizardry;
import WayofTime.alchemicalWizardry.api.items.interfaces.ArmourUpgrade; 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.complex.effect.SpellHelper;
import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly; import cpw.mods.fml.relauncher.SideOnly;
@ -79,7 +79,7 @@ public class SigilVoid extends ItemBucket implements ArmourUpgrade, ISigil
@Override @Override
public boolean onItemUseFirst(ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int side, float hitX, float hitY, float hitZ) 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; return false;
} }
@ -96,7 +96,7 @@ public class SigilVoid extends ItemBucket implements ArmourUpgrade, ISigil
{ {
FluidStack amount = ((IFluidHandler) tile).drain(ForgeDirection.getOrientation(side), 1000, false); 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); ((IFluidHandler) tile).drain(ForgeDirection.getOrientation(side), 1000, true);
return true; return true;
@ -140,7 +140,7 @@ public class SigilVoid extends ItemBucket implements ArmourUpgrade, ISigil
return false; 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); world.setBlockToAir(x, y, z);
return true; return true;

8
src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilWater.java
View file

@ -22,7 +22,7 @@ import net.minecraftforge.fluids.FluidStack;
import net.minecraftforge.fluids.IFluidHandler; import net.minecraftforge.fluids.IFluidHandler;
import WayofTime.alchemicalWizardry.AlchemicalWizardry; import WayofTime.alchemicalWizardry.AlchemicalWizardry;
import WayofTime.alchemicalWizardry.api.items.interfaces.ArmourUpgrade; 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.Side;
import cpw.mods.fml.relauncher.SideOnly; import cpw.mods.fml.relauncher.SideOnly;
@ -83,7 +83,7 @@ public class SigilWater extends ItemBucket implements ArmourUpgrade, ISigil
@Override @Override
public boolean onItemUseFirst(ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int side, float hitX, float hitY, float hitZ) 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; return false;
} }
@ -99,7 +99,7 @@ public class SigilWater extends ItemBucket implements ArmourUpgrade, ISigil
FluidStack fluid = new FluidStack(FluidRegistry.WATER, 1000); FluidStack fluid = new FluidStack(FluidRegistry.WATER, 1000);
int amount = ((IFluidHandler) tile).fill(ForgeDirection.getOrientation(side), fluid, false); 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); ((IFluidHandler) tile).fill(ForgeDirection.getOrientation(side), fluid, true);
} }
@ -147,7 +147,7 @@ public class SigilWater extends ItemBucket implements ArmourUpgrade, ISigil
return false; 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); return this.tryPlaceContainedLiquid(world, x, y, z, x, y, z);
} }

4
src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/holding/SigilOfHolding.java
View file

@ -13,9 +13,9 @@ import net.minecraft.util.MathHelper;
import net.minecraft.util.StatCollector; import net.minecraft.util.StatCollector;
import net.minecraft.world.World; import net.minecraft.world.World;
import WayofTime.alchemicalWizardry.AlchemicalWizardry; 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; private static int invSize = 4;

19
src/main/java/WayofTime/alchemicalWizardry/common/potion/PotionAmphibian.java
View file

@ -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;
}
}

Some files were not shown because too many files have changed in this diff Show more