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 ) )
{
src/main/java/appeng/tile/powersink/IC2.java
-125
View File
@@ -1,125 +0,0 @@
/*
* This file is part of Applied Energistics 2.
* Copyright (c) 2013 - 2015, AlgorithmX2, All rights reserved.
*
* Applied Energistics 2 is free software: you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* Applied Energistics 2 is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public License
* along with Applied Energistics 2. If not, see <http://www.gnu.org/licenses/lgpl>.
*/
package appeng.tile.powersink;
//import java.util.EnumSet;
//
//import net.minecraft.tileentity.TileEntity;
//import net.minecraftforge.common.util.ForgeDirection;
//
//import ic2.api.energy.tile.IEnergySink;
//
//import appeng.api.config.PowerUnits;
//import appeng.integration.IntegrationRegistry;
//import appeng.integration.IntegrationType;
//import appeng.integration.abstraction.IIC2;
//import appeng.transformer.annotations.Integration.Interface;
//import appeng.util.Platform;
//
//
//@Interface( iname = IntegrationType.IC2, iface = "ic2.api.energy.tile.IEnergySink" )
//public abstract class IC2 extends AERootPoweredTile implements IEnergySink
//{
//
// boolean isInIC2 = false;
//
// @Override
// public final boolean acceptsEnergyFrom( TileEntity emitter, ForgeDirection direction )
// {
// return this.getPowerSides().contains( direction );
// }
//
// @Override
// public final double getDemandedEnergy()
// {
// return this.getExternalPowerDemand( PowerUnits.EU, Double.MAX_VALUE );
// }
//
// @Override
// public final int getSinkTier()
// {
// return Integer.MAX_VALUE;
// }
//
// @Override
// public final double injectEnergy( ForgeDirection directionFrom, double amount, double voltage )
// {
// // just store the excess in the current block, if I return the waste,
// // IC2 will just disintegrate it - Oct 20th 2013
// double overflow = PowerUnits.EU.convertTo( PowerUnits.AE, this.injectExternalPower( PowerUnits.EU, amount ) );
// this.internalCurrentPower += overflow;
// return 0; // see above comment.
// }
//
// @Override
// public void invalidate()
// {
// super.invalidate();
// this.removeFromENet();
// }
//
// private void removeFromENet()
// {
// if( IntegrationRegistry.INSTANCE.isEnabled( IntegrationType.IC2 ) )
// {
// IIC2 ic2Integration = (IIC2) IntegrationRegistry.INSTANCE.getInstance( IntegrationType.IC2 );
// if( this.isInIC2 && Platform.isServer() && ic2Integration != null )
// {
// ic2Integration.removeFromEnergyNet( this );
// this.isInIC2 = false;
// }
// }
// }
//
// @Override
// public void onChunkUnload()
// {
// super.onChunkUnload();
// this.removeFromENet();
// }
//
// @Override
// public void onReady()
// {
// super.onReady();
// this.addToENet();
// }
//
// private void addToENet()
// {
// if( IntegrationRegistry.INSTANCE.isEnabled( IntegrationType.IC2 ) )
// {
// IIC2 ic2Integration = (IIC2) IntegrationRegistry.INSTANCE.getInstance( IntegrationType.IC2 );
// if( !this.isInIC2 && Platform.isServer() && ic2Integration != null )
// {
// ic2Integration.addToEnergyNet( this );
// this.isInIC2 = true;
// }
// }
// }
//
// @Override
// protected void setPowerSides( EnumSet<ForgeDirection> sides )
// {
// super.setPowerSides( sides );
// this.removeFromENet();
// this.addToENet();
// }
// }