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

Better naming

Browse Source
This commit is contained in:
Raoul Van den Berge
2016-05-20 19:40:39 +02:00
parent e3b1ac694a
commit 4490eea1e9
10 changed files with 24 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/main/java/refinedstorage/tile/TileController.java
View File

@@ -122,7 +122,7 @@ public class TileController extends TileBase implements IEnergyReceiver, ISynchr
int lastEnergy = energy.getEnergyStored();
if (canRun()) {
if (mayRun()) {
if (ticks % 20 == 0) {
syncMachines();
}
@@ -157,8 +157,8 @@ public class TileController extends TileBase implements IEnergyReceiver, ISynchr
disconnectAll();
}
if (couldRun != canRun()) {
couldRun = canRun();
if (couldRun != mayRun()) {
couldRun = mayRun();
worldObj.notifyNeighborsOfStateChange(pos, RefinedStorageBlocks.CONTROLLER);
}
@@ -174,7 +174,7 @@ public class TileController extends TileBase implements IEnergyReceiver, ISynchr
if (!RefinedStorageUtils.compareStack(consumer.getWirelessGrid(), consumer.getPlayer().getHeldItem(consumer.getHand()))) {
consumer.getPlayer().closeScreen(); // This will call onContainerClosed on the Container and remove it from the list
} else {
if (canRun()) {
if (mayRun()) {
RefinedStorage.NETWORK.sendTo(new MessageWirelessGridItems(this), (EntityPlayerMP) consumer.getPlayer());
}
}
@@ -365,7 +365,7 @@ public class TileController extends TileBase implements IEnergyReceiver, ISynchr
public boolean push(ItemStack stack) {
for (IStorage storage : storages) {
if (storage.canPush(stack)) {
if (storage.mayPush(stack)) {
storage.push(stack);
syncItems();
@@ -559,7 +559,7 @@ public class TileController extends TileBase implements IEnergyReceiver, ISynchr
return true;
}
public boolean canRun() {
public boolean mayRun() {
return energy.getEnergyStored() > 0 && energy.getEnergyStored() >= energyUsage && redstoneMode.isEnabled(worldObj, pos);
}