Ellpeck/ActuallyAdditions
1
0
Fork 0
mirror of https://github.com/Ellpeck/ActuallyAdditions.git synced 2024-11-26 00:38:35 +01:00
Code Issues Projects Releases Wiki Activity

The growth ring now only uses RF when growing stuff

Browse source
This commit is contained in:
Ellpeck 2016-01-07 15:56:57 +01:00
parent 493be37ede
commit fbba25d5ad
2 changed files with 19 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemGrowthRing.java
View file

@ -47,7 +47,7 @@ public class ItemGrowthRing extends ItemEnergy{
EntityPlayer player = (EntityPlayer)entity; EntityPlayer player = (EntityPlayer)entity;
ItemStack equipped = player.getCurrentEquippedItem(); ItemStack equipped = player.getCurrentEquippedItem();
int energyUse = 550; int energyUse = 50;
if(equipped != null && equipped == stack && this.getEnergyStored(stack) >= energyUse){ if(equipped != null && equipped == stack && this.getEnergyStored(stack) >= energyUse){
ArrayList<Position> blocks = new ArrayList<Position>(); ArrayList<Position> blocks = new ArrayList<Position>();
@ -76,14 +76,23 @@ public class ItemGrowthRing extends ItemEnergy{
//Fertilizing the Blocks //Fertilizing the Blocks
if(!blocks.isEmpty()){ if(!blocks.isEmpty()){
for(int i = 0; i < 45; i++){ for(int i = 0; i < 45; i++){
Position pos = blocks.get(Util.RANDOM.nextInt(blocks.size())); if(this.getEnergyStored(stack) >= energyUse){
Position pos = blocks.get(Util.RANDOM.nextInt(blocks.size()));
int metaBefore = pos.getMetadata(world); int metaBefore = pos.getMetadata(world);
pos.getBlock(world).updateTick(world, pos.getX(), pos.getY(), pos.getZ(), Util.RANDOM); pos.getBlock(world).updateTick(world, pos.getX(), pos.getY(), pos.getZ(), Util.RANDOM);
//Show Particles if Metadata changed //Show Particles if Metadata changed
if(pos.getMetadata(world) != metaBefore){ if(pos.getMetadata(world) != metaBefore){
world.playAuxSFX(2005, pos.getX(), pos.getY(), pos.getZ(), 0); world.playAuxSFX(2005, pos.getX(), pos.getY(), pos.getZ(), 0);
}
if(!player.capabilities.isCreativeMode){
this.extractEnergy(stack, energyUse, false);
}
}
else{
break;
} }
} }
} }
@ -93,11 +102,6 @@ public class ItemGrowthRing extends ItemEnergy{
else{ else{
stack.stackTagCompound.setInteger("WaitTime", waitTime+1); stack.stackTagCompound.setInteger("WaitTime", waitTime+1);
} }
//Use Energy every tick
if(!player.capabilities.isCreativeMode){
this.extractEnergy(stack, energyUse, false);
}
} }
} }

3
src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemMagnetRing.java
View file

@ -61,6 +61,9 @@ public class ItemMagnetRing extends ItemEnergy{
} }
} }
} }
else{
break;
}
} }
} }
} }