diff --git a/BM_src/WayofTime/alchemicalWizardry/AlchemicalWizardry.java b/BM_src/WayofTime/alchemicalWizardry/AlchemicalWizardry.java index 2f387e4b..ff4032d3 100644 --- a/BM_src/WayofTime/alchemicalWizardry/AlchemicalWizardry.java +++ b/BM_src/WayofTime/alchemicalWizardry/AlchemicalWizardry.java @@ -3,6 +3,7 @@ package WayofTime.alchemicalWizardry; import java.io.File; import java.lang.reflect.Field; import java.lang.reflect.Modifier; +import java.util.ArrayList; import net.minecraft.block.Block; import net.minecraft.creativetab.CreativeTabs; @@ -20,6 +21,10 @@ import net.minecraftforge.fluids.FluidContainerRegistry; import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.oredict.OreDictionary; import thaumcraft.api.ItemApi; +import WayofTime.alchemicalWizardry.api.alchemy.AlchemicalPotionCreationHandler; +import WayofTime.alchemicalWizardry.api.altarRecipeRegistry.AltarRecipeRegistry; +import WayofTime.alchemicalWizardry.api.rituals.RitualComponent; +import WayofTime.alchemicalWizardry.api.rituals.Rituals; import WayofTime.alchemicalWizardry.common.AlchemicalWizardryEventHooks; import WayofTime.alchemicalWizardry.common.AlchemicalWizardryFuelHandler; import WayofTime.alchemicalWizardry.common.CommonProxy; @@ -38,9 +43,7 @@ import WayofTime.alchemicalWizardry.common.PotionInhibit; import WayofTime.alchemicalWizardry.common.PotionPlanarBinding; import WayofTime.alchemicalWizardry.common.PotionProjectileProtect; import WayofTime.alchemicalWizardry.common.PotionReciprocation; -import WayofTime.alchemicalWizardry.common.alchemy.AlchemicalPotionCreationHandler; import WayofTime.alchemicalWizardry.common.alchemy.AlchemyRecipeRegistry; -import WayofTime.alchemicalWizardry.common.altarRecipeRegistry.AltarRecipeRegistry; import WayofTime.alchemicalWizardry.common.block.ArmourForge; import WayofTime.alchemicalWizardry.common.block.LifeEssenceBlock; import WayofTime.alchemicalWizardry.common.bloodAltarUpgrade.UpgradedAltars; @@ -66,7 +69,26 @@ import WayofTime.alchemicalWizardry.common.items.ItemSpellParadigmBlock; import WayofTime.alchemicalWizardry.common.items.LifeBucket; import WayofTime.alchemicalWizardry.common.items.sigil.SigilOfHolding; import WayofTime.alchemicalWizardry.common.items.thaumcraft.ItemSanguineArmour; -import WayofTime.alchemicalWizardry.common.rituals.Rituals; +import WayofTime.alchemicalWizardry.common.rituals.RitualEffectAnimalGrowth; +import WayofTime.alchemicalWizardry.common.rituals.RitualEffectAutoAlchemy; +import WayofTime.alchemicalWizardry.common.rituals.RitualEffectBiomeChanger; +import WayofTime.alchemicalWizardry.common.rituals.RitualEffectContainment; +import WayofTime.alchemicalWizardry.common.rituals.RitualEffectCrushing; +import WayofTime.alchemicalWizardry.common.rituals.RitualEffectFeatheredEarth; +import WayofTime.alchemicalWizardry.common.rituals.RitualEffectFeatheredKnife; +import WayofTime.alchemicalWizardry.common.rituals.RitualEffectFlight; +import WayofTime.alchemicalWizardry.common.rituals.RitualEffectGrowth; +import WayofTime.alchemicalWizardry.common.rituals.RitualEffectHealing; +import WayofTime.alchemicalWizardry.common.rituals.RitualEffectInterdiction; +import WayofTime.alchemicalWizardry.common.rituals.RitualEffectJumping; +import WayofTime.alchemicalWizardry.common.rituals.RitualEffectLava; +import WayofTime.alchemicalWizardry.common.rituals.RitualEffectLeap; +import WayofTime.alchemicalWizardry.common.rituals.RitualEffectMagnetic; +import WayofTime.alchemicalWizardry.common.rituals.RitualEffectSoulBound; +import WayofTime.alchemicalWizardry.common.rituals.RitualEffectSummonMeteor; +import WayofTime.alchemicalWizardry.common.rituals.RitualEffectUnbinding; +import WayofTime.alchemicalWizardry.common.rituals.RitualEffectWater; +import WayofTime.alchemicalWizardry.common.rituals.RitualEffectWellOfSuffering; import WayofTime.alchemicalWizardry.common.spell.simple.HomSpellRegistry; import WayofTime.alchemicalWizardry.common.spell.simple.SpellEarthBender; import WayofTime.alchemicalWizardry.common.spell.simple.SpellExplosions; @@ -808,13 +830,18 @@ public class AlchemicalWizardry proxy.registerEntityTrackers(); //Gui registration // NetworkRegistry.instance().registerGuiHandler(this, new GuiHandlerAltar()); - Rituals.loadRituals(); + UpgradedAltars.loadAltars(); SigilOfHolding.initiateSigilOfHolding(); ArmourForge.initializeRecipes(); TEPlinth.initialize(); - AlchemicalPotionCreationHandler.initializePotions(); - AltarRecipeRegistry.initRecipes(); + + //TODO + this.initAlchemyPotionRecipes(); + this.initAltarRecipes(); + this.initRituals(); + + MinecraftForge.setToolClass(ModItems.boundPickaxe, "pickaxe", 5); MinecraftForge.setToolClass(ModItems.boundAxe, "axe", 5); MinecraftForge.setToolClass(ModItems.boundShovel, "shovel", 5); @@ -1169,4 +1196,766 @@ public class AlchemicalWizardry this.isGCLoaded = false; } } + + public static void initAlchemyPotionRecipes() + { + AlchemicalPotionCreationHandler.addPotion(new ItemStack(Item.ghastTear), Potion.regeneration.id, 450); + AlchemicalPotionCreationHandler.addPotion(new ItemStack(Item.goldenCarrot), Potion.nightVision.id, 2 * 60 * 20); + AlchemicalPotionCreationHandler.addPotion(new ItemStack(Item.magmaCream), Potion.fireResistance.id, 2 * 60 * 20); + AlchemicalPotionCreationHandler.addPotion(new ItemStack(Item.bucketWater), Potion.waterBreathing.id, 2 * 60 * 20); + AlchemicalPotionCreationHandler.addPotion(new ItemStack(Item.sugar), Potion.moveSpeed.id, 2 * 60 * 20); + AlchemicalPotionCreationHandler.addPotion(new ItemStack(Item.speckledMelon), Potion.heal.id, 2 * 60 * 20); + AlchemicalPotionCreationHandler.addPotion(new ItemStack(Item.spiderEye), Potion.poison.id, 450); + AlchemicalPotionCreationHandler.addPotion(new ItemStack(Item.fermentedSpiderEye), Potion.weakness.id, 450); + AlchemicalPotionCreationHandler.addPotion(new ItemStack(Item.blazePowder), Potion.damageBoost.id, 2 * 60 * 20); + AlchemicalPotionCreationHandler.addPotion(new ItemStack(ModItems.aether), Potion.jump.id, 2 * 60 * 20); + AlchemicalPotionCreationHandler.addPotion(new ItemStack(Item.clay), Potion.moveSlowdown.id, 450); + AlchemicalPotionCreationHandler.addPotion(new ItemStack(Item.redstone), Potion.digSpeed.id, 2 * 60 * 20); + AlchemicalPotionCreationHandler.addPotion(new ItemStack(Item.potion, 1, 0), AlchemicalWizardry.customPotionDrowning.id, 450); + //AlchemicalPotionCreationHandler.addPotion(new ItemStack(Item.goldenCarrot),Potion.nightVision.id,2*60*20); + AlchemicalPotionCreationHandler.addPotion(new ItemStack(Item.glassBottle), Potion.invisibility.id, 2 * 60 * 20); + AlchemicalPotionCreationHandler.addPotion(new ItemStack(Item.diamond), Potion.resistance.id, 2 * 60 * 20); + AlchemicalPotionCreationHandler.addPotion(new ItemStack(Item.poisonousPotato), Potion.field_76443_y.id, 2); //saturation + AlchemicalPotionCreationHandler.addPotion(new ItemStack(ModItems.demonBloodShard), Potion.field_76434_w.id, 4 * 60 * 20); //health boost + AlchemicalPotionCreationHandler.addPotion(new ItemStack(ModItems.weakBloodShard), Potion.field_76444_x.id, 4 * 60 * 20); //Absorption + AlchemicalPotionCreationHandler.addPotion(new ItemStack(ModItems.terrae), AlchemicalWizardry.customPotionBoost.id, 1 * 60 * 20); + AlchemicalPotionCreationHandler.addPotion(new ItemStack(Item.feather), AlchemicalWizardry.customPotionFlight.id, 1 * 60 * 20); + AlchemicalPotionCreationHandler.addPotion(new ItemStack(Item.arrow), AlchemicalWizardry.customPotionReciprocation.id, 1 * 60 * 20); + AlchemicalPotionCreationHandler.addPotion(new ItemStack(Item.enderPearl),AlchemicalWizardry.customPotionPlanarBinding.id,1*60*20); + } + + public static void initAltarRecipes() + { + AltarRecipeRegistry.registerAltarRecipe(new ItemStack(ModItems.weakBloodOrb), new ItemStack(Item.diamond),1,2000,2,1,false); + AltarRecipeRegistry.registerAltarRecipe(new ItemStack(ModItems.apprenticeBloodOrb), new ItemStack(Item.emerald),2,5000,5,5,false); + AltarRecipeRegistry.registerAltarRecipe(new ItemStack(ModItems.magicianBloodOrb), new ItemStack(Block.blockGold),3,25000,20,20,false); + AltarRecipeRegistry.registerAltarRecipe(new ItemStack(ModItems.masterBloodOrb), new ItemStack(ModItems.weakBloodShard),4,40000,30,50,false); + AltarRecipeRegistry.registerAltarRecipe(new ItemStack(ModItems.archmageBloodOrb), new ItemStack(ModItems.demonBloodShard),5,75000,50,100,false); + + AltarRecipeRegistry.registerAltarOrbRecipe(new ItemStack(ModItems.weakBloodOrb),1,2); + AltarRecipeRegistry.registerAltarOrbRecipe(new ItemStack(ModItems.apprenticeBloodOrb),2,5); + AltarRecipeRegistry.registerAltarOrbRecipe(new ItemStack(ModItems.magicianBloodOrb),3,15); + AltarRecipeRegistry.registerAltarOrbRecipe(new ItemStack(ModItems.masterBloodOrb),4,25); + AltarRecipeRegistry.registerAltarOrbRecipe(new ItemStack(ModItems.archmageBloodOrb),5,50); + + AltarRecipeRegistry.registerAltarRecipe(new ItemStack(ModItems.telepositionFocus), new ItemStack(Item.enderPearl),4,2000,10,10,false); + AltarRecipeRegistry.registerAltarRecipe(new ItemStack(ModItems.enhancedTelepositionFocus), new ItemStack(ModItems.telepositionFocus),4,10000,25,15,false); + AltarRecipeRegistry.registerAltarRecipe(new ItemStack(ModItems.demonicSlate), new ItemStack(ModItems.imbuedSlate),4,15000,20,20,false); + AltarRecipeRegistry.registerAltarRecipe(new ItemStack(ModItems.duskScribeTool), new ItemStack(Block.coalBlock),4,2000,20,10,false); + AltarRecipeRegistry.registerAltarRecipe(new ItemStack(ModBlocks.bloodSocket), new ItemStack(ModBlocks.emptySocket),3,30000,40,10,false); + AltarRecipeRegistry.registerAltarRecipe(new ItemStack(ModItems.earthScribeTool), new ItemStack(Block.obsidian),3,1000,5,5,false); + AltarRecipeRegistry.registerAltarRecipe(new ItemStack(ModItems.waterScribeTool), new ItemStack(Block.blockLapis),3,1000,5,5,false); + AltarRecipeRegistry.registerAltarRecipe(new ItemStack(ModItems.blankSpell), new ItemStack(Block.glass),2,1000,5,5,false); + AltarRecipeRegistry.registerAltarRecipe(new ItemStack(ModItems.blankSlate), new ItemStack(Block.stone),1,1000,5,5,false); + AltarRecipeRegistry.registerAltarRecipe(new ItemStack(ModItems.activationCrystal), new ItemStack(ModItems.lavaCrystal),3,10000,20,10,false); + AltarRecipeRegistry.registerAltarRecipe(new ItemStack(ModItems.fireScribeTool), new ItemStack(Item.magmaCream),3,1000,5,5,false); + AltarRecipeRegistry.registerAltarRecipe(new ItemStack(ModItems.airScribeTool), new ItemStack(Item.ghastTear),3,1000,5,5,false); + AltarRecipeRegistry.registerAltarRecipe(new ItemStack(ModItems.imbuedSlate), new ItemStack(ModItems.reinforcedSlate),3,5000,15,10,false); + AltarRecipeRegistry.registerAltarRecipe(new ItemStack(ModItems.daggerOfSacrifice), new ItemStack(Item.swordIron),2,3000,5,5,false); + AltarRecipeRegistry.registerAltarRecipe(new ItemStack(ModItems.alchemyFlask), new ItemStack(Item.glassBottle),2,2000,5,5,false); + AltarRecipeRegistry.registerAltarRecipe(new ItemStack(ModItems.reinforcedSlate), new ItemStack(ModItems.blankSlate),2,2000,5,5,false); + AltarRecipeRegistry.registerAltarRecipe(new ItemStack(AlchemicalWizardry.bucketLife), new ItemStack(Item.bucketEmpty),1,1000,5,0,false); + } + + public static void initRituals() + { + ArrayList waterRitual = new ArrayList(); + waterRitual.add(new RitualComponent(-1, 0, 1, 1)); + waterRitual.add(new RitualComponent(-1, 0, -1, 1)); + waterRitual.add(new RitualComponent(1, 0, -1, 1)); + waterRitual.add(new RitualComponent(1, 0, 1, 1)); + ArrayList lavaRitual = new ArrayList(); + lavaRitual.add(new RitualComponent(1, 0, 0, 2)); + lavaRitual.add(new RitualComponent(-1, 0, 0, 2)); + lavaRitual.add(new RitualComponent(0, 0, 1, 2)); + lavaRitual.add(new RitualComponent(0, 0, -1, 2)); + ArrayList growthRitual = new ArrayList(); + growthRitual.add(new RitualComponent(1, 0, 0, 1)); + growthRitual.add(new RitualComponent(-1, 0, 0, 1)); + growthRitual.add(new RitualComponent(0, 0, 1, 1)); + growthRitual.add(new RitualComponent(0, 0, -1, 1)); + growthRitual.add(new RitualComponent(-1, 0, 1, 3)); + growthRitual.add(new RitualComponent(1, 0, 1, 3)); + growthRitual.add(new RitualComponent(-1, 0, -1, 3)); + growthRitual.add(new RitualComponent(1, 0, -1, 3)); + ArrayList interdictionRitual = new ArrayList(); + interdictionRitual.add(new RitualComponent(1, 0, 0, 4)); + interdictionRitual.add(new RitualComponent(-1, 0, 0, 4)); + interdictionRitual.add(new RitualComponent(0, 0, 1, 4)); + interdictionRitual.add(new RitualComponent(0, 0, -1, 4)); + interdictionRitual.add(new RitualComponent(-1, 0, 1, 4)); + interdictionRitual.add(new RitualComponent(1, 0, 1, 4)); + interdictionRitual.add(new RitualComponent(-1, 0, -1, 4)); + interdictionRitual.add(new RitualComponent(1, 0, -1, 4)); + ArrayList containmentRitual = new ArrayList(); + containmentRitual.add(new RitualComponent(1, 0, 0, 3)); + containmentRitual.add(new RitualComponent(-1, 0, 0, 3)); + containmentRitual.add(new RitualComponent(0, 0, 1, 3)); + containmentRitual.add(new RitualComponent(0, 0, -1, 3)); + containmentRitual.add(new RitualComponent(2, 0, 2, 3)); + containmentRitual.add(new RitualComponent(2, 0, -2, 3)); + containmentRitual.add(new RitualComponent(-2, 0, 2, 3)); + containmentRitual.add(new RitualComponent(-2, 0, -2, 3)); + containmentRitual.add(new RitualComponent(1, 5, 0, 3)); + containmentRitual.add(new RitualComponent(-1, 5, 0, 3)); + containmentRitual.add(new RitualComponent(0, 5, 1, 3)); + containmentRitual.add(new RitualComponent(0, 5, -1, 3)); + containmentRitual.add(new RitualComponent(2, 5, 2, 3)); + containmentRitual.add(new RitualComponent(2, 5, -2, 3)); + containmentRitual.add(new RitualComponent(-2, 5, 2, 3)); + containmentRitual.add(new RitualComponent(-2, 5, -2, 3)); + //Bound soul ritual + ArrayList boundSoulRitual = new ArrayList(); + boundSoulRitual.add(new RitualComponent(3, 0, 0, 2)); + boundSoulRitual.add(new RitualComponent(-3, 0, 0, 2)); + boundSoulRitual.add(new RitualComponent(0, 0, 3, 2)); + boundSoulRitual.add(new RitualComponent(0, 0, -3, 2)); + boundSoulRitual.add(new RitualComponent(2, 0, 2, 4)); + boundSoulRitual.add(new RitualComponent(-2, 0, 2, 4)); + boundSoulRitual.add(new RitualComponent(2, 0, -2, 4)); + boundSoulRitual.add(new RitualComponent(-2, 0, -2, 4)); + boundSoulRitual.add(new RitualComponent(4, 2, 0, 1)); + boundSoulRitual.add(new RitualComponent(-4, 2, 0, 1)); + boundSoulRitual.add(new RitualComponent(0, 2, 4, 1)); + boundSoulRitual.add(new RitualComponent(0, 2, -4, 1)); + boundSoulRitual.add(new RitualComponent(3, 2, 3, 3)); + boundSoulRitual.add(new RitualComponent(3, 2, -3, 3)); + boundSoulRitual.add(new RitualComponent(-3, 2, 3, 3)); + boundSoulRitual.add(new RitualComponent(-3, 2, -3, 3)); + boundSoulRitual.add(new RitualComponent(4, 1, 0, 0)); + boundSoulRitual.add(new RitualComponent(-4, 1, 0, 0)); + boundSoulRitual.add(new RitualComponent(0, 1, 4, 0)); + boundSoulRitual.add(new RitualComponent(0, 1, -4, 0)); + boundSoulRitual.add(new RitualComponent(3, 1, 3, 0)); + boundSoulRitual.add(new RitualComponent(3, 1, -3, 0)); + boundSoulRitual.add(new RitualComponent(-3, 1, 3, 0)); + boundSoulRitual.add(new RitualComponent(-3, 1, -3, 0)); + // + ArrayList unbindingRitual = new ArrayList(); + unbindingRitual.add(new RitualComponent(-2, 0, 0, 4)); + unbindingRitual.add(new RitualComponent(2, 0, 0, 4)); + unbindingRitual.add(new RitualComponent(0, 0, 2, 4)); + unbindingRitual.add(new RitualComponent(0, 0, -2, 4)); + unbindingRitual.add(new RitualComponent(-2, 0, -2, 3)); + unbindingRitual.add(new RitualComponent(-2, 0, -3, 3)); + unbindingRitual.add(new RitualComponent(-3, 0, -2, 3)); + unbindingRitual.add(new RitualComponent(2, 0, -2, 3)); + unbindingRitual.add(new RitualComponent(2, 0, -3, 3)); + unbindingRitual.add(new RitualComponent(3, 0, -2, 3)); + unbindingRitual.add(new RitualComponent(-2, 0, 2, 3)); + unbindingRitual.add(new RitualComponent(-2, 0, 3, 3)); + unbindingRitual.add(new RitualComponent(-3, 0, 2, 3)); + unbindingRitual.add(new RitualComponent(2, 0, 2, 3)); + unbindingRitual.add(new RitualComponent(2, 0, 3, 3)); + unbindingRitual.add(new RitualComponent(3, 0, 2, 3)); + unbindingRitual.add(new RitualComponent(3, 1, 3, 0)); + unbindingRitual.add(new RitualComponent(3, 1, -3, 0)); + unbindingRitual.add(new RitualComponent(-3, 1, -3, 0)); + unbindingRitual.add(new RitualComponent(-3, 1, 3, 0)); + unbindingRitual.add(new RitualComponent(3, 2, 3, 0)); + unbindingRitual.add(new RitualComponent(3, 2, -3, 0)); + unbindingRitual.add(new RitualComponent(-3, 2, -3, 0)); + unbindingRitual.add(new RitualComponent(-3, 2, 3, 0)); + unbindingRitual.add(new RitualComponent(3, 3, 3, 2)); + unbindingRitual.add(new RitualComponent(3, 3, -3, 2)); + unbindingRitual.add(new RitualComponent(-3, 3, -3, 2)); + unbindingRitual.add(new RitualComponent(-3, 3, 3, 2)); + unbindingRitual.add(new RitualComponent(-5, 0, 0, 2)); + unbindingRitual.add(new RitualComponent(5, 0, 0, 2)); + unbindingRitual.add(new RitualComponent(0, 0, 5, 2)); + unbindingRitual.add(new RitualComponent(0, 0, -5, 2)); + ArrayList jumpingRitual = new ArrayList(); + + for (int i = -1; i <= 1; i++) + { + jumpingRitual.add(new RitualComponent(1, i, 1, RitualComponent.AIR)); + jumpingRitual.add(new RitualComponent(-1, i, 1, RitualComponent.AIR)); + jumpingRitual.add(new RitualComponent(-1, i, -1, RitualComponent.AIR)); + jumpingRitual.add(new RitualComponent(1, i, -1, RitualComponent.AIR)); + } + + ArrayList magneticRitual = new ArrayList(); + magneticRitual.add(new RitualComponent(1, 0, 1, RitualComponent.EARTH)); + magneticRitual.add(new RitualComponent(1, 0, -1, RitualComponent.EARTH)); + magneticRitual.add(new RitualComponent(-1, 0, 1, RitualComponent.EARTH)); + magneticRitual.add(new RitualComponent(-1, 0, -1, RitualComponent.EARTH)); + magneticRitual.add(new RitualComponent(2, 1, 0, RitualComponent.EARTH)); + magneticRitual.add(new RitualComponent(0, 1, 2, RitualComponent.EARTH)); + magneticRitual.add(new RitualComponent(-2, 1, 0, RitualComponent.EARTH)); + magneticRitual.add(new RitualComponent(0, 1, -2, RitualComponent.EARTH)); + magneticRitual.add(new RitualComponent(2, 1, 2, RitualComponent.AIR)); + magneticRitual.add(new RitualComponent(2, 1, -2, RitualComponent.AIR)); + magneticRitual.add(new RitualComponent(-2, 1, 2, RitualComponent.AIR)); + magneticRitual.add(new RitualComponent(-2, 1, -2, RitualComponent.AIR)); + magneticRitual.add(new RitualComponent(2, 2, 0, RitualComponent.FIRE)); + magneticRitual.add(new RitualComponent(0, 2, 2, RitualComponent.FIRE)); + magneticRitual.add(new RitualComponent(-2, 2, 0, RitualComponent.FIRE)); + magneticRitual.add(new RitualComponent(0, 2, -2, RitualComponent.FIRE)); + ArrayList crushingRitual = new ArrayList(); + crushingRitual.add(new RitualComponent(0, 0, 1, RitualComponent.EARTH)); + crushingRitual.add(new RitualComponent(1, 0, 0, RitualComponent.EARTH)); + crushingRitual.add(new RitualComponent(0, 0, -1, RitualComponent.EARTH)); + crushingRitual.add(new RitualComponent(-1, 0, 0, RitualComponent.EARTH)); + crushingRitual.add(new RitualComponent(2, 0, 0, RitualComponent.FIRE)); + crushingRitual.add(new RitualComponent(0, 0, 2, RitualComponent.FIRE)); + crushingRitual.add(new RitualComponent(-2, 0, 0, RitualComponent.FIRE)); + crushingRitual.add(new RitualComponent(0, 0, -2, RitualComponent.FIRE)); + crushingRitual.add(new RitualComponent(2, 0, 2, RitualComponent.DUSK)); + crushingRitual.add(new RitualComponent(2, 0, -2, RitualComponent.DUSK)); + crushingRitual.add(new RitualComponent(-2, 0, 2, RitualComponent.DUSK)); + crushingRitual.add(new RitualComponent(-2, 0, -2, RitualComponent.DUSK)); + crushingRitual.add(new RitualComponent(2, 1, 0, RitualComponent.AIR)); + crushingRitual.add(new RitualComponent(-2, 1, 0, RitualComponent.AIR)); + crushingRitual.add(new RitualComponent(0, 1, 2, RitualComponent.AIR)); + crushingRitual.add(new RitualComponent(0, 1, -2, RitualComponent.AIR)); + ArrayList leapingRitual = new ArrayList(); + leapingRitual.add(new RitualComponent(0, 0, -2, RitualComponent.DUSK)); + leapingRitual.add(new RitualComponent(1, 0, -1, RitualComponent.AIR)); + leapingRitual.add(new RitualComponent(-1, 0, -1, RitualComponent.AIR)); + + for (int i = 0; i <= 2; i++) + { + leapingRitual.add(new RitualComponent(2, 0, i, RitualComponent.AIR)); + leapingRitual.add(new RitualComponent(-2, 0, i, RitualComponent.AIR)); + } + + //Animal Growth + ArrayList animalGrowthRitual = new ArrayList(); + animalGrowthRitual.add(new RitualComponent(0, 0, 2, RitualComponent.DUSK)); + animalGrowthRitual.add(new RitualComponent(2, 0, 0, RitualComponent.DUSK)); + animalGrowthRitual.add(new RitualComponent(0, 0, -2, RitualComponent.DUSK)); + animalGrowthRitual.add(new RitualComponent(-2, 0, 0, RitualComponent.DUSK)); + animalGrowthRitual.add(new RitualComponent(0, 0, 1, RitualComponent.WATER)); + animalGrowthRitual.add(new RitualComponent(1, 0, 0, RitualComponent.WATER)); + animalGrowthRitual.add(new RitualComponent(0, 0, -1, RitualComponent.WATER)); + animalGrowthRitual.add(new RitualComponent(-1, 0, 0, RitualComponent.WATER)); + animalGrowthRitual.add(new RitualComponent(1, 0, 2, RitualComponent.EARTH)); + animalGrowthRitual.add(new RitualComponent(-1, 0, 2, RitualComponent.EARTH)); + animalGrowthRitual.add(new RitualComponent(1, 0, -2, RitualComponent.EARTH)); + animalGrowthRitual.add(new RitualComponent(-1, 0, -2, RitualComponent.EARTH)); + animalGrowthRitual.add(new RitualComponent(2, 0, 1, RitualComponent.AIR)); + animalGrowthRitual.add(new RitualComponent(2, 0, -1, RitualComponent.AIR)); + animalGrowthRitual.add(new RitualComponent(-2, 0, 1, RitualComponent.AIR)); + animalGrowthRitual.add(new RitualComponent(-2, 0, -1, RitualComponent.AIR)); + //Well of Suffering + ArrayList wellOfSufferingRitual = new ArrayList(); + wellOfSufferingRitual.add(new RitualComponent(1, 0, 1, RitualComponent.FIRE)); + wellOfSufferingRitual.add(new RitualComponent(-1, 0, 1, RitualComponent.FIRE)); + wellOfSufferingRitual.add(new RitualComponent(1, 0, -1, RitualComponent.FIRE)); + wellOfSufferingRitual.add(new RitualComponent(-1, 0, -1, RitualComponent.FIRE)); + wellOfSufferingRitual.add(new RitualComponent(2, -1, 2, RitualComponent.FIRE)); + wellOfSufferingRitual.add(new RitualComponent(2, -1, -2, RitualComponent.FIRE)); + wellOfSufferingRitual.add(new RitualComponent(-2, -1, 2, RitualComponent.FIRE)); + wellOfSufferingRitual.add(new RitualComponent(-2, -1, -2, RitualComponent.FIRE)); + wellOfSufferingRitual.add(new RitualComponent(0, -1, 2, RitualComponent.EARTH)); + wellOfSufferingRitual.add(new RitualComponent(2, -1, 0, RitualComponent.EARTH)); + wellOfSufferingRitual.add(new RitualComponent(0, -1, -2, RitualComponent.EARTH)); + wellOfSufferingRitual.add(new RitualComponent(-2, -1, 0, RitualComponent.EARTH)); + wellOfSufferingRitual.add(new RitualComponent(-3, -1, -3, RitualComponent.DUSK)); + wellOfSufferingRitual.add(new RitualComponent(3, -1, -3, RitualComponent.DUSK)); + wellOfSufferingRitual.add(new RitualComponent(-3, -1, 3, RitualComponent.DUSK)); + wellOfSufferingRitual.add(new RitualComponent(3, -1, 3, RitualComponent.DUSK)); + wellOfSufferingRitual.add(new RitualComponent(2, -1, 4, RitualComponent.WATER)); + wellOfSufferingRitual.add(new RitualComponent(4, -1, 2, RitualComponent.WATER)); + wellOfSufferingRitual.add(new RitualComponent(-2, -1, 4, RitualComponent.WATER)); + wellOfSufferingRitual.add(new RitualComponent(4, -1, -2, RitualComponent.WATER)); + wellOfSufferingRitual.add(new RitualComponent(2, -1, -4, RitualComponent.WATER)); + wellOfSufferingRitual.add(new RitualComponent(-4, -1, 2, RitualComponent.WATER)); + wellOfSufferingRitual.add(new RitualComponent(-2, -1, -4, RitualComponent.WATER)); + wellOfSufferingRitual.add(new RitualComponent(-4, -1, -2, RitualComponent.WATER)); + wellOfSufferingRitual.add(new RitualComponent(1, 0, 4, RitualComponent.WATER)); + wellOfSufferingRitual.add(new RitualComponent(4, 0, 1, RitualComponent.WATER)); + wellOfSufferingRitual.add(new RitualComponent(1, 0, -4, RitualComponent.WATER)); + wellOfSufferingRitual.add(new RitualComponent(-4, 0, 1, RitualComponent.WATER)); + wellOfSufferingRitual.add(new RitualComponent(-1, 0, 4, RitualComponent.WATER)); + wellOfSufferingRitual.add(new RitualComponent(4, 0, -1, RitualComponent.WATER)); + wellOfSufferingRitual.add(new RitualComponent(-1, 0, -4, RitualComponent.WATER)); + wellOfSufferingRitual.add(new RitualComponent(-4, 0, -1, RitualComponent.WATER)); + wellOfSufferingRitual.add(new RitualComponent(4, 1, 0, RitualComponent.AIR)); + wellOfSufferingRitual.add(new RitualComponent(0, 1, 4, RitualComponent.AIR)); + wellOfSufferingRitual.add(new RitualComponent(-4, 1, 0, RitualComponent.AIR)); + wellOfSufferingRitual.add(new RitualComponent(0, 1, -4, RitualComponent.AIR)); + ArrayList healingRitual = new ArrayList(); + healingRitual.add(new RitualComponent(4, 0, 0, RitualComponent.AIR)); + healingRitual.add(new RitualComponent(5, 0, -1, RitualComponent.AIR)); + healingRitual.add(new RitualComponent(5, 0, 1, RitualComponent.AIR)); + healingRitual.add(new RitualComponent(-4, 0, 0, RitualComponent.AIR)); + healingRitual.add(new RitualComponent(-5, 0, -1, RitualComponent.AIR)); + healingRitual.add(new RitualComponent(-5, 0, 1, RitualComponent.AIR)); + healingRitual.add(new RitualComponent(0, 0, 4, RitualComponent.FIRE)); + healingRitual.add(new RitualComponent(-1, 0, 5, RitualComponent.FIRE)); + healingRitual.add(new RitualComponent(1, 0, 5, RitualComponent.FIRE)); + healingRitual.add(new RitualComponent(0, 0, -4, RitualComponent.FIRE)); + healingRitual.add(new RitualComponent(-1, 0, -5, RitualComponent.FIRE)); + healingRitual.add(new RitualComponent(1, 0, -5, RitualComponent.FIRE)); + healingRitual.add(new RitualComponent(3, 0, 5, RitualComponent.WATER)); + healingRitual.add(new RitualComponent(5, 0, 3, RitualComponent.WATER)); + healingRitual.add(new RitualComponent(3, 0, -5, RitualComponent.WATER)); + healingRitual.add(new RitualComponent(5, 0, -3, RitualComponent.WATER)); + healingRitual.add(new RitualComponent(-3, 0, 5, RitualComponent.WATER)); + healingRitual.add(new RitualComponent(-5, 0, 3, RitualComponent.WATER)); + healingRitual.add(new RitualComponent(-3, 0, -5, RitualComponent.WATER)); + healingRitual.add(new RitualComponent(-5, 0, -3, RitualComponent.WATER)); + healingRitual.add(new RitualComponent(-3, 0, -3, RitualComponent.DUSK)); + healingRitual.add(new RitualComponent(-3, 0, 3, RitualComponent.DUSK)); + healingRitual.add(new RitualComponent(3, 0, -3, RitualComponent.DUSK)); + healingRitual.add(new RitualComponent(3, 0, 3, RitualComponent.DUSK)); + healingRitual.add(new RitualComponent(4, 0, 5, RitualComponent.EARTH)); + healingRitual.add(new RitualComponent(4, -1, 5, RitualComponent.EARTH)); + healingRitual.add(new RitualComponent(5, 0, 4, RitualComponent.EARTH)); + healingRitual.add(new RitualComponent(5, -1, 4, RitualComponent.EARTH)); + healingRitual.add(new RitualComponent(5, 0, 5, RitualComponent.EARTH)); + healingRitual.add(new RitualComponent(4, 0, -5, RitualComponent.EARTH)); + healingRitual.add(new RitualComponent(4, -1, -5, RitualComponent.EARTH)); + healingRitual.add(new RitualComponent(5, 0, -4, RitualComponent.EARTH)); + healingRitual.add(new RitualComponent(5, -1, -4, RitualComponent.EARTH)); + healingRitual.add(new RitualComponent(5, 0, -5, RitualComponent.EARTH)); + healingRitual.add(new RitualComponent(-4, 0, 5, RitualComponent.EARTH)); + healingRitual.add(new RitualComponent(-4, -1, 5, RitualComponent.EARTH)); + healingRitual.add(new RitualComponent(-5, 0, 4, RitualComponent.EARTH)); + healingRitual.add(new RitualComponent(-5, -1, 4, RitualComponent.EARTH)); + healingRitual.add(new RitualComponent(-5, 0, 5, RitualComponent.EARTH)); + healingRitual.add(new RitualComponent(-4, 0, -5, RitualComponent.EARTH)); + healingRitual.add(new RitualComponent(-4, -1, -5, RitualComponent.EARTH)); + healingRitual.add(new RitualComponent(-5, 0, -4, RitualComponent.EARTH)); + healingRitual.add(new RitualComponent(-5, -1, -4, RitualComponent.EARTH)); + healingRitual.add(new RitualComponent(-5, 0, -5, RitualComponent.EARTH)); + ArrayList featheredKnifeRitual = new ArrayList(); + featheredKnifeRitual.add(new RitualComponent(1, 0, 0, RitualComponent.DUSK)); + featheredKnifeRitual.add(new RitualComponent(-1, 0, 0, RitualComponent.DUSK)); + featheredKnifeRitual.add(new RitualComponent(0, 0, 1, RitualComponent.DUSK)); + featheredKnifeRitual.add(new RitualComponent(0, 0, -1, RitualComponent.DUSK)); + featheredKnifeRitual.add(new RitualComponent(2, -1, 0, RitualComponent.WATER)); + featheredKnifeRitual.add(new RitualComponent(-2, -1, 0, RitualComponent.WATER)); + featheredKnifeRitual.add(new RitualComponent(0, -1, 2, RitualComponent.WATER)); + featheredKnifeRitual.add(new RitualComponent(0, -1, -2, RitualComponent.WATER)); + featheredKnifeRitual.add(new RitualComponent(1, -1, 1, RitualComponent.AIR)); + featheredKnifeRitual.add(new RitualComponent(1, -1, -1, RitualComponent.AIR)); + featheredKnifeRitual.add(new RitualComponent(-1, -1, 1, RitualComponent.AIR)); + featheredKnifeRitual.add(new RitualComponent(-1, -1, -1, RitualComponent.AIR)); + featheredKnifeRitual.add(new RitualComponent(4, -1, 2, RitualComponent.FIRE)); + featheredKnifeRitual.add(new RitualComponent(2, -1, 4, RitualComponent.FIRE)); + featheredKnifeRitual.add(new RitualComponent(-4, -1, 2, RitualComponent.FIRE)); + featheredKnifeRitual.add(new RitualComponent(2, -1, -4, RitualComponent.FIRE)); + featheredKnifeRitual.add(new RitualComponent(4, -1, -2, RitualComponent.FIRE)); + featheredKnifeRitual.add(new RitualComponent(-2, -1, 4, RitualComponent.FIRE)); + featheredKnifeRitual.add(new RitualComponent(-4, -1, -2, RitualComponent.FIRE)); + featheredKnifeRitual.add(new RitualComponent(-2, -1, -4, RitualComponent.FIRE)); + featheredKnifeRitual.add(new RitualComponent(4, 0, 2, RitualComponent.EARTH)); + featheredKnifeRitual.add(new RitualComponent(2, 0, 4, RitualComponent.EARTH)); + featheredKnifeRitual.add(new RitualComponent(-4, 0, 2, RitualComponent.EARTH)); + featheredKnifeRitual.add(new RitualComponent(2, 0, -4, RitualComponent.EARTH)); + featheredKnifeRitual.add(new RitualComponent(4, 0, -2, RitualComponent.EARTH)); + featheredKnifeRitual.add(new RitualComponent(-2, 0, 4, RitualComponent.EARTH)); + featheredKnifeRitual.add(new RitualComponent(-4, 0, -2, RitualComponent.EARTH)); + featheredKnifeRitual.add(new RitualComponent(-2, 0, -4, RitualComponent.EARTH)); + featheredKnifeRitual.add(new RitualComponent(4, 0, 3, RitualComponent.EARTH)); + featheredKnifeRitual.add(new RitualComponent(3, 0, 4, RitualComponent.EARTH)); + featheredKnifeRitual.add(new RitualComponent(-4, 0, 3, RitualComponent.EARTH)); + featheredKnifeRitual.add(new RitualComponent(3, 0, -4, RitualComponent.EARTH)); + featheredKnifeRitual.add(new RitualComponent(4, 0, -3, RitualComponent.EARTH)); + featheredKnifeRitual.add(new RitualComponent(-3, 0, 4, RitualComponent.EARTH)); + featheredKnifeRitual.add(new RitualComponent(-4, 0, -3, RitualComponent.EARTH)); + featheredKnifeRitual.add(new RitualComponent(-3, 0, -4, RitualComponent.EARTH)); + featheredKnifeRitual.add(new RitualComponent(3, 0, 3, RitualComponent.AIR)); + featheredKnifeRitual.add(new RitualComponent(3, 0, -3, RitualComponent.AIR)); + featheredKnifeRitual.add(new RitualComponent(-3, 0, 3, RitualComponent.AIR)); + featheredKnifeRitual.add(new RitualComponent(-3, 0, -3, RitualComponent.AIR)); + ArrayList featheredEarthRitual = new ArrayList(); + featheredEarthRitual.add(new RitualComponent(1, 0, 0, RitualComponent.DUSK)); + featheredEarthRitual.add(new RitualComponent(-1, 0, 0, RitualComponent.DUSK)); + featheredEarthRitual.add(new RitualComponent(0, 0, 1, RitualComponent.DUSK)); + featheredEarthRitual.add(new RitualComponent(0, 0, -1, RitualComponent.DUSK)); + featheredEarthRitual.add(new RitualComponent(2, 0, 2, RitualComponent.AIR)); + featheredEarthRitual.add(new RitualComponent(-2, 0, 2, RitualComponent.AIR)); + featheredEarthRitual.add(new RitualComponent(-2, 0, -2, RitualComponent.AIR)); + featheredEarthRitual.add(new RitualComponent(2, 0, -2, RitualComponent.AIR)); + featheredEarthRitual.add(new RitualComponent(1, 0, 3, RitualComponent.EARTH)); + featheredEarthRitual.add(new RitualComponent(0, 0, 3, RitualComponent.EARTH)); + featheredEarthRitual.add(new RitualComponent(-1, 0, 3, RitualComponent.EARTH)); + featheredEarthRitual.add(new RitualComponent(1, 0, -3, RitualComponent.EARTH)); + featheredEarthRitual.add(new RitualComponent(0, 0, -3, RitualComponent.EARTH)); + featheredEarthRitual.add(new RitualComponent(-1, 0, -3, RitualComponent.EARTH)); + featheredEarthRitual.add(new RitualComponent(3, 0, 1, RitualComponent.EARTH)); + featheredEarthRitual.add(new RitualComponent(3, 0, 0, RitualComponent.EARTH)); + featheredEarthRitual.add(new RitualComponent(3, 0, -1, RitualComponent.EARTH)); + featheredEarthRitual.add(new RitualComponent(-3, 0, 1, RitualComponent.EARTH)); + featheredEarthRitual.add(new RitualComponent(-3, 0, 0, RitualComponent.EARTH)); + featheredEarthRitual.add(new RitualComponent(-3, 0, -1, RitualComponent.EARTH)); + featheredEarthRitual.add(new RitualComponent(4, 4, 4, RitualComponent.FIRE)); + featheredEarthRitual.add(new RitualComponent(-4, 4, 4, RitualComponent.FIRE)); + featheredEarthRitual.add(new RitualComponent(-4, 4, -4, RitualComponent.FIRE)); + featheredEarthRitual.add(new RitualComponent(4, 4, -4, RitualComponent.FIRE)); + featheredEarthRitual.add(new RitualComponent(4, 5, 5, RitualComponent.AIR)); + featheredEarthRitual.add(new RitualComponent(4, 5, 3, RitualComponent.AIR)); + featheredEarthRitual.add(new RitualComponent(5, 5, 4, RitualComponent.AIR)); + featheredEarthRitual.add(new RitualComponent(3, 5, 4, RitualComponent.AIR)); + featheredEarthRitual.add(new RitualComponent(-4, 5, 5, RitualComponent.AIR)); + featheredEarthRitual.add(new RitualComponent(-4, 5, 3, RitualComponent.AIR)); + featheredEarthRitual.add(new RitualComponent(-5, 5, 4, RitualComponent.AIR)); + featheredEarthRitual.add(new RitualComponent(-3, 5, 4, RitualComponent.AIR)); + featheredEarthRitual.add(new RitualComponent(4, 5, -5, RitualComponent.AIR)); + featheredEarthRitual.add(new RitualComponent(4, 5, -3, RitualComponent.AIR)); + featheredEarthRitual.add(new RitualComponent(5, 5, -4, RitualComponent.AIR)); + featheredEarthRitual.add(new RitualComponent(3, 5, -4, RitualComponent.AIR)); + featheredEarthRitual.add(new RitualComponent(-4, 5, -5, RitualComponent.AIR)); + featheredEarthRitual.add(new RitualComponent(-4, 5, -3, RitualComponent.AIR)); + featheredEarthRitual.add(new RitualComponent(-5, 5, -4, RitualComponent.AIR)); + featheredEarthRitual.add(new RitualComponent(-3, 5, -4, RitualComponent.AIR)); + //Biome Changer + ArrayList biomeChangerRitual = new ArrayList(); + biomeChangerRitual.add(new RitualComponent(1, 0, -2, RitualComponent.AIR)); + biomeChangerRitual.add(new RitualComponent(1, 0, -3, RitualComponent.AIR)); + biomeChangerRitual.add(new RitualComponent(2, 0, -1, RitualComponent.AIR)); + biomeChangerRitual.add(new RitualComponent(3, 0, -1, RitualComponent.AIR)); + biomeChangerRitual.add(new RitualComponent(1, 0, 2, RitualComponent.AIR)); + biomeChangerRitual.add(new RitualComponent(1, 0, 3, RitualComponent.AIR)); + biomeChangerRitual.add(new RitualComponent(2, 0, 1, RitualComponent.AIR)); + biomeChangerRitual.add(new RitualComponent(3, 0, 1, RitualComponent.AIR)); + biomeChangerRitual.add(new RitualComponent(-1, 0, -2, RitualComponent.AIR)); + biomeChangerRitual.add(new RitualComponent(-1, 0, -3, RitualComponent.AIR)); + biomeChangerRitual.add(new RitualComponent(-2, 0, -1, RitualComponent.AIR)); + biomeChangerRitual.add(new RitualComponent(-3, 0, -1, RitualComponent.AIR)); + biomeChangerRitual.add(new RitualComponent(-1, 0, 2, RitualComponent.AIR)); + biomeChangerRitual.add(new RitualComponent(-1, 0, 3, RitualComponent.AIR)); + biomeChangerRitual.add(new RitualComponent(-2, 0, 1, RitualComponent.AIR)); + biomeChangerRitual.add(new RitualComponent(-3, 0, 1, RitualComponent.AIR)); + biomeChangerRitual.add(new RitualComponent(3, 0, -3, RitualComponent.EARTH)); + biomeChangerRitual.add(new RitualComponent(3, 0, -4, RitualComponent.EARTH)); + biomeChangerRitual.add(new RitualComponent(4, 0, -3, RitualComponent.EARTH)); + biomeChangerRitual.add(new RitualComponent(4, 0, -5, RitualComponent.FIRE)); + biomeChangerRitual.add(new RitualComponent(5, 0, -4, RitualComponent.FIRE)); + biomeChangerRitual.add(new RitualComponent(3, 0, 3, RitualComponent.EARTH)); + biomeChangerRitual.add(new RitualComponent(3, 0, 4, RitualComponent.EARTH)); + biomeChangerRitual.add(new RitualComponent(4, 0, 3, RitualComponent.EARTH)); + biomeChangerRitual.add(new RitualComponent(4, 0, 5, RitualComponent.FIRE)); + biomeChangerRitual.add(new RitualComponent(5, 0, 4, RitualComponent.FIRE)); + biomeChangerRitual.add(new RitualComponent(-3, 0, 3, RitualComponent.EARTH)); + biomeChangerRitual.add(new RitualComponent(-3, 0, 4, RitualComponent.EARTH)); + biomeChangerRitual.add(new RitualComponent(-4, 0, 3, RitualComponent.EARTH)); + biomeChangerRitual.add(new RitualComponent(-4, 0, 5, RitualComponent.FIRE)); + biomeChangerRitual.add(new RitualComponent(-5, 0, 4, RitualComponent.FIRE)); + biomeChangerRitual.add(new RitualComponent(-3, 0, -3, RitualComponent.EARTH)); + biomeChangerRitual.add(new RitualComponent(-3, 0, -4, RitualComponent.EARTH)); + biomeChangerRitual.add(new RitualComponent(-4, 0, -3, RitualComponent.EARTH)); + biomeChangerRitual.add(new RitualComponent(-4, 0, -5, RitualComponent.FIRE)); + biomeChangerRitual.add(new RitualComponent(-5, 0, -4, RitualComponent.FIRE)); + biomeChangerRitual.add(new RitualComponent(0, 0, -5, RitualComponent.WATER)); + biomeChangerRitual.add(new RitualComponent(-1, 0, -6, RitualComponent.WATER)); + biomeChangerRitual.add(new RitualComponent(1, 0, -6, RitualComponent.WATER)); + biomeChangerRitual.add(new RitualComponent(-1, 0, -8, RitualComponent.BLANK)); + biomeChangerRitual.add(new RitualComponent(0, 0, -8, RitualComponent.BLANK)); + biomeChangerRitual.add(new RitualComponent(1, 0, -8, RitualComponent.BLANK)); + biomeChangerRitual.add(new RitualComponent(-1, 0, -10, RitualComponent.DUSK)); + biomeChangerRitual.add(new RitualComponent(0, 0, -10, RitualComponent.DUSK)); + biomeChangerRitual.add(new RitualComponent(1, 0, -10, RitualComponent.DUSK)); + biomeChangerRitual.add(new RitualComponent(0, 0, 5, RitualComponent.WATER)); + biomeChangerRitual.add(new RitualComponent(-1, 0, 6, RitualComponent.WATER)); + biomeChangerRitual.add(new RitualComponent(1, 0, 6, RitualComponent.WATER)); + biomeChangerRitual.add(new RitualComponent(-1, 0, 8, RitualComponent.BLANK)); + biomeChangerRitual.add(new RitualComponent(0, 0, 8, RitualComponent.BLANK)); + biomeChangerRitual.add(new RitualComponent(1, 0, 8, RitualComponent.BLANK)); + biomeChangerRitual.add(new RitualComponent(-1, 0, 10, RitualComponent.DUSK)); + biomeChangerRitual.add(new RitualComponent(0, 0, 10, RitualComponent.DUSK)); + biomeChangerRitual.add(new RitualComponent(1, 0, 10, RitualComponent.DUSK)); + biomeChangerRitual.add(new RitualComponent(-5, 0, 0, RitualComponent.WATER)); + biomeChangerRitual.add(new RitualComponent(-6, 0, -1, RitualComponent.WATER)); + biomeChangerRitual.add(new RitualComponent(-6, 0, 1, RitualComponent.WATER)); + biomeChangerRitual.add(new RitualComponent(-8, 0, -1, RitualComponent.BLANK)); + biomeChangerRitual.add(new RitualComponent(-8, 0, 0, RitualComponent.BLANK)); + biomeChangerRitual.add(new RitualComponent(-8, 0, 1, RitualComponent.BLANK)); + biomeChangerRitual.add(new RitualComponent(-10, 0, -1, RitualComponent.DUSK)); + biomeChangerRitual.add(new RitualComponent(-10, 0, 0, RitualComponent.DUSK)); + biomeChangerRitual.add(new RitualComponent(-10, 0, 1, RitualComponent.DUSK)); + biomeChangerRitual.add(new RitualComponent(5, 0, 0, RitualComponent.WATER)); + biomeChangerRitual.add(new RitualComponent(6, 0, -1, RitualComponent.WATER)); + biomeChangerRitual.add(new RitualComponent(6, 0, 1, RitualComponent.WATER)); + biomeChangerRitual.add(new RitualComponent(8, 0, -1, RitualComponent.BLANK)); + biomeChangerRitual.add(new RitualComponent(8, 0, 0, RitualComponent.BLANK)); + biomeChangerRitual.add(new RitualComponent(8, 0, 1, RitualComponent.BLANK)); + biomeChangerRitual.add(new RitualComponent(10, 0, -1, RitualComponent.DUSK)); + biomeChangerRitual.add(new RitualComponent(10, 0, 0, RitualComponent.DUSK)); + biomeChangerRitual.add(new RitualComponent(10, 0, 1, RitualComponent.DUSK)); + biomeChangerRitual.add(new RitualComponent(6, 0, -6, RitualComponent.AIR)); + biomeChangerRitual.add(new RitualComponent(6, 0, -7, RitualComponent.AIR)); + biomeChangerRitual.add(new RitualComponent(7, 0, -6, RitualComponent.AIR)); + biomeChangerRitual.add(new RitualComponent(7, 0, -5, RitualComponent.EARTH)); + biomeChangerRitual.add(new RitualComponent(5, 0, -7, RitualComponent.EARTH)); + biomeChangerRitual.add(new RitualComponent(8, 0, -5, RitualComponent.DUSK)); + biomeChangerRitual.add(new RitualComponent(8, 0, -4, RitualComponent.EARTH)); + biomeChangerRitual.add(new RitualComponent(9, 0, -4, RitualComponent.EARTH)); + biomeChangerRitual.add(new RitualComponent(5, 0, -8, RitualComponent.DUSK)); + biomeChangerRitual.add(new RitualComponent(4, 0, -8, RitualComponent.EARTH)); + biomeChangerRitual.add(new RitualComponent(4, 0, -9, RitualComponent.EARTH)); + biomeChangerRitual.add(new RitualComponent(-6, 0, 6, RitualComponent.AIR)); + biomeChangerRitual.add(new RitualComponent(-6, 0, 7, RitualComponent.AIR)); + biomeChangerRitual.add(new RitualComponent(-7, 0, 6, RitualComponent.AIR)); + biomeChangerRitual.add(new RitualComponent(-7, 0, 5, RitualComponent.EARTH)); + biomeChangerRitual.add(new RitualComponent(-5, 0, 7, RitualComponent.EARTH)); + biomeChangerRitual.add(new RitualComponent(-8, 0, 5, RitualComponent.DUSK)); + biomeChangerRitual.add(new RitualComponent(-8, 0, 4, RitualComponent.EARTH)); + biomeChangerRitual.add(new RitualComponent(-9, 0, 4, RitualComponent.EARTH)); + biomeChangerRitual.add(new RitualComponent(-5, 0, 8, RitualComponent.DUSK)); + biomeChangerRitual.add(new RitualComponent(-4, 0, 8, RitualComponent.EARTH)); + biomeChangerRitual.add(new RitualComponent(-4, 0, 9, RitualComponent.EARTH)); + biomeChangerRitual.add(new RitualComponent(6, 0, 6, RitualComponent.FIRE)); + biomeChangerRitual.add(new RitualComponent(6, 0, 7, RitualComponent.FIRE)); + biomeChangerRitual.add(new RitualComponent(7, 0, 6, RitualComponent.FIRE)); + biomeChangerRitual.add(new RitualComponent(7, 0, 5, RitualComponent.WATER)); + biomeChangerRitual.add(new RitualComponent(5, 0, 7, RitualComponent.WATER)); + biomeChangerRitual.add(new RitualComponent(8, 0, 5, RitualComponent.DUSK)); + biomeChangerRitual.add(new RitualComponent(8, 0, 4, RitualComponent.WATER)); + biomeChangerRitual.add(new RitualComponent(9, 0, 4, RitualComponent.WATER)); + biomeChangerRitual.add(new RitualComponent(5, 0, 8, RitualComponent.DUSK)); + biomeChangerRitual.add(new RitualComponent(4, 0, 8, RitualComponent.WATER)); + biomeChangerRitual.add(new RitualComponent(4, 0, 9, RitualComponent.WATER)); + biomeChangerRitual.add(new RitualComponent(-6, 0, -6, RitualComponent.FIRE)); + biomeChangerRitual.add(new RitualComponent(-6, 0, -7, RitualComponent.FIRE)); + biomeChangerRitual.add(new RitualComponent(-7, 0, -6, RitualComponent.FIRE)); + biomeChangerRitual.add(new RitualComponent(-7, 0, -5, RitualComponent.WATER)); + biomeChangerRitual.add(new RitualComponent(-5, 0, -7, RitualComponent.WATER)); + biomeChangerRitual.add(new RitualComponent(-8, 0, -5, RitualComponent.DUSK)); + biomeChangerRitual.add(new RitualComponent(-8, 0, -4, RitualComponent.WATER)); + biomeChangerRitual.add(new RitualComponent(-9, 0, -4, RitualComponent.WATER)); + biomeChangerRitual.add(new RitualComponent(-5, 0, -8, RitualComponent.DUSK)); + biomeChangerRitual.add(new RitualComponent(-4, 0, -8, RitualComponent.WATER)); + biomeChangerRitual.add(new RitualComponent(-4, 0, -9, RitualComponent.WATER)); + ArrayList flightRitual = new ArrayList(); + flightRitual.add(new RitualComponent(1, 0, 0, RitualComponent.DUSK)); + flightRitual.add(new RitualComponent(-1, 0, 0, RitualComponent.DUSK)); + flightRitual.add(new RitualComponent(0, 0, 1, RitualComponent.DUSK)); + flightRitual.add(new RitualComponent(0, 0, -1, RitualComponent.DUSK)); + flightRitual.add(new RitualComponent(2, 0, 2, RitualComponent.AIR)); + flightRitual.add(new RitualComponent(-2, 0, 2, RitualComponent.AIR)); + flightRitual.add(new RitualComponent(-2, 0, -2, RitualComponent.AIR)); + flightRitual.add(new RitualComponent(2, 0, -2, RitualComponent.AIR)); + flightRitual.add(new RitualComponent(1, 0, 3, RitualComponent.EARTH)); + flightRitual.add(new RitualComponent(0, 0, 3, RitualComponent.EARTH)); + flightRitual.add(new RitualComponent(-1, 0, 3, RitualComponent.EARTH)); + flightRitual.add(new RitualComponent(1, 0, -3, RitualComponent.EARTH)); + flightRitual.add(new RitualComponent(0, 0, -3, RitualComponent.EARTH)); + flightRitual.add(new RitualComponent(-1, 0, -3, RitualComponent.EARTH)); + flightRitual.add(new RitualComponent(3, 0, 1, RitualComponent.EARTH)); + flightRitual.add(new RitualComponent(3, 0, 0, RitualComponent.EARTH)); + flightRitual.add(new RitualComponent(3, 0, -1, RitualComponent.EARTH)); + flightRitual.add(new RitualComponent(-3, 0, 1, RitualComponent.EARTH)); + flightRitual.add(new RitualComponent(-3, 0, 0, RitualComponent.EARTH)); + flightRitual.add(new RitualComponent(-3, 0, -1, RitualComponent.EARTH)); + flightRitual.add(new RitualComponent(-3, 0, -4, RitualComponent.WATER)); + flightRitual.add(new RitualComponent(-4, 0, -3, RitualComponent.WATER)); + flightRitual.add(new RitualComponent(-3, 0, 4, RitualComponent.WATER)); + flightRitual.add(new RitualComponent(4, 0, -3, RitualComponent.WATER)); + flightRitual.add(new RitualComponent(3, 0, -4, RitualComponent.WATER)); + flightRitual.add(new RitualComponent(-4, 0, 3, RitualComponent.WATER)); + flightRitual.add(new RitualComponent(3, 0, 4, RitualComponent.WATER)); + flightRitual.add(new RitualComponent(4, 0, 3, RitualComponent.WATER)); + flightRitual.add(new RitualComponent(-1, 1, 0, RitualComponent.FIRE)); + flightRitual.add(new RitualComponent(1, 1, 0, RitualComponent.FIRE)); + flightRitual.add(new RitualComponent(0, 1, -1, RitualComponent.FIRE)); + flightRitual.add(new RitualComponent(0, 1, 1, RitualComponent.FIRE)); + flightRitual.add(new RitualComponent(-2, 1, 0, RitualComponent.BLANK)); + flightRitual.add(new RitualComponent(2, 1, 0, RitualComponent.BLANK)); + flightRitual.add(new RitualComponent(0, 1, -2, RitualComponent.BLANK)); + flightRitual.add(new RitualComponent(0, 1, 2, RitualComponent.BLANK)); + flightRitual.add(new RitualComponent(-4, 1, 0, RitualComponent.BLANK)); + flightRitual.add(new RitualComponent(4, 1, 0, RitualComponent.BLANK)); + flightRitual.add(new RitualComponent(0, 1, -4, RitualComponent.BLANK)); + flightRitual.add(new RitualComponent(0, 1, 4, RitualComponent.BLANK)); + flightRitual.add(new RitualComponent(-5, 1, 0, RitualComponent.AIR)); + flightRitual.add(new RitualComponent(5, 1, 0, RitualComponent.AIR)); + flightRitual.add(new RitualComponent(0, 1, -5, RitualComponent.AIR)); + flightRitual.add(new RitualComponent(0, 1, 5, RitualComponent.AIR)); + flightRitual.add(new RitualComponent(5, 0, 0, RitualComponent.DUSK)); + flightRitual.add(new RitualComponent(-5, 0, 0, RitualComponent.DUSK)); + flightRitual.add(new RitualComponent(0, 0, 5, RitualComponent.DUSK)); + flightRitual.add(new RitualComponent(0, 0, -5, RitualComponent.DUSK)); + + for (int i = 2; i <= 4; i++) + { + flightRitual.add(new RitualComponent(-i, 2, 0, RitualComponent.EARTH)); + flightRitual.add(new RitualComponent(i, 2, 0, RitualComponent.EARTH)); + flightRitual.add(new RitualComponent(0, 2, -i, RitualComponent.EARTH)); + flightRitual.add(new RitualComponent(0, 2, i, RitualComponent.EARTH)); + } + + flightRitual.add(new RitualComponent(2, 4, 1, RitualComponent.FIRE)); + flightRitual.add(new RitualComponent(1, 4, 2, RitualComponent.FIRE)); + flightRitual.add(new RitualComponent(-2, 4, 1, RitualComponent.FIRE)); + flightRitual.add(new RitualComponent(1, 4, -2, RitualComponent.FIRE)); + flightRitual.add(new RitualComponent(2, 4, -1, RitualComponent.FIRE)); + flightRitual.add(new RitualComponent(-1, 4, 2, RitualComponent.FIRE)); + flightRitual.add(new RitualComponent(-2, 4, -1, RitualComponent.FIRE)); + flightRitual.add(new RitualComponent(-1, 4, -2, RitualComponent.FIRE)); + flightRitual.add(new RitualComponent(2, 4, 2, RitualComponent.AIR)); + flightRitual.add(new RitualComponent(-2, 4, 2, RitualComponent.AIR)); + flightRitual.add(new RitualComponent(2, 4, -2, RitualComponent.AIR)); + flightRitual.add(new RitualComponent(-2, 4, -2, RitualComponent.AIR)); + flightRitual.add(new RitualComponent(-4, 2, -4, RitualComponent.FIRE)); + flightRitual.add(new RitualComponent(4, 2, 4, RitualComponent.FIRE)); + flightRitual.add(new RitualComponent(4, 2, -4, RitualComponent.FIRE)); + flightRitual.add(new RitualComponent(-4, 2, 4, RitualComponent.FIRE)); + + for (int i = -1; i <= 1; i++) + { + flightRitual.add(new RitualComponent(3, 4, i, RitualComponent.EARTH)); + flightRitual.add(new RitualComponent(-3, 4, i, RitualComponent.EARTH)); + flightRitual.add(new RitualComponent(i, 4, 3, RitualComponent.EARTH)); + flightRitual.add(new RitualComponent(i, 4, -3, RitualComponent.EARTH)); + } + + ArrayList meteorRitual = new ArrayList(); + meteorRitual.add(new RitualComponent(2, 0, 0, RitualComponent.FIRE)); + meteorRitual.add(new RitualComponent(-2, 0, 0, RitualComponent.FIRE)); + meteorRitual.add(new RitualComponent(0, 0, 2, RitualComponent.FIRE)); + meteorRitual.add(new RitualComponent(0, 0, -2, RitualComponent.FIRE)); + meteorRitual.add(new RitualComponent(3, 0, 1, RitualComponent.AIR)); + meteorRitual.add(new RitualComponent(3, 0, -1, RitualComponent.AIR)); + meteorRitual.add(new RitualComponent(-3, 0, 1, RitualComponent.AIR)); + meteorRitual.add(new RitualComponent(-3, 0, -1, RitualComponent.AIR)); + meteorRitual.add(new RitualComponent(1, 0, 3, RitualComponent.AIR)); + meteorRitual.add(new RitualComponent(-1, 0, 3, RitualComponent.AIR)); + meteorRitual.add(new RitualComponent(1, 0, -3, RitualComponent.AIR)); + meteorRitual.add(new RitualComponent(-1, 0, -3, RitualComponent.AIR)); + meteorRitual.add(new RitualComponent(4, 0, 2, RitualComponent.AIR)); + meteorRitual.add(new RitualComponent(4, 0, -2, RitualComponent.AIR)); + meteorRitual.add(new RitualComponent(-4, 0, 2, RitualComponent.AIR)); + meteorRitual.add(new RitualComponent(-4, 0, -2, RitualComponent.AIR)); + meteorRitual.add(new RitualComponent(2, 0, 4, RitualComponent.AIR)); + meteorRitual.add(new RitualComponent(-2, 0, 4, RitualComponent.AIR)); + meteorRitual.add(new RitualComponent(2, 0, -4, RitualComponent.AIR)); + meteorRitual.add(new RitualComponent(-2, 0, -4, RitualComponent.AIR)); + meteorRitual.add(new RitualComponent(5, 0, 3, RitualComponent.DUSK)); + meteorRitual.add(new RitualComponent(5, 0, -3, RitualComponent.DUSK)); + meteorRitual.add(new RitualComponent(-5, 0, 3, RitualComponent.DUSK)); + meteorRitual.add(new RitualComponent(-5, 0, -3, RitualComponent.DUSK)); + meteorRitual.add(new RitualComponent(3, 0, 5, RitualComponent.DUSK)); + meteorRitual.add(new RitualComponent(-3, 0, 5, RitualComponent.DUSK)); + meteorRitual.add(new RitualComponent(3, 0, -5, RitualComponent.DUSK)); + meteorRitual.add(new RitualComponent(-3, 0, -5, RitualComponent.DUSK)); + meteorRitual.add(new RitualComponent(-4, 0, -4, RitualComponent.DUSK)); + meteorRitual.add(new RitualComponent(-4, 0, 4, RitualComponent.DUSK)); + meteorRitual.add(new RitualComponent(4, 0, 4, RitualComponent.DUSK)); + meteorRitual.add(new RitualComponent(4, 0, -4, RitualComponent.DUSK)); + + for (int i = 4; i <= 6; i++) + { + meteorRitual.add(new RitualComponent(i, 0, 0, RitualComponent.EARTH)); + meteorRitual.add(new RitualComponent(-i, 0, 0, RitualComponent.EARTH)); + meteorRitual.add(new RitualComponent(0, 0, i, RitualComponent.EARTH)); + meteorRitual.add(new RitualComponent(0, 0, -i, RitualComponent.EARTH)); + } + + meteorRitual.add(new RitualComponent(8, 0, 0, RitualComponent.EARTH)); + meteorRitual.add(new RitualComponent(-8, 0, 0, RitualComponent.EARTH)); + meteorRitual.add(new RitualComponent(0, 0, 8, RitualComponent.EARTH)); + meteorRitual.add(new RitualComponent(0, 0, -8, RitualComponent.EARTH)); + meteorRitual.add(new RitualComponent(8, 1, 0, RitualComponent.EARTH)); + meteorRitual.add(new RitualComponent(-8, 1, 0, RitualComponent.EARTH)); + meteorRitual.add(new RitualComponent(0, 1, 8, RitualComponent.EARTH)); + meteorRitual.add(new RitualComponent(0, 1, -8, RitualComponent.EARTH)); + meteorRitual.add(new RitualComponent(7, 1, 0, RitualComponent.EARTH)); + meteorRitual.add(new RitualComponent(-7, 1, 0, RitualComponent.EARTH)); + meteorRitual.add(new RitualComponent(0, 1, 7, RitualComponent.EARTH)); + meteorRitual.add(new RitualComponent(0, 1, -7, RitualComponent.EARTH)); + meteorRitual.add(new RitualComponent(7, 2, 0, RitualComponent.FIRE)); + meteorRitual.add(new RitualComponent(-7, 2, 0, RitualComponent.FIRE)); + meteorRitual.add(new RitualComponent(0, 2, 7, RitualComponent.FIRE)); + meteorRitual.add(new RitualComponent(0, 2, -7, RitualComponent.FIRE)); + meteorRitual.add(new RitualComponent(6, 2, 0, RitualComponent.FIRE)); + meteorRitual.add(new RitualComponent(-6, 2, 0, RitualComponent.FIRE)); + meteorRitual.add(new RitualComponent(0, 2, 6, RitualComponent.FIRE)); + meteorRitual.add(new RitualComponent(0, 2, -6, RitualComponent.FIRE)); + meteorRitual.add(new RitualComponent(6, 3, 0, RitualComponent.WATER)); + meteorRitual.add(new RitualComponent(-6, 3, 0, RitualComponent.WATER)); + meteorRitual.add(new RitualComponent(0, 3, 6, RitualComponent.WATER)); + meteorRitual.add(new RitualComponent(0, 3, -6, RitualComponent.WATER)); + meteorRitual.add(new RitualComponent(5, 3, 0, RitualComponent.WATER)); + meteorRitual.add(new RitualComponent(-5, 3, 0, RitualComponent.WATER)); + meteorRitual.add(new RitualComponent(0, 3, 5, RitualComponent.WATER)); + meteorRitual.add(new RitualComponent(0, 3, -5, RitualComponent.WATER)); + meteorRitual.add(new RitualComponent(5, 4, 0, RitualComponent.AIR)); + meteorRitual.add(new RitualComponent(-5, 4, 0, RitualComponent.AIR)); + meteorRitual.add(new RitualComponent(0, 4, 5, RitualComponent.AIR)); + meteorRitual.add(new RitualComponent(0, 4, -5, RitualComponent.AIR)); + + for (int i = -1; i <= 1; i++) + { + meteorRitual.add(new RitualComponent(i, 4, 4, RitualComponent.AIR)); + meteorRitual.add(new RitualComponent(i, 4, -4, RitualComponent.AIR)); + meteorRitual.add(new RitualComponent(4, 4, i, RitualComponent.AIR)); + meteorRitual.add(new RitualComponent(-4, 4, i, RitualComponent.AIR)); + } + + meteorRitual.add(new RitualComponent(2, 4, 4, RitualComponent.WATER)); + meteorRitual.add(new RitualComponent(4, 4, 2, RitualComponent.WATER)); + meteorRitual.add(new RitualComponent(2, 4, -4, RitualComponent.WATER)); + meteorRitual.add(new RitualComponent(-4, 4, 2, RitualComponent.WATER)); + meteorRitual.add(new RitualComponent(-2, 4, 4, RitualComponent.WATER)); + meteorRitual.add(new RitualComponent(4, 4, -2, RitualComponent.WATER)); + meteorRitual.add(new RitualComponent(-2, 4, -4, RitualComponent.WATER)); + meteorRitual.add(new RitualComponent(-4, 4, -2, RitualComponent.WATER)); + meteorRitual.add(new RitualComponent(2, 4, 3, RitualComponent.FIRE)); + meteorRitual.add(new RitualComponent(3, 4, 2, RitualComponent.FIRE)); + meteorRitual.add(new RitualComponent(3, 4, 3, RitualComponent.FIRE)); + meteorRitual.add(new RitualComponent(-2, 4, 3, RitualComponent.FIRE)); + meteorRitual.add(new RitualComponent(3, 4, -2, RitualComponent.FIRE)); + meteorRitual.add(new RitualComponent(3, 4, -3, RitualComponent.FIRE)); + meteorRitual.add(new RitualComponent(2, 4, -3, RitualComponent.FIRE)); + meteorRitual.add(new RitualComponent(-3, 4, 2, RitualComponent.FIRE)); + meteorRitual.add(new RitualComponent(-3, 4, 3, RitualComponent.FIRE)); + meteorRitual.add(new RitualComponent(-2, 4, -3, RitualComponent.FIRE)); + meteorRitual.add(new RitualComponent(-3, 4, -2, RitualComponent.FIRE)); + meteorRitual.add(new RitualComponent(-3, 4, -3, RitualComponent.FIRE)); + + ArrayList apiaryRitual = new ArrayList(); + apiaryRitual.add(new RitualComponent(1,0,0, RitualComponent.DUSK)); + apiaryRitual.add(new RitualComponent(1,0,1, RitualComponent.DUSK)); + apiaryRitual.add(new RitualComponent(1,0,-1, RitualComponent.DUSK)); + apiaryRitual.add(new RitualComponent(-1,0,-1, RitualComponent.DUSK)); + apiaryRitual.add(new RitualComponent(-1,0,1, RitualComponent.DUSK)); + apiaryRitual.add(new RitualComponent(-1,0,0, RitualComponent.DUSK)); + apiaryRitual.add(new RitualComponent(0,0,-1, RitualComponent.DUSK)); + apiaryRitual.add(new RitualComponent(0,0,1, RitualComponent.DUSK)); + + ArrayList autoAlchemyRitual = new ArrayList(); + autoAlchemyRitual.add(new RitualComponent(1,0,1, RitualComponent.DUSK)); + autoAlchemyRitual.add(new RitualComponent(1,0,-1, RitualComponent.DUSK)); + autoAlchemyRitual.add(new RitualComponent(-1,0,-1, RitualComponent.DUSK)); + autoAlchemyRitual.add(new RitualComponent(-1,0,1, RitualComponent.DUSK)); + autoAlchemyRitual.add(new RitualComponent(2,0,2, RitualComponent.WATER)); + autoAlchemyRitual.add(new RitualComponent(2,0,-2, RitualComponent.WATER)); + autoAlchemyRitual.add(new RitualComponent(-2,0,-2, RitualComponent.WATER)); + autoAlchemyRitual.add(new RitualComponent(-2,0,2, RitualComponent.WATER)); + autoAlchemyRitual.add(new RitualComponent(-3,0,-2, RitualComponent.FIRE)); + autoAlchemyRitual.add(new RitualComponent(-2,0,-3, RitualComponent.FIRE)); + autoAlchemyRitual.add(new RitualComponent(-3,0,2, RitualComponent.FIRE)); + autoAlchemyRitual.add(new RitualComponent(-2,0,3, RitualComponent.FIRE)); + autoAlchemyRitual.add(new RitualComponent(3,0,-2, RitualComponent.FIRE)); + autoAlchemyRitual.add(new RitualComponent(2,0,-3, RitualComponent.FIRE)); + autoAlchemyRitual.add(new RitualComponent(3,0,2, RitualComponent.FIRE)); + autoAlchemyRitual.add(new RitualComponent(2,0,3, RitualComponent.FIRE)); + + + Rituals.ritualList.add(new Rituals(waterRitual, 1, 500, new RitualEffectWater(), "Ritual of the Full Spring")); + Rituals.ritualList.add(new Rituals(lavaRitual, 1, 10000, new RitualEffectLava(), "Serenade of the Nether")); + Rituals.ritualList.add(new Rituals(growthRitual, 1, 1000, new RitualEffectGrowth(), "Ritual of the Green Grove")); + Rituals.ritualList.add(new Rituals(interdictionRitual, 1, 1000, new RitualEffectInterdiction(), "Interdiction Ritual")); + Rituals.ritualList.add(new Rituals(containmentRitual, 1, 2000, new RitualEffectContainment(), "Ritual of Containment")); + Rituals.ritualList.add(new Rituals(boundSoulRitual, 1, 5000, new RitualEffectSoulBound(), "Ritual of Binding")); + Rituals.ritualList.add(new Rituals(unbindingRitual, 1, 30000, new RitualEffectUnbinding(), "Ritual of Unbinding")); + Rituals.ritualList.add(new Rituals(jumpingRitual, 1, 1000, new RitualEffectJumping(), "Ritual of the High Jump")); + Rituals.ritualList.add(new Rituals(magneticRitual, 1, 5000, new RitualEffectMagnetic(), "Ritual of Magnetism")); + Rituals.ritualList.add(new Rituals(crushingRitual, 1, 2500, new RitualEffectCrushing(), "Ritual of the Crusher")); + Rituals.ritualList.add(new Rituals(leapingRitual, 1, 1000, new RitualEffectLeap(), "Ritual of Speed")); + Rituals.ritualList.add(new Rituals(animalGrowthRitual, 1, 10000, new RitualEffectAnimalGrowth(), "Ritual of the Shepherd")); + Rituals.ritualList.add(new Rituals(wellOfSufferingRitual, 1, 50000, new RitualEffectWellOfSuffering(), "Well of Suffering")); + Rituals.ritualList.add(new Rituals(healingRitual, 1, 25000, new RitualEffectHealing(), "Ritual of Regeneration")); + Rituals.ritualList.add(new Rituals(featheredKnifeRitual, 1, 50000, new RitualEffectFeatheredKnife(), "Ritual of the Feathered Knife")); + Rituals.ritualList.add(new Rituals(featheredEarthRitual, 2, 100000, new RitualEffectFeatheredEarth(), "Ritual of the Feathered Earth")); + Rituals.ritualList.add(new Rituals(biomeChangerRitual, 2, 1000000, new RitualEffectBiomeChanger(), "Ritual of Gaia's Transformation")); + Rituals.ritualList.add(new Rituals(flightRitual, 2, 1000000, new RitualEffectFlight(), "Reverence of the Condor")); + Rituals.ritualList.add(new Rituals(meteorRitual, 2, 1000000, new RitualEffectSummonMeteor(), "Mark of the Falling Tower")); + Rituals.ritualList.add(new Rituals(autoAlchemyRitual,1,20000,new RitualEffectAutoAlchemy(),"Ballad of Alchemy")); + //Rituals.ritualList.add(new Rituals(apiaryRitual,1,100,new RitualEffectApiaryOverclock(),"Apiary Overclock")); + } } diff --git a/BM_src/WayofTime/alchemicalWizardry/api/alchemy/AlchemicalPotionCreationHandler.java b/BM_src/WayofTime/alchemicalWizardry/api/alchemy/AlchemicalPotionCreationHandler.java new file mode 100644 index 00000000..4fcd1661 --- /dev/null +++ b/BM_src/WayofTime/alchemicalWizardry/api/alchemy/AlchemicalPotionCreationHandler.java @@ -0,0 +1,82 @@ +package WayofTime.alchemicalWizardry.api.alchemy; + +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.potion.Potion; + +import java.util.ArrayList; + +public class AlchemicalPotionCreationHandler +{ + public static ArrayList registeredPotionEffects = new ArrayList(); + + public static void addPotion(ItemStack itemStack, int potionID, int tickDuration) + { + registeredPotionEffects.add(new AlchemyPotionHandlerComponent(itemStack, potionID, tickDuration)); + //EXAMPLE: addPotion(new ItemStack(Item.ghastTear), Potion.regeneration.id, 450); + } + + public static int getPotionIDForStack(ItemStack itemStack) + { + for (AlchemyPotionHandlerComponent aphc : registeredPotionEffects) + { + if (aphc.compareItemStack(itemStack)) + { + return aphc.getPotionID(); + } + } + + return -1; + } + + public static int getPotionTickDurationForStack(ItemStack itemStack) + { + { + for (AlchemyPotionHandlerComponent aphc : registeredPotionEffects) + { + if (aphc.compareItemStack(itemStack)) + { + return aphc.getTickDuration(); + } + } + + return -1; + } + } + + public static boolean containsRegisteredPotionIngredient(ItemStack[] stackList) + { + for (ItemStack is : stackList) + { + for (AlchemyPotionHandlerComponent aphc : registeredPotionEffects) + { + if (aphc.compareItemStack(is)) + { + return true; + } + } + } + + return false; + } + + public static int getRegisteredPotionIngredientPosition(ItemStack[] stackList) + { + int i = 0; + + for (ItemStack is : stackList) + { + for (AlchemyPotionHandlerComponent aphc : registeredPotionEffects) + { + if (aphc.compareItemStack(is)) + { + return i; + } + } + + i++; + } + + return -1; + } +} diff --git a/BM_src/WayofTime/alchemicalWizardry/common/alchemy/AlchemyPotionHandlerComponent.java b/BM_src/WayofTime/alchemicalWizardry/api/alchemy/AlchemyPotionHandlerComponent.java similarity index 96% rename from BM_src/WayofTime/alchemicalWizardry/common/alchemy/AlchemyPotionHandlerComponent.java rename to BM_src/WayofTime/alchemicalWizardry/api/alchemy/AlchemyPotionHandlerComponent.java index d7f64ca0..604994dd 100644 --- a/BM_src/WayofTime/alchemicalWizardry/common/alchemy/AlchemyPotionHandlerComponent.java +++ b/BM_src/WayofTime/alchemicalWizardry/api/alchemy/AlchemyPotionHandlerComponent.java @@ -1,4 +1,4 @@ -package WayofTime.alchemicalWizardry.common.alchemy; +package WayofTime.alchemicalWizardry.api.alchemy; import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; diff --git a/BM_src/WayofTime/alchemicalWizardry/common/altarRecipeRegistry/AltarRecipe.java b/BM_src/WayofTime/alchemicalWizardry/api/altarRecipeRegistry/AltarRecipe.java similarity index 95% rename from BM_src/WayofTime/alchemicalWizardry/common/altarRecipeRegistry/AltarRecipe.java rename to BM_src/WayofTime/alchemicalWizardry/api/altarRecipeRegistry/AltarRecipe.java index a7599f70..624f219b 100644 --- a/BM_src/WayofTime/alchemicalWizardry/common/altarRecipeRegistry/AltarRecipe.java +++ b/BM_src/WayofTime/alchemicalWizardry/api/altarRecipeRegistry/AltarRecipe.java @@ -1,4 +1,4 @@ -package WayofTime.alchemicalWizardry.common.altarRecipeRegistry; +package WayofTime.alchemicalWizardry.api.altarRecipeRegistry; import net.minecraft.item.ItemStack; diff --git a/BM_src/WayofTime/alchemicalWizardry/api/altarRecipeRegistry/AltarRecipeRegistry.java b/BM_src/WayofTime/alchemicalWizardry/api/altarRecipeRegistry/AltarRecipeRegistry.java new file mode 100644 index 00000000..ce15eb83 --- /dev/null +++ b/BM_src/WayofTime/alchemicalWizardry/api/altarRecipeRegistry/AltarRecipeRegistry.java @@ -0,0 +1,64 @@ +package WayofTime.alchemicalWizardry.api.altarRecipeRegistry; + +import java.util.LinkedList; +import java.util.List; + +import net.minecraft.block.Block; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; + +public class AltarRecipeRegistry +{ + public static List altarRecipes = new LinkedList(); + + public static void registerAltarRecipe(ItemStack result, ItemStack requiredItem, int minTier, int liquidRequired, int consumptionRate, int drainRate, boolean canBeFilled) + { + altarRecipes.add(new AltarRecipe(result, requiredItem, minTier, liquidRequired, consumptionRate, drainRate, canBeFilled)); + //EXAMPLE: registerAltarRecipe(new ItemStack(ModItems.telepositionFocus), new ItemStack(Item.enderPearl),4,2000,10,10,false); + } + + public static void registerAltarOrbRecipe(ItemStack orbStack, int minTier, int consumptionRate) + { + registerAltarRecipe(null, orbStack, minTier, 0, consumptionRate, 0, true); + //EXAMPLE: registerAltarOrbRecipe(new ItemStack(ModItems.weakBloodOrb),1,2); + } + + public static boolean isRequiredItemValid(ItemStack testItem, int currentTierAltar) + { + for(AltarRecipe recipe : altarRecipes) + { + if(recipe.doesRequiredItemMatch(testItem, currentTierAltar)) + { + return true; + } + } + + return false; + } + + public static ItemStack getItemForItemAndTier(ItemStack testItem, int currentTierAltar) + { + for(AltarRecipe recipe : altarRecipes) + { + if(recipe.doesRequiredItemMatch(testItem, currentTierAltar)) + { + return recipe.getResult().copy(); + } + } + + return null; + } + + public static AltarRecipe getAltarRecipeForItemAndTier(ItemStack testItem, int currentTierAltar) + { + for(AltarRecipe recipe : altarRecipes) + { + if(recipe.doesRequiredItemMatch(testItem, currentTierAltar)) + { + return recipe; + } + } + + return null; + } +} diff --git a/BM_src/WayofTime/alchemicalWizardry/common/ArmourUpgrade.java b/BM_src/WayofTime/alchemicalWizardry/api/items/interfaces/ArmourUpgrade.java similarity index 85% rename from BM_src/WayofTime/alchemicalWizardry/common/ArmourUpgrade.java rename to BM_src/WayofTime/alchemicalWizardry/api/items/interfaces/ArmourUpgrade.java index ce14e417..7fce7cd0 100644 --- a/BM_src/WayofTime/alchemicalWizardry/common/ArmourUpgrade.java +++ b/BM_src/WayofTime/alchemicalWizardry/api/items/interfaces/ArmourUpgrade.java @@ -1,4 +1,4 @@ -package WayofTime.alchemicalWizardry.common; +package WayofTime.alchemicalWizardry.api.items.interfaces; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; diff --git a/BM_src/WayofTime/alchemicalWizardry/api/items/interfaces/IBindable.java b/BM_src/WayofTime/alchemicalWizardry/api/items/interfaces/IBindable.java new file mode 100644 index 00000000..46a79939 --- /dev/null +++ b/BM_src/WayofTime/alchemicalWizardry/api/items/interfaces/IBindable.java @@ -0,0 +1,5 @@ +package WayofTime.alchemicalWizardry.api.items.interfaces; + +public interface IBindable +{ +} diff --git a/BM_src/WayofTime/alchemicalWizardry/api/items/interfaces/IBloodOrb.java b/BM_src/WayofTime/alchemicalWizardry/api/items/interfaces/IBloodOrb.java new file mode 100644 index 00000000..794172cc --- /dev/null +++ b/BM_src/WayofTime/alchemicalWizardry/api/items/interfaces/IBloodOrb.java @@ -0,0 +1,8 @@ +package WayofTime.alchemicalWizardry.api.items.interfaces; + +public interface IBloodOrb +{ + public int getMaxEssence(); + + public int getOrbLevel(); +} diff --git a/BM_src/WayofTime/alchemicalWizardry/api/rituals/IMasterRitualStone.java b/BM_src/WayofTime/alchemicalWizardry/api/rituals/IMasterRitualStone.java new file mode 100644 index 00000000..24b33636 --- /dev/null +++ b/BM_src/WayofTime/alchemicalWizardry/api/rituals/IMasterRitualStone.java @@ -0,0 +1,30 @@ +package WayofTime.alchemicalWizardry.api.rituals; + +import net.minecraft.world.World; + +public interface IMasterRitualStone +{ + public void performRitual(World world, int x, int y, int z, int ritualID); + + public String getOwner(); + + public void setCooldown(int newCooldown); + + public int getCooldown(); + + public void setVar1(int newVar1); + + public int getVar1(); + + public void setActive(boolean active); + + public int getDirection(); + + public World getWorldObj(); + + public int getXCoord(); + + public int getYCoord(); + + public int getZCoord(); +} diff --git a/BM_src/WayofTime/alchemicalWizardry/api/rituals/IRitualStone.java b/BM_src/WayofTime/alchemicalWizardry/api/rituals/IRitualStone.java new file mode 100644 index 00000000..078cfd40 --- /dev/null +++ b/BM_src/WayofTime/alchemicalWizardry/api/rituals/IRitualStone.java @@ -0,0 +1,6 @@ +package WayofTime.alchemicalWizardry.api.rituals; + +public interface IRitualStone +{ + +} diff --git a/BM_src/WayofTime/alchemicalWizardry/common/rituals/RitualComponent.java b/BM_src/WayofTime/alchemicalWizardry/api/rituals/RitualComponent.java similarity index 93% rename from BM_src/WayofTime/alchemicalWizardry/common/rituals/RitualComponent.java rename to BM_src/WayofTime/alchemicalWizardry/api/rituals/RitualComponent.java index e929ac69..b7149858 100644 --- a/BM_src/WayofTime/alchemicalWizardry/common/rituals/RitualComponent.java +++ b/BM_src/WayofTime/alchemicalWizardry/api/rituals/RitualComponent.java @@ -1,4 +1,4 @@ -package WayofTime.alchemicalWizardry.common.rituals; +package WayofTime.alchemicalWizardry.api.rituals; public class RitualComponent { diff --git a/BM_src/WayofTime/alchemicalWizardry/api/rituals/RitualEffect.java b/BM_src/WayofTime/alchemicalWizardry/api/rituals/RitualEffect.java new file mode 100644 index 00000000..d4117c7f --- /dev/null +++ b/BM_src/WayofTime/alchemicalWizardry/api/rituals/RitualEffect.java @@ -0,0 +1,13 @@ +package WayofTime.alchemicalWizardry.api.rituals; + +public abstract class RitualEffect +{ + public abstract void performEffect(IMasterRitualStone ritualStone); + + public abstract int getCostPerRefresh(); + + public int getInitialCooldown() + { + return 0; + } +} diff --git a/BM_src/WayofTime/alchemicalWizardry/api/rituals/Rituals.java b/BM_src/WayofTime/alchemicalWizardry/api/rituals/Rituals.java new file mode 100644 index 00000000..c3366de3 --- /dev/null +++ b/BM_src/WayofTime/alchemicalWizardry/api/rituals/Rituals.java @@ -0,0 +1,263 @@ +package WayofTime.alchemicalWizardry.api.rituals; + +import net.minecraft.block.Block; +import net.minecraft.world.World; +import net.minecraftforge.oredict.OreDictionary; + +import java.util.ArrayList; +import java.util.List; + +public class Rituals +{ + private List components; + private int crystalLevel; + private int actCost; + private RitualEffect effect; + private String name; + + public static List ritualList = new ArrayList(); + + public Rituals(List components, int crystalLevel, int actCost, RitualEffect effect, String name) + { + this.components = components; + this.crystalLevel = crystalLevel; + this.actCost = actCost; + this.effect = effect; + this.name = name; + } + + public Rituals(List components, int crystalLevel, int actCost, RitualEffect effect) + { + this.components = components; + this.crystalLevel = crystalLevel; + this.actCost = actCost; + this.effect = effect; + this.name = ""; + } + + public static int checkValidRitual(World world, int x, int y, int z) + { + for (int i = 1; i <= ritualList.size(); i++) + { + if (checkRitualIsValid(world, x, y, z, i)) + { + return i; + } + } + + return 0; + } + + public static boolean canCrystalActivate(int ritual, int crystalLevel) + { + if (ritual <= ritualList.size()) + { + return ritualList.get(ritual - 1).crystalLevel <= crystalLevel; + } else + { + return false; + } + } + + public static boolean checkRitualIsValid(World world, int x, int y, int z, int ritualID) + { + int direction = Rituals.getDirectionOfRitual(world, x, y, z, ritualID); + + if (direction != -1) + { + return true; + } + + return false; + } + + /** + * 1 - NORTH + * 2 - EAST + * 3 - SOUTH + * 4 - WEST + */ + public static boolean checkDirectionOfRitualValid(World world, int x, int y, int z, int ritualID, int direction) + { + List ritual = Rituals.getRitualList(ritualID); + + if (ritual == null) + { + return false; + } + + Block test = null; + + switch (direction) + { + case 1: + for (RitualComponent rc : ritual) + { + test = Block.blocksList[world.getBlockId(x + rc.getX(), y + rc.getY(), z + rc.getZ())]; + + if (!(test instanceof IRitualStone)) + { + return false; + } + + if (world.getBlockMetadata(x + rc.getX(), y + rc.getY(), z + rc.getZ()) != rc.getStoneType()) + { + return false; + } + } + + return true; + + case 2: + for (RitualComponent rc : ritual) + { + test = Block.blocksList[world.getBlockId(x - rc.getZ(), y + rc.getY(), z + rc.getX())]; + + if (!(test instanceof IRitualStone)) + { + return false; + } + + if (world.getBlockMetadata(x - rc.getZ(), y + rc.getY(), z + rc.getX()) != rc.getStoneType()) + { + return false; + } + } + + return true; + + case 3: + for (RitualComponent rc : ritual) + { + test = Block.blocksList[world.getBlockId(x - rc.getX(), y + rc.getY(), z - rc.getZ())]; + + if (!(test instanceof IRitualStone)) + { + return false; + } + + if (world.getBlockMetadata(x - rc.getX(), y + rc.getY(), z - rc.getZ()) != rc.getStoneType()) + { + return false; + } + } + + return true; + + case 4: + for (RitualComponent rc : ritual) + { + test = Block.blocksList[world.getBlockId(x + rc.getZ(), y + rc.getY(), z - rc.getX())]; + + if (!(test instanceof IRitualStone)) + { + return false; + } + + if (world.getBlockMetadata(x + rc.getZ(), y + rc.getY(), z - rc.getX()) != rc.getStoneType()) + { + return false; + } + } + + return true; + } + + return false; + } + + public static int getDirectionOfRitual(World world, int x, int y, int z, int ritualID) + { + for (int i = 1; i <= 4; i++) + { + if (Rituals.checkDirectionOfRitualValid(world, x, y, z, ritualID, i)) + { + return i; + } + } + + return -1; + } + + public static int getCostForActivation(int ritualID) + { + if (ritualID <= ritualList.size()) + { + return ritualList.get(ritualID - 1).actCost; + } else + { + return 0; + } + } + + public static int getInitialCooldown(int ritualID) + { + if (ritualID <= ritualList.size()) + { + RitualEffect ef = ritualList.get(ritualID - 1).effect; + + if (ef != null) + { + OreDictionary d; + return ef.getInitialCooldown(); + } + } + + return 0; + } + + public static List getRitualList(int ritualID) + { + if (ritualID <= ritualList.size()) + { + return ritualList.get(ritualID - 1).obtainComponents(); + } else + { + return null; + } + } + + private List obtainComponents() + { + return this.components; + } + + private int getCrystalLevel() + { + return this.crystalLevel; + } + + public static void performEffect(IMasterRitualStone ritualStone, int ritualID) + { + if (ritualID <= ritualList.size()) + { + RitualEffect ef = ritualList.get(ritualID - 1).effect; + + if (ef != null) + { + ef.performEffect(ritualStone); + } + } + } + + public static int getNumberOfRituals() + { + return ritualList.size(); + } + + public String getRitualName() + { + return this.name; + } + + public static String getNameOfRitual(int id) + { + if (ritualList.get(id) != null) + { + return ritualList.get(id).getRitualName(); + } else + { + return ""; + } + } +} diff --git a/BM_src/WayofTime/alchemicalWizardry/common/LifeEssenceNetwork.java b/BM_src/WayofTime/alchemicalWizardry/api/soulNetwork/LifeEssenceNetwork.java similarity index 91% rename from BM_src/WayofTime/alchemicalWizardry/common/LifeEssenceNetwork.java rename to BM_src/WayofTime/alchemicalWizardry/api/soulNetwork/LifeEssenceNetwork.java index 3eadeea0..61d24eee 100644 --- a/BM_src/WayofTime/alchemicalWizardry/common/LifeEssenceNetwork.java +++ b/BM_src/WayofTime/alchemicalWizardry/api/soulNetwork/LifeEssenceNetwork.java @@ -1,4 +1,4 @@ -package WayofTime.alchemicalWizardry.common; +package WayofTime.alchemicalWizardry.api.soulNetwork; import net.minecraft.nbt.NBTTagCompound; diff --git a/BM_src/WayofTime/alchemicalWizardry/api/soulNetwork/SoulNetworkHandler.java b/BM_src/WayofTime/alchemicalWizardry/api/soulNetwork/SoulNetworkHandler.java new file mode 100644 index 00000000..43816ef8 --- /dev/null +++ b/BM_src/WayofTime/alchemicalWizardry/api/soulNetwork/SoulNetworkHandler.java @@ -0,0 +1,223 @@ +package WayofTime.alchemicalWizardry.api.soulNetwork; + +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.server.MinecraftServer; +import net.minecraft.util.DamageSource; +import net.minecraft.world.World; + +public class SoulNetworkHandler +{ + public static int syphonFromNetwork(ItemStack ist, int damageToBeDone) + { + if (ist.getTagCompound() != null && !(ist.getTagCompound().getString("ownerName").equals(""))) + { + String ownerName = ist.getTagCompound().getString("ownerName"); + + if (MinecraftServer.getServer() == null) + { + return 0; + } + + World world = MinecraftServer.getServer().worldServers[0]; + LifeEssenceNetwork data = (LifeEssenceNetwork) world.loadItemData(LifeEssenceNetwork.class, ownerName); + + if (data == null) + { + data = new LifeEssenceNetwork(ownerName); + world.setItemData(ownerName, data); + } + + if (data.currentEssence >= damageToBeDone) + { + data.currentEssence -= damageToBeDone; + data.markDirty(); + return damageToBeDone; + } + } + return 0; + } + + /** + * Master method used to syphon from the player's network, and will damage them accordingly if they do not have enough LP. + * Does not drain on the client side. + * + * @param ist Owned itemStack + * @param player Player using the item + * @param damageToBeDone + * @return True if server-sided, false if client-sided + */ + public static boolean syphonAndDamageFromNetwork(ItemStack ist, EntityPlayer player, int damageToBeDone) + { + if(player.worldObj.isRemote) + { + return false; + } + + int amount = SoulNetworkHandler.syphonFromNetwork(ist, damageToBeDone); + + hurtPlayer(player, damageToBeDone-amount); + + return true; + } + + public static boolean canSyphonFromOnlyNetwork(ItemStack ist, int damageToBeDone) + { + if (ist.getTagCompound() != null && !(ist.getTagCompound().getString("ownerName").equals(""))) + { + String ownerName = ist.getTagCompound().getString("ownerName"); + + if (MinecraftServer.getServer() == null) + { + return false; + } + + World world = MinecraftServer.getServer().worldServers[0]; + LifeEssenceNetwork data = (LifeEssenceNetwork) world.loadItemData(LifeEssenceNetwork.class, ownerName); + + if (data == null) + { + data = new LifeEssenceNetwork(ownerName); + world.setItemData(ownerName, data); + } + + return data.currentEssence >= damageToBeDone; + } + + return false; + } + + public static int getCurrentEssence(String ownerName) + { + if (MinecraftServer.getServer() == null) + { + return 0; + } + + World world = MinecraftServer.getServer().worldServers[0]; + LifeEssenceNetwork data = (LifeEssenceNetwork) world.loadItemData(LifeEssenceNetwork.class, ownerName); + + if (data == null) + { + data = new LifeEssenceNetwork(ownerName); + world.setItemData(ownerName, data); + } + + return data.currentEssence; + } + + public static void setCurrentEssence(String ownerName, int essence) + { + if (MinecraftServer.getServer() == null) + { + return; + } + + World world = MinecraftServer.getServer().worldServers[0]; + LifeEssenceNetwork data = (LifeEssenceNetwork) world.loadItemData(LifeEssenceNetwork.class, ownerName); + + if (data == null) + { + data = new LifeEssenceNetwork(ownerName); + world.setItemData(ownerName, data); + } + + data.currentEssence = essence; + data.markDirty(); + } + + /** + * A method to add to an owner's network up to a maximum value. + * + * @param ownerName + * @param addedEssence + * @param maximum + * @return amount added to the network + */ + public static int addCurrentEssenceToMaximum(String ownerName, int addedEssence, int maximum) + { + if (MinecraftServer.getServer() == null) + { + return 0; + } + + World world = MinecraftServer.getServer().worldServers[0]; + LifeEssenceNetwork data = (LifeEssenceNetwork) world.loadItemData(LifeEssenceNetwork.class, ownerName); + + if (data == null) + { + data = new LifeEssenceNetwork(ownerName); + world.setItemData(ownerName, data); + } + + int currEss = data.currentEssence; + + if(currEss>=maximum) + { + return 0; + } + + int newEss = Math.min(maximum, currEss+addedEssence); + data.currentEssence = newEss; + + return newEss-currEss; + } + + public static void hurtPlayer(EntityPlayer user, int energySyphoned) + { + if (energySyphoned < 100 && energySyphoned > 0) + { + if (!user.capabilities.isCreativeMode) + { + user.setHealth((user.getHealth() - 1)); + + if (user.getHealth() <= 0.0005f) + { + user.onDeath(DamageSource.generic); + } + } + } else if (energySyphoned >= 100) + { + if (!user.capabilities.isCreativeMode) + { + for (int i = 0; i < ((energySyphoned + 99) / 100); i++) + { + user.setHealth((user.getHealth() - 1)); + + if (user.getHealth() <= 0.0005f) + { + user.onDeath(DamageSource.generic); + break; + } + } + } + } + } + + public static void checkAndSetItemOwner(ItemStack item, EntityPlayer player) + { + if (item.stackTagCompound == null) + { + item.setTagCompound(new NBTTagCompound()); + } + + if (item.stackTagCompound.getString("ownerName").equals("")) + { + item.stackTagCompound.setString("ownerName", player.getEntityName()); + } + } + + public static void checkAndSetItemOwner(ItemStack item, String ownerName) + { + if (item.stackTagCompound == null) + { + item.setTagCompound(new NBTTagCompound()); + } + + if (item.stackTagCompound.getString("ownerName").equals("")) + { + item.stackTagCompound.setString("ownerName", ownerName); + } + } +} diff --git a/BM_src/WayofTime/alchemicalWizardry/common/IBindable.java b/BM_src/WayofTime/alchemicalWizardry/common/IBindable.java deleted file mode 100644 index 5ecb1f5b..00000000 --- a/BM_src/WayofTime/alchemicalWizardry/common/IBindable.java +++ /dev/null @@ -1,5 +0,0 @@ -package WayofTime.alchemicalWizardry.common; - -public interface IBindable -{ -} diff --git a/BM_src/WayofTime/alchemicalWizardry/common/PacketHandler.java b/BM_src/WayofTime/alchemicalWizardry/common/PacketHandler.java index cb7c0d38..1acc5b5f 100644 --- a/BM_src/WayofTime/alchemicalWizardry/common/PacketHandler.java +++ b/BM_src/WayofTime/alchemicalWizardry/common/PacketHandler.java @@ -1,6 +1,7 @@ package WayofTime.alchemicalWizardry.common; import WayofTime.alchemicalWizardry.AlchemicalWizardry; +import WayofTime.alchemicalWizardry.api.soulNetwork.LifeEssenceNetwork; import WayofTime.alchemicalWizardry.common.bloodAltarUpgrade.UpgradedAltars; import WayofTime.alchemicalWizardry.common.tileEntity.*; diff --git a/BM_src/WayofTime/alchemicalWizardry/common/alchemy/AlchemicalPotionCreationHandler.java b/BM_src/WayofTime/alchemicalWizardry/common/alchemy/AlchemicalPotionCreationHandler.java deleted file mode 100644 index aabb92cb..00000000 --- a/BM_src/WayofTime/alchemicalWizardry/common/alchemy/AlchemicalPotionCreationHandler.java +++ /dev/null @@ -1,110 +0,0 @@ -package WayofTime.alchemicalWizardry.common.alchemy; - -import WayofTime.alchemicalWizardry.AlchemicalWizardry; -import WayofTime.alchemicalWizardry.ModItems; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.potion.Potion; - -import java.util.ArrayList; - -public class AlchemicalPotionCreationHandler -{ - public static ArrayList registeredPotionEffects = new ArrayList(); - - public static void initializePotions() - { - addPotion(new ItemStack(Item.ghastTear), Potion.regeneration.id, 450); - addPotion(new ItemStack(Item.goldenCarrot), Potion.nightVision.id, 2 * 60 * 20); - addPotion(new ItemStack(Item.magmaCream), Potion.fireResistance.id, 2 * 60 * 20); - addPotion(new ItemStack(Item.bucketWater), Potion.waterBreathing.id, 2 * 60 * 20); - addPotion(new ItemStack(Item.sugar), Potion.moveSpeed.id, 2 * 60 * 20); - addPotion(new ItemStack(Item.speckledMelon), Potion.heal.id, 2 * 60 * 20); - addPotion(new ItemStack(Item.spiderEye), Potion.poison.id, 450); - addPotion(new ItemStack(Item.fermentedSpiderEye), Potion.weakness.id, 450); - addPotion(new ItemStack(Item.blazePowder), Potion.damageBoost.id, 2 * 60 * 20); - addPotion(new ItemStack(ModItems.aether), Potion.jump.id, 2 * 60 * 20); - addPotion(new ItemStack(Item.clay), Potion.moveSlowdown.id, 450); - addPotion(new ItemStack(Item.redstone), Potion.digSpeed.id, 2 * 60 * 20); - addPotion(new ItemStack(Item.potion, 1, 0), AlchemicalWizardry.customPotionDrowning.id, 450); - //addPotion(new ItemStack(Item.goldenCarrot),Potion.nightVision.id,2*60*20); - addPotion(new ItemStack(Item.glassBottle), Potion.invisibility.id, 2 * 60 * 20); - addPotion(new ItemStack(Item.diamond), Potion.resistance.id, 2 * 60 * 20); - addPotion(new ItemStack(Item.poisonousPotato), Potion.field_76443_y.id, 2); //saturation - addPotion(new ItemStack(ModItems.demonBloodShard), Potion.field_76434_w.id, 4 * 60 * 20); //health boost - addPotion(new ItemStack(ModItems.weakBloodShard), Potion.field_76444_x.id, 4 * 60 * 20); //Absorption - addPotion(new ItemStack(ModItems.terrae), AlchemicalWizardry.customPotionBoost.id, 1 * 60 * 20); - addPotion(new ItemStack(Item.feather), AlchemicalWizardry.customPotionFlight.id, 1 * 60 * 20); - addPotion(new ItemStack(Item.arrow), AlchemicalWizardry.customPotionReciprocation.id, 1 * 60 * 20); - addPotion(new ItemStack(Item.enderPearl),AlchemicalWizardry.customPotionPlanarBinding.id,1*60*20); - } - - public static void addPotion(ItemStack itemStack, int potionID, int tickDuration) - { - registeredPotionEffects.add(new AlchemyPotionHandlerComponent(itemStack, potionID, tickDuration)); - } - - public static int getPotionIDForStack(ItemStack itemStack) - { - for (AlchemyPotionHandlerComponent aphc : registeredPotionEffects) - { - if (aphc.compareItemStack(itemStack)) - { - return aphc.getPotionID(); - } - } - - return -1; - } - - public static int getPotionTickDurationForStack(ItemStack itemStack) - { - { - for (AlchemyPotionHandlerComponent aphc : registeredPotionEffects) - { - if (aphc.compareItemStack(itemStack)) - { - return aphc.getTickDuration(); - } - } - - return -1; - } - } - - public static boolean containsRegisteredPotionIngredient(ItemStack[] stackList) - { - for (ItemStack is : stackList) - { - for (AlchemyPotionHandlerComponent aphc : registeredPotionEffects) - { - if (aphc.compareItemStack(is)) - { - return true; - } - } - } - - return false; - } - - public static int getRegisteredPotionIngredientPosition(ItemStack[] stackList) - { - int i = 0; - - for (ItemStack is : stackList) - { - for (AlchemyPotionHandlerComponent aphc : registeredPotionEffects) - { - if (aphc.compareItemStack(is)) - { - return i; - } - } - - i++; - } - - return -1; - } -} diff --git a/BM_src/WayofTime/alchemicalWizardry/common/alchemy/AlchemyRecipe.java b/BM_src/WayofTime/alchemicalWizardry/common/alchemy/AlchemyRecipe.java index fe60ae4e..2a54f091 100644 --- a/BM_src/WayofTime/alchemicalWizardry/common/alchemy/AlchemyRecipe.java +++ b/BM_src/WayofTime/alchemicalWizardry/common/alchemy/AlchemyRecipe.java @@ -119,44 +119,6 @@ public class AlchemyRecipe } return true; -// if(slottedBloodOrbLevel altarRecipes = new LinkedList(); - - public static void registerAltarRecipe(ItemStack result, ItemStack requiredItem, int minTier, int liquidRequired, int consumptionRate, int drainRate, boolean canBeFilled) - { - altarRecipes.add(new AltarRecipe(result, requiredItem, minTier, liquidRequired, consumptionRate, drainRate, canBeFilled)); - } - - public static void registerAltarOrbRecipe(ItemStack orbStack, int minTier, int consumptionRate) - { - registerAltarRecipe(null, orbStack, minTier, 0, consumptionRate, 0, true); - } - - public static void initRecipes() - { - registerAltarRecipe(new ItemStack(ModItems.weakBloodOrb), new ItemStack(Item.diamond),1,2000,2,1,false); - registerAltarRecipe(new ItemStack(ModItems.apprenticeBloodOrb), new ItemStack(Item.emerald),2,5000,5,5,false); - registerAltarRecipe(new ItemStack(ModItems.magicianBloodOrb), new ItemStack(Block.blockGold),3,25000,20,20,false); - registerAltarRecipe(new ItemStack(ModItems.masterBloodOrb), new ItemStack(ModItems.weakBloodShard),4,40000,30,50,false); - registerAltarRecipe(new ItemStack(ModItems.archmageBloodOrb), new ItemStack(ModItems.demonBloodShard),5,75000,50,100,false); - - registerAltarOrbRecipe(new ItemStack(ModItems.weakBloodOrb),1,2); - registerAltarOrbRecipe(new ItemStack(ModItems.apprenticeBloodOrb),2,5); - registerAltarOrbRecipe(new ItemStack(ModItems.magicianBloodOrb),3,15); - registerAltarOrbRecipe(new ItemStack(ModItems.masterBloodOrb),4,25); - registerAltarOrbRecipe(new ItemStack(ModItems.archmageBloodOrb),5,50); - - registerAltarRecipe(new ItemStack(ModItems.telepositionFocus), new ItemStack(Item.enderPearl),4,2000,10,10,false); - registerAltarRecipe(new ItemStack(ModItems.enhancedTelepositionFocus), new ItemStack(ModItems.telepositionFocus),4,10000,25,15,false); - registerAltarRecipe(new ItemStack(ModItems.demonicSlate), new ItemStack(ModItems.imbuedSlate),4,15000,20,20,false); - registerAltarRecipe(new ItemStack(ModItems.duskScribeTool), new ItemStack(Block.coalBlock),4,2000,20,10,false); - registerAltarRecipe(new ItemStack(ModBlocks.bloodSocket), new ItemStack(ModBlocks.emptySocket),3,30000,40,10,false); - registerAltarRecipe(new ItemStack(ModItems.earthScribeTool), new ItemStack(Block.obsidian),3,1000,5,5,false); - registerAltarRecipe(new ItemStack(ModItems.waterScribeTool), new ItemStack(Block.blockLapis),3,1000,5,5,false); - registerAltarRecipe(new ItemStack(ModItems.blankSpell), new ItemStack(Block.glass),2,1000,5,5,false); - registerAltarRecipe(new ItemStack(ModItems.blankSlate), new ItemStack(Block.stone),1,1000,5,5,false); - registerAltarRecipe(new ItemStack(ModItems.activationCrystal), new ItemStack(ModItems.lavaCrystal),3,10000,20,10,false); - registerAltarRecipe(new ItemStack(ModItems.fireScribeTool), new ItemStack(Item.magmaCream),3,1000,5,5,false); - registerAltarRecipe(new ItemStack(ModItems.airScribeTool), new ItemStack(Item.ghastTear),3,1000,5,5,false); - registerAltarRecipe(new ItemStack(ModItems.imbuedSlate), new ItemStack(ModItems.reinforcedSlate),3,5000,15,10,false); - registerAltarRecipe(new ItemStack(ModItems.daggerOfSacrifice), new ItemStack(Item.swordIron),2,3000,5,5,false); - registerAltarRecipe(new ItemStack(ModItems.alchemyFlask), new ItemStack(Item.glassBottle),2,2000,5,5,false); - registerAltarRecipe(new ItemStack(ModItems.reinforcedSlate), new ItemStack(ModItems.blankSlate),2,2000,5,5,false); - registerAltarRecipe(new ItemStack(AlchemicalWizardry.bucketLife), new ItemStack(Item.bucketEmpty),1,1000,5,0,false); - } - - public static boolean isRequiredItemValid(ItemStack testItem, int currentTierAltar) - { - for(AltarRecipe recipe : altarRecipes) - { - if(recipe.doesRequiredItemMatch(testItem, currentTierAltar)) - { - return true; - } - } - - return false; - } - - public static ItemStack getItemForItemAndTier(ItemStack testItem, int currentTierAltar) - { - for(AltarRecipe recipe : altarRecipes) - { - if(recipe.doesRequiredItemMatch(testItem, currentTierAltar)) - { - return recipe.getResult().copy(); - } - } - - return null; - } - - public static AltarRecipe getAltarRecipeForItemAndTier(ItemStack testItem, int currentTierAltar) - { - for(AltarRecipe recipe : altarRecipes) - { - if(recipe.doesRequiredItemMatch(testItem, currentTierAltar)) - { - return recipe; - } - } - - return null; - } -} diff --git a/BM_src/WayofTime/alchemicalWizardry/common/block/ArmourForge.java b/BM_src/WayofTime/alchemicalWizardry/common/block/ArmourForge.java index 71e32ca2..302d4ddd 100644 --- a/BM_src/WayofTime/alchemicalWizardry/common/block/ArmourForge.java +++ b/BM_src/WayofTime/alchemicalWizardry/common/block/ArmourForge.java @@ -2,8 +2,8 @@ package WayofTime.alchemicalWizardry.common.block; import WayofTime.alchemicalWizardry.AlchemicalWizardry; import WayofTime.alchemicalWizardry.ModItems; +import WayofTime.alchemicalWizardry.api.items.interfaces.ArmourUpgrade; import WayofTime.alchemicalWizardry.common.ArmourComponent; -import WayofTime.alchemicalWizardry.common.ArmourUpgrade; import WayofTime.alchemicalWizardry.common.items.BoundArmour; import WayofTime.alchemicalWizardry.common.tileEntity.TEAltar; import WayofTime.alchemicalWizardry.common.tileEntity.TESocket; diff --git a/BM_src/WayofTime/alchemicalWizardry/common/block/BlockSocket.java b/BM_src/WayofTime/alchemicalWizardry/common/block/BlockSocket.java index 3fbdf6ff..a43e2753 100644 --- a/BM_src/WayofTime/alchemicalWizardry/common/block/BlockSocket.java +++ b/BM_src/WayofTime/alchemicalWizardry/common/block/BlockSocket.java @@ -1,7 +1,7 @@ package WayofTime.alchemicalWizardry.common.block; import WayofTime.alchemicalWizardry.AlchemicalWizardry; -import WayofTime.alchemicalWizardry.common.ArmourUpgrade; +import WayofTime.alchemicalWizardry.api.items.interfaces.ArmourUpgrade; import WayofTime.alchemicalWizardry.common.tileEntity.TESocket; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/BM_src/WayofTime/alchemicalWizardry/common/block/RitualStone.java b/BM_src/WayofTime/alchemicalWizardry/common/block/RitualStone.java index 567e0187..47bc1f16 100644 --- a/BM_src/WayofTime/alchemicalWizardry/common/block/RitualStone.java +++ b/BM_src/WayofTime/alchemicalWizardry/common/block/RitualStone.java @@ -1,9 +1,5 @@ package WayofTime.alchemicalWizardry.common.block; -import WayofTime.alchemicalWizardry.AlchemicalWizardry; -import WayofTime.alchemicalWizardry.common.items.ScribeTool; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IconRegister; @@ -12,8 +8,13 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.Icon; import net.minecraft.world.World; +import WayofTime.alchemicalWizardry.AlchemicalWizardry; +import WayofTime.alchemicalWizardry.api.rituals.IRitualStone; +import WayofTime.alchemicalWizardry.common.items.ScribeTool; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; -public class RitualStone extends Block +public class RitualStone extends Block implements IRitualStone { @SideOnly(Side.CLIENT) private static Icon blankIcon; diff --git a/BM_src/WayofTime/alchemicalWizardry/common/items/BloodShard.java b/BM_src/WayofTime/alchemicalWizardry/common/items/BloodShard.java index fda8720a..d9e22af0 100644 --- a/BM_src/WayofTime/alchemicalWizardry/common/items/BloodShard.java +++ b/BM_src/WayofTime/alchemicalWizardry/common/items/BloodShard.java @@ -2,7 +2,7 @@ package WayofTime.alchemicalWizardry.common.items; import WayofTime.alchemicalWizardry.AlchemicalWizardry; import WayofTime.alchemicalWizardry.ModItems; -import WayofTime.alchemicalWizardry.common.ArmourUpgrade; +import WayofTime.alchemicalWizardry.api.items.interfaces.ArmourUpgrade; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.client.renderer.texture.IconRegister; diff --git a/BM_src/WayofTime/alchemicalWizardry/common/items/BoundArmour.java b/BM_src/WayofTime/alchemicalWizardry/common/items/BoundArmour.java index 48b3422a..88d4c2aa 100644 --- a/BM_src/WayofTime/alchemicalWizardry/common/items/BoundArmour.java +++ b/BM_src/WayofTime/alchemicalWizardry/common/items/BoundArmour.java @@ -20,8 +20,8 @@ import thaumcraft.api.IGoggles; import thaumcraft.api.nodes.IRevealer; import WayofTime.alchemicalWizardry.AlchemicalWizardry; import WayofTime.alchemicalWizardry.ModItems; -import WayofTime.alchemicalWizardry.common.ArmourUpgrade; -import WayofTime.alchemicalWizardry.common.IBindable; +import WayofTime.alchemicalWizardry.api.items.interfaces.ArmourUpgrade; +import WayofTime.alchemicalWizardry.api.items.interfaces.IBindable; import cpw.mods.fml.common.Optional; import cpw.mods.fml.common.Optional.Interface; import cpw.mods.fml.relauncher.Side; diff --git a/BM_src/WayofTime/alchemicalWizardry/common/items/BoundAxe.java b/BM_src/WayofTime/alchemicalWizardry/common/items/BoundAxe.java index 10ffdba7..fbae4e3e 100644 --- a/BM_src/WayofTime/alchemicalWizardry/common/items/BoundAxe.java +++ b/BM_src/WayofTime/alchemicalWizardry/common/items/BoundAxe.java @@ -1,7 +1,7 @@ package WayofTime.alchemicalWizardry.common.items; import WayofTime.alchemicalWizardry.AlchemicalWizardry; -import WayofTime.alchemicalWizardry.common.IBindable; +import WayofTime.alchemicalWizardry.api.items.interfaces.IBindable; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.block.Block; diff --git a/BM_src/WayofTime/alchemicalWizardry/common/items/BoundPickaxe.java b/BM_src/WayofTime/alchemicalWizardry/common/items/BoundPickaxe.java index c48186a7..b43e3c5b 100644 --- a/BM_src/WayofTime/alchemicalWizardry/common/items/BoundPickaxe.java +++ b/BM_src/WayofTime/alchemicalWizardry/common/items/BoundPickaxe.java @@ -1,7 +1,7 @@ package WayofTime.alchemicalWizardry.common.items; import WayofTime.alchemicalWizardry.AlchemicalWizardry; -import WayofTime.alchemicalWizardry.common.IBindable; +import WayofTime.alchemicalWizardry.api.items.interfaces.IBindable; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.block.Block; diff --git a/BM_src/WayofTime/alchemicalWizardry/common/items/BoundShovel.java b/BM_src/WayofTime/alchemicalWizardry/common/items/BoundShovel.java index 6579f380..2e65d6ea 100644 --- a/BM_src/WayofTime/alchemicalWizardry/common/items/BoundShovel.java +++ b/BM_src/WayofTime/alchemicalWizardry/common/items/BoundShovel.java @@ -1,7 +1,7 @@ package WayofTime.alchemicalWizardry.common.items; import WayofTime.alchemicalWizardry.AlchemicalWizardry; -import WayofTime.alchemicalWizardry.common.IBindable; +import WayofTime.alchemicalWizardry.api.items.interfaces.IBindable; import com.google.common.collect.Multimap; diff --git a/BM_src/WayofTime/alchemicalWizardry/common/items/CheatyItem.java b/BM_src/WayofTime/alchemicalWizardry/common/items/CheatyItem.java index 055dc6ee..06b0323c 100644 --- a/BM_src/WayofTime/alchemicalWizardry/common/items/CheatyItem.java +++ b/BM_src/WayofTime/alchemicalWizardry/common/items/CheatyItem.java @@ -1,8 +1,8 @@ package WayofTime.alchemicalWizardry.common.items; import WayofTime.alchemicalWizardry.AlchemicalWizardry; -import WayofTime.alchemicalWizardry.common.IBindable; -import WayofTime.alchemicalWizardry.common.LifeEssenceNetwork; +import WayofTime.alchemicalWizardry.api.items.interfaces.IBindable; +import WayofTime.alchemicalWizardry.api.soulNetwork.LifeEssenceNetwork; import WayofTime.alchemicalWizardry.common.PacketHandler; import WayofTime.alchemicalWizardry.common.tileEntity.TEAltar; import cpw.mods.fml.common.network.PacketDispatcher; diff --git a/BM_src/WayofTime/alchemicalWizardry/common/items/EnergyBattery.java b/BM_src/WayofTime/alchemicalWizardry/common/items/EnergyBattery.java index 3f825f95..497d945e 100644 --- a/BM_src/WayofTime/alchemicalWizardry/common/items/EnergyBattery.java +++ b/BM_src/WayofTime/alchemicalWizardry/common/items/EnergyBattery.java @@ -1,6 +1,10 @@ package WayofTime.alchemicalWizardry.common.items; import WayofTime.alchemicalWizardry.AlchemicalWizardry; +import WayofTime.alchemicalWizardry.api.items.interfaces.ArmourUpgrade; +import WayofTime.alchemicalWizardry.api.items.interfaces.IBindable; +import WayofTime.alchemicalWizardry.api.items.interfaces.IBloodOrb; +import WayofTime.alchemicalWizardry.api.soulNetwork.LifeEssenceNetwork; import WayofTime.alchemicalWizardry.common.*; import WayofTime.alchemicalWizardry.common.spell.complex.effect.SpellHelper; import WayofTime.alchemicalWizardry.common.tileEntity.TEAltar; @@ -20,7 +24,7 @@ import net.minecraftforge.common.FakePlayer; import java.util.List; -public class EnergyBattery extends Item implements ArmourUpgrade, IBindable +public class EnergyBattery extends Item implements ArmourUpgrade, IBindable, IBloodOrb { private int maxEssence; protected int orbLevel; @@ -194,14 +198,6 @@ public class EnergyBattery extends Item implements ArmourUpgrade, IBindable @Override public ItemStack getContainerItemStack(ItemStack itemStack) { - //if(!syphonBatteries(itemStack, null, 10)) - { - //syphonWhileInContainer(itemStack, this.getEnergyUsed()); -// ItemStack copiedStack = itemStack.copy(); -// copiedStack.setItemDamage(copiedStack.getItemDamage()); -// copiedStack.stackSize = 1; -// return copiedStack; - } return itemStack; } diff --git a/BM_src/WayofTime/alchemicalWizardry/common/items/EnergyItems.java b/BM_src/WayofTime/alchemicalWizardry/common/items/EnergyItems.java index dba7a7ba..7b67e0fd 100644 --- a/BM_src/WayofTime/alchemicalWizardry/common/items/EnergyItems.java +++ b/BM_src/WayofTime/alchemicalWizardry/common/items/EnergyItems.java @@ -1,11 +1,5 @@ package WayofTime.alchemicalWizardry.common.items; -import WayofTime.alchemicalWizardry.AlchemicalWizardry; -import WayofTime.alchemicalWizardry.common.IBindable; -import WayofTime.alchemicalWizardry.common.LifeEssenceNetwork; -import WayofTime.alchemicalWizardry.common.PacketHandler; -import WayofTime.alchemicalWizardry.common.tileEntity.TEAltar; -import cpw.mods.fml.common.network.PacketDispatcher; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; @@ -13,6 +7,12 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.server.MinecraftServer; import net.minecraft.util.DamageSource; import net.minecraft.world.World; +import WayofTime.alchemicalWizardry.api.items.interfaces.IBindable; +import WayofTime.alchemicalWizardry.api.soulNetwork.LifeEssenceNetwork; +import WayofTime.alchemicalWizardry.api.soulNetwork.SoulNetworkHandler; +import WayofTime.alchemicalWizardry.common.PacketHandler; +import WayofTime.alchemicalWizardry.common.tileEntity.TEAltar; +import cpw.mods.fml.common.network.PacketDispatcher; public class EnergyItems extends Item implements IBindable { @@ -21,7 +21,6 @@ public class EnergyItems extends Item implements IBindable public EnergyItems(int id) { super(id); - setCreativeTab(AlchemicalWizardry.tabBloodMagic); } protected void setEnergyUsed(int par1int) @@ -33,40 +32,6 @@ public class EnergyItems extends Item implements IBindable { return this.energyUsed; } - //Heals the player using the item. If the player is at full health, or if the durability cannot be used any more, - //the item is not used. - - 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 = (float) 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("reddust", posX + Math.random() - Math.random(), posY + Math.random() - Math.random(), posZ + Math.random() - Math.random(), f1, f2, f3); - } - } - - for (int i = 0; i < damage; i++) - { - //player.setEntityHealth((player.getHealth()-1)); - player.setHealth((player.getHealth() - 1)); - - if (player.getHealth() <= 0.0005) - { - player.inventory.dropAllItems(); - break; - } - } - } public static boolean syphonBatteriesWithoutParticles(ItemStack ist, EntityPlayer player, int damageToBeDone, boolean particles) { @@ -107,6 +72,9 @@ public class EnergyItems extends Item implements IBindable } } + /** + * Master method to syphon from the Soul Network. + */ public static boolean syphonBatteries(ItemStack ist, EntityPlayer player, int damageToBeDone) { if (!player.worldObj.isRemote) @@ -135,161 +103,29 @@ public class EnergyItems extends Item implements IBindable public static boolean syphonWhileInContainer(ItemStack ist, int damageToBeDone) { - if (ist.getTagCompound() != null && !(ist.getTagCompound().getString("ownerName").equals(""))) - { - String ownerName = ist.getTagCompound().getString("ownerName"); - - if (MinecraftServer.getServer() == null) - { - return false; - } - - World world = MinecraftServer.getServer().worldServers[0]; - LifeEssenceNetwork data = (LifeEssenceNetwork) world.loadItemData(LifeEssenceNetwork.class, ownerName); - - if (data == null) - { - data = new LifeEssenceNetwork(ownerName); - world.setItemData(ownerName, data); - } - - if (data.currentEssence >= damageToBeDone) - { - data.currentEssence -= damageToBeDone; - data.markDirty(); - return true; - } - -// EntityPlayer ownerEntity = MinecraftServer.getServer().getConfigurationManager().getPlayerForUsername(ist.getTagCompound().getString("ownerName")); -// if(ownerEntity==null){return false;} -// NBTTagCompound tag = ownerEntity.getEntityData(); -// int currentEssence = tag.getInteger("currentEssence"); -// if(currentEssence>=damageToBeDone) -// { -// tag.setInteger("currentEssence", currentEssence-damageToBeDone); -// return true; -// } - } - - return false; - } - - public static boolean canSyphonInContainer(ItemStack ist, int damageToBeDone) - { - if (ist.getTagCompound() != null && !(ist.getTagCompound().getString("ownerName").equals(""))) - { - String ownerName = ist.getTagCompound().getString("ownerName"); - - if (MinecraftServer.getServer() == null) - { - return false; - } - - World world = MinecraftServer.getServer().worldServers[0]; - LifeEssenceNetwork data = (LifeEssenceNetwork) world.loadItemData(LifeEssenceNetwork.class, ownerName); - - if (data == null) - { - data = new LifeEssenceNetwork(ownerName); - world.setItemData(ownerName, data); - } - - return data.currentEssence >= damageToBeDone; -// EntityPlayer ownerEntity = MinecraftServer.getServer().getConfigurationManager().getPlayerForUsername(ist.getTagCompound().getString("ownerName")); -// if(ownerEntity==null){return false;} -// NBTTagCompound tag = ownerEntity.getEntityData(); -// int currentEssence = tag.getInteger("currentEssence"); -// if(currentEssence>=damageToBeDone) -// { -// tag.setInteger("currentEssence", currentEssence-damageToBeDone); -// return true; -// } - } - - return false; - } - - public static void hurtPlayer(EntityPlayer user, int energySyphoned) - { - if (energySyphoned < 100 && energySyphoned > 0) - { - if (!user.capabilities.isCreativeMode) - { - //player.setEntityHealth((player.getHealth()-1)); - user.setHealth((user.getHealth() - 1)); - - if (user.getHealth() <= 0.0005f) - { - user.onDeath(DamageSource.generic); - - } - } - } else if (energySyphoned >= 100) - { - if (!user.capabilities.isCreativeMode) - { - for (int i = 0; i < ((energySyphoned + 99) / 100); i++) - { - //player.setEntityHealth((player.getHealth()-1)); - user.setHealth((user.getHealth() - 1)); - - if (user.getHealth() <= 0.0005f) - { - user.onDeath(DamageSource.generic); - break; - } - } - } - } - } - - public static boolean syphonAndDamageWhileInContainer(ItemStack ist, EntityPlayer player, int damageToBeDone) - { - if (!syphonWhileInContainer(ist, damageToBeDone)) - { - hurtPlayer(player, damageToBeDone); - } + SoulNetworkHandler.syphonFromNetwork(ist, damageToBeDone); return true; } - //Global static methods + public static boolean canSyphonInContainer(ItemStack ist, int damageToBeDone) + { + return SoulNetworkHandler.canSyphonFromOnlyNetwork(ist, damageToBeDone); + } + + public static boolean syphonAndDamageWhileInContainer(ItemStack ist, EntityPlayer player, int damageToBeDone) + { + return SoulNetworkHandler.syphonAndDamageFromNetwork(ist, player, damageToBeDone); + } + public static void checkAndSetItemOwner(ItemStack item, EntityPlayer player) { - if (item.stackTagCompound == null) - { - item.setTagCompound(new NBTTagCompound()); - } - - if (item.stackTagCompound.getString("ownerName").equals("")) - { - item.stackTagCompound.setString("ownerName", player.getEntityName()); - } - - initializePlayer(player); + SoulNetworkHandler.checkAndSetItemOwner(item, player); } public static void checkAndSetItemOwner(ItemStack item, String ownerName) { - if (item.stackTagCompound == null) - { - item.setTagCompound(new NBTTagCompound()); - } - - if (item.stackTagCompound.getString("ownerName").equals("")) - { - item.stackTagCompound.setString("ownerName", ownerName); - } - } - - public static void initializePlayer(EntityPlayer player) - { - NBTTagCompound tag = player.getEntityData(); - - if (tag.getInteger("currentEssence") == 0) - { - tag.setInteger("currentEssence", 0); - } + SoulNetworkHandler.checkAndSetItemOwner(item, ownerName); } public String getOwnerName(ItemStack item) diff --git a/BM_src/WayofTime/alchemicalWizardry/common/items/ItemDiabloKey.java b/BM_src/WayofTime/alchemicalWizardry/common/items/ItemDiabloKey.java index 3a46f278..51ebf841 100644 --- a/BM_src/WayofTime/alchemicalWizardry/common/items/ItemDiabloKey.java +++ b/BM_src/WayofTime/alchemicalWizardry/common/items/ItemDiabloKey.java @@ -2,7 +2,7 @@ package WayofTime.alchemicalWizardry.common.items; import WayofTime.alchemicalWizardry.AlchemicalWizardry; import WayofTime.alchemicalWizardry.ModItems; -import WayofTime.alchemicalWizardry.common.IBindable; +import WayofTime.alchemicalWizardry.api.items.interfaces.IBindable; import WayofTime.alchemicalWizardry.common.spell.complex.effect.SpellHelper; import WayofTime.alchemicalWizardry.common.tileEntity.TEAltar; import cpw.mods.fml.common.network.PacketDispatcher; diff --git a/BM_src/WayofTime/alchemicalWizardry/common/items/ItemRitualDiviner.java b/BM_src/WayofTime/alchemicalWizardry/common/items/ItemRitualDiviner.java index 01eea34f..0cba9135 100644 --- a/BM_src/WayofTime/alchemicalWizardry/common/items/ItemRitualDiviner.java +++ b/BM_src/WayofTime/alchemicalWizardry/common/items/ItemRitualDiviner.java @@ -3,8 +3,8 @@ package WayofTime.alchemicalWizardry.common.items; import WayofTime.alchemicalWizardry.AlchemicalWizardry; import WayofTime.alchemicalWizardry.ModBlocks; import WayofTime.alchemicalWizardry.ModItems; -import WayofTime.alchemicalWizardry.common.rituals.RitualComponent; -import WayofTime.alchemicalWizardry.common.rituals.Rituals; +import WayofTime.alchemicalWizardry.api.rituals.RitualComponent; +import WayofTime.alchemicalWizardry.api.rituals.Rituals; import WayofTime.alchemicalWizardry.common.spell.complex.effect.SpellHelper; import WayofTime.alchemicalWizardry.common.tileEntity.TEMasterStone; import cpw.mods.fml.relauncher.Side; diff --git a/BM_src/WayofTime/alchemicalWizardry/common/items/LavaCrystal.java b/BM_src/WayofTime/alchemicalWizardry/common/items/LavaCrystal.java index 0f45e31c..4d416061 100644 --- a/BM_src/WayofTime/alchemicalWizardry/common/items/LavaCrystal.java +++ b/BM_src/WayofTime/alchemicalWizardry/common/items/LavaCrystal.java @@ -1,7 +1,7 @@ package WayofTime.alchemicalWizardry.common.items; import WayofTime.alchemicalWizardry.AlchemicalWizardry; -import WayofTime.alchemicalWizardry.common.LifeEssenceNetwork; +import WayofTime.alchemicalWizardry.api.soulNetwork.LifeEssenceNetwork; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.client.renderer.texture.IconRegister; diff --git a/BM_src/WayofTime/alchemicalWizardry/common/items/forestry/ItemBloodFrame.java b/BM_src/WayofTime/alchemicalWizardry/common/items/forestry/ItemBloodFrame.java index ad82a08e..53e5320f 100644 --- a/BM_src/WayofTime/alchemicalWizardry/common/items/forestry/ItemBloodFrame.java +++ b/BM_src/WayofTime/alchemicalWizardry/common/items/forestry/ItemBloodFrame.java @@ -1,7 +1,7 @@ package WayofTime.alchemicalWizardry.common.items.forestry; import WayofTime.alchemicalWizardry.AlchemicalWizardry; -import WayofTime.alchemicalWizardry.common.ArmourUpgrade; +import WayofTime.alchemicalWizardry.api.items.interfaces.ArmourUpgrade; import WayofTime.alchemicalWizardry.common.items.EnergyItems; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/BM_src/WayofTime/alchemicalWizardry/common/items/sigil/AirSigil.java b/BM_src/WayofTime/alchemicalWizardry/common/items/sigil/AirSigil.java index 0850c947..57c6d7fb 100644 --- a/BM_src/WayofTime/alchemicalWizardry/common/items/sigil/AirSigil.java +++ b/BM_src/WayofTime/alchemicalWizardry/common/items/sigil/AirSigil.java @@ -1,7 +1,7 @@ package WayofTime.alchemicalWizardry.common.items.sigil; import WayofTime.alchemicalWizardry.AlchemicalWizardry; -import WayofTime.alchemicalWizardry.common.ArmourUpgrade; +import WayofTime.alchemicalWizardry.api.items.interfaces.ArmourUpgrade; import WayofTime.alchemicalWizardry.common.items.EnergyItems; import WayofTime.alchemicalWizardry.common.spell.complex.effect.SpellHelper; import cpw.mods.fml.relauncher.Side; diff --git a/BM_src/WayofTime/alchemicalWizardry/common/items/sigil/DivinationSigil.java b/BM_src/WayofTime/alchemicalWizardry/common/items/sigil/DivinationSigil.java index 66fd6c60..10f491ec 100644 --- a/BM_src/WayofTime/alchemicalWizardry/common/items/sigil/DivinationSigil.java +++ b/BM_src/WayofTime/alchemicalWizardry/common/items/sigil/DivinationSigil.java @@ -1,7 +1,7 @@ package WayofTime.alchemicalWizardry.common.items.sigil; import WayofTime.alchemicalWizardry.AlchemicalWizardry; -import WayofTime.alchemicalWizardry.common.ArmourUpgrade; +import WayofTime.alchemicalWizardry.api.items.interfaces.ArmourUpgrade; import WayofTime.alchemicalWizardry.common.PacketHandler; import WayofTime.alchemicalWizardry.common.items.EnergyItems; import WayofTime.alchemicalWizardry.common.spell.complex.effect.SpellHelper; diff --git a/BM_src/WayofTime/alchemicalWizardry/common/items/sigil/LavaSigil.java b/BM_src/WayofTime/alchemicalWizardry/common/items/sigil/LavaSigil.java index 9b4a7939..972c9961 100644 --- a/BM_src/WayofTime/alchemicalWizardry/common/items/sigil/LavaSigil.java +++ b/BM_src/WayofTime/alchemicalWizardry/common/items/sigil/LavaSigil.java @@ -1,7 +1,7 @@ package WayofTime.alchemicalWizardry.common.items.sigil; import WayofTime.alchemicalWizardry.AlchemicalWizardry; -import WayofTime.alchemicalWizardry.common.ArmourUpgrade; +import WayofTime.alchemicalWizardry.api.items.interfaces.ArmourUpgrade; import WayofTime.alchemicalWizardry.common.items.EnergyBattery; import WayofTime.alchemicalWizardry.common.items.EnergyItems; import WayofTime.alchemicalWizardry.common.spell.complex.effect.SpellHelper; diff --git a/BM_src/WayofTime/alchemicalWizardry/common/items/sigil/SigilOfGrowth.java b/BM_src/WayofTime/alchemicalWizardry/common/items/sigil/SigilOfGrowth.java index 09252937..573a4c83 100644 --- a/BM_src/WayofTime/alchemicalWizardry/common/items/sigil/SigilOfGrowth.java +++ b/BM_src/WayofTime/alchemicalWizardry/common/items/sigil/SigilOfGrowth.java @@ -1,7 +1,7 @@ package WayofTime.alchemicalWizardry.common.items.sigil; import WayofTime.alchemicalWizardry.AlchemicalWizardry; -import WayofTime.alchemicalWizardry.common.ArmourUpgrade; +import WayofTime.alchemicalWizardry.api.items.interfaces.ArmourUpgrade; import WayofTime.alchemicalWizardry.common.items.EnergyItems; import WayofTime.alchemicalWizardry.common.spell.complex.effect.SpellHelper; import cpw.mods.fml.relauncher.Side; diff --git a/BM_src/WayofTime/alchemicalWizardry/common/items/sigil/SigilOfHaste.java b/BM_src/WayofTime/alchemicalWizardry/common/items/sigil/SigilOfHaste.java index 4e8a98b2..b71559b4 100644 --- a/BM_src/WayofTime/alchemicalWizardry/common/items/sigil/SigilOfHaste.java +++ b/BM_src/WayofTime/alchemicalWizardry/common/items/sigil/SigilOfHaste.java @@ -1,7 +1,7 @@ package WayofTime.alchemicalWizardry.common.items.sigil; import WayofTime.alchemicalWizardry.AlchemicalWizardry; -import WayofTime.alchemicalWizardry.common.ArmourUpgrade; +import WayofTime.alchemicalWizardry.api.items.interfaces.ArmourUpgrade; import WayofTime.alchemicalWizardry.common.items.EnergyItems; import WayofTime.alchemicalWizardry.common.spell.complex.effect.SpellHelper; import cpw.mods.fml.relauncher.Side; diff --git a/BM_src/WayofTime/alchemicalWizardry/common/items/sigil/SigilOfMagnetism.java b/BM_src/WayofTime/alchemicalWizardry/common/items/sigil/SigilOfMagnetism.java index 45c4a8a1..c2756375 100644 --- a/BM_src/WayofTime/alchemicalWizardry/common/items/sigil/SigilOfMagnetism.java +++ b/BM_src/WayofTime/alchemicalWizardry/common/items/sigil/SigilOfMagnetism.java @@ -1,7 +1,7 @@ package WayofTime.alchemicalWizardry.common.items.sigil; import WayofTime.alchemicalWizardry.AlchemicalWizardry; -import WayofTime.alchemicalWizardry.common.ArmourUpgrade; +import WayofTime.alchemicalWizardry.api.items.interfaces.ArmourUpgrade; import WayofTime.alchemicalWizardry.common.items.EnergyItems; import WayofTime.alchemicalWizardry.common.spell.complex.effect.SpellHelper; import cpw.mods.fml.relauncher.Side; diff --git a/BM_src/WayofTime/alchemicalWizardry/common/items/sigil/SigilOfTheBridge.java b/BM_src/WayofTime/alchemicalWizardry/common/items/sigil/SigilOfTheBridge.java index 79ca9502..a3826f5e 100644 --- a/BM_src/WayofTime/alchemicalWizardry/common/items/sigil/SigilOfTheBridge.java +++ b/BM_src/WayofTime/alchemicalWizardry/common/items/sigil/SigilOfTheBridge.java @@ -2,7 +2,7 @@ package WayofTime.alchemicalWizardry.common.items.sigil; import WayofTime.alchemicalWizardry.AlchemicalWizardry; import WayofTime.alchemicalWizardry.ModBlocks; -import WayofTime.alchemicalWizardry.common.ArmourUpgrade; +import WayofTime.alchemicalWizardry.api.items.interfaces.ArmourUpgrade; import WayofTime.alchemicalWizardry.common.items.EnergyItems; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/BM_src/WayofTime/alchemicalWizardry/common/items/sigil/SigilOfTheFastMiner.java b/BM_src/WayofTime/alchemicalWizardry/common/items/sigil/SigilOfTheFastMiner.java index 96db2e6e..9202871e 100644 --- a/BM_src/WayofTime/alchemicalWizardry/common/items/sigil/SigilOfTheFastMiner.java +++ b/BM_src/WayofTime/alchemicalWizardry/common/items/sigil/SigilOfTheFastMiner.java @@ -1,7 +1,7 @@ package WayofTime.alchemicalWizardry.common.items.sigil; import WayofTime.alchemicalWizardry.AlchemicalWizardry; -import WayofTime.alchemicalWizardry.common.ArmourUpgrade; +import WayofTime.alchemicalWizardry.api.items.interfaces.ArmourUpgrade; import WayofTime.alchemicalWizardry.common.items.EnergyItems; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/BM_src/WayofTime/alchemicalWizardry/common/items/sigil/SigilOfWind.java b/BM_src/WayofTime/alchemicalWizardry/common/items/sigil/SigilOfWind.java index 514e4ad3..bc89f98c 100644 --- a/BM_src/WayofTime/alchemicalWizardry/common/items/sigil/SigilOfWind.java +++ b/BM_src/WayofTime/alchemicalWizardry/common/items/sigil/SigilOfWind.java @@ -1,7 +1,7 @@ package WayofTime.alchemicalWizardry.common.items.sigil; import WayofTime.alchemicalWizardry.AlchemicalWizardry; -import WayofTime.alchemicalWizardry.common.ArmourUpgrade; +import WayofTime.alchemicalWizardry.api.items.interfaces.ArmourUpgrade; import WayofTime.alchemicalWizardry.common.items.EnergyItems; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/BM_src/WayofTime/alchemicalWizardry/common/items/sigil/VoidSigil.java b/BM_src/WayofTime/alchemicalWizardry/common/items/sigil/VoidSigil.java index 563db7d7..01800e37 100644 --- a/BM_src/WayofTime/alchemicalWizardry/common/items/sigil/VoidSigil.java +++ b/BM_src/WayofTime/alchemicalWizardry/common/items/sigil/VoidSigil.java @@ -1,7 +1,7 @@ package WayofTime.alchemicalWizardry.common.items.sigil; import WayofTime.alchemicalWizardry.AlchemicalWizardry; -import WayofTime.alchemicalWizardry.common.ArmourUpgrade; +import WayofTime.alchemicalWizardry.api.items.interfaces.ArmourUpgrade; import WayofTime.alchemicalWizardry.common.items.EnergyBattery; import WayofTime.alchemicalWizardry.common.items.EnergyItems; import WayofTime.alchemicalWizardry.common.spell.complex.effect.SpellHelper; diff --git a/BM_src/WayofTime/alchemicalWizardry/common/items/sigil/WaterSigil.java b/BM_src/WayofTime/alchemicalWizardry/common/items/sigil/WaterSigil.java index 78b03075..f5334bc1 100644 --- a/BM_src/WayofTime/alchemicalWizardry/common/items/sigil/WaterSigil.java +++ b/BM_src/WayofTime/alchemicalWizardry/common/items/sigil/WaterSigil.java @@ -1,7 +1,7 @@ package WayofTime.alchemicalWizardry.common.items.sigil; import WayofTime.alchemicalWizardry.AlchemicalWizardry; -import WayofTime.alchemicalWizardry.common.ArmourUpgrade; +import WayofTime.alchemicalWizardry.api.items.interfaces.ArmourUpgrade; import WayofTime.alchemicalWizardry.common.items.EnergyItems; import WayofTime.alchemicalWizardry.common.spell.complex.effect.SpellHelper; import cpw.mods.fml.relauncher.Side; diff --git a/BM_src/WayofTime/alchemicalWizardry/common/items/thaumcraft/ItemSanguineArmour.java b/BM_src/WayofTime/alchemicalWizardry/common/items/thaumcraft/ItemSanguineArmour.java index c4bba0fa..8a5b2a03 100644 --- a/BM_src/WayofTime/alchemicalWizardry/common/items/thaumcraft/ItemSanguineArmour.java +++ b/BM_src/WayofTime/alchemicalWizardry/common/items/thaumcraft/ItemSanguineArmour.java @@ -16,7 +16,7 @@ import thaumcraft.api.aspects.Aspect; import thaumcraft.api.nodes.IRevealer; import WayofTime.alchemicalWizardry.AlchemicalWizardry; import WayofTime.alchemicalWizardry.ModItems; -import WayofTime.alchemicalWizardry.common.ArmourUpgrade; +import WayofTime.alchemicalWizardry.api.items.interfaces.ArmourUpgrade; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/BM_src/WayofTime/alchemicalWizardry/common/rituals/RitualEffect.java b/BM_src/WayofTime/alchemicalWizardry/common/rituals/RitualEffect.java deleted file mode 100644 index 4652c83c..00000000 --- a/BM_src/WayofTime/alchemicalWizardry/common/rituals/RitualEffect.java +++ /dev/null @@ -1,15 +0,0 @@ -package WayofTime.alchemicalWizardry.common.rituals; - -import WayofTime.alchemicalWizardry.common.tileEntity.TEMasterStone; - -public abstract class RitualEffect -{ - public abstract void performEffect(TEMasterStone ritualStone); - - public abstract int getCostPerRefresh(); - - public int getInitialCooldown() - { - return 0; - } -} diff --git a/BM_src/WayofTime/alchemicalWizardry/common/rituals/RitualEffectAnimalGrowth.java b/BM_src/WayofTime/alchemicalWizardry/common/rituals/RitualEffectAnimalGrowth.java index ea5e04fd..f02a0210 100644 --- a/BM_src/WayofTime/alchemicalWizardry/common/rituals/RitualEffectAnimalGrowth.java +++ b/BM_src/WayofTime/alchemicalWizardry/common/rituals/RitualEffectAnimalGrowth.java @@ -1,23 +1,30 @@ package WayofTime.alchemicalWizardry.common.rituals; -import WayofTime.alchemicalWizardry.common.LifeEssenceNetwork; -import WayofTime.alchemicalWizardry.common.tileEntity.TEMasterStone; +import java.util.Iterator; +import java.util.List; + import net.minecraft.entity.EntityAgeable; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.potion.Potion; import net.minecraft.potion.PotionEffect; import net.minecraft.server.MinecraftServer; +import net.minecraft.tileentity.TileEntity; import net.minecraft.util.AxisAlignedBB; import net.minecraft.world.World; - -import java.util.Iterator; -import java.util.List; +import WayofTime.alchemicalWizardry.api.rituals.IMasterRitualStone; +import WayofTime.alchemicalWizardry.api.rituals.RitualEffect; +import WayofTime.alchemicalWizardry.api.soulNetwork.LifeEssenceNetwork; public class RitualEffectAnimalGrowth extends RitualEffect { @Override - public void performEffect(TEMasterStone ritualStone) + public void performEffect(IMasterRitualStone ritualStone) { + if(ritualStone instanceof TileEntity) + { + + } + String owner = ritualStone.getOwner(); World worldSave = MinecraftServer.getServer().worldServers[0]; LifeEssenceNetwork data = (LifeEssenceNetwork) worldSave.loadItemData(LifeEssenceNetwork.class, owner); @@ -29,10 +36,10 @@ public class RitualEffectAnimalGrowth extends RitualEffect } int currentEssence = data.currentEssence; - World world = ritualStone.worldObj; - int x = ritualStone.xCoord; - int y = ritualStone.yCoord; - int z = ritualStone.zCoord; + World world = ritualStone.getWorldObj(); + int x = ritualStone.getXCoord(); + int y = ritualStone.getYCoord(); + int z = ritualStone.getZCoord(); if (world.getWorldTime() % 20 != 0) { diff --git a/BM_src/WayofTime/alchemicalWizardry/common/rituals/RitualEffectApiaryOverclock.java b/BM_src/WayofTime/alchemicalWizardry/common/rituals/RitualEffectApiaryOverclock.java index ce3a324c..54b32cd7 100644 --- a/BM_src/WayofTime/alchemicalWizardry/common/rituals/RitualEffectApiaryOverclock.java +++ b/BM_src/WayofTime/alchemicalWizardry/common/rituals/RitualEffectApiaryOverclock.java @@ -1,22 +1,22 @@ package WayofTime.alchemicalWizardry.common.rituals; -import cpw.mods.fml.common.network.PacketDispatcher; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.potion.Potion; import net.minecraft.potion.PotionEffect; import net.minecraft.server.MinecraftServer; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; -import WayofTime.alchemicalWizardry.common.LifeEssenceNetwork; +import WayofTime.alchemicalWizardry.api.rituals.IMasterRitualStone; +import WayofTime.alchemicalWizardry.api.rituals.RitualEffect; +import WayofTime.alchemicalWizardry.api.soulNetwork.LifeEssenceNetwork; import WayofTime.alchemicalWizardry.common.tileEntity.TEAltar; -import WayofTime.alchemicalWizardry.common.tileEntity.TEMasterStone; +import cpw.mods.fml.common.network.PacketDispatcher; import forestry.api.apiculture.IBeeHousing; -import forestry.api.apiculture.IBeekeepingLogic; public class RitualEffectApiaryOverclock extends RitualEffect { @Override - public void performEffect(TEMasterStone ritualStone) + public void performEffect(IMasterRitualStone ritualStone) { String owner = ritualStone.getOwner(); World worldSave = MinecraftServer.getServer().worldServers[0]; @@ -29,10 +29,10 @@ public class RitualEffectApiaryOverclock extends RitualEffect } int currentEssence = data.currentEssence; - World world = ritualStone.worldObj; - int x = ritualStone.xCoord; - int y = ritualStone.yCoord; - int z = ritualStone.zCoord; + World world = ritualStone.getWorldObj(); + int x = ritualStone.getXCoord(); + int y = ritualStone.getYCoord(); + int z = ritualStone.getZCoord(); if (currentEssence < this.getCostPerRefresh()) diff --git a/BM_src/WayofTime/alchemicalWizardry/common/rituals/RitualEffectAutoAlchemy.java b/BM_src/WayofTime/alchemicalWizardry/common/rituals/RitualEffectAutoAlchemy.java index 64d1495c..ceeb640d 100644 --- a/BM_src/WayofTime/alchemicalWizardry/common/rituals/RitualEffectAutoAlchemy.java +++ b/BM_src/WayofTime/alchemicalWizardry/common/rituals/RitualEffectAutoAlchemy.java @@ -8,16 +8,17 @@ import net.minecraft.potion.PotionEffect; import net.minecraft.server.MinecraftServer; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; -import WayofTime.alchemicalWizardry.common.LifeEssenceNetwork; +import WayofTime.alchemicalWizardry.api.rituals.IMasterRitualStone; +import WayofTime.alchemicalWizardry.api.rituals.RitualEffect; +import WayofTime.alchemicalWizardry.api.soulNetwork.LifeEssenceNetwork; import WayofTime.alchemicalWizardry.common.alchemy.AlchemyRecipeRegistry; import WayofTime.alchemicalWizardry.common.tileEntity.TEAltar; -import WayofTime.alchemicalWizardry.common.tileEntity.TEMasterStone; import WayofTime.alchemicalWizardry.common.tileEntity.TEWritingTable; public class RitualEffectAutoAlchemy extends RitualEffect { @Override - public void performEffect(TEMasterStone ritualStone) + public void performEffect(IMasterRitualStone ritualStone) { String owner = ritualStone.getOwner(); World worldSave = MinecraftServer.getServer().worldServers[0]; @@ -30,10 +31,10 @@ public class RitualEffectAutoAlchemy extends RitualEffect } int currentEssence = data.currentEssence; - World world = ritualStone.worldObj; - int x = ritualStone.xCoord; - int y = ritualStone.yCoord; - int z = ritualStone.zCoord; + World world = ritualStone.getWorldObj(); + int x = ritualStone.getXCoord(); + int y = ritualStone.getYCoord(); + int z = ritualStone.getZCoord(); if (currentEssence < this.getCostPerRefresh()*6) { diff --git a/BM_src/WayofTime/alchemicalWizardry/common/rituals/RitualEffectBiomeChanger.java b/BM_src/WayofTime/alchemicalWizardry/common/rituals/RitualEffectBiomeChanger.java index c3697d1e..9bda4178 100644 --- a/BM_src/WayofTime/alchemicalWizardry/common/rituals/RitualEffectBiomeChanger.java +++ b/BM_src/WayofTime/alchemicalWizardry/common/rituals/RitualEffectBiomeChanger.java @@ -1,9 +1,5 @@ package WayofTime.alchemicalWizardry.common.rituals; -import WayofTime.alchemicalWizardry.ModBlocks; -import WayofTime.alchemicalWizardry.common.LifeEssenceNetwork; -import WayofTime.alchemicalWizardry.common.tileEntity.TEMasterStone; -import WayofTime.alchemicalWizardry.common.tileEntity.TEPlinth; import net.minecraft.block.Block; import net.minecraft.entity.effect.EntityLightningBolt; import net.minecraft.entity.player.EntityPlayer; @@ -17,11 +13,16 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; import net.minecraft.world.biome.BiomeGenBase; import net.minecraft.world.chunk.Chunk; +import WayofTime.alchemicalWizardry.ModBlocks; +import WayofTime.alchemicalWizardry.api.rituals.IMasterRitualStone; +import WayofTime.alchemicalWizardry.api.rituals.RitualEffect; +import WayofTime.alchemicalWizardry.api.soulNetwork.LifeEssenceNetwork; +import WayofTime.alchemicalWizardry.common.tileEntity.TEPlinth; public class RitualEffectBiomeChanger extends RitualEffect { @Override - public void performEffect(TEMasterStone ritualStone) + public void performEffect(IMasterRitualStone ritualStone) { String owner = ritualStone.getOwner(); World worldSave = MinecraftServer.getServer().worldServers[0]; @@ -32,26 +33,26 @@ public class RitualEffectBiomeChanger extends RitualEffect data = new LifeEssenceNetwork(owner); worldSave.setItemData(owner, data); } - + World world = ritualStone.getWorldObj(); int cooldown = ritualStone.getCooldown(); - + int x = ritualStone.getXCoord(); + int y = ritualStone.getYCoord(); + int z = ritualStone.getZCoord(); if (cooldown > 0) { ritualStone.setCooldown(cooldown - 1); - if (ritualStone.worldObj.rand.nextInt(15) == 0) + if (world.rand.nextInt(15) == 0) { - ritualStone.worldObj.addWeatherEffect(new EntityLightningBolt(ritualStone.worldObj, ritualStone.xCoord - 1 + ritualStone.worldObj.rand.nextInt(3), ritualStone.yCoord + 1, ritualStone.zCoord - 1 + ritualStone.worldObj.rand.nextInt(3))); + world.addWeatherEffect(new EntityLightningBolt(world, x - 1 + world.rand.nextInt(3),y + 1, z - 1 + world.rand.nextInt(3))); } return; } int currentEssence = data.currentEssence; - World world = ritualStone.worldObj; - int x = ritualStone.xCoord; - int y = ritualStone.yCoord; - int z = ritualStone.zCoord; + + int range = 10; if (currentEssence < this.getCostPerRefresh()) diff --git a/BM_src/WayofTime/alchemicalWizardry/common/rituals/RitualEffectContainment.java b/BM_src/WayofTime/alchemicalWizardry/common/rituals/RitualEffectContainment.java index 30b226e2..132acbb1 100644 --- a/BM_src/WayofTime/alchemicalWizardry/common/rituals/RitualEffectContainment.java +++ b/BM_src/WayofTime/alchemicalWizardry/common/rituals/RitualEffectContainment.java @@ -1,9 +1,8 @@ package WayofTime.alchemicalWizardry.common.rituals; -import WayofTime.alchemicalWizardry.common.LifeEssenceNetwork; -import WayofTime.alchemicalWizardry.common.tileEntity.TEAltar; -import WayofTime.alchemicalWizardry.common.tileEntity.TEMasterStone; -import cpw.mods.fml.common.network.PacketDispatcher; +import java.util.Iterator; +import java.util.List; + import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.potion.Potion; @@ -11,14 +10,16 @@ import net.minecraft.potion.PotionEffect; import net.minecraft.server.MinecraftServer; import net.minecraft.util.AxisAlignedBB; import net.minecraft.world.World; - -import java.util.Iterator; -import java.util.List; +import WayofTime.alchemicalWizardry.api.rituals.IMasterRitualStone; +import WayofTime.alchemicalWizardry.api.rituals.RitualEffect; +import WayofTime.alchemicalWizardry.api.soulNetwork.LifeEssenceNetwork; +import WayofTime.alchemicalWizardry.common.tileEntity.TEAltar; +import cpw.mods.fml.common.network.PacketDispatcher; public class RitualEffectContainment extends RitualEffect { @Override - public void performEffect(TEMasterStone ritualStone) + public void performEffect(IMasterRitualStone ritualStone) { String owner = ritualStone.getOwner(); World worldSave = MinecraftServer.getServer().worldServers[0]; @@ -31,10 +32,10 @@ public class RitualEffectContainment extends RitualEffect } int currentEssence = data.currentEssence; - World world = ritualStone.worldObj; - int x = ritualStone.xCoord; - int y = ritualStone.yCoord; - int z = ritualStone.zCoord; + World world = ritualStone.getWorldObj(); + int x = ritualStone.getXCoord(); + int y = ritualStone.getYCoord(); + int z = ritualStone.getZCoord(); if (currentEssence < this.getCostPerRefresh()) { diff --git a/BM_src/WayofTime/alchemicalWizardry/common/rituals/RitualEffectCrushing.java b/BM_src/WayofTime/alchemicalWizardry/common/rituals/RitualEffectCrushing.java index ec6948e2..b281cd65 100644 --- a/BM_src/WayofTime/alchemicalWizardry/common/rituals/RitualEffectCrushing.java +++ b/BM_src/WayofTime/alchemicalWizardry/common/rituals/RitualEffectCrushing.java @@ -1,8 +1,7 @@ package WayofTime.alchemicalWizardry.common.rituals; -import WayofTime.alchemicalWizardry.ModBlocks; -import WayofTime.alchemicalWizardry.common.LifeEssenceNetwork; -import WayofTime.alchemicalWizardry.common.tileEntity.TEMasterStone; +import java.util.ArrayList; + import net.minecraft.block.Block; import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; @@ -13,13 +12,15 @@ import net.minecraft.potion.PotionEffect; import net.minecraft.server.MinecraftServer; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; - -import java.util.ArrayList; +import WayofTime.alchemicalWizardry.ModBlocks; +import WayofTime.alchemicalWizardry.api.rituals.IMasterRitualStone; +import WayofTime.alchemicalWizardry.api.rituals.RitualEffect; +import WayofTime.alchemicalWizardry.api.soulNetwork.LifeEssenceNetwork; public class RitualEffectCrushing extends RitualEffect { @Override - public void performEffect(TEMasterStone ritualStone) + public void performEffect(IMasterRitualStone ritualStone) { String owner = ritualStone.getOwner(); World worldSave = MinecraftServer.getServer().worldServers[0]; @@ -32,16 +33,16 @@ public class RitualEffectCrushing extends RitualEffect } int currentEssence = data.currentEssence; - World world = ritualStone.worldObj; + World world = ritualStone.getWorldObj(); if (world.getWorldTime() % 40 != 0) { return; } - - int x = ritualStone.xCoord; - int y = ritualStone.yCoord; - int z = ritualStone.zCoord; + + int x = ritualStone.getXCoord(); + int y = ritualStone.getYCoord(); + int z = ritualStone.getZCoord(); TileEntity tile = world.getBlockTileEntity(x, y + 1, z); IInventory tileEntity; diff --git a/BM_src/WayofTime/alchemicalWizardry/common/rituals/RitualEffectEnhancedAlchemy.java b/BM_src/WayofTime/alchemicalWizardry/common/rituals/RitualEffectEnhancedAlchemy.java index a8b06009..e5561176 100644 --- a/BM_src/WayofTime/alchemicalWizardry/common/rituals/RitualEffectEnhancedAlchemy.java +++ b/BM_src/WayofTime/alchemicalWizardry/common/rituals/RitualEffectEnhancedAlchemy.java @@ -1,9 +1,5 @@ package WayofTime.alchemicalWizardry.common.rituals; -import WayofTime.alchemicalWizardry.common.LifeEssenceNetwork; -import WayofTime.alchemicalWizardry.common.tileEntity.TEAltar; -import WayofTime.alchemicalWizardry.common.tileEntity.TEMasterStone; -import cpw.mods.fml.common.network.PacketDispatcher; import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.potion.Potion; @@ -11,11 +7,16 @@ import net.minecraft.potion.PotionEffect; import net.minecraft.server.MinecraftServer; import net.minecraft.world.World; import net.minecraftforge.common.IPlantable; +import WayofTime.alchemicalWizardry.api.rituals.IMasterRitualStone; +import WayofTime.alchemicalWizardry.api.rituals.RitualEffect; +import WayofTime.alchemicalWizardry.api.soulNetwork.LifeEssenceNetwork; +import WayofTime.alchemicalWizardry.common.tileEntity.TEAltar; +import cpw.mods.fml.common.network.PacketDispatcher; public class RitualEffectEnhancedAlchemy extends RitualEffect { @Override - public void performEffect(TEMasterStone ritualStone) + public void performEffect(IMasterRitualStone ritualStone) { String owner = ritualStone.getOwner(); World worldSave = MinecraftServer.getServer().worldServers[0]; @@ -28,10 +29,10 @@ public class RitualEffectEnhancedAlchemy extends RitualEffect } int currentEssence = data.currentEssence; - World world = ritualStone.worldObj; - int x = ritualStone.xCoord; - int y = ritualStone.yCoord; - int z = ritualStone.zCoord; + World world = ritualStone.getWorldObj(); + int x = ritualStone.getXCoord(); + int y = ritualStone.getYCoord(); + int z = ritualStone.getZCoord(); if (currentEssence < this.getCostPerRefresh()) { diff --git a/BM_src/WayofTime/alchemicalWizardry/common/rituals/RitualEffectFeatheredEarth.java b/BM_src/WayofTime/alchemicalWizardry/common/rituals/RitualEffectFeatheredEarth.java index 1199727c..b5fe9f91 100644 --- a/BM_src/WayofTime/alchemicalWizardry/common/rituals/RitualEffectFeatheredEarth.java +++ b/BM_src/WayofTime/alchemicalWizardry/common/rituals/RitualEffectFeatheredEarth.java @@ -1,7 +1,7 @@ package WayofTime.alchemicalWizardry.common.rituals; -import WayofTime.alchemicalWizardry.common.LifeEssenceNetwork; -import WayofTime.alchemicalWizardry.common.tileEntity.TEMasterStone; +import java.util.List; + import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.effect.EntityLightningBolt; import net.minecraft.entity.player.EntityPlayer; @@ -10,13 +10,14 @@ import net.minecraft.potion.PotionEffect; import net.minecraft.server.MinecraftServer; import net.minecraft.util.AxisAlignedBB; import net.minecraft.world.World; - -import java.util.List; +import WayofTime.alchemicalWizardry.api.rituals.IMasterRitualStone; +import WayofTime.alchemicalWizardry.api.rituals.RitualEffect; +import WayofTime.alchemicalWizardry.api.soulNetwork.LifeEssenceNetwork; public class RitualEffectFeatheredEarth extends RitualEffect //Nullifies all fall damage in the area of effect { @Override - public void performEffect(TEMasterStone ritualStone) + public void performEffect(IMasterRitualStone ritualStone) { String owner = ritualStone.getOwner(); World worldSave = MinecraftServer.getServer().worldServers[0]; @@ -29,10 +30,10 @@ public class RitualEffectFeatheredEarth extends RitualEffect //Nullifies all fal } int currentEssence = data.currentEssence; - World world = ritualStone.worldObj; - int x = ritualStone.xCoord; - int y = ritualStone.yCoord; - int z = ritualStone.zCoord; + World world = ritualStone.getWorldObj(); + int x = ritualStone.getXCoord(); + int y = ritualStone.getYCoord(); + int z = ritualStone.getZCoord(); if (ritualStone.getCooldown() > 0) { diff --git a/BM_src/WayofTime/alchemicalWizardry/common/rituals/RitualEffectFeatheredKnife.java b/BM_src/WayofTime/alchemicalWizardry/common/rituals/RitualEffectFeatheredKnife.java index 76e2f2c0..6205b9e9 100644 --- a/BM_src/WayofTime/alchemicalWizardry/common/rituals/RitualEffectFeatheredKnife.java +++ b/BM_src/WayofTime/alchemicalWizardry/common/rituals/RitualEffectFeatheredKnife.java @@ -1,19 +1,19 @@ package WayofTime.alchemicalWizardry.common.rituals; -import WayofTime.alchemicalWizardry.common.LifeEssenceNetwork; -import WayofTime.alchemicalWizardry.common.spell.complex.effect.SpellHelper; -import WayofTime.alchemicalWizardry.common.tileEntity.TEAltar; -import WayofTime.alchemicalWizardry.common.tileEntity.TEMasterStone; +import java.util.Iterator; +import java.util.List; + import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.potion.Potion; import net.minecraft.potion.PotionEffect; import net.minecraft.server.MinecraftServer; import net.minecraft.util.AxisAlignedBB; import net.minecraft.world.World; - -import java.util.Iterator; -import java.util.List; +import WayofTime.alchemicalWizardry.api.rituals.IMasterRitualStone; +import WayofTime.alchemicalWizardry.api.rituals.RitualEffect; +import WayofTime.alchemicalWizardry.api.soulNetwork.LifeEssenceNetwork; +import WayofTime.alchemicalWizardry.common.spell.complex.effect.SpellHelper; +import WayofTime.alchemicalWizardry.common.tileEntity.TEAltar; public class RitualEffectFeatheredKnife extends RitualEffect { @@ -21,7 +21,7 @@ public class RitualEffectFeatheredKnife extends RitualEffect public final int amount = 100; @Override - public void performEffect(TEMasterStone ritualStone) + public void performEffect(IMasterRitualStone ritualStone) { String owner = ritualStone.getOwner(); World worldSave = MinecraftServer.getServer().worldServers[0]; @@ -34,10 +34,10 @@ public class RitualEffectFeatheredKnife extends RitualEffect } int currentEssence = data.currentEssence; - World world = ritualStone.worldObj; - int x = ritualStone.xCoord; - int y = ritualStone.yCoord; - int z = ritualStone.zCoord; + World world = ritualStone.getWorldObj(); + int x = ritualStone.getXCoord(); + int y = ritualStone.getYCoord(); + int z = ritualStone.getZCoord(); if (world.getWorldTime() % this.timeDelay != 0) { diff --git a/BM_src/WayofTime/alchemicalWizardry/common/rituals/RitualEffectFlight.java b/BM_src/WayofTime/alchemicalWizardry/common/rituals/RitualEffectFlight.java index a9f1870f..a5f1e5a7 100644 --- a/BM_src/WayofTime/alchemicalWizardry/common/rituals/RitualEffectFlight.java +++ b/BM_src/WayofTime/alchemicalWizardry/common/rituals/RitualEffectFlight.java @@ -1,21 +1,22 @@ package WayofTime.alchemicalWizardry.common.rituals; -import WayofTime.alchemicalWizardry.AlchemicalWizardry; -import WayofTime.alchemicalWizardry.common.LifeEssenceNetwork; -import WayofTime.alchemicalWizardry.common.tileEntity.TEMasterStone; +import java.util.List; + import net.minecraft.entity.player.EntityPlayer; import net.minecraft.potion.Potion; import net.minecraft.potion.PotionEffect; import net.minecraft.server.MinecraftServer; import net.minecraft.util.AxisAlignedBB; import net.minecraft.world.World; - -import java.util.List; +import WayofTime.alchemicalWizardry.AlchemicalWizardry; +import WayofTime.alchemicalWizardry.api.rituals.IMasterRitualStone; +import WayofTime.alchemicalWizardry.api.rituals.RitualEffect; +import WayofTime.alchemicalWizardry.api.soulNetwork.LifeEssenceNetwork; public class RitualEffectFlight extends RitualEffect { @Override - public void performEffect(TEMasterStone ritualStone) + public void performEffect(IMasterRitualStone ritualStone) { String owner = ritualStone.getOwner(); World worldSave = MinecraftServer.getServer().worldServers[0]; @@ -28,10 +29,10 @@ public class RitualEffectFlight extends RitualEffect } int currentEssence = data.currentEssence; - World world = ritualStone.worldObj; - int x = ritualStone.xCoord; - int y = ritualStone.yCoord; - int z = ritualStone.zCoord; + World world = ritualStone.getWorldObj(); + int x = ritualStone.getXCoord(); + int y = ritualStone.getYCoord(); + int z = ritualStone.getZCoord(); if (ritualStone.getCooldown() > 0) { diff --git a/BM_src/WayofTime/alchemicalWizardry/common/rituals/RitualEffectGrowth.java b/BM_src/WayofTime/alchemicalWizardry/common/rituals/RitualEffectGrowth.java index 3de43a5f..8ccc04fa 100644 --- a/BM_src/WayofTime/alchemicalWizardry/common/rituals/RitualEffectGrowth.java +++ b/BM_src/WayofTime/alchemicalWizardry/common/rituals/RitualEffectGrowth.java @@ -1,9 +1,5 @@ package WayofTime.alchemicalWizardry.common.rituals; -import WayofTime.alchemicalWizardry.common.LifeEssenceNetwork; -import WayofTime.alchemicalWizardry.common.tileEntity.TEAltar; -import WayofTime.alchemicalWizardry.common.tileEntity.TEMasterStone; -import cpw.mods.fml.common.network.PacketDispatcher; import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.potion.Potion; @@ -11,11 +7,16 @@ import net.minecraft.potion.PotionEffect; import net.minecraft.server.MinecraftServer; import net.minecraft.world.World; import net.minecraftforge.common.IPlantable; +import WayofTime.alchemicalWizardry.api.rituals.IMasterRitualStone; +import WayofTime.alchemicalWizardry.api.rituals.RitualEffect; +import WayofTime.alchemicalWizardry.api.soulNetwork.LifeEssenceNetwork; +import WayofTime.alchemicalWizardry.common.tileEntity.TEAltar; +import cpw.mods.fml.common.network.PacketDispatcher; public class RitualEffectGrowth extends RitualEffect { @Override - public void performEffect(TEMasterStone ritualStone) + public void performEffect(IMasterRitualStone ritualStone) { String owner = ritualStone.getOwner(); World worldSave = MinecraftServer.getServer().worldServers[0]; @@ -28,10 +29,10 @@ public class RitualEffectGrowth extends RitualEffect } int currentEssence = data.currentEssence; - World world = ritualStone.worldObj; - int x = ritualStone.xCoord; - int y = ritualStone.yCoord; - int z = ritualStone.zCoord; + World world = ritualStone.getWorldObj(); + int x = ritualStone.getXCoord(); + int y = ritualStone.getYCoord(); + int z = ritualStone.getZCoord(); if (currentEssence < this.getCostPerRefresh()) { diff --git a/BM_src/WayofTime/alchemicalWizardry/common/rituals/RitualEffectHealing.java b/BM_src/WayofTime/alchemicalWizardry/common/rituals/RitualEffectHealing.java index 51aef53e..236d3b66 100644 --- a/BM_src/WayofTime/alchemicalWizardry/common/rituals/RitualEffectHealing.java +++ b/BM_src/WayofTime/alchemicalWizardry/common/rituals/RitualEffectHealing.java @@ -1,7 +1,8 @@ package WayofTime.alchemicalWizardry.common.rituals; -import WayofTime.alchemicalWizardry.common.LifeEssenceNetwork; -import WayofTime.alchemicalWizardry.common.tileEntity.TEMasterStone; +import java.util.Iterator; +import java.util.List; + import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.potion.Potion; @@ -9,9 +10,9 @@ import net.minecraft.potion.PotionEffect; import net.minecraft.server.MinecraftServer; import net.minecraft.util.AxisAlignedBB; import net.minecraft.world.World; - -import java.util.Iterator; -import java.util.List; +import WayofTime.alchemicalWizardry.api.rituals.IMasterRitualStone; +import WayofTime.alchemicalWizardry.api.rituals.RitualEffect; +import WayofTime.alchemicalWizardry.api.soulNetwork.LifeEssenceNetwork; public class RitualEffectHealing extends RitualEffect { @@ -19,7 +20,7 @@ public class RitualEffectHealing extends RitualEffect //public final int amount = 10; @Override - public void performEffect(TEMasterStone ritualStone) + public void performEffect(IMasterRitualStone ritualStone) { String owner = ritualStone.getOwner(); World worldSave = MinecraftServer.getServer().worldServers[0]; @@ -32,10 +33,10 @@ public class RitualEffectHealing extends RitualEffect } int currentEssence = data.currentEssence; - World world = ritualStone.worldObj; - int x = ritualStone.xCoord; - int y = ritualStone.yCoord; - int z = ritualStone.zCoord; + World world = ritualStone.getWorldObj(); + int x = ritualStone.getXCoord(); + int y = ritualStone.getYCoord(); + int z = ritualStone.getZCoord(); if (world.getWorldTime() % this.timeDelay != 0) { diff --git a/BM_src/WayofTime/alchemicalWizardry/common/rituals/RitualEffectInterdiction.java b/BM_src/WayofTime/alchemicalWizardry/common/rituals/RitualEffectInterdiction.java index 5c9d5f32..812d6b7b 100644 --- a/BM_src/WayofTime/alchemicalWizardry/common/rituals/RitualEffectInterdiction.java +++ b/BM_src/WayofTime/alchemicalWizardry/common/rituals/RitualEffectInterdiction.java @@ -1,7 +1,8 @@ package WayofTime.alchemicalWizardry.common.rituals; -import WayofTime.alchemicalWizardry.common.LifeEssenceNetwork; -import WayofTime.alchemicalWizardry.common.tileEntity.TEMasterStone; +import java.util.Iterator; +import java.util.List; + import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.potion.Potion; @@ -9,14 +10,14 @@ import net.minecraft.potion.PotionEffect; import net.minecraft.server.MinecraftServer; import net.minecraft.util.AxisAlignedBB; import net.minecraft.world.World; - -import java.util.Iterator; -import java.util.List; +import WayofTime.alchemicalWizardry.api.rituals.IMasterRitualStone; +import WayofTime.alchemicalWizardry.api.rituals.RitualEffect; +import WayofTime.alchemicalWizardry.api.soulNetwork.LifeEssenceNetwork; public class RitualEffectInterdiction extends RitualEffect { @Override - public void performEffect(TEMasterStone ritualStone) + public void performEffect(IMasterRitualStone ritualStone) { String owner = ritualStone.getOwner(); World worldSave = MinecraftServer.getServer().worldServers[0]; @@ -29,10 +30,10 @@ public class RitualEffectInterdiction extends RitualEffect } int currentEssence = data.currentEssence; - World world = ritualStone.worldObj; - int x = ritualStone.xCoord; - int y = ritualStone.yCoord; - int z = ritualStone.zCoord; + World world = ritualStone.getWorldObj(); + int x = ritualStone.getXCoord(); + int y = ritualStone.getYCoord(); + int z = ritualStone.getZCoord(); if (currentEssence < this.getCostPerRefresh()) { diff --git a/BM_src/WayofTime/alchemicalWizardry/common/rituals/RitualEffectJumping.java b/BM_src/WayofTime/alchemicalWizardry/common/rituals/RitualEffectJumping.java index 8b0abd55..9e9df6f7 100644 --- a/BM_src/WayofTime/alchemicalWizardry/common/rituals/RitualEffectJumping.java +++ b/BM_src/WayofTime/alchemicalWizardry/common/rituals/RitualEffectJumping.java @@ -1,10 +1,8 @@ package WayofTime.alchemicalWizardry.common.rituals; -import WayofTime.alchemicalWizardry.common.LifeEssenceNetwork; -import WayofTime.alchemicalWizardry.common.PacketHandler; -import WayofTime.alchemicalWizardry.common.tileEntity.TEMasterStone; -import cpw.mods.fml.common.network.PacketDispatcher; -import cpw.mods.fml.common.network.Player; +import java.util.Iterator; +import java.util.List; + import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.potion.Potion; @@ -12,14 +10,17 @@ import net.minecraft.potion.PotionEffect; import net.minecraft.server.MinecraftServer; import net.minecraft.util.AxisAlignedBB; import net.minecraft.world.World; - -import java.util.Iterator; -import java.util.List; +import WayofTime.alchemicalWizardry.api.rituals.IMasterRitualStone; +import WayofTime.alchemicalWizardry.api.rituals.RitualEffect; +import WayofTime.alchemicalWizardry.api.soulNetwork.LifeEssenceNetwork; +import WayofTime.alchemicalWizardry.common.PacketHandler; +import cpw.mods.fml.common.network.PacketDispatcher; +import cpw.mods.fml.common.network.Player; public class RitualEffectJumping extends RitualEffect { @Override - public void performEffect(TEMasterStone ritualStone) + public void performEffect(IMasterRitualStone ritualStone) { String owner = ritualStone.getOwner(); World worldSave = MinecraftServer.getServer().worldServers[0]; @@ -32,10 +33,10 @@ public class RitualEffectJumping extends RitualEffect } int currentEssence = data.currentEssence; - World world = ritualStone.worldObj; - int x = ritualStone.xCoord; - int y = ritualStone.yCoord; - int z = ritualStone.zCoord; + World world = ritualStone.getWorldObj(); + int x = ritualStone.getXCoord(); + int y = ritualStone.getYCoord(); + int z = ritualStone.getZCoord(); if (currentEssence < this.getCostPerRefresh()) { diff --git a/BM_src/WayofTime/alchemicalWizardry/common/rituals/RitualEffectLava.java b/BM_src/WayofTime/alchemicalWizardry/common/rituals/RitualEffectLava.java index 1cb38c9f..d29062d0 100644 --- a/BM_src/WayofTime/alchemicalWizardry/common/rituals/RitualEffectLava.java +++ b/BM_src/WayofTime/alchemicalWizardry/common/rituals/RitualEffectLava.java @@ -1,20 +1,21 @@ package WayofTime.alchemicalWizardry.common.rituals; -import WayofTime.alchemicalWizardry.common.LifeEssenceNetwork; -import WayofTime.alchemicalWizardry.common.tileEntity.TEAltar; -import WayofTime.alchemicalWizardry.common.tileEntity.TEMasterStone; -import cpw.mods.fml.common.network.PacketDispatcher; import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.potion.Potion; import net.minecraft.potion.PotionEffect; import net.minecraft.server.MinecraftServer; import net.minecraft.world.World; +import WayofTime.alchemicalWizardry.api.rituals.IMasterRitualStone; +import WayofTime.alchemicalWizardry.api.rituals.RitualEffect; +import WayofTime.alchemicalWizardry.api.soulNetwork.LifeEssenceNetwork; +import WayofTime.alchemicalWizardry.common.tileEntity.TEAltar; +import cpw.mods.fml.common.network.PacketDispatcher; public class RitualEffectLava extends RitualEffect { @Override - public void performEffect(TEMasterStone ritualStone) + public void performEffect(IMasterRitualStone ritualStone) { String owner = ritualStone.getOwner(); World worldSave = MinecraftServer.getServer().worldServers[0]; @@ -27,10 +28,10 @@ public class RitualEffectLava extends RitualEffect } int currentEssence = data.currentEssence; - World world = ritualStone.worldObj; - int x = ritualStone.xCoord; - int y = ritualStone.yCoord; - int z = ritualStone.zCoord; + World world = ritualStone.getWorldObj(); + int x = ritualStone.getXCoord(); + int y = ritualStone.getYCoord(); + int z = ritualStone.getZCoord(); if (world.isAirBlock(x, y + 1, z)) { diff --git a/BM_src/WayofTime/alchemicalWizardry/common/rituals/RitualEffectLeap.java b/BM_src/WayofTime/alchemicalWizardry/common/rituals/RitualEffectLeap.java index ad296891..28415cea 100644 --- a/BM_src/WayofTime/alchemicalWizardry/common/rituals/RitualEffectLeap.java +++ b/BM_src/WayofTime/alchemicalWizardry/common/rituals/RitualEffectLeap.java @@ -1,10 +1,8 @@ package WayofTime.alchemicalWizardry.common.rituals; -import WayofTime.alchemicalWizardry.common.LifeEssenceNetwork; -import WayofTime.alchemicalWizardry.common.PacketHandler; -import WayofTime.alchemicalWizardry.common.tileEntity.TEMasterStone; -import cpw.mods.fml.common.network.PacketDispatcher; -import cpw.mods.fml.common.network.Player; +import java.util.Iterator; +import java.util.List; + import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.potion.Potion; @@ -12,14 +10,17 @@ import net.minecraft.potion.PotionEffect; import net.minecraft.server.MinecraftServer; import net.minecraft.util.AxisAlignedBB; import net.minecraft.world.World; - -import java.util.Iterator; -import java.util.List; +import WayofTime.alchemicalWizardry.api.rituals.IMasterRitualStone; +import WayofTime.alchemicalWizardry.api.rituals.RitualEffect; +import WayofTime.alchemicalWizardry.api.soulNetwork.LifeEssenceNetwork; +import WayofTime.alchemicalWizardry.common.PacketHandler; +import cpw.mods.fml.common.network.PacketDispatcher; +import cpw.mods.fml.common.network.Player; public class RitualEffectLeap extends RitualEffect { @Override - public void performEffect(TEMasterStone ritualStone) + public void performEffect(IMasterRitualStone ritualStone) { String owner = ritualStone.getOwner(); World worldSave = MinecraftServer.getServer().worldServers[0]; @@ -32,10 +33,10 @@ public class RitualEffectLeap extends RitualEffect } int currentEssence = data.currentEssence; - World world = ritualStone.worldObj; - int x = ritualStone.xCoord; - int y = ritualStone.yCoord; - int z = ritualStone.zCoord; + World world = ritualStone.getWorldObj(); + int x = ritualStone.getXCoord(); + int y = ritualStone.getYCoord(); + int z = ritualStone.getZCoord(); if (currentEssence < this.getCostPerRefresh()) { diff --git a/BM_src/WayofTime/alchemicalWizardry/common/rituals/RitualEffectMagnetic.java b/BM_src/WayofTime/alchemicalWizardry/common/rituals/RitualEffectMagnetic.java index 72603c1a..9b85ecb9 100644 --- a/BM_src/WayofTime/alchemicalWizardry/common/rituals/RitualEffectMagnetic.java +++ b/BM_src/WayofTime/alchemicalWizardry/common/rituals/RitualEffectMagnetic.java @@ -1,8 +1,5 @@ package WayofTime.alchemicalWizardry.common.rituals; -import WayofTime.alchemicalWizardry.common.LifeEssenceNetwork; -import WayofTime.alchemicalWizardry.common.block.BlockTeleposer; -import WayofTime.alchemicalWizardry.common.tileEntity.TEMasterStone; import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; @@ -11,11 +8,15 @@ import net.minecraft.potion.PotionEffect; import net.minecraft.server.MinecraftServer; import net.minecraft.world.World; import net.minecraftforge.oredict.OreDictionary; +import WayofTime.alchemicalWizardry.api.rituals.IMasterRitualStone; +import WayofTime.alchemicalWizardry.api.rituals.RitualEffect; +import WayofTime.alchemicalWizardry.api.soulNetwork.LifeEssenceNetwork; +import WayofTime.alchemicalWizardry.common.block.BlockTeleposer; public class RitualEffectMagnetic extends RitualEffect { @Override - public void performEffect(TEMasterStone ritualStone) + public void performEffect(IMasterRitualStone ritualStone) { String owner = ritualStone.getOwner(); World worldSave = MinecraftServer.getServer().worldServers[0]; @@ -28,10 +29,10 @@ public class RitualEffectMagnetic extends RitualEffect } int currentEssence = data.currentEssence; - World world = ritualStone.worldObj; - int x = ritualStone.xCoord; - int y = ritualStone.yCoord; - int z = ritualStone.zCoord; + World world = ritualStone.getWorldObj(); + int x = ritualStone.getXCoord(); + int y = ritualStone.getYCoord(); + int z = ritualStone.getZCoord(); if (world.getWorldTime() % 40 != 0) { diff --git a/BM_src/WayofTime/alchemicalWizardry/common/rituals/RitualEffectSoulBound.java b/BM_src/WayofTime/alchemicalWizardry/common/rituals/RitualEffectSoulBound.java index df03bf8f..024b4da0 100644 --- a/BM_src/WayofTime/alchemicalWizardry/common/rituals/RitualEffectSoulBound.java +++ b/BM_src/WayofTime/alchemicalWizardry/common/rituals/RitualEffectSoulBound.java @@ -1,11 +1,8 @@ package WayofTime.alchemicalWizardry.common.rituals; -import WayofTime.alchemicalWizardry.AlchemicalWizardry; -import WayofTime.alchemicalWizardry.ModItems; -import WayofTime.alchemicalWizardry.common.LifeEssenceNetwork; -import WayofTime.alchemicalWizardry.common.tileEntity.TEAltar; -import WayofTime.alchemicalWizardry.common.tileEntity.TEMasterStone; -import cpw.mods.fml.common.network.PacketDispatcher; +import java.util.Iterator; +import java.util.List; + import net.minecraft.entity.effect.EntityLightningBolt; import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; @@ -17,14 +14,18 @@ import net.minecraft.server.MinecraftServer; import net.minecraft.util.AxisAlignedBB; import net.minecraft.world.World; import thaumcraft.api.ItemApi; - -import java.util.Iterator; -import java.util.List; +import WayofTime.alchemicalWizardry.AlchemicalWizardry; +import WayofTime.alchemicalWizardry.ModItems; +import WayofTime.alchemicalWizardry.api.rituals.IMasterRitualStone; +import WayofTime.alchemicalWizardry.api.rituals.RitualEffect; +import WayofTime.alchemicalWizardry.api.soulNetwork.LifeEssenceNetwork; +import WayofTime.alchemicalWizardry.common.tileEntity.TEAltar; +import cpw.mods.fml.common.network.PacketDispatcher; public class RitualEffectSoulBound extends RitualEffect { @Override - public void performEffect(TEMasterStone ritualStone) + public void performEffect(IMasterRitualStone ritualStone) { String owner = ritualStone.getOwner(); World worldSave = MinecraftServer.getServer().worldServers[0]; @@ -37,10 +38,10 @@ public class RitualEffectSoulBound extends RitualEffect } int currentEssence = data.currentEssence; - World world = ritualStone.worldObj; - int x = ritualStone.xCoord; - int y = ritualStone.yCoord; - int z = ritualStone.zCoord; + World world = ritualStone.getWorldObj(); + int x = ritualStone.getXCoord(); + int y = ritualStone.getYCoord(); + int z = ritualStone.getZCoord(); if (currentEssence < this.getCostPerRefresh()) { diff --git a/BM_src/WayofTime/alchemicalWizardry/common/rituals/RitualEffectSummonMeteor.java b/BM_src/WayofTime/alchemicalWizardry/common/rituals/RitualEffectSummonMeteor.java index b320146f..6f21a9f4 100644 --- a/BM_src/WayofTime/alchemicalWizardry/common/rituals/RitualEffectSummonMeteor.java +++ b/BM_src/WayofTime/alchemicalWizardry/common/rituals/RitualEffectSummonMeteor.java @@ -1,9 +1,7 @@ package WayofTime.alchemicalWizardry.common.rituals; -import WayofTime.alchemicalWizardry.common.LifeEssenceNetwork; -import WayofTime.alchemicalWizardry.common.entity.projectile.EntityMeteor; -import WayofTime.alchemicalWizardry.common.summoning.meteor.MeteorRegistry; -import WayofTime.alchemicalWizardry.common.tileEntity.TEMasterStone; +import java.util.List; + import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.potion.Potion; @@ -11,13 +9,16 @@ import net.minecraft.potion.PotionEffect; import net.minecraft.server.MinecraftServer; import net.minecraft.util.AxisAlignedBB; import net.minecraft.world.World; - -import java.util.List; +import WayofTime.alchemicalWizardry.api.rituals.IMasterRitualStone; +import WayofTime.alchemicalWizardry.api.rituals.RitualEffect; +import WayofTime.alchemicalWizardry.api.soulNetwork.LifeEssenceNetwork; +import WayofTime.alchemicalWizardry.common.entity.projectile.EntityMeteor; +import WayofTime.alchemicalWizardry.common.summoning.meteor.MeteorRegistry; public class RitualEffectSummonMeteor extends RitualEffect { @Override - public void performEffect(TEMasterStone ritualStone) + public void performEffect(IMasterRitualStone ritualStone) { String owner = ritualStone.getOwner(); World worldSave = MinecraftServer.getServer().worldServers[0]; @@ -30,10 +31,10 @@ public class RitualEffectSummonMeteor extends RitualEffect } int currentEssence = data.currentEssence; - World world = ritualStone.worldObj; - int x = ritualStone.xCoord; - int y = ritualStone.yCoord; - int z = ritualStone.zCoord; + World world = ritualStone.getWorldObj(); + int x = ritualStone.getXCoord(); + int y = ritualStone.getYCoord(); + int z = ritualStone.getZCoord(); if (ritualStone.getCooldown() > 0) { diff --git a/BM_src/WayofTime/alchemicalWizardry/common/rituals/RitualEffectUnbinding.java b/BM_src/WayofTime/alchemicalWizardry/common/rituals/RitualEffectUnbinding.java index ac7a60af..c930de71 100644 --- a/BM_src/WayofTime/alchemicalWizardry/common/rituals/RitualEffectUnbinding.java +++ b/BM_src/WayofTime/alchemicalWizardry/common/rituals/RitualEffectUnbinding.java @@ -1,13 +1,8 @@ package WayofTime.alchemicalWizardry.common.rituals; -import WayofTime.alchemicalWizardry.ModBlocks; -import WayofTime.alchemicalWizardry.ModItems; -import WayofTime.alchemicalWizardry.common.LifeEssenceNetwork; -import WayofTime.alchemicalWizardry.common.items.BoundArmour; -import WayofTime.alchemicalWizardry.common.items.sigil.SigilOfHolding; -import WayofTime.alchemicalWizardry.common.tileEntity.TEAltar; -import WayofTime.alchemicalWizardry.common.tileEntity.TEMasterStone; -import cpw.mods.fml.common.network.PacketDispatcher; +import java.util.Iterator; +import java.util.List; + import net.minecraft.block.Block; import net.minecraft.entity.effect.EntityLightningBolt; import net.minecraft.entity.item.EntityItem; @@ -19,14 +14,20 @@ import net.minecraft.potion.PotionEffect; import net.minecraft.server.MinecraftServer; import net.minecraft.util.AxisAlignedBB; import net.minecraft.world.World; - -import java.util.Iterator; -import java.util.List; +import WayofTime.alchemicalWizardry.ModBlocks; +import WayofTime.alchemicalWizardry.ModItems; +import WayofTime.alchemicalWizardry.api.rituals.IMasterRitualStone; +import WayofTime.alchemicalWizardry.api.rituals.RitualEffect; +import WayofTime.alchemicalWizardry.api.soulNetwork.LifeEssenceNetwork; +import WayofTime.alchemicalWizardry.common.items.BoundArmour; +import WayofTime.alchemicalWizardry.common.items.sigil.SigilOfHolding; +import WayofTime.alchemicalWizardry.common.tileEntity.TEAltar; +import cpw.mods.fml.common.network.PacketDispatcher; public class RitualEffectUnbinding extends RitualEffect { @Override - public void performEffect(TEMasterStone ritualStone) + public void performEffect(IMasterRitualStone ritualStone) { String owner = ritualStone.getOwner(); World worldSave = MinecraftServer.getServer().worldServers[0]; @@ -39,10 +40,10 @@ public class RitualEffectUnbinding extends RitualEffect } int currentEssence = data.currentEssence; - World world = ritualStone.worldObj; - int x = ritualStone.xCoord; - int y = ritualStone.yCoord; - int z = ritualStone.zCoord; + World world = ritualStone.getWorldObj(); + int x = ritualStone.getXCoord(); + int y = ritualStone.getYCoord(); + int z = ritualStone.getZCoord(); if (currentEssence < this.getCostPerRefresh()) { diff --git a/BM_src/WayofTime/alchemicalWizardry/common/rituals/RitualEffectWater.java b/BM_src/WayofTime/alchemicalWizardry/common/rituals/RitualEffectWater.java index 0a7fdc87..db62c6d8 100644 --- a/BM_src/WayofTime/alchemicalWizardry/common/rituals/RitualEffectWater.java +++ b/BM_src/WayofTime/alchemicalWizardry/common/rituals/RitualEffectWater.java @@ -1,19 +1,20 @@ package WayofTime.alchemicalWizardry.common.rituals; -import WayofTime.alchemicalWizardry.common.LifeEssenceNetwork; -import WayofTime.alchemicalWizardry.common.tileEntity.TEAltar; -import WayofTime.alchemicalWizardry.common.tileEntity.TEMasterStone; -import cpw.mods.fml.common.network.PacketDispatcher; import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.potion.Potion; import net.minecraft.potion.PotionEffect; import net.minecraft.server.MinecraftServer; import net.minecraft.world.World; +import WayofTime.alchemicalWizardry.api.rituals.IMasterRitualStone; +import WayofTime.alchemicalWizardry.api.rituals.RitualEffect; +import WayofTime.alchemicalWizardry.api.soulNetwork.LifeEssenceNetwork; +import WayofTime.alchemicalWizardry.common.tileEntity.TEAltar; +import cpw.mods.fml.common.network.PacketDispatcher; public class RitualEffectWater extends RitualEffect { - public void performEffect(TEMasterStone ritualStone) + public void performEffect(IMasterRitualStone ritualStone) { String owner = ritualStone.getOwner(); World worldSave = MinecraftServer.getServer().worldServers[0]; @@ -26,10 +27,10 @@ public class RitualEffectWater extends RitualEffect } int currentEssence = data.currentEssence; - World world = ritualStone.worldObj; - int x = ritualStone.xCoord; - int y = ritualStone.yCoord; - int z = ritualStone.zCoord; + World world = ritualStone.getWorldObj(); + int x = ritualStone.getXCoord(); + int y = ritualStone.getYCoord(); + int z = ritualStone.getZCoord(); if (world.isAirBlock(x, y + 1, z)) { diff --git a/BM_src/WayofTime/alchemicalWizardry/common/rituals/RitualEffectWellOfSuffering.java b/BM_src/WayofTime/alchemicalWizardry/common/rituals/RitualEffectWellOfSuffering.java index 16727977..9012ee43 100644 --- a/BM_src/WayofTime/alchemicalWizardry/common/rituals/RitualEffectWellOfSuffering.java +++ b/BM_src/WayofTime/alchemicalWizardry/common/rituals/RitualEffectWellOfSuffering.java @@ -1,8 +1,8 @@ package WayofTime.alchemicalWizardry.common.rituals; -import WayofTime.alchemicalWizardry.common.LifeEssenceNetwork; -import WayofTime.alchemicalWizardry.common.tileEntity.TEAltar; -import WayofTime.alchemicalWizardry.common.tileEntity.TEMasterStone; +import java.util.Iterator; +import java.util.List; + import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.potion.Potion; @@ -11,9 +11,10 @@ import net.minecraft.server.MinecraftServer; import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.DamageSource; import net.minecraft.world.World; - -import java.util.Iterator; -import java.util.List; +import WayofTime.alchemicalWizardry.api.rituals.IMasterRitualStone; +import WayofTime.alchemicalWizardry.api.rituals.RitualEffect; +import WayofTime.alchemicalWizardry.api.soulNetwork.LifeEssenceNetwork; +import WayofTime.alchemicalWizardry.common.tileEntity.TEAltar; public class RitualEffectWellOfSuffering extends RitualEffect { @@ -21,7 +22,7 @@ public class RitualEffectWellOfSuffering extends RitualEffect public final int amount = 10; @Override - public void performEffect(TEMasterStone ritualStone) + public void performEffect(IMasterRitualStone ritualStone) { String owner = ritualStone.getOwner(); World worldSave = MinecraftServer.getServer().worldServers[0]; @@ -34,10 +35,10 @@ public class RitualEffectWellOfSuffering extends RitualEffect } int currentEssence = data.currentEssence; - World world = ritualStone.worldObj; - int x = ritualStone.xCoord; - int y = ritualStone.yCoord; - int z = ritualStone.zCoord; + World world = ritualStone.getWorldObj(); + int x = ritualStone.getXCoord(); + int y = ritualStone.getYCoord(); + int z = ritualStone.getZCoord(); if (world.getWorldTime() % this.timeDelay != 0) { diff --git a/BM_src/WayofTime/alchemicalWizardry/common/rituals/Rituals.java b/BM_src/WayofTime/alchemicalWizardry/common/rituals/Rituals.java deleted file mode 100644 index 644c1f3f..00000000 --- a/BM_src/WayofTime/alchemicalWizardry/common/rituals/Rituals.java +++ /dev/null @@ -1,1098 +0,0 @@ -package WayofTime.alchemicalWizardry.common.rituals; - -import WayofTime.alchemicalWizardry.common.block.RitualStone; -import WayofTime.alchemicalWizardry.common.tileEntity.TEMasterStone; -import net.minecraft.block.Block; -import net.minecraft.world.World; -import net.minecraftforge.oredict.OreDictionary; - -import java.util.ArrayList; -import java.util.List; - -public class Rituals -{ - private List components; - private int crystalLevel; - private int actCost; - private RitualEffect effect; - private String name; - - public static List ritualList = new ArrayList(); - - public Rituals(List components, int crystalLevel, int actCost, RitualEffect effect, String name) - { - this.components = components; - this.crystalLevel = crystalLevel; - this.actCost = actCost; - this.effect = effect; - this.name = name; - } - - public Rituals(List components, int crystalLevel, int actCost, RitualEffect effect) - { - this.components = components; - this.crystalLevel = crystalLevel; - this.actCost = actCost; - this.effect = effect; - this.name = ""; - } - - //public static final int totalRituals = 1; - - public static int checkValidRitual(World world, int x, int y, int z) - { - for (int i = 1; i <= ritualList.size(); i++) - { - if (checkRitualIsValid(world, x, y, z, i)) - { - return i; - } - } - - return 0; - } - - public static boolean canCrystalActivate(int ritual, int crystalLevel) - { - if (ritual <= ritualList.size()) - { - return ritualList.get(ritual - 1).crystalLevel <= crystalLevel; - } else - { - return false; - } - -// switch (crystalLevel) -// { -// case 1: -// return(ritual <= 8); -// -// case 2: -// return(ritual <= 16); -// -// default: -// return false; -// } - } - - public static boolean checkRitualIsValid(World world, int x, int y, int z, int ritualID) - { - int direction = Rituals.getDirectionOfRitual(world, x, y, z, ritualID); - - if (direction != -1) - { - return true; - } - - return false; -// List ritual = Rituals.getRitualList(ritualID); -// -// if (ritual == null) -// { -// return false; -// } -// -// Block test = null; -// -// for (RitualComponent rc : ritual) -// { -// test = Block.blocksList[world.getBlockId(x + rc.getX(), y + rc.getY(), z + rc.getZ())]; -// -// if (!(test instanceof RitualStone)) -// { -// return false; -// } -// -// if (world.getBlockMetadata(x + rc.getX(), y + rc.getY(), z + rc.getZ()) != rc.getStoneType()) -// { -// return false; -// } -// } -// -// return true; - } - - /** - * 1 - NORTH - * 2 - EAST - * 3 - SOUTH - * 4 - WEST - */ - public static boolean checkDirectionOfRitualValid(World world, int x, int y, int z, int ritualID, int direction) - { - List ritual = Rituals.getRitualList(ritualID); - - if (ritual == null) - { - return false; - } - - Block test = null; - - switch (direction) - { - case 1: - for (RitualComponent rc : ritual) - { - test = Block.blocksList[world.getBlockId(x + rc.getX(), y + rc.getY(), z + rc.getZ())]; - - if (!(test instanceof RitualStone)) - { - return false; - } - - if (world.getBlockMetadata(x + rc.getX(), y + rc.getY(), z + rc.getZ()) != rc.getStoneType()) - { - return false; - } - } - - return true; - - case 2: - for (RitualComponent rc : ritual) - { - test = Block.blocksList[world.getBlockId(x - rc.getZ(), y + rc.getY(), z + rc.getX())]; - - if (!(test instanceof RitualStone)) - { - return false; - } - - if (world.getBlockMetadata(x - rc.getZ(), y + rc.getY(), z + rc.getX()) != rc.getStoneType()) - { - return false; - } - } - - return true; - - case 3: - for (RitualComponent rc : ritual) - { - test = Block.blocksList[world.getBlockId(x - rc.getX(), y + rc.getY(), z - rc.getZ())]; - - if (!(test instanceof RitualStone)) - { - return false; - } - - if (world.getBlockMetadata(x - rc.getX(), y + rc.getY(), z - rc.getZ()) != rc.getStoneType()) - { - return false; - } - } - - return true; - - case 4: - for (RitualComponent rc : ritual) - { - test = Block.blocksList[world.getBlockId(x + rc.getZ(), y + rc.getY(), z - rc.getX())]; - - if (!(test instanceof RitualStone)) - { - return false; - } - - if (world.getBlockMetadata(x + rc.getZ(), y + rc.getY(), z - rc.getX()) != rc.getStoneType()) - { - return false; - } - } - - return true; - } - - return false; - } - - public static int getDirectionOfRitual(World world, int x, int y, int z, int ritualID) - { - for (int i = 1; i <= 4; i++) - { - if (Rituals.checkDirectionOfRitualValid(world, x, y, z, ritualID, i)) - { - return i; - } - } - - return -1; - } - - public static void loadRituals() - { - ArrayList waterRitual = new ArrayList(); - waterRitual.add(new RitualComponent(-1, 0, 1, 1)); - waterRitual.add(new RitualComponent(-1, 0, -1, 1)); - waterRitual.add(new RitualComponent(1, 0, -1, 1)); - waterRitual.add(new RitualComponent(1, 0, 1, 1)); - ArrayList lavaRitual = new ArrayList(); - lavaRitual.add(new RitualComponent(1, 0, 0, 2)); - lavaRitual.add(new RitualComponent(-1, 0, 0, 2)); - lavaRitual.add(new RitualComponent(0, 0, 1, 2)); - lavaRitual.add(new RitualComponent(0, 0, -1, 2)); - ArrayList growthRitual = new ArrayList(); - growthRitual.add(new RitualComponent(1, 0, 0, 1)); - growthRitual.add(new RitualComponent(-1, 0, 0, 1)); - growthRitual.add(new RitualComponent(0, 0, 1, 1)); - growthRitual.add(new RitualComponent(0, 0, -1, 1)); - growthRitual.add(new RitualComponent(-1, 0, 1, 3)); - growthRitual.add(new RitualComponent(1, 0, 1, 3)); - growthRitual.add(new RitualComponent(-1, 0, -1, 3)); - growthRitual.add(new RitualComponent(1, 0, -1, 3)); - ArrayList interdictionRitual = new ArrayList(); - interdictionRitual.add(new RitualComponent(1, 0, 0, 4)); - interdictionRitual.add(new RitualComponent(-1, 0, 0, 4)); - interdictionRitual.add(new RitualComponent(0, 0, 1, 4)); - interdictionRitual.add(new RitualComponent(0, 0, -1, 4)); - interdictionRitual.add(new RitualComponent(-1, 0, 1, 4)); - interdictionRitual.add(new RitualComponent(1, 0, 1, 4)); - interdictionRitual.add(new RitualComponent(-1, 0, -1, 4)); - interdictionRitual.add(new RitualComponent(1, 0, -1, 4)); - ArrayList containmentRitual = new ArrayList(); - containmentRitual.add(new RitualComponent(1, 0, 0, 3)); - containmentRitual.add(new RitualComponent(-1, 0, 0, 3)); - containmentRitual.add(new RitualComponent(0, 0, 1, 3)); - containmentRitual.add(new RitualComponent(0, 0, -1, 3)); - containmentRitual.add(new RitualComponent(2, 0, 2, 3)); - containmentRitual.add(new RitualComponent(2, 0, -2, 3)); - containmentRitual.add(new RitualComponent(-2, 0, 2, 3)); - containmentRitual.add(new RitualComponent(-2, 0, -2, 3)); - containmentRitual.add(new RitualComponent(1, 5, 0, 3)); - containmentRitual.add(new RitualComponent(-1, 5, 0, 3)); - containmentRitual.add(new RitualComponent(0, 5, 1, 3)); - containmentRitual.add(new RitualComponent(0, 5, -1, 3)); - containmentRitual.add(new RitualComponent(2, 5, 2, 3)); - containmentRitual.add(new RitualComponent(2, 5, -2, 3)); - containmentRitual.add(new RitualComponent(-2, 5, 2, 3)); - containmentRitual.add(new RitualComponent(-2, 5, -2, 3)); - //Bound soul ritual - ArrayList boundSoulRitual = new ArrayList(); - boundSoulRitual.add(new RitualComponent(3, 0, 0, 2)); - boundSoulRitual.add(new RitualComponent(-3, 0, 0, 2)); - boundSoulRitual.add(new RitualComponent(0, 0, 3, 2)); - boundSoulRitual.add(new RitualComponent(0, 0, -3, 2)); - boundSoulRitual.add(new RitualComponent(2, 0, 2, 4)); - boundSoulRitual.add(new RitualComponent(-2, 0, 2, 4)); - boundSoulRitual.add(new RitualComponent(2, 0, -2, 4)); - boundSoulRitual.add(new RitualComponent(-2, 0, -2, 4)); - boundSoulRitual.add(new RitualComponent(4, 2, 0, 1)); - boundSoulRitual.add(new RitualComponent(-4, 2, 0, 1)); - boundSoulRitual.add(new RitualComponent(0, 2, 4, 1)); - boundSoulRitual.add(new RitualComponent(0, 2, -4, 1)); - boundSoulRitual.add(new RitualComponent(3, 2, 3, 3)); - boundSoulRitual.add(new RitualComponent(3, 2, -3, 3)); - boundSoulRitual.add(new RitualComponent(-3, 2, 3, 3)); - boundSoulRitual.add(new RitualComponent(-3, 2, -3, 3)); - boundSoulRitual.add(new RitualComponent(4, 1, 0, 0)); - boundSoulRitual.add(new RitualComponent(-4, 1, 0, 0)); - boundSoulRitual.add(new RitualComponent(0, 1, 4, 0)); - boundSoulRitual.add(new RitualComponent(0, 1, -4, 0)); - boundSoulRitual.add(new RitualComponent(3, 1, 3, 0)); - boundSoulRitual.add(new RitualComponent(3, 1, -3, 0)); - boundSoulRitual.add(new RitualComponent(-3, 1, 3, 0)); - boundSoulRitual.add(new RitualComponent(-3, 1, -3, 0)); - // - ArrayList unbindingRitual = new ArrayList(); - unbindingRitual.add(new RitualComponent(-2, 0, 0, 4)); - unbindingRitual.add(new RitualComponent(2, 0, 0, 4)); - unbindingRitual.add(new RitualComponent(0, 0, 2, 4)); - unbindingRitual.add(new RitualComponent(0, 0, -2, 4)); - unbindingRitual.add(new RitualComponent(-2, 0, -2, 3)); - unbindingRitual.add(new RitualComponent(-2, 0, -3, 3)); - unbindingRitual.add(new RitualComponent(-3, 0, -2, 3)); - unbindingRitual.add(new RitualComponent(2, 0, -2, 3)); - unbindingRitual.add(new RitualComponent(2, 0, -3, 3)); - unbindingRitual.add(new RitualComponent(3, 0, -2, 3)); - unbindingRitual.add(new RitualComponent(-2, 0, 2, 3)); - unbindingRitual.add(new RitualComponent(-2, 0, 3, 3)); - unbindingRitual.add(new RitualComponent(-3, 0, 2, 3)); - unbindingRitual.add(new RitualComponent(2, 0, 2, 3)); - unbindingRitual.add(new RitualComponent(2, 0, 3, 3)); - unbindingRitual.add(new RitualComponent(3, 0, 2, 3)); - unbindingRitual.add(new RitualComponent(3, 1, 3, 0)); - unbindingRitual.add(new RitualComponent(3, 1, -3, 0)); - unbindingRitual.add(new RitualComponent(-3, 1, -3, 0)); - unbindingRitual.add(new RitualComponent(-3, 1, 3, 0)); - unbindingRitual.add(new RitualComponent(3, 2, 3, 0)); - unbindingRitual.add(new RitualComponent(3, 2, -3, 0)); - unbindingRitual.add(new RitualComponent(-3, 2, -3, 0)); - unbindingRitual.add(new RitualComponent(-3, 2, 3, 0)); - unbindingRitual.add(new RitualComponent(3, 3, 3, 2)); - unbindingRitual.add(new RitualComponent(3, 3, -3, 2)); - unbindingRitual.add(new RitualComponent(-3, 3, -3, 2)); - unbindingRitual.add(new RitualComponent(-3, 3, 3, 2)); - unbindingRitual.add(new RitualComponent(-5, 0, 0, 2)); - unbindingRitual.add(new RitualComponent(5, 0, 0, 2)); - unbindingRitual.add(new RitualComponent(0, 0, 5, 2)); - unbindingRitual.add(new RitualComponent(0, 0, -5, 2)); - ArrayList jumpingRitual = new ArrayList(); - - for (int i = -1; i <= 1; i++) - { - jumpingRitual.add(new RitualComponent(1, i, 1, RitualComponent.AIR)); - jumpingRitual.add(new RitualComponent(-1, i, 1, RitualComponent.AIR)); - jumpingRitual.add(new RitualComponent(-1, i, -1, RitualComponent.AIR)); - jumpingRitual.add(new RitualComponent(1, i, -1, RitualComponent.AIR)); - } - - ArrayList magneticRitual = new ArrayList(); - magneticRitual.add(new RitualComponent(1, 0, 1, RitualComponent.EARTH)); - magneticRitual.add(new RitualComponent(1, 0, -1, RitualComponent.EARTH)); - magneticRitual.add(new RitualComponent(-1, 0, 1, RitualComponent.EARTH)); - magneticRitual.add(new RitualComponent(-1, 0, -1, RitualComponent.EARTH)); - magneticRitual.add(new RitualComponent(2, 1, 0, RitualComponent.EARTH)); - magneticRitual.add(new RitualComponent(0, 1, 2, RitualComponent.EARTH)); - magneticRitual.add(new RitualComponent(-2, 1, 0, RitualComponent.EARTH)); - magneticRitual.add(new RitualComponent(0, 1, -2, RitualComponent.EARTH)); - magneticRitual.add(new RitualComponent(2, 1, 2, RitualComponent.AIR)); - magneticRitual.add(new RitualComponent(2, 1, -2, RitualComponent.AIR)); - magneticRitual.add(new RitualComponent(-2, 1, 2, RitualComponent.AIR)); - magneticRitual.add(new RitualComponent(-2, 1, -2, RitualComponent.AIR)); - magneticRitual.add(new RitualComponent(2, 2, 0, RitualComponent.FIRE)); - magneticRitual.add(new RitualComponent(0, 2, 2, RitualComponent.FIRE)); - magneticRitual.add(new RitualComponent(-2, 2, 0, RitualComponent.FIRE)); - magneticRitual.add(new RitualComponent(0, 2, -2, RitualComponent.FIRE)); - ArrayList crushingRitual = new ArrayList(); - crushingRitual.add(new RitualComponent(0, 0, 1, RitualComponent.EARTH)); - crushingRitual.add(new RitualComponent(1, 0, 0, RitualComponent.EARTH)); - crushingRitual.add(new RitualComponent(0, 0, -1, RitualComponent.EARTH)); - crushingRitual.add(new RitualComponent(-1, 0, 0, RitualComponent.EARTH)); - crushingRitual.add(new RitualComponent(2, 0, 0, RitualComponent.FIRE)); - crushingRitual.add(new RitualComponent(0, 0, 2, RitualComponent.FIRE)); - crushingRitual.add(new RitualComponent(-2, 0, 0, RitualComponent.FIRE)); - crushingRitual.add(new RitualComponent(0, 0, -2, RitualComponent.FIRE)); - crushingRitual.add(new RitualComponent(2, 0, 2, RitualComponent.DUSK)); - crushingRitual.add(new RitualComponent(2, 0, -2, RitualComponent.DUSK)); - crushingRitual.add(new RitualComponent(-2, 0, 2, RitualComponent.DUSK)); - crushingRitual.add(new RitualComponent(-2, 0, -2, RitualComponent.DUSK)); - crushingRitual.add(new RitualComponent(2, 1, 0, RitualComponent.AIR)); - crushingRitual.add(new RitualComponent(-2, 1, 0, RitualComponent.AIR)); - crushingRitual.add(new RitualComponent(0, 1, 2, RitualComponent.AIR)); - crushingRitual.add(new RitualComponent(0, 1, -2, RitualComponent.AIR)); - ArrayList leapingRitual = new ArrayList(); - leapingRitual.add(new RitualComponent(0, 0, -2, RitualComponent.DUSK)); - leapingRitual.add(new RitualComponent(1, 0, -1, RitualComponent.AIR)); - leapingRitual.add(new RitualComponent(-1, 0, -1, RitualComponent.AIR)); - - for (int i = 0; i <= 2; i++) - { - leapingRitual.add(new RitualComponent(2, 0, i, RitualComponent.AIR)); - leapingRitual.add(new RitualComponent(-2, 0, i, RitualComponent.AIR)); - } - - //Animal Growth - ArrayList animalGrowthRitual = new ArrayList(); - animalGrowthRitual.add(new RitualComponent(0, 0, 2, RitualComponent.DUSK)); - animalGrowthRitual.add(new RitualComponent(2, 0, 0, RitualComponent.DUSK)); - animalGrowthRitual.add(new RitualComponent(0, 0, -2, RitualComponent.DUSK)); - animalGrowthRitual.add(new RitualComponent(-2, 0, 0, RitualComponent.DUSK)); - animalGrowthRitual.add(new RitualComponent(0, 0, 1, RitualComponent.WATER)); - animalGrowthRitual.add(new RitualComponent(1, 0, 0, RitualComponent.WATER)); - animalGrowthRitual.add(new RitualComponent(0, 0, -1, RitualComponent.WATER)); - animalGrowthRitual.add(new RitualComponent(-1, 0, 0, RitualComponent.WATER)); - animalGrowthRitual.add(new RitualComponent(1, 0, 2, RitualComponent.EARTH)); - animalGrowthRitual.add(new RitualComponent(-1, 0, 2, RitualComponent.EARTH)); - animalGrowthRitual.add(new RitualComponent(1, 0, -2, RitualComponent.EARTH)); - animalGrowthRitual.add(new RitualComponent(-1, 0, -2, RitualComponent.EARTH)); - animalGrowthRitual.add(new RitualComponent(2, 0, 1, RitualComponent.AIR)); - animalGrowthRitual.add(new RitualComponent(2, 0, -1, RitualComponent.AIR)); - animalGrowthRitual.add(new RitualComponent(-2, 0, 1, RitualComponent.AIR)); - animalGrowthRitual.add(new RitualComponent(-2, 0, -1, RitualComponent.AIR)); - //Well of Suffering - ArrayList wellOfSufferingRitual = new ArrayList(); - wellOfSufferingRitual.add(new RitualComponent(1, 0, 1, RitualComponent.FIRE)); - wellOfSufferingRitual.add(new RitualComponent(-1, 0, 1, RitualComponent.FIRE)); - wellOfSufferingRitual.add(new RitualComponent(1, 0, -1, RitualComponent.FIRE)); - wellOfSufferingRitual.add(new RitualComponent(-1, 0, -1, RitualComponent.FIRE)); - wellOfSufferingRitual.add(new RitualComponent(2, -1, 2, RitualComponent.FIRE)); - wellOfSufferingRitual.add(new RitualComponent(2, -1, -2, RitualComponent.FIRE)); - wellOfSufferingRitual.add(new RitualComponent(-2, -1, 2, RitualComponent.FIRE)); - wellOfSufferingRitual.add(new RitualComponent(-2, -1, -2, RitualComponent.FIRE)); - wellOfSufferingRitual.add(new RitualComponent(0, -1, 2, RitualComponent.EARTH)); - wellOfSufferingRitual.add(new RitualComponent(2, -1, 0, RitualComponent.EARTH)); - wellOfSufferingRitual.add(new RitualComponent(0, -1, -2, RitualComponent.EARTH)); - wellOfSufferingRitual.add(new RitualComponent(-2, -1, 0, RitualComponent.EARTH)); - wellOfSufferingRitual.add(new RitualComponent(-3, -1, -3, RitualComponent.DUSK)); - wellOfSufferingRitual.add(new RitualComponent(3, -1, -3, RitualComponent.DUSK)); - wellOfSufferingRitual.add(new RitualComponent(-3, -1, 3, RitualComponent.DUSK)); - wellOfSufferingRitual.add(new RitualComponent(3, -1, 3, RitualComponent.DUSK)); - wellOfSufferingRitual.add(new RitualComponent(2, -1, 4, RitualComponent.WATER)); - wellOfSufferingRitual.add(new RitualComponent(4, -1, 2, RitualComponent.WATER)); - wellOfSufferingRitual.add(new RitualComponent(-2, -1, 4, RitualComponent.WATER)); - wellOfSufferingRitual.add(new RitualComponent(4, -1, -2, RitualComponent.WATER)); - wellOfSufferingRitual.add(new RitualComponent(2, -1, -4, RitualComponent.WATER)); - wellOfSufferingRitual.add(new RitualComponent(-4, -1, 2, RitualComponent.WATER)); - wellOfSufferingRitual.add(new RitualComponent(-2, -1, -4, RitualComponent.WATER)); - wellOfSufferingRitual.add(new RitualComponent(-4, -1, -2, RitualComponent.WATER)); - wellOfSufferingRitual.add(new RitualComponent(1, 0, 4, RitualComponent.WATER)); - wellOfSufferingRitual.add(new RitualComponent(4, 0, 1, RitualComponent.WATER)); - wellOfSufferingRitual.add(new RitualComponent(1, 0, -4, RitualComponent.WATER)); - wellOfSufferingRitual.add(new RitualComponent(-4, 0, 1, RitualComponent.WATER)); - wellOfSufferingRitual.add(new RitualComponent(-1, 0, 4, RitualComponent.WATER)); - wellOfSufferingRitual.add(new RitualComponent(4, 0, -1, RitualComponent.WATER)); - wellOfSufferingRitual.add(new RitualComponent(-1, 0, -4, RitualComponent.WATER)); - wellOfSufferingRitual.add(new RitualComponent(-4, 0, -1, RitualComponent.WATER)); - wellOfSufferingRitual.add(new RitualComponent(4, 1, 0, RitualComponent.AIR)); - wellOfSufferingRitual.add(new RitualComponent(0, 1, 4, RitualComponent.AIR)); - wellOfSufferingRitual.add(new RitualComponent(-4, 1, 0, RitualComponent.AIR)); - wellOfSufferingRitual.add(new RitualComponent(0, 1, -4, RitualComponent.AIR)); - ArrayList healingRitual = new ArrayList(); - healingRitual.add(new RitualComponent(4, 0, 0, RitualComponent.AIR)); - healingRitual.add(new RitualComponent(5, 0, -1, RitualComponent.AIR)); - healingRitual.add(new RitualComponent(5, 0, 1, RitualComponent.AIR)); - healingRitual.add(new RitualComponent(-4, 0, 0, RitualComponent.AIR)); - healingRitual.add(new RitualComponent(-5, 0, -1, RitualComponent.AIR)); - healingRitual.add(new RitualComponent(-5, 0, 1, RitualComponent.AIR)); - healingRitual.add(new RitualComponent(0, 0, 4, RitualComponent.FIRE)); - healingRitual.add(new RitualComponent(-1, 0, 5, RitualComponent.FIRE)); - healingRitual.add(new RitualComponent(1, 0, 5, RitualComponent.FIRE)); - healingRitual.add(new RitualComponent(0, 0, -4, RitualComponent.FIRE)); - healingRitual.add(new RitualComponent(-1, 0, -5, RitualComponent.FIRE)); - healingRitual.add(new RitualComponent(1, 0, -5, RitualComponent.FIRE)); - healingRitual.add(new RitualComponent(3, 0, 5, RitualComponent.WATER)); - healingRitual.add(new RitualComponent(5, 0, 3, RitualComponent.WATER)); - healingRitual.add(new RitualComponent(3, 0, -5, RitualComponent.WATER)); - healingRitual.add(new RitualComponent(5, 0, -3, RitualComponent.WATER)); - healingRitual.add(new RitualComponent(-3, 0, 5, RitualComponent.WATER)); - healingRitual.add(new RitualComponent(-5, 0, 3, RitualComponent.WATER)); - healingRitual.add(new RitualComponent(-3, 0, -5, RitualComponent.WATER)); - healingRitual.add(new RitualComponent(-5, 0, -3, RitualComponent.WATER)); - healingRitual.add(new RitualComponent(-3, 0, -3, RitualComponent.DUSK)); - healingRitual.add(new RitualComponent(-3, 0, 3, RitualComponent.DUSK)); - healingRitual.add(new RitualComponent(3, 0, -3, RitualComponent.DUSK)); - healingRitual.add(new RitualComponent(3, 0, 3, RitualComponent.DUSK)); - healingRitual.add(new RitualComponent(4, 0, 5, RitualComponent.EARTH)); - healingRitual.add(new RitualComponent(4, -1, 5, RitualComponent.EARTH)); - healingRitual.add(new RitualComponent(5, 0, 4, RitualComponent.EARTH)); - healingRitual.add(new RitualComponent(5, -1, 4, RitualComponent.EARTH)); - healingRitual.add(new RitualComponent(5, 0, 5, RitualComponent.EARTH)); - healingRitual.add(new RitualComponent(4, 0, -5, RitualComponent.EARTH)); - healingRitual.add(new RitualComponent(4, -1, -5, RitualComponent.EARTH)); - healingRitual.add(new RitualComponent(5, 0, -4, RitualComponent.EARTH)); - healingRitual.add(new RitualComponent(5, -1, -4, RitualComponent.EARTH)); - healingRitual.add(new RitualComponent(5, 0, -5, RitualComponent.EARTH)); - healingRitual.add(new RitualComponent(-4, 0, 5, RitualComponent.EARTH)); - healingRitual.add(new RitualComponent(-4, -1, 5, RitualComponent.EARTH)); - healingRitual.add(new RitualComponent(-5, 0, 4, RitualComponent.EARTH)); - healingRitual.add(new RitualComponent(-5, -1, 4, RitualComponent.EARTH)); - healingRitual.add(new RitualComponent(-5, 0, 5, RitualComponent.EARTH)); - healingRitual.add(new RitualComponent(-4, 0, -5, RitualComponent.EARTH)); - healingRitual.add(new RitualComponent(-4, -1, -5, RitualComponent.EARTH)); - healingRitual.add(new RitualComponent(-5, 0, -4, RitualComponent.EARTH)); - healingRitual.add(new RitualComponent(-5, -1, -4, RitualComponent.EARTH)); - healingRitual.add(new RitualComponent(-5, 0, -5, RitualComponent.EARTH)); - ArrayList featheredKnifeRitual = new ArrayList(); - featheredKnifeRitual.add(new RitualComponent(1, 0, 0, RitualComponent.DUSK)); - featheredKnifeRitual.add(new RitualComponent(-1, 0, 0, RitualComponent.DUSK)); - featheredKnifeRitual.add(new RitualComponent(0, 0, 1, RitualComponent.DUSK)); - featheredKnifeRitual.add(new RitualComponent(0, 0, -1, RitualComponent.DUSK)); - featheredKnifeRitual.add(new RitualComponent(2, -1, 0, RitualComponent.WATER)); - featheredKnifeRitual.add(new RitualComponent(-2, -1, 0, RitualComponent.WATER)); - featheredKnifeRitual.add(new RitualComponent(0, -1, 2, RitualComponent.WATER)); - featheredKnifeRitual.add(new RitualComponent(0, -1, -2, RitualComponent.WATER)); - featheredKnifeRitual.add(new RitualComponent(1, -1, 1, RitualComponent.AIR)); - featheredKnifeRitual.add(new RitualComponent(1, -1, -1, RitualComponent.AIR)); - featheredKnifeRitual.add(new RitualComponent(-1, -1, 1, RitualComponent.AIR)); - featheredKnifeRitual.add(new RitualComponent(-1, -1, -1, RitualComponent.AIR)); - featheredKnifeRitual.add(new RitualComponent(4, -1, 2, RitualComponent.FIRE)); - featheredKnifeRitual.add(new RitualComponent(2, -1, 4, RitualComponent.FIRE)); - featheredKnifeRitual.add(new RitualComponent(-4, -1, 2, RitualComponent.FIRE)); - featheredKnifeRitual.add(new RitualComponent(2, -1, -4, RitualComponent.FIRE)); - featheredKnifeRitual.add(new RitualComponent(4, -1, -2, RitualComponent.FIRE)); - featheredKnifeRitual.add(new RitualComponent(-2, -1, 4, RitualComponent.FIRE)); - featheredKnifeRitual.add(new RitualComponent(-4, -1, -2, RitualComponent.FIRE)); - featheredKnifeRitual.add(new RitualComponent(-2, -1, -4, RitualComponent.FIRE)); - featheredKnifeRitual.add(new RitualComponent(4, 0, 2, RitualComponent.EARTH)); - featheredKnifeRitual.add(new RitualComponent(2, 0, 4, RitualComponent.EARTH)); - featheredKnifeRitual.add(new RitualComponent(-4, 0, 2, RitualComponent.EARTH)); - featheredKnifeRitual.add(new RitualComponent(2, 0, -4, RitualComponent.EARTH)); - featheredKnifeRitual.add(new RitualComponent(4, 0, -2, RitualComponent.EARTH)); - featheredKnifeRitual.add(new RitualComponent(-2, 0, 4, RitualComponent.EARTH)); - featheredKnifeRitual.add(new RitualComponent(-4, 0, -2, RitualComponent.EARTH)); - featheredKnifeRitual.add(new RitualComponent(-2, 0, -4, RitualComponent.EARTH)); - featheredKnifeRitual.add(new RitualComponent(4, 0, 3, RitualComponent.EARTH)); - featheredKnifeRitual.add(new RitualComponent(3, 0, 4, RitualComponent.EARTH)); - featheredKnifeRitual.add(new RitualComponent(-4, 0, 3, RitualComponent.EARTH)); - featheredKnifeRitual.add(new RitualComponent(3, 0, -4, RitualComponent.EARTH)); - featheredKnifeRitual.add(new RitualComponent(4, 0, -3, RitualComponent.EARTH)); - featheredKnifeRitual.add(new RitualComponent(-3, 0, 4, RitualComponent.EARTH)); - featheredKnifeRitual.add(new RitualComponent(-4, 0, -3, RitualComponent.EARTH)); - featheredKnifeRitual.add(new RitualComponent(-3, 0, -4, RitualComponent.EARTH)); - featheredKnifeRitual.add(new RitualComponent(3, 0, 3, RitualComponent.AIR)); - featheredKnifeRitual.add(new RitualComponent(3, 0, -3, RitualComponent.AIR)); - featheredKnifeRitual.add(new RitualComponent(-3, 0, 3, RitualComponent.AIR)); - featheredKnifeRitual.add(new RitualComponent(-3, 0, -3, RitualComponent.AIR)); - ArrayList featheredEarthRitual = new ArrayList(); - featheredEarthRitual.add(new RitualComponent(1, 0, 0, RitualComponent.DUSK)); - featheredEarthRitual.add(new RitualComponent(-1, 0, 0, RitualComponent.DUSK)); - featheredEarthRitual.add(new RitualComponent(0, 0, 1, RitualComponent.DUSK)); - featheredEarthRitual.add(new RitualComponent(0, 0, -1, RitualComponent.DUSK)); - featheredEarthRitual.add(new RitualComponent(2, 0, 2, RitualComponent.AIR)); - featheredEarthRitual.add(new RitualComponent(-2, 0, 2, RitualComponent.AIR)); - featheredEarthRitual.add(new RitualComponent(-2, 0, -2, RitualComponent.AIR)); - featheredEarthRitual.add(new RitualComponent(2, 0, -2, RitualComponent.AIR)); - featheredEarthRitual.add(new RitualComponent(1, 0, 3, RitualComponent.EARTH)); - featheredEarthRitual.add(new RitualComponent(0, 0, 3, RitualComponent.EARTH)); - featheredEarthRitual.add(new RitualComponent(-1, 0, 3, RitualComponent.EARTH)); - featheredEarthRitual.add(new RitualComponent(1, 0, -3, RitualComponent.EARTH)); - featheredEarthRitual.add(new RitualComponent(0, 0, -3, RitualComponent.EARTH)); - featheredEarthRitual.add(new RitualComponent(-1, 0, -3, RitualComponent.EARTH)); - featheredEarthRitual.add(new RitualComponent(3, 0, 1, RitualComponent.EARTH)); - featheredEarthRitual.add(new RitualComponent(3, 0, 0, RitualComponent.EARTH)); - featheredEarthRitual.add(new RitualComponent(3, 0, -1, RitualComponent.EARTH)); - featheredEarthRitual.add(new RitualComponent(-3, 0, 1, RitualComponent.EARTH)); - featheredEarthRitual.add(new RitualComponent(-3, 0, 0, RitualComponent.EARTH)); - featheredEarthRitual.add(new RitualComponent(-3, 0, -1, RitualComponent.EARTH)); - featheredEarthRitual.add(new RitualComponent(4, 4, 4, RitualComponent.FIRE)); - featheredEarthRitual.add(new RitualComponent(-4, 4, 4, RitualComponent.FIRE)); - featheredEarthRitual.add(new RitualComponent(-4, 4, -4, RitualComponent.FIRE)); - featheredEarthRitual.add(new RitualComponent(4, 4, -4, RitualComponent.FIRE)); - featheredEarthRitual.add(new RitualComponent(4, 5, 5, RitualComponent.AIR)); - featheredEarthRitual.add(new RitualComponent(4, 5, 3, RitualComponent.AIR)); - featheredEarthRitual.add(new RitualComponent(5, 5, 4, RitualComponent.AIR)); - featheredEarthRitual.add(new RitualComponent(3, 5, 4, RitualComponent.AIR)); - featheredEarthRitual.add(new RitualComponent(-4, 5, 5, RitualComponent.AIR)); - featheredEarthRitual.add(new RitualComponent(-4, 5, 3, RitualComponent.AIR)); - featheredEarthRitual.add(new RitualComponent(-5, 5, 4, RitualComponent.AIR)); - featheredEarthRitual.add(new RitualComponent(-3, 5, 4, RitualComponent.AIR)); - featheredEarthRitual.add(new RitualComponent(4, 5, -5, RitualComponent.AIR)); - featheredEarthRitual.add(new RitualComponent(4, 5, -3, RitualComponent.AIR)); - featheredEarthRitual.add(new RitualComponent(5, 5, -4, RitualComponent.AIR)); - featheredEarthRitual.add(new RitualComponent(3, 5, -4, RitualComponent.AIR)); - featheredEarthRitual.add(new RitualComponent(-4, 5, -5, RitualComponent.AIR)); - featheredEarthRitual.add(new RitualComponent(-4, 5, -3, RitualComponent.AIR)); - featheredEarthRitual.add(new RitualComponent(-5, 5, -4, RitualComponent.AIR)); - featheredEarthRitual.add(new RitualComponent(-3, 5, -4, RitualComponent.AIR)); - //Biome Changer - ArrayList biomeChangerRitual = new ArrayList(); - biomeChangerRitual.add(new RitualComponent(1, 0, -2, RitualComponent.AIR)); - biomeChangerRitual.add(new RitualComponent(1, 0, -3, RitualComponent.AIR)); - biomeChangerRitual.add(new RitualComponent(2, 0, -1, RitualComponent.AIR)); - biomeChangerRitual.add(new RitualComponent(3, 0, -1, RitualComponent.AIR)); - biomeChangerRitual.add(new RitualComponent(1, 0, 2, RitualComponent.AIR)); - biomeChangerRitual.add(new RitualComponent(1, 0, 3, RitualComponent.AIR)); - biomeChangerRitual.add(new RitualComponent(2, 0, 1, RitualComponent.AIR)); - biomeChangerRitual.add(new RitualComponent(3, 0, 1, RitualComponent.AIR)); - biomeChangerRitual.add(new RitualComponent(-1, 0, -2, RitualComponent.AIR)); - biomeChangerRitual.add(new RitualComponent(-1, 0, -3, RitualComponent.AIR)); - biomeChangerRitual.add(new RitualComponent(-2, 0, -1, RitualComponent.AIR)); - biomeChangerRitual.add(new RitualComponent(-3, 0, -1, RitualComponent.AIR)); - biomeChangerRitual.add(new RitualComponent(-1, 0, 2, RitualComponent.AIR)); - biomeChangerRitual.add(new RitualComponent(-1, 0, 3, RitualComponent.AIR)); - biomeChangerRitual.add(new RitualComponent(-2, 0, 1, RitualComponent.AIR)); - biomeChangerRitual.add(new RitualComponent(-3, 0, 1, RitualComponent.AIR)); - biomeChangerRitual.add(new RitualComponent(3, 0, -3, RitualComponent.EARTH)); - biomeChangerRitual.add(new RitualComponent(3, 0, -4, RitualComponent.EARTH)); - biomeChangerRitual.add(new RitualComponent(4, 0, -3, RitualComponent.EARTH)); - biomeChangerRitual.add(new RitualComponent(4, 0, -5, RitualComponent.FIRE)); - biomeChangerRitual.add(new RitualComponent(5, 0, -4, RitualComponent.FIRE)); - biomeChangerRitual.add(new RitualComponent(3, 0, 3, RitualComponent.EARTH)); - biomeChangerRitual.add(new RitualComponent(3, 0, 4, RitualComponent.EARTH)); - biomeChangerRitual.add(new RitualComponent(4, 0, 3, RitualComponent.EARTH)); - biomeChangerRitual.add(new RitualComponent(4, 0, 5, RitualComponent.FIRE)); - biomeChangerRitual.add(new RitualComponent(5, 0, 4, RitualComponent.FIRE)); - biomeChangerRitual.add(new RitualComponent(-3, 0, 3, RitualComponent.EARTH)); - biomeChangerRitual.add(new RitualComponent(-3, 0, 4, RitualComponent.EARTH)); - biomeChangerRitual.add(new RitualComponent(-4, 0, 3, RitualComponent.EARTH)); - biomeChangerRitual.add(new RitualComponent(-4, 0, 5, RitualComponent.FIRE)); - biomeChangerRitual.add(new RitualComponent(-5, 0, 4, RitualComponent.FIRE)); - biomeChangerRitual.add(new RitualComponent(-3, 0, -3, RitualComponent.EARTH)); - biomeChangerRitual.add(new RitualComponent(-3, 0, -4, RitualComponent.EARTH)); - biomeChangerRitual.add(new RitualComponent(-4, 0, -3, RitualComponent.EARTH)); - biomeChangerRitual.add(new RitualComponent(-4, 0, -5, RitualComponent.FIRE)); - biomeChangerRitual.add(new RitualComponent(-5, 0, -4, RitualComponent.FIRE)); - biomeChangerRitual.add(new RitualComponent(0, 0, -5, RitualComponent.WATER)); - biomeChangerRitual.add(new RitualComponent(-1, 0, -6, RitualComponent.WATER)); - biomeChangerRitual.add(new RitualComponent(1, 0, -6, RitualComponent.WATER)); - biomeChangerRitual.add(new RitualComponent(-1, 0, -8, RitualComponent.BLANK)); - biomeChangerRitual.add(new RitualComponent(0, 0, -8, RitualComponent.BLANK)); - biomeChangerRitual.add(new RitualComponent(1, 0, -8, RitualComponent.BLANK)); - biomeChangerRitual.add(new RitualComponent(-1, 0, -10, RitualComponent.DUSK)); - biomeChangerRitual.add(new RitualComponent(0, 0, -10, RitualComponent.DUSK)); - biomeChangerRitual.add(new RitualComponent(1, 0, -10, RitualComponent.DUSK)); - biomeChangerRitual.add(new RitualComponent(0, 0, 5, RitualComponent.WATER)); - biomeChangerRitual.add(new RitualComponent(-1, 0, 6, RitualComponent.WATER)); - biomeChangerRitual.add(new RitualComponent(1, 0, 6, RitualComponent.WATER)); - biomeChangerRitual.add(new RitualComponent(-1, 0, 8, RitualComponent.BLANK)); - biomeChangerRitual.add(new RitualComponent(0, 0, 8, RitualComponent.BLANK)); - biomeChangerRitual.add(new RitualComponent(1, 0, 8, RitualComponent.BLANK)); - biomeChangerRitual.add(new RitualComponent(-1, 0, 10, RitualComponent.DUSK)); - biomeChangerRitual.add(new RitualComponent(0, 0, 10, RitualComponent.DUSK)); - biomeChangerRitual.add(new RitualComponent(1, 0, 10, RitualComponent.DUSK)); - biomeChangerRitual.add(new RitualComponent(-5, 0, 0, RitualComponent.WATER)); - biomeChangerRitual.add(new RitualComponent(-6, 0, -1, RitualComponent.WATER)); - biomeChangerRitual.add(new RitualComponent(-6, 0, 1, RitualComponent.WATER)); - biomeChangerRitual.add(new RitualComponent(-8, 0, -1, RitualComponent.BLANK)); - biomeChangerRitual.add(new RitualComponent(-8, 0, 0, RitualComponent.BLANK)); - biomeChangerRitual.add(new RitualComponent(-8, 0, 1, RitualComponent.BLANK)); - biomeChangerRitual.add(new RitualComponent(-10, 0, -1, RitualComponent.DUSK)); - biomeChangerRitual.add(new RitualComponent(-10, 0, 0, RitualComponent.DUSK)); - biomeChangerRitual.add(new RitualComponent(-10, 0, 1, RitualComponent.DUSK)); - biomeChangerRitual.add(new RitualComponent(5, 0, 0, RitualComponent.WATER)); - biomeChangerRitual.add(new RitualComponent(6, 0, -1, RitualComponent.WATER)); - biomeChangerRitual.add(new RitualComponent(6, 0, 1, RitualComponent.WATER)); - biomeChangerRitual.add(new RitualComponent(8, 0, -1, RitualComponent.BLANK)); - biomeChangerRitual.add(new RitualComponent(8, 0, 0, RitualComponent.BLANK)); - biomeChangerRitual.add(new RitualComponent(8, 0, 1, RitualComponent.BLANK)); - biomeChangerRitual.add(new RitualComponent(10, 0, -1, RitualComponent.DUSK)); - biomeChangerRitual.add(new RitualComponent(10, 0, 0, RitualComponent.DUSK)); - biomeChangerRitual.add(new RitualComponent(10, 0, 1, RitualComponent.DUSK)); - biomeChangerRitual.add(new RitualComponent(6, 0, -6, RitualComponent.AIR)); - biomeChangerRitual.add(new RitualComponent(6, 0, -7, RitualComponent.AIR)); - biomeChangerRitual.add(new RitualComponent(7, 0, -6, RitualComponent.AIR)); - biomeChangerRitual.add(new RitualComponent(7, 0, -5, RitualComponent.EARTH)); - biomeChangerRitual.add(new RitualComponent(5, 0, -7, RitualComponent.EARTH)); - biomeChangerRitual.add(new RitualComponent(8, 0, -5, RitualComponent.DUSK)); - biomeChangerRitual.add(new RitualComponent(8, 0, -4, RitualComponent.EARTH)); - biomeChangerRitual.add(new RitualComponent(9, 0, -4, RitualComponent.EARTH)); - biomeChangerRitual.add(new RitualComponent(5, 0, -8, RitualComponent.DUSK)); - biomeChangerRitual.add(new RitualComponent(4, 0, -8, RitualComponent.EARTH)); - biomeChangerRitual.add(new RitualComponent(4, 0, -9, RitualComponent.EARTH)); - biomeChangerRitual.add(new RitualComponent(-6, 0, 6, RitualComponent.AIR)); - biomeChangerRitual.add(new RitualComponent(-6, 0, 7, RitualComponent.AIR)); - biomeChangerRitual.add(new RitualComponent(-7, 0, 6, RitualComponent.AIR)); - biomeChangerRitual.add(new RitualComponent(-7, 0, 5, RitualComponent.EARTH)); - biomeChangerRitual.add(new RitualComponent(-5, 0, 7, RitualComponent.EARTH)); - biomeChangerRitual.add(new RitualComponent(-8, 0, 5, RitualComponent.DUSK)); - biomeChangerRitual.add(new RitualComponent(-8, 0, 4, RitualComponent.EARTH)); - biomeChangerRitual.add(new RitualComponent(-9, 0, 4, RitualComponent.EARTH)); - biomeChangerRitual.add(new RitualComponent(-5, 0, 8, RitualComponent.DUSK)); - biomeChangerRitual.add(new RitualComponent(-4, 0, 8, RitualComponent.EARTH)); - biomeChangerRitual.add(new RitualComponent(-4, 0, 9, RitualComponent.EARTH)); - biomeChangerRitual.add(new RitualComponent(6, 0, 6, RitualComponent.FIRE)); - biomeChangerRitual.add(new RitualComponent(6, 0, 7, RitualComponent.FIRE)); - biomeChangerRitual.add(new RitualComponent(7, 0, 6, RitualComponent.FIRE)); - biomeChangerRitual.add(new RitualComponent(7, 0, 5, RitualComponent.WATER)); - biomeChangerRitual.add(new RitualComponent(5, 0, 7, RitualComponent.WATER)); - biomeChangerRitual.add(new RitualComponent(8, 0, 5, RitualComponent.DUSK)); - biomeChangerRitual.add(new RitualComponent(8, 0, 4, RitualComponent.WATER)); - biomeChangerRitual.add(new RitualComponent(9, 0, 4, RitualComponent.WATER)); - biomeChangerRitual.add(new RitualComponent(5, 0, 8, RitualComponent.DUSK)); - biomeChangerRitual.add(new RitualComponent(4, 0, 8, RitualComponent.WATER)); - biomeChangerRitual.add(new RitualComponent(4, 0, 9, RitualComponent.WATER)); - biomeChangerRitual.add(new RitualComponent(-6, 0, -6, RitualComponent.FIRE)); - biomeChangerRitual.add(new RitualComponent(-6, 0, -7, RitualComponent.FIRE)); - biomeChangerRitual.add(new RitualComponent(-7, 0, -6, RitualComponent.FIRE)); - biomeChangerRitual.add(new RitualComponent(-7, 0, -5, RitualComponent.WATER)); - biomeChangerRitual.add(new RitualComponent(-5, 0, -7, RitualComponent.WATER)); - biomeChangerRitual.add(new RitualComponent(-8, 0, -5, RitualComponent.DUSK)); - biomeChangerRitual.add(new RitualComponent(-8, 0, -4, RitualComponent.WATER)); - biomeChangerRitual.add(new RitualComponent(-9, 0, -4, RitualComponent.WATER)); - biomeChangerRitual.add(new RitualComponent(-5, 0, -8, RitualComponent.DUSK)); - biomeChangerRitual.add(new RitualComponent(-4, 0, -8, RitualComponent.WATER)); - biomeChangerRitual.add(new RitualComponent(-4, 0, -9, RitualComponent.WATER)); - ArrayList flightRitual = new ArrayList(); - flightRitual.add(new RitualComponent(1, 0, 0, RitualComponent.DUSK)); - flightRitual.add(new RitualComponent(-1, 0, 0, RitualComponent.DUSK)); - flightRitual.add(new RitualComponent(0, 0, 1, RitualComponent.DUSK)); - flightRitual.add(new RitualComponent(0, 0, -1, RitualComponent.DUSK)); - flightRitual.add(new RitualComponent(2, 0, 2, RitualComponent.AIR)); - flightRitual.add(new RitualComponent(-2, 0, 2, RitualComponent.AIR)); - flightRitual.add(new RitualComponent(-2, 0, -2, RitualComponent.AIR)); - flightRitual.add(new RitualComponent(2, 0, -2, RitualComponent.AIR)); - flightRitual.add(new RitualComponent(1, 0, 3, RitualComponent.EARTH)); - flightRitual.add(new RitualComponent(0, 0, 3, RitualComponent.EARTH)); - flightRitual.add(new RitualComponent(-1, 0, 3, RitualComponent.EARTH)); - flightRitual.add(new RitualComponent(1, 0, -3, RitualComponent.EARTH)); - flightRitual.add(new RitualComponent(0, 0, -3, RitualComponent.EARTH)); - flightRitual.add(new RitualComponent(-1, 0, -3, RitualComponent.EARTH)); - flightRitual.add(new RitualComponent(3, 0, 1, RitualComponent.EARTH)); - flightRitual.add(new RitualComponent(3, 0, 0, RitualComponent.EARTH)); - flightRitual.add(new RitualComponent(3, 0, -1, RitualComponent.EARTH)); - flightRitual.add(new RitualComponent(-3, 0, 1, RitualComponent.EARTH)); - flightRitual.add(new RitualComponent(-3, 0, 0, RitualComponent.EARTH)); - flightRitual.add(new RitualComponent(-3, 0, -1, RitualComponent.EARTH)); - flightRitual.add(new RitualComponent(-3, 0, -4, RitualComponent.WATER)); - flightRitual.add(new RitualComponent(-4, 0, -3, RitualComponent.WATER)); - flightRitual.add(new RitualComponent(-3, 0, 4, RitualComponent.WATER)); - flightRitual.add(new RitualComponent(4, 0, -3, RitualComponent.WATER)); - flightRitual.add(new RitualComponent(3, 0, -4, RitualComponent.WATER)); - flightRitual.add(new RitualComponent(-4, 0, 3, RitualComponent.WATER)); - flightRitual.add(new RitualComponent(3, 0, 4, RitualComponent.WATER)); - flightRitual.add(new RitualComponent(4, 0, 3, RitualComponent.WATER)); - flightRitual.add(new RitualComponent(-1, 1, 0, RitualComponent.FIRE)); - flightRitual.add(new RitualComponent(1, 1, 0, RitualComponent.FIRE)); - flightRitual.add(new RitualComponent(0, 1, -1, RitualComponent.FIRE)); - flightRitual.add(new RitualComponent(0, 1, 1, RitualComponent.FIRE)); - flightRitual.add(new RitualComponent(-2, 1, 0, RitualComponent.BLANK)); - flightRitual.add(new RitualComponent(2, 1, 0, RitualComponent.BLANK)); - flightRitual.add(new RitualComponent(0, 1, -2, RitualComponent.BLANK)); - flightRitual.add(new RitualComponent(0, 1, 2, RitualComponent.BLANK)); - flightRitual.add(new RitualComponent(-4, 1, 0, RitualComponent.BLANK)); - flightRitual.add(new RitualComponent(4, 1, 0, RitualComponent.BLANK)); - flightRitual.add(new RitualComponent(0, 1, -4, RitualComponent.BLANK)); - flightRitual.add(new RitualComponent(0, 1, 4, RitualComponent.BLANK)); - flightRitual.add(new RitualComponent(-5, 1, 0, RitualComponent.AIR)); - flightRitual.add(new RitualComponent(5, 1, 0, RitualComponent.AIR)); - flightRitual.add(new RitualComponent(0, 1, -5, RitualComponent.AIR)); - flightRitual.add(new RitualComponent(0, 1, 5, RitualComponent.AIR)); - flightRitual.add(new RitualComponent(5, 0, 0, RitualComponent.DUSK)); - flightRitual.add(new RitualComponent(-5, 0, 0, RitualComponent.DUSK)); - flightRitual.add(new RitualComponent(0, 0, 5, RitualComponent.DUSK)); - flightRitual.add(new RitualComponent(0, 0, -5, RitualComponent.DUSK)); - - for (int i = 2; i <= 4; i++) - { - flightRitual.add(new RitualComponent(-i, 2, 0, RitualComponent.EARTH)); - flightRitual.add(new RitualComponent(i, 2, 0, RitualComponent.EARTH)); - flightRitual.add(new RitualComponent(0, 2, -i, RitualComponent.EARTH)); - flightRitual.add(new RitualComponent(0, 2, i, RitualComponent.EARTH)); - } - - flightRitual.add(new RitualComponent(2, 4, 1, RitualComponent.FIRE)); - flightRitual.add(new RitualComponent(1, 4, 2, RitualComponent.FIRE)); - flightRitual.add(new RitualComponent(-2, 4, 1, RitualComponent.FIRE)); - flightRitual.add(new RitualComponent(1, 4, -2, RitualComponent.FIRE)); - flightRitual.add(new RitualComponent(2, 4, -1, RitualComponent.FIRE)); - flightRitual.add(new RitualComponent(-1, 4, 2, RitualComponent.FIRE)); - flightRitual.add(new RitualComponent(-2, 4, -1, RitualComponent.FIRE)); - flightRitual.add(new RitualComponent(-1, 4, -2, RitualComponent.FIRE)); - flightRitual.add(new RitualComponent(2, 4, 2, RitualComponent.AIR)); - flightRitual.add(new RitualComponent(-2, 4, 2, RitualComponent.AIR)); - flightRitual.add(new RitualComponent(2, 4, -2, RitualComponent.AIR)); - flightRitual.add(new RitualComponent(-2, 4, -2, RitualComponent.AIR)); - flightRitual.add(new RitualComponent(-4, 2, -4, RitualComponent.FIRE)); - flightRitual.add(new RitualComponent(4, 2, 4, RitualComponent.FIRE)); - flightRitual.add(new RitualComponent(4, 2, -4, RitualComponent.FIRE)); - flightRitual.add(new RitualComponent(-4, 2, 4, RitualComponent.FIRE)); - - for (int i = -1; i <= 1; i++) - { - flightRitual.add(new RitualComponent(3, 4, i, RitualComponent.EARTH)); - flightRitual.add(new RitualComponent(-3, 4, i, RitualComponent.EARTH)); - flightRitual.add(new RitualComponent(i, 4, 3, RitualComponent.EARTH)); - flightRitual.add(new RitualComponent(i, 4, -3, RitualComponent.EARTH)); - } - - ArrayList meteorRitual = new ArrayList(); - meteorRitual.add(new RitualComponent(2, 0, 0, RitualComponent.FIRE)); - meteorRitual.add(new RitualComponent(-2, 0, 0, RitualComponent.FIRE)); - meteorRitual.add(new RitualComponent(0, 0, 2, RitualComponent.FIRE)); - meteorRitual.add(new RitualComponent(0, 0, -2, RitualComponent.FIRE)); - meteorRitual.add(new RitualComponent(3, 0, 1, RitualComponent.AIR)); - meteorRitual.add(new RitualComponent(3, 0, -1, RitualComponent.AIR)); - meteorRitual.add(new RitualComponent(-3, 0, 1, RitualComponent.AIR)); - meteorRitual.add(new RitualComponent(-3, 0, -1, RitualComponent.AIR)); - meteorRitual.add(new RitualComponent(1, 0, 3, RitualComponent.AIR)); - meteorRitual.add(new RitualComponent(-1, 0, 3, RitualComponent.AIR)); - meteorRitual.add(new RitualComponent(1, 0, -3, RitualComponent.AIR)); - meteorRitual.add(new RitualComponent(-1, 0, -3, RitualComponent.AIR)); - meteorRitual.add(new RitualComponent(4, 0, 2, RitualComponent.AIR)); - meteorRitual.add(new RitualComponent(4, 0, -2, RitualComponent.AIR)); - meteorRitual.add(new RitualComponent(-4, 0, 2, RitualComponent.AIR)); - meteorRitual.add(new RitualComponent(-4, 0, -2, RitualComponent.AIR)); - meteorRitual.add(new RitualComponent(2, 0, 4, RitualComponent.AIR)); - meteorRitual.add(new RitualComponent(-2, 0, 4, RitualComponent.AIR)); - meteorRitual.add(new RitualComponent(2, 0, -4, RitualComponent.AIR)); - meteorRitual.add(new RitualComponent(-2, 0, -4, RitualComponent.AIR)); - meteorRitual.add(new RitualComponent(5, 0, 3, RitualComponent.DUSK)); - meteorRitual.add(new RitualComponent(5, 0, -3, RitualComponent.DUSK)); - meteorRitual.add(new RitualComponent(-5, 0, 3, RitualComponent.DUSK)); - meteorRitual.add(new RitualComponent(-5, 0, -3, RitualComponent.DUSK)); - meteorRitual.add(new RitualComponent(3, 0, 5, RitualComponent.DUSK)); - meteorRitual.add(new RitualComponent(-3, 0, 5, RitualComponent.DUSK)); - meteorRitual.add(new RitualComponent(3, 0, -5, RitualComponent.DUSK)); - meteorRitual.add(new RitualComponent(-3, 0, -5, RitualComponent.DUSK)); - meteorRitual.add(new RitualComponent(-4, 0, -4, RitualComponent.DUSK)); - meteorRitual.add(new RitualComponent(-4, 0, 4, RitualComponent.DUSK)); - meteorRitual.add(new RitualComponent(4, 0, 4, RitualComponent.DUSK)); - meteorRitual.add(new RitualComponent(4, 0, -4, RitualComponent.DUSK)); - - for (int i = 4; i <= 6; i++) - { - meteorRitual.add(new RitualComponent(i, 0, 0, RitualComponent.EARTH)); - meteorRitual.add(new RitualComponent(-i, 0, 0, RitualComponent.EARTH)); - meteorRitual.add(new RitualComponent(0, 0, i, RitualComponent.EARTH)); - meteorRitual.add(new RitualComponent(0, 0, -i, RitualComponent.EARTH)); - } - - meteorRitual.add(new RitualComponent(8, 0, 0, RitualComponent.EARTH)); - meteorRitual.add(new RitualComponent(-8, 0, 0, RitualComponent.EARTH)); - meteorRitual.add(new RitualComponent(0, 0, 8, RitualComponent.EARTH)); - meteorRitual.add(new RitualComponent(0, 0, -8, RitualComponent.EARTH)); - meteorRitual.add(new RitualComponent(8, 1, 0, RitualComponent.EARTH)); - meteorRitual.add(new RitualComponent(-8, 1, 0, RitualComponent.EARTH)); - meteorRitual.add(new RitualComponent(0, 1, 8, RitualComponent.EARTH)); - meteorRitual.add(new RitualComponent(0, 1, -8, RitualComponent.EARTH)); - meteorRitual.add(new RitualComponent(7, 1, 0, RitualComponent.EARTH)); - meteorRitual.add(new RitualComponent(-7, 1, 0, RitualComponent.EARTH)); - meteorRitual.add(new RitualComponent(0, 1, 7, RitualComponent.EARTH)); - meteorRitual.add(new RitualComponent(0, 1, -7, RitualComponent.EARTH)); - meteorRitual.add(new RitualComponent(7, 2, 0, RitualComponent.FIRE)); - meteorRitual.add(new RitualComponent(-7, 2, 0, RitualComponent.FIRE)); - meteorRitual.add(new RitualComponent(0, 2, 7, RitualComponent.FIRE)); - meteorRitual.add(new RitualComponent(0, 2, -7, RitualComponent.FIRE)); - meteorRitual.add(new RitualComponent(6, 2, 0, RitualComponent.FIRE)); - meteorRitual.add(new RitualComponent(-6, 2, 0, RitualComponent.FIRE)); - meteorRitual.add(new RitualComponent(0, 2, 6, RitualComponent.FIRE)); - meteorRitual.add(new RitualComponent(0, 2, -6, RitualComponent.FIRE)); - meteorRitual.add(new RitualComponent(6, 3, 0, RitualComponent.WATER)); - meteorRitual.add(new RitualComponent(-6, 3, 0, RitualComponent.WATER)); - meteorRitual.add(new RitualComponent(0, 3, 6, RitualComponent.WATER)); - meteorRitual.add(new RitualComponent(0, 3, -6, RitualComponent.WATER)); - meteorRitual.add(new RitualComponent(5, 3, 0, RitualComponent.WATER)); - meteorRitual.add(new RitualComponent(-5, 3, 0, RitualComponent.WATER)); - meteorRitual.add(new RitualComponent(0, 3, 5, RitualComponent.WATER)); - meteorRitual.add(new RitualComponent(0, 3, -5, RitualComponent.WATER)); - meteorRitual.add(new RitualComponent(5, 4, 0, RitualComponent.AIR)); - meteorRitual.add(new RitualComponent(-5, 4, 0, RitualComponent.AIR)); - meteorRitual.add(new RitualComponent(0, 4, 5, RitualComponent.AIR)); - meteorRitual.add(new RitualComponent(0, 4, -5, RitualComponent.AIR)); - - for (int i = -1; i <= 1; i++) - { - meteorRitual.add(new RitualComponent(i, 4, 4, RitualComponent.AIR)); - meteorRitual.add(new RitualComponent(i, 4, -4, RitualComponent.AIR)); - meteorRitual.add(new RitualComponent(4, 4, i, RitualComponent.AIR)); - meteorRitual.add(new RitualComponent(-4, 4, i, RitualComponent.AIR)); - } - - meteorRitual.add(new RitualComponent(2, 4, 4, RitualComponent.WATER)); - meteorRitual.add(new RitualComponent(4, 4, 2, RitualComponent.WATER)); - meteorRitual.add(new RitualComponent(2, 4, -4, RitualComponent.WATER)); - meteorRitual.add(new RitualComponent(-4, 4, 2, RitualComponent.WATER)); - meteorRitual.add(new RitualComponent(-2, 4, 4, RitualComponent.WATER)); - meteorRitual.add(new RitualComponent(4, 4, -2, RitualComponent.WATER)); - meteorRitual.add(new RitualComponent(-2, 4, -4, RitualComponent.WATER)); - meteorRitual.add(new RitualComponent(-4, 4, -2, RitualComponent.WATER)); - meteorRitual.add(new RitualComponent(2, 4, 3, RitualComponent.FIRE)); - meteorRitual.add(new RitualComponent(3, 4, 2, RitualComponent.FIRE)); - meteorRitual.add(new RitualComponent(3, 4, 3, RitualComponent.FIRE)); - meteorRitual.add(new RitualComponent(-2, 4, 3, RitualComponent.FIRE)); - meteorRitual.add(new RitualComponent(3, 4, -2, RitualComponent.FIRE)); - meteorRitual.add(new RitualComponent(3, 4, -3, RitualComponent.FIRE)); - meteorRitual.add(new RitualComponent(2, 4, -3, RitualComponent.FIRE)); - meteorRitual.add(new RitualComponent(-3, 4, 2, RitualComponent.FIRE)); - meteorRitual.add(new RitualComponent(-3, 4, 3, RitualComponent.FIRE)); - meteorRitual.add(new RitualComponent(-2, 4, -3, RitualComponent.FIRE)); - meteorRitual.add(new RitualComponent(-3, 4, -2, RitualComponent.FIRE)); - meteorRitual.add(new RitualComponent(-3, 4, -3, RitualComponent.FIRE)); - - ArrayList apiaryRitual = new ArrayList(); - apiaryRitual.add(new RitualComponent(1,0,0, RitualComponent.DUSK)); - apiaryRitual.add(new RitualComponent(1,0,1, RitualComponent.DUSK)); - apiaryRitual.add(new RitualComponent(1,0,-1, RitualComponent.DUSK)); - apiaryRitual.add(new RitualComponent(-1,0,-1, RitualComponent.DUSK)); - apiaryRitual.add(new RitualComponent(-1,0,1, RitualComponent.DUSK)); - apiaryRitual.add(new RitualComponent(-1,0,0, RitualComponent.DUSK)); - apiaryRitual.add(new RitualComponent(0,0,-1, RitualComponent.DUSK)); - apiaryRitual.add(new RitualComponent(0,0,1, RitualComponent.DUSK)); - - ArrayList autoAlchemyRitual = new ArrayList(); - autoAlchemyRitual.add(new RitualComponent(1,0,1, RitualComponent.DUSK)); - autoAlchemyRitual.add(new RitualComponent(1,0,-1, RitualComponent.DUSK)); - autoAlchemyRitual.add(new RitualComponent(-1,0,-1, RitualComponent.DUSK)); - autoAlchemyRitual.add(new RitualComponent(-1,0,1, RitualComponent.DUSK)); - autoAlchemyRitual.add(new RitualComponent(2,0,2, RitualComponent.WATER)); - autoAlchemyRitual.add(new RitualComponent(2,0,-2, RitualComponent.WATER)); - autoAlchemyRitual.add(new RitualComponent(-2,0,-2, RitualComponent.WATER)); - autoAlchemyRitual.add(new RitualComponent(-2,0,2, RitualComponent.WATER)); - autoAlchemyRitual.add(new RitualComponent(-3,0,-2, RitualComponent.FIRE)); - autoAlchemyRitual.add(new RitualComponent(-2,0,-3, RitualComponent.FIRE)); - autoAlchemyRitual.add(new RitualComponent(-3,0,2, RitualComponent.FIRE)); - autoAlchemyRitual.add(new RitualComponent(-2,0,3, RitualComponent.FIRE)); - autoAlchemyRitual.add(new RitualComponent(3,0,-2, RitualComponent.FIRE)); - autoAlchemyRitual.add(new RitualComponent(2,0,-3, RitualComponent.FIRE)); - autoAlchemyRitual.add(new RitualComponent(3,0,2, RitualComponent.FIRE)); - autoAlchemyRitual.add(new RitualComponent(2,0,3, RitualComponent.FIRE)); - - - ritualList.add(new Rituals(waterRitual, 1, 500, new RitualEffectWater(), "Ritual of the Full Spring")); - ritualList.add(new Rituals(lavaRitual, 1, 10000, new RitualEffectLava(), "Serenade of the Nether")); - ritualList.add(new Rituals(growthRitual, 1, 1000, new RitualEffectGrowth(), "Ritual of the Green Grove")); - ritualList.add(new Rituals(interdictionRitual, 1, 1000, new RitualEffectInterdiction(), "Interdiction Ritual")); - ritualList.add(new Rituals(containmentRitual, 1, 2000, new RitualEffectContainment(), "Ritual of Containment")); - ritualList.add(new Rituals(boundSoulRitual, 1, 5000, new RitualEffectSoulBound(), "Ritual of Binding")); - ritualList.add(new Rituals(unbindingRitual, 1, 30000, new RitualEffectUnbinding(), "Ritual of Unbinding")); - ritualList.add(new Rituals(jumpingRitual, 1, 1000, new RitualEffectJumping(), "Ritual of the High Jump")); - ritualList.add(new Rituals(magneticRitual, 1, 5000, new RitualEffectMagnetic(), "Ritual of Magnetism")); - ritualList.add(new Rituals(crushingRitual, 1, 2500, new RitualEffectCrushing(), "Ritual of the Crusher")); - ritualList.add(new Rituals(leapingRitual, 1, 1000, new RitualEffectLeap(), "Ritual of Speed")); - ritualList.add(new Rituals(animalGrowthRitual, 1, 10000, new RitualEffectAnimalGrowth(), "Ritual of the Shepherd")); - ritualList.add(new Rituals(wellOfSufferingRitual, 1, 50000, new RitualEffectWellOfSuffering(), "Well of Suffering")); - ritualList.add(new Rituals(healingRitual, 1, 25000, new RitualEffectHealing(), "Ritual of Regeneration")); - ritualList.add(new Rituals(featheredKnifeRitual, 1, 50000, new RitualEffectFeatheredKnife(), "Ritual of the Feathered Knife")); - ritualList.add(new Rituals(featheredEarthRitual, 2, 100000, new RitualEffectFeatheredEarth(), "Ritual of the Feathered Earth")); - ritualList.add(new Rituals(biomeChangerRitual, 2, 1000000, new RitualEffectBiomeChanger(), "Ritual of Gaia's Transformation")); - ritualList.add(new Rituals(flightRitual, 2, 1000000, new RitualEffectFlight(), "Reverence of the Condor")); - ritualList.add(new Rituals(meteorRitual, 2, 1000000, new RitualEffectSummonMeteor(), "Mark of the Falling Tower")); - ritualList.add(new Rituals(autoAlchemyRitual,1,20000,new RitualEffectAutoAlchemy(),"Ballad of Alchemy")); - //ritualList.add(new Rituals(apiaryRitual,1,100,new RitualEffectApiaryOverclock(),"Apiary Overclock")); - } - - public static int getCostForActivation(int ritualID) - { - if (ritualID <= ritualList.size()) - { - return ritualList.get(ritualID - 1).actCost; - } else - { - return 0; - } - -// switch (ritualID) -// { -// case 1: -// return 500; -// -// case 2: -// return 20000; -// -// case 3: -// return 250; -// -// case 4: -// return 1000; -// -// case 5: -// return 2000; -// -// case 6: -// return 5000; -// -// case 7: -// return 50000; -// -// case 8: -// return 1000; -// default: -// return 0; -// } - } - -// public static int getCostPerRefresh(int ritualID) -// { -// switch (ritualID) -// { -// case 1: -// return 25; -// -// case 2: -// return 500; -// -// case 3: -// return 20; -// -// case 4: -// return 1; -// -// case 5: -// return 1; -// -// case 6: -// return 0; -// -// case 7: -// return 0; -// -// case 8: -// return 1; -// -// default: -// return 0; -// } -// } - - public static int getInitialCooldown(int ritualID) - { - if (ritualID <= ritualList.size()) - { - RitualEffect ef = ritualList.get(ritualID - 1).effect; - - if (ef != null) - { - OreDictionary d; - return ef.getInitialCooldown(); - } - } - - return 0; - } - - public static List getRitualList(int ritualID) - { - if (ritualID <= ritualList.size()) - { - return ritualList.get(ritualID - 1).obtainComponents(); - } else - { - return null; - } - -// switch (ritualID) -// { -// case 1: -// return waterRitual; -// -// case 2: -// return lavaRitual; -// -// case 3: -// return growthRitual; -// -// case 4: -// return interdictionRitual; -// -// case 5: -// return containmentRitual; -// -// case 6: -// return boundSoulRitual; -// -// case 7: -// return unbindingRitual; -// -// case 8: -// return jumpingRitual; -// -// default: -// return null; -// } - } - - private List obtainComponents() - { - return this.components; - } - - private int getCrystalLevel() - { - return this.crystalLevel; - } - - public static void performEffect(TEMasterStone ritualStone, int ritualID) - { - if (ritualID <= ritualList.size()) - { - RitualEffect ef = ritualList.get(ritualID - 1).effect; - - if (ef != null) - { - ef.performEffect(ritualStone); - } - } - } - - public static int getNumberOfRituals() - { - return ritualList.size(); - } - - public String getRitualName() - { - return this.name; - } - - public static String getNameOfRitual(int id) - { - if (ritualList.get(id) != null) - { - return ritualList.get(id).getRitualName(); - } else - { - return ""; - } - } -} diff --git a/BM_src/WayofTime/alchemicalWizardry/common/tileEntity/TEAltar.java b/BM_src/WayofTime/alchemicalWizardry/common/tileEntity/TEAltar.java index 9d85190f..1e78dd91 100644 --- a/BM_src/WayofTime/alchemicalWizardry/common/tileEntity/TEAltar.java +++ b/BM_src/WayofTime/alchemicalWizardry/common/tileEntity/TEAltar.java @@ -1,20 +1,11 @@ package WayofTime.alchemicalWizardry.common.tileEntity; -import WayofTime.alchemicalWizardry.AlchemicalWizardry; -import WayofTime.alchemicalWizardry.ModBlocks; -import WayofTime.alchemicalWizardry.ModItems; -import WayofTime.alchemicalWizardry.common.*; -import WayofTime.alchemicalWizardry.common.altarRecipeRegistry.AltarRecipe; -import WayofTime.alchemicalWizardry.common.altarRecipeRegistry.AltarRecipeRegistry; -import WayofTime.alchemicalWizardry.common.bloodAltarUpgrade.AltarUpgradeComponent; -import WayofTime.alchemicalWizardry.common.bloodAltarUpgrade.UpgradedAltars; -import WayofTime.alchemicalWizardry.common.items.EnergyBattery; -import cpw.mods.fml.common.network.PacketDispatcher; -import net.minecraft.block.Block; +import java.io.ByteArrayOutputStream; +import java.io.DataOutputStream; +import java.io.IOException; + import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; -import net.minecraft.item.Item; -import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; @@ -24,11 +15,24 @@ import net.minecraft.server.MinecraftServer; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; import net.minecraftforge.common.ForgeDirection; -import net.minecraftforge.fluids.*; - -import java.io.ByteArrayOutputStream; -import java.io.DataOutputStream; -import java.io.IOException; +import net.minecraftforge.fluids.Fluid; +import net.minecraftforge.fluids.FluidContainerRegistry; +import net.minecraftforge.fluids.FluidEvent; +import net.minecraftforge.fluids.FluidStack; +import net.minecraftforge.fluids.FluidTank; +import net.minecraftforge.fluids.FluidTankInfo; +import net.minecraftforge.fluids.IFluidHandler; +import net.minecraftforge.fluids.IFluidTank; +import WayofTime.alchemicalWizardry.AlchemicalWizardry; +import WayofTime.alchemicalWizardry.api.altarRecipeRegistry.AltarRecipe; +import WayofTime.alchemicalWizardry.api.altarRecipeRegistry.AltarRecipeRegistry; +import WayofTime.alchemicalWizardry.api.items.interfaces.IBloodOrb; +import WayofTime.alchemicalWizardry.api.soulNetwork.LifeEssenceNetwork; +import WayofTime.alchemicalWizardry.common.PacketHandler; +import WayofTime.alchemicalWizardry.common.bloodAltarUpgrade.AltarUpgradeComponent; +import WayofTime.alchemicalWizardry.common.bloodAltarUpgrade.UpgradedAltars; +import WayofTime.alchemicalWizardry.common.items.EnergyBattery; +import cpw.mods.fml.common.network.PacketDispatcher; public class TEAltar extends TileEntity implements IInventory, IFluidTank, IFluidHandler { @@ -575,12 +579,12 @@ public class TEAltar extends TileEntity implements IInventory, IFluidTank, IFlui { ItemStack returnedItem = getStackInSlot(0); - if (!(returnedItem.getItem() instanceof EnergyBattery)) + if (!(returnedItem.getItem() instanceof IBloodOrb)) { return; } - EnergyBattery item = (EnergyBattery) (returnedItem.getItem()); + IBloodOrb item = (IBloodOrb) (returnedItem.getItem()); NBTTagCompound itemTag = returnedItem.stackTagCompound; if (itemTag == null) diff --git a/BM_src/WayofTime/alchemicalWizardry/common/tileEntity/TEMasterStone.java b/BM_src/WayofTime/alchemicalWizardry/common/tileEntity/TEMasterStone.java index c9393d25..557672f5 100644 --- a/BM_src/WayofTime/alchemicalWizardry/common/tileEntity/TEMasterStone.java +++ b/BM_src/WayofTime/alchemicalWizardry/common/tileEntity/TEMasterStone.java @@ -1,14 +1,15 @@ package WayofTime.alchemicalWizardry.common.tileEntity; -import WayofTime.alchemicalWizardry.common.LifeEssenceNetwork; -import WayofTime.alchemicalWizardry.common.rituals.Rituals; -import cpw.mods.fml.common.network.PacketDispatcher; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.server.MinecraftServer; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; +import WayofTime.alchemicalWizardry.api.rituals.IMasterRitualStone; +import WayofTime.alchemicalWizardry.api.rituals.Rituals; +import WayofTime.alchemicalWizardry.api.soulNetwork.LifeEssenceNetwork; +import cpw.mods.fml.common.network.PacketDispatcher; -public class TEMasterStone extends TileEntity +public class TEMasterStone extends TileEntity implements IMasterRitualStone { private int currentRitual; private boolean isActive; @@ -138,7 +139,7 @@ public class TEMasterStone extends TileEntity isActive = false; currentRitual = 0; worldObj.markBlockForUpdate(xCoord, yCoord, zCoord); - //PacketDispatcher.sendPacketToAllPlayers(TEAltar.getParticlePacket(xCoord, yCoord, zCoord, (short)3)); + return; } } @@ -190,4 +191,22 @@ public class TEMasterStone extends TileEntity { return this.direction; } + + @Override + public int getXCoord() + { + return this.xCoord; + } + + @Override + public int getYCoord() + { + return this.yCoord; + } + + @Override + public int getZCoord() + { + return this.zCoord; + } } \ No newline at end of file diff --git a/BM_src/WayofTime/alchemicalWizardry/common/tileEntity/TEWritingTable.java b/BM_src/WayofTime/alchemicalWizardry/common/tileEntity/TEWritingTable.java index 9b8696c3..d2c01f01 100644 --- a/BM_src/WayofTime/alchemicalWizardry/common/tileEntity/TEWritingTable.java +++ b/BM_src/WayofTime/alchemicalWizardry/common/tileEntity/TEWritingTable.java @@ -15,11 +15,11 @@ import net.minecraft.network.packet.Packet250CustomPayload; import net.minecraft.tileentity.TileEntity; import net.minecraftforge.common.ForgeDirection; import WayofTime.alchemicalWizardry.ModItems; +import WayofTime.alchemicalWizardry.api.alchemy.AlchemicalPotionCreationHandler; import WayofTime.alchemicalWizardry.common.IBindingAgent; import WayofTime.alchemicalWizardry.common.ICatalyst; import WayofTime.alchemicalWizardry.common.IFillingAgent; import WayofTime.alchemicalWizardry.common.PacketHandler; -import WayofTime.alchemicalWizardry.common.alchemy.AlchemicalPotionCreationHandler; import WayofTime.alchemicalWizardry.common.alchemy.AlchemyRecipeRegistry; import WayofTime.alchemicalWizardry.common.items.EnergyBattery; import WayofTime.alchemicalWizardry.common.items.EnergyItems; diff --git a/BM_src/joshie/alchemicalWizardy/nei/NEIAltarRecipeHandler.java b/BM_src/joshie/alchemicalWizardy/nei/NEIAltarRecipeHandler.java index 9ca77ec5..b1f0b3bc 100644 --- a/BM_src/joshie/alchemicalWizardy/nei/NEIAltarRecipeHandler.java +++ b/BM_src/joshie/alchemicalWizardy/nei/NEIAltarRecipeHandler.java @@ -9,8 +9,8 @@ import net.minecraft.client.Minecraft; import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; import net.minecraft.util.StatCollector; -import WayofTime.alchemicalWizardry.common.altarRecipeRegistry.AltarRecipe; -import WayofTime.alchemicalWizardry.common.altarRecipeRegistry.AltarRecipeRegistry; +import WayofTime.alchemicalWizardry.api.altarRecipeRegistry.AltarRecipe; +import WayofTime.alchemicalWizardry.api.altarRecipeRegistry.AltarRecipeRegistry; import codechicken.core.gui.GuiDraw; import codechicken.nei.NEIServerUtils; import codechicken.nei.PositionedStack;