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

#2527: Implements charging of tools via RF (Forge Energy) and Tesla. Tested with Tesla Essentials and EnderIO.

Browse Source
This commit is contained in:
Sebastian Hartte
2016-10-30 02:38:20 +02:00
parent 89299cdb3c
commit 53c32cc296
7 changed files with 177 additions and 273 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/appeng/tile/powersink/AERootPoweredTile.java
+4 -7
View File
@@ -22,11 +22,9 @@ package appeng.tile.powersink;
import java.util.EnumSet;
import javax.annotation.Nullable;
import net.darkhax.tesla.api.ITeslaConsumer;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.util.EnumFacing;
import net.minecraftforge.common.capabilities.Capability;
import net.minecraftforge.common.capabilities.CapabilityInject;
import net.minecraftforge.energy.CapabilityEnergy;
import net.minecraftforge.energy.IEnergyStorage;
@@ -36,6 +34,7 @@ import appeng.api.config.PowerMultiplier;
import appeng.api.config.PowerUnits;
import appeng.api.networking.energy.IAEPowerStorage;
import appeng.api.networking.events.MENetworkPowerStorage.PowerEventType;
import appeng.capabilities.Capabilities;
import appeng.integration.modules.IC2;
import appeng.integration.modules.ic2.IC2PowerSink;
import appeng.tile.AEBaseInvTile;
@@ -45,8 +44,6 @@ import appeng.tile.events.TileEventType;
public abstract class AERootPoweredTile extends AEBaseInvTile implements IAEPowerStorage, IExternalPowerSink
{
@CapabilityInject(ITeslaConsumer.class)
private static Capability<ITeslaConsumer> teslaConsumerCapability;
// values that determine general function, are set by inheriting classes if
// needed. These should generally remain static.
@@ -64,7 +61,7 @@ public abstract class AERootPoweredTile extends AEBaseInvTile implements IAEPowe
public AERootPoweredTile()
{
forgeEnergyAdapter = new ForgeEnergyAdapter( this );
if( teslaConsumerCapability != null )
if( Capabilities.TESLA_CONSUMER != null )
{
teslaEnergyAdapter = new TeslaEnergyAdapter( this );
}
@@ -293,7 +290,7 @@ public abstract class AERootPoweredTile extends AEBaseInvTile implements IAEPowe
return true;
}
}
else if( capability == teslaConsumerCapability )
else if( capability == Capabilities.TESLA_CONSUMER )
{
if( this.getPowerSides().contains( facing ) )
{
@@ -315,7 +312,7 @@ public abstract class AERootPoweredTile extends AEBaseInvTile implements IAEPowe
return (T) forgeEnergyAdapter;
}
}
else if( capability == teslaConsumerCapability )
else if( capability == Capabilities.TESLA_CONSUMER )
{
if( this.getPowerSides().contains( facing ) )
{