maciek/TechReborn
maciek/TechReborn
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixes #38 on new ic2's

Browse source
This commit is contained in:
modmuss50 2015-06-19 18:07:15 +01:00
parent 3688c7d838
commit 45783b55f1
2 changed files with 1 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
build.gradle
View file

@ -90,7 +90,7 @@ dependencies {
if (!f.exists()) {
f.mkdir()
}
compile 'net.industrial-craft:industrialcraft-2:2.2.712-experimental:dev'
compile 'net.industrial-craft:industrialcraft-2:2.2.736-experimental:dev'
compile "codechicken:CodeChickenLib:1.7.10-1.1.3.136:dev"
compile "codechicken:CodeChickenCore:1.7.10-1.0.6.+:dev"
compile "codechicken:NotEnoughItems:1.7.10-1.0.4.+:dev"

17
src/main/java/techreborn/blocks/storage/EUStorageTile.java
View file

@ -35,15 +35,11 @@ public abstract class EUStorageTile extends TileEntityInventory implements IEner
private boolean isEmittingRedstone = false;
private int redstoneUpdateInhibit = 5;
public boolean addedToEnergyNet = false;
public final InvSlotCharge chargeSlot;
public final InvSlotDischarge dischargeSlot;
public EUStorageTile(int tier1, int output1, int maxStorage1) {
this.tier = tier1;
this.output = output1;
this.maxStorage = maxStorage1;
this.chargeSlot = new InvSlotCharge(this, 0, tier1);
this.dischargeSlot = new InvSlotDischarge(this, 1, tier1, InvSlot.InvSide.BOTTOM);
}
public float getChargeLevel() {
@ -93,19 +89,6 @@ public abstract class EUStorageTile extends TileEntityInventory implements IEner
public void updateEntity() {
super.updateEntity();
boolean needsInvUpdate = false;
double shouldEmitRedstone;
if(this.energy >= 1.0D) {
shouldEmitRedstone = this.chargeSlot.charge(this.energy);
this.energy -= shouldEmitRedstone;
needsInvUpdate = shouldEmitRedstone > 0.0D;
}
if(this.getDemandedEnergy() > 0.0D && !this.dischargeSlot.isEmpty()) {
shouldEmitRedstone = this.dischargeSlot.discharge((double)this.maxStorage - this.energy, false);
this.energy += shouldEmitRedstone;
needsInvUpdate = shouldEmitRedstone > 0.0D;
}
if(this.redstoneMode == 5 || this.redstoneMode == 6) {
this.hasRedstone = this.worldObj.isBlockIndirectlyGettingPowered(this.xCoord, this.yCoord, this.zCoord);
}