fujin/Applied-Energistics-2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Changed AE Tile Event Stuff.

Browse Source
This commit is contained in:
AlgorithmX2
2014-01-26 00:46:16 -06:00
parent 5a6cd05e20
commit 3a0f3ee792
21 changed files with 74 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tile/networking/TileCableBus.java
+1 -1
View File
@@ -42,7 +42,7 @@ public class TileCableBus extends AEBaseTile implements AEMultiTile, ICustomColl
{
public CableBusHandler() {
super( EnumSet.of( TileEventType.NETWORK, TileEventType.WORLD_NBT ) );
super( TileEventType.NETWORK, TileEventType.WORLD_NBT );
}
@Override
tile/networking/TileEnergyAcceptor.java
+4 -5
View File
@@ -1,7 +1,5 @@
package appeng.tile.networking;
import java.util.EnumSet;
import net.minecraft.inventory.IInventory;
import net.minecraft.item.ItemStack;
import net.minecraftforge.common.ForgeDirection;
@@ -32,7 +30,7 @@ public class TileEnergyAcceptor extends AENetworkPowerTile
{
public TilePowerRelayHandler() {
super( EnumSet.of( TileEventType.TICK ) );
super( TileEventType.TICK );
}
@Override
@@ -44,10 +42,11 @@ public class TileEnergyAcceptor extends AENetworkPowerTile
{
IEnergyGrid eg = gridProxy.getEnergy();
double powerRequested = internalCurrentPower - eg.injectPower( internalCurrentPower, Actionable.SIMULATE );
if ( powerRequested > 0 )
{
internalCurrentPower += eg.injectPower( extractAEPower( powerRequested, Actionable.MODULATE, PowerMultiplier.ONE ), Actionable.MODULATE );
internalCurrentPower += eg
.injectPower( extractAEPower( powerRequested, Actionable.MODULATE, PowerMultiplier.ONE ), Actionable.MODULATE );
}
}
catch (GridAccessException e)
tile/networking/TileEnergyCell.java
+3 -3
View File
@@ -1,12 +1,11 @@
package appeng.tile.networking;
import java.util.EnumSet;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraftforge.common.ForgeDirection;
import appeng.api.config.AccessRestriction;
import appeng.api.config.Actionable;
import appeng.api.config.PowerMultiplier;
import appeng.api.networking.GridFlags;
import appeng.api.networking.energy.IAEPowerStorage;
import appeng.api.networking.events.MENetworkPowerStorage;
import appeng.api.networking.events.MENetworkPowerStorage.PowerEventType;
@@ -51,7 +50,7 @@ public class TileEnergyCell extends AENetworkTile implements IAEPowerStorage
{
public TileEnergyCellHandler() {
super( EnumSet.of( TileEventType.WORLD_NBT ) );
super( TileEventType.WORLD_NBT );
}
@Override
@@ -70,6 +69,7 @@ public class TileEnergyCell extends AENetworkTile implements IAEPowerStorage
public TileEnergyCell() {
gridProxy.setIdlePowerUsage( 0 );
gridProxy.setFlags( GridFlags.CANNOT_CARRY );
addNewHandler( new TileEnergyCellHandler() );
}
tile/networking/TileWireless.java
+1 -2
View File
@@ -3,7 +3,6 @@ package appeng.tile.networking;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
import java.util.EnumSet;
import net.minecraft.inventory.IInventory;
import net.minecraft.item.ItemStack;
@@ -54,7 +53,7 @@ public class TileWireless extends AENetworkInvTile
{
public TileWirelessHandler() {
super( EnumSet.of( TileEventType.NETWORK ) );
super( TileEventType.NETWORK );
}
@Override