mirror of
https://github.com/Thorfusion/Mekanism-Community-Edition.git
synced 2026-11-22 04:52:25 +00:00
Updates for changed IC2 API. Not sure if I'll be able to use @Optional with the new non-legacy BC MJ API as it uses Annotations instead of interfaces.
This commit is contained in:
1 parent
5e0dc25e2b
commit
cd10bc88c8
14 files changed
+126
-34
No files matched your search
@@ -1,5 +1,6 @@
|
||||
package mekanism.common;
|
||||
|
||||
import ic2.api.energy.EnergyNet;
|
||||
import ic2.api.energy.tile.IEnergySink;
|
||||
|
||||
import java.util.Arrays;
|
||||
@@ -210,9 +211,9 @@ public class EnergyNetwork extends DynamicNetwork<TileEntity, EnergyNetwork>
|
||||
}
|
||||
else if(MekanismUtils.useIC2() && acceptor instanceof IEnergySink)
|
||||
{
|
||||
double toSend = Math.min(currentSending, ((IEnergySink)acceptor).getMaxSafeInput()*Mekanism.FROM_IC2);
|
||||
toSend = Math.min(toSend, ((IEnergySink)acceptor).demandedEnergyUnits()*Mekanism.FROM_IC2);
|
||||
sent += (toSend - (((IEnergySink)acceptor).injectEnergyUnits(side.getOpposite(), toSend*Mekanism.TO_IC2)*Mekanism.FROM_IC2));
|
||||
double toSend = Math.min(currentSending, EnergyNet.instance.getPowerFromTier(((IEnergySink) acceptor).getSinkTier())*Mekanism.FROM_IC2);
|
||||
toSend = Math.min(toSend, ((IEnergySink)acceptor).getDemandedEnergy()*Mekanism.FROM_IC2);
|
||||
sent += (toSend - (((IEnergySink)acceptor).injectEnergy(side.getOpposite(), toSend*Mekanism.TO_IC2, 0)*Mekanism.FROM_IC2));
|
||||
}
|
||||
else if(MekanismUtils.useBuildCraft() && acceptor instanceof IPowerReceptor)
|
||||
{
|
||||
@@ -280,7 +281,7 @@ public class EnergyNetwork extends DynamicNetwork<TileEntity, EnergyNetwork>
|
||||
|
||||
if(handler.acceptsEnergyFrom(null, side.getOpposite()))
|
||||
{
|
||||
if(Math.min((handler.demandedEnergyUnits()*Mekanism.FROM_IC2), (handler.getMaxSafeInput()*Mekanism.FROM_IC2)) > 0)
|
||||
if(Math.min((handler.getDemandedEnergy()*Mekanism.FROM_IC2), (EnergyNet.instance.getPowerFromTier(handler.getSinkTier())*Mekanism.FROM_IC2)) > 0)
|
||||
{
|
||||
toReturn.add(acceptor);
|
||||
}
|
||||
|
||||
@@ -182,7 +182,7 @@ public class EntityRobit extends EntityCreature implements IInventory, ISustaine
|
||||
|
||||
if(item.canProvideEnergy(inventory[27]))
|
||||
{
|
||||
double gain = ElectricItem.manager.discharge(inventory[27], (int)((MAX_ELECTRICITY - getEnergy())*Mekanism.TO_IC2), 4, true, false)*Mekanism.FROM_IC2;
|
||||
double gain = ElectricItem.manager.discharge(inventory[27], (MAX_ELECTRICITY - getEnergy())*Mekanism.TO_IC2, 4, true, true, false)*Mekanism.FROM_IC2;
|
||||
setEnergy(getEnergy() + gain);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -19,7 +19,7 @@ public class IC2ItemManager implements IElectricItemManager
|
||||
}
|
||||
|
||||
@Override
|
||||
public int charge(ItemStack itemStack, int amount, int tier, boolean ignoreTransferLimit, boolean simulate)
|
||||
public double charge(ItemStack itemStack, double amount, int tier, boolean ignoreTransferLimit, boolean simulate)
|
||||
{
|
||||
if(energizedItem.canReceive(itemStack))
|
||||
{
|
||||
@@ -38,7 +38,7 @@ public class IC2ItemManager implements IElectricItemManager
|
||||
}
|
||||
|
||||
@Override
|
||||
public int discharge(ItemStack itemStack, int amount, int tier, boolean ignoreTransferLimit, boolean simulate)
|
||||
public double discharge(ItemStack itemStack, double amount, int tier, boolean ignoreTransferLimit, boolean external, boolean simulate)
|
||||
{
|
||||
if(energizedItem.canSend(itemStack))
|
||||
{
|
||||
@@ -57,19 +57,19 @@ public class IC2ItemManager implements IElectricItemManager
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean canUse(ItemStack itemStack, int amount)
|
||||
public boolean canUse(ItemStack itemStack, double amount)
|
||||
{
|
||||
return energizedItem.getEnergy(itemStack) >= amount*Mekanism.FROM_IC2;
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getCharge(ItemStack itemStack)
|
||||
public double getCharge(ItemStack itemStack)
|
||||
{
|
||||
return (int)Math.round(energizedItem.getEnergy(itemStack)*Mekanism.TO_IC2);
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean use(ItemStack itemStack, int amount, EntityLivingBase entity)
|
||||
public boolean use(ItemStack itemStack, double amount, EntityLivingBase entity)
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
@@ -142,7 +142,7 @@ public class ItemBlockEnergyCube extends ItemBlock implements IEnergizedItem, IE
|
||||
|
||||
@Override
|
||||
@Method(modid = "IC2API")
|
||||
public int getMaxCharge(ItemStack itemStack)
|
||||
public double getMaxCharge(ItemStack itemStack)
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
@@ -156,7 +156,7 @@ public class ItemBlockEnergyCube extends ItemBlock implements IEnergizedItem, IE
|
||||
|
||||
@Override
|
||||
@Method(modid = "IC2API")
|
||||
public int getTransferLimit(ItemStack itemStack)
|
||||
public double getTransferLimit(ItemStack itemStack)
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
|
||||
@@ -401,7 +401,7 @@ public class ItemBlockMachine extends ItemBlock implements IEnergizedItem, ISpec
|
||||
|
||||
@Override
|
||||
@Method(modid = "IC2API")
|
||||
public int getMaxCharge(ItemStack itemStack)
|
||||
public double getMaxCharge(ItemStack itemStack)
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
@@ -415,7 +415,7 @@ public class ItemBlockMachine extends ItemBlock implements IEnergizedItem, ISpec
|
||||
|
||||
@Override
|
||||
@Method(modid = "IC2API")
|
||||
public int getTransferLimit(ItemStack itemStack)
|
||||
public double getTransferLimit(ItemStack itemStack)
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
@@ -443,7 +443,7 @@ public class ItemBlockMachine extends ItemBlock implements IEnergizedItem, ISpec
|
||||
|
||||
if(item.canProvideEnergy(inv.getStackInSlot(54)))
|
||||
{
|
||||
double gain = ElectricItem.manager.discharge(inv.getStackInSlot(54), (int)((getMaxEnergy(itemstack) - getEnergy(itemstack))*Mekanism.TO_IC2), 3, false, false)*Mekanism.FROM_IC2;
|
||||
double gain = ElectricItem.manager.discharge(inv.getStackInSlot(54), (int)((getMaxEnergy(itemstack) - getEnergy(itemstack))*Mekanism.TO_IC2), 3, false, true, false)*Mekanism.FROM_IC2;
|
||||
setEnergy(itemstack, getEnergy(itemstack) + gain);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -87,7 +87,7 @@ public class ItemEnergized extends ItemMekanism implements IEnergizedItem, ISpec
|
||||
|
||||
@Override
|
||||
@Method(modid = "IC2API")
|
||||
public int getMaxCharge(ItemStack itemStack)
|
||||
public double getMaxCharge(ItemStack itemStack)
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
@@ -101,7 +101,7 @@ public class ItemEnergized extends ItemMekanism implements IEnergizedItem, ISpec
|
||||
|
||||
@Override
|
||||
@Method(modid = "IC2API")
|
||||
public int getTransferLimit(ItemStack itemStack)
|
||||
public double getTransferLimit(ItemStack itemStack)
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
|
||||
@@ -126,7 +126,7 @@ public class ItemFreeRunners extends ItemArmor implements IEnergizedItem, ISpeci
|
||||
|
||||
@Override
|
||||
@Method(modid = "IC2API")
|
||||
public int getMaxCharge(ItemStack itemStack)
|
||||
public double getMaxCharge(ItemStack itemStack)
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
@@ -140,7 +140,7 @@ public class ItemFreeRunners extends ItemArmor implements IEnergizedItem, ISpeci
|
||||
|
||||
@Override
|
||||
@Method(modid = "IC2API")
|
||||
public int getTransferLimit(ItemStack itemStack)
|
||||
public double getTransferLimit(ItemStack itemStack)
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
|
||||
@@ -359,38 +359,38 @@ public class TileEntityAdvancedBoundingBlock extends TileEntityBoundingBlock imp
|
||||
|
||||
@Override
|
||||
@Method(modid = "IC2API")
|
||||
public double demandedEnergyUnits()
|
||||
public double getDemandedEnergy()
|
||||
{
|
||||
if(getInv() == null)
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
|
||||
return getInv().demandedEnergyUnits();
|
||||
return getInv().getDemandedEnergy();
|
||||
}
|
||||
|
||||
@Override
|
||||
@Method(modid = "IC2API")
|
||||
public double injectEnergyUnits(ForgeDirection directionFrom, double amount)
|
||||
public double injectEnergy(ForgeDirection directionFrom, double amount, double voltage)
|
||||
{
|
||||
if(getInv() == null)
|
||||
{
|
||||
return amount;
|
||||
}
|
||||
|
||||
return getInv().injectEnergyUnits(directionFrom, amount);
|
||||
return getInv().injectEnergy(directionFrom, amount, voltage);
|
||||
}
|
||||
|
||||
@Override
|
||||
@Method(modid = "IC2API")
|
||||
public int getMaxSafeInput()
|
||||
public int getSinkTier()
|
||||
{
|
||||
if(getInv() == null)
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
|
||||
return getInv().getMaxSafeInput();
|
||||
return getInv().getSinkTier();
|
||||
}
|
||||
|
||||
public IAdvancedBoundingBlock getInv()
|
||||
|
||||
@@ -308,9 +308,9 @@ public abstract class TileEntityElectricBlock extends TileEntityContainerBlock i
|
||||
|
||||
@Override
|
||||
@Method(modid = "IC2API")
|
||||
public int getMaxSafeInput()
|
||||
public int getSinkTier()
|
||||
{
|
||||
return Integer.MAX_VALUE;
|
||||
return 4;
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -371,7 +371,7 @@ public abstract class TileEntityElectricBlock extends TileEntityContainerBlock i
|
||||
|
||||
@Override
|
||||
@Method(modid = "IC2API")
|
||||
public double demandedEnergyUnits()
|
||||
public double getDemandedEnergy()
|
||||
{
|
||||
return (getMaxEnergy() - getEnergy())*Mekanism.TO_IC2;
|
||||
}
|
||||
@@ -391,7 +391,7 @@ public abstract class TileEntityElectricBlock extends TileEntityContainerBlock i
|
||||
|
||||
@Override
|
||||
@Method(modid = "IC2API")
|
||||
public double injectEnergyUnits(ForgeDirection direction, double i)
|
||||
public double injectEnergy(ForgeDirection direction, double i, double v)
|
||||
{
|
||||
if(Coord4D.get(this).getFromSide(direction).getTileEntity(worldObj) instanceof IGridTransmitter)
|
||||
{
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
package mekanism.common.util;
|
||||
|
||||
import ic2.api.energy.EnergyNet;
|
||||
import ic2.api.energy.tile.IEnergyAcceptor;
|
||||
import ic2.api.energy.tile.IEnergySink;
|
||||
import ic2.api.energy.tile.IEnergySource;
|
||||
@@ -319,8 +320,8 @@ public final class CableUtils
|
||||
{
|
||||
if(((IEnergySink)tileEntity).acceptsEnergyFrom(from, side.getOpposite()))
|
||||
{
|
||||
double toSend = Math.min(sendingEnergy, Math.min(((IEnergySink)tileEntity).getMaxSafeInput(), ((IEnergySink)tileEntity).demandedEnergyUnits())*Mekanism.FROM_IC2);
|
||||
double rejects = ((IEnergySink)tileEntity).injectEnergyUnits(side.getOpposite(), toSend*Mekanism.TO_IC2)*Mekanism.FROM_IC2;
|
||||
double toSend = Math.min(sendingEnergy, Math.min(EnergyNet.instance.getPowerFromTier(((IEnergySink) tileEntity).getSinkTier()), ((IEnergySink)tileEntity).getDemandedEnergy())*Mekanism.FROM_IC2);
|
||||
double rejects = ((IEnergySink)tileEntity).injectEnergy(side.getOpposite(), toSend*Mekanism.TO_IC2, 0)*Mekanism.FROM_IC2;
|
||||
sent += (toSend - rejects);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -31,7 +31,7 @@ public final class ChargeUtils
|
||||
|
||||
if(item.canProvideEnergy(storer.inventory[slotID]))
|
||||
{
|
||||
double gain = ElectricItem.manager.discharge(storer.inventory[slotID], (int)((storer.getMaxEnergy() - storer.getEnergy())*Mekanism.TO_IC2), 4, true, false)*Mekanism.FROM_IC2;
|
||||
double gain = ElectricItem.manager.discharge(storer.inventory[slotID], (int)((storer.getMaxEnergy() - storer.getEnergy())*Mekanism.TO_IC2), 4, true, true, false)*Mekanism.FROM_IC2;
|
||||
storer.setEnergy(storer.getEnergy() + gain);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -207,7 +207,7 @@ public class ItemBlockGenerator extends ItemBlock implements IEnergizedItem, ISp
|
||||
|
||||
@Override
|
||||
@Method(modid = "IC2API")
|
||||
public int getMaxCharge(ItemStack itemStack)
|
||||
public double getMaxCharge(ItemStack itemStack)
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
@@ -221,7 +221,7 @@ public class ItemBlockGenerator extends ItemBlock implements IEnergizedItem, ISp
|
||||
|
||||
@Override
|
||||
@Method(modid = "IC2API")
|
||||
public int getTransferLimit(ItemStack itemStack)
|
||||
public double getTransferLimit(ItemStack itemStack)
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user