Anvilcraft/resonant-induction
2
1
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Changes for the dark-lib

Browse source
This commit is contained in:
DarkGuardsman 2013-07-01 19:41:47 -04:00
parent 0d465abb7e
commit e3816bb574
2 changed files with 5 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/minecraft/assemblyline/common/armbot/command/GrabDictionary.java
View file

@ -113,7 +113,7 @@ public class GrabDictionary
} }
} }
public static void registerList() static
{ {
registerGrabableEntity("chicken", EntityChicken.class); registerGrabableEntity("chicken", EntityChicken.class);
registerGrabableEntity("cow", EntityCow.class); registerGrabableEntity("cow", EntityCow.class);

14
src/minecraft/assemblyline/common/machine/TileEntityAssembly.java
View file

@ -70,9 +70,9 @@ public abstract class TileEntityAssembly extends TileEntityRunnableMachine imple
this.updateTick = ((int) random.nextInt(10) + 20); this.updateTick = ((int) random.nextInt(10) + 20);
this.updateNetworkConnections(); this.updateNetworkConnections();
} }
if (this.wattsReceived >= this.getRequest().getWatts()) if (this.wattsReceived >= this.getRequest())
{ {
this.wattsReceived -= getRequest().getWatts(); this.wattsReceived -= getRequest();
this.powered = true; this.powered = true;
} }
else else
@ -134,15 +134,9 @@ public abstract class TileEntityAssembly extends TileEntityRunnableMachine imple
} }
@Override @Override
public ElectricityPack getRequest() public double getRequest()
{ {
int voltage = 120; return .1D;
double amps = .1D;
if (this.getTileNetwork() instanceof NetworkAssembly)
{
}
return new ElectricityPack(amps, voltage);
} }
@Override @Override