Updated IC2 API

This commit is contained in:
aidancbrady committed 2017-06-11 10:59:25 -07:00
1 parent 2c1532b293
commit e947ea0a8f
5 files changed
+22 -24

No files matched your search

@@ -21,9 +21,9 @@ public abstract class BasicSinkSource extends BasicEnergyTile implements IEnergy
this.sinkTier = sinkTier;
this.sourceTier = sourceTier;
this.sourcePower = EnergyNet.instance.getPowerFromTier(sourceTier);
double power = EnergyNet.instance.getPowerFromTier(sourceTier);
if (getCapacity() < sourcePower) setCapacity(sourcePower);
if (getCapacity() < power) setCapacity(power);
}
public BasicSinkSource(ILocatable parent, double capacity, int sinkTier, int sourceTier) {
@@ -31,9 +31,9 @@ public abstract class BasicSinkSource extends BasicEnergyTile implements IEnergy
this.sinkTier = sinkTier;
this.sourceTier = sourceTier;
this.sourcePower = EnergyNet.instance.getPowerFromTier(sourceTier);
double power = EnergyNet.instance.getPowerFromTier(sourceTier);
if (getCapacity() < sourcePower) setCapacity(sourcePower);
if (getCapacity() < power) setCapacity(power);
}
public BasicSinkSource(World world, BlockPos pos, double capacity, int sinkTier, int sourceTier) {
@@ -41,9 +41,9 @@ public abstract class BasicSinkSource extends BasicEnergyTile implements IEnergy
this.sinkTier = sinkTier;
this.sourceTier = sourceTier;
this.sourcePower = EnergyNet.instance.getPowerFromTier(sourceTier);
double power = EnergyNet.instance.getPowerFromTier(sourceTier);
if (getCapacity() < sourcePower) setCapacity(sourcePower);
if (getCapacity() < power) setCapacity(power);
}
/**
@@ -66,7 +66,6 @@ public abstract class BasicSinkSource extends BasicEnergyTile implements IEnergy
if (getCapacity() < power) setCapacity(power);
this.sourceTier = tier;
this.sourcePower = power;
}
// energy net interface >>
@@ -90,7 +89,7 @@ public abstract class BasicSinkSource extends BasicEnergyTile implements IEnergy
@Override
public double getOfferedEnergy() {
return Math.min(energyStored, sourcePower);
return energyStored;
}
@Override
@@ -112,5 +111,4 @@ public abstract class BasicSinkSource extends BasicEnergyTile implements IEnergy
protected int sinkTier;
protected int sourceTier;
protected double sourcePower;
}
Binary file not shown.
@@ -96,7 +96,7 @@ public class BasicSource extends BasicEnergyTile implements IEnergySource {
super(parent, capacity);
this.tier = tier;
this.power = EnergyNet.instance.getPowerFromTier(tier);
double power = EnergyNet.instance.getPowerFromTier(tier);
if (getCapacity() < power) setCapacity(power);
}
@@ -105,7 +105,7 @@ public class BasicSource extends BasicEnergyTile implements IEnergySource {
super(parent, capacity);
this.tier = tier;
this.power = EnergyNet.instance.getPowerFromTier(tier);
double power = EnergyNet.instance.getPowerFromTier(tier);
if (getCapacity() < power) setCapacity(power);
}
@@ -114,7 +114,7 @@ public class BasicSource extends BasicEnergyTile implements IEnergySource {
super(world, pos, capacity);
this.tier = tier;
this.power = EnergyNet.instance.getPowerFromTier(tier);
double power = EnergyNet.instance.getPowerFromTier(tier);
if (getCapacity() < power) setCapacity(power);
}
@@ -130,7 +130,6 @@ public class BasicSource extends BasicEnergyTile implements IEnergySource {
if (getCapacity() < power) setCapacity(power);
this.tier = tier;
this.power = power;
}
// energy net interface >>
@@ -142,7 +141,7 @@ public class BasicSource extends BasicEnergyTile implements IEnergySource {
@Override
public double getOfferedEnergy() {
return Math.min(energyStored, power);
return energyStored;
}
@Override
@@ -163,5 +162,4 @@ public class BasicSource extends BasicEnergyTile implements IEnergySource {
}
protected int tier;
protected double power;
}
@@ -2,25 +2,27 @@ package ic2.api.energy.tile;
/**
* Allows a tile entity (mostly a generator) to emit energy.
*
*
* See ic2/api/energy/usage.txt for an overall description of the energy net api.
*/
public interface IEnergySource extends IEnergyEmitter {
/**
* Energy output provided by the source this tick.
* This is typically Math.min(stored energy, max output/tick).
*
* Maximum energy output provided by the source this tick, typically the stored energy.
*
* <p>The value will be limited to the source tier's power multiplied with the packet count
* (see {@link IMultiEnergySource}, default 1).
*
* @note Modifying the energy net from this method is disallowed.
*
*
* @return Energy offered this tick
*/
double getOfferedEnergy();
/**
* Draw energy from this source's buffer.
*
* If the source doesn't have a buffer, this is a no-op.
*
*
* <p>If the source doesn't have a buffer, this may be a no-op.
*
* @param amount amount of EU to draw, may be negative
*/
void drawEnergy(double amount);
@@ -28,7 +30,7 @@ public interface IEnergySource extends IEnergyEmitter {
/**
* Determine the tier of this energy source.
* 1 = LV, 2 = MV, 3 = HV, 4 = EV etc.
*
*
* @note Modifying the energy net from this method is disallowed.
*
* @return tier of this energy source