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

Final 1.2.0 push!

Browse source
This commit is contained in:
WayofTime 2014-10-13 12:25:40 -04:00
parent 3d6d7bcdd6
commit e6a10f3f06
4 changed files with 3 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -166,7 +166,7 @@ import cpw.mods.fml.common.network.NetworkRegistry;
import cpw.mods.fml.common.registry.EntityRegistry; import cpw.mods.fml.common.registry.EntityRegistry;
import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.common.registry.GameRegistry;
@Mod(modid = "AWWayofTime", name = "AlchemicalWizardry", version = "v1.2.0Candidate1") @Mod(modid = "AWWayofTime", name = "AlchemicalWizardry", version = "v1.2.0")
//@NetworkMod(clientSideRequired = true, serverSideRequired = false, channels = {"BloodAltar", "particle", "SetLifeEssence", "GetLifeEssence", "Ritual", "GetAltarEssence", "TESocket", "TEWritingTable", "CustomParticle", "SetPlayerVel", "SetPlayerPos", "TEPedestal", "TEPlinth", "TETeleposer", "InfiniteLPPath", "TEOrientor"}, packetHandler = PacketHandler.class) //@NetworkMod(clientSideRequired = true, serverSideRequired = false, channels = {"BloodAltar", "particle", "SetLifeEssence", "GetLifeEssence", "Ritual", "GetAltarEssence", "TESocket", "TEWritingTable", "CustomParticle", "SetPlayerVel", "SetPlayerPos", "TEPedestal", "TEPlinth", "TETeleposer", "InfiniteLPPath", "TEOrientor"}, packetHandler = PacketHandler.class)
public class AlchemicalWizardry public class AlchemicalWizardry

26
1.7.10/main/java/WayofTime/alchemicalWizardry/common/block/BlockAltar.java
View file

@ -306,32 +306,6 @@ public class BlockAltar extends BlockContainer
// return true; // return true;
// } // }
@Override
public int isProvidingWeakPower(IBlockAccess par1IBlockAccess, int par2, int par3, int par4, int par5)
{
TileEntity tile = par1IBlockAccess.getTileEntity(par2, par3, par4);
if (tile instanceof TEAltar)
{
// if(tile.worldObj.isRemote)
// {
// return 0;
// }
ItemStack stack = ((TEAltar) tile).getStackInSlot(0);
if (stack != null && stack.getItem() instanceof EnergyBattery)
{
EnergyBattery bloodOrb = (EnergyBattery) stack.getItem();
int maxEssence = bloodOrb.getMaxEssence();
int currentEssence = bloodOrb.getCurrentEssence(stack);
int level = currentEssence * 15 / maxEssence;
return ((int) (Math.min(15, level))) % 16;
}
}
return 0;
}
@Override @Override
public TileEntity createNewTileEntity(World var1, int var2) public TileEntity createNewTileEntity(World var1, int var2)
{ {

2
1.7.10/main/java/WayofTime/alchemicalWizardry/common/items/ItemBlockCrystalBelljar.java
View file

@ -59,7 +59,7 @@ public class ItemBlockCrystalBelljar extends ItemBlock
if(tanks == null) if(tanks == null)
{ {
list.add("Empty"); list.add("- Empty");
}else }else
{ {
list.add("Current Contents:"); list.add("Current Contents:");

2
1.7.10/main/java/WayofTime/alchemicalWizardry/common/rituals/RitualEffectFlight.java
View file

@ -22,7 +22,7 @@ public class RitualEffectFlight extends RitualEffect
{ {
public static final int aetherDrain = 10; public static final int aetherDrain = 10;
public static final int reductusDrain = 5; public static final int reductusDrain = 5;
public static final int reagentCooldown = 5; public static final int reagentCooldown = 50;
@Override @Override
public void performEffect(IMasterRitualStone ritualStone) public void performEffect(IMasterRitualStone ritualStone)