Anvilcraft/buildcraft
3
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

fix robots in API

Browse source
This commit is contained in:
asiekierka 2014-09-04 19:51:50 +02:00
parent 4dc8449d46
commit af6297c73b
4 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
api/buildcraft/api/robots/AIRobot.java
View file

@ -113,7 +113,7 @@ public class AIRobot {
if (delegateAI != null) { if (delegateAI != null) {
delegateAI.cycle(); delegateAI.cycle();
} else { } else {
robot.getBattery().useEnergy(0, getEnergyCost(), false); robot.getBattery().extractEnergy(getEnergyCost(), false);
update(); update();
} }
} catch (Throwable e) { } catch (Throwable e) {

4
api/buildcraft/api/robots/EntityRobotBase.java
View file

@ -8,6 +8,7 @@
*/ */
package buildcraft.api.robots; package buildcraft.api.robots;
import cofh.api.energy.IEnergyStorage;
import net.minecraft.entity.Entity; import net.minecraft.entity.Entity;
import net.minecraft.entity.EntityLiving; import net.minecraft.entity.EntityLiving;
import net.minecraft.inventory.IInventory; import net.minecraft.inventory.IInventory;
@ -16,7 +17,6 @@ import net.minecraft.world.World;
import net.minecraftforge.fluids.IFluidHandler; import net.minecraftforge.fluids.IFluidHandler;
import buildcraft.api.boards.RedstoneBoardRobot; import buildcraft.api.boards.RedstoneBoardRobot;
import buildcraft.api.core.IZone; import buildcraft.api.core.IZone;
import buildcraft.core.RFBattery;
public abstract class EntityRobotBase extends EntityLiving implements IInventory, IFluidHandler { public abstract class EntityRobotBase extends EntityLiving implements IInventory, IFluidHandler {
@ -42,7 +42,7 @@ public abstract class EntityRobotBase extends EntityLiving implements IInventory
public abstract int getEnergy(); public abstract int getEnergy();
public abstract RFBattery getBattery(); public abstract IEnergyStorage getBattery();
public abstract IDockingStation getDockingStation(); public abstract IDockingStation getDockingStation();

4
common/buildcraft/core/robots/AIRobotRecharge.java
View file

@ -37,11 +37,11 @@ public class AIRobotRecharge extends AIRobot {
public void update() { public void update() {
PipeTransportPower powerProvider = (PipeTransportPower) ((DockingStation) robot.getDockingStation()).getPipe().pipe.transport; PipeTransportPower powerProvider = (PipeTransportPower) ((DockingStation) robot.getDockingStation()).getPipe().pipe.transport;
int amount = robot.getBattery().addEnergy(0, 1000, true); int amount = robot.getBattery().receiveEnergy(1000, false);
powerProvider.requestEnergy(robot.getDockingStation().side(), amount); powerProvider.requestEnergy(robot.getDockingStation().side(), amount);
robot.getBattery().addEnergy(0, powerProvider.consumePower(robot.getDockingStation().side(), amount), false); robot.getBattery().receiveEnergy(powerProvider.consumePower(robot.getDockingStation().side(), amount), false);
if (robot.getEnergy() >= EntityRobotBase.MAX_ENERGY) { if (robot.getEnergy() >= EntityRobotBase.MAX_ENERGY) {
terminate(); terminate();

2
common/buildcraft/core/robots/boards/BoardRobotBuilder.java
View file

@ -143,7 +143,7 @@ public class BoardRobotBuilder extends RedstoneBoardRobot {
return; return;
} }
robot.getBattery().useEnergy(0, currentBuildingSlot.getEnergyRequirement(), false); robot.getBattery().extractEnergy(currentBuildingSlot.getEnergyRequirement(), false);
launchingDelay = currentBuildingSlot.getStacksToDisplay().size() * BuildingItem.ITEMS_SPACE; launchingDelay = currentBuildingSlot.getStacksToDisplay().size() * BuildingItem.ITEMS_SPACE;
markerToBuild.bluePrintBuilder.buildSlot markerToBuild.bluePrintBuilder.buildSlot
(robot.worldObj, markerToBuild, currentBuildingSlot, (robot.worldObj, markerToBuild, currentBuildingSlot,