diff --git a/build.gradle b/build.gradle index 8d7c11c14..d64012893 100755 --- a/build.gradle +++ b/build.gradle @@ -108,13 +108,7 @@ allprojects { } jar { - // Copy redstone api into the jar, should shade this as a maven dep... - from (sourceSets.api.allSource) { - include 'cofh/**/*.txt' - } - from (sourceSets.api.output.classesDir) { - include 'cofh/**/*.*' - } + } task sourcesJar(type: Jar) { diff --git a/src/main/java/forestry/apiculture/multiblock/TileAlvearyClimatiser.java b/src/main/java/forestry/apiculture/multiblock/TileAlvearyClimatiser.java index b928bef9e..5203b03f0 100644 --- a/src/main/java/forestry/apiculture/multiblock/TileAlvearyClimatiser.java +++ b/src/main/java/forestry/apiculture/multiblock/TileAlvearyClimatiser.java @@ -13,19 +13,20 @@ package forestry.apiculture.multiblock; import javax.annotation.Nonnull; import javax.annotation.Nullable; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.EnumFacing; import forestry.api.climate.IClimateControlled; import forestry.api.multiblock.IAlvearyComponent; import forestry.apiculture.network.packets.PacketActiveUpdate; import forestry.core.proxy.Proxies; import forestry.core.tiles.IActivatable; +import forestry.energy.EnergyHelper; import forestry.energy.EnergyManager; - -import cofh.api.energy.IEnergyReceiver; +import forestry.energy.EnergyTransferMode; +import forestry.energy.compat.rf.IEnergyReceiverDelegated; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.util.EnumFacing; import net.minecraftforge.common.capabilities.Capability; -public abstract class TileAlvearyClimatiser extends TileAlveary implements IEnergyReceiver, IActivatable, IAlvearyComponent.Climatiser { +public abstract class TileAlvearyClimatiser extends TileAlveary implements IEnergyReceiverDelegated, IActivatable, IAlvearyComponent.Climatiser { private static final int WORK_CYCLES = 1; private static final int ENERGY_PER_OPERATION = 50; @@ -50,13 +51,13 @@ public abstract class TileAlvearyClimatiser extends TileAlveary implements IEner this.definition = definition; this.energyManager = new EnergyManager(1000, 2000); - this.energyManager.setReceiveOnly(); + this.energyManager.setExternalMode(EnergyTransferMode.RECEIVE); } /* UPDATING */ @Override public void changeClimate(int tick, IClimateControlled climateControlled) { - if (workingTime < 20 && energyManager.consumeEnergyToDoWork(WORK_CYCLES, ENERGY_PER_OPERATION)) { + if (workingTime < 20 && EnergyHelper.consumeEnergyToDoWork(energyManager, WORK_CYCLES, ENERGY_PER_OPERATION)) { // one tick of work for every 10 RF workingTime += ENERGY_PER_OPERATION / 10; } @@ -123,25 +124,9 @@ public abstract class TileAlvearyClimatiser extends TileAlveary implements IEner } } - /* IEnergyHandler */ @Override - public int receiveEnergy(EnumFacing from, int maxReceive, boolean simulate) { - return energyManager.receiveEnergy(from, maxReceive, simulate); - } - - @Override - public int getEnergyStored(EnumFacing from) { - return energyManager.getEnergyStored(from); - } - - @Override - public int getMaxEnergyStored(EnumFacing from) { - return energyManager.getMaxEnergyStored(from); - } - - @Override - public boolean canConnectEnergy(EnumFacing from) { - return energyManager.canConnectEnergy(from); + public EnergyManager getEnergyManager() { + return energyManager; } @Override diff --git a/src/main/java/forestry/core/config/Constants.java b/src/main/java/forestry/core/config/Constants.java index e0a865237..3369d1779 100644 --- a/src/main/java/forestry/core/config/Constants.java +++ b/src/main/java/forestry/core/config/Constants.java @@ -10,9 +10,8 @@ ******************************************************************************/ package forestry.core.config; -import net.minecraft.util.ResourceLocation; - import forestry.api.core.IForestryConstants; +import net.minecraft.util.ResourceLocation; import net.minecraftforge.fluids.Fluid; public class Constants implements IForestryConstants { @@ -23,6 +22,7 @@ public class Constants implements IForestryConstants { public static final String VERSION = "@VERSION@"; public static final String BUILD_NUMBER = "@BUILD_NUMBER@"; + public static final String RF_MOD_ID = "CoFHAPI|energy"; public static final String TESLA_MOD_ID = "tesla"; public static final int FLAG_BLOCK_UPDATE = 1; diff --git a/src/main/java/forestry/core/gui/ContainerTile.java b/src/main/java/forestry/core/gui/ContainerTile.java index 6d8b1561b..cb3cad4e9 100644 --- a/src/main/java/forestry/core/gui/ContainerTile.java +++ b/src/main/java/forestry/core/gui/ContainerTile.java @@ -69,7 +69,7 @@ public abstract class ContainerTile extends ContainerFores if (tile instanceof IPowerHandler) { EnergyManager energyManager = ((IPowerHandler) tile).getEnergyManager(); - int energyManagerData = energyManager.toGuiInt(); + int energyManagerData = energyManager.getEnergyStored(); if (energyManagerData != previousEnergyManagerData) { PacketGuiEnergy packet = new PacketGuiEnergy(windowId, energyManagerData); sendPacketToListeners(packet); @@ -105,7 +105,7 @@ public abstract class ContainerTile extends ContainerFores public void onGuiEnergy(int energyStored) { if (tile instanceof IPowerHandler) { EnergyManager energyManager = ((IPowerHandler) tile).getEnergyManager(); - energyManager.fromGuiInt(energyStored); + energyManager.setEnergyStored(energyStored); } } } diff --git a/src/main/java/forestry/core/gui/GuiForestry.java b/src/main/java/forestry/core/gui/GuiForestry.java index e94855f4c..7979fb41e 100755 --- a/src/main/java/forestry/core/gui/GuiForestry.java +++ b/src/main/java/forestry/core/gui/GuiForestry.java @@ -15,17 +15,6 @@ import java.awt.Rectangle; import java.io.IOException; import java.util.List; -import forestry.core.owner.IOwnedTile; -import net.minecraft.client.gui.FontRenderer; -import net.minecraft.client.gui.inventory.GuiContainer; -import net.minecraft.client.renderer.GlStateManager; -import net.minecraft.client.renderer.RenderHelper; -import net.minecraft.entity.player.InventoryPlayer; -import net.minecraft.inventory.Container; -import net.minecraft.inventory.IInventory; -import net.minecraft.inventory.Slot; -import net.minecraft.util.ResourceLocation; - import forestry.api.core.IErrorLogicSource; import forestry.api.core.IErrorSource; import forestry.core.config.Config; @@ -35,11 +24,22 @@ import forestry.core.gui.ledgers.LedgerManager; import forestry.core.gui.ledgers.OwnerLedger; import forestry.core.gui.ledgers.PowerLedger; import forestry.core.gui.widgets.WidgetManager; +import forestry.core.owner.IOwnedTile; import forestry.core.proxy.Proxies; import forestry.core.render.FontColour; import forestry.core.render.ForestryResource; import forestry.core.tiles.IClimatised; import forestry.core.tiles.IPowerHandler; +import forestry.core.tiles.TileEngine; +import net.minecraft.client.gui.FontRenderer; +import net.minecraft.client.gui.inventory.GuiContainer; +import net.minecraft.client.renderer.GlStateManager; +import net.minecraft.client.renderer.RenderHelper; +import net.minecraft.entity.player.InventoryPlayer; +import net.minecraft.inventory.Container; +import net.minecraft.inventory.IInventory; +import net.minecraft.inventory.Slot; +import net.minecraft.util.ResourceLocation; public abstract class GuiForestry extends GuiContainer { protected final I inventory; @@ -94,8 +94,13 @@ public abstract class GuiForestry ext ledgerManager.add(new ClimateLedger(ledgerManager, (IClimatised) inventory)); } - if (Config.enableEnergyStat && inventory instanceof IPowerHandler && ((IPowerHandler) inventory).getEnergyManager().getMaxEnergyStored() > 0) { - ledgerManager.add(new PowerLedger(ledgerManager, (IPowerHandler) inventory)); + if (Config.enableEnergyStat) { + if (inventory instanceof IPowerHandler && !(inventory instanceof TileEngine)) { + IPowerHandler powerHandler = (IPowerHandler) this.inventory; + if (powerHandler.getEnergyManager().getMaxEnergyStored() > 0) { + ledgerManager.add(new PowerLedger(ledgerManager, powerHandler)); + } + } } if (Config.enableHints && inventory instanceof IHintSource) { diff --git a/src/main/java/forestry/core/gui/ledgers/PowerLedger.java b/src/main/java/forestry/core/gui/ledgers/PowerLedger.java index eacc3cff1..fa9160885 100644 --- a/src/main/java/forestry/core/gui/ledgers/PowerLedger.java +++ b/src/main/java/forestry/core/gui/ledgers/PowerLedger.java @@ -45,7 +45,7 @@ public class PowerLedger extends Ledger { drawHeader(Translator.translateToLocal("for.gui.energy"), xHeader, y + 8); drawSubheader(Translator.translateToLocal("for.gui.stored") + ':', xBody, y + 20); - drawText(energyManager.getTotalEnergyStored() + " RF", xBody, y + 32); + drawText(energyManager.getEnergyStored() + " RF", xBody, y + 32); drawSubheader(Translator.translateToLocal("for.gui.maxenergy") + ':', xBody, y + 44); drawText(energyManager.getMaxEnergyStored() + " RF", xBody, y + 56); @@ -56,7 +56,7 @@ public class PowerLedger extends Ledger { @Override public String getTooltip() { - return tile.getEnergyManager().getTotalEnergyStored() + " RF"; + return tile.getEnergyManager().getEnergyStored() + " RF"; } } diff --git a/src/main/java/forestry/core/tiles/IPowerHandler.java b/src/main/java/forestry/core/tiles/IPowerHandler.java index 7bbf7ef83..349d77d2a 100644 --- a/src/main/java/forestry/core/tiles/IPowerHandler.java +++ b/src/main/java/forestry/core/tiles/IPowerHandler.java @@ -12,8 +12,6 @@ package forestry.core.tiles; import forestry.energy.EnergyManager; -import cofh.api.energy.IEnergyHandler; - -public interface IPowerHandler extends IEnergyHandler { +public interface IPowerHandler { EnergyManager getEnergyManager(); } diff --git a/src/main/java/forestry/core/tiles/TileEngine.java b/src/main/java/forestry/core/tiles/TileEngine.java index fb9260c71..021a17271 100644 --- a/src/main/java/forestry/core/tiles/TileEngine.java +++ b/src/main/java/forestry/core/tiles/TileEngine.java @@ -14,13 +14,6 @@ import javax.annotation.Nonnull; import javax.annotation.Nullable; import java.io.IOException; -import net.minecraft.block.state.IBlockState; -import net.minecraft.inventory.Container; -import net.minecraft.inventory.IContainerListener; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.EnumFacing; - import forestry.api.core.IErrorLogic; import forestry.apiculture.network.packets.PacketActiveUpdate; import forestry.core.blocks.BlockBase; @@ -30,13 +23,19 @@ import forestry.core.errors.EnumErrorCode; import forestry.core.network.DataInputStreamForestry; import forestry.core.network.DataOutputStreamForestry; import forestry.core.proxy.Proxies; -import forestry.core.utils.BlockUtil; +import forestry.energy.EnergyHelper; import forestry.energy.EnergyManager; - -import cofh.api.energy.IEnergyConnection; +import forestry.energy.EnergyTransferMode; +import forestry.energy.compat.rf.IEnergyConnectionDelegated; +import net.minecraft.block.state.IBlockState; +import net.minecraft.inventory.Container; +import net.minecraft.inventory.IContainerListener; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.EnumFacing; import net.minecraftforge.common.capabilities.Capability; -public abstract class TileEngine extends TileBase implements IEnergyConnection, IActivatable { +public abstract class TileEngine extends TileBase implements IEnergyConnectionDelegated, IActivatable { private static final int CANT_SEND_ENERGY_TIME = 20; private boolean active = false; // Used for smp. @@ -63,14 +62,11 @@ public abstract class TileEngine extends TileBase implements IEnergyConnection, this.maxHeat = maxHeat; energyManager = new EnergyManager(2000, maxEnergy); - // allow engines to chain, but not have energy sucked out of them - energyManager.setReceiveOnly(); + energyManager.setExternalMode(EnergyTransferMode.NONE); hints.addAll(Config.hints.get("engine")); } - - protected void addHeat(int i) { heat += i; @@ -133,7 +129,7 @@ public abstract class TileEngine extends TileBase implements IEnergyConnection, progress += pistonSpeedServer; - energyManager.sendEnergy(facing, tile); + EnergyHelper.sendEnergy(energyManager, facing, tile); if (progress > 0.25 && stagePiston == 1) { stagePiston = 2; @@ -141,8 +137,8 @@ public abstract class TileEngine extends TileBase implements IEnergyConnection, progress = 0; stagePiston = 0; } - } else if (enabledRedstone && BlockUtil.isEnergyReceiverOrEngine(facing.getOpposite(), tile)) { - if (energyManager.canSendEnergy(facing, tile)) { + } else if (enabledRedstone && EnergyHelper.isEnergyReceiverOrEngine(facing.getOpposite(), tile)) { + if (EnergyHelper.canSendEnergy(energyManager, facing, tile)) { stagePiston = 1; // If we can transfer energy, start running setActive(true); cantSendEnergyCountdown = CANT_SEND_ENERGY_TIME; @@ -288,11 +284,6 @@ public abstract class TileEngine extends TileBase implements IEnergyConnection, @Deprecated //use packets public abstract void sendGUINetworkData(Container containerEngine, IContainerListener iCrafting); - @Override - public boolean canConnectEnergy(EnumFacing from) { - return energyManager.canConnectEnergy(from); - } - public EnergyManager getEnergyManager() { return energyManager; } diff --git a/src/main/java/forestry/core/tiles/TilePowered.java b/src/main/java/forestry/core/tiles/TilePowered.java index ffc71da2b..f8fc22618 100644 --- a/src/main/java/forestry/core/tiles/TilePowered.java +++ b/src/main/java/forestry/core/tiles/TilePowered.java @@ -14,9 +14,6 @@ import javax.annotation.Nonnull; import javax.annotation.Nullable; import java.io.IOException; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.EnumFacing; - import forestry.api.core.IErrorLogic; import forestry.core.circuits.ISpeedUpgradable; import forestry.core.config.Config; @@ -25,13 +22,17 @@ import forestry.core.network.DataInputStreamForestry; import forestry.core.network.DataOutputStreamForestry; import forestry.core.network.IStreamableGui; import forestry.core.render.TankRenderInfo; +import forestry.energy.EnergyHelper; import forestry.energy.EnergyManager; - -import cofh.api.energy.IEnergyReceiver; +import forestry.energy.EnergyTransferMode; +import forestry.energy.compat.rf.IEnergyHandlerDelegated; +import forestry.energy.compat.rf.IEnergyReceiverDelegated; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.util.EnumFacing; import net.minecraftforge.common.capabilities.Capability; //@Optional.Interface(iface = "buildcraft.api.tiles.IHasWork", modid = "BuildCraftAPI|tiles") -public abstract class TilePowered extends TileBase implements IRenderableTile, IEnergyReceiver, IPowerHandler, ISpeedUpgradable, IStreamableGui { +public abstract class TilePowered extends TileBase implements IRenderableTile, IEnergyReceiverDelegated, IEnergyHandlerDelegated, ISpeedUpgradable, IStreamableGui { private static final int WORK_TICK_INTERVAL = 5; // one Forestry work tick happens every WORK_TICK_INTERVAL game ticks private final EnergyManager energyManager; @@ -49,7 +50,7 @@ public abstract class TilePowered extends TileBase implements IRenderableTile, I protected TilePowered(String hintKey, int maxTransfer, int capacity) { super(hintKey); this.energyManager = new EnergyManager(maxTransfer, capacity); - this.energyManager.setReceiveOnly(); + this.energyManager.setExternalMode(EnergyTransferMode.RECEIVE); this.ticksPerWorkCycle = 4; @@ -73,7 +74,7 @@ public abstract class TilePowered extends TileBase implements IRenderableTile, I } public void setEnergyPerWorkCycle(int energyPerWorkCycle) { - this.energyPerWorkCycle = EnergyManager.scaleForDifficulty(energyPerWorkCycle); + this.energyPerWorkCycle = EnergyHelper.scaleForDifficulty(energyPerWorkCycle); } public int getEnergyPerWorkCycle() { @@ -117,7 +118,7 @@ public abstract class TilePowered extends TileBase implements IRenderableTile, I if (workCounter < ticksPerWorkCycle) { int energyPerWorkCycle = getEnergyPerWorkCycle(); - boolean consumedEnergy = energyManager.consumeEnergyToDoWork(ticksPerWorkCycle, energyPerWorkCycle); + boolean consumedEnergy = EnergyHelper.consumeEnergyToDoWork(energyManager, ticksPerWorkCycle, energyPerWorkCycle); if (consumedEnergy) { errorLogic.setCondition(false, EnumErrorCode.NO_POWER); workCounter++; @@ -201,26 +202,6 @@ public abstract class TilePowered extends TileBase implements IRenderableTile, I return energyManager; } - @Override - public int receiveEnergy(EnumFacing from, int maxReceive, boolean simulate) { - return energyManager.receiveEnergy(from, maxReceive, simulate); - } - - @Override - public int getEnergyStored(EnumFacing from) { - return energyManager.getEnergyStored(from); - } - - @Override - public int getMaxEnergyStored(EnumFacing from) { - return energyManager.getMaxEnergyStored(from); - } - - @Override - public boolean canConnectEnergy(EnumFacing from) { - return energyManager.canConnectEnergy(from); - } - @Override public boolean hasCapability(@Nonnull Capability capability, @Nullable EnumFacing facing) { return energyManager.hasCapability(capability) || super.hasCapability(capability, facing); diff --git a/src/main/java/forestry/core/utils/BlockUtil.java b/src/main/java/forestry/core/utils/BlockUtil.java index 86541baae..dd5b21fe2 100644 --- a/src/main/java/forestry/core/utils/BlockUtil.java +++ b/src/main/java/forestry/core/utils/BlockUtil.java @@ -14,12 +14,8 @@ import javax.annotation.Nonnull; import javax.annotation.Nullable; import java.util.List; -import cofh.api.energy.IEnergyConnection; -import cofh.api.energy.IEnergyReceiver; import forestry.core.network.packets.PacketFXSignal; import forestry.core.proxy.Proxies; -import forestry.core.tiles.TileEngine; -import forestry.energy.EnergyManager; import net.minecraft.block.Block; import net.minecraft.block.BlockHorizontal; import net.minecraft.block.BlockOldLog; @@ -30,7 +26,6 @@ import net.minecraft.block.state.IBlockState; import net.minecraft.init.Blocks; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumFacing; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; @@ -38,8 +33,6 @@ import net.minecraft.util.math.RayTraceResult; import net.minecraft.util.math.Vec3d; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; -import net.minecraftforge.energy.CapabilityEnergy; -import net.minecraftforge.energy.IEnergyStorage; import net.minecraftforge.oredict.OreDictionary; public abstract class BlockUtil { @@ -52,27 +45,6 @@ public abstract class BlockUtil { return blockState.getBlock().getDrops(world, posBlock, blockState, 0); } - - public static boolean isEnergyReceiverOrEngine(EnumFacing side, TileEntity tile) { - if (tile != null) { - if (tile.hasCapability(CapabilityEnergy.ENERGY, side)) { - IEnergyStorage energyStorage = tile.getCapability(CapabilityEnergy.ENERGY, side); - return energyStorage.canReceive(); - } - - if (EnergyManager.TESLA_CONSUMER != null) { - if (tile.hasCapability(EnergyManager.TESLA_CONSUMER, side)) { - return true; - } - } - - if (tile instanceof IEnergyReceiver || (tile instanceof TileEngine)) { - IEnergyConnection receptor = (IEnergyConnection) tile; - return receptor.canConnectEnergy(side); - } - } - return false; - } public static boolean tryPlantCocoaPod(World world, BlockPos pos) { diff --git a/src/main/java/forestry/core/utils/ModUtil.java b/src/main/java/forestry/core/utils/ModUtil.java index ea8a536f7..1820109d9 100644 --- a/src/main/java/forestry/core/utils/ModUtil.java +++ b/src/main/java/forestry/core/utils/ModUtil.java @@ -43,10 +43,21 @@ public abstract class ModUtil { return true; } + /** + * Checks to see if a specific API is loaded. + * + * @param apiName the package name of the package-info.java file to check. (for example "cofh.api.energy") + */ public static boolean isAPILoaded(String apiName) { return isAPILoaded(apiName, null); } + /** + * Checks to see if an API within a specific version range is loaded. + * + * @param apiName the package name of the package-info.java file to check. (for example "cofh.api.energy") + * @param versionRangeString the version range, as defined in {@link VersionParser}. + */ public static boolean isAPILoaded(String apiName, String versionRangeString) { Package apiPackage = Package.getPackage(apiName); if (apiPackage == null) { diff --git a/src/main/java/forestry/energy/EnergyHelper.java b/src/main/java/forestry/energy/EnergyHelper.java new file mode 100644 index 000000000..dd902e703 --- /dev/null +++ b/src/main/java/forestry/energy/EnergyHelper.java @@ -0,0 +1,105 @@ +package forestry.energy; + +import forestry.api.core.ForestryAPI; +import forestry.core.tiles.TileEngine; +import forestry.energy.compat.rf.RFHelper; +import forestry.energy.compat.tesla.TeslaHelper; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.EnumFacing; +import net.minecraftforge.energy.CapabilityEnergy; +import net.minecraftforge.energy.IEnergyStorage; + +public class EnergyHelper { + public static int scaleForDifficulty(int energyValue) { + float energyModifier = ForestryAPI.activeMode.getFloatSetting("energy.demand.modifier"); + return Math.round(energyValue * energyModifier); + } + + /** + * Consumes one work cycle's worth of energy. + * + * @return true if the energy to do work was consumed + */ + public static boolean consumeEnergyToDoWork(EnergyManager energyManager, int ticksPerWorkCycle, int energyPerWorkCycle) { + int energyPerCycle = (int) Math.ceil(energyPerWorkCycle / (float) ticksPerWorkCycle); + if (energyManager.getEnergyStored() < energyPerCycle) { + return false; + } + + energyManager.drainEnergy(energyPerCycle); + + return true; + } + + /** + * Sends as much energy as it can to the tile at orientation. + * For power sources. + * + * @return amount sent + */ + public static int sendEnergy(EnergyManager energyManager, EnumFacing orientation, TileEntity tile) { + return sendEnergy(energyManager, orientation, tile, Integer.MAX_VALUE, false); + } + + /** + * Sends amount of energy to the tile at orientation. + * For power sources. + * + * @return amount sent + */ + public static int sendEnergy(EnergyManager energyManager, EnumFacing orientation, TileEntity tile, int amount, boolean simulate) { + if (tile != null) { + int extractable = energyManager.extractEnergy(amount, true); + if (extractable > 0) { + final int sent; + EnumFacing side = orientation.getOpposite(); + if (tile instanceof TileEngine) { // engine chaining + TileEngine receptor = (TileEngine) tile; + sent = receptor.getEnergyManager().receiveEnergy(extractable, simulate); + } else if (tile.hasCapability(CapabilityEnergy.ENERGY, side)) { + IEnergyStorage energyStorage = tile.getCapability(CapabilityEnergy.ENERGY, side); + sent = energyStorage.receiveEnergy(extractable, simulate); + } else if (TeslaHelper.isEnergyReceiver(tile, side)) { + sent = TeslaHelper.sendEnergy(tile, side, extractable, simulate); + } else if (RFHelper.isEnergyReceiver(tile, side)) { + sent = RFHelper.sendEnergy(tile, side, extractable, simulate); + } else { + sent = 0; + } + + energyManager.extractEnergy(sent, simulate); + return sent; + } + } + return 0; + } + + /** + * @return whether this can send energy to the target tile + */ + public static boolean canSendEnergy(EnergyManager energyManager, EnumFacing orientation, TileEntity tile) { + return sendEnergy(energyManager, orientation, tile, Integer.MAX_VALUE, true) > 0; + } + + public static boolean isEnergyReceiverOrEngine(EnumFacing side, TileEntity tile) { + if (tile != null) { + if (tile instanceof TileEngine) { // engine chaining + return true; + } + + if (tile.hasCapability(CapabilityEnergy.ENERGY, side)) { + IEnergyStorage energyStorage = tile.getCapability(CapabilityEnergy.ENERGY, side); + return energyStorage.canReceive(); + } + + if (TeslaHelper.isEnergyReceiver(tile, side)) { + return true; + } + + if (RFHelper.isEnergyReceiver(tile, side)) { + return true; + } + } + return false; + } +} diff --git a/src/main/java/forestry/energy/EnergyManager.java b/src/main/java/forestry/energy/EnergyManager.java index 7ced483e6..8e416290d 100644 --- a/src/main/java/forestry/energy/EnergyManager.java +++ b/src/main/java/forestry/energy/EnergyManager.java @@ -1,322 +1,136 @@ package forestry.energy; +import javax.annotation.Nonnull; +import javax.annotation.Nullable; import java.io.IOException; -import net.darkhax.tesla.api.ITeslaConsumer; -import net.darkhax.tesla.api.ITeslaHolder; -import net.darkhax.tesla.api.ITeslaProducer; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.EnumFacing; - -import forestry.api.core.ForestryAPI; -import forestry.core.config.Constants; +import forestry.api.core.INbtReadable; +import forestry.api.core.INbtWritable; import forestry.core.network.DataInputStreamForestry; import forestry.core.network.DataOutputStreamForestry; import forestry.core.network.IStreamable; -import forestry.core.tiles.TileEngine; -import cofh.api.energy.IEnergyProvider; -import cofh.api.energy.IEnergyReceiver; +import forestry.energy.compat.EnergyStorageWrapper; +import forestry.energy.compat.tesla.TeslaConsumerWrapper; +import forestry.energy.compat.tesla.TeslaHelper; +import forestry.energy.compat.tesla.TeslaHolderWrapper; +import forestry.energy.compat.tesla.TeslaProducerWrapper; +import net.minecraft.nbt.NBTTagCompound; import net.minecraftforge.common.capabilities.Capability; -import net.minecraftforge.common.capabilities.CapabilityInject; import net.minecraftforge.energy.CapabilityEnergy; +import net.minecraftforge.energy.EnergyStorage; import net.minecraftforge.energy.IEnergyStorage; -import net.minecraftforge.fml.common.Optional; -@Optional.InterfaceList({ - @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, IEnergyStorage, IStreamable { - @CapabilityInject(ITeslaConsumer.class) - public static Capability TESLA_CONSUMER = null; - @CapabilityInject(ITeslaProducer.class) - public static Capability TESLA_PRODUCER = null; - @CapabilityInject(ITeslaHolder.class) - public static Capability TESLA_HOLDER = null; - - private enum EnergyTransferMode { - EXTRACT, RECEIVE, BOTH - } - - private final EnergyStorage energyStorage; - private EnergyTransferMode mode = EnergyTransferMode.BOTH; +public class EnergyManager extends EnergyStorage implements IStreamable, INbtReadable, INbtWritable { + @Nonnull + private EnergyTransferMode externalMode = EnergyTransferMode.BOTH; public EnergyManager(int maxTransfer, int capacity) { - this.energyStorage = new EnergyStorage(scaleForDifficulty(capacity), scaleForDifficulty(maxTransfer), scaleForDifficulty(maxTransfer)); + super(EnergyHelper.scaleForDifficulty(capacity), EnergyHelper.scaleForDifficulty(maxTransfer), EnergyHelper.scaleForDifficulty(maxTransfer)); } - public static int scaleForDifficulty(int energyPerUse) { - return Math.round(energyPerUse * ForestryAPI.activeMode.getFloatSetting("energy.demand.modifier")); + public void setExternalMode(@Nonnull EnergyTransferMode externalMode) { + this.externalMode = externalMode; } - public void setExtractOnly() { - mode = EnergyTransferMode.EXTRACT; - } - - public void setReceiveOnly() { - mode = EnergyTransferMode.RECEIVE; + @Nonnull + public EnergyTransferMode getExternalMode() { + return externalMode; } @Override - public boolean canExtract() { - switch (mode) { - case EXTRACT: - case BOTH: - return true; - default: - return false; + public void readFromNBT(NBTTagCompound nbt) { + final int energy; + if (nbt.hasKey("EnergyManager")) { // legacy + NBTTagCompound energyManagerNBT = nbt.getCompoundTag("EnergyManager"); + NBTTagCompound energyStorageNBT = energyManagerNBT.getCompoundTag("EnergyStorage"); + energy = energyStorageNBT.getInteger("Energy"); + } else { + energy = nbt.getInteger("Energy"); } + + setEnergyStored(energy); } @Override - public boolean canReceive() { - switch (mode) { - case RECEIVE: - case BOTH: - return true; - default: - return false; - } - } - - /* NBT */ - public EnergyManager readFromNBT(NBTTagCompound nbt) { - NBTTagCompound energyManagerNBT = nbt.getCompoundTag("EnergyManager"); - NBTTagCompound energyStorageNBT = energyManagerNBT.getCompoundTag("EnergyStorage"); - energyStorage.readFromNBT(energyStorageNBT); - - return this; - } - public NBTTagCompound writeToNBT(NBTTagCompound nbt) { - NBTTagCompound energyStorageNBT = new NBTTagCompound(); - energyStorage.writeToNBT(energyStorageNBT); - - NBTTagCompound energyManagerNBT = new NBTTagCompound(); - energyManagerNBT.setTag("EnergyStorage", energyStorageNBT); - nbt.setTag("EnergyManager", energyManagerNBT); - + nbt.setInteger("Energy", energy); return nbt; } - /* Packets */ @Override public void writeData(DataOutputStreamForestry data) throws IOException { - int energyStored = energyStorage.getEnergyStored(); - data.writeInt(energyStored); + data.writeVarInt(this.energy); } @Override public void readData(DataInputStreamForestry data) throws IOException { - int energyStored = data.readInt(); - energyStorage.setEnergyStored(energyStored); - } - - public int toGuiInt() { - return energyStorage.getEnergyStored(); - } - - public void fromGuiInt(int packetInt) { - energyStorage.setEnergyStored(packetInt); - } - - /* IEnergyHandler */ - @Override - public int receiveEnergy(EnumFacing from, int maxReceive, boolean simulate) { - return receiveEnergy(maxReceive, simulate); - } - - @Override - public int extractEnergy(EnumFacing from, int maxExtract, boolean simulate) { - return extractEnergy(maxExtract, simulate); - } - - @Override - public int getEnergyStored(EnumFacing from) { - return energyStorage.getEnergyStored(); - } - - public int getTotalEnergyStored() { - return energyStorage.getEnergyStored(); - } - - @Override - public int getMaxEnergyStored(EnumFacing from) { - return energyStorage.getMaxEnergyStored(); - } - - @Override - public int receiveEnergy(int maxReceive, boolean simulate) { - if (!canReceive()) { - return 0; - } - return energyStorage.receiveEnergy(maxReceive, simulate); - } - - @Override - public int extractEnergy(int maxExtract, boolean simulate) { - if (!canExtract()) { - return 0; - } - return energyStorage.extractEnergy(maxExtract, simulate); - } - - @Override - public int getEnergyStored() { - return energyStorage.getEnergyStored(); - } - - public int getMaxEnergyStored() { - return energyStorage.getMaxEnergyStored(); + int energyStored = data.readVarInt(); + setEnergyStored(energyStored); } public int getMaxEnergyReceived() { - return energyStorage.getMaxReceive(); - } - - @Override - public boolean canConnectEnergy(EnumFacing from) { - return true; - } - - /** - * Consumes one work cycle's worth of energy. - * - * @return true if the energy to do work was consumed - */ - public boolean consumeEnergyToDoWork(int ticksPerWorkCycle, int energyPerWorkCycle) { - int energyPerCycle = (int) Math.ceil(energyPerWorkCycle / (float) ticksPerWorkCycle); - if (energyStorage.getEnergyStored() < energyPerCycle) { - return false; - } - - energyStorage.modifyEnergyStored(-energyPerCycle); - return true; - } - - /** - * @return whether this can send energy to the target tile - */ - public boolean canSendEnergy(EnumFacing orientation, TileEntity tile) { - return sendEnergy(orientation, tile, Integer.MAX_VALUE, true) > 0; - } - - /** - * Sends as much energy as it can to the tile at orientation. - * For power sources. Ignores canExtract() - * - * @return amount sent - */ - public int sendEnergy(EnumFacing orientation, TileEntity tile) { - return sendEnergy(orientation, tile, Integer.MAX_VALUE, false); - } - - /** - * Sends amount of energy to the tile at orientation. - * For power sources. Ignores canExtract() - * - * @return amount sent - */ - public int sendEnergy(EnumFacing orientation, TileEntity tile, int amount, boolean simulate) { - int sent = 0; - if (tile != null) { - int extractable = energyStorage.extractEnergy(amount, true); - if (extractable > 0) { - EnumFacing side = orientation.getOpposite(); - if (tile.hasCapability(CapabilityEnergy.ENERGY, side)) { - IEnergyStorage energyStorage = tile.getCapability(CapabilityEnergy.ENERGY, side); - sent = energyStorage.receiveEnergy(extractable, simulate); - } else if (TESLA_CONSUMER != null && tile.hasCapability(TESLA_CONSUMER, side)) { - sent = sendEnergyTesla(tile, side, extractable, simulate); - } else if (tile instanceof IEnergyReceiver) { - IEnergyReceiver receptor = (IEnergyReceiver) tile; - sent = receptor.receiveEnergy(side, extractable, simulate); - } else if (tile instanceof TileEngine) { // engine chaining - TileEngine receptor = (TileEngine) tile; - sent = receptor.getEnergyManager().receiveEnergy(side, extractable, simulate); - } - - energyStorage.extractEnergy(sent, simulate); - } - } - return sent; + return this.maxReceive; } /** * Drains an amount of energy, due to decay from lack of work or other factors */ public void drainEnergy(int amount) { - energyStorage.modifyEnergyStored(-amount); + setEnergyStored(energy - amount); } /** * Creates an amount of energy, generated by engines */ public void generateEnergy(int amount) { - energyStorage.modifyEnergyStored(amount); + setEnergyStored(energy + amount); + } + + public void setEnergyStored(int energyStored) { + this.energy = energyStored; + if (this.energy > capacity) { + this.energy = capacity; + } else if (this.energy < 0) { + this.energy = 0; + } } public boolean hasCapability(Capability capability) { + if (capability == null) { + return false; + } + if (capability == CapabilityEnergy.ENERGY) { return true; - } else if (capability == TESLA_PRODUCER && canExtract()) { + } else if (capability == TeslaHelper.TESLA_PRODUCER && externalMode.canExtract()) { return true; - } else if (capability == TESLA_CONSUMER && canReceive()) { + } else if (capability == TeslaHelper.TESLA_CONSUMER && externalMode.canReceive()) { return true; - } else if (capability == TESLA_HOLDER) { + } else if (capability == TeslaHelper.TESLA_HOLDER) { return true; + } else { + return false; } - return false; } + @Nullable public T getCapability(Capability capability) { + if (capability == null) { + return null; + } + if (capability == CapabilityEnergy.ENERGY) { - return CapabilityEnergy.ENERGY.cast(this); - } else if (capability == TESLA_PRODUCER && canExtract()) { - return TESLA_PRODUCER.cast(this); - } else if (capability == TESLA_CONSUMER && canReceive()) { - return TESLA_CONSUMER.cast(this); - } else if (capability == TESLA_HOLDER) { - return TESLA_HOLDER.cast(this); + IEnergyStorage energyStorage = new EnergyStorageWrapper(this, externalMode); + return CapabilityEnergy.ENERGY.cast(energyStorage); + } else if (capability == TeslaHelper.TESLA_PRODUCER && externalMode.canExtract()) { + return TeslaHelper.TESLA_PRODUCER.cast(new TeslaProducerWrapper(this)); + } else if (capability == TeslaHelper.TESLA_CONSUMER && externalMode.canReceive()) { + return TeslaHelper.TESLA_CONSUMER.cast(new TeslaConsumerWrapper(this)); + } else if (capability == TeslaHelper.TESLA_HOLDER) { + return TeslaHelper.TESLA_HOLDER.cast(new TeslaHolderWrapper(this)); + } else { + return null; } - return null; } - @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 = Constants.TESLA_MOD_ID) - @Override - public long givePower(long power, boolean simulated) { - if (!canReceive()) { - return 0; - } - return energyStorage.receiveEnergy(power, simulated); - } - - @Optional.Method(modid = Constants.TESLA_MOD_ID) - @Override - public long takePower(long power, boolean simulated) { - if (!canExtract()) { - return 0; - } - return energyStorage.extractEnergy(power, simulated); - } - - @Optional.Method(modid = Constants.TESLA_MOD_ID) - @Override - public long getStoredPower() { - return energyStorage.getEnergyStored(); - } - - @Optional.Method(modid = Constants.TESLA_MOD_ID) - @Override - public long getCapacity() { - return energyStorage.getMaxEnergyStored(); - } } diff --git a/src/main/java/forestry/energy/EnergyStorage.java b/src/main/java/forestry/energy/EnergyStorage.java deleted file mode 100644 index 06ef9571d..000000000 --- a/src/main/java/forestry/energy/EnergyStorage.java +++ /dev/null @@ -1,129 +0,0 @@ -package forestry.energy; - -import net.minecraft.nbt.NBTTagCompound; - -public class EnergyStorage { - - protected int energy; - protected int capacity; - protected int maxReceive; - protected int maxExtract; - - public EnergyStorage(int capacity, int maxReceive, int maxExtract) { - this.capacity = capacity; - this.maxReceive = maxReceive; - this.maxExtract = maxExtract; - } - - public EnergyStorage readFromNBT(NBTTagCompound nbt) { - this.energy = nbt.getInteger("Energy"); - - if (energy > capacity) { - energy = capacity; - } - return this; - } - - public NBTTagCompound writeToNBT(NBTTagCompound nbt) { - if (energy < 0) { - energy = 0; - } - nbt.setInteger("Energy", energy); - return nbt; - } - - public EnergyStorage setCapacity(int capacity) { - this.capacity = capacity; - - if (energy > capacity) { - energy = capacity; - } - return this; - } - - public EnergyStorage setMaxTransfer(int maxTransfer) { - - setMaxReceive(maxTransfer); - setMaxExtract(maxTransfer); - return this; - } - - public EnergyStorage setMaxReceive(int maxReceive) { - - this.maxReceive = maxReceive; - return this; - } - - public EnergyStorage setMaxExtract(int maxExtract) { - this.maxExtract = maxExtract; - return this; - } - - public int getMaxReceive() { - return maxReceive; - } - - public int getMaxExtract() { - return maxExtract; - } - - /** - * This function is included to allow for server to client sync. Do not call this externally to the containing Tile Entity, as not all IEnergyHandlers - * are guaranteed to have it. - * - * @param energy - */ - public void setEnergyStored(int energy) { - if (energy > capacity) { - this.energy = capacity; - } else if (energy < 0) { - this.energy = 0; - } else { - this.energy = energy; - } - } - - /** - * This function is included to allow the containing tile to directly and efficiently modify the energy contained in the EnergyStorage. Do not rely on this - * externally, as not all IEnergyHandlers are guaranteed to have it. - * - * @param energy - */ - public void modifyEnergyStored(int energy) { - this.energy += energy; - - if (this.energy > capacity) { - this.energy = capacity; - } else if (this.energy < 0) { - this.energy = 0; - } - } - - /* IEnergyStorage */ - public int receiveEnergy(long maxReceive, boolean simulate) { - int energyReceived = (int) Math.min(capacity - energy, Math.min(this.maxReceive, maxReceive)); - - if (!simulate) { - energy += energyReceived; - } - return energyReceived; - } - - public int extractEnergy(long maxExtract, boolean simulate) { - int energyExtracted = (int) Math.min(energy, Math.min(this.maxExtract, maxExtract)); - - if (!simulate) { - energy -= energyExtracted; - } - - return energyExtracted; - } - - public int getEnergyStored() { - return energy; - } - - public int getMaxEnergyStored() { - return capacity; - } -} diff --git a/src/main/java/forestry/energy/EnergyTransferMode.java b/src/main/java/forestry/energy/EnergyTransferMode.java new file mode 100644 index 000000000..598caaf7f --- /dev/null +++ b/src/main/java/forestry/energy/EnergyTransferMode.java @@ -0,0 +1,25 @@ +package forestry.energy; + +public enum EnergyTransferMode { + EXTRACT, RECEIVE, BOTH, NONE; + + public boolean canExtract() { + switch (this) { + case EXTRACT: + case BOTH: + return true; + default: + return false; + } + } + + public boolean canReceive() { + switch (this) { + case RECEIVE: + case BOTH: + return true; + default: + return false; + } + } +} diff --git a/src/main/java/forestry/energy/blocks/BlockEngine.java b/src/main/java/forestry/energy/blocks/BlockEngine.java index 26002e4b5..eee5e0a6b 100644 --- a/src/main/java/forestry/energy/blocks/BlockEngine.java +++ b/src/main/java/forestry/energy/blocks/BlockEngine.java @@ -10,11 +10,12 @@ ******************************************************************************/ package forestry.energy.blocks; -import com.google.common.collect.ImmutableList; - import java.util.EnumMap; import java.util.List; +import com.google.common.collect.ImmutableList; +import forestry.core.blocks.BlockBase; +import forestry.energy.EnergyHelper; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; @@ -27,9 +28,6 @@ import net.minecraft.util.math.Vec3d; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; -import forestry.core.blocks.BlockBase; -import forestry.core.utils.BlockUtil; - public class BlockEngine extends BlockBase { private static final EnumMap> boundingBoxesForDirections = new EnumMap<>(EnumFacing.class); @@ -116,7 +114,7 @@ public class BlockEngine extends BlockBase { private static boolean isOrientedAtEnergyReciever(World world, BlockPos pos, EnumFacing orientation) { TileEntity tile = world.getTileEntity(pos.offset(orientation)); - return BlockUtil.isEnergyReceiverOrEngine(orientation.getOpposite(), tile); + return EnergyHelper.isEnergyReceiverOrEngine(orientation.getOpposite(), tile); } private static boolean rotate(World world, BlockPos pos) { diff --git a/src/main/java/forestry/energy/compat/EnergyStorageWrapper.java b/src/main/java/forestry/energy/compat/EnergyStorageWrapper.java new file mode 100644 index 000000000..04c9991bb --- /dev/null +++ b/src/main/java/forestry/energy/compat/EnergyStorageWrapper.java @@ -0,0 +1,56 @@ +package forestry.energy.compat; + +import forestry.energy.EnergyManager; +import forestry.energy.EnergyTransferMode; +import net.minecraftforge.energy.IEnergyStorage; + +/** + * Wraps an {@link EnergyManager} to provide restrictions on extraction of receiving of energy. + */ +public class EnergyStorageWrapper implements IEnergyStorage { + private final EnergyManager energyManager; + private final EnergyTransferMode mode; + + public EnergyStorageWrapper(EnergyManager energyManager, EnergyTransferMode mode) { + this.energyManager = energyManager; + this.mode = mode; + } + + @Override + public boolean canExtract() { + return mode.canExtract() && energyManager.canExtract(); + } + + @Override + public boolean canReceive() { + return mode.canReceive() && energyManager.canReceive(); + } + + @Override + public int receiveEnergy(int maxReceive, boolean simulate) { + if (mode.canReceive()) { + return energyManager.receiveEnergy(maxReceive, simulate); + } else { + return 0; + } + } + + @Override + public int extractEnergy(int maxExtract, boolean simulate) { + if (mode.canExtract()) { + return energyManager.extractEnergy(maxExtract, simulate); + } else { + return 0; + } + } + + @Override + public int getEnergyStored() { + return energyManager.getEnergyStored(); + } + + @Override + public int getMaxEnergyStored() { + return energyManager.getMaxEnergyStored(); + } +} diff --git a/src/main/java/forestry/energy/compat/rf/IEnergyConnectionDelegated.java b/src/main/java/forestry/energy/compat/rf/IEnergyConnectionDelegated.java new file mode 100644 index 000000000..ef636d9fa --- /dev/null +++ b/src/main/java/forestry/energy/compat/rf/IEnergyConnectionDelegated.java @@ -0,0 +1,24 @@ +package forestry.energy.compat.rf; + +import cofh.api.energy.IEnergyConnection; +import forestry.core.config.Constants; +import forestry.core.tiles.IPowerHandler; +import forestry.energy.EnergyManager; +import net.minecraft.util.EnumFacing; +import net.minecraftforge.fml.common.Optional; + +/** + * Implements {@link IEnergyConnection} by using an {@link EnergyManager} as a delegate. + */ +@Optional.Interface(iface = "cofh.api.energy.IEnergyConnection", modid = Constants.RF_MOD_ID) +public interface IEnergyConnectionDelegated extends IEnergyConnection, IPowerHandler { + @Optional.Method(modid = Constants.RF_MOD_ID) + @Override + default boolean canConnectEnergy(EnumFacing from) { + EnergyManager energyManager = getEnergyManager(); + if (energyManager == null) { + return false; + } + return energyManager.getExternalMode().canReceive(); + } +} diff --git a/src/main/java/forestry/energy/compat/rf/IEnergyHandlerDelegated.java b/src/main/java/forestry/energy/compat/rf/IEnergyHandlerDelegated.java new file mode 100644 index 000000000..747482e6a --- /dev/null +++ b/src/main/java/forestry/energy/compat/rf/IEnergyHandlerDelegated.java @@ -0,0 +1,33 @@ +package forestry.energy.compat.rf; + +import cofh.api.energy.IEnergyHandler; +import forestry.core.config.Constants; +import forestry.energy.EnergyManager; +import net.minecraft.util.EnumFacing; +import net.minecraftforge.fml.common.Optional; + +/** + * Implements {@link IEnergyHandler} by using an {@link EnergyManager} as a delegate. + */ +@Optional.Interface(iface = "cofh.api.energy.IEnergyHandler", modid = Constants.RF_MOD_ID) +public interface IEnergyHandlerDelegated extends IEnergyHandler, IEnergyConnectionDelegated { + @Optional.Method(modid = Constants.RF_MOD_ID) + @Override + default int getEnergyStored(EnumFacing from) { + EnergyManager energyManager = getEnergyManager(); + if (energyManager == null) { + return 0; + } + return energyManager.getEnergyStored(); + } + + @Optional.Method(modid = Constants.RF_MOD_ID) + @Override + default int getMaxEnergyStored(EnumFacing from) { + EnergyManager energyManager = getEnergyManager(); + if (energyManager == null) { + return 0; + } + return energyManager.getMaxEnergyStored(); + } +} diff --git a/src/main/java/forestry/energy/compat/rf/IEnergyProviderDelegated.java b/src/main/java/forestry/energy/compat/rf/IEnergyProviderDelegated.java new file mode 100644 index 000000000..53f7bcb9d --- /dev/null +++ b/src/main/java/forestry/energy/compat/rf/IEnergyProviderDelegated.java @@ -0,0 +1,24 @@ +package forestry.energy.compat.rf; + +import cofh.api.energy.IEnergyProvider; +import forestry.core.config.Constants; +import forestry.energy.EnergyManager; +import net.minecraft.util.EnumFacing; +import net.minecraftforge.fml.common.Optional; + +/** + * Implements {@link IEnergyProvider} by using an {@link EnergyManager} as a delegate. + */ +@Optional.Interface(iface = "cofh.api.energy.IEnergyProvider", modid = Constants.RF_MOD_ID) +public interface IEnergyProviderDelegated extends IEnergyProvider, IEnergyHandlerDelegated { + @Optional.Method(modid = Constants.RF_MOD_ID) + @Override + default int extractEnergy(EnumFacing from, int maxExtract, boolean simulate) { + EnergyManager energyManager = getEnergyManager(); + if (energyManager.getExternalMode().canExtract()) { + return energyManager.extractEnergy(maxExtract, simulate); + } else { + return 0; + } + } +} diff --git a/src/main/java/forestry/energy/compat/rf/IEnergyReceiverDelegated.java b/src/main/java/forestry/energy/compat/rf/IEnergyReceiverDelegated.java new file mode 100644 index 000000000..0f4efd5f2 --- /dev/null +++ b/src/main/java/forestry/energy/compat/rf/IEnergyReceiverDelegated.java @@ -0,0 +1,26 @@ +package forestry.energy.compat.rf; + +import cofh.api.energy.IEnergyReceiver; +import forestry.core.config.Constants; +import forestry.energy.EnergyManager; +import net.minecraft.util.EnumFacing; +import net.minecraftforge.fml.common.Optional; + +/** + * Implements {@link IEnergyReceiver} by using an {@link EnergyManager} as a delegate. + */ +@Optional.Interface(iface = "cofh.api.energy.IEnergyReceiver", modid = Constants.RF_MOD_ID) +public interface IEnergyReceiverDelegated extends IEnergyReceiver, IEnergyHandlerDelegated { + @Optional.Method(modid = Constants.RF_MOD_ID) + @Override + default int receiveEnergy(EnumFacing from, int maxReceive, boolean simulate) { + EnergyManager energyManager = getEnergyManager(); + if (energyManager == null) { + return 0; + } else if (energyManager.getExternalMode().canReceive()) { + return energyManager.receiveEnergy(maxReceive, simulate); + } else { + return 0; + } + } +} diff --git a/src/main/java/forestry/energy/compat/rf/RFHelper.java b/src/main/java/forestry/energy/compat/rf/RFHelper.java new file mode 100644 index 000000000..f1130405c --- /dev/null +++ b/src/main/java/forestry/energy/compat/rf/RFHelper.java @@ -0,0 +1,52 @@ +package forestry.energy.compat.rf; + +import cofh.api.energy.IEnergyReceiver; +import forestry.core.config.Constants; +import forestry.core.utils.ModUtil; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.EnumFacing; +import net.minecraftforge.fml.common.Optional; + +public class RFHelper { + private static boolean loaded = ModUtil.isAPILoaded("cofh.api.energy"); + + public static boolean isLoaded() { + return loaded; + } + + public static boolean isEnergyReceiver(TileEntity tile, EnumFacing side) { + if (isLoaded()) { + return _isEnergyReceiver(tile, side); + } else { + return false; + } + } + + public static int sendEnergy(TileEntity tile, EnumFacing side, int amount, boolean simulate) { + if (isLoaded()) { + return _sendEnergy(tile, side, amount, simulate); + } else { + return 0; + } + } + + @Optional.Method(modid = Constants.RF_MOD_ID) + private static boolean _isEnergyReceiver(TileEntity tile, EnumFacing side) { + if (tile instanceof IEnergyReceiver) { + IEnergyReceiver energyReceiver = (IEnergyReceiver) tile; + return energyReceiver.canConnectEnergy(side); + } else { + return false; + } + } + + @Optional.Method(modid = Constants.RF_MOD_ID) + private static int _sendEnergy(TileEntity tile, EnumFacing side, int amount, boolean simulate) { + if (tile instanceof IEnergyReceiver) { + IEnergyReceiver receptor = (IEnergyReceiver) tile; + return receptor.receiveEnergy(side, amount, simulate); + } else { + return 0; + } + } +} diff --git a/src/main/java/forestry/energy/compat/tesla/TeslaConsumerWrapper.java b/src/main/java/forestry/energy/compat/tesla/TeslaConsumerWrapper.java new file mode 100644 index 000000000..d1e172837 --- /dev/null +++ b/src/main/java/forestry/energy/compat/tesla/TeslaConsumerWrapper.java @@ -0,0 +1,22 @@ +package forestry.energy.compat.tesla; + +import forestry.core.config.Constants; +import forestry.energy.EnergyManager; +import net.darkhax.tesla.api.ITeslaConsumer; +import net.minecraftforge.fml.common.Optional; + +@Optional.Interface(iface = "net.darkhax.tesla.api.ITeslaConsumer", modid = Constants.TESLA_MOD_ID) +public class TeslaConsumerWrapper implements ITeslaConsumer { + private final EnergyManager energyManager; + + public TeslaConsumerWrapper(EnergyManager energyManager) { + this.energyManager = energyManager; + } + + @Optional.Method(modid = Constants.TESLA_MOD_ID) + @Override + public long givePower(long power, boolean simulated) { + int intPower = (int) Math.min(power, Integer.MAX_VALUE); + return energyManager.receiveEnergy(intPower, simulated); + } +} diff --git a/src/main/java/forestry/energy/compat/tesla/TeslaHelper.java b/src/main/java/forestry/energy/compat/tesla/TeslaHelper.java new file mode 100644 index 000000000..5bfdcc754 --- /dev/null +++ b/src/main/java/forestry/energy/compat/tesla/TeslaHelper.java @@ -0,0 +1,51 @@ +package forestry.energy.compat.tesla; + +import forestry.core.config.Constants; +import net.darkhax.tesla.api.ITeslaConsumer; +import net.darkhax.tesla.api.ITeslaHolder; +import net.darkhax.tesla.api.ITeslaProducer; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.EnumFacing; +import net.minecraftforge.common.capabilities.Capability; +import net.minecraftforge.common.capabilities.CapabilityInject; +import net.minecraftforge.fml.common.Optional; + +public class TeslaHelper { + @CapabilityInject(ITeslaConsumer.class) + public static Capability TESLA_CONSUMER = null; + @CapabilityInject(ITeslaProducer.class) + public static Capability TESLA_PRODUCER = null; + @CapabilityInject(ITeslaHolder.class) + public static Capability TESLA_HOLDER = null; + + public static boolean isLoaded() { + return TESLA_CONSUMER != null && TESLA_PRODUCER != null && TESLA_HOLDER != null; + } + + public static boolean isEnergyReceiver(TileEntity tile, EnumFacing side) { + if (isLoaded()) { + return _isEnergyReceiver(tile, side); + } else { + return false; + } + } + + public static int sendEnergy(TileEntity tile, EnumFacing side, int amount, boolean simulate) { + if (isLoaded()) { + return _sendEnergy(tile, side, amount, simulate); + } else { + return 0; + } + } + + @Optional.Method(modid = Constants.TESLA_MOD_ID) + private static boolean _isEnergyReceiver(TileEntity tile, EnumFacing side) { + return TeslaHelper.TESLA_CONSUMER != null && tile.hasCapability(TeslaHelper.TESLA_CONSUMER, side); + } + + @Optional.Method(modid = Constants.TESLA_MOD_ID) + private static int _sendEnergy(TileEntity tile, EnumFacing side, int amount, boolean simulate) { + ITeslaConsumer consumer = tile.getCapability(TESLA_CONSUMER, side); + return (int) consumer.givePower(amount, simulate); + } +} diff --git a/src/main/java/forestry/energy/compat/tesla/TeslaHolderWrapper.java b/src/main/java/forestry/energy/compat/tesla/TeslaHolderWrapper.java new file mode 100644 index 000000000..39da54f88 --- /dev/null +++ b/src/main/java/forestry/energy/compat/tesla/TeslaHolderWrapper.java @@ -0,0 +1,27 @@ +package forestry.energy.compat.tesla; + +import forestry.core.config.Constants; +import forestry.energy.EnergyManager; +import net.darkhax.tesla.api.ITeslaHolder; +import net.minecraftforge.fml.common.Optional; + +@Optional.Interface(iface = "net.darkhax.tesla.api.ITeslaHolder", modid = Constants.TESLA_MOD_ID) +public class TeslaHolderWrapper implements ITeslaHolder { + private final EnergyManager energyManager; + + public TeslaHolderWrapper(EnergyManager energyManager) { + this.energyManager = energyManager; + } + + @Optional.Method(modid = Constants.TESLA_MOD_ID) + @Override + public long getStoredPower() { + return energyManager.getEnergyStored(); + } + + @Optional.Method(modid = Constants.TESLA_MOD_ID) + @Override + public long getCapacity() { + return energyManager.getMaxEnergyStored(); + } +} diff --git a/src/main/java/forestry/energy/compat/tesla/TeslaProducerWrapper.java b/src/main/java/forestry/energy/compat/tesla/TeslaProducerWrapper.java new file mode 100644 index 000000000..5021c20fa --- /dev/null +++ b/src/main/java/forestry/energy/compat/tesla/TeslaProducerWrapper.java @@ -0,0 +1,22 @@ +package forestry.energy.compat.tesla; + +import forestry.core.config.Constants; +import forestry.energy.EnergyManager; +import net.darkhax.tesla.api.ITeslaProducer; +import net.minecraftforge.fml.common.Optional; + +@Optional.Interface(iface = "net.darkhax.tesla.api.ITeslaProducer", modid = Constants.TESLA_MOD_ID) +public class TeslaProducerWrapper implements ITeslaProducer { + private final EnergyManager energyManager; + + public TeslaProducerWrapper(EnergyManager energyManager) { + this.energyManager = energyManager; + } + + @Optional.Method(modid = Constants.TESLA_MOD_ID) + @Override + public long takePower(long power, boolean simulated) { + int intPower = (int) Math.min(power, Integer.MAX_VALUE); + return energyManager.extractEnergy(intPower, simulated); + } +} diff --git a/src/main/java/forestry/energy/gui/GuiEngine.java b/src/main/java/forestry/energy/gui/GuiEngine.java index 5dee2944a..ff3cf1c81 100755 --- a/src/main/java/forestry/energy/gui/GuiEngine.java +++ b/src/main/java/forestry/energy/gui/GuiEngine.java @@ -10,13 +10,12 @@ ******************************************************************************/ package forestry.energy.gui; -import net.minecraft.inventory.Container; - import forestry.core.gui.GuiForestryTitled; import forestry.core.gui.ledgers.Ledger; import forestry.core.render.TextureManager; import forestry.core.tiles.TileEngine; import forestry.core.utils.Translator; +import net.minecraft.inventory.Container; public abstract class GuiEngine extends GuiForestryTitled { @@ -56,7 +55,7 @@ public abstract class GuiEngine exten drawText(inventory.getCurrentOutput() + " RF/t", x + 22, y + 32); drawSubheader(Translator.translateToLocal("for.gui.stored") + ':', x + 22, y + 44); - drawText(inventory.getEnergyManager().getEnergyStored(null) + " RF", x + 22, y + 56); + drawText(inventory.getEnergyManager().getEnergyStored() + " RF", x + 22, y + 56); drawSubheader(Translator.translateToLocal("for.gui.heat") + ':', x + 22, y + 68); drawText((double) inventory.getHeat() / (double) 10 + 20.0 + " C", x + 22, y + 80); diff --git a/src/main/java/forestry/energy/tiles/TileEngineBiogas.java b/src/main/java/forestry/energy/tiles/TileEngineBiogas.java index 6443d7daf..8360c3c84 100644 --- a/src/main/java/forestry/energy/tiles/TileEngineBiogas.java +++ b/src/main/java/forestry/energy/tiles/TileEngineBiogas.java @@ -14,19 +14,6 @@ import javax.annotation.Nonnull; import javax.annotation.Nullable; import java.io.IOException; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.inventory.Container; -import net.minecraft.inventory.IContainerListener; -import net.minecraft.inventory.ISidedInventory; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.EnumFacing; - -import net.minecraftforge.common.capabilities.Capability; -import net.minecraftforge.fluids.Fluid; -import net.minecraftforge.fluids.FluidRegistry; -import net.minecraftforge.fluids.FluidStack; -import net.minecraftforge.fluids.capability.CapabilityFluidHandler; - import forestry.api.core.IErrorLogic; import forestry.api.fuels.EngineBronzeFuel; import forestry.api.fuels.FuelManager; @@ -43,6 +30,17 @@ import forestry.core.tiles.TileEngine; import forestry.energy.gui.ContainerEngineBiogas; import forestry.energy.gui.GuiEngineBiogas; import forestry.energy.inventory.InventoryEngineBiogas; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.Container; +import net.minecraft.inventory.IContainerListener; +import net.minecraft.inventory.ISidedInventory; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.util.EnumFacing; +import net.minecraftforge.common.capabilities.Capability; +import net.minecraftforge.fluids.Fluid; +import net.minecraftforge.fluids.FluidRegistry; +import net.minecraftforge.fluids.FluidStack; +import net.minecraftforge.fluids.capability.CapabilityFluidHandler; public class TileEngineBiogas extends TileEngine implements ISidedInventory, ILiquidTankTile { private final FilteredTank fuelTank; @@ -274,7 +272,7 @@ public class TileEngineBiogas extends TileEngine implements ISidedInventory, ILi currentOutput = data; break; case 1: - energyManager.fromGuiInt(data); + energyManager.setEnergyStored(data); break; case 2: heat = data; @@ -288,7 +286,7 @@ public class TileEngineBiogas extends TileEngine implements ISidedInventory, ILi @Override public void sendGUINetworkData(Container containerEngine, IContainerListener iCrafting) { iCrafting.sendProgressBarUpdate(containerEngine, 0, currentOutput); - iCrafting.sendProgressBarUpdate(containerEngine, 1, energyManager.toGuiInt()); + iCrafting.sendProgressBarUpdate(containerEngine, 1, energyManager.getEnergyStored()); iCrafting.sendProgressBarUpdate(containerEngine, 2, heat); iCrafting.sendProgressBarUpdate(containerEngine, 3, burnTank.getCapacity()); } diff --git a/src/main/java/forestry/energy/tiles/TileEngineElectric.java b/src/main/java/forestry/energy/tiles/TileEngineElectric.java index 5b5c07d17..83a0ddf5b 100644 --- a/src/main/java/forestry/energy/tiles/TileEngineElectric.java +++ b/src/main/java/forestry/energy/tiles/TileEngineElectric.java @@ -13,13 +13,6 @@ package forestry.energy.tiles; import javax.annotation.Nonnull; import java.io.IOException; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.inventory.Container; -import net.minecraft.inventory.IContainerListener; -import net.minecraft.inventory.IInventory; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; - import forestry.api.circuits.ChipsetManager; import forestry.api.circuits.CircuitSocketType; import forestry.api.circuits.ICircuitBoard; @@ -38,8 +31,13 @@ import forestry.energy.gui.ContainerEngineElectric; import forestry.energy.gui.GuiEngineElectric; import forestry.energy.inventory.InventoryEngineElectric; import forestry.plugins.compat.PluginIC2; - import ic2.api.energy.prefab.BasicSink; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.Container; +import net.minecraft.inventory.IContainerListener; +import net.minecraft.inventory.IInventory; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; public class TileEngineElectric extends TileEngine implements ISocketable, IInventory, IStreamableGui { protected static class EuConfig { @@ -147,7 +145,7 @@ public class TileEngineElectric extends TileEngine implements ISocketable, IInve int gain = 0; if (isRedstoneActivated() && isBurning()) { gain++; - if (((double) energyManager.getTotalEnergyStored() / (double) energyManager.getMaxEnergyStored()) > 0.5) { + if (((double) energyManager.getEnergyStored() / (double) energyManager.getMaxEnergyStored()) > 0.5) { gain++; } } diff --git a/src/main/java/forestry/energy/tiles/TileEnginePeat.java b/src/main/java/forestry/energy/tiles/TileEnginePeat.java index d54fb3a9f..6211327ca 100644 --- a/src/main/java/forestry/energy/tiles/TileEnginePeat.java +++ b/src/main/java/forestry/energy/tiles/TileEnginePeat.java @@ -12,18 +12,6 @@ package forestry.energy.tiles; import javax.annotation.Nonnull; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.inventory.Container; -import net.minecraft.inventory.IContainerListener; -import net.minecraft.inventory.IInventory; -import net.minecraft.inventory.ISidedInventory; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; - -import net.minecraftforge.items.IItemHandler; -import net.minecraftforge.items.wrapper.InvWrapper; - import forestry.api.fuels.FuelManager; import forestry.core.PluginCore; import forestry.core.config.Constants; @@ -38,6 +26,16 @@ import forestry.core.utils.ItemStackUtil; import forestry.energy.gui.ContainerEnginePeat; import forestry.energy.gui.GuiEnginePeat; import forestry.energy.inventory.InventoryEnginePeat; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.Container; +import net.minecraft.inventory.IContainerListener; +import net.minecraft.inventory.IInventory; +import net.minecraft.inventory.ISidedInventory; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraftforge.items.IItemHandler; +import net.minecraftforge.items.wrapper.InvWrapper; public class TileEnginePeat extends TileEngine implements ISidedInventory { private Item fuelItem; @@ -160,7 +158,7 @@ public class TileEnginePeat extends TileEngine implements ISidedInventory { if (isBurning()) { heatToAdd++; - if ((double) energyManager.getTotalEnergyStored() / (double) energyManager.getMaxEnergyStored() > 0.5) { + if ((double) energyManager.getEnergyStored() / (double) energyManager.getMaxEnergyStored() > 0.5) { heatToAdd++; } } @@ -314,7 +312,7 @@ public class TileEnginePeat extends TileEngine implements ISidedInventory { currentOutput = j; break; case 3: - energyManager.fromGuiInt(j); + energyManager.setEnergyStored(j); break; case 4: heat = j; @@ -327,7 +325,7 @@ public class TileEnginePeat extends TileEngine implements ISidedInventory { iCrafting.sendProgressBarUpdate(containerEngine, 0, burnTime); iCrafting.sendProgressBarUpdate(containerEngine, 1, totalBurnTime); iCrafting.sendProgressBarUpdate(containerEngine, 2, currentOutput); - iCrafting.sendProgressBarUpdate(containerEngine, 3, energyManager.toGuiInt()); + iCrafting.sendProgressBarUpdate(containerEngine, 3, energyManager.getEnergyStored()); iCrafting.sendProgressBarUpdate(containerEngine, 4, heat); } diff --git a/src/main/java/forestry/farming/multiblock/FarmController.java b/src/main/java/forestry/farming/multiblock/FarmController.java index 1017cbe93..ce2f29b09 100644 --- a/src/main/java/forestry/farming/multiblock/FarmController.java +++ b/src/main/java/forestry/farming/multiblock/FarmController.java @@ -10,8 +10,6 @@ ******************************************************************************/ package forestry.farming.multiblock; -import com.google.common.base.Objects; - import javax.annotation.Nonnull; import java.io.IOException; import java.util.ArrayList; @@ -28,17 +26,7 @@ import java.util.Map; import java.util.Set; import java.util.Stack; -import net.minecraft.block.state.IBlockState; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.math.BlockPos; -import net.minecraft.util.math.Vec3i; -import net.minecraft.world.World; - -import net.minecraftforge.fluids.FluidRegistry; -import net.minecraftforge.fluids.FluidStack; - +import com.google.common.base.Objects; import forestry.api.circuits.ChipsetManager; import forestry.api.circuits.CircuitSocketType; import forestry.api.circuits.ICircuitBoard; @@ -81,6 +69,15 @@ import forestry.farming.gui.IFarmLedgerDelegate; import forestry.farming.logic.FarmLogicArboreal; import forestry.farming.tiles.TileFarmGearbox; import forestry.farming.tiles.TileFarmPlain; +import net.minecraft.block.state.IBlockState; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.Vec3i; +import net.minecraft.world.World; +import net.minecraftforge.fluids.FluidRegistry; +import net.minecraftforge.fluids.FluidStack; public class FarmController extends RectangularMultiblockControllerBase implements IFarmControllerInternal, ILiquidTankTile { @@ -262,7 +259,7 @@ public class FarmController extends RectangularMultiblockControllerBase implemen for (Map.Entry entry : farmActiveComponents.entrySet()) { IFarmComponent.Active farmComponent = entry.getKey(); if (farmComponent instanceof TileFarmGearbox) { - hasPower |= ((TileFarmGearbox) farmComponent).getEnergyManager().getTotalEnergyStored() > 0; + hasPower |= ((TileFarmGearbox) farmComponent).getEnergyManager().getEnergyStored() > 0; } int tickOffset = entry.getValue(); diff --git a/src/main/java/forestry/farming/tiles/TileFarmGearbox.java b/src/main/java/forestry/farming/tiles/TileFarmGearbox.java index a93172f5c..ebc415aab 100644 --- a/src/main/java/forestry/farming/tiles/TileFarmGearbox.java +++ b/src/main/java/forestry/farming/tiles/TileFarmGearbox.java @@ -13,18 +13,16 @@ package forestry.farming.tiles; import javax.annotation.Nonnull; import javax.annotation.Nullable; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.EnumFacing; - import forestry.api.multiblock.IFarmComponent; import forestry.api.multiblock.IFarmController; +import forestry.energy.EnergyHelper; import forestry.energy.EnergyManager; - -import cofh.api.energy.IEnergyHandler; -import cofh.api.energy.IEnergyReceiver; +import forestry.energy.compat.rf.IEnergyReceiverDelegated; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.util.EnumFacing; import net.minecraftforge.common.capabilities.Capability; -public class TileFarmGearbox extends TileFarm implements IEnergyReceiver, IEnergyHandler, IFarmComponent.Active { +public class TileFarmGearbox extends TileFarm implements IEnergyReceiverDelegated, IFarmComponent.Active { private static final int WORK_CYCLES = 4; private static final int ENERGY_PER_OPERATION = WORK_CYCLES * 50; @@ -62,7 +60,7 @@ public class TileFarmGearbox extends TileFarm implements IEnergyReceiver, IEnerg @Override public void updateServer(int tickCount) { - if (energyManager.getTotalEnergyStored() <= 0) { + if (energyManager.getEnergyStored() <= 0) { return; } @@ -72,7 +70,7 @@ public class TileFarmGearbox extends TileFarm implements IEnergyReceiver, IEnerg } // Hard limit to 4 cycles / second. - if (workCounter < WORK_CYCLES && energyManager.consumeEnergyToDoWork(WORK_CYCLES, ENERGY_PER_OPERATION)) { + if (workCounter < WORK_CYCLES && EnergyHelper.consumeEnergyToDoWork(energyManager, WORK_CYCLES, ENERGY_PER_OPERATION)) { workCounter++; } @@ -94,31 +92,11 @@ public class TileFarmGearbox extends TileFarm implements IEnergyReceiver, IEnerg } - /* IEnergyReceiver */ @Override - public int receiveEnergy(EnumFacing from, int maxReceive, boolean simulate) { - return energyManager.receiveEnergy(from, maxReceive, simulate); - } - public EnergyManager getEnergyManager() { return energyManager; } - @Override - public int getEnergyStored(EnumFacing from) { - return energyManager.getEnergyStored(from); - } - - @Override - public int getMaxEnergyStored(EnumFacing from) { - return energyManager.getMaxEnergyStored(from); - } - - @Override - public boolean canConnectEnergy(EnumFacing from) { - return energyManager.canConnectEnergy(from); - } - @Override public boolean hasCapability(@Nonnull Capability capability, @Nullable EnumFacing facing) { return energyManager.hasCapability(capability) || super.hasCapability(capability, facing); diff --git a/src/main/java/forestry/greenhouse/gui/GuiGreenhouse.java b/src/main/java/forestry/greenhouse/gui/GuiGreenhouse.java index 7cafe3f43..f4f971845 100644 --- a/src/main/java/forestry/greenhouse/gui/GuiGreenhouse.java +++ b/src/main/java/forestry/greenhouse/gui/GuiGreenhouse.java @@ -10,15 +10,11 @@ ******************************************************************************/ package forestry.greenhouse.gui; -import net.minecraft.client.gui.GuiTextField; -import net.minecraft.entity.player.EntityPlayer; -import java.io.IOException; - import javax.annotation.Nullable; +import java.io.IOException; import com.google.common.base.Predicate; import com.google.common.primitives.Floats; - import forestry.api.climate.IClimateControl; import forestry.api.climate.IClimateControlProvider; import forestry.api.core.CamouflageManager; @@ -36,6 +32,8 @@ import forestry.core.utils.Translator; import forestry.greenhouse.multiblock.DefaultClimateControl; import forestry.greenhouse.multiblock.IGreenhouseControllerInternal; import forestry.greenhouse.tiles.TileGreenhouse; +import net.minecraft.client.gui.GuiTextField; +import net.minecraft.entity.player.EntityPlayer; public class GuiGreenhouse extends GuiForestryTitled { @@ -200,12 +198,12 @@ public class GuiGreenhouse extends GuiForestryTitled getPositionsInRange(){ diff --git a/src/main/java/forestry/greenhouse/tiles/TileGreenhouseGearbox.java b/src/main/java/forestry/greenhouse/tiles/TileGreenhouseGearbox.java index 779e4a760..590ce8659 100644 --- a/src/main/java/forestry/greenhouse/tiles/TileGreenhouseGearbox.java +++ b/src/main/java/forestry/greenhouse/tiles/TileGreenhouseGearbox.java @@ -13,50 +13,19 @@ package forestry.greenhouse.tiles; import javax.annotation.Nonnull; import javax.annotation.Nullable; -import net.minecraft.util.EnumFacing; - import forestry.energy.EnergyManager; - -import cofh.api.energy.IEnergyHandler; -import cofh.api.energy.IEnergyReceiver; +import forestry.energy.compat.rf.IEnergyHandlerDelegated; +import forestry.energy.compat.rf.IEnergyReceiverDelegated; +import net.minecraft.util.EnumFacing; import net.minecraftforge.common.capabilities.Capability; -public class TileGreenhouseGearbox extends TileGreenhouse implements IEnergyReceiver, IEnergyHandler { +public class TileGreenhouseGearbox extends TileGreenhouse implements IEnergyReceiverDelegated, IEnergyHandlerDelegated { public TileGreenhouseGearbox() { } - /* IEnergyReceiver */ @Override - public int receiveEnergy(EnumFacing from, int maxReceive, boolean simulate) { - if (getEnergyManager() == null) { - return 0; - } - return getEnergyManager().receiveEnergy(from, maxReceive, simulate); - } - - @Override - public int getEnergyStored(EnumFacing from) { - if (getEnergyManager() == null) { - return 0; - } - return getEnergyManager().getEnergyStored(from); - } - - @Override - public int getMaxEnergyStored(EnumFacing from) { - if (getEnergyManager() == null) { - return 0; - } - return getEnergyManager().getMaxEnergyStored(from); - } - - @Override - public boolean canConnectEnergy(EnumFacing from) { - return getEnergyManager() != null && getEnergyManager().canConnectEnergy(from); - } - - private EnergyManager getEnergyManager() { + public EnergyManager getEnergyManager() { if (!getMultiblockLogic().isConnected()) { return null; } diff --git a/src/main/java/forestry/greenhouse/tiles/TileGreenhouseHatch.java b/src/main/java/forestry/greenhouse/tiles/TileGreenhouseHatch.java index cc85266d4..20904c86e 100644 --- a/src/main/java/forestry/greenhouse/tiles/TileGreenhouseHatch.java +++ b/src/main/java/forestry/greenhouse/tiles/TileGreenhouseHatch.java @@ -10,11 +10,10 @@ ******************************************************************************/ package forestry.greenhouse.tiles; -import java.io.IOException; -import java.util.List; - import javax.annotation.Nonnull; import javax.annotation.Nullable; +import java.io.IOException; +import java.util.List; import com.mojang.authlib.GameProfile; import forestry.api.core.CamouflageManager; @@ -42,26 +41,19 @@ import forestry.core.utils.PlayerUtil; import forestry.greenhouse.blocks.BlockGreenhouse; import forestry.greenhouse.blocks.BlockGreenhouseType; import forestry.greenhouse.multiblock.MultiblockLogicGreenhouse; - -import cofh.api.energy.IEnergyConnection; -import cofh.api.energy.IEnergyHandler; -import cofh.api.energy.IEnergyProvider; -import cofh.api.energy.IEnergyReceiver; - import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumFacing; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; - import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.common.capabilities.Capability; import net.minecraftforge.fluids.capability.CapabilityFluidHandler; import net.minecraftforge.items.CapabilityItemHandler; import net.minecraftforge.items.IItemHandler; -public class TileGreenhouseHatch extends MultiblockTileEntityBase implements IGreenhouseComponent, IStreamableGui, IHintSource, IErrorLogicSource, IOwnedTile, ICamouflageHandler, ICamouflagedTile, IEnergyProvider, IEnergyReceiver { +public class TileGreenhouseHatch extends MultiblockTileEntityBase implements IGreenhouseComponent, IStreamableGui, IHintSource, IErrorLogicSource, IOwnedTile, ICamouflageHandler, ICamouflagedTile { EnumFacing outwards; private ItemStack camouflageBlock; @@ -237,38 +229,6 @@ public class TileGreenhouseHatch extends MultiblockTileEntityBase