Anvilcraft/WarpDrive
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Updated RF support to 1.10

Browse source
This commit is contained in:
LemADEC 2017-12-02 13:05:03 +01:00
parent 361b14b924
commit 505677cd9d
3 changed files with 20 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
src/main/java/cr0s/warpdrive/block/TileEntityAbstractEnergy.java
View file

@ -28,9 +28,9 @@ import net.minecraftforge.common.MinecraftForge;
import net.minecraftforge.fml.common.Optional;
@Optional.InterfaceList({
@Optional.Interface(iface = "cofh.api.energy.IEnergyHandler", modid = "CoFHCore"),
@Optional.Interface(iface = "cofh.api.energy.IEnergyProvider", modid = "CoFHCore"),
@Optional.Interface(iface = "cofh.api.energy.IEnergyReceiver", modid = "CoFHCore"),
@Optional.Interface(iface = "cofh.api.energy.IEnergyHandler", modid = "cofhcore"),
@Optional.Interface(iface = "cofh.api.energy.IEnergyProvider", modid = "cofhcore"),
@Optional.Interface(iface = "cofh.api.energy.IEnergyReceiver", modid = "cofhcore"),
@Optional.Interface(iface = "ic2.api.energy.tile.IEnergySink", modid = "IC2"),
@Optional.Interface(iface = "ic2.api.energy.tile.IEnergySource", modid = "IC2")
})
@ -339,7 +339,7 @@ public abstract class TileEntityAbstractEnergy extends TileEntityAbstractInterfa
// ThermalExpansion IEnergyHandler interface
@Override
@Optional.Method(modid = "CoFHCore") /* IEnergyReceiver */
@Optional.Method(modid = "cofhcore") /* IEnergyReceiver */
public int receiveEnergy(EnumFacing from, int maxReceive_RF, boolean simulate) {
if (WarpDriveConfig.LOGGING_ENERGY) {
WarpDrive.logger.info(this + " [CoFH]receiveEnergy from " + from + " maxReceive_RF " + maxReceive_RF + " simulate " + simulate);
@ -366,7 +366,7 @@ public abstract class TileEntityAbstractEnergy extends TileEntityAbstractInterfa
}
@Override
@Optional.Method(modid = "CoFHCore") /* IEnergyProvider */
@Optional.Method(modid = "cofhcore") /* IEnergyProvider */
public int extractEnergy(EnumFacing from, int maxExtract_RF, boolean simulate) {
if (WarpDriveConfig.LOGGING_ENERGY) {
WarpDrive.logger.info(this + " [CoFH]extractEnergy from " + from + " maxExtract_RF " + maxExtract_RF + " simulate " + simulate);
@ -384,26 +384,26 @@ public abstract class TileEntityAbstractEnergy extends TileEntityAbstractInterfa
}
@Override
@Optional.Method(modid = "CoFHCore") /* IEnergyConnection */
@Optional.Method(modid = "cofhcore") /* IEnergyConnection */
public boolean canConnectEnergy(EnumFacing from) {
return (energy_getMaxStorage() != 0) && (energy_canInput(from) || energy_canOutput(from)); // Warning: deadlock risk depending on child implementation
}
@Override
@Optional.Method(modid = "CoFHCore") /* IEnergyReceiver and IEnergyProvider */
@Optional.Method(modid = "cofhcore") /* IEnergyReceiver and IEnergyProvider */
public int getEnergyStored(EnumFacing from) {
return canConnectEnergy(from) ? convertInternalToRF_floor(energy_getEnergyStored()) : 0;
}
@Override
@Optional.Method(modid = "CoFHCore") /* IEnergyReceiver and IEnergyProvider */
@Optional.Method(modid = "cofhcore") /* IEnergyReceiver and IEnergyProvider */
public int getMaxEnergyStored(EnumFacing from) {
return canConnectEnergy(from) ? convertInternalToRF_floor(energy_getMaxStorage()) : 0;
}
// WarpDrive overrides for Thermal Expansion
@Optional.Method(modid = "CoFHCore")
@Optional.Method(modid = "cofhcore")
private void CoFH_outputEnergy(EnumFacing from, IEnergyReceiver energyReceiver) {
if (energyReceiver == null || worldObj.getTileEntity(pos.add(from.getFrontOffsetX(), from.getFrontOffsetY(), from.getFrontOffsetZ())) == null) {
return;
@ -422,7 +422,7 @@ public abstract class TileEntityAbstractEnergy extends TileEntityAbstractInterfa
}
}
@Optional.Method(modid = "CoFHCore")
@Optional.Method(modid = "cofhcore")
private void CoFH_outputEnergy() {
for (EnumFacing from : EnumFacing.VALUES) {
if (cofhEnergyReceivers[from.ordinal()] != null) {
@ -431,7 +431,7 @@ public abstract class TileEntityAbstractEnergy extends TileEntityAbstractInterfa
}
}
@Optional.Method(modid = "CoFHCore")
@Optional.Method(modid = "cofhcore")
private void CoFH_initialiseAPI() {
cofhEnergyReceivers = new IEnergyReceiver[EnumFacing.VALUES.length];
}
@ -476,7 +476,7 @@ public abstract class TileEntityAbstractEnergy extends TileEntityAbstractInterfa
scanTickCount = -1;
}
@Optional.Method(modid = "CoFHCore")
@Optional.Method(modid = "cofhcore")
private void CoFH_scanForEnergyHandlers() {
if (WarpDriveConfig.LOGGING_ENERGY) {
WarpDrive.logger.info(this + " [CoFH]CoFH_scanForEnergyHandlers");

2
src/main/java/cr0s/warpdrive/config/WarpDriveConfig.java
View file

@ -462,7 +462,7 @@ public class WarpDriveConfig {
isIndustrialCraft2Loaded = Loader.isModLoaded("IC2");
isComputerCraftLoaded = Loader.isModLoaded("ComputerCraft");
isAdvancedSolarPanelLoaded = Loader.isModLoaded("AdvancedSolarPanel");
isCoFHCoreLoaded = Loader.isModLoaded("CoFHCore");
isCoFHCoreLoaded = Loader.isModLoaded("cofhcore");
isThermalExpansionLoaded = Loader.isModLoaded("ThermalExpansion");
isAppliedEnergistics2Loaded = Loader.isModLoaded("appliedenergistics2");
isOpenComputersLoaded = Loader.isModLoaded("OpenComputers");

14
src/main/java/cr0s/warpdrive/item/ItemEnergyWrapper.java
View file

@ -189,32 +189,32 @@ public class ItemEnergyWrapper {
// Thermal Expansion IEnergyContainerItem interface
@Optional.Method(modid = "CoFHCore")
@Optional.Method(modid = "cofhcore")
private static boolean CoFH_isContainer(ItemStack itemStack) {
return itemStack.getItem() instanceof IEnergyContainerItem;
}
@Optional.Method(modid = "CoFHCore")
@Optional.Method(modid = "cofhcore")
private static boolean CoFH_canOutput(ItemStack itemStack) {
return ((IEnergyContainerItem) itemStack.getItem()).getEnergyStored(itemStack) > 0;
}
@Optional.Method(modid = "CoFHCore")
@Optional.Method(modid = "cofhcore")
private static boolean CoFH_canInput(ItemStack itemStack) {
return ((IEnergyContainerItem) itemStack.getItem()).getEnergyStored(itemStack) < ((IEnergyContainerItem) itemStack.getItem()).getMaxEnergyStored(itemStack);
}
@Optional.Method(modid = "CoFHCore")
@Optional.Method(modid = "cofhcore")
private static int CoFH_getEnergyStored(ItemStack itemStack) {
return (int) Math.floor( ((IEnergyContainerItem)itemStack.getItem()).getEnergyStored(itemStack) );
}
@Optional.Method(modid = "CoFHCore")
@Optional.Method(modid = "cofhcore")
private static int CoFH_getMaxEnergyStorage(ItemStack itemStack) {
return (int) Math.floor( ((IEnergyContainerItem)itemStack.getItem()).getMaxEnergyStored(itemStack) );
}
@Optional.Method(modid = "CoFHCore")
@Optional.Method(modid = "cofhcore")
private static ItemStack CoFH_consume(ItemStack itemStack, final int amount_RF, final boolean simulate) {
if (((IEnergyContainerItem)itemStack.getItem()).extractEnergy(itemStack, amount_RF, simulate) > 0) {
return itemStack;
@ -222,7 +222,7 @@ public class ItemEnergyWrapper {
return null;
}
@Optional.Method(modid = "CoFHCore")
@Optional.Method(modid = "cofhcore")
private static ItemStack CoFH_charge(ItemStack itemStack, final int amount_RF, final boolean simulate) {
if ( ((IEnergyContainerItem)itemStack.getItem()).receiveEnergy(itemStack, amount_RF, simulate) > 0) {
return itemStack;