diff --git a/gradle.properties b/gradle.properties index cd60073d3..280f908d0 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,7 +2,7 @@ mcversion=1.10.2 forgeversion=12.18.0.2005-1.10.0 mcp_mappings=snapshot_20160525 -tesla_version=1.9.4-1.1.0.24 +tesla_version=1.10.2-1.2.1.41 jei_version=3.7.3.221 ic2_version=2.6.5-ex110 diff --git a/src/main/java/forestry/core/config/Constants.java b/src/main/java/forestry/core/config/Constants.java index 68439f0f2..089f06a7e 100644 --- a/src/main/java/forestry/core/config/Constants.java +++ b/src/main/java/forestry/core/config/Constants.java @@ -23,6 +23,8 @@ public class Constants implements IForestryConstants { public static final String VERSION = "@VERSION@"; public static final String BUILD_NUMBER = "@BUILD_NUMBER@"; + public static final String TESLA_MOD_ID = "tesla"; + public static final int FLAG_BLOCK_UPDATE = 1; public static final int FLAG_BLOCK_SYNC = 2; diff --git a/src/main/java/forestry/energy/EnergyManager.java b/src/main/java/forestry/energy/EnergyManager.java index 550180e33..d94f345c9 100644 --- a/src/main/java/forestry/energy/EnergyManager.java +++ b/src/main/java/forestry/energy/EnergyManager.java @@ -2,6 +2,7 @@ package forestry.energy; import java.io.IOException; +import forestry.core.config.Constants; import net.darkhax.tesla.api.ITeslaConsumer; import net.darkhax.tesla.api.ITeslaHolder; import net.darkhax.tesla.api.ITeslaProducer; @@ -14,7 +15,6 @@ import forestry.core.network.DataInputStreamForestry; import forestry.core.network.DataOutputStreamForestry; import forestry.core.network.IStreamable; import forestry.core.tiles.TileEngine; -import forestry.core.utils.BlockUtil; import cofh.api.energy.IEnergyProvider; import cofh.api.energy.IEnergyReceiver; @@ -23,9 +23,9 @@ import net.minecraftforge.common.capabilities.CapabilityInject; import net.minecraftforge.fml.common.Optional; @Optional.InterfaceList({ - @Optional.Interface(iface = "net.darkhax.tesla.api.ITeslaConsumer", modid = "Tesla"), - @Optional.Interface(iface = "net.darkhax.tesla.api.ITeslaProducer", modid = "Tesla"), - @Optional.Interface(iface = "net.darkhax.tesla.api.ITeslaHolder", modid = "Tesla") + @Optional.Interface(iface = "net.darkhax.tesla.api.ITeslaConsumer", modid = Constants.TESLA_MOD_ID), + @Optional.Interface(iface = "net.darkhax.tesla.api.ITeslaProducer", modid = Constants.TESLA_MOD_ID), + @Optional.Interface(iface = "net.darkhax.tesla.api.ITeslaHolder", modid = Constants.TESLA_MOD_ID) }) public class EnergyManager implements IEnergyReceiver, ITeslaConsumer, ITeslaProducer, ITeslaHolder, IEnergyProvider, IStreamable { @CapabilityInject(ITeslaConsumer.class) @@ -259,13 +259,13 @@ public class EnergyManager implements IEnergyReceiver, ITeslaConsumer, ITeslaPro return null; } - @Optional.Method(modid = "Tesla") + @Optional.Method(modid = Constants.TESLA_MOD_ID) public static int sendEnergyTesla(TileEntity tile, EnumFacing side, int amount, boolean simulate) { ITeslaConsumer consumer = tile.getCapability(TESLA_CONSUMER, side); return (int) consumer.givePower(amount, simulate); } - @Optional.Method(modid = "Tesla") + @Optional.Method(modid = Constants.TESLA_MOD_ID) @Override public long givePower(long power, boolean simulated) { if (!canReceive()) { @@ -274,7 +274,7 @@ public class EnergyManager implements IEnergyReceiver, ITeslaConsumer, ITeslaPro return energyStorage.receiveEnergy(power, simulated); } - @Optional.Method(modid = "Tesla") + @Optional.Method(modid = Constants.TESLA_MOD_ID) @Override public long takePower(long power, boolean simulated) { if (!canExtract()) { @@ -283,13 +283,13 @@ public class EnergyManager implements IEnergyReceiver, ITeslaConsumer, ITeslaPro return energyStorage.extractEnergy(power, simulated); } - @Optional.Method(modid = "Tesla") + @Optional.Method(modid = Constants.TESLA_MOD_ID) @Override public long getStoredPower() { return energyStorage.getEnergyStored(); } - @Optional.Method(modid = "Tesla") + @Optional.Method(modid = Constants.TESLA_MOD_ID) @Override public long getCapacity() { return energyStorage.getMaxEnergyStored();