mirror of
https://github.com/Thorfusion/Mekanism-Community-Edition.git
synced 2026-11-20 03:59:37 +00:00
Make the @Optional removals stricter.
Require IC2, BC or CoFHCore to be loaded in order to use their respective APIs. Remove all the individual mod deps to prevent us depending on mods that depend on us.
This commit is contained in:
1 parent
9db789674a
commit
71a9bfc4f9
18 files changed
+85
-106
No files matched your search
@@ -109,8 +109,8 @@ import ic2.api.item.ISpecialElectricItem;
|
||||
*
|
||||
*/
|
||||
@InterfaceList({
|
||||
@Interface(iface = "cofh.api.energy.IEnergyContainerItem", modid = "CoFHAPI|energy"),
|
||||
@Interface(iface = "ic2.api.item.ISpecialElectricItem", modid = "IC2API")
|
||||
@Interface(iface = "cofh.api.energy.IEnergyContainerItem", modid = "CoFHCore"),
|
||||
@Interface(iface = "ic2.api.item.ISpecialElectricItem", modid = "IC2")
|
||||
})
|
||||
public class ItemBlockMachine extends ItemBlock implements IEnergizedItem, ISpecialElectricItem, IFactory, ISustainedInventory, ISustainedTank, IElectricChest, IEnergyContainerItem, IFluidContainerItem
|
||||
{
|
||||
@@ -335,28 +335,28 @@ public class ItemBlockMachine extends ItemBlock implements IEnergizedItem, ISpec
|
||||
}
|
||||
|
||||
@Override
|
||||
@Method(modid = "IC2API")
|
||||
@Method(modid = "IC2")
|
||||
public boolean canProvideEnergy(ItemStack itemStack)
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
@Override
|
||||
@Method(modid = "IC2API")
|
||||
@Method(modid = "IC2")
|
||||
public double getMaxCharge(ItemStack itemStack)
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
|
||||
@Override
|
||||
@Method(modid = "IC2API")
|
||||
@Method(modid = "IC2")
|
||||
public int getTier(ItemStack itemStack)
|
||||
{
|
||||
return 4;
|
||||
}
|
||||
|
||||
@Override
|
||||
@Method(modid = "IC2API")
|
||||
@Method(modid = "IC2")
|
||||
public double getTransferLimit(ItemStack itemStack)
|
||||
{
|
||||
return 0;
|
||||
@@ -927,21 +927,21 @@ public class ItemBlockMachine extends ItemBlock implements IEnergizedItem, ISpec
|
||||
}
|
||||
|
||||
@Override
|
||||
@Method(modid = "IC2API")
|
||||
@Method(modid = "IC2")
|
||||
public IElectricItemManager getManager(ItemStack itemStack)
|
||||
{
|
||||
return IC2ItemManager.getManager(this);
|
||||
}
|
||||
|
||||
@Override
|
||||
@Method(modid = "IC2API")
|
||||
@Method(modid = "IC2")
|
||||
public Item getChargedItem(ItemStack itemStack)
|
||||
{
|
||||
return this;
|
||||
}
|
||||
|
||||
@Override
|
||||
@Method(modid = "IC2API")
|
||||
@Method(modid = "IC2")
|
||||
public Item getEmptyItem(ItemStack itemStack)
|
||||
{
|
||||
return this;
|
||||
|
||||
Reference in new issue
Block a user