From 12765e865b1e7b149f9aba02ed0324cb956b1ad3 Mon Sep 17 00:00:00 2001 From: WayofTime Date: Fri, 17 Jul 2015 12:07:38 -0400 Subject: [PATCH] Fixed API calls. --- build.properties | 4 ++-- .../alchemicalWizardry/AlchemicalWizardry.java | 2 ++ .../api/guide/PageRitualMultiBlock.java | 17 ++++++++--------- .../api/sacrifice/PlayerSacrificeHandler.java | 7 ++++--- 4 files changed, 16 insertions(+), 14 deletions(-) diff --git a/build.properties b/build.properties index 2ca145b9..cfa38cf0 100644 --- a/build.properties +++ b/build.properties @@ -1,5 +1,5 @@ # -#Thu Jul 16 09:50:10 EDT 2015 +#Thu Jul 16 18:31:47 EDT 2015 mod_name=BloodMagic forge_version=10.13.4.1448-1.7.10 ccc_version=1.0.4.29 @@ -9,5 +9,5 @@ guideapi_version=1.0.1-20 package_group=com.wayoftime.bloodmagic mod_version=1.3.3 minetweaker_version=Dev-1.7.10-3.0.9B -build_number=6 mc_version=1.7.10 +build_number=7 diff --git a/src/main/java/WayofTime/alchemicalWizardry/AlchemicalWizardry.java b/src/main/java/WayofTime/alchemicalWizardry/AlchemicalWizardry.java index 7c83aaf6..35970dab 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/AlchemicalWizardry.java +++ b/src/main/java/WayofTime/alchemicalWizardry/AlchemicalWizardry.java @@ -52,6 +52,7 @@ import WayofTime.alchemicalWizardry.api.harvest.HarvestRegistry; import WayofTime.alchemicalWizardry.api.items.ShapedBloodOrbRecipe; import WayofTime.alchemicalWizardry.api.items.ShapelessBloodOrbRecipe; import WayofTime.alchemicalWizardry.api.rituals.Rituals; +import WayofTime.alchemicalWizardry.api.sacrifice.PlayerSacrificeHandler; import WayofTime.alchemicalWizardry.api.soulNetwork.ComplexNetworkHandler; import WayofTime.alchemicalWizardry.api.spell.SpellEffectRegistry; import WayofTime.alchemicalWizardry.api.spell.SpellParadigmMelee; @@ -768,6 +769,7 @@ public class AlchemicalWizardry customPotionFireFuse = (new PotionFireFuse(customPotionFireFuseID, true, 0).setIconIndex(0, 0).setPotionName("Fire Fuse")); customPotionPlanarBinding = (new PotionPlanarBinding(customPotionPlanarBindingID, true, 0).setIconIndex(0, 0).setPotionName("Planar Binding")); customPotionSoulFray = (new PotionSoulFray(customPotionSoulFrayID, true, 0).setIconIndex(0, 0).setPotionName("Soul Fray")); + PlayerSacrificeHandler.soulFrayId = customPotionSoulFray; customPotionSoulHarden = (new PotionSoulHarden(customPotionSoulHardenID, false, 0).setIconIndex(0, 0).setPotionName("Soul Harden")); customPotionDeaf = (new PotionDeaf(customPotionDeafID, true, 0).setIconIndex(0, 0).setPotionName("Deafness")); customPotionFeatherFall = (new PotionFeatherFall(customPotionFeatherFallID, false, 0).setIconIndex(0, 0).setPotionName("Feather Fall")); diff --git a/src/main/java/WayofTime/alchemicalWizardry/api/guide/PageRitualMultiBlock.java b/src/main/java/WayofTime/alchemicalWizardry/api/guide/PageRitualMultiBlock.java index bc0269c0..2de3bf4c 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/api/guide/PageRitualMultiBlock.java +++ b/src/main/java/WayofTime/alchemicalWizardry/api/guide/PageRitualMultiBlock.java @@ -3,7 +3,6 @@ package WayofTime.alchemicalWizardry.api.guide; import java.util.List; import net.minecraft.item.ItemStack; -import WayofTime.alchemicalWizardry.ModBlocks; import WayofTime.alchemicalWizardry.api.rituals.RitualComponent; import WayofTime.alchemicalWizardry.api.rituals.Rituals; @@ -18,13 +17,13 @@ public class PageRitualMultiBlock extends PageMultiBlock private static ItemStack dawnStone; static { - blankStone = new ItemStack(ModBlocks.ritualStone, 1, RitualComponent.BLANK); - waterStone = new ItemStack(ModBlocks.ritualStone, 1, RitualComponent.WATER); - fireStone = new ItemStack(ModBlocks.ritualStone, 1, RitualComponent.FIRE); - earthStone = new ItemStack(ModBlocks.ritualStone, 1, RitualComponent.EARTH); - airStone = new ItemStack(ModBlocks.ritualStone, 1, RitualComponent.AIR); - duskStone = new ItemStack(ModBlocks.ritualStone, 1, RitualComponent.DUSK); - dawnStone = new ItemStack(ModBlocks.ritualStone, 1, RitualComponent.DAWN); +// blankStone = new ItemStack(ModBlocks.ritualStone, 1, RitualComponent.BLANK); +// waterStone = new ItemStack(ModBlocks.ritualStone, 1, RitualComponent.WATER); +// fireStone = new ItemStack(ModBlocks.ritualStone, 1, RitualComponent.FIRE); +// earthStone = new ItemStack(ModBlocks.ritualStone, 1, RitualComponent.EARTH); +// airStone = new ItemStack(ModBlocks.ritualStone, 1, RitualComponent.AIR); +// duskStone = new ItemStack(ModBlocks.ritualStone, 1, RitualComponent.DUSK); +// dawnStone = new ItemStack(ModBlocks.ritualStone, 1, RitualComponent.DAWN); } private PageRitualMultiBlock(ItemStack[][][] structure) @@ -67,7 +66,7 @@ public class PageRitualMultiBlock extends PageMultiBlock tempStructure[comp.getY() - minY][comp.getX() - minX][comp.getZ() - minZ] = getStackForRitualStone(comp.getStoneType()); } - tempStructure[-minY][-minX][-minZ] = new ItemStack(ModBlocks.blockMasterStone); +// tempStructure[-minY][-minX][-minZ] = new ItemStack(ModBlocks.blockMasterStone); return new PageRitualMultiBlock(tempStructure); } diff --git a/src/main/java/WayofTime/alchemicalWizardry/api/sacrifice/PlayerSacrificeHandler.java b/src/main/java/WayofTime/alchemicalWizardry/api/sacrifice/PlayerSacrificeHandler.java index 4a02c2d5..1e3db2b2 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/api/sacrifice/PlayerSacrificeHandler.java +++ b/src/main/java/WayofTime/alchemicalWizardry/api/sacrifice/PlayerSacrificeHandler.java @@ -1,10 +1,10 @@ package WayofTime.alchemicalWizardry.api.sacrifice; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.potion.Potion; import net.minecraft.potion.PotionEffect; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; -import WayofTime.alchemicalWizardry.AlchemicalWizardry; import WayofTime.alchemicalWizardry.api.spell.APISpellHelper; import WayofTime.alchemicalWizardry.api.tile.IBloodAltar; @@ -12,6 +12,7 @@ public class PlayerSacrificeHandler { public static float scalingOfSacrifice = 0.001f; public static int soulFrayDuration = 400; + public static Potion soulFrayId; public static float getPlayerIncense(EntityPlayer player) { return APISpellHelper.getCurrentIncense(player); @@ -40,7 +41,7 @@ public class PlayerSacrificeHandler public static boolean sacrificePlayerHealth(EntityPlayer player) { - if(player.isPotionActive(AlchemicalWizardry.customPotionSoulFray)) + if(player.isPotionActive(soulFrayId)) { return false; } @@ -60,7 +61,7 @@ public class PlayerSacrificeHandler { player.setHealth(maxHealth/10.0f); setPlayerIncense(player, 0); - player.addPotionEffect(new PotionEffect(AlchemicalWizardry.customPotionSoulFray.id, soulFrayDuration)); + player.addPotionEffect(new PotionEffect(soulFrayId.id, soulFrayDuration)); return true; }