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

Fixed API calls.

Browse source
This commit is contained in:
WayofTime 2015-07-17 12:07:38 -04:00
parent 9b7b419ec8
commit 12765e865b
4 changed files with 16 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

4
build.properties
View file

@ -1,5 +1,5 @@
# #
#Thu Jul 16 09:50:10 EDT 2015 #Thu Jul 16 18:31:47 EDT 2015
mod_name=BloodMagic mod_name=BloodMagic
forge_version=10.13.4.1448-1.7.10 forge_version=10.13.4.1448-1.7.10
ccc_version=1.0.4.29 ccc_version=1.0.4.29
@ -9,5 +9,5 @@ guideapi_version=1.0.1-20
package_group=com.wayoftime.bloodmagic package_group=com.wayoftime.bloodmagic
mod_version=1.3.3 mod_version=1.3.3
minetweaker_version=Dev-1.7.10-3.0.9B minetweaker_version=Dev-1.7.10-3.0.9B
build_number=6
mc_version=1.7.10 mc_version=1.7.10
build_number=7

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

@ -52,6 +52,7 @@ import WayofTime.alchemicalWizardry.api.harvest.HarvestRegistry;
import WayofTime.alchemicalWizardry.api.items.ShapedBloodOrbRecipe; import WayofTime.alchemicalWizardry.api.items.ShapedBloodOrbRecipe;
import WayofTime.alchemicalWizardry.api.items.ShapelessBloodOrbRecipe; import WayofTime.alchemicalWizardry.api.items.ShapelessBloodOrbRecipe;
import WayofTime.alchemicalWizardry.api.rituals.Rituals; import WayofTime.alchemicalWizardry.api.rituals.Rituals;
import WayofTime.alchemicalWizardry.api.sacrifice.PlayerSacrificeHandler;
import WayofTime.alchemicalWizardry.api.soulNetwork.ComplexNetworkHandler; import WayofTime.alchemicalWizardry.api.soulNetwork.ComplexNetworkHandler;
import WayofTime.alchemicalWizardry.api.spell.SpellEffectRegistry; import WayofTime.alchemicalWizardry.api.spell.SpellEffectRegistry;
import WayofTime.alchemicalWizardry.api.spell.SpellParadigmMelee; 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")); customPotionFireFuse = (new PotionFireFuse(customPotionFireFuseID, true, 0).setIconIndex(0, 0).setPotionName("Fire Fuse"));
customPotionPlanarBinding = (new PotionPlanarBinding(customPotionPlanarBindingID, true, 0).setIconIndex(0, 0).setPotionName("Planar Binding")); customPotionPlanarBinding = (new PotionPlanarBinding(customPotionPlanarBindingID, true, 0).setIconIndex(0, 0).setPotionName("Planar Binding"));
customPotionSoulFray = (new PotionSoulFray(customPotionSoulFrayID, true, 0).setIconIndex(0, 0).setPotionName("Soul Fray")); 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")); customPotionSoulHarden = (new PotionSoulHarden(customPotionSoulHardenID, false, 0).setIconIndex(0, 0).setPotionName("Soul Harden"));
customPotionDeaf = (new PotionDeaf(customPotionDeafID, true, 0).setIconIndex(0, 0).setPotionName("Deafness")); customPotionDeaf = (new PotionDeaf(customPotionDeafID, true, 0).setIconIndex(0, 0).setPotionName("Deafness"));
customPotionFeatherFall = (new PotionFeatherFall(customPotionFeatherFallID, false, 0).setIconIndex(0, 0).setPotionName("Feather Fall")); customPotionFeatherFall = (new PotionFeatherFall(customPotionFeatherFallID, false, 0).setIconIndex(0, 0).setPotionName("Feather Fall"));

17
src/main/java/WayofTime/alchemicalWizardry/api/guide/PageRitualMultiBlock.java
View file

@ -3,7 +3,6 @@ package WayofTime.alchemicalWizardry.api.guide;
import java.util.List; import java.util.List;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
import WayofTime.alchemicalWizardry.ModBlocks;
import WayofTime.alchemicalWizardry.api.rituals.RitualComponent; import WayofTime.alchemicalWizardry.api.rituals.RitualComponent;
import WayofTime.alchemicalWizardry.api.rituals.Rituals; import WayofTime.alchemicalWizardry.api.rituals.Rituals;
@ -18,13 +17,13 @@ public class PageRitualMultiBlock extends PageMultiBlock
private static ItemStack dawnStone; private static ItemStack dawnStone;
static static
{ {
blankStone = new ItemStack(ModBlocks.ritualStone, 1, RitualComponent.BLANK); // blankStone = new ItemStack(ModBlocks.ritualStone, 1, RitualComponent.BLANK);
waterStone = new ItemStack(ModBlocks.ritualStone, 1, RitualComponent.WATER); // waterStone = new ItemStack(ModBlocks.ritualStone, 1, RitualComponent.WATER);
fireStone = new ItemStack(ModBlocks.ritualStone, 1, RitualComponent.FIRE); // fireStone = new ItemStack(ModBlocks.ritualStone, 1, RitualComponent.FIRE);
earthStone = new ItemStack(ModBlocks.ritualStone, 1, RitualComponent.EARTH); // earthStone = new ItemStack(ModBlocks.ritualStone, 1, RitualComponent.EARTH);
airStone = new ItemStack(ModBlocks.ritualStone, 1, RitualComponent.AIR); // airStone = new ItemStack(ModBlocks.ritualStone, 1, RitualComponent.AIR);
duskStone = new ItemStack(ModBlocks.ritualStone, 1, RitualComponent.DUSK); // duskStone = new ItemStack(ModBlocks.ritualStone, 1, RitualComponent.DUSK);
dawnStone = new ItemStack(ModBlocks.ritualStone, 1, RitualComponent.DAWN); // dawnStone = new ItemStack(ModBlocks.ritualStone, 1, RitualComponent.DAWN);
} }
private PageRitualMultiBlock(ItemStack[][][] structure) 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[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); return new PageRitualMultiBlock(tempStructure);
} }

7
src/main/java/WayofTime/alchemicalWizardry/api/sacrifice/PlayerSacrificeHandler.java
View file

@ -1,10 +1,10 @@
package WayofTime.alchemicalWizardry.api.sacrifice; package WayofTime.alchemicalWizardry.api.sacrifice;
import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.potion.Potion;
import net.minecraft.potion.PotionEffect; import net.minecraft.potion.PotionEffect;
import net.minecraft.tileentity.TileEntity; import net.minecraft.tileentity.TileEntity;
import net.minecraft.world.World; import net.minecraft.world.World;
import WayofTime.alchemicalWizardry.AlchemicalWizardry;
import WayofTime.alchemicalWizardry.api.spell.APISpellHelper; import WayofTime.alchemicalWizardry.api.spell.APISpellHelper;
import WayofTime.alchemicalWizardry.api.tile.IBloodAltar; import WayofTime.alchemicalWizardry.api.tile.IBloodAltar;
@ -12,6 +12,7 @@ public class PlayerSacrificeHandler
{ {
public static float scalingOfSacrifice = 0.001f; public static float scalingOfSacrifice = 0.001f;
public static int soulFrayDuration = 400; public static int soulFrayDuration = 400;
public static Potion soulFrayId;
public static float getPlayerIncense(EntityPlayer player) public static float getPlayerIncense(EntityPlayer player)
{ {
return APISpellHelper.getCurrentIncense(player); return APISpellHelper.getCurrentIncense(player);
@ -40,7 +41,7 @@ public class PlayerSacrificeHandler
public static boolean sacrificePlayerHealth(EntityPlayer player) public static boolean sacrificePlayerHealth(EntityPlayer player)
{ {
if(player.isPotionActive(AlchemicalWizardry.customPotionSoulFray)) if(player.isPotionActive(soulFrayId))
{ {
return false; return false;
} }
@ -60,7 +61,7 @@ public class PlayerSacrificeHandler
{ {
player.setHealth(maxHealth/10.0f); player.setHealth(maxHealth/10.0f);
setPlayerIncense(player, 0); setPlayerIncense(player, 0);
player.addPotionEffect(new PotionEffect(AlchemicalWizardry.customPotionSoulFray.id, soulFrayDuration)); player.addPotionEffect(new PotionEffect(soulFrayId.id, soulFrayDuration));
return true; return true;
} }