From e6a10f3f0695831f30a1a9af551df6853e9b848f Mon Sep 17 00:00:00 2001 From: WayofTime Date: Mon, 13 Oct 2014 12:25:40 -0400 Subject: [PATCH] Final 1.2.0 push! --- .../AlchemicalWizardry.java | 2 +- .../common/block/BlockAltar.java | 26 ------------------- .../common/items/ItemBlockCrystalBelljar.java | 2 +- .../common/rituals/RitualEffectFlight.java | 2 +- 4 files changed, 3 insertions(+), 29 deletions(-) diff --git a/1.7.10/main/java/WayofTime/alchemicalWizardry/AlchemicalWizardry.java b/1.7.10/main/java/WayofTime/alchemicalWizardry/AlchemicalWizardry.java index 5a7c731c..0bf14f74 100644 --- a/1.7.10/main/java/WayofTime/alchemicalWizardry/AlchemicalWizardry.java +++ b/1.7.10/main/java/WayofTime/alchemicalWizardry/AlchemicalWizardry.java @@ -166,7 +166,7 @@ import cpw.mods.fml.common.network.NetworkRegistry; import cpw.mods.fml.common.registry.EntityRegistry; 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) public class AlchemicalWizardry diff --git a/1.7.10/main/java/WayofTime/alchemicalWizardry/common/block/BlockAltar.java b/1.7.10/main/java/WayofTime/alchemicalWizardry/common/block/BlockAltar.java index 5a2c488e..8b1b2f8c 100644 --- a/1.7.10/main/java/WayofTime/alchemicalWizardry/common/block/BlockAltar.java +++ b/1.7.10/main/java/WayofTime/alchemicalWizardry/common/block/BlockAltar.java @@ -306,32 +306,6 @@ public class BlockAltar extends BlockContainer // 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 public TileEntity createNewTileEntity(World var1, int var2) { diff --git a/1.7.10/main/java/WayofTime/alchemicalWizardry/common/items/ItemBlockCrystalBelljar.java b/1.7.10/main/java/WayofTime/alchemicalWizardry/common/items/ItemBlockCrystalBelljar.java index 0f1ac64f..7788b60b 100644 --- a/1.7.10/main/java/WayofTime/alchemicalWizardry/common/items/ItemBlockCrystalBelljar.java +++ b/1.7.10/main/java/WayofTime/alchemicalWizardry/common/items/ItemBlockCrystalBelljar.java @@ -59,7 +59,7 @@ public class ItemBlockCrystalBelljar extends ItemBlock if(tanks == null) { - list.add("Empty"); + list.add("- Empty"); }else { list.add("Current Contents:"); diff --git a/1.7.10/main/java/WayofTime/alchemicalWizardry/common/rituals/RitualEffectFlight.java b/1.7.10/main/java/WayofTime/alchemicalWizardry/common/rituals/RitualEffectFlight.java index 302441b3..ae4031d8 100644 --- a/1.7.10/main/java/WayofTime/alchemicalWizardry/common/rituals/RitualEffectFlight.java +++ b/1.7.10/main/java/WayofTime/alchemicalWizardry/common/rituals/RitualEffectFlight.java @@ -22,7 +22,7 @@ public class RitualEffectFlight extends RitualEffect { public static final int aetherDrain = 10; public static final int reductusDrain = 5; - public static final int reagentCooldown = 5; + public static final int reagentCooldown = 50; @Override public void performEffect(IMasterRitualStone ritualStone)