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

Merge pull request #565 from Arcaratus/1.8-Rewrite

Browse source 
More rituals
This commit is contained in:
Nick Ignoffo 2016-01-12 17:51:51 -08:00
commit d4f8844660
14 changed files with 886 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/main/java/WayofTime/bloodmagic/item/ItemBoundTool.java
View file

@ -71,6 +71,10 @@ public class ItemBoundTool extends ItemBindable
EntityPlayer player = (EntityPlayer) entityIn;
setHeldDownCount(stack, Math.min(player.getItemInUseDuration(), chargeTime));
}
// else if (!isSelected)
// {
// //TODO Make it so that if you scroll of while charging, does not show the charge bar
// }
}
protected int getHeldDownCount(ItemStack stack)
@ -200,7 +204,6 @@ public class ItemBoundTool extends ItemBindable
@SideOnly(Side.CLIENT)
public void addInformation(ItemStack stack, EntityPlayer player, List<String> tooltip, boolean advanced)
{
if (StatCollector.canTranslate(tooltipBase + "desc"))
tooltip.add(TextHelper.localizeEffect(tooltipBase + "desc"));

9
src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilSuppression.java
View file

@ -1,13 +1,13 @@
package WayofTime.bloodmagic.item.sigil;
import WayofTime.bloodmagic.tile.TileSpectralBlock;
import WayofTime.bloodmagic.util.Utils;
import net.minecraft.block.Block;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.BlockPos;
import net.minecraft.world.World;
import net.minecraftforge.fluids.IFluidBlock;
public class ItemSigilSuppression extends ItemSigilToggleable
{
@ -39,7 +39,7 @@ public class ItemSigilSuppression extends ItemSigilToggleable
BlockPos blockPos = new BlockPos(x + i, y + j, z + k);
Block block = world.getBlockState(blockPos).getBlock();
if (isBlockLiquid(block) && world.getTileEntity(blockPos) == null)
if (Utils.isBlockLiquid(block) && world.getTileEntity(blockPos) == null)
TileSpectralBlock.createSpectralBlock(world, blockPos, refresh);
else
{
@ -52,8 +52,5 @@ public class ItemSigilSuppression extends ItemSigilToggleable
}
}
private boolean isBlockLiquid(Block block)
{
return (block instanceof IFluidBlock || block.getMaterial().isLiquid());
}
}