mirror of
https://github.com/Thorfusion/Mekanism-Community-Edition.git
synced 2026-11-22 04:52:25 +00:00
Fixed IC2 integration
This commit is contained in:
1 parent
d4b6728d19
commit
5bd67b37b2
23 files changed
+137
-100
No files matched your search
@@ -220,7 +220,7 @@ abstract class BasicEnergyTile implements ILocatable, IEnergyTile {
|
||||
* @return true if energy was transferred
|
||||
*/
|
||||
public boolean charge(ItemStack stack) {
|
||||
if (stack == null || stack.isEmpty() || !Info.isIc2Available() || getWorldObj().isRemote) return false;
|
||||
if (stack == null || !Info.isIc2Available() || getWorldObj().isRemote) return false;
|
||||
|
||||
double amount = ElectricItem.manager.charge(stack, energyStored, Math.max(getSinkTier(), getSourceTier()), false, false);
|
||||
|
||||
@@ -237,7 +237,7 @@ abstract class BasicEnergyTile implements ILocatable, IEnergyTile {
|
||||
* @return true if energy was transferred
|
||||
*/
|
||||
public boolean discharge(ItemStack stack, double limit) {
|
||||
if (stack == null || stack.isEmpty() || !Info.isIc2Available() || getWorldObj().isRemote) return false;
|
||||
if (stack == null || !Info.isIc2Available() || getWorldObj().isRemote) return false;
|
||||
|
||||
double amount = capacity - energyStored;
|
||||
if (amount <= 0) return false;
|
||||
|
||||
Binary file not shown.
@@ -96,18 +96,24 @@ public class BasicSink extends BasicEnergyTile implements IEnergySink {
|
||||
public BasicSink(TileEntity parent, double capacity, int tier) {
|
||||
super(parent, capacity);
|
||||
|
||||
if (tier < 0) throw new IllegalArgumentException("invalid tier: "+tier);
|
||||
|
||||
this.tier = tier;
|
||||
}
|
||||
|
||||
public BasicSink(ILocatable parent, double capacity, int tier) {
|
||||
super(parent, capacity);
|
||||
|
||||
if (tier < 0) throw new IllegalArgumentException("invalid tier: "+tier);
|
||||
|
||||
this.tier = tier;
|
||||
}
|
||||
|
||||
public BasicSink(World world, BlockPos pos, double capacity, int tier) {
|
||||
super(world, pos, capacity);
|
||||
|
||||
if (tier < 0) throw new IllegalArgumentException("invalid tier: "+tier);
|
||||
|
||||
this.tier = tier;
|
||||
}
|
||||
|
||||
@@ -117,6 +123,8 @@ public class BasicSink extends BasicEnergyTile implements IEnergySink {
|
||||
* @param tier IC2 Tier.
|
||||
*/
|
||||
public void setSinkTier(int tier) {
|
||||
if (tier < 0) throw new IllegalArgumentException("invalid tier: "+tier);
|
||||
|
||||
this.tier = tier;
|
||||
}
|
||||
|
||||
|
||||
Binary file not shown.
@@ -19,6 +19,9 @@ public abstract class BasicSinkSource extends BasicEnergyTile implements IEnergy
|
||||
public BasicSinkSource(TileEntity parent, double capacity, int sinkTier, int sourceTier) {
|
||||
super(parent, capacity);
|
||||
|
||||
if (sinkTier < 0) throw new IllegalArgumentException("invalid sink tier: "+sinkTier);
|
||||
if (sourceTier < 0) throw new IllegalArgumentException("invalid source tier: "+sourceTier);
|
||||
|
||||
this.sinkTier = sinkTier;
|
||||
this.sourceTier = sourceTier;
|
||||
double power = EnergyNet.instance.getPowerFromTier(sourceTier);
|
||||
@@ -29,6 +32,9 @@ public abstract class BasicSinkSource extends BasicEnergyTile implements IEnergy
|
||||
public BasicSinkSource(ILocatable parent, double capacity, int sinkTier, int sourceTier) {
|
||||
super(parent, capacity);
|
||||
|
||||
if (sinkTier < 0) throw new IllegalArgumentException("invalid sink tier: "+sinkTier);
|
||||
if (sourceTier < 0) throw new IllegalArgumentException("invalid source tier: "+sourceTier);
|
||||
|
||||
this.sinkTier = sinkTier;
|
||||
this.sourceTier = sourceTier;
|
||||
double power = EnergyNet.instance.getPowerFromTier(sourceTier);
|
||||
@@ -39,6 +45,9 @@ public abstract class BasicSinkSource extends BasicEnergyTile implements IEnergy
|
||||
public BasicSinkSource(World world, BlockPos pos, double capacity, int sinkTier, int sourceTier) {
|
||||
super(world, pos, capacity);
|
||||
|
||||
if (sinkTier < 0) throw new IllegalArgumentException("invalid sink tier: "+sinkTier);
|
||||
if (sourceTier < 0) throw new IllegalArgumentException("invalid source tier: "+sourceTier);
|
||||
|
||||
this.sinkTier = sinkTier;
|
||||
this.sourceTier = sourceTier;
|
||||
double power = EnergyNet.instance.getPowerFromTier(sourceTier);
|
||||
@@ -52,6 +61,8 @@ public abstract class BasicSinkSource extends BasicEnergyTile implements IEnergy
|
||||
* @param tier IC2 Tier.
|
||||
*/
|
||||
public void setSinkTier(int tier) {
|
||||
if (tier < 0) throw new IllegalArgumentException("invalid tier: "+tier);
|
||||
|
||||
this.sinkTier = tier;
|
||||
}
|
||||
|
||||
@@ -61,6 +72,8 @@ public abstract class BasicSinkSource extends BasicEnergyTile implements IEnergy
|
||||
* @param tier IC2 Tier.
|
||||
*/
|
||||
public void setSourceTier(int tier) {
|
||||
if (tier < 0) throw new IllegalArgumentException("invalid tier: "+tier);
|
||||
|
||||
double power = EnergyNet.instance.getPowerFromTier(tier);
|
||||
|
||||
if (getCapacity() < power) setCapacity(power);
|
||||
|
||||
Binary file not shown.
@@ -95,6 +95,8 @@ public class BasicSource extends BasicEnergyTile implements IEnergySource {
|
||||
public BasicSource(TileEntity parent, double capacity, int tier) {
|
||||
super(parent, capacity);
|
||||
|
||||
if (tier < 0) throw new IllegalArgumentException("invalid tier: "+tier);
|
||||
|
||||
this.tier = tier;
|
||||
double power = EnergyNet.instance.getPowerFromTier(tier);
|
||||
|
||||
@@ -104,6 +106,8 @@ public class BasicSource extends BasicEnergyTile implements IEnergySource {
|
||||
public BasicSource(ILocatable parent, double capacity, int tier) {
|
||||
super(parent, capacity);
|
||||
|
||||
if (tier < 0) throw new IllegalArgumentException("invalid tier: "+tier);
|
||||
|
||||
this.tier = tier;
|
||||
double power = EnergyNet.instance.getPowerFromTier(tier);
|
||||
|
||||
@@ -113,6 +117,8 @@ public class BasicSource extends BasicEnergyTile implements IEnergySource {
|
||||
public BasicSource(World world, BlockPos pos, double capacity, int tier) {
|
||||
super(world, pos, capacity);
|
||||
|
||||
if (tier < 0) throw new IllegalArgumentException("invalid tier: "+tier);
|
||||
|
||||
this.tier = tier;
|
||||
double power = EnergyNet.instance.getPowerFromTier(tier);
|
||||
|
||||
@@ -125,6 +131,8 @@ public class BasicSource extends BasicEnergyTile implements IEnergySource {
|
||||
* @param tier1 IC2 Tier.
|
||||
*/
|
||||
public void setSourceTier(int tier) {
|
||||
if (tier < 0) throw new IllegalArgumentException("invalid tier: "+tier);
|
||||
|
||||
double power = EnergyNet.instance.getPowerFromTier(tier);
|
||||
|
||||
if (getCapacity() < power) setCapacity(power);
|
||||
|
||||
Reference in new issue
Block a user