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

Bound tools

Browse source 
Fix errors

Fix

Fix

Patch

Patch
This commit is contained in:
Arcaratus 2015-12-29 14:32:35 -05:00
parent 6c6d8067bf
commit aa0f7d81a0
33 changed files with 880 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilAir.java
View file

@ -31,7 +31,7 @@ public class ItemSigilAir extends ItemSigilBase {
player.fallDistance = 0;
if (!player.capabilities.isCreativeMode)
this.setUnusable(stack, !syphonBatteries(stack, player, getEnergyUsed()));
this.setUnusable(stack, !syphonBatteries(stack, player, getLPUsed()));
}
return super.onItemRightClick(stack, world, player);

4
src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilBase.java
View file

@ -24,11 +24,11 @@ public class ItemSigilBase extends ItemBindable implements ISigil {
private final String name;
private boolean toggleable;
public ItemSigilBase(String name, int energyUsed) {
public ItemSigilBase(String name, int lpUsed) {
super();
setUnlocalizedName(Constants.Mod.MODID + ".sigil." + name);
setEnergyUsed(energyUsed);
setLPUsed(lpUsed);
this.name = name;
this.tooltipBase = "tooltip.BloodMagic.sigil." + name + ".";

5
src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilBloodLight.java
View file

@ -9,7 +9,6 @@ import net.minecraft.item.ItemStack;
import net.minecraft.util.BlockPos;
import net.minecraft.util.EnumFacing;
import net.minecraft.world.World;
import org.lwjgl.Sys;
public class ItemSigilBloodLight extends ItemSigilBase {
@ -19,7 +18,7 @@ public class ItemSigilBloodLight extends ItemSigilBase {
@Override
public ItemStack onItemRightClick(ItemStack stack, World world, EntityPlayer player) {
if (BindableHelper.checkAndSetItemOwner(stack, player) && ItemBindable.syphonBatteries(stack, player, getEnergyUsed() * 5) && !world.isRemote)
if (BindableHelper.checkAndSetItemOwner(stack, player) && ItemBindable.syphonBatteries(stack, player, getLPUsed() * 5) && !world.isRemote)
world.spawnEntityInWorld(new EntityBloodLight(world, player));
return stack;
@ -29,7 +28,7 @@ public class ItemSigilBloodLight extends ItemSigilBase {
public boolean onItemUseFirst(ItemStack stack, EntityPlayer player, World world, BlockPos blockPos, EnumFacing side, float hitX, float hitY, float hitZ) {
if (world.isRemote) return false;
if (BindableHelper.checkAndSetItemOwner(stack, player) && ItemBindable.syphonBatteries(stack, player, getEnergyUsed())) {
if (BindableHelper.checkAndSetItemOwner(stack, player) && ItemBindable.syphonBatteries(stack, player, getLPUsed())) {
BlockPos newPos = blockPos.offset(side);
if (world.isAirBlock(newPos)) {

8
src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilLava.java
View file

@ -47,14 +47,14 @@ public class ItemSigilLava extends ItemSigilBase {
return stack;
}
if (this.canPlaceLava(world, blockpos1) && syphonBatteries(stack, player, getEnergyUsed()) && this.tryPlaceLava(world, blockpos1)) {
if (this.canPlaceLava(world, blockpos1) && syphonBatteries(stack, player, getLPUsed()) && this.tryPlaceLava(world, blockpos1)) {
return stack;
}
}
}
if (!player.capabilities.isCreativeMode)
this.setUnusable(stack, !syphonBatteries(stack, player, getEnergyUsed()));
this.setUnusable(stack, !syphonBatteries(stack, player, getLPUsed()));
}
return stack;
@ -74,7 +74,7 @@ public class ItemSigilLava extends ItemSigilBase {
FluidStack fluid = new FluidStack(FluidRegistry.LAVA, 1000);
int amount = ((IFluidHandler) tile).fill(side, fluid, false);
if (amount > 0 && syphonBatteries(stack, player, getEnergyUsed())) {
if (amount > 0 && syphonBatteries(stack, player, getLPUsed())) {
((IFluidHandler) tile).fill(side, fluid, true);
}
@ -90,7 +90,7 @@ public class ItemSigilLava extends ItemSigilBase {
return false;
}
if (this.canPlaceLava(world, newPos) && syphonBatteries(stack, player, getEnergyUsed())) {
if (this.canPlaceLava(world, newPos) && syphonBatteries(stack, player, getLPUsed())) {
return this.tryPlaceLava(world, newPos);
}

6
src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilToggleable.java
View file

@ -37,7 +37,7 @@ public class ItemSigilToggleable extends ItemSigilBase {
if (!world.isRemote && !isUnusable(stack)) {
if (player.isSneaking())
setActivated(stack, !getActivated(stack));
if (getActivated(stack) && ItemBindable.syphonBatteries(stack, player, getEnergyUsed()))
if (getActivated(stack) && ItemBindable.syphonBatteries(stack, player, getLPUsed()))
return stack;
}
@ -46,7 +46,7 @@ public class ItemSigilToggleable extends ItemSigilBase {
@Override
public boolean onItemUseFirst(ItemStack stack, EntityPlayer player, World world, BlockPos blockPos, EnumFacing side, float hitX, float hitY, float hitZ) {
if (BindableHelper.checkAndSetItemOwner(stack, player) && ItemBindable.syphonBatteries(stack, player, getEnergyUsed()))
if (BindableHelper.checkAndSetItemOwner(stack, player) && ItemBindable.syphonBatteries(stack, player, getLPUsed()))
return onSigilUseFirst(stack, player, world, blockPos, side, hitX, hitY, hitZ);
return false;
@ -60,7 +60,7 @@ public class ItemSigilToggleable extends ItemSigilBase {
public void onUpdate(ItemStack stack, World worldIn, Entity entityIn, int itemSlot, boolean isSelected) {
if (!worldIn.isRemote && entityIn instanceof EntityPlayerMP && getActivated(stack)) {
if (worldIn.getWorldTime() % 100 == 0) {
if (!ItemBindable.syphonBatteries(stack, (EntityPlayer) entityIn, getEnergyUsed())) {
if (!ItemBindable.syphonBatteries(stack, (EntityPlayer) entityIn, getLPUsed())) {
setActivated(stack, false);
}
}

8
src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilVoid.java
View file

@ -42,7 +42,7 @@ public class ItemSigilVoid extends ItemSigilBase {
return stack;
}
if (world.getBlockState(blockpos).getBlock().getMaterial().isLiquid() && syphonBatteries(stack, player, getEnergyUsed())) {
if (world.getBlockState(blockpos).getBlock().getMaterial().isLiquid() && syphonBatteries(stack, player, getLPUsed())) {
world.setBlockToAir(blockpos);
return stack;
}
@ -52,7 +52,7 @@ public class ItemSigilVoid extends ItemSigilBase {
}
if (!player.capabilities.isCreativeMode)
this.setUnusable(stack, !syphonBatteries(stack, player, getEnergyUsed()));
this.setUnusable(stack, !syphonBatteries(stack, player, getLPUsed()));
}
return stack;
@ -72,7 +72,7 @@ public class ItemSigilVoid extends ItemSigilBase {
if (tile instanceof IFluidHandler) {
FluidStack amount = ((IFluidHandler) tile).drain(side, 1000, false);
if (amount != null && amount.amount > 0 && syphonBatteries(stack, player, getEnergyUsed())) {
if (amount != null && amount.amount > 0 && syphonBatteries(stack, player, getLPUsed())) {
((IFluidHandler) tile).drain(side, 1000, true);
return true;
}
@ -86,7 +86,7 @@ public class ItemSigilVoid extends ItemSigilBase {
return false;
}
if (world.getBlockState(newPos).getBlock() instanceof IFluidBlock && syphonBatteries(stack, player, getEnergyUsed())) {
if (world.getBlockState(newPos).getBlock() instanceof IFluidBlock && syphonBatteries(stack, player, getLPUsed())) {
world.setBlockToAir(newPos);
return true;
}

8
src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilWater.java
View file

@ -47,14 +47,14 @@ public class ItemSigilWater extends ItemSigilBase {
return stack;
}
if (this.canPlaceWater(world, blockpos1) && syphonBatteries(stack, player, getEnergyUsed()) && this.tryPlaceWater(world, blockpos1)) {
if (this.canPlaceWater(world, blockpos1) && syphonBatteries(stack, player, getLPUsed()) && this.tryPlaceWater(world, blockpos1)) {
return stack;
}
}
}
if (!player.capabilities.isCreativeMode)
this.setUnusable(stack, !syphonBatteries(stack, player, getEnergyUsed()));
this.setUnusable(stack, !syphonBatteries(stack, player, getLPUsed()));
}
return stack;
@ -75,7 +75,7 @@ public class ItemSigilWater extends ItemSigilBase {
FluidStack fluid = new FluidStack(FluidRegistry.WATER, 1000);
int amount = ((IFluidHandler) tile).fill(side, fluid, false);
if (amount > 0 && syphonBatteries(stack, player, getEnergyUsed())) {
if (amount > 0 && syphonBatteries(stack, player, getLPUsed())) {
((IFluidHandler) tile).fill(side, fluid, true);
}
@ -91,7 +91,7 @@ public class ItemSigilWater extends ItemSigilBase {
return false;
}
if (this.canPlaceWater(world, newPos) && syphonBatteries(stack, player, getEnergyUsed())) {
if (this.canPlaceWater(world, newPos) && syphonBatteries(stack, player, getLPUsed())) {
return this.tryPlaceWater(world, newPos);
}