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

Re-add a missing piece of IC2 integration code.

Browse Source 
This should fix a bunch of IC2 spam in the console and allow items to be charged in IC2 blocks.
This commit is contained in:
Gunther De Wachter
2017-08-07 10:15:26 +02:00
parent 41d98f9944
commit 6aa810d62a
2 changed files with 125 additions and 127 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/appeng/items/tools/powered/powersink/IC2.java
+124 -126
View File
@@ -1,126 +1,124 @@
/// * /*
// * This file is part of Applied Energistics 2. * This file is part of Applied Energistics 2.
// * Copyright (c) 2013 - 2014, AlgorithmX2, All rights reserved. * Copyright (c) 2013 - 2014, AlgorithmX2, All rights reserved.
// * *
// * Applied Energistics 2 is free software: you can redistribute it and/or modify * 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 * 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 * the Free Software Foundation, either version 3 of the License, or
// * (at your option) any later version. * (at your option) any later version.
// * *
// * Applied Energistics 2 is distributed in the hope that it will be useful, * Applied Energistics 2 is distributed in the hope that it will be useful,
// * but WITHOUT ANY WARRANTY; without even the implied warranty of * but WITHOUT ANY WARRANTY; without even the implied warranty of
// * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// * GNU Lesser General Public License for more details. * GNU Lesser General Public License for more details.
// * *
// * You should have received a copy of the GNU Lesser General Public License * 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>. * along with Applied Energistics 2. If not, see <http://www.gnu.org/licenses/lgpl>.
// */ */
//
// package appeng.items.tools.powered.powersink; package appeng.items.tools.powered.powersink;
//
// import net.minecraft.entity.EntityLivingBase;
// import net.minecraft.entity.EntityLivingBase; import net.minecraft.item.ItemStack;
// import net.minecraft.item.ItemStack;
// import ic2.api.item.IElectricItemManager;
// import ic2.api.item.IElectricItemManager; import ic2.api.item.ISpecialElectricItem;
// import ic2.api.item.ISpecialElectricItem;
// import appeng.api.config.PowerUnits;
// import appeng.api.config.PowerUnits; import appeng.coremod.annotations.Integration.Interface;
// import appeng.coremod.annotations.Integration.Interface; import appeng.coremod.annotations.Integration.InterfaceList;
// import appeng.coremod.annotations.Integration.InterfaceList; import appeng.coremod.annotations.Integration.Method;
// import appeng.coremod.annotations.Integration.Method; import appeng.integration.IntegrationType;
// import appeng.integration.IntegrationType;
//
// @InterfaceList( value = {
// @InterfaceList( value = { @Interface( iface = "ic2.api.item.ISpecialElectricItem", iname = IntegrationType.IC2 ),
// @Interface( iface = "ic2.api.item.ISpecialElectricItem", iname = IntegrationType.IC2 ), @Interface( iface = "ic2.api.item.IElectricItemManager", iname = IntegrationType.IC2 )
// @Interface( iface = "ic2.api.item.IElectricItemManager", iname = IntegrationType.IC2 ) } )
// } ) public abstract class IC2 extends AERootPoweredItem implements IElectricItemManager, ISpecialElectricItem
// public abstract class IC2 extends AERootPoweredItem implements IElectricItemManager, ISpecialElectricItem {
// { public IC2( double powerCapacity )
// public IC2( double powerCapacity ) {
// { super( powerCapacity );
// super( powerCapacity ); }
// }
// @Override
// @Override public double charge( ItemStack is, double amount, int tier, boolean ignoreTransferLimit, boolean simulate )
// public double charge( ItemStack is, double amount, int tier, boolean ignoreTransferLimit, boolean simulate ) {
// { double addedAmt = amount;
// double addedAmt = amount; double limit = this.getTransferLimit( is );
// double limit = this.getTransferLimit( is );
// if( !ignoreTransferLimit && amount > limit )
// if( !ignoreTransferLimit && amount > limit ) {
// { addedAmt = limit;
// addedAmt = limit; }
// }
// return addedAmt - ( (int) this.injectExternalPower( PowerUnits.EU, is, addedAmt, simulate ) );
// return addedAmt - ( (int) this.injectExternalPower( PowerUnits.EU, is, addedAmt, simulate ) ); }
// }
// @Override
// @Override public double discharge( ItemStack itemStack, double amount, int tier, boolean ignoreTransferLimit, boolean externally, boolean simulate )
// public double discharge( ItemStack itemStack, double amount, int tier, boolean ignoreTransferLimit, boolean {
/// externally, boolean simulate ) return 0;
// { }
// return 0;
// } @Override
// public double getCharge( ItemStack is )
// @Override {
// public double getCharge( ItemStack is ) return (int) PowerUnits.AE.convertTo( PowerUnits.EU, this.getAECurrentPower( is ) );
// { }
// return (int) PowerUnits.AE.convertTo( PowerUnits.EU, this.getAECurrentPower( is ) );
// } @Override
// public boolean canUse( ItemStack is, double amount )
// @Override {
// public boolean canUse( ItemStack is, double amount ) return this.getCharge( is ) > amount;
// { }
// return this.getCharge( is ) > amount;
// } @Override
// public boolean use( ItemStack is, double amount, EntityLivingBase entity )
// @Override {
// public boolean use( ItemStack is, double amount, EntityLivingBase entity ) if( this.canUse( is, amount ) )
// { {
// if( this.canUse( is, amount ) ) // use the power..
// { this.extractAEPower( is, PowerUnits.EU.convertTo( PowerUnits.AE, amount ) );
// // use the power.. return true;
// this.extractAEPower( is, PowerUnits.EU.convertTo( PowerUnits.AE, amount ) ); }
// return true; return false;
// } }
// return false;
// } @Override
// public void chargeFromArmor( ItemStack itemStack, EntityLivingBase entity )
// @Override {
// public void chargeFromArmor( ItemStack itemStack, EntityLivingBase entity ) // wtf?
// { }
// // wtf?
// } @Override
// public String getToolTip( ItemStack itemStack )
// @Override {
// public String getToolTip( ItemStack itemStack ) return null;
// { }
// return null;
// } @Override
// public double getMaxCharge( ItemStack itemStack )
// @Override {
// public double getMaxCharge( ItemStack itemStack ) return PowerUnits.AE.convertTo( PowerUnits.EU, this.getAEMaxPower( itemStack ) );
// { }
// return PowerUnits.AE.convertTo( PowerUnits.EU, this.getAEMaxPower( itemStack ) );
// } @Override
// public int getTier( ItemStack itemStack )
// @Override {
// public int getTier( ItemStack itemStack ) return 1;
// { }
// return 1;
// } private double getTransferLimit( ItemStack itemStack )
// {
// private double getTransferLimit( ItemStack itemStack ) return Math.max( 32, this.getMaxCharge( itemStack ) / 200 );
// { }
// return Math.max( 32, this.getMaxCharge( itemStack ) / 200 );
// } @Override
// @Method( iname = IntegrationType.IC2 )
// @Override public IElectricItemManager getManager( ItemStack itemStack )
// @Method( iname = IntegrationType.IC2 ) {
// public IElectricItemManager getManager( ItemStack itemStack ) return this;
// { }
// return this; }
// }
// }
src/main/java/appeng/items/tools/powered/powersink/RedstoneFlux.java
+1 -1
View File
@@ -29,7 +29,7 @@ import appeng.integration.IntegrationType;
@Interface( iface = "cofh.redstoneflux.api.IEnergyContainerItem", iname = IntegrationType.RFItem ) @Interface( iface = "cofh.redstoneflux.api.IEnergyContainerItem", iname = IntegrationType.RFItem )
public abstract class RedstoneFlux extends AERootPoweredItem implements IEnergyContainerItem public abstract class RedstoneFlux extends IC2 implements IEnergyContainerItem
{ {
public RedstoneFlux( final double powerCapacity ) public RedstoneFlux( final double powerCapacity )
{ {