mirror of
https://github.com/HbmMods/Hbm-s-Nuclear-Tech-GIT.git
synced 2026-01-25 10:32:49 +00:00
that didnt fix the conflict
This commit is contained in:
parent
ac93e2c4b0
commit
5b463d96d9
@ -50,6 +50,7 @@ public class TileEntityCoreReceiver extends TileEntityMachineBase implements IEn
|
||||
if (!worldObj.isRemote) {
|
||||
|
||||
tank.updateTank(xCoord, yCoord, zCoord, worldObj.provider.dimensionId);
|
||||
this.subscribeToAllAround(tank.getTankType(), this);
|
||||
|
||||
power = joules * 5000;
|
||||
|
||||
@ -171,7 +172,12 @@ public class TileEntityCoreReceiver extends TileEntityMachineBase implements IEn
|
||||
nbt.setLong("joules", joules);
|
||||
tank.writeToNBT(nbt, "tank");
|
||||
}
|
||||
|
||||
|
||||
@Override
|
||||
public FluidTank[] getReceivingTanks() {
|
||||
return new FluidTank[] { tank };
|
||||
}
|
||||
|
||||
// do some opencomputer stuff
|
||||
@Override
|
||||
public String getComponentName() {
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user