dave/refinedstorage
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

More fixes

Browse Source
This commit is contained in:
Raoul Van den Berge
2016-06-24 19:08:41 +02:00
parent 03fcc1b0d9
commit 27910b39cf
6 changed files with 7 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/refinedstorage/RefinedStorage.java
View File

@@ -19,7 +19,7 @@ import refinedstorage.proxy.CommonProxy;
@Mod(modid = RefinedStorage.ID, version = RefinedStorage.VERSION)
public final class RefinedStorage {
public static final String ID = "refinedstorage";
public static final String VERSION = "0.7.17-pre1";
public static final String VERSION = "0.7.17";
public static final SimpleNetworkWrapper NETWORK = NetworkRegistry.INSTANCE.newSimpleChannel(ID);

2
src/main/java/refinedstorage/tile/TileSlave.java
View File

@@ -102,7 +102,7 @@ public abstract class TileSlave extends TileBase implements INetworkSlave, ISync
if (network == null) {
if (controller != null) {
connect(world, network);
connect(world, controller);
}
} else {
if (controller == null) {

4
src/main/java/refinedstorage/tile/controller/TileController.java
View File

@@ -165,13 +165,13 @@ public class TileController extends TileBase implements INetworkMaster, IEnergyR
wirelessGridHandler.update();
if (type == EnumControllerType.NORMAL && energyUsage > 0) {
if (getType() == EnumControllerType.NORMAL && energyUsage > 0) {
if (energy.getEnergyStored() - energyUsage >= 0) {
energy.extractEnergy(energyUsage, false);
} else {
energy.setEnergyStored(0);
}
} else if (type == EnumControllerType.CREATIVE) {
} else if (getType() == EnumControllerType.CREATIVE) {
energy.setEnergyStored(energy.getMaxEnergyStored());
}