mirror of
https://github.com/GTNewHorizons/ForestryMC.git
synced 2026-11-22 21:09:51 +00:00
Removed last of buildcraft.api.power
This commit is contained in:
1 parent
7de0258389
commit
3468169bf9
8 files changed
+45
-80
No files matched your search
@@ -23,9 +23,6 @@ import net.minecraft.util.MathHelper;
|
||||
import net.minecraft.world.World;
|
||||
|
||||
import net.minecraftforge.common.util.ForgeDirection;
|
||||
import net.minecraftforge.fluids.Fluid;
|
||||
import net.minecraftforge.fluids.FluidStack;
|
||||
import net.minecraftforge.fluids.FluidTankInfo;
|
||||
|
||||
import buildcraft.api.gates.ITrigger;
|
||||
import com.mojang.authlib.GameProfile;
|
||||
@@ -33,27 +30,20 @@ import com.mojang.authlib.GameProfile;
|
||||
import forestry.core.EnumErrorCode;
|
||||
import forestry.core.config.Config;
|
||||
import forestry.core.config.Defaults;
|
||||
import forestry.core.fluids.tanks.FakeTank;
|
||||
import forestry.core.interfaces.IErrorSource;
|
||||
import forestry.core.interfaces.ILiquidTankContainer;
|
||||
import forestry.core.interfaces.IOwnable;
|
||||
import forestry.core.interfaces.IPowerHandler;
|
||||
import forestry.core.network.ForestryPacket;
|
||||
import forestry.core.network.INetworkedEntity;
|
||||
import forestry.core.network.PacketPayload;
|
||||
import forestry.core.network.PacketTileUpdate;
|
||||
import forestry.core.proxy.Proxies;
|
||||
import forestry.core.utils.EnumAccess;
|
||||
import forestry.core.fluids.tanks.StandardTank;
|
||||
import forestry.core.utils.InventoryAdapter;
|
||||
import forestry.core.utils.Vect;
|
||||
|
||||
public abstract class TileForestry extends TileEntity implements INetworkedEntity, IOwnable, IErrorSource {
|
||||
|
||||
protected boolean isInited = false;
|
||||
protected int energyConsumed;
|
||||
protected int energyLast;
|
||||
protected int energyReceived;
|
||||
|
||||
public Vect Coords() {
|
||||
return new Vect(xCoord, yCoord, zCoord);
|
||||
@@ -90,13 +80,6 @@ public abstract class TileForestry extends TileEntity implements INetworkedEntit
|
||||
|
||||
if (!Proxies.common.isSimulating(worldObj))
|
||||
return;
|
||||
|
||||
if (this instanceof IPowerHandler) {
|
||||
IPowerHandler receptor = (IPowerHandler) this;
|
||||
if (receptor.getPowerHandler() != null) {
|
||||
receptor.getPowerHandler().update();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
public abstract void initialize();
|
||||
|
||||
@@ -10,23 +10,22 @@
|
||||
******************************************************************************/
|
||||
package forestry.core.gadgets;
|
||||
|
||||
import cofh.api.energy.IEnergyHandler;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.nbt.NBTTagCompound;
|
||||
|
||||
import net.minecraftforge.common.util.ForgeDirection;
|
||||
import net.minecraftforge.fluids.FluidContainerRegistry.FluidContainerData;
|
||||
|
||||
import forestry.core.fluids.tanks.StandardTank;
|
||||
import forestry.core.interfaces.IPowerHandler;
|
||||
import forestry.core.interfaces.IRenderableMachine;
|
||||
import forestry.core.network.ClassMap;
|
||||
import forestry.core.network.EntityNetData;
|
||||
import forestry.core.network.IndexInPayload;
|
||||
import forestry.core.network.PacketPayload;
|
||||
import forestry.core.proxy.Proxies;
|
||||
import forestry.core.utils.EnumTankLevel;
|
||||
import forestry.core.fluids.tanks.StandardTank;
|
||||
import forestry.energy.EnergyManager;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.nbt.NBTTagCompound;
|
||||
import net.minecraftforge.common.util.ForgeDirection;
|
||||
import net.minecraftforge.fluids.FluidContainerRegistry.FluidContainerData;
|
||||
|
||||
public abstract class TilePowered extends TileBase implements IRenderableMachine, IEnergyHandler {
|
||||
public abstract class TilePowered extends TileBase implements IRenderableMachine, IPowerHandler {
|
||||
|
||||
public static int WORK_CYCLES = 4;
|
||||
|
||||
@@ -64,6 +63,7 @@ public abstract class TilePowered extends TileBase implements IRenderableMachine
|
||||
ex.printStackTrace();
|
||||
}
|
||||
}
|
||||
|
||||
protected final EnergyManager energyManager;
|
||||
|
||||
public TilePowered(int minAcceptedEnergy, int maxTransfer, int energyPerWork, int capacity) {
|
||||
@@ -71,27 +71,6 @@ public abstract class TilePowered extends TileBase implements IRenderableMachine
|
||||
this.energyManager.setReceiveOnly();
|
||||
}
|
||||
|
||||
/*private final PowerHandler powerHandler;
|
||||
|
||||
public TilePowered() {
|
||||
powerHandler = new PowerHandler(this, Type.MACHINE);
|
||||
configurePowerProvider(powerHandler);
|
||||
adjustPowerProvider(powerHandler);
|
||||
}
|
||||
|
||||
protected void configurePowerProvider(PowerHandler provider) {
|
||||
provider.configure(Defaults.MACHINE_MIN_ENERGY_RECEIVED, Defaults.MACHINE_MAX_ENERGY_RECEIVED,
|
||||
Defaults.MACHINE_MIN_ACTIVATION_ENERGY, Defaults.MACHINE_MAX_ENERGY);
|
||||
}
|
||||
|
||||
private void adjustPowerProvider(PowerHandler provider) {
|
||||
provider.configure(
|
||||
provider.getMinEnergyReceived(),
|
||||
Math.round(provider.getMaxEnergyReceived() * GameMode.getGameMode().getFloatSetting("energy.demand.modifier")),
|
||||
Math.round(provider.getActivationEnergy() * GameMode.getGameMode().getFloatSetting("energy.demand.modifier")),
|
||||
Math.round(provider.getMaxEnergyStored() * GameMode.getGameMode().getFloatSetting("energy.demand.modifier")));
|
||||
}*/
|
||||
|
||||
/* STATE INFORMATION */
|
||||
public abstract boolean isWorking();
|
||||
|
||||
@@ -172,6 +151,12 @@ public abstract class TilePowered extends TileBase implements IRenderableMachine
|
||||
return EnumTankLevel.EMPTY;
|
||||
}
|
||||
|
||||
/* IPowerHandler */
|
||||
@Override
|
||||
public EnergyManager getEnergyManager() {
|
||||
return energyManager;
|
||||
}
|
||||
|
||||
@Override
|
||||
public int receiveEnergy(ForgeDirection from, int maxReceive, boolean simulate) {
|
||||
return energyManager.receiveEnergy(from, maxReceive, simulate);
|
||||
|
||||
@@ -96,7 +96,7 @@ public abstract class GuiForestry<T extends TileForestry> extends GuiContainer i
|
||||
if (inventory instanceof IClimatised && ((IClimatised) inventory).isClimatized())
|
||||
ledgerManager.add(new ClimateLedger(ledgerManager, (IClimatised) inventory));
|
||||
|
||||
if (!Config.disableEnergyStat && inventory instanceof IPowerHandler)
|
||||
if (!Config.disableEnergyStat && inventory instanceof IPowerHandler && ((IPowerHandler) inventory).getEnergyManager().getMaxEnergyStored() > 0)
|
||||
ledgerManager.add(new PowerLedger(ledgerManager, (IPowerHandler) inventory));
|
||||
|
||||
if (!Config.disableHints && inventory instanceof IHintSource && ((IHintSource) inventory).hasHints())
|
||||
|
||||
@@ -10,11 +10,10 @@
|
||||
******************************************************************************/
|
||||
package forestry.core.gui;
|
||||
|
||||
import buildcraft.api.power.PowerHandler;
|
||||
|
||||
import forestry.core.interfaces.IPowerHandler;
|
||||
import forestry.core.render.TextureManager;
|
||||
import forestry.core.utils.StringUtil;
|
||||
import forestry.energy.EnergyManager;
|
||||
|
||||
public class PowerLedger extends Ledger {
|
||||
|
||||
@@ -38,23 +37,23 @@ public class PowerLedger extends Ledger {
|
||||
if (!isFullyOpened())
|
||||
return;
|
||||
|
||||
PowerHandler handler = tile.getPowerHandler();
|
||||
EnergyManager energyManager = tile.getEnergyManager();
|
||||
manager.minecraft.fontRenderer.drawStringWithShadow(StringUtil.localize("gui.energy"), x + 22, y + 8, manager.gui.fontColor.get("ledger.power.header"));
|
||||
manager.minecraft.fontRenderer.drawStringWithShadow(StringUtil.localize("gui.stored") + ":", x + 22, y + 20,
|
||||
manager.gui.fontColor.get("ledger.power.subheader"));
|
||||
manager.minecraft.fontRenderer.drawString(handler.getEnergyStored() + " MJ", x + 22, y + 32, manager.gui.fontColor.get("ledger.power.text"));
|
||||
manager.minecraft.fontRenderer.drawString(energyManager.getTotalEnergyStored() + " RF", x + 22, y + 32, manager.gui.fontColor.get("ledger.power.text"));
|
||||
manager.minecraft.fontRenderer.drawStringWithShadow(StringUtil.localize("gui.maxenergy") + ":", x + 22, y + 44,
|
||||
manager.gui.fontColor.get("ledger.power.subheader"));
|
||||
manager.minecraft.fontRenderer.drawString(handler.getMaxEnergyStored() + " MJ", x + 22, y + 56, manager.gui.fontColor.get("ledger.power.text"));
|
||||
manager.minecraft.fontRenderer.drawString(energyManager.getMaxEnergyStored() + " RF", x + 22, y + 56, manager.gui.fontColor.get("ledger.power.text"));
|
||||
manager.minecraft.fontRenderer.drawStringWithShadow(StringUtil.localize("gui.maxenergyreceive") + ":", x + 22, y + 68,
|
||||
manager.gui.fontColor.get("ledger.power.subheader"));
|
||||
manager.minecraft.fontRenderer.drawString(handler.getMaxEnergyReceived() + " MJ", x + 22, y + 80, manager.gui.fontColor.get("ledger.power.text"));
|
||||
manager.minecraft.fontRenderer.drawString(energyManager.getMaxEnergyReceived() + " RF", x + 22, y + 80, manager.gui.fontColor.get("ledger.power.text"));
|
||||
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getTooltip() {
|
||||
return tile.getPowerHandler().getEnergyStored() + " MJ";
|
||||
return tile.getEnergyManager().getTotalEnergyStored() + " RF";
|
||||
}
|
||||
|
||||
}
|
||||
@@ -10,9 +10,9 @@
|
||||
******************************************************************************/
|
||||
package forestry.core.interfaces;
|
||||
|
||||
import buildcraft.api.power.IPowerReceptor;
|
||||
import buildcraft.api.power.PowerHandler;
|
||||
import cofh.api.energy.IEnergyHandler;
|
||||
import forestry.energy.EnergyManager;
|
||||
|
||||
public interface IPowerHandler extends IPowerReceptor {
|
||||
PowerHandler getPowerHandler();
|
||||
public interface IPowerHandler extends IEnergyHandler {
|
||||
EnergyManager getEnergyManager();
|
||||
}
|
||||
@@ -114,6 +114,14 @@ public class EnergyManager implements IEnergyHandler {
|
||||
return energyStorage.getMaxEnergyStored();
|
||||
}
|
||||
|
||||
public int getMaxEnergyStored() {
|
||||
return energyStorage.getMaxEnergyStored();
|
||||
}
|
||||
|
||||
public int getMaxEnergyReceived() {
|
||||
return energyStorage.getMaxReceive();
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean canConnectEnergy(ForgeDirection from) {
|
||||
return true;
|
||||
|
||||
@@ -10,21 +10,20 @@
|
||||
******************************************************************************/
|
||||
package forestry.farming.gadgets;
|
||||
|
||||
import cofh.api.energy.IEnergyHandler;
|
||||
|
||||
import forestry.energy.EnergyManager;
|
||||
import net.minecraft.nbt.NBTTagCompound;
|
||||
|
||||
import forestry.api.core.ITileStructure;
|
||||
import forestry.api.farming.IFarmHousing;
|
||||
import forestry.core.interfaces.IPowerHandler;
|
||||
import forestry.energy.EnergyManager;
|
||||
import net.minecraft.nbt.NBTTagCompound;
|
||||
import net.minecraftforge.common.util.ForgeDirection;
|
||||
|
||||
public class TileGearbox extends TileFarm implements IEnergyHandler {
|
||||
public class TileGearbox extends TileFarm implements IPowerHandler {
|
||||
|
||||
public static int WORK_CYCLES = 4;
|
||||
private int activationDelay = 0;
|
||||
private int previousDelays = 0;
|
||||
private int workCounter;
|
||||
private final EnergyManager energyManager;
|
||||
|
||||
public TileGearbox() {
|
||||
energyManager = new EnergyManager(50, 200, 50, 10000);
|
||||
@@ -60,9 +59,6 @@ public class TileGearbox extends TileFarm implements IEnergyHandler {
|
||||
nbttagcompound.setInteger("PrevDelays", previousDelays);
|
||||
}
|
||||
|
||||
/* POWER */
|
||||
EnergyManager energyManager;
|
||||
|
||||
@Override
|
||||
protected void updateServerSide() {
|
||||
super.updateServerSide();
|
||||
@@ -93,7 +89,12 @@ public class TileGearbox extends TileFarm implements IEnergyHandler {
|
||||
}
|
||||
}
|
||||
|
||||
/* IEnergyHandler */
|
||||
/* IPowerHandler */
|
||||
@Override
|
||||
public EnergyManager getEnergyManager() {
|
||||
return energyManager;
|
||||
}
|
||||
|
||||
@Override
|
||||
public int receiveEnergy(ForgeDirection from, int maxReceive, boolean simulate) {
|
||||
return energyManager.receiveEnergy(from, maxReceive, simulate);
|
||||
|
||||
@@ -17,7 +17,6 @@ import net.minecraft.item.Item;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.tileentity.TileEntity;
|
||||
|
||||
import net.minecraftforge.common.util.ForgeDirection;
|
||||
import net.minecraftforge.fluids.Fluid;
|
||||
import net.minecraftforge.fluids.FluidStack;
|
||||
|
||||
@@ -26,8 +25,6 @@ import buildcraft.api.fuels.IronEngineFuel;
|
||||
import buildcraft.api.gates.ActionManager;
|
||||
import buildcraft.api.gates.ITrigger;
|
||||
import buildcraft.api.gates.ITriggerProvider;
|
||||
import buildcraft.api.power.PowerHandler;
|
||||
import buildcraft.api.power.PowerHandler.PowerReceiver;
|
||||
import buildcraft.api.recipes.BuildcraftRecipes;
|
||||
import buildcraft.api.transport.IPipeTile;
|
||||
|
||||
@@ -134,14 +131,6 @@ public class PluginBuildCraft extends ForestryPlugin implements ITriggerProvider
|
||||
Proxies.common.addRecipe(new ItemStack(pipeWaterproof), "#", '#', ForestryItem.beeswax);
|
||||
}
|
||||
|
||||
public double invokeUseEnergyMethod(PowerHandler workProvider, float min, float max, boolean doUse) {
|
||||
return workProvider.useEnergy(min, max, doUse);
|
||||
}
|
||||
|
||||
public void invokeReceiveEnergyMethod(PowerHandler.Type type, PowerReceiver receiver, double extractedEnergy, ForgeDirection from) {
|
||||
receiver.receiveEnergy(type, extractedEnergy, from);
|
||||
}
|
||||
|
||||
// / ITRIGGERPROVIDER
|
||||
@Override
|
||||
public LinkedList<ITrigger> getPipeTriggers(IPipeTile pipe) {
|
||||
|
||||
Reference in new issue
Block a user